From 860c6d107552d3639b072a6a35a662d366484f21 Mon Sep 17 00:00:00 2001
From: Nicholas Pease <me@nicholaspease.com>
Date: Sat, 6 Apr 2024 16:57:16 -0400
Subject: [PATCH 1/2] Add Online / Total to Room List

---
 frontend-next/src/components/app/datatypes.js | 31 +++++++++++++++++--
 .../src/components/app/sidebar/home.js        | 16 +++++-----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/frontend-next/src/components/app/datatypes.js b/frontend-next/src/components/app/datatypes.js
index 343c23d..b6f217f 100644
--- a/frontend-next/src/components/app/datatypes.js
+++ b/frontend-next/src/components/app/datatypes.js
@@ -1,6 +1,9 @@
 import Link from "next/link"
 import { useEffect, useState } from "react";
 
+// Icons
+import PersonIcon from '@mui/icons-material/Person';
+
 // Colors for Messages
 const userColors = [
   "#ff80ed",
@@ -160,12 +163,34 @@ export function Member({ memberObj }) {
  * @returns {Object} - Chat Room Component
  */
 export function ChatRoomSidebar({ roomObj }) {
+  if ("users" in roomObj) {
+    if ("online" in roomObj.users) {
+      var roomOnline = Object.keys(roomObj.users.online).length
+    } else {
+      var roomOnline = 0
+    }
+    if ("all" in roomObj.users) {
+      var roomTotal = Object.keys(roomObj.users.all).length
+    } else {
+      var roomTotal = 0
+    }
+  } else {
+    var roomOnline = 0
+    var roomTotal = 0
+  }
+  console.log(roomObj)
   return (
     <div className="border-[black] border-1 shadow-lg p-2 m-2 rounded-lg cursor-pointer">
       <Link href={`/chat?room=${roomObj.path}/${roomObj.name}-${roomObj.timestamp}`}>
-        <div className="col-span-2">
-          <div className="font-bold">{roomObj.name}</div>
-          <div className="italic">{roomObj.description}</div>
+        <div className="grid grid-cols-3">
+          <div>
+            <PersonIcon/>
+            <div>{roomOnline} / {roomTotal}</div>
+          </div>
+          <div className="col-span-2">
+            <div className="font-bold">{roomObj.name}</div>
+            <div className="italic">{roomObj.description}</div>
+          </div>
         </div>
       </Link>
     </div>
diff --git a/frontend-next/src/components/app/sidebar/home.js b/frontend-next/src/components/app/sidebar/home.js
index 5f5d04e..74ad684 100644
--- a/frontend-next/src/components/app/sidebar/home.js
+++ b/frontend-next/src/components/app/sidebar/home.js
@@ -88,13 +88,15 @@ export function Sidebar({user,location,loadingLoc}) {
   // Add myRooms to Sidebar
   var myRoomArr = [];
   for (var room in user.rooms) {
-    var newRoom = (
-      <ChatRoomSidebar
-        roomObj={user.rooms[room]}
-        key={user.rooms[room].timestamp}
-      />
-    );
-    myRoomArr.push(newRoom);
+    get(ref(database, `/rooms/${user.rooms[room].path}/${user.rooms[room].name}-${user.rooms[room].timestamp}`)).then((snapshot) => {
+      var newRoom = (
+        <ChatRoomSidebar
+          roomObj={snapshot.val()}
+          key={snapshot.val().timestamp}
+        />
+      );
+      myRoomArr.push(newRoom);
+    })
   }
 
   useEffect(() => {
-- 
2.52.0


From 3caa4dcde72129ccf01d8f040d82a0b20893849c Mon Sep 17 00:00:00 2001
From: Nicholas Pease <me@nicholaspease.com>
Date: Sat, 6 Apr 2024 17:00:23 -0400
Subject: [PATCH 2/2] Remove console logs

---
 frontend-next/src/components/app/datatypes.js | 1 -
 frontend-next/src/components/app/map/geo.js   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/frontend-next/src/components/app/datatypes.js b/frontend-next/src/components/app/datatypes.js
index b6f217f..702126a 100644
--- a/frontend-next/src/components/app/datatypes.js
+++ b/frontend-next/src/components/app/datatypes.js
@@ -178,7 +178,6 @@ export function ChatRoomSidebar({ roomObj }) {
     var roomOnline = 0
     var roomTotal = 0
   }
-  console.log(roomObj)
   return (
     <div className="border-[black] border-1 shadow-lg p-2 m-2 rounded-lg cursor-pointer">
       <Link href={`/chat?room=${roomObj.path}/${roomObj.name}-${roomObj.timestamp}`}>
diff --git a/frontend-next/src/components/app/map/geo.js b/frontend-next/src/components/app/map/geo.js
index 24daf29..d691991 100644
--- a/frontend-next/src/components/app/map/geo.js
+++ b/frontend-next/src/components/app/map/geo.js
@@ -29,8 +29,6 @@ function NearbyRoomMarkers({ loc, user }) {
 
           const newMarkers = Object.values(rooms).map((roomObj, index) => {
             const markerKey = roomObj.path + "-" + index;
-            console.log("RoomObj", roomObj);
-
             return (
               // Want to change this to be something other than markers (or something extra)
               <Marker
-- 
2.52.0