Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
dbec029
[feat] ๊ธ€์“ฐ๊ธฐ ๊ธฐ๋Šฅ
EunbinJung Oct 10, 2025
64d9a8e
[feat] ํฌ์ŠคํŠธ ์ž‘์„ฑ ๊ธฐ๋Šฅ
EunbinJung Oct 10, 2025
0692f9d
Merge branch 'dev' into feat/write#19
EunbinJung Oct 10, 2025
c63aa72
Feat/communityscroll#23 (#114)
EunbinJung Oct 10, 2025
b381dc0
[feat] ๊ธ€์“ฐ๊ธฐ ๊ธฐ๋Šฅ
EunbinJung Oct 10, 2025
b1edcc9
์นดํ…Œ๊ณ ๋ฆฌํ•„์ˆ˜
EunbinJung Oct 10, 2025
5cf0cc4
[feat] ํฌ์ŠคํŠธ ๋ฌดํ•œ์Šคํฌ๋กค + ๊ธ€์“ฐ๊ธฐ๊ธฐ๋Šฅ ์ด๋ฏธ์ง€์ถ”๊ฐ€
EunbinJung Oct 10, 2025
37e6b64
[feat] ์ด๋ฏธ์ง€ ์Šค์™€์ดํผ
EunbinJung Oct 11, 2025
0df3876
[feat] ํ”„๋กœํ•„ ์‘ค๋ฆฌ ์ด๋ฏธ์ง€
EunbinJung Oct 11, 2025
c03685b
[feat] ๋Œ“๊ธ€ ๋ˆ„๋ฅด๋ฉด ๋Œ“๊ธ€ ์„น์…˜์œผ๋กœ ๊ฐ€๊ธฐ
EunbinJung Oct 11, 2025
0b9ff6a
[feat] ์ข‹์•„์š”๊ธฐ๋Šฅ(์•„์ง ์ข‹์•„์š”๋ฐ›์•„์˜ค๋Š”๊ฑด ๋ชปํ•จ apiํ•„์š”)
EunbinJung Oct 11, 2025
06f4218
[feat] ๊ฒŒ์‹œ๋ฌผ ์ˆ˜์ •
EunbinJung Oct 11, 2025
41bfd9f
[feat] ๊ธ€ ์ˆ˜์ •
EunbinJung Oct 12, 2025
a9013e6
[refactor] ์ฝ”๋“œ ์กฐ๊ธˆ์ •๋ฆฌ
EunbinJung Oct 12, 2025
7ca7f8b
[feat] ์ž‘์„ฑ์ž๋ณธ์ธ๋งŒ ๊ธ€์ˆ˜์ •์‚ญ์ œ
EunbinJung Oct 12, 2025
d555f39
[feat]๊ธ€ ์‚ญ์ œ๊ธฐ๋Šฅ
EunbinJung Oct 12, 2025
9439bfc
[feat] ์นตํ…Œ์ผํƒœ๊ทธ
EunbinJung Oct 12, 2025
5b72ae4
[fix]์นตํ…Œ์ผ, ์‰์–ด ๊ธฐ๋Šฅ
EunbinJung Oct 12, 2025
5801561
์ˆ˜ ๋ผ์šฐํ„ฐ, ๋น„๋กœ๊ทธ์ธ์ฒ˜๋ฆฌ
EunbinJung Oct 12, 2025
fc5d719
ํƒ€์ž… ์ˆ˜์ •
EunbinJung Oct 12, 2025
18a7eeb
ํƒ€์ž… ์ˆ˜์ •
EunbinJung Oct 12, 2025
9b385db
ํƒ€์ž…์ˆ˜์ •
EunbinJung Oct 12, 2025
379e6e2
ํƒ€์ž…์ˆ˜์ •
EunbinJung Oct 12, 2025
f5a3870
ํƒ€์ž…์ˆ˜์ •
EunbinJung Oct 12, 2025
f1dd851
์˜ค๋ฅ˜์ˆ˜์ •
EunbinJung Oct 12, 2025
1975647
์˜ค๋ฅ˜์ˆ˜์ •
EunbinJung Oct 12, 2025
8beb817
์˜ค๋ฅ˜์ˆ˜์ •
EunbinJung Oct 12, 2025
f811379
์˜ค๋ฅ˜์ˆ˜์ •
EunbinJung Oct 12, 2025
fabb821
์˜ค๋ฅ˜์ˆ˜์ •
EunbinJung Oct 12, 2025
e3f356b
Merge branch 'dev' into feat/write#19
EunbinJung Oct 12, 2025
1cba59c
์ถฉ๋Œํ•ด๊ฒฐ
EunbinJung Oct 12, 2025
2a783d6
์˜ค๋ฅ˜ ์ˆ˜์ •
EunbinJung Oct 12, 2025
641b8e8
์˜ค๋ฅ˜ ์ˆ˜์ •
EunbinJung Oct 12, 2025
d9ffb6f
์˜ค๋ฅ˜ ์ˆ˜์ •
EunbinJung Oct 12, 2025
c32ae58
[fix] ์ด๋ฏธ์ง€ ์นด์šดํŠธ, 10๊ฐœ ์ œํ•œ
EunbinJung Oct 12, 2025
74462d0
[fix] ๊ธ€์“ฐ๊ธฐ placeholder
EunbinJung Oct 12, 2025
03b3ab9
[fix] ๊ณต์œ  url ์ˆ˜์ •
EunbinJung Oct 12, 2025
01575c1
[fix] ํ”„๋กœํ•„๋ฐฐ๊ฒฝ ์ง€์šฐ๊ธฐ
EunbinJung Oct 12, 2025
aa5d0ef
[fix] ํ”Œ๋กœํŒ…ํƒญ ๋ฏธ๋””์–ด์ฟผ๋ฆฌ ์ˆ˜์ •
EunbinJung Oct 12, 2025
e59ce26
[fix] ์ˆ˜์ • ๋ชจ๋‹ฌ
EunbinJung Oct 12, 2025
d8bae3c
๋Œ“๊ธ€์‹ค์‹œ๊ฐ„๋ฐ˜์˜ ์‹œ๋„
EunbinJung Oct 12, 2025
18647b5
์ˆ˜์ •
EunbinJung Oct 12, 2025
b51e65b
Merge branch 'dev' into feat/write#19
EunbinJung Oct 12, 2025
0ce9b6d
[fix] ์ˆ˜์ •๋ชจ๋‹ฌ ๋กœ์ง ์ˆ˜์ •
EunbinJung Oct 12, 2025
3c5bb99
์ˆ˜์ •๋กœ์ง ์ˆ˜์ •
EunbinJung Oct 12, 2025
491ba44
[feat] edit์ˆ˜์ •
EunbinJung Oct 14, 2025
0fc9e12
ํƒ€์ž…์˜ค๋ฅ˜
EunbinJung Oct 14, 2025
c464136
[feat] ์ข‹์•„์š”๋กœ์ง ์ˆ˜์ •
EunbinJung Oct 14, 2025
3216b01
[fix] ์นตํ…Œ์ผํƒœ๊ทธ ๋„ˆ๋น„ ์ˆ˜์ •
EunbinJung Oct 14, 2025
e0806a7
๊ธ€์“ฐ๊ธฐ ๋กœ๊ทธ์ธ๊ฒ€์‚ฌ
EunbinJung Oct 14, 2025
4a5291a
Merge branch 'dev' into feat/write#19
EunbinJung Oct 15, 2025
a2e5539
Merge branch 'dev' into feat/write#19
EunbinJung Oct 15, 2025
c378ff4
๋ฒ„๊ทธ๋“ค ์ˆ˜์ •
EunbinJung Oct 15, 2025
d08e422
Merge branch 'dev' into feat/write#19
EunbinJung Oct 15, 2025
f5f7093
๋ฐ˜์‘ํ˜•
EunbinJung Oct 15, 2025
f7cd698
ํŒŒ์ผ๋ช… ๋Œ€๋ฌธ์ž์ˆ˜์ •
EunbinJung Oct 15, 2025
02d4a00
๋ชจ๋ฐ”์ผ ์ด๋ฏธ์ง€
EunbinJung Oct 15, 2025
a115156
Merge branch 'dev' into feat/write#19
EunbinJung Oct 15, 2025
b54fe15
๋ฉ”์ธ ์ˆ˜์ •
EunbinJung Oct 15, 2025
06c4c9f
3d๋ชจ๋ธ
EunbinJung Oct 15, 2025
ad1f2e6
Merge branch 'dev' into feat/write#19
EunbinJung Oct 15, 2025
c8c7723
๋ฉ”์ธ ์ˆ˜์ •
EunbinJung Oct 15, 2025
d392220
Merge branch 'dev' into feat/write#19
EunbinJung Oct 15, 2025
9e7effe
์•„๋ž˜์นตํ…Œ์ผ์ž”์ˆ˜์ •
EunbinJung Oct 15, 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
7 changes: 4 additions & 3 deletions src/app/(main)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import FooterWrapper from '@/shared/components/footer/FooterWrapper';
import Header from '@/shared/components/header/Header';

function NoLayout({ children }: { children: React.ReactNode }) {
return (
<>
<Header className="bg-transparent w-full h-[44px] md:h-[60px] flex items-center justify-between px-[12px] fixed top-0 left-0 z-50 transition-transform duration-200 ease-in-ou" />
<Header
isMain={true}
className="w-full h-[44px] md:h-[60px] flex items-center justify-between px-[12px] fixed top-0 left-0 z-50 transition-transform duration-200 ease-in-ou"
/>
<main className="flex flex-1">{children}</main>
<FooterWrapper />
</>
);
}
Expand Down
29 changes: 19 additions & 10 deletions src/domains/main/cocktailDrop/CocktailDrop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,23 @@ function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
);

// ๋กœ๊ณ  ์œ„์—์„œ ์•„๋ž˜๋กœ ์ž์—ฐ์Šค๋Ÿฝ๊ฒŒ ๋“ฑ์žฅ
const screenWidth = window.innerWidth;
const viewportHeight = window.innerHeight;
const isTablet = screenWidth >= 640 && screenWidth < 1024;
const isMobile = screenWidth < 640;

// ๋ทฐํฌํŠธ ๋†’์ด ๊ธฐ๋ฐ˜์œผ๋กœ ๋กœ๊ณ  ์œ„์น˜ ๊ณ„์‚ฐ
const logoFinalY = isMobile
? `-${viewportHeight * 0.3}px`
: isTablet
? `-${viewportHeight * -0.8}px`
: '0px';

gsap.fromTo(
logoRef.current,
{ y: -300, opacity: 0 },
{
y: !isDesktop ? -230 : -18, // ๋ฐ์Šคํฌํ†ฑ์ด ์•„๋‹ ๋•Œ ๋” ์œ„๋กœ
y: logoFinalY, // ๋ทฐํฌํŠธ ๋†’์ด ๊ธฐ๋ฐ˜ ๊ณ„์‚ฐ
opacity: 1,
duration: 3,
ease: 'power3.out',
Expand All @@ -69,7 +81,7 @@ function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
return (
<div
ref={containerRef}
className="relative w-full lg:min-h-[110vh] min-h-[89vh] flex flex-col md:justify-center justify-end items-center mt-10 overflow-hidden"
className="relative w-full lg:min-h-[120vh] md:min-h-[95vh] min-h-[87vh] flex flex-col lg:justify-center md:justify-center justify-end items-center mt-10 overflow-hidden"
id="scroll-fixed"
>
{/* ๋Œ€๊ฐ์„  ์ค„ 1 */}
Expand All @@ -84,7 +96,7 @@ function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
/>

{/* ๋กœ๊ณ  */}
<div ref={logoRef} className="absolute md:w-115 w-85 md:h-90 h-40">
<div ref={logoRef} className="absolute z-4 md:w-115 w-65 md:h-90 h-40">
<Image
src="/logo.svg"
alt="๋กœ๊ณ  ์ด๋ฏธ์ง€"
Expand All @@ -95,20 +107,17 @@ function CocktailDrop({ isDesktop = false }: CocktailDropProps) {
/>
</div>

<div className="w-full md:h-90 h-30"></div>

{/* ์ปต ์ด๋ฏธ์ง€ - ๋ชจ๋ฐ”์ผ์—์„œ ๋ฐ”๋‹ฅ์— ๋ถ™๋„๋ก */}
<div className="md:relative absolute bottom-0">
<div className="z-5 absolute bottom-0">
<Image
src={Cocktailcup}
alt="์นตํ…Œ์ผ ์ปต"
width={900}
height={700}
priority
className="md:w-auto md:h-auto w-[500px] h-[400px] object-cover"
style={{ height: 'auto' }}
className="md:w-[700px] w-[500px] object-contain"
/>
</div>
<div className="absolute md:bottom-35 bottom-20 flex items-center justify-center z-3 w-full">
<div className="absolute md:bottom-35 bottom-20 flex items-center justify-center z-10 w-full">
<PassBtn />
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/domains/main/components/3d/HomeLogo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import Image from 'next/image';
function HomeLogo({ isDesktop }: { isDesktop: boolean }) {
return (
<div
className="z-5 absolute md:top-8 md:left-10 md:translate-none top-13 left-1/2 -translate-x-1/2"
style={{ width: !isDesktop ? 400 : 700, height: !isDesktop ? 70 : 240 }}
className="z-5 absolute md:top-22 md:left-10 md:translate-none top-30 left-1/2 -translate-x-1/2"
style={{ width: !isDesktop ? 400 : 580, height: !isDesktop ? 70 : 210 }}
>
<Image src={'/logo.svg'} alt="๋กœ๊ณ  ์ด๋ฏธ์ง€" fill priority className="object-contain" />
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/domains/main/components/3d/HomeModel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ function Model({ onLoaded }: Props) {
return (
<primitive
object={scene}
scale={5.8}
position={[0, -1.2, 0]}
scale={4.6}
position={[0, -0.6, 0]}
rotation={[-0.15, Math.PI + 3, 0]}
/>
);
Expand Down
5 changes: 3 additions & 2 deletions src/domains/main/components/3d/HomeText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ function HomeText({ isDesktop }: { isDesktop: boolean }) {
return (
<>
{!isDesktop ? (
<p className="absolute top-32 text-sm left-1/2 -translate-x-1/2 whitespace-nowrap">
์–ด๋–ค ์นตํ…Œ์ผ์ด ๋Œ๋ฆฌ์‹œ๋‚˜์š”? SSoul์ด ์‰ฝ๊ฒŒ ๊ณจ๋ผ๋“œ๋ฆด๊ฒŒ์š”.
<p className="absolute top-48 text-sm left-1/2 -translate-x-1/2 text-center mt-4">
์–ด๋–ค ์นตํ…Œ์ผ์ด ๋Œ๋ฆฌ์‹œ๋‚˜์š”? <br />
SSoul์ด ์‰ฝ๊ฒŒ ๊ณจ๋ผ๋“œ๋ฆด๊ฒŒ์š”.
</p>
) : (
<p className="absolute bottom-45 right-12 font-serif text-xl text-right font-normal z-20">
Expand Down
2 changes: 1 addition & 1 deletion src/domains/main/components/3d/ModelImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function ModelImage({ onLoaded }: Props) {
width={260}
height={290}
priority
className="object-cover w-[300px] h-[390px]"
className="object-cover w-[300px] h-[350px]"
/>
</div>
</div>
Expand Down
13 changes: 4 additions & 9 deletions src/domains/main/components/3d/StarMain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ function StarMain() {
useEffect(() => {
if (!background.current || !foreground.current) return;

// ๋ชจ๋ฐ”์ผ์—์„œ๋Š” ๋ณ„ ์• ๋‹ˆ๋ฉ”์ด์…˜ ๋น„ํ™œ์„ฑํ™”
const isMobile = window.innerWidth < 768;
if (isMobile) return;

const bgX = gsap.quickSetter(background.current, 'x', 'px');
const bgY = gsap.quickSetter(background.current, 'y', 'px');
const bgRotate = gsap.quickSetter(background.current, 'rotate', 'deg');
Expand Down Expand Up @@ -43,20 +47,11 @@ function StarMain() {
mouse.current = { x, y };
};

const handleTouchMove = (e: TouchEvent) => {
const touch = e.touches[0];
const x = (touch.clientX / window.innerWidth - 0.5) * 2;
const y = (touch.clientY / window.innerHeight - 0.5) * 2;
mouse.current = { x, y };
};

window.addEventListener('mousemove', handleMouseMove);
window.addEventListener('touchmove', handleTouchMove);
rafId.current = requestAnimationFrame(update);

return () => {
window.removeEventListener('mousemove', handleMouseMove);
window.removeEventListener('touchmove', handleTouchMove);
if (rafId.current) cancelAnimationFrame(rafId.current);
};
}, []);
Expand Down
4 changes: 4 additions & 0 deletions src/domains/mypage/components/pages/my-active/MyLike.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ function MyLike() {
fetchLike();
}, []);

useEffect(() => {
console.log(myLike);
}, [myLike]);

return (
<section className="flex justify-center">
{myLike.length > 0 ? (
Expand Down
27 changes: 0 additions & 27 deletions src/domains/shared/components/3d/HomeBackground.tsx

This file was deleted.

96 changes: 0 additions & 96 deletions src/domains/shared/components/3d/HomeModel.tsx

This file was deleted.

24 changes: 0 additions & 24 deletions src/domains/shared/components/3d/Landing.tsx

This file was deleted.

Loading