db up

maybe need polishing

apps/admin/.env.example

@@ -0,0 +1,3 @@
+# DeepSeek AI API Key
+# Get your API key from https://platform.deepseek.com/
+DEEPSEEK_API_KEY=your_deepseek_api_key_here

apps/admin/debug_log.txt

@@ -0,0 +1,36 @@
+[Approve] Updating recommendation a2a4d10a-463d-4648-b2a3-3b97fd053078 with: {"status":"approved","approvedAt":"2025-11-24T16:18:30.211Z","approvedBy":"user_35fyZb2QT54VYzLfvx1cSIdcnKI"}
+[SQLite] Update result for a2a4d10a-463d-4648-b2a3-3b97fd053078: {"changes":0,"lastInsertRowid":0}
+[SQLite] Fetch after update for a2a4d10a-463d-4648-b2a3-3b97fd053078: Not Found
+[Approve] Result for a2a4d10a-463d-4648-b2a3-3b97fd053078: Not Found
+[Approve] Updating recommendation fdacfa23-0116-452b-a40e-671583a6ce60 with: {"status":"approved","approvedAt":"2025-11-24T16:21:37.787Z","approvedBy":"user_35fyZb2QT54VYzLfvx1cSIdcnKI"}
+[SQLite] Update result for fdacfa23-0116-452b-a40e-671583a6ce60: {"changes":1,"lastInsertRowid":1}
+[SQLite] Fetch after update for fdacfa23-0116-452b-a40e-671583a6ce60: Found
+[Approve] Result for fdacfa23-0116-452b-a40e-671583a6ce60: Success
+[Approve] Updating recommendation fdacfa23-0116-452b-a40e-671583a6ce60 with: {"status":"approved","approvedAt":"2025-11-24T16:22:27.297Z","approvedBy":"user_35fyZb2QT54VYzLfvx1cSIdcnKI"}
+[SQLite] Update result for fdacfa23-0116-452b-a40e-671583a6ce60: {"changes":1,"lastInsertRowid":1}
+[SQLite] Fetch after update for fdacfa23-0116-452b-a40e-671583a6ce60: Found
+[Approve] Result for fdacfa23-0116-452b-a40e-671583a6ce60: Success
+[Approve] Updating recommendation fdacfa23-0116-452b-a40e-671583a6ce60 with: {"status":"approved","approvedAt":"2025-11-24T16:24:28.104Z","approvedBy":"user_35fyZb2QT54VYzLfvx1cSIdcnKI"}
+[SQLite] Update result for fdacfa23-0116-452b-a40e-671583a6ce60: {"changes":1,"lastInsertRowid":0}
+[SQLite] Fetch after update for fdacfa23-0116-452b-a40e-671583a6ce60: Found
+[Approve] Result for fdacfa23-0116-452b-a40e-671583a6ce60: Success
+[Approve] Updating recommendation fdacfa23-0116-452b-a40e-671583a6ce60 with: {"status":"approved","approvedAt":"2025-11-24T16:24:29.552Z","approvedBy":"user_35fyZb2QT54VYzLfvx1cSIdcnKI"}
+[SQLite] Update result for fdacfa23-0116-452b-a40e-671583a6ce60: {"changes":1,"lastInsertRowid":0}
+[SQLite] Fetch after update for fdacfa23-0116-452b-a40e-671583a6ce60: Found
+[Approve] Result for fdacfa23-0116-452b-a40e-671583a6ce60: Success
+[Approve] Updating recommendation fdacfa23-0116-452b-a40e-671583a6ce60 with: {"status":"approved","approvedAt":"2025-11-24T16:25:42.561Z","approvedBy":"user_35fyZb2QT54VYzLfvx1cSIdcnKI"}
+[SQLite] Update result for fdacfa23-0116-452b-a40e-671583a6ce60: {"changes":1,"lastInsertRowid":0}
+[SQLite] Fetch after update for fdacfa23-0116-452b-a40e-671583a6ce60: Found
+[Approve] Result for fdacfa23-0116-452b-a40e-671583a6ce60: Success
+[Approve] Updating recommendation fdacfa23-0116-452b-a40e-671583a6ce60 with: {"status":"approved","approvedAt":"2025-11-24T16:25:43.627Z","approvedBy":"user_35fyZb2QT54VYzLfvx1cSIdcnKI"}
+[SQLite] Update result for fdacfa23-0116-452b-a40e-671583a6ce60: {"changes":1,"lastInsertRowid":0}
+[SQLite] Fetch after update for fdacfa23-0116-452b-a40e-671583a6ce60: Found
+[Approve] Result for fdacfa23-0116-452b-a40e-671583a6ce60: Success
+[Approve] Updating recommendation fdacfa23-0116-452b-a40e-671583a6ce60 with: {"status":"approved","approvedAt":"2025-11-24T16:27:02.858Z","approvedBy":"user_35fyZb2QT54VYzLfvx1cSIdcnKI"}
+[SQLite] Update result for fdacfa23-0116-452b-a40e-671583a6ce60: {"changes":1,"lastInsertRowid":2}
+[SQLite] Fetch after update for fdacfa23-0116-452b-a40e-671583a6ce60: Found
+[Approve] Result for fdacfa23-0116-452b-a40e-671583a6ce60: Success
+[Approve] Updating recommendation fdacfa23-0116-452b-a40e-671583a6ce60 with: {"status":"rejected"}
+[SQLite] Update result for fdacfa23-0116-452b-a40e-671583a6ce60: {"changes":1,"lastInsertRowid":2}
+[SQLite] Fetch after update for fdacfa23-0116-452b-a40e-671583a6ce60: Found
+[Approve] Result for fdacfa23-0116-452b-a40e-671583a6ce60: Success

apps/admin/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

apps/admin/package.json

@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "@clerk/nextjs": "^6.34.5",
+    "@fitai/database": "file:../../packages/database",
     "@fitai/shared": "file:../../packages/shared",
     "@hookform/resolvers": "^5.2.2",
     "@radix-ui/react-slot": "^1.2.4",
@@ -29,6 +30,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
+    "drizzle-orm": "^0.44.7",
     "lucide-react": "^0.553.0",
     "next": "^16.0.1",
     "postcss": "^8.4.31",

apps/admin/scripts/create-fitness-goals.js

@@ -0,0 +1,49 @@
+const Database = require('better-sqlite3');
+const path = require('path');
+
+const dbPath = path.join(__dirname, '../data/fitai.db');
+const db = new Database(dbPath);
+
+console.log('Creating fitness_goals table...');
+
+try {
+    db.exec(`
+        CREATE TABLE IF NOT EXISTS fitness_goals (
+            id TEXT PRIMARY KEY,
+            user_id TEXT NOT NULL,
+            fitness_profile_id TEXT,
+            goal_type TEXT NOT NULL CHECK(goal_type IN ('weight_target', 'strength_milestone', 'endurance_target', 'flexibility_goal', 'habit_building', 'custom')),
+            title TEXT NOT NULL,
+            description TEXT,
+            target_value REAL,
+            current_value REAL,
+            unit TEXT,
+            start_date INTEGER NOT NULL,
+            target_date INTEGER,
+            completed_date INTEGER,
+            status TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'completed', 'abandoned', 'paused')),
+            progress REAL DEFAULT 0,
+            priority TEXT DEFAULT 'medium' CHECK(priority IN ('low', 'medium', 'high')),
+            notes TEXT,
+            created_at INTEGER NOT NULL,
+            updated_at INTEGER NOT NULL,
+            FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
+            FOREIGN KEY (fitness_profile_id) REFERENCES fitness_profiles(userId) ON DELETE CASCADE
+        )
+    `);
+
+    // Create indexes for better query performance
+    db.exec(`
+        CREATE INDEX IF NOT EXISTS idx_fitness_goals_user_id ON fitness_goals(user_id);
+        CREATE INDEX IF NOT EXISTS idx_fitness_goals_status ON fitness_goals(status);
+        CREATE INDEX IF NOT EXISTS idx_fitness_goals_profile_id ON fitness_goals(fitness_profile_id);
+    `);
+
+    console.log('✅ fitness_goals table created successfully');
+    console.log('✅ Indexes created successfully');
+} catch (error) {
+    console.error('❌ Migration failed:', error);
+    process.exit(1);
+} finally {
+    db.close();
+}

apps/admin/scripts/migrate-fitness-profile.js

@@ -1,7 +1,7 @@
 const Database = require('better-sqlite3');
 const path = require('path');
 
-const dbPath = path.join(__dirname, '../../../data/fitai.db');
+const dbPath = path.join(__dirname, '../data/fitai.db');
 const db = new Database(dbPath);
 
 console.log('Migrating fitness_profiles table...');

apps/admin/src/app/api/fitness-goals/[id]/complete/route.ts

@@ -0,0 +1,39 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { auth } from '@clerk/nextjs/server';
+import { getDatabase } from '@/lib/database';
+
+// POST - Mark goal as complete
+export async function POST(
+    req: NextRequest,
+    { params }: { params: { id: string } }
+) {
+    try {
+        const { userId } = await auth();
+        if (!userId) {
+            return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+        }
+
+        const { id } = await params;
+        const db = await getDatabase();
+
+        // Verify goal exists and user owns it
+        const existingGoal = await db.getFitnessGoalById(id);
+        if (!existingGoal) {
+            return NextResponse.json({ error: 'Goal not found' }, { status: 404 });
+        }
+        if (existingGoal.userId !== userId) {
+            return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
+        }
+
+        // Mark as completed
+        const completedGoal = await db.completeGoal(id);
+
+        return NextResponse.json(completedGoal);
+    } catch (error) {
+        console.error('Error completing fitness goal:', error);
+        return NextResponse.json(
+            { error: 'Internal server error' },
+            { status: 500 }
+        );
+    }
+}

apps/admin/src/app/api/fitness-goals/[id]/route.ts

@@ -0,0 +1,119 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { auth } from '@clerk/nextjs/server';
+import { getDatabase } from '@/lib/database';
+
+// GET - Get specific goal
+export async function GET(
+    req: NextRequest,
+    { params }: { params: { id: string } }
+) {
+    try {
+        const { userId } = await auth();
+        if (!userId) {
+            return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+        }
+
+        const { id } = await params;
+        const db = await getDatabase();
+
+        const goal = await db.getFitnessGoalById(id);
+
+        if (!goal) {
+            return NextResponse.json({ error: 'Goal not found' }, { status: 404 });
+        }
+
+        // Verify ownership
+        if (goal.userId !== userId) {
+            return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
+        }
+
+        return NextResponse.json(goal);
+    } catch (error) {
+        console.error('Error fetching fitness goal:', error);
+        return NextResponse.json(
+            { error: 'Internal server error' },
+            { status: 500 }
+        );
+    }
+}
+
+// PUT - Update goal
+export async function PUT(
+    req: NextRequest,
+    { params }: { params: { id: string } }
+) {
+    try {
+        const { userId } = await auth();
+        if (!userId) {
+            return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+        }
+
+        const { id } = await params;
+        const db = await getDatabase();
+
+        // Verify goal exists and user owns it
+        const existingGoal = await db.getFitnessGoalById(id);
+        if (!existingGoal) {
+            return NextResponse.json({ error: 'Goal not found' }, { status: 404 });
+        }
+        if (existingGoal.userId !== userId) {
+            return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
+        }
+
+        const updates = await req.json();
+
+        // Don't allow changing userId or id
+        delete updates.userId;
+        delete updates.id;
+        delete updates.createdAt;
+
+        const updatedGoal = await db.updateFitnessGoal(id, updates);
+
+        return NextResponse.json(updatedGoal);
+    } catch (error) {
+        console.error('Error updating fitness goal:', error);
+        return NextResponse.json(
+            { error: 'Internal server error' },
+            { status: 500 }
+        );
+    }
+}
+
+// DELETE - Delete goal
+export async function DELETE(
+    req: NextRequest,
+    { params }: { params: { id: string } }
+) {
+    try {
+        const { userId } = await auth();
+        if (!userId) {
+            return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+        }
+
+        const { id } = await params;
+        const db = await getDatabase();
+
+        // Verify goal exists and user owns it
+        const existingGoal = await db.getFitnessGoalById(id);
+        if (!existingGoal) {
+            return NextResponse.json({ error: 'Goal not found' }, { status: 404 });
+        }
+        if (existingGoal.userId !== userId) {
+            return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
+        }
+
+        const deleted = await db.deleteFitnessGoal(id);
+
+        if (deleted) {
+            return NextResponse.json({ success: true });
+        } else {
+            return NextResponse.json({ error: 'Failed to delete goal' }, { status: 500 });
+        }
+    } catch (error) {
+        console.error('Error deleting fitness goal:', error);
+        return NextResponse.json(
+            { error: 'Internal server error' },
+            { status: 500 }
+        );
+    }
+}

apps/admin/src/app/api/fitness-goals/route.ts

@@ -0,0 +1,95 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { auth } from '@clerk/nextjs/server';
+import { getDatabase } from '@/lib/database';
+import { randomBytes } from 'crypto';
+
+// GET - List user's fitness goals
+export async function GET(req: NextRequest) {
+    try {
+        const { userId } = await auth();
+        if (!userId) {
+            return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+        }
+
+        const { searchParams } = new URL(req.url);
+        const targetUserId = searchParams.get('userId') || userId;
+        const status = searchParams.get('status'); // active, completed, all
+
+        const db = await getDatabase();
+
+        // Fetch goals with optional status filter
+        const goals = await db.getFitnessGoalsByUserId(
+            targetUserId,
+            status && status !== 'all' ? status : undefined
+        );
+
+        return NextResponse.json(goals);
+    } catch (error) {
+        console.error('Error fetching fitness goals:', error);
+        return NextResponse.json(
+            { error: 'Internal server error' },
+            { status: 500 }
+        );
+    }
+}
+
+// POST - Create new fitness goal
+export async function POST(req: NextRequest) {
+    try {
+        const { userId } = await auth();
+        if (!userId) {
+            return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+        }
+
+        const body = await req.json();
+        const {
+            goalType,
+            title,
+            description,
+            targetValue,
+            currentValue,
+            unit,
+            targetDate,
+            priority,
+            notes,
+            fitnessProfileId
+        } = body;
+
+        // Validation
+        if (!goalType || !title) {
+            return NextResponse.json(
+                { error: 'goalType and title are required' },
+                { status: 400 }
+            );
+        }
+
+        const db = await getDatabase();
+
+        // Create the goal
+        const goal = await db.createFitnessGoal({
+            id: randomBytes(16).toString('hex'),
+            userId,
+            fitnessProfileId: fitnessProfileId || undefined,
+            goalType,
+            title,
+            description: description || undefined,
+            targetValue: targetValue || undefined,
+            currentValue: currentValue || 0,
+            unit: unit || undefined,
+            startDate: new Date(),
+            targetDate: targetDate ? new Date(targetDate) : undefined,
+            status: 'active',
+            progress: 0,
+            priority: priority || 'medium',
+            notes: notes || undefined
+        });
+
+        return NextResponse.json(goal, { status: 201 });
+    } catch (error) {
+        console.error('Error creating fitness goal:', error);
+        return NextResponse.json(
+            { error: 'Internal server error' },
+            { status: 500 }
+        );
+    }
+}

apps/admin/src/app/api/recommendations/approve/route.ts

@@ -0,0 +1,49 @@
+import { NextResponse } from "next/server";
+import { getDatabase } from "@/lib/database";
+
+export async function POST(req: Request) {
+    try {
+        const { recommendationId, status, approvedBy } = await req.json();
+
+        if (!recommendationId || !status) {
+            return NextResponse.json(
+                { error: "Recommendation ID and status are required" },
+                { status: 400 }
+            );
+        }
+
+        const db = await getDatabase();
+
+        // Update recommendation status
+        const updates: any = {
+            status,
+            approvedAt: status === "approved" ? new Date() : undefined,
+            approvedBy: status === "approved" ? approvedBy : undefined,
+        };
+
+        // Remove undefined keys
+        Object.keys(updates).forEach(key => updates[key] === undefined && delete updates[key]);
+
+        const updatedRecommendation = await db.updateRecommendation(recommendationId, updates);
+
+        if (!updatedRecommendation) {
+            return NextResponse.json(
+                { error: "Recommendation not found" },
+                { status: 404 }
+            );
+        }
+
+        // If approved, create a notification for the user
+        // Note: IDatabase doesn't have createNotification yet, so we'll skip it for now
+        // or we need to add it to IDatabase/SQLiteDatabase
+        // For now, let's assume the notification is handled elsewhere or add it later
+
+        return NextResponse.json(updatedRecommendation);
+    } catch (error) {
+        console.error("Error approving recommendation:", error);
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+    }
+}

apps/admin/src/app/api/recommendations/generate/route.ts

@@ -0,0 +1,191 @@
+import { NextResponse } from "next/server";
+import { getDatabase } from "@/lib/database";
+import { buildAIContext } from "@/lib/ai/ai-context";
+import { buildEnhancedPrompt, buildBasicPrompt } from "@/lib/ai/prompt-builder";
+
+export async function POST(req: Request) {
+    try {
+        const { userId, useExternalModel } = await req.json();
+
+        if (!userId) {
+            return NextResponse.json({ error: "User ID is required" }, { status: 400 });
+        }
+
+        const db = await getDatabase();
+
+        // Fetch fitness profile
+        const profile = await db.getFitnessProfileByUserId(userId);
+
+        if (!profile) {
+            return NextResponse.json(
+                { error: "Fitness profile not found for this user" },
+                { status: 404 }
+            );
+        }
+
+        // Build AI context with goals and recommendations
+        let prompt: string;
+        try {
+            const context = await buildAIContext(userId);
+            prompt = buildEnhancedPrompt(context);
+            console.log('Using enhanced AI context with goals and history');
+        } catch (error) {
+            // Fallback to basic prompt if context building fails
+            console.warn('Failed to build AI context, using basic prompt:', error);
+            prompt = buildBasicPrompt(profile);
+        }
+
+        let parsedResponse;
+
+        if (useExternalModel) {
+            // Use DeepSeek AI
+            const deepseekApiKey = process.env.DEEPSEEK_API_KEY;
+
+            if (!deepseekApiKey) {
+                return NextResponse.json(
+                    { error: "DeepSeek API key not configured" },
+                    { status: 500 }
+                );
+            }
+
+            console.log("Using DeepSeek AI model...");
+
+            const deepseekResponse = await fetch("https://api.deepseek.com/v1/chat/completions", {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "Authorization": `Bearer ${deepseekApiKey}`,
+                },
+                body: JSON.stringify({
+                    model: "deepseek-chat",
+                    messages: [
+                        {
+                            role: "system",
+                            content: "You are a professional fitness trainer and nutritionist. Always respond with valid JSON only, no markdown or code blocks."
+                        },
+                        {
+                            role: "user",
+                            content: prompt
+                        }
+                    ],
+                    temperature: 0.7,
+                    max_tokens: 1000,
+                }),
+            });
+
+            if (!deepseekResponse.ok) {
+                const errorText = await deepseekResponse.text();
+                console.error("DeepSeek API error:", errorText);
+                return NextResponse.json(
+                    { error: "Failed to generate recommendation from DeepSeek AI" },
+                    { status: 500 }
+                );
+            }
+
+            const deepseekData = await deepseekResponse.json();
+            console.log("Raw DeepSeek Response:", deepseekData);
+
+            try {
+                const content = deepseekData.choices[0].message.content;
+                let cleanResponse = content.trim();
+
+                // Remove markdown code blocks if present
+                if (cleanResponse.startsWith("```json")) {
+                    cleanResponse = cleanResponse.replace(/^```json\s*/, "").replace(/\s*```$/, "");
+                } else if (cleanResponse.startsWith("```")) {
+                    cleanResponse = cleanResponse.replace(/^```\s*/, "").replace(/\s*```$/, "");
+                }
+
+                // Find the first '{' and last '}' to extract the JSON object
+                const firstBrace = cleanResponse.indexOf("{");
+                const lastBrace = cleanResponse.lastIndexOf("}");
+
+                if (firstBrace !== -1 && lastBrace !== -1) {
+                    cleanResponse = cleanResponse.substring(firstBrace, lastBrace + 1);
+                }
+
+                parsedResponse = JSON.parse(cleanResponse);
+            } catch (e) {
+                console.error("Failed to parse DeepSeek response:", deepseekData);
+                return NextResponse.json(
+                    { error: "Invalid response format from DeepSeek AI" },
+                    { status: 500 }
+                );
+            }
+        } else {
+            // Use local Ollama
+            console.log("Using local Ollama model...");
+
+            const ollamaResponse = await fetch("http://localhost:11434/api/generate", {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                    model: "gemma3:latest",
+                    prompt: prompt,
+                    stream: false,
+                    format: "json",
+                }),
+            });
+
+            if (!ollamaResponse.ok) {
+                console.error("Ollama API error:", await ollamaResponse.text());
+                return NextResponse.json(
+                    { error: "Failed to generate recommendation from Ollama" },
+                    { status: 500 }
+                );
+            }
+
+            const aiData = await ollamaResponse.json();
+            console.log("Raw Ollama Response:", aiData.response);
+
+            try {
+                let cleanResponse = aiData.response.trim();
+
+                // Remove markdown code blocks if present
+                if (cleanResponse.startsWith("```json")) {
+                    cleanResponse = cleanResponse.replace(/^```json\s*/, "").replace(/\s*```$/, "");
+                } else if (cleanResponse.startsWith("```")) {
+                    cleanResponse = cleanResponse.replace(/^```\s*/, "").replace(/\s*```$/, "");
+                }
+
+                // Find the first '{' and last '}' to extract the JSON object
+                const firstBrace = cleanResponse.indexOf("{");
+                const lastBrace = cleanResponse.lastIndexOf("}");
+
+                if (firstBrace !== -1 && lastBrace !== -1) {
+                    cleanResponse = cleanResponse.substring(firstBrace, lastBrace + 1);
+                }
+
+                parsedResponse = JSON.parse(cleanResponse);
+            } catch (e) {
+                console.error("Failed to parse Ollama response:", aiData.response);
+                return NextResponse.json(
+                    { error: "Invalid response format from Ollama" },
+                    { status: 500 }
+                );
+            }
+        }
+
+        // Save to database
+        const recommendation = await db.createRecommendation({
+            id: crypto.randomUUID(),
+            userId,
+            fitnessProfileId: profile.userId,
+            type: 'ai_plan',
+            content: parsedResponse.recommendationText,
+            activityPlan: parsedResponse.activityPlan,
+            dietPlan: parsedResponse.dietPlan,
+            status: 'pending'
+        });
+
+        return NextResponse.json(recommendation);
+    } catch (error) {
+        console.error("Error generating recommendation:", error);
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+    }
+}

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

@@ -12,23 +12,38 @@ export async function GET(request: Request) {
         const { searchParams } = new URL(request.url)
         const targetUserId = searchParams.get('userId')
 
-        if (!targetUserId) {
-            return new NextResponse('User ID is required', { status: 400 })
-        }
-
         const db = await getDatabase()
 
-        // Check permissions: Users can view their own, Admins/Trainers can view anyone's
+        // If no userId provided, check if staff and return all recommendations
-        if (currentUserId !== targetUserId) {
+        if (!targetUserId) {
             const currentUser = await db.getUserById(currentUserId)
             const isStaff = currentUser?.role === 'admin' || currentUser?.role === 'superAdmin' || currentUser?.role === 'trainer'
 
+            if (!isStaff) {
+                return new NextResponse('User ID is required', { status: 400 })
+            }
+
+            const recommendations = await db.getAllRecommendations()
+            return NextResponse.json({ recommendations })
+        }
+
+        // Check permissions: Users can view their own, Admins/Trainers can view anyone's
+        const currentUser = await db.getUserById(currentUserId)
+        const isStaff = currentUser?.role === 'admin' || currentUser?.role === 'superAdmin' || currentUser?.role === 'trainer'
+
+        if (currentUserId !== targetUserId) {
             if (!isStaff) {
                 return new NextResponse('Forbidden', { status: 403 })
             }
         }
 
-        const recommendations = await db.getRecommendationsByUserId(targetUserId)
+        let recommendations = await db.getRecommendationsByUserId(targetUserId)
+
+        // Non-staff users should only see approved recommendations
+        if (!isStaff) {
+            recommendations = recommendations.filter((rec: any) => rec.status === 'approved')
+        }
+
         return NextResponse.json(recommendations)
     } catch (error) {
         console.error('Error fetching recommendations:', error)
@@ -52,21 +67,37 @@ export async function POST(request: Request) {
         }
 
         const body = await request.json()
-        const { userId, type, content, status } = body
+        const { userId, fitnessProfileId, recommendationText, activityPlan, dietPlan, status, type, content } = body
 
-        if (!userId || !type || !content) {
+        // Handle AI Plan (Legacy/Specific)
-            return new NextResponse('Missing required fields', { status: 400 })
+        if (recommendationText && activityPlan && dietPlan && fitnessProfileId) {
+            const recommendation = await db.createRecommendation({
+                id: crypto.randomUUID(),
+                userId,
+                fitnessProfileId,
+                type: 'ai_plan',
+                content: recommendationText,
+                activityPlan,
+                dietPlan,
+                status: status || 'pending'
+            })
+            return NextResponse.json(recommendation)
         }
 
-        const recommendation = await db.createRecommendation({
+        // Handle User Goal (Generic)
-            id: crypto.randomUUID(),
+        if (type && content) {
-            userId,
+            const recommendation = await db.createRecommendation({
-            type,
+                id: crypto.randomUUID(),
-            content,
+                userId,
-            status: status || 'pending'
+                type,
-        })
+                content,
+                status: status || 'pending'
+            })
+            return NextResponse.json(recommendation)
+        }
+
+        return NextResponse.json('Missing required fields', { status: 400 })
 
-        return NextResponse.json(recommendation)
     } catch (error) {
         console.error('Error creating recommendation:', error)
         return new NextResponse('Internal Server Error', { status: 500 })
@@ -81,7 +112,7 @@ export async function PUT(request: Request) {
         }
 
         const body = await request.json()
-        const { id, status, content } = body
+        const { id, status, recommendationText, activityPlan, dietPlan, content } = body
 
         if (!id) {
             return new NextResponse('Recommendation ID is required', { status: 400 })
@@ -89,13 +120,12 @@ export async function PUT(request: Request) {
 
         const db = await getDatabase()
 
-        // Users can update status (e.g. mark as completed), Staff can update content too
-        // Ideally we'd check ownership for status update, but for now let's allow it if they have the ID
-        // A stricter check would be: fetch recommendation, check if userId matches currentUserId OR if currentUser is staff
-
         const updated = await db.updateRecommendation(id, {
             ...(status && { status }),
-            ...(content && { content })
+            ...(recommendationText && { content: recommendationText }), // Map legacy field
+            ...(content && { content }),
+            ...(activityPlan && { activityPlan }),
+            ...(dietPlan && { dietPlan })
         })
 
         return NextResponse.json(updated)

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

@@ -74,7 +74,7 @@ export async function POST(request: NextRequest) {
     }
 
     // Enforce Hierarchy
-    const allowed = {
+    const allowed: Record<string, string[]> = {
       superAdmin: ["admin", "trainer", "client"],
       admin: ["trainer", "client"],
       trainer: ["client"],

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

@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from "react";
 import { useUser } from "@clerk/nextjs";
-import { Button } from "@/components/ui/button";
+import { Button } from "@/components/ui/Button";
 import { Input } from "@/components/ui/input";
 
 interface UserProfile {
@@ -55,7 +55,7 @@ export default function ProfilePage() {
         <div className="flex justify-between items-center mb-6">
           <h1 className="text-2xl font-bold">Profile</h1>
           <Button
-            variant={isEditing ? "default" : "outline"}
+            variant={isEditing ? "primary" : "secondary"}
             onClick={() => setIsEditing(!isEditing)}
           >
             {isEditing ? "Cancel" : "Edit Profile"}

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

@@ -0,0 +1,260 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import { useUser } from "@clerk/nextjs";
+
+interface User {
+    id: string;
+    firstName: string;
+    lastName: string;
+    email: string;
+}
+
+interface Recommendation {
+    id: string;
+    userId: string;
+    content: 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<any[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [generating, setGenerating] = useState<string | null>(null);
+    const [useExternalModel, setUseExternalModel] = useState(false);
+
+    useEffect(() => {
+        fetchData();
+    }, []);
+
+    const fetchData = async () => {
+        try {
+            // Fetch users
+            const usersRes = await fetch("/api/users");
+            const usersData = await usersRes.json();
+            setUsers(usersData.users || []);
+
+            // Fetch pending recommendations
+            const recsRes = await fetch("/api/recommendations");
+            const recsData = await recsRes.json();
+            const allRecs = recsData.recommendations || [];
+            setPendingRecommendations(allRecs.filter((r: any) => r.status === 'pending'));
+        } catch (error) {
+            console.error("Error fetching data:", error);
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleGenerate = async (userId: string) => {
+        setGenerating(userId);
+        try {
+            const res = await fetch("/api/recommendations/generate", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({ userId, useExternalModel }),
+            });
+
+            if (!res.ok) {
+                const error = await res.json();
+                alert(`Error: ${error.error}`);
+            } else {
+                alert("Recommendation generated successfully!");
+                fetchData(); // Refresh data
+            }
+        } catch (error) {
+            console.error(error);
+            alert("Failed to generate recommendation.");
+        } finally {
+            setGenerating(null);
+        }
+    };
+
+    const handleApprove = async (recommendationId: string, status: "approved" | "rejected") => {
+        try {
+            const res = await fetch("/api/recommendations/approve", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({
+                    recommendationId,
+                    status,
+                    approvedBy: user?.id || "admin",
+                }),
+            });
+
+            if (!res.ok) {
+                const errorData = await res.json();
+                alert(`Failed to update status: ${errorData.error || 'Unknown error'}`);
+            } else {
+                fetchData(); // Refresh data
+            }
+        } catch (error) {
+            console.error(error);
+            alert("Error processing request");
+        }
+    };
+
+    const handleEdit = async (rec: Recommendation) => {
+        const newContent = prompt("Edit Advice:", rec.content);
+        const newActivityPlan = prompt("Edit Activity Plan:", rec.activityPlan);
+        const newDietPlan = prompt("Edit Diet Plan:", rec.dietPlan);
+
+        if (newContent === null || newActivityPlan === null || newDietPlan === null) {
+            // User cancelled one of the prompts
+            return;
+        }
+
+        try {
+            const res = await fetch("/api/recommendations", {
+                method: "PUT",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({
+                    id: rec.id,
+                    content: newContent,
+                    activityPlan: newActivityPlan,
+                    dietPlan: newDietPlan,
+                }),
+            });
+
+            if (!res.ok) {
+                const errorData = await res.json();
+                alert(`Failed to update recommendation: ${errorData.error || 'Unknown error'}`);
+            } else {
+                alert("Recommendation updated successfully!");
+                fetchData(); // Refresh data
+            }
+        } catch (error) {
+            console.error("Error updating recommendation:", error);
+            alert("Failed to update recommendation.");
+        }
+    };
+
+    if (loading) {
+        return (
+            <div className="flex items-center justify-center h-screen">
+                <div className="text-xl">Loading...</div>
+            </div>
+        );
+    }
+
+    return (
+        <div className="container mx-auto py-10 px-4">
+            <div className="flex justify-between items-center mb-8">
+                <h1 className="text-3xl font-bold">AI Recommendations</h1>
+
+                {/* Model Selection Toggle */}
+                <div className="flex items-center gap-3 bg-white px-4 py-2 rounded-lg shadow">
+                    <span className="text-sm font-medium text-gray-700">
+                        {useExternalModel ? "DeepSeek AI" : "Local Ollama"}
+                    </span>
+                    <button
+                        onClick={() => setUseExternalModel(!useExternalModel)}
+                        className={`relative inline-flex h-6 w-11 items-center rounded-full transition-colors ${useExternalModel ? "bg-blue-600" : "bg-gray-300"
+                            }`}
+                    >
+                        <span
+                            className={`inline-block h-4 w-4 transform rounded-full bg-white transition-transform ${useExternalModel ? "translate-x-6" : "translate-x-1"
+                                }`}
+                        />
+                    </button>
+                    <span className="text-xs text-gray-500">
+                        {useExternalModel ? "External" : "Local"}
+                    </span>
+                </div>
+            </div>
+
+            <div className="grid grid-cols-1 lg:grid-cols-2 gap-8">
+                {/* Generate Section */}
+                <div>
+                    <h2 className="text-2xl font-semibold mb-4">Generate Recommendations</h2>
+                    <div className="bg-white shadow rounded-lg p-6">
+                        <p className="mb-4 text-gray-600">
+                            Select a user to generate a new daily recommendation.
+                        </p>
+                        <ul className="space-y-4">
+                            {users.map((user) => (
+                                <li key={user.id} className="flex items-center justify-between border-b pb-2">
+                                    <div>
+                                        <p className="font-medium">
+                                            {user.firstName} {user.lastName}
+                                        </p>
+                                        <p className="text-sm text-gray-500">{user.email}</p>
+                                    </div>
+                                    <button
+                                        onClick={() => handleGenerate(user.id)}
+                                        disabled={generating === user.id}
+                                        className="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700 disabled:opacity-50"
+                                    >
+                                        {generating === user.id ? "Generating..." : "Generate"}
+                                    </button>
+                                </li>
+                            ))}
+                            {users.length === 0 && (
+                                <p className="text-gray-500 italic">No users found.</p>
+                            )}
+                        </ul>
+                    </div>
+                </div>
+
+                {/* Pending Approvals Section */}
+                <div>
+                    <h2 className="text-2xl font-semibold mb-4">Pending Approvals</h2>
+                    <div className="bg-white shadow rounded-lg p-6">
+                        {pendingRecommendations.length === 0 ? (
+                            <p className="text-gray-500 italic">No pending recommendations.</p>
+                        ) : (
+                            <ul className="space-y-6">
+                                {pendingRecommendations.map((rec) => (
+                                    <li key={rec.id} className="border rounded p-4">
+                                        <div className="flex justify-between items-start mb-2">
+                                            <h3 className="font-bold">For: User {rec.userId}</h3>
+                                            <span className="text-xs text-gray-500">
+                                                {new Date(rec.createdAt).toLocaleDateString()}
+                                            </span>
+                                        </div>
+                                        <div className="space-y-2 text-sm mb-4">
+                                            <div>
+                                                <span className="font-semibold">Advice:</span> {rec.content}
+                                            </div>
+                                            <div>
+                                                <span className="font-semibold">Activity:</span> {rec.activityPlan}
+                                            </div>
+                                            <div>
+                                                <span className="font-semibold">Diet:</span> {rec.dietPlan}
+                                            </div>
+                                        </div>
+                                        <div className="flex space-x-2">
+                                            <button
+                                                onClick={() => handleEdit(rec)}
+                                                className="flex-1 bg-blue-500 text-white py-2 rounded hover:bg-blue-600"
+                                            >
+                                                Edit
+                                            </button>
+                                            <button
+                                                onClick={() => handleApprove(rec.id, "approved")}
+                                                className="flex-1 bg-green-600 text-white py-2 rounded hover:bg-green-700"
+                                            >
+                                                Approve
+                                            </button>
+                                            <button
+                                                onClick={() => handleApprove(rec.id, "rejected")}
+                                                className="flex-1 bg-red-600 text-white py-2 rounded hover:bg-red-700"
+                                            >
+                                                Reject
+                                            </button>
+                                        </div>
+                                    </li>
+                                ))}
+                            </ul>
+                        )}
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}

apps/admin/src/components/Navigation.tsx

@@ -3,10 +3,10 @@
 import { type ReactElement } from "react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
-import { Home, Users, BarChart3, User } from "lucide-react";
+import { Home, Users, BarChart3, User, Brain } from "lucide-react";
 import { SignedIn, UserButton } from "@clerk/nextjs";
 import { cn } from "@/lib/utils";
-import { Button } from "@/components/ui/button";
+import { Button } from "@/components/ui/Button";
 
 interface NavItem {
   href: string;
@@ -25,6 +25,11 @@ const navItems: NavItem[] = [
     label: "Clients",
     icon: Users,
   },
+  {
+    href: "/recommendations",
+    label: "AI Recommendations",
+    icon: Brain,
+  },
   {
     href: "/analytics",
     label: "Analytics",
@@ -59,22 +64,20 @@ export function Navigation(): ReactElement {
           >
             {navItems.map((item) => (
               <li key={item.href}>
-                <Button
+                <Link href={item.href} className="flex items-center gap-2">
-                  asChild
+                  <Button
-                  variant={pathname === item.href ? "default" : "ghost"}
+                    variant={pathname === item.href ? "primary" : "secondary"}
-                  size="sm"
+                    className={cn(
-                  className={cn(
+                      "h-9 px-4 py-2",
-                    "h-9 px-4 py-2",
+                      pathname === item.href &&
-                    pathname === item.href &&
                       "bg-primary text-primary-foreground",
-                  )}
+                    )}
-                  aria-current={pathname === item.href ? "page" : undefined}
+                    aria-current={pathname === item.href ? "page" : undefined}
-                >
+                  >
-                  <Link href={item.href} className="flex items-center gap-2">
                     <item.icon className="h-4 w-4" />
                     <span>{item.label}</span>
-                  </Link>
+                  </Button>
-                </Button>
+                </Link>
               </li>
             ))}
           </ul>

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

@@ -4,7 +4,7 @@ import { useState, useEffect } from 'react'
 import { UserGrowthChart } from '@/components/charts/UserGrowthChart'
 import { MembershipDistributionChart } from '@/components/charts/MembershipDistributionChart'
 import { RevenueChart } from '@/components/charts/RevenueChart'
-import { Card, CardHeader, CardContent } from '@/components/ui/Card'
+import { Card, CardHeader, CardContent } from '@/components/ui/card'
 
 interface ChartData {
   label: string

apps/admin/src/components/recommendations/generate-button.tsx

@@ -0,0 +1,44 @@
+"use client";
+
+import { useState } from "react";
+import { Loader2 } from "lucide-react";
+
+export function GenerateButton({ userId }: { userId: string }) {
+    const [loading, setLoading] = useState(false);
+
+    const handleGenerate = async () => {
+        setLoading(true);
+        try {
+            const res = await fetch("/api/recommendations/generate", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({ userId }),
+            });
+
+            if (!res.ok) {
+                const error = await res.json();
+                alert(`Error: ${error.error}`);
+            } else {
+                alert("Recommendation generated successfully! Check Pending Approvals.");
+                // In a real app, we'd revalidate the path or update state
+                window.location.reload();
+            }
+        } catch (error) {
+            console.error(error);
+            alert("Failed to generate recommendation.");
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    return (
+        <button
+            onClick={handleGenerate}
+            disabled={loading}
+            className="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700 disabled:opacity-50 flex items-center"
+        >
+            {loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+            Generate
+        </button>
+    );
+}

apps/admin/src/components/recommendations/recommendation-list.tsx

@@ -0,0 +1,117 @@
+"use client";
+
+import { useState } from "react";
+import { Loader2, Check, X } from "lucide-react";
+
+type Recommendation = {
+    recommendation: {
+        id: string;
+        recommendationText: string;
+        activityPlan: string;
+        dietPlan: string;
+        createdAt: Date;
+    };
+    user: {
+        firstName: string;
+        lastName: string;
+    };
+};
+
+export function RecommendationList({
+    initialRecommendations,
+}: {
+    initialRecommendations: Recommendation[];
+}) {
+    const [recommendations, setRecommendations] = useState(initialRecommendations);
+    const [processingId, setProcessingId] = useState<string | null>(null);
+
+    const handleAction = async (id: string, status: "approved" | "rejected") => {
+        setProcessingId(id);
+        try {
+            const res = await fetch("/api/recommendations/approve", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({
+                    recommendationId: id,
+                    status,
+                    approvedBy: "admin_placeholder", // In real app, get from auth context
+                }),
+            });
+
+            if (!res.ok) {
+                alert("Failed to update status");
+            } else {
+                setRecommendations((prev) =>
+                    prev.filter((item) => item.recommendation.id !== id)
+                );
+            }
+        } catch (error) {
+            console.error(error);
+            alert("Error processing request");
+        } finally {
+            setProcessingId(null);
+        }
+    };
+
+    if (recommendations.length === 0) {
+        return <p className="text-gray-500 italic">No pending recommendations.</p>;
+    }
+
+    return (
+        <ul className="space-y-6">
+            {recommendations.map(({ recommendation, user }) => (
+                <li key={recommendation.id} className="border rounded p-4">
+                    <div className="flex justify-between items-start mb-2">
+                        <h3 className="font-bold">
+                            For: {user.firstName} {user.lastName}
+                        </h3>
+                        <span className="text-xs text-gray-500">
+                            {new Date(recommendation.createdAt).toLocaleDateString()}
+                        </span>
+                    </div>
+                    <div className="space-y-2 text-sm mb-4">
+                        <div>
+                            <span className="font-semibold">Advice:</span>{" "}
+                            {recommendation.recommendationText}
+                        </div>
+                        <div>
+                            <span className="font-semibold">Activity:</span>{" "}
+                            {recommendation.activityPlan}
+                        </div>
+                        <div>
+                            <span className="font-semibold">Diet:</span> {recommendation.dietPlan}
+                        </div>
+                    </div>
+                    <div className="flex space-x-2">
+                        <button
+                            onClick={() => handleAction(recommendation.id, "approved")}
+                            disabled={processingId === recommendation.id}
+                            className="flex-1 bg-green-600 text-white py-2 rounded hover:bg-green-700 disabled:opacity-50 flex justify-center items-center"
+                        >
+                            {processingId === recommendation.id ? (
+                                <Loader2 className="h-4 w-4 animate-spin" />
+                            ) : (
+                                <>
+                                    <Check className="mr-2 h-4 w-4" /> Approve
+                                </>
+                            )}
+                        </button>
+                        <button
+                            onClick={() => handleAction(recommendation.id, "rejected")}
+                            disabled={processingId === recommendation.id}
+                            className="flex-1 bg-red-600 text-white py-2 rounded hover:bg-red-700 disabled:opacity-50 flex justify-center items-center"
+                        >
+                            {processingId === recommendation.id ? (
+                                <Loader2 className="h-4 w-4 animate-spin" />
+                            ) : (
+                                <>
+                                    <X className="mr-2 h-4 w-4" /> Reject
+                                </>
+                            )}
+                        </button>
+                    </div>
+                </li>
+            ))}
+        </ul>
+    );
+}

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

@@ -2,27 +2,67 @@
 
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { useEffect, useState } from "react";
 import {
     LayoutDashboard,
     Users,
     CalendarCheck,
     CreditCard,
     Settings,
-    LogOut
+    LogOut,
+    Brain,
 } from "lucide-react";
 import { UserButton, useUser } from "@clerk/nextjs";
 
-const menuItems = [
+interface Recommendation {
-    { icon: LayoutDashboard, label: "Dashboard", href: "/" },
+    id: string;
-    { icon: Users, label: "Users", href: "/users" },
+    status: string;
-    { icon: CalendarCheck, label: "Attendance", href: "/attendance" },
+}
-    { icon: CreditCard, label: "Payments", href: "/payments" },
-    { icon: Settings, label: "Settings", href: "/settings" },
-];
 
 export function Sidebar() {
     const pathname = usePathname();
     const { user } = useUser();
+    const [pendingCount, setPendingCount] = useState(0);
+
+    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" },
+        {
+            icon: Brain,
+            label: (
+                <span className="flex items-center">
+                    AI Recommendations
+                    {pendingCount > 0 && (
+                        <span className="ml-2 inline-block bg-red-600 text-xs rounded-full px-2 py-0.5">
+                            {pendingCount}
+                        </span>
+                    )}
+                </span>
+            ),
+            href: "/recommendations",
+        },
+        { icon: CalendarCheck, label: "Attendance", href: "/attendance" },
+        { icon: CreditCard, label: "Payments", href: "/payments" },
+        { icon: Settings, label: "Settings", href: "/settings" },
+    ];
 
     return (
         <aside className="w-64 bg-slate-900 text-white h-screen fixed left-0 top-0 flex flex-col border-r border-slate-800">
@@ -36,18 +76,17 @@ export function Sidebar() {
                 {menuItems.map((item) => {
                     const Icon = item.icon;
                     const isActive = pathname === item.href;
-
+                    const label = typeof item.label === "string" ? item.label : item.label;
                     return (
                         <Link
                             key={item.href}
                             href={item.href}
                             className={`flex items-center gap-3 px-4 py-3 rounded-lg transition-all duration-200 group ${isActive
-                                    ? "bg-blue-600 text-white shadow-lg shadow-blue-900/20"
+                                ? "bg-blue-600 text-white shadow-lg shadow-blue-900/20"
-                                    : "text-slate-400 hover:bg-slate-800 hover:text-white"
+                                : "text-slate-400 hover:bg-slate-800 hover:text-white"}`}
-                                }`}
                         >
                             <Icon size={20} className={isActive ? "text-white" : "text-slate-500 group-hover:text-white"} />
-                            <span className="font-medium">{item.label}</span>
+                            <span className="font-medium">{label}</span>
                         </Link>
                     );
                 })}

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

@@ -7,9 +7,11 @@ import { Card, CardHeader, CardContent } from "@/components/ui/card";
 interface Recommendation {
     id: string;
     userId: string;
-    type: "short_term" | "medium_term" | "long_term";
+    type: "short_term" | "medium_term" | "long_term" | "ai_plan";
     content: string;
-    status: "pending" | "completed";
+    activityPlan?: string;
+    dietPlan?: string;
+    status: "pending" | "completed" | "approved" | "rejected";
     createdAt: string;
 }
 
@@ -68,15 +70,8 @@ export function Recommendations({ userId }: RecommendationsProps) {
         }
     };
 
-    const handleDelete = async (id: string) => {
-        if (!confirm("Are you sure?")) return;
-        // Note: Delete API not implemented in route.ts yet, but good to have UI ready or we can add it.
-        // For now, let's assume we might add it or just omit.
-        // Actually, I didn't add DELETE to route.ts. Let's skip for now.
-        alert("Delete functionality not available yet.");
-    };
-
     const groupedRecs = {
+        ai_plan: recommendations.filter((r) => r.type === "ai_plan"),
         short_term: recommendations.filter((r) => r.type === "short_term"),
         medium_term: recommendations.filter((r) => r.type === "medium_term"),
         long_term: recommendations.filter((r) => r.type === "long_term"),
@@ -84,7 +79,7 @@ export function Recommendations({ userId }: RecommendationsProps) {
 
     const renderSection = (
         title: string,
-        type: "short_term" | "medium_term" | "long_term",
+        type: "short_term" | "medium_term" | "long_term" | "ai_plan",
         items: Recommendation[]
     ) => (
         <div className="mb-6">
@@ -96,58 +91,66 @@ export function Recommendations({ userId }: RecommendationsProps) {
                 {items.map((rec) => (
                     <div
                         key={rec.id}
-                        className={`p-3 rounded border flex justify-between items-start ${rec.status === "completed"
+                        className={`p-3 rounded border flex justify-between items-start ${rec.status === "completed" || rec.status === "approved"
                             ? "bg-green-50 border-green-200"
                             : "bg-white border-gray-200"
                             }`}
                     >
-                        <div>
+                        <div className="w-full">
-                            <p className="text-sm">{rec.content}</p>
+                            <p className="text-sm font-medium">{rec.content}</p>
-                            <p className="text-xs text-gray-400 mt-1">
+                            {rec.type === 'ai_plan' && (
+                                <div className="mt-2 text-xs text-gray-600 space-y-1">
+                                    {rec.activityPlan && <p><span className="font-semibold">Activity:</span> {rec.activityPlan}</p>}
+                                    {rec.dietPlan && <p><span className="font-semibold">Diet:</span> {rec.dietPlan}</p>}
+                                </div>
+                            )}
+                            <p className="text-xs text-gray-400 mt-2">
                                 {new Date(rec.createdAt).toLocaleDateString()} -{" "}
                                 <span
                                     className={
-                                        rec.status === "completed"
+                                        rec.status === "completed" || rec.status === "approved"
                                             ? "text-green-600 font-medium"
                                             : "text-yellow-600"
                                     }
                                 >
-                                    {rec.status === "completed" ? "Completed" : "Pending"}
+                                    {rec.status === "completed" ? "Completed" : rec.status === "approved" ? "Approved" : "Pending"}
                                 </span>
                             </p>
                         </div>
                     </div>
                 ))}
             </div>
-            <form onSubmit={handleAddRecommendation} className="mt-3 flex gap-2">
+            {type !== 'ai_plan' && (
-                <input
+                <form onSubmit={handleAddRecommendation} className="mt-3 flex gap-2">
-                    type="hidden"
+                    <input
-                    value={type}
+                        type="hidden"
-                    onChange={() => setNewRec({ ...newRec, type })}
+                        value={type}
-                />
+                        onChange={() => setNewRec({ ...newRec, type: type as any })}
-                {newRec.type === type && (
+                    />
-                    <>
+                    {newRec.type === type && (
-                        <input
+                        <>
-                            type="text"
+                            <input
-                            placeholder={`Add ${title.toLowerCase()}...`}
+                                type="text"
-                            className="flex-1 border rounded px-3 py-1 text-sm"
+                                placeholder={`Add ${title.toLowerCase()}...`}
-                            value={newRec.content}
+                                className="flex-1 border rounded px-3 py-1 text-sm"
-                            onChange={(e) =>
+                                value={newRec.content}
-                                setNewRec({ ...newRec, content: e.target.value })
+                                onChange={(e) =>
-                            }
+                                    setNewRec({ ...newRec, content: e.target.value })
-                            required
+                                }
-                        />
+                                required
-                        <Button type="submit" variant="secondary">
+                            />
-                            Add
+                            <Button type="submit" variant="secondary">
+                                Add
+                            </Button>
+                        </>
+                    )}
+                    {newRec.type !== type && (
+                        <Button type="button" variant="secondary" onClick={() => setNewRec({ type: type as any, content: "" })} className="text-xs text-gray-500">
+                            + Add New
                         </Button>
-                    </>
+                    )}
-                )}
+                </form>
-                {newRec.type !== type && (
+            )}
-                    <Button type="button" variant="secondary" onClick={() => setNewRec({ type, content: "" })} className="text-xs text-gray-500">
-                        + Add New
-                    </Button>
-                )}
-            </form>
         </div>
     );
 
@@ -159,7 +162,8 @@ export function Recommendations({ userId }: RecommendationsProps) {
                 <h3 className="text-xl font-bold">Fitness Recommendations</h3>
             </CardHeader>
             <CardContent>
-                <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
+                <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
+                    {renderSection("Daily AI Plan", "ai_plan", groupedRecs.ai_plan)}
                     {renderSection("Short Term Goals", "short_term", groupedRecs.short_term)}
                     {renderSection("Medium Term Goals", "medium_term", groupedRecs.medium_term)}
                     {renderSection("Long Term Goals", "long_term", groupedRecs.long_term)}

apps/admin/src/lib/ai/ai-context.ts

@@ -0,0 +1,88 @@
+import { getDatabase } from '@/lib/database';
+import type { FitnessGoal } from '@/lib/database/types';
+
+// Import types from database package
+import type {
+    FitnessProfile as DBFitnessProfile,
+    Recommendation as DBRecommendation,
+} from '@fitai/database';
+
+export interface AIContext {
+    profile: DBFitnessProfile;
+    activeGoals: FitnessGoal[];
+    completedGoals: FitnessGoal[];
+    recentRecommendations: DBRecommendation[];
+    progressSummary: {
+        goalsCompleted: number;
+        goalsActive: number;
+        averageProgress: number;
+    };
+}
+
+/**
+ * Build comprehensive AI context for a user
+ * Aggregates fitness profile, goals, and recommendation history
+ */
+export async function buildAIContext(userId: string): Promise<AIContext> {
+    const db = await getDatabase();
+
+    // Fetch fitness profile
+    const profile = await db.getFitnessProfileByUserId(userId);
+
+    if (!profile) {
+        throw new Error(`Fitness profile not found for user ${userId}`);
+    }
+
+    // Fetch all fitness goals
+    const allGoals = await db.getFitnessGoalsByUserId(userId);
+
+    // Separate active and completed goals
+    const activeGoals = allGoals.filter((g) => g.status === 'active');
+    const completedGoals = allGoals.filter((g) => g.status === 'completed');
+
+    // Get all recommendations
+    const allRecommendations = await db.getRecommendationsByUserId(userId);
+
+    // Filter recent recommendations (last 7 days)
+    const sevenDaysAgo = new Date();
+    sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
+
+    const recentRecommendations = allRecommendations
+        .filter((r) => new Date(r.createdAt) > sevenDaysAgo)
+        .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
+        .slice(0, 5);
+
+    // Calculate progress summary
+    const progressSummary = {
+        goalsCompleted: completedGoals.length,
+        goalsActive: activeGoals.length,
+        averageProgress:
+            activeGoals.length > 0
+                ? activeGoals.reduce((sum, g) => sum + (g.progress || 0), 0) / activeGoals.length
+                : 0,
+    };
+
+    return {
+        profile,
+        activeGoals,
+        completedGoals,
+        recentRecommendations,
+        progressSummary,
+    };
+}
+
+/**
+ * Format goal for display in AI prompt
+ */
+export function formatGoalForPrompt(goal: FitnessGoal): string {
+    const progress = goal.progress || 0;
+    const current = goal.currentValue || 0;
+    const target = goal.targetValue;
+    const unit = goal.unit || '';
+
+    if (target) {
+        return `${goal.title}: ${current}/${target} ${unit} (${progress.toFixed(1)}% complete)`;
+    }
+
+    return `${goal.title}: ${progress.toFixed(1)}% complete`;
+}

apps/admin/src/lib/ai/prompt-builder.ts

@@ -0,0 +1,91 @@
+import type { AIContext } from './ai-context';
+import { formatGoalForPrompt } from './ai-context';
+
+/**
+ * Build enhanced AI prompt with comprehensive user context
+ * Includes profile, goals, progress, and recommendation history
+ */
+export function buildEnhancedPrompt(context: AIContext): string {
+    const { profile, activeGoals, completedGoals, recentRecommendations, progressSummary } = context;
+
+    // Build goals section
+    const activeGoalsText =
+        activeGoals.length > 0
+            ? activeGoals.map((g) => `- ${formatGoalForPrompt(g)}`).join('\n')
+            : '- No active goals set';
+
+    const completedGoalsText =
+        completedGoals.length > 0
+            ? completedGoals.slice(0, 3).map((g) => g.title).join(', ')
+            : 'None yet';
+
+    // Build context about recent recommendations
+    const recommendationContextText =
+        recentRecommendations.length > 0
+            ? `The user has received ${recentRecommendations.length} recommendations in the past week. Consider their progress and avoid repetitive advice.`
+            : 'This is a new user or they haven\'t received recent recommendations. Provide comprehensive guidance.';
+
+    return `You are a professional fitness trainer and nutritionist with access to the user's complete fitness journey.
+
+## User Profile
+- Height: ${profile.height || 'Not specified'} cm
+- Weight: ${profile.weight || 'Not specified'} kg
+- Age: ${profile.age || 'Not specified'}
+- Gender: ${profile.gender || 'Not specified'}
+- Primary Goal: ${profile.fitnessGoal || 'General fitness'}
+- Activity Level: ${profile.activityLevel || 'Not specified'}
+- Medical Conditions: ${profile.medicalConditions || 'None'}
+- Allergies: ${profile.allergies || 'None'}
+- Injuries: ${profile.injuries || 'None'}
+
+## Active Goals (${activeGoals.length})
+${activeGoalsText}
+
+## Recent Progress
+- Goals Completed: ${progressSummary.goalsCompleted}
+- Active Goals: ${progressSummary.goalsActive}
+- Average Progress on Active Goals: ${progressSummary.averageProgress.toFixed(1)}%
+${completedGoals.length > 0 ? `- Recently Completed: ${completedGoalsText}` : ''}
+
+## Recommendation History
+${recommendationContextText}
+
+## Task
+Generate a personalized daily recommendation that:
+1. Acknowledges their progress on active goals
+2. Provides specific, actionable steps toward goal completion
+3. Builds on previous recommendations without being repetitive
+4. Adapts to their current progress level
+5. Takes into account their medical conditions, allergies, and injuries
+
+Respond in the following JSON format ONLY, no other text. Do not use markdown formatting or code blocks:
+{
+  "recommendationText": "Personalized motivation and progress acknowledgment (2-3 sentences)",
+  "activityPlan": "Specific workout plan aligned with active goals (detailed, 3-5 exercises or activities)",
+  "dietPlan": "Nutrition plan supporting their goals and restrictions (detailed, include meals and portions)"
+}`;
+}
+
+/**
+ * Build basic prompt for users without complete context
+ * Fallback when goals or other data is missing
+ */
+export function buildBasicPrompt(profile: any): string {
+    return `You are a professional fitness trainer and nutritionist.
+Generate a detailed daily recommendation for a user with the following profile:
+- Height: ${profile.height} cm
+- Weight: ${profile.weight} kg
+- Age: ${profile.age}
+- Gender: ${profile.gender}
+- Goal: ${profile.fitnessGoal}
+- Activity Level: ${profile.activityLevel}
+- Medical Conditions: ${profile.medicalConditions || "None"}
+- Injuries: ${profile.injuries || "None"}
+
+Please provide the response in the following JSON format ONLY, no other text. Do not use markdown formatting or code blocks:
+{
+  "recommendationText": "General advice and motivation for today.",
+  "activityPlan": "Detailed workout or activity plan for today.",
+  "dietPlan": "Detailed meal plan for today."
+}`;
+}

apps/admin/src/lib/database/sqlite.ts

@@ -121,16 +121,24 @@ export class SQLiteDatabase implements IDatabase {
     `)
 
     // Recommendations table
+    // Removed DROP TABLE to persist data. Schema is now stable.
+    // this.db.exec(`DROP TABLE IF EXISTS recommendations`)
+
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS recommendations (
         id TEXT PRIMARY KEY,
         userId TEXT NOT NULL,
-        type TEXT NOT NULL CHECK (type IN ('short_term', 'medium_term', 'long_term')),
+        fitnessProfileId TEXT,
+        type TEXT NOT NULL,
         content TEXT NOT NULL,
-        status TEXT NOT NULL CHECK (status IN ('pending', 'completed')),
+        activityPlan TEXT,
+        dietPlan TEXT,
+        status TEXT NOT NULL CHECK (status IN ('pending', 'approved', 'rejected', 'completed')),
         createdAt DATETIME NOT NULL,
-        updatedAt DATETIME NOT NULL,
+        approvedAt DATETIME,
-        FOREIGN KEY (userId) REFERENCES users (id) ON DELETE CASCADE
+        approvedBy TEXT,
+        FOREIGN KEY (userId) REFERENCES users (id) ON DELETE CASCADE,
+        FOREIGN KEY (fitnessProfileId) REFERENCES fitness_profiles (userId)
       )
     `)
 
@@ -145,7 +153,9 @@ export class SQLiteDatabase implements IDatabase {
   }
 
   // User operations
-  async createUser(userData: Omit<User, 'createdAt' | 'updatedAt'>): Promise<User> {
+  async createUser(
+    userData: Omit<User, "createdAt" | "updatedAt" | "id"> & { id?: string },
+  ): Promise<User> {
     if (!this.db) throw new Error('Database not connected')
 
     const id = userData.id || Math.random().toString(36).substr(2, 9)
@@ -509,25 +519,29 @@ export class SQLiteDatabase implements IDatabase {
   }
 
   // Recommendation operations
-  async createRecommendation(data: Omit<Recommendation, 'createdAt' | 'updatedAt'>): Promise<Recommendation> {
+  async createRecommendation(data: Omit<Recommendation, 'createdAt' | 'approvedAt' | 'approvedBy'>): Promise<Recommendation> {
     if (!this.db) throw new Error('Database not connected')
 
     const now = new Date()
     const recommendation: Recommendation = {
       ...data,
       createdAt: now,
-      updatedAt: now
+      status: data.status || 'pending'
     }
 
     const stmt = this.db.prepare(
-      `INSERT INTO recommendations (id, userId, type, content, status, createdAt, updatedAt)
+      `INSERT INTO recommendations (
-       VALUES (?, ?, ?, ?, ?, ?, ?)`
+        id, userId, fitnessProfileId, type, content,
+        activityPlan, dietPlan, status, createdAt
+      )
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
     )
 
     stmt.run(
-      recommendation.id, recommendation.userId, recommendation.type,
+      recommendation.id, recommendation.userId, recommendation.fitnessProfileId,
-      recommendation.content, recommendation.status,
+      recommendation.type, recommendation.content, recommendation.activityPlan,
-      recommendation.createdAt.toISOString(), recommendation.updatedAt.toISOString()
+      recommendation.dietPlan, recommendation.status,
+      recommendation.createdAt.toISOString()
     )
 
     return recommendation
@@ -542,6 +556,15 @@ export class SQLiteDatabase implements IDatabase {
     return rows.map(row => this.mapRowToRecommendation(row))
   }
 
+  async getAllRecommendations(): Promise<Recommendation[]> {
+    if (!this.db) throw new Error('Database not connected')
+
+    const stmt = this.db.prepare('SELECT * FROM recommendations ORDER BY createdAt DESC')
+    const rows = stmt.all()
+
+    return rows.map(row => this.mapRowToRecommendation(row))
+  }
+
   async updateRecommendation(id: string, updates: Partial<Recommendation>): Promise<Recommendation | null> {
     if (!this.db) throw new Error('Database not connected')
 
@@ -553,11 +576,13 @@ export class SQLiteDatabase implements IDatabase {
     }
 
     const setClause = fields.map(field => `${field} = ?`).join(', ')
-    const values = fields.map(field => (updates as any)[field])
+    const values = fields.map(field => {
-    values.push(new Date().toISOString()) // updatedAt
+      const val = (updates as any)[field]
+      return val instanceof Date ? val.toISOString() : val
+    })
     values.push(id)
 
-    const stmt = this.db.prepare(`UPDATE recommendations SET ${setClause}, updatedAt = ? WHERE id = ?`)
+    const stmt = this.db.prepare(`UPDATE recommendations SET ${setClause} WHERE id = ?`)
     stmt.run(values)
 
     const getStmt = this.db.prepare('SELECT * FROM recommendations WHERE id = ?')
@@ -577,11 +602,183 @@ export class SQLiteDatabase implements IDatabase {
     return {
       id: row.id,
       userId: row.userId,
+      fitnessProfileId: row.fitnessProfileId,
       type: row.type,
       content: row.content,
+      activityPlan: row.activityPlan,
+      dietPlan: row.dietPlan,
       status: row.status,
       createdAt: new Date(row.createdAt),
-      updatedAt: new Date(row.updatedAt)
+      approvedAt: row.approvedAt ? new Date(row.approvedAt) : undefined,
+      approvedBy: row.approvedBy
+    }
+  }
+
+  // Fitness Goals operations
+  async createFitnessGoal(goalData: Omit<import('./types').FitnessGoal, 'createdAt' | 'updatedAt'>): Promise<import('./types').FitnessGoal> {
+    if (!this.db) throw new Error('Database not connected')
+
+    const now = new Date()
+    const goal: import('./types').FitnessGoal = {
+      ...goalData,
+      createdAt: now,
+      updatedAt: now
+    }
+
+    const stmt = this.db.prepare(
+      `INSERT INTO fitness_goals (
+        id, user_id, fitness_profile_id, goal_type, title, description,
+        target_value, current_value, unit, start_date, target_date,
+        completed_date, status, progress, priority, notes, created_at, updated_at
+      )
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+    )
+
+    stmt.run(
+      goal.id,
+      goal.userId,
+      goal.fitnessProfileId || null,
+      goal.goalType,
+      goal.title,
+      goal.description || null,
+      goal.targetValue || null,
+      goal.currentValue || null,
+      goal.unit || null,
+      goal.startDate.toISOString(),
+      goal.targetDate ? goal.targetDate.toISOString() : null,
+      goal.completedDate ? goal.completedDate.toISOString() : null,
+      goal.status,
+      goal.progress,
+      goal.priority,
+      goal.notes || null,
+      goal.createdAt.toISOString(),
+      goal.updatedAt.toISOString()
+    )
+
+    return goal
+  }
+
+  async getFitnessGoalById(id: string): Promise<import('./types').FitnessGoal | null> {
+    if (!this.db) throw new Error('Database not connected')
+
+    const stmt = this.db.prepare('SELECT * FROM fitness_goals WHERE id = ?')
+    const row = stmt.get(id)
+
+    return row ? this.mapRowToFitnessGoal(row) : null
+  }
+
+  async getFitnessGoalsByUserId(userId: string, status?: string): Promise<import('./types').FitnessGoal[]> {
+    if (!this.db) throw new Error('Database not connected')
+
+    let query = 'SELECT * FROM fitness_goals WHERE user_id = ?'
+    const params: any[] = [userId]
+
+    if (status) {
+      query += ' AND status = ?'
+      params.push(status)
+    }
+
+    query += ' ORDER BY created_at DESC'
+
+    const stmt = this.db.prepare(query)
+    const rows = stmt.all(...params)
+
+    return rows.map(row => this.mapRowToFitnessGoal(row))
+  }
+
+  async updateFitnessGoal(id: string, updates: Partial<import('./types').FitnessGoal>): Promise<import('./types').FitnessGoal | null> {
+    if (!this.db) throw new Error('Database not connected')
+
+    const fields = Object.keys(updates).filter(key => key !== 'id' && key !== 'createdAt')
+    if (fields.length === 0) return this.getFitnessGoalById(id)
+
+    // Map camelCase to snake_case for database columns
+    const columnMap: Record<string, string> = {
+      userId: 'user_id',
+      fitnessProfileId: 'fitness_profile_id',
+      goalType: 'goal_type',
+      targetValue: 'target_value',
+      currentValue: 'current_value',
+      startDate: 'start_date',
+      targetDate: 'target_date',
+      completedDate: 'completed_date',
+      updatedAt: 'updated_at'
+    }
+
+    const setClause = fields.map(field => `${columnMap[field] || field} = ?`).join(', ')
+    const values = fields.map(field => {
+      const val = (updates as any)[field]
+      return val instanceof Date ? val.toISOString() : val
+    })
+    values.push(new Date().toISOString()) // updatedAt
+    values.push(id)
+
+    const stmt = this.db.prepare(`UPDATE fitness_goals SET ${setClause}, updated_at = ? WHERE id = ?`)
+    stmt.run(values)
+
+    return this.getFitnessGoalById(id)
+  }
+
+  async deleteFitnessGoal(id: string): Promise<boolean> {
+    if (!this.db) throw new Error('Database not connected')
+
+    const stmt = this.db.prepare('DELETE FROM fitness_goals WHERE id = ?')
+    const result = stmt.run(id)
+    return (result.changes || 0) > 0
+  }
+
+  async updateGoalProgress(id: string, currentValue: number): Promise<import('./types').FitnessGoal | null> {
+    if (!this.db) throw new Error('Database not connected')
+
+    // Get the goal to calculate progress
+    const goal = await this.getFitnessGoalById(id)
+    if (!goal) return null
+
+    let progress = goal.progress
+    if (goal.targetValue && goal.targetValue > 0) {
+      progress = Math.min(100, (currentValue / goal.targetValue) * 100)
+    }
+
+    const stmt = this.db.prepare(
+      'UPDATE fitness_goals SET current_value = ?, progress = ?, updated_at = ? WHERE id = ?'
+    )
+    stmt.run(currentValue, progress, new Date().toISOString(), id)
+
+    return this.getFitnessGoalById(id)
+  }
+
+  async completeGoal(id: string): Promise<import('./types').FitnessGoal | null> {
+    if (!this.db) throw new Error('Database not connected')
+
+    const now = new Date()
+    const stmt = this.db.prepare(
+      'UPDATE fitness_goals SET status = ?, progress = ?, completed_date = ?, updated_at = ? WHERE id = ?'
+    )
+    stmt.run('completed', 100, now.toISOString(), now.toISOString(), id)
+
+    return this.getFitnessGoalById(id)
+  }
+
+  private mapRowToFitnessGoal(row: any): import('./types').FitnessGoal {
+    return {
+      id: row.id,
+      userId: row.user_id,
+      fitnessProfileId: row.fitness_profile_id,
+      goalType: row.goal_type,
+      title: row.title,
+      description: row.description,
+      targetValue: row.target_value,
+      currentValue: row.current_value,
+      unit: row.unit,
+      startDate: new Date(row.start_date),
+      targetDate: row.target_date ? new Date(row.target_date) : undefined,
+      completedDate: row.completed_date ? new Date(row.completed_date) : undefined,
+      status: row.status,
+      progress: row.progress,
+      priority: row.priority,
+      notes: row.notes,
+      createdAt: new Date(row.created_at),
+      updatedAt: new Date(row.updated_at)
     }
   }
 

apps/admin/src/lib/database/types.ts

@@ -50,9 +50,34 @@ export interface Attendance {
 export interface Recommendation {
   id: string;
   userId: string;
-  type: "short_term" | "medium_term" | "long_term";
+  fitnessProfileId?: string;
+  type: "short_term" | "medium_term" | "long_term" | "ai_plan";
   content: string;
-  status: "pending" | "completed";
+  activityPlan?: string;
+  dietPlan?: string;
+  status: "pending" | "approved" | "rejected" | "completed";
+  createdAt: Date;
+  approvedAt?: Date;
+  approvedBy?: string;
+}
+
+export interface FitnessGoal {
+  id: string;
+  userId: string;
+  fitnessProfileId?: string;
+  goalType: "weight_target" | "strength_milestone" | "endurance_target" | "flexibility_goal" | "habit_building" | "custom";
+  title: string;
+  description?: string;
+  targetValue?: number;
+  currentValue?: number;
+  unit?: string;
+  startDate: Date;
+  targetDate?: Date;
+  completedDate?: Date;
+  status: "active" | "completed" | "abandoned" | "paused";
+  progress: number;
+  priority: "low" | "medium" | "high";
+  notes?: string;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -64,7 +89,9 @@ export interface IDatabase {
   disconnect(): Promise<void>;
 
   // User operations
-  createUser(user: Omit<User, "createdAt" | "updatedAt">): Promise<User>;
+  createUser(
+    user: Omit<User, "createdAt" | "updatedAt" | "id"> & { id?: string },
+  ): Promise<User>;
   getUserById(id: string): Promise<User | null>;
   getUserByEmail(email: string): Promise<User | null>;
   getAllUsers(): Promise<User[]>;
@@ -105,15 +132,30 @@ export interface IDatabase {
 
   // Recommendation operations
   createRecommendation(
-    recommendation: Omit<Recommendation, "createdAt" | "updatedAt">,
+    recommendation: Omit<Recommendation, "createdAt" | "approvedAt" | "approvedBy">,
   ): Promise<Recommendation>;
   getRecommendationsByUserId(userId: string): Promise<Recommendation[]>;
+  getAllRecommendations(): Promise<Recommendation[]>;
   updateRecommendation(
     id: string,
     updates: Partial<Recommendation>,
   ): Promise<Recommendation | null>;
   deleteRecommendation(id: string): Promise<boolean>;
 
+  // Fitness Goals operations
+  createFitnessGoal(
+    goal: Omit<FitnessGoal, "createdAt" | "updatedAt">
+  ): Promise<FitnessGoal>;
+  getFitnessGoalById(id: string): Promise<FitnessGoal | null>;
+  getFitnessGoalsByUserId(userId: string, status?: string): Promise<FitnessGoal[]>;
+  updateFitnessGoal(
+    id: string,
+    updates: Partial<FitnessGoal>
+  ): Promise<FitnessGoal | null>;
+  deleteFitnessGoal(id: string): Promise<boolean>;
+  updateGoalProgress(id: string, currentValue: number): Promise<FitnessGoal | null>;
+  completeGoal(id: string): Promise<FitnessGoal | null>;
+
   // Dashboard operations
   getDashboardStats(): Promise<{
     totalUsers: number;

apps/mobile/package-lock.json

@@ -11,6 +11,7 @@
         "@clerk/clerk-expo": "^2.18.3",
         "@expo/vector-icons": "^15.0.0",
         "@hookform/resolvers": "^3.3.0",
+        "@react-native-community/datetimepicker": "8.4.4",
         "@react-native-picker/picker": "2.11.1",
         "@tanstack/react-query": "^5.0.0",
         "ajv": "^8.12.0",
@@ -40,6 +41,7 @@
       "devDependencies": {
         "@babel/core": "^7.20.0",
         "@testing-library/react-native": "^12.4.0",
+        "@types/react": "~19.1.10",
         "@types/react-native": "^0.73.0",
         "@typescript-eslint/eslint-plugin": "^6.0.0",
         "@typescript-eslint/parser": "^6.0.0",
@@ -4028,6 +4030,29 @@
         }
       }
     },
+    "node_modules/@react-native-community/datetimepicker": {
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@react-native-community/datetimepicker/-/datetimepicker-8.4.4.tgz",
+      "integrity": "sha512-bc4ZixEHxZC9/qf5gbdYvIJiLZ5CLmEsC3j+Yhe1D1KC/3QhaIfGDVdUcid0PdlSoGOSEq4VlB93AWyetEyBSQ==",
+      "license": "MIT",
+      "dependencies": {
+        "invariant": "^2.2.4"
+      },
+      "peerDependencies": {
+        "expo": ">=52.0.0",
+        "react": "*",
+        "react-native": "*",
+        "react-native-windows": "*"
+      },
+      "peerDependenciesMeta": {
+        "expo": {
+          "optional": true
+        },
+        "react-native-windows": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@react-native-picker/picker": {
       "version": "2.11.1",
       "resolved": "https://registry.npmjs.org/@react-native-picker/picker/-/picker-2.11.1.tgz",
@@ -4624,6 +4649,16 @@
       "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
       "license": "MIT"
     },
+    "node_modules/@types/react": {
+      "version": "19.1.17",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.17.tgz",
+      "integrity": "sha512-Qec1E3mhALmaspIrhWt9jkQMNdw6bReVu64mjvhbhq2NFPftLPVr+l1SZgmw/66WwBNpDh7ao5AT6gF5v41PFA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/@types/react-native": {
       "version": "0.73.0",
       "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.73.0.tgz",

apps/mobile/package.json

@@ -17,6 +17,7 @@
     "@clerk/clerk-expo": "^2.18.3",
     "@expo/vector-icons": "^15.0.0",
     "@hookform/resolvers": "^3.3.0",
+    "@react-native-community/datetimepicker": "8.4.4",
     "@react-native-picker/picker": "2.11.1",
     "@tanstack/react-query": "^5.0.0",
     "ajv": "^8.12.0",
@@ -46,6 +47,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@testing-library/react-native": "^12.4.0",
+    "@types/react": "~19.1.10",
     "@types/react-native": "^0.73.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",

apps/mobile/src/api/attendance.ts

@@ -0,0 +1,47 @@
+import { apiClient } from "./client";
+import { API_ENDPOINTS } from "../config/api";
+
+export interface Attendance {
+    id: string;
+    checkInTime: string;
+    checkOutTime?: string;
+    type: string;
+    notes?: string;
+}
+
+export const attendanceApi = {
+    getHistory: async (token: string): Promise<Attendance[]> => {
+        try {
+            const response = await apiClient.get(API_ENDPOINTS.ATTENDANCE.HISTORY, {
+                headers: { Authorization: `Bearer ${token}` },
+            });
+            return response.data;
+        } catch (error) {
+            throw error;
+        }
+    },
+
+    checkIn: async (type: string, token: string): Promise<void> => {
+        try {
+            await apiClient.post(
+                API_ENDPOINTS.ATTENDANCE.CHECK_IN,
+                { type },
+                { headers: { Authorization: `Bearer ${token}` } },
+            );
+        } catch (error) {
+            throw error;
+        }
+    },
+
+    checkOut: async (token: string): Promise<void> => {
+        try {
+            await apiClient.post(
+                API_ENDPOINTS.ATTENDANCE.CHECK_OUT,
+                {},
+                { headers: { Authorization: `Bearer ${token}` } },
+            );
+        } catch (error) {
+            throw error;
+        }
+    },
+};

apps/mobile/src/api/client.ts

@@ -0,0 +1,18 @@
+import axios from 'axios';
+import { API_BASE_URL } from '../config/api';
+
+export const apiClient = axios.create({
+    baseURL: API_BASE_URL,
+    headers: {
+        'Content-Type': 'application/json',
+    },
+});
+
+// Helper to set the auth token for a request
+export const setAuthToken = (token: string) => {
+    if (token) {
+        apiClient.defaults.headers.common['Authorization'] = `Bearer ${token}`;
+    } else {
+        delete apiClient.defaults.headers.common['Authorization'];
+    }
+};

apps/mobile/src/api/fitnessProfile.ts

@@ -1,5 +1,5 @@
-import axios from "axios";
+import { apiClient } from "./client";
-import { API_BASE_URL } from "../config/api";
+import { API_ENDPOINTS } from "../config/api";
 
 export interface FitnessProfile {
   id?: string;
@@ -22,10 +22,10 @@ export const fitnessProfileApi = {
     try {
       console.log(
         "Getting fitness profile with URL:",
-        `${API_BASE_URL}/api/users/${userId}/fitness-profile`,
+        `${API_ENDPOINTS.USERS}/${userId}/fitness-profile`,
       );
-      const response = await axios.get(
+      const response = await apiClient.get(
-        `${API_BASE_URL}/api/users/${userId}/fitness-profile`,
+        `${API_ENDPOINTS.USERS}/${userId}/fitness-profile`,
         {
           headers: {
             Authorization: `Bearer ${token}`,
@@ -49,8 +49,8 @@ export const fitnessProfileApi = {
     token: string,
   ): Promise<FitnessProfile> => {
     try {
-      const response = await axios.put(
+      const response = await apiClient.put(
-        `${API_BASE_URL}/api/users/${userId}/fitness-profile`,
+        `${API_ENDPOINTS.USERS}/${userId}/fitness-profile`,
         data,
         {
           headers: {
@@ -74,8 +74,8 @@ export const fitnessProfileApi = {
     token: string,
   ): Promise<FitnessProfile> => {
     try {
-      const response = await axios.post(
+      const response = await apiClient.post(
-        `${API_BASE_URL}/api/users/${data.clientId}/fitness-profile`,
+        `${API_ENDPOINTS.USERS}/${data.clientId}/fitness-profile`,
         data,
         {
           headers: {

apps/mobile/src/api/profile.ts

@@ -0,0 +1,30 @@
+import { apiClient } from "./client";
+import { API_ENDPOINTS } from "../config/api";
+
+export interface FitnessProfileData {
+    userId: string;
+    height: string;
+    weight: string;
+    age: string;
+    gender: "male" | "female" | "other";
+    activityLevel: "sedentary" | "light" | "moderate" | "active" | "very_active";
+    fitnessGoals: string[];
+    exerciseHabits: string;
+    dietHabits: string;
+    medicalConditions: string;
+}
+
+export const profileApi = {
+    createFitnessProfile: async (
+        data: FitnessProfileData,
+        token: string,
+    ): Promise<void> => {
+        try {
+            await apiClient.post(API_ENDPOINTS.PROFILE.FITNESS, data, {
+                headers: { Authorization: `Bearer ${token}` },
+            });
+        } catch (error) {
+            throw error;
+        }
+    },
+};

apps/mobile/src/app/(tabs)/attendance.tsx

@@ -1,16 +1,9 @@
 import { View, Text, StyleSheet, TouchableOpacity, ActivityIndicator, ScrollView, Alert } from 'react-native'
 import { useState, useEffect } from 'react'
 import { useAuth } from '@clerk/clerk-expo'
-import axios from 'axios'
+import { attendanceApi, Attendance } from '../../api/attendance'
-import { API_BASE_URL, API_ENDPOINTS } from '../../config/api'
+
 
-interface Attendance {
-  id: string
-  checkInTime: string
-  checkOutTime?: string
-  type: string
-  notes?: string
-}
 
 export default function AttendanceScreen() {
   const { getToken, userId } = useAuth()
@@ -22,13 +15,10 @@ export default function AttendanceScreen() {
     try {
       setLoading(true)
       const token = await getToken()
-      const url = `${API_BASE_URL}${API_ENDPOINTS.ATTENDANCE.HISTORY}`
+      if (!token) return
-      console.log('Fetching attendance from:', url)
-      const response = await axios.get(url, {
-        headers: { Authorization: `Bearer ${token}` }
-      })
 
-      const data: Attendance[] = response.data
+      console.log('Fetching attendance history')
+      const data = await attendanceApi.getHistory(token)
       setHistory(data)
 
       // Check if there's an active check-in (latest one has no checkOutTime)
@@ -52,11 +42,9 @@ export default function AttendanceScreen() {
   const handleCheckIn = async () => {
     try {
       const token = await getToken()
-      await axios.post(
+      if (!token) return
-        `${API_BASE_URL}${API_ENDPOINTS.ATTENDANCE.CHECK_IN}`,
+
-        { type: 'gym' },
+      await attendanceApi.checkIn('gym', token)
-        { headers: { Authorization: `Bearer ${token}` } }
-      )
       fetchAttendance()
       Alert.alert('Success', 'Checked in successfully!')
     } catch (error: any) {
@@ -68,11 +56,9 @@ export default function AttendanceScreen() {
   const handleCheckOut = async () => {
     try {
       const token = await getToken()
-      await axios.post(
+      if (!token) return
-        `${API_BASE_URL}${API_ENDPOINTS.ATTENDANCE.CHECK_OUT}`,
+
-        {},
+      await attendanceApi.checkOut(token)
-        { headers: { Authorization: `Bearer ${token}` } }
-      )
       fetchAttendance()
       Alert.alert('Success', 'Checked out successfully!')
     } catch (error: any) {

apps/mobile/src/app/(tabs)/goals.tsx

@@ -11,44 +11,26 @@ import {
 } from "react-native";
 import { useAuth } from "@clerk/clerk-expo";
 import { Ionicons } from "@expo/vector-icons";
-import { API_BASE_URL, API_ENDPOINTS } from "../../config/api";
+import { fitnessGoalsService, type FitnessGoal, type CreateGoalData } from "../../services/fitnessGoals";
-
+import { GoalProgressCard } from "../../components/GoalProgressCard";
-interface Recommendation {
+import { GoalCreationModal } from "../../components/GoalCreationModal";
-    id: string;
-    userId: string;
-    type: "short_term" | "medium_term" | "long_term";
-    content: string;
-    status: "pending" | "completed";
-    createdAt: string;
-}
 
 export default function GoalsScreen() {
     const { userId, getToken } = useAuth();
-    const [recommendations, setRecommendations] = useState<Recommendation[]>([]);
+    const [goals, setGoals] = useState<FitnessGoal[]>([]);
     const [loading, setLoading] = useState(true);
     const [refreshing, setRefreshing] = useState(false);
+    const [showCreateModal, setShowCreateModal] = useState(false);
 
-    const fetchRecommendations = async () => {
+    const fetchGoals = async () => {
         if (!userId) return;
         try {
             const token = await getToken();
-            const response = await fetch(
+            const data = await fitnessGoalsService.getGoals(userId, token);
-                `${API_BASE_URL}${API_ENDPOINTS.RECOMMENDATIONS}?userId=${userId}`,
+            setGoals(data);
-                {
-                    headers: {
-                        Authorization: `Bearer ${token}`,
-                    },
-                }
-            );
-
-            if (response.ok) {
-                const data = await response.json();
-                setRecommendations(data);
-            } else {
-                console.error("Failed to fetch recommendations");
-            }
         } catch (error) {
-            console.error("Error fetching recommendations:", error);
+            console.error("Error fetching fitness goals:", error);
+            Alert.alert("Error", "Failed to load goals. Please try again.");
         } finally {
             setLoading(false);
             setRefreshing(false);
@@ -56,99 +38,53 @@ export default function GoalsScreen() {
     };
 
     useEffect(() => {
-        fetchRecommendations();
+        fetchGoals();
     }, [userId]);
 
     const onRefresh = () => {
         setRefreshing(true);
-        fetchRecommendations();
+        fetchGoals();
     };
 
-    const toggleStatus = async (id: string, currentStatus: string) => {
+    const handleCreateGoal = async (goalData: CreateGoalData) => {
-        const newStatus = currentStatus === "pending" ? "completed" : "pending";
-
-        // Optimistic update
-        setRecommendations(prev =>
-            prev.map(r => r.id === id ? { ...r, status: newStatus } : r)
-        );
-
         try {
             const token = await getToken();
-            const response = await fetch(`${API_BASE_URL}${API_ENDPOINTS.RECOMMENDATIONS}`, {
+            const newGoal = await fitnessGoalsService.createGoal(goalData, token);
-                method: "PUT",
+            setGoals(prev => [newGoal, ...prev]);
-                headers: {
+            Alert.alert("Success", "Goal created successfully!");
-                    "Content-Type": "application/json",
-                    Authorization: `Bearer ${token}`,
-                },
-                body: JSON.stringify({
-                    id,
-                    status: newStatus,
-                }),
-            });
-
-            if (!response.ok) {
-                // Revert on failure
-                setRecommendations(prev =>
-                    prev.map(r => r.id === id ? { ...r, status: currentStatus as "pending" | "completed" } : r)
-                );
-                Alert.alert("Error", "Failed to update status");
-            }
         } catch (error) {
-            console.error(error);
+            console.error("Error creating goal:", error);
-            // Revert on error
+            throw error;
-            setRecommendations(prev =>
-                prev.map(r => r.id === id ? { ...r, status: currentStatus as "pending" | "completed" } : r)
-            );
-            Alert.alert("Error", "Failed to update status");
         }
     };
 
-    const renderSection = (
+    const handleCompleteGoal = async (goalId: string) => {
-        title: string,
+        try {
-        type: "short_term" | "medium_term" | "long_term"
+            const token = await getToken();
-    ) => {
+            const updatedGoal = await fitnessGoalsService.completeGoal(goalId, token);
-        const items = recommendations.filter((r) => r.type === type);
+            setGoals(prev => prev.map(g => g.id === goalId ? updatedGoal : g));
-
+            Alert.alert("Success", "Goal completed! 🎉");
-        return (
+        } catch (error) {
-            <View style={styles.section}>
+            console.error("Error completing goal:", error);
-                <Text style={styles.sectionTitle}>{title}</Text>
+            Alert.alert("Error", "Failed to complete goal. Please try again.");
-                {items.length === 0 ? (
+        }
-                    <Text style={styles.emptyText}>No goals set yet.</Text>
-                ) : (
-                    items.map((rec) => (
-                        <TouchableOpacity
-                            key={rec.id}
-                            style={[
-                                styles.card,
-                                rec.status === "completed" && styles.cardCompleted,
-                            ]}
-                            onPress={() => toggleStatus(rec.id, rec.status)}
-                        >
-                            <View style={styles.checkbox}>
-                                {rec.status === "completed" && (
-                                    <Ionicons name="checkmark" size={16} color="#fff" />
-                                )}
-                            </View>
-                            <View style={styles.cardContent}>
-                                <Text
-                                    style={[
-                                        styles.cardText,
-                                        rec.status === "completed" && styles.cardTextCompleted,
-                                    ]}
-                                >
-                                    {rec.content}
-                                </Text>
-                                <Text style={styles.dateText}>
-                                    {new Date(rec.createdAt).toLocaleDateString()}
-                                </Text>
-                            </View>
-                        </TouchableOpacity>
-                    ))
-                )}
-            </View>
-        );
     };
 
+    const handleDeleteGoal = async (goalId: string) => {
+        try {
+            const token = await getToken();
+            await fitnessGoalsService.deleteGoal(goalId, token);
+            setGoals(prev => prev.filter(g => g.id !== goalId));
+            Alert.alert("Success", "Goal deleted");
+        } catch (error) {
+            console.error("Error deleting goal:", error);
+            Alert.alert("Error", "Failed to delete goal. Please try again.");
+        }
+    };
+
+    const activeGoals = goals.filter(g => g.status === 'active');
+    const completedGoals = goals.filter(g => g.status === 'completed');
+
     if (loading && !refreshing) {
         return (
             <View style={styles.center}>
@@ -158,25 +94,105 @@ export default function GoalsScreen() {
     }
 
     return (
-        <ScrollView
+        <View style={styles.container}>
-            style={styles.container}
+            <ScrollView
-            refreshControl={
+                refreshControl={
-                <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+                    <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
-            }
+                }
-        >
+            >
-            <View style={styles.header}>
+                <View style={styles.header}>
-                <Text style={styles.headerTitle}>My Goals</Text>
+                    <View>
-                <Text style={styles.headerSubtitle}>
+                        <Text style={styles.headerTitle}>My Fitness Goals</Text>
-                    Track your fitness journey progress
+                        <Text style={styles.headerSubtitle}>
-                </Text>
+                            Track your fitness journey progress
-            </View>
+                        </Text>
+                    </View>
+                </View>
 
-            {renderSection("Short Term Goals", "short_term")}
+                {/* Stats Summary */}
-            {renderSection("Medium Term Goals", "medium_term")}
+                {goals.length > 0 && (
-            {renderSection("Long Term Goals", "long_term")}
+                    <View style={styles.statsContainer}>
+                        <View style={styles.statCard}>
+                            <Text style={styles.statValue}>{activeGoals.length}</Text>
+                            <Text style={styles.statLabel}>Active</Text>
+                        </View>
+                        <View style={styles.statCard}>
+                            <Text style={styles.statValue}>{completedGoals.length}</Text>
+                            <Text style={styles.statLabel}>Completed</Text>
+                        </View>
+                        <View style={styles.statCard}>
+                            <Text style={styles.statValue}>
+                                {activeGoals.length > 0
+                                    ? Math.round(
+                                        activeGoals.reduce((sum, g) => sum + g.progress, 0) /
+                                        activeGoals.length
+                                    )
+                                    : 0}%
+                            </Text>
+                            <Text style={styles.statLabel}>Avg Progress</Text>
+                        </View>
+                    </View>
+                )}
 
-            <View style={styles.footer} />
+                {/* Active Goals */}
-        </ScrollView>
+                <View style={styles.section}>
+                    <Text style={styles.sectionTitle}>
+                        Active Goals ({activeGoals.length})
+                    </Text>
+                    {activeGoals.length === 0 ? (
+                        <View style={styles.emptyState}>
+                            <Ionicons name="flag-outline" size={48} color="#d1d5db" />
+                            <Text style={styles.emptyText}>No active goals yet</Text>
+                            <Text style={styles.emptySubtext}>
+                                Tap the + button to create your first goal
+                            </Text>
+                        </View>
+                    ) : (
+                        activeGoals.map((goal) => (
+                            <GoalProgressCard
+                                key={goal.id}
+                                goal={goal}
+                                onComplete={() => handleCompleteGoal(goal.id)}
+                                onDelete={() => handleDeleteGoal(goal.id)}
+                            />
+                        ))
+                    )}
+                </View>
+
+                {/* Completed Goals */}
+                {completedGoals.length > 0 && (
+                    <View style={styles.section}>
+                        <Text style={styles.sectionTitle}>
+                            Completed Goals ({completedGoals.length})
+                        </Text>
+                        {completedGoals.map((goal) => (
+                            <GoalProgressCard
+                                key={goal.id}
+                                goal={goal}
+                                onDelete={() => handleDeleteGoal(goal.id)}
+                            />
+                        ))}
+                    </View>
+                )}
+
+                <View style={styles.footer} />
+            </ScrollView>
+
+            {/* Floating Action Button */}
+            <TouchableOpacity
+                style={styles.fab}
+                onPress={() => setShowCreateModal(true)}
+            >
+                <Ionicons name="add" size={28} color="#fff" />
+            </TouchableOpacity>
+
+            {/* Create Goal Modal */}
+            <GoalCreationModal
+                visible={showCreateModal}
+                onClose={() => setShowCreateModal(false)}
+                onSubmit={handleCreateGoal}
+            />
+        </View>
     );
 }
 
@@ -205,6 +221,34 @@ const styles = StyleSheet.create({
         color: "#6b7280",
         marginTop: 4,
     },
+    statsContainer: {
+        flexDirection: "row",
+        padding: 16,
+        gap: 12,
+    },
+    statCard: {
+        flex: 1,
+        backgroundColor: "#fff",
+        padding: 16,
+        borderRadius: 12,
+        alignItems: "center",
+        shadowColor: "#000",
+        shadowOffset: { width: 0, height: 1 },
+        shadowOpacity: 0.05,
+        shadowRadius: 2,
+        elevation: 2,
+    },
+    statValue: {
+        fontSize: 24,
+        fontWeight: "bold",
+        color: "#2563eb",
+        marginBottom: 4,
+    },
+    statLabel: {
+        fontSize: 12,
+        color: "#6b7280",
+        fontWeight: "500",
+    },
     section: {
         padding: 20,
         paddingTop: 10,
@@ -215,58 +259,38 @@ const styles = StyleSheet.create({
         color: "#374151",
         marginBottom: 12,
     },
-    emptyText: {
+    emptyState: {
-        fontStyle: "italic",
-        color: "#9ca3af",
-    },
-    card: {
-        backgroundColor: "#fff",
-        padding: 16,
-        borderRadius: 12,
-        marginBottom: 12,
-        flexDirection: "row",
-        alignItems: "flex-start",
-        shadowColor: "#000",
-        shadowOffset: { width: 0, height: 1 },
-        shadowOpacity: 0.05,
-        shadowRadius: 2,
-        elevation: 2,
-    },
-    cardCompleted: {
-        backgroundColor: "#f0fdf4", // light green
-        borderColor: "#bbf7d0",
-        borderWidth: 1,
-    },
-    checkbox: {
-        width: 24,
-        height: 24,
-        borderRadius: 6,
-        borderWidth: 2,
-        borderColor: "#d1d5db",
-        marginRight: 12,
-        marginTop: 2,
-        justifyContent: "center",
         alignItems: "center",
-        backgroundColor: "#fff",
+        paddingVertical: 40,
     },
-    cardContent: {
+    emptyText: {
-        flex: 1,
-    },
-    cardText: {
         fontSize: 16,
-        color: "#1f2937",
+        fontWeight: "500",
-        lineHeight: 24,
+        color: "#6b7280",
+        marginTop: 12,
     },
-    cardTextCompleted: {
+    emptySubtext: {
-        textDecorationLine: "line-through",
+        fontSize: 14,
-        color: "#9ca3af",
-    },
-    dateText: {
-        fontSize: 12,
         color: "#9ca3af",
         marginTop: 4,
     },
     footer: {
-        height: 40,
+        height: 100,
+    },
+    fab: {
+        position: "absolute",
+        right: 20,
+        bottom: 20,
+        width: 56,
+        height: 56,
+        borderRadius: 28,
+        backgroundColor: "#2563eb",
+        justifyContent: "center",
+        alignItems: "center",
+        shadowColor: "#000",
+        shadowOffset: { width: 0, height: 4 },
+        shadowOpacity: 0.3,
+        shadowRadius: 8,
+        elevation: 8,
     },
 });

apps/mobile/src/app/(tabs)/recommendations.tsx

@@ -0,0 +1,229 @@
+import { useEffect, useState } from "react";
+import { View, Text, FlatList, ActivityIndicator, StyleSheet, RefreshControl } from "react-native";
+import { useAuth } from "@clerk/clerk-expo";
+import { Ionicons } from "@expo/vector-icons";
+import { API_BASE_URL, API_ENDPOINTS } from "../../config/api";
+
+interface Recommendation {
+    id: string;
+    userId: string;
+    content: string;
+    activityPlan?: string;
+    dietPlan?: string;
+    status: string;
+    createdAt: string;
+}
+
+export default function RecommendationsScreen() {
+    const { getToken, userId } = useAuth();
+    const [recommendations, setRecommendations] = useState<Recommendation[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [refreshing, setRefreshing] = useState(false);
+
+    const fetchRecommendations = async () => {
+        try {
+            if (!userId) {
+                console.error('No userId available');
+                return;
+            }
+
+            const token = await getToken();
+            const headers: Record<string, string> = {
+                'Content-Type': 'application/json',
+            };
+
+            if (token) {
+                headers['Authorization'] = `Bearer ${token}`;
+            }
+
+            const url = `${API_BASE_URL}${API_ENDPOINTS.RECOMMENDATIONS}?userId=${userId}`;
+            console.log('Fetching recommendations from:', url);
+
+            const res = await fetch(url, { headers });
+
+            if (!res.ok) {
+                const errorText = await res.text();
+                console.error('API Error:', res.status, errorText);
+                throw new Error(`Network response was not ok: ${res.status}`);
+            }
+
+            const data = await res.json();
+            console.log('Recommendations data:', data);
+            setRecommendations(data.recommendations || data || []);
+        } catch (e) {
+            console.error('Failed to load recommendations', e);
+        } finally {
+            setLoading(false);
+            setRefreshing(false);
+        }
+    };
+
+    useEffect(() => {
+        fetchRecommendations();
+    }, []);
+
+    const onRefresh = () => {
+        setRefreshing(true);
+        fetchRecommendations();
+    };
+
+    if (loading) {
+        return (
+            <View style={styles.centered}>
+                <ActivityIndicator size="large" color="#000" />
+            </View>
+        );
+    }
+
+    return (
+        <View style={styles.container}>
+            <Text style={styles.header}>AI Recommendations</Text>
+
+            {/* AI Context Info Banner */}
+            <View style={styles.infoBanner}>
+                <Ionicons name="sparkles" size={20} color="#2563eb" />
+                <Text style={styles.infoBannerText}>
+                    Personalized based on your active fitness goals and progress
+                </Text>
+            </View>
+
+            <FlatList
+                data={recommendations}
+                keyExtractor={(item) => item.id}
+                refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
+                ListEmptyComponent={
+                    <View style={styles.emptyContainer}>
+                        <Text style={styles.empty}>No recommendations available yet.</Text>
+                        <Text style={styles.emptySub}>Pull down to refresh</Text>
+                    </View>
+                }
+                renderItem={({ item }) => (
+                    <View style={styles.card}>
+                        <View style={styles.cardHeader}>
+                            <Text style={styles.status}>{item.status.toUpperCase()}</Text>
+                            <Text style={styles.date}>{new Date(item.createdAt).toLocaleDateString()}</Text>
+                        </View>
+
+                        <Text style={styles.sectionTitle}>Daily Advice</Text>
+                        <Text style={styles.content}>{item.content}</Text>
+
+                        {item.activityPlan && (
+                            <>
+                                <Text style={styles.sectionTitle}>Activity Plan</Text>
+                                <Text style={styles.content}>{item.activityPlan}</Text>
+                            </>
+                        )}
+
+                        {item.dietPlan && (
+                            <>
+                                <Text style={styles.sectionTitle}>Diet Plan</Text>
+                                <Text style={styles.content}>{item.dietPlan}</Text>
+                            </>
+                        )}
+                    </View>
+                )}
+            />
+        </View>
+    );
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        backgroundColor: '#f5f5f5',
+    },
+    header: {
+        fontSize: 28,
+        fontWeight: 'bold',
+        padding: 20,
+        paddingBottom: 12,
+        color: '#1a1a1a',
+    },
+    infoBanner: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        backgroundColor: '#eff6ff',
+        marginHorizontal: 16,
+        marginBottom: 12,
+        padding: 12,
+        borderRadius: 8,
+        borderLeftWidth: 3,
+        borderLeftColor: '#2563eb',
+        gap: 8,
+    },
+    infoBannerText: {
+        flex: 1,
+        fontSize: 13,
+        color: '#1e40af',
+        lineHeight: 18,
+    },
+    centered: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+        backgroundColor: '#f5f5f5',
+    },
+    card: {
+        backgroundColor: '#fff',
+        padding: 16,
+        marginHorizontal: 16,
+        marginBottom: 12,
+        borderRadius: 12,
+        shadowColor: '#000',
+        shadowOpacity: 0.1,
+        shadowRadius: 4,
+        shadowOffset: { width: 0, height: 2 },
+        elevation: 3,
+    },
+    cardHeader: {
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        marginBottom: 12,
+        paddingBottom: 12,
+        borderBottomWidth: 1,
+        borderBottomColor: '#e0e0e0',
+    },
+    status: {
+        fontSize: 12,
+        fontWeight: '600',
+        color: '#2e7d32',
+        backgroundColor: '#e8f5e9',
+        paddingHorizontal: 8,
+        paddingVertical: 4,
+        borderRadius: 4,
+    },
+    date: {
+        fontSize: 12,
+        color: '#666',
+    },
+    sectionTitle: {
+        fontSize: 14,
+        fontWeight: '600',
+        color: '#1a1a1a',
+        marginTop: 12,
+        marginBottom: 6,
+    },
+    content: {
+        fontSize: 14,
+        color: '#333',
+        lineHeight: 20,
+    },
+    emptyContainer: {
+        alignItems: 'center',
+        justifyContent: 'center',
+        paddingVertical: 60,
+    },
+    empty: {
+        textAlign: 'center',
+        fontSize: 16,
+        color: '#666',
+        fontWeight: '500',
+    },
+    emptySub: {
+        textAlign: 'center',
+        fontSize: 14,
+        color: '#999',
+        marginTop: 8,
+    },
+});

apps/mobile/src/app/welcome.tsx

@@ -1,9 +1,9 @@
 import React, { useState } from 'react'
 import { View, Text, TextInput, TouchableOpacity, StyleSheet, Alert, ScrollView } from 'react-native'
 import { useRouter } from 'expo-router'
-import axios from 'axios'
+import { useAuth } from '@clerk/clerk-expo'
 import * as SecureStore from 'expo-secure-store'
-import { API_BASE_URL, API_ENDPOINTS } from '../config/api'
+import { profileApi } from '../api/profile'
 
 interface FitnessProfile {
   height: string
@@ -31,6 +31,7 @@ export default function WelcomeScreen() {
   })
   const [loading, setLoading] = useState(false)
   const router = useRouter()
+  const { getToken } = useAuth()
 
   const fitnessGoalsOptions = [
     'Weight Loss',
@@ -67,6 +68,11 @@ export default function WelcomeScreen() {
 
     setLoading(true)
     try {
+      const token = await getToken()
+      if (!token) {
+        throw new Error('Authentication required')
+      }
+
       const user = await SecureStore.getItemAsync('user')
       if (!user) {
         throw new Error('No user found')
@@ -74,19 +80,19 @@ export default function WelcomeScreen() {
 
       const userData = JSON.parse(user)
 
-      const response = await axios.post(
+      await profileApi.createFitnessProfile(
-        `${API_BASE_URL}${API_ENDPOINTS.PROFILE.FITNESS}`,
         {
           userId: userData.id,
           ...profile
-        }
+        },
+        token
       )
 
-      if (response.status === 201) {
+      Alert.alert('Success', 'Profile completed successfully!', [
-        Alert.alert('Success', 'Profile completed successfully!', [
+        { text: 'OK', onPress: () => router.replace('/(tabs)') }
-          { text: 'OK', onPress: () => router.replace('/(tabs)') }
+      ])
-        ])
+
-      }
+
     } catch (error: any) {
       console.log('Profile save error:', error)
       Alert.alert('Error', error.response?.data?.error || 'Failed to save profile. Please try again.')

apps/mobile/src/components/GoalCreationModal.tsx

@@ -0,0 +1,414 @@
+import React, { useState } from 'react';
+import {
+    View,
+    Text,
+    StyleSheet,
+    Modal,
+    TextInput,
+    TouchableOpacity,
+    ScrollView,
+    Platform,
+} from 'react-native';
+import { Ionicons } from '@expo/vector-icons';
+import DateTimePicker from '@react-native-community/datetimepicker';
+import type { CreateGoalData } from '../services/fitnessGoals';
+
+interface GoalCreationModalProps {
+    visible: boolean;
+    onClose: () => void;
+    onSubmit: (goalData: CreateGoalData) => Promise<void>;
+}
+
+const GOAL_TYPES = [
+    { value: 'weight_target', label: 'Weight Target' },
+    { value: 'strength_milestone', label: 'Strength Milestone' },
+    { value: 'endurance_target', label: 'Endurance Target' },
+    { value: 'flexibility_goal', label: 'Flexibility Goal' },
+    { value: 'habit_building', label: 'Habit Building' },
+    { value: 'custom', label: 'Custom Goal' },
+] as const;
+
+const PRIORITIES = [
+    { value: 'low', label: 'Low', color: '#10b981' },
+    { value: 'medium', label: 'Medium', color: '#f59e0b' },
+    { value: 'high', label: 'High', color: '#ef4444' },
+] as const;
+
+export function GoalCreationModal({ visible, onClose, onSubmit }: GoalCreationModalProps) {
+    const [goalType, setGoalType] = useState<CreateGoalData['goalType']>('weight_target');
+    const [title, setTitle] = useState('');
+    const [description, setDescription] = useState('');
+    const [targetValue, setTargetValue] = useState('');
+    const [currentValue, setCurrentValue] = useState('');
+    const [unit, setUnit] = useState('');
+    const [priority, setPriority] = useState<'low' | 'medium' | 'high'>('medium');
+    const [targetDate, setTargetDate] = useState<Date | undefined>();
+    const [showDatePicker, setShowDatePicker] = useState(false);
+    const [submitting, setSubmitting] = useState(false);
+
+    const resetForm = () => {
+        setGoalType('weight_target');
+        setTitle('');
+        setDescription('');
+        setTargetValue('');
+        setCurrentValue('');
+        setUnit('');
+        setPriority('medium');
+        setTargetDate(undefined);
+    };
+
+    const handleSubmit = async () => {
+        if (!title.trim()) {
+            alert('Please enter a goal title');
+            return;
+        }
+
+        setSubmitting(true);
+        try {
+            const goalData: CreateGoalData = {
+                goalType,
+                title: title.trim(),
+                description: description.trim() || undefined,
+                targetValue: targetValue ? parseFloat(targetValue) : undefined,
+                currentValue: currentValue ? parseFloat(currentValue) : undefined,
+                unit: unit.trim() || undefined,
+                targetDate: targetDate?.toISOString(),
+                priority,
+            };
+
+            await onSubmit(goalData);
+            resetForm();
+            onClose();
+        } catch (error) {
+            console.error('Error creating goal:', error);
+            alert('Failed to create goal. Please try again.');
+        } finally {
+            setSubmitting(false);
+        }
+    };
+
+    const handleClose = () => {
+        resetForm();
+        onClose();
+    };
+
+    return (
+        <Modal
+            visible={visible}
+            animationType="slide"
+            presentationStyle="pageSheet"
+            onRequestClose={handleClose}
+        >
+            <View style={styles.container}>
+                <View style={styles.header}>
+                    <Text style={styles.headerTitle}>Create Fitness Goal</Text>
+                    <TouchableOpacity onPress={handleClose} style={styles.closeButton}>
+                        <Ionicons name="close" size={28} color="#111827" />
+                    </TouchableOpacity>
+                </View>
+
+                <ScrollView style={styles.content} showsVerticalScrollIndicator={false}>
+                    {/* Goal Type */}
+                    <View style={styles.field}>
+                        <Text style={styles.label}>Goal Type *</Text>
+                        <ScrollView horizontal showsHorizontalScrollIndicator={false} style={styles.typeScroll}>
+                            {GOAL_TYPES.map((type) => (
+                                <TouchableOpacity
+                                    key={type.value}
+                                    style={[
+                                        styles.typeButton,
+                                        goalType === type.value && styles.typeButtonActive,
+                                    ]}
+                                    onPress={() => setGoalType(type.value)}
+                                >
+                                    <Text
+                                        style={[
+                                            styles.typeButtonText,
+                                            goalType === type.value && styles.typeButtonTextActive,
+                                        ]}
+                                    >
+                                        {type.label}
+                                    </Text>
+                                </TouchableOpacity>
+                            ))}
+                        </ScrollView>
+                    </View>
+
+                    {/* Title */}
+                    <View style={styles.field}>
+                        <Text style={styles.label}>Title *</Text>
+                        <TextInput
+                            style={styles.input}
+                            value={title}
+                            onChangeText={setTitle}
+                            placeholder="e.g., Lose 5kg"
+                            placeholderTextColor="#9ca3af"
+                        />
+                    </View>
+
+                    {/* Description */}
+                    <View style={styles.field}>
+                        <Text style={styles.label}>Description</Text>
+                        <TextInput
+                            style={[styles.input, styles.textArea]}
+                            value={description}
+                            onChangeText={setDescription}
+                            placeholder="Optional description"
+                            placeholderTextColor="#9ca3af"
+                            multiline
+                            numberOfLines={3}
+                        />
+                    </View>
+
+                    {/* Target Value & Unit */}
+                    <View style={styles.row}>
+                        <View style={[styles.field, styles.flex1]}>
+                            <Text style={styles.label}>Target Value</Text>
+                            <TextInput
+                                style={styles.input}
+                                value={targetValue}
+                                onChangeText={setTargetValue}
+                                placeholder="e.g., 70"
+                                placeholderTextColor="#9ca3af"
+                                keyboardType="numeric"
+                            />
+                        </View>
+                        <View style={[styles.field, styles.flex1]}>
+                            <Text style={styles.label}>Unit</Text>
+                            <TextInput
+                                style={styles.input}
+                                value={unit}
+                                onChangeText={setUnit}
+                                placeholder="e.g., kg"
+                                placeholderTextColor="#9ca3af"
+                            />
+                        </View>
+                    </View>
+
+                    {/* Current Value */}
+                    <View style={styles.field}>
+                        <Text style={styles.label}>Current Value</Text>
+                        <TextInput
+                            style={styles.input}
+                            value={currentValue}
+                            onChangeText={setCurrentValue}
+                            placeholder="Starting value (optional)"
+                            placeholderTextColor="#9ca3af"
+                            keyboardType="numeric"
+                        />
+                    </View>
+
+                    {/* Target Date */}
+                    <View style={styles.field}>
+                        <Text style={styles.label}>Target Date</Text>
+                        <TouchableOpacity
+                            style={styles.dateButton}
+                            onPress={() => setShowDatePicker(true)}
+                        >
+                            <Text style={targetDate ? styles.dateText : styles.datePlaceholder}>
+                                {targetDate ? targetDate.toLocaleDateString() : 'Select target date'}
+                            </Text>
+                            <Ionicons name="calendar-outline" size={20} color="#6b7280" />
+                        </TouchableOpacity>
+                    </View>
+
+                    {showDatePicker && (
+                        <DateTimePicker
+                            value={targetDate || new Date()}
+                            mode="date"
+                            display={Platform.OS === 'ios' ? 'spinner' : 'default'}
+                            onChange={(event, selectedDate) => {
+                                setShowDatePicker(Platform.OS === 'ios');
+                                if (selectedDate) {
+                                    setTargetDate(selectedDate);
+                                }
+                            }}
+                            minimumDate={new Date()}
+                        />
+                    )}
+
+                    {/* Priority */}
+                    <View style={styles.field}>
+                        <Text style={styles.label}>Priority</Text>
+                        <View style={styles.priorityContainer}>
+                            {PRIORITIES.map((p) => (
+                                <TouchableOpacity
+                                    key={p.value}
+                                    style={[
+                                        styles.priorityButton,
+                                        priority === p.value && { backgroundColor: p.color },
+                                    ]}
+                                    onPress={() => setPriority(p.value)}
+                                >
+                                    <Text
+                                        style={[
+                                            styles.priorityButtonText,
+                                            priority === p.value && styles.priorityButtonTextActive,
+                                        ]}
+                                    >
+                                        {p.label}
+                                    </Text>
+                                </TouchableOpacity>
+                            ))}
+                        </View>
+                    </View>
+                </ScrollView>
+
+                <View style={styles.footer}>
+                    <TouchableOpacity
+                        style={[styles.submitButton, submitting && styles.submitButtonDisabled]}
+                        onPress={handleSubmit}
+                        disabled={submitting}
+                    >
+                        <Text style={styles.submitButtonText}>
+                            {submitting ? 'Creating...' : 'Create Goal'}
+                        </Text>
+                    </TouchableOpacity>
+                </View>
+            </View>
+        </Modal>
+    );
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        backgroundColor: '#f9fafb',
+    },
+    header: {
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        padding: 20,
+        paddingTop: Platform.OS === 'ios' ? 60 : 20,
+        backgroundColor: '#fff',
+        borderBottomWidth: 1,
+        borderBottomColor: '#e5e7eb',
+    },
+    headerTitle: {
+        fontSize: 20,
+        fontWeight: '600',
+        color: '#111827',
+    },
+    closeButton: {
+        padding: 4,
+    },
+    content: {
+        flex: 1,
+        padding: 20,
+    },
+    field: {
+        marginBottom: 20,
+    },
+    label: {
+        fontSize: 14,
+        fontWeight: '600',
+        color: '#374151',
+        marginBottom: 8,
+    },
+    input: {
+        backgroundColor: '#fff',
+        borderWidth: 1,
+        borderColor: '#d1d5db',
+        borderRadius: 8,
+        padding: 12,
+        fontSize: 16,
+        color: '#111827',
+    },
+    textArea: {
+        height: 80,
+        textAlignVertical: 'top',
+    },
+    row: {
+        flexDirection: 'row',
+        gap: 12,
+    },
+    flex1: {
+        flex: 1,
+    },
+    typeScroll: {
+        flexGrow: 0,
+    },
+    typeButton: {
+        paddingHorizontal: 16,
+        paddingVertical: 8,
+        borderRadius: 8,
+        borderWidth: 1,
+        borderColor: '#d1d5db',
+        backgroundColor: '#fff',
+        marginRight: 8,
+    },
+    typeButtonActive: {
+        backgroundColor: '#2563eb',
+        borderColor: '#2563eb',
+    },
+    typeButtonText: {
+        fontSize: 14,
+        color: '#374151',
+    },
+    typeButtonTextActive: {
+        color: '#fff',
+        fontWeight: '600',
+    },
+    dateButton: {
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        backgroundColor: '#fff',
+        borderWidth: 1,
+        borderColor: '#d1d5db',
+        borderRadius: 8,
+        padding: 12,
+    },
+    dateText: {
+        fontSize: 16,
+        color: '#111827',
+    },
+    datePlaceholder: {
+        fontSize: 16,
+        color: '#9ca3af',
+    },
+    priorityContainer: {
+        flexDirection: 'row',
+        gap: 12,
+    },
+    priorityButton: {
+        flex: 1,
+        paddingVertical: 12,
+        borderRadius: 8,
+        borderWidth: 1,
+        borderColor: '#d1d5db',
+        backgroundColor: '#fff',
+        alignItems: 'center',
+    },
+    priorityButtonText: {
+        fontSize: 14,
+        color: '#374151',
+        fontWeight: '500',
+    },
+    priorityButtonTextActive: {
+        color: '#fff',
+        fontWeight: '600',
+    },
+    footer: {
+        padding: 20,
+        paddingBottom: Platform.OS === 'ios' ? 40 : 20,
+        backgroundColor: '#fff',
+        borderTopWidth: 1,
+        borderTopColor: '#e5e7eb',
+    },
+    submitButton: {
+        backgroundColor: '#2563eb',
+        borderRadius: 8,
+        padding: 16,
+        alignItems: 'center',
+    },
+    submitButtonDisabled: {
+        opacity: 0.6,
+    },
+    submitButtonText: {
+        fontSize: 16,
+        fontWeight: '600',
+        color: '#fff',
+    },
+});

apps/mobile/src/components/GoalProgressCard.tsx

@@ -0,0 +1,251 @@
+import React from 'react';
+import { View, Text, StyleSheet, TouchableOpacity, Alert } from 'react-native';
+import { Ionicons } from '@expo/vector-icons';
+import type { FitnessGoal } from '../services/fitnessGoals';
+
+interface GoalProgressCardProps {
+    goal: FitnessGoal;
+    onPress?: () => void;
+    onComplete?: () => void;
+    onDelete?: () => void;
+}
+
+export function GoalProgressCard({ goal, onPress, onComplete, onDelete }: GoalProgressCardProps) {
+    const isCompleted = goal.status === 'completed';
+    const progress = goal.progress || 0;
+
+    // Calculate days remaining
+    const daysRemaining = goal.targetDate
+        ? Math.ceil((new Date(goal.targetDate).getTime() - Date.now()) / (1000 * 60 * 60 * 24))
+        : null;
+
+    const getGoalTypeIcon = (type: string) => {
+        switch (type) {
+            case 'weight_target': return 'scale-outline';
+            case 'strength_milestone': return 'barbell-outline';
+            case 'endurance_target': return 'bicycle-outline';
+            case 'flexibility_goal': return 'body-outline';
+            case 'habit_building': return 'calendar-outline';
+            default: return 'flag-outline';
+        }
+    };
+
+    const getPriorityColor = (priority: string) => {
+        switch (priority) {
+            case 'high': return '#ef4444';
+            case 'medium': return '#f59e0b';
+            case 'low': return '#10b981';
+            default: return '#6b7280';
+        }
+    };
+
+    const handleDelete = () => {
+        Alert.alert(
+            'Delete Goal',
+            'Are you sure you want to delete this goal?',
+            [
+                { text: 'Cancel', style: 'cancel' },
+                { text: 'Delete', style: 'destructive', onPress: onDelete },
+            ]
+        );
+    };
+
+    return (
+        <TouchableOpacity
+            style={[styles.card, isCompleted && styles.cardCompleted]}
+            onPress={onPress}
+            activeOpacity={0.7}
+        >
+            <View style={styles.header}>
+                <View style={styles.titleRow}>
+                    <Ionicons
+                        name={getGoalTypeIcon(goal.goalType) as any}
+                        size={24}
+                        color={isCompleted ? '#9ca3af' : '#2563eb'}
+                    />
+                    <View style={styles.titleContainer}>
+                        <Text style={[styles.title, isCompleted && styles.titleCompleted]}>
+                            {goal.title}
+                        </Text>
+                        {goal.description && (
+                            <Text style={styles.description} numberOfLines={2}>
+                                {goal.description}
+                            </Text>
+                        )}
+                    </View>
+                </View>
+
+                <View style={styles.actions}>
+                    {!isCompleted && onComplete && (
+                        <TouchableOpacity onPress={onComplete} style={styles.actionButton}>
+                            <Ionicons name="checkmark-circle-outline" size={24} color="#10b981" />
+                        </TouchableOpacity>
+                    )}
+                    {onDelete && (
+                        <TouchableOpacity onPress={handleDelete} style={styles.actionButton}>
+                            <Ionicons name="trash-outline" size={22} color="#ef4444" />
+                        </TouchableOpacity>
+                    )}
+                </View>
+            </View>
+
+            {goal.targetValue && (
+                <View style={styles.progressSection}>
+                    <View style={styles.progressInfo}>
+                        <Text style={styles.progressText}>
+                            {goal.currentValue || 0} / {goal.targetValue} {goal.unit || ''}
+                        </Text>
+                        <Text style={styles.progressPercentage}>{progress.toFixed(0)}%</Text>
+                    </View>
+
+                    <View style={styles.progressBarContainer}>
+                        <View
+                            style={[
+                                styles.progressBar,
+                                { width: `${Math.min(progress, 100)}%` },
+                                isCompleted && styles.progressBarCompleted
+                            ]}
+                        />
+                    </View>
+                </View>
+            )}
+
+            <View style={styles.footer}>
+                <View style={[styles.priorityBadge, { backgroundColor: getPriorityColor(goal.priority) }]}>
+                    <Text style={styles.priorityText}>{goal.priority.toUpperCase()}</Text>
+                </View>
+
+                {daysRemaining !== null && !isCompleted && (
+                    <Text style={[styles.daysRemaining, daysRemaining < 0 && styles.overdue]}>
+                        {daysRemaining < 0
+                            ? `${Math.abs(daysRemaining)} days overdue`
+                            : `${daysRemaining} days remaining`
+                        }
+                    </Text>
+                )}
+
+                {isCompleted && goal.completedDate && (
+                    <Text style={styles.completedDate}>
+                        Completed {new Date(goal.completedDate).toLocaleDateString()}
+                    </Text>
+                )}
+            </View>
+        </TouchableOpacity>
+    );
+}
+
+const styles = StyleSheet.create({
+    card: {
+        backgroundColor: '#fff',
+        borderRadius: 12,
+        padding: 16,
+        marginBottom: 12,
+        shadowColor: '#000',
+        shadowOffset: { width: 0, height: 2 },
+        shadowOpacity: 0.1,
+        shadowRadius: 4,
+        elevation: 3,
+    },
+    cardCompleted: {
+        backgroundColor: '#f0fdf4',
+        borderColor: '#bbf7d0',
+        borderWidth: 1,
+    },
+    header: {
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        alignItems: 'flex-start',
+        marginBottom: 12,
+    },
+    titleRow: {
+        flexDirection: 'row',
+        alignItems: 'flex-start',
+        flex: 1,
+    },
+    titleContainer: {
+        marginLeft: 12,
+        flex: 1,
+    },
+    title: {
+        fontSize: 18,
+        fontWeight: '600',
+        color: '#111827',
+        marginBottom: 4,
+    },
+    titleCompleted: {
+        color: '#9ca3af',
+        textDecorationLine: 'line-through',
+    },
+    description: {
+        fontSize: 14,
+        color: '#6b7280',
+        lineHeight: 20,
+    },
+    actions: {
+        flexDirection: 'row',
+        gap: 8,
+    },
+    actionButton: {
+        padding: 4,
+    },
+    progressSection: {
+        marginBottom: 12,
+    },
+    progressInfo: {
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        marginBottom: 8,
+    },
+    progressText: {
+        fontSize: 14,
+        fontWeight: '500',
+        color: '#374151',
+    },
+    progressPercentage: {
+        fontSize: 14,
+        fontWeight: '600',
+        color: '#2563eb',
+    },
+    progressBarContainer: {
+        height: 8,
+        backgroundColor: '#e5e7eb',
+        borderRadius: 4,
+        overflow: 'hidden',
+    },
+    progressBar: {
+        height: '100%',
+        backgroundColor: '#2563eb',
+        borderRadius: 4,
+    },
+    progressBarCompleted: {
+        backgroundColor: '#10b981',
+    },
+    footer: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'space-between',
+    },
+    priorityBadge: {
+        paddingHorizontal: 8,
+        paddingVertical: 4,
+        borderRadius: 4,
+    },
+    priorityText: {
+        fontSize: 10,
+        fontWeight: '600',
+        color: '#fff',
+    },
+    daysRemaining: {
+        fontSize: 12,
+        color: '#6b7280',
+    },
+    overdue: {
+        color: '#ef4444',
+        fontWeight: '600',
+    },
+    completedDate: {
+        fontSize: 12,
+        color: '#10b981',
+        fontWeight: '500',
+    },
+});

apps/mobile/src/config/api.ts

@@ -1,5 +1,5 @@
 export const API_BASE_URL = __DEV__
-  ? 'https://201081f0849c.ngrok-free.app'
+  ? 'https://221260dc4a2b.ngrok-free.app'
   : 'https://your-production-url.com'
 
 export const API_ENDPOINTS = {
@@ -18,4 +18,12 @@ export const API_ENDPOINTS = {
     HISTORY: '/api/attendance/history',
   },
   RECOMMENDATIONS: '/api/recommendations',
+  FITNESS_GOALS: {
+    LIST: '/api/fitness-goals',
+    CREATE: '/api/fitness-goals',
+    GET: (id: string) => `/api/fitness-goals/${id}`,
+    UPDATE: (id: string) => `/api/fitness-goals/${id}`,
+    DELETE: (id: string) => `/api/fitness-goals/${id}`,
+    COMPLETE: (id: string) => `/api/fitness-goals/${id}/complete`,
+  },
 }

apps/mobile/src/services/fitnessGoals.ts

@@ -0,0 +1,153 @@
+import { API_BASE_URL, API_ENDPOINTS } from '../config/api';
+
+export interface FitnessGoal {
+    id: string;
+    userId: string;
+    fitnessProfileId?: string;
+    goalType: 'weight_target' | 'strength_milestone' | 'endurance_target' | 'flexibility_goal' | 'habit_building' | 'custom';
+    title: string;
+    description?: string;
+    targetValue?: number;
+    currentValue?: number;
+    unit?: string;
+    startDate: string;
+    targetDate?: string;
+    completedDate?: string;
+    status: 'active' | 'completed' | 'abandoned' | 'paused';
+    progress: number;
+    priority: 'low' | 'medium' | 'high';
+    notes?: string;
+    createdAt: string;
+    updatedAt: string;
+}
+
+export interface CreateGoalData {
+    goalType: FitnessGoal['goalType'];
+    title: string;
+    description?: string;
+    targetValue?: number;
+    currentValue?: number;
+    unit?: string;
+    targetDate?: string;
+    priority?: FitnessGoal['priority'];
+    notes?: string;
+}
+
+export class FitnessGoalsService {
+    private async getAuthHeaders(token: string | null): Promise<HeadersInit> {
+        const headers: HeadersInit = {
+            'Content-Type': 'application/json',
+        };
+
+        if (token) {
+            headers['Authorization'] = `Bearer ${token}`;
+        }
+
+        return headers;
+    }
+
+    async getGoals(userId: string, token: string | null, status?: string): Promise<FitnessGoal[]> {
+        try {
+            const headers = await this.getAuthHeaders(token);
+            let url = `${API_BASE_URL}${API_ENDPOINTS.FITNESS_GOALS.LIST}?userId=${userId}`;
+
+            if (status && status !== 'all') {
+                url += `&status=${status}`;
+            }
+
+            const response = await fetch(url, { headers });
+
+            if (!response.ok) {
+                throw new Error(`Failed to fetch goals: ${response.status}`);
+            }
+
+            return await response.json();
+        } catch (error) {
+            console.error('Error fetching fitness goals:', error);
+            throw error;
+        }
+    }
+
+    async createGoal(goalData: CreateGoalData, token: string | null): Promise<FitnessGoal> {
+        try {
+            const headers = await this.getAuthHeaders(token);
+            const response = await fetch(`${API_BASE_URL}${API_ENDPOINTS.FITNESS_GOALS.CREATE}`, {
+                method: 'POST',
+                headers,
+                body: JSON.stringify(goalData),
+            });
+
+            if (!response.ok) {
+                const error = await response.json();
+                throw new Error(error.error || 'Failed to create goal');
+            }
+
+            return await response.json();
+        } catch (error) {
+            console.error('Error creating fitness goal:', error);
+            throw error;
+        }
+    }
+
+    async updateGoal(id: string, updates: Partial<FitnessGoal>, token: string | null): Promise<FitnessGoal> {
+        try {
+            const headers = await this.getAuthHeaders(token);
+            const response = await fetch(`${API_BASE_URL}${API_ENDPOINTS.FITNESS_GOALS.UPDATE(id)}`, {
+                method: 'PUT',
+                headers,
+                body: JSON.stringify(updates),
+            });
+
+            if (!response.ok) {
+                throw new Error('Failed to update goal');
+            }
+
+            return await response.json();
+        } catch (error) {
+            console.error('Error updating fitness goal:', error);
+            throw error;
+        }
+    }
+
+    async updateProgress(id: string, currentValue: number, token: string | null): Promise<FitnessGoal> {
+        return this.updateGoal(id, { currentValue }, token);
+    }
+
+    async completeGoal(id: string, token: string | null): Promise<FitnessGoal> {
+        try {
+            const headers = await this.getAuthHeaders(token);
+            const response = await fetch(`${API_BASE_URL}${API_ENDPOINTS.FITNESS_GOALS.COMPLETE(id)}`, {
+                method: 'POST',
+                headers,
+            });
+
+            if (!response.ok) {
+                throw new Error('Failed to complete goal');
+            }
+
+            return await response.json();
+        } catch (error) {
+            console.error('Error completing fitness goal:', error);
+            throw error;
+        }
+    }
+
+    async deleteGoal(id: string, token: string | null): Promise<void> {
+        try {
+            const headers = await this.getAuthHeaders(token);
+            const response = await fetch(`${API_BASE_URL}${API_ENDPOINTS.FITNESS_GOALS.DELETE(id)}`, {
+                method: 'DELETE',
+                headers,
+            });
+
+            if (!response.ok) {
+                throw new Error('Failed to delete goal');
+            }
+        } catch (error) {
+            console.error('Error deleting fitness goal:', error);
+            throw error;
+        }
+    }
+}
+
+export const fitnessGoalsService = new FitnessGoalsService();

docs/DATABASE_SETUP.md

@@ -0,0 +1,217 @@
+# Database Setup Guide
+
+## Database Location
+
+**Primary Database**: `apps/admin/data/fitai.db`
+
+This is the single source of truth for all application data. All API routes, migration scripts, and database operations use this file.
+
+## Database Path Configuration
+
+### Database Package (`@fitai/database`)
+
+The database package supports configurable paths via environment variables:
+
+```typescript
+// Default behavior:
+// - Development: ../../apps/admin/data/fitai.db
+// - Production: ./data/fitai.db
+// - Custom: Set DATABASE_URL environment variable
+```
+
+**Environment Variable**:
+```bash
+# Optional: Override default database path
+DATABASE_URL=/path/to/your/fitai.db
+```
+
+### Admin App
+
+The admin app uses the following database path configuration:
+
+```typescript
+// Default: ./data/fitai.db (relative to apps/admin/)
+filename: './data/fitai.db'
+```
+
+All API routes and scripts use this consistent path.
+
+## Migration Scripts
+
+All migration scripts are located in `apps/admin/scripts/` and use the correct database path:
+
+- `seed-superadmin.js` - Creates super admin user
+- `migrate-roles.js` - Adds role column to users table
+- `migrate-fitness-profile.js` - Adds allergies and injuries columns
+- `migrate-last-visit.js` - Adds lastVisit column to clients table
+
+**Running Migrations**:
+```bash
+cd apps/admin
+node scripts/migrate-fitness-profile.js
+node scripts/migrate-roles.js
+node scripts/migrate-last-visit.js
+```
+
+## Drizzle ORM
+
+Drizzle Kit is configured to use the admin database:
+
+```typescript
+// packages/database/drizzle.config.ts
+dbCredentials: {
+  url: "../../apps/admin/data/fitai.db"
+}
+```
+
+**Drizzle Commands**:
+```bash
+cd packages/database
+
+# Push schema changes to database
+npm run db:push
+
+# Open Drizzle Studio (database GUI)
+npm run db:studio
+```
+
+## Backup and Restore
+
+### Creating a Backup
+
+```bash
+# From project root
+cp apps/admin/data/fitai.db backups/fitai-$(date +%Y%m%d-%H%M%S).db
+```
+
+### Restoring from Backup
+
+```bash
+# From project root
+cp backups/fitai-YYYYMMDD-HHMMSS.db apps/admin/data/fitai.db
+```
+
+## Database Schema
+
+The database uses SQLite with the following main tables:
+
+- `users` - User accounts (admin, trainer, client)
+- `clients` - Client profiles linked to users
+- `fitness_profiles` - Fitness goals, preferences, and health info
+- `payments` - Payment records
+- `attendance` - Check-in/check-out records
+- `notifications` - User notifications
+- `recommendations` - AI-generated fitness recommendations
+
+## Troubleshooting
+
+### Database Not Found Error
+
+If you see "database not found" errors:
+
+1. Ensure you're running commands from the correct directory
+2. Check that `apps/admin/data/fitai.db` exists
+3. Verify file permissions (should be readable/writable)
+
+### Multiple Database Files
+
+**There should only be ONE database file**: `apps/admin/data/fitai.db`
+
+If you find other `fitai.db` files:
+- `data/fitai.db` (root level) - Old duplicate, should not exist
+- `packages/database/fitai.db` - Old duplicate, should not exist
+
+These were consolidated on 2025-11-26. Backups are in `backups/database-consolidation-2025-11-26/`.
+
+### Migration Script Errors
+
+If migration scripts fail:
+
+1. Check that you're in the `apps/admin` directory
+2. Verify the database file exists and is writable
+3. Check the script output for specific error messages
+4. Ensure no other process has the database locked
+
+## Development Workflow
+
+### Starting Fresh
+
+```bash
+# Remove existing database
+rm apps/admin/data/fitai.db
+
+# Run migrations to create tables
+cd packages/database
+npm run db:push
+
+# Seed super admin user
+cd ../../apps/admin
+node scripts/seed-superadmin.js
+```
+
+### Viewing Database Contents
+
+**Option 1: Drizzle Studio (Recommended)**
+```bash
+cd packages/database
+npm run db:studio
+# Opens at http://localhost:4983
+```
+
+**Option 2: SQLite CLI**
+```bash
+cd apps/admin/data
+sqlite3 fitai.db
+# Then run SQL queries
+SELECT * FROM users;
+.exit
+```
+
+**Option 3: VS Code Extension**
+Install "SQLite Viewer" extension and open `apps/admin/data/fitai.db`
+
+## Production Deployment
+
+### Environment Variables
+
+Set the following in production:
+
+```bash
+# Optional: Custom database path
+DATABASE_URL=/var/data/fitai.db
+
+# Set production mode
+NODE_ENV=production
+```
+
+### Database Location in Production
+
+Ensure the database directory exists and has proper permissions:
+
+```bash
+mkdir -p /path/to/data
+chmod 755 /path/to/data
+```
+
+### Backup Strategy
+
+Implement automated backups in production:
+
+```bash
+# Daily backup cron job
+0 2 * * * cp /var/data/fitai.db /var/backups/fitai-$(date +\%Y\%m\%d).db
+```
+
+## Security Considerations
+
+1. **Never commit the database file to git** - It's in `.gitignore`
+2. **Protect database file permissions** - Only application should have access
+3. **Regular backups** - Implement automated backup strategy
+4. **Encryption at rest** - Consider encrypting the database file in production
+5. **Access control** - Ensure only authorized users can access the database
+
+## Related Documentation
+
+- [Clerk Webhook Setup](./CLERK_WEBHOOK_SETUP.md) - User synchronization
+- [Testing Fitness Profile](./TESTING_FITNESS_PROFILE.md) - Feature testing
+- [Webhook Database Fix](./WEBHOOK_DATABASE_FIX.md) - Webhook implementation details

packages/database/drizzle.config.ts

@@ -5,6 +5,7 @@ export default defineConfig({
   out: "./drizzle",
   dialect: "sqlite",
   dbCredentials: {
-    url: "./fitai.db",
+    // url: "./fitai.db",
+    url: "../../apps/admin/data/fitai.db",
   },
 });

packages/database/src/index.ts

@@ -2,7 +2,14 @@ import Database from 'better-sqlite3'
 import { drizzle } from 'drizzle-orm/better-sqlite3'
 import * as schema from './schema'
 
-const sqlite = new Database('./fitai.db')
+// Configurable database path with intelligent defaults
+const dbPath = process.env.DATABASE_URL ||
+    (process.env.NODE_ENV === 'production'
+        ? './data/fitai.db'
+        : '../../apps/admin/data/fitai.db')
+
+const sqlite = new Database(dbPath)
 export const db = drizzle(sqlite, { schema })
 
 export * from './schema'
+export { eq, and, or, desc, asc } from 'drizzle-orm'

packages/database/src/schema.ts

@@ -145,6 +145,96 @@ export const fitnessProfiles = sqliteTable("fitness_profiles", {
     .$defaultFn(() => new Date()),
 });
 
+export const fitnessGoals = sqliteTable("fitness_goals", {
+  id: text("id").primaryKey(),
+  userId: text("user_id")
+    .notNull()
+    .references(() => users.id, { onDelete: "cascade" }),
+  fitnessProfileId: text("fitness_profile_id").references(
+    () => fitnessProfiles.id,
+    { onDelete: "cascade" }
+  ),
+
+  // Goal details
+  goalType: text("goal_type", {
+    enum: [
+      "weight_target",
+      "strength_milestone",
+      "endurance_target",
+      "flexibility_goal",
+      "habit_building",
+      "custom",
+    ],
+  }).notNull(),
+
+  title: text("title").notNull(),
+  description: text("description"),
+
+  // Measurable targets
+  targetValue: real("target_value"), // e.g., 70 (kg), 100 (kg bench press)
+  currentValue: real("current_value"), // Current progress
+  unit: text("unit"), // kg, km, reps, etc.
+
+  // Timeline
+  startDate: integer("start_date", { mode: "timestamp" })
+    .notNull()
+    .$defaultFn(() => new Date()),
+  targetDate: integer("target_date", { mode: "timestamp" }),
+  completedDate: integer("completed_date", { mode: "timestamp" }),
+
+  // Status tracking
+  status: text("status", {
+    enum: ["active", "completed", "abandoned", "paused"],
+  })
+    .notNull()
+    .default("active"),
+
+  progress: real("progress").default(0), // 0-100 percentage
+
+  // Metadata
+  priority: text("priority", {
+    enum: ["low", "medium", "high"],
+  }).default("medium"),
+
+  notes: text("notes"),
+
+  createdAt: integer("created_at", { mode: "timestamp" })
+    .notNull()
+    .$defaultFn(() => new Date()),
+  updatedAt: integer("updated_at", { mode: "timestamp" })
+    .notNull()
+    .$defaultFn(() => new Date()),
+});
+
+export const recommendations = sqliteTable("recommendations", {
+  id: text("id").primaryKey(),
+  userId: text("user_id")
+    .notNull()
+    .references(() => users.id, { onDelete: "cascade" }),
+  fitnessProfileId: text("fitness_profile_id")
+    .notNull()
+    .references(() => fitnessProfiles.id, { onDelete: "cascade" }),
+  recommendationText: text("recommendation_text").notNull(),
+  activityPlan: text("activity_plan").notNull(),
+  dietPlan: text("diet_plan").notNull(),
+  status: text("status", {
+    enum: ["pending", "approved", "rejected"],
+  })
+    .notNull()
+    .default("pending"),
+  generatedAt: integer("generated_at", { mode: "timestamp" })
+    .notNull()
+    .$defaultFn(() => new Date()),
+  approvedAt: integer("approved_at", { mode: "timestamp" }),
+  approvedBy: text("approved_by"), // User ID of admin/trainer
+  createdAt: integer("created_at", { mode: "timestamp" })
+    .notNull()
+    .$defaultFn(() => new Date()),
+  updatedAt: integer("updated_at", { mode: "timestamp" })
+    .notNull()
+    .$defaultFn(() => new Date()),
+});
+
 export type User = typeof users.$inferSelect;
 export type NewUser = typeof users.$inferInsert;
 export type Client = typeof clients.$inferSelect;
@@ -157,3 +247,8 @@ export type Notification = typeof notifications.$inferSelect;
 export type NewNotification = typeof notifications.$inferInsert;
 export type FitnessProfile = typeof fitnessProfiles.$inferSelect;
 export type NewFitnessProfile = typeof fitnessProfiles.$inferInsert;
+export type FitnessGoal = typeof fitnessGoals.$inferSelect;
+export type NewFitnessGoal = typeof fitnessGoals.$inferInsert;
+export type Recommendation = typeof recommendations.$inferSelect;
+export type NewRecommendation = typeof recommendations.$inferInsert;
+