Merge pull request #158 from Igloo-Club/AdvanceApplication/#152

fix: 사전알림 시 메인페이지 접근 막기

src/Router.tsx

@@ -2,17 +2,18 @@ import { createBrowserRouter } from 'react-router-dom';
 import Login from './login';
 import AuthKakao from './login/AuthKakao';
 import Landing from './landing/Landing';
-import MainPage from './main/pages/mainPage';
-import DetailPage from './main/pages/DetailPage';
-import FinishMatch from './main/pages/finishMatch';
 import Register from './register/RegisterPage';
-import NungilList from './nungilList/pages/nungilList';
-import ReceivedDetailPage from './nungilList/pages/receivedDetailPage';
-import SendDetailPage from './nungilList/pages/sendDetailPage';
-import MyPage from './mypage/pages/myPage';
-import EditProfilePage from './mypage/pages/editProfilePage';
-import Chat from './chat/Chat';
-import ChatRoom from './chat/components/chatRoom/ChatRoom';
+// // import MainPage from './main/pages/mainPage';
+// import DetailPage from './main/pages/DetailPage';
+// import FinishMatch from './main/pages/finishMatch';
+// import NungilList from './nungilList/pages/nungilList';
+// import ReceivedDetailPage from './nungilList/pages/receivedDetailPage';
+// import SendDetailPage from './nungilList/pages/sendDetailPage';
+// import MyPage from './mypage/pages/myPage';
+// import EditProfilePage from './mypage/pages/editProfilePage';
+// import Chat from './chat/Chat';
+// import ChatRoom from './chat/components/chatRoom/ChatRoom';
+import 사전신청완료 from './common/components/RegisterAdvanceApplication';
 
 const router = createBrowserRouter([
   {
@@ -29,20 +30,20 @@ const router = createBrowserRouter([
       },
       {
         path: '/main-page',
-        element: <MainPage />,
+        element: <사전신청완료 />,
       },
-      {
-        path: 'detailpage/:nungilId',
-        element: <DetailPage />,
-      },
-      { path: 'finishmatch/:nungilId', element: <FinishMatch /> },
-      { path: 'nungillist', element: <NungilList /> },
-      { path: 'receiveddetailpage/:nungilId', element: <ReceivedDetailPage /> },
-      { path: 'senddetailpage/:nungilId', element: <SendDetailPage /> },
-      { path: 'mypage', element: <MyPage /> },
-      { path: 'editprofilepage', element: <EditProfilePage /> },
-      { path: 'chat', element: <Chat /> },
-      { path: 'chat/:chatRoomId', element: <ChatRoom /> },
+      // {
+      //   path: 'detailpage/:nungilId',
+      //   element: <DetailPage />,
+      // },
+      // { path: 'finishmatch/:nungilId', element: <FinishMatch /> },
+      // { path: 'nungillist', element: <NungilList /> },
+      // { path: 'receiveddetailpage/:nungilId', element: <ReceivedDetailPage /> },
+      // { path: 'senddetailpage/:nungilId', element: <SendDetailPage /> },
+      // { path: 'mypage', element: <MyPage /> },
+      // { path: 'editprofilepage', element: <EditProfilePage /> },
+      // { path: 'chat', element: <Chat /> },
+      // { path: 'chat/:chatRoomId', element: <ChatRoom /> },
     ],
   },
   {

src/register/funnelPages/RegisterAdvanceApplication.tsx → src/common/components/RegisterAdvanceApplication.tsx

@@ -1,5 +1,5 @@
 import styled from '@emotion/styled';
-import { CheckApplication } from '../assets/svgs/0_index';
+import { CheckApplication } from '../../register/assets/svgs/0_index';
 import { Link } from 'react-router-dom';
 
 const 사전신청완료 = () => {

src/common/styles/globalStyles.ts

@@ -67,11 +67,9 @@ const globalStyles = css`
     position: relative;
     display: flex;
     flex-direction: column;
-    align-items: flex-start;
+    align-items: center;
     justify-content: flex-start;
     width: 100vw;
-    max-width: 425px;
-    overflow: hidden;
   }
 
   select,

src/landing/Landing.tsx

@@ -32,7 +32,8 @@ const Landing = () => {
 export default Landing;
 
 const landingStyles = css`
-  width: 100%;
+  width: 100vw;
+  max-width: 425px;
   height: calc(var(--vh, 1vh) * 100);
   overflow: hidden;
 `;

src/login/index.tsx

@@ -25,7 +25,7 @@ const Login = () => {
   };
 
   return (
-    <div css={{ overflowY: 'scroll', width: '100%' }}>
+    <div css={{ overflowY: 'scroll', width: '100%', maxWidth: '425px' }}>
       <img src={HeroImage} css={backgroundImage} />
       <div css={containerStyles}>
         <StGuide>{guidement}</StGuide>
@@ -63,6 +63,7 @@ const backgroundImage = css`
   position: absolute;
   z-index: 1;
   width: 100%;
+  max-width: 425px;
   height: 100vh;
 `;
 

src/register/RegisterPage.tsx

@@ -242,7 +242,7 @@ const Register = () => {
           <장소선택
             onPrev={() => setStep('시간선택')}
             onNext={() => {
-              setStep('회원가입완료'), localStorage.setItem('STEP', '가입완료');
+              setStep('사전신청완료'), localStorage.setItem('STEP', '가입완료');
             }}
             registerScheduleValues={registerScheduleValues}
             percent={100}
@@ -269,8 +269,6 @@ const RagisterLayout = styled.section`
   display: flex;
   flex-direction: column;
   width: 100%;
-
-  /* height: calc(var(--vh, 1vh) * 100); */
   height: 100%;
   padding: 0 2rem;
   overflow: hidden;

src/register/components/RegisterBtn.tsx

@@ -17,6 +17,7 @@ const RegisterBtn = ({ isActive, onClick, content }: RegisterBtnProps) => {
 export default RegisterBtn;
 
 const Button = styled.button<{ isActive: boolean }>`
+  position: relative;
   width: 100%;
   min-height: 5.4rem;
   margin-top: 0.5rem;

src/register/funnelPages/0_index.ts

@@ -12,7 +12,7 @@ import 지역선택 from './RegisterSelectPlace';
 import 시간선택 from './RegisterSelectTime';
 import 장소선택 from './RegisterSelectMarker';
 import 회원가입완료 from './RegisterFinish';
-import 사전신청완료 from './RegisterAdvanceApplication';
+import 사전신청완료 from '../../common/components/RegisterAdvanceApplication';
 
 export {
   약관동의,

src/register/styles/registerStyles.ts

@@ -21,8 +21,9 @@ export const articleStyles = css`
   display: flex;
   flex-direction: column;
   justify-content: space-between;
+  width: 100%;
   height: 100%;
-  overflow-y: hidden;
+  overflow-y: scroll;
 `;
 
 export const sectionStyles = css`