diff --git a/Server/routes/index.js b/Server/routes/index.js index 1f43b2a..b79078f 100644 --- a/Server/routes/index.js +++ b/Server/routes/index.js @@ -6,27 +6,7 @@ const { getAllNodes, getNodeInfoFromId } = require("../utilities/mysqlHandler"); /* GET home page. */ router.get('/', (req, res) => { //var sources = libCore.getSources(); - return res.render('index'); - - var htmlOutput = ""; - - sources.forEach(source => { - htmlOutput += ` -
- -
Title: ${source.title}
-
Link: ${source.link}
-
category: ${source.category}
- -
-
-
- -
- - ` - }); - res.send(htmlOutput); + return res.render('index', {'page': 'index'}); }); /* GET node controller page. */ @@ -38,7 +18,7 @@ router.get('/controller', async (req, res) => { }); //var sources = libCore.getSources(); - return res.render('controller', {'nodes' : nodes}); + return res.render('controller', {'nodes' : nodes, 'page': 'controller'}); }); /* GET individual node page. */ @@ -46,7 +26,7 @@ router.get('/node/:id', async (req, res) => { var node = await getNodeInfoFromId(req.params.id); //var sources = libCore.getSources(); - return res.render('node', {'node' : node}); + return res.render('node', {'node' : node, 'page': 'node'}); }); module.exports = router; diff --git a/Server/views/index.ejs b/Server/views/index.ejs index b6524a3..8e72b3f 100644 --- a/Server/views/index.ejs +++ b/Server/views/index.ejs @@ -1,4 +1,4 @@ -<%- include('partials/htmlHead.ejs') %> +<%- include('partials/htmlHead.ejs', {'page': page}) %>
diff --git a/Server/views/partials/head.ejs b/Server/views/partials/head.ejs index 3429389..2aa5d1a 100644 --- a/Server/views/partials/head.ejs +++ b/Server/views/partials/head.ejs @@ -1,7 +1,20 @@ - Bootstrap demo + <% switch (page) { + case "index":%> + Node Dashboard + <% break; + case "controller":%> + Node Controller + <% break; + case "node":%> + Node Configuration + <% break; + default:%> + DRB_CnC Server + <%break; + } %> diff --git a/Server/views/partials/htmlHead.ejs b/Server/views/partials/htmlHead.ejs index a1b1d37..89af0ef 100644 --- a/Server/views/partials/htmlHead.ejs +++ b/Server/views/partials/htmlHead.ejs @@ -1,6 +1,6 @@ - <%- include('head.ejs') %> + <%- include('head.ejs', {'page': page}) %> <%- include('navbar.ejs') %> <%- include('sidebar.ejs') %> \ No newline at end of file