Merge branch 'main' of https://github.com/alexechoi/junction-hack

albinjal · albinjal · commit 302dec893e53 · 2025-11-15T13:04:53.000+02:00
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
@@ -0,0 +1,21 @@
+name: Prettier
+
+on: [push]
+
+jobs:
+  prettier:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: junction-app
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
+      - run: bun install
+
+      - name: Run Prettier check
+        run: bun run format:check
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.vercel
diff --git a/junction-app/.gitignore b/junction-app/.gitignore
@@ -39,3 +39,6 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+# DS_Store
+*.DS_Store
diff --git a/junction-app/app/auth/page.tsx b/junction-app/app/auth/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useAuth } from "@/contexts/AuthContext";
 import { useRouter } from "next/navigation";
 
@@ -13,9 +13,16 @@ export default function AuthPage() {
   const [error, setError] = useState("");
   const [loading, setLoading] = useState(false);
 
-  const { signIn, signUp, signInWithGoogle } = useAuth();
+  const { user, signIn, signUp, signInWithGoogle } = useAuth();
   const router = useRouter();
 
+  // if logged in, redirect to dashboard
+  useEffect(() => {
+    if (user) {
+      router.push("/dashboard");
+    }
+  }, [user, router]);
+
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setError("");
@@ -28,8 +35,8 @@ export default function AuthPage() {
         await signUp(email, password, firstName, lastName);
       }
       router.push("/dashboard");
-    } catch (err: any) {
-      setError(err.message || "An error occurred");
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : "An error occurred");
     } finally {
       setLoading(false);
     }
@@ -42,8 +49,8 @@ export default function AuthPage() {
     try {
       await signInWithGoogle();
       router.push("/dashboard");
-    } catch (err: any) {
-      setError(err.message || "An error occurred");
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : "An error occurred");
     } finally {
       setLoading(false);
     }
diff --git a/junction-app/app/dashboard/page.tsx b/junction-app/app/dashboard/page.tsx
@@ -54,9 +54,7 @@ export default function DashboardPage() {
       <div className="max-w-3xl mx-auto">
         <div className="bg-white shadow rounded-lg">
           <div className="px-4 py-5 sm:p-6">
-            <h1 className="text-2xl font-bold text-gray-900 mb-6">
-              Dashboard
-            </h1>
+            <h1 className="text-2xl font-bold text-gray-900 mb-6">Dashboard</h1>
 
             <div className="space-y-4">
               <div>
@@ -80,10 +78,15 @@ export default function DashboardPage() {
                     <p className="text-sm text-gray-600">
                       <span className="font-medium">Member since:</span>{" "}
                       {(() => {
-                        const dateValue = userData.createdAt instanceof Date
-                          ? userData.createdAt
-                          : (userData.createdAt as { toDate?: () => Date }).toDate?.();
-                        return dateValue ? new Date(dateValue).toLocaleDateString() : '';
+                        const dateValue =
+                          userData.createdAt instanceof Date
+                            ? userData.createdAt
+                            : (
+                                userData.createdAt as { toDate?: () => Date }
+                              ).toDate?.();
+                        return dateValue
+                          ? new Date(dateValue).toLocaleDateString()
+                          : "";
                       })()}
                     </p>
                   )}
diff --git a/junction-app/app/layout.tsx b/junction-app/app/layout.tsx
@@ -2,7 +2,7 @@ import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
 import "./globals.css";
 import { AuthProvider } from "@/contexts/AuthContext";
-import Nav from "@/components/Nav";
+import { AppChrome } from "@/components/AppChrome";
 
 const geistSans = Geist({
   variable: "--font-geist-sans",
@@ -30,8 +30,7 @@ export default function RootLayout({
         className={`${geistSans.variable} ${geistMono.variable} antialiased`}
       >
         <AuthProvider>
-          <Nav />
-          {children}
+          <AppChrome>{children}</AppChrome>
         </AuthProvider>
       </body>
     </html>
diff --git a/junction-app/app/page.tsx b/junction-app/app/page.tsx
@@ -1,62 +1,15 @@
-import Link from "next/link";
+import { Demo } from "@/components/landing/Demo";
+import { Hero } from "@/components/landing/Hero";
+import { LandingFooter } from "@/components/landing/Footer";
+import { TrustScore } from "@/components/landing/TrustScore";
 
 export default function Home() {
   return (
-    <div className="min-h-screen bg-gradient-to-b from-blue-50 to-white">
-      <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-20">
-        <div className="text-center">
-          <h1 className="text-5xl font-bold text-gray-900 mb-6">
-            Welcome to Hackathon App
-          </h1>
-          <p className="text-xl text-gray-600 mb-8 max-w-2xl mx-auto">
-            Build amazing things faster with our scaffold. Authentication, database, and UI components ready to go.
-          </p>
-
-          <div className="flex flex-col sm:flex-row gap-4 justify-center items-center">
-            <Link
-              href="/auth"
-              className="bg-blue-600 text-white hover:bg-blue-700 px-8 py-3 rounded-lg text-lg font-medium transition-colors"
-            >
-              Get Started
-            </Link>
-            <Link
-              href="/dashboard"
-              className="border-2 border-blue-600 text-blue-600 hover:bg-blue-50 px-8 py-3 rounded-lg text-lg font-medium transition-colors"
-            >
-              View Dashboard
-            </Link>
-          </div>
-        </div>
-
-        <div className="mt-20 grid grid-cols-1 md:grid-cols-3 gap-8">
-          <div className="bg-white p-6 rounded-lg shadow-md">
-            <h3 className="text-xl font-semibold text-gray-900 mb-3">
-              Authentication Ready
-            </h3>
-            <p className="text-gray-600">
-              Firebase authentication with email/password and Google sign-in out of the box.
-            </p>
-          </div>
-
-          <div className="bg-white p-6 rounded-lg shadow-md">
-            <h3 className="text-xl font-semibold text-gray-900 mb-3">
-              Database Integration
-            </h3>
-            <p className="text-gray-600">
-              Firestore database configured and ready for your data models.
-            </p>
-          </div>
-
-          <div className="bg-white p-6 rounded-lg shadow-md">
-            <h3 className="text-xl font-semibold text-gray-900 mb-3">
-              Modern Stack
-            </h3>
-            <p className="text-gray-600">
-              Built with Next.js 15, TypeScript, and Tailwind CSS for the best developer experience.
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
+    <main className="bg-zinc-950 text-white">
+      <Hero />
+      <Demo />
+      <TrustScore />
+      <LandingFooter />
+    </main>
   );
 }
diff --git a/junction-app/bun.lock b/junction-app/bun.lock
@@ -5,7 +5,9 @@
       "name": "junction-app",
       "dependencies": {
         "firebase": "^12.6.0",
+        "lucide-react": "^0.553.0",
         "next": "16.0.3",
+        "prettier": "^3.6.2",
         "react": "19.2.0",
         "react-dom": "19.2.0",
       },
@@ -766,6 +768,8 @@
 
     "lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="],
 
+    "lucide-react": ["lucide-react@0.553.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-BRgX5zrWmNy/lkVAe0dXBgd7XQdZ3HTf+Hwe3c9WK6dqgnj9h+hxV+MDncM88xDWlCq27+TKvHGE70ViODNILw=="],
+
     "magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="],
 
     "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="],
@@ -832,6 +836,8 @@
 
     "prelude-ls": ["prelude-ls@1.2.1", "", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="],
 
+    "prettier": ["prettier@3.6.2", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ=="],
+
     "prop-types": ["prop-types@15.8.1", "", { "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", "react-is": "^16.13.1" } }, "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="],
 
     "protobufjs": ["protobufjs@7.5.4", "", { "dependencies": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", "@protobufjs/codegen": "^2.0.4", "@protobufjs/eventemitter": "^1.1.0", "@protobufjs/fetch": "^1.1.0", "@protobufjs/float": "^1.0.2", "@protobufjs/inquire": "^1.1.0", "@protobufjs/path": "^1.1.2", "@protobufjs/pool": "^1.1.0", "@protobufjs/utf8": "^1.1.0", "@types/node": ">=13.7.0", "long": "^5.0.0" } }, "sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg=="],
diff --git a/junction-app/components/AppChrome.tsx b/junction-app/components/AppChrome.tsx
@@ -0,0 +1,22 @@
+"use client";
+
+import { usePathname } from "next/navigation";
+import Nav from "@/components/Nav";
+
+type AppChromeProps = {
+  children: React.ReactNode;
+};
+
+export function AppChrome({ children }: AppChromeProps) {
+  const pathname = usePathname();
+  const isLanding = pathname === "/";
+
+  const theme = isLanding ? "bg-zinc-950 text-white" : "bg-white text-zinc-900";
+
+  return (
+    <div className={`${theme} min-h-screen`}>
+      <Nav />
+      {children}
+    </div>
+  );
+}
diff --git a/junction-app/components/Nav.tsx b/junction-app/components/Nav.tsx
@@ -2,44 +2,84 @@
 
 import Link from "next/link";
 import { useAuth } from "@/contexts/AuthContext";
+import { usePathname } from "next/navigation";
+import { useEffect, useState } from "react";
 
 export default function Nav() {
   const { user } = useAuth();
+  const pathname = usePathname();
+  const isLanding = pathname === "/";
+  const [scrolled, setScrolled] = useState(false);
+
+  useEffect(() => {
+    if (!isLanding) return;
+
+    const handleScroll = () => {
+      setScrolled(window.scrollY > 10);
+    };
+
+    handleScroll();
+    window.addEventListener("scroll", handleScroll);
+    return () => window.removeEventListener("scroll", handleScroll);
+  }, [isLanding]);
+
+  const navTheme = isLanding
+    ? scrolled
+      ? "border-white/10 bg-zinc-950/80 text-white shadow-lg shadow-black/30"
+      : "border-transparent bg-transparent text-white"
+    : "border-gray-200 bg-white text-gray-900 shadow-sm";
+  const linkTheme = isLanding
+    ? "text-sm font-medium text-white/80 hover:text-white"
+    : "text-sm font-medium text-gray-700 hover:text-gray-900";
+  const buttonTheme = isLanding
+    ? "bg-white text-zinc-950 hover:bg-zinc-100"
+    : "bg-blue-600 text-white hover:bg-blue-700";
+  const secondaryLinkTheme = isLanding ? "text-white" : "text-gray-900";
+
+  const landingLinks = [
+    { href: "/#how-it-works", label: "How it works" },
+    { href: "/#features", label: "Features" },
+    { href: "/#demo", label: "Demo" },
+    { href: "/#trust-score", label: "Trust score" },
+  ];
 
   return (
-    <nav className="bg-white shadow-sm border-b">
+    <nav className={`sticky top-0 z-50 border-b backdrop-blur ${navTheme}`}>
       <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
         <div className="flex justify-between items-center h-16">
-          <div className="flex items-center">
-            <Link href="/" className="text-xl font-bold text-gray-900">
-              Hackathon App
+          <div className="flex items-center gap-6">
+            <Link
+              href="/"
+              className={`text-xl font-bold transition ${secondaryLinkTheme}`}
+            >
+              Aegis
             </Link>
+            {isLanding && (
+              <div className="hidden md:flex items-center gap-4">
+                {landingLinks.map((link) => (
+                  <Link key={link.label} href={link.href} className={linkTheme}>
+                    {link.label}
+                  </Link>
+                ))}
+              </div>
+            )}
           </div>
 
           <div className="flex items-center gap-4">
             {user ? (
               <>
                 <Link
                   href="/dashboard"
-                  className="text-gray-700 hover:text-gray-900 px-3 py-2 rounded-md text-sm font-medium"
+                  className={`${linkTheme} rounded-md px-3 py-2`}
                 >
                   Dashboard
                 </Link>
-                <span className="text-gray-600 text-sm">
-                  {user.email}
-                </span>
               </>
             ) : (
               <>
-                <Link
-                  href="/"
-                  className="text-gray-700 hover:text-gray-900 px-3 py-2 rounded-md text-sm font-medium"
-                >
-                  Home
-                </Link>
                 <Link
                   href="/auth"
-                  className="bg-blue-600 text-white hover:bg-blue-700 px-4 py-2 rounded-md text-sm font-medium"
+                  className={`${buttonTheme} rounded-full px-4 py-2 text-sm font-medium transition`}
                 >
                   Sign In
                 </Link>
diff --git a/junction-app/components/landing/Demo.tsx b/junction-app/components/landing/Demo.tsx
diff --git a/junction-app/components/landing/Footer.tsx b/junction-app/components/landing/Footer.tsx
diff --git a/junction-app/components/landing/Hero.tsx b/junction-app/components/landing/Hero.tsx
diff --git a/junction-app/components/landing/TrustScore.tsx b/junction-app/components/landing/TrustScore.tsx
diff --git a/junction-app/package.json b/junction-app/package.json

-Original file line number
+Diff line change
       "name": "junction-app",
       "dependencies": {
         "firebase": "^12.6.0",
 +        "lucide-react": "^0.553.0",
         "next": "16.0.3",
 +        "prettier": "^3.6.2",
         "react": "19.2.0",
         "react-dom": "19.2.0",
       },
     "lru-cache": ["[email protected]", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="],
 +    "lucide-react": ["[email protected]", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-BRgX5zrWmNy/lkVAe0dXBgd7XQdZ3HTf+Hwe3c9WK6dqgnj9h+hxV+MDncM88xDWlCq27+TKvHGE70ViODNILw=="],
++
     "magic-string": ["[email protected]", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="],
     "math-intrinsics": ["[email protected]", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="],
     "prelude-ls": ["[email protected]", "", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="],
 +    "prettier": ["[email protected]", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ=="],
++
     "prop-types": ["[email protected]", "", { "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", "react-is": "^16.13.1" } }, "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="],
     "protobufjs": ["[email protected]", "", { "dependencies": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", "@protobufjs/codegen": "^2.0.4", "@protobufjs/eventemitter": "^1.1.0", "@protobufjs/fetch": "^1.1.0", "@protobufjs/float": "^1.0.2", "@protobufjs/inquire": "^1.1.0", "@protobufjs/path": "^1.1.2", "@protobufjs/pool": "^1.1.0", "@protobufjs/utf8": "^1.1.0", "@types/node": ">=13.7.0", "long": "^5.0.0" } }, "sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg=="],