diff --git a/apps/app/components/pages/single-page-detailed-item.tsx b/apps/app/components/pages/single-page-detailed-item.tsx index e53a1c78b..b6a0af476 100644 --- a/apps/app/components/pages/single-page-detailed-item.tsx +++ b/apps/app/components/pages/single-page-detailed-item.tsx @@ -2,10 +2,11 @@ import React from "react"; import Link from "next/link"; import { useRouter } from "next/router"; -import dynamic from "next/dynamic"; +// hooks +import useUser from "hooks/use-user"; // ui -import { CustomMenu, Loader, Tooltip } from "components/ui"; +import { CustomMenu, Tooltip } from "components/ui"; // icons import { LockClosedIcon, @@ -29,15 +30,6 @@ type TSingleStatProps = { partialUpdatePage: (page: IPage, formData: Partial) => void; }; -const RemirrorRichTextEditor = dynamic(() => import("components/rich-text-editor"), { - ssr: false, - loading: () => ( - - - - ), -}); - export const SinglePageDetailedItem: React.FC = ({ page, handleEditPage, @@ -49,6 +41,8 @@ export const SinglePageDetailedItem: React.FC = ({ const router = useRouter(); const { workspaceSlug, projectId } = router.query; + const { user } = useUser(); + return (
@@ -106,29 +100,31 @@ export const SinglePageDetailedItem: React.FC = ({ )} - - - + + + )} { diff --git a/apps/app/components/pages/single-page-list-item.tsx b/apps/app/components/pages/single-page-list-item.tsx index db3d1d95f..9057906b7 100644 --- a/apps/app/components/pages/single-page-list-item.tsx +++ b/apps/app/components/pages/single-page-list-item.tsx @@ -3,6 +3,8 @@ import React from "react"; import Link from "next/link"; import { useRouter } from "next/router"; +// hooks +import useUser from "hooks/use-user"; // ui import { CustomMenu, Tooltip } from "components/ui"; // icons @@ -40,6 +42,8 @@ export const SinglePageListItem: React.FC = ({ const router = useRouter(); const { workspaceSlug, projectId } = router.query; + const { user } = useUser(); + return (
  • @@ -103,29 +107,32 @@ export const SinglePageListItem: React.FC = ({ )} - - - + + + )} + { diff --git a/apps/app/components/workspace/sidebar-dropdown.tsx b/apps/app/components/workspace/sidebar-dropdown.tsx index 50defdd4b..8ac3b4ccc 100644 --- a/apps/app/components/workspace/sidebar-dropdown.tsx +++ b/apps/app/components/workspace/sidebar-dropdown.tsx @@ -77,8 +77,8 @@ export const WorkspaceSidebarDropdown = () => { }) ) .finally(() => { - mutateUser(); router.push("/signin"); + mutateUser(); }); }; diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx index ed3261971..a1cb2bb8a 100644 --- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx +++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/[pageId].tsx @@ -19,6 +19,7 @@ import pagesService from "services/pages.service"; import issuesService from "services/issues.service"; // hooks import useToast from "hooks/use-toast"; +import useUser from "hooks/use-user"; // layouts import { ProjectAuthorizationWrapper } from "layouts/auth-layout"; // components @@ -61,6 +62,8 @@ const SinglePage: NextPage = () => { const { setToastAlert } = useToast(); + const { user } = useUser(); + const { handleSubmit, reset, watch, setValue } = useForm({ defaultValues: { name: "" }, }); @@ -411,18 +414,22 @@ const SinglePage: NextPage = () => { )}
  • - {pageDetails.access ? ( - - ) : ( - + {pageDetails.created_by === user?.id && ( + <> + {pageDetails.access ? ( + + ) : ( + + )} + )} {pageDetails.is_favorite ? (