Merge ac74bbd into c0170a1

BoostV · Nov 18, 2022 · c51aca7 · c51aca7
2 parents c0170a1 + ac74bbd
commit c51aca7
Show file tree

Hide file tree

Showing 98 changed files with 2,522 additions and 4,038 deletions.
diff --git a/.env.development b/.env.development
@@ -1 +1,2 @@
-NEXT_PUBLIC_API_SERVER=http://localhost:9090/v1.0
+VITE_PUBLIC_API_SERVER=http://localhost:9090/v1.0
+VITE_BASE_PATH=/
diff --git a/.env.production b/.env.production
@@ -1 +1,2 @@
-NEXT_PUBLIC_API_SERVER=http://localhost:9090/v1.0
+VITE_PUBLIC_API_SERVER=http://localhost:9090/v1.0
+VITE_BASE_PATH=/
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,4 +1,28 @@
 {
-  "plugins": ["react", "prettier"],
-  "extends": ["next/core-web-vitals", "prettier"]
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react/jsx-runtime"
+  ],
+  "overrides": [],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": ["react", "@typescript-eslint"],
+  "rules": {
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-extra-semi": "off"
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  }
 }
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,6 +18,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
+  BRANCH: ${{ github.ref_name }}
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
@@ -44,7 +45,7 @@ jobs:
         run: yarn prettier --check .
 
       - name: Build distribution
-        run: yarn build-static
+        run: yarn build
 
       -
         name: Docker meta

diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,4 @@ db
 /specification.yml
 .vscode
 tsconfig.tsbuildinfo
+dist
diff --git a/.prettierignore b/.prettierignore
@@ -3,6 +3,7 @@
 .github
 node_modules
 out
+dist
 public
 tmp
 openapi

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM nginx
-COPY ./out /usr/share/nginx/html
+COPY ./dist /usr/share/nginx/html
 COPY ./docker-entrypoint.sh /docker-entrypoint.d
 COPY ./nginx-spa.conf /etc/nginx/conf.d/default.conf
 

diff --git a/Dockerfile.nextjs b/Dockerfile.nextjs
diff --git a/index.html b/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Process Optimizer Frontend</title>
+    <script type="module" src="/src/jquery-shim.ts"></script>
+    <script type="module" src="/src/main.tsx"></script>
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/jest.config.js b/jest.config.js
diff --git a/jest.setup.ts b/jest.setup.ts
diff --git a/next-env.d.ts b/next-env.d.ts
diff --git a/next.config.js b/next.config.js
diff --git a/package.json b/package.json
@@ -3,13 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "build-static": "next build && next export",
-    "start": "next start",
-    "lint": "eslint .",
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "start": "vite preview",
+    "lint": "eslint src",
     "formatAll": "prettier --write .",
-    "test": "jest",
+    "prettier": "prettier --check .",
+    "test": "vitest",
     "prepare": "husky install",
     "openapi": "openapi-generator-cli generate  -i https://raw.githubusercontent.com/BoostV/process-optimizer-api/v2.1.0/optimizerapi/openapi/specification.yml -g typescript-fetch -o ./openapi --additional-properties=nullSafeAdditionalProps && prettier --write ./openapi"
   },
@@ -25,45 +25,46 @@
     "@mui/icons-material": "^5.8.4",
     "@mui/lab": "^5.0.0-alpha.87",
     "@mui/material": "^5.8.6",
-    "@mui/styles": "^5.8.6",
     "@types/recharts": "^1.8.23",
     "compare-versions": "^4.1.3",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-prettier": "4.1.0",
     "immer": "^9.0.15",
-    "next": "^12.1.6",
-    "prettier": "2.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.1",
     "react-hook-form": "^7.33.0",
+    "react-router-dom": "^6.4.3",
     "recharts": "^2.1.12",
-    "swr": "^1.3.0",
+    "tss-react": "^4.4.4",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@openapitools/openapi-generator-cli": "2.5.1",
-    "@swc/jest": "^0.2.21",
     "@testing-library/dom": "^8.13.0",
-    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^14.2.0",
     "@types/node": "^18.0.0",
     "@types/react": "^18.0.14",
     "@types/rimraf": "^3.0.0",
     "@types/uuid": "^8.3.4",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
+    "@vitejs/plugin-react": "^2.2.0",
     "eslint": "8.18.0",
-    "eslint-config-next": "12.1.6",
-    "git-revision-webpack-plugin": "^5.0.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-jest-dom": "^4.0.3",
+    "eslint-plugin-prettier": "4.1.0",
+    "eslint-plugin-react": "^7.31.10",
+    "eslint-plugin-testing-library": "^5.9.1",
     "husky": "^8.0.1",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^28.1.1",
-    "jest-dom": "^4.0.0",
-    "jest-environment-jsdom": "^28.1.1",
+    "jsdom": "^20.0.2",
     "lint-staged": "^13.0.3",
     "node-mocks-http": "^1.10.1",
+    "prettier": "2.7.1",
     "react-devtools": "^4.24.7",
     "rimraf": "^3.0.2",
-    "typescript": "^4.7.4"
+    "typescript": "^4.7.4",
+    "vite": "^3.2.4",
+    "vitest": "^0.25.2"
   }
 }
diff --git a/pages/_app.tsx b/pages/_app.tsx
diff --git a/pages/_document.tsx b/pages/_document.tsx
diff --git a/pages/index.tsx b/pages/index.tsx