diff --git a/src/app/gathering/page.tsx b/src/app/gathering/page.tsx index 9893026f..d8a7c03b 100644 --- a/src/app/gathering/page.tsx +++ b/src/app/gathering/page.tsx @@ -35,14 +35,18 @@ export default async function Page({ const gatheringCategoryList = await getData(); return ( -
- 직접 내 모임을`, "만들어보세요!"]} - buttonText="모임 등록하기" - category={"모임"} - /> -
- +
+
+ 직접 내 모임을`, "만들어보세요!"]} + buttonText="모임 등록하기" + category={"모임"} + /> +
+
+
+ +
diff --git a/src/components/common/GatheringItem.tsx b/src/components/common/GatheringItem.tsx index bf843426..7f650647 100644 --- a/src/components/common/GatheringItem.tsx +++ b/src/components/common/GatheringItem.tsx @@ -37,11 +37,13 @@ const status: { [key: string]: string } = { // todo const GatheringItem = ({ data }: IGatheringItem) => { return ( + // w-[307] , h-[315], p-5,
+ {/* 상태와 북마크 */}

{ postId={data.gatheringId} />

+ {/* 제목, 유저 닉네임 */}

{data.title}

@@ -66,11 +69,11 @@ const GatheringItem = ({ data }: IGatheringItem) => {
{/* 마감일 포함 영역 */}
- {/* 4개 영역 */} + {/* 4개 영역(기간, 장소, 시간, 인원) */}
@@ -106,7 +109,7 @@ const GatheringItem = ({ data }: IGatheringItem) => {
@@ -162,7 +165,8 @@ const GatheringItem = ({ data }: IGatheringItem) => {
-
+ {/* 마감일, 좋아요, 조회수 */} +
{

마감일: - {format(new Date(data.deadline), "yy-MM-dd(EE)", { + {format(new Date(data.deadline), "yy.MM.dd(EE)", { locale: ko, })}

diff --git a/src/components/common/modal/Modal.tsx b/src/components/common/modal/Modal.tsx index a12d9bf9..6fe84f19 100644 --- a/src/components/common/modal/Modal.tsx +++ b/src/components/common/modal/Modal.tsx @@ -14,7 +14,7 @@ interface ModalProps extends React.PropsWithChildren { export const Modal = ({ isOpen, children, onClose, isHeaderBar, headerBarStyle = "bg-white" }: ModalProps) => { const [documentBody, setDocumentBody] = useState(null); - const ref = useRef(null); + const ref = useRef(null); let flag = isOpen; usePreventBodyScroll(isOpen); @@ -62,10 +62,15 @@ export const Modal = ({ isOpen, children, onClose, isHeaderBar, headerBarStyle = className="fixed inset-0 flex h-full w-full items-center justify-center" style={{ zIndex: "100" }} > -
-
+
+
, document.getElementById("modal-root") as HTMLElement, ); diff --git a/src/components/gathering/createUpdate/editor/modal/GatheringCategoryModal.tsx b/src/components/gathering/createUpdate/editor/modal/GatheringCategoryModal.tsx index 93ebd137..2a7f7ac8 100644 --- a/src/components/gathering/createUpdate/editor/modal/GatheringCategoryModal.tsx +++ b/src/components/gathering/createUpdate/editor/modal/GatheringCategoryModal.tsx @@ -28,7 +28,7 @@ const GatheringCategoryModal = (props: IGatheringCategoryModalProps) => { return (
-
-

카테고리 선택

-
+
+

카테고리 선택

+
{props.categoryList.map((i) => ( ))}
-
+
-

시간 선택

-
+

시간 선택

+
{/* 날짜 */} -
- {format(calendarDate[0].startDate, "yyyy-MM-dd(EE)", { + {format(calendarDate[0].startDate, "yyyy.MM.dd(EE)", { locale: ko, })} -
- {/* 시 */} -
- -
-
- {/* 분 */} -
- + setStartDateTime((prev) => ({ + ...prev, + hour: +e.target.value, + })) + } + value={startDateTime.hour} + > + {Array.from({ length: 24 }, (_, i) => i).map((i) => ( + + ))} + +
+ location-icon +
+
+ + {/* 분 */} +
+ -
+ ))} + +
+ location-icon +
+
+
-
-
-
+
+ +
+
); }; export default GatheringTimeModal; + +// flex 요소 때문에 줄어들고 있음 \ No newline at end of file diff --git a/src/components/gathering/read/GatheringCardList.tsx b/src/components/gathering/read/GatheringCardList.tsx index 3a1ab163..d66b6896 100644 --- a/src/components/gathering/read/GatheringCardList.tsx +++ b/src/components/gathering/read/GatheringCardList.tsx @@ -19,7 +19,7 @@ const GatheringCardList = ({
찾는 내용이 없습니다.
) : -
+
{data?.map((i, index) => )}
} diff --git a/src/components/gathering/read/GatheringList.tsx b/src/components/gathering/read/GatheringList.tsx index a04f7010..2a4fbb74 100644 --- a/src/components/gathering/read/GatheringList.tsx +++ b/src/components/gathering/read/GatheringList.tsx @@ -17,7 +17,7 @@ interface IGatheringList { const GatheringList = (props: IGatheringList) => { return ( -
+