Fixed login redirecting issues

app/routes/admin_pages.py

@@ -27,8 +27,13 @@ from fastapi import APIRouter, Request, Depends, Path
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
 from sqlalchemy.orm import Session
+from typing import Optional
 
-from app.api.deps import get_current_admin_from_cookie_or_header, get_db
+from app.api.deps import (
+    get_current_admin_from_cookie_or_header,
+    get_current_admin_optional,
+    get_db
+)
 from models.database.user import User
 
 router = APIRouter()
@@ -40,23 +45,37 @@ templates = Jinja2Templates(directory="app/templates")
 # ============================================================================
 
 @router.get("/", response_class=RedirectResponse, include_in_schema=False)
-async def admin_root():
+async def admin_root(
+        current_user: Optional[User] = Depends(get_current_admin_optional)
+):
     """
-    Redirect /admin/ to /admin/login.
+    Redirect /admin/ based on authentication status.
 
-    Simple approach:
-    - Unauthenticated users → see login form
-    - Authenticated users → login page shows form (they can navigate to dashboard)
+    - Authenticated admin users → /admin/dashboard
+    - Unauthenticated users → /admin/login
     """
+    if current_user:
+        # User is already logged in as admin, redirect to dashboard
+        return RedirectResponse(url="/admin/dashboard", status_code=302)
+
     return RedirectResponse(url="/admin/login", status_code=302)
 
 
 @router.get("/login", response_class=HTMLResponse, include_in_schema=False)
-async def admin_login_page(request: Request):
+async def admin_login_page(
+        request: Request,
+        current_user: Optional[User] = Depends(get_current_admin_optional)
+):
     """
     Render admin login page.
-    No authentication required.
+
+    If user is already authenticated as admin, redirect to dashboard.
+    Otherwise, show login form.
     """
+    if current_user:
+        # User is already logged in as admin, redirect to dashboard
+        return RedirectResponse(url="/admin/dashboard", status_code=302)
+
     return templates.TemplateResponse(
         "admin/login.html",
         {"request": request}

app/routes/vendor_pages.py

@@ -24,8 +24,12 @@ Routes:
 from fastapi import APIRouter, Request, Depends, Path
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
+from typing import Optional
 
-from app.api.deps import get_current_vendor_from_cookie_or_header
+from app.api.deps import (
+    get_current_vendor_from_cookie_or_header,
+    get_current_vendor_optional
+)
 from models.database.user import User
 
 router = APIRouter()
@@ -46,28 +50,44 @@ async def vendor_root_no_slash(vendor_code: str = Path(..., description="Vendor
 
 
 @router.get("/{vendor_code}/", response_class=RedirectResponse, include_in_schema=False)
-async def vendor_root(vendor_code: str = Path(..., description="Vendor code")):
+async def vendor_root(
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: Optional[User] = Depends(get_current_vendor_optional)
+):
     """
-    Redirect /vendor/{code}/ to login page.
-    Simple approach - let login page handle authenticated redirects.
+    Redirect /vendor/{code}/ based on authentication status.
+
+    - Authenticated vendor users → /vendor/{code}/dashboard
+    - Unauthenticated users → /vendor/{code}/login
     """
+    if current_user:
+        # User is already logged in as vendor, redirect to dashboard
+        return RedirectResponse(url=f"/vendor/{vendor_code}/dashboard", status_code=302)
+
     return RedirectResponse(url=f"/vendor/{vendor_code}/login", status_code=302)
 
 
 @router.get("/{vendor_code}/login", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_login_page(
         request: Request,
-        vendor_code: str = Path(..., description="Vendor code")
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: Optional[User] = Depends(get_current_vendor_optional)
 ):
     """
     Render vendor login page.
-    No authentication required.
+
+    If user is already authenticated as vendor, redirect to dashboard.
+    Otherwise, show login form.
 
     JavaScript will:
     - Load vendor info via API
     - Handle login form submission
     - Redirect to dashboard on success
     """
+    if current_user:
+        # User is already logged in as vendor, redirect to dashboard
+        return RedirectResponse(url=f"/vendor/{vendor_code}/dashboard", status_code=302)
+
     return templates.TemplateResponse(
         "vendor/login.html",
         {
@@ -97,7 +117,7 @@ async def vendor_dashboard_page(
     - Handle all interactivity
     """
     return templates.TemplateResponse(
-        "vendor/admin/dashboard.html",
+        "vendor/dashboard.html",
         {
             "request": request,
             "user": current_user,
@@ -121,7 +141,7 @@ async def vendor_products_page(
     JavaScript loads product list via API.
     """
     return templates.TemplateResponse(
-        "vendor/admin/products.html",
+        "vendor/products.html",
         {
             "request": request,
             "user": current_user,
@@ -145,7 +165,7 @@ async def vendor_orders_page(
     JavaScript loads order list via API.
     """
     return templates.TemplateResponse(
-        "vendor/admin/orders.html",
+        "vendor/orders.html",
         {
             "request": request,
             "user": current_user,
@@ -169,7 +189,7 @@ async def vendor_customers_page(
     JavaScript loads customer list via API.
     """
     return templates.TemplateResponse(
-        "vendor/admin/customers.html",
+        "vendor/customers.html",
         {
             "request": request,
             "user": current_user,
@@ -193,7 +213,7 @@ async def vendor_inventory_page(
     JavaScript loads inventory data via API.
     """
     return templates.TemplateResponse(
-        "vendor/admin/inventory.html",
+        "vendor/inventory.html",
         {
             "request": request,
             "user": current_user,
@@ -217,7 +237,7 @@ async def vendor_marketplace_page(
     JavaScript loads import jobs and products via API.
     """
     return templates.TemplateResponse(
-        "vendor/admin/marketplace.html",
+        "vendor/marketplace.html",
         {
             "request": request,
             "user": current_user,
@@ -241,7 +261,7 @@ async def vendor_team_page(
     JavaScript loads team members via API.
     """
     return templates.TemplateResponse(
-        "vendor/admin/team.html",
+        "vendor/team.html",
         {
             "request": request,
             "user": current_user,
@@ -251,9 +271,29 @@ async def vendor_team_page(
 
 
 # ============================================================================
-# SETTINGS
+# PROFILE & SETTINGS
 # ============================================================================
 
+@router.get("/{vendor_code}/profile", response_class=HTMLResponse, include_in_schema=False)
+async def vendor_profile_page(
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_from_cookie_or_header)
+):
+    """
+    Render vendor profile page.
+    User can manage their personal profile information.
+    """
+    return templates.TemplateResponse(
+        "vendor/profile.html",
+        {
+            "request": request,
+            "user": current_user,
+            "vendor_code": vendor_code,
+        }
+    )
+
+
 @router.get("/{vendor_code}/settings", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_settings_page(
         request: Request,