Skip to content

Commit f62996d

Browse files
authored
update student training message
* chore: update student training message * chore: bug for self grading * chore: update styling * chore: more styling * chore: make loading more visible * chore: update linting
1 parent 961628e commit f62996d

File tree

8 files changed

+16
-9
lines changed

8 files changed

+16
-9
lines changed

src/components/AppContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const AppContainer = ({ children }) => {
2424
}
2525
return (
2626
<div className="w-100 h-100">
27-
{isLoaded ? children : <Spinner animation="border" screenReaderText="loading" />}
27+
{isLoaded ? children : <Spinner animation="border" screenReaderText="loading" className="app-loading" />}
2828
</div>
2929
);
3030
};

src/components/ProgressBar/hooks.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export const useProgressStepData = ({ step, canRevisit = false }) => {
2525
? activeStepName === step
2626
: viewStep === step;
2727
let isEnabled = isActive
28-
|| viewStep === stepNames.done
2928
|| stepState === stepStates.inProgress
3029
|| (canRevisit && stepState === stepStates.done);
3130

@@ -34,7 +33,6 @@ export const useProgressStepData = ({ step, canRevisit = false }) => {
3433
const isWaitingForSubmissions = stepInfo.peer?.isWaitingForSubmissions;
3534
isEnabled = !isWaitingForSubmissions && (isEnabled || isPeerComplete);
3635
}
37-
3836
return {
3937
...(viewStep === stepNames.xblock ? { onClick } : { href }),
4038
isEnabled,

src/components/Prompt/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const Prompt = ({ prompt, defaultOpen }) => {
1818
const message = messages[viewStep] || messages[activeStepName];
1919
const title = message ? formatMessage(message) : '';
2020
return (
21-
<Collapsible className="py-3" title={(<h3>{title}</h3>)} open={open} onToggle={toggleOpen}>
21+
<Collapsible title={(<h3 className="py-3">{title}</h3>)} open={open} onToggle={toggleOpen}>
2222
<div dangerouslySetInnerHTML={{ __html: prompt }} />
2323
</Collapsible>
2424
);

src/components/StatusAlert/messages.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const submissionHeadings = defineMessages({
7979
const studentTrainingAlerts = defineMessages({
8080
[stepStates.submitted]: {
8181
id: 'frontend-app-ora.StatusAlert.studentTraining.submitted',
82-
defaultMessage: 'You have successfully submitted a practice grade. Continue to the next example, or if you have completed all examples, continue to the next step.',
82+
defaultMessage: 'Continue to the next example, or if you have completed all examples, continue to the next step.',
8383
description: 'Practice Assessment submitted status alert',
8484
},
8585
[stepStates.trainingValidation]: {
@@ -91,7 +91,7 @@ const studentTrainingAlerts = defineMessages({
9191
const studentTrainingHeadings = defineMessages({
9292
[stepStates.submitted]: {
9393
id: 'frontend-app-ora.StatusAlert.Heading.studentTraining.submitted',
94-
defaultMessage: 'Student Training: Submitted',
94+
defaultMessage: 'You have successfully submitted a practice grade.',
9595
description: 'Practice Assessment submitted status alert heading',
9696
},
9797
});

src/index.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,10 @@
4747
.ora-icon svg {
4848
display: inline-block !important;
4949
}
50+
51+
.app-loading {
52+
position: absolute;
53+
top: 50%;
54+
left: 50%;
55+
scale: 3;
56+
}

src/views/AssessmentView/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const AssessmentView = () => {
3131
<Prompt prompt={prompt} />
3232
{!textIsEmpty && (
3333
<>
34-
<h3 className="m-1">{formatMessage(messages.responseMessages[step])}</h3>
34+
<h3 className="m-1 py-2">{formatMessage(messages.responseMessages[step])}</h3>
3535
<TextResponse response={response.textResponses[index]} />
3636
</>
3737
)}

src/views/GradeView/FinalGrade.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ const FinalGrade = () => {
4545
</p>
4646
</InfoPopover>
4747
</h1>
48-
{renderAssessment(effectiveAssessment, true)}
48+
<div className="py-2">
49+
{renderAssessment(effectiveAssessment, true)}
50+
</div>
4951
<div className="my-2" />
5052
{extraGrades.length > 0 && (
5153
<h3>

src/views/GradeView/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "@edx/paragon/scss/core/core";
22

33
.grade-view-body {
4-
max-width: $max-width-xl;
4+
max-width: $max-width-lg;
55
flex-wrap: nowrap !important;
66
gap: 1em;
77
}

0 commit comments

Comments
 (0)