Skip to content

Commit

Permalink
chore: merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
se0jinYoon committed Jul 7, 2024
2 parents 792f545 + 9e6f53e commit ec4bea0
Show file tree
Hide file tree
Showing 35 changed files with 72 additions and 9 deletions.
1 change: 0 additions & 1 deletion public/vite.svg

This file was deleted.

2 changes: 2 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Global, ThemeProvider } from '@emotion/react';
import styled from '@emotion/styled';
import { useEffect } from 'react';

import { Outlet } from 'react-router-dom';
import globalStyle from './styles/globalStyle';
import theme from './styles/theme';
const App = () => {
Expand Down Expand Up @@ -29,6 +30,7 @@ const App = () => {
<Wrapper>
<ThemeProvider theme={theme}>
<Global styles={globalStyle} />
<Outlet />
</ThemeProvider>
</Wrapper>
);
Expand Down
39 changes: 38 additions & 1 deletion src/Router.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
import { RouterProvider, createBrowserRouter } from 'react-router-dom';
import App from './App';
import HomePage from './pages/home/HomePage';
import JuniorPromisePage from './pages/juniorPromise/JuniorPromisePage';
import JuniorOnboardingPage from './pages/onboarding/juniorOnboarding/JuniorOnboardingPage';
import SeniorOnboardingPage from './pages/onboarding/seniorOnboarding/SeniorOnboardingPage';
import SeniorProfilePage from './pages/seniorProfile/SeniorProfilePage';

const router = createBrowserRouter([
{
path: '/',
element: <App />,
children: [
{
index: true,
element: <HomePage />,
},
{
path: 'seniorOnboarding',
element: <SeniorOnboardingPage />,
},
{
path: 'juniorOnboarding',
element: <JuniorOnboardingPage />,
},
{
path: 'seniorProfile',
element: <SeniorProfilePage />,
},
{
path: 'juniorPromise',
element: <JuniorPromisePage />,
},
],
},
]);

const Router = () => {
return <div>Router</div>;
return <RouterProvider router={router} />;
};

export default Router;
9 changes: 7 additions & 2 deletions src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App.tsx';
import Router from './Router.tsx';

ReactDOM.createRoot(document.getElementById('root')!).render(<App />);
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<Router />
</React.StrictMode>,
);
5 changes: 5 additions & 0 deletions src/pages/home/HomePage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const HomePage = () => {
return <div>Home</div>;
};

export default HomePage;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions src/pages/juniorPromise/JuniorPromisePage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const JuniorPromisePage = () => {
return <div>JuniorPromise</div>;
};

export default JuniorPromisePage;
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
5 changes: 0 additions & 5 deletions src/pages/main/Main.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const JuniorOnboardingPage = () => {
return <div>JuniorOnboarding</div>;
};

export default JuniorOnboardingPage;
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const SeniorOnboardingPage = () => {
return <div>SeniorOnboarding</div>;
};

export default SeniorOnboardingPage;
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
5 changes: 5 additions & 0 deletions src/pages/seniorProfile/SeniorProfilePage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const SeniorProfilePage = () => {
return <div>SeniorProfile</div>;
};

export default SeniorProfilePage;
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.

0 comments on commit ec4bea0

Please sign in to comment.