Skip to content

Commit ab73561

Browse files
JSH99JSH99
authored
Merge pull request #5 from Toy2-Team3/KAN-11--feature/layout
기능개발 브랜치 생성을 위해 dev브랜치로 pullrequest한다.
2 parents 1251261 + 7a45af2 commit ab73561

12 files changed

+948
-64
lines changed

‎.prettierrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"singleQuote": true,
2+
"singleQuote": false,
33
"semi": true,
44
"useTabs": false,
55
"tabWidth": 2,

‎package-lock.json

+128-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
"@types/react": "^18.2.15",
77
"@types/react-dom": "^18.2.7",
88
"react": "^18.2.0",
9+
"react-datepicker": "^4.21.0",
910
"react-dom": "^18.2.0",
1011
"react-router-dom": "^6.18.0",
1112
"react-scripts": "5.0.1",
13+
"recoil": "^0.7.7",
1214
"styled-components": "^6.1.0",
1315
"typescript": "^4.9.5",
1416
"web-vitals": "^2.1.4"
@@ -20,6 +22,7 @@
2022
"eject": "react-scripts eject"
2123
},
2224
"devDependencies": {
25+
"@types/react-datepicker": "^4.19.2",
2326
"@typescript-eslint/eslint-plugin": "^6.0.0",
2427
"@typescript-eslint/parser": "^6.0.0",
2528
"eslint": "^8.48.0",

‎public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77
<meta name="theme-color" content="#000000" />
88
<meta name="description" content="toy2 team3" />
9-
<title>Toy2 Team3</title>
9+
<title>SWEETY | make youre life sweet</title>
1010
</head>
1111
<body>
1212
<div id="root"></div>

‎src/App.tsx

+37-19
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,61 @@
1-
import './App.css';
2-
import { ThemeProvider } from 'styled-components';
3-
import theme from '../src/styles/theme';
1+
import "./App.css";
2+
import { ThemeProvider } from "styled-components";
3+
import theme from "../src/styles/theme";
44
import { BrowserRouter, Route, Routes } from "react-router-dom";
5-
import NavigationBar from './components/NavigationBar';
6-
import HomePage from './pages/HomePage';
7-
import CommunityPage from './pages/CommunityPage';
8-
import ChatPage from './pages/chatting/index';
9-
import MyPage from './pages/MyPage';
10-
import styled from 'styled-components';
5+
import NavigationBar from "./components/NavigationBar";
6+
import HomePage from "./pages/HomePage";
7+
import CommunityPage from "./pages/CommunityPage";
8+
import ChatPage from "./pages/chatting/index";
9+
import MyPage from "./pages/MyPage";
10+
import styled from "styled-components";
11+
import StartPage from "./components/login/StartPage";
12+
import SignUpSpecific from "./components/login/SignUpSpecific";
13+
import Login from "./components/login/Login";
14+
import SignUpIDPW from "./components/login/SignUpIDPW";
15+
import { useRecoilState } from "recoil";
16+
import { loginState } from "./recoil/atoms";
1117

1218
function App() {
13-
return (
19+
const [login] = useRecoilState(loginState);
20+
return login ? (
1421
<ThemeProvider theme={theme}>
1522
<BrowserRouter>
16-
<div className="App" style={{display: 'flex'}}>
23+
<div className="App" style={{ display: "flex" }}>
1724
<NavigationBar></NavigationBar>
1825
<PageWrap>
1926
<Routes>
20-
<Route path="/" element={<HomePage/>} />
21-
<Route path="/community" element={<CommunityPage/>} />
22-
<Route path="/chat" element={<ChatPage/>} />
23-
<Route path="/mypage" element={<MyPage/>} />
27+
<Route path="/" element={<HomePage />} />
28+
<Route path="/community" element={<CommunityPage />} />
29+
<Route path="/chat" element={<ChatPage />} />
30+
<Route path="/mypage" element={<MyPage />} />
2431
</Routes>
2532
</PageWrap>
2633
</div>
27-
</BrowserRouter>
34+
</BrowserRouter>
35+
</ThemeProvider>
36+
) : (
37+
<ThemeProvider theme={theme}>
38+
<BrowserRouter>
39+
<Routes>
40+
<Route path="/startPage" element={<StartPage />} />
41+
<Route path="/signup1" element={<SignUpIDPW />} />
42+
<Route path="/signup2" element={<SignUpSpecific theme={theme} />} />
43+
<Route path="/login" element={<Login />} />
44+
</Routes>
45+
</BrowserRouter>
2846
</ThemeProvider>
2947
);
3048
}
3149

3250
const PageWrap = styled.div`
33-
flex: 1;
51+
flex: 1;
3452
margin-left: 300px;
3553
36-
${props => props.theme.response.tablet} {
54+
${(props) => props.theme.response.tablet} {
3755
margin-left: 100px;
3856
}
3957
40-
${props => props.theme.response.mobile} {
58+
${(props) => props.theme.response.mobile} {
4159
margin-left: 0;
4260
margin-bottom: 120px;
4361
}

0 commit comments

Comments
 (0)