From 9aa97350b7144181c075aec5d44b818a74f2b7e8 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Fri, 28 Sep 2018 15:27:00 +0200 Subject: added client side group authentification --- WebInterface/NodeJSServer/dist/chat.js | 12 +++++++++++- WebInterface/NodeJSServer/dist/index.html | 11 +++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) (limited to 'WebInterface/NodeJSServer/dist') diff --git a/WebInterface/NodeJSServer/dist/chat.js b/WebInterface/NodeJSServer/dist/chat.js index 6832cc2..1be6fbc 100644 --- a/WebInterface/NodeJSServer/dist/chat.js +++ b/WebInterface/NodeJSServer/dist/chat.js @@ -14,10 +14,20 @@ connection.start().catch(function (err) { return console.error(err.toString()); }); +document.getElementById("loginButton").addEventListener("click", function (event) { + var group = document.getElementById("userInput").value; + var password = document.getElementById("messageInput").value; + connection.invoke("Login", group, password).catch(function (err) { + return console.error(err.toString()); + }); + event.preventDefault(); +}); + document.getElementById("sendButton").addEventListener("click", function (event) { var user = document.getElementById("userInput").value; var message = document.getElementById("messageInput").value; - connection.invoke("SendMessage", user, message).catch(function (err) { + var group = "TheCrew"; + connection.invoke("SendMessage",group, user, message).catch(function (err) { return console.error(err.toString()); }); event.preventDefault(); diff --git a/WebInterface/NodeJSServer/dist/index.html b/WebInterface/NodeJSServer/dist/index.html index 4264b39..d54470c 100644 --- a/WebInterface/NodeJSServer/dist/index.html +++ b/WebInterface/NodeJSServer/dist/index.html @@ -1,4 +1,4 @@ - + @@ -42,9 +42,12 @@ - + + + + + + + \ No newline at end of file diff --git a/ZooBOTanica/CritCreate.cs b/ZooBOTanica/CritCreate.cs index f570c9e..08a6ff0 100644 --- a/ZooBOTanica/CritCreate.cs +++ b/ZooBOTanica/CritCreate.cs @@ -23,7 +23,7 @@ namespace ZooBOTanica this.AllowDrop = true; } - private void Load(string path) + private new void Load(string path) { this.critter = Critter.Load(path); -- cgit v1.2.3-54-g00ecf From 680967aee589e4a8d277044b204de07cbe32f41e Mon Sep 17 00:00:00 2001 From: TrueDoctor Date: Sat, 29 Sep 2018 17:02:10 +0200 Subject: modifyed cahat.js to match chatHub --- WebInterface/NodeJSServer/dist/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebInterface/NodeJSServer/dist') diff --git a/WebInterface/NodeJSServer/dist/chat.js b/WebInterface/NodeJSServer/dist/chat.js index 1be6fbc..e9baff1 100644 --- a/WebInterface/NodeJSServer/dist/chat.js +++ b/WebInterface/NodeJSServer/dist/chat.js @@ -27,7 +27,7 @@ document.getElementById("sendButton").addEventListener("click", function (event) var user = document.getElementById("userInput").value; var message = document.getElementById("messageInput").value; var group = "TheCrew"; - connection.invoke("SendMessage",group, user, message).catch(function (err) { + connection.invoke("SendMessage", user, message).catch(function (err) { return console.error(err.toString()); }); event.preventDefault(); -- cgit v1.2.3-54-g00ecf