From 76a67df0a5729ced27e0c45aa64a86d883058c43 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 9 Nov 2022 00:38:05 -0800 Subject: [PATCH] finish new intro --- locales/en-US.yml | 26 +-- package.json | 2 +- .../src/components/MkTutorialDialog.vue | 164 +++++++++++------- 3 files changed, 120 insertions(+), 72 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 1c81da913..6fdf547d0 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1219,19 +1219,19 @@ _tutorial: 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: "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." - step5_1: "Now, let's try making your timeline more lively by following other people." - step5_2: "{featured} will show you popular notes in this instance. {explore} will let you find popular users. Try finding people you'd like to follow there!" - step5_3: "To follow other users, click on their icon and press the \"Follow\" button on their profile." - step5_4: "If the other user has a lock icon next to their name, it may take some time for that user to manually approve your follow request." - step6_1: "You should be able to see other users' notes on your timeline now." - step6_2: "You can also put \"reactions\" on other people's notes to quickly respond to them." - step6_3: "To attach a \"reaction\", press the \"+\" mark on another user's note and choose an emoji you'd like to react with." - step7_1: "Congratulations! You have now finished Calckey's basic tutorial." - step7_2: "If you would like to learn more about Calckey, try the {help} section." - step7_3: "Now then, good luck and have fun with Calckey! 🚀" + step4_1: "Let's get you out there." + step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\"" + step5_1: "Timelines, timelines everywhere!" + step5_2: "Your instance has {timelines} different timelines enabled." + step5_3: "The Home {icon} timeline is where you can see posts from your followers." + step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance." + step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend." + step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers." + step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance." + step6_1: "So, what is this place?" + step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"." + step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though!" + step6_4: "It may be a bit confusing at first, but you'll get the hang of it. Go, explore, and have fun! 🚀" _2fa: alreadyRegistered: "You have already registered a 2-factor authentication device." registerDevice: "Register a new device" diff --git a/package.json b/package.json index 78d27e4c2..9c213083e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.10-b.1", + "version": "12.119.0-calc.10-b.2", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue index 98275e4c0..b0f306aaa 100644 --- a/packages/client/src/components/MkTutorialDialog.vue +++ b/packages/client/src/components/MkTutorialDialog.vue @@ -2,7 +2,7 @@
-
{{ i18n.ts._tutorial.title }}
-
-
{{ i18n.ts._tutorial.step1_1 }}
-
{{ i18n.ts._tutorial.step1_2 }}
-
-
-
{{ i18n.ts._tutorial.step2_1 }}
-
{{ i18n.ts._tutorial.step2_2 }}
- -
-
-
{{ i18n.ts._tutorial.step3_1 }}
-
{{ i18n.ts._tutorial.step3_2 }}
- -
-
-
{{ i18n.ts._tutorial.step4_1 }}
-
{{ i18n.ts._tutorial.step4_2 }}
-
-
-
{{ i18n.ts._tutorial.step5_1 }}
- - - - -
{{ i18n.ts._tutorial.step5_3 }}
- {{ i18n.ts._tutorial.step5_4 }} -
-
-
{{ i18n.ts._tutorial.step6_1 }}
-
{{ i18n.ts._tutorial.step6_2 }}
-
{{ i18n.ts._tutorial.step6_3 }}
-
-
-
{{ i18n.ts._tutorial.step7_1 }}
- - - -
{{ i18n.ts._tutorial.step7_3 }}
-
-
-
- - {{ tutorial + 1 }} / 7 - +
+
{{ i18n.ts._tutorial.title }}
+
+
+
{{ i18n.ts._tutorial.step1_1 }}
+
{{ i18n.ts._tutorial.step1_2 }}
+
+
+
{{ i18n.ts._tutorial.step2_1 }}
+
{{ i18n.ts._tutorial.step2_2 }}
+ +
+
+
{{ i18n.ts._tutorial.step3_1 }}
+
{{ i18n.ts._tutorial.step3_2 }}
+ +
+
+
{{ i18n.ts._tutorial.step4_1 }}
+ + + + +
+
+
{{ i18n.ts._tutorial.step5_1 }}
+ + + + + + + + + + + + + + + + + + +
+
+
{{ i18n.ts._tutorial.step6_1 }}
+
{{ i18n.ts._tutorial.step6_2 }}
+
{{ i18n.ts._tutorial.step6_3 }}
+
{{ i18n.ts._tutorial.step6_4 }}
+
+
+
+ + {{ tutorial + 1 }} / 6 + +
+ {{ i18n.ts.gotIt }} + {{ i18n.ts.next }}
- {{ i18n.ts.gotIt }} - {{ i18n.ts.next }}
@@ -81,8 +101,36 @@ import XSettings from '@/pages/settings/profile.vue'; import XModalWindow from '@/components/MkModalWindow.vue'; import MkButton from '@/components/MkButton.vue'; import XFeaturedUsers from '@/pages/explore.users.vue'; +import XPostForm from '@/components/MkPostForm.vue'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; +import { $i } from '@/account'; +import { instance } from '@/instance'; + +const isLocalTimelineAvailable = + !instance.disableLocalTimeline || + ($i != null && ($i.isModerator || $i.isAdmin)); +const isRecommendedTimelineAvailable = + !instance.disableRecommendedTimeline || + ($i != null && ($i.isModerator || $i.isAdmin)); +const isGlobalTimelineAvailable = + !instance.disableGlobalTimeline || + ($i != null && ($i.isModerator || $i.isAdmin)); + +let timelines = ['home']; + +if (isLocalTimelineAvailable) { + timelines.push('local'); +} +if (isRecommendedTimelineAvailable) { + timelines.push('recommended'); +} +if (isLocalTimelineAvailable) { + timelines.push('social'); +} +if (isGlobalTimelineAvailable) { + timelines.push('global'); +} const emit = defineEmits<{ (ev: 'done'): void;