diff --git a/webui/.nvmrc b/webui/.nvmrc index 8ba691606..8b0beab16 100644 --- a/webui/.nvmrc +++ b/webui/.nvmrc @@ -1 +1 @@ -12.11.1 +20.11.0 diff --git a/webui/Dockerfile b/webui/Dockerfile index edb9593bc..3939d56b0 100644 --- a/webui/Dockerfile +++ b/webui/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.16 +FROM node:20.11 # Current Active LTS release according to (https://nodejs.org/en/about/releases/) ENV WEBUI_DIR /src/webui diff --git a/webui/package.json b/webui/package.json index 1f88c6a52..aa11f65b7 100644 --- a/webui/package.json +++ b/webui/package.json @@ -16,22 +16,23 @@ "build:nc": "yarn build" }, "dependencies": { - "@quasar/extras": "^1.0.0", - "axios": "^0.19.0", + "@quasar/extras": "^1.11.2", + "axios": "^0.21.1", "bowser": "^2.5.2", "chart.js": "^2.8.0", "dot-prop": "^5.2.0", + "core-js": "^3.35.1", "iframe-resizer": "^4.2.11", "lodash.isequal": "4.5.0", "moment": "^2.24.0", - "quasar": "^1.4.4", + "quasar": "^1.22.10", "query-string": "^6.13.1", "vh-check": "^2.0.5", "vue-chartjs": "^3.4.2", "vuex-map-fields": "^1.3.4" }, "devDependencies": { - "@quasar/app": "^1.2.4", + "@quasar/app": "^2.4.3", "@vue/eslint-config-standard": "^4.0.0", "@vue/test-utils": "^1.0.0-beta.29", "babel-eslint": "^10.0.1", @@ -43,9 +44,7 @@ "eslint-plugin-vue": "^5.0.0", "mocha": "^6.2.2", "mocha-webpack": "^2.0.0-beta.0", - "node-sass": "^4.12.0", - "prettier": "1.19.1", - "sass-loader": "^7.1.0" + "prettier": "1.19.1" }, "engines": { "node": ">= 8.9.0", diff --git a/webui/src/statics/app-logo-128x128.png b/webui/public/app-logo-128x128.png similarity index 100% rename from webui/src/statics/app-logo-128x128.png rename to webui/public/app-logo-128x128.png diff --git a/webui/src/statics/icons/apple-icon-120x120.png b/webui/public/icons/apple-icon-120x120.png similarity index 100% rename from webui/src/statics/icons/apple-icon-120x120.png rename to webui/public/icons/apple-icon-120x120.png diff --git a/webui/src/statics/icons/apple-icon-152x152.png b/webui/public/icons/apple-icon-152x152.png similarity index 100% rename from webui/src/statics/icons/apple-icon-152x152.png rename to webui/public/icons/apple-icon-152x152.png diff --git a/webui/src/statics/icons/apple-icon-167x167.png b/webui/public/icons/apple-icon-167x167.png similarity index 100% rename from webui/src/statics/icons/apple-icon-167x167.png rename to webui/public/icons/apple-icon-167x167.png diff --git a/webui/src/statics/icons/apple-icon-180x180.png b/webui/public/icons/apple-icon-180x180.png similarity index 100% rename from webui/src/statics/icons/apple-icon-180x180.png rename to webui/public/icons/apple-icon-180x180.png diff --git a/webui/src/statics/icons/favicon-16x16.png b/webui/public/icons/favicon-16x16.png similarity index 100% rename from webui/src/statics/icons/favicon-16x16.png rename to webui/public/icons/favicon-16x16.png diff --git a/webui/src/statics/icons/favicon-32x32.png b/webui/public/icons/favicon-32x32.png similarity index 100% rename from webui/src/statics/icons/favicon-32x32.png rename to webui/public/icons/favicon-32x32.png diff --git a/webui/src/statics/icons/favicon-96x96.png b/webui/public/icons/favicon-96x96.png similarity index 100% rename from webui/src/statics/icons/favicon-96x96.png rename to webui/public/icons/favicon-96x96.png diff --git a/webui/src/statics/icons/favicon.ico b/webui/public/icons/favicon.ico similarity index 100% rename from webui/src/statics/icons/favicon.ico rename to webui/public/icons/favicon.ico diff --git a/webui/src/statics/icons/icon-128x128.png b/webui/public/icons/icon-128x128.png similarity index 100% rename from webui/src/statics/icons/icon-128x128.png rename to webui/public/icons/icon-128x128.png diff --git a/webui/src/statics/icons/icon-192x192.png b/webui/public/icons/icon-192x192.png similarity index 100% rename from webui/src/statics/icons/icon-192x192.png rename to webui/public/icons/icon-192x192.png diff --git a/webui/src/statics/icons/icon-256x256.png b/webui/public/icons/icon-256x256.png similarity index 100% rename from webui/src/statics/icons/icon-256x256.png rename to webui/public/icons/icon-256x256.png diff --git a/webui/src/statics/icons/icon-384x384.png b/webui/public/icons/icon-384x384.png similarity index 100% rename from webui/src/statics/icons/icon-384x384.png rename to webui/public/icons/icon-384x384.png diff --git a/webui/src/statics/icons/icon-512x512.png b/webui/public/icons/icon-512x512.png similarity index 100% rename from webui/src/statics/icons/icon-512x512.png rename to webui/public/icons/icon-512x512.png diff --git a/webui/src/statics/icons/ms-icon-144x144.png b/webui/public/icons/ms-icon-144x144.png similarity index 100% rename from webui/src/statics/icons/ms-icon-144x144.png rename to webui/public/icons/ms-icon-144x144.png diff --git a/webui/src/statics/icons/safari-pinned-tab.svg b/webui/public/icons/safari-pinned-tab.svg similarity index 100% rename from webui/src/statics/icons/safari-pinned-tab.svg rename to webui/public/icons/safari-pinned-tab.svg diff --git a/webui/src/statics/providers/consul.svg b/webui/public/providers/consul.svg similarity index 100% rename from webui/src/statics/providers/consul.svg rename to webui/public/providers/consul.svg diff --git a/webui/src/statics/providers/consulcatalog.svg b/webui/public/providers/consulcatalog.svg similarity index 100% rename from webui/src/statics/providers/consulcatalog.svg rename to webui/public/providers/consulcatalog.svg diff --git a/webui/src/statics/providers/docker.svg b/webui/public/providers/docker.svg similarity index 100% rename from webui/src/statics/providers/docker.svg rename to webui/public/providers/docker.svg diff --git a/webui/src/statics/providers/ecs.svg b/webui/public/providers/ecs.svg similarity index 100% rename from webui/src/statics/providers/ecs.svg rename to webui/public/providers/ecs.svg diff --git a/webui/src/statics/providers/etcd.svg b/webui/public/providers/etcd.svg similarity index 100% rename from webui/src/statics/providers/etcd.svg rename to webui/public/providers/etcd.svg diff --git a/webui/src/statics/providers/file.svg b/webui/public/providers/file.svg similarity index 100% rename from webui/src/statics/providers/file.svg rename to webui/public/providers/file.svg diff --git a/webui/src/statics/providers/http.svg b/webui/public/providers/http.svg similarity index 100% rename from webui/src/statics/providers/http.svg rename to webui/public/providers/http.svg diff --git a/webui/src/statics/providers/hub.svg b/webui/public/providers/hub.svg similarity index 100% rename from webui/src/statics/providers/hub.svg rename to webui/public/providers/hub.svg diff --git a/webui/src/statics/providers/internal.svg b/webui/public/providers/internal.svg similarity index 100% rename from webui/src/statics/providers/internal.svg rename to webui/public/providers/internal.svg diff --git a/webui/src/statics/providers/kubernetes.svg b/webui/public/providers/kubernetes.svg similarity index 100% rename from webui/src/statics/providers/kubernetes.svg rename to webui/public/providers/kubernetes.svg diff --git a/webui/src/statics/providers/kubernetescrd.svg b/webui/public/providers/kubernetescrd.svg similarity index 100% rename from webui/src/statics/providers/kubernetescrd.svg rename to webui/public/providers/kubernetescrd.svg diff --git a/webui/src/statics/providers/kubernetesgateway.svg b/webui/public/providers/kubernetesgateway.svg similarity index 100% rename from webui/src/statics/providers/kubernetesgateway.svg rename to webui/public/providers/kubernetesgateway.svg diff --git a/webui/src/statics/providers/kubernetesingress.svg b/webui/public/providers/kubernetesingress.svg similarity index 100% rename from webui/src/statics/providers/kubernetesingress.svg rename to webui/public/providers/kubernetesingress.svg diff --git a/webui/src/statics/providers/marathon.svg b/webui/public/providers/marathon.svg similarity index 100% rename from webui/src/statics/providers/marathon.svg rename to webui/public/providers/marathon.svg diff --git a/webui/src/statics/providers/nomad.svg b/webui/public/providers/nomad.svg similarity index 100% rename from webui/src/statics/providers/nomad.svg rename to webui/public/providers/nomad.svg diff --git a/webui/src/statics/providers/plugin.svg b/webui/public/providers/plugin.svg similarity index 100% rename from webui/src/statics/providers/plugin.svg rename to webui/public/providers/plugin.svg diff --git a/webui/src/statics/providers/rancher.svg b/webui/public/providers/rancher.svg similarity index 100% rename from webui/src/statics/providers/rancher.svg rename to webui/public/providers/rancher.svg diff --git a/webui/src/statics/providers/redis.svg b/webui/public/providers/redis.svg similarity index 100% rename from webui/src/statics/providers/redis.svg rename to webui/public/providers/redis.svg diff --git a/webui/src/statics/providers/rest.svg b/webui/public/providers/rest.svg similarity index 100% rename from webui/src/statics/providers/rest.svg rename to webui/public/providers/rest.svg diff --git a/webui/src/statics/providers/zookeeper.svg b/webui/public/providers/zookeeper.svg similarity index 100% rename from webui/src/statics/providers/zookeeper.svg rename to webui/public/providers/zookeeper.svg diff --git a/webui/src/statics/traefiklabs-hub-button-app/main-v1.js b/webui/public/traefiklabs-hub-button-app/main-v1.js similarity index 100% rename from webui/src/statics/traefiklabs-hub-button-app/main-v1.js rename to webui/public/traefiklabs-hub-button-app/main-v1.js diff --git a/webui/src/statics/traefiklabs-hub-button-app/main-v1.js.map b/webui/public/traefiklabs-hub-button-app/main-v1.js.map similarity index 100% rename from webui/src/statics/traefiklabs-hub-button-app/main-v1.js.map rename to webui/public/traefiklabs-hub-button-app/main-v1.js.map diff --git a/webui/quasar.conf.js b/webui/quasar.conf.js index 07eec1a8d..1e7bf08a5 100644 --- a/webui/quasar.conf.js +++ b/webui/quasar.conf.js @@ -117,12 +117,12 @@ module.exports = function (ctx) { publicPath: process.env.APP_PUBLIC_PATH || '', env: process.env.APP_ENV === 'development' ? { // staging: - APP_ENV: JSON.stringify(process.env.APP_ENV), - APP_API: JSON.stringify(process.env.APP_API || '/api') + APP_ENV: process.env.APP_ENV, + APP_API: process.env.APP_API || '/api' } : { // production: - APP_ENV: JSON.stringify(process.env.APP_ENV), - APP_API: JSON.stringify(process.env.APP_API || '/api') + APP_ENV: process.env.APP_ENV, + APP_API: process.env.APP_API || '/api' }, uglifyOptions: { compress: { @@ -186,27 +186,27 @@ module.exports = function (ctx) { theme_color: '#027be3', icons: [ { - 'src': 'statics/icons/icon-128x128.png', + 'src': 'icons/icon-128x128.png', 'sizes': '128x128', 'type': 'image/png' }, { - 'src': 'statics/icons/icon-192x192.png', + 'src': 'icons/icon-192x192.png', 'sizes': '192x192', 'type': 'image/png' }, { - 'src': 'statics/icons/icon-256x256.png', + 'src': 'icons/icon-256x256.png', 'sizes': '256x256', 'type': 'image/png' }, { - 'src': 'statics/icons/icon-384x384.png', + 'src': 'icons/icon-384x384.png', 'sizes': '384x384', 'type': 'image/png' }, { - 'src': 'statics/icons/icon-512x512.png', + 'src': 'icons/icon-512x512.png', 'sizes': '512x512', 'type': 'image/png' } diff --git a/webui/src-pwa/pwa-flag.d.ts b/webui/src-pwa/pwa-flag.d.ts new file mode 100644 index 000000000..cda1c0ec5 --- /dev/null +++ b/webui/src-pwa/pwa-flag.d.ts @@ -0,0 +1,10 @@ +/* eslint-disable */ +// THIS FEATURE-FLAG FILE IS AUTOGENERATED, +// REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING +import "quasar/dist/types/feature-flag"; + +declare module "quasar/dist/types/feature-flag" { + interface QuasarFeatureFlags { + pwa: true; + } +} diff --git a/webui/src/components/_commons/MainTable.vue b/webui/src/components/_commons/MainTable.vue index 85ae32e55..df7c9df68 100644 --- a/webui/src/components/_commons/MainTable.vue +++ b/webui/src/components/_commons/MainTable.vue @@ -89,7 +89,7 @@ export default { @import "../../css/sass/variables"; .table-wrapper { - /deep/ .q-table__container{ + :deep(.q-table__container) { border-radius: 8px; .q-table { .table-header { diff --git a/webui/src/components/_commons/NavBar.vue b/webui/src/components/_commons/NavBar.vue index 4e1a02d46..eff0cc607 100644 --- a/webui/src/components/_commons/NavBar.vue +++ b/webui/src/components/_commons/NavBar.vue @@ -29,7 +29,7 @@