logan/DRB-CnC
1
0
Fork 0
Code Issues 23 Pull Requests Packages Projects 1 Releases Wiki Activity

Small tweaks

Browse Source 
- Update local webUI to refresh when joining server to clear modal
- Updated client webUI page title
- Re-added join modal to node page (client & server)
- updated join modal to use node.nearbySystems
This commit is contained in:
Logan Cusano
2023-07-22 15:01:48 -04:00
parent ec091c0017
commit 8a0baa5bc9
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Client/public/res/js/node.js
View File

@@ -253,8 +253,8 @@ function joinServer() {
const responseObject = JSON.parse(Http.responseText) const responseObject = JSON.parse(Http.responseText)
console.log(Http.status); console.log(Http.status);
console.log(responseObject); console.log(responseObject);
createToast(`${responseObject.name} will join shortly`, { showNow: true }); createToast(`${responseObject.name} will join shortly`);
$("#joinModal").modal('toggle'); location.reload();
} }
} }

6
Client/views/index.ejs
View File

@@ -3,7 +3,7 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Bootstrap demo</title> <title>'<%=node.name%>' - Configuration</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM" crossorigin="anonymous"> integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.3.0/font/bootstrap-icons.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.3.0/font/bootstrap-icons.css">
@@ -153,7 +153,9 @@
</div> </div>
<% // new System Modal %> <% // new System Modal %>
<%- include("partials/modifySystemModal.ejs", {'system': "New System" , 'frequencies' : [], 'mode' : '' }) %> <%- include("partials/modifySystemModal.ejs", {'system': "New System" , 'frequencies' : [], 'mode' : '' }) %>
<% // Join Server Modal %>
<%- include("partials/joinModal.ejs", {'node': node}) %>
</body> </body>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"
integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script> integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script>

2
Client/views/partials/joinModal.ejs
View File

@@ -24,7 +24,7 @@
<div class="col-md-6"> <div class="col-md-6">
<label class="small mb-1" for="selectRadioPreset">Selected Preset:</label> <label class="small mb-1" for="selectRadioPreset">Selected Preset:</label>
<select class="custom-select" id="selectRadioPreset"> <select class="custom-select" id="selectRadioPreset">
<% for(const system in nearbySystems) { %> <% for(const system in node.nearbySystems) { %>
<option value="<%=system%>"><%=system%></option> <option value="<%=system%>"><%=system%></option>
<% } %> <% } %>
</select> </select>

2
Server/public/res/js/node.js
View File

@@ -256,7 +256,7 @@ function joinServer() {
console.log(Http.status); console.log(Http.status);
console.log(responseObject); console.log(responseObject);
createToast(`${responseObject.name} will join shortly`, { showNow: true }); createToast(`${responseObject.name} will join shortly`, { showNow: true });
$("#joinModal").modal('toggle'); location.reload();
} }
} }

2
Server/views/node.ejs
View File

@@ -134,5 +134,7 @@
<% // new System Modal %> <% // new System Modal %>
<%- include("partials/modifySystemModal.ejs", {'system': "New System", 'frequencies': [], 'mode': ''}) %> <%- include("partials/modifySystemModal.ejs", {'system': "New System", 'frequencies': [], 'mode': ''}) %>
<% // Join Server Modal %>
<%- include("partials/joinModal.ejs", {'node': node}) %>
<%- include('partials/bodyEnd.ejs') %> <%- include('partials/bodyEnd.ejs') %>
<%- include('partials/htmlFooter.ejs') %> <%- include('partials/htmlFooter.ejs') %>

2
Server/views/partials/joinModal.ejs
View File

@@ -24,7 +24,7 @@
<div class="col-md-6"> <div class="col-md-6">
<label class="small mb-1" for="selectRadioPreset">Selected Preset:</label> <label class="small mb-1" for="selectRadioPreset">Selected Preset:</label>
<select class="custom-select" id="selectRadioPreset"> <select class="custom-select" id="selectRadioPreset">
<% for(const system in nearbySystems) { %> <% for(const system in node.nearbySystems) { %>
<option value="<%=system%>"><%=system%></option> <option value="<%=system%>"><%=system%></option>
<% } %> <% } %>
</select> </select>