mirror of
https://github.com/Lissy93/dashy.git
synced 2025-07-24 22:25:16 +02:00
WIP: updated drone
This commit is contained in:
parent
97ccdd44b2
commit
f14eaf5f0b
@ -10,7 +10,21 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<p class="build-name"><a :href="build.git_http_url" target="_blank">{{ build.name }}</a></p>
|
<p class="build-name"><a :href="build.git_http_url" target="_blank">{{ build.name }}</a></p>
|
||||||
<p class="build-desc"><a :href="build.baseurl + '/' + build.slug + '/' +build.build.number" target="_blank">{{ build.build.number }}</a></p>
|
<p class="build-desc">
|
||||||
|
<a :href="build.baseurl + '/' + build.slug + '/' +build.build.number" target="_blank">{{ build.build.number }}</a>
|
||||||
|
<template v-if="build.event == 'pull_request'">
|
||||||
|
<a :href="build.build.link" target="_blank" class="droneio-extra-info">#{{ formatPrId(build.build.link) }}</a> to <span class="droneio-info-link">{{ build.build.target }}</span>
|
||||||
|
</template>
|
||||||
|
<template v-if="build.event == 'push'">
|
||||||
|
<a :href="build.build.link" target="_blank" class="droneio-extra-info">push</a> to <span class="droneio-extra-info">{{ build.build.target }}</span>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<span class="droneio-extra-info">{{ build.build.target }}</span>
|
||||||
|
</template>
|
||||||
|
<span v-if="build.status == 'running'">{{ build.build.started*1000 | formatTimeAgo }}</span>
|
||||||
|
<span v-else-if="build.status != 'running' || build.status != 'pending' ">{{ formatBuildDuration(build) }}</span>
|
||||||
|
<span v-else>Missing Time</span>
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -18,7 +32,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import WidgetMixin from '@/mixins/WidgetMixin';
|
import WidgetMixin from '@/mixins/WidgetMixin';
|
||||||
import { timestampToDateTime } from '@/utils/MiscHelpers';
|
import { getTimeAgo, getTimeDifference, timestampToDateTime } from '@/utils/MiscHelpers';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
mixins: [WidgetMixin],
|
mixins: [WidgetMixin],
|
||||||
@ -34,11 +48,15 @@ export default {
|
|||||||
if (status === 'success') symbol = '✔';
|
if (status === 'success') symbol = '✔';
|
||||||
if (status === 'failure' || status === 'error') symbol = '✘';
|
if (status === 'failure' || status === 'error') symbol = '✘';
|
||||||
if (status === 'running') symbol = '❖';
|
if (status === 'running') symbol = '❖';
|
||||||
|
if (status === 'skipped') symbol = '↠';
|
||||||
return `${symbol}`;
|
return `${symbol}`;
|
||||||
},
|
},
|
||||||
formatDate(timestamp) {
|
formatDate(timestamp) {
|
||||||
return timestampToDateTime(timestamp);
|
return timestampToDateTime(timestamp);
|
||||||
},
|
},
|
||||||
|
formatTimeAgo(timestamp) {
|
||||||
|
return getTimeAgo(timestamp);
|
||||||
|
},
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
/* API endpoint, either for self-hosted or managed instance */
|
/* API endpoint, either for self-hosted or managed instance */
|
||||||
@ -54,11 +72,6 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
update() {
|
|
||||||
this.startLoading();
|
|
||||||
this.fetchData();
|
|
||||||
this.finishLoading();
|
|
||||||
},
|
|
||||||
/* Make GET request to CoinGecko API endpoint */
|
/* Make GET request to CoinGecko API endpoint */
|
||||||
fetchData() {
|
fetchData() {
|
||||||
this.overrideProxyChoice = true;
|
this.overrideProxyChoice = true;
|
||||||
@ -82,6 +95,12 @@ export default {
|
|||||||
content, html: true, trigger: 'hover focus', delay: 250, classes: 'build-info-tt',
|
content, html: true, trigger: 'hover focus', delay: 250, classes: 'build-info-tt',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
formatPrId(link) {
|
||||||
|
return link.split('/').pop();
|
||||||
|
},
|
||||||
|
formatBuildDuration(build){
|
||||||
|
return getTimeDifference(build.build.started*1000, build.build.finished*1000);
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
@ -125,6 +144,13 @@ export default {
|
|||||||
color: inherit;
|
color: inherit;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
.droneio-extra-info {
|
||||||
|
margin: 0.25em;
|
||||||
|
padding: 0.25em;
|
||||||
|
background: var(--item-background);
|
||||||
|
border: 1px solid var(--primary);
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
p.build-desc::before {
|
p.build-desc::before {
|
||||||
content: "#";
|
content: "#";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user