temp fix lastPull server

exemple.env

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

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");
 })

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 secret_display = null
-                var tmp = ''
+            servers.forEach((server) => {
-                var secret_display = {}
+                if (server.lastPull != null) {
-                servers.forEach((server) => {
+                    lastPullList[server.hostname] = server.lastPull.toISOString().replace(/T/, ' ').replace(/\..+/, '')
-                    if (server.hostname === req.query.server) {
+                } else {
-                        secret_display.content = server.tmp
+                    lastPullList[server.hostname] = 'never'
-                        secret_display.url = process.env.APP_URL
+                }
-                        secret_display.name = server.hostname,
+                if (req.query.alert === "secretDisplay") {
-                        secret_display.user = server.username
+                    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, "lastPullList": lastPullList, locals: {secret: secret_display, alert: req.query.alert, alert_type: req.query.type} })
-            res.render('admin/servers', { "servers": servers, locals: {secret: secret_display, alert: req.query.alert, alert_type: req.query.type} })
         });
     } catch (e) {
         console.log(e)

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()
 
                     })

views/admin/servers.ejs

@@ -54,7 +54,7 @@
                             <td><%= server.ip %></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>
                         </tr>
                     <% }) %>