diff --git a/locales/US_en.json b/locales/US_en.json index a246e44..1706ad4 100644 --- a/locales/US_en.json +++ b/locales/US_en.json @@ -2,7 +2,8 @@ "nav": { "about": "About", "faq": "FAQ", - "credits": "Credits" + "credits": "Credits", + "progress": "Progress" }, "hero": { "subtitle": "Game servers", @@ -130,5 +131,9 @@ "github": "https://github.com/Kinnay" } ] + }, + "progressPage": { + "title": "Progress", + "description": "This is text. Text can go here. This is a spot for text. A paragraph holds text. It's all true." } } diff --git a/feature-lists.json b/progress-lists.json similarity index 100% rename from feature-lists.json rename to progress-lists.json diff --git a/public/main.css b/public/main.css index f4818ad..7d2f36f 100644 --- a/public/main.css +++ b/public/main.css @@ -4,6 +4,7 @@ --text: white; --text-secondary: #A1A8D9; --btn: #673DB6; + --theme: var(--btn); --text-secondary-2: #8990C1; } @@ -229,7 +230,7 @@ section.progress .left, section.progress .right { section.progress .right { position: relative; padding-left: 80px; - background: #673DB6; + background: var(--theme); border-top-left-radius: 10px; border-bottom-left-radius: 10px; } @@ -244,7 +245,7 @@ section.progress .right:before { background: yellow; left: 90%; margin-top: -50px; - background: #673DB6; + background: var(--theme); } section.faq { @@ -354,6 +355,12 @@ section.team { } /* Progress */ +.all-progress-lists { + margin-top: 50px; + display: grid; + grid-template-columns: repeat(auto-fill, minmax(500px, 1fr)); + grid-gap: 20px; +} .feature-list-wrapper h3 { margin: 0; } @@ -412,6 +419,12 @@ section.team { height: 100%; } +/* Bright purple cards */ +.purple-card { + padding: 50px 20px; + border-radius: 10px; + background: var(--btn); +} /* Footer */ footer { diff --git a/src/index.js b/src/index.js index 6b6dadb..92ec506 100644 --- a/src/index.js +++ b/src/index.js @@ -8,7 +8,8 @@ const app = express(); const routers = { home: require('./routers/home'), - faq: require('./routers/faq') + faq: require('./routers/faq'), + progress: require('./routers/progress') }; app.use('*', (req, res, next) => { @@ -18,6 +19,7 @@ app.use('*', (req, res, next) => { app.use('/', routers.home); app.use('/faq', routers.faq); +app.use('/progress', routers.progress); app.engine('handlebars', handlebars({ helpers: { diff --git a/src/routers/home.js b/src/routers/home.js index dcbf2e3..0d9a7a4 100644 --- a/src/routers/home.js +++ b/src/routers/home.js @@ -2,14 +2,14 @@ const getLocale = require('../../util/getLocale'); const { Router } = require('express'); const router = new Router(); -const featureLists = require('../../feature-lists.json'); +const pgoressLists = require('../../progress-lists.json'); router.get('/', (req, res) => { const tmpLocale = getLocale('US', 'en'); res.render('home', { layout: 'main', locale: tmpLocale, - featuredFeatureList: featureLists[0] + featuredFeatureList: pgoressLists[0] }); }); diff --git a/src/routers/progress.js b/src/routers/progress.js new file mode 100644 index 0000000..21253ce --- /dev/null +++ b/src/routers/progress.js @@ -0,0 +1,16 @@ +const getLocale = require('../../util/getLocale'); +const { Router } = require('express'); +const router = new Router(); + +const progressLists = require('../../progress-lists.json'); + +router.get('/', (req, res) => { + const tmpLocale = getLocale('US', 'en'); + res.render('progress', { + layout: 'main', + locale: tmpLocale, + progressLists + }); +}); + +module.exports = router; diff --git a/views/home.handlebars b/views/home.handlebars index 78c4195..7f5aaf4 100644 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -1,27 +1,7 @@
-
- - - - Pretendo - - - - -
+ {{> header}}
@@ -31,7 +11,7 @@ {{ locale.hero.text }}

- + @@ -148,6 +128,6 @@
- + {{> footer }}
\ No newline at end of file diff --git a/views/partials/custom-checkbox.handlebars b/views/partials/custom-checkbox.handlebars index 0fd5907..984c79f 100644 --- a/views/partials/custom-checkbox.handlebars +++ b/views/partials/custom-checkbox.handlebars @@ -1,3 +1,4 @@ +{{altBg}}
{{#if checked}} {{!-- Icon --}} diff --git a/views/partials/footer.handlebars b/views/partials/footer.handlebars new file mode 100644 index 0000000..2800ebb --- /dev/null +++ b/views/partials/footer.handlebars @@ -0,0 +1 @@ +
Copyright 2020 - Design by mrjvs, development by Jip Fr
\ No newline at end of file diff --git a/views/partials/header.handlebars b/views/partials/header.handlebars new file mode 100644 index 0000000..39cb542 --- /dev/null +++ b/views/partials/header.handlebars @@ -0,0 +1,31 @@ +
+ + + + + Pretendo + + + + + +
\ No newline at end of file diff --git a/views/progress.handlebars b/views/progress.handlebars new file mode 100644 index 0000000..d52d024 --- /dev/null +++ b/views/progress.handlebars @@ -0,0 +1,22 @@ +
+ + {{> header}} + +
+
+

{{ locale.progressPage.title }}

+

{{ locale.progressPage.description }}

+
+
+ +
+ {{#each progressLists}} +
+ {{> progress-list data=this }} +
+ {{/each}} +
+ + {{> footer }} + +
\ No newline at end of file