diff --git a/frontend/src/components/pages/landing/FirstPage/FirstPage.styled.ts b/frontend/src/components/pages/landing/FirstPage/FirstPage.styled.ts index 6adbef6c..cc4db9b7 100644 --- a/frontend/src/components/pages/landing/FirstPage/FirstPage.styled.ts +++ b/frontend/src/components/pages/landing/FirstPage/FirstPage.styled.ts @@ -1,4 +1,4 @@ -import { css } from "@emotion/react"; +import { css, keyframes } from "@emotion/react"; import styled from "@emotion/styled"; import theme from "@styles/theme"; @@ -61,3 +61,21 @@ export const Gradient = styled.div` height: 20rem; background: linear-gradient(to bottom, rgb(255 255 255 / 0%) 0%, rgb(255 255 255 / 50%) 100%); `; + +const float = keyframes` + 0% { transform: translateY(0px); } + 50% { transform: translateY(-1rem); } + 100% { transform: translateY(0px); } +`; + +export const iconStyle = css` + position: absolute; + bottom: 0; + z-index: ${theme.zIndex.toast}; + padding: ${theme.spacing.m}; + opacity: 0.5; + + background-color: transparent; + + animation: ${float} 1s ease-in-out infinite; +`; diff --git a/frontend/src/components/pages/landing/FirstPage/FirstPage.tsx b/frontend/src/components/pages/landing/FirstPage/FirstPage.tsx index 231b1dc8..692b9d97 100644 --- a/frontend/src/components/pages/landing/FirstPage/FirstPage.tsx +++ b/frontend/src/components/pages/landing/FirstPage/FirstPage.tsx @@ -1,9 +1,11 @@ import { useNavigate } from "react-router-dom"; -import { Button, Text } from "@components/common"; +import { Button, Icon, Text } from "@components/common"; import { ROUTE_PATHS_MAP } from "@constants/route"; +import { PRIMITIVE_COLORS } from "@styles/tokens"; + import { BigTturi } from "@assets/webp"; import { createAnimation } from "../Animation.styled"; @@ -47,6 +49,7 @@ const FirstPage = () => { + ); }; diff --git a/frontend/src/components/pages/landing/LandingPage.styled.ts b/frontend/src/components/pages/landing/LandingPage.styled.ts index e5674a46..dc7694f7 100644 --- a/frontend/src/components/pages/landing/LandingPage.styled.ts +++ b/frontend/src/components/pages/landing/LandingPage.styled.ts @@ -19,11 +19,3 @@ export const firstPageStyle = css` top: 0; z-index: 1; `; - -export const secondPageStyle = css` - position: absolute; - top: 100vh; - z-index: 2; - width: 100%; - transition: transform 0.1s ease-out; -`; diff --git a/frontend/src/components/pages/landing/LandingPage.tsx b/frontend/src/components/pages/landing/LandingPage.tsx index ffad61ec..ff6932ae 100644 --- a/frontend/src/components/pages/landing/LandingPage.tsx +++ b/frontend/src/components/pages/landing/LandingPage.tsx @@ -5,20 +5,15 @@ import FourthPage from "./FourthPage/FourthPage"; import * as S from "./LandingPage.styled"; import SecondPage from "./SecondPage/SecondPage"; import ThirdPage from "./ThirdPage/ThirdPage"; -import useScrollAnimation from "./hook/useScrollAnimation"; const LandingPage = () => { - const [secondPageRef] = useScrollAnimation(); - return (
-
- -
+
diff --git a/frontend/src/components/pages/landing/SecondPage/SecondPage.styled.ts b/frontend/src/components/pages/landing/SecondPage/SecondPage.styled.ts index b7cf811d..803e79b3 100644 --- a/frontend/src/components/pages/landing/SecondPage/SecondPage.styled.ts +++ b/frontend/src/components/pages/landing/SecondPage/SecondPage.styled.ts @@ -1,4 +1,4 @@ -import { css, keyframes } from "@emotion/react"; +import { css } from "@emotion/react"; import theme from "@styles/theme"; import { PRIMITIVE_COLORS } from "@styles/tokens"; @@ -99,24 +99,6 @@ export const emojiStyle = css` z-index: 10; `; -const float = keyframes` - 0% { transform: translateY(0px); } - 50% { transform: translateY(-1rem); } - 100% { transform: translateY(0px); } -`; - -export const buttonStyle = css` - position: absolute; - top: -5.8rem; - z-index: ${theme.zIndex.toast}; - padding: ${theme.spacing.m}; - opacity: 0.5; - - background-color: transparent; - - animation: ${float} 1s ease-in-out infinite; -`; - export const primaryText = css` color: ${theme.colors.primary}; `; diff --git a/frontend/src/components/pages/landing/SecondPage/SecondPage.tsx b/frontend/src/components/pages/landing/SecondPage/SecondPage.tsx index 0f0239b3..f158c3f5 100644 --- a/frontend/src/components/pages/landing/SecondPage/SecondPage.tsx +++ b/frontend/src/components/pages/landing/SecondPage/SecondPage.tsx @@ -1,6 +1,4 @@ -import { Icon, Text } from "@components/common"; - -import { PRIMITIVE_COLORS } from "@styles/tokens"; +import { Text } from "@components/common"; import { MainPageImage } from "@assets/webp"; @@ -14,7 +12,6 @@ const SecondPage = () => { return (
-