From eabb79a17651514343cb1157ac0dce364886702d Mon Sep 17 00:00:00 2001 From: Franziska Date: Thu, 1 Apr 2021 18:59:32 +0200 Subject: [PATCH 01/14] Funktionsaufruf AddPlayer gefixt --- website/javascript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/javascript.js b/website/javascript.js index ba05ad7..4bc5487 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -42,7 +42,7 @@ ws.onmessage = function(evt){ else { newPlayer.Tick = tickType; } - Add(newPlayer); + AddPlayer(newPlayer); PlayerList(); CurrentPlayer(); } From 0dcea91752ec6f0695908a4ff762788e8531fded Mon Sep 17 00:00:00 2001 From: Franziska Date: Thu, 1 Apr 2021 19:06:04 +0200 Subject: [PATCH 02/14] =?UTF-8?q?Unn=C3=B6tige=20Dateien=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/test.html | 38 -------------------------------------- website/test.json | 1 - 2 files changed, 39 deletions(-) delete mode 100644 website/test.html delete mode 100644 website/test.json diff --git a/website/test.html b/website/test.html deleted file mode 100644 index 89df0c0..0000000 --- a/website/test.html +++ /dev/null @@ -1,38 +0,0 @@ - - - Playing YouTube video on HTML5 canvas - - - - - - -The Scream - -

Canvas:

- -Your browser does not support the HTML5 canvas tag. - - - diff --git a/website/test.json b/website/test.json deleted file mode 100644 index fcec025..0000000 --- a/website/test.json +++ /dev/null @@ -1 +0,0 @@ -"Hallo" From ea153db8a9a54a3f98e64a32c907d4545bbeea08 Mon Sep 17 00:00:00 2001 From: Franziska Date: Thu, 1 Apr 2021 19:50:07 +0200 Subject: [PATCH 03/14] AddPlayer gefixt --- website/javascript.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/website/javascript.js b/website/javascript.js index 4bc5487..7e7bede 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -6,7 +6,7 @@ let reloadButton = document.getElementById("reload"); let saveButton = document.getElementById("save"); var players = []; let Id = Math.floor(Math.random()*10000000000000000).toString(16) -var ws = new WebSocket("ws:10.9.1.129:8080/" + Id); +var ws = new WebSocket("wss://nerfingen.de:8080/" + Id); document.getElementById("p4").innerHTML = "" + Id; @@ -140,7 +140,7 @@ changeTickButton.onclick = function() { changeIdButton.onclick = function() { Id = document.getElementById("D").value; ws.close(); - ws = new WebSocket("ws:10.9.1.129:8080/" + Id); + ws = new WebSocket("wss://nerfingen.de:8080/" + Id); document.getElementById("p4").innerHTML = "" + Id; } @@ -165,11 +165,14 @@ function PlayerList(){ /*Updates the current Player according to the Player with the smallest Tick in players.*/ function CurrentPlayer(){ + if (players.length > 0 ){ document.getElementById("p2").innerHTML = players[0].Name; document.getElementById("p1").innerHTML = "" + players[0].Tick; + } } function AddPlayer(player){ + var hinzugefügt = false; if (player.Tick == "Abwarten"){ players.push(player); } @@ -186,8 +189,12 @@ function AddPlayer(player){ for (i = 0; i Date: Thu, 1 Apr 2021 20:07:40 +0200 Subject: [PATCH 04/14] =?UTF-8?q?AddPlayer=20f=C3=BCr=20leere=20Liste=20ge?= =?UTF-8?q?fixt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/javascript.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/website/javascript.js b/website/javascript.js index 7e7bede..dc09804 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -173,6 +173,9 @@ function CurrentPlayer(){ function AddPlayer(player){ var hinzugefügt = false; + if (player.length == 0){ + players.push(player); + } if (player.Tick == "Abwarten"){ players.push(player); } @@ -181,8 +184,12 @@ function AddPlayer(player){ for (i = players.length; i>0;i++){ if (players[i-1].Tick != "Abwarten"){ players.splice(i,0,player); + hinzugefügt = true; break; } + if (i == 1 && hinzugefügt == false){ + players.splice(0,0,player); + } } } else { From f66e4171517af52ab6ae225610f285ee3784afc3 Mon Sep 17 00:00:00 2001 From: Franziska Date: Thu, 1 Apr 2021 20:22:54 +0200 Subject: [PATCH 05/14] AddPlayer typo gefixt --- website/javascript.js | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/website/javascript.js b/website/javascript.js index dc09804..06a31e4 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -4,9 +4,10 @@ let changeTickButton = document.getElementById("changeTick"); let changeIdButton = document.getElementById("tickLeistenId"); let reloadButton = document.getElementById("reload"); let saveButton = document.getElementById("save"); +let url = "wss://nerfingen.de:8080/"; var players = []; let Id = Math.floor(Math.random()*10000000000000000).toString(16) -var ws = new WebSocket("wss://nerfingen.de:8080/" + Id); +var ws = new WebSocket(url + Id); document.getElementById("p4").innerHTML = "" + Id; @@ -140,7 +141,7 @@ changeTickButton.onclick = function() { changeIdButton.onclick = function() { Id = document.getElementById("D").value; ws.close(); - ws = new WebSocket("wss://nerfingen.de:8080/" + Id); + ws = new WebSocket(url + Id); document.getElementById("p4").innerHTML = "" + Id; } @@ -172,10 +173,11 @@ function CurrentPlayer(){ } function AddPlayer(player){ - var hinzugefügt = false; - if (player.length == 0){ - players.push(player); - } + if (players.length == 0){ + players.push(player); + } + else { + var added = false; if (player.Tick == "Abwarten"){ players.push(player); } @@ -184,10 +186,10 @@ function AddPlayer(player){ for (i = players.length; i>0;i++){ if (players[i-1].Tick != "Abwarten"){ players.splice(i,0,player); - hinzugefügt = true; + added = true; break; } - if (i == 1 && hinzugefügt == false){ + if (i == 1 && added == false){ players.splice(0,0,player); } } @@ -196,16 +198,17 @@ function AddPlayer(player){ for (i = 0; i Date: Wed, 7 Apr 2021 16:18:21 +0200 Subject: [PATCH 06/14] Zeile 186 Endlosschleife gefixt --- website/javascript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/javascript.js b/website/javascript.js index 06a31e4..3579448 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -183,7 +183,7 @@ function AddPlayer(player){ } else { if (player.Tick == "Bereithalten"){ - for (i = players.length; i>0;i++){ + for (i = players.length; i>0;i--){ if (players[i-1].Tick != "Abwarten"){ players.splice(i,0,player); added = true; From 0d91cb7c54e711562d4041d99650cc389b2fd8b7 Mon Sep 17 00:00:00 2001 From: Franziska Date: Wed, 7 Apr 2021 17:30:07 +0200 Subject: [PATCH 07/14] AddPlayer gefixt JSON gefixt --- website/javascript.js | 50 +++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/website/javascript.js b/website/javascript.js index 3579448..b5fc0d0 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -4,7 +4,7 @@ let changeTickButton = document.getElementById("changeTick"); let changeIdButton = document.getElementById("tickLeistenId"); let reloadButton = document.getElementById("reload"); let saveButton = document.getElementById("save"); -let url = "wss://nerfingen.de:8080/"; +let url = "ws://10.9.1.129:8080/"; var players = []; let Id = Math.floor(Math.random()*10000000000000000).toString(16) var ws = new WebSocket(url + Id); @@ -22,10 +22,16 @@ ws.onmessage = function(evt){ valid = true; for (i = 0; i < players.length; i++){ if (players[i].UUID == obj.playerUUID){ - players[i].Tick = obj.tick.tickValue; + if (obj.tick.tickType == "Tick"){ + players[i].Tick = obj.tick.tickValue; + } + else { + players[i].Tick = obj.tick.tickType; + } var pl = players[i]; players.splice(i,1); AddPlayer(pl); + break; } } PlayerList(); @@ -38,10 +44,10 @@ ws.onmessage = function(evt){ newPlayer.Name = obj.playerName; newPlayer.UUID = obj.playerUUID; if (obj.tick.tickType == "Tick"){ - newPlayer.Tick = obj.tick.tickValue; + newPlayer.Tick = obj.tick.tickValue; } else { - newPlayer.Tick = tickType; + newPlayer.Tick = obj.tick.tickType; } AddPlayer(newPlayer); PlayerList(); @@ -95,14 +101,17 @@ addButton.onclick = function() { var type = ""; if (document.getElementById("A2").value == "Abwarten") { type = "Abwarten"; + ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '", "tickValue" : "' + document.getElementById("A2").value + '"}}'); } if (document.getElementById("A2").value == "Bereithalten") { type = "Bereithalten"; + ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '", "tickValue" : "' + document.getElementById("A2").value + '"}}'); } else { type = "Tick"; + ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}'); } - ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}'); + } /*When the Button is clicked, a RemovePlayerR request is send to the server.*/ @@ -124,17 +133,18 @@ changeTickButton.onclick = function() { for (i = 0; i < players.length; i++){ if (players[i].Name == document.getElementById("C1").value){ UUID = players[i].UUID; - if (players[i].tick == "Abwarten" || players[i].tick == "Bereithalten"){ - type = players[i].Tick; + if (Tick == "Abwarten" || Tick == "Bereithalten"){ + ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + Tick + '"}}'); + break; } else { type = "Tick"; + ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}'); + break; } } } - /*console.log(Tick); - console.log('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}');*/ - ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}'); + } /*When the Button is clicked, a new WebSocket connection is opened with the new ID*/ @@ -170,6 +180,10 @@ function CurrentPlayer(){ document.getElementById("p2").innerHTML = players[0].Name; document.getElementById("p1").innerHTML = "" + players[0].Tick; } + else{ + document.getElementById("p2").innerHTML = "-"; + document.getElementById("p1").innerHTML = "-"; + } } function AddPlayer(player){ @@ -196,13 +210,21 @@ function AddPlayer(player){ } else { for (i = 0; i Date: Wed, 7 Apr 2021 17:38:13 +0200 Subject: [PATCH 08/14] InitializeTickLeiste auf Abwarten & Bereithalten angepasst --- website/javascript.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/website/javascript.js b/website/javascript.js index b5fc0d0..891effc 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -59,9 +59,15 @@ ws.onmessage = function(evt){ players = []; for (i = 0; i Date: Wed, 7 Apr 2021 18:30:05 +0200 Subject: [PATCH 09/14] Id hardcoded --- website/javascript.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/website/javascript.js b/website/javascript.js index 891effc..77e1344 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -6,7 +6,7 @@ let reloadButton = document.getElementById("reload"); let saveButton = document.getElementById("save"); let url = "ws://10.9.1.129:8080/"; var players = []; -let Id = Math.floor(Math.random()*10000000000000000).toString(16) +let Id = "Test" //Math.floor(Math.random()*10000000000000000).toString(16) var ws = new WebSocket(url + Id); document.getElementById("p4").innerHTML = "" + Id; @@ -16,7 +16,7 @@ ws.onmessage = function(evt){ var msg = evt.data; var obj = JSON.parse(msg); var valid = false; - + console.log (obj); /*Changes Tick of one Player in players. Updates the Playerlist and current Player.*/ if (obj.eventType == "SetPlayerTickE") { valid = true; @@ -57,17 +57,18 @@ ws.onmessage = function(evt){ if (obj.eventType == "InitializeTickLeisteE") { valid = true; players = []; + console.log(obj); for (i = 0; i Date: Wed, 7 Apr 2021 18:50:24 +0200 Subject: [PATCH 10/14] =?UTF-8?q?Tickleiste=20=C3=A4ndern=20onmessage=20zu?= =?UTF-8?q?=20Websocket=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/javascript.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/website/javascript.js b/website/javascript.js index 77e1344..9046ebb 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -12,11 +12,14 @@ document.getElementById("p4").innerHTML = "" + Id; /* Handles Events from Server */ -ws.onmessage = function(evt){ +ws.onmessage = function(evt) {messageHandling(evt)}; + + + +function messageHandling(evt){ var msg = evt.data; var obj = JSON.parse(msg); var valid = false; - console.log (obj); /*Changes Tick of one Player in players. Updates the Playerlist and current Player.*/ if (obj.eventType == "SetPlayerTickE") { valid = true; @@ -57,7 +60,6 @@ ws.onmessage = function(evt){ if (obj.eventType == "InitializeTickLeisteE") { valid = true; players = []; - console.log(obj); for (i = 0; i Date: Wed, 7 Apr 2021 20:00:13 +0200 Subject: [PATCH 11/14] =?UTF-8?q?logs=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/Tickleiste.html | 2 +- website/javascript.js | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/website/Tickleiste.html b/website/Tickleiste.html index 6dc1814..be179c6 100644 --- a/website/Tickleiste.html +++ b/website/Tickleiste.html @@ -13,7 +13,7 @@
- +
diff --git a/website/javascript.js b/website/javascript.js index 9046ebb..1a2aa81 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -60,13 +60,18 @@ function messageHandling(evt){ if (obj.eventType == "InitializeTickLeisteE") { valid = true; players = []; + console.log(obj); for (i = 0; i Date: Wed, 7 Apr 2021 20:11:20 +0200 Subject: [PATCH 12/14] =?UTF-8?q?var=20keyword=20vor=20Schleifenvariablen?= =?UTF-8?q?=20eingef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/javascript.js | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/website/javascript.js b/website/javascript.js index 1a2aa81..d0e2112 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -23,7 +23,7 @@ function messageHandling(evt){ /*Changes Tick of one Player in players. Updates the Playerlist and current Player.*/ if (obj.eventType == "SetPlayerTickE") { valid = true; - for (i = 0; i < players.length; i++){ + for (var i = 0; i < players.length; i++){ if (players[i].UUID == obj.playerUUID){ if (obj.tick.tickType == "Tick"){ players[i].Tick = obj.tick.tickValue; @@ -60,18 +60,13 @@ function messageHandling(evt){ if (obj.eventType == "InitializeTickLeisteE") { valid = true; players = []; - console.log(obj); - for (i = 0; i"; } document.getElementById("p3").innerHTML = content; @@ -214,7 +209,7 @@ function AddPlayer(player){ } else { if (player.Tick == "Bereithalten"){ - for (i = players.length; i>0;i--){ + for (var i = players.length; i>0;i--){ if (players[i-1].Tick != "Abwarten"){ players.splice(i,0,player); added = true; @@ -227,7 +222,7 @@ function AddPlayer(player){ } } else { - for (i = 0; i Date: Mon, 17 Jan 2022 14:55:26 +0100 Subject: [PATCH 13/14] Hardcoded the server (We should realy clean up that mess) --- website/javascript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/javascript.js b/website/javascript.js index d0e2112..56841a6 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -4,7 +4,7 @@ let changeTickButton = document.getElementById("changeTick"); let changeIdButton = document.getElementById("tickLeistenId"); let reloadButton = document.getElementById("reload"); let saveButton = document.getElementById("save"); -let url = "ws://10.9.1.129:8080/"; +let url = "wss://nerfingen.de/tickLeisteSocket"; var players = []; let Id = "Test" //Math.floor(Math.random()*10000000000000000).toString(16) var ws = new WebSocket(url + Id); From d010edf7d8e8aff23bfc0f329a3310f6ee535f8f Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Fri, 4 Feb 2022 22:39:41 +0100 Subject: [PATCH 14/14] fixed the hardcoded path --- website/javascript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/javascript.js b/website/javascript.js index 56841a6..cf870b9 100644 --- a/website/javascript.js +++ b/website/javascript.js @@ -4,7 +4,7 @@ let changeTickButton = document.getElementById("changeTick"); let changeIdButton = document.getElementById("tickLeistenId"); let reloadButton = document.getElementById("reload"); let saveButton = document.getElementById("save"); -let url = "wss://nerfingen.de/tickLeisteSocket"; +let url = "wss://nerfingen.de/tickLeisteSocket/"; var players = []; let Id = "Test" //Math.floor(Math.random()*10000000000000000).toString(16) var ws = new WebSocket(url + Id);