From e4cdc78e1fb638fd345d898a8bc3f0deb66282a3 Mon Sep 17 00:00:00 2001 From: b1ek Date: Mon, 20 Feb 2023 12:53:03 +1000 Subject: [PATCH] sort entries, add email mailto link --- routes/guestbook.js | 12 ++++++++---- view/guestbook.pug | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/routes/guestbook.js b/routes/guestbook.js index 0da6364..a705648 100644 --- a/routes/guestbook.js +++ b/routes/guestbook.js @@ -16,17 +16,21 @@ async function handler(req, res, next) { const errors = req.query.error; - let data = {}; let sqldata = await Sequelize.Guestbook.findAll({ where: { hidden: false - } + }, + order: [ + ['id', 'DESC'] + ] }); if (!sqldata) throw new Error('Failed to get guestbook entries'); - for (let i = 0; i != sqldata.length; i++) { + /*for (let i = 0; i != sqldata.length; i++) { data[sqldata[i].id] = sqldata[i]; - } + }*/ + + const data = sqldata; res.send(await Helpers.ViewLoader.load('guestbook.pug', { current_route: req.originalUrl, diff --git a/view/guestbook.pug b/view/guestbook.pug index 2891364..e3534a9 100644 --- a/view/guestbook.pug +++ b/view/guestbook.pug @@ -86,7 +86,7 @@ block content p No records available. else table(class='gb_entries') - each entry, id in data + each entry, i in data tr(id='gb_entry_' + id) td(width='20%' class='gb_sender_data') p(style='font-size:9pt') @@ -96,7 +96,8 @@ block content | Sender: #{entry.name} br if (!entry.hidemail) - | Email: #{entry.email} + | Email: + a(href='mailto:' + entry.email)= entry.email else | Email: span(class='gb_hidden_mail' style='width:' + (10 * entry.email.length) + 'px')