Merge pull request #18 from GTBitsOfGood/kavinphan/nav-bar

Add navbar + screens
GTBitsOfGood · Feb 2, 2025 · 1bdfe5c · 1bdfe5c
2 parents ea6bbd1 + 52e98f2
commit 1bdfe5c
Show file tree

Hide file tree

Showing 30 changed files with 464 additions and 148 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "db:view": "npx prisma studio"
   },
   "dependencies": {
+    "@phosphor-icons/react": "^2.1.7",
     "@prisma/client": "^6.2.1",
     "@react-email/render": "1.0.3",
     "@sendgrid/mail": "^8.1.4",

diff --git a/public/logo.svg b/public/logo.svg
diff --git a/src/app/account_management/page.tsx b/src/app/account_management/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+import LoadingScreen from "@/screens/LoadingScreen";
+import dynamic from "next/dynamic";
+
+export default dynamic(() => import("@/screens/AccountManagementScreen"), {
+  ssr: false,
+  loading: LoadingScreen,
+});
diff --git a/src/app/distributions/page.tsx b/src/app/distributions/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+import LoadingScreen from "@/screens/LoadingScreen";
+import dynamic from "next/dynamic";
+
+export default dynamic(() => import("@/screens/DistributionsScreen"), {
+  ssr: false,
+  loading: LoadingScreen,
+});
diff --git a/src/app/donor_offers/page.tsx b/src/app/donor_offers/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+import LoadingScreen from "@/screens/LoadingScreen";
+import dynamic from "next/dynamic";
+
+export default dynamic(() => import("@/screens/DonorOffersScreen"), {
+  ssr: false,
+  loading: LoadingScreen,
+});
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,8 +1,9 @@
 import type { Metadata } from "next";
 import "./globals.css";
 
-import AuthenticationLayout from "@/components/layouts/AuthenticationLayout";
+import AuthenticationProvider from "@/components/AuthenticationProvider";
 import { Toaster } from "react-hot-toast";
+import NavbarLayout from "@/components/NavBarLayout";
 
 export const metadata: Metadata = {
   title: "Hope for Haiti",
@@ -16,12 +17,12 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en">
-      <AuthenticationLayout>
-        <body>
-          {children}
+      <body>
+        <AuthenticationProvider>
+          <NavbarLayout>{children}</NavbarLayout>
           <Toaster position="top-right" />
-        </body>
-      </AuthenticationLayout>
+        </AuthenticationProvider>
+      </body>
     </html>
   );
 }
diff --git a/src/app/map/page.tsx b/src/app/map/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+import LoadingScreen from "@/screens/LoadingScreen";
+import dynamic from "next/dynamic";
+
+export default dynamic(() => import("@/screens/MapScreen"), {
+  ssr: false,
+  loading: LoadingScreen,
+});
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import LoadingPage from "@/screens/LoadingScreen";
+import LoadingScreen from "@/screens/LoadingScreen";
 import dynamic from "next/dynamic";
 
 export default dynamic(() => import("@/screens/HomeScreen"), {
   ssr: false,
-  loading: LoadingPage,
+  loading: LoadingScreen,
 });
diff --git a/src/app/profile/page.tsx b/src/app/profile/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+import LoadingScreen from "@/screens/LoadingScreen";
+import dynamic from "next/dynamic";
+
+export default dynamic(() => import("@/screens/ProfileScreen"), {
+  ssr: false,
+  loading: LoadingScreen,
+});
diff --git a/src/app/sign_in/page.tsx b/src/app/sign_in/page.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import LoadingPage from "@/screens/LoadingScreen";
+import LoadingScreen from "@/screens/LoadingScreen";
 import dynamic from "next/dynamic";
 
 export default dynamic(() => import("@/screens/SignInScreen"), {
   ssr: false,
-  loading: LoadingPage,
+  loading: LoadingScreen,
 });
diff --git a/src/app/unallocated_items/page.tsx b/src/app/unallocated_items/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+import LoadingScreen from "@/screens/LoadingScreen";
+import dynamic from "next/dynamic";
+
+export default dynamic(() => import("@/screens/UnallocatedItemsScreen"), {
+  ssr: false,
+  loading: LoadingScreen,
+});
diff --git a/src/app/wishlist/page.tsx b/src/app/wishlist/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+import LoadingScreen from "@/screens/LoadingScreen";
+import dynamic from "next/dynamic";
+
+export default dynamic(() => import("@/screens/WishlistScreen"), {
+  ssr: false,
+  loading: LoadingScreen,
+});
diff --git a/src/app/wishlists/page.tsx b/src/app/wishlists/page.tsx
@@ -0,0 +1,9 @@
+"use client";
+
+import LoadingScreen from "@/screens/LoadingScreen";
+import dynamic from "next/dynamic";
+
+export default dynamic(() => import("@/screens/WishlistsScreen"), {
+  ssr: false,
+  loading: LoadingScreen,
+});
diff --git a/src/auth/PageHelpers.tsx b/src/auth/PageHelpers.tsx
diff --git a/src/components/AuthenticationProvider.tsx b/src/components/AuthenticationProvider.tsx
@@ -0,0 +1,50 @@
+"use client";
+
+import { SessionProvider } from "next-auth/react";
+import { useUser } from "./context/UserContext";
+import LoadingScreen from "@/screens/LoadingScreen";
+import { useEffect } from "react";
+import { usePathname, useRouter } from "next/navigation";
+
+function VerifyAuthentication({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  const pathName = usePathname();
+  const { loading, user } = useUser();
+  const router = useRouter();
+
+  const onSignInPage = pathName === "/sign_in";
+
+  useEffect(() => {
+    if (loading) return;
+    if (onSignInPage && user) router.replace("/");
+    if (!onSignInPage && !user) router.replace("/sign_in");
+  }, [onSignInPage, loading, user, router]);
+
+  if (loading)
+    return (
+      <main className="w-screen h-screen">
+        <LoadingScreen />
+      </main>
+    );
+
+  if (!onSignInPage && !user) {
+    return <></>;
+  }
+
+  return children;
+}
+
+export default function AuthenticationProvider({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <SessionProvider>
+      <VerifyAuthentication>{children}</VerifyAuthentication>
+    </SessionProvider>
+  );
+}