diff --git a/assets/css/pretendo-pnid.css b/assets/css/pretendo-pnid.css index cba36a3..fc94d28 100644 --- a/assets/css/pretendo-pnid.css +++ b/assets/css/pretendo-pnid.css @@ -25,5 +25,48 @@ body footer .content { /* aside navigation */ nav.userNav { - padding: 1em; + padding: 1em 3em 1em 1em; +} +nav.userNav .userNavProfile { + text-align: center; +} +nav.userNav .userNavProfile::after { + content: ""; + width: 10em; + display: inline-block; + height: 1px; + background-color: rgba(0, 0, 0, 0.5);; +} +nav.userNav .userNavProfile img { + width: 7em; + height: 7em; + background-color: white; + border: 1px solid rgba(0, 0, 0, 0.5); + border-radius: 50%; + display: inline-block; +} +nav.userNav .userNavProfile .name { + font-size: 1.5em; + font-weight: bold; + color: #353535; + margin: .5em 1em 0 1em; +} +nav.userNav .links { + padding: .7em 0; +} +nav.userNav .links .navItem { + display: block; + margin: .3em .5em; + font-size: 1em; + color: #707070; + text-decoration: none; +} +nav.userNav .links .navItem:hover { + color: #505050; + font-weight: bold; + text-decoration: none; +} +nav.userNav .links .navItem.active { + color: #673ab7; + font-weight: bold; } \ No newline at end of file diff --git a/helpers/util.js b/helpers/util.js index d0b4616..9509f1e 100644 --- a/helpers/util.js +++ b/helpers/util.js @@ -20,7 +20,12 @@ function templateReadyUser(req) { }; } +function getLocales() { + return require('../locales/US_en.json'); +} + module.exports = { send404, - templateReadyUser + templateReadyUser, + getLocales }; \ No newline at end of file diff --git a/routes/blog.js b/routes/blog.js index 2817688..ce8d6ce 100644 --- a/routes/blog.js +++ b/routes/blog.js @@ -30,7 +30,8 @@ router.get('/news/:date/:title', (req, res) => { if (err) return utilHelper.send404(res); res.render('post', { post: postTemplate, - user: utilHelper.templateReadyUser(req) + user: utilHelper.templateReadyUser(req), + locales: utilHelper.getLocales() }); }); }); @@ -57,6 +58,7 @@ router.get('/news', (req, res) => { res.render('post-collection', { posts: postCollection, user: utilHelper.templateReadyUser(req), + locales: utilHelper.getLocales(), page: 'news' }); }); diff --git a/routes/contact.js b/routes/contact.js index c09180a..d569e10 100644 --- a/routes/contact.js +++ b/routes/contact.js @@ -16,6 +16,7 @@ const https = require('https'); router.get('/contact', (req, res) => { res.render('contact', { user: utilHelper.templateReadyUser(req), + locales: utilHelper.getLocales(), page: 'contact' }); }); diff --git a/routes/home.js b/routes/home.js index 29e5fda..7d0de31 100644 --- a/routes/home.js +++ b/routes/home.js @@ -14,6 +14,7 @@ const utilHelper = require('../helpers/util'); router.get('/', (req, res) => { res.render('home', { user: utilHelper.templateReadyUser(req), + locales: utilHelper.getLocales(), page: 'home' }); }); diff --git a/routes/pnid.js b/routes/pnid.js index e61afa1..055f066 100644 --- a/routes/pnid.js +++ b/routes/pnid.js @@ -20,15 +20,21 @@ const PNID = require('../models/pnid'); // renders register page router.get('/pnid/register', recaptcha.middleware.render, (req, res) => { - res.render('register', { captcha: res.recaptcha }); + res.render('register', { + captcha: res.recaptcha, + locales: utilHelper.getLocales() + }); }); // renders login page router.get('/pnid/login', (req, res) => { - res.render('login'); + res.render('login', { + locales: utilHelper.getLocales() + }); }); // renders pnid dashboard router.get('/pnid/dashboard', userMiddleware.pnidAuthNeeded, (req, res) => { res.render('dashboard', { + locales: utilHelper.getLocales(), user: utilHelper.templateReadyUser(req) }); }); diff --git a/routes/progress.js b/routes/progress.js index ac30643..ea3face 100644 --- a/routes/progress.js +++ b/routes/progress.js @@ -25,6 +25,7 @@ router.get('/progress', (req, res) => { games, backends, user: utilHelper.templateReadyUser(req), + locales: utilHelper.getLocales(), page: 'progress' }); }); diff --git a/views/dashboard.hbs b/views/dashboard.hbs index 44dfadf..06ee426 100644 --- a/views/dashboard.hbs +++ b/views/dashboard.hbs @@ -8,9 +8,7 @@ {{> nav-default }}
- + {{> nav-dashboard }}

User profile

PNID dashboard

diff --git a/views/home.hbs b/views/home.hbs index dd98acf..a63d228 100644 --- a/views/home.hbs +++ b/views/home.hbs @@ -1,5 +1,5 @@ - + {{> head-common }} diff --git a/views/partials/nav-dashboard.hbs b/views/partials/nav-dashboard.hbs new file mode 100644 index 0000000..03ff972 --- /dev/null +++ b/views/partials/nav-dashboard.hbs @@ -0,0 +1,31 @@ + + + \ No newline at end of file