Merge branch 'development' into backend/enhancement/seeder

SELab-2 · May 4, 2024 · bd22093 · bd22093
2 parents 519e333 + c0cd627
commit bd22093
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/frontend/public/locales/en/translation.json b/frontend/public/locales/en/translation.json
@@ -133,6 +133,8 @@
     "course": "Course",
     "SUCCESS": "Success",
     "FAIL": "Fail",
+    "RUNNING": "Is running",
+    "LATE": "Late",
     "deadlinesOnDay": "Deadlines on: ",
     "noDeadline": "No deadlines",
     "no_submission_yet" : "No submission yet",

diff --git a/frontend/public/locales/nl/translation.json b/frontend/public/locales/nl/translation.json
@@ -66,6 +66,8 @@
     "last_submission": "Laatste indiening",
     "SUCCESS": "Geslaagd",
     "FAIL": "Gefaald",
+    "RUNNING": "Aan het lopen",
+    "LATE": "Te laat",
     "deadlinesOnDay": "Deadlines op: ",
     "noDeadline": "Geen deadlines",
     "no_submission_yet" : "Nog geen indiening",

diff --git a/frontend/src/components/Header/Header.tsx b/frontend/src/components/Header/Header.tsx
@@ -85,6 +85,15 @@ export function Header({ me }: HeaderProps): JSX.Element {
           >
             <MenuIcon style={{ fontSize: "2rem" }} />
           </IconButton>
+          <Link to={`/home`}
+            style={{ color: 'inherit', textDecoration: 'none' }}>
+            <Typography
+              variant="h6"
+              color="inherit"
+              sx={{ marginRight: '2rem' }}>
+              Peristerónas
+            </Typography>
+          </Link>
           <TitlePortal />
           {!me.loggedIn && (
             <LoginButton/>

diff --git a/frontend/src/pages/project/projectDeadline/ProjectDeadlineCard.tsx b/frontend/src/pages/project/projectDeadline/ProjectDeadlineCard.tsx
@@ -31,7 +31,9 @@ export const ProjectDeadlineCard: React.FC<ProjectCardProps> = ({  deadlines, sh
           <CardActionArea component={Link} to={`/${i18n.language}/projects/${project.project_id}`}>
             <CardContent>
               <Typography variant="h6" style={{color: project.short_submission ?
-                (project.short_submission.submission_status === 'SUCCESS' ? 'green' : 'red') : '#686868'}}>
+                (project.short_submission.submission_status === 'SUCCESS' ? 'green' : 
+                  (project.short_submission.submission_status === 'RUNNING' ? '#686868' : 'red')
+                ) : '#686868'}}>
                 {project.title}
               </Typography>
               {showCourse && (