From 9d9047c33d5ab844b785edbdaf98dba83a29197c Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 1 Jun 2023 07:24:49 +0900 Subject: [PATCH 1/3] switch position of social and recommended --- packages/client/src/pages/timeline.vue | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index a44f36c55b..1947caaef3 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -109,12 +109,12 @@ let timelines = ["home"]; if (isLocalTimelineAvailable) { timelines.push("local"); } -if (isRecommendedTimelineAvailable) { - timelines.push("recommended"); -} if (isLocalTimelineAvailable) { timelines.push("social"); } +if (isRecommendedTimelineAvailable) { + timelines.push("recommended"); +} if (isGlobalTimelineAvailable) { timelines.push("global"); } @@ -255,16 +255,6 @@ const headerTabs = $computed(() => [ }, ] : []), - ...(isRecommendedTimelineAvailable - ? [ - { - key: "recommended", - title: i18n.ts._timelines.recommended, - icon: "ph-thumbs-up ph-bold ph-lg", - iconOnly: true, - }, - ] - : []), ...(isLocalTimelineAvailable ? [ { @@ -275,6 +265,16 @@ const headerTabs = $computed(() => [ }, ] : []), + ...(isRecommendedTimelineAvailable + ? [ + { + key: "recommended", + title: i18n.ts._timelines.recommended, + icon: "ph-thumbs-up ph-bold ph-lg", + iconOnly: true, + }, + ] + : []), ...(isGlobalTimelineAvailable ? [ { From 0a9936629814570ae1720db4d0e2f315259944db Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 1 Jun 2023 07:29:54 +0900 Subject: [PATCH 2/3] no change, but more comfortable --- packages/client/src/pages/timeline.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 1947caaef3..5d96d6dfd8 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -195,7 +195,7 @@ async function chooseAntenna(ev: MouseEvent): Promise { } function saveSrc( - newSrc: "home" | "local" | "recommended" | "social" | "global" + newSrc: "home" | "local" | "social" | "recommended" | "global" ): void { defaultStore.set("tl", { ...defaultStore.state.tl, From 0eb65d0f12894073f20b17cb3786e7e76bf95a34 Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 3 Jun 2023 15:24:16 +0900 Subject: [PATCH 3/3] fix tutorial --- .../client/src/components/MkTutorialDialog.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue index 6927e961c6..b4d8eee0a2 100644 --- a/packages/client/src/components/MkTutorialDialog.vue +++ b/packages/client/src/components/MkTutorialDialog.vue @@ -140,26 +140,26 @@ -
  • +
  • -
  • +
  • @@ -235,12 +235,12 @@ let timelines = ["home"]; if (isLocalTimelineAvailable) { timelines.push("local"); } -if (isRecommendedTimelineAvailable) { - timelines.push("recommended"); -} if (isLocalTimelineAvailable) { timelines.push("social"); } +if (isRecommendedTimelineAvailable) { + timelines.push("recommended"); +} if (isGlobalTimelineAvailable) { timelines.push("global"); }