Skip to content

Commit

Permalink
Merge pull request #52 from crolvlee/web_develop
Browse files Browse the repository at this point in the history
feat: 로그인 / 회비, 공지 관련 페이지
  • Loading branch information
crolvlee authored Aug 8, 2024
2 parents 88402d9 + d15e565 commit 1ccbe48
Show file tree
Hide file tree
Showing 52 changed files with 1,972 additions and 3,907 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.env.development.local
.env.test.local
.env.production.local
.env

npm-debug.log*
yarn-debug.log*
Expand Down
3,117 changes: 99 additions & 3,018 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,22 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@react-oauth/google": "^0.12.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"axios": "^1.7.2",
"jwt-decode": "^4.0.0",
"date-fns": "^3.6.0",
"react": "^18.3.1",
"react-calendar": "^5.0.0",
"react-dom": "^18.3.1",
"react-router-dom": "^6.24.1",
"react-scripts": "^5.0.1",
"styled-components": "^6.1.11",
"styled-reset": "^4.5.2",
"web-vitals": "^2.1.4"
"web-vitals": "^2.1.4",
"zustand": "^4.5.4"
},
"scripts": {
"start": "react-scripts start",
Expand Down
3 changes: 2 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import theme from './styles/theme';
import { RouterProvider } from 'react-router-dom';
import { router } from './routes/router';


function App() {
console.log("App 실행");

return (
<ThemeProvider theme={theme}>
<GlobalStyle />
Expand Down
10 changes: 10 additions & 0 deletions src/api/api.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import axios from 'axios';

const api = axios.create({
baseURL: process.env.REACT_APP_SERVER_URL,
headers: {
'Content-Type': 'application/json',
}
})

export default api;
11 changes: 11 additions & 0 deletions src/assets/icons/group/checkbox_active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/icons/group/checkbox_inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/login/apple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/assets/login/google.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/assets/login/kakao.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1ccbe48

Please sign in to comment.