From fd303ee5a4c8d317251ddd66b7b2d6df9ad93fc3 Mon Sep 17 00:00:00 2001
From: Umair Hundekar <umairmhundekar@gmail.com>
Date: Mon, 29 Sep 2025 21:21:42 -0400
Subject: [PATCH 1/5] Added Admin authentication

---
 backend/app/routes/auth.py             |   5 +
 frontend/src/pages/admin-login.tsx     |   8 +-
 frontend/src/pages/admin-signup.tsx    | 276 +++++++++++++++++++++++++
 frontend/src/pages/admin-verify.tsx    | 189 +++++++++++++++++
 frontend/src/pages/admin/dashboard.tsx |  25 +--
 5 files changed, 477 insertions(+), 26 deletions(-)
 create mode 100644 frontend/src/pages/admin-signup.tsx
 create mode 100644 frontend/src/pages/admin-verify.tsx

diff --git a/backend/app/routes/auth.py b/backend/app/routes/auth.py
index e2abd2c9..0c7764ed 100644
--- a/backend/app/routes/auth.py
+++ b/backend/app/routes/auth.py
@@ -17,6 +17,11 @@
 # TODO: ADD RATE LIMITING
 @router.post("/register", response_model=UserCreateResponse)
 async def register_user(user: UserCreateRequest, user_service: UserService = Depends(get_user_service)):
+    allowed_Admins = ["umair.hundekar@uwblueprint.org", "umairmhundekar@gmail.com"]
+    if user.role == UserRole.ADMIN:
+        if user.email not in allowed_Admins:
+            raise HTTPException(status_code=403, detail="Access denied. Admin privileges required for admin portal")
+    
     try:
         return await user_service.create_user(user)
     except HTTPException as http_ex:
diff --git a/frontend/src/pages/admin-login.tsx b/frontend/src/pages/admin-login.tsx
index 704e3952..cc3b0bbd 100644
--- a/frontend/src/pages/admin-login.tsx
+++ b/frontend/src/pages/admin-login.tsx
@@ -23,11 +23,11 @@ export default function AdminLogin() {
 
     try {
       const result = await login(email, password);
-      if (result) {
+      if (result.success) {
         console.log('Admin login success:', result);
         router.push('/admin/dashboard');
       } else {
-        setError('Invalid email or password');
+        setError('Invalid email or password. Please check your credentials and try again. If you recently signed up, make sure to verify your email first.');
       }
     } catch (err: unknown) {
       console.error('Admin login error:', err);
@@ -163,7 +163,7 @@ export default function AdminLogin() {
                   marginTop: 6,
                   cursor: 'pointer',
                 }}
-                onClick={() => router.push('/reset-password')}
+                onClick={() => router.push('/admin-reset-password')}
               >
                 Forgot Password?
               </span>
@@ -203,7 +203,7 @@ export default function AdminLogin() {
           >
             Don&apos;t have an account?{' '}
             <Link
-              href="/participant-form"
+              href="/admin-signup"
               style={{
                 color: teal,
                 textDecoration: 'underline',
diff --git a/frontend/src/pages/admin-signup.tsx b/frontend/src/pages/admin-signup.tsx
new file mode 100644
index 00000000..b98fe141
--- /dev/null
+++ b/frontend/src/pages/admin-signup.tsx
@@ -0,0 +1,276 @@
+import React, { useState } from 'react';
+import Image from 'next/image';
+import Link from 'next/link';
+import { Box, Flex, Heading, Text, Button, Input } from '@chakra-ui/react';
+import { Field } from '@/components/ui/field';
+import { InputGroup } from '@/components/ui/input-group';
+import { useRouter } from 'next/router';
+import { register } from '@/APIClients/authAPIClient';
+import { UserRole, SignUpMethod } from '@/types/authTypes';
+
+const veniceBlue = '#1d3448';
+const fieldGray = '#414651';
+const teal = '#056067';
+
+export default function AdminLoginPage() {
+  const router = useRouter();
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [error, setError] = useState('');
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    setError('');
+
+    if (password !== confirmPassword) {
+      setError('Passwords do not match');
+      return;
+    }
+
+    try {
+      const userData = {
+        first_name: '',
+        last_name: '',
+        email,
+        password,
+        role: UserRole.ADMIN,
+        signupMethod: SignUpMethod.PASSWORD,
+      };
+      const result = await register(userData);
+      console.log('Admin registration success:', result);
+      router.push(`/admin-verify?email=${encodeURIComponent(email)}&role=admin`);
+    } catch (err: unknown) {
+      console.error('Admin registration error:', err);
+      if (
+        err &&
+        typeof err === 'object' &&
+        'response' in err &&
+        err.response &&
+        typeof err.response === 'object' &&
+        'data' in err.response &&
+        err.response.data &&
+        typeof err.response.data === 'object' &&
+        'detail' in err.response.data
+      ) {
+        setError((err.response.data as { detail: string }).detail || 'Registration failed');
+      } else {
+        setError('Registration failed');
+      }
+    }
+  };
+
+  return (
+    <Flex minH="100vh" direction={{ base: 'column', md: 'row' }}>
+      {/* Left: Admin Login Form */}
+      <Flex
+        flex="1"
+        align="center"
+        justify="center"
+        px={{ base: 4, md: 12 }}
+        py={{ base: 16, md: 0 }}
+        bg="white"
+        minH={{ base: '60vh', md: '100vh' }}
+      >
+        <Box w="full" maxW="520px">
+          <Heading
+            as="h1"
+            fontFamily="'Open Sans', sans-serif"
+            fontWeight={600}
+            color={veniceBlue}
+            fontSize={{ base: '3xl', md: '4xl', lg: '5xl' }}
+            lineHeight="50px"
+            mb={2}
+          >
+            Admin Portal - First Connection Peer
+            <br />
+            Support Program
+          </Heading>
+          <Heading
+            as="h2"
+            fontFamily="'Open Sans', sans-serif"
+            fontWeight={600}
+            color={veniceBlue}
+            fontSize={{ base: 'xl', md: '2xl' }}
+            mb={6}
+            mt={8}
+          >
+            Welcome!
+          </Heading>
+          <Text
+            mb={8}
+            color={veniceBlue}
+            fontFamily="'Open Sans', sans-serif"
+            fontWeight={400}
+            fontSize="lg"
+          >
+            Let&apos;s start by setting up your admin account.
+          </Text>
+          <form onSubmit={handleSubmit}>
+            <Field
+              label={
+                <span
+                  style={{
+                    color: fieldGray,
+                    fontWeight: 600,
+                    fontSize: 14,
+                    fontFamily: 'Open Sans, sans-serif',
+                  }}
+                >
+                  Email
+                </span>
+              }
+              mb={4}
+            >
+              <InputGroup w="100%">
+                <Input
+                  type="email"
+                  placeholder="john.doe@gmail.com"
+                  required
+                  autoComplete="email"
+                  w="100%"
+                  maxW="518px"
+                  fontFamily="'Open Sans', sans-serif"
+                  fontWeight={400}
+                  fontSize={14}
+                  color={fieldGray}
+                  bg="white"
+                  borderColor="#D5D7DA"
+                  _placeholder={{ color: '#A0AEC0', fontWeight: 400 }}
+                  value={email}
+                  onChange={(e) => setEmail(e.target.value)}
+                />
+              </InputGroup>
+            </Field>
+            <Field
+              label={
+                <span
+                  style={{
+                    color: fieldGray,
+                    fontWeight: 600,
+                    fontSize: 14,
+                    fontFamily: 'Open Sans, sans-serif',
+                  }}
+                >
+                  Password
+                </span>
+              }
+              mb={2}
+            >
+              <InputGroup w="100%">
+                <Input
+                  type="password"
+                  placeholder=""
+                  required
+                  autoComplete="new-password"
+                  w="100%"
+                  maxW="518px"
+                  fontFamily="'Open Sans', sans-serif"
+                  fontWeight={400}
+                  fontSize={14}
+                  color={fieldGray}
+                  bg="white"
+                  borderColor="#D5D7DA"
+                  _placeholder={{ color: '#A0AEC0', fontWeight: 400 }}
+                  value={password}
+                  onChange={(e) => setPassword(e.target.value)}
+                />
+              </InputGroup>
+            </Field>
+            <Field
+              label={
+                <span
+                  style={{
+                    color: fieldGray,
+                    fontWeight: 600,
+                    fontSize: 14,
+                    fontFamily: 'Open Sans, sans-serif',
+                  }}
+                >
+                  Confirm Password
+                </span>
+              }
+              mb={6}
+            >
+              <InputGroup w="100%">
+                <Input
+                  type="password"
+                  placeholder=""
+                  required
+                  autoComplete="new-password"
+                  w="100%"
+                  maxW="518px"
+                  fontFamily="'Open Sans', sans-serif"
+                  fontWeight={400}
+                  fontSize={14}
+                  color={fieldGray}
+                  bg="white"
+                  borderColor="#D5D7DA"
+                  _placeholder={{ color: '#A0AEC0', fontWeight: 400 }}
+                  value={confirmPassword}
+                  onChange={(e) => setConfirmPassword(e.target.value)}
+                />
+              </InputGroup>
+            </Field>
+            {error && (
+              <Text color="red.500" mb={4} fontWeight={600} fontFamily="'Open Sans', sans-serif">
+                {typeof error === 'string' ? error : JSON.stringify(error)}
+              </Text>
+            )}
+            <Button
+              type="submit"
+              w="100%"
+              maxW="518px"
+              mt={2}
+              size="lg"
+              fontWeight={600}
+              fontFamily="'Open Sans', sans-serif"
+              fontSize="lg"
+              bg={teal}
+              color="white"
+              borderRadius="8px"
+              border="1px solid #056067"
+              boxShadow="0 1px 2px 0 #0A0D12, 0 0 0 0 transparent"
+              _hover={{ bg: '#044953' }}
+              px={8}
+              py={3}
+            >
+              Continue <span style={{ display: 'inline-block', marginLeft: 8 }}>&#8594;</span>
+            </Button>
+          </form>
+          <Text
+            mt={8}
+            color={veniceBlue}
+            fontSize="md"
+            fontWeight={400}
+            fontFamily="'Open Sans', sans-serif"
+          >
+            Already have an account?{' '}
+            <Link
+              href="/admin"
+              style={{
+                color: teal,
+                textDecoration: 'underline',
+                fontWeight: 600,
+                fontFamily: 'Open Sans, sans-serif',
+              }}
+            >
+              Sign in.
+            </Link>
+          </Text>
+        </Box>
+      </Flex>
+      {/* Right: Image */}
+      <Box flex="1" display={{ base: 'none', md: 'block' }} position="relative" minH="100vh">
+        <Image
+          src="/admin.png"
+          alt="Admin Portal Visual"
+          fill
+          sizes="(max-width: 768px) 100vw, 50vw"
+          style={{ objectFit: 'cover', objectPosition: '90% 50%' }}
+          priority
+        />
+      </Box>
+    </Flex>
+  );
+}
diff --git a/frontend/src/pages/admin-verify.tsx b/frontend/src/pages/admin-verify.tsx
new file mode 100644
index 00000000..03b3105e
--- /dev/null
+++ b/frontend/src/pages/admin-verify.tsx
@@ -0,0 +1,189 @@
+import { useRouter } from 'next/router';
+import { Box, Flex, Heading, Text, Link } from '@chakra-ui/react';
+import { useEffect, useState } from 'react';
+import { useEmailVerification } from '@/hooks/useEmailVerification';
+import {
+  getEmailForSignIn,
+  clearEmailForSignIn,
+  setEmailForSignIn,
+} from '@/services/firebaseAuthService';
+import { auth } from '@/config/firebase';
+import Image from 'next/image';
+
+const veniceBlue = '#1d3448';
+
+export default function AdminVerifyPage() {
+  const router = useRouter();
+  const { email, role } = router.query;
+  const [displayEmail, setDisplayEmail] = useState<string>('');
+  const [message, setMessage] = useState<{ type: 'success' | 'error' | null; text: string }>({
+    type: null,
+    text: '',
+  });
+
+  const { sendVerificationEmail, sendSignInLink, isLoading, error, success } =
+    useEmailVerification();
+
+  useEffect(() => {
+    // Get email from query params or localStorage
+    const emailFromQuery = email as string;
+    const emailFromStorage = getEmailForSignIn();
+    const finalEmail = emailFromQuery || emailFromStorage || 'admin@example.com';
+    setDisplayEmail(finalEmail);
+
+    // Store the email from query params if available
+    if (emailFromQuery) {
+      setEmailForSignIn(emailFromQuery);
+    }
+  }, [email]);
+
+  useEffect(() => {
+    if (success) {
+      setMessage({ type: 'success', text: 'Email sent successfully! Please check your inbox.' });
+    }
+  }, [success]);
+
+  useEffect(() => {
+    if (error) {
+      setMessage({ type: 'error', text: error });
+    }
+  }, [error]);
+
+  const handleResendEmail = async () => {
+    setMessage({ type: null, text: '' });
+
+    // For admin users, send verification email instead of sign-in link
+    await sendVerificationEmail();
+  };
+
+  const handleBackToLogin = () => {
+    clearEmailForSignIn();
+    router.push('/admin-login');
+  };
+
+  return (
+    <Flex minH="100vh" direction={{ base: 'column', md: 'row' }}>
+      {/* Left: Admin Verification Content */}
+      <Flex
+        flex="1"
+        align="center"
+        justify="center"
+        px={{ base: 4, md: 12 }}
+        py={{ base: 16, md: 0 }}
+        bg="white"
+        minH={{ base: '60vh', md: '100vh' }}
+      >
+        <Box w="full" maxW="520px">
+          <Heading
+            as="h1"
+            fontFamily="'Open Sans', sans-serif"
+            fontWeight={600}
+            color={veniceBlue}
+            fontSize={{ base: '3xl', md: '4xl', lg: '5xl' }}
+            lineHeight="50px"
+            mb={2}
+          >
+            Admin Portal - First Connection Peer Support Program
+          </Heading>
+          <Heading
+            as="h2"
+            fontFamily="'Open Sans', sans-serif"
+            fontWeight={600}
+            color={veniceBlue}
+            fontSize={{ base: 'xl', md: '2xl' }}
+            mb={6}
+            mt={8}
+          >
+            Verify Your Admin Account
+          </Heading>
+          <Text
+            mb={8}
+            color={veniceBlue}
+            fontFamily="'Open Sans', sans-serif"
+            fontWeight={400}
+            fontSize="lg"
+          >
+            We sent a confirmation link to <b>{displayEmail}</b>
+          </Text>
+
+          {message.type === 'success' && (
+            <Text
+              mb={4}
+              color="green.600"
+              fontFamily="'Open Sans', sans-serif"
+              fontWeight={600}
+              fontSize="md"
+            >
+              {message.text}
+            </Text>
+          )}
+
+          {message.type === 'error' && (
+            <Text
+              mb={4}
+              color="red.600"
+              fontFamily="'Open Sans', sans-serif"
+              fontWeight={600}
+              fontSize="md"
+            >
+              {message.text}
+            </Text>
+          )}
+
+          <Text
+            color={veniceBlue}
+            fontFamily="'Open Sans', sans-serif"
+            fontWeight={400}
+            fontSize="md"
+            mb={4}
+          >
+            Didn&apos;t get a link?{' '}
+            <Link
+              onClick={handleResendEmail}
+              style={{
+                color: '#056067',
+                textDecoration: 'underline',
+                fontWeight: 600,
+                fontFamily: 'Open Sans, sans-serif',
+                cursor: 'pointer',
+              }}
+            >
+              Click here to resend.
+            </Link>
+          </Text>
+
+          <Text
+            color={veniceBlue}
+            fontFamily="'Open Sans', sans-serif"
+            fontWeight={400}
+            fontSize="md"
+          >
+            Remember your password?{' '}
+            <Link
+              href="/admin-login"
+              style={{
+                color: '#056067',
+                textDecoration: 'underline',
+                fontWeight: 600,
+                fontFamily: 'Open Sans, sans-serif',
+              }}
+            >
+              Back to login
+            </Link>
+          </Text>
+        </Box>
+      </Flex>
+      {/* Right: Image - Using admin.png from admin-login.tsx */}
+      <Box flex="1" display={{ base: 'none', md: 'block' }} position="relative" minH="100vh">
+        <Image
+          src="/admin.png"
+          alt="Admin Portal Visual"
+          fill
+          sizes="(max-width: 768px) 100vw, 50vw"
+          style={{ objectFit: 'cover', objectPosition: '90% 50%' }}
+          priority
+        />
+      </Box>
+    </Flex>
+  );
+}
diff --git a/frontend/src/pages/admin/dashboard.tsx b/frontend/src/pages/admin/dashboard.tsx
index 3af94c2b..2edf9505 100644
--- a/frontend/src/pages/admin/dashboard.tsx
+++ b/frontend/src/pages/admin/dashboard.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import Image from 'next/image';
-import { Box, Flex, Heading, Text, Link } from '@chakra-ui/react';
+import { Box, Flex, Heading, Text } from '@chakra-ui/react';
 import { ProtectedPage } from '@/components/auth/ProtectedPage';
 import { UserRole } from '@/types/authTypes';
 
@@ -41,7 +41,7 @@ export default function AdminDashboard() {
               mb={6}
               mt={8}
             >
-              Welcome!
+              You've logged in!
             </Heading>
             <Text
               mb={8}
@@ -50,26 +50,7 @@ export default function AdminDashboard() {
               fontWeight={400}
               fontSize="lg"
             >
-              We sent a confirmation link to <b>john.doe@gmail.com</b>
-            </Text>
-            <Text
-              color={veniceBlue}
-              fontFamily="'Open Sans', sans-serif"
-              fontWeight={400}
-              fontSize="md"
-            >
-              Didn&apos;t get a link?{' '}
-              <Link
-                href="/admin-login"
-                style={{
-                  color: '#056067',
-                  textDecoration: 'underline',
-                  fontWeight: 600,
-                  fontFamily: 'Open Sans, sans-serif',
-                }}
-              >
-                Click here to resend.
-              </Link>
+              Welcome to the admin dashboard. You have successfully logged in to your administrator account.
             </Text>
           </Box>
         </Flex>

From 91f7886181cddc200caeeedc8add2031ad18201b Mon Sep 17 00:00:00 2001
From: Umair Hundekar <umairmhundekar@gmail.com>
Date: Tue, 7 Oct 2025 13:23:33 -0400
Subject: [PATCH 2/5] rebased

---
 backend/app/routes/auth.py               |   2 +-
 frontend/src/APIClients/authAPIClient.ts |  46 ++--
 frontend/src/pages/admin-login.tsx       |   2 +-
 frontend/src/pages/admin-signup.tsx      |  34 ++-
 frontend/src/pages/admin.tsx             | 276 -----------------------
 5 files changed, 48 insertions(+), 312 deletions(-)
 delete mode 100644 frontend/src/pages/admin.tsx

diff --git a/backend/app/routes/auth.py b/backend/app/routes/auth.py
index 0c7764ed..e6d2f27b 100644
--- a/backend/app/routes/auth.py
+++ b/backend/app/routes/auth.py
@@ -17,7 +17,7 @@
 # TODO: ADD RATE LIMITING
 @router.post("/register", response_model=UserCreateResponse)
 async def register_user(user: UserCreateRequest, user_service: UserService = Depends(get_user_service)):
-    allowed_Admins = ["umair.hundekar@uwblueprint.org", "umairmhundekar@gmail.com"]
+    allowed_Admins = ["umair.hkar@gmail.com", "umairmhundekar@gmail.com"]
     if user.role == UserRole.ADMIN:
         if user.email not in allowed_Admins:
             raise HTTPException(status_code=403, detail="Access denied. Admin privileges required for admin portal")
diff --git a/frontend/src/APIClients/authAPIClient.ts b/frontend/src/APIClients/authAPIClient.ts
index 9ad7cfcc..cdfab868 100644
--- a/frontend/src/APIClients/authAPIClient.ts
+++ b/frontend/src/APIClients/authAPIClient.ts
@@ -35,7 +35,7 @@ export interface AuthResult {
   validationErrors?: string[];
 }
 
-export const login = async (email: string, password: string): Promise<AuthResult> => {
+export const login = async (email: string, password: string, isAdminPortal: boolean = false): Promise<AuthResult> => {
   try {
     // Validate inputs
     if (!validateEmail(email)) {
@@ -63,12 +63,29 @@ export const login = async (email: string, password: string): Promise<AuthResult
     // Attempt backend login
     try {
       const loginRequest: LoginRequest = { email, password };
-      const { data } = await baseAPIClient.post<AuthResponse>('/auth/login', loginRequest, {
-        withCredentials: true,
-      });
+      const headers: any = { withCredentials: true };
+      
+      // Add admin portal header if this is an admin login
+      if (isAdminPortal) {
+        headers.headers = { 'X-Admin-Portal': 'true' };
+      }
+      
+      const { data } = await baseAPIClient.post<AuthResponse>('/auth/login', loginRequest, headers);
       localStorage.setItem(AUTHENTICATED_USER_KEY, JSON.stringify(data));
-      return { success: true, user: { ...data.user, ...data } as AuthenticatedUser };
-    } catch {
+      return { success: true, user: { ...data.user, ...data } };
+    } catch (error) {
+      // Handle admin privilege errors specifically
+      if (error && typeof error === 'object' && 'response' in error) {
+        const response = (error as { response?: { status?: number; data?: { detail?: string } } }).response;
+        if (response?.status === 403 && isAdminPortal) {
+          return {
+            success: false,
+            error: 'Access denied. You do not have admin privileges. Please contact an administrator.',
+            errorCode: 'auth/insufficient-privileges',
+          };
+        }
+      }
+      
       // Backend login failure is not critical since Firebase auth succeeded
       return {
         success: true,
@@ -217,22 +234,19 @@ export const register = async ({
       } else {
         console.warn('[REGISTER] Failed to send email verification after registration');
       }
+
+      // Return success with user info - don't try to login since email isn't verified yet
+      return {
+        success: true,
+        user: { email: user.email, uid: user.uid } as unknown as AuthenticatedUser,
+      };
     } catch (firebaseError) {
       console.error('[REGISTER] Firebase sign-in failed:', firebaseError);
       // Continue with registration even if Firebase sign-in fails
       // The user can still verify their email later
-    }
-
-    // Try backend login but don't fail if it doesn't work
-    try {
-      const loginResult = await login(email, password);
-      return loginResult;
-    } catch (loginError) {
-      console.warn('[REGISTER] Backend login failed, but registration was successful:', loginError);
-      // Return success even if backend login fails, since Firebase user was created
       return {
         success: true,
-        user: { email, uid: auth.currentUser?.uid || 'unknown' } as unknown as AuthenticatedUser,
+        user: { email, uid: 'unknown' } as unknown as AuthenticatedUser,
       };
     }
   } catch (error) {
diff --git a/frontend/src/pages/admin-login.tsx b/frontend/src/pages/admin-login.tsx
index cc3b0bbd..20e8aec3 100644
--- a/frontend/src/pages/admin-login.tsx
+++ b/frontend/src/pages/admin-login.tsx
@@ -163,7 +163,7 @@ export default function AdminLogin() {
                   marginTop: 6,
                   cursor: 'pointer',
                 }}
-                onClick={() => router.push('/admin-reset-password')}
+                onClick={() => router.push('/reset-password')}
               >
                 Forgot Password?
               </span>
diff --git a/frontend/src/pages/admin-signup.tsx b/frontend/src/pages/admin-signup.tsx
index b98fe141..ae647b16 100644
--- a/frontend/src/pages/admin-signup.tsx
+++ b/frontend/src/pages/admin-signup.tsx
@@ -38,25 +38,23 @@ export default function AdminLoginPage() {
         signupMethod: SignUpMethod.PASSWORD,
       };
       const result = await register(userData);
-      console.log('Admin registration success:', result);
-      router.push(`/admin-verify?email=${encodeURIComponent(email)}&role=admin`);
-    } catch (err: unknown) {
-      console.error('Admin registration error:', err);
-      if (
-        err &&
-        typeof err === 'object' &&
-        'response' in err &&
-        err.response &&
-        typeof err.response === 'object' &&
-        'data' in err.response &&
-        err.response.data &&
-        typeof err.response.data === 'object' &&
-        'detail' in err.response.data
-      ) {
-        setError((err.response.data as { detail: string }).detail || 'Registration failed');
+      console.log("?", result)
+      // Check if it's an admin privilege error
+      if (!result.success && result.error && result.error.includes('Admin privileges required')) {
+        setError('Access denied. Admin registration is restricted. Please contact an administrator.');
+        return;
+      }
+      
+      // If successful (even if success is false, check if we got a user)
+      if (result.user || result.success) {
+        console.log('Admin registration success:', result);
+        router.push(`/admin-verify?email=${encodeURIComponent(email)}&role=admin`);
       } else {
-        setError('Registration failed');
+        setError(result.error || 'Registration failed');
       }
+    } catch (err: unknown) {
+      console.error('Admin registration error:', err);
+      setError('Registration failed');
     }
   };
 
@@ -247,7 +245,7 @@ export default function AdminLoginPage() {
           >
             Already have an account?{' '}
             <Link
-              href="/admin"
+              href="/admin-login"
               style={{
                 color: teal,
                 textDecoration: 'underline',
diff --git a/frontend/src/pages/admin.tsx b/frontend/src/pages/admin.tsx
deleted file mode 100644
index 5bc397b8..00000000
--- a/frontend/src/pages/admin.tsx
+++ /dev/null
@@ -1,276 +0,0 @@
-import React, { useState } from 'react';
-import Image from 'next/image';
-import Link from 'next/link';
-import { Box, Flex, Heading, Text, Button, Input } from '@chakra-ui/react';
-import { Field } from '@/components/ui/field';
-import { InputGroup } from '@/components/ui/input-group';
-import { useRouter } from 'next/router';
-import { register } from '@/APIClients/authAPIClient';
-import { UserRole, SignUpMethod } from '@/types/authTypes';
-
-const veniceBlue = '#1d3448';
-const fieldGray = '#414651';
-const teal = '#056067';
-
-export default function AdminLoginPage() {
-  const router = useRouter();
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-  const [confirmPassword, setConfirmPassword] = useState('');
-  const [error, setError] = useState('');
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    setError('');
-
-    if (password !== confirmPassword) {
-      setError('Passwords do not match');
-      return;
-    }
-
-    try {
-      const userData = {
-        first_name: '',
-        last_name: '',
-        email,
-        password,
-        role: UserRole.ADMIN,
-        signupMethod: SignUpMethod.PASSWORD,
-      };
-      const result = await register(userData);
-      console.log('Admin registration success:', result);
-      router.push(`/verify?email=${encodeURIComponent(email)}&role=admin`);
-    } catch (err: unknown) {
-      console.error('Admin registration error:', err);
-      if (
-        err &&
-        typeof err === 'object' &&
-        'response' in err &&
-        err.response &&
-        typeof err.response === 'object' &&
-        'data' in err.response &&
-        err.response.data &&
-        typeof err.response.data === 'object' &&
-        'detail' in err.response.data
-      ) {
-        setError((err.response.data as { detail: string }).detail || 'Registration failed');
-      } else {
-        setError('Registration failed');
-      }
-    }
-  };
-
-  return (
-    <Flex minH="100vh" direction={{ base: 'column', md: 'row' }}>
-      {/* Left: Admin Login Form */}
-      <Flex
-        flex="1"
-        align="center"
-        justify="center"
-        px={{ base: 4, md: 12 }}
-        py={{ base: 16, md: 0 }}
-        bg="white"
-        minH={{ base: '60vh', md: '100vh' }}
-      >
-        <Box w="full" maxW="520px">
-          <Heading
-            as="h1"
-            fontFamily="'Open Sans', sans-serif"
-            fontWeight={600}
-            color={veniceBlue}
-            fontSize={{ base: '3xl', md: '4xl', lg: '5xl' }}
-            lineHeight="50px"
-            mb={2}
-          >
-            Admin Portal - First Connection Peer
-            <br />
-            Support Program
-          </Heading>
-          <Heading
-            as="h2"
-            fontFamily="'Open Sans', sans-serif"
-            fontWeight={600}
-            color={veniceBlue}
-            fontSize={{ base: 'xl', md: '2xl' }}
-            mb={6}
-            mt={8}
-          >
-            Welcome!
-          </Heading>
-          <Text
-            mb={8}
-            color={veniceBlue}
-            fontFamily="'Open Sans', sans-serif"
-            fontWeight={400}
-            fontSize="lg"
-          >
-            Let&apos;s start by setting up your admin account.
-          </Text>
-          <form onSubmit={handleSubmit}>
-            <Field
-              label={
-                <span
-                  style={{
-                    color: fieldGray,
-                    fontWeight: 600,
-                    fontSize: 14,
-                    fontFamily: 'Open Sans, sans-serif',
-                  }}
-                >
-                  Email
-                </span>
-              }
-              mb={4}
-            >
-              <InputGroup w="100%">
-                <Input
-                  type="email"
-                  placeholder="john.doe@gmail.com"
-                  required
-                  autoComplete="email"
-                  w="100%"
-                  maxW="518px"
-                  fontFamily="'Open Sans', sans-serif"
-                  fontWeight={400}
-                  fontSize={14}
-                  color={fieldGray}
-                  bg="white"
-                  borderColor="#D5D7DA"
-                  _placeholder={{ color: '#A0AEC0', fontWeight: 400 }}
-                  value={email}
-                  onChange={(e) => setEmail(e.target.value)}
-                />
-              </InputGroup>
-            </Field>
-            <Field
-              label={
-                <span
-                  style={{
-                    color: fieldGray,
-                    fontWeight: 600,
-                    fontSize: 14,
-                    fontFamily: 'Open Sans, sans-serif',
-                  }}
-                >
-                  Password
-                </span>
-              }
-              mb={2}
-            >
-              <InputGroup w="100%">
-                <Input
-                  type="password"
-                  placeholder=""
-                  required
-                  autoComplete="new-password"
-                  w="100%"
-                  maxW="518px"
-                  fontFamily="'Open Sans', sans-serif"
-                  fontWeight={400}
-                  fontSize={14}
-                  color={fieldGray}
-                  bg="white"
-                  borderColor="#D5D7DA"
-                  _placeholder={{ color: '#A0AEC0', fontWeight: 400 }}
-                  value={password}
-                  onChange={(e) => setPassword(e.target.value)}
-                />
-              </InputGroup>
-            </Field>
-            <Field
-              label={
-                <span
-                  style={{
-                    color: fieldGray,
-                    fontWeight: 600,
-                    fontSize: 14,
-                    fontFamily: 'Open Sans, sans-serif',
-                  }}
-                >
-                  Confirm Password
-                </span>
-              }
-              mb={6}
-            >
-              <InputGroup w="100%">
-                <Input
-                  type="password"
-                  placeholder=""
-                  required
-                  autoComplete="new-password"
-                  w="100%"
-                  maxW="518px"
-                  fontFamily="'Open Sans', sans-serif"
-                  fontWeight={400}
-                  fontSize={14}
-                  color={fieldGray}
-                  bg="white"
-                  borderColor="#D5D7DA"
-                  _placeholder={{ color: '#A0AEC0', fontWeight: 400 }}
-                  value={confirmPassword}
-                  onChange={(e) => setConfirmPassword(e.target.value)}
-                />
-              </InputGroup>
-            </Field>
-            {error && (
-              <Text color="red.500" mb={4} fontWeight={600} fontFamily="'Open Sans', sans-serif">
-                {typeof error === 'string' ? error : JSON.stringify(error)}
-              </Text>
-            )}
-            <Button
-              type="submit"
-              w="100%"
-              maxW="518px"
-              mt={2}
-              size="lg"
-              fontWeight={600}
-              fontFamily="'Open Sans', sans-serif"
-              fontSize="lg"
-              bg={teal}
-              color="white"
-              borderRadius="8px"
-              border="1px solid #056067"
-              boxShadow="0 1px 2px 0 #0A0D12, 0 0 0 0 transparent"
-              _hover={{ bg: '#044953' }}
-              px={8}
-              py={3}
-            >
-              Continue <span style={{ display: 'inline-block', marginLeft: 8 }}>&#8594;</span>
-            </Button>
-          </form>
-          <Text
-            mt={8}
-            color={veniceBlue}
-            fontSize="md"
-            fontWeight={400}
-            fontFamily="'Open Sans', sans-serif"
-          >
-            Already have an account?{' '}
-            <Link
-              href="/admin"
-              style={{
-                color: teal,
-                textDecoration: 'underline',
-                fontWeight: 600,
-                fontFamily: 'Open Sans, sans-serif',
-              }}
-            >
-              Sign in.
-            </Link>
-          </Text>
-        </Box>
-      </Flex>
-      {/* Right: Image */}
-      <Box flex="1" display={{ base: 'none', md: 'block' }} position="relative" minH="100vh">
-        <Image
-          src="/admin.png"
-          alt="Admin Portal Visual"
-          fill
-          sizes="(max-width: 768px) 100vw, 50vw"
-          style={{ objectFit: 'cover', objectPosition: '90% 50%' }}
-          priority
-        />
-      </Box>
-    </Flex>
-  );
-}

From c88972b43b2bdcf2cbc441427d58a73612de35b3 Mon Sep 17 00:00:00 2001
From: Umair Hundekar <umairmhundekar@gmail.com>
Date: Tue, 7 Oct 2025 13:25:39 -0400
Subject: [PATCH 3/5] rebase pt 2

---
 backend/app/routes/auth.py               |  2 +-
 frontend/src/APIClients/authAPIClient.ts | 12 +++++++-----
 frontend/src/pages/admin-login.tsx       |  4 +++-
 frontend/src/pages/admin-signup.tsx      |  8 +++++---
 frontend/src/pages/admin/dashboard.tsx   |  3 ++-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/backend/app/routes/auth.py b/backend/app/routes/auth.py
index e6d2f27b..dce36793 100644
--- a/backend/app/routes/auth.py
+++ b/backend/app/routes/auth.py
@@ -21,7 +21,7 @@ async def register_user(user: UserCreateRequest, user_service: UserService = Dep
     if user.role == UserRole.ADMIN:
         if user.email not in allowed_Admins:
             raise HTTPException(status_code=403, detail="Access denied. Admin privileges required for admin portal")
-    
+
     try:
         return await user_service.create_user(user)
     except HTTPException as http_ex:
diff --git a/frontend/src/APIClients/authAPIClient.ts b/frontend/src/APIClients/authAPIClient.ts
index cdfab868..51a1deca 100644
--- a/frontend/src/APIClients/authAPIClient.ts
+++ b/frontend/src/APIClients/authAPIClient.ts
@@ -64,28 +64,30 @@ export const login = async (email: string, password: string, isAdminPortal: bool
     try {
       const loginRequest: LoginRequest = { email, password };
       const headers: any = { withCredentials: true };
-      
+
       // Add admin portal header if this is an admin login
       if (isAdminPortal) {
         headers.headers = { 'X-Admin-Portal': 'true' };
       }
-      
+
       const { data } = await baseAPIClient.post<AuthResponse>('/auth/login', loginRequest, headers);
       localStorage.setItem(AUTHENTICATED_USER_KEY, JSON.stringify(data));
       return { success: true, user: { ...data.user, ...data } };
     } catch (error) {
       // Handle admin privilege errors specifically
       if (error && typeof error === 'object' && 'response' in error) {
-        const response = (error as { response?: { status?: number; data?: { detail?: string } } }).response;
+        const response = (error as { response?: { status?: number; data?: { detail?: string } } })
+          .response;
         if (response?.status === 403 && isAdminPortal) {
           return {
             success: false,
-            error: 'Access denied. You do not have admin privileges. Please contact an administrator.',
+            error:
+              'Access denied. You do not have admin privileges. Please contact an administrator.',
             errorCode: 'auth/insufficient-privileges',
           };
         }
       }
-      
+
       // Backend login failure is not critical since Firebase auth succeeded
       return {
         success: true,
diff --git a/frontend/src/pages/admin-login.tsx b/frontend/src/pages/admin-login.tsx
index 20e8aec3..2359d841 100644
--- a/frontend/src/pages/admin-login.tsx
+++ b/frontend/src/pages/admin-login.tsx
@@ -27,7 +27,9 @@ export default function AdminLogin() {
         console.log('Admin login success:', result);
         router.push('/admin/dashboard');
       } else {
-        setError('Invalid email or password. Please check your credentials and try again. If you recently signed up, make sure to verify your email first.');
+        setError(
+          'Invalid email or password. Please check your credentials and try again. If you recently signed up, make sure to verify your email first.',
+        );
       }
     } catch (err: unknown) {
       console.error('Admin login error:', err);
diff --git a/frontend/src/pages/admin-signup.tsx b/frontend/src/pages/admin-signup.tsx
index ae647b16..9eee1860 100644
--- a/frontend/src/pages/admin-signup.tsx
+++ b/frontend/src/pages/admin-signup.tsx
@@ -38,13 +38,15 @@ export default function AdminLoginPage() {
         signupMethod: SignUpMethod.PASSWORD,
       };
       const result = await register(userData);
-      console.log("?", result)
+      console.log('?', result);
       // Check if it's an admin privilege error
       if (!result.success && result.error && result.error.includes('Admin privileges required')) {
-        setError('Access denied. Admin registration is restricted. Please contact an administrator.');
+        setError(
+          'Access denied. Admin registration is restricted. Please contact an administrator.',
+        );
         return;
       }
-      
+
       // If successful (even if success is false, check if we got a user)
       if (result.user || result.success) {
         console.log('Admin registration success:', result);
diff --git a/frontend/src/pages/admin/dashboard.tsx b/frontend/src/pages/admin/dashboard.tsx
index 2edf9505..6db15f30 100644
--- a/frontend/src/pages/admin/dashboard.tsx
+++ b/frontend/src/pages/admin/dashboard.tsx
@@ -50,7 +50,8 @@ export default function AdminDashboard() {
               fontWeight={400}
               fontSize="lg"
             >
-              Welcome to the admin dashboard. You have successfully logged in to your administrator account.
+              Welcome to the admin dashboard. You have successfully logged in to your administrator
+              account.
             </Text>
           </Box>
         </Flex>

From ebbff45360aa146cecd5a016c311e32a105f5a8e Mon Sep 17 00:00:00 2001
From: Umair Hundekar <umairmhundekar@gmail.com>
Date: Tue, 7 Oct 2025 13:29:49 -0400
Subject: [PATCH 4/5] fixed linter

---
 frontend/src/APIClients/authAPIClient.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/APIClients/authAPIClient.ts b/frontend/src/APIClients/authAPIClient.ts
index 51a1deca..a753aa50 100644
--- a/frontend/src/APIClients/authAPIClient.ts
+++ b/frontend/src/APIClients/authAPIClient.ts
@@ -35,7 +35,11 @@ export interface AuthResult {
   validationErrors?: string[];
 }
 
-export const login = async (email: string, password: string, isAdminPortal: boolean = false): Promise<AuthResult> => {
+export const login = async (
+  email: string,
+  password: string,
+  isAdminPortal: boolean = false,
+): Promise<AuthResult> => {
   try {
     // Validate inputs
     if (!validateEmail(email)) {

From d7e130e65404b007f2705cc597a989b43d7b3244 Mon Sep 17 00:00:00 2001
From: Umair Hundekar <umairmhundekar@gmail.com>
Date: Tue, 7 Oct 2025 13:43:48 -0400
Subject: [PATCH 5/5] Allowed for verfiication through log in page

---
 frontend/src/pages/admin-login.tsx | 7 +++----
 frontend/src/pages/index.tsx       | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/admin-login.tsx b/frontend/src/pages/admin-login.tsx
index 2359d841..e2b07efb 100644
--- a/frontend/src/pages/admin-login.tsx
+++ b/frontend/src/pages/admin-login.tsx
@@ -24,12 +24,11 @@ export default function AdminLogin() {
     try {
       const result = await login(email, password);
       if (result.success) {
-        console.log('Admin login success:', result);
         router.push('/admin/dashboard');
+      } else if (result.errorCode === 'auth/email-not-verified') {
+        router.push(`/admin-verify?email=${encodeURIComponent(email)}&role=admin`);
       } else {
-        setError(
-          'Invalid email or password. Please check your credentials and try again. If you recently signed up, make sure to verify your email first.',
-        );
+        setError('Invalid email or password. Please check your credentials and try again.');
       }
     } catch (err: unknown) {
       console.error('Admin login error:', err);
diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx
index 784fe1af..cfe1aadb 100644
--- a/frontend/src/pages/index.tsx
+++ b/frontend/src/pages/index.tsx
@@ -37,6 +37,8 @@ export default function LoginPage() {
 
       if (result.success) {
         router.push('/welcome');
+      } else if (result.errorCode === 'auth/email-not-verified') {
+        router.push(`/verify?email=${encodeURIComponent(email)}`);
       } else {
         setError(result.error || 'Login failed. Please try again.');
       }