From 3a3d0fc3d4733f8908e23a03f860d76340479ec4 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Tue, 11 Jun 2019 23:53:30 +0200 Subject: Reorganize Project structure --- WebInterface/NodeJSServer/src/js/about.js | 6 - WebInterface/NodeJSServer/src/js/index.js | 12 -- .../NodeJSServer/src/js/modules/interface.js | 82 ---------- .../src/js/modules/networking/commands/_command.js | 28 ---- .../networking/commands/login/createServer.js | 23 --- .../networking/commands/login/listServers.js | 43 ----- .../js/modules/networking/commands/login/login.js | 54 ------ .../js/modules/networking/commands/loginCmds.js | 36 ---- .../src/js/modules/networking/commands/playCmds.js | 31 ---- .../NodeJSServer/src/js/modules/networking/hash.js | 20 --- .../src/js/modules/networking/networker.js | 89 ---------- .../src/js/modules/ui/collections/about.js | 14 -- .../src/js/modules/ui/collections/login.js | 24 --- .../src/js/modules/ui/collections/play.js | 19 --- .../src/js/modules/ui/components/backdrop.js | 65 -------- .../js/modules/ui/components/modal/login-modal.js | 139 ---------------- .../src/js/modules/ui/components/modal/modal.js | 66 -------- .../modules/ui/components/notification-banner.js | 133 --------------- .../src/js/modules/ui/components/router.js | 44 ----- .../src/js/modules/ui/components/server-listing.js | 91 ----------- .../NodeJSServer/src/js/modules/ui/uiManager.js | 60 ------- WebInterface/NodeJSServer/src/js/play.js | 12 -- .../src/js/src_old/modules/playModule.js | 46 ------ .../src/js/src_old/modules/server-client.js | 93 ----------- .../src/js/src_old/modules/ui/login-modal.js | 181 --------------------- .../src/js/src_old/modules/ui/modal.js | 67 -------- .../src/js/src_old/modules/ui/server-listing.js | 67 -------- WebInterface/NodeJSServer/src/style/about.scss | 43 ----- WebInterface/NodeJSServer/src/style/index.scss | 10 -- .../NodeJSServer/src/style/partials/_base.scss | 20 --- .../NodeJSServer/src/style/partials/_btn.scss | 75 --------- .../NodeJSServer/src/style/partials/_colors.scss | 18 -- .../NodeJSServer/src/style/partials/_game.scss | 13 -- .../src/style/partials/backdrop/_base.scss | 58 ------- .../src/style/partials/backdrop/_menu.scss | 43 ----- .../src/style/partials/front-layer/_base.scss | 23 --- .../src/style/partials/front-layer/_copyright.scss | 10 -- .../style/partials/front-layer/_notifications.scss | 84 ---------- .../partials/front-layer/_server-listing.scss | 121 -------------- .../src/style/partials/game/_chat.scss | 28 ---- .../src/style/partials/modal/_base.scss | 35 ---- .../src/style/partials/modal/_login.scss | 55 ------- WebInterface/NodeJSServer/src/style/play.scss | 17 -- 43 files changed, 2198 deletions(-) delete mode 100644 WebInterface/NodeJSServer/src/js/about.js delete mode 100644 WebInterface/NodeJSServer/src/js/index.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/interface.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/networking/commands/_command.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/networking/commands/login/createServer.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/networking/commands/login/listServers.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/networking/commands/login/login.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/networking/commands/loginCmds.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/networking/commands/playCmds.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/networking/hash.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/networking/networker.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/collections/about.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/collections/login.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/collections/play.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/components/backdrop.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/components/modal/login-modal.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/components/modal/modal.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/components/notification-banner.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/components/router.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/components/server-listing.js delete mode 100644 WebInterface/NodeJSServer/src/js/modules/ui/uiManager.js delete mode 100644 WebInterface/NodeJSServer/src/js/play.js delete mode 100644 WebInterface/NodeJSServer/src/js/src_old/modules/playModule.js delete mode 100644 WebInterface/NodeJSServer/src/js/src_old/modules/server-client.js delete mode 100644 WebInterface/NodeJSServer/src/js/src_old/modules/ui/login-modal.js delete mode 100644 WebInterface/NodeJSServer/src/js/src_old/modules/ui/modal.js delete mode 100644 WebInterface/NodeJSServer/src/js/src_old/modules/ui/server-listing.js delete mode 100644 WebInterface/NodeJSServer/src/style/about.scss delete mode 100644 WebInterface/NodeJSServer/src/style/index.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/_base.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/_btn.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/_colors.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/_game.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/backdrop/_base.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/backdrop/_menu.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/front-layer/_base.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/front-layer/_copyright.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/front-layer/_notifications.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/front-layer/_server-listing.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/game/_chat.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/modal/_base.scss delete mode 100644 WebInterface/NodeJSServer/src/style/partials/modal/_login.scss delete mode 100644 WebInterface/NodeJSServer/src/style/play.scss (limited to 'WebInterface/NodeJSServer/src') diff --git a/WebInterface/NodeJSServer/src/js/about.js b/WebInterface/NodeJSServer/src/js/about.js deleted file mode 100644 index 23351cf..0000000 --- a/WebInterface/NodeJSServer/src/js/about.js +++ /dev/null @@ -1,6 +0,0 @@ -import Interface from './modules/interface'; -import UIManager from './modules/ui/uiManager'; - -let iface = new Interface(); -let uiMan = new UIManager(iface); -uiMan.initAbout(); diff --git a/WebInterface/NodeJSServer/src/js/index.js b/WebInterface/NodeJSServer/src/js/index.js deleted file mode 100644 index c8b5ca8..0000000 --- a/WebInterface/NodeJSServer/src/js/index.js +++ /dev/null @@ -1,12 +0,0 @@ -import Interface from './modules/interface'; -import UIManager from './modules/ui/uiManager'; -import Networker from './modules/networking/networker'; - -const SERVERURL = 'https://kobert.dev/api/login'; - -let iface = new Interface(); -let uiMan = new UIManager(iface); -uiMan.initLogin(); - -let netMan = new Networker(iface, SERVERURL, true); // TODO: Remove debug flag -netMan.initLogin(); diff --git a/WebInterface/NodeJSServer/src/js/modules/interface.js b/WebInterface/NodeJSServer/src/js/modules/interface.js deleted file mode 100644 index ac5ea93..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/interface.js +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Stores an object and it's public methods - */ -class InterfaceAccessor { - /** - * Creates new accessor for object with publicMethods being exposed - * @param {object} object - * @param {array} publicMethods - */ - constructor(object, publicMethods) { - this.object = object; - this.publicMethods = publicMethods; - } - - /** - * Executes method if it is a public method - * @param {string} method Name of method to call - * @return {number} 0 success, 1 method not public, 2 method not found - */ - execute(method, ...args) { - if (!this.publicMethods.includes(method)) return 1; - if (typeof this.object[method] != 'function') return 2; - - this.object[method](...args); - return 0; - } -} - -/** - * Implements communication between objects - */ -export default class Interface { - /** - * Initializes interface - */ - constructor() { - this.objects = {}; - } - - /** - * Adds a new object to array at objKey and assigns public methods - * @param {object} object Object to reference in Interface - * @param {String} objKey Key to reference the object under - * @param {Array} publicMethods Names of public methods - */ - addObject(object, objKey, publicMethods) { - if (!this.objects[objKey]) this.objects[objKey] = []; - this.objects[objKey].push(new InterfaceAccessor(object, publicMethods)); - } - - /** - * Unregisters object - * @param {Object} object - * @param {String} objKey - */ - removeObject(object, objKey) { - if (!this.objects[objKey]) return; - - // Remove all instances of object from objKey - objects[objKey] = objects[objKey].filter(elt => elt.object != object); - - // Remove reference, if none remain - if (objects[objKey].length == 0) objects[objKey] = undefined; - } - - /** - * Calls a method on all objects with the key objKey - * @param {String} objKey Object Key of objects to call method on - * @param {String} method Method name to call on the objects - * @param {...*} args Arguments to pass - * @return {number} 0 Success, 1 no objects with objKey, 2 method not public - */ - callMethod(objKey, method, ...args) { - if (!this.objects[objKey]) return 1; - - let returnCode = 0; - for (let obj of this.objects[objKey]) { - if (obj.execute(method, ...args) != 0) returnCode = 2; - } - return returnCode; - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/_command.js b/WebInterface/NodeJSServer/src/js/modules/networking/commands/_command.js deleted file mode 100644 index 46a1a14..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/_command.js +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Parent Command class which all commands inherit from - */ -export default class Command { - /** - * Constructs basic command object - * @param {Interface} iface Interface to communicate over - */ - constructor(iface) { - this.iface = iface; - } - - /** - * Registers public command names to interface - * @param {String} name Name to register under - * @param {...String} commandNames Names of public commands - */ - registerPublic(name, ...commandNames) { - this.iface.addObject(this, name, ['destroy'].concat(commandNames)); - } - - /** - * Removes from iface - */ - destroy() { - this.iface.removeObject(this); - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/createServer.js b/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/createServer.js deleted file mode 100644 index 78b2a1b..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/createServer.js +++ /dev/null @@ -1,23 +0,0 @@ -import Command from '../_command'; - -/** - * Handles creation of Servers - */ -export default class CreateServer extends Command { - /** - * Registers interface for communication with other objects - * @param {Interface} iface - */ - constructor(iface) { - super(iface); - this.registerPublic('createServer', 'createServer'); - this.refreshing = false; - } - - /** - * TODO: - */ - createServer() { - - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/listServers.js b/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/listServers.js deleted file mode 100644 index 2c2bc11..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/listServers.js +++ /dev/null @@ -1,43 +0,0 @@ -import Command from '../_command'; - -/** - * Handles serverList commands - */ -export default class ListServers extends Command { - /** - * Registers interface for communication with other objects - * @param {Interface} iface - */ - constructor(iface) { - super(iface); - this.registerPublic('listServers', 'listServers'); - this.refreshing = false; - } - - /** - * Requests server list from the server - */ - listServers() { - if (this.refreshing) return; // If already refreshing, no new request - - let listFn = (groups) => { - // Populate server listing - this.iface.callMethod('serverListing', 'flushElements'); - this.iface.callMethod('serverListing', 'addElements', groups, this.iface); - // Unbind network function - this.iface.callMethod('networker', 'removeHandler', 'ListGroups'); - this.refreshing = false; - }; - let errorHandler = (err) => { - this.refreshing = false; - console.error(err.toString()); - }; - - this.iface.callMethod('networker', 'registerHandler', - 'ListGroups', listFn); - this.iface.callMethod('networker', 'sendRequest', - 'GetGroups', errorHandler); - - this.refreshing = true; - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/login.js b/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/login.js deleted file mode 100644 index 44a6c94..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/login/login.js +++ /dev/null @@ -1,54 +0,0 @@ -import Command from '../_command'; -import LoginModal from '../../../ui/components/modal/login-modal'; - -/** - * Handles login to server - */ -export default class Login extends Command { - /** - * Registers interface for communication with other objects - * @param {Interface} iface - */ - constructor(iface) { - super(iface); - this.registerPublic('login', 'sendLogin', 'showLogin'); - this.refreshing = false; - } - - /** - * Shows a login modal - * @param {String} name - */ - showLogin(name) { - new LoginModal(this.iface, name); - } - - /** - * Registers login response method - */ - registerLoginResponse() { - this.iface.callMethod('networker', 'registerHandler', 'LoginResponse', - (result) => { - if (result == 0) { - this.iface.callMethod('modal', 'close'); - this.iface.callMethod('router', 'routePlay'); - this.iface.callMethod('networker', 'removeHandler', - 'LoginResponse'); - } else { - this.iface.callMethod('modal', 'loginFailed', result); - } - }); - } - - /** - * Sends a login request - * @param {string} group Group name to join - * @param {string} password Password to send as SHA-256 Base64 String - * @param {string} username Display name to use - */ - sendLogin(group, password, username) { - this.registerLoginResponse(); - this.iface.callMethod('networker', 'sendRequest', 'Login', - (err) => console.error(err), group, username, password); - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/loginCmds.js b/WebInterface/NodeJSServer/src/js/modules/networking/commands/loginCmds.js deleted file mode 100644 index bc5d8a7..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/loginCmds.js +++ /dev/null @@ -1,36 +0,0 @@ -import ListServers from './login/listServers'; -import CreateServer from './login/createServer'; -import Login from './login/login'; - -/** - * Manages commands related to the login page - */ -export default class LoginCommands { - /** - * Initializes the login commands - * @param {Interface} iface Interface for inter-object communication - */ - constructor(iface) { - this.iface = iface; - this.cmds = []; - this.registerCommands(); - } - - /** - * Registers all the available commands - */ - registerCommands() { - this.cmds.push(new ListServers(this.iface)); - this.cmds.push(new CreateServer(this.iface)); - this.cmds.push(new Login(this.iface)); - } - - /** - * Destroys all attached commands - */ - destroy() { - for (let cmd of this.cmds) { - cmd.destroy(); - } - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/commands/playCmds.js b/WebInterface/NodeJSServer/src/js/modules/networking/commands/playCmds.js deleted file mode 100644 index 94cd6ba..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/networking/commands/playCmds.js +++ /dev/null @@ -1,31 +0,0 @@ -// import ListServers from './login/listServers'; - -/** - * Manages commands related to the login page - */ -export default class LoginCommands { - /** - * Initializes the login commands - * @param {Interface} iface Interface for inter-object communication - */ - constructor(iface) { - this.iface = iface; - this.cmds = []; - } - - /** - * Registers all the available commands - */ - registerCommands() { - // this.cmds.push(new ListServers(iface)); - } - - /** - * Destroys all attached commands - */ - destroy() { - for (let cmd of this.cmds) { - cmd.destroy(); - } - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/hash.js b/WebInterface/NodeJSServer/src/js/modules/networking/hash.js deleted file mode 100644 index 3abcc21..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/networking/hash.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Creates Base64 String with SHA-256 Hash of given string - */ -String.prototype.getHash = async function() { - let data = new ArrayBuffer(this.length * 2); - let bufferView = new Uint16Array(data); - for (let i = 0; i < this.length; i++) { - bufferView[i] = this.charCodeAt(i); - } - - let encrypted = await crypto.subtle.digest('SHA-256', bufferView); - let byteArray = new Uint8Array(encrypted); - let base64String = ''; - - for (let byte of byteArray) { - base64String += String.fromCharCode(byte); - } - - return btoa(base64String); -}; diff --git a/WebInterface/NodeJSServer/src/js/modules/networking/networker.js b/WebInterface/NodeJSServer/src/js/modules/networking/networker.js deleted file mode 100644 index 199adc7..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/networking/networker.js +++ /dev/null @@ -1,89 +0,0 @@ -import * as signalR from '@aspnet/signalr'; -import LoginCommands from './commands/loginCmds'; -import PlayCommands from './commands/playCmds'; - -/** - * Class for communication to server - */ -export default class Networker { - /** - * Creates new Networker and connects it to the Interface - * @param {Interface} iface Interface for communication between objects - * @param {String} url URL of the server backend - * @param {Boolean} [debug=false] Should there be debug output - */ - constructor(iface, url, debug = false) { - this.url = url; - - // Register in Interface - iface.addObject(this, 'networker', - ['sendRequest', 'registerHandler', 'removeHandler']); - this.iface = iface; - - const connectionBuilder = new signalR.HubConnectionBuilder() - .withUrl(url); - - if (debug) { - connectionBuilder.configureLogging(signalR.LogLevel.Trace); - } else { - connectionBuilder.configureLogging(signalR.LogLevel.Error); - } - - this.connection = connectionBuilder.build(); - this.connection.start() - .then(() => this.iface.callMethod('listServers', 'listServers')) - .catch((err) => console.error(err.toString())); - - // Initialize refreshing (blocks new refreshes if true) - this.refreshing = false; - } - - /** - * Sending a network request to the server - * @param {String} methodName Method to call on server - * @param {function} errorHandler Function to call on error - * @param {...*} args Arguments to pass to server - */ - sendRequest(methodName, errorHandler, ...args) { - this.connection.invoke(methodName, ...args).catch(errorHandler); - } - - /** - * Register a new function to be called upon receival of message from server - * @param {String} name Name of invoked method - * @param {function} fn function to call with received data - */ - registerHandler(name, fn) { - this.connection.on(name, fn); - } - - /** - * Removes handler for receiving messages from the server - * @param {String} name Name of the invoked method - */ - removeHandler(name) { - this.connection.off(name); - } - - /** - * Initializes Login Commands - */ - initLogin() { - this.loginCmd = new LoginCommands(this.iface); - } - - /** - * Initializes play commands - */ - initPlay() { - this.playCmd = new PlayCommands(this.iface); - } - - /** - * Clears all currently registered commands - */ - clearCommands() { - if (this.loginCmd) this.loginCmd.destroy(); - if (this.playCmd) this.playCmd.destroy(); - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/collections/about.js b/WebInterface/NodeJSServer/src/js/modules/ui/collections/about.js deleted file mode 100644 index dac8f01..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/ui/collections/about.js +++ /dev/null @@ -1,14 +0,0 @@ -import Backdrop from '../components/backdrop'; - -/** - * UI Loader for about page - */ -export default class About { - /** - * Registers components for about page - */ - constructor() { - this.backdrop = new Backdrop('menu', 'front-layer', 'show-menu'); - this.backdrop.initialize(); - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/collections/login.js b/WebInterface/NodeJSServer/src/js/modules/ui/collections/login.js deleted file mode 100644 index 98a6b30..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/ui/collections/login.js +++ /dev/null @@ -1,24 +0,0 @@ -import Backdrop from '../components/backdrop'; -import BannerController from '../components/notification-banner'; -import ServerListing from '../components/server-listing'; - -/** - * UI Loader for login page - */ -export default class Login { - /** - * Registers components for login page - * @param {Interface} iface Interface to enable comm. with notifications - */ - constructor(iface) { - this.backdrop = new Backdrop('menu', 'front-layer', 'show-menu'); - this.bannerController = new BannerController(iface, 'notifications', - 'banner-info', 'dismiss-banner', 'notification-amount'); - this.serverListing = new ServerListing(iface, 'server-list', - 'refresh-button'); - - this.backdrop.initialize(); - this.bannerController.initialize(); - this.serverListing.initialize(); - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/collections/play.js b/WebInterface/NodeJSServer/src/js/modules/ui/collections/play.js deleted file mode 100644 index cdea777..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/ui/collections/play.js +++ /dev/null @@ -1,19 +0,0 @@ -import Backdrop from '../components/backdrop'; -import BannerController from '../components/notification-banner'; - -/** - * UI Loader for play page - */ -export default class Play { - /** - * Registers components for play page - */ - constructor() { - this.backdrop = new Backdrop('menu', 'front-layer', 'show-menu'); - this.bannerController = new BannerController(iface, 'notifications', - 'banner-info', 'dismiss-banner', 'notification-amount'); - - this.backdrop.initialize(); - this.bannerController.initialize(); - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/backdrop.js b/WebInterface/NodeJSServer/src/js/modules/ui/components/backdrop.js deleted file mode 100644 index 82ca64f..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/backdrop.js +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Class for adding functionality to backdrop elements - */ -export default class Backdrop { - /** - * Registers all important elements in the backdrop - * @param {string} backdropMenu ID of Backdrop Menu - * @param {string} frontLayer ID of Front Layer - * @param {string} menuButton ID of Show / Hide Menu Button - */ - constructor(backdropMenu, frontLayer, menuButton) { - this.ids = {backdropMenu, frontLayer, menuButton}; - } - - /** - * Initializes the components from the ids defined in the constructor - */ - initialize() { - this.open = false; - this.backdrop = document.getElementById(this.ids.backdropMenu); - this.frontLayer = document.getElementById(this.ids.frontLayer); - this.menuButton = document.getElementById(this.ids.menuButton); - - this.registerEvents(); - } - - /** - * Registers all neccessary events - */ - registerEvents() { - this.registerButtonEvent(); - this.registerFrontLayerEvent(); - } - - /** - * Registers showing / hiding through menu button - */ - registerButtonEvent() { - this.menuButton.addEventListener('click', () => { - // Change open state - this.open = !this.open; - - // Hide / Unhide Backdrop Menu - this.open ? this.backdrop.classList.remove('hidden') : - this.backdrop.classList.add('hidden'); - - // Set open state for menu button - this.open ? this.menuButton.classList.add('open') : - this.menuButton.classList.remove('open'); - }); - } - - /** - * Registers hiding upon front layer interaction - */ - registerFrontLayerEvent() { - this.frontLayer.addEventListener('click', () => { - if (!this.open) return; // It's already closed - - this.open = false; - this.backdrop.classList.add('hidden'); - this.menuButton.classList.remove('open'); - }); - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/login-modal.js b/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/login-modal.js deleted file mode 100644 index 941fd84..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/login-modal.js +++ /dev/null @@ -1,139 +0,0 @@ -import Modal from './modal'; -import '../../../networking/hash'; - -/** - * Class to implement a login modal from the parent modal class - */ -export default class LoginModal extends Modal { - /** - * Creates necessary elements for login modal - * @param {Interface} iface Interface for Interactions with other Objects - * @param {string} serverName Name of the server to connect to - */ - constructor(iface, serverName) { - super(serverName); - this.serverName = serverName; - - iface.addObject(this, 'modal', ['loginFailed', 'close']); - this.iface = iface; - - let passBox = document.createElement('div'); - let nameBox = document.createElement('div'); - let sendBox = document.createElement('div'); - - let passwordLabel = document.createElement('label'); - let passwordInput = document.createElement('input'); - let passwordInvalid = document.createElement('span'); - passwordLabel.setAttribute('for', 'password-input'); - passwordLabel.textContent = 'Passwort:'; - passwordLabel.title = 'Das Passwort des Spiels'; - passwordInput.id = 'password-input'; - passwordInput.type = 'password'; - passwordInput.placeholder = 'Passwort'; - passwordInput.title = 'Das Passwort des Spiels'; - passwordInvalid.className = 'invalid hidden'; - passwordInvalid.textContent = 'Das eingegebene Passwort ist falsch.'; - - let nameLabel = document.createElement('label'); - let nameInput = document.createElement('input'); - let nameInvalid = document.createElement('span'); - nameLabel.setAttribute('for', 'name-input'); - nameLabel.textContent = 'Benutzername:'; - nameLabel.title = 'Dein Anzeigename'; - nameInput.id = 'name-input'; - nameInput.type = 'text'; - nameInput.autocomplete = 'on'; - nameInput.placeholder = 'Name'; - nameInput.title = 'Dein Anzeigename'; - nameInvalid.className = 'invalid hidden'; - nameInvalid.textContent = - 'Der eingegebene Nutzername ist bereits vergeben.'; - - let sendButton = document.createElement('button'); - sendButton.className = 'btn'; - sendButton.textContent = 'Login'; - sendButton.id = 'login-button'; - - passBox.appendChild(passwordLabel); - passBox.appendChild(passwordInput); - passBox.appendChild(passwordInvalid); - nameBox.appendChild(nameLabel); - nameBox.appendChild(nameInput); - nameBox.appendChild(nameInvalid); - sendBox.appendChild(sendButton); - - this.body.appendChild(passBox); - this.body.appendChild(nameBox); - this.body.appendChild(sendBox); - - this.nameInput = nameInput; - this.passwordInput = passwordInput; - this.loginButton = sendButton; - - this.passwordInvalid = passwordInvalid; - this.nameInvalid = nameInvalid; - - this.registerLoginBtnEvent(); - } - - /** - * Method that gets called, if login fails - * @param {number} result Error Code - */ - loginFailed(result) { - if (result == 1) { - this.invalid('Name'); - this.loginButton.addEventListener('click', this.event); - } else if (result == 2) { - this.invalid('Pass'); - this.loginButton.addEventListener('click', this.event); - } else { - this.iface.callMethod('notifications', 'show', 'failed', - 'Ein unbekannter Fehler ist aufgetreten'); - this.close(); - } - } - - /** - * Registers event to send login, on button press - */ - registerLoginBtnEvent() { - this.event = () => { - this.invalid(); // Remove 'invalid' messages - this.loginButton.removeEventListener('click', this.event); - this.userName = this.nameInput.value; - this.passwordInput.value.getHash() - .then((result) => { - this.iface.callMethod('login', 'sendLogin', this.serverName, - result, this.userName); - }); - }; - this.loginButton.addEventListener('click', this.event); - } - - /** - * Displays text under invalid password / username - * @param {string} inv Which field to display under (Pass / Name) - * Blank inv will hide both - */ - invalid(inv) { - this.body.classList.remove('frst-warning'); - this.body.classList.remove('scnd-warning'); - - this.passwordInvalid.classList.add('hidden'); - this.nameInvalid.classList.add('hidden'); - - this.passwordInput.style.borderColor = 'none'; - this.nameInput.style.borderColor = 'none'; - - if (inv == 'Pass') { - this.body.classList.add('frst-warning'); - this.passwordInvalid.classList.remove('hidden'); - this.passwordInput.style.borderColor = '#ef5350'; - } else if (inv == 'Name') { - this.body.classList.add('scnd-warning'); - this.nameInvalid.classList.remove('hidden'); - this.nameInput.style.borderColor = '#ef5350'; - } - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/modal.js b/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/modal.js deleted file mode 100644 index c4c5119..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/modal/modal.js +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Parent class to create Modals on the screen - * Contains no content, as that is implemented by child classes - */ -export default class Modal { - /** - * Creates a new modal with a title and empty content - * @param {string} titleString Title to show at the top of the modal - */ - constructor(titleString) { - let modalBackground = document.createElement('div'); - let modal = document.createElement('div'); - let title = document.createElement('h1'); - let body = document.createElement('div'); - - modalBackground.className = 'modal-container'; - modal.className = 'modal'; - title.className = 'modal-title'; - body.className = 'modal-body'; - title.textContent = titleString; - - modal.appendChild(title); - modal.appendChild(body); - modalBackground.appendChild(modal); - document.body.appendChild(modalBackground); - - this.bg = modalBackground; - this.modal = modal; - this.title = title; - this.body = body; - - this.registerEvents(); - } - - /** - * Register event to close if clicked outside of modal - * Clicking on the modal itself should not close it though - */ - registerEvents() { - this.modal.addEventListener('click', (e) => { - e.stopPropagation(); - }); - - this.bg.addEventListener('click', () => { - this.close(); - }); - } - - /** - * Fades modal out and removes it from the flow of the document - */ - close() { - this.bg.classList.add('hidden'); - this.bg.addEventListener('transitionend', () => { - document.body.removeChild(this.bg); - }); - } - - /** - * Puts text in the body - * @param {string} text Text to put into the body - */ - setBodyText(text) { - this.body.textContent = text; - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/notification-banner.js b/WebInterface/NodeJSServer/src/js/modules/ui/components/notification-banner.js deleted file mode 100644 index a527725..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/notification-banner.js +++ /dev/null @@ -1,133 +0,0 @@ -/** - * Object containing a message for the notification banner - */ -class BannerItem { - /** - * Creates new Banner Message Items - * @param {String} name Name the message will be referenced under - * @param {String} content Content, either formatted as plain text or html - * @param {Boolean} html Is content formatted as html? - */ - constructor(name, content, html) { - this.name = name; - this.content = content; - this.html = html; - } -} - -/** - * Class for controlling the Notification banner - */ -export default class BannerController { - /** - * Creates references to objects and hides notification banner - * @param {Interface} iface Interface to receive comm. from - * @param {string} bannerId ID of Notification Banner - * @param {string} textP ID of Notification Banner text field - * @param {string} dismissBtn ID of dismiss button - * @param {string} badge ID of badge (# of notifications) - */ - constructor(iface, bannerId, textP, dismissBtn, badge) { - iface.addObject(this, 'notifications', ['show', 'hide']); - this.iface = iface; - - this.ids = {bannerId, textP, dismissBtn, badge}; - } - - /** - * Initializes the Banner in the DOM - */ - initialize() { - this.banner = document.getElementById(this.ids.bannerId); - this.bannerText = document.getElementById(this.ids.textP); - this.dismissBtn = document.getElementById(this.ids.dismissBtn); - this.notificationBadge = document.getElementById(this.ids.badge); - this.bannerMsgs = []; - - this.banner.classList.add('hidden'); // Hide banner by default - this.registerEvents(); - } - - /** - * Registers events for notification banner - */ - registerEvents() { - this.registerDismissEvent(); - } - - /** - * Registers dismissing via dismiss button - */ - registerDismissEvent() { - this.dismissBtn.addEventListener('click', () => { - this.dismissCurrent(); - }); - } - - /** - * Pushes a new message to the notification banner and shows it - * @param {string} name Name to register notification (referenced in hide) - * @param {string} text Notification text - */ - show(name, text) { - let bannerItem = new BannerItem(name, text, false); - this.bannerMsgs.push(bannerItem); - - this.update(); - } - - /** - * Removes notification from banner - * @param {string} name The name the notification was registered under - */ - hide(name) { - if (name) this.bannerMsgs = this.bannerMsgs.filter(elt => elt.name != name); - else this.bannerMsgs = []; - - this.update(); - } - - /** - * Dismisses the currently shown message - */ - dismissCurrent() { - this.hide(this.current); - } - - /** - * Updates the notification banner with the most recent message - */ - update() { - if (this.bannerMsgs.length === 0) { - this.banner.classList.add('hidden'); - return; - } - - const lastNotification = this.bannerMsgs[this.bannerMsgs.length - 1]; - const name = lastNotification.name; - const text = lastNotification.content; - const isHtml = lastNotification.html; - this.banner.classList.remove('hidden'); - - if (isHtml) this.bannerText.innerHTML = text; - else this.bannerText.innerText = text; - - this.current = name; - this.updateNotificationBadge(); - } - - /** - * Updates the notification badge number - */ - updateNotificationBadge() { - if (this.bannerMsgs.length < 2) { - this.notificationBadge.classList.add('hidden'); - } else if (this.bannerMsgs.length > 9) { - this.notificationBadge.classList.remove('hidden'); - this.notificationBadge.textContent = '∞'; - } else { - this.notificationBadge.classList.remove('hidden'); - this.notificationBadge.textContent = this.bannerMsgs.length.toString(); - } - } -} diff --git a/WebInterface/NodeJSServer/src/js/modules/ui/components/router.js b/WebInterface/NodeJSServer/src/js/modules/ui/components/router.js deleted file mode 100644 index c01c21b..0000000 --- a/WebInterface/NodeJSServer/src/js/modules/ui/components/router.js +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Class for routing between pages - */ -export default class Router { - /** - * @param {Interface} iface Interface for comm. with other objects - */ - constructor(iface) { - iface.addObject(this, 'serverListing', ['routePlay']); - this.iface = iface; - } - - /** - * Routes to the play page - * @param {HubConnection} connection Connection to the server - */ - routePlay(connection) { - window.history.pushState('object or string', 'Game Page', - 'play#game=' + this.serverName); - fetch('play').then((response) => { - response.text().then((htmlString) => { - // Replace all references, since we're starting one level farther up - htmlString = htmlString.replace(/\.\.\//g, './'); - htmlString = /((.)|(\n))*<\/body>/g.exec(htmlString)[0]; - htmlString = htmlString.replace(/