-
Notifications
You must be signed in to change notification settings - Fork 5
Feature/page lending #57
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.
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
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
0dc6a4e
Feat : ๋ ๋ฉํ์ด์ง ๋ ์ด์์ ์์
llmojoll 6ed077b
Merge branch 'dev' into feature/page-lending
llmojoll cd69bf4
Feat : ์ด๋ฏธ์ง์ปดํฌ๋ํธ ์ถ๊ฐ svg ์ ๊ฑฐ
llmojoll b60bb5f
Feat : ๋ ๋ฉํ์ด์ง ์์ธ์นด๋๋ค ์ถ๊ฐ ์๋ฃ
llmojoll 662771f
Style : ๋ฐ์ํ ์ฌ์ด์ฆ ๋ณ๊ฒฝ `
llmojoll 5c6c4b7
Merge branch 'dev' into feature/page-lending
llmojoll b0643cd
Feat : ์ปดํฌ๋ํธ ๋ถ๋ฆฌ
llmojoll 8eb6aee
Style : ํจ๋ฉ๊ฐ์์
llmojoll 53b948e
Merge branch 'dev' into feature/page-lending
llmojoll 67bbeff
Style : ๋ฐ์ํ ์์ , ๋ฐฐ๊ฒฝ์ ๋ณ๊ฒฝ
llmojoll f0dd0ce
Chore
llmojoll d525f17
Feat : ํํฐ ๋ฃ๋์ค
llmojoll c37777f
Merge branch 'dev' into feature/page-lending
llmojoll 688271f
Feat : ํํฐ์ ์ด๋ฏธ์ง ์ถ๊ฐ
llmojoll 027b40a
Chore
llmojoll f6df454
Refactor : ๋ ์ด์์ ์ปดํฌ๋ํธ ์์ฑํด์ ๊ฐ๋
์ฑ์ฌ๋ ค์ค
llmojoll 23c3d4f
Merge branch 'dev' into feature/page-lending
llmojoll 9794dd1
Feat : Image์ปดํฌ alt์์ฑ ์ถ๊ฐ
llmojoll 6e534a5
Feat : ๋ฒํผ๊ฒฝ๋ก wines๋ก ์์
llmojoll File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| import Image from 'next/image'; | ||
|
|
||
| import { ImageCard } from '../common/card/ImageCard'; | ||
|
|
||
| export const ContentSection = () => { | ||
| return ( | ||
| <div className='mx-auto max-w-[640px] min-w-[343px] mt-12 md:mt-[80px] xl:mt-[160px]'> | ||
| <div className='relative bg-[#EBEEF4] h-[424px] md:h-[320px] mb-[48px] md:mb-[96px] rounded-2xl mx-auto max-w-[500px] md:max-w-[640px] shadow'> | ||
| <div className='relative max-w-[500px] md:max-w-[640px] mx-auto'> | ||
| <div className='absolute top-[24px] md:top-[56px] left-[24px] md:left-[32px]'> | ||
| <span className='custom-text-2lg-bold md:text-[22px] md:leading-8 md:font-bold block mb-[8px]'> | ||
| ๋งค๋ฌ ์๋กญ๊ฒ ๋ง๋๋ <br /> | ||
| ์์ธ ์ถ์ฒ ์ฝํ ์ธ | ||
| </span> | ||
| <p className='custom-text-xs-regular text-gray-500'> | ||
| ๋งค๋ฌ ๋ค์ํ ์ธ๊ธฐ ์์ธ์ ๋ง๋๋ณด์ธ์ | ||
| </p> | ||
| </div> | ||
| <div className='absolute w-[290px] md:w-[356px] h-[241px] md:h-[277px] right-0 bottom-[24px] md:bottom-0 bg-gray-100 rounded-2xl overflow-hidden md:overflow-visible top-[160px] md:top-[42px]'> | ||
| <span className='absolute text-[#7E7E7E] md:text-[#50545B] md:font-bold custom-text-lg-bold md:custom-text-2lg-bold left-5 top-5'> | ||
| ์ด๋ฒ ๋ฌ ์ถ์ฒ ์์ธ | ||
| </span> | ||
| <div className='flex gap-2.5 ml-5 mt-[61px] '> | ||
| <div className='w-[193px] flex-shrink-0'> | ||
| <ImageCard | ||
| className='bg-white h-[160px] rounded-lg border-none overflow-hidden shadow' | ||
| imageSrc='/assets/lendingwine3.png' | ||
| imageClassName='h-[165px] w-[44px] object-contain ' | ||
| > | ||
| <div className='flex flex-col ml-[9px] w-[80px]'> | ||
| <span className='font-extrabold text-4xl text-gray-800'>4.3</span> | ||
| <span>๋ณ์ ๋์ค์</span> | ||
| <p className='text-[10px] text-gray-500'>Sentinel Carbernet Sauvignon 2016</p> | ||
| </div> | ||
| </ImageCard> | ||
| </div> | ||
| <div className='w-[193px] flex-shrink-0'> | ||
| <ImageCard | ||
| className='bg-white h-[160px] rounded-lg border-none overflow-hidden shadow' | ||
| imageSrc='/assets/lendingwine3.png' | ||
| imageClassName='h-[165px] w-[44px] object-contain ' | ||
| > | ||
| <div className='flex flex-col ml-[9px] w-[80px]'> | ||
| <span className='font-extrabold text-4xl text-gray-800'>4.3</span> | ||
| <span>๋ณ์ ๋์ค์</span> | ||
| <p className='text-[10px] text-gray-500'>Sentinel Carbernet Sauvignon 2016</p> | ||
| </div> | ||
| </ImageCard> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div className='relative bg-[#EBEEF4] h-[424px] md:h-[320px] mb-[48px] md:mb-[96px] rounded-2xl mx-auto max-w-[500px] overflow-hidden md:max-w-[640px] shadow'> | ||
| <div className='relative max-w-[500px] md:max-w-[640px] mx-auto'> | ||
| <div className='absolute top-[24px] md:top-[55px] left-[24px] md:left-[32px]'> | ||
| <span className='custom-text-2lg-bold md:text-[22px] md:leading-8 md:font-bold block mb-2'> | ||
| ๋ค์ํ ํํฐ๋ก ์ฐพ๋ | ||
| <br />๋ด ๋ง์ถค ์์ธ | ||
| </span> | ||
| <p className='custom-text-xs-regular text-gray-500'> | ||
| ์์ธ ํ์ , ๊ฐ๊ฒฉ, ํ์ ์ผ๋ก <br /> | ||
| ๋์๊ฒ ๋ง๋ ์์ธ์ ์ฝ๊ฒ ๊ฒ์ํด์. | ||
| </p> | ||
| </div> | ||
| <div className='absolute top-[185px] left-[42px] hidden md:block'> | ||
| <Image width={180} height={100} alt='ํํฐ์ด๋ฏธ์ง2' src='/assets/lendingfilter2.png' /> | ||
| </div> | ||
| <div className='absolute top-[245px] left-[32px] hidden md:block'> | ||
| <Image width={200} height={100} alt='ํํฐ์ด๋ฏธ์ง1' src='/assets/lendingfilter1.png' /> | ||
| </div> | ||
| <Image | ||
| width={280} | ||
| height={100} | ||
| alt='ํํฐ๋ก ์ฐพ์ ๋ด ๋ง์ถค ์์ธ' | ||
| src='/assets/lendingwinecard.png' | ||
| className='absolute right-[-10px] top-[120px] md:top-[20px]' | ||
| /> | ||
| </div> | ||
| <div | ||
| className='pointer-events-none absolute inset-0 rounded-xl' | ||
| style={{ | ||
| background: | ||
| 'linear-gradient(to top, #EBEEF4 0%, transparent 10%, transparent 90%, #EBEEF4 100%)', | ||
| }} | ||
| /> | ||
| </div> | ||
| <div className='relative bg-[#EBEEF4] h-[424px] md:h-[320px] mb-[64px] md:mb-[80px] xl:mb-[104px] rounded-2xl mx-auto max-w-[500px] overflow-hidden md:max-w-[640px] shadow'> | ||
| <div className='relative max-w-[500px] md:max-w-[640px] mx-auto'> | ||
| <div className='absolute top-[24px] md:top-[55px] left-[24px] md:left-[28px]'> | ||
| <span className='custom-text-2lg-bold md:text-[22px] md:leading-8 md:font-bold block mb-2'> | ||
| ์ง๊ด์ ์ธ | ||
| <br /> | ||
| ๋ฆฌ๋ทฐ ์์คํ | ||
| </span> | ||
| <p className='custom-text-xs-regular text-gray-500'> | ||
| ๋ ๊ตฌ์ฒดํ๋ ๋ฆฌ๋ทฐ ์์คํ ์ผ๋ก | ||
| <br /> | ||
| ์ฝ๊ณ ๋น ๋ฅด๊ฒ ์์ธ ๋ฆฌ๋ทฐ๋ฅผ ์ดํด๋ณด์ธ์ | ||
| </p> | ||
| </div> | ||
| <Image | ||
| width={272} | ||
| height={100} | ||
| alt='์์ธ ๋ฆฌ๋ทฐ ์์ ์ด๋ฏธ์ง' | ||
| src='/assets/lendingreviewcard.png' | ||
| className='absolute right-[-10px] top-[120px] md:right-[42px] md:top-[-65px]' | ||
| /> | ||
| </div> | ||
| <div | ||
| className='pointer-events-none absolute inset-0 rounded-xl' | ||
| style={{ | ||
| background: | ||
| 'linear-gradient(to top, #EBEEF4 0%, transparent 5%, transparent 95%, #EBEEF4 100%)', | ||
| }} | ||
| /> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| import Image from 'next/image'; | ||
|
|
||
| import HeroSectionLayout from './HeroSectionLayout'; | ||
| import { ImageCard } from '../common/card/ImageCard'; | ||
|
|
||
| export const HeroSection = () => { | ||
| return ( | ||
| <header> | ||
| <div className='relative h-[403px] md:h-[394px] xl:h-[535px] bg-[#171A21] flex items-center justify-center overflow-hidden rounded-lg'> | ||
| <div className='flex flex-col items-center h-full'> | ||
| <div> | ||
| <Image | ||
| src='/assets/lendinglogo.png' | ||
| alt='์์ธ ๋ก๊ณ ์ด๋ฏธ์ง' | ||
| width={100} | ||
| height={100} | ||
| className='w-[81px] md:w-[100px] h-[23px] md:h-[30px] text-primary mt-[58px] md:mt-[80px] xl:mt-[112px]' | ||
| /> | ||
| </div> | ||
| <span className='text-white text-center custom-text-xl-bold md:custom-text-2xl-bold mt-6 md:mt-8'> | ||
| ํ ๊ณณ์์ ๊ด๋ฆฌํ๋ <br /> | ||
| ๋๋ง์ ์์ธ์ฐฝ๊ณ | ||
| </span> | ||
| <div className='relative w-[720px] h-[420px] mt-auto mx-auto translate-y-[80px] md:translate-y-[40px] xl:translate-y-[120px] scale-[1] md:scale-[0.7] xl:scale-[1]'> | ||
| {/* ๊ธฐ์ค ๋ฐ์ค translate-y ์๋๋ก-ใ ใ ๋งํผ ๋ฐ์ด๋ด๊ธฐ */} | ||
| <HeroSectionLayout className='top-4 left-1/2 z-30 -translate-x-1/2'> | ||
| <ImageCard | ||
| imageSrc='/assets/lendingwine3.png' | ||
| imageClassName='h-full w-[44px] object-contain ' | ||
| > | ||
| <div className='flex flex-col ml-[8px] w-[100px]'> | ||
| <span className='font-extrabold text-4xl text-gray-800'>4.3</span> | ||
| {/* ๋ชจ๋ฌ์ชฝ์ ๊ตฌํํด๋ ๋ณ์ ์ด ์์ */} | ||
| <span>๋ณ์ ๋์ค์</span> | ||
| <p className='custom-text-xs-regular text-gray-500'> | ||
| Sentinel Carbernet Sauvignon 2016 | ||
| </p> | ||
| </div> | ||
| </ImageCard> | ||
| </HeroSectionLayout> | ||
|
|
||
| {/* ์ข์ฐ ์ ๋ฐ์ค */} | ||
| <HeroSectionLayout className='top-10 left-[calc(50%-340px)] z-20'> | ||
| <ImageCard | ||
| imageSrc='/assets/lendingwine1.png' | ||
| imageClassName='h-full w-[44px] object-contain ' | ||
| > | ||
| <div className='flex flex-col ml-[8px] w-[100px]'> | ||
| <span className='font-extrabold text-4xl text-gray-800'>4.3</span> | ||
| <span>๋ณ์ ๋์ค์</span> | ||
| <p className='custom-text-xs-regular text-gray-500'> | ||
| Sentinel Carbernet Sauvignon 2016 | ||
| </p> | ||
| </div> | ||
| </ImageCard> | ||
| </HeroSectionLayout> | ||
| <HeroSectionLayout className='top-10 left-[calc(50%+100px)] z-20'> | ||
| <ImageCard | ||
| imageSrc='/assets/lendingwine1.png' | ||
| imageClassName='h-full w-[44px] object-contain ' | ||
| > | ||
| <div className='flex flex-col ml-[8px] w-[100px]'> | ||
| <span className='font-extrabold text-4xl text-gray-800'>4.3</span> | ||
| <span>๋ณ์ ๋์ค์</span> | ||
| <p className='custom-text-xs-regular text-gray-500'> | ||
| Sentinel Carbernet Sauvignon 2016 | ||
| </p> | ||
| </div> | ||
| </ImageCard> | ||
| </HeroSectionLayout> | ||
|
|
||
| {/* ์ข์ฐ ์๋ ๋ฐ์ค */} | ||
| <HeroSectionLayout className='top-[80px] left-[calc(50%-480px)] z-10'> | ||
| <ImageCard | ||
| imageSrc='/assets/lendingwine1.png' | ||
| imageClassName='h-full w-[44px] object-contain ' | ||
| > | ||
| <div className='flex flex-col ml-[8px] w-[100px]'> | ||
| <span className='font-extrabold text-4xl text-gray-800'>4.3</span> | ||
| <span>๋ณ์ ๋์ค์</span> | ||
| <p className='custom-text-xs-regular text-gray-500'> | ||
| Sentinel Carbernet Sauvignon 2016 | ||
| </p> | ||
| </div> | ||
| </ImageCard> | ||
| </HeroSectionLayout> | ||
| <HeroSectionLayout className='top-[80px] left-[calc(50%+240px)] z-10'> | ||
| <ImageCard | ||
| imageSrc='/assets/lendingwine1.png' | ||
| imageClassName='h-full w-[44px] object-contain ' | ||
| > | ||
| <div className='flex flex-col ml-[8px] w-[100px]'> | ||
| <span className='font-extrabold text-4xl text-gray-800'>4.3</span> | ||
| <span>๋ณ์ ๋์ค์</span> | ||
| <p className='custom-text-xs-regular text-gray-500'> | ||
| Sentinel Carbernet Sauvignon 2016 | ||
| </p> | ||
| </div> | ||
| </ImageCard> | ||
| </HeroSectionLayout> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </header> | ||
| ); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import React from 'react'; | ||
|
|
||
| import { cn } from '@/lib/utils'; | ||
|
|
||
| interface HeroSectionLayoutProps { | ||
| children?: React.ReactNode; | ||
| className?: string; | ||
| } | ||
|
|
||
| const HeroSectionLayout = ({ children, className }: HeroSectionLayoutProps) => { | ||
| const baseClass = 'absolute w-[240px] h-[185px] rounded-xl shadow-xl bg-white'; | ||
|
|
||
| return <div className={cn(baseClass, className)}>{children}</div>; | ||
| }; | ||
|
|
||
| export default HeroSectionLayout; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,28 @@ | ||
| import Link from 'next/link'; | ||
|
|
||
| import { ContentSection } from '@/components/home/ContentSection'; | ||
| import { HeroSection } from '@/components/home/HeroSection'; | ||
| import { Button } from '@/components/ui/button'; | ||
|
|
||
| export default function Home() { | ||
| return <main>๋ฉ์ธ</main>; | ||
| return ( | ||
| <div className='mx-auto px-[16px] md:px-[20px] xl:px-0 max-w-[1140px] min-w-[343px] mt-6 xl:mt-[80px]'> | ||
| <HeroSection /> | ||
| <main> | ||
| <ContentSection /> | ||
| </main> | ||
| <footer> | ||
| <Link href='/wines'> | ||
| <Button | ||
| variant='purpleDark' | ||
| size='onlyLanding' | ||
| width='onlyLanding' | ||
| className='block mx-auto mb-[62px]' | ||
| > | ||
| ์์ธ ๋ณด๋ฌ๊ฐ๊ธฐ | ||
| </Button> | ||
| </Link> | ||
| </footer> | ||
| </div> | ||
| ); | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
๋ ์ด์์ ์ ์ก์์ฃผ์ จ๋ค์.
์ถํ ํ๋์ฝ๋ฉ๋ ๋ถ๋ถ๋ค์ด๋ ์ค๋ณต์ฝ๋๋ฅผ ์์๋ก ๋ถ๋ฆฌ์ํค๋ฉด ์ข์ ๊ฒ ๊ฐ์ต๋๋ค.
๊ณ ์ํ์ จ์ต๋๋ค!