From 6726c2b16f4421b6c7558c38de95aa3759f82ce9 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Mon, 26 Aug 2019 11:36:05 +0200 Subject: [PATCH] Refactor EJS string gluing code Rewrite awful string gluing of HTML with JS to use the slightly less awful EJS string gluing method. --- views/nav.ejs | 35 +++++++++--------- views/nodes.ejs | 94 ++++++++++++++++++++++--------------------------- 2 files changed, 59 insertions(+), 70 deletions(-) diff --git a/views/nav.ejs b/views/nav.ejs index 536f47c3..5a560649 100644 --- a/views/nav.ejs +++ b/views/nav.ejs @@ -10,27 +10,24 @@ - <%# Very ugly ejs code to hide the Players button if the playerManager plugin isn`t installed %> - <% - let sidebarPluginButtonsHtml = ""; - for(let o in locals.masterPlugins){ + <% +for(let o in locals.masterPlugins) { let plug = locals.masterPlugins[o]; - if(plug.main - && plug.main.ui - && typeof plug.main.ui.sidebar == "object" - && Array.isArray(plug.main.ui.sidebar)){ - let sidebarEntries = plug.main.ui.sidebar; - for(let i in sidebarEntries){ - let button = sidebarEntries[i]; - if(button.getHtml && typeof button.getHtml == "function"){ - sidebarPluginButtonsHtml += button.getHtml(); + if ( + plug.main + && plug.main.ui + && typeof plug.main.ui.sidebar == "object" + && Array.isArray(plug.main.ui.sidebar) + ) { + let sidebarEntries = plug.main.ui.sidebar; + for (let i in sidebarEntries) { + let button = sidebarEntries[i]; + if (button.getHtml && typeof button.getHtml == "function") { %> + <%- button.getHtml() %><% + } + } } - } - } - } - %> - <%- sidebarPluginButtonsHtml %> +} %> diff --git a/views/nodes.ejs b/views/nodes.ejs index c8277c74..1e860c23 100644 --- a/views/nodes.ejs +++ b/views/nodes.ejs @@ -7,56 +7,48 @@ <%- include("nav") %>
- -
- <% - let html = "" - for(let [id, slave] of locals.slaves){ - html += ` -
- -
    -
  • ID: ${id}
  • -
  • Last seen: ${moment(Number(slave.time)).format("DD.MM.YY, hh:mm")}
  • -
  • Online players: ${slave.playerCount}
  • -
  • IP: ${slave.publicIP}:${slave.serverPort}
  • -
  • Host: ${slave.mac}
  • -
- ` - for(let o in locals.masterPlugins){ - let plug = locals.masterPlugins[o]; - if(plug.main - && plug.main.ui - && typeof plug.main.ui.slaveListing == "object" - && Array.isArray(plug.main.ui.slaveListing)){ - let slaveListingEntries = plug.main.ui.slaveListing; - for(let i in slaveListingEntries){ - let button = slaveListingEntries[i]; - if(button.getHtml && typeof button.getHtml == "function"){ - html += "
" - html += button.getHtml({slave}); - html += "
" - } - } - } - } - html += ` -
- ` - } - %> - <%- html %> + - +
+
<% +for (let [id, slave] of locals.slaves) { %> +
+ +
    +
  • ID: <%= id %>
  • +
  • Last seen: <%= moment(Number(slave.time)).format("DD.MM.YY, hh:mm") %>
  • +
  • Online players: <%= slave.playerCount %>
  • +
  • IP: <%= slave.publicIP %>:<%= slave.serverPort %>
  • +
  • Host: <%= slave.mac %>
  • +
<% + for (let o in locals.masterPlugins) { + let plug = locals.masterPlugins[o]; + if ( + plug.main + && plug.main.ui + && typeof plug.main.ui.slaveListing == "object" + && Array.isArray(plug.main.ui.slaveListing) + ) { + let slaveListingEntries = plug.main.ui.slaveListing; + for (let i in slaveListingEntries) { + let button = slaveListingEntries[i]; + if (button.getHtml && typeof button.getHtml == "function") { %> + <% + } + } + } + } %> +
<% +} %> +
+
+