From fbf140c41f016aaf8a2770ef6d47d6854a7f7b00 Mon Sep 17 00:00:00 2001 From: kwangkki_Heo Date: Mon, 10 Apr 2023 00:56:48 +0900 Subject: [PATCH 1/3] Update README.md --- groomeong_front/README.md | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/groomeong_front/README.md b/groomeong_front/README.md index fb9bcc9..c416d7d 100644 --- a/groomeong_front/README.md +++ b/groomeong_front/README.md @@ -1,36 +1 @@ -This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). - -## Getting Started - -First, run the development server: - -```bash -npm run dev -# or -yarn dev -``` - -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. - -You can start editing the page by modifying `pages/index.tsx`. The page auto-updates as you edit the file. - -[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.ts`. - -The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages. - -This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font. - -## Learn More - -To learn more about Next.js, take a look at the following resources: - -- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. -- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. - -You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! - -## Deploy on Vercel - -The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. - -Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details. +그루멍 가자! From 280a2a8017786352306acdaeed7b2e155c584ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=ED=98=84=EC=9E=AC?= Date: Mon, 10 Apr 2023 10:06:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=EB=A0=8C=EB=94=A9=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=B0=98=EC=9D=91=ED=98=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/commons/RendingStyles/index.ts | 130 +++++------------- 1 file changed, 38 insertions(+), 92 deletions(-) diff --git a/groomeong_front/src/commons/RendingStyles/index.ts b/groomeong_front/src/commons/RendingStyles/index.ts index 4da782e..a03dd0e 100644 --- a/groomeong_front/src/commons/RendingStyles/index.ts +++ b/groomeong_front/src/commons/RendingStyles/index.ts @@ -9,20 +9,12 @@ interface IProps { export const Container = styled.div` width: 100vw; - height: 500vh; color: black; font-family: "Pretendard"; background-color: white; transition: all 0.08s ease-in-out; background-color: white; cursor: none; - - ${mediaQueries("phone")} { - height: 260vh; - } - ${mediaQueries("tablet")} { - height: 260vh; - } `; export const Page = styled.div` @@ -56,14 +48,11 @@ export const First = styled.div` props.position <= 150 ? "1" : `${1 - (props.position - 150) / 1000}`}; ${mediaQueries("phone")} { - flex-direction: column; - height: 80vh; - transform: none; opacity: 1; + height: 70vh; + transform: none; } ${mediaQueries("tablet")} { - height: 80vh; - flex-direction: column; transform: none; opacity: 1; } @@ -79,12 +68,8 @@ export const First_Text_Wrapper = styled.div` gap: 1vh; ${mediaQueries("phone")} { - top: 30vh; - right: 5vw; - } - ${mediaQueries("tablet")} { - top: 30vh; - right: 5vw; + top: 20vh; + right: 10vw; } `; @@ -154,6 +139,10 @@ export const First_Img_Wrapper = styled.div` transform: rotate(-1deg); } } + + ${mediaQueries("phone")} { + height: -50vh; + } `; export const First_Back_Img = styled.img` @@ -176,9 +165,6 @@ export const First_Back_Img = styled.img` ${mediaQueries("phone")} { height: 18vh; } - ${mediaQueries("tablet")} { - height: 18vh; - } `; export const First_Dog_Img = styled.img` width: 30vw; @@ -192,10 +178,6 @@ export const First_Dog_Img = styled.img` height: 30vh; top: -30.5vh; } - ${mediaQueries("tablet")} { - height: 30vh; - top: -30.5vh; - } @keyframes firstDog { 0% { @@ -227,13 +209,11 @@ export const Second = styled.div` props.position >= 1050 ? `${1 + (1050 - props.position) / 2000}` : `1`}; ${mediaQueries("phone")} { + height: 70vh; opacity: 1; - height: 50vh; } - ${mediaQueries("tablet")} { opacity: 1; - height: 50vh; } `; @@ -244,12 +224,10 @@ export const Second_Text_Wrapper = styled.div` ${mediaQueries("phone")} { opacity: 1; - top: -28vh; + top: -20vh; } - ${mediaQueries("tablet")} { opacity: 1; - top: -28vh; } `; @@ -265,6 +243,7 @@ export const Second_Main_Text = styled.div` opacity: 1; padding-bottom: 2vh; } + ${mediaQueries("tablet")} { opacity: 1; } @@ -290,12 +269,11 @@ export const Second_Img_Wrapper = styled.div` ${mediaQueries("phone")} { opacity: 1; - top: -40vh; + top: -25vh; } ${mediaQueries("tablet")} { opacity: 1; - top: -40vh; } `; export const Second_Img_Dog = styled.img` @@ -314,12 +292,10 @@ export const Second_Img_Dog = styled.img` ); ${mediaQueries("phone")} { - transform: none; - top: 22%; + display: none; } ${mediaQueries("tablet")} { - transform: none; - top: 22%; + display: none; } `; export const Second_Img_Table = styled.img` @@ -338,12 +314,10 @@ export const Second_Img_Table = styled.img` ); ${mediaQueries("phone")} { - transform: none; - top: 40%; + display: none; } ${mediaQueries("tablet")} { - transform: none; - top: 40%; + display: none; } `; export const Second_Img_Back = styled.img` @@ -354,13 +328,10 @@ export const Second_Img_Back = styled.img` z-index: 0; ${mediaQueries("phone")} { - top: 20%; - left: 28vw; z-index: -2; } ${mediaQueries("tablet")} { top: 20%; - z-index: -2; } `; export const Second_Img_Women = styled.img` @@ -374,9 +345,6 @@ export const Second_Img_Women = styled.img` ${mediaQueries("phone")} { top: 18%; } - ${mediaQueries("tablet")} { - top: 18%; - } @keyframes imgWrapper { 0% { @@ -398,11 +366,10 @@ export const Third = styled.div` align-items: center; ${mediaQueries("phone")} { - height: 80vh; + height: 70vh; } ${mediaQueries("tablet")} { height: 80vh; - transform: translateY(-28vh); } `; @@ -416,12 +383,11 @@ export const Third_Img_Back = styled.img` top: -90vh; ${mediaQueries("phone")} { - top: -80vh; - height: 100vh; + height: 70vh; + top: -120vh; } ${mediaQueries("tablet")} { - top: -80vh; - height: 100vh; + height: 260vh; } `; export const Third_Img_Map = styled.img` @@ -432,13 +398,13 @@ export const Third_Img_Map = styled.img` ); ${mediaQueries("phone")} { transform: none; - transform: translateX(); - transform: translateY(-50vh); + position: absolute; + top: -40vh; } ${mediaQueries("tablet")} { transform: none; - transform: translateX(0); - transform: translateY(-50vh); + transform: translateX(0vw); + transform: translateY(-10vh); } `; @@ -454,12 +420,11 @@ export const Third_Text_Wrapper = styled.div` ${mediaQueries("phone")} { opacity: 1; - transform: translateY(-35vh); + transform: translateY(-25vh); } ${mediaQueries("tablet")} { opacity: 1; - transform: translateY(-35vh); } `; @@ -473,10 +438,6 @@ export const Third_Main_Text = styled.div` ${mediaQueries("phone")} { padding-bottom: 2vh; } - - ${mediaQueries("tablet")} { - padding-bottom: 2vh; - } `; export const Third_Sub_Text = styled.div` text-align: end; @@ -498,11 +459,7 @@ export const Fourth = styled.div` position: relative; ${mediaQueries("phone")} { - height: 0vh; - } - - ${mediaQueries("tablet")} { - height: 0vh; + height: 70vh; } `; @@ -517,13 +474,13 @@ export const Fourth_Text_Wrapper = styled.div` props.position > 1500 ? `${(props.position - 1500) / 800}` : `0`}; ${mediaQueries("phone")} { + transform: translateY(-30vh); opacity: 1; - top: -70vh; } ${mediaQueries("tablet")} { opacity: 1; - top: -70vh; + top: -20vh; } `; export const Fourth_Main_Text = styled.div` @@ -541,11 +498,10 @@ export const Fourth_Sub_Text = styled.div` font-weight: 700; ${mediaQueries("phone")} { - top: -17vh; + transform: translateY(-5vh); } - ${mediaQueries("tablet")} { - top: -17vh; + top: -10vh; } `; @@ -553,11 +509,7 @@ export const Fourth_Img_Wrapper = styled.div` position: relative; ${mediaQueries("phone")} { - top: -52vh; - } - - ${mediaQueries("tablet")} { - top: -52vh; + top: -38vh; } `; @@ -581,13 +533,12 @@ export const Fourth_Img_Reservation = styled.img` export const Fifth = styled.div` width: 100vw; - height: 60vh; + height: 100vh; display: flex; flex-direction: row; justify-content: center; align-items: center; - opacity: ${(props) => - props.position >= 2800 ? `${(props.position - 2800) / 400}` : `0`}; + opacity: 1; ${mediaQueries("phone")} { opacity: 1; @@ -597,8 +548,6 @@ export const Fifth = styled.div` ${mediaQueries("tablet")} { opacity: 1; - position: absolute; - top: 152vh; } `; @@ -607,15 +556,14 @@ export const Fifth_Wrapper = styled.div` flex-direction: column; justify-content: center; align-items: center; - padding-top: 25vh; overflow: hidden; ${mediaQueries("phone")} { - padding: 0; - } - - ${mediaQueries("tablet")} { - padding: 0; + background-color: white; + width: 100vw; + height: 70vh; + transform: translateY(50vh); + padding-top: 0; } `; @@ -667,9 +615,7 @@ export const Scroll = styled.div` width: 110px; height: 110px; border-radius: 50%; - /* color: #454552; */ color: ${GS.base.secondary}; - /* background-color: rgba(232, 90, 113, 0.65); */ background-color: ${GS.base.tertiary}; opacity: 0.9; font-weight: 700; From 084f0a5a74d8d0e49fd08689002236f9818a114c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=ED=98=84=EC=9E=AC?= Date: Thu, 13 Apr 2023 17:02:30 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- groomeong_front/src/components/commons/layout/index.tsx | 1 - groomeong_front/src/components/units/index.tsx | 1 - 2 files changed, 2 deletions(-) delete mode 100644 groomeong_front/src/components/commons/layout/index.tsx delete mode 100644 groomeong_front/src/components/units/index.tsx diff --git a/groomeong_front/src/components/commons/layout/index.tsx b/groomeong_front/src/components/commons/layout/index.tsx deleted file mode 100644 index d251e77..0000000 --- a/groomeong_front/src/components/commons/layout/index.tsx +++ /dev/null @@ -1 +0,0 @@ -// 폴더 구조 예시 diff --git a/groomeong_front/src/components/units/index.tsx b/groomeong_front/src/components/units/index.tsx deleted file mode 100644 index d251e77..0000000 --- a/groomeong_front/src/components/units/index.tsx +++ /dev/null @@ -1 +0,0 @@ -// 폴더 구조 예시