diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-03-29 10:14:33 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-03-29 10:14:33 +0900 |
| commit | a950b6193a2dfbda35fc01360d18406c1fb53a56 (patch) | |
| tree | 31912c83372f44f9959cd26dba63b1ad575baccf | |
| parent | Update CHANGELOG.md (diff) | |
| download | misskey-a950b6193a2dfbda35fc01360d18406c1fb53a56.tar.gz misskey-a950b6193a2dfbda35fc01360d18406c1fb53a56.tar.bz2 misskey-a950b6193a2dfbda35fc01360d18406c1fb53a56.zip | |
インスタンス一覧でソートできるように
| -rw-r--r-- | locales/ja-JP.yml | 14 | ||||
| -rw-r--r-- | src/client/pages/instance/federation.vue | 28 |
2 files changed, 34 insertions, 8 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index a77991cccd..4e764bc635 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -472,6 +472,10 @@ installedApps: "インストールされたアプリ" nothing: "ありません" installedDate: "インストール日時" lastUsedDate: "最終使用日時" +state: "状態" +sort: "ソート" +ascendingOrder: "昇順" +descendingOrder: "降順" _theme: explore: "テーマを探す" @@ -691,15 +695,15 @@ _charts: _instanceCharts: requests: "リクエスト" users: "ユーザーの増減" - usersTotal: "ユーザーの積算" + usersTotal: "ユーザーの累積" notes: "ノートの増減" - notesTotal: "ノートの積算" + notesTotal: "ノートの累積" ff: "フォロー/フォロワーの増減" - ffTotal: "フォロー/フォロワーの積算" + ffTotal: "フォロー/フォロワーの累積" cacheSize: "キャッシュサイズの増減" - cacheSizeTotal: "キャッシュサイズの積算" + cacheSizeTotal: "キャッシュサイズの累積" files: "ファイル数の増減" - filesTotal: "ファイル数の積算" + filesTotal: "ファイル数の累積" _timelines: home: "ホーム" diff --git a/src/client/pages/instance/federation.vue b/src/client/pages/instance/federation.vue index fa7c377720..b22f92ab26 100644 --- a/src/client/pages/instance/federation.vue +++ b/src/client/pages/instance/federation.vue @@ -3,9 +3,10 @@ <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 +15,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> |