homelab/traefik
1
0
Fork 0
Code Activity

Merge current v2.11 into v3.0

Browse source
This commit is contained in:
mmatur 2024-02-08 14:15:45 +01:00
commit bc84fdd006
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
143 changed files with 8736 additions and 6601 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webui/src/components/_commons/MainTable.vue
View file

@ -116,7 +116,7 @@ export default {
@import "../../css/sass/variables";
.table-wrapper {
/deep/ .q-table__container{
:deep(.q-table__container) {
border-radius: 8px;
.q-table {
.table-header {

12
webui/src/components/_commons/NavBar.vue
View file

@ -29,7 +29,7 @@
</q-btn>
</q-tabs>
<div class="right-menu">
<q-tabs>
<q-tabs class="allow-overflow">
<div v-if="!coreVersion.disableDashboardAd && hasHubButtonComponent" style="margin-right: 5px;">
<hub-button-app theme="dark" v-if="$q.dark.isActive"></hub-button-app>
<hub-button-app v-if="!$q.dark.isActive"></hub-button-app>
@ -111,7 +111,7 @@ export default {
this.hasHubButtonComponent = customElements.get('hub-button-app') !== undefined
}
// Sources: https://github.com/traefik/traefiklabs-hub-button-app
hubButtonScriptLocal.src = 'statics/traefiklabs-hub-button-app/main-v1.js'
hubButtonScriptLocal.src = 'traefiklabs-hub-button-app/main-v1.js'
document.head.appendChild(hubButtonScriptLocal)
}
hubButtonScript.onload = () => {
@ -164,7 +164,7 @@ export default {
.q-tabs {
color: rgba( $app-text-white, .4 );
/deep/ .q-tabs__content {
:deep(.q-tabs__content) {
.q-tab__content{
min-width: 100%;
.q-tab__label {
@ -197,4 +197,10 @@ export default {
align-items: flex-start;
}
.allow-overflow {
:deep(.q-tabs__content) {
overflow: visible !important;
}
}
</style>

12
webui/src/components/_commons/PanelMiddlewares.vue
View file

@ -1171,19 +1171,19 @@ export default {
const name = provider.toLowerCase()
if (name.startsWith('plugin-')) {
return 'statics/providers/plugin.svg'
return 'providers/plugin.svg'
}
if (name.startsWith('consul-')) {
return `statics/providers/consul.svg`
return `providers/consul.svg`
}
if (name.startsWith('consulcatalog-')) {
return `statics/providers/consulcatalog.svg`
return `providers/consulcatalog.svg`
}
if (name.startsWith('nomad-')) {
return `statics/providers/nomad.svg`
return `providers/nomad.svg`
}
return `statics/providers/${name}.svg`
return `providers/${name}.svg`
}
},
filters: {
@ -1267,7 +1267,7 @@ export default {
flex-wrap: wrap;
border-width: 0;
margin-bottom: 8px;
/deep/ .q-chip__content{
:deep(.q-chip__content) {
white-space: normal;
}
}

10
webui/src/components/_commons/PanelMirroringServices.vue
View file

@ -67,19 +67,19 @@ export default {
const name = provider.toLowerCase()
if (name.startsWith('plugin-')) {
return 'statics/providers/plugin.svg'
return 'providers/plugin.svg'
}
if (name.startsWith('consul-')) {
return `statics/providers/consul.svg`
return `providers/consul.svg`
}
if (name.startsWith('consulcatalog-')) {
return `statics/providers/consulcatalog.svg`
return `providers/consulcatalog.svg`
}
if (name.startsWith('nomad-')) {
return `statics/providers/nomad.svg`
return `providers/nomad.svg`
}
return `statics/providers/${name}.svg`
return `providers/${name}.svg`
}
}
}

12
webui/src/components/_commons/PanelRouterDetails.vue
View file

@ -145,19 +145,19 @@ export default {
const name = this.data.provider.toLowerCase()
if (name.startsWith('plugin-')) {
return 'statics/providers/plugin.svg'
return 'providers/plugin.svg'
}
if (name.startsWith('consul-')) {
return `statics/providers/consul.svg`
return `providers/consul.svg`
}
if (name.startsWith('consulcatalog-')) {
return `statics/providers/consulcatalog.svg`
return `providers/consulcatalog.svg`
}
if (name.startsWith('nomad-')) {
return `statics/providers/nomad.svg`
return `providers/nomad.svg`
}
return `statics/providers/${name}.svg`
return `providers/${name}.svg`
}
}
}
@ -218,7 +218,7 @@ export default {
flex-wrap: wrap;
border-width: 0;
margin-bottom: 8px;
/deep/ .q-chip__content{
:deep(.q-chip__content) {
white-space: normal;
}
}

10
webui/src/components/_commons/PanelServiceDetails.vue
View file

@ -134,19 +134,19 @@ export default {
const name = this.data.provider.toLowerCase()
if (name.startsWith('plugin-')) {
return 'statics/providers/plugin.svg'
return 'providers/plugin.svg'
}
if (name.startsWith('consul-')) {
return `statics/providers/consul.svg`
return `providers/consul.svg`
}
if (name.startsWith('consulcatalog-')) {
return `statics/providers/consulcatalog.svg`
return `providers/consulcatalog.svg`
}
if (name.startsWith('nomad-')) {
return `statics/providers/nomad.svg`
return `providers/nomad.svg`
}
return `statics/providers/${name}.svg`
return `providers/${name}.svg`
}
},
filters: {

2
webui/src/components/_commons/PanelTLS.vue
View file

@ -119,7 +119,7 @@ export default {
flex-wrap: wrap;
border-width: 0;
margin-bottom: 8px;
/deep/ .q-chip__content{
:deep(.q-chip__content) {
white-space: normal;
}
}

10
webui/src/components/_commons/PanelWeightedServices.vue
View file

@ -67,19 +67,19 @@ export default {
const name = provider.toLowerCase()
if (name.startsWith('plugin-')) {
return 'statics/providers/plugin.svg'
return 'providers/plugin.svg'
}
if (name.startsWith('consul-')) {
return `statics/providers/consul.svg`
return `providers/consul.svg`
}
if (name.startsWith('consulcatalog-')) {
return `statics/providers/consulcatalog.svg`
return `providers/consulcatalog.svg`
}
if (name.startsWith('nomad-')) {
return `statics/providers/nomad.svg`
return `providers/nomad.svg`
}
return `statics/providers/${name}.svg`
return `providers/${name}.svg`
}
}
}

10
webui/src/components/_commons/ProviderIcon.vue
View file

@ -12,19 +12,19 @@ export default {
const name = this.name.toLowerCase()
if (name.startsWith('plugin-')) {
return 'statics/providers/plugin.svg'
return 'providers/plugin.svg'
}
if (name.startsWith('consul-')) {
return `statics/providers/consul.svg`
return `providers/consul.svg`
}
if (name.startsWith('consulcatalog-')) {
return `statics/providers/consulcatalog.svg`
return `providers/consulcatalog.svg`
}
if (name.startsWith('nomad-')) {
return `statics/providers/nomad.svg`
return `providers/nomad.svg`
}
return `statics/providers/${name}.svg`
return `providers/${name}.svg`
}
}
}

2
webui/src/components/_commons/ToolBar.vue
View file

@ -89,7 +89,7 @@ export default {
}
.q-tabs {
/deep/ .q-tabs__content {
:deep(.q-tabs__content) {
.q-tab__label {
color: $app-text-grey;
font-size: 16px;

4
webui/src/components/_commons/ToolBarTable.vue
View file

@ -93,7 +93,7 @@ export default {
.q-toolbar {
padding: 0;
/deep/ .bar-toggle {
:deep(.bar-toggle) {
.q-btn {
font-weight: 600;
margin-right: 12px;
@ -105,7 +105,7 @@ export default {
}
}
}
/deep/ .bar-search {
:deep(.bar-search) {
.q-field__inner {
.q-field__control {
border-radius: 12px;

10
webui/src/components/dashboard/PanelProvider.vue
View file

@ -29,19 +29,19 @@ export default {
const name = this.getName.toLowerCase()
if (name.startsWith('plugin-')) {
return 'statics/providers/plugin.svg'
return 'providers/plugin.svg'
}
if (name.startsWith('consul-')) {
return `statics/providers/consul.svg`
return `providers/consul.svg`
}
if (name.startsWith('consulcatalog-')) {
return `statics/providers/consulcatalog.svg`
return `providers/consulcatalog.svg`
}
if (name.startsWith('nomad-')) {
return `statics/providers/nomad.svg`
return `providers/nomad.svg`
}
return `statics/providers/${name}.svg`
return `providers/${name}.svg`
}
}
}