Merge pull request #258 from SOPT-all/develop

기획/디자인 포함 QA용 2차 배포
SOPT-all · Jan 23, 2025 · be2e47d · be2e47d
2 parents 327e539 + 4493ebf
commit be2e47d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git 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 값 반환

diff --git a/...pages/instructor/classRegister/components/ClassSchedule/TimeStep/TimeControl/index.css.ts b/...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
@@ -10,7 +10,7 @@ interface TimeControlProps {
   onDecrease: () => void;
 }
 const TimeControl = ({ label, value, onIncrease, onDecrease }: TimeControlProps) => (
-  <Flex direction="column" align="center" gap="0.4rem">
+  <Flex direction="column" width="100%" align="center" gap="0.4rem">
     <button onClick={onIncrease} className={styles.buttonStyle}>
       <IcArrowUpGray1032 width={'3.2rem'} />
     </button>

diff --git 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 (
-    <Flex direction="column" paddingLeft="2rem" paddingRight="2rem">
+    <Flex direction="column">
       <Head level="h2" tag="h6">
         클래스 시작 시간
       </Head>
 
-      <Flex justify="center" gap="1rem" paddingTop="1.6rem" paddingBottom="2.4rem">
+      <Flex justify="center" gap="1rem" paddingTop="1.6rem" paddingBottom="2.4rem" width="100%">
         <TimeControl
           label="hour"
           value={hour}

diff --git 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
@@ -17,7 +17,7 @@ const TopInfoContent = ({ name, teacherNickname, imageUrl }: TopInfoContentProps
         }}>
         <div className={gradientOverlayStyle} />
 
-        <Flex direction="column" gap="0.8rem" paddingTop="12.4rem" paddingLeft="2rem" className={textWrapperStyle}>
+        <Flex className={textWrapperStyle}>
           <Head level="h3" tag="h4" color="white">
             {name}
           </Head>