diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-03-29 17:46:31 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-03-29 17:46:31 +0900 |
| commit | cc66a1f9c7733f0ff3c23b60a8578cdb1235a3f2 (patch) | |
| tree | e7e7697fcfc2ec63c642e5496030bdd46f87601b /src/client/pages/instance | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.28.0 (diff) | |
| download | sharkey-cc66a1f9c7733f0ff3c23b60a8578cdb1235a3f2.tar.gz sharkey-cc66a1f9c7733f0ff3c23b60a8578cdb1235a3f2.tar.bz2 sharkey-cc66a1f9c7733f0ff3c23b60a8578cdb1235a3f2.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/pages/instance')
| -rw-r--r-- | src/client/pages/instance/federation.vue | 32 | ||||
| -rw-r--r-- | src/client/pages/instance/queue.vue | 3 |
2 files changed, 31 insertions, 4 deletions
diff --git a/src/client/pages/instance/federation.vue b/src/client/pages/instance/federation.vue index fa7c377720..5babc60453 100644 --- a/src/client/pages/instance/federation.vue +++ b/src/client/pages/instance/federation.vue @@ -1,11 +1,14 @@ <template> <div class="mk-federation"> + <portal to="icon"><fa :icon="faGlobe"/></portal> + <portal to="title">{{ $t('federation') }}</portal> + <section class="_card instances"> - <div class="_title"><fa :icon="faGlobe"/> {{ $t('instances') }}</div> <div class="_content"> + <mk-input v-model="host" :debounce="true"><span>{{ $t('host') }}</span></mk-input> <div class="inputs" style="display: flex;"> - <mk-input v-model="host" :debounce="true" style="margin: 0; flex: 1;"><span>{{ $t('host') }}</span></mk-input> - <mk-select v-model="state" style="margin: 0;"> + <mk-select v-model="state" style="margin: 0; flex: 1;"> + <template #label>{{ $t('state') }}</template> <option value="all">{{ $t('all') }}</option> <option value="federating">{{ $t('federating') }}</option> <option value="subscribing">{{ $t('subscribing') }}</option> @@ -14,11 +17,32 @@ <option value="blocked">{{ $t('blocked') }}</option> <option value="notResponding">{{ $t('notResponding') }}</option> </mk-select> + <mk-select v-model="sort" style="margin: 0; flex: 1;"> + <template #label>{{ $t('sort') }}</template> + <option value="+pubSub">{{ $t('pubSub') }} ({{ $t('descendingOrder') }})</option> + <option value="-pubSub">{{ $t('pubSub') }} ({{ $t('ascendingOrder') }})</option> + <option value="+notes">{{ $t('notes') }} ({{ $t('descendingOrder') }})</option> + <option value="-notes">{{ $t('notes') }} ({{ $t('ascendingOrder') }})</option> + <option value="+users">{{ $t('users') }} ({{ $t('descendingOrder') }})</option> + <option value="-users">{{ $t('users') }} ({{ $t('ascendingOrder') }})</option> + <option value="+following">{{ $t('following') }} ({{ $t('descendingOrder') }})</option> + <option value="-following">{{ $t('following') }} ({{ $t('ascendingOrder') }})</option> + <option value="+followers">{{ $t('followers') }} ({{ $t('descendingOrder') }})</option> + <option value="-followers">{{ $t('followers') }} ({{ $t('ascendingOrder') }})</option> + <option value="+caughtAt">{{ $t('caughtAt') }} ({{ $t('descendingOrder') }})</option> + <option value="-caughtAt">{{ $t('caughtAt') }} ({{ $t('ascendingOrder') }})</option> + <option value="+lastCommunicatedAt">{{ $t('lastCommunicatedAt') }} ({{ $t('descendingOrder') }})</option> + <option value="-lastCommunicatedAt">{{ $t('lastCommunicatedAt') }} ({{ $t('ascendingOrder') }})</option> + <option value="+driveUsage">{{ $t('driveUsage') }} ({{ $t('descendingOrder') }})</option> + <option value="-driveUsage">{{ $t('driveUsage') }} ({{ $t('ascendingOrder') }})</option> + <option value="+driveFiles">{{ $t('driveFiles') }} ({{ $t('descendingOrder') }})</option> + <option value="-driveFiles">{{ $t('driveFiles') }} ({{ $t('ascendingOrder') }})</option> + </mk-select> </div> </div> <div class="_content"> <mk-pagination :pagination="pagination" #default="{items}" class="instances" ref="instances" :key="host + state"> - <div class="instance" v-for="(instance, i) in items" :key="instance.id" @click="info(instance)"> + <div class="instance" v-for="instance in items" :key="instance.id" @click="info(instance)"> <div class="host"><fa :icon="faCircle" class="indicator" :class="getStatus(instance)"/><b>{{ instance.host }}</b></div> <div class="status"> <span class="sub" v-if="instance.followersCount > 0"><fa :icon="faCaretDown" class="icon"/>Sub</span> diff --git a/src/client/pages/instance/queue.vue b/src/client/pages/instance/queue.vue index 8590f9ae23..c4892e88db 100644 --- a/src/client/pages/instance/queue.vue +++ b/src/client/pages/instance/queue.vue @@ -1,5 +1,8 @@ <template> <div> + <portal to="icon"><fa :icon="faExchangeAlt"/></portal> + <portal to="title">{{ $t('jobQueue') }}</portal> + <x-queue :connection="connection" domain="inbox"> <template #title><fa :icon="faExchangeAlt"/> In</template> </x-queue> |