Migrate to Vue3 (#6587)

* Update reaction.vue

* fix  bug

* wip

* wip

* wjio

* wip

* Revert "wip"

This reverts commit e427f2160adf4e8a4147006e25a89854edab0033.

* wip

* wip

* wip

* Update init.ts

* Update drive-window.vue

* wip

* wip

* Use PascalCase for components

* Use PascalCase for components

* update dep

* wip

* wip

* wip

* Update init.ts

* wip

* Update paging.ts

* Update test.vue

* watch deep

* wip

* lint

* wip

* wip

* wip

* wip

* wiop

* wip

* Update webpack.config.ts

* alllow null poll

* wip

* wip

* wip

* wiop

* UI redesign & refactor (#6714)

* wip

* wip

* wip

* wip

* wip

* Update drive.vue

* Update word-mute.vue

* wip

* wip

* wip

* clean up

* wip

* Update default.vue

* wip

* Update notes.vue

* Update mfm.ts

* Update index.home.vue

* Update post-form.vue

* Update post-form-attaches.vue

* wip

* Update post-form.vue

* Update sidebar.vue

* wip

* wip

* Update index.vue

* wip

* Update default.vue

* Update index.vue

* Update index.vue

* wip

* Update post-form-attaches.vue

* Update note.vue

* wip

* clean up

* Update notes.vue

* wip

* wip

* Update ja-JP.yml

* wip

* wip

* Update index.vue

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update default.vue

* wip

* Update _dark.json5

* wip

* wip

* wip

* clean up

* wip

* wip

* Update index.vue

* Update test.vue

* wip

* wip

* fix

* wip

* wip

* wip

* wip

* clena yop

* wip

* wip

* Update store.ts

* Update messaging-room.vue

* Update default.widgets.vue

* fix

* wip

* wip

* Update modal.vue

* wip

* Update os.ts

* Update os.ts

* Update deck.vue

* Update init.ts

* wip

* Update ja-JP.yml

* v-sizeは単にwindowのresizeを監視するだけで良いかもしれない

* Update modal.vue

* wip

* Update tooltip.ts

* wip

* wip

* wip

* wip

* wip

* Update image-viewer.vue

* wip

* wip

* Update style.scss

* Update style.scss

* Update visitor.vue

* wip

* Update init.ts

* Update init.ts

* wip

* wip

* Update visitor.vue

* Update visitor.vue

* Update visitor.vue

* Update visitor.vue

* wip

* wip

* Update modal.vue

* Update header.vue

* Update menu.vue

* Update about.vue

* Update about-misskey.vue

* wip

* wip

* Update visitor.vue

* Update tooltip.ts

* wip

* Update drive.vue

* wip

* Update style.scss

* Update header.vue

* wip

* wip

* Update users.user.vue

* Update announcements.vue

* wip

* wip

* wip

* Update emojis.vue

* wip

* Update emojis.vue

* Update style.scss

* Update users.vue

* wip

* Update style.scss

* wip

* Update welcome.entrance.vue

* Update radio.vue

* Update size.ts

* Update emoji-edit-dialog.vue

* wip

* Update emojis.vue

* wip

* Update emojis.vue

* Update emojis.vue

* Update emojis.vue

* wip

* wip

* wip

* wip

* Update file-dialog.vue

* wip

* wip

* Update token-generate-window.vue

* Update notification-setting-window.vue

* wip

* wip

* Update _error_.vue

* Update ja-JP.yml

* wip

* wip

* Update store.ts

* Update emojis.vue

* Update emojis.vue

* Update emojis.vue

* Update announcements.vue

* Update store.ts

* wip

* Update page-editor.vue

* wip

* wip

* Update modal.vue

* wip

* Update select-file.ts

* Update timeline.vue

* Update emojis.vue

* Update os.ts

* wip

* Update user-select.vue

* Update mfm.ts

* Update get-file-info.ts

* Update drive.vue

* Update init.ts

* Update mfm.ts

* wip

* wip

* Update window.vue

* Update note.vue

* wip

* wip

* Update user-info.vue

* wip

* wip

* wip

* wip

* wip

* Update header.vue

* Update header.vue

* wip

* Update explore.vue

* wip

* wip

* wip

* Update webpack.config.ts

* wip

* wip

* wip

* wip

* wip

* wip

* Update autocomplete.ts

* wip

* wip

* wip

* Update toast.vue

* wip

* Update post-form-dialog.vue

* wip

* wip

* wip

* wip

* wip

* Update users.vue

* wip

* Update explore.vue

* wip

* wip

* wip

* Update package.json

* wip

* Update icon-dialog.vue

* wip

* wip

* Update user-preview.ts

* wip

* wip

* wip

* wip

* wip

* Update instance.vue

* Update user-name.vue

* Update federation.vue

* Update instance.vue

* wip

* wip

* Update tag.vue

* wip

* wip

* wip

* wip

* wip

* Update instance.vue

* wip

* Update os.ts

* Update os.ts

* wip

* wip

* wip

* Update router.ts

* wip

* Update init.ts

* Update note.vue

* Update messages.vue

* wip

* wip

* wip

* wip

* wip

* google

* wip

* wip

* wip

* wip

* Update theme-editor.vue

* wip

* wip

* Update room.vue

* Update channel-editor.vue

* wip

* Update window.vue

* Update window.vue

* wip

* Update window.vue

* Update window.vue

* wip

* Update menu.vue

* wip

* wip

* wip

* wip

* Update messaging-room.vue

* wip

* Update post-form.vue

* Update default.widgets.vue

* Update window.vue

* wip
This commit is contained in:
syuilo 2020-10-17 20:12:00 +09:00 committed by GitHub
parent a40f38b2b5
commit 7199e6f4e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
357 changed files with 15053 additions and 12496 deletions

View file

@ -1,21 +1,31 @@
<template>
<div class="t9makv94">
<portal to="icon"><fa :icon="faPalette"/></portal>
<portal to="title">{{ $t('themeEditor') }}</portal>
<section class="_card">
<section class="_section">
<div class="_content">
<mk-input v-model="name" required><span>{{ $t('name') }}</span></mk-input>
<mk-input v-model="author" required><span>{{ $t('author') }}</span></mk-input>
<mk-textarea v-model="description"><span>{{ $t('description') }}</span></mk-textarea>
<div class="_inputs">
<div v-text="$t('_theme.base')" />
<mk-radio v-model="baseTheme" value="light">{{ $t('light') }}</mk-radio>
<mk-radio v-model="baseTheme" value="dark">{{ $t('dark') }}</mk-radio>
<details>
<summary>{{ $t('import') }}</summary>
<MkTextarea v-model:value="themeToImport">
{{ $t('_theme.importInfo') }}
</MkTextarea>
<MkButton :disabled="!themeToImport.trim()" @click="importTheme">{{ $t('import') }}</MkButton>
</details>
</div>
</section>
<section class="_section">
<div class="_content _card _vMargin">
<div class="_content">
<MkInput v-model:value="name" required><span>{{ $t('name') }}</span></MkInput>
<MkInput v-model:value="author" required><span>{{ $t('author') }}</span></MkInput>
<MkTextarea v-model:value="description"><span>{{ $t('description') }}</span></MkTextarea>
<div class="_inputs">
<div v-text="$t('_theme.base')" />
<MkRadio v-model="baseTheme" value="light">{{ $t('light') }}</MkRadio>
<MkRadio v-model="baseTheme" value="dark">{{ $t('dark') }}</MkRadio>
</div>
</div>
</div>
<div class="_content">
<div class="list-view">
<div class="_content _card _vMargin">
<div class="list-view _content">
<div class="item" v-for="([ k, v ], i) in theme" :key="k">
<div class="_inputs">
<div>
@ -24,73 +34,74 @@
</div>
<div>
<div class="type" @click="chooseType($event, i)">
{{ getTypeOf(v) }} <fa :icon="faChevronDown"/>
{{ getTypeOf(v) }} <Fa :icon="faChevronDown"/>
</div>
<!-- default -->
<div v-if="v === null" v-text="baseProps[k]" class="default-value" />
<!-- color -->
<div v-else-if="typeof v === 'string'" class="color">
<input type="color" :value="v" @input="colorChanged($event.target.value, i)"/>
<mk-input class="select" :value="v" @input="colorChanged($event, i)"/>
<MkInput class="select" :value="v" @update:value="colorChanged($event, i)"/>
</div>
<!-- ref const -->
<mk-input v-else-if="v.type === 'refConst'" v-model="v.key">
<MkInput v-else-if="v.type === 'refConst'" v-model:value="v.key">
<template #prefix>$</template>
<span>{{ $t('name') }}</span>
</mk-input>
</MkInput>
<!-- ref props -->
<mk-select class="select" v-else-if="v.type === 'refProp'" v-model="v.key">
<MkSelect class="select" v-else-if="v.type === 'refProp'" v-model:value="v.key">
<option v-for="key in themeProps" :value="key" :key="key">{{ $t('_theme.keys.' + key) }}</option>
</mk-select>
</MkSelect>
<!-- func -->
<template v-else-if="v.type === 'func'">
<mk-select class="select" v-model="v.name">
<MkSelect class="select" v-model:value="v.name">
<template #label>{{ $t('_theme.funcKind') }}</template>
<option v-for="n in ['alpha', 'darken', 'lighten']" :value="n" :key="n">{{ $t('_theme.' + n) }}</option>
</mk-select>
<mk-input type="number" v-model="v.arg"><span>{{ $t('_theme.argument') }}</span></mk-input>
<mk-select class="select" v-model="v.value">
</MkSelect>
<MkInput type="number" v-model:value="v.arg"><span>{{ $t('_theme.argument') }}</span></MkInput>
<MkSelect class="select" v-model:value="v.value">
<template #label>{{ $t('_theme.basedProp') }}</template>
<option v-for="key in themeProps" :value="key" :key="key">{{ $t('_theme.keys.' + key) }}</option>
</mk-select>
</MkSelect>
</template>
<!-- CSS -->
<MkInput v-else-if="v.type === 'css'" v-model:value="v.value">
<span>CSS</span>
</MkInput>
</div>
</div>
</div>
<mk-button primary @click="addConst">{{ $t('_theme.addConstant') }}</mk-button>
<MkButton primary @click="addConst">{{ $t('_theme.addConstant') }}</MkButton>
</div>
</div>
</section>
<section class="_section">
<div class="_content">
<mk-textarea v-model="themeToImport">
{{ $t('_theme.importInfo') }}
</mk-textarea>
<mk-button :disabled="!themeToImport.trim()" @click="importTheme">{{ $t('import') }}</mk-button>
</div>
<div class="_footer">
<mk-button inline @click="preview">{{ $t('preview') }}</mk-button>
<mk-button inline primary :disabled="!name || !author" @click="save">{{ $t('save') }}</mk-button>
<MkButton inline @click="preview">{{ $t('preview') }}</MkButton>
<MkButton inline primary :disabled="!name || !author" @click="save">{{ $t('save') }}</MkButton>
</div>
</section>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import { defineComponent } from 'vue';
import { faPalette, faChevronDown, faKeyboard } from '@fortawesome/free-solid-svg-icons';
import * as JSON5 from 'json5';
import MkRadio from '../components/ui/radio.vue';
import MkButton from '../components/ui/button.vue';
import MkInput from '../components/ui/input.vue';
import MkTextarea from '../components/ui/textarea.vue';
import MkSelect from '../components/ui/select.vue';
import MkRadio from '@/components/ui/radio.vue';
import MkButton from '@/components/ui/button.vue';
import MkInput from '@/components/ui/input.vue';
import MkTextarea from '@/components/ui/textarea.vue';
import MkSelect from '@/components/ui/select.vue';
import { convertToMisskeyTheme, ThemeValue, convertToViewModel, ThemeViewModel } from '../scripts/theme-editor';
import { Theme, applyTheme, lightTheme, darkTheme, themeProps, validateTheme } from '../scripts/theme';
import { convertToMisskeyTheme, ThemeValue, convertToViewModel, ThemeViewModel } from '@/scripts/theme-editor';
import { Theme, applyTheme, lightTheme, darkTheme, themeProps, validateTheme } from '@/scripts/theme';
import { toUnicode } from 'punycode';
import { host } from '../config';
import { host } from '@/config';
import * as os from '@/os';
export default Vue.extend({
export default defineComponent({
components: {
MkRadio,
MkButton,
@ -98,14 +109,15 @@ export default Vue.extend({
MkTextarea,
MkSelect
},
metaInfo() {
return {
title: this.$t('themeEditor') + (this.changed ? '*' : '')
};
},
data() {
return {
INFO: {
header: [{
title: this.$t('themeEditor'),
icon: faPalette,
}],
},
theme: [] as ThemeViewModel,
name: '',
description: '',
@ -113,8 +125,8 @@ export default Vue.extend({
author: `@${this.$store.state.i.username}@${toUnicode(host)}`,
themeToImport: '',
changed: false,
faPalette, faChevronDown, faKeyboard,
lightTheme, darkTheme, themeProps,
faPalette, faChevronDown, faKeyboard,
}
},
@ -124,7 +136,7 @@ export default Vue.extend({
},
},
beforeDestroy() {
beforeUnmount() {
window.removeEventListener('beforeunload', this.beforeunload);
},
@ -156,7 +168,7 @@ export default Vue.extend({
},
async confirm(): Promise<boolean> {
const { canceled } = await this.$root.dialog({
const { canceled } = await os.dialog({
type: 'warning',
text: this.$t('leaveConfirm'),
showCancelButton: true
@ -173,7 +185,7 @@ export default Vue.extend({
},
async del(i: number) {
const { canceled } = await this.$root.dialog({
const { canceled } = await os.dialog({
type: 'warning',
showCancelButton: true,
text: this.$t('_theme.deleteConstantConfirm', { const: this.theme[i][0] }),
@ -183,7 +195,7 @@ export default Vue.extend({
},
async addConst() {
const { canceled, result } = await this.$root.dialog({
const { canceled, result } = await os.dialog({
title: this.$t('_theme.inputConstantName'),
input: true
});
@ -197,7 +209,7 @@ export default Vue.extend({
this.$store.commit('device/set', {
key: 'themes', value: themes
});
this.$root.dialog({
os.dialog({
type: 'success',
text: this.$t('_theme.installed', { name: theme.name })
});
@ -209,7 +221,7 @@ export default Vue.extend({
try {
applyTheme(theme, false);
} catch (e) {
this.$root.dialog({
os.dialog({
type: 'error',
text: e.message
});
@ -230,7 +242,7 @@ export default Vue.extend({
this.theme = convertToViewModel(theme);
this.themeToImport = '';
} catch (e) {
this.$root.dialog({
os.dialog({
type: 'error',
text: e.message
});
@ -238,9 +250,9 @@ export default Vue.extend({
},
colorChanged(color: string, i: number) {
Vue.set(this.theme, i, [this.theme[i][0], color]);
this.theme[i] = [this.theme[i][0], color];
},
getTypeOf(v: ThemeValue) {
return v === null
? this.$t('_theme.defaultValue')
@ -251,36 +263,38 @@ export default Vue.extend({
async chooseType(e: MouseEvent, i: number) {
const newValue = await this.showTypeMenu(e);
Vue.set(this.theme, i, [ this.theme[i][0], newValue ]);
this.theme[i] = [ this.theme[i][0], newValue ];
},
showTypeMenu(e: MouseEvent) {
return new Promise<ThemeValue>((resolve) => {
this.$root.menu({
items: [{
text: this.$t('_theme.defaultValue'),
action: () => resolve(null),
}, {
text: this.$t('_theme.color'),
action: () => resolve('#000000'),
}, {
text: this.$t('_theme.func'),
action: () => resolve({
type: 'func', name: 'alpha', arg: 1, value: 'accent'
}),
}, {
text: this.$t('_theme.refProp'),
action: () => resolve({
type: 'refProp', key: 'accent',
}),
}, {
text: this.$t('_theme.refConst'),
action: () => resolve({
type: 'refConst', key: '',
}),
},],
source: e.currentTarget || e.target,
});
os.modalMenu([{
text: this.$t('_theme.defaultValue'),
action: () => resolve(null),
}, {
text: this.$t('_theme.color'),
action: () => resolve('#000000'),
}, {
text: this.$t('_theme.func'),
action: () => resolve({
type: 'func', name: 'alpha', arg: 1, value: 'accent'
}),
}, {
text: this.$t('_theme.refProp'),
action: () => resolve({
type: 'refProp', key: 'accent',
}),
}, {
text: this.$t('_theme.refConst'),
action: () => resolve({
type: 'refConst', key: '',
}),
}, {
text: 'CSS',
action: () => resolve({
type: 'css', value: '',
}),
}], e.currentTarget || e.target);
});
}
}
@ -289,20 +303,15 @@ export default Vue.extend({
<style lang="scss" scoped>
.t9makv94 {
> ._card {
> ._section {
> ._content {
> .list-view {
height: 480px;
overflow: auto;
border: 1px solid var(--divider);
> .item {
min-height: 48px;
padding: 0 16px;
word-break: break-all;
&:not(:last-child) {
padding-bottom: 8px;
margin-bottom: 8px;
}
.select {
@ -332,10 +341,6 @@ export default Vue.extend({
}
}
}
> ._button {
margin: 16px;
}
}
}
}