From c45f62f16ab938d2df4a8c2905021550b03af08c Mon Sep 17 00:00:00 2001 From: sezeranoJchrisostome Date: Fri, 7 Jun 2024 09:06:43 +0200 Subject: [PATCH 1/2] feat: adds not-found page --- hooks/auth.ts | 6 +++--- views/App.tsx | 18 +++++++++++++----- views/not-found.tsx | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/hooks/auth.ts b/hooks/auth.ts index 1b640d9..5bdc139 100644 --- a/hooks/auth.ts +++ b/hooks/auth.ts @@ -1,8 +1,8 @@ -import useSWR from "swr" -import axios from "../lib/axios" -import { useEffect } from "react" import { User } from "@/types" +import { useEffect } from "react" import { useNavigate, useParams } from "react-router-dom" +import useSWR from "swr" +import axios from "../lib/axios" type UseAuthProps = { middleware?: "auth" | "guest" diff --git a/views/App.tsx b/views/App.tsx index cb845b3..52918ec 100644 --- a/views/App.tsx +++ b/views/App.tsx @@ -10,13 +10,13 @@ import DashboardHeader from "./app/headers/DashboardHeader" import AppLayout from "./app/layout" import Login from "./auth/login/page" import AuthLayout from "./auth/layout" +import NotFoundPage from "./not-found" const App = () => { return ( - - @@ -52,14 +52,22 @@ const App = () => { path="/dashboard" element={ - <>} > - + + <> + + } + > + } /> - + + } /> {/* */} diff --git a/views/not-found.tsx b/views/not-found.tsx index fe89a2a..212232c 100644 --- a/views/not-found.tsx +++ b/views/not-found.tsx @@ -1,5 +1,5 @@ import { Heading, Link, Text } from "@radix-ui/themes"; -import AuthCard from "./(auth)/AuthCard/AuthCard"; +import AuthCard from "./auth/AuthCard/AuthCard"; import styles from "./NotFound.module.css"; From c280fc202c9b8ff40166870f8b5352ab82984fc5 Mon Sep 17 00:00:00 2001 From: sezeranoJchrisostome Date: Fri, 7 Jun 2024 09:08:41 +0200 Subject: [PATCH 2/2] fix: bring back login-check on home --- views/Home.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/views/Home.tsx b/views/Home.tsx index 17818b8..73f21f9 100644 --- a/views/Home.tsx +++ b/views/Home.tsx @@ -7,8 +7,7 @@ const Home = () => { const navigate = useNavigate() useLayoutEffect(() => { - console.log({ user }) - // if (user) return navigate("/dashboard") + if (user) return navigate("/dashboard") }, [user]) return null