beaucoup

backend/project/endpoints/projects/endpoint_parser.py

@@ -28,7 +28,7 @@
     help='Projects visibility for students',
     location="form"
 )
-parser.add_argument("archived", type=bool, help='Projects', location="form")
+parser.add_argument("archived", type=str, help='Projects', location="form")
 parser.add_argument(
     "regex_expressions",
     type=str,
@@ -61,7 +61,9 @@ def parse_project_params():
                         )
                     )
                 result_dict[key] = new_deadlines
+            elif "archived" == key:
+                result_dict[key] = True if value == "true" else False
             else:
                 result_dict[key] = value
 
-    return result_dict
+    return result_dict

frontend/public/locales/en/translation.json

@@ -52,7 +52,7 @@
     "cancel": "Cancel",
     "create": "Create",
     "activeCourses": "Active Courses",
-    "archivedCourses": "Archived Courses"
+    "archivedCourses":"Archived Courses"
   },
   "courseForm": {
     "courseName": "Course Name",
@@ -73,7 +73,8 @@
       "submitTime": "Time submitted",
       "status": "Status"
     },
-    "projectOverview": "Overview"
+    "projectOverview": "Overview",
+    "archive": "Archive"
   },
   "time": {
     "yearsAgo": "years ago",
@@ -128,19 +129,19 @@
     "unauthorized": "You are unauthorized to upload a project for this course",
     "submissionError": "Submission failed, please try again"
   },
-  "student": {
+  "student" : {
     "myProjects": "My Projects",
     "myCourses": "My Courses",
     "deadlines": "Past deadlines",
-    "last_submission": "Last submission",
+    "last_submission" : "Last submission",
     "course": "Course",
     "SUCCESS": "Success",
     "FAIL": "Fail",
     "RUNNING": "Is running",
     "LATE": "Late",
     "deadlinesOnDay": "Deadlines on: ",
     "noDeadline": "No deadlines on this day",
-    "no_submission_yet": "No submission yet",
+    "no_submission_yet" : "No submission yet",
     "loading": "Loading...",
     "no_projects": "There are no projects here, sign up for a course to see projects"
   },
@@ -150,4 +151,4 @@
     "no_projects": "There are no projects here.",
     "new_project": "New Project"
   }
-}
+}

frontend/public/locales/nl/translation.json

@@ -1,144 +1,153 @@
 {
   "header": {
-    "myProjects": "Mijn Projecten",
-    "myCourses": "Mijn Vakken",
-    "login": "Aanmelden",
+    "myProjects": "My Projects",
+    "myCourses": "My Courses",
+    "projectCreate": "Create Project",
+    "login": "Login",
     "home": "Home",
-    "tag": "nl",
+    "tag": "en",
     "homepage": "Homepage",
-    "projectUploadForm": "Project uploaden",
-    "logout": "Afmelden"
+    "projectUploadForm": "Project upload form",
+    "logout": "Logout"
   },
   "home": {
     "home": "Home",
-    "tag": "nl",
-    "homepage": "Homepagina",
-    "welcomeDescription": "Welkom bij Peristerónas, het online indieningsplatform van UGent",
-    "login": "Aanmelden"
+    "tag": "en",
+    "homepage": "Homepage",
+    "welcomeDescription": "Welcome to Peristerónas, the online submission platform of UGent",
+    "login": "Login"
   },
   "courseDetailTeacher": {
-    "title": "Vak Details",
-    "noCoursesFound": "Geen vakken gevonden",
-    "unauthorizedDelete": "U heeft niet de juiste rechten om dit vak te verwijderen",
-    "noProjects": "Geen projecten",
-    "noStudents": "Geen studenten voor dit vak",
-    "deleteCourse": "Verwijder vak",
+    "title": "Course Details",
+    "deleteCourse": "Delete Course",
+    "unauthorizedDelete": "You are unauthorized to delete this course",
+    "noCoursesFound": "No courses found",
+    "noProjects": "No projects",
+    "noStudents": "No students in this course",
     "joinCodes": "Join Codes",
-    "forAdmins": "Voor Admins",
-    "forStudents": "Voor Studenten",
-    "noExpiryDate": "Geen vervaldatum",
-    "expiryDate": "Vervaldatum",
-    "newJoinCode": "Nieuwe Join Code",
-    "deleteSelected": "Verwijder geselecteerde studenten",
-    "projects": "Projecten",
-    "newProject": "Nieuw Project",
-    "assistantList": "Lijst co-leerkrachten/assistenten",
-    "newTeacher": "Nieuwe leerkracht",
-    "studentList": "Lijst studenten",
-    "newStudent": "Nieuwe student(en)",
+    "forAdmins": "For Admins",
+    "forStudents": "For Students",
+    "noExpiryDate": "No expiry date",
+    "expiryDate": "Expiry Date",
+    "newJoinCode": "New Join Code",
+    "deleteSelected": "Delete Selected Students",
+    "projects": "Projects",
+    "newProject": "New Project",
+    "assistantList": "List of co-teachers/assistants",
+    "newTeacher": "New teacher",
+    "studentList": "List of students",
+    "newStudent": "New student(s)",
     "deadline": "Deadline",
-    "teacher": "Leerkracht",
-    "view": "Bekijk",
+    "teacher": "Teacher",
+    "view": "View",
     "admins": "Admins",
-    "students": "Studenten"
+    "students": "Students"
   },
   "allCoursesTeacher": {
-    "title": "Alle Vakken",
-    "courseForm": "Vak Form",
-    "courseName": "Vak Naam",
-    "submit": "Opslaan",
-    "emptyCourseNameError": "Vak naam mag niet leeg zijn",
-    "cancel": "Annuleer",
-    "create": "Nieuw Vak",
-    "activeCourses": "Actieve Vakken",
-    "archivedCourses":"Gearchiveerde Vakken"
+    "title": "All Courses",
+    "courseForm": "Course Form",
+    "courseName": "Course Name",
+    "submit": "Submit",
+    "emptyCourseNameError": "Course name should not be empty",
+    "cancel": "Cancel",
+    "create": "Create",
+    "activeCourses": "Active Courses",
+    "archivedCourses":"Archived Courses"
   },
   "courseForm": {
-    "courseName": "Vak Naam",
-    "submit": "Opslaan",
-    "emptyCourseNameError": "Vak naam mag niet leeg zijn"
-  },
-  "student": {
-    "myProjects": "Mijn Projecten",
-    "myCourses": "Mijn Vakken",
-    "deadlines": "Verlopen Deadlines",
-    "course": "Vak",
-    "last_submission": "Laatste indiening",
-    "SUCCESS": "Geslaagd",
-    "FAIL": "Gefaald",
-    "RUNNING": "Aan het lopen",
-    "LATE": "Te laat",
-    "deadlinesOnDay": "Deadlines op: ",
-    "noDeadline": "Geen deadlines op deze dag",
-    "no_submission_yet" : "Nog geen indiening",
-    "loading": "Laden...",
-    "no_projects": "Er zijn hier geen projecten, meld je aan voor een vak om projecten te zien"
-
-  },
-  "projectForm": {
-    "projectTitle": "Titel",
-    "projectDescription": "Beschrijving",
-    "projectCourse": "Vak",
-    "projectDeadline": "Project deadline",
-    "visibleForStudents": "Zichtbaar voor studenten",
-    "uploadFile": "Upload bestand",
-    "regex": "Voeg Regex toe",
-    "selectCourseText": "Selecteer een vak",
-    "testWarning": "Opgelet: Deze opgave bevat geen tests",
-    "helperText": "Selecteer een geldige deadline voor het project",
-    "uploadProject": "Upload project",
-    "regexStructure": "Regex structuur",
-    "uploadError": "Project is niet goed geformatteerd",
-    "noDeadlinesPlaceholder": "Nog geen opgegeven deadlines",
-    "noFilesPlaceholder": "Nog geen opgave bestanden geupload",
-    "noRegexPlaceholder": "Nog geen regex toegevoegd",
-    "unauthorized": "U heeft niet de juiste rechten om een project aan te maken voor dit vak",
-    "submissionError": "Er is een fout opgetreden bij het indienen van uw project, probeer het later opnieuw.",
-    "clearSelected": "Deselecteer keuze"
+    "courseName": "Course Name",
+    "submit": "Submit",
+    "emptyCourseNameError": "Course name should not be empty"
   },
   "projectView": {
-    "submitNetworkError": "Er is iets mislopen bij het opslaan van uw indiening. Probeer het later opnieuw.",
-    "selected": "Geselecteerd",
-    "submit": "Indienen",
-    "previousSubmissions": "Vorige indieningen",
-    "noFileSelected": "Er is geen bestand geselecteerd",
+    "submitNetworkError": "Failed to upload file, please try again.",
+    "selected": "Selected",
+    "submit": "Submit",
+    "previousSubmissions": "Previous Submissions",
+    "noFileSelected": "No file selected",
     "submissionGrid": {
-      "late": "Te laat",
-      "fail": "Gefaald",
-      "success": "Succesvol",
-      "running": "Aan het uitvoeren",
-      "submitTime": "Indientijd",
+      "late": "Late",
+      "fail": "Fail",
+      "success": "Success",
+      "running": "Running",
+      "submitTime": "Time submitted",
       "status": "Status"
     },
     "projectOverview": "Overzicht"
   },
   "time": {
-    "yearsAgo": "jaren geleden",
-    "monthsAgo": "maanden geleden",
-    "daysAgo": "dagen geleden",
-    "hoursAgo": "uur geleden",
-    "minutesAgo": "minuten geleden",
-    "justNow": "Zonet",
-    "yearsLater": "jaren later",
-    "monthsLater": "maanden later",
-    "daysLater": "dagen later",
-    "hoursLater": "uur later",
-    "minutesLater": "minuten later"
-  },
-  "projectsOverview": {
-    "past_deadline": "Verlopen Projecten",
-    "future_deadline": "Opkomende Deadlines",
-    "no_projects": "Er zijn hier geen projecten.",
-    "new_project": "Nieuw Project"
+    "yearsAgo": "years ago",
+    "monthsAgo": "months ago",
+    "daysAgo": "days ago",
+    "hoursAgo": "hours ago",
+    "minutesAgo": "minutes ago",
+    "justNow": "just now",
+    "yearsLater": "years later",
+    "monthsLater": "months later",
+    "daysLater": "days later",
+    "hoursLater": "hours later",
+    "minutesLater": "minutes later"
   },
   "error": {
-    "pageNotFound": "Pagina Niet Gevonden",
-    "pageNotFoundMessage": "De opgevraagde pagina werd niet gevonden.",
-    "forbidden": "Verboden",
-    "forbiddenMessage": "Je hebt geen toegang tot deze bron.",
-    "clientError": "Client Fout",
-    "clientErrorMessage": "Er is een client fout opgetreden.",
-    "serverError": "Server Fout",
-    "serverErrorMessage": "Er is een server fout opgetreden."
+    "pageNotFound": "Page Not Found",
+    "pageNotFoundMessage": "The requested page was not found.",
+    "forbidden": "Forbidden",
+    "forbiddenMessage": "You don't have access to this resource.",
+    "clientError": "Client Error",
+    "clientErrorMessage": "A client error has occured.",
+    "serverError": "Server Error",
+    "serverErrorMessage": "A server error has occured."
+  },
+  "projectForm": {
+    "projectTitle": "Title",
+    "projectDescription": "Project description",
+    "projectCourse": "Course",
+    "projectDeadline": "Project deadline",
+    "visibleForStudents": "Visible for students",
+    "uploadFile": "Upload file",
+    "regex": "Add Regex",
+    "selectCourseText": "Select a course",
+    "testWarning": "Warning: This assignment doesn't contain tests",
+    "helperText": "Please fill in a valid deadline for the project",
+    "uploadProject": "Upload project",
+    "regexStructure": "Regex structure",
+    "uploadError": "Project isn't formatted appropriately",
+    "projectHeader": "Upload a project",
+    "deadline": "deadline",
+    "description": "Description",
+    "zipFile": "Zipfile",
+    "helperRegexText": "Regex can't be empty or already added",
+    "fileInfo": "The uploaded file must be a .zip file, if you want automatic tests you should include a Dockerfile or a run_tests.sh.\n For more info you should see",
+    "userDocs": "user guide",
+    "visibleForStudentsTooltip": "If this is checked the project will be visible to the students after upload",
+    "noDeadlinesPlaceholder": "No deadlines present yet",
+    "noFilesPlaceholder": "No assignment files given yet",
+    "noRegexPlaceholder": "No regex added yet",
+    "clearSelected": "Clear Selection",
+    "faultySubmission": "Some fields were left open or there is no valid runner/file combination",
+    "unauthorized": "You are unauthorized to upload a project for this course",
+    "submissionError": "Submission failed, please try again"
+  },
+  "student" : {
+    "myProjects": "My Projects",
+    "myCourses": "My Courses",
+    "deadlines": "Past deadlines",
+    "last_submission" : "Last submission",
+    "course": "Course",
+    "SUCCESS": "Success",
+    "FAIL": "Fail",
+    "RUNNING": "Is running",
+    "LATE": "Late",
+    "deadlinesOnDay": "Deadlines on: ",
+    "noDeadline": "No deadlines on this day",
+    "no_submission_yet" : "No submission yet",
+    "loading": "Loading...",
+    "no_projects": "There are no projects here, sign up for a course to see projects"
+  },
+  "projectsOverview": {
+    "past_deadline": "Past Projects",
+    "future_deadline": "Upcoming Deadlines",
+    "no_projects": "There are no projects here.",
+    "new_project": "New Project"
   }
 }

frontend/src/App.tsx

@@ -23,7 +23,6 @@ import { synchronizeJoinCode } from "./loaders/join-code.ts";
 import { fetchMe } from "./utils/fetches/FetchMe.ts";
 import {fetchProjectForm} from "./components/ProjectForm/project-form.ts";
 import loadSubmissionOverview from "./loaders/submission-overview-loader.ts";
-import ProjectAdminView from "./pages/project/projectAdminView/projectAdminView.tsx";
 
 const router = createBrowserRouter(
   createRoutesFromElements(
@@ -52,7 +51,6 @@ const router = createBrowserRouter(
             path=":projectId/overview"
             element={<SubmissionsOverview />}
           />
-          <Route element={<ProjectAdminView />} path=":projectId/admin"></Route>
           <Route path=":projectId" element={<ProjectView />}></Route>
           <Route path="create" element={<ProjectCreateHome />} loader={fetchProjectForm}/>
         </Route>