Move web ui code in its own directory

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/.eslintignore b/.eslintignore
index 2e753b54275d195251c7b8c44b3a7c8294036510..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +0,0 @@
-/src/ui/web

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3ae891ae7f8c7d6b1759775b9acd1480778aca7c..8091b25c09ace3dfe9d5775bf318c17db3286f7e 100644 (file)
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -21,7 +21,7 @@ updates:
       - 'olivierbagot'
     versioning-strategy: increase
   - package-ecosystem: 'npm'
-    directory: '/src/ui/web'
+    directory: '/ui/web'
     schedule:
       interval: 'daily'
     labels:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b62417bf97de13e62f80be9d38fa01cd621c18d7..5c2f0f157d9705f4e26837a65bbbc659825aefa1 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     defaults:
       run:
-        working-directory: src/ui/web
+        working-directory: ui/web
     strategy:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d302f589811053e22a1f93158887a82c1f4f14e..631bcdb0ba4709fe6aaa4067dc44d8ba6f78d9aa 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -384,7 +384,7 @@
 - Apply dependencies update [`4bfec50`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/4bfec50a28f4fdc26495641b7d23db923f5c97c0)
 - Use the generic OCPPServiceUtils import where appropriate [`cbb3711`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/cbb3711f55d6cc41a82fe4ff7104d8083077f526)
 - Fix undefined meterStop at sending stopTransaction [`1c3cfd4`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/1c3cfd4f4074733491c8e9ceee59c044a0d0800b)
-- Align more request and reponse handlers name [`97f0a1a`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/97f0a1a56a61c831615eee3717e84787ccafb5ce)
+- Align more request and response handlers name [`97f0a1a`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/97f0a1a56a61c831615eee3717e84787ccafb5ce)
 - Fix assets directory cleanup at build in target directory [`045639f`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/045639f584167bbd8459bba6125f3cc767510419)
 - AjvErrorsToErrorType -> ajvErrorsToErrorType [`01a4dcb`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/01a4dcbb168f3fb8c52b81a6ff5473b4259f390f)
 - Simplify BroadcastChannel classes inheritance [`1598b27`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/1598b27c55255d49693d67950242661fefbe1d7d)
@@ -418,7 +418,7 @@
 - Improve supported OCPP commands filtering [`7645760`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/7645760b75ac201b8ec0b8378b986cabacce7807)
 - Apply dependencies update [`85c603d`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/85c603dabe1b0415dfa956baec73f34267093cf0)
 - Apply dependencies update [`3eac8b7`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/3eac8b744f13a08908d43e308cb327152910eebd)
-- Apply dedendencies update [`7ec87a0`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/7ec87a04802c0db55a44600f10734c6fba909bae)
+- Apply dependencies update [`7ec87a0`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/7ec87a04802c0db55a44600f10734c6fba909bae)
 - Version 1.1.65 [`1798b55`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/1798b5506effb00fe98fc78696dacb5f0792cd5a)
 - Apply dependencies update [`d421f87`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/d421f877629367252376d4c7b180f6d4f291ead1)
 - Apply dependencies update [`c7755c3`](https://github.com/sap/e-mobility-charging-stations-simulator/commit/c7755c3f9e722522dc6c99a29861879a61ee0069)

diff --git a/README.md b/README.md
index e7b8a4b4c4a29a8c56ff00ccdaff4813f99097ea..7bdb708667baf9543ded62b4276d3ce07fa3b71a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ To start the program, run: `npm start`.
 
 ## Start Web UI
 
-See Web UI [README.md](src/ui/web/README.md) for more information.
+See Web UI [README.md](ui/web/README.md) for more information.
 
 ## Configuration files syntax
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6e77eba832e3ed44906d290727e2c2ef72d9c00a..3d57d1a45ba60ece0a012d9679a04fd065393401 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@ RUN npm run build
 
 # Build simulator dashboard
 WORKDIR /usr/builder/webui
-COPY src/ui/web ./
+COPY ui/web ./
 RUN npm set progress=false && npm config set depth 0 && npm cache clean --force && npm install
 RUN npm run build
 

diff --git a/e-mobility-charging-stations-simulator.code-workspace b/e-mobility-charging-stations-simulator.code-workspace
index b0df61ae478e4aaf630ba55b0d92805424f701df..cb8f650bda008b8505a7906385dad0c2471f6677 100644 (file)
--- a/e-mobility-charging-stations-simulator.code-workspace
+++ b/e-mobility-charging-stations-simulator.code-workspace
@@ -4,7 +4,7 @@
       "path": "."
     },
     {
-      "path": "src/ui/web"
+      "path": "ui/web"
     }
   ],
   "extensions": {

diff --git a/sonar-project.properties b/sonar-project.properties
index aee02cee35334ab114edf04b6ecc8dba4e786c2f..ad7f3a6eef9ae35a97f2c09b5bcf978caf75e17c 100644 (file)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -7,7 +7,7 @@ sonar.projectVersion=1.1.85
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 sonar.sources=src
-sonar.tests=test,src/ui/web/tests
+sonar.tests=test
 
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
 

diff --git a/src/ui/web/.browserslistrc b/ui/web/.browserslistrc
similarity index 100%
rename from src/ui/web/.browserslistrc
rename to ui/web/.browserslistrc

diff --git a/src/ui/web/.editorconfig b/ui/web/.editorconfig
similarity index 100%
rename from src/ui/web/.editorconfig
rename to ui/web/.editorconfig

diff --git a/src/ui/web/.eslintrc.js b/ui/web/.eslintrc.js
similarity index 100%
rename from src/ui/web/.eslintrc.js
rename to ui/web/.eslintrc.js

diff --git a/src/ui/web/.gitignore b/ui/web/.gitignore
similarity index 100%
rename from src/ui/web/.gitignore
rename to ui/web/.gitignore

diff --git a/src/ui/web/.lintstagedrc.js b/ui/web/.lintstagedrc.js
similarity index 100%
rename from src/ui/web/.lintstagedrc.js
rename to ui/web/.lintstagedrc.js

diff --git a/src/ui/web/.vscode/extensions.json b/ui/web/.vscode/extensions.json
similarity index 100%
rename from src/ui/web/.vscode/extensions.json
rename to ui/web/.vscode/extensions.json

diff --git a/src/ui/web/.vscode/launch.json b/ui/web/.vscode/launch.json
similarity index 100%
rename from src/ui/web/.vscode/launch.json
rename to ui/web/.vscode/launch.json

diff --git a/src/ui/web/.vscode/settings.json b/ui/web/.vscode/settings.json
similarity index 100%
rename from src/ui/web/.vscode/settings.json
rename to ui/web/.vscode/settings.json

diff --git a/src/ui/web/README.md b/ui/web/README.md
similarity index 100%
rename from src/ui/web/README.md
rename to ui/web/README.md

diff --git a/src/ui/web/babel.config.js b/ui/web/babel.config.js
similarity index 100%
rename from src/ui/web/babel.config.js
rename to ui/web/babel.config.js

diff --git a/src/ui/web/package-lock.json b/ui/web/package-lock.json
similarity index 100%
rename from src/ui/web/package-lock.json
rename to ui/web/package-lock.json

diff --git a/src/ui/web/package.json b/ui/web/package.json
similarity index 100%
rename from src/ui/web/package.json
rename to ui/web/package.json

diff --git a/src/ui/web/public/favicon.ico b/ui/web/public/favicon.ico
similarity index 100%
rename from src/ui/web/public/favicon.ico
rename to ui/web/public/favicon.ico

diff --git a/src/ui/web/public/index.html b/ui/web/public/index.html
similarity index 100%
rename from src/ui/web/public/index.html
rename to ui/web/public/index.html

diff --git a/src/ui/web/src/App.vue b/ui/web/src/App.vue
similarity index 100%
rename from src/ui/web/src/App.vue
rename to ui/web/src/App.vue

diff --git a/src/ui/web/src/assets/config.ts b/ui/web/src/assets/config.ts
similarity index 100%
rename from src/ui/web/src/assets/config.ts
rename to ui/web/src/assets/config.ts

diff --git a/src/ui/web/src/assets/logo.png b/ui/web/src/assets/logo.png
similarity index 100%
rename from src/ui/web/src/assets/logo.png
rename to ui/web/src/assets/logo.png

diff --git a/src/ui/web/src/components/Container.vue b/ui/web/src/components/Container.vue
similarity index 100%
rename from src/ui/web/src/components/Container.vue
rename to ui/web/src/components/Container.vue

diff --git a/src/ui/web/src/components/Modal.vue b/ui/web/src/components/Modal.vue
similarity index 100%
rename from src/ui/web/src/components/Modal.vue
rename to ui/web/src/components/Modal.vue

diff --git a/src/ui/web/src/components/buttons/Button.vue b/ui/web/src/components/buttons/Button.vue
similarity index 100%
rename from src/ui/web/src/components/buttons/Button.vue
rename to ui/web/src/components/buttons/Button.vue

diff --git a/src/ui/web/src/components/buttons/FlatButton.vue b/ui/web/src/components/buttons/FlatButton.vue
similarity index 100%
rename from src/ui/web/src/components/buttons/FlatButton.vue
rename to ui/web/src/components/buttons/FlatButton.vue

diff --git a/src/ui/web/src/components/buttons/ReloadButton.vue b/ui/web/src/components/buttons/ReloadButton.vue
similarity index 100%
rename from src/ui/web/src/components/buttons/ReloadButton.vue
rename to ui/web/src/components/buttons/ReloadButton.vue

diff --git a/src/ui/web/src/components/charging-stations/CSConnector.vue b/ui/web/src/components/charging-stations/CSConnector.vue
similarity index 100%
rename from src/ui/web/src/components/charging-stations/CSConnector.vue
rename to ui/web/src/components/charging-stations/CSConnector.vue

diff --git a/src/ui/web/src/components/charging-stations/CSData.vue b/ui/web/src/components/charging-stations/CSData.vue
similarity index 100%
rename from src/ui/web/src/components/charging-stations/CSData.vue
rename to ui/web/src/components/charging-stations/CSData.vue

diff --git a/src/ui/web/src/components/charging-stations/CSInfoModal.vue b/ui/web/src/components/charging-stations/CSInfoModal.vue
similarity index 100%
rename from src/ui/web/src/components/charging-stations/CSInfoModal.vue
rename to ui/web/src/components/charging-stations/CSInfoModal.vue

diff --git a/src/ui/web/src/components/charging-stations/CSTable.vue b/ui/web/src/components/charging-stations/CSTable.vue
similarity index 100%
rename from src/ui/web/src/components/charging-stations/CSTable.vue
rename to ui/web/src/components/charging-stations/CSTable.vue

diff --git a/src/ui/web/src/components/charging-stations/IdTagInputModal.vue b/ui/web/src/components/charging-stations/IdTagInputModal.vue
similarity index 100%
rename from src/ui/web/src/components/charging-stations/IdTagInputModal.vue
rename to ui/web/src/components/charging-stations/IdTagInputModal.vue

diff --git a/src/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
similarity index 100%
rename from src/ui/web/src/composables/UIClient.ts
rename to ui/web/src/composables/UIClient.ts

diff --git a/src/ui/web/src/composables/Utils.ts b/ui/web/src/composables/Utils.ts
similarity index 100%
rename from src/ui/web/src/composables/Utils.ts
rename to ui/web/src/composables/Utils.ts

diff --git a/src/ui/web/src/main.ts b/ui/web/src/main.ts
similarity index 100%
rename from src/ui/web/src/main.ts
rename to ui/web/src/main.ts

diff --git a/src/ui/web/src/router/index.ts b/ui/web/src/router/index.ts
similarity index 100%
rename from src/ui/web/src/router/index.ts
rename to ui/web/src/router/index.ts

diff --git a/src/ui/web/src/shims-vue.d.ts b/ui/web/src/shims-vue.d.ts
similarity index 100%
rename from src/ui/web/src/shims-vue.d.ts
rename to ui/web/src/shims-vue.d.ts

diff --git a/src/ui/web/src/types/ChargingStationType.ts b/ui/web/src/types/ChargingStationType.ts
similarity index 100%
rename from src/ui/web/src/types/ChargingStationType.ts
rename to ui/web/src/types/ChargingStationType.ts

diff --git a/src/ui/web/src/types/ConfigurationType.ts b/ui/web/src/types/ConfigurationType.ts
similarity index 100%
rename from src/ui/web/src/types/ConfigurationType.ts
rename to ui/web/src/types/ConfigurationType.ts

diff --git a/src/ui/web/src/types/JsonType.ts b/ui/web/src/types/JsonType.ts
similarity index 100%
rename from src/ui/web/src/types/JsonType.ts
rename to ui/web/src/types/JsonType.ts

diff --git a/src/ui/web/src/types/UIProtocol.ts b/ui/web/src/types/UIProtocol.ts
similarity index 100%
rename from src/ui/web/src/types/UIProtocol.ts
rename to ui/web/src/types/UIProtocol.ts

diff --git a/src/ui/web/src/views/ChargingStationsView.vue b/ui/web/src/views/ChargingStationsView.vue
similarity index 100%
rename from src/ui/web/src/views/ChargingStationsView.vue
rename to ui/web/src/views/ChargingStationsView.vue

diff --git a/src/ui/web/start.js b/ui/web/start.js
similarity index 100%
rename from src/ui/web/start.js
rename to ui/web/start.js

diff --git a/src/ui/web/tests/unit/CSTable.spec.ts b/ui/web/tests/unit/CSTable.spec.ts
similarity index 100%
rename from src/ui/web/tests/unit/CSTable.spec.ts
rename to ui/web/tests/unit/CSTable.spec.ts

diff --git a/src/ui/web/tsconfig.json b/ui/web/tsconfig.json
similarity index 100%
rename from src/ui/web/tsconfig.json
rename to ui/web/tsconfig.json

diff --git a/src/ui/web/vue.config.js b/ui/web/vue.config.js
similarity index 100%
rename from src/ui/web/vue.config.js
rename to ui/web/vue.config.js