Merge pull request #5 from KushK04/socialfeeed

Socialfeeed

Author: Andurdur

.env

@@ -5,22 +5,27 @@ DOMAIN=localhost
 # To test the local Traefik config
 # DOMAIN=localhost.tiangolo.com
 
+
 # Used by the backend to generate links in emails to the frontend
 FRONTEND_HOST=http://localhost:5173
 # In staging and production, set this env var to the frontend host, e.g.
 # FRONTEND_HOST=https://dashboard.example.com
 
+
 # Environment: local, staging, production
 ENVIRONMENT=local
 
+
 PROJECT_NAME="Full Stack FastAPI Project"
 STACK_NAME=full-stack-fastapi-project
 
+
 # Backend
-BACKEND_CORS_ORIGINS="http://localhost,http://localhost:5173,https://localhost,https://localhost:5173,http://localhost.tiangolo.com"
-SECRET_KEY=changethis
+BACKEND_CORS_ORIGINS="http://localhost,http://localhost:5173,http://localhost:8081,https://localhost,https://localhost:5173,https://localhost:8081,http://localhost.tiangolo.com"
+SECRET_KEY=VfIGsNDeZkTOiSHIgoG9DjhpTyaLGBb-lZvYa8-wbTM
 FIRST_SUPERUSER=[email protected]
-FIRST_SUPERUSER_PASSWORD=changethis
+FIRST_SUPERUSER_PASSWORD=ierjXObp0qpZq82J
+
 
 # Emails
 SMTP_HOST=
@@ -31,15 +36,21 @@ SMTP_TLS=True
 SMTP_SSL=False
 SMTP_PORT=587
 
+
 # Postgres
 POSTGRES_SERVER=localhost
 POSTGRES_PORT=5432
 POSTGRES_DB=app
 POSTGRES_USER=postgres
-POSTGRES_PASSWORD=changethis
+POSTGRES_PASSWORD=SP52qKZTPKFTpi0w7adJJS80G4BpGDC4X2uxH5H7FYY
+
 
 SENTRY_DSN=
 
+
 # Configure these with your own Docker registry images
 DOCKER_IMAGE_BACKEND=backend
 DOCKER_IMAGE_FRONTEND=frontend
+
+
+

KonditionExpo/app/(tabs)/_layout.tsx

@@ -47,6 +47,20 @@ export default function TabLayout() {
           tabBarIcon: ({ color }) => <IconSymbol size={28} name="clock.fill" color={color} />,
         }}
       />
+      <Tabs.Screen
+        name="feed"
+        options={{
+          title: 'Feed',
+          tabBarIcon: ({ color }) => <IconSymbol size={28} name="list.bullet" color={color} />,
+        }}
+      />
+      <Tabs.Screen
+        name="social"
+        options={{
+          title: 'Social',
+          tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.2.fill" color={color} />,
+        }}
+      />
       <Tabs.Screen
         name="profile"
         options={{

KonditionExpo/app/(tabs)/feed.tsx

@@ -0,0 +1,123 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, Alert } from 'react-native';
+import { router } from 'expo-router';
+import { useFeed, FeedType } from '../../contexts/FeedContext';
+import { FeedToggle, PostList, CreatePostButton } from '../../components/feed';
+import { WorkoutPostResponse } from '../../services/api';
+
+export default function FeedScreen() {
+  const {
+    getCurrentFeed,
+    currentFeedType,
+    setCurrentFeedType,
+    loadFeed,
+    loadMorePosts,
+    refreshFeed,
+    isLoading,
+    error,
+    hasMore,
+    personalFeed,
+    publicFeed,
+    combinedFeed,
+    clearError,
+  } = useFeed();
+
+  const [isRefreshing, setIsRefreshing] = useState(false);
+
+  useEffect(() => {
+    // Load initial feed when component mounts
+    loadFeed(currentFeedType, true);
+  }, []);
+
+  useEffect(() => {
+    // Show error alert if there's an error
+    if (error) {
+      Alert.alert('Error', error, [
+        { text: 'OK', onPress: clearError }
+      ]);
+    }
+  }, [error, clearError]);
+
+  const handleFeedTypeChange = async (feedType: FeedType) => {
+    setCurrentFeedType(feedType);
+    
+    // Load feed if it's empty or switch to a different type
+    const targetFeed = getFeedForType(feedType);
+    if (targetFeed.length === 0) {
+      await loadFeed(feedType, true);
+    }
+  };
+
+  const getFeedForType = (feedType: FeedType): WorkoutPostResponse[] => {
+    switch (feedType) {
+      case 'personal':
+        return personalFeed;
+      case 'public':
+        return publicFeed;
+      case 'combined':
+        return combinedFeed;
+      default:
+        return personalFeed;
+    }
+  };
+
+  const handleRefresh = async () => {
+    setIsRefreshing(true);
+    try {
+      await refreshFeed();
+    } finally {
+      setIsRefreshing(false);
+    }
+  };
+
+  const handleLoadMore = async () => {
+    await loadMorePosts();
+  };
+
+  const handleCreatePost = () => {
+    router.push('/create-post' as any);
+  };
+
+  const handlePostPress = (post: WorkoutPostResponse) => {
+    // Navigate to post detail or user profile
+    console.log('Post pressed:', post.id);
+    // TODO: Implement post detail navigation
+  };
+
+  const postCounts = {
+    personal: personalFeed.length,
+    public: publicFeed.length,
+    combined: combinedFeed.length,
+  };
+
+  const currentFeed = getCurrentFeed();
+
+  return (
+    <View style={styles.container}>
+      <FeedToggle
+        currentFeedType={currentFeedType}
+        onFeedTypeChange={handleFeedTypeChange}
+        postCounts={postCounts}
+      />
+      
+      <PostList
+        posts={currentFeed}
+        isLoading={isLoading}
+        isRefreshing={isRefreshing}
+        hasMore={hasMore}
+        onRefresh={handleRefresh}
+        onLoadMore={handleLoadMore}
+        onPostPress={handlePostPress}
+      />
+      
+      <CreatePostButton onPress={handleCreatePost} />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#f5f5f5',
+  },
+});