From 828330f28bec62d170504f67d1072c35cde6c705 Mon Sep 17 00:00:00 2001 From: Jordi Enric Date: Mon, 28 Oct 2024 23:24:46 +0100 Subject: [PATCH] wip --- .../src/components/Editor/EditorSettings.tsx | 3 ++- .../web/src/components/Editor/ZendoEditor.tsx | 4 +-- .../src/pages/blogs/[blogId]/categories.tsx | 1 - apps/web/src/pages/blogs/[blogId]/create.tsx | 1 - apps/web/src/pages/blogs/[blogId]/posts.tsx | 26 ++++++++++--------- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/apps/web/src/components/Editor/EditorSettings.tsx b/apps/web/src/components/Editor/EditorSettings.tsx index 4474b59..51fd3ff 100644 --- a/apps/web/src/components/Editor/EditorSettings.tsx +++ b/apps/web/src/components/Editor/EditorSettings.tsx @@ -131,7 +131,8 @@ const EditorSettings = (props: Props) => { const ogImageUrl = `/api/public/og?title=${props.title}&emoji=${props.blogEmoji}&url=${props.blogTitle}`; - const { data: categories, isLoading: isCategoriesLoading } = useCategories(); + const { data: categories, isLoading: isCategoriesLoading } = + useCategories(blogId); const { mutate: createCategory } = useCreateCategory(); function EditorSettingsSection({ children }: { children: React.ReactNode }) { diff --git a/apps/web/src/components/Editor/ZendoEditor.tsx b/apps/web/src/components/Editor/ZendoEditor.tsx index eddbd49..ba1c254 100644 --- a/apps/web/src/components/Editor/ZendoEditor.tsx +++ b/apps/web/src/components/Editor/ZendoEditor.tsx @@ -29,7 +29,6 @@ import { Sheet, SheetContent, SheetTrigger } from "../ui/sheet"; import EditorSettings from "./EditorSettings"; import TiptapLink from "@tiptap/extension-link"; import Placeholder from "@tiptap/extension-placeholder"; -import { useSubscriptionQuery } from "@/queries/subscription"; import { toast } from "sonner"; import { Database } from "@/types/supabase"; import { useBlogTags } from "./Editor.queries"; @@ -102,7 +101,8 @@ export const ZendoEditor = (props: Props) => { const [published, setPublished] = React.useState( props.post?.published || false ); - const { data: categories, isLoading: categoriesLoading } = useCategories(); + const { data: categories, isLoading: categoriesLoading } = + useCategories(blogId); const selectedCategory = categories?.find( (c) => c.id === getValues("category_id") ); diff --git a/apps/web/src/pages/blogs/[blogId]/categories.tsx b/apps/web/src/pages/blogs/[blogId]/categories.tsx index b94df14..8f6a51c 100644 --- a/apps/web/src/pages/blogs/[blogId]/categories.tsx +++ b/apps/web/src/pages/blogs/[blogId]/categories.tsx @@ -26,7 +26,6 @@ import { import { useBlogId } from "@/hooks/use-blog-id"; import AppLayout, { Section } from "@/layouts/AppLayout"; import { - useCategories, useCategoriesWithPostCount, useCreateCategory, useDeleteCategoryMutation, diff --git a/apps/web/src/pages/blogs/[blogId]/create.tsx b/apps/web/src/pages/blogs/[blogId]/create.tsx index 5809bff..4caebe2 100644 --- a/apps/web/src/pages/blogs/[blogId]/create.tsx +++ b/apps/web/src/pages/blogs/[blogId]/create.tsx @@ -2,7 +2,6 @@ import { useRouter } from "next/router"; import { ZendoEditor } from "@/components/Editor/ZendoEditor"; import { toast } from "sonner"; import { createSupabaseBrowserClient } from "@/lib/supabase"; -import { useCategories } from "@/queries/categories"; export default function CreatePost() { const router = useRouter(); diff --git a/apps/web/src/pages/blogs/[blogId]/posts.tsx b/apps/web/src/pages/blogs/[blogId]/posts.tsx index 40f29d6..8c52e07 100644 --- a/apps/web/src/pages/blogs/[blogId]/posts.tsx +++ b/apps/web/src/pages/blogs/[blogId]/posts.tsx @@ -172,18 +172,20 @@ export default function BlogPosts() { /> ); })} -
- Showing {posts.pages.flatMap((page) => page).length} posts - -
+ {posts.pages.flatMap((page) => page).length > 0 && ( +
+ Showing {posts.pages.flatMap((page) => page).length} posts + +
+ )} );