diff --git a/web/src/app/submissions/[submissionId]/(styles)/page/reviewStatus.scss b/web/src/app/submissions/[submissionId]/(styles)/page/reviewStatus.scss index 211c9af..e64bd43 100644 --- a/web/src/app/submissions/[submissionId]/(styles)/page/reviewStatus.scss +++ b/web/src/app/submissions/[submissionId]/(styles)/page/reviewStatus.scss @@ -1,12 +1,13 @@ -$Published: "0"; -$Rejected: "1"; -$Publishing: "2"; -$Validated: "3"; +$UnderConstruction: "0"; +$Submitted: "1"; +$ChangesRequested: "2"; +$Accepted: "3"; $Validating: "4"; -$Accepted: "5"; -$ChangesRequested: "6"; -$Submitted: "7"; -$UnderConstruction: "8"; +$Validated: "5"; +$Uploading: "6"; +$Uploaded: "7"; +$Rejected: "8"; +$Released: "9"; .review-status { border-radius: 5px; @@ -16,7 +17,7 @@ $UnderConstruction: "8"; font-weight: bold; } - &[data-review-status="#{$Published}"] { + &[data-review-status="#{$Released}"] { background-color: orange; p { color: white; @@ -28,7 +29,13 @@ $UnderConstruction: "8"; color: white; } } - &[data-review-status="#{$Publishing}"] { + &[data-review-status="#{$Uploading}"] { + background-color: orange; + p { + color: white; + } + } + &[data-review-status="#{$Uploaded}"] { background-color: orange; p { color: white; @@ -70,4 +77,4 @@ $UnderConstruction: "8"; color: white; } } -} \ No newline at end of file +} diff --git a/web/src/app/submissions/[submissionId]/page.tsx b/web/src/app/submissions/[submissionId]/page.tsx index 1444f91..4b681cd 100644 --- a/web/src/app/submissions/[submissionId]/page.tsx +++ b/web/src/app/submissions/[submissionId]/page.tsx @@ -55,7 +55,6 @@ function TitleAndComments(stats: CreatorAndReviewStatus) {

{stats.name}

- {/* TODO: Fix review status, I think its displaying the wrong information idk */} @@ -97,4 +96,4 @@ export default function SubmissionInfoPage() {
) -} \ No newline at end of file +} diff --git a/web/src/app/ts/Submission.ts b/web/src/app/ts/Submission.ts index b321b8f..3234348 100644 --- a/web/src/app/ts/Submission.ts +++ b/web/src/app/ts/Submission.ts @@ -1,13 +1,14 @@ const enum SubmissionStatus { - Published, - Rejected, - Publishing, - Validated, - Validating, - Accepted, - ChangesRequested, - Submitted, - UnderConstruction + UnderConstruction = 0, + Submitted = 1, + ChangesRequested = 2, + Accepted = 3, + Validating = 4, + Validated = 5, + Uploading = 6, + Uploaded = 7, + Rejected = 8, + Released = 9, } interface SubmissionInfo { @@ -26,12 +27,14 @@ interface SubmissionInfo { function SubmissionStatusToString(submission_status: SubmissionStatus): string { switch (submission_status) { - case SubmissionStatus.Published: - return "PUBLISHED" + case SubmissionStatus.Released: + return "RELEASED" case SubmissionStatus.Rejected: return "REJECTED" - case SubmissionStatus.Publishing: - return "PUBLISHING" + case SubmissionStatus.Uploading: + return "UPLOADING" + case SubmissionStatus.Uploaded: + return "UPLOADED" case SubmissionStatus.Validated: return "VALIDATED" case SubmissionStatus.Validating: @@ -53,4 +56,4 @@ export { SubmissionStatus, SubmissionStatusToString, type SubmissionInfo -} \ No newline at end of file +}