From 0013832e066b9347c95156aa9316a906759f1795 Mon Sep 17 00:00:00 2001
From: Izan Gil <66965250+SrIzan10@users.noreply.github.com>
Date: Fri, 7 Jun 2024 23:23:06 +0200
Subject: [PATCH] feat: better protected routes, move to login, env example
 file

---
 .env.example                                          |  2 ++
 src/app/(protected)/layout.tsx                        | 10 ++++++++++
 src/app/{ => (protected)}/protected/page.tsx          |  4 +---
 src/app/{auth/signIn => (public)/auth/login}/page.tsx |  0
 src/app/{ => (public)}/auth/signUp/page.tsx           |  2 +-
 src/app/{ => (public)}/page.tsx                       |  0
 src/components/app/NavBar/NavBar.tsx                  |  2 +-
 src/lib/auth/actions.ts                               |  2 +-
 8 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 .env.example
 create mode 100644 src/app/(protected)/layout.tsx
 rename src/app/{ => (protected)}/protected/page.tsx (71%)
 rename src/app/{auth/signIn => (public)/auth/login}/page.tsx (100%)
 rename src/app/{ => (public)}/auth/signUp/page.tsx (95%)
 rename src/app/{ => (public)}/page.tsx (100%)

diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..f79672a
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,2 @@
+# from the dev postgres containeer
+DATABASE_URL=postgresql://postgres:dfsjhkdswkjntelsmldbfvsgknl5t@localhost:5555/postgres
\ No newline at end of file
diff --git a/src/app/(protected)/layout.tsx b/src/app/(protected)/layout.tsx
new file mode 100644
index 0000000..ff22080
--- /dev/null
+++ b/src/app/(protected)/layout.tsx
@@ -0,0 +1,10 @@
+import { validateRequest } from "@/lib/auth";
+import { redirect } from "next/navigation";
+
+export default async function Layout({ children }: { children: React.ReactNode }) {
+  const { user } = await validateRequest()
+  if (!user) {
+      return redirect('/auth/login')
+  }
+  return children
+}
\ No newline at end of file
diff --git a/src/app/protected/page.tsx b/src/app/(protected)/protected/page.tsx
similarity index 71%
rename from src/app/protected/page.tsx
rename to src/app/(protected)/protected/page.tsx
index 9f777f2..575648b 100644
--- a/src/app/protected/page.tsx
+++ b/src/app/(protected)/protected/page.tsx
@@ -1,14 +1,12 @@
 import { validateRequest } from "@/lib/auth";
-import { redirect } from "next/navigation";
 
 export default async function Page() {
     const { user } = await validateRequest()
-    if (!user) return redirect('/auth/signIn')
     return (
         <div>
             <h1 className="text-3xl font-bold text-center">Welcome {user?.username}!</h1>
             <p>You are actually on a protected route!</p>
-            <p>Your ID is: {user.id}</p>
+            <p>Your ID is: {user!.id}</p>
         </div>
     )
 }
\ No newline at end of file
diff --git a/src/app/auth/signIn/page.tsx b/src/app/(public)/auth/login/page.tsx
similarity index 100%
rename from src/app/auth/signIn/page.tsx
rename to src/app/(public)/auth/login/page.tsx
diff --git a/src/app/auth/signUp/page.tsx b/src/app/(public)/auth/signUp/page.tsx
similarity index 95%
rename from src/app/auth/signUp/page.tsx
rename to src/app/(public)/auth/signUp/page.tsx
index 7eb8a79..a59c3e9 100644
--- a/src/app/auth/signUp/page.tsx
+++ b/src/app/(public)/auth/signUp/page.tsx
@@ -34,7 +34,7 @@ export default function Page() {
           <SubmitButton buttonText="Create account" className="w-full" />
           <div className="text-center text-sm">
             Already have an account?
-            <Link className="underline pl-1" href="/auth/signIn">
+            <Link className="underline pl-1" href="/auth/login">
               Login
             </Link>
           </div>
diff --git a/src/app/page.tsx b/src/app/(public)/page.tsx
similarity index 100%
rename from src/app/page.tsx
rename to src/app/(public)/page.tsx
diff --git a/src/components/app/NavBar/NavBar.tsx b/src/components/app/NavBar/NavBar.tsx
index b9808ea..299003b 100644
--- a/src/components/app/NavBar/NavBar.tsx
+++ b/src/components/app/NavBar/NavBar.tsx
@@ -73,7 +73,7 @@ export default function Navbar() {
             </DropdownMenu>
           </>
         ) : (
-          <Link href="/auth/signIn">
+          <Link href="/auth/login">
             <Button variant="outline">Sign in</Button>
           </Link>
         )}
diff --git a/src/lib/auth/actions.ts b/src/lib/auth/actions.ts
index 82c9e78..87bcb07 100644
--- a/src/lib/auth/actions.ts
+++ b/src/lib/auth/actions.ts
@@ -13,7 +13,7 @@ export async function logout() {
 	await lucia.invalidateSession(session!.id);
 	const sessionCookie = lucia.createBlankSessionCookie();
 	cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes);
-	return redirect("/auth/signIn");
+	return redirect("/auth/login");
 }
 
 export async function login(prev: any, data: FormData) {