From 4114fa5f51067cbb474c9e36f1a79dbcbb61a7b9 Mon Sep 17 00:00:00 2001 From: thgee Date: Fri, 23 Aug 2024 12:15:47 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore:=20=EC=B9=B4=EB=93=9C=20=EC=BA=90?= =?UTF-8?q?=EB=9F=AC=EC=85=80=204=EC=97=B4,=20=EB=93=9C=EB=9E=98=EA=B7=B8?= =?UTF-8?q?=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/pickEvent/CardCarousel/CardCarousel.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/service/src/components/pickEvent/CardCarousel/CardCarousel.tsx b/packages/service/src/components/pickEvent/CardCarousel/CardCarousel.tsx index cff1d9e8..9a077328 100644 --- a/packages/service/src/components/pickEvent/CardCarousel/CardCarousel.tsx +++ b/packages/service/src/components/pickEvent/CardCarousel/CardCarousel.tsx @@ -7,12 +7,13 @@ export const CardCarousel = () => { const settings = { infinite: true, speed: 800, - slidesToShow: 3, + slidesToShow: 4, slidesToScroll: 1, initialSlide: 0, autoplay: true, autoplaySpeed: 1500, arrows: false, + draggable: false, responsive: [ { From ceba26f0606e8692e68c06e943cd583e9f3c46a4 Mon Sep 17 00:00:00 2001 From: thgee Date: Fri, 23 Aug 2024 12:29:23 +0900 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20EventCard=20bg=20color=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/src/components/main/EventCard/EventCard.css.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/service/src/components/main/EventCard/EventCard.css.ts b/packages/service/src/components/main/EventCard/EventCard.css.ts index 1f06578d..7c4f4c55 100644 --- a/packages/service/src/components/main/EventCard/EventCard.css.ts +++ b/packages/service/src/components/main/EventCard/EventCard.css.ts @@ -4,7 +4,10 @@ import { theme } from "@watermelon-clap/core/src/theme"; export const eventCard = (isMainEvent: boolean) => css` padding: 72px; - background: ${isMainEvent ? theme.color.mainEventCardBg : theme.color.white}; + background: ${isMainEvent + ? theme.color.mainEventCardBg + : "linear-gradient(194deg, #dffbdd 3.1%, #d2ecff 33.71%, #d2e5d8 78.87%, #e5c7f1 103.46%)"}; + width: 452px; border-radius: 20px; text-align: center; From a064ddcff86abe82a784a5e7582dde66427e3648 Mon Sep 17 00:00:00 2001 From: thgee Date: Fri, 23 Aug 2024 12:32:44 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=EC=9D=91=EB=AA=A8=EB=82=B4?= =?UTF-8?q?=EC=97=AD=ED=99=95=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8B=80=20font-size=20=EC=B6=95=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/src/pages/LotteryApplyInfo/LotteryApplyInfo.css.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/service/src/pages/LotteryApplyInfo/LotteryApplyInfo.css.ts b/packages/service/src/pages/LotteryApplyInfo/LotteryApplyInfo.css.ts index d638de52..d30ddd21 100644 --- a/packages/service/src/pages/LotteryApplyInfo/LotteryApplyInfo.css.ts +++ b/packages/service/src/pages/LotteryApplyInfo/LotteryApplyInfo.css.ts @@ -23,7 +23,7 @@ export const mainBg = css` export const pageTitle = css` text-align: center; ${theme.font.pcpB} - font-size : calc(50px + 2vw); + font-size : calc(26px + 2vw); padding-top: 120px; color: ${theme.color.white}; From a53a328847096db608a6b29426f883773f8bfd14 Mon Sep 17 00:00:00 2001 From: thgee Date: Fri, 23 Aug 2024 12:38:01 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20`=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=9D=B4=20=ED=95=84=EC=9A=94=ED=95=9C=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=EC=9E=85=EB=8B=88=EB=8B=A4`=20font-size=20=EC=B6=95?= =?UTF-8?q?=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/service/src/pages/Error/Error.css.ts | 5 +++++ packages/service/src/pages/Error/Error.tsx | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/service/src/pages/Error/Error.css.ts b/packages/service/src/pages/Error/Error.css.ts index 8b9fa344..988cc7ed 100644 --- a/packages/service/src/pages/Error/Error.css.ts +++ b/packages/service/src/pages/Error/Error.css.ts @@ -1,4 +1,5 @@ import { css } from "@emotion/react"; +import { mobile } from "@service/common/responsive/responsive"; import { theme } from "@watermelon-clap/core/src/theme"; export const errorContainerStyle = css` @@ -10,6 +11,7 @@ export const errorContainerStyle = css` ${theme.flex.column} ${theme.gap.gap32} + height: 100vh; `; @@ -20,4 +22,7 @@ export const errorMessageStyle = css` export const loginText = css` color: white; + ${mobile(css` + font-size: 24px; + `)} `; diff --git a/packages/service/src/pages/Error/Error.tsx b/packages/service/src/pages/Error/Error.tsx index 16d28ec8..c2816bf0 100644 --- a/packages/service/src/pages/Error/Error.tsx +++ b/packages/service/src/pages/Error/Error.tsx @@ -7,6 +7,7 @@ import { useErrorBoundary } from "react-error-boundary"; import { GlobalNavigationBar } from "@service/common/components/GlobalNavigationBar"; import { Space } from "@service/common/styles/Space"; import { useAuth } from "@watermelon-clap/core/src/hooks"; +import { useMobile } from "@service/common/hooks/useMobile"; export const Error = ({ error, resetErrorBoundary }: FallbackProps) => { const navigate = useNavigate(); @@ -15,6 +16,8 @@ export const Error = ({ error, resetErrorBoundary }: FallbackProps) => { const { login } = useAuth(); + const mobile = useMobile(); + switch (error.message) { case "404": errorMessage = @@ -49,7 +52,7 @@ export const Error = ({ error, resetErrorBoundary }: FallbackProps) => { {error.message === "403" ? (

로그인이 필요한 서비스입니다

- +