From 98f8b51a42dd0665654d9be2d0c95c400cc38321 Mon Sep 17 00:00:00 2001 From: Yamozha Date: Thu, 4 Feb 2021 00:04:26 +0200 Subject: [PATCH] Changed --- Server/websocketServer.py | 4 +++- Website/index.html | 2 ++ Website/scripts/getCurrentCoins.js | 10 ++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Server/websocketServer.py b/Server/websocketServer.py index 95d22d6d..d40f6b35 100644 --- a/Server/websocketServer.py +++ b/Server/websocketServer.py @@ -26,7 +26,9 @@ async def serveStuff(websocket, path): # bad way to send balance to given user - FIX!!! elif requestText == "STATUSONUSER": name, balance = checkBalance("1") - await websocket.send(balance) + print(name) + await websocket.send(f"Your balance is: {balance}") + await websocket.send(f"Welcome, {name}!") else: await websocket.send("We don't accept DoS") diff --git a/Website/index.html b/Website/index.html index 03705454..72940815 100644 --- a/Website/index.html +++ b/Website/index.html @@ -10,7 +10,9 @@

This is where you'll see the thing

+

Your balance is:

+

diff --git a/Website/scripts/getCurrentCoins.js b/Website/scripts/getCurrentCoins.js index 4664e088..d8fe0728 100644 --- a/Website/scripts/getCurrentCoins.js +++ b/Website/scripts/getCurrentCoins.js @@ -1,6 +1,6 @@ socketAdress="ws://localhost:8765" // Lacking protocol for ids lmao -document.cookie = "id=1"; +document.cookie = "id=2"; function currencyTicker(){ var ws = new WebSocket(socketAdress); @@ -26,10 +26,12 @@ function userBalance(){ ws.onmessage = function(evt){ var balanceStatus = evt.data; // this doesnt work, fix pls - var websiteReplace = "Your balance is:${balanceStatus}" - w = document.getElementById("balance").innerHTML = websiteReplace + w = document.getElementById("balance").innerHTML = balanceStatus; + ws.onmessage = function(evt){ + w = document.getElementById("username").innerHTML = evt.data; + } } } var t=setInterval(currencyTicker,5000); -var y=setInterval(userBalance,10000); +var y=setInterval(userBalance,5000);