From d0ec5902b539e4e69aac2432f0b6f6650286b97c Mon Sep 17 00:00:00 2001
From: charles-gauthereau <charles.gauthereau@soluce-technologies.com>
Date: Fri, 14 Feb 2025 09:25:45 +0100
Subject: [PATCH] Correcting some bugs in statistics.

---
 app/(customer)/dashboard/[slug]/layout.tsx    | 20 --------------
 app/(customer)/dashboard/[slug]/not-found.tsx | 26 -------------------
 .../dashboard/[slug]/projects/new/page.tsx    |  1 +
 .../dashboard/[slug]/projects/page.tsx        | 12 +++------
 app/(customer)/dashboard/layout.tsx           | 13 +++-------
 app/(landing)/page.tsx                        |  1 -
 app/not-found.tsx                             | 22 +---------------
 7 files changed, 8 insertions(+), 87 deletions(-)
 delete mode 100644 app/(customer)/dashboard/[slug]/layout.tsx
 delete mode 100644 app/(customer)/dashboard/[slug]/not-found.tsx

diff --git a/app/(customer)/dashboard/[slug]/layout.tsx b/app/(customer)/dashboard/[slug]/layout.tsx
deleted file mode 100644
index ef662357..00000000
--- a/app/(customer)/dashboard/[slug]/layout.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from "react";
-import {getCurrentOrganizationSlug} from "@/features/dashboard/organization-cookie";
-import {notFound, redirect} from "next/navigation";
-
-
-export default async function Layout({children, params}: { children: React.ReactNode , params: { slug: string };}) {
-    const {slug: organizationSlug} = await params
-    console.log(organizationSlug);
-    const currentOrganizationSlug = await getCurrentOrganizationSlug()
-    console.log(currentOrganizationSlug);
-    if(currentOrganizationSlug != organizationSlug) {
-        redirect("charles")
-    }
-
-    return (
-        <>
-            {children}
-        </>
-    )
-}
\ No newline at end of file
diff --git a/app/(customer)/dashboard/[slug]/not-found.tsx b/app/(customer)/dashboard/[slug]/not-found.tsx
deleted file mode 100644
index 158aa15e..00000000
--- a/app/(customer)/dashboard/[slug]/not-found.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import {redirect, useRouter} from "next/navigation";
-import {useEffect} from "react";
-import {currentUser} from "@/auth/current-user";
-
-// export default function NotFound() {
-//
-//     const router = useRouter();
-//
-//     useEffect(() => {
-//         router.push('/');
-//     }, [router]);
-//
-//     return null; // You can return null or a loading spinner while the redirect happens
-// }
-
-export default async function NotFound() {
-
-    // const user = await currentUser()
-    // if (!user) {
-    //     redirect("/")
-    // }else{
-    //     redirect("/")
-    // }
-
-    redirect("/dashboard/default")
-}
\ No newline at end of file
diff --git a/app/(customer)/dashboard/[slug]/projects/new/page.tsx b/app/(customer)/dashboard/[slug]/projects/new/page.tsx
index dd5d136b..bf59ef1e 100644
--- a/app/(customer)/dashboard/[slug]/projects/new/page.tsx
+++ b/app/(customer)/dashboard/[slug]/projects/new/page.tsx
@@ -8,6 +8,7 @@ import {getCurrentOrganizationSlug} from "@/features/dashboard/organization-cook
 
 export default async function RoutePage(props: PageParams<{slug: string}>) {
     const {slug: organizationSlug} = await props.params
+
     const currentOrganizationSlug = await getCurrentOrganizationSlug()
     if(currentOrganizationSlug != organizationSlug) {
         notFound()
diff --git a/app/(customer)/dashboard/[slug]/projects/page.tsx b/app/(customer)/dashboard/[slug]/projects/page.tsx
index c1ce31c2..3c731b14 100644
--- a/app/(customer)/dashboard/[slug]/projects/page.tsx
+++ b/app/(customer)/dashboard/[slug]/projects/page.tsx
@@ -14,12 +14,6 @@ export default async function RoutePage(props: PageParams<{slug: string}>) {
     const {slug: organizationSlug} = await props.params
 
 
-    const currentOrganizationSlug = await getCurrentOrganizationSlug()
-
-    // if(currentOrganizationSlug != organizationSlug) {
-    //     notFound()
-    // }
-
     const projects = await prisma.project.findMany({
         where: {
             isArchived: {not: true},
@@ -46,7 +40,7 @@ export default async function RoutePage(props: PageParams<{slug: string}>) {
                 </PageTitle>
                 {projects.length > 0 && (
                     <PageActions>
-                        <Link href={`/dashboard/${currentOrganizationSlug}/projects/new`}>
+                        <Link href={`/dashboard/${organizationSlug}/projects/new`}>
                             <Button>+ Create Project</Button>
                         </Link>
                     </PageActions>
@@ -58,7 +52,7 @@ export default async function RoutePage(props: PageParams<{slug: string}>) {
 
                 {projects.length > 0 ?
                     <CardsWithPagination
-                        organizationSlug={currentOrganizationSlug}
+                        organizationSlug={organizationSlug}
                         data={projects}
                         cardItem={ProjectCard}
                         cardsPerPage={4}
@@ -66,7 +60,7 @@ export default async function RoutePage(props: PageParams<{slug: string}>) {
                     />
                     :
                     <Link
-                        href={`/dashboard/${currentOrganizationSlug}/projects/new`}
+                        href={`/dashboard/${organizationSlug}/projects/new`}
                         className="  flex item-center justify-center border-2 border-dashed transition-colors border-primary p-8 lg:p-12 w-full rounded-md">
                         Create new Project
                     </Link>
diff --git a/app/(customer)/dashboard/layout.tsx b/app/(customer)/dashboard/layout.tsx
index a2ce5020..6aa80d17 100644
--- a/app/(customer)/dashboard/layout.tsx
+++ b/app/(customer)/dashboard/layout.tsx
@@ -3,22 +3,15 @@ import {redirect} from "next/navigation";
 
 import {SidebarInset, SidebarProvider} from "@/components/ui/sidebar"
 import {AppSidebar} from "@/components/wrappers/dashboard/sideBar/app-sidebar";
-import {currentUser} from "@/auth/current-user";
+import {currentUser, requiredCurrentUser} from "@/auth/current-user";
 import {Header} from "@/features/layout/Header";
 import {prisma} from "@/prisma";
 
 
 export default async function Layout({children}: { children: React.ReactNode }) {
 
-    const user = await currentUser()
-    if (user) {
-        const userInfo = await prisma.user.findUnique({
-            where: {
-                email: user?.email
-            }
-        })
-        if (!userInfo) redirect('/login')
-    }
+    const user = await requiredCurrentUser()
+
     if (!user) redirect('/login')
 
     return (
diff --git a/app/(landing)/page.tsx b/app/(landing)/page.tsx
index ce73ee30..a8742203 100644
--- a/app/(landing)/page.tsx
+++ b/app/(landing)/page.tsx
@@ -7,7 +7,6 @@ export default async function Index() {
     const user = await currentUser()
     if (user) {
         const currentOrganizationSlug = await getCurrentOrganizationSlug()
-        console.log(currentOrganizationSlug)
         redirect(`/dashboard/${currentOrganizationSlug}/projects`)
     }
     redirect("/login")
diff --git a/app/not-found.tsx b/app/not-found.tsx
index 716b98a0..1286056c 100644
--- a/app/not-found.tsx
+++ b/app/not-found.tsx
@@ -1,26 +1,6 @@
 import {redirect, useRouter} from "next/navigation";
-import {useEffect} from "react";
-import {currentUser} from "@/auth/current-user";
-
-// export default function NotFound() {
-//
-//     const router = useRouter();
-//
-//     useEffect(() => {
-//         router.push('/');
-//     }, [router]);
-//
-//     return null; // You can return null or a loading spinner while the redirect happens
-// }
 
 export default async function NotFound() {
-
-    // const user = await currentUser()
-    // if (!user) {
-    //     redirect("/")
-    // }else{
-    //     redirect("/")
-    // }
-
+    console.log("not found");
     redirect("/")
 }
\ No newline at end of file