feat!: brand-new onboarding page

cypress/e2e/basic.cy.ts

@@ -129,7 +129,7 @@ describe('After user signup', () => {
 		cy.wait('@signin');
 	});
 
-	it('suspend', function() {
+	it('suspend', function () {
 		cy.request('POST', '/api/admin/suspend-user', {
 			i: this.admin.token,
 			userId: this.alice.id,
@@ -146,56 +146,6 @@ describe('After user signup', () => {
 	});
 });
 
-describe('After user signed in', () => {
-	beforeEach(() => {
-		cy.resetState();
-
-		// インスタンス初期セットアップ
-		cy.registerUser('admin', 'pass', true);
-
-		// ユーザー作成
-		cy.registerUser('alice', 'alice1234');
-
-		cy.login('alice', 'alice1234');
-	});
-
-	afterEach(() => {
-		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
-		// waitを入れることでそれを防止できる
-		cy.wait(1000);
-	});
-
-  it('successfully loads', () => {
-		// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
-		cy.get('[data-cy-user-setup-continue]', { timeout: 30000 }).should('be.visible');
-  });
-
-	it('account setup wizard', () => {
-		// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
-		cy.get('[data-cy-user-setup-continue]', { timeout: 30000 }).click();
-
-		cy.get('[data-cy-user-setup-user-name] input').type('ありす');
-		cy.get('[data-cy-user-setup-user-description] textarea').type('ほげ');
-		// TODO: アイコン設定テスト
-
-		cy.get('[data-cy-user-setup-continue]').click();
-
-		// プライバシー設定
-
-		cy.get('[data-cy-user-setup-continue]').click();
-
-		// フォローはスキップ
-
-		cy.get('[data-cy-user-setup-continue]').click();
-
-		// プッシュ通知設定はスキップ
-
-		cy.get('[data-cy-user-setup-continue]').click();
-
-		cy.get('[data-cy-user-setup-continue]').click();
-  });
-});
-
 describe('After user setup', () => {
 	beforeEach(() => {
 		cy.resetState();
@@ -207,11 +157,6 @@ describe('After user setup', () => {
 		cy.registerUser('alice', 'alice1234');
 
 		cy.login('alice', 'alice1234');
-
-		// アカウント初期設定ウィザード
-		// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
-		cy.get('[data-cy-user-setup] [data-cy-modal-window-close]', { timeout: 30000 }).click();
-		cy.get('[data-cy-modal-dialog-ok]').click();
 	});
 
 	afterEach(() => {

cypress/e2e/router.cy.ts

@@ -16,12 +16,6 @@ describe('Router transition', () => {
 			cy.registerUser('alice', 'alice1234');
 
 			cy.login('alice', 'alice1234');
-
-			// アカウント初期設定ウィザード
-			// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
-			cy.get('[data-cy-user-setup] [data-cy-modal-window-close]', { timeout: 30000 }).click();
-			cy.wait(500);
-			cy.get('[data-cy-modal-dialog-ok]').click();
 		});
 
 		it('redirect to user profile', () => {

locales/ja-JP.yml

@@ -1276,6 +1276,8 @@ hideSensitiveInformation: "個人情報の非表示"
 youAreHidingSensitiveInformation: "「プライベートモード」で非表示になっています。"
 temporarilySeeThis: "無視して表示する"
 sensitiveDoubleClickRequired: "敏感な内容のメディアをダブルクリックして表示"
+prohibitSkippingInitialTutorial: "チュートリアルをスキップできないようにする"
+prohibitSkippingInitialTutorialDescription: "新規登録したユーザーに表示されるチュートリアルをスキップできないようにします。チュートリアルを完了しなかったりチュートリアルページを回避したりした場合でも、強制的にリダイレクトされます。"
 
 _bubbleGame:
   howToPlay: "遊び方"
@@ -1382,6 +1384,9 @@ _initialTutorial:
     global: "接続している他のすべてのサーバーからの投稿を見られます。"
     description2: "それぞれのタイムラインは、画面上部でいつでも切り替えられます。"
     description3: "その他にも、リストタイムラインやチャンネルタイムラインなどがあります。詳しくは{link}をご覧ください。"
+  _followUsers:
+    description1: "誰もフォローしていない状態だと、ホームタイムラインには何も表示されません。"
+    description2: "タイムラインを構築するため、気になるユーザーをフォローしてみましょう。"
   _postNote:
     title: "ノートの投稿設定"
     description1: "Misskeyにノートを投稿する際には、様々なオプションの設定が可能です。投稿フォームはこのようになっています。"
@@ -1410,9 +1415,33 @@ _initialTutorial:
     method: "添付ファイルをセンシティブにする際は、そのファイルをクリックしてメニューを開き、「センシティブとして設定」をクリックします。"
     sensitiveSucceeded: "ファイルを添付する際は、サーバーのガイドラインに従ってセンシティブを適切に設定してください。"
     doItToContinue: "画像をセンシティブに設定すると先に進めるようになります。"
+  _pushNotification:
+    description: "プッシュ通知を有効にすると{name}の通知をお使いのデバイスで受け取ることができます。"
+  _privacySettings:
+    title: "プライバシー設定"
+    description1: "多くのユーザーが利用しているプライバシー関連の設定項目をリストアップしました。必要に応じて変更してください。"
+    theseSettingsCanEditLater: "これらの設定は後から変更できます。"
+    youCanEditMoreSettingsInSettingsPageLater: "この他にも様々な設定を「設定」ページから行えます。ぜひ後で確認してみてください。"
   _done:
     title: "チュートリアルは終了です🎉"
     description: "ここで紹介した機能はほんの一部にすぎません。Misskeyの使い方をより詳しく知るには、{link}をご覧ください。"
+    haveFun: "{name}をお楽しみください！"
+    youCanReferTutorialBy: "このチュートリアルは、「もっと！」→「情報」→「チュートリアルを見る」からいつでも見返すことができます。"
+  _onboardingLanding:
+    accountCreated: "アカウントの作成が完了しました！"
+    welcomeToX: "ようこそ、{name}へ！"
+    description: "「{name}に登録したは良いものの、どう使えばいいか分からない…💦」といったことを防ぐために、まずはMisskeyの基本的な使い方を学びましょう。"
+    takesAbout: "このチュートリアルの所要時間は{min}分程度です。\nチュートリアルを完了すると実績が解除されます。"
+    adminForcesToTakeTutorial: "このサーバーの管理者は新規ユーザーにチュートリアルを完了することを義務付けています。\nチュートリアルを完了するまでMisskeyを使い始めることはできません。"
+  _onboardingDone:
+    description: "お疲れ様でした！次のステップに進んで、{name}をもっと楽しめるようにしましょう。"
+    backToOriginalPath: "元のページに戻る"
+    backToOriginalPathDescription: "あなたがアクセスしようとしていたページに戻ります。"
+    profile: "プロフィール設定"
+    profileDescription: "他のユーザーが親しみやすいように、プロフィールをつくりましょう。"
+    exploreDescription: "人気のノートやユーザーを見つけて交流をはじめましょう。"
+    goToTimeline: "ホーム画面に進む"
+    goToTimelineDescription: "設定等を行わず、通常のホーム画面（タイムライン）に進みます。"
 
 _timelineDescription:
   home: "ホームタイムラインでは、あなたがフォローしているアカウントの投稿を見られます。"

locales/ko-KR.yml

@@ -1261,6 +1261,8 @@ hideSensitiveInformation: "민감한 정보 숨기기"
 youAreHidingSensitiveInformation: "'프라이빗 모드'에 의해 숨겨졌습니다."
 temporarilySeeThis: "무시하고 표시하기"
 sensitiveDoubleClickRequired: "민감한 내용의 미디어를 더블 클릭해서 표시"
+prohibitSkippingInitialTutorial: "チュートリアルをスキップできないようにする"
+prohibitSkippingInitialTutorialDescription: "新規登録したユーザーに表示されるチュートリアルをスキップできないようにします。チュートリアルを完了しなかったりチュートリアルページを回避したりした場合でも、強制的にリダイレクトされます。"
 _bubbleGame:
   howToPlay: "설명"
   hold: "홀드"
@@ -1366,6 +1368,9 @@ _initialTutorial:
     global: "연결되어 있는 모든 서버의 게시물을 볼 수 있습니다."
     description2: "각각의 타임라인은 화면 상단에서 언제든지 변경할 수 있습니다."
     description3: "이 외에도, '리스트 타임라인'이나 '채널 타임라인' 등이 있습니다. 자세한 사항은 {link}에서 확인하실 수 있습니다."
+  _followUsers:
+    description1: "誰もフォローしていない状態だと、ホームタイムラインには何も表示されません。"
+    description2: "タイムラインを構築するため、気になるユーザーをフォローしてみましょう。"
   _postNote:
     title: "노트 게시 설정"
     description1: "Misskey에 노트를 쓸 때에는 다양한 옵션을 설정할 수 있습니다. 노트를 작성하는 화면은 이렇게 생겼습니다."
@@ -1394,9 +1399,33 @@ _initialTutorial:
     method: "첨부 파일을 열람 주의로 설정하려면, 해당 파일을 클릭하여 메뉴를 열고, '열람주의로 설정'을 클릭합니다."
     sensitiveSucceeded: "파일을 첨부할 때에는 서버의 가이드라인에 따라 적절히 열람주의를 설정해 주시기 바랍니다."
     doItToContinue: "이미지를 열람 주의로 설정하면 다음으로 넘어갈 수 있게 됩니다."
+  _pushNotification:
+    description: "プッシュ通知を有効にすると{name}の通知をお使いのデバイスで受け取ることができます。"
+  _privacySettings:
+    title: "プライバシー設定"
+    description1: "多くのユーザーが利用しているプライバシー関連の設定項目をリストアップしました。必要に応じて変更してください。"
+    theseSettingsCanEditLater: "これらの設定は後から変更できます。"
+    youCanEditMoreSettingsInSettingsPageLater: "この他にも様々な設定を「設定」ページから行えます。ぜひ後で確認してみてください。"
   _done:
     title: "튜토리얼이 끝났습니다! 🎉"
     description: "여기에서 소개한 기능은 극히 일부에 지나지 않습니다. Misskey의 사용 방법을 더 자세히 알아보려면 {link}를 확인해 주세요!"
+    haveFun: "{name}をお楽しみください！"
+    youCanReferTutorialBy: "このチュートリアルは、「もっと！」→「情報」→「チュートリアルを見る」からいつでも見返すことができます。"
+  _onboardingLanding:
+    accountCreated: "アカウントの作成が完了しました！"
+    welcomeToX: "ようこそ、{name}へ！"
+    description: "「{name}に登録したは良いものの、どう使えばいいか分からない…💦」といったことを防ぐために、まずはMisskeyの基本的な使い方を学びましょう。"
+    takesAbout: "このチュートリアルの所要時間は{min}分程度です。\nチュートリアルを完了すると実績が解除されます。"
+    adminForcesToTakeTutorial: "このサーバーの管理者は新規ユーザーにチュートリアルを完了することを義務付けています。\nチュートリアルを完了するまでMisskeyを使い始めることはできません。"
+  _onboardingDone:
+    description: "お疲れ様でした！次のステップに進んで、{name}をもっと楽しめるようにしましょう。"
+    backToOriginalPath: "元のページに戻る"
+    backToOriginalPathDescription: "あなたがアクセスしようとしていたページに戻ります。"
+    profile: "プロフィール設定"
+    profileDescription: "他のユーザーが親しみやすいように、プロフィールをつくりましょう。"
+    exploreDescription: "人気のノートやユーザーを見つけて交流をはじめましょう。"
+    goToTimeline: "ホーム画面に進む"
+    goToTimelineDescription: "設定等を行わず、通常のホーム画面（タイムライン）に進みます。"
 _timelineDescription:
   home: "홈 타임라인에서는, 내가 팔로우한 계정의 게시물을 볼 수 있습니다."
   local: "로컬 타임라인에서는, 이 서버의 모든 유저의 게시물을 볼 수 있습니다."

packages/backend/migration/1708933788259-canSkipInitialTutorial.js

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class CanSkipInitialTutorial1708933788259 {
+		name = 'CanSkipInitialTutorial1708933788259'
+
+		async up(queryRunner) {
+				await queryRunner.query(`ALTER TABLE "meta" ADD "canSkipInitialTutorial" boolean NOT NULL DEFAULT true`);
+		}
+
+		async down(queryRunner) {
+				await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "canSkipInitialTutorial"`);
+		}
+}

packages/backend/src/core/entities/MetaEntityService.ts

@@ -68,6 +68,7 @@ export class MetaEntityService {
 			privacyPolicyUrl: instance.privacyPolicyUrl,
 			disableRegistration: instance.disableRegistration,
 			emailRequiredForSignup: instance.emailRequiredForSignup,
+			canSkipInitialTutorial: instance.canSkipInitialTutorial,
 			enableHcaptcha: instance.enableHcaptcha,
 			hcaptchaSiteKey: instance.hcaptchaSiteKey,
 			enableMcaptcha: instance.enableMcaptcha,

packages/backend/src/models/Meta.ts

@@ -184,6 +184,11 @@ export class MiMeta {
 	})
 	public emailRequiredForSignup: boolean;
 
+	@Column('boolean', {
+		default: true,
+	})
+	public canSkipInitialTutorial: boolean;
+
 	@Column('boolean', {
 		default: false,
 	})

packages/backend/src/models/json-schema/meta.ts

@@ -75,6 +75,10 @@ export const packedMetaLiteSchema = {
 			type: 'boolean',
 			optional: false, nullable: false,
 		},
+		canSkipInitialTutorial: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 		enableHcaptcha: {
 			type: 'boolean',
 			optional: false, nullable: false,

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -33,6 +33,10 @@ export const meta = {
 				type: 'boolean',
 				optional: false, nullable: false,
 			},
+			canSkipInitialTutorial: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
 			enableHcaptcha: {
 				type: 'boolean',
 				optional: false, nullable: false,
@@ -548,6 +552,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				privacyPolicyUrl: instance.privacyPolicyUrl,
 				disableRegistration: instance.disableRegistration,
 				emailRequiredForSignup: instance.emailRequiredForSignup,
+				canSkipInitialTutorial: instance.canSkipInitialTutorial,
 				enableHcaptcha: instance.enableHcaptcha,
 				hcaptchaSiteKey: instance.hcaptchaSiteKey,
 				enableMcaptcha: instance.enableMcaptcha,

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -65,6 +65,7 @@ export const paramDef = {
 		cacheRemoteFiles: { type: 'boolean' },
 		cacheRemoteSensitiveFiles: { type: 'boolean' },
 		emailRequiredForSignup: { type: 'boolean' },
+		canSkipInitialTutorial: { type: 'boolean' },
 		enableHcaptcha: { type: 'boolean' },
 		hcaptchaSiteKey: { type: 'string', nullable: true },
 		hcaptchaSecretKey: { type: 'string', nullable: true },
@@ -322,6 +323,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				set.emailRequiredForSignup = ps.emailRequiredForSignup;
 			}
 
+			if (ps.canSkipInitialTutorial !== undefined) {
+				set.canSkipInitialTutorial = ps.canSkipInitialTutorial;
+			}
+
 			if (ps.enableHcaptcha !== undefined) {
 				set.enableHcaptcha = ps.enableHcaptcha;
 			}

packages/frontend/.storybook/generate.tsx

@@ -401,8 +401,6 @@ function toStories(component: string): Promise<string> {
 		glob('src/components/MkDigitalClock.vue'),
 		glob('src/components/MkGalleryPostPreview.vue'),
 		glob('src/components/MkSignupServerRules.vue'),
-		glob('src/components/MkUserSetupDialog.vue'),
-		glob('src/components/MkUserSetupDialog.*.vue'),
 		glob('src/components/MkInviteCode.vue'),
 		glob('src/pages/user/home.vue'),
 	]);

packages/frontend/package.json

@@ -99,6 +99,7 @@
 		"@storybook/vue3": "8.1.2",
 		"@storybook/vue3-vite": "8.1.2",
 		"@testing-library/vue": "8.1.0",
+		"@types/canvas-confetti": "^1.6.4",
 		"@types/escape-regexp": "0.0.3",
 		"@types/estree": "1.0.5",
 		"@types/matter-js": "0.19.6",

packages/frontend/src/_boot_.ts

@@ -10,7 +10,7 @@ import '@/style.scss';
 import { mainBoot } from '@/boot/main-boot.js';
 import { subBoot } from '@/boot/sub-boot.js';
 
-const subBootPaths = ['/share', '/auth', '/miauth', '/signup-complete'];
+const subBootPaths = ['/share', '/auth', '/miauth', '/signup-complete', '/onboarding'];
 
 if (subBootPaths.some(i => location.pathname === i || location.pathname.startsWith(i + '/'))) {
 	subBoot();

packages/frontend/src/boot/common.ts

@@ -12,7 +12,7 @@ import { version, lang, updateLocale, locale } from '@/config.js';
 import { applyTheme } from '@/scripts/theme.js';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode.js';
 import { updateI18n } from '@/i18n.js';
-import { $i, refreshAccount, login } from '@/account.js';
+import { $i, iAmModerator, refreshAccount, login } from '@/account.js';
 import { defaultStore, ColdDeviceStorage } from '@/store.js';
 import { fetchInstance, instance } from '@/instance.js';
 import { deviceKind } from '@/scripts/device-kind.js';
@@ -21,6 +21,7 @@ import { getUrlWithoutLoginId } from '@/scripts/login-id.js';
 import { getAccountFromId } from '@/scripts/get-account-from-id.js';
 import { deckStore } from '@/ui/deck/deck-store.js';
 import { miLocalStorage } from '@/local-storage.js';
+import { claimedAchievements } from '@/scripts/achievements.js';
 import { fetchCustomEmojis } from '@/custom-emojis.js';
 import { setupRouter } from '@/router/definition.js';
 
@@ -118,6 +119,14 @@ export async function common(createVue: () => App<Element>) {
 	await defaultStore.ready;
 	await deckStore.ready;
 
+	// 2024年4月1日JST以降に作成されたアカウントで、チュートリアルを完了していない通常ユーザーの場合、チュートリアルにリダイレクト
+	if (!instance.canSkipInitialTutorial && $i && !iAmModerator && defaultStore.state.accountSetupWizard !== -1 && !location.pathname.startsWith('/onboarding') && !location.pathname.startsWith('/signup-complete')) {
+		const param = new URLSearchParams();
+		param.set('redirected_from', location.pathname + location.search + location.hash);
+		location.replace('/onboarding?' + param.toString());
+		return;
+	}
+
 	const fetchInstanceMetaPromise = fetchInstance();
 
 	fetchInstanceMetaPromise.then(() => {

packages/frontend/src/boot/main-boot.ts

@@ -107,12 +107,6 @@ export async function mainBoot() {
 		// only add post shortcuts if logged in
 		hotkeys['p|n'] = post;
 
-		defaultStore.loaded.then(() => {
-			if (defaultStore.state.accountSetupWizard !== -1) {
-				popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), {}, {}, 'closed');
-			}
-		});
-
 		for (const announcement of ($i.unreadAnnouncements ?? []).filter(x => x.display === 'dialog')) {
 			popup(defineAsyncComponent(() => import('@/components/MkAnnouncementDialog.vue')), {
 				announcement,

packages/frontend/src/components/MkPostForm.vue

@@ -555,6 +555,8 @@ function pushVisibleUser(user: Misskey.entities.UserDetailed) {
 }
 
 function addVisibleUser() {
+	if (props.mock) return;
+
 	os.selectUser().then(user => {
 		pushVisibleUser(user);
 
@@ -884,6 +886,8 @@ function cancel() {
 }
 
 function insertMention() {
+	if (props.mock) return;
+
 	os.selectUser({ localOnly: localOnly.value, includeSelf: true }).then(user => {
 		insertTextAtCursor(textareaEl.value, '@' + Misskey.acct.toString(user) + ' ');
 	});

packages/frontend/src/components/MkSignupDialog.form.vue

@@ -214,7 +214,7 @@ async function onSubmit(): Promise<void> {
 			emit('signup', res);
 
 			if (props.autoSet) {
-				return login(res.i);
+				return login(res.i, '/onboarding');
 			}
 		}
 	} catch {

packages/frontend/src/components/MkTutorial.FollowUsers.vue

@@ -5,14 +5,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<div style="text-align: center;">{{ i18n.ts._initialAccountSetting.followUsers }}</div>
+	<div style="word-break: auto-phrase; text-align: center;">{{ i18n.ts._initialTutorial._followUsers.description1 }}<br>{{ i18n.ts._initialTutorial._followUsers.description2 }}</div>
 
 	<MkFolder :defaultOpen="true">
 		<template #label>{{ i18n.ts.recommended }}</template>
 
 		<MkPagination :pagination="pinnedUsers">
 			<template #default="{ items }">
-				<div :class="$style.users">
+				<div class="_gaps_s">
 					<XUser v-for="item in (items as Misskey.entities.UserDetailed[])" :key="item.id" :user="item"/>
 				</div>
 			</template>
@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<MkPagination :pagination="popularUsers">
 			<template #default="{ items }">
-				<div :class="$style.users">
+				<div class="_gaps_s">
 					<XUser v-for="item in (items as Misskey.entities.UserDetailed[])" :key="item.id" :user="item"/>
 				</div>
 			</template>
@@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import * as Misskey from 'misskey-js';
 import { i18n } from '@/i18n.js';
 import MkFolder from '@/components/MkFolder.vue';
-import XUser from '@/components/MkUserSetupDialog.User.vue';
+import XUser from '@/components/MkTutorial.FollowUsers.UserCard.vue';
 import MkPagination, { type Paging } from '@/components/MkPagination.vue';
 
 const pinnedUsers: Paging = {
@@ -57,12 +57,3 @@ const popularUsers: Paging = {
 	},
 };
 </script>
-
-<style lang="scss" module>
-.users {
-	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(230px, 1fr));
-	grid-gap: var(--margin);
-	justify-content: center;
-}
-</style>

packages/frontend/src/components/MkTutorial.Note.vue

@@ -5,8 +5,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div v-if="phase === 'aboutNote'" class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._note.description }}</div>
-	<MkNote :class="$style.exampleNoteRoot" style="pointer-events: none;" :note="exampleNote" :mock="true"/>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._note.description }}</div>
+	<MkNote tabindex="-1" :class="$style.exampleNoteRoot" style="pointer-events: none;" :note="exampleNote" :mock="true"/>
 	<div class="_gaps_s">
 		<div><i class="ti ti-arrow-back-up"></i> <b>{{ i18n.ts.reply }}</b> … {{ i18n.ts._initialTutorial._note.reply }}</div>
 		<div><i class="ti ti-repeat"></i> <b>{{ i18n.ts.renote }}</b> … {{ i18n.ts._initialTutorial._note.renote }}</div>
@@ -15,7 +15,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</div>
 </div>
 <div v-else-if="phase === 'howToReact'" class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._reaction.description }}</div>
+	<div class="_gaps_s">
+		<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._reaction.description }}</div>
+		<img :class="$style.image" src="/client-assets/tutorial/reaction.png"/>
+	</div>
 	<div>{{ i18n.ts._initialTutorial._reaction.letsTryReacting }}</div>
 	<MkNote :class="$style.exampleNoteRoot" :note="exampleNote" :mock="true" @reaction="addReaction" @removeReaction="removeReaction"/>
 	<div v-if="onceReacted"><b style="color: var(--accent);"><i class="ti ti-check"></i> {{ i18n.ts._initialTutorial.wellDone }}</b> {{ i18n.ts._initialTutorial._reaction.reactNotification }}<br>{{ i18n.ts._initialTutorial._reaction.reactDone }}</div>
@@ -78,7 +81,11 @@ function addReaction(emoji) {
 	emit('reacted');
 	exampleNote.reactions[emoji] = 1;
 	exampleNote.myReaction = emoji;
+
+	// 通知音も鳴らしたいのでちょっと遅らせる
+	setTimeout(() => {
 		doNotification(emoji);
+	}, 200);
 }
 
 function doNotification(emoji: string): void {
@@ -114,4 +121,10 @@ function removeReaction(emoji) {
 	height: 1px;
 	background: var(--divider);
 }
+
+.image {
+	max-width: 300px;
+	margin: 0 auto;
+	border-radius: var(--radius);
+}
 </style>

packages/frontend/src/components/MkTutorial.PostNote.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._postNote.description1 }}</div>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._postNote.description1 }}</div>
 	<MkPostForm :class="$style.exampleRoot" :mock="true" :autofocus="false"/>
 	<MkFormSection>
 		<template #label>{{ i18n.ts.visibility }}</template>

packages/frontend/src/components/MkTutorial.PrivacySettings.vue

@@ -0,0 +1,55 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div class="_gaps">
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._privacySettings.description1 }}</div>
+
+	<MkInfo>{{ i18n.ts._initialTutorial._privacySettings.theseSettingsCanEditLater }}</MkInfo>
+
+	<MkSwitch v-model="isLocked">{{ i18n.ts.makeFollowManuallyApprove }}<template #caption>{{ i18n.ts.lockedAccountInfo }}</template></MkSwitch>
+
+	<MkSwitch v-model="publicReactions">{{ i18n.ts.makeReactionsPublic }}<template #caption>{{ i18n.ts.makeReactionsPublicDescription }}</template></MkSwitch>
+
+	<MkSwitch v-model="hideOnlineStatus">{{ i18n.ts.hideOnlineStatus }}<template #caption>{{ i18n.ts.hideOnlineStatusDescription }}</template></MkSwitch>
+
+	<MkSwitch v-model="noCrawle">{{ i18n.ts.noCrawle }}<template #caption>{{ i18n.ts.noCrawleDescription }}</template></MkSwitch>
+
+	<MkSwitch v-model="preventAiLearning">{{ i18n.ts.preventAiLearning }}<template #caption>{{ i18n.ts.preventAiLearningDescription }}</template></MkSwitch>
+
+	<MkInfo>{{ i18n.ts._initialTutorial._privacySettings.youCanEditMoreSettingsInSettingsPageLater }}</MkInfo>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch } from 'vue';
+import { i18n } from '@/i18n.js';
+import MkSwitch from '@/components/MkSwitch.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import { signinRequired } from '@/account.js';
+
+const $i = signinRequired();
+
+const isLocked = ref($i.isLocked);
+const publicReactions = ref($i.publicReactions);
+const hideOnlineStatus = ref($i.hideOnlineStatus);
+const noCrawle = ref($i.noCrawle);
+const preventAiLearning = ref($i.preventAiLearning);
+
+watch([isLocked, publicReactions, hideOnlineStatus, noCrawle, preventAiLearning], () => {
+	misskeyApi('i/update', {
+		isLocked: !!isLocked.value,
+		publicReactions: !!publicReactions.value,
+		hideOnlineStatus: !!hideOnlineStatus.value,
+		noCrawle: !!noCrawle.value,
+		preventAiLearning: !!preventAiLearning.value,
+	});
+});
+</script>
+
+<style lang="scss" module>
+
+</style>

packages/frontend/src/components/MkTutorial.Sensitive.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.description }}</div>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.description }}</div>
 	<div>{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.tryThisFile }}</div>
 	<MkInfo>{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.method }}</MkInfo>
 	<MkPostForm

packages/frontend/src/components/MkTutorial.Timeline.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div class="_gaps">
-	<div style="text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._timeline.description1 }}</div>
+	<div style="word-break: auto-phrase; text-align: center; padding: 0 16px;">{{ i18n.ts._initialTutorial._timeline.description1 }}</div>
 	<div class="_gaps_s">
 		<div><i class="ti ti-home"></i> <b>{{ i18n.ts._timelines.home }}</b> … {{ i18n.ts._initialTutorial._timeline.home }}</div>
 		<div><i class="ti ti-planet"></i> <b>{{ i18n.ts._timelines.local }}</b> … {{ i18n.ts._initialTutorial._timeline.local }}</div>
@@ -22,7 +22,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<a href="https://misskey-hub.net/docs/for-users/features/timeline/" rel="nofollow noopener" target="_blank" class="_link">{{ i18n.ts.help }}</a>
 		</template>
 	</I18n>
-
 </div>
 </template>
 

packages/frontend/src/components/MkTutorial.vue

@@ -0,0 +1,327 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="$style.tutorialRoot">
+	<div v-if="showProgressbar" :class="$style.progressBar">
+		<div :class="$style.progressBarValue" :style="{ width: `${(page / MAX_PAGE) * 100}%` }"></div>
+	</div>
+	<div v-if="showProgressbar && page !== 0 && page !== MAX_PAGE" :class="$style.progressText">{{ page }}/{{ MAX_PAGE - 1 }}</div>
+	<div :class="$style.tutorialMain">
+		<Transition
+			mode="out-in"
+			:enterActiveClass="$style.transition_x_enterActive"
+			:leaveActiveClass="$style.transition_x_leaveActive"
+			:enterFromClass="$style.transition_x_enterFrom"
+			:leaveToClass="$style.transition_x_leaveTo"
+		>
+			<slot v-if="page === 0" key="tutorialPage_0" name="welcome" :close="() => emit('close', true)" :next="next">
+				<div :class="$style.centerPage">
+					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
+					<MkSpacer :marginMin="20" :marginMax="28">
+						<div class="_gaps" style="text-align: center;">
+							<i class="ti ti-confetti" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
+							<div style="font-size: 120%;">{{ i18n.ts._initialTutorial._landing.title }}</div>
+							<div>{{ i18n.ts._initialTutorial._landing.description }}</div>
+							<MkButton primary rounded gradate style="margin: 16px auto 0 auto;" data-cy-user-setup-continue @click="next">{{ i18n.ts._initialTutorial.launchTutorial }} <i class="ti ti-arrow-right"></i></MkButton>
+							<MkButton v-if="skippable" style="margin: 0 auto;" transparent rounded data-cy-user-setup-close @click="emit('close', true)">{{ i18n.ts.close }}</MkButton>
+						</div>
+					</MkSpacer>
+				</div>
+			</slot>
+			<div v-else-if="page === 1" key="tutorialPage_1" :class="$style.pageContainer">
+				<div :class="$style.pageRoot">
+					<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
+						<XNote phase="aboutNote"/>
+					</MkSpacer>
+				</div>
+			</div>
+			<div v-else-if="page === 2" key="tutorialPage_2" :class="$style.pageContainer">
+				<div :class="$style.pageRoot">
+					<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
+						<div class="_gaps">
+							<XNote phase="howToReact" @reacted="isReactionTutorialPushed = true"/>
+							<b v-if="!isReactionTutorialPushed" :class="$style.actionWaitText">{{ i18n.ts._initialTutorial._reaction.reactToContinue }}</b>
+						</div>
+					</MkSpacer>
+				</div>
+			</div>
+			<div v-else-if="page === 3" key="tutorialPage_3" :class="$style.pageContainer">
+				<div :class="$style.pageRoot">
+					<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
+						<XTimeline/>
+					</MkSpacer>
+				</div>
+			</div>
+			<div v-else-if="page === 4" key="tutorialPage_4" :class="$style.pageContainer">
+				<div :class="$style.pageRoot">
+					<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
+						<XFollowUsers/>
+					</MkSpacer>
+				</div>
+			</div>
+			<div v-else-if="page === 5" key="tutorialPage_5" :class="$style.pageContainer">
+				<div :class="$style.pageRoot">
+					<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
+						<XPostNote/>
+					</MkSpacer>
+				</div>
+			</div>
+			<div v-else-if="page === 6" key="tutorialPage_6" :class="$style.pageContainer">
+				<div :class="$style.pageRoot">
+					<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
+						<div class="_gaps">
+							<XSensitive @succeeded="isSensitiveTutorialSucceeded = true"/>
+							<b v-if="!isSensitiveTutorialSucceeded" :class="$style.actionWaitText">{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.doItToContinue }}</b>
+						</div>
+					</MkSpacer>
+				</div>
+			</div>
+			<div v-else-if="page === 7" key="tutorialPage_7" :class="$style.pageContainer">
+				<div :class="$style.pageRoot">
+					<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
+						<div class="_gaps">
+							<XPrivacySettings/>
+						</div>
+					</MkSpacer>
+				</div>
+			</div>
+			<slot v-else-if="page === 8" key="tutorialPage_8" name="finish" :close="() => emit('close')" :prev="prev">
+				<div :class="$style.centerPage">
+					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
+					<MkSpacer :marginMin="20" :marginMax="28">
+						<div class="_gaps">
+							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
+							<div style="text-align: center; font-size: 120%;">{{ i18n.ts._initialTutorial._done.title }}</div>
+							<I18n :src="i18n.ts._initialTutorial._done.description" tag="div" style="text-align: center; padding: 0 16px;">
+								<template #link>
+									<a href="https://misskey-hub.net/docs/for-users/" target="_blank" class="_link">{{ i18n.ts.help }}</a>
+								</template>
+							</I18n>
+							<div style="text-align: center;">{{ i18n.ts._initialTutorial._done.youCanReferTutorialBy }}</div>
+							<div style="text-align: center;">{{ i18n.tsx._initialTutorial._done.haveFun({ name: instance.name ?? host }) }}</div>
+							<div class="_buttonsCenter" style="margin-top: 16px;">
+								<MkButton v-if="initialPage !== 4" rounded @click="prev"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
+								<MkButton rounded primary gradate @click="emit('close')">{{ i18n.ts.close }}</MkButton>
+							</div>
+						</div>
+					</MkSpacer>
+				</div>
+			</slot>
+		</Transition>
+	</div>
+	<div :class="[$style.pageFooter, { [$style.pageFooterShown]: (page > 0 && page < MAX_PAGE) }]">
+		<div class="_buttonsCenter">
+			<MkButton v-if="initialPage !== page" rounded @click="prev"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
+			<MkButton primary rounded gradate :disabled="!canContinue" data-cy-user-setup-continue @click="next">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
+		</div>
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+
+// チュートリアルの枚数を増やしたら必ず変更すること！！
+export const MAX_PAGE = 8;
+
+</script>
+
+<script lang="ts" setup>
+import { ref, computed, watch } from 'vue';
+import MkButton from '@/components/MkButton.vue';
+import XNote from '@/components/MkTutorial.Note.vue';
+import XTimeline from '@/components/MkTutorial.Timeline.vue';
+import XFollowUsers from '@/components/MkTutorial.FollowUsers.vue';
+import XPostNote from '@/components/MkTutorial.PostNote.vue';
+import XSensitive from '@/components/MkTutorial.Sensitive.vue';
+import XPrivacySettings from '@/components/MkTutorial.PrivacySettings.vue';
+import MkAnimBg from '@/components/MkAnimBg.vue';
+import { i18n } from '@/i18n.js';
+import { instance } from '@/instance.js';
+import { host } from '@/config.js';
+import { claimAchievement } from '@/scripts/achievements.js';
+
+const props = defineProps<{
+	initialPage?: number;
+	showProgressbar?: boolean;
+	skippable?: boolean;
+	withSetup?: boolean;
+}>();
+
+const emit = defineEmits<{
+	(ev: 'pageChanged', to: number): void;
+	(ev: 'close', withConfirm?: boolean): void;
+}>();
+
+// テストの場合は全インタラクションをスキップする
+const isTest = (import.meta.env.MODE === 'test');
+
+// eslint-disable-next-line vue/no-setup-props-destructure
+const page = ref(props.initialPage ?? 0);
+
+watch(page, (to) => {
+	if (to === MAX_PAGE) {
+		claimAchievement('tutorialCompleted');
+	}
+});
+
+const isReactionTutorialPushed = ref<boolean>(isTest);
+const isSensitiveTutorialSucceeded = ref<boolean>(isTest);
+
+const canContinue = computed(() => {
+	if (page.value === 2) {
+		return isReactionTutorialPushed.value;
+	} else if (page.value === 6) {
+		return isSensitiveTutorialSucceeded.value;
+	} else {
+		return true;
+	}
+});
+
+function next() {
+	if (page.value === 3 && !props.withSetup) {
+		page.value += 2;
+	} else if (page.value === 6 && !props.withSetup) {
+		page.value += 2;
+	} else {
+		page.value++;
+	}
+
+	emit('pageChanged', page.value);
+}
+
+function prev() {
+	if (page.value === 5 && !props.withSetup) {
+		page.value -= 2;
+	} else if (page.value === 8 && !props.withSetup) {
+		page.value -= 2;
+	} else {
+		page.value--;
+	}
+
+	emit('pageChanged', page.value);
+}
+</script>
+
+<style lang="scss" module>
+.tutorialRoot {
+	position: relative;
+	box-sizing: border-box;
+	overflow: hidden;
+	width: 100%;
+	height: 100%;
+}
+
+.tutorialMain {
+	position: relative;
+	width: 100%;
+	height: 100%;
+}
+
+.progressBar {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 10;
+	width: 100%;
+	height: 4px;
+}
+
+.progressBarValue {
+	height: 100%;
+	background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
+	transition: all 0.5s cubic-bezier(0,.5,.5,1);
+}
+
+.progressText {
+	position: absolute;
+	top: 1em;
+	right: 1em;
+	font-size: 0.8em;
+	opacity: 0.7;
+	pointer-events: none;
+}
+
+.transition_x_enterActive,
+.transition_x_leaveActive {
+	transition: opacity 0.3s cubic-bezier(0,0,.35,1), transform 0.3s cubic-bezier(0,0,.35,1);
+}
+.transition_x_enterFrom {
+	opacity: 0;
+	transform: translateX(50px);
+}
+.transition_x_leaveTo {
+	opacity: 0;
+	transform: translateX(-50px);
+}
+
+.progressBar {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 10;
+	width: 100%;
+	height: 4px;
+}
+
+.progressBarValue {
+	height: 100%;
+	background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
+	transition: all 0.5s cubic-bezier(0,.5,.5,1);
+}
+
+.centerPage {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100%;
+	box-sizing: border-box;
+}
+
+.pageContainer {
+	width: 100%;
+	height: 100%;
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+
+.pageRoot {
+	display: flex;
+	flex-direction: column;
+	min-height: 100%;
+}
+
+.pageMain {
+	flex-grow: 1;
+	line-height: 1.5;
+	margin-bottom: 56px;
+}
+
+.actionWaitText {
+	color: var(--error);
+}
+
+.pageFooter {
+	position: sticky;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 56px;
+	box-sizing: border-box;
+	flex-shrink: 0;
+	padding: 12px;
+	border-top: solid 0.5px var(--divider);
+	background: var(--acrylicBg);
+
+	transition: transform 0.3s cubic-bezier(0,0,.35,1);
+	transform: translateY(100%);
+	visibility: hidden;
+
+	&.pageFooterShown {
+		transform: translateY(0);
+		visibility: visible;
+	}
+}
+</style>

packages/frontend/src/components/MkTutorialDialog.vue

@@ -14,152 +14,24 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template v-if="page === 1" #header><i class="ti ti-pencil"></i> {{ i18n.ts._initialTutorial._note.title }}</template>
 	<template v-else-if="page === 2" #header><i class="ti ti-mood-smile"></i> {{ i18n.ts._initialTutorial._reaction.title }}</template>
 	<template v-else-if="page === 3" #header><i class="ti ti-home"></i> {{ i18n.ts._initialTutorial._timeline.title }}</template>
-	<template v-else-if="page === 4" #header><i class="ti ti-pencil-plus"></i> {{ i18n.ts._initialTutorial._postNote.title }}</template>
-	<template v-else-if="page === 5" #header><i class="ti ti-eye-exclamation"></i> {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.title }}</template>
+	<template v-else-if="page === 5" #header><i class="ti ti-pencil-plus"></i> {{ i18n.ts._initialTutorial._postNote.title }}</template>
+	<template v-else-if="page === 6" #header><i class="ti ti-eye-exclamation"></i> {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.title }}</template>
 	<template v-else #header>{{ i18n.ts._initialTutorial.title }}</template>
 
-	<div style="overflow-x: clip;">
-		<Transition
-			mode="out-in"
-			:enterActiveClass="$style.transition_x_enterActive"
-			:leaveActiveClass="$style.transition_x_leaveActive"
-			:enterFromClass="$style.transition_x_enterFrom"
-			:leaveToClass="$style.transition_x_leaveTo"
-		>
-			<template v-if="page === 0">
-				<div :class="$style.centerPage">
-					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-confetti" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts._initialTutorial._landing.title }}</div>
-							<div>{{ i18n.ts._initialTutorial._landing.description }}</div>
-							<MkButton primary rounded gradate style="margin: 16px auto 0 auto;" @click="page++">{{ i18n.ts._initialTutorial.launchTutorial }} <i class="ti ti-arrow-right"></i></MkButton>
-							<MkButton style="margin: 0 auto;" transparent rounded @click="close(true)">{{ i18n.ts.close }}</MkButton>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-			<template v-else-if="page === 1">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XNote phase="aboutNote"/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 1" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 2">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<div class="_gaps">
-								<XNote phase="howToReact" @reacted="isReactionTutorialPushed = true"/>
-								<div v-if="!isReactionTutorialPushed">{{ i18n.ts._initialTutorial._reaction.reactToContinue }}</div>
-							</div>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 2" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate :disabled="!isReactionTutorialPushed" @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 3">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XTimeline/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 3" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 4">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XPostNote/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 3" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 5">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<div class="_gaps">
-								<XSensitive @succeeded="isSensitiveTutorialSucceeded = true"/>
-								<div v-if="!isSensitiveTutorialSucceeded">{{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.doItToContinue }}</div>
-							</div>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton v-if="initialPage !== 2" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate :disabled="!isSensitiveTutorialSucceeded" @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 6">
-				<div :class="$style.centerPage">
-					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts._initialTutorial._done.title }}</div>
-							<I18n :src="i18n.ts._initialTutorial._done.description" tag="div" style="padding: 0 16px;">
-								<template #link>
-									<a href="https://misskey-hub.net/docs/for-users/" rel="nofollow noopener" target="_blank" class="_link">{{ i18n.ts.help }}</a>
-								</template>
-							</I18n>
-							<div>{{ i18n.tsx._initialAccountSetting.haveFun({ name: instance.name ?? host }) }}</div>
-							<div class="_buttonsCenter" style="margin-top: 16px;">
-								<MkButton v-if="initialPage !== 4" rounded @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton rounded primary gradate @click="close(false)">{{ i18n.ts.close }}</MkButton>
-							</div>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-		</Transition>
-	</div>
+	<XTutorial
+		:initialPage="initialPage"
+		:skippable="true"
+		@pageChanged="handlePageChange"
+		@close="close"
+	/>
 </MkModalWindow>
 </template>
 
 <script lang="ts" setup>
-import { ref, shallowRef, watch } from 'vue';
+import { ref, shallowRef } from 'vue';
 import MkModalWindow from '@/components/MkModalWindow.vue';
-import MkButton from '@/components/MkButton.vue';
-import XNote from '@/components/MkTutorialDialog.Note.vue';
-import XTimeline from '@/components/MkTutorialDialog.Timeline.vue';
-import XPostNote from '@/components/MkTutorialDialog.PostNote.vue';
-import XSensitive from '@/components/MkTutorialDialog.Sensitive.vue';
-import MkAnimBg from '@/components/MkAnimBg.vue';
+import XTutorial from '@/components/MkTutorial.vue';
 import { i18n } from '@/i18n.js';
-import { instance } from '@/instance.js';
-import { host } from '@/config.js';
-import { claimAchievement } from '@/scripts/achievements.js';
 import * as os from '@/os.js';
 
 const props = defineProps<{
@@ -175,17 +47,11 @@ const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
 // eslint-disable-next-line vue/no-setup-props-destructure
 const page = ref(props.initialPage ?? 0);
 
-watch(page, (to) => {
-	// チュートリアルの枚数を増やしたら必ず変更すること！！
-	if (to === 6) {
-		claimAchievement('tutorialCompleted');
-	}
-});
+function handlePageChange(to: number) {
+	page.value = to;
+}
 
-const isReactionTutorialPushed = ref<boolean>(false);
-const isSensitiveTutorialSucceeded = ref<boolean>(false);
-
-async function close(skip: boolean) {
+async function close(skip?: boolean) {
 	if (skip) {
 		const { canceled } = await os.confirm({
 			type: 'warning',

packages/frontend/src/components/MkUserSetupDialog.Follow.stories.impl.ts

@@ -1,56 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import { HttpResponse, http } from 'msw';
-import { commonHandlers } from '../../.storybook/mocks.js';
-import { userDetailed } from '../../.storybook/fakes.js';
-import MkUserSetupDialog_Follow from './MkUserSetupDialog.Follow.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog_Follow,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog_Follow v-bind="props" />',
-		};
-	},
-	args: {
-
-	},
-	parameters: {
-		layout: 'centered',
-		msw: {
-			handlers: [
-				...commonHandlers,
-				http.post('/api/users', () => {
-					return HttpResponse.json([
-						userDetailed('44'),
-						userDetailed('49'),
-					]);
-				}),
-				http.post('/api/pinned-users', () => {
-					return HttpResponse.json([
-						userDetailed('44'),
-						userDetailed('49'),
-					]);
-				}),
-			],
-		},
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog_Follow>;

packages/frontend/src/components/MkUserSetupDialog.Privacy.stories.impl.ts

@@ -1,36 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import MkUserSetupDialog_Privacy from './MkUserSetupDialog.Privacy.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog_Privacy,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog_Privacy v-bind="props" />',
-		};
-	},
-	args: {
-
-	},
-	parameters: {
-		layout: 'centered',
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog_Privacy>;

packages/frontend/src/components/MkUserSetupDialog.Privacy.vue

@@ -1,71 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div class="_gaps">
-	<MkInfo>{{ i18n.ts._initialAccountSetting.theseSettingsCanEditLater }}</MkInfo>
-
-	<MkFolder>
-		<template #label>{{ i18n.ts.makeFollowManuallyApprove }}</template>
-		<template #icon><i class="ti ti-lock"></i></template>
-		<template #suffix>{{ isLocked ? i18n.ts.on : i18n.ts.off }}</template>
-
-		<MkSwitch v-model="isLocked">{{ i18n.ts.makeFollowManuallyApprove }}<template #caption>{{ i18n.ts.lockedAccountInfo }}</template></MkSwitch>
-	</MkFolder>
-
-	<MkFolder>
-		<template #label>{{ i18n.ts.hideOnlineStatus }}</template>
-		<template #icon><i class="ti ti-eye-off"></i></template>
-		<template #suffix>{{ hideOnlineStatus ? i18n.ts.on : i18n.ts.off }}</template>
-
-		<MkSwitch v-model="hideOnlineStatus">{{ i18n.ts.hideOnlineStatus }}<template #caption>{{ i18n.ts.hideOnlineStatusDescription }}</template></MkSwitch>
-	</MkFolder>
-
-	<MkFolder>
-		<template #label>{{ i18n.ts.noCrawle }}</template>
-		<template #icon><i class="ti ti-world-x"></i></template>
-		<template #suffix>{{ noCrawle ? i18n.ts.on : i18n.ts.off }}</template>
-
-		<MkSwitch v-model="noCrawle">{{ i18n.ts.noCrawle }}<template #caption>{{ i18n.ts.noCrawleDescription }}</template></MkSwitch>
-	</MkFolder>
-
-	<MkFolder>
-		<template #label>{{ i18n.ts.preventAiLearning }}</template>
-		<template #icon><i class="ti ti-photo-shield"></i></template>
-		<template #suffix>{{ preventAiLearning ? i18n.ts.on : i18n.ts.off }}</template>
-
-		<MkSwitch v-model="preventAiLearning">{{ i18n.ts.preventAiLearning }}<template #caption>{{ i18n.ts.preventAiLearningDescription }}</template></MkSwitch>
-	</MkFolder>
-
-	<MkInfo>{{ i18n.ts._initialAccountSetting.youCanEditMoreSettingsInSettingsPageLater }}</MkInfo>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { ref, watch } from 'vue';
-import { i18n } from '@/i18n.js';
-import MkSwitch from '@/components/MkSwitch.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import { misskeyApi } from '@/scripts/misskey-api.js';
-
-const isLocked = ref(false);
-const hideOnlineStatus = ref(false);
-const noCrawle = ref(false);
-const preventAiLearning = ref(true);
-
-watch([isLocked, hideOnlineStatus, noCrawle, preventAiLearning], () => {
-	misskeyApi('i/update', {
-		isLocked: !!isLocked.value,
-		hideOnlineStatus: !!hideOnlineStatus.value,
-		noCrawle: !!noCrawle.value,
-		preventAiLearning: !!preventAiLearning.value,
-	});
-});
-</script>
-
-<style lang="scss" module>
-
-</style>

packages/frontend/src/components/MkUserSetupDialog.Profile.stories.impl.ts

@@ -1,36 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import MkUserSetupDialog_Profile from './MkUserSetupDialog.Profile.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog_Profile,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog_Profile v-bind="props" />',
-		};
-	},
-	args: {
-
-	},
-	parameters: {
-		layout: 'centered',
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog_Profile>;

packages/frontend/src/components/MkUserSetupDialog.User.stories.impl.ts

@@ -1,37 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import { userDetailed } from '../../.storybook/fakes.js';
-import MkUserSetupDialog_User from './MkUserSetupDialog.User.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog_User,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog_User v-bind="props" />',
-		};
-	},
-	args: {
-		user: userDetailed(),
-	},
-	parameters: {
-		layout: 'centered',
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog_User>;

packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts

@@ -1,56 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-import { StoryObj } from '@storybook/vue3';
-import { HttpResponse, http } from 'msw';
-import { commonHandlers } from '../../.storybook/mocks.js';
-import { userDetailed } from '../../.storybook/fakes.js';
-import MkUserSetupDialog from './MkUserSetupDialog.vue';
-export const Default = {
-	render(args) {
-		return {
-			components: {
-				MkUserSetupDialog,
-			},
-			setup() {
-				return {
-					args,
-				};
-			},
-			computed: {
-				props() {
-					return {
-						...this.args,
-					};
-				},
-			},
-			template: '<MkUserSetupDialog v-bind="props" />',
-		};
-	},
-	args: {
-
-	},
-	parameters: {
-		layout: 'centered',
-		msw: {
-			handlers: [
-				...commonHandlers,
-				http.post('/api/users', () => {
-					return HttpResponse.json([
-						userDetailed('44'),
-						userDetailed('49'),
-					]);
-				}),
-				http.post('/api/pinned-users', () => {
-					return HttpResponse.json([
-						userDetailed('44'),
-						userDetailed('49'),
-					]);
-				}),
-			],
-		},
-	},
-} satisfies StoryObj<typeof MkUserSetupDialog>;

packages/frontend/src/components/MkUserSetupDialog.vue

@@ -1,258 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<MkModalWindow
-	ref="dialog"
-	:width="500"
-	:height="550"
-	data-cy-user-setup
-	@closed="emit('closed')"
->
-	<template v-if="page === 1" #header><i class="ti ti-user-edit"></i> {{ i18n.ts._initialAccountSetting.profileSetting }}</template>
-	<template v-else-if="page === 2" #header><i class="ti ti-lock"></i> {{ i18n.ts._initialAccountSetting.privacySetting }}</template>
-	<template v-else-if="page === 3" #header><i class="ti ti-user-plus"></i> {{ i18n.ts.follow }}</template>
-	<template v-else-if="page === 4" #header><i class="ti ti-bell-plus"></i> {{ i18n.ts.pushNotification }}</template>
-	<template v-else-if="page === 5" #header>{{ i18n.ts.done }}</template>
-	<template v-else #header>{{ i18n.ts.initialAccountSetting }}</template>
-
-	<div style="overflow-x: clip;">
-		<div :class="$style.progressBar">
-			<div :class="$style.progressBarValue" :style="{ width: `${(page / 5) * 100}%` }"></div>
-		</div>
-		<Transition
-			mode="out-in"
-			:enterActiveClass="$style.transition_x_enterActive"
-			:leaveActiveClass="$style.transition_x_leaveActive"
-			:enterFromClass="$style.transition_x_enterFrom"
-			:leaveToClass="$style.transition_x_leaveTo"
-		>
-			<template v-if="page === 0">
-				<div :class="$style.centerPage">
-					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-confetti" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts._initialAccountSetting.accountCreated }}</div>
-							<div>{{ i18n.ts._initialAccountSetting.letsStartAccountSetup }}</div>
-							<MkButton primary rounded gradate style="margin: 16px auto 0 auto;" data-cy-user-setup-continue @click="page++">{{ i18n.ts._initialAccountSetting.profileSetting }} <i class="ti ti-arrow-right"></i></MkButton>
-							<MkButton style="margin: 0 auto;" transparent rounded @click="later(true)">{{ i18n.ts.later }}</MkButton>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-			<template v-else-if="page === 1">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XProfile :onNextButtonEnabled="(state) => page1NextButtonDisabled = !state"/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate data-cy-user-setup-continue :disabled="page1NextButtonDisabled" @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 2">
-				<div style="height: 100cqh; overflow: auto;">
-					<div :class="$style.pageRoot">
-						<MkSpacer :marginMin="20" :marginMax="28" :class="$style.pageMain">
-							<XPrivacy/>
-						</MkSpacer>
-						<div :class="$style.pageFooter">
-							<div class="_buttonsCenter">
-								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate data-cy-user-setup-continue @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 3">
-				<div style="height: 100cqh; overflow: auto;">
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<XFollow/>
-					</MkSpacer>
-					<div :class="$style.pageFooter">
-						<div class="_buttonsCenter">
-							<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-							<MkButton primary rounded gradate style="" data-cy-user-setup-continue @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-						</div>
-					</div>
-				</div>
-			</template>
-			<template v-else-if="page === 4">
-				<div :class="$style.centerPage">
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-bell-ringing-2" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts.pushNotification }}</div>
-							<div style="padding: 0 16px;">{{ i18n.tsx._initialAccountSetting.pushNotificationDescription({ name: instance.name ?? host }) }}</div>
-							<MkPushNotificationAllowButton primary showOnlyToRegister style="margin: 0 auto;"/>
-							<div class="_buttonsCenter" style="margin-top: 16px;">
-								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton primary rounded gradate data-cy-user-setup-continue @click="page++">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-			<template v-else-if="page === 5">
-				<div :class="$style.centerPage">
-					<MkAnimBg style="position: absolute; top: 0;" :scale="1.5"/>
-					<MkSpacer :marginMin="20" :marginMax="28">
-						<div class="_gaps" style="text-align: center;">
-							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
-							<div style="font-size: 120%;">{{ i18n.ts._initialAccountSetting.initialAccountSettingCompleted }}</div>
-							<div>{{ i18n.tsx._initialAccountSetting.youCanContinueTutorial({ name: instance.name ?? host }) }}</div>
-							<div class="_buttonsCenter" style="margin-top: 16px;">
-								<MkButton rounded primary gradate data-cy-user-setup-continue @click="launchTutorial()">{{ i18n.ts._initialAccountSetting.startTutorial }} <i class="ti ti-arrow-right"></i></MkButton>
-							</div>
-							<div class="_buttonsCenter">
-								<MkButton rounded data-cy-user-setup-back @click="page--"><i class="ti ti-arrow-left"></i> {{ i18n.ts.goBack }}</MkButton>
-								<MkButton rounded primary data-cy-user-setup-continue @click="setupComplete()">{{ i18n.ts.close }}</MkButton>
-							</div>
-						</div>
-					</MkSpacer>
-				</div>
-			</template>
-		</Transition>
-	</div>
-</MkModalWindow>
-</template>
-
-<script lang="ts" setup>
-import { ref, shallowRef, watch, nextTick, defineAsyncComponent } from 'vue';
-import MkModalWindow from '@/components/MkModalWindow.vue';
-import MkButton from '@/components/MkButton.vue';
-import XProfile from '@/components/MkUserSetupDialog.Profile.vue';
-import XFollow from '@/components/MkUserSetupDialog.Follow.vue';
-import XPrivacy from '@/components/MkUserSetupDialog.Privacy.vue';
-import MkAnimBg from '@/components/MkAnimBg.vue';
-import { i18n } from '@/i18n.js';
-import { instance } from '@/instance.js';
-import { host } from '@/config.js';
-import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue';
-import { defaultStore } from '@/store.js';
-import * as os from '@/os.js';
-
-const emit = defineEmits<{
-	(ev: 'closed'): void;
-}>();
-
-const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
-
-// eslint-disable-next-line vue/no-setup-props-destructure
-const page = ref(defaultStore.state.accountSetupWizard);
-
-const page1NextButtonDisabled = ref(false);
-
-watch(page, () => {
-	defaultStore.set('accountSetupWizard', page.value);
-});
-
-async function close(skip: boolean) {
-	if (skip) {
-		const { canceled } = await os.confirm({
-			type: 'warning',
-			text: i18n.ts._initialAccountSetting.skipAreYouSure,
-		});
-		if (canceled) return;
-	}
-
-	dialog.value?.close();
-	defaultStore.set('accountSetupWizard', -1);
-}
-
-function setupComplete() {
-	defaultStore.set('accountSetupWizard', -1);
-	dialog.value?.close();
-}
-
-function launchTutorial() {
-	setupComplete();
-	nextTick(() => {
-		os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {
-			initialPage: 1,
-		}, {}, 'closed');
-	});
-}
-
-async function later(later: boolean) {
-	if (later) {
-		const { canceled } = await os.confirm({
-			type: 'warning',
-			text: i18n.ts._initialAccountSetting.laterAreYouSure,
-		});
-		if (canceled) return;
-	}
-
-	dialog.value?.close();
-	defaultStore.set('accountSetupWizard', 0);
-}
-</script>
-
-<style lang="scss" module>
-.transition_x_enterActive,
-.transition_x_leaveActive {
-	transition: opacity 0.3s cubic-bezier(0,0,.35,1), transform 0.3s cubic-bezier(0,0,.35,1);
-}
-.transition_x_enterFrom {
-	opacity: 0;
-	transform: translateX(50px);
-}
-.transition_x_leaveTo {
-	opacity: 0;
-	transform: translateX(-50px);
-}
-
-.progressBar {
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 10;
-	width: 100%;
-	height: 4px;
-}
-
-.progressBarValue {
-	height: 100%;
-	background: linear-gradient(90deg, var(--buttonGradateA), var(--buttonGradateB));
-	transition: all 0.5s cubic-bezier(0,.5,.5,1);
-}
-
-.centerPage {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	height: 100cqh;
-	padding-bottom: 30px;
-	box-sizing: border-box;
-}
-
-.pageRoot {
-	display: flex;
-	flex-direction: column;
-	min-height: 100%;
-}
-
-.pageMain {
-	flex-grow: 1;
-}
-
-.pageFooter {
-	position: sticky;
-	bottom: 0;
-	left: 0;
-	flex-shrink: 0;
-	padding: 12px;
-	border-top: solid 0.5px var(--divider);
-	-webkit-backdrop-filter: blur(15px);
-	backdrop-filter: blur(15px);
-}
-</style>

packages/frontend/src/components/form/link.vue

@@ -5,17 +5,31 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div :class="[$style.root, { [$style.inline]: inline }]">
-	<a v-if="external" :class="$style.main" class="_button" :href="to" rel="nofollow noopener" target="_blank">
+	<a v-if="external" :class="[$style.main, { [$style.large]: large }]" class="_button" rel="nofollow noopener" :href="to" target="_blank">
 		<span :class="$style.icon"><slot name="icon"></slot></span>
-		<span :class="$style.text"><slot></slot></span>
+		<div :class="$style.headerText">
+			<div>
+				<MkCondensedLine :minScale="2 / 3"><slot></slot></MkCondensedLine>
+			</div>
+			<div v-if="$slots.caption" :class="$style.headerTextSub">
+				<MkCondensedLine :minScale="2 / 3"><slot name="caption"></slot></MkCondensedLine>
+			</div>
+		</div>
 		<span :class="$style.suffix">
 			<span :class="$style.suffixText"><slot name="suffix"></slot></span>
 			<i class="ti ti-external-link"></i>
 		</span>
 	</a>
-	<MkA v-else :class="[$style.main, { [$style.active]: active }]" class="_button" :to="to" :behavior="behavior">
+	<MkA v-else :class="[$style.main, { [$style.large]: large, [$style.active]: active }]" class="_button" :to="to" :behavior="behavior">
 		<span :class="$style.icon"><slot name="icon"></slot></span>
-		<span :class="$style.text"><slot></slot></span>
+		<div :class="$style.headerText">
+			<div>
+				<MkCondensedLine :minScale="2 / 3"><slot></slot></MkCondensedLine>
+			</div>
+			<div v-if="$slots.caption" :class="$style.headerTextSub">
+				<MkCondensedLine :minScale="2 / 3"><slot name="caption"></slot></MkCondensedLine>
+			</div>
+		</div>
 		<span :class="$style.suffix">
 			<span :class="$style.suffixText"><slot name="suffix"></slot></span>
 			<i class="ti ti-chevron-right"></i>
@@ -25,7 +39,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
+import MkA from '@/components/global/MkA.vue';
+import MkCondensedLine from '@/components/global/MkCondensedLine.vue';
 
 const props = defineProps<{
 	to: string;
@@ -33,6 +48,7 @@ const props = defineProps<{
 	external?: boolean;
 	behavior?: null | 'window' | 'browser';
 	inline?: boolean;
+	large?: boolean;
 }>();
 </script>
 
@@ -55,6 +71,10 @@ const props = defineProps<{
 	border-radius: 6px;
 	font-size: 0.9em;
 
+	&.large {
+		font-size: 1em;
+	}
+
 	&:hover {
 		text-decoration: none;
 		background: var(--buttonHoverBg);
@@ -81,11 +101,17 @@ const props = defineProps<{
 	}
 }
 
-.text {
-	flex-shrink: 1;
-	white-space: normal;
+.headerText {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	text-align: start;
+	overflow: hidden;
 	padding-right: 12px;
-	text-align: center;
+}
+
+.headerTextSub {
+	color: var(--fgTransparentWeak);
+	font-size: .85em;
 }
 
 .suffix {

packages/frontend/src/pages/admin/moderation.vue

@@ -18,6 +18,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<template #label>{{ i18n.ts.emailRequiredForSignup }}</template>
 					</MkSwitch>
 
+					<MkSwitch v-model="prohibitSkippingInitialTutorial">
+						<template #label>{{ i18n.ts.prohibitSkippingInitialTutorial }}</template>
+						<template #caption>{{ i18n.ts.prohibitSkippingInitialTutorialDescription }}</template>
+					</MkSwitch>
+
 					<FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink>
 
 					<MkInput v-model="tosUrl" type="url">
@@ -90,6 +95,7 @@ import FormLink from '@/components/form/link.vue';
 
 const enableRegistration = ref<boolean>(false);
 const emailRequiredForSignup = ref<boolean>(false);
+const prohibitSkippingInitialTutorial = ref<boolean>(false);
 const sensitiveWords = ref<string>('');
 const prohibitedWords = ref<string>('');
 const hiddenTags = ref<string>('');
@@ -103,6 +109,7 @@ async function init() {
 	const meta = await misskeyApi('admin/meta');
 	enableRegistration.value = !meta.disableRegistration;
 	emailRequiredForSignup.value = meta.emailRequiredForSignup;
+	prohibitSkippingInitialTutorial.value = !meta.canSkipInitialTutorial;
 	sensitiveWords.value = meta.sensitiveWords.join('\n');
 	prohibitedWords.value = meta.prohibitedWords.join('\n');
 	hiddenTags.value = meta.hiddenTags.join('\n');
@@ -117,6 +124,7 @@ function save() {
 	os.apiWithDialog('admin/update-meta', {
 		disableRegistration: !enableRegistration.value,
 		emailRequiredForSignup: emailRequiredForSignup.value,
+		canSkipInitialTutorial: !prohibitSkippingInitialTutorial.value,
 		tosUrl: tosUrl.value,
 		privacyPolicyUrl: privacyPolicyUrl.value,
 		sensitiveWords: sensitiveWords.value.split('\n'),

packages/frontend/src/pages/onboarding.vue

@@ -0,0 +1,394 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="[$style.onboardingRoot, { [$style.ready]: animationPhase >= 1 }]">
+	<MkAnimBg :class="$style.onboardingBg"/>
+	<div :class="[$style.onboardingContainer]">
+		<div :class="[$style.tutorialTitle, { [$style.showing]: (page !== 0) }]">
+			<div :class="$style.text">
+				<span v-if="page === 1"><i class="ti ti-pencil"></i> {{ i18n.ts._initialTutorial._note.title }}</span>
+				<span v-else-if="page === 2"><i class="ti ti-mood-smile"></i> {{ i18n.ts._initialTutorial._reaction.title }}</span>
+				<span v-else-if="page === 3"><i class="ti ti-home"></i> {{ i18n.ts._initialTutorial._timeline.title }}</span>
+				<span v-else-if="page === 4"><i class="ti ti-user-plus"></i> {{ i18n.ts.follow }}</span>
+				<span v-else-if="page === 5"><i class="ti ti-pencil-plus"></i> {{ i18n.ts._initialTutorial._postNote.title }}</span>
+				<span v-else-if="page === 6"><i class="ti ti-eye-exclamation"></i> {{ i18n.ts._initialTutorial._howToMakeAttachmentsSensitive.title }}</span>
+				<span v-else-if="page === 7"><i class="ti ti-lock"></i> {{ i18n.ts.privacy }}</span>
+				<span v-else-if="page === MAX_PAGE"><!-- なんもなし --></span>
+				<span v-else>{{ i18n.ts._initialTutorial.title }}</span>
+			</div>
+			<div v-if="instance.canSkipInitialTutorial" :class="$style.closeButton">
+				<button class="_button" data-cy-user-setup-close @click="cancel"><i class="ti ti-x"></i></button>
+			</div>
+		</div>
+		<MkTutorial
+			:class="$style.tutorialRoot"
+			:showProgressbar="true"
+			:skippable="false"
+			:withSetup="true"
+			@pageChanged="pageChangeHandler"
+		>
+			<template #welcome="{ next }">
+				<!-- Tips for large-scale server admins: you should customize this slide for better branding -->
+				<!-- 大規模サーバーの管理者さんへ: このスライドの内容をサーバー独自でアレンジすると良さそうなのでやってみてね -->
+				<div ref="welcomePageRootEl" :class="$style.welcomePageRoot">
+					<canvas ref="confettiEl" :class="$style.welcomePageConfetti"></canvas>
+					<div
+						:class="[
+							$style.centerPage,
+							$style.welcomePageMain,
+							{
+								[$style.appear]: animationPhase >= 3,
+								[$style.done]: animationPhase === 4,
+							}
+						]"
+					>
+						<MkSpacer :marginMin="20" :marginMax="28">
+							<div class="_gaps" style="word-break: auto-phrase; text-align: center;">
+								<img ref="instanceIconEl" :src="instance.iconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
+								<div>
+									<div style="font-size: 135%;">{{ i18n.ts._initialTutorial._onboardingLanding.accountCreated }}</div>
+									<div>{{ i18n.tsx._initialTutorial._onboardingLanding.welcomeToX({ name: instance.name ?? host }) }}</div>
+								</div>
+								<div>{{ i18n.tsx._initialTutorial._onboardingLanding.description({ name: instance.name ?? host }) }}</div>
+								<MkButton large primary rounded gradate style="margin: 16px auto 0;" data-cy-user-setup-continue @click="next">{{ i18n.ts.start }} <i class="ti ti-arrow-right"></i></MkButton>
+								<MkButton v-if="instance.canSkipInitialTutorial" transparent rounded style="margin: 0 auto;" data-cy-user-setup-close @click="cancel">{{ i18n.ts.later }}</MkButton>
+								<MkInfo v-else warn style="width: fit-content; margin: 0 auto; text-align: start; white-space: pre-wrap;">{{ i18n.ts._initialTutorial._onboardingLanding.adminForcesToTakeTutorial }}</MkInfo>
+								<MkInfo style="width: fit-content; margin: 0 auto; text-align: start; white-space: pre-wrap;">{{ i18n.tsx._initialTutorial._onboardingLanding.takesAbout({ min: 3 }) }}</MkInfo>
+							</div>
+						</MkSpacer>
+					</div>
+					<div
+						:class="[
+							$style.welcomePageAnimRoot,
+							{
+								[$style.appear]: animationPhase === 2,
+								[$style.move]: animationPhase === 3,
+							},
+						]"
+					>
+						<img :src="instance.iconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
+					</div>
+				</div>
+			</template>
+			<template #finish="{ prev }">
+				<div :class="$style.centerPage">
+					<MkSpacer :marginMin="20" :marginMax="28">
+						<div class="_gaps">
+							<i class="ti ti-check" style="display: block; margin: auto; font-size: 3em; color: var(--accent);"></i>
+							<div style="text-align: center; font-size: 120%;">{{ i18n.ts._initialTutorial._done.title }}</div>
+							<div style="text-align: center;">{{ i18n.tsx._initialTutorial._onboardingDone.description({ name: instance.name ?? host }) }}</div>
+							<div>
+								<FormLink v-if="originalPath && originalPath !== '/'" :to="originalPath" large :behavior="'browser'">
+									<template #icon><i class="ti ti-directions"></i></template>
+									{{ i18n.ts._initialTutorial._onboardingDone.backToOriginalPath }}
+									<template #caption>{{ i18n.ts._initialTutorial._onboardingDone.backToOriginalPathDescription }}</template>
+								</FormLink>
+								<hr v-if="originalPath && originalPath !== '/'">
+								<div class="_gaps_s">
+									<FormLink to="/settings/profile" large :behavior="'browser'">
+										<template #icon><i class="ti ti-user"></i></template>
+										{{ i18n.ts._initialTutorial._onboardingDone.profile }}
+										<template #caption>{{ i18n.ts._initialTutorial._onboardingDone.profileDescription }}</template>
+									</FormLink>
+									<FormLink to="/explore" large :behavior="'browser'">
+										<template #icon><i class="ti ti-hash"></i></template>
+										{{ i18n.ts.explore }}
+										<template #caption>{{ i18n.ts._initialTutorial._onboardingDone.exploreDescription }}</template>
+									</FormLink>
+									<FormLink to="/" large :behavior="'browser'" data-cy-user-setup-complete>
+										<template #icon><i class="ti ti-home"></i></template>
+										{{ i18n.ts._initialTutorial._onboardingDone.goToTimeline }}
+										<template #caption>{{ i18n.ts._initialTutorial._onboardingDone.goToTimelineDescription }}</template>
+									</FormLink>
+								</div>
+							</div>
+							<MkInfo style="border-radius: 6px;">{{ i18n.ts._initialTutorial._done.youCanReferTutorialBy }}</MkInfo>
+							<div style="text-align: center;">{{ i18n.tsx._initialTutorial._done.haveFun({ name: instance.name ?? host }) }}</div>
+						</div>
+					</MkSpacer>
+				</div>
+			</template>
+		</MkTutorial>
+	</div>
+</div>
+</template>
+
+<script setup lang="ts">
+import { ref, shallowRef, computed, onMounted } from 'vue';
+import { create as createConfetti } from 'canvas-confetti';
+
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { reactionPicker } from '@/scripts/reaction-picker.js';
+import { i18n } from '@/i18n.js';
+import { instance } from '@/instance.js';
+import { host } from '@/config.js';
+import { confirm as osConfirm } from '@/os.js';
+
+import MkAnimBg from '@/components/MkAnimBg.vue';
+import MkButton from '@/components/MkButton.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import MkTutorial, { MAX_PAGE } from '@/components/MkTutorial.vue';
+
+import FormLink from '@/components/form/link.vue';
+
+const page = ref(0);
+
+function pageChangeHandler(to: number) {
+	page.value = to;
+}
+
+// See: @/_boot_/common.ts L123 for details
+const query = new URLSearchParams(location.search);
+const originalPath = query.get('redirected_from');
+
+async function cancel() {
+	const confirm = await osConfirm({
+		type: 'question',
+		title: i18n.ts._initialTutorial.skipAreYouSure,
+		text: i18n.ts._initialTutorial._done.youCanReferTutorialBy,
+		okText: i18n.ts.yes,
+		cancelText: i18n.ts.no,
+	});
+
+	if (confirm.canceled) return;
+
+	location.href = '/';
+}
+
+// #region デフォルトオープニング画面のアニメーション
+const confettiEl = shallowRef<HTMLCanvasElement | null>(null);
+const welcomePageRootEl = shallowRef<HTMLDivElement | null>(null);
+const instanceIconEl = shallowRef<HTMLImageElement | null>(null);
+const instanceIconY = ref(0);
+// 30pxは文字が上がってくる距離、40pxは上部ヘッダの高さ
+const instanceIconYPx = computed(() => `${instanceIconY.value - 30 + 40}px`);
+
+/**
+ * 0 … なにもしない
+ * 1 … 背景表示（mounted）
+ * 2 … サーバーロゴ出現
+ * 3 … サーバーロゴ移動・文字表示
+ * 4 … 完了（オープニング用ロゴ消滅）
+ */
+const animationPhase = ref(0);
+
+// 画面上部に表示されるアイコンの中心Y座標を取得
+function getIconY(instanceIconEl: HTMLImageElement, welcomePageRootEl: HTMLDivElement) {
+	const instanceIconElRect = instanceIconEl.getBoundingClientRect();
+	return instanceIconElRect.top - welcomePageRootEl.getBoundingClientRect().top;
+}
+
+function instanceIconElImageLoaded() {
+	return new Promise<void>((resolve) => {
+		if (instanceIconEl.value!.complete) {
+			resolve();
+		} else {
+			instanceIconEl.value!.addEventListener('load', () => resolve(), { once: true });
+		}
+	});
+}
+
+onMounted(() => {
+	const confetti = createConfetti(confettiEl.value!, {
+		resize: true,
+	});
+
+	instanceIconY.value = getIconY(instanceIconEl.value!, welcomePageRootEl.value!);
+	window.addEventListener('resize', () => {
+		instanceIconY.value = getIconY(instanceIconEl.value!, welcomePageRootEl.value!);
+	}, { passive: true });
+
+	// チュートリアル内で必須（subBootでは初期化されないので）
+	Promise.all([
+		reactionPicker.init(),
+		instanceIconElImageLoaded(),
+	]).then(() => {
+		setTimeout(() => {
+			// 待たないとアニメーションが正しく動かない場合がある
+			animationPhase.value = 1;
+
+			setTimeout(() => {
+				animationPhase.value = 2;
+
+				setTimeout(() => {
+					animationPhase.value = 3;
+
+					setTimeout(() => {
+						animationPhase.value = 4;
+						confetti({
+							spread: 70,
+							origin: { y: 0.5 },
+						});
+					}, 1000);
+				}, 1250);
+			}, 500);
+		}, 100);
+	});
+});
+
+// #endregion
+
+definePageMetadata(() => ({
+	title: 'Onboarding',
+	description: 'Welcome to Misskey!',
+}));
+</script>
+
+<style lang="scss" module>
+.onboardingRoot {
+	box-sizing: border-box;
+	display: grid;
+	place-content: center;
+	min-height: 100svh;
+	padding: 32px 32px 64px 32px;
+}
+
+.onboardingBg {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+	transition: opacity 2s ease;
+}
+
+.onboardingContainer {
+	position: relative;
+	border-radius: var(--radius);
+	background-color: var(--acrylicPanel);
+	overflow: clip;
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+	max-width: 650px;
+	max-height: 700px;
+	width: 100vw;
+	height: 100svh;
+
+	container-type: inline-size;
+}
+
+.tutorialTitle {
+	position: absolute;
+	box-sizing: border-box;
+	top: 0;
+	left: 0;
+	width: 100%;
+	font-size: 14px;
+	line-height: 40px;
+	height: 40px;
+	padding: 0 var(--margin);
+	background: var(--panelHighlight);
+	display: flex;
+	transition: transform 0.5s ease;
+	transform: translateY(-100%);
+
+	&.showing {
+		transform: translateY(0);
+	}
+
+	.text {
+		font-weight: 700;
+	}
+
+	.closeButton {
+		margin-left: auto;
+
+		>._button {
+			padding: 8px;
+		}
+	}
+}
+
+.tutorialRoot {
+	margin-top: 40px;
+	height: calc(100% - 40px);
+}
+
+.ready {
+	& .onboardingBg {
+		opacity: 1;
+	}
+}
+
+.centerPage {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	min-height: 100%;
+	box-sizing: border-box;
+	overflow-y: auto;
+}
+
+.welcomePageRoot {
+	position: relative;
+	height: 100%;
+}
+
+.welcomePageMain {
+	opacity: 0;
+	transform: translateY(30px);
+	visibility: hidden;
+
+	.instanceIcon {
+		opacity: 0;
+	}
+
+	&.appear {
+		transition: opacity 0.75s 0.25s ease, transform 0.75s 0.25s ease;
+		opacity: 1;
+		transform: translateY(0);
+		visibility: visible;
+	}
+
+	&.done .instanceIcon {
+		opacity: 1;
+	}
+}
+
+.instanceIcon {
+	height: 5em;
+	width: 5em;
+	margin: 0 auto;
+	object-fit: contain;
+	border-radius: calc(var(--radius) / 2);
+}
+
+.welcomePageConfetti,
+.welcomePageAnimRoot {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	overflow: clip;
+	pointer-events: none;
+
+	.instanceIcon {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		opacity: 0;
+	}
+
+	&.appear {
+		.instanceIcon {
+			opacity: 1;
+			transform: translate(-50%, -50%) scale(1.5);
+			transition: opacity 1s cubic-bezier(0.22, 0.61, 0.36, 1), transform 1s cubic-bezier(0.22, 0.61, 0.36, 1);
+		}
+	}
+
+	&.move {
+		.instanceIcon {
+			opacity: 1;
+			transform: translate(-50%, 0) scale(1);
+			top: v-bind(instanceIconYPx);
+			transition: transform 1s ease, top 1s ease;
+		}
+	}
+}
+</style>

packages/frontend/src/pages/signup-complete.vue

@@ -46,7 +46,7 @@ function submit() {
 	misskeyApi('signup-pending', {
 		code: props.code,
 	}).then(res => {
-		return login(res.i, '/');
+		return login(res.i, '/onboarding');
 	}).catch(() => {
 		submitting.value = false;
 

packages/frontend/src/router/definition.ts

@@ -194,6 +194,10 @@ const routes: RouteDef[] = [{
 }, {
 	path: '/signup-complete/:code',
 	component: page(() => import('@/pages/signup-complete.vue')),
+}, {
+	path: '/onboarding',
+	component: page(() => import('@/pages/onboarding.vue')),
+	loginRequired: true,
 }, {
 	path: '/announcements',
 	component: page(() => import('@/pages/announcements.vue')),

packages/frontend/src/scripts/reaction-picker.ts

@@ -14,12 +14,15 @@ class ReactionPicker {
 	private targetNote: Ref<Misskey.entities.Note | null> = ref(null);
 	private onChosen?: (reaction: string) => void;
 	private onClosed?: () => void;
+	public isInitialized = false;
 
 	constructor() {
 		// nop
 	}
 
 	public async init() {
+		if (this.isInitialized) return;
+
 		const reactionsRef = defaultStore.reactiveState.reactions;
 		await popup(defineAsyncComponent(() => import('@/components/MkEmojiPickerDialog.vue')), {
 			src: this.src,
@@ -39,6 +42,7 @@ class ReactionPicker {
 				if (this.onClosed) this.onClosed();
 			},
 		});
+		this.isInitialized = true;
 	}
 
 	public show(src: HTMLElement | null, targetNote: Misskey.entities.Note | null, onChosen?: ReactionPicker['onChosen'], onClosed?: ReactionPicker['onClosed']) {

packages/misskey-js/src/autogen/types.ts

@@ -5031,6 +5031,7 @@ export type components = {
       defaultLightTheme: string | null;
       disableRegistration: boolean;
       emailRequiredForSignup: boolean;
+      canSkipInitialTutorial: boolean;
       enableHcaptcha: boolean;
       hcaptchaSiteKey: string | null;
       enableMcaptcha: boolean;
@@ -5177,6 +5178,7 @@ export type operations = {
             cacheRemoteFiles: boolean;
             cacheRemoteSensitiveFiles: boolean;
             emailRequiredForSignup: boolean;
+            canSkipInitialTutorial: boolean;
             enableHcaptcha: boolean;
             hcaptchaSiteKey: string | null;
             enableMcaptcha: boolean;
@@ -9844,6 +9846,7 @@ export type operations = {
           cacheRemoteFiles?: boolean;
           cacheRemoteSensitiveFiles?: boolean;
           emailRequiredForSignup?: boolean;
+          canSkipInitialTutorial?: boolean;
           enableHcaptcha?: boolean;
           hcaptchaSiteKey?: string | null;
           hcaptchaSecretKey?: string | null;

pnpm-lock.yaml

@@ -944,6 +944,9 @@ importers:
       '@testing-library/vue':
         specifier: 8.1.0
         version: 8.1.0(@vue/compiler-sfc@3.4.15)(vue@3.4.15(typescript@5.4.5))
+      '@types/canvas-confetti':
+        specifier: ^1.6.4
+        version: 1.6.4
       '@types/escape-regexp':
         specifier: 0.0.3
         version: 0.0.3
@@ -4076,6 +4079,9 @@ packages:
   '@types/cacheable-request@6.0.3':
     resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
 
+  '@types/canvas-confetti@1.6.4':
+    resolution: {integrity: sha512-fNyZ/Fdw/Y92X0vv7B+BD6ysHL4xVU5dJcgzgxLdGbn8O3PezZNIJpml44lKM0nsGur+o/6+NZbZeNTt00U1uA==}
+
   '@types/chai-subset@1.3.5':
     resolution: {integrity: sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==}
 
@@ -10708,8 +10714,8 @@ packages:
   vue-component-type-helpers@2.0.19:
     resolution: {integrity: sha512-cN3f1aTxxKo4lzNeQAkVopswuImUrb5Iurll9Gaw5cqpnbTAxtEMM1mgi6ou4X79OCyqYv1U1mzBHJkzmiK82w==}
 
-  vue-component-type-helpers@2.0.26:
-    resolution: {integrity: sha512-sO9qQ8oC520SW6kqlls0iqDak53gsTVSrYylajgjmkt1c0vcgjsGSy1KzlDrbEx8pm02IEYhlUkU5hCYf8rwtg==}
+  vue-component-type-helpers@2.0.29:
+    resolution: {integrity: sha512-58i+ZhUAUpwQ+9h5Hck0D+jr1qbYl4voRt5KffBx8qzELViQ4XdT/Tuo+mzq8u63teAG8K0lLaOiL5ofqW38rg==}
 
   vue-demi@0.14.7:
     resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
@@ -14781,7 +14787,7 @@ snapshots:
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       vue: 3.4.15(typescript@5.4.5)
-      vue-component-type-helpers: 2.0.26
+      vue-component-type-helpers: 2.0.29
     transitivePeerDependencies:
       - encoding
       - prettier
@@ -15070,6 +15076,8 @@ snapshots:
       '@types/node': 20.12.12
       '@types/responselike': 1.0.3
 
+  '@types/canvas-confetti@1.6.4': {}
+
   '@types/chai-subset@1.3.5':
     dependencies:
       '@types/chai': 4.3.16
@@ -22712,7 +22720,7 @@ snapshots:
 
   vue-component-type-helpers@2.0.19: {}
 
-  vue-component-type-helpers@2.0.26: {}
+  vue-component-type-helpers@2.0.29: {}
 
   vue-demi@0.14.7(vue@3.4.15(typescript@5.4.5)):
     dependencies: