Skip to content

Commit 6ee2306

Browse files
Feat/승주님과 연결 후 충돌 해결
1 parent a305f1d commit 6ee2306

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/components/Schedule/ScheduleDetail.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const ScheduleDetail = () => {
6565
{schedule.subject}
6666
</div>{" "}
6767
<div className="place-content-end font-light flex text-[18px] mt-[70px]">
68-
d-
68+
D-
6969
{schedule.dday === 0 ? <div>day</div> : <div>{schedule.dday}</div>}
7070
</div>
7171
</div>

src/components/Schedule/ScheduleDetailParticipants.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const ScheduleDetailParticipants = () => {
3333
console.log(invitees);
3434
return (
3535
<div>
36-
{schedule.invitees.length !== 1 ? (
36+
{[schedule.invitees].length !== 1 ? (
3737
<div className="mt-[30px] h-[98px] ml-[20px]">
3838
참여자{" "}
3939
<div className="bg-[#CEE4F8] h-[50px] w-[335px] mt-[20px] p-[15px] shadow flex rounded-lg">

src/components/layout/BottomNavi.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ const BottomNavi = () => {
2020
</div>
2121
<div
2222
onClick={() => {
23-
navigate("/");
23+
navigate("/main");
2424
}}
2525
className="w-[24px] h-[24px]"
2626
>
2727
<img src={Home} alt="홈" />
2828
</div>
2929
<div
3030
onClick={() => {
31-
navigate();
31+
navigate("/profile");
3232
}}
3333
className="px-[3.5px] py-[5.5px] w-[24px] h-[24px]"
3434
>

src/components/modal/KebabButtonModal.jsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@ const KebabModal = ({ setModalOpen, modalOpen }) => {
1010
<div className="h-[686px] w-[375px] mt-[48px] bg-black bg-opacity-50 flex justify-center fixed ">
1111
<div className="inset-x-0 bottom-[50px] w-[375px] h-[160px] absolute rounded-t-lg bg-white">
1212
{" "}
13-
<button onClick={closeModal}>x</button>
13+
<button className="fixed right-3" onClick={closeModal}>
14+
x
15+
</button>
1416
<div
1517
onClick={scheduleEditHandler}
16-
className="text-[#12396F] pt-[23px] h-[57px] border-solid border-[1px]"
18+
className="text-[#12396F] pt-[23px] h-[57px] border-solid border-b-[1px]"
1719
>
1820
수정
1921
</div>
2022
<div
2123
onClick={scheduleDeleteHandler}
22-
className="text-[#DE0D0D] h-[60px]"
24+
className="text-[#DE0D0D] h-[60px] pt-[23px] "
2325
>
2426
삭제
2527
</div>

0 commit comments

Comments
 (0)