From 544e34475bc1823250523da1a270086e6a0f2458 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Fri, 24 Nov 2023 23:12:58 +0000 Subject: [PATCH] fix --- client/package.json | 1 - client/src/features/comment/components/comment-list-item.tsx | 2 +- .../editor/atoms/{page-editor-atom.ts => editor-atoms.ts} | 0 client/src/features/editor/page-editor.tsx | 2 +- client/src/features/editor/title-editor.tsx | 2 +- client/src/features/page-history/components/history-list.tsx | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) rename client/src/features/editor/atoms/{page-editor-atom.ts => editor-atoms.ts} (100%) diff --git a/client/package.json b/client/package.json index 71a0aeb0..c2a9ec7c 100644 --- a/client/package.json +++ b/client/package.json @@ -23,7 +23,6 @@ "@tiptap/extension-collaboration-cursor": "^2.1.12", "@tiptap/extension-color": "^2.1.12", "@tiptap/extension-document": "^2.1.12", - "@tiptap/extension-focus": "^2.1.12", "@tiptap/extension-heading": "^2.1.12", "@tiptap/extension-highlight": "^2.1.12", "@tiptap/extension-link": "^2.1.12", diff --git a/client/src/features/comment/components/comment-list-item.tsx b/client/src/features/comment/components/comment-list-item.tsx index c5ea9878..b9191a7d 100644 --- a/client/src/features/comment/components/comment-list-item.tsx +++ b/client/src/features/comment/components/comment-list-item.tsx @@ -4,7 +4,7 @@ import classes from './comment.module.css'; import { useAtomValue } from 'jotai'; import { timeAgo } from '@/lib/time'; import CommentEditor from '@/features/comment/components/comment-editor'; -import { pageEditorAtom } from '@/features/editor/atoms/page-editor-atom'; +import { pageEditorAtom } from '@/features/editor/atoms/editor-atoms'; import CommentActions from '@/features/comment/components/comment-actions'; import CommentMenu from '@/features/comment/components/comment-menu'; import { useHover } from '@mantine/hooks'; diff --git a/client/src/features/editor/atoms/page-editor-atom.ts b/client/src/features/editor/atoms/editor-atoms.ts similarity index 100% rename from client/src/features/editor/atoms/page-editor-atom.ts rename to client/src/features/editor/atoms/editor-atoms.ts diff --git a/client/src/features/editor/page-editor.tsx b/client/src/features/editor/page-editor.tsx index 1f10f652..bab17cc2 100644 --- a/client/src/features/editor/page-editor.tsx +++ b/client/src/features/editor/page-editor.tsx @@ -14,7 +14,7 @@ import { useAtom } from 'jotai'; import { authTokensAtom } from '@/features/auth/atoms/auth-tokens-atom'; import useCollaborationUrl from '@/features/editor/hooks/use-collaboration-url'; import { currentUserAtom } from '@/features/user/atoms/current-user-atom'; -import { pageEditorAtom } from '@/features/editor/atoms/page-editor-atom'; +import { pageEditorAtom } from '@/features/editor/atoms/editor-atoms'; import { asideStateAtom } from '@/components/navbar/atoms/sidebar-atom'; import { activeCommentIdAtom, showCommentPopupAtom } from '@/features/comment/atoms/comment-atom'; import CommentDialog from '@/features/comment/components/comment-dialog'; diff --git a/client/src/features/editor/title-editor.tsx b/client/src/features/editor/title-editor.tsx index d3e317ac..0e94e2fd 100644 --- a/client/src/features/editor/title-editor.tsx +++ b/client/src/features/editor/title-editor.tsx @@ -6,7 +6,7 @@ import { Heading } from '@tiptap/extension-heading'; import { Text } from '@tiptap/extension-text'; import { Placeholder } from '@tiptap/extension-placeholder'; import { useAtomValue } from 'jotai'; -import { pageEditorAtom, titleEditorAtom } from '@/features/editor/atoms/page-editor-atom'; +import { pageEditorAtom, titleEditorAtom } from '@/features/editor/atoms/editor-atoms'; import { useUpdatePageMutation } from '@/features/page/queries/page-query'; import { useDebouncedValue } from '@mantine/hooks'; import { useAtom } from 'jotai'; diff --git a/client/src/features/page-history/components/history-list.tsx b/client/src/features/page-history/components/history-list.tsx index 79ae6f17..45d15fb2 100644 --- a/client/src/features/page-history/components/history-list.tsx +++ b/client/src/features/page-history/components/history-list.tsx @@ -5,7 +5,7 @@ import { activeHistoryIdAtom, historyAtoms } from '@/features/page-history/atoms import { useAtom } from 'jotai'; import { useCallback, useEffect } from 'react'; import { Button, ScrollArea, Group, Divider, Text } from '@mantine/core'; -import { pageEditorAtom, titleEditorAtom } from '@/features/editor/atoms/page-editor-atom'; +import { pageEditorAtom, titleEditorAtom } from '@/features/editor/atoms/editor-atoms'; import { modals } from '@mantine/modals'; import { notifications } from '@mantine/notifications';