Merge branch 'develop' into ft-user-login-170947547

.eslintrc.json

@@ -7,27 +7,29 @@
     "mocha": true
   },
   "rules": {
-    "one-var": 0,
-    "one-var-declaration-per-line": 0,
-    "new-cap": 0,
-    "consistent-return": 0,
-    "no-param-reassign": 0,
-    "comma-dangle": 0,
-    "curly": ["error", "multi-line"],
-    "import/no-unresolved": [2, { "commonjs": true }],
-    "no-shadow": ["error", { "allow": ["req", "res", "err"] }],
-    "valid-jsdoc": ["error", {
-      "requireReturn": true,
-      "requireReturnType": true,
-      "requireParamDescription": false,
-      "requireReturnDescription": true
-    }],
-    "require-jsdoc": ["error", {
-        "require": {
-            "FunctionDeclaration": true,
-            "MethodDefinition": true,
-            "ClassDeclaration": true
-        }
-    }]
+      "one-var": 0,
+      "one-var-declaration-per-line": 0,
+      "new-cap": 0,
+      "consistent-return": 0,
+      "no-param-reassign": 0,
+      "comma-dangle": 0,
+      "arrow-parens":"off",
+      "curly": ["error", "multi-line"],
+      "import/no-unresolved": [2, { "commonjs": true }],
+      "no-shadow": ["error", { "allow": ["req", "res", "err"] }],
+      "no-underscore-dangle": ["error", { "allow": ["__"] }],
+      "valid-jsdoc": ["error", {
+          "requireReturn": true,
+          "requireReturnType": true,
+          "requireParamDescription": false,
+          "requireReturnDescription": true
+      }],
+      "require-jsdoc": ["error", {
+      "require": {
+          "FunctionDeclaration": true,
+          "MethodDefinition": true,
+          "ClassDeclaration": true
+          }
+      }]
   }
 }

package.json

@@ -29,6 +29,7 @@
     "express": "^4.17.1",
     "express-validator": "^6.4.0",
     "jsonwebtoken": "^8.5.1",
+    "i18n": "^0.8.5",
     "path": "^0.12.7",
     "pg": "^7.18.1",
     "pg-hstore": "^2.3.3",

src/index.js

@@ -1,3 +1,5 @@
+import i18n from 'i18n';
+import path from 'path';
 import express from 'express';
 import bodyParser from 'body-parser';
 import dotenv from 'dotenv';
@@ -6,8 +8,15 @@ import swagger from './swagger/index';
 import authRouter from './routes/authRoutes';
 
 dotenv.config();
+i18n.configure({
+  locales: ['fr', 'en'],
+  defaultLocale: 'en',
+  queryParameter: 'lang',
+  directory: path.join(__dirname, 'services/localesServices/locales'),
+});
 
 const app = express();
+app.use(i18n.init);
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 

src/routes/api/welcome.js

@@ -0,0 +1,22 @@
+import { Router } from 'express';
+
+const router = Router();
+
+/**
+ * @swagger
+ * /:
+ *   get:
+ *     description: Display welcome message
+ *     produces:
+ *       - application/json
+ *     responses:
+ *       200:
+ *         description: Welcome to devRepublic Barefoot Nomad API
+ */
+router.get('/', (req, res) => {
+  res.status(200).json({
+    message: res.__('Welcome to devRepublic Barefoot Nomad API')
+  });
+});
+
+export default router;

src/routes/welcome.js

@@ -4,7 +4,7 @@ const router = Router();
 
 router.get('/', (req, res) => {
   res.status(200).json({
-    message: 'Welcome to devRepublic Barefoot Nomad API'
+    message: res.__('Welcome to devRepublic Barefoot Nomad API')
   });
 });
 

src/services/localesServices/locales/en.json

@@ -0,0 +1,7 @@
+{
+    "Welcome to devRepublic Barefoot Nomad API": "Welcome to devRepublic Barefoot Nomad API",
+    "register": "register",
+    "signup": "signup",
+    "login": "login",
+    "logout": "logout"
+}

src/services/localesServices/locales/fr.json

@@ -0,0 +1,7 @@
+{
+    "Welcome to devRepublic Barefoot Nomad API": "Bienvenue au devRepublic Barefoot Nomad API",
+    "register": "enregistrer",
+    "signup": "enregistrer",
+    "login": "connecter",
+    "logout": "déconnecter"
+}

src/tests/index.test.js

@@ -20,3 +20,16 @@ describe('Testing index page ', () => {
       });
   });
 });
+
+describe('Testing index page ', () => {
+  it('should return a message from index page in French.', (done) => {
+    chai.request(app)
+      .get('/api?lang=fr')
+      .end((err, res) => {
+        expect(res.body).to.be.an('object');
+        expect(res.status).to.equal(200);
+        expect(res.body.message).to.equal('Bienvenue au devRepublic Barefoot Nomad API');
+        done();
+      });
+  });
+});