summaryrefslogtreecommitdiff
path: root/src/client/pages/instance
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-08-13 21:27:06 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-08-13 21:27:06 +0900
commit080574e13d46075e537249d926781a91a490eb38 (patch)
tree13aca25eb4397d28aefec1b03fc1175b8d07240c /src/client/pages/instance
parentWIP: Improve admin dashboard (diff)
downloadsharkey-080574e13d46075e537249d926781a91a490eb38.tar.gz
sharkey-080574e13d46075e537249d926781a91a490eb38.tar.bz2
sharkey-080574e13d46075e537249d926781a91a490eb38.zip
WIP: Improve admin dashboard
Diffstat (limited to 'src/client/pages/instance')
-rw-r--r--src/client/pages/instance/index.vue30
1 files changed, 22 insertions, 8 deletions
diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue
index 9cdf97833e..c32fe81df0 100644
--- a/src/client/pages/instance/index.vue
+++ b/src/client/pages/instance/index.vue
@@ -108,7 +108,7 @@
<mk-folder>
<template #header><fa :icon="faClipboardList"/> {{ $t('jobQueue') }}</template>
- <div class="vkyrmkwb">
+ <div class="vkyrmkwb" :style="{ gridTemplateRows: queueHeight }">
<mk-container :body-togglable="false" :scrollable="true" :resize-base-el="() => $el">
<template #header><fa :icon="faExclamationTriangle"/> {{ $t('delayed') }}</template>
@@ -119,10 +119,10 @@
</div>
</div>
</mk-container>
- <x-queue :connection="queueConnection" domain="inbox">
+ <x-queue :connection="queueConnection" domain="inbox" ref="queue" class="queue">
<template #title><fa :icon="faExchangeAlt"/> In</template>
</x-queue>
- <x-queue :connection="queueConnection" domain="deliver">
+ <x-queue :connection="queueConnection" domain="deliver" class="queue">
<template #title><fa :icon="faExchangeAlt"/> Out</template>
</x-queue>
</div>
@@ -239,6 +239,7 @@ export default Vue.extend({
modLogs: [],
dbInfo: null,
overviewHeight: '1fr',
+ queueHeight: '1fr',
faDatabase, faServer, faExchangeAlt, faMicrochip, faHdd, faStream, faTrashAlt, faInfoCircle, faExclamationTriangle, faTachometerAlt, faHeartbeat, faClipboardList,
}
},
@@ -512,13 +513,17 @@ export default Vue.extend({
});
this.$nextTick(() => {
- const ro = new ResizeObserver((entries, observer) => {
- if (this.$refs.stats) {
+ new ResizeObserver((entries, observer) => {
+ if (this.$refs.stats && this.$refs.stats.$el) {
this.overviewHeight = this.$refs.stats.$el.offsetHeight + 'px';
}
- });
+ }).observe(this.$refs.stats.$el);
- ro.observe(this.$refs.stats.$el);
+ new ResizeObserver((entries, observer) => {
+ if (this.$refs.queue && this.$refs.queue.$el) {
+ this.queueHeight = this.$refs.queue.$el.offsetHeight + 'px';
+ }
+ }).observe(this.$refs.queue.$el);
});
},
@@ -666,8 +671,17 @@ export default Vue.extend({
.vkyrmkwb {
display: grid;
grid-template-columns: 0.5fr 1fr 1fr;
- grid-template-rows: 400px;
+ grid-template-rows: 1fr;
gap: 16px 16px;
+ margin-bottom: var(--margin);
+
+ > .queue {
+ height: min-content;
+ }
+
+ > * {
+ margin-bottom: 0;
+ }
}
.uwuemslx {