Merge pull request #36 from jatin-narang/final-UI-11.0

Refractor: Fix profile page and scenario end success message
nditech · Mar 5, 2019 · c1cfad6 · c1cfad6
2 parents 1af607f + 9bc2fa1
commit c1cfad6
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 55 deletions.
diff --git a/client/src/components/ProfileInfo/index.js b/client/src/components/ProfileInfo/index.js
@@ -40,7 +40,7 @@ class ProfileInfo extends React.Component {
 		const { email, name } = this.state;
 		return (
 			<div className="profile-info-container">
-				<div>
+				<div className="profile-form-container">
 					<div className="profile-header">
 						<div className="back-module-container">
 							<button className="back-button" onClick={this.props.history.goBack}>

diff --git a/client/src/components/ProfileInfo/styles.scss b/client/src/components/ProfileInfo/styles.scss
@@ -127,6 +127,9 @@
 	.profile-info-container {
 		display: flex;
 		margin: 0 14em;
+		.profile-form-container{
+			width: 26em;
+		}
 		.career-progress-label {
 			margin-left: 0;
 			font-size: 1.6em;
@@ -139,13 +142,13 @@
 		}
 		.input-label {
 			left: 14em;
-			top: 3em;
+			top: 4em;
 		}
 		.input-label-name {
-			top: 8em;
+			top: 9em;
 		}
 		.input-label-password {
-			top: 13.2em;
+			top: 14.2em;
 		}
 	}
 }
diff --git a/client/src/pages/ScenarioBased/ScenarioQuesAns.js b/client/src/pages/ScenarioBased/ScenarioQuesAns.js
@@ -263,7 +263,7 @@ export class ScenarioQuesAns extends React.Component {
 						{conclusionReached && (
 							<AnswerInfoPopup
 								open={open}
-								message={'Your answer is correct'}
+								message={'Scenario Ends'}
 								answerStatus={true}
 								handleClose={this.handleClose}
 								imageUrl={correctAnsUrl}
@@ -290,8 +290,8 @@ export class ScenarioQuesAns extends React.Component {
 										messageOne: parScoreStatus
 											? `You have scored  ${currentScore > 0 ? currentScore : 0}/${totalScore}.`
 											: `Oh! You have scored only  ${currentScore > 0
-													? currentScore
-													: 0}/${totalScore}.`,
+												? currentScore
+												: 0}/${totalScore}.`,
 										messageTwo: `Scenario Ends`,
 
 										messageThree: parScoreStatus
@@ -306,56 +306,56 @@ export class ScenarioQuesAns extends React.Component {
 						)}
 
 						{!showCorrectAns &&
-						questionId != null && (
-							<div>
-								<div className="level-question-detail">
-									<span>Level {level} </span>
-									<span className="question-number-status">
-										Question {id} out of {totalQuestion}
-									</span>
-								</div>
-								<div className="progress-bar-container">
-									<ProgressBar progress={progress} />
-								</div>
-								<div className="questions-container">
-									<p className={`question-label question-label-${moduleColor}`}>
-										{questions &&
-											questions.length > 0 &&
-											questionId != null &&
-											questions[questionId - 1].question}
-									</p>
-								</div>
-								<div className="answer-container">
-									{!emptyOption && !showAnswer && <p className="select-label">Select any option.</p>}
-									<div className="options-card-container">
-										{!emptyOption &&
-											questions &&
-											questions.length > 0 &&
-											questionId != null &&
-											questions[questionId - 1].options.map((option, key) => (
-												<Card
-													key={key}
-													option={moduleScenario ? option.option : option}
-													answerClick={answerClick}
-													// selectedCard={clickedOptions.includes(key)}
-													selectedCard={selectedCard === key}
-													handleClick={this.handleAnswerClick(key)}
-													moduleColor={moduleColor}
-												/>
-											))}
+							questionId != null && (
+								<div>
+									<div className="level-question-detail">
+										<span>Level {level} </span>
+										<span className="question-number-status">
+											Question {id} out of {totalQuestion}
+										</span>
 									</div>
-								</div>
-								{/* Either option is clicked or question option is empty render proceed button */}
-								{(emptyOption || answerClick) && (
-									<button
-										className={`next-page-button next-page-button-${true}`}
-										onClick={moduleScenario ? this.handleScenarioProceed : this.handleProceedNext}
-									>
-										Proceed
+									<div className="progress-bar-container">
+										<ProgressBar progress={progress} />
+									</div>
+									<div className="questions-container">
+										<p className={`question-label question-label-${moduleColor}`}>
+											{questions &&
+												questions.length > 0 &&
+												questionId != null &&
+												questions[questionId - 1].question}
+										</p>
+									</div>
+									<div className="answer-container">
+										{!emptyOption && !showAnswer && <p className="select-label">Select any option.</p>}
+										<div className="options-card-container">
+											{!emptyOption &&
+												questions &&
+												questions.length > 0 &&
+												questionId != null &&
+												questions[questionId - 1].options.map((option, key) => (
+													<Card
+														key={key}
+														option={moduleScenario ? option.option : option}
+														answerClick={answerClick}
+														// selectedCard={clickedOptions.includes(key)}
+														selectedCard={selectedCard === key}
+														handleClick={this.handleAnswerClick(key)}
+														moduleColor={moduleColor}
+													/>
+												))}
+										</div>
+									</div>
+									{/* Either option is clicked or question option is empty render proceed button */}
+									{(emptyOption || answerClick) && (
+										<button
+											className={`next-page-button next-page-button-${true}`}
+											onClick={moduleScenario ? this.handleScenarioProceed : this.handleProceedNext}
+										>
+											Proceed
 									</button>
-								)}
-							</div>
-						)}
+									)}
+								</div>
+							)}
 					</Fragment>
 				</div>
 				{infoOpen && <GameInfo open={infoOpen} handleClose={this.handleInfoClose} />}