3 way chat working
This commit is contained in:
@@ -55,8 +55,8 @@
|
|||||||
[
|
[
|
||||||
"@electron-forge/plugin-webpack",
|
"@electron-forge/plugin-webpack",
|
||||||
{
|
{
|
||||||
"port": "4000",
|
"port": "4005",
|
||||||
"loggerPort": "9002",
|
"loggerPort": "9006",
|
||||||
"mainConfig": "./webpack.main.config.js",
|
"mainConfig": "./webpack.main.config.js",
|
||||||
"devContentSecurityPolicy": "connect-src 'self' http://localhost:5000 ws://localhost:5000 'unsafe-eval'",
|
"devContentSecurityPolicy": "connect-src 'self' http://localhost:5000 ws://localhost:5000 'unsafe-eval'",
|
||||||
"renderer": {
|
"renderer": {
|
||||||
|
|||||||
@@ -359,6 +359,8 @@ function StreamRoom({
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log("keeping an eye on user peers map");
|
console.log("keeping an eye on user peers map");
|
||||||
console.log(userPeers);
|
console.log(userPeers);
|
||||||
|
|
||||||
|
// TODO: p1...when the peer map user count === tuned in - 1, then we tell parent to say that we are actually tuned in/connected
|
||||||
}, [userPeers]);
|
}, [userPeers]);
|
||||||
|
|
||||||
// todo, someone tell the main object that I am finally connected after everything...different than tuned in
|
// todo, someone tell the main object that I am finally connected after everything...different than tuned in
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ export default function Login() {
|
|||||||
<Logo className="scale-50" />
|
<Logo className="scale-50" />
|
||||||
|
|
||||||
{/* ! TESTING PURPOSES */}
|
{/* ! TESTING PURPOSES */}
|
||||||
|
<div className={"text-white flex flex-col gap-5"}>
|
||||||
<button
|
<button
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
setJwtToken(
|
setJwtToken(
|
||||||
@@ -65,7 +66,7 @@ export default function Login() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
patel.arjun50@gmail.com
|
Personal Account
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
@@ -75,9 +76,20 @@ export default function Login() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
arjunpatel@berkeley.edu
|
Berkeley Email
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
onClick={() =>
|
||||||
|
setJwtToken(
|
||||||
|
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI2MjczZTAxNTM1OTg3YWZhMGZjOTA5NzYiLCJnb29nbGVVc2VySWQiOiIxMTQyMTgxMjM0Mzk1OTA4OTU4MjAiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL29ndy9BRGVhNEk0RUhmY08ycVc1blEtelJXdzdRdTVOMWVQdnU5cHkyQzFPbUVxbj1zNjQtYy1tbyIsImVtYWlsIjoidXNlbmlydmFuYUBnbWFpbC5jb20iLCJuYW1lIjoiTmlydmFuYSBTdXBwb3J0IiwiaWF0IjoxNjUxOTY3MDA2fQ.9AgmMW2LYv4QNqibvopiKAaV0GWNbChujWiY6t0OZeQ"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
Nirvana Support
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<>
|
<>
|
||||||
<span className="text-white">Attempting to log you in</span>
|
<span className="text-white">Attempting to log you in</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user