artin/API-Explorer-II
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Explorer-II.git synced 2026-02-06 10:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/Resolve merge issues

Browse Source
This commit is contained in:
Marko Milić 2024-12-18 12:02:12 +01:00
parent 697ee2688d
commit 175f146dee
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components.d.ts vendored
View File

@ -1,10 +1,10 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
ChatWidget: typeof import('./src/components/ChatWidget.vue')['default']

3
server/controllers/StatusController.ts
View File

@ -65,7 +65,8 @@ export class StatusController {
apiVersions,
messageDocs,
resourceDocs,
currentUser
currentUser,
commitId
})
}

6
src/views/APIServerStatusView.vue
View File

@ -39,7 +39,7 @@ onBeforeMount(async () => {
<template>
<main>
<div class="content">
<div v-for="(value, name, index) in status" :key="index" v-if="name !== 'commit_id'">
<div v-for="(value, name, index) in status" :key="index" v-if="name !== 'commitId'">
<div v-if="name === 'status'" class="status">
<el-icon v-if="value === true" style="vertical-align: middle; color: green; width: auto"
><SuccessFilled
@ -47,7 +47,7 @@ onBeforeMount(async () => {
<el-icon v-else style="vertical-align: middle; color: red"><RemoveFilled /></el-icon>
<span class="main-status-label">{{ name }}</span>
</div>
<div v-else-if="name !== 'commit_id'" class="sub-status">
<div v-else-if="name !== 'commitId'" class="sub-status">
<span class="status-label">{{ name }}</span>
&nbsp;&nbsp;&nbsp;<el-divider />&nbsp;&nbsp;&nbsp;
<el-icon
@ -61,7 +61,7 @@ onBeforeMount(async () => {
</div>
</main>
<span>App Version: {{ version }}</span>
<span>Commit ID: {{ status.commit_id }}</span>
<span>Commit ID: {{ status.commitId }}</span>
</template>
<style scoped>