1
0
mirror of synced 2025-10-28 18:19:17 +00:00

temp fix lastPull server

This commit is contained in:
Valentin
2023-09-13 16:21:49 +02:00
parent 092ab264bc
commit e45c92d44b
5 changed files with 26 additions and 17 deletions

View File

@@ -2,3 +2,4 @@ GITHUB_CLIENT_ID=
GITHUB_CLIENT_SECRET= GITHUB_CLIENT_SECRET=
SESSION_SECRET= SESSION_SECRET=
APP_URL=http://exemple:8080 APP_URL=http://exemple:8080
APP_PORT=8080

View File

@@ -82,6 +82,6 @@ app.use('/auth/', require('./routes/auth.route'));
app.use('/keys/', require('./routes/keys.route')); app.use('/keys/', require('./routes/keys.route'));
app.use('/endpoint', require('./routes/endpoint.route')) app.use('/endpoint', require('./routes/endpoint.route'))
app.listen(8080, () => { app.listen(process.env.APP_PORT, () => {
console.log("running"); console.log("running");
}) })

View File

@@ -12,11 +12,19 @@ var router = express.Router();
router.get("/", (req, res) => { router.get("/", (req, res) => {
try { try {
// pas très propre à edit
var lastPullList = {}
Server.findAll().then((servers) => { Server.findAll().then((servers) => {
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") { if (req.query.alert === "secretDisplay") {
var tmp = '' var tmp = ''
var secret_display = {} secret_display = {}
servers.forEach((server) => {
if (server.hostname === req.query.server) { if (server.hostname === req.query.server) {
secret_display.content = server.tmp secret_display.content = server.tmp
secret_display.url = process.env.APP_URL secret_display.url = process.env.APP_URL
@@ -24,9 +32,9 @@ router.get("/", (req, res) => {
secret_display.user = server.username 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) { } catch (e) {
console.log(e) console.log(e)

View File

@@ -19,7 +19,7 @@ router.get("/:server", async (req, res) => {
raw += '# ' + x + '\n' + result[x] + '\n\n' raw += '# ' + x + '\n' + result[x] + '\n\n'
} }
res.send(raw) res.send(raw)
server.lastPull = server.lastPull = new Date()
server.save() server.save()
}) })

View File

@@ -54,7 +54,7 @@
<td><%= server.ip %></td> <td><%= server.ip %></td>
<td><%= server.username %></td> <td><%= server.username %></td>
<td><%= server.lastPull.toISOString().replace(/T/, ' ').replace(/\..+/, '') %> <% if (!server.lastPull) { %>never<% } %></td> <td><%= lastPullList[server.hostname] %></td>
<td style="text-align: right;"> <a class="btn btn-sm btn-danger" href="/admin/servers/delete/<%= server.hostname %>"><i class="far fa-trash-alt"></i></a></td> <td style="text-align: right;"> <a class="btn btn-sm btn-danger" href="/admin/servers/delete/<%= server.hostname %>"><i class="far fa-trash-alt"></i></a></td>
</tr> </tr>
<% }) %> <% }) %>