Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2025-01-20 23:39:56 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(fe): small ui fixes

Browse Source
This commit is contained in:
Denis Gukov 2020-11-22 15:54:03 +05:00
parent c3266bc730
commit 7d50947b1f
4 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web2/src/main.js
View File

@ -8,7 +8,7 @@ Vue.config.productionTip = false;
Vue.filter('formatDate', (value) => (value ? moment(String(value)).fromNow() : '—'));
Vue.filter('formatTime', (value) => (value ? moment(String(value)).format('LTS') : '—'));
Vue.filter('formatMilliseconds', (value) => (value ? moment.duration(parseInt(value, 10), 'milliseconds').humanize() : undefined));
Vue.filter('formatMilliseconds', (value) => (value ? moment.duration(parseInt(value, 10), 'milliseconds').humanize() : '—'));
new Vue({
router,

2
web2/src/views/project/Activity.vue
View File

@ -16,8 +16,8 @@
<v-data-table
:headers="headers"
:items="items"
hide-default-footer
class="mt-4"
:footer-props="{ itemsPerPageOptions: [20] }"
>
<template v-slot:item.created="{ item }">
{{ item.created | formatDate }}

8
web2/src/views/project/History.vue
View File

@ -28,15 +28,11 @@
</template>
<template v-slot:item.start="{ item }">
<span v-if="item.start">{{ item.start | formatDate }}</span>
<v-chip v-else>Not started</v-chip>
{{ item.start | formatDate }}
</template>
<template v-slot:item.end="{ item }">
<span v-if="item.end">
{{ (new Date(item.end) - new Date(item.start)) | formatMilliseconds }}
</span>
<v-chip v-else>Not ended</v-chip>
{{ (new Date(item.end) - new Date(item.start)) | formatMilliseconds }}
</template>
</v-data-table>
</div>

72
web2/src/views/project/TemplateView.vue
View File

@ -97,8 +97,45 @@
<v-list-item-subtitle>{{ item.playbook }}</v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
</v-list>
</v-col>
<v-col>
<v-list two-line subheader>
<v-list-item>
<v-list-item-icon>
<v-icon>mdi-monitor</v-icon>
</v-list-item-icon>
<v-list-item-content>
<v-list-item-title>Inventory</v-list-item-title>
<v-list-item-subtitle>
{{ inventory.find((x) => x.id === item.inventory_id).name }}
</v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
</v-list>
</v-col>
<v-col>
<v-list two-line subheader>
<v-list-item>
<v-list-item-icon>
<v-icon>mdi-code-braces</v-icon>
</v-list-item-icon>
<v-list-item-content>
<v-list-item-title>Environment</v-list-item-title>
<v-list-item-subtitle>
{{ environment.find((x) => x.id === item.environment_id).name }}
</v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
</v-list>
</v-col>
<v-col>
<v-list two-line subheader>
<v-list-item>
<v-list-item-icon>
<v-icon>mdi-key</v-icon>
</v-list-item-icon>
<v-list-item-content>
<v-list-item-title>SSH Key</v-list-item-title>
<v-list-item-subtitle>
@ -111,24 +148,9 @@
<v-col>
<v-list two-line subheader>
<v-list-item>
<v-list-item-content>
<v-list-item-title>Inventory</v-list-item-title>
<v-list-item-subtitle>
{{ inventory.find((x) => x.id === item.inventory_id).name }}
</v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
<v-list-item>
<v-list-item-content>
<v-list-item-title>Environment</v-list-item-title>
<v-list-item-subtitle>
{{ environment.find((x) => x.id === item.environment_id).name }}
</v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
<v-list-item>
<v-list-item-icon>
<v-icon>mdi-git</v-icon>
</v-list-item-icon>
<v-list-item-content>
<v-list-item-title>Repository</v-list-item-title>
<v-list-item-subtitle>
@ -141,12 +163,12 @@
</v-row>
</v-container>
<h4 class="ml-4 mt-4">Task History</h4>
<!-- <h4 class="ml-4 mt-1">Running History</h4>-->
<v-data-table
:headers="headers"
:items="tasks"
hide-default-footer
class="mt-2"
:footer-props="{ itemsPerPageOptions: [20] }"
class="mt-0"
>
<template v-slot:item.id="{ item }">
<a @click="showTaskLog(item.id)">#{{ item.id }}</a>
@ -157,15 +179,11 @@
</template>
<template v-slot:item.start="{ item }">
<span v-if="item.start">{{ item.start | formatDate }}</span>
<v-chip v-else>Not started</v-chip>
{{ item.start | formatDate }}
</template>
<template v-slot:item.end="{ item }">
<span v-if="item.end">
{{ (new Date(item.end) - new Date(item.start)) | formatMilliseconds }}
</span>
<v-chip v-else>Not ended</v-chip>
</template>
</v-data-table>
</div>