Merge branch 'master' into hugo
This commit is contained in:
3
package-lock.json
generated
3
package-lock.json
generated
@@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"lockfileVersion": 1
|
|
||||||
}
|
|
||||||
@@ -28,7 +28,7 @@ implements OnGatewayConnection, OnGatewayDisconnect
|
|||||||
socket.username = socket.handshake.query.username.toString();
|
socket.username = socket.handshake.query.username.toString();
|
||||||
this.sockets.set(socket.username, socket);
|
this.sockets.set(socket.username, socket);
|
||||||
|
|
||||||
printCaller("socket.username:", socket.username);
|
printCaller("--- socket.username:", socket.username);
|
||||||
|
|
||||||
let not_emit: string = `${socket.username}_not_emit`;
|
let not_emit: string = `${socket.username}_not_emit`;
|
||||||
socket.join(not_emit);
|
socket.join(not_emit);
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
WEBSITE_HOST=transcendance
|
WEBSITE_HOST=localhost
|
||||||
WEBSITE_PORT=8080
|
WEBSITE_PORT=8080
|
||||||
|
|||||||
@@ -59,7 +59,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
resize: vertical;
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background: #FB8B24;
|
background: #FB8B24;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|||||||
@@ -6,8 +6,11 @@ const address = `http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}`
|
|||||||
|
|
||||||
export async function init_socket()
|
export async function init_socket()
|
||||||
{
|
{
|
||||||
|
to_print("in init_socket");
|
||||||
|
console.log("here");
|
||||||
const response = await fetch(`${address}/api/v2/user`);
|
const response = await fetch(`${address}/api/v2/user`);
|
||||||
const response_data = await response.json();
|
const response_data = await response.json();
|
||||||
|
to_print("-- response_data:", response_data);
|
||||||
|
|
||||||
set_user(response_data);
|
set_user(response_data);
|
||||||
|
|
||||||
@@ -19,6 +22,7 @@ export async function init_socket()
|
|||||||
username: response_data.username,
|
username: response_data.username,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
console.log("horo");
|
||||||
set_socket(socket);
|
set_socket(socket);
|
||||||
|
|
||||||
socket_states(socket);
|
socket_states(socket);
|
||||||
|
|||||||
Reference in New Issue
Block a user