Merge pull request #100 from dnd-side-project/refactor/#98

Refactor/#98

Author: leeleeleeleejun

src/app/_components/MemoListModal.tsx

@@ -4,7 +4,7 @@ import Modal from '@/components/Modal'
 import Button from '@/components/Button'
 import { Icon } from '@/components/Icon'
 import { Fragment, useState } from 'react'
-import MemoListItem from '@/app/retrospects/create/[[...memoId]]/_components/MemoListItem'
+import MemoListItem from '@/app/retrospects/create/[[...id]]/_components/MemoListItem'
 import { useMemoListModalStore } from '@/store/memoListModal'
 import useMyMemoListQuery from '@/app/_queries/useMyMemoListQuery'
 import { cn } from '@/utils/cn'

…reate/[[...memoId]]/RetrospectCreate.tsx …ts/create/[[...id]]/RetrospectCreate.tsxsrc/app/retrospects/create/[[...memoId]]/RetrospectCreate.tsx renamed to src/app/retrospects/create/[[...id]]/RetrospectCreate.tsx src/app/retrospects/create/[[...memoId]]/RetrospectCreate.tsx renamed to src/app/retrospects/create/[[...id]]/RetrospectCreate.tsx

@@ -9,16 +9,16 @@ import Editor from './_components/Editor'
 import RetrospectInfoSelect from './_components/RetrospectInfoSelect'
 import useGetRetrospect from '@/app/groups/[id]/_queries/useGetRetrospect'
 
-const RetrospectCreate = ({ memoId }: { memoId: number | null }) => {
+const RetrospectCreate = ({ id }: { id: number | null }) => {
   const searchParams = useSearchParams()
   const isRetrospectUpdate = searchParams.get('isRetrospectUpdate') === 'true'
 
   const { data: memo, isSuccess: memoIsSuccess } = useGetMemo(
-    memoId,
+    id,
     !isRetrospectUpdate,
   )
   const { data: retrospect, isSuccess: retrospectIsSuccess } = useGetRetrospect(
-    String(memoId),
+    String(id),
     isRetrospectUpdate,
   )
   const data = isRetrospectUpdate ? retrospect : memo
@@ -53,7 +53,7 @@ const RetrospectCreate = ({ memoId }: { memoId: number | null }) => {
       <Step step={step} name={'EDITOR'}>
         <Editor
           retrospectInfo={retrospectInfo}
-          memoId={memoId || null}
+          id={id || null}
           initialTitle={data?.title || ''}
           initialContent={data?.content || ''}
           isRetrospectUpdate={isRetrospectUpdate}

…ate/[[...memoId]]/_components/Editor.tsx …/create/[[...id]]/_components/Editor.tsxsrc/app/retrospects/create/[[...memoId]]/_components/Editor.tsx renamed to src/app/retrospects/create/[[...id]]/_components/Editor.tsx src/app/retrospects/create/[[...memoId]]/_components/Editor.tsx renamed to src/app/retrospects/create/[[...id]]/_components/Editor.tsx

@@ -38,13 +38,13 @@ function onError(error: unknown) {
 }
 
 const Editor = ({
-  memoId,
+  id,
   retrospectInfo,
   initialTitle,
   initialContent,
   isRetrospectUpdate,
 }: {
-  memoId: number | null
+  id: number | null
   retrospectInfo: RetrospectInfoForm
   initialTitle: string
   initialContent: string
@@ -70,7 +70,7 @@ const Editor = ({
           title={title}
           groupId={Number(retrospectInfo.groupId)}
           templateId={retrospectInfo.templateId ?? 0}
-          initMemoId={memoId}
+          initMemoId={isRetrospectUpdate ? null : id}
           isRetrospectUpdate={isRetrospectUpdate}
         />
         <div className='bg-white py-6 px-10 rounded-md'>

…Id]]/_components/HTMLToLexicalPlugin.tsx …id]]/_components/HTMLToLexicalPlugin.tsxsrc/app/retrospects/create/[[...memoId]]/_components/HTMLToLexicalPlugin.tsx renamed to src/app/retrospects/create/[[...id]]/_components/HTMLToLexicalPlugin.tsx src/app/retrospects/create/[[...memoId]]/_components/HTMLToLexicalPlugin.tsx renamed to src/app/retrospects/create/[[...id]]/_components/HTMLToLexicalPlugin.tsx

@@ -1,5 +1,5 @@
 import { cn } from '@/utils/cn'
-import { RADIO_BUTTON_SIZE } from '@/app/retrospects/create/[[...memoId]]/_consts'
+import { RADIO_BUTTON_SIZE } from '../_consts'
 
 interface Props
   extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'size'> {