Merge branch 'main' into api-cleanup

README.md

@@ -8,6 +8,7 @@ Echo is a new chat messaging app aimed at allowing you to talk to strangers *(or
 
 This repository holds the all of the code that our Echo app utilizes (pretty cool right? 😎). This repository is public because we believe in the future of open source projects, the community is what makes developing so special ✨! It is split into the frontend/app `/client` and the backend/server `/server`. Take a look around, we're sure you'll find yourself wanting to help out! Ready? Head here 👉 [contributing](#contributing)
 
+If you are interested in contributing to the UI/UX design of our app, please see our Figma design [here](https://www.figma.com/file/2mvddKeA4XMODdCidYkDid/Proximity-Chat-App?type=design&node-id=0%3A1&mode=design&t=V5A9MVRhlmdxGH0M-1). Improvements here are always welcome.
 
 ## Installation
 

client/app/components/auth/AuthButtons.tsx

@@ -56,6 +56,7 @@ export const SignOutButton: React.FC<SignOutButtonProps> = () => {
       disabled={loading}>
       <Text style={styles.button_text}>Sign Out</Text>
     </TouchableOpacity>
+
   );
 };
 
@@ -72,14 +73,6 @@ export const LogInButton: React.FC<{ onPress?: () => void }> = ({
 export const SignUpButton: React.FC<{ onPress?: () => void }> = ({
   onPress,
 }) => {
-  const [fontsLoaded, fontError] = useFonts({
-    "Gilroy-ExtraBold": require("../../../assets/fonts/Gilroy-ExtraBold.otf"),
-    "Gilroy-Light": require("../../../assets/fonts/Gilroy-Light.otf"),
-  });
-
-  if (!fontsLoaded && !fontError) {
-    return null;
-  }
 
   return (
     <TouchableOpacity style={styles.login_button} onPress={onPress}>

client/app/configs/firebaseConfig.ts

@@ -10,11 +10,7 @@ import {
 
 const firebaseConfig = {
   apiKey: API_KEY || "Mock-Key",
-  authDomain: AUTH_DOMAIN,
-  // projectId: PROJECT_ID,
-  // storageBucket: STORAGE_BUCKET,
-  // messagingSenderId: MESSAGING_SENDER_ID,
-  // appId: APP_ID,
+  authDomain: AUTH_DOMAIN
 };
 
 let app;

client/config_example.md

@@ -14,7 +14,3 @@ LOCATION_REFRESH_RATE=3000
 
 API_KEY = place_your_apiKey_here
 AUTH_DOMAIN = place_your_authDomain_here
-PROJECT_ID = place_your_projectId_here
-STORAGE_BUCKET = place_your_storageBucket_here
-MESSAGING_SENDER_ID = place_your_messagingSenderId_here
-APP_ID = place_your_appId_here

server/.gitignore

@@ -134,6 +134,7 @@ build
 
 # Private Key JSON
 firebase-secrets.json
+firebase-secret.json
 
 # Other
 .env

server/src/index.ts

@@ -24,6 +24,7 @@ const { createServer } = require("http");
 const { Server } = require("socket.io");
 const socket_port = process.env.socket_port;
 const express_port = process.env.express_port;
+const message_outreach_radius = Number(process.env.message_outreach_radius);
 const app = express();
 
 // Middleware
@@ -77,8 +78,8 @@ io.on("connection", async (socket: any) => {
   await toggleUserConnectionStatus(socket.id);
 
   const observer = messagesCollection
-    .order('lastUpdated', "desc")
-    .limit(0)
+    .orderBy('lastUpdated', "desc")
+    .limit(1)
     .onSnapshot((querySnapshot) => {
       querySnapshot.docChanges().forEach((change) => {
         if (change.type === "added") {
@@ -97,20 +98,19 @@ io.on("connection", async (socket: any) => {
             userLon
           );
 
-          if (distance < 300) {
-            console.log("Message is within 300m of user");
+          if (distance < message_outreach_radius) {
+            console.log(`Message is within ${message_outreach_radius} meters of the user ${socket.id}.`);
             socket.emit("message", change.doc.data());
           } else {
-            console.log("Message is not within 300m of user");
+            console.log(`Message is not within ${message_outreach_radius} meters of the user ${socket.id}.`);
           }
         }
       });
-    });
+  });
 
   socket.on("disconnect", () => {
     console.log(`[WS] User <${socket.id}> exited.`);
     deleteConnectedUserByUID(socket.id);
-    observer();
   });
   socket.on("ping", (ack) => {
     // The (ack) parameter stands for "acknowledgement." This function sends a message back to the originating socket.
@@ -123,7 +123,7 @@ io.on("connection", async (socket: any) => {
     try {
       const messageCreated = await createMessage(message);
       if (!messageCreated) throw new Error("createMessage() failed.");
-      if (ack) ack("message recieved");
+      if (ack) ack("message recieved");  
     } catch (error) {
       console.error("[WS] Error sending message:", error.message);
     }