Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

WIP: updated drone

Matthias Bilgerf14eaf5f0b74
diff --git a/src/components/Widgets/DroneIo.vue b/src/components/Widgets/DroneIo.vue
index e426e1c3..9687a399 100644
--- a/src/components/Widgets/DroneIo.vue
+++ b/src/components/Widgets/DroneIo.vue
@@ -10,7 +10,21 @@
</div>
<div class="info">
<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>
@@ -18,7 +32,7 @@
<script>
import WidgetMixin from '@/mixins/WidgetMixin';
-import { timestampToDateTime } from '@/utils/MiscHelpers';
+import { getTimeAgo, getTimeDifference, timestampToDateTime } from '@/utils/MiscHelpers';
export default {
mixins: [WidgetMixin],
@@ -34,11 +48,15 @@ export default {
if (status === 'success') symbol = 'βœ”';
if (status === 'failure' || status === 'error') symbol = '✘';
if (status === 'running') symbol = '❖';
+ if (status === 'skipped') symbol = 'β† ';
return `${symbol}`;
},
formatDate(timestamp) {
return timestampToDateTime(timestamp);
},
+ formatTimeAgo(timestamp) {
+ return getTimeAgo(timestamp);
+ },
},
computed: {
/* API endpoint, either for self-hosted or managed instance */
@@ -54,11 +72,6 @@ export default {
},
},
methods: {
- update() {
- this.startLoading();
- this.fetchData();
- this.finishLoading();
- },
/* Make GET request to CoinGecko API endpoint */
fetchData() {
this.overrideProxyChoice = true;
@@ -82,6 +95,12 @@ export default {
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>
@@ -125,6 +144,13 @@ export default {
color: inherit;
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 {
content: "#";