From d1152f352667ac6407e9b9b7235df76cf1750c23 Mon Sep 17 00:00:00 2001 From: heesunee Date: Fri, 24 Jan 2025 06:29:01 +0900 Subject: [PATCH 1/3] =?UTF-8?q?design:=20timeSelector=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=20(#252)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClassSchedule/TimeStep/TimeControl/index.css.ts | 4 ++-- .../components/ClassSchedule/TimeStep/TimeControl/index.tsx | 2 +- .../classRegister/components/ClassSchedule/TimeStep/index.tsx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.css.ts b/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.css.ts index 63dd9451..e3cd4834 100644 --- a/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.css.ts +++ b/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.css.ts @@ -7,7 +7,7 @@ export const buttonStyle = style({ justifyContent: 'center', alignItems: 'center', - width: '10.5rem', + width: '100%', height: '3.2rem', padding: '0rem 1rem', @@ -21,7 +21,7 @@ export const timeValueWrapperStyle = style({ justifyContent: 'center', alignItems: 'center', - width: '10.5rem', + width: '100%', padding: '1.2rem 1rem', borderRadius: '4px', diff --git a/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.tsx b/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.tsx index 0f27ee3c..51315c62 100644 --- a/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.tsx +++ b/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.tsx @@ -10,7 +10,7 @@ interface TimeControlProps { onDecrease: () => void; } const TimeControl = ({ label, value, onIncrease, onDecrease }: TimeControlProps) => ( - + diff --git a/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/index.tsx b/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/index.tsx index ee9b10f9..ade6985a 100644 --- a/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/index.tsx +++ b/src/pages/instructor/classRegister/components/ClassSchedule/TimeStep/index.tsx @@ -31,12 +31,12 @@ const TimeStep = ({ }; return ( - + 클래스 시작 시간 - + Date: Fri, 24 Jan 2025 06:39:33 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20redirect=20url=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=20(#255)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/auth/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/auth/index.ts b/src/pages/auth/index.ts index 73620592..2dd01764 100644 --- a/src/pages/auth/index.ts +++ b/src/pages/auth/index.ts @@ -12,7 +12,7 @@ export const LoginCallback = () => { const { mutate: login } = useLoginMutation(); useEffect(() => { - if (code) login({ redirectUrl: 'http://localhost:5173/auth', code }); + if (code) login({ redirectUrl: 'https://www.da-sh.kr/auth', code }); }, [code]); // 잠시 인가 코드만 추출해서 api를 보내는 페이지이기 때문에 null 값 반환 From 97b46e59db9d00bc41b52e7a31830dec67018d1b Mon Sep 17 00:00:00 2001 From: hansoojeongsj Date: Fri, 24 Jan 2025 06:42:26 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=ED=95=98=EA=B8=B0=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20topImage=20=EB=B6=80=EB=B6=84=20bottom=EA=B8=B0?= =?UTF-8?q?=EC=A4=80=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95=20(#254)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/components/TopInfoContent/index.css.ts | 9 ++++++++- .../reservation/components/TopInfoContent/index.tsx | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages/reservation/components/TopInfoContent/index.css.ts b/src/pages/reservation/components/TopInfoContent/index.css.ts index 3cb119a6..1ae2ca47 100644 --- a/src/pages/reservation/components/TopInfoContent/index.css.ts +++ b/src/pages/reservation/components/TopInfoContent/index.css.ts @@ -24,6 +24,13 @@ export const gradientOverlayStyle = style({ }); export const textWrapperStyle = style({ - position: 'relative', + display: 'flex', + position: 'absolute', + bottom: '3rem', + gap: '0.8rem', + + paddingLeft: '2rem', + paddingRight:'2rem', + flexDirection: 'column', zIndex: vars.zIndex.two, }); diff --git a/src/pages/reservation/components/TopInfoContent/index.tsx b/src/pages/reservation/components/TopInfoContent/index.tsx index af9f81a9..9c395895 100644 --- a/src/pages/reservation/components/TopInfoContent/index.tsx +++ b/src/pages/reservation/components/TopInfoContent/index.tsx @@ -17,7 +17,7 @@ const TopInfoContent = ({ name, teacherNickname, imageUrl }: TopInfoContentProps }}>
- + {name}