Skip to content

Commit

Permalink
Syle uniformization & small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Maëlys Bras de fer committed Jun 25, 2021
1 parent 44c1890 commit e99c5b5
Show file tree
Hide file tree
Showing 28 changed files with 92 additions and 57 deletions.
2 changes: 1 addition & 1 deletion dockers/manager/front/src/components/BaseDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<q-card bordered :style="style">
<q-card-section>
<div class="row q-gutter-sm items-center">
<div class="col col-auto title text-h6 ">
<div class="col col-auto title text-h6">
{{ title }} {{ subtitle ? ":" : "" }}
</div>
<div class="col col-auto text-h6 subtitle">
Expand Down
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 @@ -93,7 +93,7 @@
v-if="props.expand"
:props="props"
no-hover
class="expand bg-grey-10"
class="expand bg-grey-10"
>
<q-td colspan="100%">
<slot name="details" v-bind="{ row: props.row }"></slot>
Expand Down
4 changes: 2 additions & 2 deletions dockers/manager/front/src/components/DNS/Zone/Dialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import CreateZone from "./Create.vue";
import BaseDialog from "src/components/BaseDialog.vue";
export default {
components: { CreateZone, BaseDialog },
components: { CreateZone, BaseDialog },
props: {
zone: { type: Object, default: null }
},
Expand All @@ -25,7 +25,7 @@ export default {
},
hide() {
this.$refs.dialog.hide();
},
}
}
};
</script>
4 changes: 3 additions & 1 deletion dockers/manager/front/src/components/DNS/Zone/Link.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import PmLink from "src/components/PMLink.vue";
export default {
components: { PmLink },
props: { name: { type: String, required: true } }
props: {
name: { type: String, required: true }
}
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{{ entry.aliases ? entry.aliases.join(", ") : "-" }}
</div>
<div class="ellipsis text-right">
{{ entry.ipAddress || "Off-line" }}
{{ entry.ipAddress || "offline" }}
</div>
</template>
</base-grid-input>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{{ entry.aliases ? entry.aliases.join(", ") : "-" }}
</div>
<div class="ellipsis text-right">
{{ entry.ipAddress || "Off-line" }}
{{ entry.ipAddress || "offline" }}
</div>
</template>
</base-grid-input>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
style="max-width: 40vw;"
align="left"
>


{{ props.value }}
<q-popup-edit :value="props.value">
<q-input :value="props.value" readonly dense autofocus counter />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ import DeepForm from "src/mixins/DeepForm";
export default {
mixins: [DeepForm],
props: { readonly: { type: Boolean, default: false } },
props: {
readonly: { type: Boolean, default: false }
},
formDefinition: null,
data: () => ({ filter: null }),
apollo: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<q-expansion-item
label="Network"
:caption="selectedName"
icon="eva-hard-drive-outline"
icon="eva-globe-outline"
>
<q-separator />
<q-card>
Expand Down
4 changes: 3 additions & 1 deletion dockers/manager/front/src/components/Docker/Image/Link.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import PmLink from "src/components/PMLink.vue";
export default {
components: { PmLink },
props: { image: { type: Object, required: true } },
props: {
image: { type: Object, required: true }
}
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ export default {
components: { BaseGridInput },
mixins: [DeepForm],
formDefinition: [],
props: { imageId: { type: String, required: true } },
props: {
imageId: { type: String, required: true }
},
data: () => ({ model: null, loading: false }),
methods: {
doRemoveTag(tag) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ import BaseGridInput from "src/components/BaseGridInput.vue";
export default {
components: { BaseGridInput },
mixins: [DeepForm],
props: { readonly: { type: Boolean, default: false } },
props: {
readonly: { type: Boolean, default: false }
},
formDefinition: {
subnet: null,
ipRange: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ const defaultModel = {
export default {
components: { HelpLink, BaseGridInput },
mixins: [DeepForm],
props: { readonly: { type: Boolean, default: false } },
props: {
readonly: { type: Boolean, default: false }
},
formDefinition: [],
data: () => ({ model: defaultModel }),
data: () => ({ model: { ...defaultModel } }),
computed: {
caption() {
if (this.form.length === 0) {
Expand All @@ -125,7 +127,7 @@ export default {
addEntry() {
if (!this.model.subnet) return;
this.form.unshift(this.model);
this.model = defaultModel;
this.model = { ...defaultModel };
}
}
};
Expand Down
4 changes: 3 additions & 1 deletion dockers/manager/front/src/components/Docker/Network/Link.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ import PmLink from "src/components/PMLink.vue";
export default {
components: { PmLink },
props: { network: { type: Object, required: true } }
props: {
network: { type: Object, required: true }
}
};
</script>
<style lang="scss" scoped>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ export default {
props: {
volume: { type: Object, required: true }
},
data: () => ({
files: [],
selected: [],
expanded: ["/"]
}),
data: () => ({ files: [], selected: [], expanded: ["/"] }),
mounted() {
this.init();
},
Expand Down
4 changes: 3 additions & 1 deletion dockers/manager/front/src/components/Docker/Volume/Link.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import PmLink from "src/components/PMLink.vue";
export default {
components: { PmLink },
props: { name: { type: String, required: true } }
props: {
name: { type: String, required: true }
}
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import PmLink from "src/components/PMLink.vue";
export default {
components: { PmLink },
props: { name: {type: String, required: true} }
props: {
name: { type: String, required: true }
}
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ export default {
type: "addPrefix",
extra: getCreateComponent
},
props: { middleware: { type: Object, default: null } },
props: {
middleware: { type: Object, default: null }
},
data() {
const originalForm = {
name: this.middleware?.name.split("@")[0],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import CreateMiddleware from "./Create.vue";
export default {
components: { CreateMiddleware, BaseDialog },
props: { middleware: { type: Object, default: null } },
props: {
middleware: { type: Object, default: null }
},
data: () => ({ form: {}, subtitle: null }),
methods: {
updateSubtitle(t) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import PmLink from "src/components/PMLink.vue";
export default {
components: { PmLink },
props: { name: {type: String, required: true} }
props: {
name: { type: String, required: true }
}
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import BaseDialog from "src/components/BaseDialog.vue";
export default {
components: { CreateRouter, BaseDialog },
props: { router: { type: Object, default: null } },
props: {
router: { type: Object, default: null }
},
methods: {
show() {
this.$refs.dialog.show();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ import api from "src/api";
export default {
mixins: [DeepForm],
props: { protocol: { type: String, default: null } },
props: {
protocol: { type: String, default: null }
},
formDefinition: [],
apollo: {
entrypoints: {
Expand Down
4 changes: 3 additions & 1 deletion dockers/manager/front/src/components/Traefik/Router/Link.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import PmLink from "src/components/PMLink.vue";
export default {
components: { PmLink },
props: { name: {type: String, required: true} }
props: {
name: { type: String, required: true }
}
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ export default {
update: data => data.traefikServices
}
},
props: { protocol: { type: String, default: null } },
props: {
protocol: { type: String, default: null }
},
computed: {
serviceNames() {
return (this.services ?? []).map(s => s.name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ export default {
type: "loadBalancer",
extra: getCreateComponent
},
props: { service: { type: Object, default: null } },
props: {
service: { type: Object, default: null }
},
data() {
const availableTypes = {
http: ["loadBalancer", "weighted", "mirroring"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import CreateService from "./Create.vue";
export default {
components: { CreateService, BaseDialog },
props: { service: { type: Object, default: null } },
props: {
service: { type: Object, default: null }
},
data: () => ({ subtitle: null }),
computed: {
serviceForm() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import PmLink from "src/components/PMLink.vue";
export default {
components: { PmLink },
props: { name: { type: String, required: true } }
props: {
name: { type: String, required: true }
}
};
</script>
47 changes: 25 additions & 22 deletions dockers/manager/front/src/pages/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
/>
<div class="row justify-center">
<div class="col col-auto">
<component :is="formChildren.otp" v-model="form.otp" @enter="submit" />
<component
:is="formChildren.otp"
v-model="form.otp"
@enter="submit"
/>
</div>
</div>
<q-select
Expand Down Expand Up @@ -45,34 +49,33 @@ import api from "src/api";
import DeepForm from "src/mixins/DeepForm";
import OtpInput from "src/components/Auth/OtpInput.vue";
const expireOptions = [
{
label: "One day",
value: 1
},
{
label: "One week",
value: 7
},
{
label: "One month",
value: 30
},
{
label: "Forever",
value: 0
}
];
export default {
mixins: [DeepForm],
formDefinition: {
password: "",
otp: OtpInput,
durationDays: 1
},
data: () => {
const expireOptions = [
{
label: "One day",
value: 1
},
{
label: "One week",
value: 7
},
{
label: "One month",
value: 30
},
{
label: "Forever",
value: 0
}
];
return { expireOptions };
},
data: () => ({ expireOptions }),
methods: {
submit() {
this.mutate({
Expand Down

0 comments on commit e99c5b5

Please sign in to comment.