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

Style: 여정목록조회 디자인 수정 반영 #175

Merged
merged 3 commits into from
Jan 16, 2024
+18 −16
Merged

Style: 여정목록조회 디자인 수정 반영 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c2f5a4
style: 여정목록조회 디자인 수정 반영
NohWookJin Jan 16, 2024
8a7a73e
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
NohWookJin Jan 16, 2024
c38a0ca
style: 여정목록조회 디자인 수정 반영
NohWookJin Jan 16, 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/MyTrip/MyTripAfterList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const MyTripAfterList: React.FC<MyTripIngListProps> = ({ myTripsData }) => {

return (
<>
<div className="mb-[15px] mt-[30px]">
<h1 className='"text-black text-lg font-bold'>지난 여행</h1>
<div className="mb-[10px] mt-[40px]">
<h1 className="text-xl font-bold text-stone-900">지난 여행</h1>
</div>
<div className="no-scrollbar grid grid-cols-1 gap-[5px] overflow-y-scroll">
{sortedTrips.map((myTripList: MyTripType) => (
Expand Down
4 changes: 2 additions & 2 deletions src/components/MyTrip/MyTripBeforeList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ const MyTripBeforeList: React.FC<MyTripIngListProps> = ({ myTripsData }) => {

return (
<>
<div className="mb-[15px] mt-[30px]">
<h1 className='"text-black text-lg font-bold'>다가오는 여행</h1>
<div className="mb-[10px] mt-[40px]">
<h1 className="text-xl font-bold text-stone-900">다가오는 여행</h1>
</div>
<div className="no-scrollbar grid grid-cols-1 gap-[5px] overflow-y-scroll">
{myTripsData.map((myTripList: MyTripType) => (
Expand Down
14 changes: 8 additions & 6 deletions src/components/MyTrip/MyTripIngItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,28 @@ const MyTripIngItem: React.FC<MyTripItemProps> = ({ myTripList }) => {

return (
<div
className="relative flex h-16 w-full cursor-pointer items-center rounded-lg border border-solid border-cyan-400 px-3"
className="relative flex h-16 w-full cursor-pointer items-center rounded-2xl border border-solid border-cyan-400 bg-cyan-400 px-3"
onClick={() => navigate(`/trip/${tripId}`)}>
<div className="flex">
<div>
<img
className="rounded-1 h-10 min-h-10 w-10 rounded-lg object-cover"
className="h-10 min-h-10 w-10 rounded-3xl rounded-lg object-cover"
src={tripThumbnailUrl}
alt="여행지 이미지"
/>
</div>
<div className="absolute right-3 top-[20px] inline-flex h-[22px] w-[54px] items-center justify-center gap-[8px] rounded-2xl border border-solid border-cyan-400 bg-cyan-400 px-[8px] py-[10px] pt-[12px]">
<span className="text-xs font-semibold text-white">{tripStatus}</span>
<div className="absolute right-3 top-[20px] inline-flex h-[22px] w-[54px] items-center justify-center gap-[8px] rounded-2xl border border-solid border-cyan-400 bg-white px-[8px] py-[10px] pt-[13px]">
<span className="text-xs font-semibold text-cyan-400">
{tripStatus}
</span>
</div>
<div className="ml-[15px] flex max-w-[300px] flex-col items-start justify-between gap-[15px] ">
<div className="mt-[4px] ">
<div className="w-56 truncate text-sm font-bold text-black ">
<div className="w-56 truncate text-sm font-bold text-white ">
{tripName}
</div>

<div className="text-xs font-medium tracking-tight text-zinc-500">
<div className="text-xs font-semibold text-white">
{startDate.replace(/-/g, '.')} ~{' '}
{endDate.replace(/-/g, '.').split('2024.')} ({tripDuration})
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/components/MyTrip/MyTripItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,18 @@ const MyTripItem: React.FC<MyTripItemProps> = ({ myTripList }) => {
</div>
<div className="ml-[10px] flex w-full flex-col items-start justify-between ">
<div className="mt-[1px] ">
<div className="truncate text-[15px] text-base font-bold text-black">
<div className="truncate text-[15px] text-base font-semibold text-stone-900">
{tripName}
</div>
<div className="text-sm font-medium tracking-tight text-zinc-500">
{startDate.replace(/-/g, '.')} ~{' '}
<div className="text-sm font-normal text-zinc-500">
{startDate.replace(/-/g, '.')} -{' '}
{endDate.replace(/-/g, '.').split('2024.')} ({tripDuration})
</div>
</div>

<div className="mb-[5px] flex text-xs font-normal text-zinc-500">
<UserIcon size={13} fill="gray4" />
<span className="ml-[4px]">{numberOfPeople}명과 공유중</span>
<UserIcon size={13} fill="#888" color="none" />
<span>{numberOfPeople}명과 공유중</span>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/create/createTrip.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const CreateTrip = () => {
queryFn: () => getMemberTrips(),
});

const MY_TRIP_NUMBER = data?.data.numberOfElements + 1;
const MY_TRIP_NUMBER = data?.numberOfElements + 1;
const defaultTitle = `나의 여정 ${MY_TRIP_NUMBER}`;

const handleSubmit = async () => {
Expand Down