diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts index ddcd8ccb9..49ea53199 100644 --- a/packages/client/src/navbar.ts +++ b/packages/client/src/navbar.ts @@ -55,22 +55,6 @@ export const navbarItemDef = reactive({ show: computed(() => $i != null), to: "/my/snippets", }, - pages: { - title: "pages", - icon: "ph-file-text ph-bold ph-lg", - to: "/pages", - }, - gallery: { - title: "gallery", - icon: "ph-film-strip ph-bold ph-lg", - to: "/gallery", - }, - achievements: { - title: "achievements", - icon: "ph-medal-military ph-bold ph-lg", - show: computed(() => $i != null), - to: "/my/achievements", - }, space: { title: "space", icon: "ph-rocket-launch ph-bold ph-lg", diff --git a/packages/client/src/pages/achievements.vue b/packages/client/src/pages/achievements.vue deleted file mode 100644 index b7aa18bb3..000000000 --- a/packages/client/src/pages/achievements.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - diff --git a/packages/client/src/pages/discover.vue b/packages/client/src/pages/discover.vue index 6237ec8b2..62db4532b 100644 --- a/packages/client/src/pages/discover.vue +++ b/packages/client/src/pages/discover.vue @@ -125,8 +125,8 @@ import { computed, watch, onMounted, onActivated } from "vue"; import { Virtual } from "swiper/modules"; import { Swiper, SwiperSlide } from "swiper/vue"; -import MkChannelPreview from "@/components/MkChannelPreview.vue"; import MkChannelList from "@/components/MkChannelList.vue"; +import MkFolder from "@/components/MkFolder.vue"; import MkPagePreview from "@/components/MkPagePreview.vue"; import MkGalleryPostPreview from "@/components/MkGalleryPostPreview.vue"; import MkPagination from "@/components/MkPagination.vue"; diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue deleted file mode 100644 index b47d8a954..000000000 --- a/packages/client/src/pages/gallery/index.vue +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - {{ i18n.ts.recentPosts }} - - - - - - - - - {{ i18n.ts.popularPosts }} - - - - - - - - - - - - - - - - - - - - - - {{ i18n.ts.postToGallery }} - - - - - - - - - - - - - - - - diff --git a/packages/client/src/pages/my-snippets/index.vue b/packages/client/src/pages/my-snippets/index.vue index 7f4189bfd..2f8105dd3 100644 --- a/packages/client/src/pages/my-snippets/index.vue +++ b/packages/client/src/pages/my-snippets/index.vue @@ -83,6 +83,18 @@ + + + + {{ i18n.ts.notes }} + {{ i18n.ts._gallery.liked }} + {{ i18n.ts._pages.liked }} + + + + + + @@ -90,27 +102,33 @@ + + diff --git a/packages/client/src/pages/my-snippets/liked-reels.vue b/packages/client/src/pages/my-snippets/liked-reels.vue new file mode 100644 index 000000000..afc6a584a --- /dev/null +++ b/packages/client/src/pages/my-snippets/liked-reels.vue @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue deleted file mode 100644 index cdb9247c5..000000000 --- a/packages/client/src/pages/pages.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ i18n.ts._pages.newPage }} - - - - - - - - - - - - - - - diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue index b0d6d7ddc..97ad8ab00 100644 --- a/packages/client/src/pages/user/index.vue +++ b/packages/client/src/pages/user/index.vue @@ -92,12 +92,12 @@ const headerTabs = $computed(() => title: i18n.ts.overview, icon: "ph-user ph-bold ph-lg", }, - ...(user.host == null ? [{ + ...((!$i || $i.id !== user.id) && user.host == null ? [{ key: 'achievements', title: i18n.ts.achievements, icon: 'ph-medal-military ph-bold ph-lg', }] : []), - ...(($i && $i.id === user.id) || user.publicReactions + ...((!$i || $i.id !== user.id) && user.publicReactions ? [ { key: "reactions", @@ -106,7 +106,7 @@ const headerTabs = $computed(() => }, ] : []), - ...(user.instance == null + ...((!$i || $i.id !== user.id) && user.instance == null ? [ { key: "clips", diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index c26b6f733..8f3f004f9 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -412,10 +412,6 @@ export const routes = [ component: page(() => import("./pages/page-editor/page-editor.vue")), loginRequired: true, }, - { - path: "/pages", - component: page(() => import("./pages/pages.vue")), - }, { path: "/gallery/:postId/edit", component: page(() => import("./pages/gallery/edit.vue")), @@ -430,10 +426,6 @@ export const routes = [ path: "/gallery/:postId", component: page(() => import("./pages/gallery/post.vue")), }, - { - path: "/gallery", - component: page(() => import("./pages/gallery/index.vue")), - }, { path: "/channels/:channelId/edit", component: page(() => import("./pages/channel-editor.vue")), @@ -594,11 +586,6 @@ export const routes = [ component: page(() => import("./pages/my-snippets/index.vue")), loginRequired: true, }, - { - path: '/my/achievements', - component: page(() => import('./pages/achievements.vue')), - loginRequired: true, - }, { name: "messaging", path: "/my/messaging",