From 37f6a93e715db623b7002b69477e589f94fa2df0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 8 Nov 2022 23:48:03 -0800
Subject: [PATCH] new intro test

---
 locales/en-US.yml                             |   8 +-
 package.json                                  |   2 +-
 .../src/components/MkTutorialDialog.vue       | 146 ++++++++++++++++++
 packages/client/src/pages/timeline.vue        |   6 +-
 4 files changed, 153 insertions(+), 9 deletions(-)
 create mode 100644 packages/client/src/components/MkTutorialDialog.vue

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 47025e795..1c81da913 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1214,13 +1214,11 @@ _time:
 _tutorial:
   title: "How to use Calckey"
   step1_1: "Welcome!"
-  step1_2: "This page is called the \"timeline\". It shows chronologically ordered \"notes\" of people who you \"follow\"."
-  step1_3: "Your timeline is currently empty, since you have not posted any notes or followed anyone yet."
+  step1_2: "Let's get you set up."
   step2_1: "Let's finish setting up your profile before writing a note or following anyone."
   step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you."
-  step3_1: "Finished setting up your profile?"
-  step3_2: "Then let's try posting a note next. You can do so by pressing the button with a pencil icon on the screen."
-  step3_3: "Fill in the modal and press the button on the top right to post."
+  step3_1: "Now time to follow some people!"
+  step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started."
   step3_4: "Have nothing to say? Try \"just setting up my msky\"!"
   step4_1: "Finished posting your first note?"
   step4_2: "Hurray! Now your first note should be displayed on your timeline."
diff --git a/package.json b/package.json
index f5f8f37ab..78d27e4c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.9.24",
+	"version": "12.119.0-calc.10-b.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue
new file mode 100644
index 000000000..e13ec22c5
--- /dev/null
+++ b/packages/client/src/components/MkTutorialDialog.vue
@@ -0,0 +1,146 @@
+<template>
+<XModalWindow
+	ref="dialog"
+	:width="800"
+	:height="500"
+	:scroll="false"
+	@close="dialog.close()"
+	@closed="$emit('closed')"
+>
+	<template #header>{{ i18n.ts.signup }}</template>
+
+	<div class="_monolithic_">
+		<div class="_section">
+			<div class="_title"><i class="ph-info-bold ph-lg"></i> {{ i18n.ts._tutorial.title }}</div>
+			<div v-if="tutorial === 0" class="_content">
+				<div>{{ i18n.ts._tutorial.step1_1 }}</div>
+				<div>{{ i18n.ts._tutorial.step1_2 }}</div>
+			</div>
+			<div v-else-if="tutorial === 1" class="_content">
+				<div>{{ i18n.ts._tutorial.step2_1 }}</div>
+				<div>{{ i18n.ts._tutorial.step2_2 }}</div>
+				<XSettings/>
+			</div>
+			<div v-else-if="tutorial === 2" class="_content">
+				<div>{{ i18n.ts._tutorial.step3_1 }}</div>
+				<div>{{ i18n.ts._tutorial.step3_2 }}</div>
+				<XFeaturedUsers/>
+			</div>
+			<div v-else-if="tutorial === 3" class="_content">
+				<div>{{ i18n.ts._tutorial.step4_1 }}</div>
+				<div>{{ i18n.ts._tutorial.step4_2 }}</div>
+			</div>
+			<div v-else-if="tutorial === 4" class="_content">
+				<div>{{ i18n.ts._tutorial.step5_1 }}</div>
+				<I18n :src="i18n.ts._tutorial.step5_2" tag="div">
+					<template #featured>
+						<MkA class="_link" to="/featured">{{ i18n.ts.featured }}</MkA>
+					</template>
+					<template #explore>
+						<MkA class="_link" to="/explore">{{ i18n.ts.explore }}</MkA>
+					</template>
+				</I18n>
+				<div>{{ i18n.ts._tutorial.step5_3 }}</div>
+				<small>{{ i18n.ts._tutorial.step5_4 }}</small>
+			</div>
+			<div v-else-if="tutorial === 5" class="_content">
+				<div>{{ i18n.ts._tutorial.step6_1 }}</div>
+				<div>{{ i18n.ts._tutorial.step6_2 }}</div>
+				<div>{{ i18n.ts._tutorial.step6_3 }}</div>
+			</div>
+			<div v-else-if="tutorial === 6" class="_content">
+				<div>{{ i18n.ts._tutorial.step7_1 }}</div>
+				<I18n :src="i18n.ts._tutorial.step7_2" tag="div">
+					<template #help>
+						<a href="https://misskey-hub.net/help.html" target="_blank" class="_link">{{ i18n.ts.help }}</a>
+					</template>
+				</I18n>
+				<div>{{ i18n.ts._tutorial.step7_3 }}</div>
+			</div>
+			<div class="_footer navigation">
+				<div class="step">
+					<button class="arrow _button" :disabled="tutorial === 0" @click="tutorial--">
+						<i class="ph-caret-left-bold ph-lg"></i>
+					</button>
+					<span>{{ tutorial + 1 }} / 7</span>
+					<button class="arrow _button" :disabled="tutorial === 6" @click="tutorial++">
+						<i class="ph-caret-right-bold ph-lg"></i>
+					</button>
+				</div>
+				<MkButton v-if="tutorial === 6" class="ok" primary @click="close"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.gotIt }}</MkButton>
+				<MkButton v-else class="ok" primary @click="tutorial++"><i class="ph-check-bold ph-lg"></i> {{ i18n.ts.next }}</MkButton>
+			</div>>
+		</div>
+	</div>
+</XModalWindow>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+import XModalWindow from '@/components/MkModalWindow.vue';
+import MkButton from '@/components/MkButton.vue';
+import XFeaturedUsers from '@/pages/explore.users.vue';
+import XSettings from '@pages/settings/profile.vue'
+import { defaultStore } from '@/store';
+import { i18n } from '@/i18n';
+
+const emit = defineEmits<{
+	(ev: 'done'): void;
+	(ev: 'closed'): void;
+}>();
+
+const dialog = $ref<InstanceType<typeof XModalWindow>>();
+
+const tutorial = computed({
+	get() { return defaultStore.reactiveState.tutorial.value || 0; },
+	set(value) { defaultStore.set('tutorial', value); },
+});
+
+function close(res) {
+	tutorial.value = -1;
+	dialog.close();
+}
+</script>
+
+<style lang="scss" scoped>
+.tbkwesmv {
+	> ._content {
+		> small {
+			opacity: 0.7;
+		}
+	}
+
+	> .navigation {
+		display: flex;
+		flex-direction: row;
+		align-items: baseline;
+
+		> .step {
+			> .arrow {
+				padding: 4px;
+
+				&:disabled {
+					opacity: 0.5;
+				}
+
+				&:first-child {
+					padding-right: 8px;
+				}
+
+				&:last-child {
+					padding-left: 8px;
+				}
+			}
+
+			> span {
+				margin: 0 4px;
+			}
+		}
+
+		> .ok {
+			margin-left: auto;
+		}
+	}
+}
+</style>
+
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 2e6b3d112..3bc7ddea9 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -10,10 +10,10 @@
 	</template>
 	<MkSpacer :content-max="800">
 		<div ref="rootEl" v-hotkey.global="keymap" class="cmuxhskf">
-			<XTutorial
+			<!-- <XTutorial
 				v-if="$store.reactiveState.tutorial.value != -1"
 				class="tutorial _block"
-			/>
+			/> -->
 			<XPostForm
 				v-if="$store.reactiveState.showFixedPostForm.value"
 				class="post-form _block"
@@ -82,7 +82,7 @@ import { deviceKind } from '@/scripts/device-kind';
 import 'swiper/scss';
 import 'swiper/scss/virtual';
 
-const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
+// const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
 
 const isLocalTimelineAvailable =
 	!instance.disableLocalTimeline ||