Skip to content

Commit 6591e07

Browse files
JinleeJeongJinleeJeong
authored
Merge pull request #12 from GDG-Team7/develop
feat: 코각모 최소한의 기능 동작하도록 마무리 작업
2 parents ae1c2e9 + ce3509f commit 6591e07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3148
-44
lines changed

‎.eslintrc.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ module.exports = {
2828
tsconfigRootDir: "./",
2929
},
3030
rules: {
31+
"prettier/prettier":
32+
[
33+
"error",
34+
{
35+
"endOfLine": "auto"
36+
}
37+
],
3138
'padding-line-between-statements': [
3239
'warn',
3340
{ blankLine: 'always', prev: '*', next: 'return' },

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/node_modules
55
/.pnp
66
.pnp.js
7-
7+
.env
88
# testing
99
/coverage
1010

‎.prettierrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module.exports = {
33
jsxBracketSameLine: true,
44
singleQuote: true,
55
trailingComma: 'all',
6-
semi: false,
6+
semi: true,
77
arrowParens: 'avoid',
88
};

‎package.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,21 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6+
"@reduxjs/toolkit": "^1.6.0",
67
"@testing-library/jest-dom": "^5.11.4",
78
"@testing-library/react": "^11.1.0",
89
"@testing-library/user-event": "^12.1.10",
10+
"@types/qs": "6.9.7",
11+
"@types/react-select": "4.0.17",
12+
"axios": "^0.21.1",
13+
"qs": "6.10.1",
914
"react": "^17.0.2",
1015
"react-dom": "^17.0.2",
16+
"react-redux": "^7.2.4",
1117
"react-router-dom": "5.2.0",
1218
"react-scripts": "4.0.3",
19+
"react-select": "4.3.1",
20+
"redux-logger": "^3.0.6",
1321
"styled-components": "5.3.0",
1422
"styled-normalize": "8.0.7",
1523
"typescript": "4.3.5"
@@ -36,14 +44,17 @@
3644
]
3745
},
3846
"devDependencies": {
39-
"@typescript-eslint/eslint-plugin": "4.28.2",
40-
"@typescript-eslint/parser": "4.28.2",
47+
"@types/axios": "^0.14.0",
4148
"@types/jest": "^26.0.15",
4249
"@types/node": "^12.0.0",
4350
"@types/react": "^17.0.0",
4451
"@types/react-dom": "^17.0.0",
52+
"@types/react-redux": "^7.1.18",
4553
"@types/react-router-dom": "5.1.7",
54+
"@types/redux-logger": "^3.0.9",
4655
"@types/styled-components": "5.1.11",
56+
"@typescript-eslint/eslint-plugin": "4.28.2",
57+
"@typescript-eslint/parser": "4.28.2",
4758
"eslint": "7.30.0",
4859
"eslint-config-prettier": "8.3.0",
4960
"eslint-plugin-prettier": "3.4.0",

‎public/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
work correctly both with client-side routing and a non-root public URL.
2525
Learn how to configure a non-root public URL by running `npm run build`.
2626
-->
27+
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
2728
<title>React App</title>
2829
</head>
2930
<body>

‎src/App.tsx

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1-
import React from 'react'
2-
import {Route, Switch, BrowserRouter} from 'react-router-dom'
3-
import Main from './component/pages/MainPage'
1+
import React from 'react';
2+
import {Route, Switch, BrowserRouter} from 'react-router-dom';
3+
import CallBack from './component/pages/CallbackPage';
4+
import Landing from './component/pages/LandingPage';
5+
import Login from './component/pages/LoginPage';
6+
import RegisterRoomPage from './component/pages/RegisterRoomPage';
7+
import SignUp from './component/pages/SignUpPage';
8+
import ProtectedRoute from './routes/ProtectedRoute';
9+
import Routes from './routes/Routes';
410

511
const App = () => {
612
return (
713
<BrowserRouter>
814
<Switch>
9-
<Route path="/" component={Main} exact />
15+
<Route path="/login" component={Login} />
16+
<Route path="/signup" component={SignUp} />
17+
<Route path="/landing" component={Landing} />
18+
<Route path="/callback" component={CallBack} />
19+
<Route path="/register/room" component={RegisterRoomPage} />
20+
<ProtectedRoute path="/" component={Routes} exact={false} />
1021
</Switch>
1122
</BrowserRouter>
12-
)
13-
}
23+
);
24+
};
1425

15-
export default App
26+
export default App;

‎src/assets/images/clock.png

449 Bytes
Loading

‎src/assets/images/deco.png

1.31 KB
Loading

‎src/assets/images/first.png

66.9 KB
Loading

‎src/assets/images/fourth_1.png

9.68 KB
Loading

0 commit comments

Comments
 (0)