Added admin user management

Author: Uttam Singh

backend/Dockerfile

@@ -1,15 +1,18 @@
+# Use Python base image
 FROM python:3.11-slim
 
+# Set working directory
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y build-essential && rm -rf /var/lib/apt/lists/*
-
-# Copy requirements.txt from backend folder (Render context fix)
+# Copy and install dependencies
 COPY backend/requirements.txt ./requirements.txt
-
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy the rest of the backend code
+# Copy the app source
 COPY backend/. .
 
+# Expose FastAPI default port
+EXPOSE 8000
+
+# Run the FastAPI app
 CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

backend/app/main.py

@@ -178,3 +178,4 @@ def ai_chat(prompt: str = Form(...)):
 
 # --- USER ROUTES ---
 app.include_router(users.router, prefix="/users", tags=["Users"])
+

backend/app/models/user.py

@@ -1,12 +1,13 @@
-from sqlalchemy import Column, Integer, String
-from sqlalchemy.orm import declarative_base
-
-Base = declarative_base()
+from sqlalchemy import Column, Integer, String, Boolean
+from app.database import Base
 
 class User(Base):
     __tablename__ = "users"
-
     id = Column(Integer, primary_key=True, index=True)
-    username = Column(String(100), unique=True, nullable=False)
-    password = Column(String(255), nullable=False)
-    role = Column(String(50), default="member")
+    name = Column(String(120), nullable=False)
+    email = Column(String(255), unique=True, index=True, nullable=False)
+    hashed_password = Column(String(255), nullable=False)
+    department = Column(String(100))      # e.g., Accounts, Compliance, Ops
+    role = Column(String(50))             # admin, auditor, auditee, manager
+    manager_email = Column(String(255))   # reporting manager
+    is_active = Column(Boolean, default=True)

backend/app/routers/users.py

@@ -1,17 +1,47 @@
-from fastapi import APIRouter, HTTPException, Depends
+from fastapi import APIRouter, Depends, HTTPException, Form
+from passlib.hash import bcrypt
 from sqlalchemy.orm import Session
-from app.main import get_db
+from app.database import get_db
+from app.models.user import User
 
-router = APIRouter(prefix="/users", tags=["Users"])
+router = APIRouter()
 
+# List all users
 @router.get("/")
 def list_users(db: Session = Depends(get_db)):
-    # For now, just a placeholder
-    return {"message": "User list (placeholder)"}
+    return db.query(User).all()
 
-@router.post("/login")
-def login(username: str, password: str, db: Session = Depends(get_db)):
-    # Simple fake login logic (replace later)
-    if username == "admin" and password == "admin123":
-        return {"message": "Login successful", "role": "admin"}
-    raise HTTPException(status_code=401, detail="Invalid credentials")
+# Create new user
+@router.post("/")
+def create_user(
+    name: str = Form(...),
+    email: str = Form(...),
+    password: str = Form(...),
+    department: str = Form(None),
+    role: str = Form("auditee"),
+    manager_email: str = Form(None),
+    db: Session = Depends(get_db),
+):
+    if db.query(User).filter(User.email == email).first():
+        raise HTTPException(status_code=400, detail="Email already exists")
+    user = User(
+        name=name,
+        email=email,
+        hashed_password=bcrypt.hash(password),
+        department=department,
+        role=role,
+        manager_email=manager_email,
+    )
+    db.add(user)
+    db.commit()
+    return {"ok": True}
+
+# Delete user
+@router.delete("/{user_id}")
+def delete_user(user_id: int, db: Session = Depends(get_db)):
+    user = db.get(User, user_id)
+    if not user:
+        raise HTTPException(status_code=404, detail="User not found")
+    db.delete(user)
+    db.commit()
+    return {"ok": True}

backend/app/schemas/user.py

@@ -0,0 +1,18 @@
+from pydantic import BaseModel
+
+class UserCreate(BaseModel):
+    username: str
+    password: str
+    role: str = "user"
+
+class UserLogin(BaseModel):
+    username: str
+    password: str
+
+class UserOut(BaseModel):
+    id: int
+    username: str
+    role: str
+
+    class Config:
+        from_attributes = True

frontend/src/assets/logo.png.png

@@ -8,3 +8,8 @@ ReactDOM.createRoot(document.getElementById("root")).render(
     <App />
   </React.StrictMode>
 );
+import AdminUsers from "./pages/AdminUsers.jsx";
+
+// Add inside Routes:
+<Route path="/admin/users" element={<AdminUsers />} />
+

frontend/src/main.jsx

@@ -0,0 +1,89 @@
+import React, { useState, useEffect } from "react";
+const API = import.meta.env.VITE_API_URL;
+
+export default function AdminUsers() {
+  const [users, setUsers] = useState([]);
+  const [form, setForm] = useState({
+    name: "",
+    email: "",
+    password: "",
+    department: "",
+    role: "auditee",
+    manager_email: "",
+  });
+
+  const loadUsers = async () => {
+    const res = await fetch(`${API}/users`);
+    const data = await res.json();
+    setUsers(data);
+  };
+
+  useEffect(() => {
+    loadUsers();
+  }, []);
+
+  const createUser = async (e) => {
+    e.preventDefault();
+    const fd = new FormData();
+    Object.entries(form).forEach(([k, v]) => fd.append(k, v));
+    const res = await fetch(`${API}/users`, { method: "POST", body: fd });
+    if (res.ok) {
+      alert("User created");
+      loadUsers();
+    } else alert("Error creating user");
+  };
+
+  const deleteUser = async (id) => {
+    if (!window.confirm("Are you sure?")) return;
+    await fetch(`${API}/users/${id}`, { method: "DELETE" });
+    loadUsers();
+  };
+
+  return (
+    <div style={{ maxWidth: "800px", margin: "40px auto" }}>
+      <h2>Admin – User Management</h2>
+      <form onSubmit={createUser} style={{ display: "grid", gap: 10 }}>
+        <input placeholder="Name" onChange={(e) => setForm({ ...form, name: e.target.value })} />
+        <input placeholder="Email" onChange={(e) => setForm({ ...form, email: e.target.value })} />
+        <input type="password" placeholder="Password" onChange={(e) => setForm({ ...form, password: e.target.value })} />
+        <input placeholder="Department" onChange={(e) => setForm({ ...form, department: e.target.value })} />
+        <input placeholder="Manager Email" onChange={(e) => setForm({ ...form, manager_email: e.target.value })} />
+        <select onChange={(e) => setForm({ ...form, role: e.target.value })}>
+          <option value="auditee">Auditee</option>
+          <option value="auditor">Auditor</option>
+          <option value="manager">Manager</option>
+          <option value="admin">Admin</option>
+        </select>
+        <button>Create User</button>
+      </form>
+
+      <h3 style={{ marginTop: "20px" }}>User List</h3>
+      <table border="1" cellPadding="8" width="100%">
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Email</th>
+            <th>Dept</th>
+            <th>Role</th>
+            <th>Manager</th>
+            <th>Delete</th>
+          </tr>
+        </thead>
+        <tbody>
+          {users.map((u) => (
+            <tr key={u.id}>
+              <td>{u.name}</td>
+              <td>{u.email}</td>
+              <td>{u.department}</td>
+              <td>{u.role}</td>
+              <td>{u.manager_email}</td>
+              <td>
+                <button onClick={() => deleteUser(u.id)}>❌</button>
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+}

frontend/src/pages/AdminUsers.jsx

@@ -3,19 +3,64 @@ import logo from "../assets/logo.png";
 import "./Login.css";
 
 export default function Login() {
-  const [email, setEmail] = useState("");
+  const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
+  const [loading, setLoading] = useState(false);
 
-  const handleSubmit = (e) => {
+  // ✅ TEMP ADMIN LOGIN (for testing)
+  const ADMIN_ID = "[email protected]";
+  const ADMIN_PASS = "Admin@123";
+
+  const handleSubmit = async (e) => {
     e.preventDefault();
-    // Replace this with your backend API call later
-    if (email === "[email protected]" && password === "password123") {
+    setLoading(true);
+
+    // ✅ Step 1: Local hardcoded admin check (for testing)
+    if (username === ADMIN_ID && password === ADMIN_PASS) {
+      alert("Admin login successful!");
+      localStorage.setItem("role", "admin");
       window.location.href = "/dashboard";
-    } else {
-      alert("Invalid credentials");
+      setLoading(false);
+      return;
+    }
+
+    // ✅ Step 2: (optional) Try backend login if not admin
+    try {
+      const response = await fetch(
+        "https://fat-eibl-backend.onrender.com/users/login",
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ username, password }),
+        }
+      );
+
+      const data = await response.json();
+
+      if (response.ok) {
+        localStorage.setItem("token", data.access_token);
+        localStorage.setItem("role", data.role);
+
+        if (data.role === "admin") {
+          window.location.href = "/dashboard";
+        } else {
+          window.location.href = "/user-dashboard";
+        }
+      } else {
+        alert(data.detail || "Invalid username or password");
+      }
+    } catch (error) {
+      console.error("Login failed:", error);
+      alert("Server error. Please try again later.");
+    } finally {
+      setLoading(false);
     }
   };
 
+  const handleForgotPassword = () => {
+    alert("Forgot Password feature coming soon. Please contact Admin.");
+  };
+
   return (
     <div
       style={{
@@ -27,7 +72,11 @@ export default function Login() {
         backgroundColor: "#f5f9ff",
       }}
     >
-      <img src={logo} alt="Company Logo" style={{ width: "120px", marginBottom: "20px" }} />
+      <img
+        src={logo}
+        alt="Company Logo"
+        style={{ width: "120px", marginBottom: "20px" }}
+      />
       <h1 style={{ color: "#004aad" }}>Welcome to FAT-EIBL</h1>
       <p style={{ color: "#003b80", marginBottom: "30px" }}>
         Finance Audit Tracker – Edme Insurance Brokers Limited
@@ -45,10 +94,10 @@ export default function Login() {
         }}
       >
         <input
-          type="email"
-          placeholder="Email"
-          value={email}
-          onChange={(e) => setEmail(e.target.value)}
+          type="text"
+          placeholder="Enter Username / Email"
+          value={username}
+          onChange={(e) => setUsername(e.target.value)}
           style={{
             width: "100%",
             padding: "10px",
@@ -60,7 +109,7 @@ export default function Login() {
         />
         <input
           type="password"
-          placeholder="Password"
+          placeholder="Enter Password"
           value={password}
           onChange={(e) => setPassword(e.target.value)}
           style={{
@@ -72,6 +121,7 @@ export default function Login() {
           }}
           required
         />
+
         <button
           type="submit"
           style={{
@@ -83,9 +133,22 @@ export default function Login() {
             cursor: "pointer",
             width: "100%",
           }}
+          disabled={loading}
         >
-          Login
+          {loading ? "Logging in..." : "Login"}
         </button>
+
+        <p
+          onClick={handleForgotPassword}
+          style={{
+            color: "#004aad",
+            marginTop: "15px",
+            cursor: "pointer",
+            textDecoration: "underline",
+          }}
+        >
+          Forgot Password?
+        </p>
       </form>
     </div>
   );