mirror of
https://iceshrimp.dev/limepotato/jormungandr-bite.git
synced 2025-01-27 09:56:21 -07:00
dcea130932
* ストリーミング以外は一通り実装
* ストリーミング分も適用
* 通知のグローバル設定をサーバーサイドに保存
* グローバル通知を使うようにしたら更新されなくなるのを修正
* サーバーサイド処理
* i/notifications のパラメーター includeTypes に空配列を渡すと全部の通知が来る問題を修正
* 全て有効/無効ボタンを実装
* Squashed commit of the following:
commit c3c111529e7aab640c37679ac3478918bd4781eb
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Wed Aug 19 22:29:04 2020 +0900
12.47.0
commit 2dbab66cfe2d4a100a61b25770f65582d9a913ef
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)
commit 01238d6b1a5ba37a08c278a10d4a91a27839cbe3
Author: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Date: Wed Aug 19 22:24:02 2020 +0900
Update README.md [AUTOGEN] (#6593)
commit c34f302b1c91bd3b091cd03fa60fae86b385f902
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Wed Aug 19 21:47:18 2020 +0900
enhance(client): サーバーから切断されたときにダイアログで警告を表示できるように
commit 6870262f8d50407115160979b483a43503ee854f
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Wed Aug 19 17:52:11 2020 +0900
enhance(client): Better element visible detection
commit c54d5e70401d8a417f1fe816fc354c9851a23d20
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Wed Aug 19 17:51:31 2020 +0900
fix(clinet): 誤字によりスクロールイベントリスナが解除されていなかったのを修正
commit 0ace009a54f6b781def9386298a2b053f3224bc6
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
commit 48e8ee440bcff712710666861262b0a6492a3794
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue Aug 18 22:48:52 2020 +0900
WebPのアニメーションが失われるのを修正 Fix #6625 (#6649)
commit 9855405b8989713b81709fc1700e2ead97423467
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
commit 122076e8eaa5517ee3fab6caacd0d12e61654125
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat Aug 15 04:27:19 2020 +0900
Sign (request-target) Fix #6652 (#6656)
commit 7c5ac2cbb407fbcdd06f7561ccbcff56c9da6a14
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Fri Aug 14 15:24:55 2020 +0900
perf(server): Add isSensitive index to improve query performance
commit ccda2181c1c0a02a3d9feeb47e40644ca043bb11
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri Aug 14 00:54:33 2020 +0900
GCSに大きいファイルがアップロードできないのを修正 Fix #6254 (#6648)
commit b5fe4ba9bef376a5977c23c82f4666458abcecfd
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Thu Aug 13 23:02:43 2020 +0900
WIP: Improve admin dashboard
commit fd9c7d525a9d57666edd7fc2b717ee2a1b6fa231
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
commit 080574e13d46075e537249d926781a91a490eb38
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Thu Aug 13 21:27:06 2020 +0900
WIP: Improve admin dashboard
commit ee0a44559040e83ce7d184bef57372f9c3602a75
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Thu Aug 13 20:05:01 2020 +0900
Option objectStorageSetPublicRead (#6645)
commit bb342c76016d71fddb9c272c855292bec604fc87
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Thu Aug 13 19:56:46 2020 +0900
WIP: Improve admin dashboard
commit ed17636fb9852263b33e37fe9cc6eb20d2aafbc8
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Thu Aug 13 17:58:16 2020 +0900
WIP: Improve admin dashboard
commit c59d7d941ad5b241b12e9adb580c35804a86a465
Author: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed Aug 12 17:42:12 2020 +0900
Update README.md
Close #6644
commit 377377595abb56f10b24db43774da4661b6e9f06
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 20:23:51 2020 +0900
enhance(client): Improve admin page
commit d63aef9963bf727d35eb868360cced774ae8d733
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 13:55:00 2020 +0900
chore(client): Fix style
commit e9b28fa3c00c7e1dc98c567d47111b33fbba2bf7
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 13:00:10 2020 +0900
chore(client): Design tweaks
commit be255dc583dade8c1168e4dd71c9d11ab2ac45e9
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:42:51 2020 +0900
chore(client): Design tweak
commit 18eb7c6087129d15873c0d05740839ccf0a53f17
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:31:22 2020 +0900
chore(client): Design tweaks
commit cf29e69813888c372867a166525a251e1f0d8c60
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:28:35 2020 +0900
chore(client): Fix bug
commit 132da7e3c06bc40b6680bffc299ca354ddac1cd8
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:20:58 2020 +0900
Update ja-JP.yml
commit 26df23bb6463133a516217b89c0a9ec992f4ac3f
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:18:02 2020 +0900
chore(client): fix style
commit 76389ad619ff63e3015643c9e32a5ecfd7c34d33
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:15:58 2020 +0900
chore(client): Design tweaks
commit 7cde8cfbf2c840186f4c2025fb34cc108bb84c50
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 11:51:43 2020 +0900
chore(client): Design tweaks
commit 4eb2ddac4e6d4dead85613f12155865cc053f17f
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 11:24:30 2020 +0900
chore(client): Design tweaks
commit dc51eef27c97798bfa3fed62c0d4013a5efbd3f8
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
commit bff8a23cbc2a7046924d44e8da8b23d4207f3edf
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 10:37:57 2020 +0900
chore(client): Design tweaks
commit 9c5efb9da0a166add3edbc8d51156ea260e814a8
Author: rinsuki <428rinsuki+git@gmail.com>
Date: Mon Aug 10 01:33:01 2020 +0900
Dockerのビルド時にgitを入れるように (#6639)
917d3d0bd3
でgitの依存関係が追加されたのにgitが入っていないのでコケていた
commit 48b8320e5ec6971d19b7734e22b0a1518b545f1e
Author: rinsuki <428rinsuki+git@gmail.com>
Date: Mon Aug 10 01:32:27 2020 +0900
Fix #6637 (#6638)
* Fix #6637
* fix lint
commit 9b2ed96c1cb0e311fcc51d367dc0411e833b1698
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sun Aug 9 15:59:38 2020 +0900
chore: Clean up
commit 69d9aa71f25ab06d8024b04ce341909425d053d6
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
commit 13683780cdfa6c71767127ce75e2755b40c03356
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sun Aug 9 13:49:44 2020 +0900
✌️
commit d780e5b251c8f4f593f7bece72439e411a3c0b66
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sun Aug 9 13:46:19 2020 +0900
enhance(client): ミュートされたノート数を表示するようにしたり
commit 917d3d0bd3e7746b722f154860c604c4d6c92c69
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sat Aug 8 10:30:38 2020 +0900
chore: Update dependencies 🚀
commit 4b19c53697e3edae1ffd5dff1f78d25837cafe7f
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sat Aug 8 10:27:37 2020 +0900
client: テーマコードをコピーできるようにしたり
commit 2d40a15d2bc7356fdd82dd980cce202d6e9acdbc
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Fri Aug 7 11:27:37 2020 +0900
refactor: Extract well-known services
commit 2bdcd22ad44aed94eb406f788f1546d73fcdf73e
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Tue Aug 4 23:09:48 2020 +0900
enhance(api): アクセストークンを作成する際、createdAtをlastUsedAtを揃えるようにして、未使用かどうかを判定できるように
commit f73a4e1304317fcfb06aedd5ad4890d03d704d73
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue Aug 4 21:12:55 2020 +0900
Update .dockerignore (#6620)
commit b265cdbd8453edb65a5aab739bc4d3dfd3ce075d
Author: Xeltica <7106976+Xeltica@users.noreply.github.com>
Date: Mon Aug 3 13:40:32 2020 +0900
Update CHANGELOG.md
commit a04d8b95c24ec3935fa4ac3d6df9d714d5758e93
Author: Xeltica <7106976+Xeltica@users.noreply.github.com>
Date: Mon Aug 3 13:40:13 2020 +0900
Update CHANGELOG.md
commit 0e9a8c0cd48361cb07b78740fd2b1eeddbc6cd55
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sun Aug 2 13:59:05 2020 +0900
fix(client): Message read state is not reactive
commit 5ae8a3c7e8531154d0dd870aaeb92c4c0c14e15d
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>
789 lines
19 KiB
Vue
789 lines
19 KiB
Vue
<template>
|
|
<div class="mk-app" v-hotkey.global="keymap">
|
|
<header class="header" ref="header">
|
|
<div class="title" ref="title">
|
|
<transition :name="$store.state.device.animation ? 'header' : ''" mode="out-in" appear>
|
|
<button class="_button back" v-if="canBack" @click="back()"><fa :icon="faChevronLeft"/></button>
|
|
</transition>
|
|
<transition :name="$store.state.device.animation ? 'header' : ''" mode="out-in" appear>
|
|
<div class="body" :key="pageKey">
|
|
<div class="default">
|
|
<portal-target name="avatar" slim/>
|
|
<h1 class="title"><portal-target name="icon" slim/><portal-target name="title" slim/></h1>
|
|
</div>
|
|
<div class="custom">
|
|
<portal-target name="header" slim/>
|
|
</div>
|
|
</div>
|
|
</transition>
|
|
</div>
|
|
<div class="sub">
|
|
<template v-if="$store.getters.isSignedIn">
|
|
<button v-if="widgetsEditMode" class="_button edit active" @click="widgetsEditMode = false"><fa :icon="faGripVertical"/></button>
|
|
<button v-else class="_button edit" @click="widgetsEditMode = true"><fa :icon="faGripVertical"/></button>
|
|
</template>
|
|
<div class="search">
|
|
<fa :icon="faSearch"/>
|
|
<input type="search" :placeholder="$t('search')" v-model="searchQuery" v-autocomplete="{ model: 'searchQuery' }" :disabled="searchWait" @keypress="searchKeypress"/>
|
|
</div>
|
|
<button v-if="$store.getters.isSignedIn" class="post _buttonPrimary" @click="post()"><fa :icon="faPencilAlt"/></button>
|
|
<x-clock v-if="isDesktop" class="clock"/>
|
|
</div>
|
|
</header>
|
|
|
|
<x-sidebar ref="nav" @change-view-mode="calcHeaderWidth"/>
|
|
|
|
<div class="contents" ref="contents" :class="{ wallpaper, full: $store.state.fullView }">
|
|
<main ref="main">
|
|
<div class="content">
|
|
<transition :name="$store.state.device.animation ? 'page' : ''" mode="out-in" @enter="onTransition">
|
|
<keep-alive :include="['index']">
|
|
<router-view></router-view>
|
|
</keep-alive>
|
|
</transition>
|
|
</div>
|
|
<div class="powerd-by" :class="{ visible: !$store.getters.isSignedIn }">
|
|
<b><router-link to="/">{{ host }}</router-link></b>
|
|
<small>Powered by <a href="https://github.com/syuilo/misskey" target="_blank">Misskey</a></small>
|
|
</div>
|
|
</main>
|
|
|
|
<template v-if="isDesktop">
|
|
<div v-for="place in ['left', 'right']" ref="widgets" class="widgets" :class="{ edit: widgetsEditMode, fixed: $store.state.device.fixedWidgetsPosition, empty: widgets[place].length === 0 && !widgetsEditMode }" :key="place">
|
|
<div class="spacer"></div>
|
|
<div class="container" v-if="widgetsEditMode">
|
|
<mk-button primary @click="addWidget(place)" class="add"><fa :icon="faPlus"/></mk-button>
|
|
<x-draggable
|
|
:list="widgets[place]"
|
|
handle=".handle"
|
|
animation="150"
|
|
class="sortable"
|
|
@sort="onWidgetSort"
|
|
>
|
|
<div v-for="widget in widgets[place]" class="customize-container _panel" :key="widget.id">
|
|
<header>
|
|
<span class="handle"><fa :icon="faBars"/></span>{{ $t('_widgets.' + widget.name) }}<button class="remove _button" @click="removeWidget(widget)"><fa :icon="faTimes"/></button>
|
|
</header>
|
|
<div @click="widgetFunc(widget.id)">
|
|
<component class="_close_ _forceContainerFull_" :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-customize-mode="true"/>
|
|
</div>
|
|
</div>
|
|
</x-draggable>
|
|
</div>
|
|
<div class="container" v-else>
|
|
<component v-for="widget in widgets[place]" class="_close_ _forceContainerFull_" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget"/>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</div>
|
|
|
|
<div class="buttons" :class="{ navHidden }">
|
|
<button class="button nav _button" @click="showNav" ref="navButton"><fa :icon="faBars"/><i v-if="navIndicated"><fa :icon="faCircle"/></i></button>
|
|
<button v-if="$route.name === 'index'" class="button home _button" @click="top()"><fa :icon="faHome"/></button>
|
|
<button v-else class="button home _button" @click="$router.push('/')"><fa :icon="faHome"/></button>
|
|
<button v-if="$store.getters.isSignedIn" class="button notifications _button" @click="$router.push('/my/notifications')"><fa :icon="faBell"/><i v-if="$store.state.i.hasUnreadNotification"><fa :icon="faCircle"/></i></button>
|
|
<button v-if="$store.getters.isSignedIn" class="button post _buttonPrimary" @click="post()"><fa :icon="faPencilAlt"/></button>
|
|
</div>
|
|
|
|
<button v-if="$store.getters.isSignedIn" class="post _buttonPrimary" :class="{ navHidden }" @click="post()"><fa :icon="faPencilAlt"/></button>
|
|
|
|
<stream-indicator v-if="$store.getters.isSignedIn"/>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
import Vue from 'vue';
|
|
import { faGripVertical, faChevronLeft, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faListUl, faPlus, faUserClock, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer, faInfoCircle, faQuestionCircle, faProjectDiagram } from '@fortawesome/free-solid-svg-icons';
|
|
import { faBell, faEnvelope, faLaugh, faComments } from '@fortawesome/free-regular-svg-icons';
|
|
import { v4 as uuid } from 'uuid';
|
|
import { host } from './config';
|
|
import { search } from './scripts/search';
|
|
import { StickySidebar } from './scripts/sticky-sidebar';
|
|
import { widgets } from './widgets';
|
|
import XSidebar from './components/sidebar.vue';
|
|
|
|
const DESKTOP_THRESHOLD = 1100;
|
|
|
|
export default Vue.extend({
|
|
components: {
|
|
XSidebar,
|
|
XClock: () => import('./components/header-clock.vue').then(m => m.default),
|
|
MkButton: () => import('./components/ui/button.vue').then(m => m.default),
|
|
XDraggable: () => import('vuedraggable'),
|
|
},
|
|
|
|
data() {
|
|
return {
|
|
host: host,
|
|
pageKey: 0,
|
|
searching: false,
|
|
connection: null,
|
|
searchQuery: '',
|
|
searchWait: false,
|
|
widgetsEditMode: false,
|
|
isDesktop: window.innerWidth >= DESKTOP_THRESHOLD,
|
|
canBack: false,
|
|
menuDef: this.$store.getters.nav({}),
|
|
navHidden: false,
|
|
wallpaper: localStorage.getItem('wallpaper') != null,
|
|
faGripVertical, faChevronLeft, faComments, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faBell, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faEnvelope, faListUl, faPlus, faUserClock, faLaugh, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer, faProjectDiagram
|
|
};
|
|
},
|
|
|
|
computed: {
|
|
keymap(): any {
|
|
return {
|
|
'd': () => {
|
|
if (this.$store.state.device.syncDeviceDarkMode) return;
|
|
this.$store.commit('device/set', { key: 'darkMode', value: !this.$store.state.device.darkMode });
|
|
},
|
|
'p': this.post,
|
|
'n': this.post,
|
|
's': this.search,
|
|
'h|/': this.help
|
|
};
|
|
},
|
|
|
|
widgets(): any {
|
|
if (this.$store.getters.isSignedIn) {
|
|
const widgets = this.$store.state.deviceUser.widgets;
|
|
return {
|
|
left: widgets.filter(x => x.place === 'left'),
|
|
right: widgets.filter(x => x.place == null || x.place === 'right'),
|
|
mobile: widgets.filter(x => x.place === 'mobile'),
|
|
};
|
|
} else {
|
|
const right = [{
|
|
name: 'calendar',
|
|
id: 'b', place: 'right', data: {}
|
|
}, {
|
|
name: 'trends',
|
|
id: 'c', place: 'right', data: {}
|
|
}];
|
|
|
|
if (this.$route.name !== 'index') {
|
|
right.unshift({
|
|
name: 'welcome',
|
|
id: 'a', place: 'right', data: {}
|
|
});
|
|
}
|
|
|
|
return {
|
|
left: [],
|
|
right,
|
|
mobile: [],
|
|
};
|
|
}
|
|
},
|
|
|
|
menu(): string[] {
|
|
return this.$store.state.deviceUser.menu;
|
|
},
|
|
|
|
navIndicated(): boolean {
|
|
if (!this.$store.getters.isSignedIn) return false;
|
|
for (const def in this.menuDef) {
|
|
if (def === 'notifications') continue; // 通知は下にボタンとして表示されてるから
|
|
if (this.menuDef[def].indicated) return true;
|
|
}
|
|
return false;
|
|
}
|
|
},
|
|
|
|
watch: {
|
|
$route(to, from) {
|
|
this.pageKey++;
|
|
this.canBack = (window.history.length > 0 && !['index'].includes(to.name));
|
|
},
|
|
|
|
isDesktop() {
|
|
this.$nextTick(() => {
|
|
this.attachSticky();
|
|
});
|
|
}
|
|
},
|
|
|
|
created() {
|
|
document.documentElement.style.overflowY = 'scroll';
|
|
|
|
if (this.$store.getters.isSignedIn) {
|
|
this.connection = this.$root.stream.useSharedConnection('main');
|
|
this.connection.on('notification', this.onNotification);
|
|
|
|
if (this.$store.state.deviceUser.widgets.length === 0) {
|
|
this.$store.commit('deviceUser/setWidgets', [{
|
|
name: 'calendar',
|
|
id: 'a', place: 'right', data: {}
|
|
}, {
|
|
name: 'notifications',
|
|
id: 'b', place: 'right', data: {}
|
|
}, {
|
|
name: 'trends',
|
|
id: 'c', place: 'right', data: {}
|
|
}]);
|
|
}
|
|
}
|
|
},
|
|
|
|
mounted() {
|
|
this.adjustTitlePosition();
|
|
|
|
const ro = new ResizeObserver((entries, observer) => {
|
|
this.adjustTitlePosition();
|
|
});
|
|
|
|
ro.observe(this.$refs.contents);
|
|
|
|
window.addEventListener('resize', this.adjustTitlePosition, { passive: true });
|
|
|
|
if (!this.isDesktop) {
|
|
window.addEventListener('resize', () => {
|
|
if (window.innerWidth >= DESKTOP_THRESHOLD) this.isDesktop = true;
|
|
}, { passive: true });
|
|
}
|
|
|
|
// widget follow
|
|
this.attachSticky();
|
|
|
|
this.$nextTick(() => {
|
|
this.calcHeaderWidth();
|
|
});
|
|
},
|
|
|
|
methods: {
|
|
adjustTitlePosition() {
|
|
const left = this.$refs.main.getBoundingClientRect().left - this.$refs.nav.$el.offsetWidth;
|
|
if (left >= 0) {
|
|
this.$refs.title.style.left = left + 'px';
|
|
}
|
|
},
|
|
|
|
calcHeaderWidth() {
|
|
const navWidth = this.$refs.nav.$el.offsetWidth;
|
|
this.navHidden = navWidth === 0;
|
|
this.$refs.header.style.width = `calc(100% - ${navWidth}px)`;
|
|
this.adjustTitlePosition();
|
|
},
|
|
|
|
showNav() {
|
|
this.$refs.nav.show();
|
|
},
|
|
|
|
attachSticky() {
|
|
if (!this.isDesktop) return;
|
|
if (this.$store.state.device.fixedWidgetsPosition) return;
|
|
|
|
const stickyWidgetColumns = this.$refs.widgets.map(w => new StickySidebar(w.children[1], w.children[0], w.offsetTop));
|
|
window.addEventListener('scroll', () => {
|
|
for (const stickyWidgetColumn of stickyWidgetColumns) {
|
|
stickyWidgetColumn.calc(window.scrollY);
|
|
}
|
|
}, { passive: true });
|
|
},
|
|
|
|
top() {
|
|
window.scroll({ top: 0, behavior: 'smooth' });
|
|
},
|
|
|
|
help() {
|
|
this.$router.push('/docs/keyboard-shortcut');
|
|
},
|
|
|
|
back() {
|
|
if (this.canBack) window.history.back();
|
|
},
|
|
|
|
onTransition() {
|
|
if (window._scroll) window._scroll();
|
|
},
|
|
|
|
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;
|
|
});
|
|
});
|
|
},
|
|
|
|
searchKeypress(e) {
|
|
if (e.keyCode === 13) {
|
|
this.searchWait = true;
|
|
search(this, this.searchQuery).finally(() => {
|
|
this.searchWait = false;
|
|
this.searchQuery = '';
|
|
});
|
|
}
|
|
},
|
|
|
|
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');
|
|
},
|
|
|
|
widgetFunc(id) {
|
|
this.$refs[id][0].setting();
|
|
},
|
|
|
|
onWidgetSort() {
|
|
this.saveHome();
|
|
},
|
|
|
|
async addWidget(place) {
|
|
const { canceled, result: widget } = await this.$root.dialog({
|
|
type: null,
|
|
title: this.$t('chooseWidget'),
|
|
select: {
|
|
items: widgets.map(widget => ({
|
|
value: widget,
|
|
text: this.$t('_widgets.' + widget),
|
|
}))
|
|
},
|
|
showCancelButton: true
|
|
});
|
|
if (canceled) return;
|
|
|
|
this.$store.commit('deviceUser/addWidget', {
|
|
name: widget,
|
|
id: uuid(),
|
|
place: place,
|
|
data: {}
|
|
});
|
|
},
|
|
|
|
removeWidget(widget) {
|
|
this.$store.commit('deviceUser/removeWidget', widget);
|
|
},
|
|
|
|
saveHome() {
|
|
this.$store.commit('deviceUser/setWidgets', [...this.widgets.left, ...this.widgets.right, ...this.widgets.mobile]);
|
|
}
|
|
}
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" scoped>
|
|
.mk-app {
|
|
$header-height: 60px;
|
|
$main-width: 670px;
|
|
$ui-font-size: 1em; // TODO: どこかに集約したい
|
|
$header-sub-hide-threshold: 1090px;
|
|
$left-widgets-hide-threshold: 1600px;
|
|
$right-widgets-hide-threshold: 1090px;
|
|
|
|
// ほんとは単に 100vh と書きたいところだが... https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
|
|
min-height: calc(var(--vh, 1vh) * 100);
|
|
box-sizing: border-box;
|
|
padding-top: $header-height;
|
|
|
|
&, > .header > .body {
|
|
display: flex;
|
|
margin: 0 auto;
|
|
}
|
|
|
|
> .header {
|
|
position: fixed;
|
|
z-index: 1000;
|
|
top: 0;
|
|
right: 0;
|
|
height: $header-height;
|
|
width: 100%;
|
|
//background-color: var(--panel);
|
|
-webkit-backdrop-filter: blur(32px);
|
|
backdrop-filter: blur(32px);
|
|
background-color: var(--header);
|
|
border-bottom: solid 1px var(--divider);
|
|
|
|
> .title {
|
|
position: relative;
|
|
line-height: $header-height;
|
|
height: $header-height;
|
|
max-width: $main-width;
|
|
text-align: center;
|
|
|
|
> .back {
|
|
position: absolute;
|
|
z-index: 1;
|
|
top: 0;
|
|
left: 0;
|
|
height: $header-height;
|
|
width: $header-height;
|
|
}
|
|
|
|
> .body {
|
|
white-space: nowrap;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
height: $header-height;
|
|
|
|
> .default {
|
|
padding: 0 $header-height;
|
|
|
|
> .avatar {
|
|
$size: 32px;
|
|
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;
|
|
font-size: $ui-font-size;
|
|
margin: 0;
|
|
line-height: $header-height;
|
|
|
|
> [data-icon] {
|
|
margin-right: 8px;
|
|
}
|
|
}
|
|
}
|
|
|
|
> .custom {
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
height: 100%;
|
|
width: 100%;
|
|
}
|
|
}
|
|
}
|
|
|
|
> .sub {
|
|
$post-button-size: 42px;
|
|
$post-button-margin: (($header-height - $post-button-size) / 2);
|
|
display: flex;
|
|
align-items: center;
|
|
position: absolute;
|
|
top: 0;
|
|
right: 16px;
|
|
height: $header-height;
|
|
|
|
@media (max-width: $header-sub-hide-threshold) {
|
|
display: none;
|
|
}
|
|
|
|
> .edit {
|
|
padding: 16px;
|
|
|
|
&.active {
|
|
color: var(--accent);
|
|
}
|
|
}
|
|
|
|
> .search {
|
|
position: relative;
|
|
|
|
> input {
|
|
width: 220px;
|
|
box-sizing: border-box;
|
|
margin-right: 8px;
|
|
padding: 0 12px 0 42px;
|
|
font-size: 1rem;
|
|
line-height: 38px;
|
|
border: none;
|
|
border-radius: 38px;
|
|
color: var(--fg);
|
|
background: var(--bg);
|
|
-webkit-appearance: textfield;
|
|
|
|
&:focus {
|
|
outline: none;
|
|
}
|
|
}
|
|
|
|
> [data-icon] {
|
|
position: absolute;
|
|
top: 0;
|
|
left: 16px;
|
|
height: 100%;
|
|
pointer-events: none;
|
|
font-size: 16px;
|
|
}
|
|
}
|
|
|
|
> .post {
|
|
width: $post-button-size;
|
|
height: $post-button-size;
|
|
margin-left: $post-button-margin;
|
|
border-radius: 100%;
|
|
font-size: 16px;
|
|
}
|
|
|
|
> .clock {
|
|
margin-left: 8px;
|
|
}
|
|
}
|
|
}
|
|
|
|
> .contents {
|
|
display: flex;
|
|
margin: 0 auto;
|
|
min-width: 0;
|
|
|
|
&.wallpaper {
|
|
background: var(--wallpaperOverlay);
|
|
backdrop-filter: blur(4px);
|
|
}
|
|
|
|
&.full {
|
|
width: 100%;
|
|
|
|
> main {
|
|
width: 100%;
|
|
}
|
|
|
|
> .widgets {
|
|
display: none;
|
|
}
|
|
}
|
|
|
|
> main {
|
|
width: $main-width;
|
|
min-width: 0;
|
|
|
|
> .content {
|
|
> * {
|
|
// ほんとは単に calc(100vh - #{$header-height}) と書きたいところだが... https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
|
|
min-height: calc((var(--vh, 1vh) * 100) - #{$header-height});
|
|
box-sizing: border-box;
|
|
padding: var(--margin);
|
|
|
|
&.full {
|
|
padding: 0 var(--margin);
|
|
}
|
|
}
|
|
}
|
|
|
|
> .powerd-by {
|
|
font-size: 14px;
|
|
text-align: center;
|
|
margin: 32px 0;
|
|
visibility: hidden;
|
|
|
|
&.visible {
|
|
visibility: visible;
|
|
}
|
|
|
|
&:not(.visible) {
|
|
@media (min-width: 850px) {
|
|
display: none;
|
|
}
|
|
}
|
|
|
|
@media (max-width: 500px) {
|
|
margin-top: 16px;
|
|
}
|
|
|
|
> small {
|
|
display: block;
|
|
margin-top: 8px;
|
|
opacity: 0.5;
|
|
|
|
@media (max-width: 500px) {
|
|
margin-top: 4px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
> .widgets {
|
|
padding: 0 var(--margin);
|
|
box-shadow: 1px 0 0 0 var(--divider), -1px 0 0 0 var(--divider);
|
|
|
|
&.fixed {
|
|
position: sticky;
|
|
overflow: auto;
|
|
// ほんとは単に calc(100vh - #{$header-height}) と書きたいところだが... https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
|
|
height: calc((var(--vh, 1vh) * 100) - #{$header-height});
|
|
top: $header-height;
|
|
}
|
|
|
|
&:first-of-type {
|
|
order: -1;
|
|
|
|
@media (max-width: $left-widgets-hide-threshold) {
|
|
display: none;
|
|
}
|
|
}
|
|
|
|
&.empty {
|
|
display: none;
|
|
}
|
|
|
|
@media (max-width: $right-widgets-hide-threshold) {
|
|
display: none;
|
|
}
|
|
|
|
> .container {
|
|
position: sticky;
|
|
height: min-content;
|
|
// ほんとは単に calc(100vh - #{$header-height}) と書きたいところだが... https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
|
|
min-height: calc((var(--vh, 1vh) * 100) - #{$header-height});
|
|
padding: var(--margin) 0;
|
|
box-sizing: border-box;
|
|
|
|
> * {
|
|
margin: var(--margin) 0;
|
|
width: 300px;
|
|
|
|
&:first-child {
|
|
margin-top: 0;
|
|
}
|
|
|
|
&:last-child {
|
|
margin-bottom: 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
> .add {
|
|
margin: 0 auto;
|
|
}
|
|
|
|
.customize-container {
|
|
margin: 8px 0;
|
|
|
|
> header {
|
|
position: relative;
|
|
line-height: 32px;
|
|
|
|
> .handle {
|
|
padding: 0 8px;
|
|
cursor: move;
|
|
}
|
|
|
|
> .remove {
|
|
position: absolute;
|
|
top: 0;
|
|
right: 0;
|
|
padding: 0 8px;
|
|
line-height: 32px;
|
|
}
|
|
}
|
|
|
|
> div {
|
|
padding: 8px;
|
|
|
|
> * {
|
|
pointer-events: none;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
> .post {
|
|
display: block;
|
|
position: fixed;
|
|
z-index: 1000;
|
|
bottom: 32px;
|
|
right: 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;
|
|
|
|
&.navHidden {
|
|
display: none;
|
|
}
|
|
|
|
@media (min-width: ($header-sub-hide-threshold + 1px)) {
|
|
display: none;
|
|
}
|
|
}
|
|
|
|
> .buttons {
|
|
position: fixed;
|
|
z-index: 1000;
|
|
bottom: 0;
|
|
padding: 0 32px 32px 32px;
|
|
display: flex;
|
|
width: 100%;
|
|
box-sizing: border-box;
|
|
background: linear-gradient(0deg, var(--bg), var(--X1));
|
|
|
|
@media (max-width: 500px) {
|
|
padding: 0 16px 16px 16px;
|
|
}
|
|
|
|
&:not(.navHidden) {
|
|
display: none;
|
|
}
|
|
|
|
> .button {
|
|
position: relative;
|
|
padding: 0;
|
|
margin: auto;
|
|
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);
|
|
|
|
&:first-child {
|
|
margin-left: 0;
|
|
}
|
|
|
|
&:last-child {
|
|
margin-right: 0;
|
|
}
|
|
|
|
> * {
|
|
font-size: 22px;
|
|
}
|
|
|
|
&:disabled {
|
|
cursor: default;
|
|
|
|
> * {
|
|
opacity: 0.5;
|
|
}
|
|
}
|
|
|
|
&:not(.post) {
|
|
background: var(--panel);
|
|
color: var(--fg);
|
|
|
|
&:hover {
|
|
background: var(--X2);
|
|
}
|
|
|
|
> i {
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
color: var(--indicator);
|
|
font-size: 16px;
|
|
animation: blink 1s infinite;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</style>
|