Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
87 changes: 69 additions & 18 deletions src/app/(main)/home/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export default function HomePage() {
<div className="w-full min-h-screen bg-[#131416]">
<div className="relative mx-auto w-full min-h-screen font-pretendard select-none bg-[#131416]">

{/* ์ƒ๋‹จ ์„น์…˜ */}
<section
className="relative w-full h-[463px] flex flex-col items-center shrink-0"
style={{
Expand All @@ -41,45 +40,97 @@ export default function HomePage() {
</p>
</div>

{/* ์บ๋ฆญํ„ฐ ์ธํ„ฐ๋ž™์…˜ ์˜์—ญ */}
<div
className="relative z-10 flex-1 flex flex-col items-center justify-center mt-[30px] cursor-pointer"
onClick={checkGuide}
>
{isGuideChecked && (
<div className="absolute top-[0] left-[79.43px] z-30 animate-fade-in">
<div className="relative bg-primary-30 text-gray-90 text-[12px] px-[15px] py-1 rounded-[16px] whitespace-nowrap font-medium">
<div
className="absolute z-30 animate-fade-in flex items-center"
style={{
top: '-30px',
left: '50%',
transform: 'translateX(-52%)',
}}
>
<div
className="flex-shrink-0"
style={{
width: '63px',
height: '48px',
boxShadow: '0 0 20px 0 rgba(21, 21, 64, 0.70)',
}}
>
<Image
src="/home/notif.svg"
alt="ํŽธ์ง€"
width={63}
height={48}
style={{ width: '63px', height: '48px' }}
/>
</div>

<div
className="relative bg-primary-30 text-gray-90 font-medium"
style={{
fontSize: '12px',
lineHeight: '180%',
paddingLeft: '12px',
paddingRight: '12px',
paddingTop: '4px',
paddingBottom: '4px',
borderRadius: '16px',
whiteSpace: 'nowrap',
}}
>
{guideMessage}
</div>
</div>
)}

<div className={`relative z-20 ${!isGuideRead ? 'animate-shake' : 'animate-float'}`}>
<Image src="/img-character-main.png" alt="ํ•€ํ† " width={111} height={155} priority />
</div>

<div className={`absolute top-[-5px] z-30 transition-all duration-500 ease-in-out ${
isGuideChecked ? 'left-[32px]' : 'right-[125px]'
}`}>
<div className="relative w-[63px] h-[48px]">
<Image src="/home/notif.svg" alt="์•Œ๋ฆผ" fill className="object-contain" />
{!isGuideRead && (
<div className="absolute top-[-2px] right-[-2px] z-10 w-[13px] h-[13px]">
<Image src="/home/dot.svg" alt="์•Œ๋ฆผ ๋„ํŠธ" fill className="object-contain" />

{!isGuideChecked && (
<div
className="absolute z-30"
style={{
top: '3px',
right: '-20px',
}}
>
<div className="relative" style={{ width: '63px', height: '48px' }}>
<Image
src="/home/notif.svg"
alt="์•Œ๋ฆผ"
width={63}
height={48}
style={{ width: '63px', height: '48px' }}
/>
{!isGuideRead && (
<div
className="absolute z-10 w-[13px] h-[13px]"
style={{
top: '6px',
right: '10px',
}}
>
<Image src="/home/dot.svg" alt="์•Œ๋ฆผ ๋„ํŠธ" width={13} height={13} />
</div>
)}
</div>
)}
</div>
</div>
)}
</div>

<div className="mt-[-36px] px-[78px] mb-3">
<Image src="/home/Ellipse.svg" alt="ํ•€ํ†  ๊ทธ๋ฆผ์ž" width={234} height={52} priority />
</div>
</div>

{/* ์ฒดํฌ๋ฆฌ์ŠคํŠธ ์˜์—ญ: ์™ธ๋ถ€ ์ปดํฌ๋„ŒํŠธ๋กœ ๋Œ€์ฒด */}
<DailyMissionSection />
</section>

{/* ๋‰ด์Šค ์„น์…˜ */}
<div className="flex flex-col w-full py-5">
<PopularNews />
<CuratedNews />
Expand Down
11 changes: 8 additions & 3 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,15 @@ function LoginSelectScreen() {
justifyContent: 'center',
alignItems: 'center',
backgroundColor: '#131416',
overflow: 'hidden',
overflow: 'auto',
}}
>
<div
style={{
position: 'relative',
width: '390px',
height: '844px',
minHeight: '100vh',
maxHeight: '844px',
}}
>
{/* ๋ฐฐ๊ฒฝ ์ด๋ฏธ์ง€ */}
Expand All @@ -123,7 +124,9 @@ function LoginSelectScreen() {
height={844}
style={{
width: '390px',
height: '844px',
height: '100%',
minHeight: '100vh',
objectFit: 'cover',
}}
priority
/>
Expand Down Expand Up @@ -171,10 +174,12 @@ function LoginSelectScreen() {
left: '0',
right: '0',
height: '20px',
minHeight: '20px',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
gap: '24px',
paddingBottom: 'env(safe-area-inset-bottom, 0px)',
}}>
<Link
href="/signup"
Expand Down