diff --git a/frontend-next/src/app/api/firebase-config.js b/frontend-next/src/app/api/firebase-config.js index 5d82756..0d51435 100644 --- a/frontend-next/src/app/api/firebase-config.js +++ b/frontend-next/src/app/api/firebase-config.js @@ -2,13 +2,13 @@ import { initializeApp, getApps, getApp } from "firebase/app"; import { getAuth } from "firebase/auth"; var config = { - apiKey: process.env.FIREBASE_CONFIG_API_KEY, - authDomain: process.env.FIREBASE_CONFIG_AUTH_DOMAIN, - projectId: process.env.FIREBASE_CONFIG_PROJECT_ID, - storageBucket: process.env.FIREBASE_CONFIG_STORAGE_BUCKET, - messagingSenderId: process.env.FIREBASE_CONFIG_MESSAGING_SENDER_ID, - appId: process.env.FIREBASE_CONFIG_APPID, - databaseURL: process.env.FIREBASE_CONFIG_DATABASE_URL, + apiKey: "AIzaSyDbDPjQGt-lIjNPeTG-Q5AECM1m0vtOr2c", + authDomain: "chatmaps-3e7fa.firebaseapp.com", + projectId: "chatmaps-3e7fa", + storageBucket: "chatmaps-3e7fa.appspot.com", + messagingSenderId: "771010649524", + appId: "1:771010649524:web:b6e66d3457820c817b26e1", + databaseURL: "https://chatmaps-3e7fa-default-rtdb.firebaseio.com/", } var app = getApps().length > 0 ? getApp() : initializeApp(config); diff --git a/frontend-next/src/app/app/page.js b/frontend-next/src/app/app/page.js index bdec581..5a4fda1 100644 --- a/frontend-next/src/app/app/page.js +++ b/frontend-next/src/app/app/page.js @@ -2,15 +2,19 @@ import { useState, useEffect } from 'react' import {Map, Marker, ZoomControl} from "pigeon-maps" import { Form, useForm } from "react-hook-form"; +import { app } from "../api/firebase-config"; +import { getDatabase, ref, onValue, get } from "firebase/database"; +var database = getDatabase(app) -function ChatRoomSidebar({roomName}) { + +function ChatRoomSidebar({roomObj}) { return (
Icons
-
{roomName}
+
{roomObj.name}
x Members
@@ -84,16 +88,40 @@ function MainTabHome() { ) } -function ChatRoom({chatRoom}) { +function Chat({chatObj}) { + return ( +
+ {chatObj.user}: {chatObj.body} +
+ ) +} + +function MainTabChatRoom({chatRoom}) { var { register, control, setError, formState: { errors, isSubmitting, isSubmitted } } = useForm() + const [chats, setData] = useState(null) + const [isLoading, setLoading] = useState(true) + var unsubscribeUpdater + useEffect(() => { + unsubscribeUpdater = onValue(ref(database, "/rooms/1"), (snapshot) => { + var chatsarr = [] + var messages = snapshot.val() + for (var message in messages) { + chatsarr.push() + } + setData(chatsarr) + setLoading(false) + }) + }, []) + if (isLoading) return
Loading
+ if (!chats) return
No Chats
return (
-
- Chats Go Here +
+ {chats}
- +
@@ -101,6 +129,37 @@ function ChatRoom({chatRoom}) { ) } +function MyRooms() { + const [myrooms, setData] = useState(null) + const [isLoading, setLoading] = useState(true) + var unsubscribeUpdater + useEffect(() => { + fetch('/api/user').then((res) => { + res.json().then((user) => { + console.log(user.uid) + get(ref(database,`/users/${user.uid}/rooms`), (snapshot) => { + var json = snapshot.val() + console.log(json) + var roomsArr = [] + for (var room in json) { + console.log(room,json[room]) + roomsArr.push() + } + setData(roomsArr) + setLoading(false) + }) + }) + }) + }, []) + if (isLoading) return
Loading
+ if (!myrooms) return
No Data
+ return ( +
+ {myrooms} +
+ ) +} + function Home() { var [tab, setTab] = useState("nearby") var [mainTab, setMainTab] = useState("chat") @@ -120,7 +179,7 @@ function Home() {
{mainTab == "home" && } - {mainTab == "chat" && } + {mainTab == "chat" && }
@@ -137,6 +196,9 @@ function Home() {
} {tab == "rooms" &&
My Rooms +
+ +
} {tab == "create" &&
Create Room