From e7b4d365f287f173c8cc0b5a4d965c3a0579c2e0 Mon Sep 17 00:00:00 2001 From: JoelHMikael Date: Tue, 4 Jan 2022 14:18:20 +0200 Subject: Minor GUI improvements --- index.css | 1 + index.html | 2 +- scrape.js | 7 ++++++- server.js | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/index.css b/index.css index d71e3f3..1f5a422 100644 --- a/index.css +++ b/index.css @@ -13,6 +13,7 @@ body { background: #444; color: white; padding: 1em; + margin-bottom: 3em; /* for the footer */ font-family: verdana, sans-serif; } diff --git a/index.html b/index.html index eba1547..c9f6c4c 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@

LYLL-ruokailuvuoro

diff --git a/scrape.js b/scrape.js index 45dd0b4..64e00fb 100644 --- a/scrape.js +++ b/scrape.js @@ -49,7 +49,7 @@ async function scrapeFood(url) let weekdayIndex = weekdays.findIndex(val => { return val === title.substring(0, 2); }); if (weekdayIndex !== -1) - foodList[weekdayIndex] = [title, food]; + foodList[weekdayIndex] = [title, neatify(food)]; titleSpan = getSpan(data, titleTags, foodSpan[1]); foodSpan = getSpan(data, foodTags, titleSpan[1]); @@ -63,5 +63,10 @@ function getFoodLink(week) return `https://eruokalista.lohja.fi/AromieMenus/FI/Default/Lohja/Koulut/Rss.aspx?Id=97f76449-f57c-4217-aede-b5f9dbf2b41e&DateMode=${week}`; } +function neatify(food) +{ + return food.replaceAll(")", ")
").replaceAll(" :", ":").replaceAll(":", ":
"); +} + exports.food = scrapeFood; exports.link = getFoodLink; diff --git a/server.js b/server.js index 2ed10fc..d26da04 100644 --- a/server.js +++ b/server.js @@ -178,7 +178,7 @@ async function buildMain(args) // get the food let food; - food = foods[ +(day < actualDay) ][day]; // test this out more + food = foods[ +(day < actualDay) ][day]; if (food !== undefined) { res["food-header"] = food[0]; -- cgit v1.2.3