Merge pull request #457 from SELab-2/clearer-submission-status

chore: clearer submission status
SELab-2 · May 23, 2024 · 663f329 · 663f329
2 parents cd9935c + b29caf4
commit 663f329
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,8 @@ data/nginx/ssl/*
 data/postres*
 data/redis/*
 
+docs/.vitepress/cache/*
+
 backend/data/production/*
 backend/staticfiles/*
 

diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
@@ -0,0 +1,31 @@
+import { defineConfig } from "vitepress";
+
+// https://vitepress.dev/reference/site-config
+export default defineConfig({
+    base: "/docs",
+    locales: {
+        root: {
+            label: "English",
+            lang: "en",
+            link: "/en",
+        },
+        nl: {
+            label: "Nederlands",
+            lang: "nl",
+            link: "/nl",
+        },
+    },
+    title: "Ypovoli",
+    description: "A ugent site",
+    themeConfig: {
+        // https://vitepress.dev/reference/default-theme-config
+        nav: [
+            // { text: 'Home', link: '/en/' },
+            // { text: 'Examples', link: '/markdown-examples' }
+        ],
+
+        socialLinks: [
+            { icon: "github", link: "https://github.com/SELab-2/UGent-7" },
+        ],
+    },
+})
diff --git a/frontend/src/assets/lang/app/en.json b/frontend/src/assets/lang/app/en.json
@@ -227,11 +227,11 @@
             "open": "Details",
             "newProject": "New project",
             "noSubmissions": "This project does not have any submissions \uD83D\uDE2D",
-            "submissions": "Submission | Submissions",
+            "submissions": "Group has made a submission | Groups have made a submission",
             "groups": "Group | Groups",
-            "structureTestsSucceed": "Succeeded structure tests",
-            "extraTestsSucceed": "Succeeded extra tests",
-            "testsFail": "Failed tests",
+            "structureTestsFail": "Failed structure tests",
+            "extraChecksFail": "Failed extra tests",
+            "testsSucceed": "Succeeded tests",
             "successfulSubmission": "Successful submissions",
             "submit": "Submit"
         },

diff --git a/frontend/src/assets/lang/app/nl.json b/frontend/src/assets/lang/app/nl.json
@@ -229,10 +229,10 @@
             "newProject": "Nieuw project",
             "noSubmissions": "Dit project heeft geen indieningen",
             "submissions": "Indiening | Indieningen",
-            "groups": "Groep | Groepen",
-            "structureTestsSucceed": "Geslaagde structuur testen",
-            "extraTestsSucceed": "Geslaagde extra testen",
-            "testsFail": "Gefaalde testen",
+            "groups": "Groep heeft al ingediend | Groepen hebben al ingediend",
+            "structureTestsFail": "Gefaalde structuurtesten",
+            "extraChecksFail": "Gefaalde extra testen",
+            "testsSucceed": "Geslaagde testen",
             "successfulSubmission": "Geslaagde indieningen",
             "submit": "Indienen"
         },

diff --git a/frontend/src/components/submissions/ProjectMeter.vue b/frontend/src/components/submissions/ProjectMeter.vue
@@ -32,19 +32,19 @@ const meterItems = computed(() => {
     const submissionsFailedItem = {
         value: (submissionsFailed / groups) * 100,
         color: red,
-        label: t('components.card.testsFail'),
+        label: t('components.card.structureTestsFail'),
         icon: 'pi pi-times',
     };
     const structureChecksPassedItem = {
         value: (extraChecksFailed / groups) * 100,
         color: orange,
-        label: t('components.card.structureTestsSucceed'),
+        label: t('components.card.extraChecksFail'),
         icon: 'pi pi-exclamation-circle',
     };
     const extraChecksPassedItem = {
         value: (extraChecksPassed / groups) * 100,
         color: green,
-        label: t('components.card.extraTestsSucceed'),
+        label: t('components.card.testsSucceed'),
         icon: 'pi pi-check',
     };
 
@@ -54,6 +54,7 @@ const meterItems = computed(() => {
         }
         structureChecksPassedItem.color = green;
         structureChecksPassedItem.icon = 'pi pi-check';
+        structureChecksPassedItem.label = t('components.card.testsSucceed');
         return [submissionsFailedItem, structureChecksPassedItem];
     }
     return [