Migrate to Vue3 (#6587)
* Update reaction.vue
* fix  bug
* wip
* wip
* wjio
* wip
* Revert "wip"
This reverts commit e427f2160a.
* 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:
		| @@ -1,49 +1,48 @@ | ||||
| <template> | ||||
| <div v-if="$store.getters.isSignedIn"> | ||||
| 	<div class="waiting _card _vMargin" v-if="state == 'waiting'"> | ||||
| 	<div class="waiting _section" v-if="state == 'waiting'"> | ||||
| 		<div class="_content"> | ||||
| 			<mk-loading/> | ||||
| 			<MkLoading/> | ||||
| 		</div> | ||||
| 	</div> | ||||
| 	<div class="denied _card _vMargin" v-if="state == 'denied'"> | ||||
| 	<div class="denied _section" v-if="state == 'denied'"> | ||||
| 		<div class="_content"> | ||||
| 			<p>{{ $t('_auth.denied') }}</p> | ||||
| 		</div> | ||||
| 	</div> | ||||
| 	<div class="accepted _card _vMargin" v-else-if="state == 'accepted'"> | ||||
| 	<div class="accepted _section" v-else-if="state == 'accepted'"> | ||||
| 		<div class="_content"> | ||||
| 			<p v-if="callback">{{ $t('_auth.callback') }}<mk-ellipsis/></p> | ||||
| 			<p v-if="callback">{{ $t('_auth.callback') }}<MkEllipsis/></p> | ||||
| 			<p v-else>{{ $t('_auth.pleaseGoBack') }}</p> | ||||
| 		</div> | ||||
| 	</div> | ||||
| 	<div class="_card _vMargin" v-else> | ||||
| 	<div class="_section" v-else> | ||||
| 		<div class="_title" v-if="name">{{ $t('_auth.shareAccess', { name: name }) }}</div> | ||||
| 		<div class="_title" v-else>{{ $t('_auth.shareAccessAsk') }}</div> | ||||
| 		<div class="_content"> | ||||
| 			<p>{{ $t('_auth.permissionAsk') }}</p> | ||||
| 			<ul> | ||||
| 				<template v-for="p in permission"> | ||||
| 					<li :key="p">{{ $t(`_permissions.${p}`) }}</li> | ||||
| 				</template> | ||||
| 				<li v-for="p in permission" :key="p">{{ $t(`_permissions.${p}`) }}</li> | ||||
| 			</ul> | ||||
| 		</div> | ||||
| 		<div class="_footer"> | ||||
| 			<mk-button @click="deny" inline>{{ $t('cancel') }}</mk-button> | ||||
| 			<mk-button @click="accept" inline primary>{{ $t('accept') }}</mk-button> | ||||
| 			<MkButton @click="deny" inline>{{ $t('cancel') }}</MkButton> | ||||
| 			<MkButton @click="accept" inline primary>{{ $t('accept') }}</MkButton> | ||||
| 		</div> | ||||
| 	</div> | ||||
| </div> | ||||
| <div class="signin" v-else> | ||||
| 	<mk-signin @login="onLogin"/> | ||||
| 	<MkSignin @login="onLogin"/> | ||||
| </div> | ||||
| </template> | ||||
|  | ||||
| <script lang="ts"> | ||||
| import Vue from 'vue'; | ||||
| import MkSignin from '../components/signin.vue'; | ||||
| import MkButton from '../components/ui/button.vue'; | ||||
| import { defineComponent } from 'vue'; | ||||
| import MkSignin from '@/components/signin.vue'; | ||||
| import MkButton from '@/components/ui/button.vue'; | ||||
| import * as os from '@/os'; | ||||
|  | ||||
| export default Vue.extend({ | ||||
| export default defineComponent({ | ||||
| 	components: { | ||||
| 		MkSignin, | ||||
| 		MkButton, | ||||
| @@ -73,7 +72,7 @@ export default Vue.extend({ | ||||
| 	methods: { | ||||
| 		async accept() { | ||||
| 			this.state = 'waiting'; | ||||
| 			await this.$root.api('miauth/gen-token', { | ||||
| 			await os.api('miauth/gen-token', { | ||||
| 				session: this.session, | ||||
| 				name: this.name, | ||||
| 				iconUrl: this.icon, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 syuilo
					syuilo