モバイル版でもデッキを使えるように (#4366)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Fix bug

* wip

* Update notifications.vue

* Update user-menu.vue

* deck settings

* indicate
This commit is contained in:
syuilo 2019-02-25 19:45:00 +09:00 committed by GitHub
parent 3654f247c4
commit c0a60260c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 711 additions and 666 deletions

View file

@ -158,6 +158,16 @@ common:
no-notes: "投稿がありません" no-notes: "投稿がありません"
turn-on-darkmode: "闇に飲まれる" turn-on-darkmode: "闇に飲まれる"
turn-off-darkmode: "光あれ" turn-off-darkmode: "光あれ"
deck-column-align: "デッキのカラムの配置"
deck-column-align-center: "中央"
deck-column-align-left: "左"
deck-column-align-flexible: "フレキシブル"
deck-column-width: "デッキのカラムの幅"
deck-column-width-narrow: "狭"
deck-column-width-narrower: "やや狭"
deck-column-width-normal: "普通"
deck-column-width-wider: "やや広"
deck-column-width-wide: "広"
error: error:
title: "問題が発生しました" title: "問題が発生しました"
@ -939,16 +949,6 @@ desktop/views/components/settings.vue:
show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する" show-local-renotes: "ローカルの投稿のRenoteをタイムラインに表示する"
show-maps: "マップの自動展開" show-maps: "マップの自動展開"
remain-deleted-note: "削除された投稿を表示し続ける" remain-deleted-note: "削除された投稿を表示し続ける"
deck-column-align: "デッキのカラムの配置"
deck-column-align-center: "中央"
deck-column-align-left: "左"
deck-column-align-flexible: "フレキシブル"
deck-column-width: "デッキのカラムの幅"
deck-column-width-narrow: "狭"
deck-column-width-narrower: "やや狭"
deck-column-width-normal: "普通"
deck-column-width-wider: "やや広"
deck-column-width-wide: "広"
sound: "サウンド" sound: "サウンド"
enable-sounds: "サウンドを有効にする" enable-sounds: "サウンドを有効にする"
@ -1711,10 +1711,6 @@ mobile/views/pages/note.vue:
prev: "前の投稿" prev: "前の投稿"
next: "次の投稿" next: "次の投稿"
mobile/views/pages/notifications.vue:
notifications: "通知"
read-all: "すべての通知を既読にしますか?"
mobile/views/pages/games/reversi.vue: mobile/views/pages/games/reversi.vue:
reversi: "リバーシ" reversi: "リバーシ"
@ -1803,6 +1799,7 @@ deck:
direct: "ダイレクト投稿" direct: "ダイレクト投稿"
notifications: "通知" notifications: "通知"
list: "リスト" list: "リスト"
select-list: "リストを選択してください"
swap-left: "左に移動" swap-left: "左に移動"
swap-right: "右に移動" swap-right: "右に移動"
swap-up: "上に移動" swap-up: "上に移動"

View file

@ -9,6 +9,10 @@ export default function <T extends object>(data: {
widget: { widget: {
type: Object type: Object
}, },
column: {
type: Object,
default: null
},
platform: { platform: {
type: String, type: String,
required: true required: true
@ -65,10 +69,14 @@ export default function <T extends object>(data: {
this.bakeProps(); this.bakeProps();
this.$root.api('i/update_widget', { if (this.platform == 'deck') {
id: this.id, this.$store.commit('device/updateDeckColumn', this.column);
data: this.props } else {
}); this.$root.api('i/update_widget', {
id: this.id,
data: this.props
});
}
} }
} }
}); });

View file

@ -64,6 +64,10 @@ export default Vue.extend({
this.hukidasi = false; this.hukidasi = false;
} }
if (top < 0) {
top = 0;
}
popover.style.left = left + 'px'; popover.style.left = left + 'px';
popover.style.top = top + 'px'; popover.style.top = top + 'px';

View file

@ -1,5 +1,5 @@
<template> <template>
<div class="puqkfets" :class="{ mini }"> <div class="puqkfets" :class="{ mini: narrow }">
<mk-avatar class="avatar" :user="note.user"/> <mk-avatar class="avatar" :user="note.user"/>
<fa icon="retweet"/> <fa icon="retweet"/>
<i18n path="@.renoted-by" tag="span"> <i18n path="@.renoted-by" tag="span">
@ -30,13 +30,13 @@ export default Vue.extend({
note: { note: {
type: Object, type: Object,
required: true required: true
}, }
mini: { },
type: Boolean, inject: {
required: false, narrow: {
default: false default: false
} }
} },
}); });
</script> </script>
@ -44,25 +44,20 @@ export default Vue.extend({
.puqkfets .puqkfets
display flex display flex
align-items center align-items center
padding 16px 32px 8px 32px padding 8px 16px
line-height 28px line-height 28px
white-space pre white-space pre
color var(--renoteText) color var(--renoteText)
background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%) background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%)
&.mini &:not(.mini)
padding 8px 16px padding 8px 16px
@media (min-width 500px) @media (min-width 500px)
padding 16px padding 8px 16px
@media (min-width 600px) @media (min-width 600px)
padding 16px 32px padding 16px 32px 8px 32px
> .avatar
@media (min-width 500px)
width 28px
height 28px
> .avatar > .avatar
flex-shrink 0 flex-shrink 0

View file

@ -8,7 +8,7 @@
</blockquote> </blockquote>
</div> </div>
<div v-else class="mk-url-preview"> <div v-else class="mk-url-preview">
<a :class="{ mini, compact }" :href="url" target="_blank" :title="url" v-if="!fetching"> <a :class="{ mini: narrow, compact }" :href="url" target="_blank" :title="url" v-if="!fetching">
<div class="thumbnail" v-if="thumbnail" :style="`background-image: url('${thumbnail}')`"></div> <div class="thumbnail" v-if="thumbnail" :style="`background-image: url('${thumbnail}')`"></div>
<article> <article>
<header> <header>
@ -125,10 +125,10 @@ export default Vue.extend({
required: false, required: false,
default: false default: false
}, },
},
mini: { inject: {
type: Boolean, narrow: {
required: false,
default: false default: false
} }
}, },
@ -350,7 +350,7 @@ export default Vue.extend({
&.compact &.compact
> .thumbnail > .thumbnail
position: absolute position absolute
width 56px width 56px
height 100% height 100%
@ -368,7 +368,7 @@ export default Vue.extend({
&.compact &.compact
> article > article
> header h1, p, footer > header h1, p, footer
overflow: hidden; overflow hidden
white-space: nowrap; white-space nowrap
text-overflow: ellipsis; text-overflow ellipsis
</style> </style>

View file

@ -66,10 +66,11 @@ export default Vue.extend({
}, },
async pushList() { async pushList() {
const t = this.$t('select-list'); // null
const lists = await this.$root.api('users/lists/list'); const lists = await this.$root.api('users/lists/list');
const { canceled, result: listId } = await this.$root.dialog({ const { canceled, result: listId } = await this.$root.dialog({
type: null, type: null,
title: this.$t('select-list'), title: t,
select: { select: {
items: lists.map(list => ({ items: lists.map(list => ({
value: list.id, text: list.title value: list.id, text: list.title

View file

@ -30,6 +30,8 @@ import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import Menu from '../../../common/views/components/menu.vue'; import Menu from '../../../common/views/components/menu.vue';
import { countIf } from '../../../../../prelude/array'; import { countIf } from '../../../../../prelude/array';
import { faArrowUp, faArrowDown } from '@fortawesome/free-solid-svg-icons';
import { faWindowMaximize } from '@fortawesome/free-regular-svg-icons';
export default Vue.extend({ export default Vue.extend({
i18n: i18n('deck'), i18n: i18n('deck'),
@ -71,7 +73,8 @@ export default Vue.extend({
active: true, active: true,
dragging: false, dragging: false,
draghover: false, draghover: false,
dropready: false dropready: false,
faArrowUp, faArrowDown
}; };
}, },
@ -143,7 +146,7 @@ export default Vue.extend({
toggleActive() { toggleActive() {
if (!this.isStacked) return; if (!this.isStacked) return;
const vms = this.$store.state.settings.deck.layout.find(ids => ids.indexOf(this.column.id) != -1).map(id => this.getColumnVm(id)); const vms = this.$store.state.device.deck.layout.find(ids => ids.indexOf(this.column.id) != -1).map(id => this.getColumnVm(id));
if (this.active && countIf(vm => vm.$el.classList.contains('active'), vms) == 1) return; if (this.active && countIf(vm => vm.$el.classList.contains('active'), vms) == 1) return;
this.active = !this.active; this.active = !this.active;
}, },
@ -176,50 +179,50 @@ export default Vue.extend({
} }
}).then(({ canceled, result: name }) => { }).then(({ canceled, result: name }) => {
if (canceled) return; if (canceled) return;
this.$store.dispatch('settings/renameDeckColumn', { id: this.column.id, name }); this.$store.commit('device/renameDeckColumn', { id: this.column.id, name });
}); });
} }
}, null, { }, null, {
icon: 'arrow-left', icon: 'arrow-left',
text: this.$t('swap-left'), text: this.$t('swap-left'),
action: () => { action: () => {
this.$store.dispatch('settings/swapLeftDeckColumn', this.column.id); this.$store.commit('device/swapLeftDeckColumn', this.column.id);
} }
}, { }, {
icon: 'arrow-right', icon: 'arrow-right',
text: this.$t('swap-right'), text: this.$t('swap-right'),
action: () => { action: () => {
this.$store.dispatch('settings/swapRightDeckColumn', this.column.id); this.$store.commit('device/swapRightDeckColumn', this.column.id);
} }
}, this.isStacked ? { }, this.isStacked ? {
icon: 'arrow-up', icon: faArrowUp,
text: this.$t('swap-up'), text: this.$t('swap-up'),
action: () => { action: () => {
this.$store.dispatch('settings/swapUpDeckColumn', this.column.id); this.$store.commit('device/swapUpDeckColumn', this.column.id);
} }
} : undefined, this.isStacked ? { } : undefined, this.isStacked ? {
icon: 'arrow-down', icon: faArrowDown,
text: this.$t('swap-down'), text: this.$t('swap-down'),
action: () => { action: () => {
this.$store.dispatch('settings/swapDownDeckColumn', this.column.id); this.$store.commit('device/swapDownDeckColumn', this.column.id);
} }
} : undefined, null, { } : undefined, null, {
icon: ['far', 'window-restore'], icon: ['far', 'window-restore'],
text: this.$t('stack-left'), text: this.$t('stack-left'),
action: () => { action: () => {
this.$store.dispatch('settings/stackLeftDeckColumn', this.column.id); this.$store.commit('device/stackLeftDeckColumn', this.column.id);
} }
}, this.isStacked ? { }, this.isStacked ? {
icon: ['far', 'window-maximize'], icon: faWindowMaximize,
text: this.$t('pop-right'), text: this.$t('pop-right'),
action: () => { action: () => {
this.$store.dispatch('settings/popRightDeckColumn', this.column.id); this.$store.commit('device/popRightDeckColumn', this.column.id);
} }
} : undefined, null, { } : undefined, null, {
icon: ['far', 'trash-alt'], icon: ['far', 'trash-alt'],
text: this.$t('remove'), text: this.$t('remove'),
action: () => { action: () => {
this.$store.dispatch('settings/removeDeckColumn', this.column.id); this.$store.commit('device/removeDeckColumn', this.column.id);
} }
}]; }];
@ -303,7 +306,7 @@ export default Vue.extend({
const id = e.dataTransfer.getData('mk-deck-column'); const id = e.dataTransfer.getData('mk-deck-column');
if (id != null && id != '') { if (id != null && id != '') {
this.$store.dispatch('settings/swapDeckColumn', { this.$store.commit('device/swapDeckColumn', {
a: this.column.id, a: this.column.id,
b: id b: id
}); });
@ -418,5 +421,6 @@ export default Vue.extend({
height "calc(100% - %s)" % $header-height height "calc(100% - %s)" % $header-height
overflow auto overflow auto
overflow-x hidden overflow-x hidden
-webkit-overflow-scrolling touch
</style> </style>

View file

@ -11,7 +11,7 @@
<a :href="note.url || note.uri" target="_blank">{{ $t('@.view-on-remote') }}</a> <a :href="note.url || note.uri" target="_blank">{{ $t('@.view-on-remote') }}</a>
</details> </details>
</div> </div>
<x-note :note="note" :detail="true" :mini="true"/> <mk-note :note="note" :detail="true"/>
</div> </div>
</x-column> </x-column>
</template> </template>
@ -21,14 +21,12 @@ import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import XColumn from './deck.column.vue'; import XColumn from './deck.column.vue';
import XNotes from './deck.notes.vue'; import XNotes from './deck.notes.vue';
import XNote from '../components/note.vue';
export default Vue.extend({ export default Vue.extend({
i18n: i18n(), i18n: i18n(),
components: { components: {
XColumn, XColumn,
XNotes, XNotes,
XNote
}, },
data() { data() {

View file

@ -13,12 +13,12 @@
<!-- トランジションを有効にするとなぜかメモリリークする --> <!-- トランジションを有効にするとなぜかメモリリークする -->
<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="transition notes" ref="notes" tag="div"> <component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="transition notes" ref="notes" tag="div">
<template v-for="(note, i) in _notes"> <template v-for="(note, i) in _notes">
<x-note <mk-note
:note="note" :note="note"
:key="note.id" :key="note.id"
@update:note="onNoteUpdated(i, $event)" @update:note="onNoteUpdated(i, $event)"
:compact="true" :compact="true"
:mini="true"/> />
<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date"> <p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
<span><fa icon="angle-up"/>{{ note._datetext }}</span> <span><fa icon="angle-up"/>{{ note._datetext }}</span>
<span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span> <span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span>
@ -39,17 +39,12 @@
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import shouldMuteNote from '../../../common/scripts/should-mute-note'; import shouldMuteNote from '../../../common/scripts/should-mute-note';
import XNote from '../components/note.vue';
const displayLimit = 20; const displayLimit = 20;
export default Vue.extend({ export default Vue.extend({
i18n: i18n(), i18n: i18n(),
components: {
XNote
},
inject: ['column', 'isScrollTop', 'count'], inject: ['column', 'isScrollTop', 'count'],
props: { props: {

View file

@ -81,15 +81,15 @@
</div> </div>
<template v-if="notification.type == 'quote'"> <template v-if="notification.type == 'quote'">
<x-note :note="notification.note" @update:note="onNoteUpdated" :mini="true"/> <mk-note :note="notification.note" @update:note="onNoteUpdated"/>
</template> </template>
<template v-if="notification.type == 'reply'"> <template v-if="notification.type == 'reply'">
<x-note :note="notification.note" @update:note="onNoteUpdated" :mini="true"/> <mk-note :note="notification.note" @update:note="onNoteUpdated"/>
</template> </template>
<template v-if="notification.type == 'mention'"> <template v-if="notification.type == 'mention'">
<x-note :note="notification.note" @update:note="onNoteUpdated" :mini="true"/> <mk-note :note="notification.note" @update:note="onNoteUpdated"/>
</template> </template>
</div> </div>
</template> </template>
@ -97,12 +97,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getNoteSummary from '../../../../../misc/get-note-summary'; import getNoteSummary from '../../../../../misc/get-note-summary';
import XNote from '../components/note.vue';
export default Vue.extend({ export default Vue.extend({
components: {
XNote
},
props: ['notification'], props: ['notification'],
data() { data() {
return { return {

View file

@ -199,7 +199,7 @@ export default Vue.extend({
display block display block
width 100% width 100%
padding 16px padding 16px
color #555 color var(--text)
border-top solid var(--lineWidth) rgba(#000, 0.05) border-top solid var(--lineWidth) rgba(#000, 0.05)
&:hover &:hover

View file

@ -90,7 +90,7 @@ export default Vue.extend({
methods: { methods: {
onChangeSettings(v) { onChangeSettings(v) {
this.$store.dispatch('settings/saveDeck'); this.$store.commit('device/updateDeckColumn', this.column);
}, },
focus() { focus() {

View file

@ -3,7 +3,7 @@
<ui-container v-if="user.pinnedNotes && user.pinnedNotes.length > 0" :body-togglable="true"> <ui-container v-if="user.pinnedNotes && user.pinnedNotes.length > 0" :body-togglable="true">
<template #header><fa icon="thumbtack"/> {{ $t('pinned-notes') }}</template> <template #header><fa icon="thumbtack"/> {{ $t('pinned-notes') }}</template>
<div> <div>
<x-note v-for="n in user.pinnedNotes" :key="n.id" :note="n" :mini="true"/> <mk-note v-for="n in user.pinnedNotes" :key="n.id" :note="n"/>
</div> </div>
</ui-container> </ui-container>
<ui-container v-if="images.length > 0" :body-togglable="true" <ui-container v-if="images.length > 0" :body-togglable="true"
@ -40,7 +40,6 @@
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import XNotes from './deck.notes.vue'; import XNotes from './deck.notes.vue';
import XNote from '../components/note.vue';
import { concat } from '../../../../../prelude/array'; import { concat } from '../../../../../prelude/array';
import ApexCharts from 'apexcharts'; import ApexCharts from 'apexcharts';
@ -51,7 +50,6 @@ export default Vue.extend({
components: { components: {
XNotes, XNotes,
XNote
}, },
props: { props: {

View file

@ -20,7 +20,6 @@ import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import XColumnCore from './deck.column-core.vue'; import XColumnCore from './deck.column-core.vue';
import Menu from '../../../common/views/components/menu.vue'; import Menu from '../../../common/views/components/menu.vue';
import MkUserListsWindow from '../components/user-lists-window.vue';
import * as uuid from 'uuid'; import * as uuid from 'uuid';
@ -32,14 +31,14 @@ export default Vue.extend({
computed: { computed: {
columns(): any[] { columns(): any[] {
if (this.$store.state.settings.deck == null) return []; if (this.$store.state.device.deck == null) return [];
return this.$store.state.settings.deck.columns; return this.$store.state.device.deck.columns;
}, },
layout(): any[] { layout(): any[] {
if (this.$store.state.settings.deck == null) return []; if (this.$store.state.device.deck == null) return [];
if (this.$store.state.settings.deck.layout == null) return this.$store.state.settings.deck.columns.map(c => [c.id]); if (this.$store.state.device.deck.layout == null) return this.$store.state.device.deck.columns.map(c => [c.id]);
return this.$store.state.settings.deck.layout; return this.$store.state.device.deck.layout;
}, },
style(): any { style(): any {
@ -69,45 +68,50 @@ export default Vue.extend({
provide() { provide() {
return { return {
getColumnVm: this.getColumnVm getColumnVm: this.getColumnVm,
narrow: true
}; };
}, },
created() { created() {
if (this.$store.state.settings.deck == null) { if (this.$store.state.device.deck == null) {
const deck = { const deck = {
columns: [/*{ columns: [/*{
type: 'widgets', type: 'widgets',
widgets: [] widgets: []
}, */{ }, */{
id: uuid(), id: uuid(),
type: 'home' type: 'home',
name: null,
}, { }, {
id: uuid(), id: uuid(),
type: 'notifications' type: 'notifications',
name: null,
}, { }, {
id: uuid(), id: uuid(),
type: 'local' type: 'local',
name: null,
}, { }, {
id: uuid(), id: uuid(),
type: 'global' type: 'global',
name: null,
}] }]
}; };
deck.layout = deck.columns.map(c => [c.id]); deck.layout = deck.columns.map(c => [c.id]);
this.$store.dispatch('settings/set', { this.$store.commit('device/set', {
key: 'deck', key: 'deck',
value: deck value: deck
}); });
} }
// //
if (this.$store.state.settings.deck != null && this.$store.state.settings.deck.layout == null) { if (this.$store.state.device.deck != null && this.$store.state.device.deck.layout == null) {
this.$store.dispatch('settings/set', { this.$store.commit('device/set', {
key: 'deck', key: 'deck',
value: Object.assign({}, this.$store.state.settings.deck, { value: Object.assign({}, this.$store.state.device.deck, {
layout: this.$store.state.settings.deck.columns.map(c => [c.id]) layout: this.$store.state.device.deck.columns.map(c => [c.id])
}) })
}); });
} }
@ -134,7 +138,7 @@ export default Vue.extend({
icon: 'home', icon: 'home',
text: this.$t('@deck.home'), text: this.$t('@deck.home'),
action: () => { action: () => {
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'home' type: 'home'
}); });
@ -143,7 +147,7 @@ export default Vue.extend({
icon: ['far', 'comments'], icon: ['far', 'comments'],
text: this.$t('@deck.local'), text: this.$t('@deck.local'),
action: () => { action: () => {
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'local' type: 'local'
}); });
@ -152,7 +156,7 @@ export default Vue.extend({
icon: 'share-alt', icon: 'share-alt',
text: this.$t('@deck.hybrid'), text: this.$t('@deck.hybrid'),
action: () => { action: () => {
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'hybrid' type: 'hybrid'
}); });
@ -161,7 +165,7 @@ export default Vue.extend({
icon: 'globe', icon: 'globe',
text: this.$t('@deck.global'), text: this.$t('@deck.global'),
action: () => { action: () => {
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'global' type: 'global'
}); });
@ -170,7 +174,7 @@ export default Vue.extend({
icon: 'at', icon: 'at',
text: this.$t('@deck.mentions'), text: this.$t('@deck.mentions'),
action: () => { action: () => {
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'mentions' type: 'mentions'
}); });
@ -179,7 +183,7 @@ export default Vue.extend({
icon: ['far', 'envelope'], icon: ['far', 'envelope'],
text: this.$t('@deck.direct'), text: this.$t('@deck.direct'),
action: () => { action: () => {
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'direct' type: 'direct'
}); });
@ -187,15 +191,23 @@ export default Vue.extend({
}, { }, {
icon: 'list', icon: 'list',
text: this.$t('@deck.list'), text: this.$t('@deck.list'),
action: () => { action: async () => {
const w = this.$root.new(MkUserListsWindow); const lists = await this.$root.api('users/lists/list');
w.$once('choosen', list => { const { canceled, result: listId } = await this.$root.dialog({
this.$store.dispatch('settings/addDeckColumn', { type: null,
id: uuid(), title: this.$t('@deck.select-list'),
type: 'list', select: {
list: list items: lists.map(list => ({
}); value: list.id, text: list.title
w.close(); }))
},
showCancelButton: true
});
if (canceled) return;
this.$store.commit('device/addDeckColumn', {
id: uuid(),
type: 'list',
list: lists.find(l => l.id === listId)
}); });
} }
}, { }, {
@ -207,7 +219,7 @@ export default Vue.extend({
input: true input: true
}).then(({ canceled, result: title }) => { }).then(({ canceled, result: title }) => {
if (canceled) return; if (canceled) return;
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'hashtag', type: 'hashtag',
tagTlId: this.$store.state.settings.tagTimelines.find(x => x.title == title).id tagTlId: this.$store.state.settings.tagTimelines.find(x => x.title == title).id
@ -218,7 +230,7 @@ export default Vue.extend({
icon: ['far', 'bell'], icon: ['far', 'bell'],
text: this.$t('@deck.notifications'), text: this.$t('@deck.notifications'),
action: () => { action: () => {
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'notifications' type: 'notifications'
}); });
@ -227,7 +239,7 @@ export default Vue.extend({
icon: 'calculator', icon: 'calculator',
text: this.$t('@deck.widgets'), text: this.$t('@deck.widgets'),
action: () => { action: () => {
this.$store.dispatch('settings/addDeckColumn', { this.$store.commit('device/addDeckColumn', {
id: uuid(), id: uuid(),
type: 'widgets', type: 'widgets',
widgets: [] widgets: []
@ -316,6 +328,8 @@ export default Vue.extend({
flex 1 flex 1
padding 16px 0 16px 16px padding 16px 0 16px 16px
overflow auto overflow auto
overflow-y hidden
-webkit-overflow-scrolling touch
> div > div
margin-right 8px margin-right 8px

View file

@ -37,12 +37,12 @@
> >
<div v-for="widget in column.widgets" class="customize-container" :key="widget.id" @contextmenu.stop.prevent="widgetFunc(widget.id)"> <div v-for="widget in column.widgets" class="customize-container" :key="widget.id" @contextmenu.stop.prevent="widgetFunc(widget.id)">
<button class="remove" @click="removeWidget(widget)"><fa icon="times"/></button> <button class="remove" @click="removeWidget(widget)"><fa icon="times"/></button>
<component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-customize-mode="true" platform="deck"/> <component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-customize-mode="true" platform="deck" :column="column"/>
</div> </div>
</x-draggable> </x-draggable>
</template> </template>
<template v-else> <template v-else>
<component class="widget" v-for="widget in column.widgets" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" platform="deck"/> <component class="widget" v-for="widget in column.widgets" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" platform="deck" :column="column"/>
</template> </template>
</div> </div>
</x-column> </x-column>
@ -109,7 +109,7 @@ export default Vue.extend({
}, },
addWidget() { addWidget() {
this.$store.dispatch('settings/addDeckWidget', { this.$store.commit('device/addDeckWidget', {
id: this.column.id, id: this.column.id,
widget: { widget: {
name: this.widgetAdderSelected, name: this.widgetAdderSelected,
@ -122,14 +122,14 @@ export default Vue.extend({
}, },
removeWidget(widget) { removeWidget(widget) {
this.$store.dispatch('settings/removeDeckWidget', { this.$store.commit('device/removeDeckWidget', {
id: this.column.id, id: this.column.id,
widget widget
}); });
}, },
saveWidgets() { saveWidgets() {
this.$store.dispatch('settings/saveDeck'); this.$store.commit('device/updateDeckColumn', this.column);
} }
} }
}); });

View file

@ -13,7 +13,7 @@ import fuckAdBlock from '../common/scripts/fuck-ad-block';
import composeNotification from '../common/scripts/compose-notification'; import composeNotification from '../common/scripts/compose-notification';
import MkHome from './views/home/home.vue'; import MkHome from './views/home/home.vue';
import MkDeck from './views/deck/deck.vue'; import MkDeck from '../common/views/deck/deck.vue';
import MkSelectDrive from './views/pages/selectdrive.vue'; import MkSelectDrive from './views/pages/selectdrive.vue';
import MkDrive from './views/pages/drive.vue'; import MkDrive from './views/pages/drive.vue';
import MkMessagingRoom from './views/pages/messaging-room.vue'; import MkMessagingRoom from './views/pages/messaging-room.vue';
@ -123,30 +123,24 @@ init(async (launch, os) => {
require('./views/components'); require('./views/components');
require('./views/widgets'); require('./views/widgets');
os.store.commit('device/set', {
key: 'inDeckMode',
value: os.store.getters.isSignedIn && os.store.state.device.deckMode
&& (document.location.pathname === '/' || window.performance.navigation.type === 1)
});
// Init router // Init router
const router = new VueRouter({ const router = new VueRouter({
mode: 'history', mode: 'history',
routes: [ routes: [
os.store.state.device.inDeckMode os.store.state.device.inDeckMode
? { path: '/', name: 'index', component: MkDeck, children: [ ? { path: '/', name: 'index', component: MkDeck, children: [
{ path: '/@:user', component: () => import('./views/deck/deck.user-column.vue').then(m => m.default), children: [ { path: '/@:user', component: () => import('../common/views/deck/deck.user-column.vue').then(m => m.default), children: [
{ path: '', name: 'user', component: () => import('./views/deck/deck.user-column.home.vue').then(m => m.default) }, { path: '', name: 'user', component: () => import('../common/views/deck/deck.user-column.home.vue').then(m => m.default) },
{ path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) }, { path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) },
{ path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) }, { path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) },
]}, ]},
{ path: '/notes/:note', name: 'note', component: () => import('./views/deck/deck.note-column.vue').then(m => m.default) }, { path: '/notes/:note', name: 'note', component: () => import('../common/views/deck/deck.note-column.vue').then(m => m.default) },
{ path: '/search', component: () => import('./views/deck/deck.search-column.vue').then(m => m.default) }, { path: '/search', component: () => import('../common/views/deck/deck.search-column.vue').then(m => m.default) },
{ path: '/tags/:tag', name: 'tag', component: () => import('./views/deck/deck.hashtag-column.vue').then(m => m.default) }, { path: '/tags/:tag', name: 'tag', component: () => import('../common/views/deck/deck.hashtag-column.vue').then(m => m.default) },
{ path: '/featured', name: 'featured', component: () => import('./views/deck/deck.featured-column.vue').then(m => m.default) }, { path: '/featured', name: 'featured', component: () => import('../common/views/deck/deck.featured-column.vue').then(m => m.default) },
{ path: '/explore', name: 'explore', component: () => import('./views/deck/deck.explore-column.vue').then(m => m.default) }, { path: '/explore', name: 'explore', component: () => import('../common/views/deck/deck.explore-column.vue').then(m => m.default) },
{ path: '/explore/tags/:tag', name: 'explore-tag', props: true, component: () => import('./views/deck/deck.explore-column.vue').then(m => m.default) }, { path: '/explore/tags/:tag', name: 'explore-tag', props: true, component: () => import('../common/views/deck/deck.explore-column.vue').then(m => m.default) },
{ path: '/i/favorites', component: () => import('./views/deck/deck.favorites-column.vue').then(m => m.default) } { path: '/i/favorites', component: () => import('../common/views/deck/deck.favorites-column.vue').then(m => m.default) }
]} ]}
: { path: '/', component: MkHome, children: [ : { path: '/', component: MkHome, children: [
{ path: '', name: 'index', component: MkHomeTimeline }, { path: '', name: 'index', component: MkHomeTimeline },

View file

@ -2,6 +2,7 @@ import Vue from 'vue';
import ui from './ui.vue'; import ui from './ui.vue';
import uiNotification from './ui-notification.vue'; import uiNotification from './ui-notification.vue';
import note from './note.vue';
import notes from './notes.vue'; import notes from './notes.vue';
import subNoteContent from './sub-note-content.vue'; import subNoteContent from './sub-note-content.vue';
import window from './window.vue'; import window from './window.vue';
@ -20,6 +21,7 @@ import uiContainer from './ui-container.vue';
Vue.component('mk-ui', ui); Vue.component('mk-ui', ui);
Vue.component('mk-ui-notification', uiNotification); Vue.component('mk-ui-notification', uiNotification);
Vue.component('mk-note', note);
Vue.component('mk-notes', notes); Vue.component('mk-notes', notes);
Vue.component('mk-sub-note-content', subNoteContent); Vue.component('mk-sub-note-content', subNoteContent);
Vue.component('mk-window', window); Vue.component('mk-window', window);

View file

@ -1,6 +1,6 @@
<template> <template>
<div class="qiziqtywpuaucsgarwajitwaakggnisj" :title="title"> <div class="qiziqtywpuaucsgarwajitwaakggnisj" :title="title">
<mk-avatar class="avatar" :user="note.user" v-if="!mini"/> <mk-avatar class="avatar" :user="note.user" v-if="!narrow"/>
<div class="main"> <div class="main">
<mk-note-header class="header" :note="note" :mini="true"/> <mk-note-header class="header" :note="note" :mini="true"/>
<div class="body"> <div class="body">
@ -25,9 +25,10 @@ export default Vue.extend({
type: Object, type: Object,
required: true required: true
}, },
mini: { },
type: Boolean,
required: false, inject: {
narrow: {
default: false default: false
} }
}, },

View file

@ -1,5 +1,5 @@
<template> <template>
<div class="tkfdzaxtkdeianobciwadajxzbddorql" :class="{ mini }" :title="title"> <div class="tkfdzaxtkdeianobciwadajxzbddorql" :class="{ mini: narrow }" :title="title">
<mk-avatar class="avatar" :user="note.user"/> <mk-avatar class="avatar" :user="note.user"/>
<div class="main"> <div class="main">
<mk-note-header class="header" :note="note"/> <mk-note-header class="header" :note="note"/>
@ -24,10 +24,11 @@ export default Vue.extend({
note: { note: {
type: Object, type: Object,
required: true required: true
}, }
mini: { },
type: Boolean,
required: false, inject: {
narrow: {
default: false default: false
} }
}, },

View file

@ -1,23 +1,23 @@
<template> <template>
<div <div
class="note" class="note"
:class="{ mini }" :class="{ mini: narrow }"
v-show="(this.$store.state.settings.remainDeletedNote || appearNote.deletedAt == null) && !hideThisNote" v-show="(this.$store.state.settings.remainDeletedNote || appearNote.deletedAt == null) && !hideThisNote"
:tabindex="appearNote.deletedAt == null ? '-1' : null" :tabindex="appearNote.deletedAt == null ? '-1' : null"
v-hotkey="keymap" v-hotkey="keymap"
:title="title" :title="title"
> >
<div class="conversation" v-if="detail && conversation.length > 0"> <div class="conversation" v-if="detail && conversation.length > 0">
<x-sub v-for="note in conversation" :key="note.id" :note="note" :mini="mini"/> <x-sub v-for="note in conversation" :key="note.id" :note="note"/>
</div> </div>
<div class="reply-to" v-if="appearNote.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)"> <div class="reply-to" v-if="appearNote.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)">
<x-sub :note="appearNote.reply" :mini="mini"/> <x-sub :note="appearNote.reply"/>
</div> </div>
<mk-renote class="renote" v-if="isRenote" :note="note"/> <mk-renote class="renote" v-if="isRenote" :note="note"/>
<article> <article class="article">
<mk-avatar class="avatar" :user="appearNote.user"/> <mk-avatar class="avatar" :user="appearNote.user"/>
<div class="main"> <div class="main">
<mk-note-header class="header" :note="appearNote" :mini="mini"/> <mk-note-header class="header" :note="appearNote"/>
<div class="body" v-if="appearNote.deletedAt == null"> <div class="body" v-if="appearNote.deletedAt == null">
<p v-if="appearNote.cw != null" class="cw"> <p v-if="appearNote.cw != null" class="cw">
<mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" /> <mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
@ -35,12 +35,12 @@
</div> </div>
<mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/> <mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/>
<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> 位置情報</a> <a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> 位置情報</a>
<div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote" :mini="mini"/></div> <div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote"/></div>
<mk-url-preview v-for="url in urls" :url="url" :key="url" :mini="mini" :compact="compact"/> <mk-url-preview v-for="url in urls" :url="url" :key="url" :compact="compact"/>
</div> </div>
</div> </div>
<footer v-if="appearNote.deletedAt == null"> <footer v-if="appearNote.deletedAt == null">
<span class="app" v-if="appearNote.app && mini && $store.state.settings.showVia">via <b>{{ appearNote.app.name }}</b></span> <span class="app" v-if="appearNote.app && narrow && $store.state.settings.showVia">via <b>{{ appearNote.app.name }}</b></span>
<mk-reactions-viewer :note="appearNote" ref="reactionsViewer"/> <mk-reactions-viewer :note="appearNote" ref="reactionsViewer"/>
<button class="replyButton" @click="reply()" :title="$t('reply')"> <button class="replyButton" @click="reply()" :title="$t('reply')">
<template v-if="appearNote.reply"><fa icon="reply-all"/></template> <template v-if="appearNote.reply"><fa icon="reply-all"/></template>
@ -70,7 +70,7 @@
</div> </div>
</article> </article>
<div class="replies" v-if="detail && replies.length > 0"> <div class="replies" v-if="detail && replies.length > 0">
<x-sub v-for="note in replies" :key="note.id" :note="note" :mini="mini"/> <x-sub v-for="note in replies" :key="note.id" :note="note"/>
</div> </div>
</div> </div>
</template> </template>
@ -110,9 +110,10 @@ export default Vue.extend({
required: false, required: false,
default: false default: false
}, },
mini: { },
type: Boolean,
required: false, inject: {
narrow: {
default: false default: false
} }
}, },
@ -152,7 +153,7 @@ export default Vue.extend({
border-bottom solid var(--lineWidth) var(--faceDivider) border-bottom solid var(--lineWidth) var(--faceDivider)
&.mini &.mini
font-size 14px font-size 13px
> .renote > .renote
padding 8px 16px 0 16px padding 8px 16px 0 16px
@ -161,7 +162,7 @@ export default Vue.extend({
width 20px width 20px
height 20px height 20px
> article > .article
padding 16px 16px 4px padding 16px 16px 4px
> .avatar > .avatar
@ -189,7 +190,7 @@ export default Vue.extend({
> .renote + article > .renote + article
padding-top 8px padding-top 8px
> article > .article
display flex display flex
padding 28px 32px 18px 32px padding 28px 32px 18px 32px

View file

@ -17,7 +17,7 @@
<!-- トランジションを有効にするとなぜかメモリリークする --> <!-- トランジションを有効にするとなぜかメモリリークする -->
<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="notes transition" tag="div" ref="notes"> <component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="notes transition" tag="div" ref="notes">
<template v-for="(note, i) in _notes"> <template v-for="(note, i) in _notes">
<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :compact="true" ref="note"/> <mk-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :compact="true" ref="note"/>
<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date"> <p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
<span><fa icon="angle-up"/>{{ note._datetext }}</span> <span><fa icon="angle-up"/>{{ note._datetext }}</span>
<span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span> <span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span>
@ -39,17 +39,12 @@ import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import * as config from '../../../config'; import * as config from '../../../config';
import shouldMuteNote from '../../../common/scripts/should-mute-note'; import shouldMuteNote from '../../../common/scripts/should-mute-note';
import XNote from './note.vue';
const displayLimit = 30; const displayLimit = 30;
export default Vue.extend({ export default Vue.extend({
i18n: i18n(), i18n: i18n(),
components: {
XNote
},
props: { props: {
makePromise: { makePromise: {
required: true required: true

View file

@ -115,18 +115,18 @@
<ui-switch v-model="remainDeletedNote">{{ $t('remain-deleted-note') }}</ui-switch> <ui-switch v-model="remainDeletedNote">{{ $t('remain-deleted-note') }}</ui-switch>
</section> </section>
<section> <section>
<header>{{ $t('deck-column-align') }}</header> <header>{{ $t('@.deck-column-align') }}</header>
<ui-radio v-model="deckColumnAlign" value="center">{{ $t('deck-column-align-center') }}</ui-radio> <ui-radio v-model="deckColumnAlign" value="center">{{ $t('@.deck-column-align-center') }}</ui-radio>
<ui-radio v-model="deckColumnAlign" value="left">{{ $t('deck-column-align-left') }}</ui-radio> <ui-radio v-model="deckColumnAlign" value="left">{{ $t('@.deck-column-align-left') }}</ui-radio>
<ui-radio v-model="deckColumnAlign" value="flexible">{{ $t('deck-column-align-flexible') }}</ui-radio> <ui-radio v-model="deckColumnAlign" value="flexible">{{ $t('@.deck-column-align-flexible') }}</ui-radio>
</section> </section>
<section> <section>
<header>{{ $t('deck-column-width') }}</header> <header>{{ $t('@.deck-column-width') }}</header>
<ui-radio v-model="deckColumnWidth" value="narrow">{{ $t('deck-column-width-narrow') }}</ui-radio> <ui-radio v-model="deckColumnWidth" value="narrow">{{ $t('@.deck-column-width-narrow') }}</ui-radio>
<ui-radio v-model="deckColumnWidth" value="narrower">{{ $t('deck-column-width-narrower') }}</ui-radio> <ui-radio v-model="deckColumnWidth" value="narrower">{{ $t('@.deck-column-width-narrower') }}</ui-radio>
<ui-radio v-model="deckColumnWidth" value="normal">{{ $t('deck-column-width-normal') }}</ui-radio> <ui-radio v-model="deckColumnWidth" value="normal">{{ $t('@.deck-column-width-normal') }}</ui-radio>
<ui-radio v-model="deckColumnWidth" value="wider">{{ $t('deck-column-width-wider') }}</ui-radio> <ui-radio v-model="deckColumnWidth" value="wider">{{ $t('@.deck-column-width-wider') }}</ui-radio>
<ui-radio v-model="deckColumnWidth" value="wide">{{ $t('deck-column-width-wide') }}</ui-radio> <ui-radio v-model="deckColumnWidth" value="wide">{{ $t('@.deck-column-width-wide') }}</ui-radio>
</section> </section>
<section> <section>
<ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@.show-reversi-board-labels') }}</ui-switch> <ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@.show-reversi-board-labels') }}</ui-switch>

View file

@ -504,6 +504,13 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS], os: MiOS)
return [app, os] as [Vue, MiOS]; return [app, os] as [Vue, MiOS];
}; };
// Deck mode
os.store.commit('device/set', {
key: 'inDeckMode',
value: os.store.getters.isSignedIn && os.store.state.device.deckMode
&& (document.location.pathname === '/' || window.performance.navigation.type === 1)
});
callback(launch, os); callback(launch, os);
}); });
}; };

View file

@ -283,7 +283,7 @@ export default class MiOS extends EventEmitter {
}); });
main.on('widgetUpdated', x => { main.on('widgetUpdated', x => {
this.store.commit('settings/setWidget', { this.store.commit('settings/updateWidget', {
id: x.id, id: x.id,
data: x.data data: x.data
}); });

View file

@ -11,10 +11,10 @@ import './style.styl';
import init from '../init'; import init from '../init';
import MkIndex from './views/pages/index.vue'; import MkIndex from './views/pages/index.vue';
import MkDeck from '../common/views/deck/deck.vue';
import MkSignup from './views/pages/signup.vue'; import MkSignup from './views/pages/signup.vue';
import MkSelectDrive from './views/pages/selectdrive.vue'; import MkSelectDrive from './views/pages/selectdrive.vue';
import MkDrive from './views/pages/drive.vue'; import MkDrive from './views/pages/drive.vue';
import MkNotifications from './views/pages/notifications.vue';
import MkWidgets from './views/pages/widgets.vue'; import MkWidgets from './views/pages/widgets.vue';
import MkMessaging from './views/pages/messaging.vue'; import MkMessaging from './views/pages/messaging.vue';
import MkMessagingRoom from './views/pages/messaging-room.vue'; import MkMessagingRoom from './views/pages/messaging-room.vue';
@ -37,7 +37,7 @@ import FolderChooser from './views/components/drive-folder-chooser.vue';
/** /**
* init * init
*/ */
init((launch) => { init((launch, os) => {
Vue.mixin({ Vue.mixin({
data() { data() {
return { return {
@ -114,10 +114,26 @@ init((launch) => {
const router = new VueRouter({ const router = new VueRouter({
mode: 'history', mode: 'history',
routes: [ routes: [
{ path: '/', name: 'index', component: MkIndex }, ...(os.store.state.device.inDeckMode
? [{ path: '/', name: 'index', component: MkDeck, children: [
{ path: '/@:user', component: () => import('../common/views/deck/deck.user-column.vue').then(m => m.default), children: [
{ path: '', name: 'user', component: () => import('../common/views/deck/deck.user-column.home.vue').then(m => m.default) },
{ path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) },
{ path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) },
]},
{ path: '/notes/:note', name: 'note', component: () => import('../common/views/deck/deck.note-column.vue').then(m => m.default) },
{ path: '/search', component: () => import('../common/views/deck/deck.search-column.vue').then(m => m.default) },
{ path: '/tags/:tag', name: 'tag', component: () => import('../common/views/deck/deck.hashtag-column.vue').then(m => m.default) },
{ path: '/featured', name: 'featured', component: () => import('../common/views/deck/deck.featured-column.vue').then(m => m.default) },
{ path: '/explore', name: 'explore', component: () => import('../common/views/deck/deck.explore-column.vue').then(m => m.default) },
{ path: '/explore/tags/:tag', name: 'explore-tag', props: true, component: () => import('../common/views/deck/deck.explore-column.vue').then(m => m.default) },
{ path: '/i/favorites', component: () => import('../common/views/deck/deck.favorites-column.vue').then(m => m.default) }
]}]
: [
{ path: '/', name: 'index', component: MkIndex },
]),
{ path: '/signup', name: 'signup', component: MkSignup }, { path: '/signup', name: 'signup', component: MkSignup },
{ path: '/i/settings', name: 'settings', component: () => import('./views/pages/settings.vue').then(m => m.default) }, { path: '/i/settings', name: 'settings', component: () => import('./views/pages/settings.vue').then(m => m.default) },
{ path: '/i/notifications', name: 'notifications', component: MkNotifications },
{ path: '/i/favorites', name: 'favorites', component: MkFavorites }, { path: '/i/favorites', name: 'favorites', component: MkFavorites },
{ path: '/i/lists', name: 'user-lists', component: MkUserLists }, { path: '/i/lists', name: 'user-lists', component: MkUserLists },
{ path: '/i/lists/:list', name: 'user-list', component: MkUserList }, { path: '/i/lists/:list', name: 'user-list', component: MkUserList },

View file

@ -1,6 +1,6 @@
<template> <template>
<div class="yohlumlkhizgfkvvscwfcrcggkotpvry" :class="{ smart: $store.state.device.postStyle == 'smart' }"> <div class="yohlumlkhizgfkvvscwfcrcggkotpvry" :class="{ smart: $store.state.device.postStyle == 'smart', mini: narrow }">
<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle != 'smart'"/> <mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle != 'smart' && !narrow"/>
<div class="main"> <div class="main">
<mk-note-header class="header" :note="note" :mini="true"/> <mk-note-header class="header" :note="note" :mini="true"/>
<div class="body"> <div class="body">
@ -27,6 +27,12 @@ export default Vue.extend({
} }
}, },
inject: {
narrow: {
default: false
}
},
data() { data() {
return { return {
showContent: false showContent: false
@ -43,11 +49,25 @@ export default Vue.extend({
overflow hidden overflow hidden
font-size 10px font-size 10px
@media (min-width 350px) &:not(.mini)
font-size 12px
@media (min-width 500px) @media (min-width 350px)
font-size 14px font-size 12px
@media (min-width 500px)
font-size 14px
> .avatar
@media (min-width 350px)
margin 0 10px 0 0
width 44px
height 44px
@media (min-width 500px)
margin 0 12px 0 0
width 48px
height 48px
&.smart &.smart
> .main > .main
@ -64,16 +84,6 @@ export default Vue.extend({
height 40px height 40px
border-radius 8px border-radius 8px
@media (min-width 350px)
margin 0 10px 0 0
width 44px
height 44px
@media (min-width 500px)
margin 0 12px 0 0
width 48px
height 48px
> .main > .main
flex 1 flex 1
min-width 0 min-width 0

View file

@ -1,5 +1,5 @@
<template> <template>
<div class="zlrxdaqttccpwhpaagdmkawtzklsccam" :class="{ smart: $store.state.device.postStyle == 'smart' }"> <div class="zlrxdaqttccpwhpaagdmkawtzklsccam" :class="{ smart: $store.state.device.postStyle == 'smart', mini: narrow }">
<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle != 'smart'"/> <mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle != 'smart'"/>
<div class="main"> <div class="main">
<mk-note-header class="header" :note="note" :mini="true"/> <mk-note-header class="header" :note="note" :mini="true"/>
@ -32,6 +32,12 @@ export default Vue.extend({
} }
}, },
inject: {
narrow: {
default: false
}
},
data() { data() {
return { return {
showContent: false showContent: false
@ -47,14 +53,28 @@ export default Vue.extend({
font-size 10px font-size 10px
background var(--subNoteBg) background var(--subNoteBg)
@media (min-width 350px) &:not(.mini)
font-size 12px
@media (min-width 500px) @media (min-width 350px)
font-size 14px font-size 12px
@media (min-width 600px) @media (min-width 500px)
padding 24px 32px font-size 14px
@media (min-width 600px)
padding 24px 32px
> .avatar
@media (min-width 350px)
margin-right 10px
width 42px
height 42px
@media (min-width 500px)
margin-right 14px
width 50px
height 50px
&.smart &.smart
> .main > .main
@ -71,16 +91,6 @@ export default Vue.extend({
height 38px height 38px
border-radius 8px border-radius 8px
@media (min-width 350px)
margin-right 10px
width 42px
height 42px
@media (min-width 500px)
margin-right 14px
width 50px
height 50px
> .main > .main
flex 1 flex 1
min-width 0 min-width 0

View file

@ -3,14 +3,14 @@
class="note" class="note"
v-show="appearNote.deletedAt == null && !hideThisNote" v-show="appearNote.deletedAt == null && !hideThisNote"
:tabindex="appearNote.deletedAt == null ? '-1' : null" :tabindex="appearNote.deletedAt == null ? '-1' : null"
:class="{ renote: isRenote, smart: $store.state.device.postStyle == 'smart' }" :class="{ renote: isRenote, smart: $store.state.device.postStyle == 'smart', mini: narrow }"
v-hotkey="keymap" v-hotkey="keymap"
> >
<div class="reply-to" v-if="appearNote.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)"> <div class="reply-to" v-if="appearNote.reply && (!$store.getters.isSignedIn || $store.state.settings.showReplyTarget)">
<x-sub :note="appearNote.reply"/> <x-sub :note="appearNote.reply"/>
</div> </div>
<mk-renote class="renote" v-if="isRenote" :note="note" mini/> <mk-renote class="renote" v-if="isRenote" :note="note"/>
<article> <article class="article">
<mk-avatar class="avatar" :user="appearNote.user" v-if="$store.state.device.postStyle != 'smart'"/> <mk-avatar class="avatar" :user="appearNote.user" v-if="$store.state.device.postStyle != 'smart'"/>
<div class="main"> <div class="main">
<mk-note-header class="header" :note="appearNote" :mini="true"/> <mk-note-header class="header" :note="appearNote" :mini="true"/>
@ -30,7 +30,7 @@
<mk-media-list :media-list="appearNote.files"/> <mk-media-list :media-list="appearNote.files"/>
</div> </div>
<mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/> <mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/>
<mk-url-preview v-for="url in urls" :url="url" :key="url" :compact="compact"/> <mk-url-preview v-for="url in urls" :url="url" :key="url" :compact="true"/>
<a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> {{ $t('location') }}</a> <a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> {{ $t('location') }}</a>
<div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote"/></div> <div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote"/></div>
</div> </div>
@ -91,19 +91,20 @@ export default Vue.extend({
type: Object, type: Object,
required: true required: true
}, },
compact: { },
type: Boolean,
required: false, inject: {
narrow: {
default: false default: false
} }
} },
}); });
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.note .note
overflow hidden overflow hidden
font-size 12px font-size 13px
border-bottom solid var(--lineWidth) var(--faceDivider) border-bottom solid var(--lineWidth) var(--faceDivider)
&:focus &:focus
@ -123,29 +124,53 @@ export default Vue.extend({
&:last-of-type &:last-of-type
border-bottom none border-bottom none
@media (min-width 350px) &:not(.mini)
font-size 14px
@media (min-width 500px) @media (min-width 350px)
font-size 16px font-size 14px
@media (min-width 500px)
font-size 16px
> .article
@media (min-width 600px)
padding 32px 32px 22px
> .avatar
@media (min-width 350px)
width 48px
height 48px
border-radius 6px
@media (min-width 500px)
margin-right 16px
width 58px
height 58px
border-radius 8px
> .main
> .header
@media (min-width 500px)
margin-bottom 2px
> .body
@media (min-width 700px)
font-size 1.1em
&.smart &.smart
> article > .article
> .main > .main
> header > header
align-items center align-items center
margin-bottom 4px margin-bottom 4px
> .renote + article > .renote + .article
padding-top 8px padding-top 8px
> article > .article
display flex display flex
padding 16px 16px 9px padding 16px 16px 9px
@media (min-width 600px)
padding 32px 32px 22px
> .avatar > .avatar
flex-shrink 0 flex-shrink 0
display block display block
@ -157,29 +182,11 @@ export default Vue.extend({
//position sticky //position sticky
//top 62px //top 62px
@media (min-width 350px)
width 48px
height 48px
border-radius 6px
@media (min-width 500px)
margin-right 16px
width 58px
height 58px
border-radius 8px
> .main > .main
flex 1 flex 1
min-width 0 min-width 0
> .header
@media (min-width 500px)
margin-bottom 2px
> .body > .body
@media (min-width 700px)
font-size 1.1em
> .cw > .cw
cursor default cursor default
display block display block

View file

@ -13,7 +13,7 @@
<!-- トランジションを有効にするとなぜかメモリリークする --> <!-- トランジションを有効にするとなぜかメモリリークする -->
<component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="transition" tag="div"> <component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="transition" tag="div">
<template v-for="(note, i) in _notes"> <template v-for="(note, i) in _notes">
<mk-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :compact="true"/> <mk-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)"/>
<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date"> <p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
<span><fa icon="angle-up"/>{{ note._datetext }}</span> <span><fa icon="angle-up"/>{{ note._datetext }}</span>
<span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span> <span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span>

View file

@ -116,15 +116,6 @@ export default Vue.extend({
font-size 12px font-size 12px
overflow-wrap break-word overflow-wrap break-word
@media (min-width 350px)
font-size 14px
@media (min-width 500px)
font-size 16px
@media (min-width 600px)
padding 24px 32px
&:after &:after
content "" content ""
display block display block
@ -137,18 +128,11 @@ export default Vue.extend({
height 36px height 36px
border-radius 6px border-radius 6px
@media (min-width 500px)
width 42px
height 42px
> div > div
float right float right
width calc(100% - 36px) width calc(100% - 36px)
padding-left 8px padding-left 8px
@media (min-width 500px)
width calc(100% - 42px)
> header > header
display flex display flex
align-items baseline align-items baseline

View file

@ -131,15 +131,6 @@ export default Vue.extend({
<style lang="stylus" scoped> <style lang="stylus" scoped>
.mk-notifications .mk-notifications
margin 0 auto
background var(--face)
border-radius 8px
box-shadow 0 0 2px rgba(#000, 0.1)
overflow hidden
@media (min-width 500px)
box-shadow 0 8px 32px rgba(#000, 0.1)
.transition .transition
.mk-notifications-enter .mk-notifications-enter
.mk-notifications-leave-to .mk-notifications-leave-to
@ -187,10 +178,7 @@ export default Vue.extend({
color var(--text) color var(--text)
> .placeholder > .placeholder
padding 16px padding 32px
opacity 0.3 opacity 0.3
@media (min-width 500px)
padding 32px
</style> </style>

View file

@ -1,5 +1,5 @@
<template> <template>
<div class="ukygtjoj" :class="{ naked, hideHeader: !showHeader }"> <div class="ukygtjoj" :class="{ naked, inDeck, hideHeader: !showHeader }">
<header v-if="showHeader"> <header v-if="showHeader">
<div class="title"><slot name="header"></slot></div> <div class="title"><slot name="header"></slot></div>
<slot name="func"></slot> <slot name="func"></slot>
@ -35,6 +35,11 @@ export default Vue.extend({
default: true default: true
}, },
}, },
inject: {
inDeck: {
default: false
}
},
data() { data() {
return { return {
showBody: this.expanded showBody: this.expanded
@ -50,49 +55,69 @@ export default Vue.extend({
<style lang="stylus" scoped> <style lang="stylus" scoped>
.ukygtjoj .ukygtjoj
background var(--face)
border-radius 8px
box-shadow 0 4px 16px rgba(#000, 0.1)
overflow hidden overflow hidden
& + .ukygtjoj &:not(.inDeck)
margin-top 16px background var(--face)
border-radius 8px
box-shadow 0 4px 16px rgba(#000, 0.1)
@media (max-width 500px) & + .ukygtjoj
margin-top 8px margin-top 16px
&.naked @media (max-width 500px)
background transparent !important margin-top 8px
box-shadow none !important
> header &.naked
> .title background transparent !important
box-shadow none !important
> header
> .title
margin 0
padding 8px 10px
font-size 15px
font-weight normal
color var(--faceHeaderText)
background var(--faceHeader)
border-radius 8px 8px 0 0
> [data-icon]
margin-right 6px
&:empty
display none
> button
position absolute
z-index 2
top 0
right 0
padding 0
width 42px
height 100%
font-size 15px
color var(--faceTextButton)
> div
color var(--text)
&.inDeck
background var(--face)
> header
margin 0 margin 0
padding 8px 10px padding 8px 16px
font-size 15px font-size 12px
font-weight normal color var(--text)
color var(--faceHeaderText) background var(--deckColumnBg)
background var(--faceHeader)
border-radius 8px 8px 0 0
> [data-icon] > button
margin-right 6px position absolute
top 0
&:empty right 8px
display none padding 8px 6px
font-size 14px
> button color var(--text)
position absolute
z-index 2
top 0
right 0
padding 0
width 42px
height 100%
font-size 15px
color var(--faceTextButton)
> div
color var(--text)
</style> </style>

View file

@ -5,7 +5,7 @@
<div class="backdrop"></div> <div class="backdrop"></div>
<div class="content" ref="mainContainer"> <div class="content" ref="mainContainer">
<button class="nav" @click="$parent.isDrawerOpening = true"><fa icon="bars"/></button> <button class="nav" @click="$parent.isDrawerOpening = true"><fa icon="bars"/></button>
<i v-if="hasUnreadNotification || hasUnreadMessagingMessage || hasGameInvitation" class="circle"><fa icon="circle"/></i> <i v-if="$parent.indicate" class="circle"><fa icon="circle"/></i>
<h1> <h1>
<slot>{{ $root.instanceName }}</slot> <slot>{{ $root.instanceName }}</slot>
</h1> </h1>
@ -27,48 +27,13 @@ export default Vue.extend({
data() { data() {
return { return {
hasGameInvitation: false,
connection: null,
env: env env: env
}; };
}, },
computed: {
hasUnreadNotification(): boolean {
return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadNotification;
},
hasUnreadMessagingMessage(): boolean {
return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadMessagingMessage;
}
},
mounted() { mounted() {
this.$store.commit('setUiHeaderHeight', 48); this.$store.commit('setUiHeaderHeight', 48);
if (this.$store.getters.isSignedIn) {
this.connection = this.$root.stream.useSharedConnection('main');
this.connection.on('reversiInvited', this.onReversiInvited);
this.connection.on('reversiNoInvites', this.onReversiNoInvites);
}
}, },
beforeDestroy() {
if (this.$store.getters.isSignedIn) {
this.connection.dispose();
}
},
methods: {
onReversiInvited() {
this.hasGameInvitation = true;
},
onReversiNoInvites() {
this.hasGameInvitation = false;
}
}
}); });
</script> </script>

View file

@ -1,5 +1,5 @@
<template> <template>
<div class="nav"> <div class="fquwcbxs">
<transition name="back"> <transition name="back">
<div class="backdrop" <div class="backdrop"
v-if="isOpen" v-if="isOpen"
@ -8,41 +8,52 @@
></div> ></div>
</transition> </transition>
<transition name="nav"> <transition name="nav">
<div class="body" v-if="isOpen"> <div class="body" :class="{ notifications: showNotifications }" v-if="isOpen">
<router-link class="me" v-if="$store.getters.isSignedIn" :to="`/@${$store.state.i.username}`"> <div class="nav" v-show="!showNotifications">
<img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/> <router-link class="me" v-if="$store.getters.isSignedIn" :to="`/@${$store.state.i.username}`">
<p class="name"><mk-user-name :user="$store.state.i"/></p> <img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/>
</router-link> <p class="name"><mk-user-name :user="$store.state.i"/></p>
<div class="links"> </router-link>
<ul> <div class="links">
<li><router-link to="/" :data-active="$route.name == 'index'"><i><fa icon="home" fixed-width/></i>{{ $t('timeline') }}<i><fa icon="angle-right"/></i></router-link></li> <ul>
<li><router-link to="/i/notifications" :data-active="$route.name == 'notifications'"><i><fa :icon="['far', 'bell']" fixed-width/></i>{{ $t('notifications') }}<i v-if="hasUnreadNotification" class="circle"><fa icon="circle"/></i><i><fa icon="angle-right"/></i></router-link></li> <li><router-link to="/" :data-active="$route.name == 'index'"><i><fa icon="home" fixed-width/></i>{{ $t('timeline') }}<i><fa icon="angle-right"/></i></router-link></li>
<li><router-link to="/i/messaging" :data-active="$route.name == 'messaging'"><i><fa :icon="['far', 'comments']" fixed-width/></i>{{ $t('@.messaging') }}<i v-if="hasUnreadMessagingMessage" class="circle"><fa icon="circle"/></i><i><fa icon="angle-right"/></i></router-link></li> <li><p @click="showNotifications = true"><i><fa :icon="['far', 'bell']" fixed-width/></i>{{ $t('notifications') }}<i v-if="hasUnreadNotification" class="circle"><fa icon="circle"/></i><i><fa icon="angle-right"/></i></p></li>
<li v-if="$store.getters.isSignedIn && ($store.state.i.isLocked || $store.state.i.carefulBot)"><router-link to="/i/received-follow-requests" :data-active="$route.name == 'received-follow-requests'"><i><fa :icon="['far', 'envelope']" fixed-width/></i>{{ $t('follow-requests') }}<i v-if="$store.getters.isSignedIn && $store.state.i.pendingReceivedFollowRequestsCount" class="circle"><fa icon="circle"/></i><i><fa icon="angle-right"/></i></router-link></li> <li><router-link to="/i/messaging" :data-active="$route.name == 'messaging'"><i><fa :icon="['far', 'comments']" fixed-width/></i>{{ $t('@.messaging') }}<i v-if="hasUnreadMessagingMessage" class="circle"><fa icon="circle"/></i><i><fa icon="angle-right"/></i></router-link></li>
<li><router-link to="/featured" :data-active="$route.name == 'featured'"><i><fa :icon="faNewspaper" fixed-width/></i>{{ $t('@.featured-notes') }}<i><fa icon="angle-right"/></i></router-link></li> <li v-if="$store.getters.isSignedIn && ($store.state.i.isLocked || $store.state.i.carefulBot)"><router-link to="/i/received-follow-requests" :data-active="$route.name == 'received-follow-requests'"><i><fa :icon="['far', 'envelope']" fixed-width/></i>{{ $t('follow-requests') }}<i v-if="$store.getters.isSignedIn && $store.state.i.pendingReceivedFollowRequestsCount" class="circle"><fa icon="circle"/></i><i><fa icon="angle-right"/></i></router-link></li>
<li><router-link to="/explore" :data-active="$route.name == 'explore' || $route.name == 'explore-tag'"><i><fa :icon="faHashtag" fixed-width/></i>{{ $t('@.explore') }}<i><fa icon="angle-right"/></i></router-link></li> <li><router-link to="/featured" :data-active="$route.name == 'featured'"><i><fa :icon="faNewspaper" fixed-width/></i>{{ $t('@.featured-notes') }}<i><fa icon="angle-right"/></i></router-link></li>
<li><router-link to="/games/reversi" :data-active="$route.name == 'reversi'"><i><fa icon="gamepad" fixed-width/></i>{{ $t('game') }}<i v-if="hasGameInvitation" class="circle"><fa icon="circle"/></i><i><fa icon="angle-right"/></i></router-link></li> <li><router-link to="/explore" :data-active="$route.name == 'explore' || $route.name == 'explore-tag'"><i><fa :icon="faHashtag" fixed-width/></i>{{ $t('@.explore') }}<i><fa icon="angle-right"/></i></router-link></li>
</ul> <li><router-link to="/games/reversi" :data-active="$route.name == 'reversi'"><i><fa icon="gamepad" fixed-width/></i>{{ $t('game') }}<i v-if="hasGameInvitation" class="circle"><fa icon="circle"/></i><i><fa icon="angle-right"/></i></router-link></li>
<ul> </ul>
<li><router-link to="/i/widgets" :data-active="$route.name == 'widgets'"><i><fa :icon="['far', 'calendar-alt']" fixed-width/></i>{{ $t('widgets') }}<i><fa icon="angle-right"/></i></router-link></li> <ul>
<li><router-link to="/i/favorites" :data-active="$route.name == 'favorites'"><i><fa icon="star" fixed-width/></i>{{ $t('favorites') }}<i><fa icon="angle-right"/></i></router-link></li> <li><router-link to="/i/widgets" :data-active="$route.name == 'widgets'"><i><fa :icon="['far', 'calendar-alt']" fixed-width/></i>{{ $t('widgets') }}<i><fa icon="angle-right"/></i></router-link></li>
<li><router-link to="/i/lists" :data-active="$route.name == 'user-lists'"><i><fa icon="list" fixed-width/></i>{{ $t('user-lists') }}<i><fa icon="angle-right"/></i></router-link></li> <li><router-link to="/i/favorites" :data-active="$route.name == 'favorites'"><i><fa icon="star" fixed-width/></i>{{ $t('favorites') }}<i><fa icon="angle-right"/></i></router-link></li>
<li><router-link to="/i/drive" :data-active="$route.name == 'drive'"><i><fa icon="cloud" fixed-width/></i>{{ $t('@.drive') }}<i><fa icon="angle-right"/></i></router-link></li> <li><router-link to="/i/lists" :data-active="$route.name == 'user-lists'"><i><fa icon="list" fixed-width/></i>{{ $t('user-lists') }}<i><fa icon="angle-right"/></i></router-link></li>
</ul> <li><router-link to="/i/drive" :data-active="$route.name == 'drive'"><i><fa icon="cloud" fixed-width/></i>{{ $t('@.drive') }}<i><fa icon="angle-right"/></i></router-link></li>
<ul> </ul>
<li><a @click="search"><i><fa icon="search" fixed-width/></i>{{ $t('search') }}<i><fa icon="angle-right"/></i></a></li> <ul>
<li><router-link to="/i/settings" :data-active="$route.name == 'settings'"><i><fa icon="cog" fixed-width/></i>{{ $t('settings') }}<i><fa icon="angle-right"/></i></router-link></li> <li><a @click="search"><i><fa icon="search" fixed-width/></i>{{ $t('search') }}<i><fa icon="angle-right"/></i></a></li>
<li v-if="$store.getters.isSignedIn && ($store.state.i.isAdmin || $store.state.i.isModerator)"><a href="/admin"><i><fa icon="terminal" fixed-width/></i><span>{{ $t('admin') }}</span><i><fa icon="angle-right"/></i></a></li> <li><router-link to="/i/settings" :data-active="$route.name == 'settings'"><i><fa icon="cog" fixed-width/></i>{{ $t('settings') }}<i><fa icon="angle-right"/></i></router-link></li>
<li @click="dark"><p><template><i><fa :icon="$store.state.device.darkmode ? faSun : faMoon" fixed-width/></i></template><span>{{ $store.state.device.darkmode ? $t('@.turn-off-darkmode') : $t('@.turn-on-darkmode') }}</span></p></li> <li v-if="$store.getters.isSignedIn && ($store.state.i.isAdmin || $store.state.i.isModerator)"><a href="/admin"><i><fa icon="terminal" fixed-width/></i><span>{{ $t('admin') }}</span><i><fa icon="angle-right"/></i></a></li>
</ul> </ul>
<ul>
<li @click="toggleDeckMode"><p><i><fa :icon="$store.state.device.inDeckMode ? faHome : faColumns"/></i><span>{{ $store.state.device.inDeckMode ? $t('@.home') : $t('@.deck') }}</span></p></li>
<li @click="dark"><p><i><fa :icon="$store.state.device.darkmode ? faSun : faMoon" fixed-width/></i><span>{{ $store.state.device.darkmode ? $t('@.turn-off-darkmode') : $t('@.turn-on-darkmode') }}</span></p></li>
</ul>
</div>
<div class="announcements" v-if="announcements && announcements.length > 0">
<article v-for="announcement in announcements">
<span v-html="announcement.title" class="title"></span>
<div v-html="announcement.text"></div>
</article>
</div>
<a :href="aboutUrl"><p class="about">{{ $t('about') }}</p></a>
</div> </div>
<div class="announcements" v-if="announcements && announcements.length > 0"> <div class="notifications" v-if="showNotifications">
<article v-for="announcement in announcements"> <header>
<span v-html="announcement.title" class="title"></span> <button @click="$parent.isDrawerOpening = false"><fa icon="times"/></button>
<div v-html="announcement.text"></div> </header>
</article> <mk-notifications/>
</div> </div>
<a :href="aboutUrl"><p class="about">{{ $t('about') }}</p></a>
</div> </div>
</transition> </transition>
</div> </div>
@ -52,13 +63,18 @@
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import { lang } from '../../../config'; import { lang } from '../../../config';
import { faNewspaper, faHashtag } from '@fortawesome/free-solid-svg-icons'; import { faNewspaper, faHashtag, faHome, faColumns } from '@fortawesome/free-solid-svg-icons';
import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons'; import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';
export default Vue.extend({ export default Vue.extend({
i18n: i18n('mobile/views/components/ui.nav.vue'), i18n: i18n('mobile/views/components/ui.nav.vue'),
props: ['isOpen'], props: ['isOpen'],
provide: {
narrow: true
},
data() { data() {
return { return {
hasGameInvitation: false, hasGameInvitation: false,
@ -66,7 +82,8 @@ export default Vue.extend({
aboutUrl: `/docs/${lang}/about`, aboutUrl: `/docs/${lang}/about`,
announcements: [], announcements: [],
searching: false, searching: false,
faNewspaper, faHashtag, faMoon, faSun showNotifications: false,
faNewspaper, faHashtag, faMoon, faSun, faHome, faColumns
}; };
}, },
@ -80,6 +97,12 @@ export default Vue.extend({
} }
}, },
watch: {
isOpen() {
this.showNotifications = false;
}
},
mounted() { mounted() {
this.$root.getMeta().then(meta => { this.$root.getMeta().then(meta => {
this.announcements = meta.announcements; this.announcements = meta.announcements;
@ -148,13 +171,18 @@ export default Vue.extend({
key: 'darkmode', key: 'darkmode',
value: !this.$store.state.device.darkmode value: !this.$store.state.device.darkmode
}); });
} },
toggleDeckMode() {
this.$store.commit('device/set', { key: 'deckMode', value: !this.$store.state.device.inDeckMode });
location.replace('/');
},
} }
}); });
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.nav .fquwcbxs
$color = var(--text) $color = var(--text)
.backdrop .backdrop
@ -178,102 +206,126 @@ export default Vue.extend({
background var(--secondary) background var(--secondary)
font-size 15px font-size 15px
.me &.notifications
display block width 340px
margin 0
padding 16px
.avatar > .notifications
display inline padding-top 42px
max-width 64px
border-radius 32px
vertical-align middle
.name > header
display block position fixed
margin 0 16px top 0
position absolute left 0
top 0 z-index 1000
left 80px width 340px
padding 0 line-height 42px
width calc(100% - 112px) background var(--secondary)
color $color
line-height 96px
overflow hidden
text-overflow ellipsis
white-space nowrap
ul > button
display block display block
margin 16px 0 padding 0 14px
padding 0 font-size 20px
list-style none line-height 42px
color var(--text)
&:first-child > .nav
margin-top 0
&:last-child > .me
margin-bottom 0
> li
display block
font-size 1em
line-height 1em
a, p
display block display block
margin 0 margin 0
padding 0 20px padding 16px
line-height 3rem
line-height calc(1rem + 30px)
color $color
text-decoration none
&[data-active] .avatar
color var(--primaryForeground) display inline
background var(--primary) max-width 64px
border-radius 32px
vertical-align middle
> i:last-child .name
color var(--primaryForeground) display block
margin 0 16px
> i:first-child
margin-right 0.5em
width 20px
text-align center
> i.circle
margin-left 6px
font-size 10px
color var(--notificationIndicator)
> i:last-child
position absolute position absolute
top 0 top 0
right 0 left 80px
padding 0 20px padding 0
font-size 1.2em width calc(100% - 112px)
line-height calc(1rem + 30px)
color $color color $color
opacity 0.5 line-height 96px
overflow hidden
text-overflow ellipsis
white-space nowrap
.announcements ul
> article display block
background var(--mobileAnnouncement) margin 16px 0
color var(--mobileAnnouncementFg) padding 0
padding 16px list-style none
margin 8px 0
font-size 12px
> .title &:first-child
font-weight bold margin-top 0
.about &:last-child
margin 0 0 8px 0 margin-bottom 0
padding 1em 0
text-align center > li
font-size 0.8em display block
color $color font-size 1em
opacity 0.5 line-height 1em
a, p
display block
margin 0
padding 0 20px
line-height 3rem
line-height calc(1rem + 30px)
color $color
text-decoration none
&[data-active]
color var(--primaryForeground)
background var(--primary)
> i:last-child
color var(--primaryForeground)
> i:first-child
margin-right 0.5em
width 20px
text-align center
> i.circle
margin-left 6px
font-size 10px
color var(--notificationIndicator)
> i:last-child
position absolute
top 0
right 0
padding 0 20px
font-size 1.2em
line-height calc(1rem + 30px)
color $color
opacity 0.5
.announcements
> article
background var(--mobileAnnouncement)
color var(--mobileAnnouncementFg)
padding 16px
margin 8px 0
font-size 12px
> .title
font-weight bold
.about
margin 0 0 8px 0
padding 1em 0
text-align center
font-size 0.8em
color $color
opacity 0.5
.nav-enter-active, .nav-enter-active,
.nav-leave-active { .nav-leave-active {

View file

@ -1,6 +1,6 @@
<template> <template>
<div class="mk-ui"> <div class="mk-ui" :class="{ deck: $store.state.device.inDeckMode }">
<x-header> <x-header v-if="!$store.state.device.inDeckMode">
<template #func><slot name="func"></slot></template> <template #func><slot name="func"></slot></template>
<slot name="header"></slot> <slot name="header"></slot>
</x-header> </x-header>
@ -9,6 +9,8 @@
<slot></slot> <slot></slot>
</div> </div>
<mk-stream-indicator v-if="$store.getters.isSignedIn"/> <mk-stream-indicator v-if="$store.getters.isSignedIn"/>
<button class="nav button" v-if="$store.state.device.inDeckMode" @click="isDrawerOpening = !isDrawerOpening"><fa icon="bars"/><i v-if="indicate"><fa icon="circle"/></i></button>
<button class="post button" v-if="$store.state.device.inDeckMode" @click="$post()"><fa icon="pencil-alt"/></button>
</div> </div>
</template> </template>
@ -28,11 +30,26 @@ export default Vue.extend({
data() { data() {
return { return {
hasGameInvitation: false,
isDrawerOpening: false, isDrawerOpening: false,
connection: null connection: null
}; };
}, },
computed: {
hasUnreadNotification(): boolean {
return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadNotification;
},
hasUnreadMessagingMessage(): boolean {
return this.$store.getters.isSignedIn && this.$store.state.i.hasUnreadMessagingMessage;
},
indicate(): boolean {
return this.hasUnreadNotification || this.hasUnreadMessagingMessage || this.hasGameInvitation;
}
},
watch: { watch: {
'$store.state.uiHeaderHeight'() { '$store.state.uiHeaderHeight'() {
this.$el.style.paddingTop = this.$store.state.uiHeaderHeight + 'px'; this.$el.style.paddingTop = this.$store.state.uiHeaderHeight + 'px';
@ -46,6 +63,8 @@ export default Vue.extend({
this.connection = this.$root.stream.useSharedConnection('main'); this.connection = this.$root.stream.useSharedConnection('main');
this.connection.on('notification', this.onNotification); this.connection.on('notification', this.onNotification);
this.connection.on('reversiInvited', this.onReversiInvited);
this.connection.on('reversiNoInvites', this.onReversiNoInvites);
} }
}, },
@ -65,6 +84,14 @@ export default Vue.extend({
this.$root.new(MkNotify, { this.$root.new(MkNotify, {
notification notification
}); });
},
onReversiInvited() {
this.hasGameInvitation = true;
},
onReversiNoInvites() {
this.hasGameInvitation = false;
} }
} }
}); });
@ -72,13 +99,37 @@ export default Vue.extend({
<style lang="stylus" scoped> <style lang="stylus" scoped>
.mk-ui .mk-ui
display flex &:not(.deck)
flex 1 padding-top 48px
flex-direction column
padding-top 48px > .button
position fixed
z-index 1000
bottom 28px
padding 0
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 24px
&.nav
left 28px
background var(--secondary)
color var(--text)
> i
position absolute
top 0
left 0
color var(--primary)
font-size 16px
&.post
right 28px
background var(--primary)
color var(--primaryForeground)
> .content
display flex
flex 1
flex-direction column
</style> </style>

View file

@ -1,41 +0,0 @@
<template>
<mk-ui>
<template #header><span style="margin-right:4px;"><fa :icon="['far', 'bell']"/></span>{{ $t('notifications') }}</template>
<template #func><button @click="fn"><fa icon="check"/></button></template>
<main>
<mk-notifications @fetched="onFetched"/>
</main>
</mk-ui>
</template>
<script lang="ts">
import Vue from 'vue';
import i18n from '../../../i18n';
import Progress from '../../../common/scripts/loading';
export default Vue.extend({
i18n: i18n('mobile/views/pages/notifications.vue'),
mounted() {
document.title = this.$t('notifications');
Progress.start();
},
methods: {
fn() {
this.$root.dialog({
type: 'warning',
text: this.$t('read-all'),
showCancelButton: true
}).then(({ canceled }) => {
if (canceled) return;
this.$root.api('notifications/mark_all_as_read');
});
},
onFetched() {
Progress.done();
}
}
});
</script>

View file

@ -60,6 +60,21 @@
<ui-radio v-model="mobileNotificationPosition" value="bottom">{{ $t('notification-position-bottom') }}</ui-radio> <ui-radio v-model="mobileNotificationPosition" value="bottom">{{ $t('notification-position-bottom') }}</ui-radio>
<ui-radio v-model="mobileNotificationPosition" value="top">{{ $t('notification-position-top') }}</ui-radio> <ui-radio v-model="mobileNotificationPosition" value="top">{{ $t('notification-position-top') }}</ui-radio>
</section> </section>
<section>
<header>{{ $t('@.deck-column-align') }}</header>
<ui-radio v-model="deckColumnAlign" value="center">{{ $t('@.deck-column-align-center') }}</ui-radio>
<ui-radio v-model="deckColumnAlign" value="left">{{ $t('@.deck-column-align-left') }}</ui-radio>
<ui-radio v-model="deckColumnAlign" value="flexible">{{ $t('@.deck-column-align-flexible') }}</ui-radio>
</section>
<section>
<header>{{ $t('@.deck-column-width') }}</header>
<ui-radio v-model="deckColumnWidth" value="narrow">{{ $t('@.deck-column-width-narrow') }}</ui-radio>
<ui-radio v-model="deckColumnWidth" value="narrower">{{ $t('@.deck-column-width-narrower') }}</ui-radio>
<ui-radio v-model="deckColumnWidth" value="normal">{{ $t('@.deck-column-width-normal') }}</ui-radio>
<ui-radio v-model="deckColumnWidth" value="wider">{{ $t('@.deck-column-width-wider') }}</ui-radio>
<ui-radio v-model="deckColumnWidth" value="wide">{{ $t('@.deck-column-width-wide') }}</ui-radio>
</section>
</ui-card> </ui-card>
<ui-card> <ui-card>
@ -244,6 +259,16 @@ export default Vue.extend({
set(value) { this.$store.commit('device/set', { key: 'enableSounds', value }); } set(value) { this.$store.commit('device/set', { key: 'enableSounds', value }); }
}, },
deckColumnAlign: {
get() { return this.$store.state.device.deckColumnAlign; },
set(value) { this.$store.commit('device/set', { key: 'deckColumnAlign', value }); }
},
deckColumnWidth: {
get() { return this.$store.state.device.deckColumnWidth; },
set(value) { this.$store.commit('device/set', { key: 'deckColumnWidth', value }); }
},
fetchOnScroll: { fetchOnScroll: {
get() { return this.$store.state.settings.fetchOnScroll; }, get() { return this.$store.state.settings.fetchOnScroll; },
set(value) { this.$store.dispatch('settings/set', { key: 'fetchOnScroll', value }); } set(value) { this.$store.dispatch('settings/set', { key: 'fetchOnScroll', value }); }

View file

@ -9,7 +9,6 @@ import getNoteSummary from '../../misc/get-note-summary';
const defaultSettings = { const defaultSettings = {
home: null, home: null,
mobileHome: [], mobileHome: [],
deck: null,
keepCw: false, keepCw: false,
tagTimelines: [], tagTimelines: [],
fetchOnScroll: true, fetchOnScroll: true,
@ -45,6 +44,10 @@ const defaultSettings = {
}; };
const defaultDeviceSettings = { const defaultDeviceSettings = {
deck: null,
deckMode: false,
deckColumnAlign: 'center',
deckColumnWidth: 'normal',
reduceMotion: false, reduceMotion: false,
autoPopout: false, autoPopout: false,
darkmode: false, darkmode: false,
@ -63,10 +66,7 @@ const defaultDeviceSettings = {
alwaysShowNsfw: false, alwaysShowNsfw: false,
postStyle: 'standard', postStyle: 'standard',
navbar: 'top', navbar: 'top',
deckColumnAlign: 'center',
deckColumnWidth: 'normal',
mobileNotificationPosition: 'bottom', mobileNotificationPosition: 'bottom',
deckMode: false,
useOsDefaultEmojis: false, useOsDefaultEmojis: false,
disableShowingAnimatedImages: false, disableShowingAnimatedImages: false,
expandUsersPhotos: true, expandUsersPhotos: true,
@ -162,73 +162,10 @@ export default (os: MiOS) => new Vuex.Store({
setVisibility(state, visibility) { setVisibility(state, visibility) {
state.visibility = visibility; state.visibility = visibility;
}
}
},
settings: {
namespaced: true,
state: defaultSettings,
mutations: {
set(state, x: { key: string; value: any }) {
nestedProperty.set(state, x.key, x.value);
},
setHome(state, data) {
state.home = data;
},
addHomeWidget(state, widget) {
state.home.unshift(widget);
},
setMobileHome(state, data) {
state.mobileHome = data;
},
setWidget(state, x) {
let w;
//#region Decktop home
if (state.home) {
w = state.home.find(w => w.id == x.id);
if (w) {
w.data = x.data;
}
}
//#endregion
//#region Mobile home
if (state.mobileHome) {
w = state.mobileHome.find(w => w.id == x.id);
if (w) {
w.data = x.data;
}
}
//#endregion
//#region Deck
if (state.deck && state.deck.columns) {
for (const c of state.deck.columns.filter(c => c.type == 'widgets')) {
for (const w of c.widgets.filter(w => w.id == x.id)) {
w.data = x.data;
}
}
}
//#endregion
},
addMobileHomeWidget(state, widget) {
state.mobileHome.unshift(widget);
},
removeMobileHomeWidget(state, widget) {
state.mobileHome = state.mobileHome.filter(w => w.id != widget.id);
}, },
addDeckColumn(state, column) { addDeckColumn(state, column) {
if (column.name == undefined) column.name = null;
state.deck.columns.push(column); state.deck.columns.push(column);
state.deck.layout.push([column.id]); state.deck.layout.push([column.id]);
}, },
@ -255,8 +192,11 @@ export default (os: MiOS) => new Vuex.Store({
if (ids.indexOf(id) != -1) { if (ids.indexOf(id) != -1) {
const left = state.deck.layout[i - 1]; const left = state.deck.layout[i - 1];
if (left) { if (left) {
state.deck.layout[i - 1] = state.deck.layout[i]; // https://vuejs.org/v2/guide/list.html#Caveats
state.deck.layout[i] = left; //state.deck.layout[i - 1] = state.deck.layout[i];
//state.deck.layout[i] = left;
state.deck.layout.splice(i - 1, 1, state.deck.layout[i]);
state.deck.layout.splice(i, 1, left);
} }
return true; return true;
} }
@ -268,8 +208,11 @@ export default (os: MiOS) => new Vuex.Store({
if (ids.indexOf(id) != -1) { if (ids.indexOf(id) != -1) {
const right = state.deck.layout[i + 1]; const right = state.deck.layout[i + 1];
if (right) { if (right) {
state.deck.layout[i + 1] = state.deck.layout[i]; // https://vuejs.org/v2/guide/list.html#Caveats
state.deck.layout[i] = right; //state.deck.layout[i + 1] = state.deck.layout[i];
//state.deck.layout[i] = right;
state.deck.layout.splice(i + 1, 1, state.deck.layout[i]);
state.deck.layout.splice(i, 1, right);
} }
return true; return true;
} }
@ -282,8 +225,11 @@ export default (os: MiOS) => new Vuex.Store({
if (x == id) { if (x == id) {
const up = ids[i - 1]; const up = ids[i - 1];
if (up) { if (up) {
ids[i - 1] = id; // https://vuejs.org/v2/guide/list.html#Caveats
ids[i] = up; //ids[i - 1] = id;
//ids[i] = up;
ids.splice(i - 1, 1, id);
ids.splice(i, 1, up);
} }
return true; return true;
} }
@ -296,8 +242,11 @@ export default (os: MiOS) => new Vuex.Store({
if (x == id) { if (x == id) {
const down = ids[i + 1]; const down = ids[i + 1];
if (down) { if (down) {
ids[i + 1] = id; // https://vuejs.org/v2/guide/list.html#Caveats
ids[i] = down; //ids[i + 1] = id;
//ids[i] = down;
ids.splice(i + 1, 1, id);
ids.splice(i, 1, down);
} }
return true; return true;
} }
@ -335,7 +284,67 @@ export default (os: MiOS) => new Vuex.Store({
const column = state.deck.columns.find(c => c.id == x.id); const column = state.deck.columns.find(c => c.id == x.id);
if (column == null) return; if (column == null) return;
column.name = x.name; column.name = x.name;
},
updateDeckColumn(state, x) {
let column = state.deck.columns.find(c => c.id == x.id);
if (column == null) return;
column = x;
} }
}
},
settings: {
namespaced: true,
state: defaultSettings,
mutations: {
set(state, x: { key: string; value: any }) {
nestedProperty.set(state, x.key, x.value);
},
setHome(state, data) {
state.home = data;
},
addHomeWidget(state, widget) {
state.home.unshift(widget);
},
setMobileHome(state, data) {
state.mobileHome = data;
},
updateWidget(state, x) {
let w;
//#region Desktop home
if (state.home) {
w = state.home.find(w => w.id == x.id);
if (w) {
w.data = x.data;
}
}
//#endregion
//#region Mobile home
if (state.mobileHome) {
w = state.mobileHome.find(w => w.id == x.id);
if (w) {
w.data = x.data;
}
}
//#endregion
},
addMobileHomeWidget(state, widget) {
state.mobileHome.unshift(widget);
},
removeMobileHomeWidget(state, widget) {
state.mobileHome = state.mobileHome.filter(w => w.id != widget.id);
},
}, },
actions: { actions: {
@ -357,73 +366,6 @@ export default (os: MiOS) => new Vuex.Store({
} }
}, },
saveDeck(ctx) {
os.api('i/update_client_setting', {
name: 'deck',
value: ctx.state.deck
});
},
addDeckColumn(ctx, column) {
ctx.commit('addDeckColumn', column);
ctx.dispatch('saveDeck');
},
removeDeckColumn(ctx, id) {
ctx.commit('removeDeckColumn', id);
ctx.dispatch('saveDeck');
},
swapDeckColumn(ctx, id) {
ctx.commit('swapDeckColumn', id);
ctx.dispatch('saveDeck');
},
swapLeftDeckColumn(ctx, id) {
ctx.commit('swapLeftDeckColumn', id);
ctx.dispatch('saveDeck');
},
swapRightDeckColumn(ctx, id) {
ctx.commit('swapRightDeckColumn', id);
ctx.dispatch('saveDeck');
},
swapUpDeckColumn(ctx, id) {
ctx.commit('swapUpDeckColumn', id);
ctx.dispatch('saveDeck');
},
swapDownDeckColumn(ctx, id) {
ctx.commit('swapDownDeckColumn', id);
ctx.dispatch('saveDeck');
},
stackLeftDeckColumn(ctx, id) {
ctx.commit('stackLeftDeckColumn', id);
ctx.dispatch('saveDeck');
},
popRightDeckColumn(ctx, id) {
ctx.commit('popRightDeckColumn', id);
ctx.dispatch('saveDeck');
},
addDeckWidget(ctx, x) {
ctx.commit('addDeckWidget', x);
ctx.dispatch('saveDeck');
},
removeDeckWidget(ctx, x) {
ctx.commit('removeDeckWidget', x);
ctx.dispatch('saveDeck');
},
renameDeckColumn(ctx, x) {
ctx.commit('renameDeckColumn', x);
ctx.dispatch('saveDeck');
},
addHomeWidget(ctx, widget) { addHomeWidget(ctx, widget) {
ctx.commit('addHomeWidget', widget); ctx.commit('addHomeWidget', widget);