Merge pull request #81 from ISE-GenAI-TechX25-Section-D/displayFriendsNames

Display friends names, added caching logic, merged users posts with GenAI logic

Author: diegoperez-techex

activity_page.py

@@ -1,34 +1,46 @@
 import streamlit as sl
 from data_fetcher import get_user_workouts, insert_user_post
 from modules import display_activity_summary, display_recent_workouts
+from datetime import datetime
 
-def display(user_id="user1"):
-    sl.title("🏃‍♂️ Activities Dashboard")
+#Used GPT 4o to help with share logic
+
+def display_activity_page(user_id="user1"):
+    # sl.title("🏃‍♂️ Activities Dashboard")
 
     fetcher = lambda: get_user_workouts(user_id)
     workouts = fetcher() 
-    recent_workouts = workouts[-3:] if len(workouts) >= 3 else workouts
 
-    side_view(user_id, fetcher)
+    # Sort by timestamp descending (most recent first)
+    sorted_workouts = sorted(
+        workouts,
+        key=lambda w: w['start_timestamp'][:w['start_timestamp'].index(' ')],
+        reverse=True
+    )
+
+    # Get the 3 most recent
+    recent_workouts = sorted_workouts[:3]
+
+    side_view(user_id, recent_workouts)
 
     total_distance = sl.session_state.get("total_distance", 0)
     total_steps = sl.session_state.get("total_steps", 0)
     total_calories = sl.session_state.get("total_calories", 0)
 
     handle_share_section(user_id, workouts, recent_workouts)
 
-def side_view(user_id, fetcher):
+def side_view(user_id, workouts_list):
     left_col, right_col = sl.columns(2)
 
     with left_col:
-        sl.subheader("🕒 Recent Workouts")
-        # display_activity_summary expects a fetcher function
-        display_recent_workouts(userId=user_id, workouts_func=get_user_workouts, streamlit_module=sl)
+        # Developeed with GPT 4o
+        display_recent_workouts(
+            user_id,
+            workouts_func=lambda uid: sorted(get_user_workouts(uid), key=lambda w: w['start_timestamp'], reverse=True)[:3]
+        )
 
     with right_col:
-        sl.subheader("📊 Summary")
-        # display_recent_workouts directly takes the get_user_workouts function
-        display_activity_summary(fetcher=fetcher)
+        display_activity_summary(workouts_list)
 
 
 def handle_share_section(user_id, workouts, recent_workouts):
@@ -41,6 +53,9 @@ def handle_share_section(user_id, workouts, recent_workouts):
         share_total_stats(user_id)
     elif data_source == "A Specific Workout":
         share_specific_workout(user_id, recent_workouts)
+    sl.markdown("---")
+    sl.markdown("When you press the sharing button, wait a few seconds until the shared notification appears!")
+    
 
 def share_total_stats(user_id):
 
@@ -52,9 +67,9 @@ def share_total_stats(user_id):
 
     if sl.button("📤 Share"):
         if stat_type == "Steps":
-            message = f"👟 I walked {steps} steps this week!"
+            message = f"👟 I walked {round(steps)} steps this week!"
         elif stat_type == "Distance":
-            message = f"🏃 I ran {distance} miles this week!"
+            message = f"🏃 I ran {round(distance)} miles this week!"
         elif stat_type == "Calories":
             message = f"🔥 I burned {calories} calories this week!"
         elif stat_type == "All":

app.py

@@ -9,18 +9,26 @@
 from modules import display_my_custom_component, display_post, display_genai_advice, display_activity_summary, display_recent_workouts
 from data_fetcher import get_user_posts, get_genai_advice, get_user_profile, get_user_sensor_data, get_user_workouts
 from streamlit_option_menu import option_menu
-from activity_page import display
+from activity_page import display_activity_page
 from community_page import display_community
 
 
-
 def display_app_page():
     """Displays the home page of the app."""
-    userId = 'user1'
+
+    if 'userId' not in sl.session_state:
+        sl.session_state.userId = 'user1'
+
+    userId = sl.session_state.userId
+
     user_profile = get_user_profile(userId)
     user_name = user_profile['username']
 
-   
+    friends = user_profile['friends']
+    friend_profiles = [get_user_profile(fid) for fid in friends]
+    friend_names = [p['full_name'] for p in friend_profiles]
+    friend_usernames = [p['username'] for p in friend_profiles]
+
     selected = option_menu(
         menu_title=None,  # Appears at top of sidebar
         options=["Home", "Activities", "Community"],
@@ -35,21 +43,24 @@ def display_app_page():
         sl.subheader(f"Welcome {user_profile['full_name']} to MyFitness!")
 
         # Profile Card
-        sl.image(user_profile['profile_image'], width=150, caption="Your Profile Picture")
-
-        sl.markdown(f"**Username:** {user_profile['username']}")
-        sl.markdown(f"**Date of Birth:** {user_profile['date_of_birth']}")
+        col1, col2 = sl.columns([1, 3])
+        with col1:
+            sl.image(user_profile['profile_image'], width=150)
+        with col2:
+            sl.markdown(f"**Username:** {user_profile['username']}")
+            sl.markdown(f"**Date of Birth:** {user_profile['date_of_birth']}")
 
         # Friends section
         sl.markdown("### 👯 Your Friends")
-        if user_profile['friends']:
-            for friend_id in user_profile['friends']:
-                sl.markdown(f"- {friend_id}")
+        if friends:
+            for i, j in zip(friend_names, friend_usernames):
+                sl.markdown(f"**{i}**  \n`@{j}`")
+
         else:
             sl.info("You don't have any friends yet!")
 
     elif selected == "Activities":
-        display(user_id=userId)
+        display_activity_page(user_id=userId)
 
     elif selected == "Community":
         display_community(userId)

bq_scripts/insert_post.py

@@ -0,0 +1,66 @@
+# Utilized GPT 4o to generate script
+from google.cloud import bigquery
+from datetime import datetime
+
+client = bigquery.Client()
+table_id = "diegoperez16techx25.Committees.Posts"
+
+
+def get_next_post_id():
+    query = f"""
+        SELECT MAX(CAST(REGEXP_EXTRACT(PostId, r'post(\\d+)') AS INT64)) AS max_id
+        FROM `{table_id}`
+        WHERE REGEXP_CONTAINS(PostId, r'^post\\d+$')
+    """
+    result = client.query(query).result()
+    row = next(result)
+    return f"post{(row.max_id + 1) if row.max_id else 1}"
+
+def add_post():
+    user_id = input("👤 Enter user ID: ")
+    image_url = input("🖼️  Enter image URL: ")
+    content = input("📝 Enter post content: ")
+
+    post_id = get_next_post_id()
+    timestamp = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+
+    query = f"""
+        INSERT INTO `{table_id}` (PostId, AuthorId, Timestamp, ImageUrl, Content)
+        VALUES (
+            '{post_id}',
+            '{user_id}',
+            DATETIME '{timestamp}',
+            '{image_url}',
+            '{content.replace("'", "\\'")}'
+        )
+    """
+    client.query(query).result()
+    print(f"\n✅ Post '{post_id}' successfully added for user '{user_id}'.")
+
+# Update a post's image
+def update_post_image_url():
+    post_id = input("🆔 Enter Post ID to update: ")
+    new_url = input("🔗 Enter new image URL: ")
+
+    query = f"""
+        UPDATE `{table_id}`
+        SET ImageUrl = '{new_url}'
+        WHERE PostId = '{post_id}'
+    """
+    client.query(query).result()
+    print(f"\n🔄 Image URL updated for '{post_id}'.")
+
+# Main flow
+def main():
+    print("📬 Welcome to the Post Manager!")
+    choice = input("Type 'add' to create a post or 'update' to change an image URL: ").strip().lower()
+
+    if choice == "add":
+        add_post()
+    elif choice == "update":
+        update_post_image_url()
+    else:
+        print("❗ Invalid choice. Please type 'add' or 'update'.")
+
+if __name__ == "__main__":
+    main()

bq_scripts/insert_workouts.py

@@ -0,0 +1,56 @@
+# Utilized GPT 4o to generate script
+from google.cloud import bigquery
+from datetime import datetime, timedelta
+import random
+import re
+
+client = bigquery.Client()
+
+table_id = "diegoperez16techx25.Committees.Workouts"
+
+def get_last_workout_number():
+    query = f"""
+        SELECT MAX(CAST(REGEXP_EXTRACT(WorkoutId, r'workout(\\d+)') AS INT64)) AS max_id
+        FROM `{table_id}`
+        WHERE REGEXP_CONTAINS(WorkoutId, r'^workout\\d+$')
+    """
+    result = client.query(query).result()
+    row = next(result)
+    return row.max_id if row.max_id is not None else 0
+
+def generate_sql_insert(user_id, workout_id):
+    start_time = datetime.utcnow() - timedelta(days=random.randint(1, 30))
+    end_time = start_time + timedelta(minutes=random.randint(20, 90))
+
+    return f"""
+        INSERT INTO `{table_id}` (
+            WorkoutId, UserId, StartTimestamp, EndTimestamp,
+            StartLocationLat, StartLocationLong,
+            EndLocationLat, EndLocationLong,
+            TotalDistance, TotalSteps, CaloriesBurned
+        )
+        VALUES (
+            '{workout_id}', '{user_id}',
+            DATETIME '{start_time.strftime("%Y-%m-%d %H:%M:%S")}',
+            DATETIME '{end_time.strftime("%Y-%m-%d %H:%M:%S")}',
+            {round(random.uniform(-90.0, 90.0), 6)},
+            {round(random.uniform(-180.0, 180.0), 6)},
+            {round(random.uniform(-90.0, 90.0), 6)},
+            {round(random.uniform(-180.0, 180.0), 6)},
+            {round(random.uniform(1.0, 10.0), 2)},
+            {random.randint(2000, 15000)},
+            {round(random.uniform(100.0, 900.0), 2)}
+        )
+    """
+
+start_id = get_last_workout_number() + 1
+users = ["user4"]
+
+for user in users:
+    for i in range(3):  # 3 workouts per user
+        workout_number = start_id
+        workout_id = f"workout{workout_number}"
+        query = generate_sql_insert(user, workout_id)
+        client.query(query).result()
+        print(f"✅ Inserted {workout_id} for {user}")
+        start_id += 1

community_page.py

@@ -5,8 +5,33 @@
 def display_community(user_id):
     user_profile = get_user_profile(user_id)
     sl.title("❤️ Community Page")
-    left_col, right_col = sl.columns(2)
-    with left_col:
+    sl.subheader(f" {user_profile['full_name']}'s")
+
+    tab1, tab2, tab3 = sl.tabs(["👥 Friends' Posts","GenAI Advice", "👤 My Posts"])
+
+    with tab1:
         display_post(user_id)
-    with right_col:
-        display_genai_advice(user_id)
+            
+    with tab2:
+        display_genai_advice(user_id)
+
+    with tab3:
+        sl.subheader("📝 Your Posts")
+        sl.markdown("---")
+        user_posts = get_user_posts(user_id)
+        if user_posts:
+            user_posts.sort(key=lambda post: post.get('timestamp', ''), reverse=True)
+            # Generated by GPT 4o
+            for post in user_posts:
+               # sl.write(post) #For debugging
+                image_url = post.get('image', '')
+                if image_url and image_url.startswith("http"):
+                    sl.image(image_url, width=300)
+
+                sl.markdown(post.get('content', 'No content available.'))
+                timestamp = post.get('timestamp', '🕒 No timestamp')
+                sl.markdown(f"**{timestamp}**")
+                sl.markdown("---")
+        else:
+            sl.info("You haven't posted anything yet.")
+