Skip to content

Commit a1b0013

Browse files
authored
Merge pull request #45 from kubero-dev/release/v1.4.1
Release/v1.4.1
2 parents 0acae7b + 9afe1e3 commit a1b0013

File tree

4 files changed

+46
-9
lines changed

4 files changed

+46
-9
lines changed
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

client/src/components/apps/new.vue

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
:counter="60"
2626
:readonly="app!='new'"
2727
label="App name"
28-
v-on="changeName(appname)"
28+
v-on:input="changeName(appname)"
2929
required
3030
></v-text-field>
3131
</v-col>
@@ -618,15 +618,13 @@ export default {
618618
this.docker.image = this.pipelineData.dockerimage;
619619
}
620620
621-
621+
this.loadBranches();
622622
this.buildpack = this.pipelineData.buildpack;
623623
624-
this.gitrepo.ssh_url = this.pipelineData.git.repository.ssh_url;
625-
this.domain = this.pipelineData.domain;
626-
627-
this.loadBranches();
628-
/*
629624
if (this.app == 'new') {
625+
this.domain = this.pipelineData.domain;
626+
this.gitrepo.ssh_url = this.pipelineData.git.repository.ssh_url;
627+
/*
630628
switch (this.pipelineData.github.repository.language) {
631629
case "JavaScript":
632630
this.buildpack = 'NodeJS';
@@ -639,8 +637,9 @@ export default {
639637
//this.buildpack = "";
640638
break;
641639
}
640+
*/
642641
}
643-
*/
642+
644643
});
645644
},
646645
loadBranches() {

client/src/components/pipelines/list.vue

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<v-col cols="12" sm="12" md="6">
3131
<a :href="'/#/pipeline/'+item.name+'/apps'">
3232
<v-card-title>
33-
<v-icon left>mdi-{{ item.deploymentstrategy}}</v-icon>
33+
<v-icon left :class=" (item.git.repository.admin == true) ? 'connected' : 'disconnected' "></v-icon>
3434
<span class="text-h5">{{ item.name }}</span>
3535
</v-card-title>
3636
<v-card-text>
@@ -131,4 +131,34 @@ export default {
131131
text-decoration: none;
132132
color: #8560A9 !important;
133133
}
134+
135+
.connected{
136+
background-image: url('./../../../public/img/icons/connected.svg');
137+
background-size: contain;
138+
background-repeat: no-repeat;
139+
filter: invert(39%) sepia(47%) saturate(584%) hue-rotate(228deg) brightness(95%) contrast(80%);
140+
/*filter: invert(93%) sepia(49%) saturate(7411%) hue-rotate(184deg) brightness(87%) contrast(90%);*/
141+
}
142+
143+
.connected::before {
144+
height: 23px;
145+
width: 23px;
146+
visibility: hidden;
147+
content: "";
148+
}
149+
150+
.disconnected{
151+
background-image: url('./../../../public/img/icons/disconnected.svg');
152+
background-size: contain;
153+
background-repeat: no-repeat;
154+
filter: invert(39%) sepia(47%) saturate(584%) hue-rotate(228deg) brightness(95%) contrast(80%);
155+
/*filter: invert(93%) sepia(49%) saturate(7411%) hue-rotate(184deg) brightness(87%) contrast(90%);*/
156+
}
157+
158+
.disconnected::before {
159+
height: 23px;
160+
width: 23px;
161+
visibility: hidden;
162+
content: "";
163+
}
134164
</style>

0 commit comments

Comments
 (0)