Merge pull request #91 from SELab-2/81-custom-404-and-403-pages

81 custom 404 and 403 pages
SELab-2 · Apr 16, 2024 · 4f2868f · 4f2868f
2 parents 2aa4bb7 + e743c0e
commit 4f2868f
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 2 deletions.
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Analysing the code with flake8
         working-directory: ./backend
         run: |
-          flake8 pigeonhole/
+          flake8 .
 
   ESLint:
     runs-on: self-hosted

diff --git a/frontend/app/[...not-found]/layout.tsx b/frontend/app/[...not-found]/layout.tsx
@@ -0,0 +1,16 @@
+export const metadata = {
+    title: 'Next.js',
+    description: 'Generated by Next.js',
+}
+
+export default function RootLayout({
+                                       children,
+                                   }: {
+    children: React.ReactNode
+}) {
+    return (
+        <html lang="en">
+        <body>{children}</body>
+        </html>
+    )
+}
diff --git a/frontend/app/[...not-found]/page.tsx b/frontend/app/[...not-found]/page.tsx
@@ -0,0 +1,27 @@
+import NavBar from "@app/[locale]/components/NavBar";
+import Typography from "@mui/material/Typography";
+import Box from "@mui/material/Box";
+import initTranslations from "@app/i18n";
+import TranslationsProvider from "@app/[locale]/components/TranslationsProvider";
+
+
+async function Page_404({params: {locale}}: { params: { locale: any } }) {
+    const {t, resources} = await initTranslations(locale, ["common"])
+
+    return (
+        <TranslationsProvider
+            resources={resources}
+            locale={locale}
+            namespaces={["common"]}
+        >
+            <NavBar/>
+            <Box sx={{marginTop: '64px'}}>
+                <Typography variant="h3">
+                    {t("page_not_found")}
+                </Typography>
+            </Box>
+        </TranslationsProvider>
+    );
+}
+
+export default Page_404;
diff --git a/frontend/app/[locale]/403/page.tsx b/frontend/app/[locale]/403/page.tsx
@@ -0,0 +1,26 @@
+import NavBar from "@app/[locale]/components/NavBar";
+import Typography from "@mui/material/Typography";
+import Box from "@mui/material/Box";
+import initTranslations from "@app/i18n";
+import TranslationsProvider from "@app/[locale]/components/TranslationsProvider";
+
+async function Page_403({params: {locale}}: { params: { locale: any } }) {
+    const {t, resources} = await initTranslations(locale, ["common"])
+
+    return (
+        <TranslationsProvider
+            resources={resources}
+            locale={locale}
+            namespaces={["common"]}
+        >
+            <NavBar/>
+            <Box sx={{marginTop: '64px'}}>
+                <Typography variant="h3">
+                    {t("no_access_message")}
+                </Typography>
+            </Box>
+        </TranslationsProvider>
+    );
+}
+
+export default Page_403;
diff --git a/frontend/lib/api.ts b/frontend/lib/api.ts
@@ -248,7 +248,7 @@ export async function getUserData() : Promise<UserData>{
         return user;
     }*/else{
         let user : UserData = await getRequest('/users/current');
-        localStorage.setItem('user', JSON.stringify(user));
+        //localStorage.setItem('user', JSON.stringify(user));
         console.log(user);
         return user;
     }

diff --git a/frontend/locales/en/common.json b/frontend/locales/en/common.json
@@ -12,6 +12,8 @@
     "add_project": "Add project",
     "details": "Details",
     "no_courses": "No courses to display.",
+    "page_not_found": "Page not found",
+    "no_access_message": "You don't have access to this page",
     "title": "Title",
     "max_score": "Maximal score",
     "title_required": "Title is required",

diff --git a/frontend/locales/nl/common.json b/frontend/locales/nl/common.json
@@ -12,6 +12,8 @@
     "add_project": "Project toevoegen",
     "details": "Details",
     "no_courses": "Geen cursussen om weer te geven.",
+    "page_not_found": "Pagina niet gevonden",
+    "no_access_message": "Je hebt geen toegang tot deze pagina.",
     "title": "Titel",
     "max_score": "Maximale score",
     "title_required": "Titel is verplicht",