diff --git a/src/Router.tsx b/src/Router.tsx
index 84d6314..b66c011 100644
--- a/src/Router.tsx
+++ b/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: ,
+ element: <사전신청완료 />,
},
- {
- path: 'detailpage/:nungilId',
- element: ,
- },
- { path: 'finishmatch/:nungilId', element: },
- { path: 'nungillist', element: },
- { path: 'receiveddetailpage/:nungilId', element: },
- { path: 'senddetailpage/:nungilId', element: },
- { path: 'mypage', element: },
- { path: 'editprofilepage', element: },
- { path: 'chat', element: },
- { path: 'chat/:chatRoomId', element: },
+ // {
+ // path: 'detailpage/:nungilId',
+ // element: ,
+ // },
+ // { path: 'finishmatch/:nungilId', element: },
+ // { path: 'nungillist', element: },
+ // { path: 'receiveddetailpage/:nungilId', element: },
+ // { path: 'senddetailpage/:nungilId', element: },
+ // { path: 'mypage', element: },
+ // { path: 'editprofilepage', element: },
+ // { path: 'chat', element: },
+ // { path: 'chat/:chatRoomId', element: },
],
},
{
diff --git a/src/common/components/.gitkeep b/src/common/components/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/register/funnelPages/RegisterAdvanceApplication.tsx b/src/common/components/RegisterAdvanceApplication.tsx
similarity index 96%
rename from src/register/funnelPages/RegisterAdvanceApplication.tsx
rename to src/common/components/RegisterAdvanceApplication.tsx
index 8181839..3e790f4 100644
--- a/src/register/funnelPages/RegisterAdvanceApplication.tsx
+++ b/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 사전신청완료 = () => {
diff --git a/src/common/styles/globalStyles.ts b/src/common/styles/globalStyles.ts
index 9c478f1..a00b751 100644
--- a/src/common/styles/globalStyles.ts
+++ b/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,
diff --git a/src/landing/Landing.tsx b/src/landing/Landing.tsx
index 383ec8a..a34fad6 100644
--- a/src/landing/Landing.tsx
+++ b/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;
`;
diff --git a/src/login/index.tsx b/src/login/index.tsx
index 646ff5e..ea90256 100644
--- a/src/login/index.tsx
+++ b/src/login/index.tsx
@@ -25,7 +25,7 @@ const Login = () => {
};
return (
-
+
{guidement}
@@ -63,6 +63,7 @@ const backgroundImage = css`
position: absolute;
z-index: 1;
width: 100%;
+ max-width: 425px;
height: 100vh;
`;
diff --git a/src/register/RegisterPage.tsx b/src/register/RegisterPage.tsx
index 3333c89..84be83b 100644
--- a/src/register/RegisterPage.tsx
+++ b/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;
diff --git a/src/register/components/RegisterBtn.tsx b/src/register/components/RegisterBtn.tsx
index 8612022..5512efd 100644
--- a/src/register/components/RegisterBtn.tsx
+++ b/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;
diff --git a/src/register/funnelPages/0_index.ts b/src/register/funnelPages/0_index.ts
index 381bce9..a638615 100644
--- a/src/register/funnelPages/0_index.ts
+++ b/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 {
약관동의,
diff --git a/src/register/styles/registerStyles.ts b/src/register/styles/registerStyles.ts
index 603a25b..941e16b 100644
--- a/src/register/styles/registerStyles.ts
+++ b/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`