broke everything

client/app/contexts/LocationContext.tsx

@@ -20,8 +20,8 @@ export const LocationProvider = ({
   children: React.ReactNode;
 }) => {
   const [location, setLocation] = useState<LocationType>({
-    latitude: 99999, // Impossible starting value
-    longitude: 99999,
+    lat: 99999, // Impossible starting value
+    lon: 99999,
   });
   const [isLocationEnabled, setIsLocationEnabled] = useState(false);
 
@@ -36,11 +36,11 @@ export const LocationProvider = ({
 
       // Set up the interval once after permission is granted
       interval = setInterval(async () => {
-        const locationData = await getLocation(); 
+        const locationData = await getLocation();
         if (locationData && locationData.coords) {
           const { latitude, longitude } = locationData.coords;
-          if (latitude !== location.latitude || longitude !== location.longitude) {
-            setLocation({ latitude, longitude });
+          if (latitude !== location.lat || longitude !== location.lon) {
+            setLocation({ lat: latitude, lon: longitude });
           } else {
             console.log("Location has not changed");
           }
@@ -57,14 +57,14 @@ export const LocationProvider = ({
         console.log("[LOG]: Cleaning up location useEffect");
       }
     };
-  }, []); 
+  }, []);
 
 
   return (
     <LocationContext.Provider
       value={{
-        longitude: location.longitude,
-        latitude: location.latitude,
+        lon: location.lon,
+        lat: location.lat,
         isLocationEnabled,
       }}>
       {children}

client/app/contexts/NearbyUserContext.tsx

@@ -0,0 +1,14 @@
+import React, { createContext, useContext, useState } from "react";
+import { UserProfile } from "../types/User";
+
+const NearbyUsersContext = createContext<{ [uid: string]: UserProfile }>({});
+
+export const userNearbyUsers = () => {
+  return useContext(NearbyUsersContext);
+};
+
+export const NearbyUsersProvider = ({ children }: { children: React.ReactNode }) => {
+  const [user, setNearbyUsers] = useState<{ [uid: string]: UserProfile }>({});
+
+  return <NearbyUsersContext.Provider value={user}>{children}</NearbyUsersContext.Provider>;
+};

client/app/contexts/SocketContext.tsx

@@ -54,12 +54,12 @@ export const SocketProvider = ({ children }: { children: React.ReactNode }) => {
     if (
       socket &&
       locationContext &&
-      locationContext?.latitude !== 9999 &&
-      locationContext?.longitude !== 9999
+      locationContext?.lat !== 9999 &&
+      locationContext?.lon !== 9999
     ) {
-      sendLocationUpdate(socket, locationContext.latitude, locationContext.longitude);
+      sendLocationUpdate(socket, locationContext.lat, locationContext.lon);
     }
-  }, [locationContext?.latitude, locationContext?.longitude, socket]);
+  }, [locationContext?.lat, locationContext?.lon, socket]);
 
   return (
     <SocketContext.Provider value={socket}>

client/app/screens/chat/ChatScreen.tsx

@@ -16,18 +16,19 @@ import { useSocket } from "../../contexts/SocketContext";
 import { AuthStore } from "../../services/AuthStore";
 import { Message } from "../../types/Message";
 import { useState, useEffect } from "react";
-import { useUser } from "@app/contexts/UserContext";
 import NearbyHeader from "@app/components/chat/NearbyHeader";
 import React from "react";
 import NearbyUserDrawer from "@app/components/chat/NearbyUserDrawer";
+import { sendMessage } from "@app/services/SocketService";
+import { userNearbyUsers } from "@app/contexts/NearbyUserContext";
 
 const ChatScreen = () => {
   const settings = useSettings();
   const screenHeight = Dimensions.get("window").height;
   const keyboardBehavior = Platform.OS === "ios" ? "padding" : undefined;
   const socket = useSocket();
   const location = useLocation();
-  const user = useUser();
+  const nearbyUsers = userNearbyUsers();
   const userAuth = AuthStore.useState();
   // Note: To prevent complexity, all user information is grabbed from different contexts and services. If we wanted most information inside of UserContext, we would have to import contexts within contexts and have state change as certain things mount, which could cause errors that are difficult to pinpoint.
 
@@ -53,31 +54,24 @@ const ChatScreen = () => {
 
   // For when the user sends a message (fired by the send button)
   const onHandleSubmit = () => {
-    if (messageContent.trim() !== "") {
-      const newMessage: Message = {
-        author: {
-          uid: String(userAuth.userAuthInfo?.uid),
-          displayName: String(user?.displayName),
-        },
-        msgId: Crypto.randomUUID(),
-        msgContent: messageContent.trim(),
-        timestamp: Date.now(),
-        lastUpdated: Date.now(),
-        location: {
-          lat: Number(location?.latitude),
-          lon: Number(location?.longitude),
-        },
-        isReply: false,
-        replyTo: "",
-        reactions: {},
-      };
-
-      if (socket !== null) {
-        socket.emit("message", newMessage);
-      }
-
-      setMessageContent("");
-    }
+    if (messageContent.trim() === "") return;
+    if (socket === null) return;
+
+    const newMessage: Message = {
+      author: String(userAuth.userAuthInfo?.uid),
+      //msgId: Crypto.randomUUID(),
+      content: { text: messageContent.trim(), },
+      location: {
+        lat: Number(location?.lat),
+        lon: Number(location?.lon),
+      },
+      replyTo: undefined,
+      reactions: {},
+    };
+
+    sendMessage(socket, newMessage);
+
+    setMessageContent("");
   };
 
   return (

client/app/services/AuthStore.ts

@@ -7,8 +7,9 @@ import {
 } from "@firebase/auth";
 import { Store } from "pullstate";
 
-import { auth , db } from "../configs/firebaseConfig";
-import { doc , setDoc } from "@firebase/firestore"; // Import Firestore functions
+import { auth, db } from "../configs/firebaseConfig";
+import { doc, setDoc } from "@firebase/firestore"; // Import Firestore functions
+import { UserProfile } from "@app/types/User";
 
 interface AuthStoreInterface {
   isLoggedin: boolean;
@@ -22,27 +23,13 @@ export const AuthStore = new Store<AuthStoreInterface>({
   userAuthInfo: null,
 });
 
-const createUserConfig = async (userId: string) => {
+// TODO: Must call notifyUpdateProfile if connected to socket server
+export const updateUserProfile = async (userId: string, profile: UserProfile) => {
   try {
-    const docRef = doc(db, "UserConfigs", userId);
-
-    await setDoc(docRef, {
-      // TODO: create a matching UserConfig type in the app/types folder.
-      // In documentation: make explicit that the key for UserConfig documents is the same as a uid from the user auth collection.
-      isConnected: false,
-      lastConnectionTime: "",
-      displayName: "",
-      userIcon: {
-        imageType: 0,
-        color: "#02efdb"
-      },
-      darkMode: false,
-      notificationsEnabled: false,
-      language: "English",
-
-    });
-  } catch (e){
-    console.error("Error creating UserConfig: ", e);
+    const docRef = doc(db, "users", userId);
+    await setDoc(docRef, profile);
+  } catch (e) {
+    console.error("Error updating user profile: ", e);
   }
 }
 
@@ -94,10 +81,6 @@ export const appSignUp = async (email: string, password: string) => {
       store.isLoggedin = !!response.user;
     });
 
-    if (response.user) {
-      await createUserConfig(response.user.uid);
-    }
-
     return { user: auth.currentUser };
   } catch (e) {
     return { error: e };

client/app/services/SocketService.ts

@@ -1,6 +1,10 @@
 import { io, Socket } from "socket.io-client";
 import { AuthStore } from "../services/AuthStore";
 import { EXPO_IP } from "@env";
+import { LocationType } from "@app/types/Location";
+import { UserProfile } from "@app/types/User";
+import { Completer } from "@app/utils/completer";
+import { Message } from "@app/types/Message";
 
 export const initializeSocket = async (token: string): Promise<Socket> => {
   const socketIo = io(`http://${EXPO_IP}:8080`, {
@@ -21,21 +25,57 @@ export const getToken = async (): Promise<string | null> => {
 };
 
 
+// Methods
 
-export const sendLocationUpdate = (
+export const updateLocation = (
   socket: Socket,
-  latitude: number,
-  longitude: number
+  location: LocationType,
 ) => {
-  console.log("Sending location update to server:", latitude, longitude);
+  console.log("Sending location update to server:", location);
   socket.emit(
     "updateLocation",
-    {
-      lat: latitude,
-      lon: longitude,
-    },
+    location,
+    (ack: string) => {
+      console.log("updateLocation ack:", ack);
+    }
+  );
+};
+
+export const getNearbyUsers = async (
+  socket: Socket,
+): Promise<{ [uid: string]: UserProfile }> => {
+  const completer = new Completer<{ [uid: string]: UserProfile }>();
+
+  socket.emit(
+    "getNearbyUsers",
+    (nearbyUsersMap: { [uid: string]: UserProfile }) => {
+      completer.complete(nearbyUsersMap);
+    }
+  );
+
+  return await completer.promise;
+}
+
+export const notifyUpdateProfile = (
+  socket: Socket,
+) => {
+  socket.emit(
+    "notifyUpdateProfile",
     (ack: string) => {
-      console.log("Location update ack:", ack);
+      console.log("notifyUpdateProfile ack:", ack);
+    }
+  )
+}
+
+export const sendMessage = (
+  socket: Socket,
+  message: Message,
+) => {
+  socket.emit("sendMessage", message,
+    (ack: string) => {
+      console.log("sendMessage ack:", ack);
     }
   );
-};
+}
+
+//

client/app/types/Location.ts

@@ -1,10 +1,10 @@
 export interface LocationContextProps {
-    longitude: number;
-    latitude: number;
-    isLocationEnabled: boolean;
-  }
-  
+  lon: number;
+  lat: number;
+  isLocationEnabled: boolean;
+}
+
 export interface LocationType {
-    longitude: number;
-    latitude: number;
-  }
+  lon: number;
+  lat: number;
+}

client/app/types/Message.ts

@@ -1,19 +1,14 @@
+import { LocationType } from "./Location";
+
 export interface Message {
-  author: {
-    uid: string;
-    displayName: string;
-  };
-  msgId: string;
-  msgContent: string;
-  timestamp: number;
-  lastUpdated: number;
-  location: {
-    lat: number;
-    lon: number;
-  };
-  isReply: boolean;
-  replyTo: string;
+  author: string,
+  content: {
+    text?: string,
+    attachment?: string,
+  },
+  location: LocationType,
+  replyTo?: string,
   reactions: {
-    [key: string]: number;
-  };
+    [key: string]: number,
+  }
 }

client/app/types/User.ts

@@ -1,7 +1,4 @@
-export interface UserType {
+export interface UserProfile {
   displayName: string;
-  userIcon?: {
-    imagePath: string;
-    colorHex: string;
-  };
+  profilePicture: number;
 }