Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Maëlys Bras de fer committed Aug 4, 2021
1 parent 87585a9 commit 8d66d78
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 39 deletions.
2 changes: 1 addition & 1 deletion dockers/manager/front/src/components/BaseTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
size="xs"
icon="eva-loader-outline"
:loading="loading"
class=" q-mr-md no-pointer-events"
class="q-mr-md no-pointer-events"
/>
{{ props.message }}
</template>
Expand Down
2 changes: 1 addition & 1 deletion dockers/manager/front/src/components/DNS/Log/LogList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
size="xs"
icon="eva-loader-outline"
:loading="$apollo.queries.dnsLogs.loading"
class=" q-mr-md no-pointer-events"
class="q-mr-md no-pointer-events"
/>
{{ props.message }}
</template>
Expand Down
2 changes: 1 addition & 1 deletion dockers/manager/front/src/components/DNS/Rule/Table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@input="v => toggleRule(row, v)"
/>
</template>
<template #details="{ row }">
<template #details="{row}">
<rule-details :value="row" />
</template>
</base-table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,6 @@ export default {
"create"
];
return steps;
},
portOptions() {
return (this.container?.ports ?? [])
.filter(p => p.protocol === "TCP")
.map(p => p.containerPort);
}
},
watch: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<port-list :ports="row.ports" />
</template>

<template #details="{ row }" auto-width>
<template #details="{row}" auto-width>
<container-details :container="row" />
</template>
</base-table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
row-key="name"
:rows-per-page-options="[0]"
>
<template #body-cell-pull="{ row }">
<template #body-cell-pull="{row}">
<q-td align="right">
<q-btn
:label="isAvailable(row) ? 'update' : 'pull'"
Expand Down
8 changes: 4 additions & 4 deletions dockers/manager/front/src/components/Docker/Image/Table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/>
<q-checkbox v-model="showIntermediate" label="Show intermediate images" />
</template>
<template #body-cell-usedBy="{ row }">
<template #body-cell-usedBy="{row}">
<div class="q-gutter-sm row" style="max-width: 20vw">
<container-link
v-for="{ name } of row.usedBy"
Expand All @@ -28,10 +28,10 @@
/>
</div>
</template>
<template #body-cell-shortId="{ row }">
<template #body-cell-shortId="{row}">
<div class="text-mono">{{ row.shortId }}</div>
</template>
<template #body-cell-tags="{ row }">
<template #body-cell-tags="{row}">
<div class="row q-gutter-sm">
<div
v-for="tag of row.tags"
Expand All @@ -50,7 +50,7 @@
</div>
</template>

<template #details="{ row }">
<template #details="{row}">
<image-details :image="row" />
</template>
</base-table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>
</template>

<template #details="{ row }">
<template #details="{row}">
<network-details :network="row" />
</template>
</base-table>
Expand Down
4 changes: 2 additions & 2 deletions dockers/manager/front/src/components/Docker/Volume/Table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@click="pruneVolumes"
/>
</template>
<template #body-cell-usedBy="{ row }">
<template #body-cell-usedBy="{row}">
<div class="q-gutter-sm row">
<container-link
v-for="{ name } of row.usedBy"
Expand All @@ -29,7 +29,7 @@
/>
</div>
</template>
<template #details="{ row }">
<template #details="{row}">
<volume-details :volume="row" />
</template>
</base-table>
Expand Down
2 changes: 1 addition & 1 deletion dockers/manager/front/src/components/ListInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
</template>

<template #entry="{ entry }">
<template #entry="{entry}">
<div v-for="key of cols" :key="key" class="ellipsis">
{{ entry[key] || "&ZeroWidthSpace;" }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
size="xs"
icon="eva-loader-outline"
:loading="$apollo.loading"
class=" q-mr-md no-pointer-events"
class="q-mr-md no-pointer-events"
/>
{{ props.message }}
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<template #body-cell-enabled="{row}">
<status-badge :status="row.enabled" />
</template>
<template #details="{ row }">
<template #details="{row}">
<middleware-details :value="extraForm(row)" />
</template>
</base-table>
Expand Down
30 changes: 13 additions & 17 deletions dockers/manager/front/src/components/Traefik/ProtocolBadge.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<template>
<q-badge outline class="text-white" :style="{'border-color': color}">{{ protocol }} </q-badge>
<q-badge
outline
class="text-white"
:style="`border-color: var(--q-color-${color})`"
>
{{ protocol }}
</q-badge>
</template>

<script>
Expand All @@ -9,23 +15,13 @@ export default {
},
computed: {
color() {
switch (this.protocol) {
case "http":
return "var(--q-color-primary)";
case "tcp":
return "var(--q-color-secondary)";
case "udp":
return "var(--q-color-accent)";
default:
return "var(--q-color-negative)";
}
const colors = {
http: "primary",
tcp: "secondary",
udp: "accent"
};
return colors[this.protocol] ?? "negative";
}
}
};
</script>

<style lang="scss" scoped>
.status {
color: white ;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</div>
</template>

<template #details="{ row }">
<template #details="{row}">
<router-details :value="extraForm(row)" />
</template>
</base-table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<template #body-cell-enabled="{row}">
<status-badge :status="row.enabled" />
</template>
<template #details="{ row }">
<template #details="{row}">
<service-details :value="extraForm(row)" />
</template>
</base-table>
Expand Down

0 comments on commit 8d66d78

Please sign in to comment.