Skip to content

Merge dev #240

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
CSE-Shaco merged 2 commits into from
Dec 16, 2025
Merged

Merge dev #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b364be
fix(event/homecoming): modify typo
CSE-Shaco Dec 16, 2025
f4082b3
Merge pull request #239 from CSE-Shaco/develop
CSE-Shaco Dec 16, 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/app/event/homecoming/component/mobile/HomecomingInviteCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export default function HomecomingInviteCard() {
<div className="text-white font-bold">도착 안내</div>
<div className="text-white text-[12px] leading-snug">
• 1부 참석자: <span className="font-semibold">12:50</span>까지 도착<br/>
• 2부 참석자: <span className="font-semibold">15:20</span>까지 도착
• 2부 참석자: <span className="font-semibold">15:50</span>까지 도착
</div>
</div>

Expand Down
10 changes: 2 additions & 8 deletions src/app/event/homecoming/component/pc/FrameLayout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export default function FrameLayout() {
const viewportRef = useRef(null);
const [activeIndex, setActiveIndex] = useState(0);
const TOTAL = 5;
const SCROLL_DAMPING = 0.2;
const MAX_DELTA = 60;

const onScroll = () => {
const el = viewportRef.current;
Expand All @@ -29,18 +27,14 @@ export default function FrameLayout() {
const el = viewportRef.current;
if (!el) return;

const raw = e.deltaY;
const clamped = Math.max(-MAX_DELTA, Math.min(MAX_DELTA, raw));
const delta = clamped * SCROLL_DAMPING;

const atTop = el.scrollTop <= 0;
const atBottom = el.scrollTop + el.clientHeight >= el.scrollHeight - 1;
const canScrollInside = (delta > 0 && !atBottom) || (delta < 0 && !atTop);
const canScrollInside = (e.deltaY > 0 && !atBottom) || (e.deltaY < 0 && !atTop);

if (!canScrollInside) return;

e.preventDefault();
el.scrollTop += delta;
el.scrollTop += e.deltaY;
};

return (<div
Expand Down
6 changes: 3 additions & 3 deletions src/app/event/homecoming/component/pc/FrameViewport.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function SecondSection() {

<div className="mt-14 px-24 text-cwhite/80 text-lg leading-snug">
• 1부 참석자: <span className="font-semibold text-cwhite">12:50</span>까지 도착<br/>
• 2부 참석자: <span className="font-semibold text-cwhite">15:20</span>까지 도착
• 2부 참석자: <span className="font-semibold text-cwhite">15:50</span>까지 도착
</div>
</div>);
}
Expand Down Expand Up @@ -144,8 +144,8 @@ function FifthSection() {

<HomecomingMap/>

<div className="mt-14 px-24 text-cwhite/80 text-lg">
문의: <span className="font-semibold text-cwhite">010-2087-1816</span>
<div className="mt-14 px-24 text-cwhite/80 text-lg text-center">
문의사항이 있으실 경우, <span className="font-semibold text-cwhite">010-2087-1816</span>으로 편하게 연락 부탁드립니다.
</div>
</div>);
}
Expand Down