diff --git a/exemple.env b/exemple.env index 9f270a0..261d9de 100644 --- a/exemple.env +++ b/exemple.env @@ -1,4 +1,5 @@ GITHUB_CLIENT_ID= GITHUB_CLIENT_SECRET= SESSION_SECRET= -APP_URL=http://exemple:8080 \ No newline at end of file +APP_URL=http://exemple:8080 +APP_PORT=8080 \ No newline at end of file diff --git a/index.js b/index.js index 96ff4c5..72f3b50 100644 --- a/index.js +++ b/index.js @@ -75,13 +75,13 @@ app.get("/login", (req, res) => { res.render('login') }); - + app.use('/admin/', require('./routes/admin.route')); app.use('/auth/', require('./routes/auth.route')); app.use('/keys/', require('./routes/keys.route')); app.use('/endpoint', require('./routes/endpoint.route')) -app.listen(8080, () => { +app.listen(process.env.APP_PORT, () => { console.log("running"); }) \ No newline at end of file diff --git a/routes/admin/servers.route.js b/routes/admin/servers.route.js index 7e19a28..1775220 100644 --- a/routes/admin/servers.route.js +++ b/routes/admin/servers.route.js @@ -12,21 +12,29 @@ var router = express.Router(); router.get("/", (req, res) => { try { + // pas très propre à edit + var lastPullList = {} Server.findAll().then((servers) => { - if (req.query.alert === "secretDisplay") { - var tmp = '' - var secret_display = {} - servers.forEach((server) => { - if (server.hostname === req.query.server) { - secret_display.content = server.tmp - secret_display.url = process.env.APP_URL - secret_display.name = server.hostname, - secret_display.user = server.username + var secret_display = null + servers.forEach((server) => { + if (server.lastPull != null) { + lastPullList[server.hostname] = server.lastPull.toISOString().replace(/T/, ' ').replace(/\..+/, '') + } else { + lastPullList[server.hostname] = 'never' + } + if (req.query.alert === "secretDisplay") { + var tmp = '' + secret_display = {} + if (server.hostname === req.query.server) { + secret_display.content = server.tmp + secret_display.url = process.env.APP_URL + secret_display.name = server.hostname, + secret_display.user = server.username + } } - }) - } - res.render('admin/servers', { "servers": servers, locals: {secret: secret_display, alert: req.query.alert, alert_type: req.query.type} }) + }) + res.render('admin/servers', { "servers": servers, "lastPullList": lastPullList, locals: {secret: secret_display, alert: req.query.alert, alert_type: req.query.type} }) }); } catch (e) { console.log(e) diff --git a/routes/endpoint/update.route.js b/routes/endpoint/update.route.js index d913d3c..a8ab692 100644 --- a/routes/endpoint/update.route.js +++ b/routes/endpoint/update.route.js @@ -19,7 +19,7 @@ router.get("/:server", async (req, res) => { raw += '# ' + x + '\n' + result[x] + '\n\n' } res.send(raw) - server.lastPull = + server.lastPull = new Date() server.save() }) diff --git a/views/admin/servers.ejs b/views/admin/servers.ejs index 4bff0f5..1819674 100644 --- a/views/admin/servers.ejs +++ b/views/admin/servers.ejs @@ -54,7 +54,7 @@ <%= server.ip %> <%= server.username %> - <%= server.lastPull.toISOString().replace(/T/, ' ').replace(/\..+/, '') %> <% if (!server.lastPull) { %>never<% } %> + <%= lastPullList[server.hostname] %> <% }) %>