merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 44 insertions, 36 deletions

diff --git a/opendc-web/opendc-web-ui/package.json b/opendc-web/opendc-web-ui/package.json
index c64a3c11..427e3cbd 100644
--- a/opendc-web/opendc-web-ui/package.json
+++ b/opendc-web/opendc-web-ui/package.json
@@ -10,46 +10,54 @@
     ],
     "homepage": "http://opendc.org",
     "bugs": {
-        "url": "https://github.com/atlarge-research/opendc-frontend/issues",
+        "url": "https://github.com/atlarge-research/opendc/issues",
         "email": "opendc@atlarge-research.com"
     },
-    "author": "Georgios Andreadis <g.andreadis@atlarge-research.com> (https://gandreadis.com/)",
+    "author": "OpenDC Maintainers <opendc@atlarge-research.com>",
     "license": "MIT",
     "private": true,
-    "proxy": "http://localhost:8081",
     "dependencies": {
-        "@sentry/react": "^5.27.3",
-        "@sentry/tracing": "^5.27.3",
-        "approximate-number": "~2.0.0",
-        "bootstrap": "4.5.3",
-        "classnames": "~2.2.5",
-        "husky": "~4.2.5",
-        "konva": "~6.0.0",
-        "lint-staged": "~10.2.2",
-        "mathjs": "~7.1.0",
-        "prettier": "~2.0.5",
-        "prop-types": "~15.7.2",
-        "react": "~16.13.1",
-        "react-document-title": "~2.0.3",
-        "react-dom": "~16.13.1",
-        "react-fontawesome": "~1.7.1",
-        "react-google-login": "~5.1.14",
-        "react-konva": "~16.13.0-2",
-        "react-redux": "~7.2.0",
-        "react-router-dom": "~5.1.2",
-        "react-scripts": "~3.4.1",
-        "react-shortcuts": "~2.1.0",
-        "reactstrap": "^8.6.0",
-        "recharts": "~1.8.5",
-        "redux": "~4.0.5",
-        "redux-localstorage": "~0.4.1",
+        "@auth0/auth0-react": "^1.7.0",
+        "@fortawesome/fontawesome-svg-core": "^1.2.35",
+        "@fortawesome/free-brands-svg-icons": "^5.15.3",
+        "@fortawesome/free-solid-svg-icons": "^5.15.3",
+        "@fortawesome/react-fontawesome": "^0.1.14",
+        "@patternfly/react-core": "^4.152.4",
+        "@patternfly/react-icons": "^4.11.14",
+        "@patternfly/react-table": "^4.29.58",
+        "@sentry/react": "^5.30.0",
+        "@sentry/tracing": "^5.30.0",
+        "approximate-number": "^2.1.0",
+        "classnames": "^2.3.1",
+        "husky": "^4.3.8",
+        "immer": "^9.0.6",
+        "konva": "^7.2.5",
+        "lint-staged": "^10.5.4",
+        "mathjs": "^7.6.0",
+        "next": "^11.1.2",
+        "next-transpile-modules": "^8.0.0",
+        "normalizr": "^3.6.1",
+        "prettier": "^2.3.2",
+        "prop-types": "^15.7.2",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
+        "react-hotkeys": "^2.0.0",
+        "react-konva": "^17.0.2-5",
+        "react-query": "^3.22.0",
+        "react-redux": "^7.2.5",
+        "recharts": "^2.1.2",
+        "redux": "^4.1.1",
         "redux-logger": "~3.0.6",
         "redux-saga": "~1.1.3",
         "redux-thunk": "~2.3.0",
-        "sass": "^1.32.12",
-        "socket.io-client": "~2.3.0",
-        "svgsaver": "~0.9.0",
-        "uuidv4": "~6.1.1"
+        "sass": "^1.39.0",
+        "svgsaver": "^0.9.0",
+        "use-resize-observer": "^8.0.0",
+        "uuidv4": "^6.2.12"
+    },
+    "devDependencies": {
+        "eslint": "^7.32.0",
+        "eslint-config-next": "^11.1.2"
     },
     "lint-staged": {
         "src/**/*.{js,jsx,json}": [
@@ -60,10 +68,10 @@
     "scripts": {
         "format": "prettier --write src",
         "precommit": "lint-staged",
-        "start": "react-scripts start",
-        "build": "react-scripts build",
-        "test": "react-scripts test --env=jsdom",
-        "eject": "react-scripts eject"
+        "dev": "next dev",
+        "build": "next build",
+        "start": "next start",
+        "export": "next export -o build"
     },
     "browserslist": {
         "production": [