From 45dcb975fde930fbde14a71951026765bee7ce5b Mon Sep 17 00:00:00 2001 From: Jip Fr Date: Wed, 21 Apr 2021 10:47:22 +0200 Subject: [PATCH 1/4] Improve layout and coloring issues --- package-lock.json | 1 - progress-lists.json | 69 ++++++++++++++++++++++------------- public/charts.js | 4 +- public/main.css | 15 ++++---- src/index.js | 2 +- views/layouts/main.handlebars | 4 +- 6 files changed, 59 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 24ff23c..2a6c809 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "website", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/progress-lists.json b/progress-lists.json index 230cf30..103a8fa 100644 --- a/progress-lists.json +++ b/progress-lists.json @@ -1,47 +1,66 @@ [ { - "title": "Thing", + "title": "Juxtaposition", "features": [ { - "name": "Feature A", + "name": "Fix fonts", "status": "done" }, { - "name": "Feature B", - "status": "ongoing" - }, - { - "name": "Feature B", - "status": "ongoing" - }, - { - "name": "Feature B", + "name": "Guest Mode", "status": "done" }, { - "name": "Feature B", + "name": "Communities Page", + "status": "done" + }, + { + "name": "Set-Up Page", + "status": "done" + }, + { + "name": "Posts", "status": "ongoing" }, { - "name": "Feature A", + "name": "User Page", + "status": "ongoing" + }, + { + "name": "Community Page", + "status": "ongoing" + }, + { + "name": "Notifications", + "status": "ongoing" + }, + { + "name": "Miiverse Patch (applet)", + "status": "ongoing" + }, + { + "name": "Replies", + "status": "ongoing" + }, + { + "name": "Activity Feed", "status": "todo" }, { - "name": "Feature A", - "status": "todo" - } - ] - }, - { - "title": "Another list", - "features": [ - { - "name": "Some other A", + "name": "Fix browser History", "status": "todo" }, { - "name": "Feature B", - "status": "done" + "name": "Google Analytics(?)", + "status": "todo" + }, + { + "name": "Sub Communities", + "status": "todo" + }, + { + "name": "Miiverse Patch (games)", + "status": "todo" } ] } diff --git a/public/charts.js b/public/charts.js index 500584e..d3b27c2 100644 --- a/public/charts.js +++ b/public/charts.js @@ -22,6 +22,8 @@ function loadAllCharts() { enabled: false }; + const isInBrightCard = !!wrapper.closest('.right.sect'); + new Chart(wrapper.querySelector('canvas'), { type: 'doughnut', data: { @@ -29,7 +31,7 @@ function loadAllCharts() { datasets: [ { data, - backgroundColor: ['#9D6FF3', '#4C5174'] + backgroundColor: isInBrightCard ? ['white', 'rgba(195, 178, 227, 0.5)'] : ['#9D6FF3', '#4C5174'] } ] }, diff --git a/public/main.css b/public/main.css index 199c39c..f8b08b2 100644 --- a/public/main.css +++ b/public/main.css @@ -9,14 +9,19 @@ } body { - margin: 0; background: var(--background); + padding-bottom: env(safe-area-inset-bottom); +} +body, .main-body { + width: 100%; + max-width: 100vw; + position: relative; + margin: 0; color: var(--text); display: flex; justify-content: center; font-family: Poppins, Arial; overflow-x: hidden; - padding-bottom: env(safe-area-inset-bottom); } .animateDot { @@ -275,6 +280,7 @@ section.progress .right:before { left: 90%; margin-top: -50px; background: var(--theme); + z-index: -1; } section.faq { @@ -405,11 +411,6 @@ section.team { margin: 20px 0; background: rgba(255, 255, 255, 0.1); } -.feature-list-wrapper .feature-list-top { - display: grid; - grid-template-columns: auto 1fr; - grid-gap: 20px; -} .progress-title { margin-bottom: 20px; } diff --git a/src/index.js b/src/index.js index e51280b..93e98cd 100644 --- a/src/index.js +++ b/src/index.js @@ -13,7 +13,7 @@ const routers = { }; app.use('*', (req, res, next) => { - logger.info(`${req.method.toUpperCase()} ${req.path}`); + logger.info(`${req.method.toUpperCase()} ${req.path}${req.filepath}`); next(); }); diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index d62c384..c5a4ed3 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -35,7 +35,9 @@ - {{{ body }}} +
+ {{{ body }}} +
From f248aeed1ca8e20dcf44c9a1446a8ee448b1f7e8 Mon Sep 17 00:00:00 2001 From: Jip Fr Date: Wed, 21 Apr 2021 10:51:12 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Oops=20=E2=80=94=C2=A0fix=20logger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 93e98cd..e54a98c 100644 --- a/src/index.js +++ b/src/index.js @@ -13,7 +13,7 @@ const routers = { }; app.use('*', (req, res, next) => { - logger.info(`${req.method.toUpperCase()} ${req.path}${req.filepath}`); + logger.info(`${req.method.toUpperCase()} ${req.originalUrl}`); next(); }); From 15e3f1882079cc246a93d18ec34d7823887773db Mon Sep 17 00:00:00 2001 From: Jip Fr Date: Wed, 21 Apr 2021 12:07:17 +0200 Subject: [PATCH 3/4] Improve mobile view --- public/main.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/main.css b/public/main.css index f8b08b2..f10b30f 100644 --- a/public/main.css +++ b/public/main.css @@ -401,6 +401,9 @@ section.team { grid-template-columns: auto 1fr; grid-gap: 20px; } +.feature-progress-chart { + max-width: 100px; +} .feature-list-wrapper h3 { margin: 0; } @@ -435,7 +438,7 @@ section.team { /* Progress: Feature list */ .feature-list { display: grid; - grid-template-columns: repeat(2, 1fr); + grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); grid-gap: 10px; } .feature { @@ -609,4 +612,8 @@ footer { margin-top: 100px; } + .text { + width: 100%; + } + } From 99ac5aef5636929df8013961167bda9cf55e22d5 Mon Sep 17 00:00:00 2001 From: Jip Fr Date: Wed, 21 Apr 2021 12:16:32 +0200 Subject: [PATCH 4/4] Remove weird paragraph color --- public/main.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/main.css b/public/main.css index f10b30f..83a5a11 100644 --- a/public/main.css +++ b/public/main.css @@ -268,9 +268,6 @@ section.progress .right { border-top-left-radius: 10px; border-bottom-left-radius: 10px; } -section.progress .text { - color: #D2C4EC; -} section.progress .right:before { content: ""; width: 300vw;