diff --git a/frontend-next/src/app/app/page.js b/frontend-next/src/app/app/page.js
index b35b67d..1ac9d45 100644
--- a/frontend-next/src/app/app/page.js
+++ b/frontend-next/src/app/app/page.js
@@ -7,7 +7,7 @@ import Drawer from '@mui/material/Drawer';
// Firebase Imports
import { auth, database } from "../../../firebase-config";
-import { ref, onValue, set } from "firebase/database";
+import { ref, get, set } from "firebase/database";
import { useAuthState } from "react-firebase-hooks/auth"
// Component Imports
@@ -43,7 +43,7 @@ function Home() {
// Authentication Verification / Redirection if Profile Data not Filled out
useEffect(() => {
if (authUser && authLoading === false) {
- onValue(ref(database, `users/${authUser.uid}`), (userData) => {
+ get(ref(database, `users/${authUser.uid}`)).then((userData) => {
userData = userData.val();
if (userData) {
setUser({...userData});
diff --git a/frontend-next/src/app/chat/page.js b/frontend-next/src/app/chat/page.js
index 37a37d6..1aa692b 100644
--- a/frontend-next/src/app/chat/page.js
+++ b/frontend-next/src/app/chat/page.js
@@ -38,8 +38,8 @@ function Chat() {
// Authentication Verification / Redirection if Profile Data not Filled out
useEffect(() => {
- if (authUser && authLoading === false) {
- onValue(ref(database, `users/${authUser.uid}`), (userData) => {
+ if (authUser && authLoading === false && !user) {
+ get(ref(database, `users/${authUser.uid}`)).then((userData) => {
userData = userData.val();
if (userData) {
setUser(userData);
diff --git a/frontend-next/src/app/dm/page.js b/frontend-next/src/app/dm/page.js
index 815da34..f339609 100644
--- a/frontend-next/src/app/dm/page.js
+++ b/frontend-next/src/app/dm/page.js
@@ -40,7 +40,7 @@ function Chat() {
// Authentication Verification / Redirection if Profile Data not Filled out
useEffect(() => {
if (authUser && authLoading === false) {
- onValue(ref(database, `users/${authUser.uid}`), (userData) => {
+ get(ref(database, `users/${authUser.uid}`)).then((userData) => {
userData = userData.val();
if (userData) {
setUser(userData);
diff --git a/frontend-next/src/app/user/page.js b/frontend-next/src/app/user/page.js
index eb84533..7e2b9b2 100644
--- a/frontend-next/src/app/user/page.js
+++ b/frontend-next/src/app/user/page.js
@@ -49,7 +49,7 @@ function UserProfile() {
if (authUser && authLoading === false) {
const searchParams = new URLSearchParams(document.location.search);
var userUID = searchParams.get("uid")
- onValue(ref(database, `users/${authUser.uid}`), (userData) => {
+ get(ref(database, `users/${authUser.uid}`)).then((userData) => {
userData = userData.val();
if (userData) {
if (userData.uid == userUID) {
@@ -70,7 +70,7 @@ function UserProfile() {
useEffect(() => {
const searchParams = new URLSearchParams(document.location.search);
var userUID = searchParams.get("uid")
- onValue(ref(database, "/users/" + userUID), (snapshot) => {
+ get(ref(database, "/users/" + userUID)).then((snapshot) => {
setProfileData(snapshot.val());
// Populates array with user's interests
diff --git a/frontend-next/src/components/app/map/geo.js b/frontend-next/src/components/app/map/geo.js
index 040c447..f230319 100644
--- a/frontend-next/src/components/app/map/geo.js
+++ b/frontend-next/src/components/app/map/geo.js
@@ -77,25 +77,31 @@ export function Geo({ loc, zoom, moveable, user }) {
// Load Nearby Markers
- var nearbyMarkers = NearbyMarkers(loc);
- if (nearbyMarkers) {
- var nearbyMarkers = Object.values(nearbyMarkers).map((roomObj) => {
- return (