Skip to content
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

[feat] 인터랙션 모달 분기 처리 #83

Merged
merged 8 commits into from
Aug 9, 2024
Merged

[feat] 인터랙션 모달 분기 처리 #83

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9778134
[refactor] swiper slideTo 기능을 함수로 자식에 넘겨줌
darkdulgi Aug 8, 2024
dd7730a
[feat] 인터랙션 모달 분기 처리 약간
darkdulgi Aug 8, 2024
27ed8f1
[feat] 사용자 로그인 상태에 대한 일부 분기처리 적용
darkdulgi Aug 9, 2024
cc55226
[design] 인터랙션 모달 반응형 약간
darkdulgi Aug 9, 2024
8c00532
[feat] 타이머 클릭시 선착순 이벤트 섹션으로 이동
darkdulgi Aug 9, 2024
a6dda6b
[design] 인터랙션 섹션 반응형 디자인
darkdulgi Aug 9, 2024
3bc5ae7
Merge branch 'dev' into feature/10-interactionpage
darkdulgi Aug 9, 2024
5ef518c
[chore] 미사용 import 제거
darkdulgi Aug 9, 2024
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/interactions/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function InteractionPage() {
return (
<section
ref={sectionRef}
className="bg-black py-60 flex flex-col items-center"
className="bg-black py-20 sm:py-60 flex flex-col items-center"
>
<TapBar
currentInteraction={currentInteraction}
Expand Down
9 changes: 2 additions & 7 deletions src/introSection/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,13 @@ import style from "./index.module.css";
import SpinningCarVideo from "./car-spin.webm";
import Pointer from "./pointer.svg";
import { useEffect, useRef, useState } from "react";
import scrollTo from "../scroll/scrollTo.js";

function IntroSection() {
const videoRef = useRef(null);
const introRef = useRef(null);
const [isTimerVisible, setIsTimerVisible] = useState(false);

function onClickTimer() {
/*
* 타이머 클릭시 선착순 이벤트 섹션으로 이동하는 코드 미구현
*/
}

const titleOpacity = useScrollTransition({
scrollStart: 0,
scrollEnd: 500,
Expand Down Expand Up @@ -122,7 +117,7 @@ function IntroSection() {
</section>

<div
onClick={onClickTimer}
onClick={() => scrollTo(4)}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflict가 날 예정입니다.

className={`${isTimerVisible ? "-translate-y-24" : ""} -bottom-20 transition duration-150 ease-in-out fixed left-1/2 -translate-x-1/2 graphic-gradient rounded-full p-px shadow-[0_4px_12px_0px_rgba(0,0,0,0.25)] z-40 select-none`}
>
<div className=" bg-black flex items-center gap-[10px] px-10 py-4 rounded-full">
Expand Down