From a53181d96a926a219e231f5e9c6e762f439885fc Mon Sep 17 00:00:00 2001 From: Gang Li Date: Wed, 1 Nov 2023 22:05:00 +0800 Subject: [PATCH] Organize the folder structure --- src/main/webui/assets.js | 16 ++++++---------- src/main/webui/package.json | 7 ++----- src/main/webui/{ => src}/app/css/.gitkeep | 0 src/main/webui/{ => src}/app/css/indy.css | 0 src/main/webui/{ => src}/app/favicon.ico | Bin src/main/webui/{ => src}/app/img/.gitkeep | 0 src/main/webui/{ => src}/app/index.html | 0 src/main/webui/{ => src}/app/index.js | 0 src/main/webui/{ => src}/app/js/app.js | 0 src/main/webui/{ => src}/app/js/boot.js | 0 src/main/webui/{ => src}/app/js/controllers.js | 0 src/main/webui/{ => src}/app/js/directives.js | 0 src/main/webui/{ => src}/app/js/filters.js | 0 src/main/webui/{ => src}/app/js/services.js | 0 src/main/webui/{ => src}/app/js/utils.js | 0 src/main/webui/{ => src}/app/keycloak.json | 0 src/main/webui/{ => src}/app/partials/.gitkeep | 0 .../{ => src}/app/partials/cache-delete.html | 0 .../app/partials/dialogs/changelog-dialog.html | 0 .../app/partials/dialogs/confirm-dialog.html | 0 .../app/partials/dialogs/save-dialog.html | 0 .../partials/directives/ap-group-available.html | 0 .../directives/ap-group-constituent.html | 0 .../webui/{ => src}/app/partials/footer.html | 0 .../{ => src}/app/partials/group-detail.html | 0 .../{ => src}/app/partials/group-edit.html | 0 .../{ => src}/app/partials/group-list.html | 0 .../{ => src}/app/partials/hosted-detail.html | 0 .../{ => src}/app/partials/hosted-edit.html | 0 .../{ => src}/app/partials/hosted-list.html | 0 .../app/partials/includes/group-view.html | 0 .../app/partials/includes/hosted-view.html | 0 .../app/partials/includes/remote-view.html | 0 .../partials/includes/store-control-panel.html | 0 src/main/webui/{ => src}/app/partials/nfc.html | 0 .../{ => src}/app/partials/remote-detail.html | 0 .../{ => src}/app/partials/remote-edit.html | 0 .../{ => src}/app/partials/remote-list.html | 0 .../content-browse}/DirectoryListing.jsx | 0 .../main => src/content-browse}/html/index.html | 0 .../src/main/js => src/content-browse}/index.js | 0 .../src/main/js => src/content-browse}/style.js | 0 .../webui/webpack-content-browse.dev.config.js | 2 +- .../webui/webpack-content-browse.prod.config.js | 2 +- src/main/webui/webpack.config.js | 2 +- 45 files changed, 11 insertions(+), 18 deletions(-) rename src/main/webui/{ => src}/app/css/.gitkeep (100%) rename src/main/webui/{ => src}/app/css/indy.css (100%) rename src/main/webui/{ => src}/app/favicon.ico (100%) rename src/main/webui/{ => src}/app/img/.gitkeep (100%) rename src/main/webui/{ => src}/app/index.html (100%) rename src/main/webui/{ => src}/app/index.js (100%) rename src/main/webui/{ => src}/app/js/app.js (100%) rename src/main/webui/{ => src}/app/js/boot.js (100%) rename src/main/webui/{ => src}/app/js/controllers.js (100%) rename src/main/webui/{ => src}/app/js/directives.js (100%) rename src/main/webui/{ => src}/app/js/filters.js (100%) rename src/main/webui/{ => src}/app/js/services.js (100%) rename src/main/webui/{ => src}/app/js/utils.js (100%) rename src/main/webui/{ => src}/app/keycloak.json (100%) rename src/main/webui/{ => src}/app/partials/.gitkeep (100%) rename src/main/webui/{ => src}/app/partials/cache-delete.html (100%) rename src/main/webui/{ => src}/app/partials/dialogs/changelog-dialog.html (100%) rename src/main/webui/{ => src}/app/partials/dialogs/confirm-dialog.html (100%) rename src/main/webui/{ => src}/app/partials/dialogs/save-dialog.html (100%) rename src/main/webui/{ => src}/app/partials/directives/ap-group-available.html (100%) rename src/main/webui/{ => src}/app/partials/directives/ap-group-constituent.html (100%) rename src/main/webui/{ => src}/app/partials/footer.html (100%) rename src/main/webui/{ => src}/app/partials/group-detail.html (100%) rename src/main/webui/{ => src}/app/partials/group-edit.html (100%) rename src/main/webui/{ => src}/app/partials/group-list.html (100%) rename src/main/webui/{ => src}/app/partials/hosted-detail.html (100%) rename src/main/webui/{ => src}/app/partials/hosted-edit.html (100%) rename src/main/webui/{ => src}/app/partials/hosted-list.html (100%) rename src/main/webui/{ => src}/app/partials/includes/group-view.html (100%) rename src/main/webui/{ => src}/app/partials/includes/hosted-view.html (100%) rename src/main/webui/{ => src}/app/partials/includes/remote-view.html (100%) rename src/main/webui/{ => src}/app/partials/includes/store-control-panel.html (100%) rename src/main/webui/{ => src}/app/partials/nfc.html (100%) rename src/main/webui/{ => src}/app/partials/remote-detail.html (100%) rename src/main/webui/{ => src}/app/partials/remote-edit.html (100%) rename src/main/webui/{ => src}/app/partials/remote-list.html (100%) rename src/main/webui/{content-browse/src/main/js => src/content-browse}/DirectoryListing.jsx (100%) rename src/main/webui/{content-browse/src/main => src/content-browse}/html/index.html (100%) rename src/main/webui/{content-browse/src/main/js => src/content-browse}/index.js (100%) rename src/main/webui/{content-browse/src/main/js => src/content-browse}/style.js (100%) diff --git a/src/main/webui/assets.js b/src/main/webui/assets.js index b9af36a..2285b20 100644 --- a/src/main/webui/assets.js +++ b/src/main/webui/assets.js @@ -20,7 +20,7 @@ const CSS = [ 'node_modules/ng-dialog/css/ngDialog-theme-default.css', 'node_modules/bootstrap/dist/css/bootstrap.min.css', 'node_modules/bootstrap/dist/css/bootstrap-theme.min.css', - {"from":"app/css/", "to":"css/"} + {"from":"src/app/css/", "to":"css/"} ]; const JS = [ 'node_modules/angular/angular.min.js', @@ -30,19 +30,15 @@ const JS = [ 'node_modules/ng-dialog/js/ngDialog.min.js', 'node_modules/jquery/dist/jquery.min.js', 'node_modules/bootstrap/dist/js/bootstrap.min.js', - {"from":"app/js/", "to":"js/"} + {"from":"src/app/js/", "to":"js/"} ]; const IMG=[ - {"from":"app/img/", "to":"img/"} + {"from":"src/app/img/", "to":"img/"} ]; -// const SWAGGER=[ -// 'node_modules/swagger-ui-dist/', -// {"from":"app/rest-api.html", "to":"rest-api.html"} -// ]; const OTHER=[ - {"from":"app/index.html", "to":"index.html"}, - {"from":"app/partials/", "to":"partials/"}, - {"from":"app/keycloak.json", "to":"keycloak.json"} + {"from":"src/app/index.html", "to":"index.html"}, + {"from":"src/app/partials/", "to":"partials/"}, + {"from":"src/app/keycloak.json", "to":"keycloak.json"} ] module.exports = [...JS, ...CSS, ...IMG, ...OTHER]; diff --git a/src/main/webui/package.json b/src/main/webui/package.json index 30c172c..d5bc1f8 100644 --- a/src/main/webui/package.json +++ b/src/main/webui/package.json @@ -46,10 +46,7 @@ "webpack": "node node_modules/webpack/bin/webpack.js --openssl-legacy-provider", "compile": "NODE_ENV=production webpack --config ./webpack.config.js --progress && webpack --config ./webpack-content-browse.prod.config.js --progress", "clean": "rm -rf ./dist", - "build": "npm run-script clean && npm run-script compile && cp ./content-browse/src/main/html/* ./dist/content-browse/ && rm ./dist/indy.bundle.js", - "start": "http-server ./dist -a localhost -p 8000", - "update-webdriver": "webdriver-manager update", - "preprotractor": "npm run update-webdriver", - "protractor": "protractor test/protractor-conf.js" + "build": "npm run-script clean && npm run-script compile && cp ./src/content-browse/html/* ./dist/content-browse/ && rm ./dist/indy.bundle.js", + "start": "http-server ./dist -a localhost -p 8000" } } diff --git a/src/main/webui/app/css/.gitkeep b/src/main/webui/src/app/css/.gitkeep similarity index 100% rename from src/main/webui/app/css/.gitkeep rename to src/main/webui/src/app/css/.gitkeep diff --git a/src/main/webui/app/css/indy.css b/src/main/webui/src/app/css/indy.css similarity index 100% rename from src/main/webui/app/css/indy.css rename to src/main/webui/src/app/css/indy.css diff --git a/src/main/webui/app/favicon.ico b/src/main/webui/src/app/favicon.ico similarity index 100% rename from src/main/webui/app/favicon.ico rename to src/main/webui/src/app/favicon.ico diff --git a/src/main/webui/app/img/.gitkeep b/src/main/webui/src/app/img/.gitkeep similarity index 100% rename from src/main/webui/app/img/.gitkeep rename to src/main/webui/src/app/img/.gitkeep diff --git a/src/main/webui/app/index.html b/src/main/webui/src/app/index.html similarity index 100% rename from src/main/webui/app/index.html rename to src/main/webui/src/app/index.html diff --git a/src/main/webui/app/index.js b/src/main/webui/src/app/index.js similarity index 100% rename from src/main/webui/app/index.js rename to src/main/webui/src/app/index.js diff --git a/src/main/webui/app/js/app.js b/src/main/webui/src/app/js/app.js similarity index 100% rename from src/main/webui/app/js/app.js rename to src/main/webui/src/app/js/app.js diff --git a/src/main/webui/app/js/boot.js b/src/main/webui/src/app/js/boot.js similarity index 100% rename from src/main/webui/app/js/boot.js rename to src/main/webui/src/app/js/boot.js diff --git a/src/main/webui/app/js/controllers.js b/src/main/webui/src/app/js/controllers.js similarity index 100% rename from src/main/webui/app/js/controllers.js rename to src/main/webui/src/app/js/controllers.js diff --git a/src/main/webui/app/js/directives.js b/src/main/webui/src/app/js/directives.js similarity index 100% rename from src/main/webui/app/js/directives.js rename to src/main/webui/src/app/js/directives.js diff --git a/src/main/webui/app/js/filters.js b/src/main/webui/src/app/js/filters.js similarity index 100% rename from src/main/webui/app/js/filters.js rename to src/main/webui/src/app/js/filters.js diff --git a/src/main/webui/app/js/services.js b/src/main/webui/src/app/js/services.js similarity index 100% rename from src/main/webui/app/js/services.js rename to src/main/webui/src/app/js/services.js diff --git a/src/main/webui/app/js/utils.js b/src/main/webui/src/app/js/utils.js similarity index 100% rename from src/main/webui/app/js/utils.js rename to src/main/webui/src/app/js/utils.js diff --git a/src/main/webui/app/keycloak.json b/src/main/webui/src/app/keycloak.json similarity index 100% rename from src/main/webui/app/keycloak.json rename to src/main/webui/src/app/keycloak.json diff --git a/src/main/webui/app/partials/.gitkeep b/src/main/webui/src/app/partials/.gitkeep similarity index 100% rename from src/main/webui/app/partials/.gitkeep rename to src/main/webui/src/app/partials/.gitkeep diff --git a/src/main/webui/app/partials/cache-delete.html b/src/main/webui/src/app/partials/cache-delete.html similarity index 100% rename from src/main/webui/app/partials/cache-delete.html rename to src/main/webui/src/app/partials/cache-delete.html diff --git a/src/main/webui/app/partials/dialogs/changelog-dialog.html b/src/main/webui/src/app/partials/dialogs/changelog-dialog.html similarity index 100% rename from src/main/webui/app/partials/dialogs/changelog-dialog.html rename to src/main/webui/src/app/partials/dialogs/changelog-dialog.html diff --git a/src/main/webui/app/partials/dialogs/confirm-dialog.html b/src/main/webui/src/app/partials/dialogs/confirm-dialog.html similarity index 100% rename from src/main/webui/app/partials/dialogs/confirm-dialog.html rename to src/main/webui/src/app/partials/dialogs/confirm-dialog.html diff --git a/src/main/webui/app/partials/dialogs/save-dialog.html b/src/main/webui/src/app/partials/dialogs/save-dialog.html similarity index 100% rename from src/main/webui/app/partials/dialogs/save-dialog.html rename to src/main/webui/src/app/partials/dialogs/save-dialog.html diff --git a/src/main/webui/app/partials/directives/ap-group-available.html b/src/main/webui/src/app/partials/directives/ap-group-available.html similarity index 100% rename from src/main/webui/app/partials/directives/ap-group-available.html rename to src/main/webui/src/app/partials/directives/ap-group-available.html diff --git a/src/main/webui/app/partials/directives/ap-group-constituent.html b/src/main/webui/src/app/partials/directives/ap-group-constituent.html similarity index 100% rename from src/main/webui/app/partials/directives/ap-group-constituent.html rename to src/main/webui/src/app/partials/directives/ap-group-constituent.html diff --git a/src/main/webui/app/partials/footer.html b/src/main/webui/src/app/partials/footer.html similarity index 100% rename from src/main/webui/app/partials/footer.html rename to src/main/webui/src/app/partials/footer.html diff --git a/src/main/webui/app/partials/group-detail.html b/src/main/webui/src/app/partials/group-detail.html similarity index 100% rename from src/main/webui/app/partials/group-detail.html rename to src/main/webui/src/app/partials/group-detail.html diff --git a/src/main/webui/app/partials/group-edit.html b/src/main/webui/src/app/partials/group-edit.html similarity index 100% rename from src/main/webui/app/partials/group-edit.html rename to src/main/webui/src/app/partials/group-edit.html diff --git a/src/main/webui/app/partials/group-list.html b/src/main/webui/src/app/partials/group-list.html similarity index 100% rename from src/main/webui/app/partials/group-list.html rename to src/main/webui/src/app/partials/group-list.html diff --git a/src/main/webui/app/partials/hosted-detail.html b/src/main/webui/src/app/partials/hosted-detail.html similarity index 100% rename from src/main/webui/app/partials/hosted-detail.html rename to src/main/webui/src/app/partials/hosted-detail.html diff --git a/src/main/webui/app/partials/hosted-edit.html b/src/main/webui/src/app/partials/hosted-edit.html similarity index 100% rename from src/main/webui/app/partials/hosted-edit.html rename to src/main/webui/src/app/partials/hosted-edit.html diff --git a/src/main/webui/app/partials/hosted-list.html b/src/main/webui/src/app/partials/hosted-list.html similarity index 100% rename from src/main/webui/app/partials/hosted-list.html rename to src/main/webui/src/app/partials/hosted-list.html diff --git a/src/main/webui/app/partials/includes/group-view.html b/src/main/webui/src/app/partials/includes/group-view.html similarity index 100% rename from src/main/webui/app/partials/includes/group-view.html rename to src/main/webui/src/app/partials/includes/group-view.html diff --git a/src/main/webui/app/partials/includes/hosted-view.html b/src/main/webui/src/app/partials/includes/hosted-view.html similarity index 100% rename from src/main/webui/app/partials/includes/hosted-view.html rename to src/main/webui/src/app/partials/includes/hosted-view.html diff --git a/src/main/webui/app/partials/includes/remote-view.html b/src/main/webui/src/app/partials/includes/remote-view.html similarity index 100% rename from src/main/webui/app/partials/includes/remote-view.html rename to src/main/webui/src/app/partials/includes/remote-view.html diff --git a/src/main/webui/app/partials/includes/store-control-panel.html b/src/main/webui/src/app/partials/includes/store-control-panel.html similarity index 100% rename from src/main/webui/app/partials/includes/store-control-panel.html rename to src/main/webui/src/app/partials/includes/store-control-panel.html diff --git a/src/main/webui/app/partials/nfc.html b/src/main/webui/src/app/partials/nfc.html similarity index 100% rename from src/main/webui/app/partials/nfc.html rename to src/main/webui/src/app/partials/nfc.html diff --git a/src/main/webui/app/partials/remote-detail.html b/src/main/webui/src/app/partials/remote-detail.html similarity index 100% rename from src/main/webui/app/partials/remote-detail.html rename to src/main/webui/src/app/partials/remote-detail.html diff --git a/src/main/webui/app/partials/remote-edit.html b/src/main/webui/src/app/partials/remote-edit.html similarity index 100% rename from src/main/webui/app/partials/remote-edit.html rename to src/main/webui/src/app/partials/remote-edit.html diff --git a/src/main/webui/app/partials/remote-list.html b/src/main/webui/src/app/partials/remote-list.html similarity index 100% rename from src/main/webui/app/partials/remote-list.html rename to src/main/webui/src/app/partials/remote-list.html diff --git a/src/main/webui/content-browse/src/main/js/DirectoryListing.jsx b/src/main/webui/src/content-browse/DirectoryListing.jsx similarity index 100% rename from src/main/webui/content-browse/src/main/js/DirectoryListing.jsx rename to src/main/webui/src/content-browse/DirectoryListing.jsx diff --git a/src/main/webui/content-browse/src/main/html/index.html b/src/main/webui/src/content-browse/html/index.html similarity index 100% rename from src/main/webui/content-browse/src/main/html/index.html rename to src/main/webui/src/content-browse/html/index.html diff --git a/src/main/webui/content-browse/src/main/js/index.js b/src/main/webui/src/content-browse/index.js similarity index 100% rename from src/main/webui/content-browse/src/main/js/index.js rename to src/main/webui/src/content-browse/index.js diff --git a/src/main/webui/content-browse/src/main/js/style.js b/src/main/webui/src/content-browse/style.js similarity index 100% rename from src/main/webui/content-browse/src/main/js/style.js rename to src/main/webui/src/content-browse/style.js diff --git a/src/main/webui/webpack-content-browse.dev.config.js b/src/main/webui/webpack-content-browse.dev.config.js index d46ecbc..c03a4a0 100644 --- a/src/main/webui/webpack-content-browse.dev.config.js +++ b/src/main/webui/webpack-content-browse.dev.config.js @@ -17,7 +17,7 @@ const path = require('path') const webpack = require('webpack') module.exports = { - entry: './content-browse/src/main/js/index.js', + entry: './src/content-browse/index.js', output: { path: path.resolve(__dirname, 'dist/content-browse'), filename: 'app_bundle.js' diff --git a/src/main/webui/webpack-content-browse.prod.config.js b/src/main/webui/webpack-content-browse.prod.config.js index 9d7ef5b..32f6bae 100644 --- a/src/main/webui/webpack-content-browse.prod.config.js +++ b/src/main/webui/webpack-content-browse.prod.config.js @@ -18,7 +18,7 @@ const webpack = require('webpack') const TerserPlugin = require('terser-webpack-plugin') module.exports = { - entry: './content-browse/src/main/js/index.js', + entry: './src/content-browse/index.js', output: { path: path.resolve(__dirname, './dist/content-browse'), filename: 'app_bundle.js' diff --git a/src/main/webui/webpack.config.js b/src/main/webui/webpack.config.js index fa19af8..cdaed27 100644 --- a/src/main/webui/webpack.config.js +++ b/src/main/webui/webpack.config.js @@ -21,7 +21,7 @@ const Assets = require('./assets'); module.exports = { "mode": "production", - "entry": "./app/index.js", + "entry": "./src/app/index.js", "output": { "path": path.resolve(__dirname, 'dist'), "filename": "indy.bundle.js"