Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 로그인 / 회비, 공지 관련 페이지 #52

Merged
merged 43 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
01804ff
chore: gitignore에 .env 추가
crolvlee Jul 24, 2024
0b972e2
feat: 구글로그인 틀 잡기
crolvlee Jul 24, 2024
d09ddb5
feat: 리프레시토큰 관련 내용 제거
crolvlee Jul 26, 2024
ad1fa1b
feat: 로그인 CSS
crolvlee Jul 28, 2024
4216a81
feat: 알림 페이지 UI 구현
crolvlee Jul 28, 2024
f19cf63
Merge remote-tracking branch 'upstream/web_develop' into web_develop
crolvlee Aug 3, 2024
1d1e479
fix: main layout style 수정
Aug 3, 2024
363c877
feat: 공지, 아티클 상세 페이지 라우팅 설정
Aug 3, 2024
c37d6d3
feat: 중첩 라우팅 해제
Aug 3, 2024
744f55f
feat: 공지 상세 페이지 layout
Aug 3, 2024
55fe75d
style: scroll 추가
leve68 Aug 3, 2024
e50e2bf
feat: 공지 상세 페이지 설계
leve68 Aug 3, 2024
809009b
feat: 아티클 상세 페이지 layout
leve68 Aug 3, 2024
1d60e98
feat: article component 수정
leve68 Aug 3, 2024
d3757f3
Merge pull request #50 from IT-Cotato/feature/main-page
leve68 Aug 3, 2024
d68aa38
feat: 회비 등록 구현
crolvlee Aug 3, 2024
cf4eaf0
Merge remote-tracking branch 'upstream/develop' into web_develop
crolvlee Aug 4, 2024
ef9fab9
refactor: global-style에 border-box 추가
crolvlee Aug 4, 2024
c9a00e0
feat: 회비 등록 수정 및 멤버 선택 구현
crolvlee Aug 4, 2024
fab3c0d
style: 탭 사이즈 정리
crolvlee Aug 4, 2024
88cd827
fix: isNew 제거
crolvlee Aug 4, 2024
d05064d
chore: 공지 더미 데이터 정리
crolvlee Aug 4, 2024
19b4732
chore: 회비 더미 데이터 정리
crolvlee Aug 4, 2024
c3fd87f
feat: 회비 사용 내역 추가 버튼
crolvlee Aug 4, 2024
7366f15
chore: 회비 제출버튼 불필요한 부분 삭제
crolvlee Aug 4, 2024
1a453f6
feat: 회비 사용 내역 추가 모달
crolvlee Aug 4, 2024
86a154b
feat: 회비 등록 react-calendar 적용
crolvlee Aug 5, 2024
3674439
feat: react-calendar 일부 수정
crolvlee Aug 5, 2024
49fabc7
feat: 회비등록 보완
crolvlee Aug 5, 2024
f642e72
refactor: 회비 - 캘린더 컴포넌트화
crolvlee Aug 5, 2024
c41bc8a
feat: 회비사용내역등록 보완
crolvlee Aug 5, 2024
97b5ce4
fix: 공지작성 모달 수정
crolvlee Aug 5, 2024
d114bc6
feat: 그룹 기본정보 페이지 레이아웃 구현
kdhqwe1030 Jul 24, 2024
5ab4b0b
feat: 일정 추가 페이지 레이아웃 구현
kdhqwe1030 Jul 25, 2024
bedf440
feat:Rank페이지 레이아웃 구현
kdhqwe1030 Jul 28, 2024
81adcf8
fix: 스크롤 버그 수정 및 Rank페이지 수정
kdhqwe1030 Aug 3, 2024
cd5767e
merge
kdhqwe1030 Aug 3, 2024
bdaf893
Merge pull request #51 from kdhqwe1030/home/Calendar
kdhqwe1030 Aug 7, 2024
a99539e
feat: 로그인 버튼 정리 / 기존 oauth 내용 삭제
crolvlee Aug 8, 2024
4b21556
feat: 로그인 api 연결
crolvlee Aug 8, 2024
baf44d3
feat: 사용자 로그인 정보 전역관리
crolvlee Aug 8, 2024
71b7736
chore: 필요없는 부분 제거
crolvlee Aug 8, 2024
d15e565
Merge remote-tracking branch 'upstream/develop' into web_develop
crolvlee Aug 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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