Squashed commit adding pr/53

commit 0f096c0 Merge: a1ce2ec 4dfd6f8 Author: Tepohe <[email protected]> Date: Thu Oct 10 14:42:19 2024 +0200 Merge branch 'main' into development commit a1ce2ec Merge: 4f7d813 f06a472 Author: Tepohe <[email protected]> Date: Tue Oct 8 13:53:44 2024 +0200 Merge branch 'pr/53' into development commit f06a472 Author: Sebbben <[email protected]> Date: Mon Oct 7 16:47:03 2024 +0200 Fixed wrong path for nav bar home from pointing to /home to pointing to / commit 0d154f5 Author: Sebbben <[email protected]> Date: Thu Sep 26 14:40:51 2024 +0200 Renamed some directories to take advantage of nexts routing for more usable url paths Co-Authored-By: Sebbben <[email protected]>
cybernetisk · Oct 10, 2024 · bcbc8d1 · bcbc8d1
1 parent 4dfd6f8
commit bcbc8d1
Show file tree

Hide file tree

Showing 50 changed files with 33 additions and 39 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -29,7 +29,7 @@ jobs:
         DATABASE_URL = 'mysql://${{ secrets.DATABASE_USER }}:${{ secrets.DATABASE_PASSWORD }}@localhost:3306/${{ secrets.DATABASE_NAME }}'
         
         NEXTAUTH_URL = '${{ vars.NEXTAUTH_URL }}'
-        NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/pages/main/home'
+        NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/'
         NEXTAUTH_SECRET = '${{ secrets.NEXTAUTH_SECRET }}'
         
         NEXTAUTH_GITHUB_CLIENT_ID = '${{ vars.NEXTAUTH_GITHUB_CLIENT_ID }}'

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -29,7 +29,7 @@ jobs:
         DATABASE_URL = 'mysql://${{ secrets.DATABASE_USER }}:${{ secrets.DATABASE_PASSWORD }}@localhost:3306/${{ secrets.DATABASE_NAME }}'
         
         NEXTAUTH_URL = '${{ vars.NEXTAUTH_URL }}'
-        NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/pages/main/home'
+        NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/'
         NEXTAUTH_SECRET = '${{ secrets.NEXTAUTH_SECRET }}'
         
         NEXTAUTH_GITHUB_CLIENT_ID = '${{ vars.NEXTAUTH_GITHUB_CLIENT_ID }}'

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ DATABASE_SCHEMA = 'ISV2_development'
 DATABASE_URL = "mysql://${DATABASE_USER}:${DATABASE_PASS}@localhost:3307/${DATABASE_SCHEMA}"
 
 NEXTAUTH_URL = 'http://localhost:3005'
-NEXTAUTH_CALLBACK = '/pages/main/home'
+NEXTAUTH_CALLBACK = '/'
 NEXTAUTH_SECRET = 'QuTxFdD3yon9X+83rRaio/vSgkfhvnwUglcIrnUwTLA='
 
 NODEMAILER_NOREPLY_USER = '[email protected]'

diff --git a/app/pages/main/home/layout.js → app/(pages)/(main)/(home)/layout.js b/app/pages/main/home/layout.js → app/(pages)/(main)/(home)/layout.js
diff --git a/app/pages/main/home/page.js → app/(pages)/(main)/(home)/page.js b/app/pages/main/home/page.js → app/(pages)/(main)/(home)/page.js
diff --git a/app/pages/main/aboutCYB/layout.js → app/(pages)/(main)/aboutCYB/layout.js b/app/pages/main/aboutCYB/layout.js → app/(pages)/(main)/aboutCYB/layout.js
diff --git a/app/pages/main/aboutCYB/page.js → app/(pages)/(main)/aboutCYB/page.js b/app/pages/main/aboutCYB/page.js → app/(pages)/(main)/aboutCYB/page.js
diff --git a/app/pages/main/aboutEscape/layout.js → app/(pages)/(main)/aboutEscape/layout.js b/app/pages/main/aboutEscape/layout.js → app/(pages)/(main)/aboutEscape/layout.js
diff --git a/app/pages/main/aboutEscape/page.js → app/(pages)/(main)/aboutEscape/page.js b/app/pages/main/aboutEscape/page.js → app/(pages)/(main)/aboutEscape/page.js
diff --git a/.../main/aboutEscape/rentingEscape/layout.js → ...main)/aboutEscape/rentingEscape/layout.js b/.../main/aboutEscape/rentingEscape/layout.js → ...main)/aboutEscape/rentingEscape/layout.js
diff --git a/...es/main/aboutEscape/rentingEscape/page.js → .../(main)/aboutEscape/rentingEscape/page.js b/...es/main/aboutEscape/rentingEscape/page.js → .../(main)/aboutEscape/rentingEscape/page.js
diff --git a/app/pages/main/admin/handleRoles.js → app/(pages)/(main)/admin/handleRoles.js b/app/pages/main/admin/handleRoles.js → app/(pages)/(main)/admin/handleRoles.js
diff --git a/app/pages/main/admin/handleWorkGroups.js → app/(pages)/(main)/admin/handleWorkGroups.js b/app/pages/main/admin/handleWorkGroups.js → app/(pages)/(main)/admin/handleWorkGroups.js
diff --git a/app/pages/main/admin/layout.js → app/(pages)/(main)/admin/layout.js b/app/pages/main/admin/layout.js → app/(pages)/(main)/admin/layout.js
diff --git a/app/pages/main/admin/page.js → app/(pages)/(main)/admin/page.js b/app/pages/main/admin/page.js → app/(pages)/(main)/admin/page.js
diff --git a/app/pages/main/layout.js → app/(pages)/(main)/layout.js b/app/pages/main/layout.js → app/(pages)/(main)/layout.js
@@ -18,7 +18,7 @@ import { cybTheme } from "@/app/components/themeCYB";
 import LayoutFooter from "@/app/components/layout/Footer";
 
 const NavItems = [
-  { id: "home", path: "home", name: "Home", icon: <Home /> },
+  { id: "home", path: "", name: "Home", icon: <Home /> },
   { id: "aboutCYB", path: "aboutCYB", name: "About CYB", icon: <Groups /> },
   {
     id: "volunteering",

diff --git a/app/pages/main/profile/layout.js → app/(pages)/(main)/profile/layout.js b/app/pages/main/profile/layout.js → app/(pages)/(main)/profile/layout.js
diff --git a/app/pages/main/profile/page.js → app/(pages)/(main)/profile/page.js b/app/pages/main/profile/page.js → app/(pages)/(main)/profile/page.js
diff --git a/app/pages/main/unauthorized/layout.js → app/(pages)/(main)/unauthorized/layout.js b/app/pages/main/unauthorized/layout.js → app/(pages)/(main)/unauthorized/layout.js
diff --git a/app/pages/main/unauthorized/page.js → app/(pages)/(main)/unauthorized/page.js b/app/pages/main/unauthorized/page.js → app/(pages)/(main)/unauthorized/page.js
diff --git a/app/pages/main/volunteering/cafe/page.js → app/(pages)/(main)/volunteering/cafe/page.js b/app/pages/main/volunteering/cafe/page.js → app/(pages)/(main)/volunteering/cafe/page.js
diff --git a/...pages/main/volunteering/economy/layout.js → ...es)/(main)/volunteering/economy/layout.js b/...pages/main/volunteering/economy/layout.js → ...es)/(main)/volunteering/economy/layout.js
diff --git a/app/pages/main/volunteering/economy/page.js → ...ages)/(main)/volunteering/economy/page.js b/app/pages/main/volunteering/economy/page.js → ...ages)/(main)/volunteering/economy/page.js
diff --git a/app/pages/main/volunteering/groups/layout.js → ...ges)/(main)/volunteering/groups/layout.js b/app/pages/main/volunteering/groups/layout.js → ...ges)/(main)/volunteering/groups/layout.js
diff --git a/app/pages/main/volunteering/groups/page.js → ...pages)/(main)/volunteering/groups/page.js b/app/pages/main/volunteering/groups/page.js → ...pages)/(main)/volunteering/groups/page.js
diff --git a/app/pages/main/volunteering/layout.js → app/(pages)/(main)/volunteering/layout.js b/app/pages/main/volunteering/layout.js → app/(pages)/(main)/volunteering/layout.js
diff --git a/app/pages/main/volunteering/logs/layout.js → ...pages)/(main)/volunteering/logs/layout.js b/app/pages/main/volunteering/logs/layout.js → ...pages)/(main)/volunteering/logs/layout.js
diff --git a/app/pages/main/volunteering/logs/page.js → app/(pages)/(main)/volunteering/logs/page.js b/app/pages/main/volunteering/logs/page.js → app/(pages)/(main)/volunteering/logs/page.js
diff --git a/...main/volunteering/logs/voucherLogInput.js → ...ain)/volunteering/logs/voucherLogInput.js b/...main/volunteering/logs/voucherLogInput.js → ...ain)/volunteering/logs/voucherLogInput.js
diff --git a/...es/main/volunteering/logs/workLogInput.js → .../(main)/volunteering/logs/workLogInput.js b/...es/main/volunteering/logs/workLogInput.js → .../(main)/volunteering/logs/workLogInput.js
diff --git a/...es/main/volunteering/membership/layout.js → .../(main)/volunteering/membership/layout.js b/...es/main/volunteering/membership/layout.js → .../(main)/volunteering/membership/layout.js
diff --git a/...ages/main/volunteering/membership/page.js → ...s)/(main)/volunteering/membership/page.js b/...ages/main/volunteering/membership/page.js → ...s)/(main)/volunteering/membership/page.js
diff --git a/app/pages/main/volunteering/page.js → app/(pages)/(main)/volunteering/page.js b/app/pages/main/volunteering/page.js → app/(pages)/(main)/volunteering/page.js
@@ -23,9 +23,9 @@ import { sanityClient } from "@/sanity/client";
 
 const BUTTON_CONTENT_1 = [
   // { title: "Economy", path: "volunteering/economy" },
-  // { title: "Café shifts", path: "/pages/main/volunteering/cafe" },
-  { title: "Vouchers", path: "/pages/main/volunteering/logs" },
-  { title: "Membership", path: "/pages/main/volunteering/membership" },
+  // { title: "Café shifts", path: "/volunteering/cafe" },
+  { title: "Vouchers", path: "/volunteering/logs" },
+  { title: "Membership", path: "/volunteering/membership" },
   { title: "Website content", path: "/studio" },
 ];
 

diff --git a/...ages/main/volunteering/traditions/page.js → ...s)/(main)/volunteering/traditions/page.js b/...ages/main/volunteering/traditions/page.js → ...s)/(main)/volunteering/traditions/page.js
diff --git a/app/pages/auth/email.js → app/(pages)/auth/email.js b/app/pages/auth/email.js → app/(pages)/auth/email.js
diff --git a/app/pages/auth/layout.js → app/(pages)/auth/layout.js b/app/pages/auth/layout.js → app/(pages)/auth/layout.js
@@ -17,7 +17,7 @@ export default function AuthLayout({ children }) {
       <body>
         <ThemeProvider theme={cybTheme}>
           <Box sx={{ p:2, px:3 }}>
-            <Link href={`/pages/main/home`}>
+            <Link href={`/`}>
               <Avatar
                 sx={{
                   height: 45,

diff --git a/app/pages/auth/register/layout.js → app/(pages)/auth/register/layout.js b/app/pages/auth/register/layout.js → app/(pages)/auth/register/layout.js
diff --git a/app/pages/auth/register/page.js → app/(pages)/auth/register/page.js b/app/pages/auth/register/page.js → app/(pages)/auth/register/page.js
@@ -76,7 +76,7 @@ export default function registerPage() {
 
         <Grid item container direction="row" justifyContent="flex-end">
           <Link
-            href="/pages/auth/signIn"
+            href="/auth/signIn"
             passHref
             style={{ textDecoration: "none", cursor: "pointer" }}
           >

diff --git a/app/pages/auth/signIn/layout.js → app/(pages)/auth/signIn/layout.js b/app/pages/auth/signIn/layout.js → app/(pages)/auth/signIn/layout.js
diff --git a/app/pages/auth/signIn/page.js → app/(pages)/auth/signIn/page.js b/app/pages/auth/signIn/page.js → app/(pages)/auth/signIn/page.js
@@ -20,7 +20,7 @@ export default function SignInPage() {
   const router = useRouter()
 
   if (session.status == "authenticated") {
-    router.push("/pages/main/home");
+    router.push("/");
     return;
   }
 
@@ -88,7 +88,7 @@ export default function SignInPage() {
           justifyContent="flex-end"
         >
           <Link
-            href="/pages/auth/register"
+            href="/auth/register"
             passHref
             style={{ textDecoration: "none", cursor: "pointer" }}
           >

diff --git a/app/api/activate/[token]/route.js b/app/api/activate/[token]/route.js
@@ -45,5 +45,5 @@ export async function GET(request, {params}) {
     }
   })
 
-  redirect("/pages/auth/signIn")
+  redirect("/auth/signIn")
 }
diff --git a/app/api/auth/[...nextauth]/route.js b/app/api/auth/[...nextauth]/route.js
@@ -84,7 +84,7 @@ const handler = NextAuth({
     }
   },
   pages: {
-    signIn: "/pages/auth/signIn"
+    signIn: "/auth/signIn"
   },
   adapter: PrismaAdapter(prisma),
 });

diff --git a/app/api/sendVerification/route.js b/app/api/sendVerification/route.js
@@ -1,5 +1,5 @@
 
-import { mailOptions, transporter } from "@/app/pages/auth/email";
+import { mailOptions, transporter } from "@/app/(pages)/auth/email";
 import { NextResponse } from "next/server";
 
 const NEXTAUTH_URL = process.env.NEXTAUTH_URL || "";

diff --git a/app/components/Login/LoginButton.js b/app/components/Login/LoginButton.js
@@ -40,7 +40,7 @@ export default function LoginButton(props) {
   const handleClick = (event) => {
     console.log("CLICK")
     if (session.status == "authenticated") {
-      router.push("/pages/main/profile");
+      router.push("/profile");
     } else {
       signIn();
     }
@@ -88,7 +88,7 @@ export default function LoginButton(props) {
                 key={`link_item_text_login`}
                 sx={{
                   color:
-                    currentPath == `/pages/main/profile`
+                    currentPath == `/profile`
                       ? cybTheme.palette.primary.main
                       : cybTheme.palette.text.primary,
                 }}

diff --git a/app/components/layout/AppBar.js b/app/components/layout/AppBar.js
@@ -63,7 +63,7 @@ export class NavBar extends Component {
             sx={{ display: { xs: "none", md: "flex" } }}
           >
             <Grid item>
-              <Link href={`/pages/main/home`}>
+              <Link href={`/`}>
                 <Avatar
                   sx={{
                     height: 45,
@@ -101,7 +101,7 @@ function NavElementLargeScreen(item, index, currentPath) {
     return (
       <Link
         key={`link_nav${index}`}
-        href={`/pages/main/${item.path}`}
+        href={`/${item.path}`}
         style={{ textDecoration: "none" }}
       >
         <ListItem key={`link_nav${index}_item`} disablePadding>
@@ -110,7 +110,7 @@ function NavElementLargeScreen(item, index, currentPath) {
               key={`link_nav${index}_itemtext`}
               sx={{
                 color:
-                  currentPath == `/pages/main/${item.path}`
+                  currentPath == `/${item.path}`
                     ? cybTheme.palette.primary.main
                     : cybTheme.palette.text.primary,
               }}
@@ -135,7 +135,7 @@ function NavElementSmallScreen(item, index, iconProps, currentPath) {
     return (
       <Link
         key={`link_snav${index}`}
-        href={`/pages/main/${item.path}`}
+        href={`/${item.path}`}
         style={{ textDecoration: "none" }}
         sx={{ width: "100%" }}
       >
@@ -157,7 +157,7 @@ function NavElementSmallScreen(item, index, iconProps, currentPath) {
                 key={`link_snav${index}_itemtext`}
                 sx={{
                   color:
-                    currentPath == `/pages/main/${item.path}`
+                    currentPath == `/${item.path}`
                       ? cybTheme.palette.primary.main
                       : cybTheme.palette.text.primary,
                 }}

diff --git a/app/components/layout/Breadcrumbs.js b/app/components/layout/Breadcrumbs.js
@@ -26,7 +26,7 @@ export default function WebsiteBreadcrumbs(path, navItems) {
     const path = `/${pathBits.slice(0, index + 1).join("/")}`;
 
     return (
-      <Link key={"link_" + path} href={"/pages/main/" + path}>
+      <Link key={"link_" + path} href={"/" + path}>
         <Typography
           // color="text.primary"
           variant="body2"

diff --git a/app/components/layout/Footer.js b/app/components/layout/Footer.js
@@ -52,7 +52,7 @@ const USEFUL_LINKS = [
   },
   {
     name: "Rent Escape",
-    link: "/pages/main/aboutEscape/rentingEscape",
+    link: "/aboutEscape/rentingEscape",
   },
   {
     name: "Submit issue",

diff --git a/app/middleware/authWrapper.js b/app/middleware/authWrapper.js
@@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";
 import { useEffect } from "react";
 import { PageBuilderSkeleton } from "../components/sanity/PageBuilder";
 
-export default function authWrapper(WrappedComponent, requiredRole="", redirect="/pages/main/unauthorized") {
+export default function authWrapper(WrappedComponent, requiredRole="", redirect="/unauthorized") {
   return function AuthenticatedComponent(props) {
 
     const router = useRouter();

diff --git a/app/sitemap.tsx b/app/sitemap.tsx
@@ -4,31 +4,31 @@ import type { MetadataRoute } from "next";
 export default function sitemap(): MetadataRoute.Sitemap {
   return [
     {
-      url: "https://cyb.no/pages/main/home",
+      url: "https://cyb.no/",
       lastModified: new Date(Date.parse("28 Aug 2024 00:00:00 GMT")),
       changeFrequency: "yearly",
       priority: 1,
     },
     {
-      url: "https://cyb.no/pages/main/aboutCYB",
+      url: "https://cyb.no/aboutCYB",
       lastModified: new Date(Date.parse("28 Aug 2024 00:00:00 GMT")),
       changeFrequency: "yearly",
       priority: 1,
     },
     {
-      url: "https://cyb.no/pages/main/volunteering",
+      url: "https://cyb.no/volunteering",
       lastModified: new Date(Date.parse("08 Sep 2024 00:00:00 GMT")),
       changeFrequency: "yearly",
       priority: 1,
     },
     {
-      url: "https://cyb.no/pages/main/aboutEscape/rentingEscape",
+      url: "https://cyb.no/aboutEscape/rentingEscape",
       lastModified: new Date(Date.parse("08 Sep 2024 00:00:00 GMT")),
       changeFrequency: "yearly",
       priority: 1,
     },
     {
-      url: "https://cyb.no/pages/main/unauthorized",
+      url: "https://cyb.no/unauthorized",
       lastModified: new Date(Date.parse("08 Sep 2024 00:00:00 GMT")),
       changeFrequency: "yearly",
       priority: 0.5,

diff --git a/next.config.mjs b/next.config.mjs
@@ -3,20 +3,14 @@ const nextConfig = {
   async redirects() {
     return [
       {
-        source: "/",
-        destination: "/pages/main/home",
+        source: "/home",
+        destination: "/",
         permanent: true,
         basePath: false,
       },
       {
-        source: "/pages",
-        destination: "/pages/main/home",
-        permanent: true,
-        basePath: false,
-      },
-      {
-        source: "/pages/main",
-        destination: "/pages/main/home",
+        source: "/pages/main/home",
+        destination: "/",
         permanent: true,
         basePath: false,
       },
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,5 +45,5 @@ export async function GET(request, {params}) { @@
         }
       })
-      redirect("/pages/auth/signIn")
+      redirect("/auth/signIn")
     }