mscode07 · mscode07 · Jan 8, 2025 · Jan 8, 2025
diff --git a/apps/X/app/favicon.ico b/apps/X/app/favicon.ico
diff --git a/apps/X/app/home/page.tsx b/apps/X/app/home/page.tsx
@@ -1,6 +1,11 @@
-import { CenterComp, HomeLeft, HomeRight } from "@/components/ui";
+"use client";
 
+import { HomeRight, Button, CenterComp, HomeLeft } from "@/components/ui";
+import { signOut } from "next-auth/react";
 const homepage = () => {
+  const handleLogout = async () => {
+    await signOut({ callbackUrl: "/" });
+  };
   return (
     <div>
       <HomeRight />

diff --git a/apps/X/app/icon.svg b/apps/X/app/icon.svg
diff --git a/apps/X/app/layout.tsx b/apps/X/app/layout.tsx
@@ -1,7 +1,8 @@
 import type { Metadata } from "next";
 import localFont from "next/font/local";
 import "./globals.css";
-import { Provieder } from "./provider";
+import { Provider } from "./provider";
+import { RouteGard } from "@/components/RouteGuard";
 
 const geistSans = localFont({
   src: "./fonts/GeistVF.woff",
@@ -24,11 +25,11 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en" className="dark">
-      <Provieder>
+      <Provider>
         <body className={`${geistSans.variable} ${geistMono.variable} m-0`}>
-          {children}
+          <RouteGard>{children}</RouteGard>
         </body>
-      </Provieder>
+      </Provider>
     </html>
   );
 }
diff --git a/apps/X/app/lib/auth.ts b/apps/X/app/lib/auth.ts
@@ -4,6 +4,7 @@ import { JWT } from "next-auth/jwt";
 import CredentialsProvider from "next-auth/providers/credentials";
 import GithubProvider from "next-auth/providers/github";
 import GoogleProvider from "next-auth/providers/google";
+import { signOut } from "next-auth/react";
 import z from "zod";
 
 interface credentialsTypes {
@@ -15,8 +16,8 @@ interface credentialsTypes {
 
 const userInput = z.object({
   username: z.string(),
-  name: z.string(),
-  email: z.string().email(),
+  name: z.string().optional(),
+  email: z.string().email().optional(),
   password: z.string(),
 });
 
@@ -52,7 +53,11 @@ export const authOptions = {
             name: creds.name,
           });
         };
-
+        const validationResult = validatedUserInput(credentials);
+        if (!validationResult.success) {
+          console.log("Validation failed", validationResult.error);
+          return null;
+        }
         if (!validatedUserInput) return null;
 
         const hashedPassword = await bcrypt.hash(credentials.password, 10);
@@ -70,7 +75,6 @@ export const authOptions = {
               credentials.password,
               existingUser.password
             );
-            console.log("This is the password", passwordValidation);
             if (passwordValidation) {
               console.log("This is userEmail", existingUser.email);
               console.log("This is username", existingUser.username);
@@ -80,8 +84,9 @@ export const authOptions = {
                 email: existingUser.email,
                 name: existingUser.name,
               };
+            } else {
+              console.log("Invalid password for existing user");
             }
-
             console.log("This is name", existingUser.name);
           } catch (error) {
             console.log("Error while LogIn", error);
@@ -119,6 +124,8 @@ export const authOptions = {
     async jwt({ token, user }: any) {
       if (user) {
         token.id = user.id;
+        token.username = user.username;
+        token.email = user.email;
       }
       return token;
     },
@@ -127,14 +134,17 @@ export const authOptions = {
       //   where: { id: token.sub },
       // });
 
-      if (token) {
-        session.user.id = token.sub;
+      if (token && session.user) {
+        session.user.id = token.id || null;
+        session.user.username = token.username || null;
+        session.user.email = token.email || null;
       }
-
       return session;
     },
   },
   pages: {
     signIn: "/signin",
+    error: "/error",
+    signOut: "/signin",
   },
 };
diff --git a/apps/X/app/page.tsx b/apps/X/app/page.tsx
@@ -4,15 +4,14 @@ import { redirect } from "next/navigation";
 
 const Page = async () => {
   const session = await getServerSession(authOptions);
+  console.log(session, "This is the session log");
 
-  if (!session) {
-    console.log("No session,redirecting to SIGNIN");
+  if (!session?.user?.id) {
+    console.log("No valid session, redirecting to signin");
     redirect("/signin");
   }
-  if (session.user && session.user.id) {
-    redirect("/home");
-  }
-  return <div>Loading......</div>;
+  console.log("Valid session detected, redirecting to /home");
+  redirect("/home");
 };
 
 export default Page;
diff --git a/apps/X/app/provider.tsx b/apps/X/app/provider.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { SessionProvider } from "next-auth/react";
 
-export const Provieder = ({ children }: { children: React.ReactNode }) => {
+export const Provider = ({ children }: { children: React.ReactNode }) => {
   return <SessionProvider>{children}</SessionProvider>;
 };
diff --git a/apps/X/src/components/RouteGuard.tsx b/apps/X/src/components/RouteGuard.tsx
@@ -0,0 +1,38 @@
+"use client";
+import { useSession } from "next-auth/react";
+import { usePathname, useRouter } from "next/navigation";
+import { useEffect } from "react";
+
+const publicPaths = ["/signin", "/login", "/error"];
+
+export function RouteGard({ children }: { children: React.ReactNode }) {
+  const { data: session, status } = useSession();
+  const router = useRouter();
+  const pathname = usePathname();
+  useEffect(() => {
+    if (status == "loading") {
+      return;
+    }
+    if (!session && !publicPaths.includes(pathname)) {
+      router.push("/signin");
+    }
+  }, [session, status, router, pathname]);
+
+  if (status == "loading") {
+    return (
+      <div className="flex justify-center items-center h-screen ">
+        <svg
+          viewBox="0 0 24 24"
+          aria-hidden="true"
+          className=" w-24 h-24 fill-current text-black dark:text-white"
+        >
+          <g>
+            <path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"></path>
+          </g>
+        </svg>
+      </div>
+    );
+  }
+
+  return <>{children}</>;
+}
diff --git a/apps/X/src/components/home/HomeLeft.tsx b/apps/X/src/components/home/HomeLeft.tsx
@@ -1,3 +1,4 @@
+"use client"
 export const HomeLeft = () => {
   return <div>Home Left</div>;
 };
diff --git a/apps/X/src/components/home/HomeRight.tsx b/apps/X/src/components/home/HomeRight.tsx
@@ -1,3 +1,4 @@
+"use client"
 export const HomeRight = () => {
   return <div>Home Right Side</div>;
 };
diff --git a/apps/X/src/components/ui/X_logo.tsx b/apps/X/src/components/ui/X_logo.tsx
@@ -5,7 +5,7 @@ export const X_logo = () => {
         <svg
           viewBox="0 0 24 24"
           aria-hidden="true"
-          className=" w-6 h-6 fill-current text-black dark:text-white"
+          className=" w-min-6 h-min-6 fill-current text-black dark:text-white"
         >
           <g>
             <path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"></path>

diff --git a/apps/X/src/components/ui/index.ts b/apps/X/src/components/ui/index.ts
@@ -1,6 +1,5 @@
 import { SigninRightCom } from "./SigninRightCom";
 import { SigninComp } from "./SigninComp";
-import { Button } from "@repo/ui/button";
 import { X_logoBIG } from "./X_logoBIG";
 import { Dialog } from "./dialog";
 import { X_logo } from "./X_logo";
@@ -12,12 +11,13 @@ import { HomeLeft } from "../home/HomeLeft";
 import { CenterComp } from "../home/HomeCenterComp";
 import { TweetComp } from "./TweetComp";
 import { UserAvatar } from "./usrAvatar";
+import { Button } from "./button";
 
 export {
   SigninComp,
+  Button,
   UserAvatar,
   SigninRightCom,
-  Button,
   X_logoBIG,
   Dialog,
   TweetComp,