From bd7c4f66f3441a9c5136afcb17f0852d9e2f1c0c Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Wed, 27 Mar 2024 16:03:35 +0000
Subject: [PATCH] use correct note design in favorites page - fixes #483
---
packages/frontend/src/components/MkNotes.vue | 2 --
packages/frontend/src/pages/favorites.vue | 9 ++++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue
index afe43d965c..5240d64661 100644
--- a/packages/frontend/src/components/MkNotes.vue
+++ b/packages/frontend/src/components/MkNotes.vue
@@ -55,8 +55,6 @@ import { i18n } from '@/i18n.js';
import { infoImageUrl } from '@/instance.js';
import { defaultStore } from '@/store.js';
-console.log(defaultStore.state.noteDesign, defaultStore.state.noteDesign === 'sharkey');
-
const props = defineProps<{
pagination: Paging;
noGap?: boolean;
diff --git a/packages/frontend/src/pages/favorites.vue b/packages/frontend/src/pages/favorites.vue
index 2827898194..5835f0c093 100644
--- a/packages/frontend/src/pages/favorites.vue
+++ b/packages/frontend/src/pages/favorites.vue
@@ -16,9 +16,14 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<template #default="{ items }">
- <MkDateSeparatedList v-slot="{ item }" :items="items" :direction="'down'" :noGap="false" :ad="false">
+ <MkDateSeparatedList v-if="defaultStore.state.noteDesign === 'misskey'"
+ v-slot="{ item }" :items="items" :direction="'down'" :noGap="false" :ad="false">
<MkNote :key="item.id" :note="item.note" :class="$style.note"/>
</MkDateSeparatedList>
+ <MkDateSeparatedList v-if="defaultStore.state.noteDesign === 'sharkey'"
+ v-slot="{ item }" :items="items" :direction="'down'" :noGap="false" :ad="false">
+ <SkNote :key="item.id" :note="item.note" :class="$style.note"/>
+ </MkDateSeparatedList>
</template>
</MkPagination>
</MkSpacer>
@@ -28,10 +33,12 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import MkPagination from '@/components/MkPagination.vue';
import MkNote from '@/components/MkNote.vue';
+import SkNote from '@/components/SkNote.vue';
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { infoImageUrl } from '@/instance.js';
+import { defaultStore } from '@/store.js';
const pagination = {
endpoint: 'i/favorites' as const,