cd0f8a4ef9
* ストリーミング以外は一通り実装 * ストリーミング分も適用 * 通知のグローバル設定をサーバーサイドに保存 * グローバル通知を使うようにしたら更新されなくなるのを修正 * サーバーサイド処理 * i/notifications のパラメーター includeTypes に空配列を渡すと全部の通知が来る問題を修正 * 全て有効/無効ボタンを実装 * Squashed commit of the following: commitc3c111529e
Author: syuilo <syuilotan@yahoo.co.jp> Date: Wed Aug 19 22:29:04 2020 +0900 12.47.0 commit2dbab66cfe
Author: syuilo <Syuilotan@yahoo.co.jp> Date: Wed Aug 19 22:24:39 2020 +0900 New Crowdin updates (#6617) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) commit01238d6b1a
Author: Acid Chicken (硫酸鶏) <root@acid-chicken.com> Date: Wed Aug 19 22:24:02 2020 +0900 Update README.md [AUTOGEN] (#6593) commitc34f302b1c
Author: syuilo <syuilotan@yahoo.co.jp> Date: Wed Aug 19 21:47:18 2020 +0900 enhance(client): サーバーから切断されたときにダイアログで警告を表示できるように commit6870262f8d
Author: syuilo <syuilotan@yahoo.co.jp> Date: Wed Aug 19 17:52:11 2020 +0900 enhance(client): Better element visible detection commitc54d5e7040
Author: syuilo <syuilotan@yahoo.co.jp> Date: Wed Aug 19 17:51:31 2020 +0900 fix(clinet): 誤字によりスクロールイベントリスナが解除されていなかったのを修正 commit0ace009a54
Author: syuilo <syuilotan@yahoo.co.jp> Date: Tue Aug 18 22:52:54 2020 +0900 fix(server): Prevent error when recieve non-json data from websocket Fix #6658 commit48e8ee440b
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue Aug 18 22:48:52 2020 +0900 WebPのアニメーションが失われるのを修正 Fix #6625 (#6649) commit9855405b89
Author: syuilo <Syuilotan@yahoo.co.jp> Date: Tue Aug 18 22:44:21 2020 +0900 Channel (#6621) * wip * wip * wip * wip * wip * wip * wip * wip * wop * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * add notes * wip * wip * wip * wip * sound * wip * add kick_gaba2 * wip commit122076e8ea
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat Aug 15 04:27:19 2020 +0900 Sign (request-target) Fix #6652 (#6656) commit7c5ac2cbb4
Author: syuilo <syuilotan@yahoo.co.jp> Date: Fri Aug 14 15:24:55 2020 +0900 perf(server): Add isSensitive index to improve query performance commitccda2181c1
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri Aug 14 00:54:33 2020 +0900 GCSに大きいファイルがアップロードできないのを修正 Fix #6254 (#6648) commitb5fe4ba9be
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 23:02:43 2020 +0900 WIP: Improve admin dashboard commitfd9c7d525a
Merge:080574e13
ee0a44559
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 21:27:10 2020 +0900 Merge branch 'develop' of https://github.com/syuilo/misskey into develop commit080574e13d
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 21:27:06 2020 +0900 WIP: Improve admin dashboard commitee0a445590
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Thu Aug 13 20:05:01 2020 +0900 Option objectStorageSetPublicRead (#6645) commitbb342c7601
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 19:56:46 2020 +0900 WIP: Improve admin dashboard commited17636fb9
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 17:58:16 2020 +0900 WIP: Improve admin dashboard commitc59d7d941a
Author: syuilo <Syuilotan@yahoo.co.jp> Date: Wed Aug 12 17:42:12 2020 +0900 Update README.md Close #6644 commit377377595a
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 20:23:51 2020 +0900 enhance(client): Improve admin page commitd63aef9963
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 13:55:00 2020 +0900 chore(client): Fix style commite9b28fa3c0
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 13:00:10 2020 +0900 chore(client): Design tweaks commitbe255dc583
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:42:51 2020 +0900 chore(client): Design tweak commit18eb7c6087
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:31:22 2020 +0900 chore(client): Design tweaks commitcf29e69813
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:28:35 2020 +0900 chore(client): Fix bug commit132da7e3c0
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:20:58 2020 +0900 Update ja-JP.yml commit26df23bb64
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:18:02 2020 +0900 chore(client): fix style commit76389ad619
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:15:58 2020 +0900 chore(client): Design tweaks commit7cde8cfbf2
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 11:51:43 2020 +0900 chore(client): Design tweaks commit4eb2ddac4e
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 11:24:30 2020 +0900 chore(client): Design tweaks commitdc51eef27c
Merge:bff8a23cb
9c5efb9da
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 10:38:00 2020 +0900 Merge branch 'develop' of https://github.com/syuilo/misskey into develop commitbff8a23cbc
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 10:37:57 2020 +0900 chore(client): Design tweaks commit9c5efb9da0
Author: rinsuki <428rinsuki+git@gmail.com> Date: Mon Aug 10 01:33:01 2020 +0900 Dockerのビルド時にgitを入れるように (#6639)917d3d0bd3
でgitの依存関係が追加されたのにgitが入っていないのでコケていた commit48b8320e5e
Author: rinsuki <428rinsuki+git@gmail.com> Date: Mon Aug 10 01:32:27 2020 +0900 Fix #6637 (#6638) * Fix #6637 * fix lint commit9b2ed96c1c
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 9 15:59:38 2020 +0900 chore: Clean up commit69d9aa71f2
Author: syuilo <Syuilotan@yahoo.co.jp> Date: Sun Aug 9 15:51:02 2020 +0900 Full view mode (#6636) * wuip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update folder.vue * wip * Update size.ts * wip * wip * Update index.vue * wip commit13683780cd
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 9 13:49:44 2020 +0900 ✌️ commitd780e5b251
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 9 13:46:19 2020 +0900 enhance(client): ミュートされたノート数を表示するようにしたり commit917d3d0bd3
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sat Aug 8 10:30:38 2020 +0900 chore: Update dependencies 🚀 commit4b19c53697
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sat Aug 8 10:27:37 2020 +0900 client: テーマコードをコピーできるようにしたり commit2d40a15d2b
Author: syuilo <syuilotan@yahoo.co.jp> Date: Fri Aug 7 11:27:37 2020 +0900 refactor: Extract well-known services commit2bdcd22ad4
Author: syuilo <syuilotan@yahoo.co.jp> Date: Tue Aug 4 23:09:48 2020 +0900 enhance(api): アクセストークンを作成する際、createdAtをlastUsedAtを揃えるようにして、未使用かどうかを判定できるように commitf73a4e1304
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue Aug 4 21:12:55 2020 +0900 Update .dockerignore (#6620) commitb265cdbd84
Author: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Mon Aug 3 13:40:32 2020 +0900 Update CHANGELOG.md commita04d8b95c2
Author: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Mon Aug 3 13:40:13 2020 +0900 Update CHANGELOG.md commit0e9a8c0cd4
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 2 13:59:05 2020 +0900 fix(client): Message read state is not reactive commit5ae8a3c7e8
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 2 13:49:28 2020 +0900 refactor * fix: includeTypes 未指定時に通知が返ってこなくなるバグを修正 * 最適化とバグ修正 * 挙動を修正 * Update ja-JP.yml * 不要なimportを削除 * ✌ * 不要なコードの削除 * Update notification-setting-window.vue * Update notification-setting-window.vue * 🎨 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
327 lines
7.3 KiB
Vue
327 lines
7.3 KiB
Vue
<template>
|
|
<div class="mk-deck" :class="`${$store.state.device.deckColumnAlign}`" v-hotkey.global="keymap">
|
|
<x-sidebar ref="nav"/>
|
|
|
|
<!-- TODO: deckMainColumnPlace を見て位置変える -->
|
|
<deck-column class="column" v-if="$store.state.device.deckAlwaysShowMainColumn || $route.name !== 'index'">
|
|
<template #action>
|
|
<button class="_button back" v-if="canBack" @click="back()"><fa :icon="faChevronLeft"/></button>
|
|
</template>
|
|
|
|
<template #header>
|
|
<div class="iwnjqeul">
|
|
<div class="default">
|
|
<portal-target name="avatar" slim/>
|
|
<span class="title"><portal-target name="icon" slim/><portal-target name="title" slim/></span>
|
|
</div>
|
|
<div class="custom">
|
|
<portal-target name="header" slim/>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<router-view></router-view>
|
|
</deck-column>
|
|
|
|
<template v-for="ids in layout">
|
|
<div v-if="ids.length > 1" class="folder column">
|
|
<deck-column-core v-for="id, i in ids" :ref="id" :key="id" :column="columns.find(c => c.id === id)" :is-stacked="true" @parent-focus="moveFocus(id, $event)"/>
|
|
</div>
|
|
<deck-column-core v-else class="column" :ref="ids[0]" :key="ids[0]" :column="columns.find(c => c.id === ids[0])" @parent-focus="moveFocus(ids[0], $event)"/>
|
|
</template>
|
|
|
|
<button @click="addColumn" class="_button add"><fa :icon="faPlus"/></button>
|
|
|
|
<button v-if="$store.getters.isSignedIn" class="nav _button" @click="showNav()"><fa :icon="faBars"/><i v-if="navIndicated"><fa :icon="faCircle"/></i></button>
|
|
<button v-if="$store.getters.isSignedIn" class="post _buttonPrimary" @click="post()"><fa :icon="faPencilAlt"/></button>
|
|
|
|
<stream-indicator v-if="$store.getters.isSignedIn"/>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
import Vue from 'vue';
|
|
import { faPlus, faPencilAlt, faChevronLeft, faBars, faCircle } from '@fortawesome/free-solid-svg-icons';
|
|
import { } from '@fortawesome/free-regular-svg-icons';
|
|
import { v4 as uuid } from 'uuid';
|
|
import { host } from './config';
|
|
import { search } from './scripts/search';
|
|
import DeckColumnCore from './components/deck/column-core.vue';
|
|
import DeckColumn from './components/deck/column.vue';
|
|
import XSidebar from './components/sidebar.vue';
|
|
import { getScrollContainer } from './scripts/scroll';
|
|
|
|
export default Vue.extend({
|
|
components: {
|
|
XSidebar,
|
|
DeckColumn,
|
|
DeckColumnCore,
|
|
},
|
|
|
|
data() {
|
|
return {
|
|
host: host,
|
|
pageKey: 0,
|
|
searching: false,
|
|
connection: null,
|
|
searchQuery: '',
|
|
searchWait: false,
|
|
canBack: false,
|
|
menuDef: this.$store.getters.nav({}),
|
|
wallpaper: localStorage.getItem('wallpaper') != null,
|
|
faPlus, faPencilAlt, faChevronLeft, faBars, faCircle
|
|
};
|
|
},
|
|
|
|
computed: {
|
|
deck() {
|
|
return this.$store.state.deviceUser.deck;
|
|
},
|
|
columns(): any[] {
|
|
return this.deck.columns;
|
|
},
|
|
layout(): any[] {
|
|
return this.deck.layout;
|
|
},
|
|
navIndicated(): boolean {
|
|
if (!this.$store.getters.isSignedIn) return false;
|
|
for (const def in this.menuDef) {
|
|
if (this.menuDef[def].indicated) return true;
|
|
}
|
|
return false;
|
|
},
|
|
keymap(): any {
|
|
return {
|
|
'p': this.post,
|
|
'n': this.post,
|
|
's': this.search,
|
|
'h|/': this.help
|
|
};
|
|
},
|
|
},
|
|
|
|
watch: {
|
|
$route(to, from) {
|
|
this.pageKey++;
|
|
this.canBack = (window.history.length > 0 && !['index'].includes(to.name));
|
|
},
|
|
},
|
|
|
|
created() {
|
|
document.documentElement.style.overflowY = 'hidden';
|
|
document.documentElement.style.scrollBehavior = 'auto';
|
|
window.addEventListener('wheel', this.onWheel);
|
|
|
|
if (this.$store.getters.isSignedIn) {
|
|
this.connection = this.$root.stream.useSharedConnection('main');
|
|
this.connection.on('notification', this.onNotification);
|
|
}
|
|
},
|
|
|
|
mounted() {
|
|
},
|
|
|
|
methods: {
|
|
onWheel(e) {
|
|
if (getScrollContainer(e.target) == null) {
|
|
document.documentElement.scrollLeft += e.deltaY > 0 ? 96 : -96;
|
|
}
|
|
},
|
|
|
|
showNav() {
|
|
this.$refs.nav.show();
|
|
},
|
|
|
|
help() {
|
|
this.$router.push('/docs/keyboard-shortcut');
|
|
},
|
|
|
|
back() {
|
|
if (this.canBack) window.history.back();
|
|
},
|
|
|
|
post() {
|
|
this.$root.post();
|
|
},
|
|
|
|
search() {
|
|
if (this.searching) return;
|
|
|
|
this.$root.dialog({
|
|
title: this.$t('search'),
|
|
input: true
|
|
}).then(async ({ canceled, result: query }) => {
|
|
if (canceled || query == null || query === '') return;
|
|
|
|
this.searching = true;
|
|
search(this, query).finally(() => {
|
|
this.searching = false;
|
|
});
|
|
});
|
|
},
|
|
|
|
async onNotification(notification) {
|
|
const t = this.$store.state.i.includingNotificationTypes;
|
|
if (!!t && !t.includes(notification.type)) {
|
|
return;
|
|
}
|
|
|
|
if (document.visibilityState === 'visible') {
|
|
this.$root.stream.send('readNotification', {
|
|
id: notification.id
|
|
});
|
|
|
|
this.$root.new(await import('./components/toast.vue').then(m => m.default), {
|
|
notification
|
|
});
|
|
}
|
|
this.$root.sound('notification');
|
|
},
|
|
|
|
async addColumn(ev) {
|
|
const columns = [
|
|
'widgets',
|
|
'notifications',
|
|
'tl',
|
|
'antenna',
|
|
'list',
|
|
'mentions',
|
|
'direct',
|
|
];
|
|
|
|
const { canceled, result: column } = await this.$root.dialog({
|
|
title: this.$t('_deck.addColumn'),
|
|
type: null,
|
|
select: {
|
|
items: columns.map(column => ({
|
|
value: column, text: this.$t('_deck._columns.' + column)
|
|
}))
|
|
},
|
|
showCancelButton: true
|
|
});
|
|
if (canceled) return;
|
|
|
|
this.$store.commit('deviceUser/addDeckColumn', {
|
|
type: column,
|
|
id: uuid(),
|
|
name: this.$t('_deck._columns.' + column),
|
|
width: 330,
|
|
});
|
|
},
|
|
}
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" scoped>
|
|
.mk-deck {
|
|
$nav-hide-threshold: 650px; // TODO: どこかに集約したい
|
|
|
|
// TODO: この値を設定で変えられるようにする?
|
|
$columnMargin: 12px;
|
|
|
|
$deckMargin: 12px;
|
|
|
|
--margin: var(--marginHalf);
|
|
|
|
display: flex;
|
|
// ほんとは単に 100vh と書きたいところだが... https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
|
|
height: calc(var(--vh, 1vh) * 100);
|
|
box-sizing: border-box;
|
|
flex: 1;
|
|
padding: $deckMargin 0 $deckMargin $deckMargin;
|
|
|
|
&.center {
|
|
> .column:first-of-type {
|
|
margin-left: auto;
|
|
}
|
|
|
|
> .add {
|
|
margin-right: auto;
|
|
}
|
|
}
|
|
|
|
> .column {
|
|
flex-shrink: 0;
|
|
margin-right: $columnMargin;
|
|
|
|
&.folder {
|
|
display: flex;
|
|
flex-direction: column;
|
|
|
|
> *:not(:last-child) {
|
|
margin-bottom: $columnMargin;
|
|
}
|
|
}
|
|
}
|
|
|
|
> .post,
|
|
> .nav {
|
|
position: fixed;
|
|
z-index: 1000;
|
|
bottom: 32px;
|
|
width: 64px;
|
|
height: 64px;
|
|
border-radius: 100%;
|
|
box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12);
|
|
font-size: 22px;
|
|
}
|
|
|
|
> .post {
|
|
right: 32px;
|
|
}
|
|
|
|
> .nav {
|
|
left: 32px;
|
|
background: var(--panel);
|
|
color: var(--fg);
|
|
|
|
@media (min-width: ($nav-hide-threshold + 1px)) {
|
|
display: none;
|
|
}
|
|
|
|
&:hover {
|
|
background: var(--X2);
|
|
}
|
|
|
|
> i {
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
color: var(--indicator);
|
|
font-size: 16px;
|
|
animation: blink 1s infinite;
|
|
}
|
|
}
|
|
}
|
|
|
|
.iwnjqeul {
|
|
$header-height: 42px; // TODO: column.vueのそれを参照するようにしたい(出来るのか?)
|
|
|
|
> .default {
|
|
> .avatar {
|
|
$size: 28px;
|
|
display: inline-block;
|
|
width: $size;
|
|
height: $size;
|
|
vertical-align: bottom;
|
|
margin: (($header-height - $size) / 2) 8px (($header-height - $size) / 2) 0;
|
|
}
|
|
|
|
> .title {
|
|
display: inline-block;
|
|
margin: 0;
|
|
line-height: $header-height;
|
|
|
|
> [data-icon] {
|
|
margin-right: 8px;
|
|
}
|
|
}
|
|
}
|
|
|
|
> .custom {
|
|
position: absolute;
|
|
top: 0;
|
|
}
|
|
}
|
|
</style>
|