cleanup

and AI recommnedation fix

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

@@ -172,9 +172,9 @@ export async function POST(req: Request) {
         const recommendation = await db.createRecommendation({
             id: crypto.randomUUID(),
             userId,
-            fitnessProfileId: profile.userId,
+            fitnessProfileId: profile.id,
             type: 'ai_plan',
-            content: parsedResponse.recommendationText,
+            recommendationText: parsedResponse.recommendationText,
             activityPlan: parsedResponse.activityPlan,
             dietPlan: parsedResponse.dietPlan,
             status: 'pending'

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

@@ -76,7 +76,7 @@ export async function POST(request: Request) {
                 userId,
                 fitnessProfileId,
                 type: 'ai_plan',
-                content: recommendationText,
+                recommendationText: recommendationText,
                 activityPlan,
                 dietPlan,
                 status: status || 'pending'
@@ -90,7 +90,7 @@ export async function POST(request: Request) {
                 id: crypto.randomUUID(),
                 userId,
                 type,
-                content,
+                recommendationText: content,
                 status: status || 'pending'
             })
             return NextResponse.json(recommendation)
@@ -122,8 +122,8 @@ export async function PUT(request: Request) {
 
         const updated = await db.updateRecommendation(id, {
             ...(status && { status }),
-            ...(recommendationText && { content: recommendationText }), // Map legacy field
-            ...(content && { content }),
+            ...(recommendationText && { recommendationText }),
+            ...(content && { recommendationText: content }),
             ...(activityPlan && { activityPlan }),
             ...(dietPlan && { dietPlan })
         })

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

@@ -219,7 +219,7 @@ export default function RecommendationsPage() {
                                         </div>
                                         <div className="space-y-2 text-sm mb-4">
                                             <div>
-                                                <span className="font-semibold">Advice:</span> {rec.content}
+                                                <span className="font-semibold">Advice:</span> {rec.recommendationText}
                                             </div>
                                             <div>
                                                 <span className="font-semibold">Activity:</span> {rec.activityPlan}

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

@@ -8,7 +8,7 @@ interface Recommendation {
     id: string;
     userId: string;
     type: "short_term" | "medium_term" | "long_term" | "ai_plan";
-    content: string;
+    recommendationText: string;
     activityPlan?: string;
     dietPlan?: string;
     status: "pending" | "completed" | "approved" | "rejected";
@@ -97,7 +97,7 @@ export function Recommendations({ userId }: RecommendationsProps) {
                             }`}
                     >
                         <div className="w-full">
-                            <p className="text-sm font-medium">{rec.content}</p>
+                            <p className="text-gray-700">{rec.recommendationText}</p>
                             {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>}

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

@@ -224,14 +224,14 @@ export function UserGrid({
   const gridRef = React.useRef<AgGridReact<User>>(null);
 
   const gridOptions = {
-    theme: "legacy",
+    theme: "legacy" as const,
     columnDefs,
     defaultColDef,
     rowData: users,
-    rowSelection: "multiple",
+    rowSelection: "multiple" as const,
     onSelectionChanged: () => {
       const selectedNodes = gridRef.current?.api.getSelectedNodes();
-      const selectedData = selectedNodes?.map((node) => node.data) || [];
+      const selectedData = selectedNodes?.map((node) => node.data).filter((u): u is User => !!u) || [];
       setSelectedUsers(selectedData);
       if (selectedData.length === 1 && onUserSelect) {
         onUserSelect(selectedData[0]);

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

@@ -1,17 +1,11 @@
 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';
+import type { FitnessGoal, FitnessProfile, Recommendation } from '@/lib/database/types';
 
 export interface AIContext {
-    profile: DBFitnessProfile;
+    profile: FitnessProfile;
     activeGoals: FitnessGoal[];
     completedGoals: FitnessGoal[];
-    recentRecommendations: DBRecommendation[];
+    recentRecommendations: Recommendation[];
     progressSummary: {
         goalsCompleted: number;
         goalsActive: number;

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

@@ -32,7 +32,7 @@ export function buildEnhancedPrompt(context: AIContext): string {
 - Weight: ${profile.weight || 'Not specified'} kg
 - Age: ${profile.age || 'Not specified'}
 - Gender: ${profile.gender || 'Not specified'}
-- Primary Goal: ${profile.fitnessGoal || 'General fitness'}
+- Primary Goal: ${profile.fitnessGoals?.[0] || 'General fitness'}
 - Activity Level: ${profile.activityLevel || 'Not specified'}
 - Medical Conditions: ${profile.medicalConditions || 'None'}
 - Allergies: ${profile.allergies || 'None'}
@@ -77,7 +77,7 @@ Generate a detailed daily recommendation for a user with the following profile:
 - Weight: ${profile.weight} kg
 - Age: ${profile.age}
 - Gender: ${profile.gender}
-- Goal: ${profile.fitnessGoal}
+- Goal: ${profile.fitnessGoals?.[0]}
 - Activity Level: ${profile.activityLevel}
 - Medical Conditions: ${profile.medicalConditions || "None"}
 - Injuries: ${profile.injuries || "None"}

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

@@ -246,7 +246,7 @@ export class DrizzleDatabase implements IDatabase {
     }
 
     // Fitness Profile operations
-    async createFitnessProfile(profileData: Omit<FitnessProfile, 'createdAt' | 'updatedAt'>): Promise<FitnessProfile> {
+    async createFitnessProfile(profileData: Omit<FitnessProfile, 'id' | 'createdAt' | 'updatedAt'>): Promise<FitnessProfile> {
         const now = new Date()
         const id = Math.random().toString(36).substr(2, 9)
         const newProfile = {
@@ -257,7 +257,7 @@ export class DrizzleDatabase implements IDatabase {
         }
 
         await this.db.insert(fitnessProfiles).values(newProfile as any)
-        return { ...profileData, createdAt: now, updatedAt: now }
+        return { id, ...profileData, createdAt: now, updatedAt: now }
     }
 
     async getFitnessProfileByUserId(userId: string): Promise<FitnessProfile | null> {

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

@@ -1,86 +1,12 @@
+import { User as SharedUser, Client, FitnessProfile, Attendance, Recommendation, FitnessGoal } from "@fitai/shared";
+
 // Database Entity Types
-export interface User {
-  id: string;
-  email: string;
-  firstName: string;
-  lastName: string;
+export interface User extends SharedUser {
   password: string;
-  phone?: string;
-  role: "superAdmin" | "admin" | "trainer" | "client";
-  createdAt: Date;
-  updatedAt: Date;
 }
 
-export interface Client {
-  id: string;
-  userId: string;
-  membershipType: "basic" | "premium" | "vip";
-  membershipStatus: "active" | "inactive" | "expired";
-  joinDate: Date;
-  lastVisit?: Date;
-}
+export type { Client, FitnessProfile, Attendance, Recommendation, FitnessGoal };
 
-export interface FitnessProfile {
-  userId: string;
-  height: string;
-  weight: string;
-  age: string;
-  gender: "male" | "female" | "other";
-  activityLevel: "sedentary" | "lightly_active" | "moderately_active" | "very_active" | "extremely_active";
-  fitnessGoals: string[];
-  exerciseHabits: string;
-  dietHabits: string;
-  medicalConditions: string;
-  allergies?: string;
-  injuries?: string;
-  createdAt: Date;
-  updatedAt: Date;
-}
-
-export interface Attendance {
-  id: string;
-  userId: string;
-  checkInTime: Date;
-  checkOutTime?: Date;
-  type: "gym" | "class" | "personal_training";
-  notes?: string;
-  createdAt: Date;
-}
-
-export interface Recommendation {
-  id: string;
-  userId: string;
-  fitnessProfileId?: string;
-  type: "short_term" | "medium_term" | "long_term" | "ai_plan";
-  content: string;
-  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;
-}
 
 // Database Interface - allows us to swap implementations
 export interface IDatabase {

apps/admin/src/lib/utils.ts

@@ -1,14 +1 @@
-import { type ClassValue, clsx } from "clsx"
-import { twMerge } from "tailwind-merge"
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
-}
-
-export function formatDate(date: string | Date) {
-  return new Date(date).toLocaleDateString("en-US", {
-    month: "long",
-    day: "numeric",
-    year: "numeric",
-  })
-}
+export { cn, formatDate } from "@fitai/shared"

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

@@ -9,7 +9,7 @@ import { theme } from "../../styles/theme";
 interface Recommendation {
     id: string;
     userId: string;
-    content: string;
+    recommendationText: string;
     activityPlan?: string;
     dietPlan?: string;
     status: string;
@@ -141,7 +141,7 @@ export default function RecommendationsScreen() {
                         </View>
 
                         <Text style={styles.sectionTitle}>Daily Advice</Text>
-                        <Text style={styles.content}>{item.content}</Text>
+                        <Text style={styles.content}>{item.recommendationText}</Text>
 
                         {item.activityPlan && (
                             <>

nextstepts0210.md

@@ -15,7 +15,7 @@
     - Shared types should be utilized from `@fitai/shared` or `@fitai/database`.
 - **Configuration**:
     - `apps/mobile/src/config/api.ts` contains hardcoded URLs (e.g., ngrok) which is brittle for development and production.
-    - API routes in `apps/admin` contain `console.log` statements that should be removed or replaced with a proper logging solution.
+    - API routes in `apps/admin` contain `console.log` statements that should be removed or replaced with a proper logging solution.https://5e424f097c8b.ngrok-free.app 
 - **Error Handling**:
     - Basic error handling exists in API routes, but could be standardized (e.g., custom error classes, consistent error response format).
 

packages/shared/package-lock.json

@@ -8,12 +8,33 @@
       "name": "@fitai/shared",
       "version": "1.0.0",
       "dependencies": {
+        "clsx": "^2.1.1",
+        "tailwind-merge": "^3.4.0",
         "zod": "^4.1.12"
       },
       "devDependencies": {
         "typescript": "^5.9.3"
       }
     },
+    "node_modules/clsx": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tailwind-merge": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.4.0.tgz",
+      "integrity": "sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/dcastil"
+      }
+    },
     "node_modules/typescript": {
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",

packages/shared/package.json

@@ -9,9 +9,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "clsx": "^2.1.1",
+    "tailwind-merge": "^3.4.0",
     "zod": "^4.1.12"
   },
   "devDependencies": {
     "typescript": "^5.9.3"
   }
-}
+}

packages/shared/src/types/index.ts

@@ -3,7 +3,10 @@ export interface User {
   email: string
   firstName: string
   lastName: string
-  role: 'admin' | 'trainer' | 'client'
+  password?: string
+  phone?: string
+  role: 'superAdmin' | 'admin' | 'trainer' | 'client'
+  imageUrl?: string
   createdAt: Date
   updatedAt: Date
 }
@@ -11,18 +14,83 @@ export interface User {
 export interface Client {
   id: string
   userId: string
-  user: User
+  user?: User
   membershipType: 'basic' | 'premium' | 'vip'
-  membershipStatus: 'active' | 'inactive' | 'suspended'
+  membershipStatus: 'active' | 'inactive' | 'suspended' | 'expired'
   joinDate: Date
   lastVisit?: Date
-  emergencyContact: {
+  emergencyContact?: {
     name: string
     phone: string
     relationship: string
   }
 }
 
+export interface FitnessProfile {
+  id: string
+  userId: string
+  height: string
+  weight: string
+  age: string
+  gender: "male" | "female" | "other"
+  activityLevel: "sedentary" | "lightly_active" | "moderately_active" | "very_active" | "extremely_active"
+  fitnessGoals: string[]
+  exerciseHabits: string
+  dietHabits: string
+  medicalConditions: string
+  allergies?: string
+  injuries?: string
+  createdAt: Date
+  updatedAt: Date
+}
+
+export interface Attendance {
+  id: string
+  userId: string
+  clientId?: string
+  client?: Client
+  checkInTime: Date
+  checkOutTime?: Date
+  type: 'gym' | 'class' | 'personal_training'
+  notes?: string
+  createdAt?: Date
+}
+
+export interface Recommendation {
+  id: string
+  userId: string
+  fitnessProfileId?: string
+  type: "short_term" | "medium_term" | "long_term" | "ai_plan"
+  recommendationText: string
+  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
+}
+
 export interface Payment {
   id: string
   clientId: string
@@ -36,16 +104,6 @@ export interface Payment {
   description: string
 }
 
-export interface Attendance {
-  id: string
-  clientId: string
-  client: Client
-  checkInTime: Date
-  checkOutTime?: Date
-  type: 'gym' | 'class' | 'personal_training'
-  notes?: string
-}
-
 export interface Notification {
   id: string
   userId: string

packages/shared/src/utils/index.ts

@@ -1,9 +1,17 @@
-export const formatDate = (date: Date): string => {
+import { type ClassValue, clsx } from "clsx"
+import { twMerge } from "tailwind-merge"
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs))
+}
+
+export const formatDate = (date: Date | string): string => {
+  const d = new Date(date)
   return new Intl.DateTimeFormat('en-US', {
     year: 'numeric',
-    month: 'short',
+    month: 'long',
     day: 'numeric',
-  }).format(date)
+  }).format(d)
 }
 
 export const formatCurrency = (