From cc93abfb7e4c5e17abb95a4856cc7918b7c25b9a Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:13:43 +0100 Subject: [PATCH 1/5] make pages table responsive --- .../src/components/common/recent-changes.tsx | 83 ++++++++++--------- 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/apps/client/src/components/common/recent-changes.tsx b/apps/client/src/components/common/recent-changes.tsx index 055629b2..1fe8050e 100644 --- a/apps/client/src/components/common/recent-changes.tsx +++ b/apps/client/src/components/common/recent-changes.tsx @@ -1,4 +1,11 @@ -import { Text, Group, UnstyledButton, Badge, Table } from "@mantine/core"; +import { + Text, + Group, + UnstyledButton, + Badge, + Table, + ScrollArea, +} from "@mantine/core"; import { Link } from "react-router-dom"; import PageListSkeleton from "@/components/ui/page-list-skeleton.tsx"; import { buildPageUrl } from "@/features/page/page.utils.ts"; @@ -22,46 +29,48 @@ export default function RecentChanges({ spaceId }: Props) { } return pages && pages.items.length > 0 ? ( - - - {pages.items.map((page) => ( - - - - - {page.icon || } - - - {page.title || "Untitled"} - - - - - {!spaceId && ( + +
+ + {pages.items.map((page) => ( + - - {page?.space.name} - + + {page.icon || } + + + {page.title || "Untitled"} + + + - )} - - - {formattedDate(page.updatedAt)} - - - - ))} - -
+ {!spaceId && ( + + + {page?.space.name} + + + )} + + + {formattedDate(page.updatedAt)} + + + + ))} + + + ) : ( No pages yet From a4d53468c35bc9f5f5c0664186b4f0961effc76f Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:30:56 +0100 Subject: [PATCH 2/5] fix tree state --- apps/client/src/features/page/tree/components/space-tree.tsx | 4 +++- apps/client/src/features/page/tree/hooks/use-tree-mutation.ts | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/client/src/features/page/tree/components/space-tree.tsx b/apps/client/src/features/page/tree/components/space-tree.tsx index d5a27351..e2647ed3 100644 --- a/apps/client/src/features/page/tree/components/space-tree.tsx +++ b/apps/client/src/features/page/tree/components/space-tree.tsx @@ -88,6 +88,8 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) { if (pagesData?.pages && !hasNextPage) { const allItems = pagesData.pages.flatMap((page) => page.items); const treeData = buildTree(allItems); + console.log("tree data init"); + console.log("items", treeData); if (data.length < 1 || data?.[0].spaceId !== spaceId) { //Thoughts // don't reset if there is data in state @@ -106,7 +108,7 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) { const fetchData = async () => { if (isDataLoaded.current && currentPage) { // check if pageId node is present in the tree - const node = dfs(treeApiRef.current.root, currentPage.id); + const node = dfs(treeApiRef.current?.root, currentPage.id); if (node) { // if node is found, no need to traverse its ancestors return; diff --git a/apps/client/src/features/page/tree/hooks/use-tree-mutation.ts b/apps/client/src/features/page/tree/hooks/use-tree-mutation.ts index 42fcd7d0..0cc41a9d 100644 --- a/apps/client/src/features/page/tree/hooks/use-tree-mutation.ts +++ b/apps/client/src/features/page/tree/hooks/use-tree-mutation.ts @@ -52,6 +52,8 @@ export function useTreeMutation(spaceId: string) { slugId: createdPage.slugId, name: "", position: createdPage.position, + spaceId: createdPage.spaceId, + parentPageId: createdPage.parentPageId, children: [], } as any; From f52cd011a42d4f456a2bb3bed5277281bce09678 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:33:12 +0100 Subject: [PATCH 3/5] remove unused imports --- apps/client/src/features/search/search-spotlight.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/apps/client/src/features/search/search-spotlight.tsx b/apps/client/src/features/search/search-spotlight.tsx index bbf9295b..fb842bd8 100644 --- a/apps/client/src/features/search/search-spotlight.tsx +++ b/apps/client/src/features/search/search-spotlight.tsx @@ -1,17 +1,10 @@ import { Group, Center, Text } from "@mantine/core"; import { Spotlight } from "@mantine/spotlight"; -import { - IconFileDescription, - IconHome, - IconSearch, - IconSettings, -} from "@tabler/icons-react"; +import { IconFileDescription, IconSearch } from "@tabler/icons-react"; import React, { useState } from "react"; import { useNavigate, useParams } from "react-router-dom"; import { useDebouncedValue } from "@mantine/hooks"; import { usePageSearchQuery } from "@/features/search/queries/search-query"; -import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts"; -import { useRecentChangesQuery } from "@/features/page/queries/page-query.ts"; import { buildPageUrl } from "@/features/page/page.utils.ts"; interface SearchSpotlightProps { From 0c622a0dc17d562c187ec14e515633ae72e4b277 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:33:59 +0100 Subject: [PATCH 4/5] use sane font-weight --- apps/client/src/features/editor/styles/core.css | 2 +- apps/client/src/features/editor/styles/youtube.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/client/src/features/editor/styles/core.css b/apps/client/src/features/editor/styles/core.css index d2a09f1e..75b6f322 100644 --- a/apps/client/src/features/editor/styles/core.css +++ b/apps/client/src/features/editor/styles/core.css @@ -9,7 +9,7 @@ ); font-size: var(--mantine-font-size-md); line-height: var(--mantine-line-height-xl); - font-weight: 415; + font-weight: 400; width: 100%; > * + * { diff --git a/apps/client/src/features/editor/styles/youtube.css b/apps/client/src/features/editor/styles/youtube.css index 90cb0e53..4ec23196 100644 --- a/apps/client/src/features/editor/styles/youtube.css +++ b/apps/client/src/features/editor/styles/youtube.css @@ -4,7 +4,7 @@ iframe { display: block; - outline: 0px solid transparent; + outline: 0 solid transparent; border-radius: var(--mantine-radius-md); width: 100%; } From bbf865b2f68a5cdfda742ae5b47a8c3c181dcd01 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:41:30 +0100 Subject: [PATCH 5/5] cleanup debug log --- apps/client/src/features/page/tree/components/space-tree.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/client/src/features/page/tree/components/space-tree.tsx b/apps/client/src/features/page/tree/components/space-tree.tsx index e2647ed3..e30a9db8 100644 --- a/apps/client/src/features/page/tree/components/space-tree.tsx +++ b/apps/client/src/features/page/tree/components/space-tree.tsx @@ -88,8 +88,7 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) { if (pagesData?.pages && !hasNextPage) { const allItems = pagesData.pages.flatMap((page) => page.items); const treeData = buildTree(allItems); - console.log("tree data init"); - console.log("items", treeData); + if (data.length < 1 || data?.[0].spaceId !== spaceId) { //Thoughts // don't reset if there is data in state