From 7eda19e530a96304fa5f3085b719e2cc3f3f38c1 Mon Sep 17 00:00:00 2001 From: jerry Date: Fri, 19 Jul 2024 18:51:18 +0900 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20url=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/register/Register.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/register/Register.tsx b/src/pages/register/Register.tsx index 197cb5b9..13b3e3a4 100644 --- a/src/pages/register/Register.tsx +++ b/src/pages/register/Register.tsx @@ -66,9 +66,8 @@ const Register = () => { openAlert({ title: "로그인이 필요한 서비스입니다.", }); + handleKakaoLogin("/gig-register"); } - - handleKakaoLogin("/register"); }, []); // gigInfo 초기화 From 76a4ac7ad07aa502ae598002f282a90d1a008456 Mon Sep 17 00:00:00 2001 From: jerry Date: Fri, 19 Jul 2024 18:53:56 +0900 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=ED=99=95=EC=9D=B8=20=EB=88=84?= =?UTF-8?q?=EB=A5=BC=EC=8B=9C=20main=EC=9C=BC=EB=A1=9C=20=EB=A6=AC?= =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EB=A0=89=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/register/Register.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/register/Register.tsx b/src/pages/register/Register.tsx index 13b3e3a4..7ae77b02 100644 --- a/src/pages/register/Register.tsx +++ b/src/pages/register/Register.tsx @@ -65,6 +65,7 @@ const Register = () => { if (userObj === null) { openAlert({ title: "로그인이 필요한 서비스입니다.", + okCallback: () => navigate("/main"), }); handleKakaoLogin("/gig-register"); } From 4114162054fa87c6a39348e4872b1a9c6f5297f5 Mon Sep 17 00:00:00 2001 From: jerry Date: Fri, 19 Jul 2024 18:56:47 +0900 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20stepper=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/commons/stepper/Stepper.styled.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/commons/stepper/Stepper.styled.ts b/src/components/commons/stepper/Stepper.styled.ts index 5c9bc680..0fc9480b 100644 --- a/src/components/commons/stepper/Stepper.styled.ts +++ b/src/components/commons/stepper/Stepper.styled.ts @@ -18,6 +18,8 @@ export const StepperBtn = styled.button<{ disabled: boolean }>` width: 2.4rem; height: 2.4rem; + color: ${({ theme, disabled }) => (disabled ? theme.colors.gray_500 : theme.colors.white)}; + cursor: ${({ theme, disabled }) => (disabled ? "not-allowed" : "pointer")}; stroke: ${({ theme, disabled }) => (disabled ? theme.colors.gray_500 : theme.colors.white)}; From b25e6786e24ad46c587617151bc3281ffa52d63d Mon Sep 17 00:00:00 2001 From: jerry Date: Fri, 19 Jul 2024 19:00:50 +0900 Subject: [PATCH 4/9] =?UTF-8?q?feat:=20=EC=B9=B4=EB=93=9C=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=EC=8B=9C=20=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/MyRegisterdShow/MyRegisterdShow.tsx | 1 + .../components/registeredcard/RegisteredCard.tsx | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pages/MyRegisterdShow/MyRegisterdShow.tsx b/src/pages/MyRegisterdShow/MyRegisterdShow.tsx index b53971a1..4563e330 100644 --- a/src/pages/MyRegisterdShow/MyRegisterdShow.tsx +++ b/src/pages/MyRegisterdShow/MyRegisterdShow.tsx @@ -95,6 +95,7 @@ const MyRegisterdShow = () => { {showList?.map((item: RegisteredObjProps, index: number) => ( - + { + navigate(`/gig/${performanceId}`); + }} + /> - + { + navigate(`/gig/${performanceId}`); + }} + > {getShowTypeText(genre as SHOW_TYPE_KEY)} {performanceTitle} From c22e1105ff9413d237d4225459491aa9367b1185 Mon Sep 17 00:00:00 2001 From: jerry Date: Fri, 19 Jul 2024 19:02:01 +0900 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=ED=83=80=EC=9E=85=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/registeredcard/RegisteredCard.styled.ts | 4 ++-- .../components/registeredcard/RegisteredCard.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/MyRegisterdShow/components/registeredcard/RegisteredCard.styled.ts b/src/pages/MyRegisterdShow/components/registeredcard/RegisteredCard.styled.ts index b2f4e186..bb504925 100644 --- a/src/pages/MyRegisterdShow/components/registeredcard/RegisteredCard.styled.ts +++ b/src/pages/MyRegisterdShow/components/registeredcard/RegisteredCard.styled.ts @@ -58,9 +58,9 @@ export const CardInfoTitleText = styled.span` width: 21rem; overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; color: ${({ theme }) => theme.colors.white}; + white-space: nowrap; + text-overflow: ellipsis; ${({ theme }) => theme.fonts.heading4}; `; diff --git a/src/pages/MyRegisterdShow/components/registeredcard/RegisteredCard.tsx b/src/pages/MyRegisterdShow/components/registeredcard/RegisteredCard.tsx index efd55787..f8905fc2 100644 --- a/src/pages/MyRegisterdShow/components/registeredcard/RegisteredCard.tsx +++ b/src/pages/MyRegisterdShow/components/registeredcard/RegisteredCard.tsx @@ -11,7 +11,7 @@ const RegisteredCard = ({ performancePeriod, genre, posterImage, -}: Omit) => { +}: RegisteredObjProps) => { const navigate = useNavigate(); //공연 수정하기 뷰 연결하고 나면 url 변경해야할 수도 있음 // 또한, 파라미터를 넘겨서 조회할 수 있도록 url에 파라미터를 추가해야할 수 있음. From 3742803eae42915a4316a01a4c4fc9075f9c464c Mon Sep 17 00:00:00 2001 From: Sinji Date: Fri, 19 Jul 2024 19:05:13 +0900 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20ios=20=EC=8A=A4=ED=83=9C=ED=8D=BC=20?= =?UTF-8?q?=EC=83=89=20=EC=95=88=20=EB=9C=A8=EB=8A=94=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svgs/IconMinus.tsx | 2 +- src/assets/svgs/IconPlus.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/svgs/IconMinus.tsx b/src/assets/svgs/IconMinus.tsx index 6b99f89d..db5dfbfb 100644 --- a/src/assets/svgs/IconMinus.tsx +++ b/src/assets/svgs/IconMinus.tsx @@ -1,6 +1,6 @@ import type { SVGProps } from "react"; const SvgIconMinus = (props: SVGProps) => ( - + ); diff --git a/src/assets/svgs/IconPlus.tsx b/src/assets/svgs/IconPlus.tsx index 77fe3bb8..ae1c3279 100644 --- a/src/assets/svgs/IconPlus.tsx +++ b/src/assets/svgs/IconPlus.tsx @@ -1,6 +1,6 @@ import type { SVGProps } from "react"; const SvgIconPlus = (props: SVGProps) => ( - + ); From accd27f3ccbd56229c67b7ac8345b5d355b9f5d0 Mon Sep 17 00:00:00 2001 From: Sinji Date: Fri, 19 Jul 2024 19:20:41 +0900 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20ios=20=EC=8A=A4=ED=83=9C=ED=8D=BC=20?= =?UTF-8?q?=EC=83=89=20=EC=95=88=20=EB=9C=A8=EB=8A=94=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svgs/IconMinus.tsx | 9 ++++++++- src/assets/svgs/IconPlus.tsx | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/assets/svgs/IconMinus.tsx b/src/assets/svgs/IconMinus.tsx index db5dfbfb..6b4808e8 100644 --- a/src/assets/svgs/IconMinus.tsx +++ b/src/assets/svgs/IconMinus.tsx @@ -1,6 +1,13 @@ import type { SVGProps } from "react"; const SvgIconMinus = (props: SVGProps) => ( - + ); diff --git a/src/assets/svgs/IconPlus.tsx b/src/assets/svgs/IconPlus.tsx index ae1c3279..19184303 100644 --- a/src/assets/svgs/IconPlus.tsx +++ b/src/assets/svgs/IconPlus.tsx @@ -1,6 +1,13 @@ import type { SVGProps } from "react"; const SvgIconPlus = (props: SVGProps) => ( - + ); From 5d7e2142ad6bdc1abcbc7800f1d54a551b25cf5c Mon Sep 17 00:00:00 2001 From: Sinji Date: Fri, 19 Jul 2024 19:49:12 +0900 Subject: [PATCH 8/9] =?UTF-8?q?HOTFIX:=20255=EC=9E=90=20=EC=9D=B4=EC=83=81?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C=20POST=20=EC=95=88=20?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/modifyManage/ModifyManage.tsx | 4 ++-- src/pages/register/Register.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/modifyManage/ModifyManage.tsx b/src/pages/modifyManage/ModifyManage.tsx index 20f0fa27..2548e34c 100644 --- a/src/pages/modifyManage/ModifyManage.tsx +++ b/src/pages/modifyManage/ModifyManage.tsx @@ -342,7 +342,7 @@ const ModifyManage = () => { value={performanceDescription} onChange={(e) => setPerformanceDescription(e.target.value)} placeholder="공연을 예매할 예매자들에게 공연을 소개해주세요." - maxLength={300} + maxLength={250} /> @@ -423,7 +423,7 @@ const ModifyManage = () => { value={performanceAttentionNote} onChange={(e) => setPerformanceAttentionNote(e.target.value)} placeholder="입장 안내, 공연 중 인터미션, 공연장 반입금지 물품, 촬영 가능 여부, 주차 안내 등 예매자들이 꼭 알고 있어야할 유의사항을 입력해주세요." - maxLength={300} + maxLength={250} /> diff --git a/src/pages/register/Register.tsx b/src/pages/register/Register.tsx index 7ae77b02..9f2ec459 100644 --- a/src/pages/register/Register.tsx +++ b/src/pages/register/Register.tsx @@ -363,7 +363,7 @@ const Register = () => { value={performanceDescription} onChange={(e) => handleChange(e, setGigInfo)} placeholder="공연을 예매할 예매자들에게 공연을 소개해주세요." - maxLength={300} + maxLength={250} /> @@ -440,7 +440,7 @@ const Register = () => { value={performanceAttentionNote} onChange={(e) => handleChange(e, setGigInfo)} placeholder="입장 안내, 공연 중 인터미션, 공연장 반입금지 물품, 촬영 가능 여부, 주차 안내 등 예매자들이 꼭 알고 있어야할 유의사항을 입력해주세요." - maxLength={300} + maxLength={250} /> From 94b8d6890ce8556c9093b58da58f2fe86cc5a6db Mon Sep 17 00:00:00 2001 From: Sinji Date: Fri, 19 Jul 2024 20:23:07 +0900 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=EC=8A=A4=ED=83=9C=ED=94=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=90=90=EC=9D=84=20=EB=95=8C=20=EB=8B=A4?= =?UTF-8?q?=EC=9D=8C=20=EC=8A=A4=ED=85=9D=20=EC=95=88=20=EB=84=98=EC=96=B4?= =?UTF-8?q?=EA=B0=80=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=9E=84=EC=8B=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/register/Register.tsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/register/Register.tsx b/src/pages/register/Register.tsx index 9f2ec459..d79ca728 100644 --- a/src/pages/register/Register.tsx +++ b/src/pages/register/Register.tsx @@ -96,18 +96,18 @@ const Register = () => { }, ], castList: [ - { - castName: "", // 이름 - castRole: "", // 역할 - castPhoto: "", // 출연진 사진 URL - }, + // { + // castName: "", // 이름 + // castRole: "", // 역할 + // castPhoto: "", // 출연진 사진 URL + // }, ], staffList: [ - { - staffName: "", // 이름 - staffRole: "", // 역할 - staffPhoto: "", // 스태프 사진 URL - }, + // { + // staffName: "", // 이름 + // staffRole: "", // 역할 + // staffPhoto: "", // 스태프 사진 URL + // }, ], });