diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-03-01 10:42:28 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-03-01 10:42:28 +0900 |
| commit | ea1818284ba228dbdc6323877ca67cf293e706a8 (patch) | |
| tree | ed9c1237520a8cdcc6fe9f28600b7341ed75dc23 /src/client/app/common/views/components | |
| parent | 文字サイズを設定できるように (diff) | |
| download | misskey-ea1818284ba228dbdc6323877ca67cf293e706a8.tar.gz misskey-ea1818284ba228dbdc6323877ca67cf293e706a8.tar.bz2 misskey-ea1818284ba228dbdc6323877ca67cf293e706a8.zip | |
クライアントの設定コンポーネントを整理
* デスクトップとモバイルで統一
* いくつかの設定を廃止
Diffstat (limited to 'src/client/app/common/views/components')
15 files changed, 870 insertions, 15 deletions
diff --git a/src/client/app/common/views/components/settings/2fa.vue b/src/client/app/common/views/components/settings/2fa.vue new file mode 100644 index 0000000000..07a1493151 --- /dev/null +++ b/src/client/app/common/views/components/settings/2fa.vue @@ -0,0 +1,82 @@ +<template> +<div class="2fa"> + <p style="margin-top:0;">{{ $t('intro') }}<a :href="$t('url')" target="_blank">{{ $t('detail') }}</a></p> + <ui-info warn>{{ $t('caution') }}</ui-info> + <p v-if="!data && !$store.state.i.twoFactorEnabled"><ui-button @click="register">{{ $t('register') }}</ui-button></p> + <template v-if="$store.state.i.twoFactorEnabled"> + <p>{{ $t('already-registered') }}</p> + <ui-button @click="unregister">{{ $t('unregister') }}</ui-button> + </template> + <div v-if="data && !$store.state.i.twoFactorEnabled"> + <ol> + <li>{{ $t('authenticator') }}<a href="https://support.google.com/accounts/answer/1066447" target="_blank">{{ $t('howtoinstall') }}</a></li> + <li>{{ $t('scan') }}<br><img :src="data.qr"></li> + <li>{{ $t('done') }}<br> + <ui-input v-model="token">{{ $t('token') }}</ui-input> + <ui-button primary @click="submit">{{ $t('submit') }}</ui-button> + </li> + </ol> + <ui-info>{{ $t('info') }}</ui-info> + </div> +</div> +</template> + +<script lang="ts"> +import Vue from 'vue'; +import i18n from '../../../../i18n'; + +export default Vue.extend({ + i18n: i18n('desktop/views/components/settings.2fa.vue'), + data() { + return { + data: null, + token: null + }; + }, + methods: { + register() { + this.$root.dialog({ + title: this.$t('enter-password'), + input: { + type: 'password' + } + }).then(({ canceled, result: password }) => { + if (canceled) return; + this.$root.api('i/2fa/register', { + password: password + }).then(data => { + this.data = data; + }); + }); + }, + + unregister() { + this.$root.dialog({ + title: this.$t('enter-password'), + input: { + type: 'password' + } + }).then(({ canceled, result: password }) => { + if (canceled) return; + this.$root.api('i/2fa/unregister', { + password: password + }).then(() => { + this.$notify(this.$t('unregistered')); + this.$store.state.i.twoFactorEnabled = false; + }); + }); + }, + + submit() { + this.$root.api('i/2fa/done', { + token: this.token + }).then(() => { + this.$notify(this.$t('success')); + this.$store.state.i.twoFactorEnabled = true; + }).catch(() => { + this.$notify(this.$t('failed')); + }); + } + } +}); +</script> diff --git a/src/client/app/common/views/components/api-settings.vue b/src/client/app/common/views/components/settings/api.vue index 8877e1f3cb..4f1b755857 100644 --- a/src/client/app/common/views/components/api-settings.vue +++ b/src/client/app/common/views/components/settings/api.vue @@ -34,7 +34,7 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; +import i18n from '../../../../i18n'; import * as JSON5 from 'json5'; export default Vue.extend({ diff --git a/src/client/app/common/views/components/settings/apps.vue b/src/client/app/common/views/components/settings/apps.vue new file mode 100644 index 0000000000..c5beaa1fe2 --- /dev/null +++ b/src/client/app/common/views/components/settings/apps.vue @@ -0,0 +1,39 @@ +<template> +<div class="root"> + <ui-info v-if="!fetching && apps.length == 0">{{ $t('no-apps') }}</ui-info> + <div class="apps" v-if="apps.length != 0"> + <div v-for="app in apps"> + <p><b>{{ app.name }}</b></p> + <p>{{ app.description }}</p> + </div> + </div> +</div> +</template> + +<script lang="ts"> +import Vue from 'vue'; +import i18n from '../../../../i18n'; +export default Vue.extend({ + i18n: i18n('desktop/views/components/settings.apps.vue'), + data() { + return { + fetching: true, + apps: [] + }; + }, + mounted() { + this.$root.api('i/authorized_apps').then(apps => { + this.apps = apps; + this.fetching = false; + }); + } +}); +</script> + +<style lang="stylus" scoped> +.root + > .apps + > div + padding 16px 0 0 0 + border-bottom solid 1px #eee +</style> diff --git a/src/client/app/common/views/components/drive-settings.vue b/src/client/app/common/views/components/settings/drive.vue index 0541c2b3d2..850f95d3f4 100644 --- a/src/client/app/common/views/components/drive-settings.vue +++ b/src/client/app/common/views/components/settings/drive.vue @@ -16,7 +16,7 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; +import i18n from '../../../../i18n'; import * as tinycolor from 'tinycolor2'; import ApexCharts from 'apexcharts'; diff --git a/src/client/app/common/views/components/integration-settings.vue b/src/client/app/common/views/components/settings/integration.vue index 8862fa86d5..b91880679f 100644 --- a/src/client/app/common/views/components/integration-settings.vue +++ b/src/client/app/common/views/components/settings/integration.vue @@ -27,8 +27,8 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; -import { apiUrl } from '../../../config'; +import i18n from '../../../../i18n'; +import { apiUrl } from '../../../../config'; export default Vue.extend({ i18n: i18n('common/views/components/integration-settings.vue'), diff --git a/src/client/app/common/views/components/language-settings.vue b/src/client/app/common/views/components/settings/language.vue index 0d9a5e1608..f81775f09b 100644 --- a/src/client/app/common/views/components/language-settings.vue +++ b/src/client/app/common/views/components/settings/language.vue @@ -20,8 +20,8 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; -import { langs } from '../../../config'; +import i18n from '../../../../i18n'; +import { langs } from '../../../../config'; export default Vue.extend({ i18n: i18n('common/views/components/language-settings.vue'), diff --git a/src/client/app/common/views/components/mute-and-block.vue b/src/client/app/common/views/components/settings/mute-and-block.vue index 4a7f5be67d..33b19582b7 100644 --- a/src/client/app/common/views/components/mute-and-block.vue +++ b/src/client/app/common/views/components/settings/mute-and-block.vue @@ -34,7 +34,7 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; +import i18n from '../../../../i18n'; export default Vue.extend({ i18n: i18n('common/views/components/mute-and-block.vue'), diff --git a/src/client/app/common/views/components/notification-settings.vue b/src/client/app/common/views/components/settings/notification.vue index fe7475027e..b689544d69 100644 --- a/src/client/app/common/views/components/notification-settings.vue +++ b/src/client/app/common/views/components/settings/notification.vue @@ -16,7 +16,7 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; +import i18n from '../../../../i18n'; export default Vue.extend({ i18n: i18n('common/views/components/notification-settings.vue'), diff --git a/src/client/app/common/views/components/password-settings.vue b/src/client/app/common/views/components/settings/password.vue index eb511d6213..c867561518 100644 --- a/src/client/app/common/views/components/password-settings.vue +++ b/src/client/app/common/views/components/settings/password.vue @@ -6,7 +6,7 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; +import i18n from '../../../../i18n'; export default Vue.extend({ i18n: i18n('common/views/components/password-settings.vue'), diff --git a/src/client/app/common/views/components/profile-editor.vue b/src/client/app/common/views/components/settings/profile.vue index 91f6e91b33..61d273cfaf 100644 --- a/src/client/app/common/views/components/profile-editor.vue +++ b/src/client/app/common/views/components/settings/profile.vue @@ -61,7 +61,7 @@ <div> <ui-switch v-model="isCat" @change="save(false)">{{ $t('is-cat') }}</ui-switch> <ui-switch v-model="isBot" @change="save(false)">{{ $t('is-bot') }}</ui-switch> - <ui-switch v-model="alwaysMarkNsfw">{{ $t('@.always-mark-nsfw') }}</ui-switch> + <ui-switch v-model="alwaysMarkNsfw">{{ $t('@._settings.always-mark-nsfw') }}</ui-switch> </div> </section> @@ -113,11 +113,11 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; -import { apiUrl, host } from '../../../config'; +import i18n from '../../../../i18n'; +import { apiUrl, host } from '../../../../config'; import { toUnicode } from 'punycode'; import langmap from 'langmap'; -import { unique } from '../../../../../prelude/array'; +import { unique } from '../../../../../../prelude/array'; import { faDownload } from '@fortawesome/free-solid-svg-icons'; export default Vue.extend({ diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue new file mode 100644 index 0000000000..87b93574a5 --- /dev/null +++ b/src/client/app/common/views/components/settings/settings.vue @@ -0,0 +1,565 @@ +<template> +<div class="nqfhvmnl"> + <template v-if="page == null || page == 'profile'"> + <x-profile/> + <x-integration/> + </template> + + <template v-if="page == null || page == 'appearance'"> + <x-theme/> + + <ui-card> + <template #title><fa icon="desktop"/> {{ $t('@._settings.appearance') }}</template> + + <section v-if="!$root.isMobile"> + <ui-switch v-model="showPostFormOnTopOfTl">{{ $t('@._settings.post-form-on-timeline') }}</ui-switch> + <ui-button @click="customizeHome">{{ $t('@.customize-home') }}</ui-button> + </section> + <section v-if="!$root.isMobile"> + <header>{{ $t('@._settings.wallpaper') }}</header> + <ui-horizon-group class="fit-bottom"> + <ui-button @click="updateWallpaper">{{ $t('@._settings.choose-wallpaper') }}</ui-button> + <ui-button @click="deleteWallpaper">{{ $t('@._settings.delete-wallpaper') }}</ui-button> + </ui-horizon-group> + </section> + <section v-if="!$root.isMobile"> + <header>{{ $t('@._settings.navbar-position') }}</header> + <ui-radio v-model="navbar" value="top">{{ $t('@._settings.navbar-position-top') }}</ui-radio> + <ui-radio v-model="navbar" value="left">{{ $t('@._settings.navbar-position-left') }}</ui-radio> + <ui-radio v-model="navbar" value="right">{{ $t('@._settings.navbar-position-right') }}</ui-radio> + </section> + <section> + <ui-switch v-model="darkmode">{{ $t('@.dark-mode') }}</ui-switch> + <ui-switch v-model="useShadow">{{ $t('@._settings.use-shadow') }}</ui-switch> + <ui-switch v-model="roundedCorners">{{ $t('@._settings.rounded-corners') }}</ui-switch> + <ui-switch v-model="circleIcons">{{ $t('@._settings.circle-icons') }}</ui-switch> + <ui-switch v-model="reduceMotion">{{ $t('@._settings.reduce-motion') }}</ui-switch> + <ui-switch v-model="contrastedAcct">{{ $t('@._settings.contrasted-acct') }}</ui-switch> + <ui-switch v-model="showFullAcct">{{ $t('@._settings.show-full-acct') }}</ui-switch> + <ui-switch v-model="showVia">{{ $t('@._settings.show-via') }}</ui-switch> + <ui-switch v-model="useOsDefaultEmojis">{{ $t('@._settings.use-os-default-emojis') }}</ui-switch> + <ui-switch v-model="iLikeSushi">{{ $t('@._settings.i-like-sushi') }}</ui-switch> + </section> + <section> + <ui-switch v-model="suggestRecentHashtags">{{ $t('@._settings.suggest-recent-hashtags') }}</ui-switch> + <ui-switch v-model="showClockOnHeader" v-if="!$root.isMobile">{{ $t('@._settings.show-clock-on-header') }}</ui-switch> + <ui-switch v-model="alwaysShowNsfw">{{ $t('@._settings.always-show-nsfw') }}</ui-switch> + <ui-switch v-model="showReplyTarget">{{ $t('@._settings.show-reply-target') }}</ui-switch> + <ui-switch v-model="disableAnimatedMfm">{{ $t('@._settings.disable-animated-mfm') }}</ui-switch> + <ui-switch v-model="disableShowingAnimatedImages">{{ $t('@._settings.disable-showing-animated-images') }}</ui-switch> + <ui-switch v-model="remainDeletedNote">{{ $t('@._settings.remain-deleted-note') }}</ui-switch> + </section> + <section> + <header>{{ $t('@._settings.line-width') }}</header> + <ui-radio v-model="lineWidth" :value="0.5">{{ $t('@._settings.line-width-thin') }}</ui-radio> + <ui-radio v-model="lineWidth" :value="1">{{ $t('@._settings.line-width-normal') }}</ui-radio> + <ui-radio v-model="lineWidth" :value="2">{{ $t('@._settings.line-width-thick') }}</ui-radio> + </section> + <section> + <header>{{ $t('@._settings.font-size') }}</header> + <ui-radio v-model="fontSize" :value="-2">{{ $t('@._settings.font-size-x-small') }}</ui-radio> + <ui-radio v-model="fontSize" :value="-1">{{ $t('@._settings.font-size-small') }}</ui-radio> + <ui-radio v-model="fontSize" :value="0">{{ $t('@._settings.font-size-medium') }}</ui-radio> + <ui-radio v-model="fontSize" :value="1">{{ $t('@._settings.font-size-large') }}</ui-radio> + <ui-radio v-model="fontSize" :value="2">{{ $t('@._settings.font-size-x-large') }}</ui-radio> + </section> + <section v-if="$root.isMobile"> + <header>{{ $t('@._settings.post-style') }}</header> + <ui-radio v-model="postStyle" value="standard">{{ $t('@._settings.post-style-standard') }}</ui-radio> + <ui-radio v-model="postStyle" value="smart">{{ $t('@._settings.post-style-smart') }}</ui-radio> + </section> + <section v-if="$root.isMobile"> + <header>{{ $t('@._settings.notification-position') }}</header> + <ui-radio v-model="mobileNotificationPosition" value="bottom">{{ $t('@._settings.notification-position-bottom') }}</ui-radio> + <ui-radio v-model="mobileNotificationPosition" value="top">{{ $t('@._settings.notification-position-top') }}</ui-radio> + </section> + <section> + <header>{{ $t('@._settings.deck-column-align') }}</header> + <ui-radio v-model="deckColumnAlign" value="center">{{ $t('@._settings.deck-column-align-center') }}</ui-radio> + <ui-radio v-model="deckColumnAlign" value="left">{{ $t('@._settings.deck-column-align-left') }}</ui-radio> + <ui-radio v-model="deckColumnAlign" value="flexible">{{ $t('@._settings.deck-column-align-flexible') }}</ui-radio> + </section> + <section> + <header>{{ $t('@._settings.deck-column-width') }}</header> + <ui-radio v-model="deckColumnWidth" value="narrow">{{ $t('@._settings.deck-column-width-narrow') }}</ui-radio> + <ui-radio v-model="deckColumnWidth" value="narrower">{{ $t('@._settings.deck-column-width-narrower') }}</ui-radio> + <ui-radio v-model="deckColumnWidth" value="normal">{{ $t('@._settings.deck-column-width-normal') }}</ui-radio> + <ui-radio v-model="deckColumnWidth" value="wider">{{ $t('@._settings.deck-column-width-wider') }}</ui-radio> + <ui-radio v-model="deckColumnWidth" value="wide">{{ $t('@._settings.deck-column-width-wide') }}</ui-radio> + </section> + <section> + <ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@._settings.show-reversi-board-labels') }}</ui-switch> + <ui-switch v-model="games_reversi_useAvatarStones">{{ $t('@._settings.use-avatar-reversi-stones') }}</ui-switch> + </section> + </ui-card> + </template> + + <template v-if="page == null || page == 'behavior'"> + <ui-card> + <template #title><fa icon="sliders-h"/> {{ $t('@._settings.behavior') }}</template> + + <section> + <ui-switch v-model="fetchOnScroll">{{ $t('@._settings.fetch-on-scroll') }} + <template #desc>{{ $t('@._settings.fetch-on-scroll-desc') }}</template> + </ui-switch> + <ui-switch v-model="keepCw">{{ $t('@._settings.keep-cw') }} + <template #desc>{{ $t('@._settings.keep-cw-desc') }}</template> + </ui-switch> + <ui-switch v-if="$root.isMobile" v-model="disableViaMobile">{{ $t('@._settings.disable-via-mobile') }}</ui-switch> + </section> + + <section> + <header>{{ $t('@._settings.timeline') }}</header> + <ui-switch v-model="showMyRenotes">{{ $t('@._settings.show-my-renotes') }}</ui-switch> + <ui-switch v-model="showRenotedMyNotes">{{ $t('@._settings.show-renoted-my-notes') }}</ui-switch> + <ui-switch v-model="showLocalRenotes">{{ $t('@._settings.show-local-renotes') }}</ui-switch> + </section> + + <section> + <header>{{ $t('@._settings.note-visibility') }}</header> + <ui-switch v-model="rememberNoteVisibility">{{ $t('@._settings.remember-note-visibility') }}</ui-switch> + <section> + <header>{{ $t('@._settings.default-note-visibility') }}</header> + <ui-select v-model="defaultNoteVisibility"> + <option value="public">{{ $t('@.note-visibility.public') }}</option> + <option value="home">{{ $t('@.note-visibility.home') }}</option> + <option value="followers">{{ $t('@.note-visibility.followers') }}</option> + <option value="specified">{{ $t('@.note-visibility.specified') }}</option> + <option value="local-public">{{ $t('@.note-visibility.local-public') }}</option> + <option value="local-home">{{ $t('@.note-visibility.local-home') }}</option> + <option value="local-followers">{{ $t('@.note-visibility.local-followers') }}</option> + </ui-select> + </section> + </section> + + <section> + <header>{{ $t('@._settings.web-search-engine') }}</header> + <ui-input v-model="webSearchEngine">{{ $t('@._settings.web-search-engine') }}<template #desc>{{ $t('@._settings.web-search-engine-desc') }}</template></ui-input> + </section> + </ui-card> + + <ui-card> + <template #title><fa icon="volume-up"/> {{ $t('@._settings.sound') }}</template> + + <section> + <ui-switch v-model="enableSounds">{{ $t('@._settings.enable-sounds') }} + <template #desc>{{ $t('@._settings.enable-sounds-desc') }}</template> + </ui-switch> + <label>{{ $t('@._settings.volume') }}</label> + <input type="range" + v-model="soundVolume" + :disabled="!enableSounds" + max="1" + step="0.1" + /> + <ui-button @click="soundTest"><fa icon="volume-up"/> {{ $t('@._settings.test') }}</ui-button> + </section> + </ui-card> + + <x-language/> + </template> + + <template v-if="page == null || page == 'notification'"> + <x-notification v-show="page == 'notification'"/> + </template> + + <template v-if="page == null || page == 'drive'"> + <x-drive/> + </template> + + <template v-if="page == null || page == 'hashtags'"> + <ui-card> + <template #title><fa icon="hashtag"/> {{ $t('@._settings.tags') }}</template> + <section> + <x-tags/> + </section> + </ui-card> + </template> + + <template v-if="page == null || page == 'muteAndBlock'"> + <x-mute-and-block/> + </template> + + <template v-if="page == null || page == 'apps'"> + <ui-card> + <template #title><fa icon="puzzle-piece"/> {{ $t('@._settings.apps') }}</template> + <section> + <x-apps/> + </section> + </ui-card> + </template> + + <template v-if="page == null || page == 'security'"> + <ui-card> + <template #title><fa icon="unlock-alt"/> {{ $t('@._settings.password') }}</template> + <section> + <x-password/> + </section> + </ui-card> + + <ui-card v-if="!$root.isMobile"> + <template #title><fa icon="mobile-alt"/> {{ $t('@.2fa') }}</template> + <section> + <x-2fa/> + </section> + </ui-card> + + <ui-card> + <template #title><fa icon="sign-in-alt"/> {{ $t('@._settings.signin') }}</template> + <section> + <x-signins/> + </section> + </ui-card> + </template> + + <template v-if="page == null || page == 'api'"> + <x-api/> + </template> + + <template v-if="page == null || page == 'other'"> + <ui-card> + <template #title><fa icon="sync-alt"/> {{ $t('@._settings.update') }}</template> + <section> + <p> + <span>{{ $t('@._settings.version') }} <i>{{ version }}</i></span> + <template v-if="latestVersion !== undefined"> + <br> + <span>{{ $t('@._settings.latest-version') }} <i>{{ latestVersion ? latestVersion : version }}</i></span> + </template> + </p> + <ui-button @click="checkForUpdate" :disabled="checkingForUpdate"> + <template v-if="checkingForUpdate">{{ $t('@._settings.update-checking') }}<mk-ellipsis/></template> + <template v-else>{{ $t('@._settings.do-update') }}</template> + </ui-button> + </section> + </ui-card> + + <ui-card> + <template #title><fa icon="cogs"/> {{ $t('@._settings.advanced-settings') }}</template> + <section> + <ui-switch v-model="debug"> + {{ $t('@._settings.debug-mode') }}<template #desc>{{ $t('@._settings.debug-mode-desc') }}</template> + </ui-switch> + </section> + </ui-card> + </template> +</div> +</template> + +<script lang="ts"> +import Vue from 'vue'; +import i18n from '../../../../i18n'; +import X2fa from './2fa.vue'; +import XApps from './apps.vue'; +import XSignins from './signins.vue'; +import XTags from './tags.vue'; +import XIntegration from './integration.vue'; +import XTheme from './theme.vue'; +import XDrive from './drive.vue'; +import XMuteAndBlock from './mute-and-block.vue'; +import XPassword from './password.vue'; +import XProfile from './profile.vue'; +import XApi from './api.vue'; +import XLanguage from './language.vue'; +import XNotification from './notification.vue'; + +import { url, version } from '../../../../config'; +import checkForUpdate from '../../../scripts/check-for-update'; + +export default Vue.extend({ + i18n: i18n(), + components: { + X2fa, + XApps, + XSignins, + XTags, + XIntegration, + XTheme, + XDrive, + XMuteAndBlock, + XPassword, + XProfile, + XApi, + XLanguage, + XNotification, + }, + props: { + page: { + type: String, + required: false, + default: null + } + }, + data() { + return { + meta: null, + version, + latestVersion: undefined, + checkingForUpdate: false + }; + }, + computed: { + useOsDefaultEmojis: { + get() { return this.$store.state.device.useOsDefaultEmojis; }, + set(value) { this.$store.commit('device/set', { key: 'useOsDefaultEmojis', value }); } + }, + + reduceMotion: { + get() { return this.$store.state.device.reduceMotion; }, + set(value) { this.$store.commit('device/set', { key: 'reduceMotion', value }); } + }, + + keepCw: { + get() { return this.$store.state.settings.keepCw; }, + set(value) { this.$store.commit('settings/set', { key: 'keepCw', value }); } + }, + + darkmode: { + get() { return this.$store.state.device.darkmode; }, + set(value) { this.$store.commit('device/set', { key: 'darkmode', value }); } + }, + + navbar: { + get() { return this.$store.state.device.navbar; }, + set(value) { this.$store.commit('device/set', { key: 'navbar', 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 }); } + }, + + enableSounds: { + get() { return this.$store.state.device.enableSounds; }, + set(value) { this.$store.commit('device/set', { key: 'enableSounds', value }); } + }, + + soundVolume: { + get() { return this.$store.state.device.soundVolume; }, + set(value) { this.$store.commit('device/set', { key: 'soundVolume', value }); } + }, + + debug: { + get() { return this.$store.state.device.debug; }, + set(value) { this.$store.commit('device/set', { key: 'debug', value }); } + }, + + alwaysShowNsfw: { + get() { return this.$store.state.device.alwaysShowNsfw; }, + set(value) { this.$store.commit('device/set', { key: 'alwaysShowNsfw', value }); } + }, + + postStyle: { + get() { return this.$store.state.device.postStyle; }, + set(value) { this.$store.commit('device/set', { key: 'postStyle', value }); } + }, + + disableViaMobile: { + get() { return this.$store.state.settings.disableViaMobile; }, + set(value) { this.$store.dispatch('settings/set', { key: 'disableViaMobile', value }); } + }, + + useShadow: { + get() { return this.$store.state.device.useShadow; }, + set(value) { this.$store.commit('device/set', { key: 'useShadow', value }); } + }, + + roundedCorners: { + get() { return this.$store.state.device.roundedCorners; }, + set(value) { this.$store.commit('device/set', { key: 'roundedCorners', value }); } + }, + + lineWidth: { + get() { return this.$store.state.device.lineWidth; }, + set(value) { this.$store.commit('device/set', { key: 'lineWidth', value }); } + }, + + fontSize: { + get() { return this.$store.state.device.fontSize; }, + set(value) { this.$store.commit('device/set', { key: 'fontSize', value }); } + }, + + fetchOnScroll: { + get() { return this.$store.state.settings.fetchOnScroll; }, + set(value) { this.$store.dispatch('settings/set', { key: 'fetchOnScroll', value }); } + }, + + rememberNoteVisibility: { + get() { return this.$store.state.settings.rememberNoteVisibility; }, + set(value) { this.$store.dispatch('settings/set', { key: 'rememberNoteVisibility', value }); } + }, + + defaultNoteVisibility: { + get() { return this.$store.state.settings.defaultNoteVisibility; }, + set(value) { this.$store.dispatch('settings/set', { key: 'defaultNoteVisibility', value }); } + }, + + webSearchEngine: { + get() { return this.$store.state.settings.webSearchEngine; }, + set(value) { this.$store.dispatch('settings/set', { key: 'webSearchEngine', value }); } + }, + + showReplyTarget: { + get() { return this.$store.state.settings.showReplyTarget; }, + set(value) { this.$store.dispatch('settings/set', { key: 'showReplyTarget', value }); } + }, + + showMyRenotes: { + get() { return this.$store.state.settings.showMyRenotes; }, + set(value) { this.$store.dispatch('settings/set', { key: 'showMyRenotes', value }); } + }, + + showRenotedMyNotes: { + get() { return this.$store.state.settings.showRenotedMyNotes; }, + set(value) { this.$store.dispatch('settings/set', { key: 'showRenotedMyNotes', value }); } + }, + + showLocalRenotes: { + get() { return this.$store.state.settings.showLocalRenotes; }, + set(value) { this.$store.dispatch('settings/set', { key: 'showLocalRenotes', value }); } + }, + + showPostFormOnTopOfTl: { + get() { return this.$store.state.settings.showPostFormOnTopOfTl; }, + set(value) { this.$store.dispatch('settings/set', { key: 'showPostFormOnTopOfTl', value }); } + }, + + suggestRecentHashtags: { + get() { return this.$store.state.settings.suggestRecentHashtags; }, + set(value) { this.$store.dispatch('settings/set', { key: 'suggestRecentHashtags', value }); } + }, + + showClockOnHeader: { + get() { return this.$store.state.settings.showClockOnHeader; }, + set(value) { this.$store.dispatch('settings/set', { key: 'showClockOnHeader', value }); } + }, + + circleIcons: { + get() { return this.$store.state.settings.circleIcons; }, + set(value) { + this.$store.dispatch('settings/set', { key: 'circleIcons', value }); + this.reload(); + } + }, + + contrastedAcct: { + get() { return this.$store.state.settings.contrastedAcct; }, + set(value) { + this.$store.dispatch('settings/set', { key: 'contrastedAcct', value }); + this.reload(); + } + }, + + showFullAcct: { + get() { return this.$store.state.settings.showFullAcct; }, + set(value) { + this.$store.dispatch('settings/set', { key: 'showFullAcct', value }); + this.reload(); + } + }, + + showVia: { + get() { return this.$store.state.settings.showVia; }, + set(value) { this.$store.dispatch('settings/set', { key: 'showVia', value }); } + }, + + iLikeSushi: { + get() { return this.$store.state.settings.iLikeSushi; }, + set(value) { this.$store.dispatch('settings/set', { key: 'iLikeSushi', value }); } + }, + + games_reversi_showBoardLabels: { + get() { return this.$store.state.settings.games.reversi.showBoardLabels; }, + set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.showBoardLabels', value }); } + }, + + games_reversi_useAvatarStones: { + get() { return this.$store.state.settings.games.reversi.useAvatarStones; }, + set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useAvatarStones', value }); } + }, + + disableAnimatedMfm: { + get() { return this.$store.state.settings.disableAnimatedMfm; }, + set(value) { this.$store.dispatch('settings/set', { key: 'disableAnimatedMfm', value }); } + }, + + disableShowingAnimatedImages: { + get() { return this.$store.state.device.disableShowingAnimatedImages; }, + set(value) { this.$store.commit('device/set', { key: 'disableShowingAnimatedImages', value }); } + }, + + remainDeletedNote: { + get() { return this.$store.state.settings.remainDeletedNote; }, + set(value) { this.$store.dispatch('settings/set', { key: 'remainDeletedNote', value }); } + }, + + mobileNotificationPosition: { + get() { return this.$store.state.device.mobileNotificationPosition; }, + set(value) { this.$store.commit('device/set', { key: 'mobileNotificationPosition', value }); } + }, + }, + created() { + this.$root.getMeta().then(meta => { + this.meta = meta; + }); + }, + methods: { + reload() { + this.$root.dialog({ + type: 'warning', + text: this.$t('@.reload-to-apply-the-setting'), + showCancelButton: true + }).then(({ canceled }) => { + if (!canceled) { + location.reload(); + } + }); + }, + customizeHome() { + location.href = '/?customize'; + }, + updateWallpaper() { + this.$chooseDriveFile({ + multiple: false + }).then(file => { + this.$root.api('i/update', { + wallpaperId: file.id + }); + }); + }, + deleteWallpaper() { + this.$root.api('i/update', { + wallpaperId: null + }); + }, + checkForUpdate() { + this.checkingForUpdate = true; + checkForUpdate(this.$root, true, true).then(newer => { + this.checkingForUpdate = false; + this.latestVersion = newer; + if (newer == null) { + this.$root.dialog({ + title: this.$t('no-updates'), + text: this.$t('no-updates-desc') + }); + } else { + this.$root.dialog({ + title: this.$t('update-available'), + text: this.$t('update-available-desc') + }); + } + }); + }, + soundTest() { + const sound = new Audio(`${url}/assets/message.mp3`); + sound.volume = this.$store.state.device.soundVolume; + sound.play(); + } + } +}); +</script> diff --git a/src/client/app/common/views/components/settings/signins.vue b/src/client/app/common/views/components/settings/signins.vue new file mode 100644 index 0000000000..048fa2fc5b --- /dev/null +++ b/src/client/app/common/views/components/settings/signins.vue @@ -0,0 +1,98 @@ +<template> +<div class="root"> +<div class="signins" v-if="signins.length != 0"> + <div v-for="signin in signins"> + <header @click="signin._show = !signin._show"> + <template v-if="signin.success"><fa icon="check"/></template> + <template v-else><fa icon="times"/></template> + <span class="ip">{{ signin.ip }}</span> + <mk-time :time="signin.createdAt"/> + </header> + <div class="headers" v-show="signin._show"> + <!-- TODO --> + </div> + </div> +</div> +</div> +</template> + +<script lang="ts"> +import Vue from 'vue'; +export default Vue.extend({ + data() { + return { + fetching: true, + signins: [], + connection: null + }; + }, + + mounted() { + this.$root.api('i/signin_history').then(signins => { + this.signins = signins; + this.fetching = false; + }); + + this.connection = this.$root.stream.useSharedConnection('main'); + + this.connection.on('signin', this.onSignin); + }, + + beforeDestroy() { + this.connection.dispose(); + }, + + methods: { + onSignin(signin) { + this.signins.unshift(signin); + } + } +}); +</script> + +<style lang="stylus" scoped> +.root + > .signins + > div + border-bottom solid 1px #eee + + > header + display flex + padding 8px 0 + line-height 32px + cursor pointer + + > [data-icon] + margin-right 8px + text-align left + + &.check + color #0fda82 + + &.times + color #ff3100 + + > .ip + display inline-block + text-align left + padding 8px + line-height 16px + font-family monospace + font-size 14px + color #444 + background #f8f8f8 + border-radius 4px + + > .mk-time + margin-left auto + text-align right + color #777 + + > .headers + overflow auto + margin 0 0 16px 0 + max-height 100px + white-space pre-wrap + word-break break-all + +</style> diff --git a/src/client/app/common/views/components/settings/tags.vue b/src/client/app/common/views/components/settings/tags.vue new file mode 100644 index 0000000000..05034c9461 --- /dev/null +++ b/src/client/app/common/views/components/settings/tags.vue @@ -0,0 +1,67 @@ +<template> +<div class="vfcitkilproprqtbnpoertpsziierwzi"> + <div v-for="timeline in timelines" class="timeline" :key="timeline.id"> + <ui-input v-model="timeline.title" @change="save"> + <span>{{ $t('title') }}</span> + </ui-input> + <ui-textarea :value="timeline.query ? timeline.query.map(tags => tags.join(' ')).join('\n') : ''" :pre="true" @input="onQueryChange(timeline, $event)"> + <span>{{ $t('query') }}</span> + </ui-textarea> + </div> + <ui-button class="add" @click="add">{{ $t('add') }}</ui-button> + <ui-button class="save" @click="save">{{ $t('save') }}</ui-button> +</div> +</template> + +<script lang="ts"> +import Vue from 'vue'; +import i18n from '../../../../i18n'; +import * as uuid from 'uuid'; + +export default Vue.extend({ + i18n: i18n('desktop/views/components/settings.tags.vue'), + data() { + return { + timelines: this.$store.state.settings.tagTimelines + }; + }, + + methods: { + add() { + this.timelines.push({ + id: uuid(), + title: '', + query: '' + }); + }, + + save() { + const timelines = this.timelines + .filter(timeline => timeline.title) + .map(timeline => { + if (!(timeline.query && timeline.query[0] && timeline.query[0][0])) { + timeline.query = timeline.title.split('\n').map(tags => tags.split(' ')); + } + return timeline; + }); + + this.$store.dispatch('settings/set', { key: 'tagTimelines', value: timelines }); + }, + + onQueryChange(timeline, value) { + timeline.query = value.split('\n').map(tags => tags.split(' ')); + } + } +}); +</script> + +<style lang="stylus" scoped> +.vfcitkilproprqtbnpoertpsziierwzi + > .timeline + padding-bottom 16px + border-bottom solid 1px rgba(#000, 0.1) + + > .add + margin-top 16px + +</style> diff --git a/src/client/app/common/views/components/theme.vue b/src/client/app/common/views/components/settings/theme.vue index 54162e2c61..7d419e3bdd 100644 --- a/src/client/app/common/views/components/theme.vue +++ b/src/client/app/common/views/components/settings/theme.vue @@ -103,8 +103,8 @@ <script lang="ts"> import Vue from 'vue'; -import i18n from '../../../i18n'; -import { lightTheme, darkTheme, builtinThemes, applyTheme, Theme } from '../../../theme'; +import i18n from '../../../../i18n'; +import { lightTheme, darkTheme, builtinThemes, applyTheme, Theme } from '../../../../theme'; import { Chrome } from 'vue-color'; import * as uuid from 'uuid'; import * as tinycolor from 'tinycolor2'; diff --git a/src/client/app/common/views/components/ui/card.vue b/src/client/app/common/views/components/ui/card.vue index 7018c20b9d..a83013f5d0 100644 --- a/src/client/app/common/views/components/ui/card.vue +++ b/src/client/app/common/views/components/ui/card.vue @@ -62,4 +62,8 @@ export default Vue.extend({ > section margin 16px 0 + > header + font-weight bold + color var(--text) + </style> |