Merge branch 'master' into dev

src/routers/blog.js

@@ -0,0 +1,20 @@
+const { Router } = require('express');
+const util = require('../util');
+const router = new Router();
+
+
+router.get('/', async (request, response) => {
+
+	const reqLocale = request.locale;
+	const locale = util.getLocale(reqLocale.region, reqLocale.language);
+
+	const localeString = reqLocale.toString();
+
+	response.render('blog', {
+		layout: 'main',
+		locale,
+		localeString,
+	});
+});
+
+module.exports = router;

src/server.js

@@ -23,6 +23,7 @@ const routers = {
 	home: require('./routers/home'),
 	faq: require('./routers/faq'),
 	progress: require('./routers/progress'),
+	blog: require('./routers/blog'),
 	localization: require('./routers/localization')
 };
 
@@ -31,8 +32,7 @@ app.use(cookieParser());
 // Locale express middleware setup
 app.use(expressLocale({
 	'priority': ['cookie', 'accept-language', 'map', 'default'],
-	cookie: {name: 'preferredLocale'},
-
+	cookie: { name: 'preferredLocale' },
 	// Map unavailable regions to available locales from the same language
 	map: {
 		/* TODO: map more regions to the available locales */
@@ -69,6 +69,7 @@ app.use('/', routers.home);
 app.use('/faq', routers.faq);
 app.use('/progress', routers.progress);
 app.use('/localization', routers.localization);
+app.use('/blog', routers.blog);
 
 logger.info('Creating 404 status handler');
 // This works because it is the last router created
@@ -86,11 +87,11 @@ app.engine('handlebars', handlebars({
 		doFaq(value, options) {
 			let htmlLeft = '';
 			let htmlRight = '';
-			for(const [i, v] of Object.entries(value)) {
+			for (const [i, v] of Object.entries(value)) {
 				const appendHtml = options.fn({
 					...v
 				}); // Tis is an HTML string
-				if(i % 2 === 0) {
+				if (i % 2 === 0) {
 					htmlLeft += appendHtml;
 				} else {
 					htmlRight += appendHtml;