From 2a3eeab2747b0f2eb3d41944a040b2443cd67a5e Mon Sep 17 00:00:00 2001 From: Gianni Carafa Date: Sun, 18 Dec 2022 23:44:28 +0100 Subject: [PATCH 1/2] fix editing domain on a app --- client/src/components/apps/new.vue | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/client/src/components/apps/new.vue b/client/src/components/apps/new.vue index 41ebb164..4c2eecf8 100644 --- a/client/src/components/apps/new.vue +++ b/client/src/components/apps/new.vue @@ -25,7 +25,7 @@ :counter="60" :readonly="app!='new'" label="App name" - v-on="changeName(appname)" + v-on:input="changeName(appname)" required > @@ -618,15 +618,13 @@ export default { this.docker.image = this.pipelineData.dockerimage; } - + this.loadBranches(); this.buildpack = this.pipelineData.buildpack; - this.gitrepo.ssh_url = this.pipelineData.git.repository.ssh_url; - this.domain = this.pipelineData.domain; - - this.loadBranches(); -/* if (this.app == 'new') { + this.domain = this.pipelineData.domain; + this.gitrepo.ssh_url = this.pipelineData.git.repository.ssh_url; + /* switch (this.pipelineData.github.repository.language) { case "JavaScript": this.buildpack = 'NodeJS'; @@ -639,8 +637,9 @@ export default { //this.buildpack = ""; break; } + */ } -*/ + }); }, loadBranches() { From 913f8655c560a82a85ff4d2e06cdf4e89cbfab50 Mon Sep 17 00:00:00 2001 From: Gianni Carafa Date: Mon, 19 Dec 2022 07:28:17 +0100 Subject: [PATCH 2/2] improve pipelineview status icon --- client/public/img/icons/connected.svg | 4 +++ client/public/img/icons/disconnected.svg | 4 +++ client/src/components/pipelines/list.vue | 32 +++++++++++++++++++++++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 client/public/img/icons/connected.svg create mode 100644 client/public/img/icons/disconnected.svg diff --git a/client/public/img/icons/connected.svg b/client/public/img/icons/connected.svg new file mode 100644 index 00000000..11e33e47 --- /dev/null +++ b/client/public/img/icons/connected.svg @@ -0,0 +1,4 @@ + + + + diff --git a/client/public/img/icons/disconnected.svg b/client/public/img/icons/disconnected.svg new file mode 100644 index 00000000..1de2371e --- /dev/null +++ b/client/public/img/icons/disconnected.svg @@ -0,0 +1,4 @@ + + + + diff --git a/client/src/components/pipelines/list.vue b/client/src/components/pipelines/list.vue index ce476773..8aedeac5 100644 --- a/client/src/components/pipelines/list.vue +++ b/client/src/components/pipelines/list.vue @@ -30,7 +30,7 @@ - mdi-{{ item.deploymentstrategy}} + {{ item.name }} @@ -131,4 +131,34 @@ export default { text-decoration: none; color: #8560A9 !important; } + +.connected{ + background-image: url('./../../../public/img/icons/connected.svg'); + background-size: contain; + background-repeat: no-repeat; + filter: invert(39%) sepia(47%) saturate(584%) hue-rotate(228deg) brightness(95%) contrast(80%); + /*filter: invert(93%) sepia(49%) saturate(7411%) hue-rotate(184deg) brightness(87%) contrast(90%);*/ +} + +.connected::before { + height: 23px; + width: 23px; + visibility: hidden; + content: ""; +} + +.disconnected{ + background-image: url('./../../../public/img/icons/disconnected.svg'); + background-size: contain; + background-repeat: no-repeat; + filter: invert(39%) sepia(47%) saturate(584%) hue-rotate(228deg) brightness(95%) contrast(80%); + /*filter: invert(93%) sepia(49%) saturate(7411%) hue-rotate(184deg) brightness(87%) contrast(90%);*/ +} + +.disconnected::before { + height: 23px; + width: 23px; + visibility: hidden; + content: ""; +} \ No newline at end of file