Merge branch 'master' of github.com:isaacphysics/isaac-react-app into cs-related-questions

Author: mlt47

src/app/components/content/IsaacQuestion.tsx

@@ -256,12 +256,12 @@ const IsaacQuestionComponent = ({doc, validationResponse, currentAttempt, canSub
             {(!validationResponse || !validationResponse.correct || canSubmit) && !locked &&
                 <div className="d-flex align-items-stretch flex-column-reverse flex-sm-row flex-md-column-reverse flex-lg-row">
                     {secondaryAction && <div
-                        className={`text-center pt-3 pb-1 w-100 w-sm-50 w-md-100 w-lg-50 ${primaryAction ? "pr-sm-2 pr-md-0 pr-lg-3" : ""}`}
+                        className={`m-auto pt-3 pb-1 w-100 w-sm-50 w-md-100 w-lg-50 ${primaryAction ? "pr-sm-2 pr-md-0 pr-lg-3" : ""}`}
                     >
                         <input {...secondaryAction} className="h-100 btn btn-outline-primary btn-block" />
                     </div>}
                     {primaryAction && <div
-                        className={`text-center pt-3 pb-1 w-100 w-sm-50 w-md-100 w-lg-50 ${secondaryAction ? "pl-sm-2 pl-md-0 pl-lg-3" : ""}`}
+                        className={`m-auto pt-3 pb-1 w-100 w-sm-50 w-md-100 w-lg-50 ${secondaryAction ? "pl-sm-2 pl-md-0 pl-lg-3" : ""}`}
                     >
                         <input {...primaryAction} className="h-100 btn btn-secondary btn-block" />
                     </div>}

src/app/components/elements/Accordion.tsx

@@ -140,7 +140,8 @@ const AccordionComponent = ({id, trustedTitle, index, children, location: {hash}
                 }}
                 aria-expanded={open ? "true" : "false"}
             >
-                {level && <span className="accordion-level badge-secondary">Level {level}</span>}
+                {/*TODO CS Level*/}
+                {SITE_SUBJECT === SITE.PHY && level && <span className="accordion-level badge-secondary">Level {level}</span>}
                 <div className="accordion-title pl-3">
                     <RS.Row><span className="accordion-part p-3 text-secondary">Part {ALPHABET[index % ALPHABET.length]}  {" "}</span>
                         {trustedTitle && <div className="p-3"><TrustedHtml html={trustedTitle} /></div>}</RS.Row>

src/app/components/elements/RelatedContent.tsx

@@ -8,6 +8,7 @@ import {logAction} from "../../state/actions";
 import {SITE, SITE_SUBJECT} from "../../services/siteConstants";
 import {sortByNumberStringValue, sortByStringValue} from "../../services/sorting";
 
+
 interface RelatedContentProps {
     content: ContentSummaryDTO[];
     parentPage: ContentDTO;
@@ -141,6 +142,7 @@ export const RelatedContentComponent = ({content, parentPage, logAction}: Relate
                 target={openInNewTab ? "_blank" : undefined}
             >
                 {contentSummary.title}
+                {/*TODO CS Level*/}
                 {SITE_SUBJECT === SITE.PHY && contentSummary.level && contentSummary.level != '0' && " (Level " + contentSummary.level + ")"}
             </Link>
         </ListGroupItem>

src/app/components/handlers/PasswordResetHandler.tsx

@@ -51,8 +51,8 @@ const ResetPasswordHandlerComponent = ({urlToken, handleResetPassword, verifyPas
                 <CardBody>
                     <Form name="passwordReset">
                         <FormGroup>
-                            <Label htmlFor="password-input">New password</Label>
-                            <Input id="password" type="password" name="password"
+                            <Label htmlFor="password">New password</Label>
+                            <Input id="password" type="password" name="password-new"
                                 onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                                     passwordDebounce(e.target.value, setPasswordFeedback);
                                 }}
@@ -71,7 +71,7 @@ const ResetPasswordHandlerComponent = ({urlToken, handleResetPassword, verifyPas
                         </FormGroup>
                         <FormGroup>
                             <Label htmlFor="password-confirm">Re-enter new password</Label>
-                            <Input invalid={!isValidPassword} id="password-confirm" type="password" name="password" onBlur={(e: any) => {
+                            <Input invalid={!isValidPassword} id="password-confirm" type="password" name="password-new-confirm" onBlur={(e: any) => {
                                 validateAndSetPassword(e);
                                 (e.target.value == (document.getElementById("password") as HTMLInputElement).value) ? setCurrentPassword(e.target.value) : null}
                             } aria-describedby="invalidPassword" required/>
@@ -83,7 +83,12 @@ const ResetPasswordHandlerComponent = ({urlToken, handleResetPassword, verifyPas
                     <h4 role="alert" className="text-danger text-center mb-0">
                         {errorMessage && errorMessage.type === "generalError" && errorMessage.generalError}
                     </h4>
-                    <Button color="secondary" className="mb-2" block onClick={(e: any) => (isValidPassword && !errorMessage) ? handleResetPassword({token: urlToken, password: currentPassword}) : null}>Change Password</Button>
+                    <Button color="secondary" className="mb-2" block
+                        onClick={() => (isValidPassword && !errorMessage) ? handleResetPassword({token: urlToken, password: currentPassword}) : null}
+                        id="change-password"
+                    >
+                        Change Password
+                    </Button>
                 </CardFooter>
             </Card>
         </div>

src/app/components/pages/Gameboard.tsx

@@ -68,7 +68,8 @@ const gameboardItem = (gameboard: GameboardDTO, question: GameboardItem) => {
                     {tags.map(tag => (<span className="gameboard-tag" key={tag.id}>{tag.title}</span>))}
                 </div>}
             </div>
-            {question.level !== undefined && question.level !== 0 &&
+            {/*TODO CS Level*/}
+            {SITE_SUBJECT === SITE.PHY && question.level !== undefined && question.level !== 0 &&
                 <span className="gameboard-tags">Level {question.level}</span>}
         </Link>
     </RS.ListGroupItem>;

src/app/components/pages/LogIn.tsx

@@ -122,7 +122,9 @@ const LogInPageComponent = ({user, handleProviderLoginRedirect, logInUser, reset
                                             Forgotten your password?
                                         </Button> :
                                         <p>
-                                            <strong className="d-block">Your password reset request is being processed.</strong>
+                                            <strong id="password-reset-processing" className="d-block">
+                                                Your password reset request is being processed.
+                                            </strong>
                                             <strong className="d-block">Please check your inbox.</strong>
                                         </p>
                                     }