Still working on reworking backend

Author: KushK04

.env

@@ -13,14 +13,14 @@ FRONTEND_HOST=http://localhost:5173
 # Environment: local, staging, production
 ENVIRONMENT=local
 
-PROJECT_NAME="Full Stack FastAPI Project"
-STACK_NAME=full-stack-fastapi-project
+PROJECT_NAME="Kondition Fastapi"
+STACK_NAME=kondition-fastapi
 
 # Backend
 BACKEND_CORS_ORIGINS="http://localhost,http://localhost:5173,https://localhost,https://localhost:5173,http://localhost.tiangolo.com"
-SECRET_KEY=changethis
+SECRET_KEY=S8T75_i6lcsZerDMe59A9tmyx0-AtFAzGY5bez_dsBw
 FIRST_SUPERUSER=[email protected]
-FIRST_SUPERUSER_PASSWORD=changethis
+FIRST_SUPERUSER_PASSWORD=VSOhm4DWGG8h1kOBAhlZYM0HqqL--r4CuAhZ-eXQX8Q
 
 # Emails
 SMTP_HOST=
@@ -34,9 +34,9 @@ SMTP_PORT=587
 # Postgres
 POSTGRES_SERVER=localhost
 POSTGRES_PORT=5432
-POSTGRES_DB=app
+POSTGRES_DB=konditionDB
 POSTGRES_USER=postgres
-POSTGRES_PASSWORD=changethis
+POSTGRES_PASSWORD=d0pFlN6jcym0Fui_lc4dShkzzRAYUL78ToQTMoALE1g
 
 SENTRY_DSN=
 

KonditionExpo/app/(tabs)/_layout.tsx

@@ -1,16 +1,32 @@
-import { Tabs } from 'expo-router';
-import React from 'react';
+// app/(tabs)/_layout.tsx
+import { Tabs, Redirect } from 'expo-router';
+import { useEffect } from 'react';
+import { ActivityIndicator, View } from 'react-native';
 import { Platform } from 'react-native';
 
+import { useAuth } from '@/contexts/AuthContext';
+import { Colors } from '@/constants/Colors';
+import { useColorScheme } from '@/hooks/useColorScheme';
 import { HapticTab } from '@/components/HapticTab';
 import { IconSymbol } from '@/components/ui/IconSymbol';
 import TabBarBackground from '@/components/ui/TabBarBackground';
-import { Colors } from '@/constants/Colors';
-import { useColorScheme } from '@/hooks/useColorScheme';
 
 export default function TabLayout() {
+  const { token, loading } = useAuth();
   const colorScheme = useColorScheme();
 
+  if (loading) {
+    return (
+      <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
+        <ActivityIndicator size="large" />
+      </View>
+    );
+  }
+
+  if (!token) {
+    return <Redirect href="/login" />;
+  }
+
   return (
     <Tabs
       screenOptions={{
@@ -20,7 +36,6 @@ export default function TabLayout() {
         tabBarBackground: TabBarBackground,
         tabBarStyle: Platform.select({
           ios: {
-            // Use a transparent background on iOS to show the blur effect
             position: 'absolute',
           },
           default: {},

KonditionExpo/app/home.tsx

@@ -4,6 +4,10 @@ import { SafeAreaView, View, Text, StyleSheet, ScrollView, TouchableOpacity, Ima
 import { LineChart, PieChart } from 'react-native-chart-kit';
 import { router } from 'expo-router';
 import { usePersonalBests } from "@/hooks/usePersonalBests";
+import { getAccessToken } from '@/scripts/auth';
+import { useEffect } from 'react';
+
+
 
 const { width } = Dimensions.get('window');
 //console.log(" 1 HomeScreen about to be rendered rendered");
@@ -17,6 +21,30 @@ const HomeScreen = () => {
     return null;
   }
   const { name } = user;
+  useEffect(() => {
+    const fetchAdminDbStructure = async () => {
+      try {
+        const token = await getAccessToken();
+        const res = await fetch('http://localhost:8000/api/v1/inspect-db', {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        });
+  
+        if (!res.ok) {
+          console.error(`Failed to fetch admin DB structure: ${res.status}`);
+          return;
+        }
+  
+        const dbStructure = await res.json();
+        console.log("🛠 Admin DB Structure:", dbStructure);
+      } catch (err) {
+        console.error("Error fetching admin DB structure:", err);
+      }
+    };
+  
+    fetchAdminDbStructure();
+  }, []);
   const heartRateData = [60, 62, 65, 70, 75, 78, 80, 82, 79, 76];
   const waterIntake = '4L';
   const sleepHours = '8h 20m';
@@ -29,7 +57,7 @@ const HomeScreen = () => {
     { id: '2', type: 'Lowerbody Workout', calories: 200, duration: '30 minutes', icon: require('../assets/images/lowerbody.png') },
     // ... more workouts
   ];
-  const { pbs, loading } = usePersonalBests();
+  const { pbs = [], loading } = usePersonalBests();
   const testPbs = pbs.length === 0 ? [{ metric: "Deadlift", value: 315, date: "2025-05-27" }] : pbs;
 
   console.log('PBS LOADED:', pbs);
@@ -224,7 +252,7 @@ const HomeScreen = () => {
           ) : pbs.length === 0 ? (
             <Text style={{ textAlign: 'center', color: '#999', marginBottom: 12 }}>No personal bests yet. Start training to set new records!</Text>
           ) : (
-            testPbs.map((pb) => (
+            pbs.map((pb) => (
               <View key={pb.metric} style={styles.workoutItem}>
                 <Image source={require('../assets/images/trophy.png')} style={styles.workoutIcon} />
                 <View style={styles.workoutInfo}>

KonditionExpo/app/login.tsx

@@ -6,6 +6,8 @@ import { Input } from '../components/ui/Input';
 import { Checkbox } from '../components/ui/Checkbox';
 import { router } from 'expo-router';
 import { useUser } from '@/contexts/UserContext';
+import { useAuth } from '@/contexts/AuthContext';
+import { API_URL } from '@/constants/config';
 
 export default function LoginScreen() {
   const { setName: setUserName } = useUser();
@@ -15,39 +17,28 @@ export default function LoginScreen() {
   const [showPassword, setShowPassword] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [errors, setErrors] = useState<{ email?: string; password?: string }>({});
+  const { login } = useAuth();
+
 
   const backgroundColor = useThemeColor({}, 'background');
   const textColor = useThemeColor({}, 'text');
   const tintColor = useThemeColor({}, 'tint');
 
   const handleLogin = async () => {
-    setErrors({});
-    
-    const newErrors: { email?: string; password?: string } = {};
-  
-    if (!email) newErrors.email = 'Email is required';
-    else if (!/\S+@\S+\.\S+/.test(email)) newErrors.email = 'Please enter a valid email';
-  
-    if (!password) newErrors.password = 'Password is required';
-    else if (password.length < 6) newErrors.password = 'Password must be at least 6 characters';
-  
-    if (Object.keys(newErrors).length > 0) {
-      setErrors(newErrors);
-      return;
-    }
-  
-    setIsLoading(true);
-  
     try {
-      // Simulate API call
-      await new Promise(resolve => setTimeout(resolve, 1500));
-  
-      // Set the name (this mimics what signup does)
-      setUserName('Returning User'); // You can replace this with a real name from API later
-  
-      router.replace('/(tabs)');
-    } catch (error) {
-      console.error('Login error:', error);
+      setIsLoading(true);
+      await login(email, password); // Use context login logic
+      setUserName(email); // optionally call setUserName if it's useful
+      router.replace('/'); // Redirect to home or dashboard
+    } catch (err: any) {
+      console.error('Login error:', err instanceof Error ? err.message : err);
+      if (err instanceof Error) {
+        console.error('Login error:', err.message);
+        console.error('Full stack:', err.stack);
+      } else {
+        console.error('Login error (raw):', err);
+      }
+      alert(`Login failed: ${err.message}`);
     } finally {
       setIsLoading(false);
     }

KonditionExpo/app/signup.tsx

@@ -4,6 +4,9 @@ import { Input } from '@/components/ui/Input';
 import { Button } from '@/components/ui/Button';
 import { router } from 'expo-router';
 import { useUser } from '@/contexts/UserContext';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import { API_URL } from "@/constants/config";
+
 
 
 
@@ -15,16 +18,45 @@ export default function SignUpScreen() {
   const [confirmPassword, setConfirmPassword] = useState('');
   const { setName: setUserName } = useUser();
 
-  const handleCreateAccount = () => {
+  const handleCreateAccount = async () => {
     if (password !== confirmPassword) {
       alert("Passwords don't match");
       return;
     }
 
-    setUserName(name);
-  
-    // TODO: Send signup data to API
-    router.replace('/signup2');
+    try {
+      const res = await fetch(`http://localhost:8000/api/v1/register`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ email, password, name }),
+      });
+      console.log("response from signup: ", res);
+      if (!res.ok) {
+        const errData = await res.json().catch(() => ({}));
+        console.log("ERROR DATA: ", errData);
+        const errMsg =
+          errData.detail || JSON.stringify(errData) || res.statusText || "Unknown error";
+        alert("Signup failed: " + errMsg);
+        return;
+      }      
+      const data = await res.json();
+      console.log("JSON DATA OF SIGNUP: ", data)
+      if (res.ok) {
+        // Optionally, auto-login after signup
+        if (data.access_token) {
+          await AsyncStorage.setItem("access_token", data.access_token);
+        } else {
+          console.warn("No token returned from signup");
+        }
+        setUserName(name);
+        router.replace('/signup2');
+      } else {
+        alert(data.detail || "Signup failed");
+      }
+    } catch (err) {
+      console.error("Signup error", err);
+      alert("Something went wrong during signup.");
+    }
   };