ash/iceshrimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of codeberg.org:calckey/calckey into develop

Browse source
This commit is contained in:
ThatOneCalculator 2023-06-02 23:55:41 -07:00
commit 05f1b6d8c5
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/client/src/components/MkTutorialDialog.vue
View file

@ -140,26 +140,26 @@
</template>
</I18n>
</li>
<li v-if="timelines.includes('recommended')">
<li v-if="timelines.includes('social')">
<I18n
:src="i18n.ts._tutorial.step5_5"
tag="div"
>
<template #icon>
<i
class="ph-thumbs-up ph-bold ph-lg"
class="ph-handshake ph-bold ph-lg"
/>
</template>
</I18n>
</li>
<li v-if="timelines.includes('social')">
<li v-if="timelines.includes('recommended')">
<I18n
:src="i18n.ts._tutorial.step5_6"
tag="div"
>
<template #icon>
<i
class="ph-handshake ph-bold ph-lg"
class="ph-thumbs-up ph-bold ph-lg"
/>
</template>
</I18n>
@ -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");
}

28
packages/client/src/pages/timeline.vue
View file

@ -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");
}
@ -195,7 +195,7 @@ async function chooseAntenna(ev: MouseEvent): Promise<void> {
}
function saveSrc(
newSrc: "home" | "local" | "recommended" | "social" | "global"
newSrc: "home" | "local" | "social" | "recommended" | "global"
): void {
defaultStore.set("tl", {
...defaultStore.state.tl,
@ -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
? [
{