Merge branch 'fix/feature'

whatever-mentoring · Sep 25, 2023 · 37e996c · 37e996c
2 parents d549550 + 0727814
commit 37e996c
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 24 deletions.
diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx
@@ -27,8 +27,12 @@ export const Header = ({
 
   const handleBack = () => {
     const currentURI = location.pathname;
-    if (currentURI === '/ask/write' || currentURI.match(/^\/answer\/\d+$/)) {
+    if (currentURI === '/ask/write') {
       alert('작성을 취소하시겠습니까?');
+      navigate('/ask');
+    } else if (currentURI.match(/^\/answer\/\d+$/)) {
+      alert('작성을 취소하시겠습니까?');
+      navigate('/answer');
     } else {
       navigate(-1);
     }

diff --git a/src/pages/Signup/SignupSuccess/index.tsx b/src/pages/Signup/SignupSuccess/index.tsx
@@ -1,5 +1,6 @@
 import { Column, EntireContainer } from 'assets/common';
 import { LongBtn } from 'components/common/Button';
+import { Header } from 'components/common/Header';
 import styled from 'styled-components';
 import { Palette } from 'styles/Palette';
 import Typo from 'styles/Typo';
@@ -8,40 +9,52 @@ const SignupSuccess = () => {
   const userType = window.localStorage.getItem('userType');
 
   return (
-    <EntireContainer>
-      <InnerContainer>
-        <Column gap={11}>
-          <Typo.h1>회원가입 완료</Typo.h1>
-          <Typo.h2 color={Palette.Gray4}>
-            쥬잇씨 가입이 완료되었습니다. <br />
-            만나서 반가워요!
-          </Typo.h2>
-        </Column>
-        <Img>
-          {userType === 'Juni' ? (
-            <img src="/img/pageImgs/signup-success-juni.svg" />
-          ) : (
-            <img src="/img/pageImgs/signup-success-cyni.svg" />
-          )}
-        </Img>
-
-        <LongBtn to="/">확인</LongBtn>
-      </InnerContainer>
-    </EntireContainer>
+    <Column>
+      <Header borderBottom={false}>{''}</Header>
+      <EntireContainer>
+        <InnerContainer>
+          <Column gap={11}>
+            <Typo.h1>회원가입 완료</Typo.h1>
+            <Typo.h2 color={Palette.Gray4}>
+              쥬잇씨 가입이 완료되었습니다. <br />
+            </Typo.h2>
+            <Typo.h2 color={Palette.Gray4}>
+              {userType === 'Juni'
+                ? '지금 바로 질문을 등록해보세요!'
+                : '주니어들의 고민을 확인하러 가볼까요?'}
+            </Typo.h2>
+          </Column>
+          <ImgWrapper>
+            {userType === 'Juni' ? (
+              <Img src="/img/pageImgs/signup-success-juni.svg" />
+            ) : (
+              <Img src="/img/pageImgs/signup-success-cyni.svg" />
+            )}
+          </ImgWrapper>
+          <LongBtn to="/">확인</LongBtn>
+        </InnerContainer>
+      </EntireContainer>
+    </Column>
   );
 };
 
 export default SignupSuccess;
 
+const Container = styled(EntireContainer)`
+  width: 100%;
+  height: 100dvh;
+  padding: 60px 30px 79px 30px;
+`;
 const InnerContainer = styled(Column)`
   width: 100%;
   height: 100%;
   justify-content: space-between;
-
-  padding-top: 60px;
 `;
-const Img = styled(Column)`
+const ImgWrapper = styled(Column)`
   width: 100%;
   justify-content: center;
   align-items: center;
 `;
+const Img = styled.img`
+  width: 250px;
+`;