Last updates before merge on master.

.gitignore

@@ -1,3 +1,2 @@
 **/node_modules
 docker/mongodb/data
-**/public/bundle.js

backend/public/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Vanilla JS frontend app.</title>
-    </head>
-    <body>
-        <div id="content"></div>
-        <script type="application/javascript" src="./bundle.js"></script>
-    </body>
-</html>

docker/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.0"
+version: "3.6"
 services:
   mongo:
     container_name: "mongo"

frontend/src/index.js

@@ -1,7 +0,0 @@
-console.log('Hello world! ++++++');
-
-document.getElementById('content').innerHTML = `
-    <div>
-        <h1>Hello world!</h1>
-    </div>
-`;

frontend/webpack.config.js

@@ -1,24 +0,0 @@
-const webpack = require("webpack");
-const path = require("path");
-const UglifyJSPlugin = require("uglifyjs-webpack-plugin");
-
-let config = {
-    entry: "./frontend/src/index.js",
-    output: {
-        path: path.resolve(__dirname, "../backend/public"),
-        filename: "bundle.js"
-    },
-    devServer: {
-        contentBase: path.resolve(__dirname, "../backend/public"),
-        historyApiFallback: true,
-        inline: true,
-        open: true,
-        hot: true
-    },
-    plugins: [
-        new UglifyJSPlugin(),
-        new webpack.SourceMapDevToolPlugin({})
-    ],
-    devtool: "eval-source-map"
-}
-module.exports = config;

package.json

@@ -4,9 +4,8 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "npm-run-all --parallel start-frontend start-backend",
+    "start": "nodemon ./src/js/app.js localhost 3000",
-    "start-backend": "nodemon ./backend/src/js/app.js localhost 3000",
+    "test": "echo \"Error: no test specified\" && exit 1"
-    "start-frontend": "webpack --watch --config frontend/webpack.config.js"
   },
   "keywords": [],
   "author": "",
@@ -21,11 +20,6 @@
   "devDependencies": {
     "eslint": "^7.4.0",
     "eslint-plugin-node": "^11.1.0",
-    "nodemon": "^2.0.4",
+    "nodemon": "^2.0.4"
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10",
-    "webpack-dev-server": "^3.9.0",
-    "npm-run-all": "^4.1.5"
   }
 }

src/js/app.js

@@ -3,14 +3,13 @@ const bodyParser = require('body-parser');
 const applicationController = require('./controller/applicationCtrl');
 const userController = require('./controller/userCtrl');
 
-const port = 8080;
+const port = 3000;
 
 const app = express();
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(bodyParser.json());
-app.use(express.static('backend/public'));
 
-app.use('/api/apps', applicationController);
+app.use('/apps', applicationController);
-app.use('/api/users', userController);
+app.use('/users', userController);
 
 app.listen(port, () => console.log('Mock is listening at port ', port, '\n'));

src/js/configuration.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const yaml = require('yaml');
 
-const configurationFile = fs.readFileSync('backend/src/resources/application.yml', 'utf8');
+const configurationFile = fs.readFileSync('src/resources/application.yml', 'utf8');
 const configuration = yaml.parse(configurationFile);
 module.exports = configuration;

src/js/controller/userCtrl.js

@@ -2,11 +2,6 @@ const router = require('express').Router();
 const tokenService = require('../service/tokenService');
 const userService = require('../service/userService');
 
-
-const passwordService = require('../service/passwordService');
-const Repository = require('../repository/repository');
-const userRepository = new Repository('users');
-
 router.post('/login', (request, response) => {
     const loginRequest = request.body;
 
@@ -22,20 +17,4 @@ router.post('/login', (request, response) => {
     }
 });
 
-router.post('/init', (request, response) => {
-    userRepository.insert({_id: 'takiguchi', login:'takiguchi', password:passwordService.hashPassword('azer')}, () => {
-        console.log('ok');
-        response.status(200).send();
-    }, () => {
-        console.error('KO');
-        response.status(400).send();
-    });
-})
-
-router.get('/test', (request, response) => {
-    response.json({
-        content: 'Hello world from users controller!'
-    });
-});
-
 module.exports = router;