Merge pull request #15 from pooulad/improve-loading-ui

pooulad · web-flow · commit 972582b08735 · 2024-12-08T18:54:56.000-05:00
Debug auth callback data and improve ui🎯
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ in back-end:
 in front-end:
  - React hook form
  - Axios
- - React-loading
  - React-toastify
  - Tailwindcss
  - Typescript
diff --git a/frontend/app/auth/signin/page.tsx b/frontend/app/auth/signin/page.tsx
@@ -12,7 +12,10 @@ export const metadata: Metadata = {
 export default async function SignIn() {
   const user = await getCurrentUser();
 
-  if (user) {
+  console.log("user",user);
+  
+
+  if (user?.token) {
     redirect("/dashboard");
   }
 
diff --git a/frontend/app/dashboard/layout.tsx b/frontend/app/dashboard/layout.tsx
@@ -12,7 +12,7 @@ export default async function DashboardLayout({
 }: DashboardLayoutProps) {
   const user = await getCurrentUser();
 
-  if (!user) {
+  if (!user?.token) {
     redirect(authOptions?.pages?.signIn || "/auth/signin");
   }
   return (
diff --git a/frontend/app/dashboard/page.tsx b/frontend/app/dashboard/page.tsx
@@ -1,10 +1,9 @@
 import React from "react";
 import { getCurrentUser } from "../../lib/session";
 import { redirect } from "next/navigation";
-import { authOptions } from "../../lib/auth";
+import { authOptions, getSession } from "../../lib/auth";
 import Link from "next/link";
 import { siteConfig } from "../../config/site";
-import { signOut } from "next-auth/react";
 import SignOutButton from "../../components/signout-button/page";
 
 export const metadata = {
@@ -13,11 +12,17 @@ export const metadata = {
 };
 
 async function getUsers(): Promise<any | null> {
+  const session = await getSession();
+  console.log("session", session);
+
   try {
     const response = await fetch(`${siteConfig.localApi}/users`, {
       next: {
         revalidate: 60,
       },
+      headers: {
+        Authorization: `Bearer ${session?.user?.token}`,
+      },
     });
 
     // if (!response?.ok) {
@@ -34,18 +39,17 @@ async function getUsers(): Promise<any | null> {
 }
 
 export default async function DashboardPage() {
-  const users = await getUsers();
   const user = await getCurrentUser();
+  const users = await getUsers();
 
-  if (!user) {
-    redirect(authOptions?.pages?.signIn || "/auth/signin");
-  }
   return (
     <main className={`flex min-h-screen flex-col items-center p-4`}>
       <header className="container z-40 bg-background">
         <div className="flex h-20 items-center justify-between py-6">
           <nav>
-           <SignOutButton className={`absolute left-5 top-5 bg-teal-500 hover:bg-teal-700 text-white font-bold rounded-sm min-w-[70px] text-center`} />
+            <SignOutButton
+              className={`absolute left-5 top-5 bg-teal-500 hover:bg-teal-700 text-white font-bold rounded-sm min-w-[70px] text-center`}
+            />
           </nav>
         </div>
       </header>
diff --git a/frontend/components/signin-form/page.tsx b/frontend/components/signin-form/page.tsx
@@ -5,7 +5,6 @@ import Link from "next/link";
 import { useSearchParams } from "next/navigation";
 import { useState } from "react";
 import { SubmitHandler, useForm } from "react-hook-form";
-import ReactLoading from "react-loading";
 
 export default function SignInForm() {
   const [loading, setLoading] = useState(false);
@@ -33,18 +32,32 @@ export default function SignInForm() {
       callbackUrl: searchParams?.get("from") || "/dashboard",
     });
     setLoading(false);
+    console.log("res",signInResult);
+    
   };
   return (
     <main className={`flex min-h-screen flex-col items-center p-4`}>
       {loading ? (
         <>
-          <ReactLoading
-            type={"bars"}
-            color={"red"}
-            height={200}
-            width={200}
-            className="flex flex-row min-h-screen justify-center items-center"
-          />
+          <div role="status">
+            <svg
+              aria-hidden="true"
+              className="inline w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-green-500"
+              viewBox="0 0 100 101"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                fill="currentColor"
+              />
+              <path
+                d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                fill="currentFill"
+              />
+            </svg>
+            <span className="sr-only">Loading...</span>
+          </div>
         </>
       ) : (
         <>
diff --git a/frontend/components/signup-form/page.tsx b/frontend/components/signup-form/page.tsx
@@ -9,7 +9,6 @@ import {
   ToastSuccessMessage,
 } from "../../utils/ToastGenerator";
 import { useRouter } from "next/navigation";
-import ReactLoading from "react-loading";
 import Link from "next/link";
 
 export default function SignUpForm() {
@@ -57,13 +56,25 @@ export default function SignUpForm() {
     <main className={`flex min-h-screen flex-col items-center p-4`}>
       {loading ? (
         <>
-          <ReactLoading
-            type={"bars"}
-            color={"red"}
-            height={200}
-            width={200}
-            className="flex flex-row min-h-screen justify-center items-center"
-          />
+          <div role="status">
+            <svg
+              aria-hidden="true"
+              className="inline w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-green-500"
+              viewBox="0 0 100 101"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                fill="currentColor"
+              />
+              <path
+                d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                fill="currentFill"
+              />
+            </svg>
+            <span className="sr-only">Loading...</span>
+          </div>
         </>
       ) : (
         <>
diff --git a/frontend/lib/auth.ts b/frontend/lib/auth.ts
@@ -29,7 +29,8 @@ const authOptions: NextAuthOptions = {
             }),
           });
           const user = await res.json();
-          console.log(user);
+          console.log("this is user",user);
+          console.log("this is req",req);
           
   
           if (user) {
@@ -40,6 +41,17 @@ const authOptions: NextAuthOptions = {
         },
       }),
     ],
+    callbacks: {
+      async jwt({ token, user }) {
+        return { ...token, ...user };
+      },
+      async session({ session, token, user }) {
+        console.log("sd",user);
+        
+        session.user = token as any;
+        return session;
+      },
+    },
     pages: {
       signIn: "/auth/signin",
       // signOut: "/auth/signout",
diff --git a/frontend/package.json b/frontend/package.json
@@ -23,7 +23,6 @@
     "react-bootstrap": "^2.9.1",
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.47.0",
-    "react-loading": "^2.0.3",
     "react-toastify": "^9.1.3",
     "tailwindcss": "3.3.3",
     "typescript": "5.1.6"
diff --git a/frontend/types/next-auth.d.ts b/frontend/types/next-auth.d.ts
@@ -0,0 +1,18 @@
+import { User } from "next-auth";
+
+// type UserId = string
+
+// declare module "next-auth/jwt" {
+//   interface JWT {
+//     id: UserId
+//   }
+// }
+
+declare module "next-auth" {
+  interface Session {
+    user: User & {
+      token: string;
+      message: string;
+    };
+  }
+}
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -2573,11 +2573,6 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-loading@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/react-loading/-/react-loading-2.0.3.tgz#e8138fb0c3e4674e481b320802ac7048ae14ffb9"
-  integrity sha512-Vdqy79zq+bpeWJqC+xjltUjuGApyoItPgL0vgVfcJHhqwU7bAMKzysfGW/ADu6i0z0JiOCRJjo+IkFNkRNbA3A==
-
 react-toastify@^9.1.3:
   version "9.1.3"
   resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-9.1.3.tgz#1e798d260d606f50e0fab5ee31daaae1d628c5ff"
diff --git a/repository/routes.go b/repository/routes.go
@@ -8,12 +8,12 @@ import (
 func (repo *Repository) SetupRoutes(app *fiber.App) {
 	api := app.Group("/api")
 	// Unauthenticated route
-	api.Get("/users", repo.GetUsers)
 	api.Post("/user", repo.CreateUser)
 	api.Patch("/user/:id", repo.UpdateUser)
 	api.Delete("/user/:id", repo.DeleteUser)
 	api.Post("/login", repo.Login)
 	// Restricted Routes
 	jwtFunc := middlewares.NewAuthMiddleware()
+	api.Get("/users",jwtFunc, repo.GetUsers)
 	api.Get("/user/:id",jwtFunc, repo.GetUserByID)
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export default async function DashboardLayout({`
`12`	`12`	`}: DashboardLayoutProps) {`
`13`	`13`	`const user = await getCurrentUser();`
`14`	`14`
`15`		`- if (!user) {`
	`15`	`+ if (!user?.token) {`
`16`	`16`	`redirect(authOptions?.pages?.signIn \|\| "/auth/signin");`
`17`	`17`	`}`
`18`	`18`	`return (`