Merge pull request #45 from kubero-dev/release/v1.4.1

Release/v1.4.1
kubero-dev · Dec 19, 2022 · a1b0013 · a1b0013
2 parents 0acae7b + 9afe1e3
commit a1b0013
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/client/public/img/icons/connected.svg b/client/public/img/icons/connected.svg
diff --git a/client/public/img/icons/disconnected.svg b/client/public/img/icons/disconnected.svg
diff --git 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
           ></v-text-field>
         </v-col>
@@ -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() {

diff --git a/client/src/components/pipelines/list.vue b/client/src/components/pipelines/list.vue
@@ -30,7 +30,7 @@
                                     <v-col cols="12" sm="12" md="6">
                                         <a :href="'/#/pipeline/'+item.name+'/apps'">
                                             <v-card-title>
-                                                <v-icon left>mdi-{{ item.deploymentstrategy}}</v-icon>
+                                                <v-icon left :class=" (item.git.repository.admin == true) ? 'connected' : 'disconnected' "></v-icon>
                                                 <span class="text-h5">{{ item.name }}</span>
                                             </v-card-title>
                                             <v-card-text>
@@ -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: "";
+}
 </style>