Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: 여졍페이지 충돌 해결 #185

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Chore: 여졍페이지 충돌 해결 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a1d3ea
Merge pull request #183 from FinalDoubleTen/FE-77--feat/Trips
LeHiHo Jan 17, 2024
dfe8e1c
Feat: 여졍페이지 충돌 해결
LeHiHo Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Plan/PlanItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ const PlanItem = (date: any) => {
/>
</div>
</div>
<div className="flex h-8 w-[46px] cursor-pointer items-center justify-center gap-2 rounded-lg bg-[#f0f0f0] p-2 text-sm font-medium text-gray4">
<button className="flex h-8 w-[46px] cursor-pointer items-center justify-center gap-2 rounded-lg bg-[#f0f0f0] p-2 text-sm font-medium text-gray4">
편집
</div>
</button>
</div>

<div className="flex flex-col gap-[5px]">
Expand Down
1 change: 0 additions & 1 deletion src/components/Plan/TripMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ const TripMap = ({ paths }: { paths: Paths[] }) => {
width: '100%',
height: '180px',
marginTop: '15px',
marginBottom: '15px',
transition: 'height 0.3s ease-in-out',
};

Expand Down
3 changes: 0 additions & 3 deletions src/components/Trip/TripInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ const TripInfo = () => {
</span>
</div>
</div>
<button className="body4 rounded-[8px] bg-[#F0F0F0] px-[10px] py-[8px] text-gray4">
편집
</button>
</div>
<span className="body1 text-gray4">
{trip?.startDate} ~ {trip?.endDate}
Expand Down
5 changes: 0 additions & 5 deletions src/hooks/useSocket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,9 @@ export const useSocket = (tripId: string, visitDate: string) => {
}
});

console.log('sub외부', visitDate);

subItem(tripId, visitDate, (res) => {
console.log('sub내부', visitDate);
if (res) {
setTripItem(res);
console.log('상태변경실행');
}
});

Expand All @@ -79,7 +75,6 @@ export const useSocket = (tripId: string, visitDate: string) => {

if (socketCallback) {
socketCallback();
console.log('소켓커넥트내부', socketCallback);
}
};

Expand Down