| 
| 
| 
|
+| [์ด์์ฐ](https://github.com/eesoyeon) | [๋จ์ ์ฑ](https://github.com/meteorqz6) | [ํฉ์ฑ์ฐ](https://github.com/chaeon1) | [ํ์ ์ฑ](https://github.com/nowrobin) |
+
+{title}
- {createdAt} + {createdAt.split('T')[0]}
+
+ );
+}
diff --git a/src/components/display/PreviewDisplay.tsx b/src/components/display/PreviewDisplay.tsx
index a3c70d4..326ee1c 100644
--- a/src/components/display/PreviewDisplay.tsx
+++ b/src/components/display/PreviewDisplay.tsx
@@ -4,17 +4,17 @@ import { useAccordionStore } from '@store/useAccordionStore';
const PreviewDisplay = () => {
const { getSections } = useAccordionStore();
const { font } = useThemeStore();
-
+ const sections = getSections();
return (
+
+
+ 
+
+
+ + ์ฒญ์ฒฉ์ฅ ๋ถ๋ฌ์ค๋ ์ค์ด์์ +
+ +
+
+
+
+
+
- {getSections().map((section, index) => {
+ {sections.map((section, index) => {
if (index == 2 || index == 3) {
return;
}
return
);
};
diff --git a/src/components/display/ResultDisplay.tsx b/src/components/display/ResultDisplay.tsx
index 936a5aa..d3c4d92 100644
--- a/src/components/display/ResultDisplay.tsx
+++ b/src/components/display/ResultDisplay.tsx
@@ -4,17 +4,18 @@ import { useAccordionStore } from '@store/useAccordionStore';
const ResultDisplay = () => {
const { getSections } = useAccordionStore();
const { font } = useThemeStore();
+ const sections = getSections();
return (
{section}
;
})}
- {getSections()[2]}
- {getSections()[3]}
+ {sections[2]}
+ {sections[3]}
- {getSections().map((section, index) => {
+ {sections.map((section, index) => {
if (index == 2 || index == 3) {
return;
}
return
);
};
diff --git a/src/hooks/useInvitation.tsx b/src/hooks/useInvitation.tsx
index 93ab2be..4e281e3 100644
--- a/src/hooks/useInvitation.tsx
+++ b/src/hooks/useInvitation.tsx
@@ -2,23 +2,30 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import {
deleteInvitation,
getInvitation,
+ getInvitationCredential,
getInvitations,
postInvitation,
updateInvitation,
} from '../services/invitationService';
import { InvitationDetail } from '../types/invitationTypes';
import resetAllStores from '@/store/resetStore';
-import { useNavigate } from 'react-router';
+import { useLocation, useNavigate } from 'react-router';
export const useGetInvitation = (id: number) => {
- let { data, isError } = useQuery{section}
;
})}
- {getSections()[2]}
- {getSections()[3]}
+ {sections[2]}
+ {sections[3]}
+ navigate(-1)} aria-label="๋ค๋ก๊ฐ๊ธฐ">
+
+
+ );
+};
+
+export default BasicInformationPage;
diff --git a/src/pages/CreateInvitationPage.tsx b/src/pages/CreateInvitationPage.tsx
index 949fab6..8966a09 100644
--- a/src/pages/CreateInvitationPage.tsx
+++ b/src/pages/CreateInvitationPage.tsx
@@ -11,12 +11,12 @@ import useImageStore from '@/store/useImageStore';
import { useS3Image } from '@/hooks/useS3Image';
import {
getInvitationAction,
- useUpdateInvitationStore,
+ updateInvitationStore,
} from '@/actions/invitationAction';
import useGalleryStore from '@/store/OptionalFeature/useGalleryFeatureStore';
import { useOptionalFeatureStore } from '@/store/OptionalFeature/useOptionalFeatureStore';
import useNoticeStore from '@/store/OptionalFeature/useNoticeFeatureStore';
-import { InvitationDetail, NoticeDetail } from '@/types/invitationTypes';
+import { NoticeDetail } from '@/types/invitationTypes';
import PreviewButton from '@/components/common/CreateInvitation/PreviewButton';
import { useDebouncedInputStore } from '@/store/useDebouncedInputStore';
import { useInvitationStore } from '@/store/useInvitaionStore';
@@ -44,8 +44,9 @@ const CreateInvitationPage = () => {
const [previewModal, setPreviewModal] = useState(false);
const { message, showToast } = useToast();
- const details = getInvitationAction();
const { invitations } = useGetInvitation(parseInt(id!));
+ const details = getInvitationAction();
+
const { mutateAsync: updateMutate } = useUpdateInvitation(parseInt(id!));
const { mutateAsync: s3Mutate } = useS3Image();
@@ -117,7 +118,12 @@ const CreateInvitationPage = () => {
...details,
imgUrl: thumbnail.length > 0 ? thumbnail[0] : uploadedImageUrl,
galleries: [
- { images: gallery, grid, isActive: selectedOptionalFeatures.gallery },
+ {
+ images: gallery,
+ grid,
+ isActive: selectedOptionalFeatures.gallery,
+ order: findOrder('gallery'),
+ },
],
notices: noticeList,
});
@@ -130,7 +136,9 @@ const CreateInvitationPage = () => {
}, [invitations?.title]);
useEffect(() => {
- useUpdateInvitationStore(invitations as InvitationDetail);
+ if (invitations) {
+ updateInvitationStore(invitations);
+ }
}, [invitations]);
useEffect(() => {
@@ -138,33 +146,6 @@ const CreateInvitationPage = () => {
initializeItems(start, end);
}, [currentStep, initializeItems]);
- // useEffect(() => {
- // const intervalId = setInterval(async () => {
- // await flushAll()
- // setAutoSaveModal(true);
- // await saveInvitationData()
- // // useUpdateInvitationStore(invitations as InvitationDetail);
- // setTimeout(() => {
- // setAutoSaveModal(false);
- // setIsModalOpen(false)
- // }, AUTO_SAVE_MODAL_DURATION_MS); // ๋ชจ๋ฌ ์ธํฐ๋ฒ
- // }, AUTO_SAVE_INTERVAL_MS); // ์์์ ์ฅ ์ธํฐ๋ฒ
- // return () => {
- // clearInterval(intervalId); // ์ปดํฌ๋ํธ unmount ์ cleanup
- // };
- // }, [updateMutate]);
-
- // const handleNextStep = () => {
- // if (currentStep < STEP_RANGES.length) {
- // handleStepClick(currentStep + 1);
- // }
- // };
- // const handlePrevStep = () => {
- // if (currentStep > 0) {
- // handleStepClick(currentStep - 1);
- // }
- // };
-
const toggleExpand = (id: number) => {
setExpandedIds((prev) =>
prev.includes(id) ? prev.filter((item) => item !== id) : [...prev, id],
@@ -187,7 +168,8 @@ const CreateInvitationPage = () => {
navigate('/dashboard');
};
- const handleSave = async () => {
+ const handleSave = async (e: React.MouseEvent
+
+
+ {sections.map((section) => {
+ const isExpanded = expandedIds.includes(section.id);
+ return (
+
+
+
+ );
+ })}
+ toggleExpand(section.id)}
+ role="button"
+ aria-expanded={isExpanded}
+ aria-controls={`accordion-content-${section.id}`}
+ >
+
+
+ {isExpanded && (
+
+
+
+ {section.isRequired && (
+
+
+ {section.isCompleted ? (
+
+ )}
+ + {section.title} +
+
+
+ )}
+
+ {section.content}
+
+
+
+
{/* + ์จ๋ฉ ์ ๋ณด +
+
+
+ + ๊ธฐ๋ณธ ์ ๋ณด ๊ด๋ฆฌ +
+ +