From ee4618c67b7e9a5754cd63866d016bc2a7ecf6b2 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 29 Aug 2020 12:40:40 +0200 Subject: [PATCH] Moved AdmimUi modules to /src/main, some small improvments Former-commit-id: 4dbaa4fb835a9eb5e1c700abf588421070094964 --- ccm-core/pom.xml | 8 +- ccm-core/src/ccm-admin-dashboard/src/App.vue | 34 -- .../{ => main}/ccm-admin-dashboard/.gitignore | 0 .../{ => main}/ccm-admin-dashboard/README.md | 0 .../ccm-admin-dashboard/babel.config.js | 0 .../ccm-admin-dashboard/package-lock.json | 321 +++++++++--------- .../ccm-admin-dashboard/package.json | 2 +- .../ccm-admin-dashboard/public/favicon.ico | Bin .../ccm-admin-dashboard/public/index.html | 0 .../src/main/ccm-admin-dashboard/src/App.vue | 48 +++ .../ccm-admin-dashboard/src/admin-ui.ts | 0 .../ccm-admin-dashboard/src/main.ts | 0 .../ccm-admin-dashboard/src/router/index.ts | 0 .../ccm-admin-dashboard/src/shims-tsx.d.ts | 0 .../ccm-admin-dashboard/src/shims-vue.d.ts | 0 .../ccm-admin-dashboard/src/store/index.ts | 0 .../ccm-admin-dashboard/src/views/About.vue | 0 .../ccm-admin-dashboard/src/views/Home.vue | 0 .../ccm-admin-dashboard/tsconfig.json | 0 .../ccm-admin-systeminformation/.gitignore | 0 .../ccm-admin-systeminformation/README.md | 0 .../babel.config.js | 0 .../package-lock.json | 321 +++++++++--------- .../ccm-admin-systeminformation/package.json | 2 +- .../public/favicon.ico | Bin .../public/index.html | 0 .../ccm-admin-systeminformation/src/App.vue | 0 .../src/assets/logo.png | Bin .../src/components/HelloWorld.vue | 0 .../ccm-admin-systeminformation/src/main.ts | 0 .../src/router/index.ts | 0 .../src/shims-tsx.d.ts | 0 .../src/shims-vue.d.ts | 0 .../src/store/index.ts | 0 .../src/views/About.vue | 0 .../src/views/Home.vue | 0 .../ccm-admin-systeminformation/tsconfig.json | 0 .../org/libreccm/ui/admin/DashboardApp.java | 2 +- .../templates/admin-ui/admin-ui.html.ftl | 4 + 39 files changed, 371 insertions(+), 371 deletions(-) delete mode 100644 ccm-core/src/ccm-admin-dashboard/src/App.vue rename ccm-core/src/{ => main}/ccm-admin-dashboard/.gitignore (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/README.md (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/babel.config.js (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/package-lock.json (99%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/package.json (95%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/public/favicon.ico (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/public/index.html (100%) create mode 100644 ccm-core/src/main/ccm-admin-dashboard/src/App.vue rename ccm-core/src/{ => main}/ccm-admin-dashboard/src/admin-ui.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/src/main.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/src/router/index.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/src/shims-tsx.d.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/src/shims-vue.d.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/src/store/index.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/src/views/About.vue (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/src/views/Home.vue (100%) rename ccm-core/src/{ => main}/ccm-admin-dashboard/tsconfig.json (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/.gitignore (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/README.md (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/babel.config.js (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/package-lock.json (99%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/package.json (94%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/public/favicon.ico (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/public/index.html (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/App.vue (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/assets/logo.png (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/components/HelloWorld.vue (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/main.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/router/index.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/shims-tsx.d.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/shims-vue.d.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/store/index.ts (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/views/About.vue (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/src/views/Home.vue (100%) rename ccm-core/src/{ => main}/ccm-admin-systeminformation/tsconfig.json (100%) diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 94914af6b..7a8d9e099 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -483,7 +483,7 @@ install - src/ccm-admin-dashboard + src/main/ccm-admin-dashboard @@ -493,7 +493,7 @@ run build - src/ccm-admin-dashboard + src/main/ccm-admin-dashboard @@ -503,7 +503,7 @@ install - src/ccm-admin-systeminformation + src/main/ccm-admin-systeminformation @@ -513,7 +513,7 @@ run build - src/ccm-admin-systeminformation + src/main/ccm-admin-systeminformation diff --git a/ccm-core/src/ccm-admin-dashboard/src/App.vue b/ccm-core/src/ccm-admin-dashboard/src/App.vue deleted file mode 100644 index 2e7d042c5..000000000 --- a/ccm-core/src/ccm-admin-dashboard/src/App.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - diff --git a/ccm-core/src/ccm-admin-dashboard/.gitignore b/ccm-core/src/main/ccm-admin-dashboard/.gitignore similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/.gitignore rename to ccm-core/src/main/ccm-admin-dashboard/.gitignore diff --git a/ccm-core/src/ccm-admin-dashboard/README.md b/ccm-core/src/main/ccm-admin-dashboard/README.md similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/README.md rename to ccm-core/src/main/ccm-admin-dashboard/README.md diff --git a/ccm-core/src/ccm-admin-dashboard/babel.config.js b/ccm-core/src/main/ccm-admin-dashboard/babel.config.js similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/babel.config.js rename to ccm-core/src/main/ccm-admin-dashboard/babel.config.js diff --git a/ccm-core/src/ccm-admin-dashboard/package-lock.json b/ccm-core/src/main/ccm-admin-dashboard/package-lock.json similarity index 99% rename from ccm-core/src/ccm-admin-dashboard/package-lock.json rename to ccm-core/src/main/ccm-admin-dashboard/package-lock.json index db9e5c503..a9857a5c3 100644 --- a/ccm-core/src/ccm-admin-dashboard/package-lock.json +++ b/ccm-core/src/main/ccm-admin-dashboard/package-lock.json @@ -1805,6 +1805,91 @@ "tslint": "^5.20.1", "webpack": "^4.0.0", "yorkie": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "fork-ts-checker-webpack-plugin-v5": { + "version": "npm:fork-ts-checker-webpack-plugin@5.1.0", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz", + "integrity": "sha512-vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g==", + "dev": true, + "optional": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@types/json-schema": "^7.0.5", + "chalk": "^4.1.0", + "cosmiconfig": "^6.0.0", + "deepmerge": "^4.2.2", + "fs-extra": "^9.0.0", + "memfs": "^3.1.2", + "minimatch": "^3.0.4", + "schema-utils": "2.7.0", + "semver": "^7.3.2", + "tapable": "^1.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true, + "optional": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "@vue/cli-plugin-vuex": { @@ -1883,6 +1968,17 @@ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", "dev": true }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", @@ -1909,6 +2005,34 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "find-cache-dir": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", @@ -1941,6 +2065,13 @@ "universalify": "^0.1.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -2014,6 +2145,16 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", @@ -2036,6 +2177,21 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.0.0-beta.5", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.5.tgz", + "integrity": "sha512-ciWfzNefqWlmzKznCWY9hl+fPP4KlQ0A9MtHbJ/8DpyY+dAM8gDrjufIdxwTgC4szE4EZC3A6ip/BbrqM84GqA==", + "dev": true, + "optional": true, + "requires": { + "@types/mini-css-extract-plugin": "^0.9.1", + "chalk": "^3.0.0", + "hash-sum": "^2.0.0", + "loader-utils": "^1.2.3", + "merge-source-map": "^1.1.0", + "source-map": "^0.6.1" + } } } }, @@ -5894,91 +6050,6 @@ "worker-rpc": "^0.1.0" } }, - "fork-ts-checker-webpack-plugin-v5": { - "version": "npm:fork-ts-checker-webpack-plugin@5.1.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz", - "integrity": "sha512-vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g==", - "dev": true, - "optional": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@types/json-schema": "^7.0.5", - "chalk": "^4.1.0", - "cosmiconfig": "^6.0.0", - "deepmerge": "^4.2.2", - "fs-extra": "^9.0.0", - "memfs": "^3.1.2", - "minimatch": "^3.0.4", - "schema-utils": "2.7.0", - "semver": "^7.3.2", - "tapable": "^1.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "optional": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", @@ -12259,86 +12330,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.0.0-beta.5", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.5.tgz", - "integrity": "sha512-ciWfzNefqWlmzKznCWY9hl+fPP4KlQ0A9MtHbJ/8DpyY+dAM8gDrjufIdxwTgC4szE4EZC3A6ip/BbrqM84GqA==", - "dev": true, - "optional": true, - "requires": { - "@types/mini-css-extract-plugin": "^0.9.1", - "chalk": "^3.0.0", - "hash-sum": "^2.0.0", - "loader-utils": "^1.2.3", - "merge-source-map": "^1.1.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "optional": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-property-decorator": { "version": "8.5.1", "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-8.5.1.tgz", diff --git a/ccm-core/src/ccm-admin-dashboard/package.json b/ccm-core/src/main/ccm-admin-dashboard/package.json similarity index 95% rename from ccm-core/src/ccm-admin-dashboard/package.json rename to ccm-core/src/main/ccm-admin-dashboard/package.json index 0e6974b90..d24bbe862 100644 --- a/ccm-core/src/ccm-admin-dashboard/package.json +++ b/ccm-core/src/main/ccm-admin-dashboard/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", - "build": "vue-cli-service build --dest ../../target/generated-resources/_admin/dashboard", + "build": "vue-cli-service build --dest ../../../target/generated-resources/_admin/dashboard", "lint": "vue-cli-service lint" }, "dependencies": { diff --git a/ccm-core/src/ccm-admin-dashboard/public/favicon.ico b/ccm-core/src/main/ccm-admin-dashboard/public/favicon.ico similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/public/favicon.ico rename to ccm-core/src/main/ccm-admin-dashboard/public/favicon.ico diff --git a/ccm-core/src/ccm-admin-dashboard/public/index.html b/ccm-core/src/main/ccm-admin-dashboard/public/index.html similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/public/index.html rename to ccm-core/src/main/ccm-admin-dashboard/public/index.html diff --git a/ccm-core/src/main/ccm-admin-dashboard/src/App.vue b/ccm-core/src/main/ccm-admin-dashboard/src/App.vue new file mode 100644 index 000000000..866c44ded --- /dev/null +++ b/ccm-core/src/main/ccm-admin-dashboard/src/App.vue @@ -0,0 +1,48 @@ + + + + diff --git a/ccm-core/src/ccm-admin-dashboard/src/admin-ui.ts b/ccm-core/src/main/ccm-admin-dashboard/src/admin-ui.ts similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/src/admin-ui.ts rename to ccm-core/src/main/ccm-admin-dashboard/src/admin-ui.ts diff --git a/ccm-core/src/ccm-admin-dashboard/src/main.ts b/ccm-core/src/main/ccm-admin-dashboard/src/main.ts similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/src/main.ts rename to ccm-core/src/main/ccm-admin-dashboard/src/main.ts diff --git a/ccm-core/src/ccm-admin-dashboard/src/router/index.ts b/ccm-core/src/main/ccm-admin-dashboard/src/router/index.ts similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/src/router/index.ts rename to ccm-core/src/main/ccm-admin-dashboard/src/router/index.ts diff --git a/ccm-core/src/ccm-admin-dashboard/src/shims-tsx.d.ts b/ccm-core/src/main/ccm-admin-dashboard/src/shims-tsx.d.ts similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/src/shims-tsx.d.ts rename to ccm-core/src/main/ccm-admin-dashboard/src/shims-tsx.d.ts diff --git a/ccm-core/src/ccm-admin-dashboard/src/shims-vue.d.ts b/ccm-core/src/main/ccm-admin-dashboard/src/shims-vue.d.ts similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/src/shims-vue.d.ts rename to ccm-core/src/main/ccm-admin-dashboard/src/shims-vue.d.ts diff --git a/ccm-core/src/ccm-admin-dashboard/src/store/index.ts b/ccm-core/src/main/ccm-admin-dashboard/src/store/index.ts similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/src/store/index.ts rename to ccm-core/src/main/ccm-admin-dashboard/src/store/index.ts diff --git a/ccm-core/src/ccm-admin-dashboard/src/views/About.vue b/ccm-core/src/main/ccm-admin-dashboard/src/views/About.vue similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/src/views/About.vue rename to ccm-core/src/main/ccm-admin-dashboard/src/views/About.vue diff --git a/ccm-core/src/ccm-admin-dashboard/src/views/Home.vue b/ccm-core/src/main/ccm-admin-dashboard/src/views/Home.vue similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/src/views/Home.vue rename to ccm-core/src/main/ccm-admin-dashboard/src/views/Home.vue diff --git a/ccm-core/src/ccm-admin-dashboard/tsconfig.json b/ccm-core/src/main/ccm-admin-dashboard/tsconfig.json similarity index 100% rename from ccm-core/src/ccm-admin-dashboard/tsconfig.json rename to ccm-core/src/main/ccm-admin-dashboard/tsconfig.json diff --git a/ccm-core/src/ccm-admin-systeminformation/.gitignore b/ccm-core/src/main/ccm-admin-systeminformation/.gitignore similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/.gitignore rename to ccm-core/src/main/ccm-admin-systeminformation/.gitignore diff --git a/ccm-core/src/ccm-admin-systeminformation/README.md b/ccm-core/src/main/ccm-admin-systeminformation/README.md similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/README.md rename to ccm-core/src/main/ccm-admin-systeminformation/README.md diff --git a/ccm-core/src/ccm-admin-systeminformation/babel.config.js b/ccm-core/src/main/ccm-admin-systeminformation/babel.config.js similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/babel.config.js rename to ccm-core/src/main/ccm-admin-systeminformation/babel.config.js diff --git a/ccm-core/src/ccm-admin-systeminformation/package-lock.json b/ccm-core/src/main/ccm-admin-systeminformation/package-lock.json similarity index 99% rename from ccm-core/src/ccm-admin-systeminformation/package-lock.json rename to ccm-core/src/main/ccm-admin-systeminformation/package-lock.json index 39f4fdf34..126096287 100644 --- a/ccm-core/src/ccm-admin-systeminformation/package-lock.json +++ b/ccm-core/src/main/ccm-admin-systeminformation/package-lock.json @@ -1805,6 +1805,91 @@ "tslint": "^5.20.1", "webpack": "^4.0.0", "yorkie": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "fork-ts-checker-webpack-plugin-v5": { + "version": "npm:fork-ts-checker-webpack-plugin@5.1.0", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz", + "integrity": "sha512-vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g==", + "dev": true, + "optional": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@types/json-schema": "^7.0.5", + "chalk": "^4.1.0", + "cosmiconfig": "^6.0.0", + "deepmerge": "^4.2.2", + "fs-extra": "^9.0.0", + "memfs": "^3.1.2", + "minimatch": "^3.0.4", + "schema-utils": "2.7.0", + "semver": "^7.3.2", + "tapable": "^1.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true, + "optional": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "@vue/cli-plugin-vuex": { @@ -1883,6 +1968,17 @@ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", "dev": true }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", @@ -1909,6 +2005,34 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "find-cache-dir": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", @@ -1941,6 +2065,13 @@ "universalify": "^0.1.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -2014,6 +2145,16 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", @@ -2036,6 +2177,21 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.0.0-beta.5", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.5.tgz", + "integrity": "sha512-ciWfzNefqWlmzKznCWY9hl+fPP4KlQ0A9MtHbJ/8DpyY+dAM8gDrjufIdxwTgC4szE4EZC3A6ip/BbrqM84GqA==", + "dev": true, + "optional": true, + "requires": { + "@types/mini-css-extract-plugin": "^0.9.1", + "chalk": "^3.0.0", + "hash-sum": "^2.0.0", + "loader-utils": "^1.2.3", + "merge-source-map": "^1.1.0", + "source-map": "^0.6.1" + } } } }, @@ -5900,91 +6056,6 @@ "worker-rpc": "^0.1.0" } }, - "fork-ts-checker-webpack-plugin-v5": { - "version": "npm:fork-ts-checker-webpack-plugin@5.1.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz", - "integrity": "sha512-vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g==", - "dev": true, - "optional": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@types/json-schema": "^7.0.5", - "chalk": "^4.1.0", - "cosmiconfig": "^6.0.0", - "deepmerge": "^4.2.2", - "fs-extra": "^9.0.0", - "memfs": "^3.1.2", - "minimatch": "^3.0.4", - "schema-utils": "2.7.0", - "semver": "^7.3.2", - "tapable": "^1.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "optional": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", @@ -12259,86 +12330,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.0.0-beta.5", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.5.tgz", - "integrity": "sha512-ciWfzNefqWlmzKznCWY9hl+fPP4KlQ0A9MtHbJ/8DpyY+dAM8gDrjufIdxwTgC4szE4EZC3A6ip/BbrqM84GqA==", - "dev": true, - "optional": true, - "requires": { - "@types/mini-css-extract-plugin": "^0.9.1", - "chalk": "^3.0.0", - "hash-sum": "^2.0.0", - "loader-utils": "^1.2.3", - "merge-source-map": "^1.1.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "optional": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-property-decorator": { "version": "8.5.1", "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-8.5.1.tgz", diff --git a/ccm-core/src/ccm-admin-systeminformation/package.json b/ccm-core/src/main/ccm-admin-systeminformation/package.json similarity index 94% rename from ccm-core/src/ccm-admin-systeminformation/package.json rename to ccm-core/src/main/ccm-admin-systeminformation/package.json index 8c9651f37..d7370d1d7 100644 --- a/ccm-core/src/ccm-admin-systeminformation/package.json +++ b/ccm-core/src/main/ccm-admin-systeminformation/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", - "build": "vue-cli-service build --dest ../../target/generated-resources/_admin/systeminformation", + "build": "vue-cli-service build --dest ../../../target/generated-resources/_admin/systeminformation", "lint": "vue-cli-service lint" }, "dependencies": { diff --git a/ccm-core/src/ccm-admin-systeminformation/public/favicon.ico b/ccm-core/src/main/ccm-admin-systeminformation/public/favicon.ico similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/public/favicon.ico rename to ccm-core/src/main/ccm-admin-systeminformation/public/favicon.ico diff --git a/ccm-core/src/ccm-admin-systeminformation/public/index.html b/ccm-core/src/main/ccm-admin-systeminformation/public/index.html similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/public/index.html rename to ccm-core/src/main/ccm-admin-systeminformation/public/index.html diff --git a/ccm-core/src/ccm-admin-systeminformation/src/App.vue b/ccm-core/src/main/ccm-admin-systeminformation/src/App.vue similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/App.vue rename to ccm-core/src/main/ccm-admin-systeminformation/src/App.vue diff --git a/ccm-core/src/ccm-admin-systeminformation/src/assets/logo.png b/ccm-core/src/main/ccm-admin-systeminformation/src/assets/logo.png similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/assets/logo.png rename to ccm-core/src/main/ccm-admin-systeminformation/src/assets/logo.png diff --git a/ccm-core/src/ccm-admin-systeminformation/src/components/HelloWorld.vue b/ccm-core/src/main/ccm-admin-systeminformation/src/components/HelloWorld.vue similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/components/HelloWorld.vue rename to ccm-core/src/main/ccm-admin-systeminformation/src/components/HelloWorld.vue diff --git a/ccm-core/src/ccm-admin-systeminformation/src/main.ts b/ccm-core/src/main/ccm-admin-systeminformation/src/main.ts similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/main.ts rename to ccm-core/src/main/ccm-admin-systeminformation/src/main.ts diff --git a/ccm-core/src/ccm-admin-systeminformation/src/router/index.ts b/ccm-core/src/main/ccm-admin-systeminformation/src/router/index.ts similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/router/index.ts rename to ccm-core/src/main/ccm-admin-systeminformation/src/router/index.ts diff --git a/ccm-core/src/ccm-admin-systeminformation/src/shims-tsx.d.ts b/ccm-core/src/main/ccm-admin-systeminformation/src/shims-tsx.d.ts similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/shims-tsx.d.ts rename to ccm-core/src/main/ccm-admin-systeminformation/src/shims-tsx.d.ts diff --git a/ccm-core/src/ccm-admin-systeminformation/src/shims-vue.d.ts b/ccm-core/src/main/ccm-admin-systeminformation/src/shims-vue.d.ts similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/shims-vue.d.ts rename to ccm-core/src/main/ccm-admin-systeminformation/src/shims-vue.d.ts diff --git a/ccm-core/src/ccm-admin-systeminformation/src/store/index.ts b/ccm-core/src/main/ccm-admin-systeminformation/src/store/index.ts similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/store/index.ts rename to ccm-core/src/main/ccm-admin-systeminformation/src/store/index.ts diff --git a/ccm-core/src/ccm-admin-systeminformation/src/views/About.vue b/ccm-core/src/main/ccm-admin-systeminformation/src/views/About.vue similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/views/About.vue rename to ccm-core/src/main/ccm-admin-systeminformation/src/views/About.vue diff --git a/ccm-core/src/ccm-admin-systeminformation/src/views/Home.vue b/ccm-core/src/main/ccm-admin-systeminformation/src/views/Home.vue similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/src/views/Home.vue rename to ccm-core/src/main/ccm-admin-systeminformation/src/views/Home.vue diff --git a/ccm-core/src/ccm-admin-systeminformation/tsconfig.json b/ccm-core/src/main/ccm-admin-systeminformation/tsconfig.json similarity index 100% rename from ccm-core/src/ccm-admin-systeminformation/tsconfig.json rename to ccm-core/src/main/ccm-admin-systeminformation/tsconfig.json diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/DashboardApp.java b/ccm-core/src/main/java/org/libreccm/ui/admin/DashboardApp.java index 89c605929..d98a3a5e2 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/DashboardApp.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/DashboardApp.java @@ -79,7 +79,7 @@ public class DashboardApp implements AdminUiApp { public String[] getCssFilesUrls() { return new String[]{ "/_admin/dashboard/css/chunk-vendors.css", - "/_admin/dashboard/css/app.css" +// "/_admin/dashboard/css/app.css" }; } diff --git a/ccm-core/src/main/resources/templates/admin-ui/admin-ui.html.ftl b/ccm-core/src/main/resources/templates/admin-ui/admin-ui.html.ftl index 4d8885f8c..17a05eaf3 100644 --- a/ccm-core/src/main/resources/templates/admin-ui/admin-ui.html.ftl +++ b/ccm-core/src/main/resources/templates/admin-ui/admin-ui.html.ftl @@ -18,10 +18,14 @@ LibreCCM - ${activeApp.label} +
<#list activeApp.jsFilesUrls as jsFile> +