enhance: customize for UZH usage (#1)

uzh-bf · Sep 24, 2023 · 782844f · 782844f
1 parent 3d4c425
commit 782844f
Show file tree

Hide file tree

Showing 23 changed files with 1,131 additions and 30 deletions.
diff --git a/.env.template b/.env.template
@@ -2,3 +2,4 @@ DATABASE_USER=escapp
 DATABASE_PASS=escapp
 DATABASE_NAME=escapp
 DATABASE_HOST=localhost
+DATABASE_URL=postgres://escapp:escapp@localhost:5432/escapp
diff --git a/app.js b/app.js
@@ -49,8 +49,8 @@ app.use(express.static(path.join(__dirname, "public")));
 
 app.use(i18n({
     "translationsPath": path.join(__dirname, "i18n"),
-    "siteLangs": ["en", "es"],
-    "locales": ["en", "es"],
+    "siteLangs": ["en", "es", "de"],
+    "locales": ["en", "es", "de"],
     "cookieLangName": "locale",
     "defaultLang": "en",
     "textsVarName": "i18n"

diff --git a/controllers/api_controller.js b/controllers/api_controller.js
@@ -42,9 +42,9 @@ exports.checkParticipantSafe = async (req, res, next) => {
         const user = await authenticate(email, password, token);
 
         if (user) {
-            if (!req.escapeRoom.forceLang && user.lang && i18n.lang !== user.lang && (user.lang === "es" || user.lang === "en")) {
+            if (!req.escapeRoom.forceLang && user.lang && i18n.lang !== user.lang && (user.lang === "es" || user.lang === "en" || user.lang === "de")) {
                 // eslint-disable-next-line global-require
-                res.locals.i18n_lang = user.lang === "es" ? "es" : "en";
+                res.locals.i18n_lang = ["en", "es", "de"].includes(user.lang) ? user.lang : "en";
                 // eslint-disable-next-line global-require
                 res.locals.i18n_texts = require(`../i18n/${res.locals.i18n_lang}`);
                 res.locals.i18n = res.locals.i18n_texts;

diff --git a/controllers/escapeRoom_controller.js b/controllers/escapeRoom_controller.js
@@ -9,6 +9,13 @@ const {nextStep, prevStep} = require("../helpers/progress");
 const {saveInterface, getERPuzzles, paginate, validationError} = require("../helpers/utils");
 const es = require("../i18n/es");
 const en = require("../i18n/en");
+const de = require("../i18n/de");
+
+const LANGUAGE_FILES = {
+    en,
+    es,
+    de
+};
 
 // Autoload the escape room with id equals to :escapeRoomId
 exports.load = async (req, res, next, escapeRoomId) => {
@@ -19,8 +26,8 @@ exports.load = async (req, res, next, escapeRoomId) => {
             if (res.locals) {
                 if (!req.session || req.session && req.session.user && req.session.user.isStudent) {
                     if (escapeRoom.forceLang && req.cookies && req.cookies.locale !== escapeRoom.forceLang) {
-                        res.locals.i18n_texts = escapeRoom.forceLang === "es" ? es : en;
-                        res.locals.i18n_lang = escapeRoom.forceLang === "es" ? "es" : "en";
+                        res.locals.i18n_texts = LANGUAGE_FILES[escapeRoom.forceLang] || en;
+                        res.locals.i18n_lang = Object.keys(LANGUAGE_FILES).includes(escapeRoom.forceLang) ? escapeRoom.forceLang : "en";
                         res.locals.i18n = res.locals.i18n_texts;
                     }
                 }
@@ -121,7 +128,7 @@ exports.create = async (req, res) => {
     const escapeRoom = models.escapeRoom.build({title, subject, duration, "forbiddenLateSubmissions": forbiddenLateSubmissions === "on", invitation, description, supportLink, "scope": scope === "private", "teamSize": teamSize || 0, authorId, forceLang}); // Saves only the fields question and answer into the DDBB
     const {i18n} = res.locals;
 
-    escapeRoom.forceLang = forceLang === "en" || forceLang === "es" ? forceLang : null;
+    escapeRoom.forceLang = Object.keys(LANGUAGE_FILES).includes(forceLang) ? forceLang : null;
 
     try {
         const er = await escapeRoom.save({"fields": ["title", "teacher", "subject", "duration", "description", "forbiddenLateSubmissions", "scope", "teamSize", "authorId", "supportLink", "invitation", "forceLang"]});
@@ -193,7 +200,7 @@ exports.update = async (req, res) => {
     escapeRoom.invitation = body.invitation !== undefined ? body.invitation.toString() : undefined;
     escapeRoom.scope = body.scope === "private";
     escapeRoom.teamSize = body.teamSize || 0;
-    escapeRoom.forceLang = body.forceLang === "en" || body.forceLang === "es" ? body.forceLang : null;
+    escapeRoom.forceLang = Object.keys(LANGUAGE_FILES).includes(body.forceLang) ? body.forceLang : null;
     const progressBar = body.progress;
 
     try {

diff --git a/db_migrate.js b/db_migrate.js
@@ -14,7 +14,7 @@ function callback (err, stdout, stderr) {
 }
 
 if (process.env.DATABASE_URL) {
-    exec(`./node_modules/.bin/sequelize db:migrate --uri ${process.env.DATABASE_URL}`, callback);
+    exec(`./node_modules/.bin/sequelize db:migrate --url ${process.env.DATABASE_URL}`, callback);
 } else if (process.env.DATABASE_HOST && process.env.DATABASE_USER && process.env.DATABASE_PASS && process.env.DATABASE_NAME) {
     exec("./node_modules/.bin/sequelize db:migrate --config models/config.js", callback);
 } else {