From 27fc1b2e69b6ecca37c3287ab437b851cc62a5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=8C=E1=85=A2=E1=84=92=E1=85=A1?= Date: Thu, 5 Oct 2023 20:17:54 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EB=B3=80=EB=8F=99=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jurumarble/src/app/register/constants.tsx | 6 +++--- .../sections/RegisterDrinkCapacitySection.tsx | 11 +++++++---- .../src/app/register/sections/RegisterStepSection.tsx | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/jurumarble/src/app/register/constants.tsx b/apps/jurumarble/src/app/register/constants.tsx index f7d98387..a8a5aeb6 100644 --- a/apps/jurumarble/src/app/register/constants.tsx +++ b/apps/jurumarble/src/app/register/constants.tsx @@ -8,17 +8,17 @@ import RegisterMBTISection from "./sections/RegisterMBTISection"; export const REGISTER_STEPS_CONTENT = { STEP1: { title: "평소에 어떤 술을 즐기시나요?", - subTitle: "여행의 즐거움을 더할 우리술을 추천드릴게요.", + subTitle: "여행의 즐거움을 레벨업할 우리술을 추천드릴게요.", component: () => , }, STEP2: { title: "여행자님의 성별은 무엇인가요?", - subTitle: "같은 성별이 선호하는 우리술이 무엇인지 추천드릴게요", + subTitle: "같은 성별의 여행자들이 선호하는 우리술을 추천드릴게요.", component: () => , }, STEP3: { title: "여행자님의 출생년도는 어떻게 되나요?", - subTitle: "비슷한 나이대의 여행자들이 선호하는 우리술이 무엇인지 추천드릴게요.", + subTitle: "비슷한 나이대의 여행자들이 선호하는 우리술을 추천드릴게요.", component: () => , }, STEP4: { diff --git a/apps/jurumarble/src/app/register/sections/RegisterDrinkCapacitySection.tsx b/apps/jurumarble/src/app/register/sections/RegisterDrinkCapacitySection.tsx index 44e2a7ed..31a5b3fa 100644 --- a/apps/jurumarble/src/app/register/sections/RegisterDrinkCapacitySection.tsx +++ b/apps/jurumarble/src/app/register/sections/RegisterDrinkCapacitySection.tsx @@ -31,10 +31,10 @@ const Wrapper = styled.div` margin: 32px 0; background: ${({ theme }) => theme.colors.white}; border: 1px solid ${({ theme }) => theme.colors.line_01}; + border-radius: 8px; box-shadow: 2px 2px 20px 0px rgba(0, 0, 0, 0.04), 2px 2px 20px 0px rgba(0, 0, 0, 0.06); > div + div { - border-top: 1px solid ${({ theme }) => theme.colors.line_01}; } `; @@ -45,17 +45,20 @@ const Item = styled.div<{ cursor: pointer; display: flex; transition: all 0.3s ease-in-out; + border-top: 1px solid ${({ theme }) => theme.colors.line_01}; - ${({ $selected }) => + ${({ theme, $selected }) => $selected && css` & { animation: ${transitions.blink} 0.7s ease-in-out; - background: rgba(255, 92, 0, 0.5); + background: rgba(255, 92, 0, 0.2); + border: 1px solid ${theme.colors.main_01}; + border-radius: 8px; } `} &:hover { - background-color: ${({ theme }) => theme.colors.main_02}; + background: rgba(255, 92, 0, 0.2); } `; diff --git a/apps/jurumarble/src/app/register/sections/RegisterStepSection.tsx b/apps/jurumarble/src/app/register/sections/RegisterStepSection.tsx index 48cd0089..968e5e98 100644 --- a/apps/jurumarble/src/app/register/sections/RegisterStepSection.tsx +++ b/apps/jurumarble/src/app/register/sections/RegisterStepSection.tsx @@ -14,7 +14,6 @@ export const RegisterStepSection = () => { return ( <> - {step === "STEP1" && 주루마블에 오신 여행자님 환영합니다!} {component()} From f03df8e760cb83032e90112b9421127b75ed7cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=8C=E1=85=A2=E1=84=92=E1=85=A1?= Date: Thu, 5 Oct 2023 21:50:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=82=AC=ED=8C=8C=EB=A6=AC=EC=97=90?= =?UTF-8?q?=EC=84=9C=20margin=200=20auto=20=EC=9E=91=EB=8F=99=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=9D=B4=EC=8A=88=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/register/components/WarningModal.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/jurumarble/src/app/register/components/WarningModal.tsx b/apps/jurumarble/src/app/register/components/WarningModal.tsx index 14143a4b..451be3ad 100644 --- a/apps/jurumarble/src/app/register/components/WarningModal.tsx +++ b/apps/jurumarble/src/app/register/components/WarningModal.tsx @@ -1,7 +1,6 @@ import { Button, ModalTemplate } from "components/index"; import { ALCOHOL_LEVEL_LIST, GENDER_LIST } from "lib/constants"; import { SvgWarningIcon } from "src/assets/icons/components"; - import styled, { css } from "styled-components"; import { useRegisterContext } from "../contexts"; @@ -19,7 +18,7 @@ function WarningModal() { return ( - + 선택하신 항목을 확인해주세요. @@ -67,14 +66,12 @@ const Container = styled.div` ${({ theme }) => css` ${theme.typography.body02} padding: 40px 20px 0 20px; + display: flex; + flex-direction: column; + align-items: center; `} `; -const WarningIconStyled = styled(SvgWarningIcon)` - display: flex; - margin: 0 auto; -`; - const GuideText = styled.div` ${({ theme }) => css` ${theme.typography.headline02}; @@ -93,6 +90,7 @@ const UserInfoList = styled.ul` flex-direction: column; margin-top: 24px; padding: 20px; + width: 100%; `} `; @@ -135,6 +133,7 @@ const ButtonContainer = styled.div` display: flex; gap: 8px; margin-top: 40px; + width: 100%; `}; `; From 939598a6ba894c708ed8fc8677a5bb1565d41393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=8C=E1=85=A2=E1=84=92=E1=85=A1?= Date: Thu, 5 Oct 2023 21:58:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=EC=99=84=EB=A3=8C=EC=8B=9C=20=ED=86=A0=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/register/contexts/RegisterProvider.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/jurumarble/src/app/register/contexts/RegisterProvider.tsx b/apps/jurumarble/src/app/register/contexts/RegisterProvider.tsx index 25cfbff9..6c45826d 100644 --- a/apps/jurumarble/src/app/register/contexts/RegisterProvider.tsx +++ b/apps/jurumarble/src/app/register/contexts/RegisterProvider.tsx @@ -172,7 +172,10 @@ export const RegisterProvider = ({ children }: PropsWithChildren) => { mbti: stringfiedMBTI, }), { - onSuccess: () => router.replace(Path.MAIN_PAGE), + onSuccess: () => { + toast.success("회원가입이 완료되었습니다."); + router.replace(Path.MAIN_PAGE); + }, onError: (error) => alert(error), }, );