fix conflicts and rework routes

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node server.js",
-    "dev": "cross-env NODE_ENV=development webpack-dev-server --progress",
+    "dev": "cross-env NODE_ENV=development webpack-dev-server",
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
   },
   "author": "",
@@ -35,7 +35,6 @@
     "passport-local-mongoose": "^6.0.1",
     "qrcode": "^1.4.4",
     "referrer-policy": "^1.2.0",
-    "request": "^2.88.2",
     "socket.io": "^2.3.0",
     "socket.io-client": "^2.3.0",
     "vue": "~2.6",