diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2025-08-21 16:52:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-21 16:52:30 +0900 |
| commit | 7f6ba2e50128182258b92a8572700d14a05a9f8b (patch) | |
| tree | 03739b4016dd893d38e0c66c39511aae6c3b68ef /packages/frontend/src | |
| parent | Bump version to 2025.8.0-beta.2 (diff) | |
| download | misskey-7f6ba2e50128182258b92a8572700d14a05a9f8b.tar.gz misskey-7f6ba2e50128182258b92a8572700d14a05a9f8b.tar.bz2 misskey-7f6ba2e50128182258b92a8572700d14a05a9f8b.zip | |
enhance: verify-emailにフロントエンドUIを実装 (#16431)
* enhance: メールのverifyをAPIに変更
* enhance(frontend): メールのVerifyページを追加
* fix
* :art:
* :art:
* Update Changelog
* lint
Diffstat (limited to 'packages/frontend/src')
| -rw-r--r-- | packages/frontend/src/_boot_.ts | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkButton.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/pages/signup-complete.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/verify-email.vue | 122 | ||||
| -rw-r--r-- | packages/frontend/src/router.definition.ts | 3 |
5 files changed, 129 insertions, 3 deletions
diff --git a/packages/frontend/src/_boot_.ts b/packages/frontend/src/_boot_.ts index 354fb95544..111a4abbfd 100644 --- a/packages/frontend/src/_boot_.ts +++ b/packages/frontend/src/_boot_.ts @@ -16,7 +16,7 @@ import '@/style.scss'; import { mainBoot } from '@/boot/main-boot.js'; import { subBoot } from '@/boot/sub-boot.js'; -const subBootPaths = ['/share', '/auth', '/miauth', '/oauth', '/signup-complete', '/install-extensions']; +const subBootPaths = ['/share', '/auth', '/miauth', '/oauth', '/signup-complete', '/verify-email', '/install-extensions']; if (subBootPaths.some(i => window.location.pathname === i || window.location.pathname.startsWith(i + '/'))) { subBoot(); diff --git a/packages/frontend/src/components/MkButton.vue b/packages/frontend/src/components/MkButton.vue index a77ebd6ac5..b729128a21 100644 --- a/packages/frontend/src/components/MkButton.vue +++ b/packages/frontend/src/components/MkButton.vue @@ -36,6 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { nextTick, onMounted, useTemplateRef } from 'vue'; +import type { MkABehavior } from '@/components/global/MkA.vue'; const props = defineProps<{ type?: 'button' | 'submit' | 'reset'; @@ -45,7 +46,7 @@ const props = defineProps<{ inline?: boolean; link?: boolean; to?: string; - linkBehavior?: null | 'window' | 'browser'; + linkBehavior?: MkABehavior; autofocus?: boolean; wait?: boolean; danger?: boolean; diff --git a/packages/frontend/src/pages/signup-complete.vue b/packages/frontend/src/pages/signup-complete.vue index 15954ccc82..8a907c9066 100644 --- a/packages/frontend/src/pages/signup-complete.vue +++ b/packages/frontend/src/pages/signup-complete.vue @@ -51,7 +51,7 @@ function submit() { os.alert({ type: 'error', title: i18n.ts.somethingHappened, - text: i18n.ts.signupPendingError, + text: i18n.ts.emailVerificationFailedError, }); }); } diff --git a/packages/frontend/src/pages/verify-email.vue b/packages/frontend/src/pages/verify-email.vue new file mode 100644 index 0000000000..daf3a0c4c6 --- /dev/null +++ b/packages/frontend/src/pages/verify-email.vue @@ -0,0 +1,122 @@ +<!-- +SPDX-FileCopyrightText: syuilo and misskey-project +SPDX-License-Identifier: AGPL-3.0-only +--> + +<template> +<PageWithAnimBg> + <div :class="$style.formContainer"> + <form :class="$style.form" class="_panel" @submit.prevent="submit()"> + <div :class="$style.banner"> + <i class="ti ti-mail-check"></i> + </div> + <Transition + mode="out-in" + :enterActiveClass="$style.transition_enterActive" + :leaveActiveClass="$style.transition_leaveActive" + :enterFromClass="$style.transition_enterFrom" + :leaveToClass="$style.transition_leaveTo" + > + <div v-if="!succeeded" key="input" class="_gaps_m" style="padding: 32px;"> + <div :class="$style.mainText">{{ i18n.tsx.clickToFinishEmailVerification({ ok: i18n.ts.gotIt }) }}</div> + <div> + <MkButton gradate large rounded type="submit" :disabled="submitting" style="margin: 0 auto;"> + {{ submitting ? i18n.ts.processing : i18n.ts.gotIt }}<MkEllipsis v-if="submitting"/> + </MkButton> + </div> + </div> + <div v-else key="success" class="_gaps_m" style="padding: 32px;"> + <div :class="$style.mainText">{{ i18n.ts.emailVerified }}</div> + <div> + <MkButton large rounded link to="/" linkBehavior="browser" style="margin: 0 auto;"> + {{ i18n.ts.goToMisskey }} + </MkButton> + </div> + </div> + </Transition> + </form> + </div> +</PageWithAnimBg> +</template> + +<script lang="ts" setup> +import { ref } from 'vue'; +import MkButton from '@/components/MkButton.vue'; +import { i18n } from '@/i18n.js'; +import * as os from '@/os.js'; +import { misskeyApi } from '@/utility/misskey-api.js'; + +const submitting = ref(false); +const succeeded = ref(false); + +const props = defineProps<{ + code: string; +}>(); + +function submit() { + if (submitting.value) return; + submitting.value = true; + + misskeyApi('verify-email', { + code: props.code, + }).then(() => { + succeeded.value = true; + submitting.value = false; + }).catch(() => { + submitting.value = false; + + os.alert({ + type: 'error', + title: i18n.ts.somethingHappened, + text: i18n.ts.emailVerificationFailedError, + }); + }); +} +</script> + +<style lang="scss" module> +.transition_enterActive, +.transition_leaveActive { + transition: opacity 0.3s cubic-bezier(0,0,.35,1), transform 0.3s cubic-bezier(0,0,.35,1); +} +.transition_enterFrom { + opacity: 0; + transform: translateX(50px); +} +.transition_leaveTo { + opacity: 0; + transform: translateX(-50px); +} + +.formContainer { + min-height: 100svh; + padding: 32px 32px 64px 32px; + box-sizing: border-box; + display: flex; + align-items: center; +} + +.form { + position: relative; + display: block; + margin: 0 auto; + z-index: 10; + border-radius: var(--MI-radius); + box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1); + overflow: clip; + width: 100%; + max-width: 500px; +} + +.banner { + padding: 16px; + text-align: center; + font-size: 26px; + background-color: var(--MI_THEME-accentedBg); + color: var(--MI_THEME-accent); +} + +.mainText { + text-align: center; +} +</style> diff --git a/packages/frontend/src/router.definition.ts b/packages/frontend/src/router.definition.ts index 57d9a860d6..e25e0fe161 100644 --- a/packages/frontend/src/router.definition.ts +++ b/packages/frontend/src/router.definition.ts @@ -203,6 +203,9 @@ export const ROUTE_DEF = [{ path: '/signup-complete/:code', component: page(() => import('@/pages/signup-complete.vue')), }, { + path: '/verify-email/:code', + component: page(() => import('@/pages/verify-email.vue')), +}, { path: '/announcements', component: page(() => import('@/pages/announcements.vue')), }, { |