Merge branch 'main' of https://git.coastit.co.za/caitlin/CRM_ENVR

src/app/(dashboard)/users/page.tsx

@@ -1,22 +1,54 @@
 "use client"
 
-import { useState } from "react"
+import { useState, useEffect, useCallback } from "react"
 import { PageHeader } from "@/components/shared/page-header"
 import { UsersTable } from "@/components/users/users-table"
 import { UserFormDialog } from "@/components/users/user-form-dialog"
 import { Button } from "@/components/ui/button"
-import { users } from "@/data/users"
+import { Input } from "@/components/ui/input"
-import { Plus, Users as UsersIcon } from "lucide-react"
+import { Plus, Search, Users as UsersIcon } from "lucide-react"
+import { User } from "@/types"
+import { toast } from "sonner"
 
 export default function UsersPage() {
   const [createOpen, setCreateOpen] = useState(false)
+  const [users, setUsers] = useState<User[]>([])
+  const [loading, setLoading] = useState(true)
+  const [searchQuery, setSearchQuery] = useState("")
+
+  const fetchUsers = useCallback(async () => {
+    try {
+      const res = await fetch("/api/users")
+      const data = await res.json()
+      if (data.users) setUsers(data.users)
+    } catch {
+      toast.error("Failed to load users")
+    } finally {
+      setLoading(false)
+    }
+  }, [])
+
+  useEffect(() => {
+    fetchUsers()
+  }, [fetchUsers])
+
+  const filteredUsers = searchQuery.trim()
+    ? users.filter((u) =>
+        u.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+        u.email.toLowerCase().includes(searchQuery.toLowerCase())
+      )
+    : users
+
+  const stats = [
+    { label: "Total Users", value: users.length, color: "bg-blue-500/10", textColor: "text-blue-600 dark:text-blue-400" },
+    { label: "Active", value: users.filter((u) => u.active).length, color: "bg-emerald-500/10", textColor: "text-emerald-600 dark:text-emerald-400" },
+    { label: "Admins", value: users.filter((u) => u.role === "admin" || u.role === "super_admin").length, color: "bg-purple-500/10", textColor: "text-purple-600 dark:text-purple-400" },
+    { label: "Sales", value: users.filter((u) => u.role === "sales_user").length, color: "bg-amber-500/10", textColor: "text-amber-600 dark:text-amber-400" },
+  ]
 
   return (
     <div className="space-y-4">
-      <PageHeader
+      <PageHeader title="Users" description="Manage team members and their roles">
-        title="Users"
-        description="Manage team members and their roles"
-      >
         <Button className="gap-2" onClick={() => setCreateOpen(true)}>
           <Plus className="h-4 w-4" />
           Add User
@@ -24,57 +56,32 @@ export default function UsersPage() {
       </PageHeader>
 
       <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4 mb-6">
-        <div className="rounded-lg border bg-card p-4">
+        {stats.map((s) => (
+          <div key={s.label} className="rounded-lg border bg-card p-4">
             <div className="flex items-center gap-3">
-            <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-blue-500/10">
+              <div className={`flex h-10 w-10 items-center justify-center rounded-lg ${s.color}`}>
-              <UsersIcon className="h-5 w-5 text-blue-600 dark:text-blue-400" />
+                <UsersIcon className={`h-5 w-5 ${s.textColor}`} />
               </div>
               <div>
-              <p className="text-2xl font-bold">{users.length}</p>
+                <p className="text-2xl font-bold">{s.value}</p>
-              <p className="text-xs text-muted-foreground">Total Users</p>
+                <p className="text-xs text-muted-foreground">{s.label}</p>
-            </div>
-          </div>
-        </div>
-        <div className="rounded-lg border bg-card p-4">
-          <div className="flex items-center gap-3">
-            <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-emerald-500/10">
-              <UsersIcon className="h-5 w-5 text-emerald-600 dark:text-emerald-400" />
-            </div>
-            <div>
-              <p className="text-2xl font-bold">{users.filter((u) => u.active).length}</p>
-              <p className="text-xs text-muted-foreground">Active</p>
-            </div>
-          </div>
-        </div>
-        <div className="rounded-lg border bg-card p-4">
-          <div className="flex items-center gap-3">
-            <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-purple-500/10">
-              <UsersIcon className="h-5 w-5 text-purple-600 dark:text-purple-400" />
-            </div>
-            <div>
-              <p className="text-2xl font-bold">{users.filter((u) => u.role === "admin").length}</p>
-              <p className="text-xs text-muted-foreground">Admins</p>
-            </div>
-          </div>
-        </div>
-        <div className="rounded-lg border bg-card p-4">
-          <div className="flex items-center gap-3">
-            <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-amber-500/10">
-              <UsersIcon className="h-5 w-5 text-amber-600 dark:text-amber-400" />
-            </div>
-            <div>
-              <p className="text-2xl font-bold">{users.filter((u) => u.role === "sales_user").length}</p>
-              <p className="text-xs text-muted-foreground">Sales</p>
               </div>
             </div>
           </div>
+        ))}
       </div>
 
       <div className="rounded-lg border bg-card">
-        <UsersTable data={users} />
+        <div className="flex items-center gap-2 p-4 pb-0">
+          <div className="relative flex-1 max-w-sm">
+            <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+            <Input value={searchQuery} onChange={(e) => setSearchQuery(e.target.value)} placeholder="Search users by name or email..." className="h-9 pl-9" />
+          </div>
+        </div>
+        <UsersTable data={filteredUsers} loading={loading} onUserDeleted={fetchUsers} />
       </div>
 
-      <UserFormDialog open={createOpen} onOpenChange={setCreateOpen} />
+      <UserFormDialog open={createOpen} onOpenChange={setCreateOpen} onUserCreated={fetchUsers} />
     </div>
   )
 }

src/app/api/users/[id]/route.ts

@@ -0,0 +1,24 @@
+import { NextRequest, NextResponse } from "next/server"
+import { query } from "@/lib/db"
+import { getSessionUser } from "@/lib/auth"
+
+export async function DELETE(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+  try {
+    const sessionUser = await getSessionUser()
+    if (!sessionUser) {
+      return NextResponse.json({ error: "Not authenticated" }, { status: 401 })
+    }
+
+    const { id } = await params
+
+    await query(
+      `UPDATE users SET deleted_at = NOW() WHERE id = $1 AND deleted_at IS NULL`,
+      [id]
+    )
+
+    return NextResponse.json({ success: true }, { status: 200 })
+  } catch (error) {
+    console.error("Error deleting user:", error)
+    return NextResponse.json({ error: "Failed to delete user" }, { status: 500 })
+  }
+}

src/app/api/users/route.ts

@@ -0,0 +1,78 @@
+import { NextRequest, NextResponse } from "next/server"
+import { query } from "@/lib/db"
+import { hashPassword, getSessionUser } from "@/lib/auth"
+
+export async function GET() {
+  try {
+    const result = await query(
+      `SELECT u.id, u.username, u.email, u.first_name, u.last_name,
+              u.is_active AS active, u.created_at,
+              r.name AS role
+       FROM users u
+       JOIN user_roles ur ON ur.user_id = u.id
+       JOIN roles r ON r.id = ur.role_id
+       WHERE u.deleted_at IS NULL
+       ORDER BY u.created_at DESC`
+    )
+    const users = result.rows.map((row: any) => ({
+      id: row.id,
+      name: `${row.first_name} ${row.last_name}`,
+      email: row.email,
+      role: row.role.toLowerCase(),
+      active: row.active,
+      avatar: `https://ui-avatars.com/api/?name=${encodeURIComponent(`${row.first_name}+${row.last_name}`)}&background=1d4ed8&color=fff&size=128`,
+      createdAt: row.created_at,
+    }))
+    return NextResponse.json({ users }, { status: 200 })
+  } catch (error) {
+    console.error("Error fetching users:", error)
+    return NextResponse.json({ error: "Failed to fetch users" }, { status: 500 })
+  }
+}
+
+export async function POST(request: NextRequest) {
+  try {
+    const sessionUser = await getSessionUser()
+    if (!sessionUser) {
+      return NextResponse.json({ error: "Not authenticated" }, { status: 401 })
+    }
+
+    const { name, email, password, role, active } = await request.json()
+    if (!name || !email || !password || !role) {
+      return NextResponse.json({ error: "Name, email, password, and role are required" }, { status: 400 })
+    }
+
+    const nameParts = name.trim().split(/\s+/)
+    const firstName = nameParts[0]
+    const lastName = nameParts.slice(1).join(" ") || firstName
+    const username = email.split("@")[0]
+    const passwordHash = await hashPassword(password)
+
+    const result = await query(
+      `INSERT INTO users (username, email, password_hash, first_name, last_name, is_active, created_by)
+       VALUES ($1, $2, $3, $4, $5, $6, $7)
+       RETURNING id`,
+      [username.toLowerCase(), email.toLowerCase(), passwordHash, firstName, lastName, active, sessionUser.id]
+    )
+
+    const roleId = (
+      await query(`SELECT id FROM roles WHERE LOWER(name) = LOWER($1)`, [role])
+    ).rows[0]?.id
+
+    if (roleId) {
+      await query(
+        `INSERT INTO user_roles (user_id, role_id, assigned_by)
+         VALUES ($1, $2, $3)`,
+        [result.rows[0].id, roleId, sessionUser.id]
+      )
+    }
+
+    return NextResponse.json({ success: true, id: result.rows[0].id }, { status: 201 })
+  } catch (error: any) {
+    console.error("Error creating user:", error)
+    if (error?.constraint === "uq_users_username" || error?.constraint === "uq_users_email") {
+      return NextResponse.json({ error: "A user with this email or username already exists" }, { status: 409 })
+    }
+    return NextResponse.json({ error: error?.message || "Failed to create user" }, { status: 500 })
+  }
+}

src/app/page.tsx

@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation"
 
 export default function RootPage() {
-  redirect("/login")
+  redirect("/dashboard")
 }

src/components/users/user-form-dialog.tsx

@@ -31,30 +31,37 @@ import {
 } from "@/components/ui/select"
 import { Switch } from "@/components/ui/switch"
 import { User } from "@/types"
+import { toast } from "sonner"
 
-const userFormSchema = z.object({
+const createSchema = z.object({
   name: z.string().min(1, "Name is required"),
   email: z.string().email("Invalid email address"),
+  password: z.string().min(6, "Password must be at least 6 characters"),
   role: z.string().min(1, "Role is required"),
   active: z.boolean(),
 })
 
-type UserFormValues = z.infer<typeof userFormSchema>
+type UserFormValues = z.infer<typeof createSchema>
+
+
 
 interface UserFormDialogProps {
   open: boolean
   onOpenChange: (open: boolean) => void
   user?: User | null
+  onUserCreated?: () => void
 }
 
-export function UserFormDialog({ open, onOpenChange, user }: UserFormDialogProps) {
+export function UserFormDialog({ open, onOpenChange, user, onUserCreated }: UserFormDialogProps) {
   const isEditing = !!user
+  const [submitting, setSubmitting] = useState(false)
 
   const form = useForm<UserFormValues>({
-    resolver: zodResolver(userFormSchema),
+    resolver: zodResolver(createSchema),
     defaultValues: {
       name: "",
       email: "",
+      password: "",
       role: "sales_user",
       active: true,
     },
@@ -65,17 +72,36 @@ export function UserFormDialog({ open, onOpenChange, user }: UserFormDialogProps
       form.reset({
         name: user.name,
         email: user.email,
+        password: "",
         role: user.role,
         active: user.active,
       })
     } else {
-      form.reset({ name: "", email: "", role: "sales_user", active: true })
+      form.reset({ name: "", email: "", password: "", role: "sales_user", active: true })
     }
   }, [user, form])
 
-  function onSubmit(values: UserFormValues) {
+  async function onSubmit(values: UserFormValues) {
-    console.log(values)
+    setSubmitting(true)
+    try {
+      const res = await fetch("/api/users", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(values),
+      })
+      const data = await res.json()
+      if (!res.ok) {
+        toast.error(data.error || "Failed to create user")
+        return
+      }
+      toast.success("User created")
       onOpenChange(false)
+      onUserCreated?.()
+    } catch {
+      toast.error("Failed to create user")
+    } finally {
+      setSubmitting(false)
+    }
   }
 
   return (
@@ -86,7 +112,7 @@ export function UserFormDialog({ open, onOpenChange, user }: UserFormDialogProps
           <DialogDescription>
             {isEditing
               ? "Update the user's information and permissions."
-              : "Create a new user account."}
+              : "Create a new user account that can sign in."}
           </DialogDescription>
         </DialogHeader>
         <Form {...form}>
@@ -111,7 +137,7 @@ export function UserFormDialog({ open, onOpenChange, user }: UserFormDialogProps
                 <FormItem>
                   <FormLabel>Email</FormLabel>
                   <FormControl>
-                    <Input placeholder="john@coastalit.com" type="email" {...field} />
+                    <Input placeholder="john@coastit.co.za" type="email" {...field} />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
@@ -140,20 +166,19 @@ export function UserFormDialog({ open, onOpenChange, user }: UserFormDialogProps
                 </FormItem>
               )}
             />
-            {!isEditing && (
             <FormField
+              control={form.control}
               name="password"
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Password</FormLabel>
                   <FormControl>
-                      <Input type="password" placeholder="Enter password" {...field} />
+                    <Input type="password" placeholder={isEditing ? "Leave blank to keep current" : "Enter password"} {...field} />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
               )}
             />
-            )}
             <FormField
               control={form.control}
               name="active"
@@ -178,8 +203,8 @@ export function UserFormDialog({ open, onOpenChange, user }: UserFormDialogProps
               <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
                 Cancel
               </Button>
-              <Button type="submit">
+              <Button type="submit" disabled={submitting}>
-                {isEditing ? "Save Changes" : "Create User"}
+                {submitting ? "Saving..." : isEditing ? "Save Changes" : "Create User"}
               </Button>
             </DialogFooter>
           </form>

src/components/users/users-table.tsx

@@ -11,17 +11,31 @@ import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
 import { Checkbox } from "@/components/ui/checkbox"
 import { User } from "@/types"
-import { Pencil, Power, PowerOff } from "lucide-react"
+import { Pencil, Trash2 } from "lucide-react"
+import { toast } from "sonner"
 
 interface UsersTableProps {
   data: User[]
   loading?: boolean
+  onUserDeleted?: () => void
 }
 
-export function UsersTable({ data, loading }: UsersTableProps) {
+export function UsersTable({ data, loading, onUserDeleted }: UsersTableProps) {
   const [editingUser, setEditingUser] = useState<User | null>(null)
   const [editOpen, setEditOpen] = useState(false)
 
+  const handleDelete = async (id: string) => {
+    if (!confirm("Are you sure you want to delete this user?")) return
+    try {
+      const res = await fetch(`/api/users/${id}`, { method: "DELETE" })
+      if (!res.ok) throw new Error()
+      toast.success("User deleted")
+      onUserDeleted?.()
+    } catch {
+      toast.error("Failed to delete user")
+    }
+  }
+
   const columns: ColumnDef<User>[] = useMemo(
     () => [
       {
@@ -76,15 +90,15 @@ export function UsersTable({ data, loading }: UsersTableProps) {
         ),
         cell: ({ row }) => {
           const role = row.getValue("role") as string
-          return (
+          const colors: Record<string, string> = {
-            <Badge
+            super_admin: "bg-red-500/10 text-red-600 dark:text-red-400 border-red-500/20",
-              variant="outline"
+            admin: "bg-blue-500/10 text-blue-600 dark:text-blue-400 border-blue-500/20",
-              className={role === "admin"
+            sales_user: "bg-purple-500/10 text-purple-600 dark:text-purple-400 border-purple-500/20",
-                ? "bg-blue-500/10 text-blue-600 dark:text-blue-400 border-blue-500/20 capitalize"
+            developer: "bg-zinc-500/10 text-zinc-600 dark:text-zinc-400 border-zinc-500/20",
-                : "bg-purple-500/10 text-purple-600 dark:text-purple-400 border-purple-500/20 capitalize"
           }
-            >
+          return (
-              {role}
+            <Badge variant="outline" className={`capitalize ${colors[role] || ""}`}>
+              {role.replace("_", " ")}
             </Badge>
           )
         },
@@ -117,8 +131,9 @@ export function UsersTable({ data, loading }: UsersTableProps) {
                 variant="ghost"
                 size="icon"
                 className="h-8 w-8 text-muted-foreground hover:text-destructive"
+                onClick={() => handleDelete(user.id)}
               >
-                {user.active ? <PowerOff className="h-4 w-4" /> : <Power className="h-4 w-4" />}
+                <Trash2 className="h-4 w-4" />
               </Button>
             </div>
           )
@@ -140,6 +155,7 @@ export function UsersTable({ data, loading }: UsersTableProps) {
         open={editOpen}
         onOpenChange={setEditOpen}
         user={editingUser}
+        onUserCreated={onUserDeleted}
       />
     </>
   )