From 7c273a8bcab2da87acb3431448a53e91e360d5eb Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sun, 19 Jan 2020 21:18:15 +0000 Subject: [webapp] upgrade/migration from vuetify 1.5 to 2.X still TODO: switch from old grid system (v-layout/v-flex) to the new one (v-row/v-col) --- webapp/package-lock.json | 23 ++- webapp/package.json | 6 +- webapp/src/assets/styles.css | 26 +++- webapp/src/components/AccountModule.vue | 18 +-- webapp/src/components/BackendModule.vue | 19 +-- webapp/src/components/BackendModuleEdit.vue | 6 +- .../components/BackendModuleEditDynamicFields.vue | 2 +- webapp/src/components/BackendModuleSync.vue | 28 ++-- webapp/src/components/ComponentSearchTable.vue | 8 +- webapp/src/components/ConfiguratorModule.vue | 25 ++-- webapp/src/components/ConfiguratorModuleAssign.vue | 6 +- webapp/src/components/ConfiguratorModuleConfig.vue | 50 ++++--- webapp/src/components/ConfiguratorModuleDelete.vue | 2 +- webapp/src/components/ConfiguratorModuleEntry.vue | 2 +- webapp/src/components/DashboardPage.vue | 96 +++++++----- webapp/src/components/DataTable.vue | 166 ++++++++++++--------- webapp/src/components/DataTableSearch.vue | 7 +- webapp/src/components/EventModule.vue | 2 +- webapp/src/components/EventModuleDelete.vue | 2 +- webapp/src/components/EventModuleEdit.vue | 14 +- webapp/src/components/EventModuleEventList.vue | 8 +- webapp/src/components/GroupModule.vue | 8 +- webapp/src/components/GroupModuleClientList.vue | 12 +- webapp/src/components/GroupModuleClientView.vue | 8 +- webapp/src/components/GroupModuleDialog.vue | 7 +- webapp/src/components/GroupModuleGroupInfo.vue | 10 +- webapp/src/components/GroupModuleGroupList.vue | 16 +- webapp/src/components/GroupModuleGroupView.vue | 46 +++--- webapp/src/components/HomeModule.vue | 2 - webapp/src/components/IprangeModule.vue | 17 ++- webapp/src/components/IpxeBuilderModule.vue | 4 +- webapp/src/components/IpxeBuilderModuleConfig.vue | 78 +++++----- webapp/src/components/LogModule.vue | 10 +- webapp/src/components/LogModuleEntry.vue | 6 +- webapp/src/components/NotificationsAlerts.vue | 16 +- webapp/src/components/NotificationsSnackbars.vue | 3 +- webapp/src/components/PermissionModule.vue | 2 +- webapp/src/components/PermissionModuleDelete.vue | 2 +- webapp/src/components/PermissionModuleEdit.vue | 4 +- .../src/components/PermissionModuleGrantRevoke.vue | 2 +- webapp/src/components/PermissionModuleRoleList.vue | 8 +- webapp/src/components/PermissionModuleUserList.vue | 10 +- webapp/src/components/RegistrationModule.vue | 36 ++--- webapp/src/components/RegistrationModuleDelete.vue | 2 +- webapp/src/components/RegistrationModuleEdit.vue | 4 +- webapp/src/components/SelectBox.vue | 65 ++++---- webapp/src/components/SettingsModule.vue | 2 +- webapp/src/components/StartPage.vue | 31 +++- webapp/src/components/StartPageSetup.vue | 2 +- webapp/src/components/UserModule.vue | 10 +- webapp/src/components/UserModuleDelete.vue | 2 +- webapp/src/components/UserModuleEdit.vue | 2 +- webapp/src/main.js | 16 +- 53 files changed, 548 insertions(+), 411 deletions(-) (limited to 'webapp') diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 96a917c..9fc511e 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -1,5 +1,5 @@ { - "name": "webappnew", + "name": "webapp", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -1205,6 +1205,12 @@ "integrity": "sha512-M2280E9PMxetu6mOdtyh1d6Dif7LwH4gvxD2dgsu7HOyzR26AUNok8DxZ1Y5YAexJvPfbBXC75Llui2myO05Hg==", "dev": true }, + "@mdi/font": { + "version": "4.8.95", + "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.8.95.tgz", + "integrity": "sha512-mfEjd6kkuheZ15CBU7g/q+De9+dah/SEgVH0uZsgCJTSYa+CkXIen35aNyHoixgcEfPV4Or0NLJvyYM5CXUnbQ==", + "dev": true + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -10048,6 +10054,15 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "sass": { + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.25.0.tgz", + "integrity": "sha512-uQMjye0Y70SEDGO56n0j91tauqS9E1BmpKHtiYNQScXDHeaE9uHwNEqQNFf4Bes/3DHMNinB6u79JsG10XWNyw==", + "dev": true, + "requires": { + "chokidar": ">=2.0.0 <4.0.0" + } + }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -11749,9 +11764,9 @@ } }, "vuetify": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.11.tgz", - "integrity": "sha512-S4f0wXEbQNHnP4IUtSSIRmzU/fjyPtTN5fC80JlHdTcF78VLT1/xsTqXgNtSW5712UJtrLPpF6b0LfOTJrCCBg==" + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.2.4.tgz", + "integrity": "sha512-jhSdCeatWgHrY4Bb2FTi1sFfGDrVHLmkvI7pkG9FEF9TmZ+Qq7Ts85XAft9ucwU8ybB5nDmN6s+oeHJgvL+4tA==" }, "vuex": { "version": "3.1.0", diff --git a/webapp/package.json b/webapp/package.json index 4750d1a..05da26d 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,5 +1,5 @@ { - "name": "webappnew", + "name": "webapp", "version": "0.1.0", "private": true, "scripts": { @@ -17,11 +17,12 @@ "vue-router": "^3.0.3", "vue-virtual-scroller": "^1.0.0-rc.2", "vuedraggable": "^2.20.0", - "vuetify": "^1.5.11", + "vuetify": "^2.2.4", "vuex": "^3.1.0" }, "devDependencies": { "@kazupon/vue-i18n-loader": "^0.3.0", + "@mdi/font": "^4.8.95", "@vue/cli-plugin-babel": "^3.5.5", "@vue/cli-plugin-eslint": "^3.5.1", "@vue/cli-service": "^3.5.3", @@ -29,6 +30,7 @@ "babel-eslint": "^10.0.1", "eslint": "^5.16.0", "eslint-plugin-vue": "^5.0.0", + "sass": "^1.25.0", "vue-template-compiler": "^2.6.10" }, "postcss": { diff --git a/webapp/src/assets/styles.css b/webapp/src/assets/styles.css index 2aaeddc..a5b1e28 100644 --- a/webapp/src/assets/styles.css +++ b/webapp/src/assets/styles.css @@ -54,7 +54,7 @@ html { z-index: 3; } -.tabbar-card .v-tabs .v-tabs__item { +.tabbar-card .v-tabs .v-tab { text-transform: none !important; } @@ -182,3 +182,27 @@ html { .tutorial-enabled .tutorial-element.label-right::before { right: -14px; } + + +/* Vuetify overwrites */ + +.container { + padding: 24px; +} + +.v-tab { + min-width: auto; +} + +.v-tabs-items { + background-color: transparent !important; +} + +.v-dialog > .v-card > .v-card__text { + padding: 16px 24px; +} + +.theme--dark .v-tooltip__content { + background: white; + color: black; +} \ No newline at end of file diff --git a/webapp/src/components/AccountModule.vue b/webapp/src/components/AccountModule.vue index a39a414..73f85fb 100644 --- a/webapp/src/components/AccountModule.vue +++ b/webapp/src/components/AccountModule.vue @@ -66,7 +66,7 @@ - - +
- + create{{ $t('edit') }}
- {{ $t('cancel') }} + {{ $t('cancel') }} save{{ $t('save') }} @@ -197,17 +197,17 @@ - +
- + create{{ $t('edit') }}
- +
- {{ $t('cancel') }} + {{ $t('cancel') }} save{{ $t('save') }} @@ -247,7 +247,7 @@ - {{ $t('cancel') }} + {{ $t('cancel') }} {{ $t('delete') }} diff --git a/webapp/src/components/BackendModule.vue b/webapp/src/components/BackendModule.vue index 6945d82..2670230 100644 --- a/webapp/src/components/BackendModule.vue +++ b/webapp/src/components/BackendModule.vue @@ -40,7 +40,7 @@ - {{ $t('checkConnectionTooltip') }} @@ -71,14 +72,14 @@ {{ $t('editSyncTooltip') }} {{ $t('editTooltip') }} @@ -86,15 +87,15 @@ -
+
- + cached{{ $tc('checkConnection', selectedBackends.length, [selectedBackends.length]) }} - + remove_circle_outline{{ $tc('removeBackend', selectedBackends.length, [selectedBackends.length]) }} - + add_circle_outline{{ $t('addBackendBtn') }}
@@ -124,7 +125,7 @@ - {{ $t('cancel') }} + {{ $t('cancel') }} {{ $t('delete') }} diff --git a/webapp/src/components/BackendModuleEdit.vue b/webapp/src/components/BackendModuleEdit.vue index c5c1c31..0b235da 100644 --- a/webapp/src/components/BackendModuleEdit.vue +++ b/webapp/src/components/BackendModuleEdit.vue @@ -41,7 +41,7 @@ > - + - - {{ $t('cancel') }} + + {{ $t('cancel') }} {{ $t('continue') }} {{ $t('continue') }} {{ backendId ? $t('save') : $t('create') }} diff --git a/webapp/src/components/BackendModuleEditDynamicFields.vue b/webapp/src/components/BackendModuleEditDynamicFields.vue index 6d17357..b8e96b0 100644 --- a/webapp/src/components/BackendModuleEditDynamicFields.vue +++ b/webapp/src/components/BackendModuleEditDynamicFields.vue @@ -32,7 +32,7 @@ v-model="element.value" :prepend-icon="element.icon" > - edit + edit
diff --git a/webapp/src/components/BackendModuleSync.vue b/webapp/src/components/BackendModuleSync.vue index 8c385b9..7ac76ae 100644 --- a/webapp/src/components/BackendModuleSync.vue +++ b/webapp/src/components/BackendModuleSync.vue @@ -46,13 +46,13 @@ prepend-icon="device_hub" > - - {{ $t('cancel') }} + + {{ $t('cancel') }} {{ $t('save') }} diff --git a/webapp/src/components/ComponentSearchTable.vue b/webapp/src/components/ComponentSearchTable.vue index e9101dc..35046d7 100644 --- a/webapp/src/components/ComponentSearchTable.vue +++ b/webapp/src/components/ComponentSearchTable.vue @@ -20,7 +20,7 @@