performance improvments

apps/admin/src/app/api/admin/analytics/route.ts

@@ -0,0 +1,142 @@
+import { NextRequest, NextResponse } from "next/server";
+import { auth } from "@clerk/nextjs/server";
+import { getDatabase } from "@/lib/database";
+import { ensureUserSynced } from "@/lib/sync-user";
+import { successResponse } from "@/lib/api/responses";
+import { db as rawDb, sql } from "@fitai/database";
+
+interface UserGrowthPoint {
+  label: string;
+  value: number;
+}
+
+interface MembershipDistributionPoint {
+  label: string;
+  value: number;
+  color: string;
+}
+
+interface RevenuePoint {
+  label: string;
+  value: number;
+  color: string;
+}
+
+interface AnalyticsData {
+  userGrowth: UserGrowthPoint[];
+  membershipDistribution: MembershipDistributionPoint[];
+  revenue: RevenuePoint[];
+}
+
+export async function GET(req: NextRequest) {
+  try {
+    const { userId } = await auth();
+    if (!userId) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+
+    const database = await getDatabase();
+    const user = await ensureUserSynced(userId, database);
+
+    if (!user || (user.role !== "admin" && user.role !== "superAdmin")) {
+      return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+    }
+
+    const url = new URL(req.url);
+    const months = parseInt(url.searchParams.get("months") || "6");
+
+    const allUsers = await database.getAllUsers();
+    const allClients = await database.getAllClients();
+
+    const paymentsRaw = await rawDb.all(
+      sql`SELECT * FROM payments WHERE status = 'completed' AND paid_at IS NOT NULL`,
+    );
+    const payments: any[] = paymentsRaw || [];
+
+    const now = new Date();
+    const userGrowth: UserGrowthPoint[] = [];
+
+    for (let i = months - 1; i >= 0; i--) {
+      const date = new Date(now.getFullYear(), now.getMonth() - i, 1);
+      const monthLabel = date.toLocaleDateString("en-US", { month: "short" });
+
+      const usersCreatedByMonth = allUsers.filter((u: any) => {
+        const createdAt = new Date(u.createdAt);
+        return (
+          createdAt.getFullYear() === date.getFullYear() &&
+          createdAt.getMonth() === date.getMonth()
+        );
+      });
+
+      userGrowth.push({
+        label: monthLabel,
+        value: usersCreatedByMonth.length,
+      });
+    }
+
+    let runningTotal = 0;
+    for (const point of userGrowth) {
+      runningTotal += point.value;
+      point.value = runningTotal;
+    }
+
+    const membershipCounts: Record<string, number> = {
+      basic: 0,
+      premium: 0,
+      vip: 0,
+    };
+
+    for (const client of allClients) {
+      const membershipType = (client as any).membershipType || "basic";
+      if (membershipCounts[membershipType] !== undefined) {
+        membershipCounts[membershipType]++;
+      }
+    }
+
+    const membershipDistribution: MembershipDistributionPoint[] = [
+      { label: "Basic", value: membershipCounts.basic, color: "#6b7280" },
+      { label: "Premium", value: membershipCounts.premium, color: "#3b82f6" },
+      { label: "VIP", value: membershipCounts.vip, color: "#f59e0b" },
+    ];
+
+    const revenue: RevenuePoint[] = [];
+
+    for (let i = months - 1; i >= 0; i--) {
+      const date = new Date(now.getFullYear(), now.getMonth() - i, 1);
+      const monthLabel = date.toLocaleDateString("en-US", { month: "short" });
+      const nextMonthDate = new Date(
+        now.getFullYear(),
+        now.getMonth() - i + 1,
+        1,
+      );
+
+      const monthlyRevenue = payments
+        .filter((p: any) => {
+          const paidAt = p.paid_at ? new Date(p.paid_at) : null;
+          if (!paidAt) return false;
+          return paidAt >= date && paidAt < nextMonthDate;
+        })
+        .reduce((sum: number, p: any) => sum + (p.amount || 0), 0);
+
+      revenue.push({
+        label: monthLabel,
+        value: monthlyRevenue,
+        color: "#10b981",
+      });
+    }
+
+    const analyticsData: AnalyticsData = {
+      userGrowth,
+      membershipDistribution,
+      revenue,
+    };
+
+    return successResponse({ analytics: analyticsData });
+  } catch (error) {
+    console.error("Analytics error:", error);
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}

apps/admin/src/app/api/admin/stats/route.ts

@@ -2,6 +2,7 @@ import { auth } from "@clerk/nextjs/server";
 import { NextResponse } from "next/server";
 import { getDatabase } from "@/lib/database";
 import { ensureUserSynced } from "@/lib/sync-user";
+import { successResponse } from "@/lib/api/responses";
 
 export async function GET(req: Request) {
   try {
@@ -51,7 +52,7 @@ export async function GET(req: Request) {
       revenueGrowth: 0,
     };
 
-    return NextResponse.json(stats);
+    return successResponse({ stats });
   } catch (error) {
     console.error("Dashboard stats error:", error);
     return new NextResponse("Internal Server Error", { status: 500 });

apps/admin/src/app/layout.tsx

@@ -10,6 +10,7 @@ import {
 } from "@clerk/nextjs";
 import { Sidebar } from "@/components/ui/Sidebar";
 import { Toaster } from "sonner";
+import { QueryProvider } from "@/components/providers/QueryProvider";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -25,15 +26,17 @@ export default function RootLayout({
 }) {
   return (
     <ClerkProvider>
-      <html lang="en">
+      <QueryProvider>
-        <body className={inter.className}>
+        <html lang="en">
-          <div className="flex min-h-screen bg-slate-50">
+          <body className={inter.className}>
-            <Sidebar />
+            <div className="flex min-h-screen bg-slate-50">
-            <main className="flex-1 ml-20 p-8">{children}</main>
+              <Sidebar />
-          </div>
+              <main className="flex-1 ml-20 p-8">{children}</main>
-          <Toaster richColors position="top-right" />
+            </div>
-        </body>
+            <Toaster richColors position="top-right" />
-      </html>
+          </body>
+        </html>
+      </QueryProvider>
     </ClerkProvider>
   );
 }

apps/admin/src/app/page.tsx

@@ -1,99 +1,88 @@
 "use client";
 
-import { useEffect, useState } from "react";
 import { Users, CreditCard, CalendarCheck, TrendingUp } from "lucide-react";
 import { StatsCard } from "@/components/ui/StatsCard";
+import { StatsCardSkeleton } from "@/components/ui/skeleton";
 import { UserManagement } from "@/components/users/UserManagement";
 import { AnalyticsDashboard } from "@/components/analytics/AnalyticsDashboard";
-import axios from "axios";
+import { useDashboardStats } from "@/hooks/use-api";
-
-interface DashboardStats {
-  totalUsers: number;
-  activeClients: number;
-  totalRevenue: number;
-  revenueGrowth: number;
-}
 
 export default function Home() {
-  const [stats, setStats] = useState<DashboardStats>({
+  const { data: stats, isLoading } = useDashboardStats();
-    totalUsers: 0,
-    activeClients: 0,
-    totalRevenue: 0,
-    revenueGrowth: 0,
-  });
-  const [loading, setLoading] = useState(true);
-
-  useEffect(() => {
-    const fetchStats = async () => {
-      try {
-        const response = await axios.get("/api/admin/stats");
-        setStats(response.data);
-      } catch (error) {
-        console.error("Failed to fetch dashboard stats:", error);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    fetchStats();
-  }, []);
 
   const formatCurrency = (value: number) => {
     return new Intl.NumberFormat("en-US", {
       style: "currency",
       currency: "USD",
-    }).format(value);
+    }).format(value || 0);
   };
 
   return (
     <div className="space-y-8">
       <div>
         <h2 className="text-3xl font-bold text-slate-900">Dashboard</h2>
-        <p className="text-slate-500 mt-2">Welcome back, here's what's happening today.</p>
+        <p className="text-slate-500 mt-2">
+          Welcome back, here's what's happening today.
+        </p>
       </div>
 
       <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
-        <StatsCard
+        {isLoading ? (
-          title="Total Users"
+          <>
-          value={loading ? "..." : stats.totalUsers}
+            <StatsCardSkeleton />
-          change="+12%" // Placeholder for now as we don't track historical growth yet
+            <StatsCardSkeleton />
-          trend="up"
+            <StatsCardSkeleton />
-          icon={Users}
+            <StatsCardSkeleton />
-          color="blue"
+          </>
-        />
+        ) : (
-        <StatsCard
+          <>
-          title="Active Clients"
+            <StatsCard
-          value={loading ? "..." : stats.activeClients}
+              title="Total Users"
-          change="+5%"
+              value={stats?.totalUsers ?? 0}
-          trend="up"
+              change="+12%"
-          icon={CalendarCheck}
+              trend="up"
-          color="green"
+              icon={Users}
-        />
+              color="blue"
-        <StatsCard
+            />
-          title="Revenue"
+            <StatsCard
-          value={loading ? "..." : formatCurrency(stats.totalRevenue)}
+              title="Active Clients"
-          change={`${stats.revenueGrowth > 0 ? "+" : ""}${stats.revenueGrowth}%`}
+              value={stats?.activeClients ?? 0}
-          trend={stats.revenueGrowth >= 0 ? "up" : "down"}
+              change="+5%"
-          icon={CreditCard}
+              trend="up"
-          color="purple"
+              icon={CalendarCheck}
-        />
+              color="green"
-        <StatsCard
+            />
-          title="Growth"
+            <StatsCard
-          value="24%" // Placeholder
+              title="Revenue"
-          change="-2%"
+              value={formatCurrency(stats?.totalRevenue ?? 0)}
-          trend="down"
+              change={`${(stats?.revenueGrowth ?? 0) > 0 ? "+" : ""}${stats?.revenueGrowth ?? 0}%`}
-          icon={TrendingUp}
+              trend={(stats?.revenueGrowth ?? 0) >= 0 ? "up" : "down"}
-          color="orange"
+              icon={CreditCard}
-        />
+              color="purple"
+            />
+            <StatsCard
+              title="Growth"
+              value="24%"
+              change="-2%"
+              trend="down"
+              icon={TrendingUp}
+              color="orange"
+            />
+          </>
+        )}
       </div>
 
       <div className="flex flex-col gap-8">
         <div className="bg-white rounded-xl shadow-sm border border-slate-100 p-6">
-          <h3 className="text-xl font-bold text-slate-900 mb-6">Recent Activity</h3>
+          <h3 className="text-xl font-bold text-slate-900 mb-6">
+            Recent Activity
+          </h3>
           <UserManagement />
         </div>
         <div className="bg-white rounded-xl shadow-sm border border-slate-100 p-6">
-          <h3 className="text-xl font-bold text-slate-900 mb-6">Quick Analytics</h3>
+          <h3 className="text-xl font-bold text-slate-900 mb-6">
+            Quick Analytics
+          </h3>
           <AnalyticsDashboard />
         </div>
       </div>

apps/admin/src/app/recommendations/page.tsx

@@ -1,86 +1,40 @@
 "use client";
 
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useUser } from "@clerk/nextjs";
 import log from "@/lib/logger";
 import { toast } from "@/lib/toast";
-
+import {
-interface User {
+  useUsers,
-  id: string;
+  useRecommendations,
-  firstName: string;
+  useGenerateRecommendations,
-  lastName: string;
+  useApproveRecommendation,
-  email: string;
+  useUpdateRecommendation,
-}
+  type Recommendation,
-
+} from "@/hooks/use-api";
-interface Recommendation {
-  id: string;
-  userId: string;
-  content: string;
-  recommendationText: string;
-  activityPlan: string;
-  dietPlan: string;
-  status: string;
-  createdAt: Date;
-}
 
 export default function RecommendationsPage() {
   const { user } = useUser();
-  const [users, setUsers] = useState<User[]>([]);
-  const [pendingRecommendations, setPendingRecommendations] = useState<
-    Recommendation[]
-  >([]);
-  const [loading, setLoading] = useState(true);
-  const [generating, setGenerating] = useState<string | null>(null);
   const [useExternalModel, setUseExternalModel] = useState(false);
 
-  useEffect(() => {
+  const { data: users = [], isLoading: usersLoading } = useUsers();
-    fetchData();
+  const { data: allRecommendations = [], isLoading: recsLoading } =
-  }, []);
+    useRecommendations();
+  const pendingRecommendations = allRecommendations.filter(
+    (r) => r.status === "pending",
+  );
 
-  const fetchData = async () => {
+  const generateRec = useGenerateRecommendations();
-    try {
+  const approveRec = useApproveRecommendation();
-      // Fetch users - API returns { success: true, data: { users: [...] }, meta: {...} }
+  const updateRec = useUpdateRecommendation();
-      const usersRes = await fetch("/api/users");
-      const usersResult = await usersRes.json();
-      const usersArray = usersResult.data?.users || usersResult.users || [];
-      setUsers(usersArray);
-
-      // Fetch pending recommendations - API returns { success: true, data: { recommendations: [...] }, meta: {...} }
-      const recsRes = await fetch("/api/recommendations");
-      const recsResult = await recsRes.json();
-      const allRecs =
-        recsResult.data?.recommendations || recsResult.recommendations || [];
-      setPendingRecommendations(
-        allRecs.filter((r: Recommendation) => r.status === "pending"),
-      );
-    } catch (error) {
-      log.error("Failed to fetch data", error);
-    } finally {
-      setLoading(false);
-    }
-  };
 
   const handleGenerate = async (userId: string) => {
-    setGenerating(userId);
     try {
-      const res = await fetch("/api/recommendations/generate", {
+      await generateRec.mutateAsync(userId);
-        method: "POST",
+      toast.success("Recommendation generated successfully!");
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ userId, useExternalModel }),
-      });
-
-      if (!res.ok) {
-        const error = await res.json();
-        toast.error(`Error: ${error.error}`);
-      } else {
-        toast.success("Recommendation generated successfully!");
-        fetchData(); // Refresh data
-      }
     } catch (error) {
       log.error("Failed to generate recommendation", error);
       toast.error("Failed to generate recommendation.");
-    } finally {
-      setGenerating(null);
     }
   };
 
@@ -89,25 +43,11 @@ export default function RecommendationsPage() {
     status: "approved" | "rejected",
   ) => {
     try {
-      const res = await fetch("/api/recommendations/approve", {
+      await approveRec.mutateAsync({
-        method: "POST",
+        recommendationId,
-        headers: { "Content-Type": "application/json" },
+        approved: status === "approved",
-        body: JSON.stringify({
-          recommendationId,
-          status,
-          approvedBy: user?.id || "admin",
-        }),
       });
-
+      toast.success("Recommendation status updated");
-      if (!res.ok) {
-        const errorData = await res.json();
-        toast.error(
-          `Failed to update status: ${errorData.error || "Unknown error"}`,
-        );
-      } else {
-        toast.success("Recommendation status updated");
-        fetchData(); // Refresh data
-      }
     } catch (error) {
       log.error("Failed to approve recommendation", error);
       toast.error("Error processing request");
@@ -124,38 +64,24 @@ export default function RecommendationsPage() {
       newActivityPlan === null ||
       newDietPlan === null
     ) {
-      // User cancelled one of the prompts
       return;
     }
 
     try {
-      const res = await fetch("/api/recommendations", {
+      await updateRec.mutateAsync({
-        method: "PUT",
+        id: rec.id,
-        headers: { "Content-Type": "application/json" },
+        content: newContent,
-        body: JSON.stringify({
+        activityPlan: newActivityPlan,
-          id: rec.id,
+        dietPlan: newDietPlan,
-          content: newContent,
-          activityPlan: newActivityPlan,
-          dietPlan: newDietPlan,
-        }),
       });
-
+      toast.success("Recommendation updated successfully!");
-      if (!res.ok) {
-        const errorData = await res.json();
-        toast.error(
-          `Failed to update recommendation: ${errorData.error || "Unknown error"}`,
-        );
-      } else {
-        toast.success("Recommendation updated successfully!");
-        fetchData(); // Refresh data
-      }
     } catch (error) {
       log.error("Failed to update recommendation", error);
       toast.error("Failed to update recommendation.");
     }
   };
 
-  if (loading) {
+  if (usersLoading || recsLoading) {
     return (
       <div className="flex items-center justify-center h-screen">
         <div className="text-xl">Loading...</div>
@@ -215,10 +141,10 @@ export default function RecommendationsPage() {
                   </div>
                   <button
                     onClick={() => handleGenerate(user.id)}
-                    disabled={generating === user.id}
+                    disabled={generateRec.isPending}
                     className="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700 disabled:opacity-50"
                   >
-                    {generating === user.id ? "Generating..." : "Generate"}
+                    {generateRec.isPending ? "Generating..." : "Generate"}
                   </button>
                 </li>
               ))}

apps/admin/src/components/analytics/AnalyticsDashboard.tsx

@@ -1,75 +1,34 @@
-'use client'
+"use client";
 
-import { useState, useEffect } from 'react'
+import { UserGrowthChart } from "@/components/charts/UserGrowthChart";
-import { UserGrowthChart } from '@/components/charts/UserGrowthChart'
+import { MembershipDistributionChart } from "@/components/charts/MembershipDistributionChart";
-import { MembershipDistributionChart } from '@/components/charts/MembershipDistributionChart'
+import { RevenueChart } from "@/components/charts/RevenueChart";
-import { RevenueChart } from '@/components/charts/RevenueChart'
+import { Card, CardHeader, CardContent } from "@/components/ui/card";
-import { Card, CardHeader, CardContent } from '@/components/ui/card'
+import { useAnalytics } from "@/hooks/use-api";
-
-interface ChartData {
-  label: string
-  value: number
-  color?: string
-}
 
 export function AnalyticsDashboard() {
-  const [userGrowthData, setUserGrowthData] = useState<ChartData[]>([])
+  const { data: analytics, isLoading } = useAnalytics(6);
-  const [membershipData, setMembershipData] = useState<ChartData[]>([])
-  const [revenueData, setRevenueData] = useState<ChartData[]>([])
-  const [loading, setLoading] = useState(true)
 
-  useEffect(() => {
+  const userGrowthData = analytics?.userGrowth ?? [];
-    fetchAnalyticsData()
+  const membershipData = analytics?.membershipDistribution ?? [];
-  }, [])
+  const revenueData = analytics?.revenue ?? [];
 
-  const fetchAnalyticsData = async () => {
+  const totalUsers =
-    setLoading(true)
+    userGrowthData.length > 0
-    try {
+      ? userGrowthData[userGrowthData.length - 1].value
-      // Mock data for demonstration - replace with real API calls
+      : 0;
-      const mockUserGrowth = [
+  const totalRevenue = revenueData.reduce((sum, item) => sum + item.value, 0);
-        { label: 'Jan', value: 45 },
+  const activeMembers = membershipData.reduce(
-        { label: 'Feb', value: 52 },
+    (sum, item) => sum + item.value,
-        { label: 'Mar', value: 61 },
+    0,
-        { label: 'Apr', value: 58 },
+  );
-        { label: 'May', value: 67 },
-        { label: 'Jun', value: 74 },
-      ]
 
-      const mockMembershipData = [
+  if (isLoading) {
-        { label: 'Basic', value: 45, color: '#6b7280' },
-        { label: 'Premium', value: 28, color: '#3b82f6' },
-        { label: 'VIP', value: 12, color: '#f59e0b' },
-      ]
-
-      const mockRevenueData = [
-        { label: 'Jan', value: 12500, color: '#10b981' },
-        { label: 'Feb', value: 14200, color: '#10b981' },
-        { label: 'Mar', value: 16800, color: '#10b981' },
-        { label: 'Apr', value: 15900, color: '#10b981' },
-        { label: 'May', value: 18200, color: '#10b981' },
-        { label: 'Jun', value: 19400, color: '#10b981' },
-      ]
-
-      setUserGrowthData(mockUserGrowth)
-      setMembershipData(mockMembershipData)
-      setRevenueData(mockRevenueData)
-    } catch (error) {
-      console.error('Failed to fetch analytics data:', error)
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  const totalUsers = userGrowthData.length > 0 ? userGrowthData[userGrowthData.length - 1].value : 0
-  const totalRevenue = revenueData.reduce((sum, item) => sum + item.value, 0)
-  const activeMembers = membershipData.reduce((sum, item) => sum + item.value, 0)
-
-  if (loading) {
     return (
       <div className="flex justify-center items-center h-64">
         <div className="text-lg">Loading analytics...</div>
       </div>
-    )
+    );
   }
 
   return (
@@ -81,7 +40,9 @@ export function AnalyticsDashboard() {
         <Card>
           <CardContent>
             <div className="text-center">
-              <div className="text-3xl font-bold text-blue-600">{totalUsers}</div>
+              <div className="text-3xl font-bold text-blue-600">
+                {totalUsers}
+              </div>
               <div className="text-gray-600">Total Users</div>
             </div>
           </CardContent>
@@ -90,7 +51,9 @@ export function AnalyticsDashboard() {
         <Card>
           <CardContent>
             <div className="text-center">
-              <div className="text-3xl font-bold text-green-600">${totalRevenue.toLocaleString()}</div>
+              <div className="text-3xl font-bold text-green-600">
+                ${totalRevenue.toLocaleString()}
+              </div>
               <div className="text-gray-600">Total Revenue</div>
             </div>
           </CardContent>
@@ -99,7 +62,9 @@ export function AnalyticsDashboard() {
         <Card>
           <CardContent>
             <div className="text-center">
-              <div className="text-3xl font-bold text-purple-600">{activeMembers}</div>
+              <div className="text-3xl font-bold text-purple-600">
+                {activeMembers}
+              </div>
               <div className="text-gray-600">Active Members</div>
             </div>
           </CardContent>
@@ -133,14 +98,14 @@ export function AnalyticsDashboard() {
         </CardHeader>
         <CardContent>
           <RevenueChart
-            data={revenueData.map(item => ({
+            data={revenueData.map((item) => ({
               category: item.label,
               value: item.value,
-              color: item.color
+              color: item.color,
             }))}
           />
         </CardContent>
       </Card>
     </div>
-  )
+  );
 }

apps/admin/src/components/providers/QueryProvider.tsx

@@ -0,0 +1,26 @@
+"use client";
+
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { useState, type ReactNode } from "react";
+
+interface QueryProviderProps {
+  children: ReactNode;
+}
+
+export function QueryProvider({ children }: QueryProviderProps) {
+  const [queryClient] = useState(
+    () =>
+      new QueryClient({
+        defaultOptions: {
+          queries: {
+            staleTime: 60 * 1000,
+            refetchOnWindowFocus: false,
+          },
+        },
+      }),
+  );
+
+  return (
+    <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+  );
+}

apps/admin/src/components/ui/Sidebar.tsx

@@ -13,40 +13,18 @@ import {
   Brain,
 } from "lucide-react";
 import { UserButton, useUser } from "@clerk/nextjs";
-
+import { usePendingRecommendationsCount } from "@/hooks/use-api";
-interface Recommendation {
-  id: string;
-  status: string;
-}
 
 export function Sidebar() {
   const pathname = usePathname();
   const { user } = useUser();
-  const [pendingCount, setPendingCount] = useState(0);
+  const { data: pendingCount = 0 } = usePendingRecommendationsCount();
   const [mounted, setMounted] = useState(false);
 
   useEffect(() => {
     setMounted(true);
   }, []);
 
-  useEffect(() => {
-    const fetchPending = async () => {
-      try {
-        const res = await fetch("/api/recommendations");
-        if (res.ok) {
-          const data = await res.json();
-          const pending = (data.recommendations || []).filter(
-            (r: Recommendation) => r.status === "pending",
-          );
-          setPendingCount(pending.length);
-        }
-      } catch (e) {
-        console.error("Failed to fetch pending recommendations", e);
-      }
-    };
-    fetchPending();
-  }, []);
-
   const menuItems = [
     { icon: LayoutDashboard, label: "Dashboard", href: "/" },
     { icon: Users, label: "Users", href: "/users" },

apps/admin/src/components/ui/skeleton.tsx

@@ -0,0 +1,57 @@
+import { cn } from "@/lib/utils";
+
+interface SkeletonProps {
+  className?: string;
+}
+
+export function Skeleton({ className }: SkeletonProps) {
+  return (
+    <div
+      className={cn(
+        "animate-pulse rounded-md bg-slate-200 dark:bg-slate-700",
+        className,
+      )}
+    />
+  );
+}
+
+export function StatsCardSkeleton() {
+  return (
+    <div className="bg-white rounded-xl shadow-sm border border-slate-100 p-6">
+      <div className="flex items-center gap-4">
+        <Skeleton className="h-12 w-12 rounded-full" />
+        <div className="flex-1 space-y-2">
+          <Skeleton className="h-4 w-20" />
+          <Skeleton className="h-8 w-16" />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export function TableSkeleton({ rows = 5 }: { rows?: number }) {
+  return (
+    <div className="space-y-3">
+      {Array.from({ length: rows }).map((_, i) => (
+        <div key={i} className="flex gap-4">
+          <Skeleton className="h-12 flex-1" />
+          <Skeleton className="h-12 w-32" />
+          <Skeleton className="h-12 w-24" />
+        </div>
+      ))}
+    </div>
+  );
+}
+
+export function CardSkeleton() {
+  return (
+    <div className="bg-white rounded-xl shadow-sm border border-slate-100 p-6 space-y-4">
+      <Skeleton className="h-6 w-40" />
+      <div className="space-y-2">
+        <Skeleton className="h-4 w-full" />
+        <Skeleton className="h-4 w-3/4" />
+        <Skeleton className="h-4 w-5/6" />
+      </div>
+    </div>
+  );
+}

apps/admin/src/components/users/UserGrid.tsx

@@ -9,9 +9,10 @@ import { formatDate } from "@/lib/utils";
 
 ModuleRegistry.registerModules([AllCommunityModule]);
 
-function getTimeAgo(date: Date): string {
+function getTimeAgo(date: Date | string): string {
   const now = new Date();
-  const diffMs = now.getTime() - date.getTime();
+  const d = typeof date === "string" ? new Date(date) : date;
+  const diffMs = now.getTime() - d.getTime();
   const diffMins = Math.floor(diffMs / 60000);
   const diffHours = Math.floor(diffMins / 60);
   const diffDays = Math.floor(diffHours / 24);
@@ -22,7 +23,7 @@ function getTimeAgo(date: Date): string {
   return `${diffDays}d ago`;
 }
 
-interface User {
+export interface User {
   id: string;
   email: string;
   firstName: string;
@@ -31,15 +32,18 @@ interface User {
   phone?: string;
   gymId?: string;
   gymName?: string | null;
-  createdAt: Date;
+  createdAt?: string | Date;
   isCheckedIn?: boolean;
-  checkInTime?: Date;
+  checkInTime?: string | Date;
+  lastCheckInTime?: string | Date;
+  checkInsThisWeek?: number;
+  checkInsThisMonth?: number;
   client?: {
     id: string;
     membershipType: string;
     membershipStatus: string;
-    joinDate: Date;
+    joinDate: string | Date;
-    lastVisit?: Date;
+    lastVisit?: string | Date;
   };
 }
 

apps/admin/src/components/users/UserManagement.tsx

@@ -1,43 +1,23 @@
 "use client";
 
-import { useState, useEffect } from "react";
+import { useState } from "react";
-import { UserGrid } from "@/components/users/UserGrid";
+import { UserGrid, type User } from "@/components/users/UserGrid";
-// import { Button } from "@/components/ui/button";
 import { Card, CardHeader, CardContent } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
 import { useUser } from "@clerk/nextjs";
-import { getGymIdFromUser } from "@/lib/error-helpers";
 import log from "@/lib/logger";
 import { toast } from "@/lib/toast";
 import { CreateUserModal } from "./CreateUserModal";
-
+import {
-interface User {
+  useUsers,
-  id: string;
+  useGyms,
-  email: string;
+  useUpdateUser,
-  firstName: string;
+  useDeleteUser,
-  lastName: string;
+  useSendInvitation,
-  role: string;
+} from "@/hooks/use-api";
-  phone?: string;
-  gymId?: string;
-  createdAt: Date;
-  isCheckedIn?: boolean;
-  checkInTime?: Date;
-  lastCheckInTime?: Date;
-  checkInsThisWeek?: number;
-  checkInsThisMonth?: number;
-  client?: {
-    id: string;
-    membershipType: string;
-    membershipStatus: string;
-    joinDate: Date;
-    lastVisit?: Date;
-  };
-}
 
 export function UserManagement() {
   const { user } = useUser();
-  const [users, setUsers] = useState<User[]>([]);
-  const [loading, setLoading] = useState(true);
   const [filter, setFilter] = useState<string>("all");
   const [selectedUser, setSelectedUser] = useState<User | null>(null);
   const [isEditing, setIsEditing] = useState(false);
@@ -52,68 +32,17 @@ export function UserManagement() {
     gymId: string;
   } | null>(null);
 
-  // Active gyms for dropdown
+  const {
-  const [gyms, setGyms] = useState<Array<{ id: string; name: string }>>([]);
+    data: users = [],
-
+    isLoading,
-  // Load gyms when modal opens or refreshes
+    refetch,
-  useEffect(() => {
+  } = useUsers({
-    if (isEditing) {
+    role: filter !== "all" ? filter : undefined,
-      (async () => {
+  });
-        try {
+  const { data: gyms = [] } = useGyms();
-          const res = await fetch("/api/gyms");
+  const updateUser = useUpdateUser();
-          const data = await res.json();
+  const deleteUser = useDeleteUser();
-          if (Array.isArray(data)) {
+  const sendInvitation = useSendInvitation();
-            // map down to id and name to avoid extra payload use here
-            setGyms(data.map((g: any) => ({ id: g.id, name: g.name })));
-          } else {
-            setGyms([]);
-          }
-        } catch {
-          setGyms([]);
-        }
-      })();
-    }
-  }, [isEditing]);
-
-  useEffect(() => {
-    fetchUsers();
-  }, [filter]);
-
-  const fetchUsers = async () => {
-    setLoading(true);
-    try {
-      const ts = Date.now();
-      const url =
-        filter === "all"
-          ? `/api/users?ts=${ts}`
-          : `/api/users?role=${filter}&ts=${ts}`;
-
-      log.debug("Fetching users", { url });
-      const response = await fetch(url, { cache: "no-store" });
-      log.debug("Users fetch response", {
-        ok: response.ok,
-        status: response.status,
-      });
-      const responseData = await response.json();
-      const data = responseData.data || responseData; // Handle both old and new API response formats
-      log.debug("Received users data", {
-        count: Array.isArray(data.users) ? data.users.length : 0,
-        sample:
-          data.users && data.users[0]
-            ? {
-                id: data.users[0].id,
-                gymId: data.users[0].gymId,
-                role: data.users[0].role,
-              }
-            : null,
-      });
-      setUsers(data.users || []);
-    } catch (error) {
-      log.error("Failed to fetch users", error);
-    } finally {
-      setLoading(false);
-    }
-  };
 
   const handleUserSelect = (user: User | null) => {
     setSelectedUser(user);
@@ -144,17 +73,12 @@ export function UserManagement() {
       return;
 
     try {
-      const response = await fetch("/api/users", {
+      const deletePromises = users.map((u) =>
-        method: "DELETE",
+        fetch(`/api/users?id=${u.id}`, { method: "DELETE" }),
-        headers: { "Content-Type": "application/json" },
+      );
-        body: JSON.stringify({ ids: users.map((u) => u.id) }),
+      await Promise.all(deletePromises);
-      });
+      refetch();
-      if (response.ok) {
+      toast.success("Users deleted successfully");
-        fetchUsers();
-        toast.success("Users deleted successfully");
-      } else {
-        toast.error("Error deleting users");
-      }
     } catch (error) {
       log.error("Failed to delete users", error);
     }
@@ -196,7 +120,7 @@ export function UserManagement() {
   };
 
   const handleRefresh = () => {
-    fetchUsers();
+    refetch();
   };
 
   const handleSaveEdit = async () => {
@@ -204,7 +128,6 @@ export function UserManagement() {
 
     try {
       if (selectedUser) {
-        // Update existing user
         const payload = {
           id: selectedUser.id,
           email: editForm.email,
@@ -214,80 +137,21 @@ export function UserManagement() {
           phone: editForm.phone,
           gymId: editForm.gymId === "" ? null : editForm.gymId,
         };
-        log.debug("Updating user", payload);
-        const response = await fetch("/api/users", {
-          method: "PUT",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify(payload),
-        });
-        log.debug("User update response", {
-          ok: response.ok,
-          status: response.status,
-        });
-        if (response.ok) {
-          // Optimistically update local state so grid reflects changes immediately
-          setUsers((prev) =>
-            prev.map((u) =>
-              u.id === selectedUser.id
-                ? {
-                    ...u,
-                    email: editForm.email,
-                    firstName: editForm.firstName,
-                    lastName: editForm.lastName,
-                    role: editForm.role,
-                    phone: editForm.phone || undefined,
-                    gymId: editForm.gymId === "" ? undefined : editForm.gymId,
-                  }
-                : u,
-            ),
-          );
-          setSelectedUser((prev) =>
-            prev
-              ? {
-                  ...prev,
-                  email: editForm.email,
-                  firstName: editForm.firstName,
-                  lastName: editForm.lastName,
-                  role: editForm.role,
-                  phone: editForm.phone || undefined,
-                  gymId: editForm.gymId === "" ? undefined : editForm.gymId,
-                }
-              : prev,
-          );
-          setIsEditing(false);
-          setEditForm(null);
-          // Still re-fetch from server to ensure consistency
-          log.debug("Re-fetching users after successful edit");
-          fetchUsers();
-          toast.success("User updated successfully");
-        } else {
-          const errText = await response.text().catch(() => "");
-          log.error("User update failed", new Error(errText), {
-            status: response.status,
-          });
-          toast.error("Error updating user");
-        }
-      } else {
-        // Create (Invite) new user
-        const response = await fetch("/api/invitations", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            inviteeEmail: editForm.email,
-            roleAssigned: editForm.role,
-            gymId: editForm.gymId || undefined,
-          }),
-        });
 
-        if (response.ok) {
+        await updateUser.mutateAsync(payload);
-          setIsEditing(false);
+        setIsEditing(false);
-          setEditForm(null);
+        setEditForm(null);
-          fetchUsers();
+        refetch();
-          toast.success("Invitation sent successfully!");
+        toast.success("User updated successfully");
-        } else {
+      } else {
-          const errorData = await response.json();
+        await sendInvitation.mutateAsync({
-          toast.error(`Error sending invitation: ${errorData.error}`);
+          email: editForm.email,
-        }
+          role: editForm.role,
+        });
+        setIsEditing(false);
+        setEditForm(null);
+        refetch();
+        toast.success("Invitation sent successfully!");
       }
     } catch (error) {
       console.error(error);
@@ -299,17 +163,11 @@ export function UserManagement() {
     if (!selectedUser) return;
 
     try {
-      const response = await fetch(`/api/users?id=${selectedUser.id}`, {
+      await deleteUser.mutateAsync(selectedUser.id);
-        method: "DELETE",
+      setIsDeleting(false);
-      });
+      setSelectedUser(null);
-      if (response.ok) {
+      refetch();
-        setIsDeleting(false);
+      toast.success("User deleted successfully");
-        setSelectedUser(null);
-        fetchUsers();
-        toast.success("User deleted successfully");
-      } else {
-        toast.error("Error deleting user");
-      }
     } catch (error) {
       log.error("Failed to delete user", error);
     }
@@ -397,7 +255,7 @@ export function UserManagement() {
             onEditUser={handleEditUser}
             onDeleteUser={handleDeleteUser}
             onBulkDelete={handleBulkDelete}
-            loading={loading}
+            loading={isLoading}
           />
         </CardContent>
       </Card>
@@ -591,7 +449,9 @@ export function UserManagement() {
                   </p>
                   <p>
                     <span className="font-medium">Joined:</span>{" "}
-                    {new Date(selectedUser.createdAt).toLocaleDateString()}
+                    {selectedUser.createdAt
+                      ? new Date(selectedUser.createdAt).toLocaleDateString()
+                      : "N/A"}
                   </p>
                 </div>
               </div>
@@ -653,7 +513,7 @@ export function UserManagement() {
       <CreateUserModal
         open={createModalOpen}
         onOpenChange={setCreateModalOpen}
-        onSuccess={() => fetchUsers()}
+        onSuccess={() => refetch()}
       />
     </div>
   );

apps/admin/src/hooks/use-api.ts

@@ -0,0 +1,380 @@
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+
+export interface DashboardStats {
+  totalUsers: number;
+  activeClients: number;
+  totalRevenue: number;
+  revenueGrowth: number;
+}
+
+export interface User {
+  id: string;
+  email: string;
+  firstName: string;
+  lastName: string;
+  role: string;
+  phone?: string;
+  gymId?: string;
+  gymName?: string | null;
+  createdAt?: string;
+  isCheckedIn?: boolean;
+  checkInTime?: string;
+  lastCheckInTime?: string;
+  checkInsThisWeek?: number;
+  checkInsThisMonth?: number;
+  client?: {
+    id: string;
+    membershipType: string;
+    membershipStatus: string;
+    joinDate: string;
+    lastVisit?: string;
+  };
+}
+
+export interface Recommendation {
+  id: string;
+  userId: string;
+  type: string;
+  title: string;
+  description: string;
+  content?: string;
+  recommendationText?: string;
+  activityPlan?: string;
+  dietPlan?: string;
+  status: "pending" | "approved" | "rejected";
+  createdAt: string;
+  user?: User;
+}
+
+export interface Gym {
+  id: string;
+  name: string;
+  address?: string;
+}
+
+export interface AttendanceRecord {
+  id: string;
+  userId: string;
+  checkIn: string;
+  checkOut?: string;
+  date: string;
+}
+
+async function fetchApi<T>(url: string, options?: RequestInit): Promise<T> {
+  const response = await fetch(url, {
+    ...options,
+    headers: {
+      "Content-Type": "application/json",
+      ...options?.headers,
+    },
+  });
+
+  if (!response.ok) {
+    const error = await response
+      .json()
+      .catch(() => ({ error: "Request failed" }));
+    throw new Error(error.error || `HTTP ${response.status}`);
+  }
+
+  return response.json();
+}
+
+export function useDashboardStats(gymId?: string) {
+  return useQuery({
+    queryKey: ["dashboard-stats", gymId],
+    queryFn: () => {
+      const url = gymId
+        ? `/api/admin/stats?gymId=${gymId}`
+        : "/api/admin/stats";
+      return fetchApi<{ data: { stats: DashboardStats } }>(url).then(
+        (res) => res.data?.stats,
+      );
+    },
+  });
+}
+
+export function useUsers(filters?: {
+  role?: string;
+  gymId?: string;
+  search?: string;
+}) {
+  const params = new URLSearchParams();
+  if (filters?.role) params.set("role", filters.role);
+  if (filters?.gymId) params.set("gymId", filters.gymId);
+  if (filters?.search) params.set("search", filters.search);
+
+  const queryString = params.toString();
+  const url = queryString ? `/api/users?${queryString}` : "/api/users";
+
+  return useQuery({
+    queryKey: ["users", filters],
+    queryFn: () =>
+      fetchApi<{ data: { users: User[] } }>(url).then(
+        (res) => res.data?.users ?? [],
+      ),
+  });
+}
+
+export function useUser(userId: string) {
+  return useQuery({
+    queryKey: ["user", userId],
+    queryFn: () =>
+      fetchApi<{ data: { user: User } }>(`/api/users?id=${userId}`).then(
+        (res) => res.data?.user,
+      ),
+    enabled: !!userId,
+  });
+}
+
+export function useRecommendations(filters?: {
+  userId?: string;
+  status?: string;
+}) {
+  const params = new URLSearchParams();
+  if (filters?.userId) params.set("userId", filters.userId);
+  if (filters?.status) params.set("status", filters.status);
+
+  const queryString = params.toString();
+  const url = queryString
+    ? `/api/recommendations?${queryString}`
+    : "/api/recommendations";
+
+  return useQuery({
+    queryKey: ["recommendations", filters],
+    queryFn: () =>
+      fetchApi<{ data: { recommendations: Recommendation[] } }>(url).then(
+        (res) => res.data?.recommendations ?? [],
+      ),
+  });
+}
+
+export function usePendingRecommendationsCount() {
+  return useQuery({
+    queryKey: ["pending-recommendations-count"],
+    queryFn: () =>
+      fetchApi<{ data: { recommendations: Recommendation[] } }>(
+        "/api/recommendations",
+      ).then(
+        (res) =>
+          (res.data?.recommendations ?? []).filter(
+            (r) => r.status === "pending",
+          ).length,
+      ),
+    refetchInterval: 30000,
+  });
+}
+
+export function useGyms() {
+  return useQuery({
+    queryKey: ["gyms"],
+    queryFn: () =>
+      fetchApi<{ data: { gyms: Gym[] } }>("/api/gyms").then(
+        (res) => res.data?.gyms ?? [],
+      ),
+  });
+}
+
+export function useAttendance(filters?: { userId?: string; date?: string }) {
+  const params = new URLSearchParams();
+  if (filters?.userId) params.set("userId", filters.userId);
+  if (filters?.date) params.set("date", filters.date);
+
+  const queryString = params.toString();
+  const url = queryString
+    ? `/api/admin/attendance?${queryString}`
+    : "/api/admin/attendance";
+
+  return useQuery({
+    queryKey: ["attendance", filters],
+    queryFn: () =>
+      fetchApi<{ data: { records: AttendanceRecord[] } }>(url).then(
+        (res) => res.data?.records ?? [],
+      ),
+  });
+}
+
+export function useCreateUser() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (data: {
+      email: string;
+      firstName: string;
+      lastName: string;
+      role: string;
+      phone?: string;
+      gymId?: string;
+    }) =>
+      fetchApi<{ data: { userId: string } }>("/api/users/create", {
+        method: "POST",
+        body: JSON.stringify(data),
+      }).then((res) => res.data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["users"] });
+      queryClient.invalidateQueries({ queryKey: ["dashboard-stats"] });
+    },
+  });
+}
+
+export function useUpdateUser() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (data: { id: string; [key: string]: unknown }) =>
+      fetchApi<{ data: { success: boolean } }>(`/api/users?id=${data.id}`, {
+        method: "PUT",
+        body: JSON.stringify(data),
+      }),
+    onSuccess: (_, variables) => {
+      queryClient.invalidateQueries({ queryKey: ["users"] });
+      queryClient.invalidateQueries({ queryKey: ["user", variables.id] });
+    },
+  });
+}
+
+export function useDeleteUser() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (userId: string) =>
+      fetchApi<{ data: { success: boolean } }>(`/api/users?id=${userId}`, {
+        method: "DELETE",
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["users"] });
+      queryClient.invalidateQueries({ queryKey: ["dashboard-stats"] });
+    },
+  });
+}
+
+export function useGenerateRecommendations() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (userId?: string) =>
+      fetchApi<{
+        data: { success: boolean; recommendations?: Recommendation[] };
+      }>("/api/recommendations/generate", {
+        method: "POST",
+        body: userId ? JSON.stringify({ userId }) : undefined,
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["recommendations"] });
+      queryClient.invalidateQueries({
+        queryKey: ["pending-recommendations-count"],
+      });
+    },
+  });
+}
+
+export function useApproveRecommendation() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (data: { recommendationId: string; approved: boolean }) =>
+      fetchApi<{ data: { success: boolean } }>("/api/recommendations/approve", {
+        method: "POST",
+        body: JSON.stringify(data),
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["recommendations"] });
+      queryClient.invalidateQueries({
+        queryKey: ["pending-recommendations-count"],
+      });
+    },
+  });
+}
+
+export function useUpdateRecommendation() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (data: {
+      id: string;
+      content?: string;
+      activityPlan?: string;
+      dietPlan?: string;
+    }) =>
+      fetchApi<{ data: { success: boolean } }>("/api/recommendations", {
+        method: "PUT",
+        body: JSON.stringify(data),
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["recommendations"] });
+    },
+  });
+}
+
+export function useCheckIn() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (userId: string) =>
+      fetchApi<{ data: { success: boolean; record: AttendanceRecord } }>(
+        "/api/attendance/check-in",
+        {
+          method: "POST",
+          body: JSON.stringify({ userId }),
+        },
+      ),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["attendance"] });
+    },
+  });
+}
+
+export function useCheckOut() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (userId: string) =>
+      fetchApi<{ data: { success: boolean } }>("/api/attendance/check-out", {
+        method: "POST",
+        body: JSON.stringify({ userId }),
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["attendance"] });
+    },
+  });
+}
+
+export function useInvitations() {
+  return useQuery({
+    queryKey: ["invitations"],
+    queryFn: () =>
+      fetchApi<{ data: { invitations: unknown[] } }>("/api/invitations").then(
+        (res) => res.data?.invitations ?? [],
+      ),
+  });
+}
+
+export function useSendInvitation() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (data: { email: string; role: string }) =>
+      fetchApi<{ data: { success: boolean } }>("/api/invitations", {
+        method: "POST",
+        body: JSON.stringify(data),
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["invitations"] });
+    },
+  });
+}
+
+export interface AnalyticsData {
+  userGrowth: { label: string; value: number }[];
+  membershipDistribution: { label: string; value: number; color: string }[];
+  revenue: { label: string; value: number; color: string }[];
+}
+
+export function useAnalytics(months: number = 6) {
+  return useQuery({
+    queryKey: ["analytics", months],
+    queryFn: () =>
+      fetchApi<{ data: { analytics: AnalyticsData } }>(
+        `/api/admin/analytics?months=${months}`,
+      ).then((res) => res.data?.analytics),
+  });
+}

apps/mobile/src/app/(auth)/onboarding.tsx

@@ -96,9 +96,13 @@ export default function OnboardingScreen() {
 
       const fitnessData = {
         userId: user.id,
-        height: parseFloat(fitnessProfile.height),
+        height: fitnessProfile.height
-        weight: parseFloat(fitnessProfile.weight),
+          ? parseFloat(fitnessProfile.height)
-        age: parseInt(fitnessProfile.age),
+          : undefined,
+        weight: fitnessProfile.weight
+          ? parseFloat(fitnessProfile.weight)
+          : undefined,
+        age: fitnessProfile.age ? parseInt(fitnessProfile.age, 10) : undefined,
         fitnessGoals: fitnessProfile.goals ? [fitnessProfile.goals] : [],
         medicalConditions: fitnessProfile.medicalConditions || undefined,
         allergies: fitnessProfile.dietaryRestrictions || undefined,

apps/mobile/src/app/fitness-profile.tsx

@@ -13,8 +13,10 @@ import {
 import { useRouter, Stack } from "expo-router";
 import { useAuth } from "@clerk/clerk-expo";
 import { Ionicons } from "@expo/vector-icons";
-import { LinearGradient } from "expo-linear-gradient";
+import { useTheme } from "../contexts/ThemeContext";
-import { theme } from "../styles/theme";
+import { MinimalCard } from "../components/MinimalCard";
+import { MinimalButton } from "../components/MinimalButton";
+import { IconContainer } from "../components/IconContainer";
 import { API_BASE_URL } from "../config/api";
 
 interface FitnessProfileData {
@@ -30,13 +32,13 @@ interface FitnessProfileData {
 }
 
 const GENDER_OPTIONS = [
-  { label: "Male", value: "male", icon: "male" },
+  { label: "Male", value: "male", icon: "male-outline" },
-  { label: "Female", value: "female", icon: "female" },
+  { label: "Female", value: "female", icon: "female-outline" },
-  { label: "Other", value: "other", icon: "transgender" },
+  { label: "Other", value: "other", icon: "transgender-outline" },
   {
     label: "Prefer not to say",
     value: "prefer_not_to_say",
-    icon: "help-circle",
+    icon: "help-circle-outline",
   },
 ];
 
@@ -45,31 +47,26 @@ const FITNESS_GOAL_OPTIONS = [
     label: "Weight Loss",
     value: "weight_loss",
     icon: "trending-down",
-    color: theme.colors.danger,
+    color: "#FF3B3B",
   },
   {
     label: "Muscle Gain",
     value: "muscle_gain",
     icon: "barbell",
-    color: theme.colors.primary,
+    color: "#0066FF",
-  },
-  {
-    label: "Endurance",
-    value: "endurance",
-    icon: "bicycle",
-    color: theme.colors.success,
   },
+  { label: "Endurance", value: "endurance", icon: "bicycle", color: "#00D26A" },
   {
     label: "Flexibility",
     value: "flexibility",
     icon: "body",
-    color: theme.colors.purple,
+    color: "#7B2CBF",
   },
   {
     label: "General Fitness",
     value: "general_fitness",
     icon: "fitness",
-    color: theme.colors.warning,
+    color: "#FFB800",
   },
 ];
 
@@ -99,6 +96,7 @@ const ACTIVITY_LEVEL_OPTIONS = [
 
 export default function FitnessProfileScreen() {
   const router = useRouter();
+  const { colors, typography } = useTheme();
   const { userId, getToken } = useAuth();
   const [loading, setLoading] = useState(false);
   const [fetchingProfile, setFetchingProfile] = useState(true);
@@ -124,7 +122,6 @@ export default function FitnessProfileScreen() {
       if (response.ok) {
         const data = await response.json();
         if (data.profile) {
-          // Normalize old activity level values to new schema
           let activityLevel = data.profile.activityLevel || "";
           if (activityLevel === "light") activityLevel = "lightly_active";
           if (activityLevel === "moderate") activityLevel = "moderately_active";
@@ -159,8 +156,6 @@ export default function FitnessProfileScreen() {
       setLoading(true);
       const token = await getToken();
 
-      // Prepare data with userId and convert fitnessGoal to fitnessGoals array
-      // Convert empty strings to undefined for optional enum fields
       const dataToSave = {
         userId: userId,
         height: profileData.height,
@@ -205,8 +200,13 @@ export default function FitnessProfileScreen() {
 
   if (fetchingProfile) {
     return (
-      <View style={styles.loadingContainer}>
+      <View
-        <ActivityIndicator size="large" color={theme.colors.primary} />
+        style={[
+          styles.loadingContainer,
+          { backgroundColor: colors.background },
+        ]}
+      >
+        <ActivityIndicator size="large" color={colors.primary} />
       </View>
     );
   }
@@ -214,18 +214,28 @@ export default function FitnessProfileScreen() {
   return (
     <>
       <Stack.Screen options={{ headerShown: false }} />
-      <View style={styles.container}>
+      <View style={[styles.container, { backgroundColor: colors.background }]}>
         {/* Header */}
-        <LinearGradient colors={theme.gradients.primary} style={styles.header}>
+        <View
+          style={[
+            styles.header,
+            {
+              backgroundColor: colors.primary,
+              paddingTop: Platform.OS === "ios" ? 60 : 40,
+            },
+          ]}
+        >
           <TouchableOpacity
             style={styles.backButton}
             onPress={() => router.back()}
           >
             <Ionicons name="arrow-back" size={24} color="#fff" />
           </TouchableOpacity>
-          <Text style={styles.headerTitle}>Fitness Profile</Text>
+          <Text style={[typography.h2, { color: "#fff" }]}>
+            Fitness Profile
+          </Text>
           <View style={{ width: 40 }} />
-        </LinearGradient>
+        </View>
 
         <ScrollView
           style={styles.scrollView}
@@ -234,19 +244,41 @@ export default function FitnessProfileScreen() {
         >
           {/* Basic Information */}
           <View style={styles.section}>
-            <Text style={styles.sectionTitle}>Basic Information</Text>
+            <Text
-            <View style={styles.card}>
+              style={[
-              <View style={styles.row}>
+                typography.h3,
+                { color: colors.textPrimary, marginBottom: 16 },
+              ]}
+            >
+              Basic Information
+            </Text>
+            <MinimalCard variant="elevated" style={styles.card}>
+              <View style={styles.inputRow}>
                 <View style={styles.inputGroup}>
-                  <Text style={styles.label}>Height (cm)</Text>
+                  <Text
-                  <View style={styles.inputContainer}>
+                    style={[
+                      typography.label,
+                      { color: colors.textSecondary, marginBottom: 8 },
+                    ]}
+                  >
+                    HEIGHT (CM)
+                  </Text>
+                  <View
+                    style={[
+                      styles.inputContainer,
+                      {
+                        backgroundColor: colors.surfaceElevated,
+                        borderColor: colors.border,
+                      },
+                    ]}
+                  >
                     <Ionicons
-                      name="resize-outline"
+                      name="resize"
                       size={20}
-                      color={theme.colors.gray400}
+                      color={colors.textTertiary}
                     />
                     <TextInput
-                      style={styles.input}
+                      style={[styles.input, { color: colors.textPrimary }]}
                       value={profileData.height?.toString() || ""}
                       onChangeText={(text) =>
                         updateField(
@@ -256,20 +288,35 @@ export default function FitnessProfileScreen() {
                       }
                       keyboardType="decimal-pad"
                       placeholder="175"
-                      placeholderTextColor={theme.colors.gray400}
+                      placeholderTextColor={colors.textTertiary}
                     />
                   </View>
                 </View>
                 <View style={styles.inputGroup}>
-                  <Text style={styles.label}>Weight (kg)</Text>
+                  <Text
-                  <View style={styles.inputContainer}>
+                    style={[
+                      typography.label,
+                      { color: colors.textSecondary, marginBottom: 8 },
+                    ]}
+                  >
+                    WEIGHT (KG)
+                  </Text>
+                  <View
+                    style={[
+                      styles.inputContainer,
+                      {
+                        backgroundColor: colors.surfaceElevated,
+                        borderColor: colors.border,
+                      },
+                    ]}
+                  >
                     <Ionicons
-                      name="scale-outline"
+                      name="scale"
                       size={20}
-                      color={theme.colors.gray400}
+                      color={colors.textTertiary}
                     />
                     <TextInput
-                      style={styles.input}
+                      style={[styles.input, { color: colors.textPrimary }]}
                       value={profileData.weight?.toString() || ""}
                       onChangeText={(text) =>
                         updateField(
@@ -279,45 +326,75 @@ export default function FitnessProfileScreen() {
                       }
                       keyboardType="decimal-pad"
                       placeholder="70"
-                      placeholderTextColor={theme.colors.gray400}
+                      placeholderTextColor={colors.textTertiary}
                     />
                   </View>
                 </View>
               </View>
               <View style={styles.inputGroup}>
-                <Text style={styles.label}>Age</Text>
+                <Text
-                <View style={styles.inputContainer}>
+                  style={[
+                    typography.label,
+                    { color: colors.textSecondary, marginBottom: 8 },
+                  ]}
+                >
+                  AGE
+                </Text>
+                <View
+                  style={[
+                    styles.inputContainer,
+                    {
+                      backgroundColor: colors.surfaceElevated,
+                      borderColor: colors.border,
+                    },
+                  ]}
+                >
                   <Ionicons
-                    name="calendar-outline"
+                    name="calendar"
                     size={20}
-                    color={theme.colors.gray400}
+                    color={colors.textTertiary}
                   />
                   <TextInput
-                    style={styles.input}
+                    style={[styles.input, { color: colors.textPrimary }]}
                     value={profileData.age?.toString() || ""}
                     onChangeText={(text) =>
                       updateField("age", text ? parseInt(text, 10) : undefined)
                     }
                     keyboardType="number-pad"
                     placeholder="25"
-                    placeholderTextColor={theme.colors.gray400}
+                    placeholderTextColor={colors.textTertiary}
                   />
                 </View>
               </View>
-            </View>
+            </MinimalCard>
           </View>
 
           {/* Gender Selection */}
           <View style={styles.section}>
-            <Text style={styles.sectionTitle}>Gender</Text>
+            <Text
-            <View style={styles.optionsRow}>
+              style={[
+                typography.h3,
+                { color: colors.textPrimary, marginBottom: 16 },
+              ]}
+            >
+              Gender
+            </Text>
+            <View style={styles.genderRow}>
               {GENDER_OPTIONS.map((option) => (
                 <TouchableOpacity
                   key={option.value}
                   style={[
-                    styles.optionCard,
+                    styles.genderCard,
-                    profileData.gender === option.value &&
+                    {
-                      styles.optionCardActive,
+                      backgroundColor:
+                        profileData.gender === option.value
+                          ? colors.primary
+                          : colors.surfaceElevated,
+                      borderColor:
+                        profileData.gender === option.value
+                          ? colors.primary
+                          : colors.border,
+                    },
                   ]}
                   onPress={() => updateField("gender", option.value)}
                 >
@@ -326,15 +403,22 @@ export default function FitnessProfileScreen() {
                     size={24}
                     color={
                       profileData.gender === option.value
-                        ? theme.colors.primary
+                        ? "#fff"
-                        : theme.colors.gray400
+                        : colors.textTertiary
                     }
                   />
                   <Text
                     style={[
-                      styles.optionLabel,
+                      typography.caption,
-                      profileData.gender === option.value &&
+                      {
-                        styles.optionLabelActive,
+                        color:
+                          profileData.gender === option.value
+                            ? "#fff"
+                            : colors.textSecondary,
+                        fontWeight:
+                          profileData.gender === option.value ? "700" : "500",
+                        marginTop: 6,
+                      },
                     ]}
                   >
                     {option.label}
@@ -346,8 +430,15 @@ export default function FitnessProfileScreen() {
 
           {/* Fitness Goal */}
           <View style={styles.section}>
-            <Text style={styles.sectionTitle}>Primary Fitness Goal</Text>
+            <Text
-            <View style={styles.card}>
+              style={[
+                typography.h3,
+                { color: colors.textPrimary, marginBottom: 16 },
+              ]}
+            >
+              Primary Fitness Goal
+            </Text>
+            <MinimalCard variant="elevated" style={styles.card}>
               {FITNESS_GOAL_OPTIONS.map((option, index) => (
                 <React.Fragment key={option.value}>
                   <TouchableOpacity
@@ -366,27 +457,46 @@ export default function FitnessProfileScreen() {
                         color={option.color}
                       />
                     </View>
-                    <Text style={styles.listItemText}>{option.label}</Text>
+                    <Text
+                      style={[
+                        typography.bodyEmphasis,
+                        { color: colors.textPrimary, flex: 1 },
+                      ]}
+                    >
+                      {option.label}
+                    </Text>
                     {profileData.fitnessGoal === option.value && (
                       <Ionicons
                         name="checkmark-circle"
                         size={24}
-                        color={theme.colors.primary}
+                        color={colors.primary}
                       />
                     )}
                   </TouchableOpacity>
                   {index < FITNESS_GOAL_OPTIONS.length - 1 && (
-                    <View style={styles.divider} />
+                    <View
+                      style={[
+                        styles.divider,
+                        { backgroundColor: colors.border },
+                      ]}
+                    />
                   )}
                 </React.Fragment>
               ))}
-            </View>
+            </MinimalCard>
           </View>
 
           {/* Activity Level */}
           <View style={styles.section}>
-            <Text style={styles.sectionTitle}>Activity Level</Text>
+            <Text
-            <View style={styles.card}>
+              style={[
+                typography.h3,
+                { color: colors.textPrimary, marginBottom: 16 },
+              ]}
+            >
+              Activity Level
+            </Text>
+            <MinimalCard variant="elevated" style={styles.card}>
               {ACTIVITY_LEVEL_OPTIONS.map((option, index) => (
                 <React.Fragment key={option.value}>
                   <TouchableOpacity
@@ -394,8 +504,20 @@ export default function FitnessProfileScreen() {
                     onPress={() => updateField("activityLevel", option.value)}
                   >
                     <View style={{ flex: 1 }}>
-                      <Text style={styles.listItemText}>{option.label}</Text>
+                      <Text
-                      <Text style={styles.listItemDescription}>
+                        style={[
+                          typography.bodyEmphasis,
+                          { color: colors.textPrimary },
+                        ]}
+                      >
+                        {option.label}
+                      </Text>
+                      <Text
+                        style={[
+                          typography.caption,
+                          { color: colors.textTertiary, marginTop: 2 },
+                        ]}
+                      >
                         {option.description}
                       </Text>
                     </View>
@@ -403,90 +525,141 @@ export default function FitnessProfileScreen() {
                       <Ionicons
                         name="checkmark-circle"
                         size={24}
-                        color={theme.colors.primary}
+                        color={colors.primary}
                       />
                     )}
                   </TouchableOpacity>
                   {index < ACTIVITY_LEVEL_OPTIONS.length - 1 && (
-                    <View style={styles.divider} />
+                    <View
+                      style={[
+                        styles.divider,
+                        { backgroundColor: colors.border },
+                      ]}
+                    />
                   )}
                 </React.Fragment>
               ))}
-            </View>
+            </MinimalCard>
           </View>
 
           {/* Health Information */}
           <View style={styles.section}>
-            <Text style={styles.sectionTitle}>
+            <Text
-              Health Information (Optional)
+              style={[
+                typography.h3,
+                { color: colors.textPrimary, marginBottom: 16 },
+              ]}
+            >
+              Health Information
             </Text>
-            <View style={styles.card}>
+            <MinimalCard variant="elevated" style={styles.card}>
               <View style={styles.inputGroup}>
-                <Text style={styles.label}>Medical Conditions</Text>
+                <Text
+                  style={[
+                    typography.label,
+                    { color: colors.textSecondary, marginBottom: 8 },
+                  ]}
+                >
+                  MEDICAL CONDITIONS
+                </Text>
                 <TextInput
-                  style={[styles.textArea]}
+                  style={[
+                    styles.textArea,
+                    {
+                      backgroundColor: colors.surfaceElevated,
+                      borderColor: colors.border,
+                      color: colors.textPrimary,
+                    },
+                  ]}
                   value={profileData.medicalConditions || ""}
                   onChangeText={(text) =>
                     updateField("medicalConditions", text)
                   }
                   placeholder="e.g., Asthma, diabetes..."
-                  placeholderTextColor={theme.colors.gray400}
+                  placeholderTextColor={colors.textTertiary}
                   multiline
                   numberOfLines={3}
                   textAlignVertical="top"
                 />
               </View>
               <View style={styles.inputGroup}>
-                <Text style={styles.label}>Allergies</Text>
+                <Text
+                  style={[
+                    typography.label,
+                    { color: colors.textSecondary, marginBottom: 8 },
+                  ]}
+                >
+                  ALLERGIES
+                </Text>
                 <TextInput
-                  style={[styles.textArea]}
+                  style={[
+                    styles.textArea,
+                    {
+                      backgroundColor: colors.surfaceElevated,
+                      borderColor: colors.border,
+                      color: colors.textPrimary,
+                    },
+                  ]}
                   value={profileData.allergies || ""}
                   onChangeText={(text) => updateField("allergies", text)}
                   placeholder="e.g., Peanuts, latex..."
-                  placeholderTextColor={theme.colors.gray400}
+                  placeholderTextColor={colors.textTertiary}
                   multiline
                   numberOfLines={3}
                   textAlignVertical="top"
                 />
               </View>
               <View style={styles.inputGroup}>
-                <Text style={styles.label}>Injuries</Text>
+                <Text
+                  style={[
+                    typography.label,
+                    { color: colors.textSecondary, marginBottom: 8 },
+                  ]}
+                >
+                  INJURIES
+                </Text>
                 <TextInput
-                  style={[styles.textArea]}
+                  style={[
+                    styles.textArea,
+                    {
+                      backgroundColor: colors.surfaceElevated,
+                      borderColor: colors.border,
+                      color: colors.textPrimary,
+                    },
+                  ]}
                   value={profileData.injuries || ""}
                   onChangeText={(text) => updateField("injuries", text)}
                   placeholder="e.g., Previous knee injury..."
-                  placeholderTextColor={theme.colors.gray400}
+                  placeholderTextColor={colors.textTertiary}
                   multiline
                   numberOfLines={3}
                   textAlignVertical="top"
                 />
               </View>
-            </View>
+            </MinimalCard>
           </View>
+
+          <View style={{ height: 120 }} />
         </ScrollView>
 
         {/* Save Button */}
-        <View style={styles.footer}>
+        <View
-          <TouchableOpacity
+          style={[
-            style={[styles.saveButton, loading && styles.saveButtonDisabled]}
+            styles.footer,
+            {
+              backgroundColor: colors.background,
+              borderTopColor: colors.border,
+            },
+          ]}
+        >
+          <MinimalButton
+            title="Save Profile"
             onPress={handleSave}
-            disabled={loading}
+            variant="primary"
-          >
+            size="xl"
-            <LinearGradient
+            fullWidth
-              colors={theme.gradients.primary}
+            loading={loading}
-              style={styles.saveButtonGradient}
+          />
-            >
-              {loading ? (
-                <ActivityIndicator color="#fff" />
-              ) : (
-                <>
-                  <Ionicons name="checkmark-circle" size={20} color="#fff" />
-                  <Text style={styles.saveButtonText}>Save Profile</Text>
-                </>
-              )}
-            </LinearGradient>
-          </TouchableOpacity>
         </View>
       </View>
     </>
@@ -496,35 +669,27 @@ export default function FitnessProfileScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: theme.colors.background,
   },
   loadingContainer: {
     flex: 1,
     justifyContent: "center",
     alignItems: "center",
-    backgroundColor: theme.colors.background,
   },
   header: {
     flexDirection: "row",
     alignItems: "center",
     justifyContent: "space-between",
-    paddingTop: Platform.OS === "ios" ? 60 : 40,
     paddingBottom: 20,
     paddingHorizontal: 20,
   },
   backButton: {
     width: 40,
     height: 40,
-    borderRadius: 20,
+    borderRadius: 12,
     backgroundColor: "rgba(255, 255, 255, 0.2)",
     justifyContent: "center",
     alignItems: "center",
   },
-  headerTitle: {
-    fontSize: theme.typography.fontSize["2xl"],
-    fontWeight: theme.typography.fontWeight.bold,
-    color: "#fff",
-  },
   scrollView: {
     flex: 1,
   },
@@ -533,118 +698,69 @@ const styles = StyleSheet.create({
     paddingBottom: 100,
   },
   section: {
-    marginBottom: 24,
+    marginBottom: 28,
-  },
-  sectionTitle: {
-    fontSize: theme.typography.fontSize.lg,
-    fontWeight: theme.typography.fontWeight.bold,
-    color: theme.colors.gray900,
-    marginBottom: 12,
   },
   card: {
-    backgroundColor: "#fff",
+    padding: 4,
-    borderRadius: theme.borderRadius.xl,
-    padding: 16,
-    ...theme.shadows.subtle,
-    borderWidth: 1,
-    borderColor: theme.colors.gray100,
   },
-  row: {
+  inputRow: {
     flexDirection: "row",
     gap: 12,
-    marginBottom: 16,
   },
   inputGroup: {
     flex: 1,
-    marginBottom: 16,
+    marginBottom: 4,
-  },
-  label: {
-    fontSize: theme.typography.fontSize.sm,
-    fontWeight: theme.typography.fontWeight.semibold,
-    color: theme.colors.gray700,
-    marginBottom: 8,
   },
   inputContainer: {
     flexDirection: "row",
     alignItems: "center",
-    backgroundColor: theme.colors.gray50,
+    borderRadius: 14,
-    borderRadius: theme.borderRadius.lg,
+    borderWidth: 1.5,
-    borderWidth: 1,
+    paddingHorizontal: 14,
-    borderColor: theme.colors.gray200,
+    gap: 10,
-    paddingHorizontal: 12,
-    gap: 8,
   },
   input: {
     flex: 1,
-    paddingVertical: 12,
+    paddingVertical: 14,
-    fontSize: theme.typography.fontSize.base,
+    fontSize: 16,
-    color: theme.colors.gray900,
+    fontWeight: "600",
   },
   textArea: {
-    backgroundColor: theme.colors.gray50,
+    borderRadius: 14,
-    borderRadius: theme.borderRadius.lg,
+    borderWidth: 1.5,
-    borderWidth: 1,
+    padding: 14,
-    borderColor: theme.colors.gray200,
+    fontSize: 16,
-    padding: 12,
+    minHeight: 90,
-    fontSize: theme.typography.fontSize.base,
-    color: theme.colors.gray900,
-    minHeight: 80,
   },
-  optionsRow: {
+  genderRow: {
     flexDirection: "row",
-    gap: 12,
+    gap: 10,
   },
-  optionCard: {
+  genderCard: {
     flex: 1,
-    backgroundColor: "#fff",
+    paddingVertical: 16,
-    borderRadius: theme.borderRadius.lg,
+    paddingHorizontal: 8,
-    padding: 16,
+    borderRadius: 14,
-    alignItems: "center",
-    gap: 8,
     borderWidth: 2,
-    borderColor: theme.colors.gray200,
+    alignItems: "center",
-    ...theme.shadows.subtle,
-  },
-  optionCardActive: {
-    borderColor: theme.colors.primary,
-    backgroundColor: `${theme.colors.primary}10`,
-  },
-  optionLabel: {
-    fontSize: theme.typography.fontSize.sm,
-    fontWeight: theme.typography.fontWeight.medium,
-    color: theme.colors.gray600,
-  },
-  optionLabelActive: {
-    color: theme.colors.primary,
-    fontWeight: theme.typography.fontWeight.bold,
   },
   listItem: {
     flexDirection: "row",
     alignItems: "center",
-    paddingVertical: 12,
+    paddingVertical: 14,
-    gap: 12,
+    paddingHorizontal: 12,
+    gap: 14,
   },
   iconCircle: {
-    width: 40,
+    width: 44,
-    height: 40,
+    height: 44,
-    borderRadius: 20,
+    borderRadius: 12,
     justifyContent: "center",
     alignItems: "center",
   },
-  listItemText: {
-    flex: 1,
-    fontSize: theme.typography.fontSize.base,
-    fontWeight: theme.typography.fontWeight.medium,
-    color: theme.colors.gray900,
-  },
-  listItemDescription: {
-    fontSize: theme.typography.fontSize.xs,
-    color: theme.colors.gray500,
-    marginTop: 2,
-  },
   divider: {
     height: 1,
-    backgroundColor: theme.colors.gray100,
+    marginLeft: 58,
   },
   footer: {
     position: "absolute",
@@ -652,29 +768,7 @@ const styles = StyleSheet.create({
     left: 0,
     right: 0,
     padding: 20,
-    paddingBottom: Platform.OS === "ios" ? 40 : 20,
+    paddingBottom: 34,
-    backgroundColor: "#fff",
     borderTopWidth: 1,
-    borderTopColor: theme.colors.gray100,
-    ...theme.shadows.medium,
-  },
-  saveButton: {
-    borderRadius: theme.borderRadius.lg,
-    overflow: "hidden",
-  },
-  saveButtonGradient: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "center",
-    paddingVertical: 16,
-    gap: 8,
-  },
-  saveButtonDisabled: {
-    opacity: 0.6,
-  },
-  saveButtonText: {
-    fontSize: theme.typography.fontSize.base,
-    fontWeight: theme.typography.fontWeight.bold,
-    color: "#fff",
   },
 });