From 0896dd46d1c70a1855575a55cbe929b5600037f6 Mon Sep 17 00:00:00 2001
From: echo <petrovskidimitar@yandex.com>
Date: Mon, 24 Nov 2025 19:08:58 +0100
Subject: [PATCH] ai rec refinement

---
 apps/admin/data/fitai.db                      | Bin 94208 -> 98304 bytes
 .../src/app/api/recommendations/route.ts      |  14 +-
 .../mobile/src/app/(tabs)/recommendations.tsx | 201 ++++++++++++++++++
 3 files changed, 211 insertions(+), 4 deletions(-)
 create mode 100644 apps/mobile/src/app/(tabs)/recommendations.tsx

diff --git a/apps/admin/data/fitai.db b/apps/admin/data/fitai.db
index 69cf70713423965b3547bf78c9508cb1484b63fe..2f02afee6bccd73320dcc7c942d3174278770167 100644
GIT binary patch
delta 2456
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

delta 417
zcmZo@U~725IzgKCJOcxR_(TPJ#`7B!mdFdR@V@~HFo^U2=Kse3k^jwRMS&GeoA)Sb
z^RlK@MkN_dexonJ!Or)HfuEc2(PjaI2EK_4!X{6!W7+)7j$3fD+I#*@0W1m3d|dpK
z**C}nb-(7^%)g75X|m)lE#~yf+{yXxBsM4RS<EcN$8XEPf1N*)-<JO~|8D-L{PQ<U
z91!Q9xIkdC?fK)(K<UZs7eFRR@=w;k&pO%Z{vl>QzU;~D4?u$Me3Sj&32m-@*UHGT
zi-DDwhmlWZGuH<xKHf%QMlN4xX?b3Gaa-HT59$>rNB=WnO-#wn%$t0{Uv%=Sf85fB
zmLUcvR>tO5hUR)k1{P63A9LI5i;Fk1GHgEj&t8#@o$nt5-@omA3XIEu9`u{OMUPQs
zyOKWR69tw&2IfAX16r7cX5_Q+hx+<Tw^vT|p2jb2%fK+1-(F>VcQB(Y&-91&jKb6R
x#53}6@d8a}WY%P0)&y#kXBL_n!VcEf7CBjRx;9wbGdq>-YRQaEFm3saJOHpcfhYg~

diff --git a/apps/admin/src/app/api/recommendations/route.ts b/apps/admin/src/app/api/recommendations/route.ts
index 84141d8..0d38f50 100644
--- a/apps/admin/src/app/api/recommendations/route.ts
+++ b/apps/admin/src/app/api/recommendations/route.ts
@@ -28,16 +28,22 @@ export async function GET(request: Request) {
         }
 
         // Check permissions: Users can view their own, Admins/Trainers can view anyone's
-        if (currentUserId !== targetUserId) {
-            const currentUser = await db.getUserById(currentUserId)
-            const isStaff = currentUser?.role === 'admin' || currentUser?.role === 'superAdmin' || currentUser?.role === 'trainer'
+        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)
diff --git a/apps/mobile/src/app/(tabs)/recommendations.tsx b/apps/mobile/src/app/(tabs)/recommendations.tsx
new file mode 100644
index 0000000..ecedc89
--- /dev/null
+++ b/apps/mobile/src/app/(tabs)/recommendations.tsx
@@ -0,0 +1,201 @@
+import { useEffect, useState } from "react";
+import { View, Text, FlatList, ActivityIndicator, StyleSheet, RefreshControl } from "react-native";
+import { useAuth } from "@clerk/clerk-expo";
+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>
+            <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',
+    },
+    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,
+    },
+});