Skip to content

Fix/목록페이지 스타일 수정 #127

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

Merged
Luganic merged 3 commits into from
Aug 2, 2025
Merged

Fix/목록페이지 스타일 수정 #127

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dd4a3f
fix: 레이아웃 깨짐 해결
Luganic Aug 2, 2025
6f438bb
Merge branch 'dev' into fix/liststyle
Luganic Aug 2, 2025
210a099
build: 타입 수정
Luganic Aug 2, 2025
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
2 changes: 1 addition & 1 deletion src/components/common/Filter/WineTypeFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const WineTypeFilter = ({
}: WineTypeFilterProps) => {
const { type, setType, minPrice, maxPrice, setPriceRange, rating, setRating } = useFilterStore();

const wineTypeOptions: WineType[] = ['RED', 'WHITE', 'SPARKLING'];
const wineTypeOptions: WineType[] = ['Red', 'White', 'Sparkling'];
const priceRange: [number, number] = [minPrice, maxPrice];

const borderClass = 'border-b border-gray-100';
Expand Down
60 changes: 29 additions & 31 deletions src/components/common/winelist/WineListCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ export default function WineListCard() {
);

return (
<div className='flex flex-col gap-[24px] px-[16px] mt-[12px] min-w-[370px] md:px-[20px] md:mt-[24px] xl:px-0 max-w-[1140px] mx-auto xl:max-w-[800px]'>
<div
className='flex flex-col gap-[24px] px-[16px] mt-[12px] min-w-[370px] h-[390px]
md:px-[20px] md:mt-[24px]
xl:px-0 max-w-[1140px] mx-auto xl:max-w-[800px] xl:800px'
>
{wineList.map((wine) => (
<Link href={`/wines/${wine.id}`} key={wine.id} className='no-underline'>
<div className='w-full bg-white border border-gray-300 rounded-xl flex flex-col relative min-w-[320px]'>
Expand All @@ -52,10 +56,10 @@ export default function WineListCard() {
>
<div className='flex flex-col w-full px-[16px] md:px-0'>
<div className='flex flex-col w-full ml-0 mt-[20px] gap-[8px] md:w-[300px] md:ml-[36px] md:gap-[10px]'>
<div className='custom-text-xl-semibold text-gray-800 leading-[32px] h-auto break-words max-w-[220px] mt-[5px] md:custom-text-3xl-semibold md:max-w-none'>
<div className='custom-text-xl-semibold text-gray-800 leading-[32px] h-auto max-w-[220px] mt-[5px] md:text-[30px] md:max-w-[400px] md:min-h-[10px]'>
{wine.name}
</div>
<div className='custom-text-md-regular text-gray-500 leading-[24px] h-[24px] md:text-[16px] md:leading-[26px] md:h-[26px] break-words'>
<div className='[custom-text-md-regular] text-gray-500 leading-[24px] h-[24px] md:text-[16px] md:leading-[26px] md:h-[26px] break-words'>
{wine.region}
</div>
<Button
Expand All @@ -68,38 +72,35 @@ export default function WineListCard() {
₩ {wine.price.toLocaleString()}
</Button>
</div>

<div className='flex flex-row items-start mt-[23px] w-full ml-0 gap-[6px] md:hidden'>
<div className='text-[28px] font-extrabold text-gray-800 w-auto h-auto'>
{wine.avgRating?.toFixed(1)}
</div>
<div className='flex flex-col gap-[5px] ml-[15px] w-[100px] h-auto mt-[-6px]'>
<div className='flex gap-[4px] flex-nowrap'>
{Array.from({ length: 5 }).map((_, i) => (
<StarIcon
key={i}
className={cn(
wine.avgRating >= i + 1 ? 'fill-purpleDark' : 'fill-gray-300',
'w-3 h-3',
)}
/>
))}
<div className='flex flex-row items-start justify-between mt-[23px] w-full ml-0 gap-[6px] md:hidden'>
<div className='flex items-start gap-[6px]'>
<div className='text-[28px] font-extrabold text-gray-800 w-auto h-auto'>
{wine.avgRating?.toFixed(1)}
</div>
<div className='custom-text-xs-regular text-gray-500 break-words'>
{wine.reviewCount}개의 후기
<div className='flex flex-col gap-[5px] ml-[15px] w-[100px] h-auto mt-[-6px]'>
<div className='flex gap-[4px] flex-nowrap'>
{Array.from({ length: 5 }).map((_, i) => (
<StarIcon
key={i}
className={cn(
wine.avgRating >= i + 1 ? 'fill-purpleDark' : 'fill-gray-300',
'w-3 h-3',
)}
/>
))}
</div>
<div className='custom-text-xs-regular text-gray-500 break-words'>
{wine.reviewCount}개의 후기
</div>
</div>
</div>
</div>

<div className='flex-grow md:hidden flex justify-end items-center px-[16px] pr-[10px] mt-[-35px]'>
<button type='button' className='w-[36px] h-[36px] p-[4px] rounded'>
<NextIcon className='w-full h-full text-gray-300 hover:text-gray-500' />
</button>
</div>
</div>
</ImageCard>

<div className='hidden md:flex flex-col items-start absolute top-[40px] right-[-10px] z-10'>
<div className='hidden md:flex flex-col items-start absolute top-[35px] right-[-20px]'>
<div className='text-[48px] font-extrabold text-gray-800 leading-[48px] md:mt-[9px]'>
{wine.avgRating?.toFixed(1)}
</div>
Expand All @@ -120,17 +121,14 @@ export default function WineListCard() {
</div>
</div>
</div>

<button
type='button'
className='w-[40px] h-[40px] p-[4px] rounded flex-shrink-0 ml-0 hidden md:block absolute top-[185px] right-[50px] z-20'
className='w-[40px] h-[40px] p-[4px] rounded flex-shrink-0 ml-10 hidden md:block absolute top-[185px] right-[20px]'
>
<NextIcon className='w-full h-full text-gray-300 hover:text-gray-500' />
</button>

<div className='w-full h-px bg-gray-300 mt-[-1px]' />

<div className='px-[25px] py-[20px]'>
<div className='px-[25px] py-[20px] xl:w-[800px] xl:h-[110px]'>
<div className='text-[14px] font-semibold text-gray-800 mb-[4px] break-words'>
최신 후기
</div>
Expand Down
9 changes: 7 additions & 2 deletions src/components/common/winelist/WineSlider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { RecommendedWineResponse } from '@/types/wineListType';
import WineCard from './WineCard';

const TEAM_ID = process.env.NEXT_PUBLIC_TEAM;
const RECOMMENDED_WINES_LIMIT = 4;
const RECOMMENDED_WINES_LIMIT = 30;

export default function WineSlider() {
const { data, isLoading, isError } = useQuery<RecommendedWineResponse>({
Expand Down Expand Up @@ -41,7 +41,12 @@ export default function WineSlider() {
}

return (
<Carousel className='w-full'>
<Carousel
opts={{
align: 'start',
slidesToScroll: 2,
}}
>
<CarouselContent>
{filteredWines.map((wine) => (
<CarouselItem key={wine.id} className='basis-auto flex items-start '>
Expand Down
Loading