Merge pull request #580 from FredericHeem/merge-base

Merge base

Author: FredericHeem

.gitignore

@@ -16,3 +16,6 @@ coverage
 .settings/
 .idea
 typings
+*.log
+env
+grucloud-gcp.json

.vscode/launch.json

@@ -1,31 +1,59 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Launch Program",
-            "program": "${workspaceFolder}/server/src/index.js",
-            "cwd": "${workspaceFolder}/server",
-            "runtimeArgs": [],
-            "outFiles": [
-                "${workspaceFolder}/**/*.js"
-            ]
-        },
-        {
-            "name": "Debug test",
-            "type": "node",
-            "request": "launch",
-            "program": "${workspaceRoot}/server/node_modules/mocha/bin/_mocha",
-            "stopOnEntry": false,
-            "args": ["--no-timeouts", "--colors"], //you can specify paths to specific tests here
-            "cwd": "${workspaceRoot}/server",
-            "runtimeExecutable": null,
-            "internalConsoleOptions": "openOnSessionStart",
-            "env": {
-              "NODE_PATH": "src"
-            }
-          }
-    ]
-}
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "chrome",
+      "name": "Debug Frontend",
+      "request": "launch",
+      "url": "http://localhost:8080/infra",
+      "webRoot": "${workspaceFolder}/client/src"
+    },
+    {
+      "name": "Debug Server Test",
+      "type": "node",
+      "request": "launch",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "mocha", "--", "--inspect-brk=9229"],
+      "internalConsoleOptions": "openOnSessionStart",
+      "console": "integratedTerminal",
+      "cwd": "${workspaceFolder}/server",
+      "port": 9229
+    },
+    {
+      "name": "Debug Worker Test",
+      "type": "node",
+      "request": "launch",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "test", "--", "--inspect-brk=9229"],
+      "internalConsoleOptions": "openOnSessionStart",
+      "console": "integratedTerminal",
+      "cwd": "${workspaceFolder}/services/worker",
+      "port": 9229
+    },
+    {
+      "name": "API Server",
+      "type": "node",
+      "request": "launch",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "start"],
+      "internalConsoleOptions": "openOnSessionStart",
+      "console": "integratedTerminal",
+      "cwd": "${workspaceFolder}/server",
+      "port": 9229
+    },
+    {
+      "name": "Debug test",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceRoot}/server/node_modules/mocha/bin/_mocha",
+      "stopOnEntry": false,
+      "args": ["--no-timeouts", "--colors"], //you can specify paths to specific tests here
+      "cwd": "${workspaceRoot}/server",
+      "runtimeExecutable": null,
+      "internalConsoleOptions": "openOnSessionStart",
+      "env": {
+        "NODE_PATH": "src"
+      }
+    }
+  ]
+}

client/.gitignore

@@ -12,3 +12,4 @@ build
 deploy/keys
 selenium-debug.log
 chromedriver.log
+grucloud-vm-tuto-1.json

client/assets/cloud.svg

@@ -1,25 +1,22 @@
 {
   "name": "starhackit-ui",
-  "title": "StarHack.It",
-  "version": "10.14.0",
+  "title": "StarHackIt",
+  "version": "10.41.0",
+  "private": true,
   "description": "React + node starter kit. A fullstack boilerplate with authentication and authorisation",
-  "homepage": "https://github.com/FredericHeem/starhackit",
   "license": "NLPL",
   "scripts": {
     "start": "webpack serve --config webpack.dev.js --open",
     "start:admin": "webpack serve --config webpack.dev.js --open-page=admin/users",
     "start:user": "webpack serve --config webpack.dev.js --open-page=user/profile",
     "start:public": "webpack serve --config webpack.dev.js --open-page=public",
+    "start:infra": "webpack serve --config webpack.dev.js --open-page=infra",
     "start:prod": "http-server dist/",
-    "prestart": "npm run prebuild",
-    "lint": "tslint -c tslint.json './src/**/*.{js,jsx,ts,tsx}'",
     "cpd": "jscpd -r console --format 'javascript,typescript' ./src",
-    "prebuild": "npm run lint && npm run cpd",
     "build": "webpack --config webpack.prod.js",
     "clean": "rimraf dist coverage",
     "test": "karma start --single-run --no-auto-watch karma.conf.js",
     "test:watch": "karma start --auto-watch --no-single-run karma.conf.js",
-    "e2e": "npm run nightwatch",
     "nightwatch": "cd test/nightwatch/ && nightwatch",
     "docker:build": "docker build -t ui .",
     "docker:tag": "docker tag ui fredericheem/ui:latest",
@@ -28,60 +25,55 @@
     "preversion": "npm test",
     "postversion": "git push && git push --tags"
   },
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:FredericHeem/starhackit.git"
-  },
-  "bugs": {
-    "url": "https://github.com/FredericHeem/starhackit/issues"
-  },
   "browserslist": "last 2 versions, ie 11",
   "dependencies": {
-    "@emotion/react": "11.1.4",
-    "@emotion/styled": "11.0.0",
-    "@material-ui/core": "4.11.2",
-    "@types/react": "17.0.0",
+    "@emotion/react": "11.4.0",
+    "@emotion/styled": "11.3.0",
+    "@material-ui/core": "4.11.4",
+    "@types/react": "17.0.5",
     "axios": "0.21.1",
+    "date-fns": "2.21.3",
     "debug": "4.3.1",
+    "dotenv": "9.0.1",
+    "dotenv-cli": "4.0.0",
     "history": "5.0.0",
-    "i18next": "19.8.4",
-    "i18next-browser-languagedetector": "6.0.1",
+    "i18next": "20.2.2",
+    "i18next-browser-languagedetector": "6.1.0",
     "i18next-xhr-backend": "3.2.2",
     "intl": "1.2.5",
-    "lodash": "4.17.20",
-    "mdlean": "0.29.0",
+    "lodash": "4.17.21",
+    "mdlean": "0.44.0",
     "mitt": "2.1.0",
-    "mobx": "6.0.4",
-    "mobx-react": "7.0.5",
+    "mobx": "6.3.0",
+    "mobx-react": "7.1.0",
     "prop-types": "15.7.2",
-    "qs": "6.9.4",
-    "react": "17.0.1",
-    "react-dom": "17.0.1",
-    "react-icons": "4.1.0",
-    "react-leanimate": "0.16.0",
+    "qs": "6.10.1",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "react-icons": "4.2.0",
     "react-pagify": "2.4.0",
     "reactabular-table": "8.14.0",
+    "rubico": "1.6.25",
     "segmentize": "0.4.1",
     "universal-router": "9.0.1",
     "validate.js": "0.13.1"
   },
   "devDependencies": {
     "bluebird": "3.7.2",
-    "chai": "4.2.0",
+    "chai": "4.3.4",
     "chai-as-promised": "7.1.1",
     "chance": "1.1.7",
-    "chromedriver": "88.0.0",
     "clean-webpack-plugin": "3.0.0",
-    "compression-webpack-plugin": "7.1.1",
-    "copy-webpack-plugin": "7.0.0",
-    "css-loader": "5.0.1",
+    "compression-webpack-plugin": "7.1.2",
+    "copy-webpack-plugin": "8.1.1",
+    "css-loader": "5.2.4",
     "file-loader": "6.2.0",
-    "html-webpack-plugin": "4.5.1",
+    "html-webpack-plugin": "5.3.1",
     "http-server": "0.12.3",
-    "imports-loader": "1.2.0",
-    "jscpd": "3.3.23",
+    "imports-loader": "2.0.0",
+    "jscpd": "3.3.25",
     "json-loader": "0.5.7",
-    "karma": "5.2.3",
+    "karma": "6.3.2",
     "karma-chai": "0.1.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage": "2.0.3",
@@ -92,24 +84,20 @@
     "karma-sourcemap-loader": "0.3.8",
     "karma-webpack": "5.0.0-alpha.5",
     "lodash-webpack-plugin": "0.11.6",
-    "mini-css-extract-plugin": "1.3.3",
-    "mocha": "8.2.1",
-    "nightwatch": "1.5.1",
-    "puppeteer": "5.5.0",
-    "sinon": "9.2.3",
+    "mini-css-extract-plugin": "1.6.0",
+    "mocha": "8.4.0",
+    "puppeteer": "10.2.0",
+    "sinon": "10.0.0",
     "style-loader": "2.0.0",
-    "ts-loader": "8.0.14",
+    "ts-loader": "9.1.2",
     "ts-node": "9.1.1",
-    "tslint": "6.1.3",
-    "tslint-config-prettier": "1.18.0",
-    "tslint-loader": "3.5.4",
-    "typescript": "4.1.3",
+    "typescript": "4.2.4",
     "url-loader": "4.1.1",
-    "webpack": "5.12.1",
-    "webpack-bundle-analyzer": "4.3.0",
+    "webpack": "5.36.2",
+    "webpack-bundle-analyzer": "4.4.1",
     "webpack-bundle-size-analyzer": "3.1.0",
-    "webpack-cli": "4.3.1",
-    "webpack-dev-server": "3.11.1",
+    "webpack-cli": "4.7.0",
+    "webpack-dev-server": "3.11.2",
     "webpack-hud": "0.1.2"
   },
   "engines": {

client/package.json

@@ -1,3 +1,9 @@
 .text-center {
   text-align: center;
-}
+}
+ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  display: block;
+}

client/src/app.css

@@ -1,4 +1,4 @@
-//import "./app.css";
+import "./app.css";
 import Router from "./router";
 import Log from "utils/log";
 import config from "./config";
@@ -10,9 +10,9 @@ const initialScreenFadeOut = () => {
   if (loading) {
     loading.classList.add("m-fadeOut");
   }
-}
+};
 
-export default async function({ context, routes, layout }) {
+export default async function ({ context, routes, layout }) {
   const router = Router({ context, routes, layout });
 
   initialScreenFadeOut();
@@ -21,6 +21,6 @@ export default async function({ context, routes, layout }) {
 
   return {
     context,
-    router
-  }
+    router,
+  };
 }

client/src/app.js

@@ -8,9 +8,10 @@ export default async () => {
     config: {
       base: "/admin",
       title: "Admin",
+      loginPath: "/admin/auth/login",
       routeAfterLogin: "/admin/users",
-      defaultPath: "/admin/users"
-    }
+      defaultPath: "/admin/users",
+    },
   });
 
   return App({ context, routes: createRoutes({ context }), layout });

client/src/app_admin/AdminApp.js

@@ -3,10 +3,10 @@ import { observer } from "mobx-react";
 import page from "components/Page";
 import paper from "components/Paper";
 import input from "mdlean/lib/input";
-import spinner from "components/spinner";
-import formGroup from "components/FormGroup";
+import spinner from "mdlean/lib/spinner";
+import formGroup from "mdlean/lib/formGroup";
 
-export default context => {
+export default (context) => {
   const { tr } = context;
   const FormGroup = formGroup(context);
   const Page = page(context);