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

Dev #263

Merged
merged 186 commits into from
Oct 8, 2024
Merged

Dev #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
186 commits
Select commit Hold shift + click to select a range
d0c7205
Style : css 수정
Yeonsu00-12 Aug 30, 2024
bab7272
Merge branch 'dev' into feature/elle
Yeonsu00-12 Aug 30, 2024
4cf63f5
Chore : 센트리 설정 변경, 게임용 헤더적용을 위한 라우터 수정 및 게임용 헤더 생성
lucy726j Sep 4, 2024
fedd051
Merge pull request #185 from 100-hours-a-week/feature/lucy
lucy726j Sep 4, 2024
9f226c5
Feat : 년도별 게임 화면
yzooop Sep 5, 2024
0496622
Feat : 게임 handler 추가
yzooop Sep 7, 2024
1f6b87c
Feat : 최종결과 페이지 레이아웃 구성
lucy726j Sep 9, 2024
c1f34cf
Feat : 랭킹 페이지 레이아웃 구성
lucy726j Sep 9, 2024
c5f0413
Merge pull request #187 from 100-hours-a-week/feature/veronica
Yeonsu00-12 Sep 11, 2024
b4a0342
Docs : 주스탠드 구조분해할당방법으로 변경
Yeonsu00-12 Sep 11, 2024
659b766
Feat : interim 추가
yzooop Sep 11, 2024
fdd9374
Feat : 메인 & 정보거래소 api연결
Yeonsu00-12 Sep 11, 2024
a90d467
Merge pull request #195 from 100-hours-a-week/feature/veronica
lucy726j Sep 11, 2024
1e75737
Merge pull request #196 from 100-hours-a-week/feature/elle
lucy726j Sep 11, 2024
d38d4e0
Feat : 메인 & 정보거래소 api 연결 / 튜토리얼 생성
Yeonsu00-12 Sep 11, 2024
aa67eaf
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 11, 2024
aa7ead4
Merge pull request #197 from 100-hours-a-week/feature/elle
Yeonsu00-12 Sep 11, 2024
5c024e4
Feat : 거래 api 연결
yzooop Sep 11, 2024
457a5fe
Feat : 게임 주식 종목 조회 페이지 레이아웃 구성
lucy726j Sep 13, 2024
59c9bb5
Feat : 거래 api
yzooop Sep 13, 2024
4b2cc92
Merge branch 'dev' into feature/lucy
lucy726j Sep 13, 2024
f947570
Merge pull request #198 from 100-hours-a-week/feature/veronica
lucy726j Sep 13, 2024
78bcd2d
Merge branch 'dev' into feature/lucy
lucy726j Sep 13, 2024
4eab131
Merge pull request #199 from 100-hours-a-week/feature/lucy
lucy726j Sep 13, 2024
cfe39ff
pull
lucy726j Sep 13, 2024
f4f7025
Fix : ret -> profit, ror -> profitRate로 수정
lucy726j Sep 14, 2024
e22df1f
Docs : 게임 주식 종목 조회 페이지 api 연결 코드 추가
lucy726j Sep 14, 2024
c90471f
Feat : 거래 스와이프 ux개선
yzooop Sep 16, 2024
fb2db86
Feat : 라우터 수정, 뒤로가기 새로고침 차단, 정보거래소 수정
Yeonsu00-12 Sep 16, 2024
c185d77
주식거래 상태관리, 정보거래소 거래가능금액 연결
Yeonsu00-12 Sep 17, 2024
1268c59
Merge pull request #200 from 100-hours-a-week/feature/veronica
lucy726j Sep 17, 2024
b3a5e76
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 17, 2024
dde277d
Merge pull request #201 from 100-hours-a-week/feature/elle
lucy726j Sep 17, 2024
de12dc4
Feat : 예수금 보여주기
yzooop Sep 17, 2024
74db82d
Merge branch 'dev' into feature/veronica
Yeonsu00-12 Sep 17, 2024
3453722
Merge pull request #202 from 100-hours-a-week/feature/veronica
Yeonsu00-12 Sep 17, 2024
ba2603a
Fix : 게임 주식 종목 조회 오류 확인
lucy726j Sep 17, 2024
3bfef64
Docs : console.log 삭제
lucy726j Sep 17, 2024
09242c0
Fix : 로컬스토리지 빼고 context로 상태관리
Yeonsu00-12 Sep 17, 2024
87b34cf
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 17, 2024
b2a631f
Merge pull request #203 from 100-hours-a-week/feature/elle
lucy726j Sep 17, 2024
0629f92
pull
lucy726j Sep 17, 2024
7d8a487
Merge branch 'dev' into feature/lucy
lucy726j Sep 17, 2024
b4724b7
Merge pull request #204 from 100-hours-a-week/feature/lucy
lucy726j Sep 17, 2024
8aa4e47
pull
lucy726j Sep 19, 2024
724432e
Merge branch 'dev' into feature/lucy
lucy726j Sep 19, 2024
59e1641
Fix : 이슈 해결
Yeonsu00-12 Sep 20, 2024
53dcb94
Merge pull request #205 from 100-hours-a-week/feature/elle
Yeonsu00-12 Sep 20, 2024
19d1d79
Docs : 실시간 랭킹 현황 탭 만드는 중
lucy726j Sep 20, 2024
641470d
Merge branch 'dev' into feature/lucy
lucy726j Sep 20, 2024
4ef1bca
Merge pull request #206 from 100-hours-a-week/feature/lucy
lucy726j Sep 20, 2024
b3c9e05
Feat : 보유주식, 실시간 랭킹 탭
lucy726j Sep 21, 2024
0c38d98
Fix : 연도별 주식 종목 업데이트 오류 수정
lucy726j Sep 23, 2024
ea81fab
Merge branch 'dev' into feature/lucy
lucy726j Sep 23, 2024
9c54e9a
Merge pull request #207 from 100-hours-a-week/feature/lucy
lucy726j Sep 23, 2024
333d9cb
Docs : 보유한 주식이 없습니다 문구 추가
lucy726j Sep 23, 2024
35f6506
Feat : 거래 swipe 수정
yzooop Sep 23, 2024
648bfa2
Merge pull request #208 from 100-hours-a-week/feature/veronica
lucy726j Sep 23, 2024
88403d6
Merge branch 'dev' into feature/lucy
lucy726j Sep 23, 2024
959a2d9
Feat : 랭킹버튼 추가중
lucy726j Sep 23, 2024
9e13e60
Feat : 로딩페이지
Yeonsu00-12 Sep 23, 2024
b31b300
Fix : 게임 결과 랭킹 등록 api 수정 반영
lucy726j Sep 23, 2024
18abf78
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 23, 2024
c9f617e
Merge pull request #209 from 100-hours-a-week/feature/elle
Yeonsu00-12 Sep 23, 2024
93ceb1b
Merge branch 'dev' into feature/lucy
lucy726j Sep 23, 2024
a26c0bf
Merge pull request #210 from 100-hours-a-week/feature/lucy
lucy726j Sep 23, 2024
ae03409
Fix : 드롭다운 다른걸로 변경 & 뒤로가기/새로고침 수정
Yeonsu00-12 Sep 24, 2024
a054b32
Fix : 수정
Yeonsu00-12 Sep 24, 2024
cdfb796
Fix : 수정
Yeonsu00-12 Sep 24, 2024
f08a79a
Merge pull request #211 from 100-hours-a-week/feature/elle
Yeonsu00-12 Sep 24, 2024
d3976ae
Fix : interim 모달 순서 수정
yzooop Sep 24, 2024
bc99e8e
Merge pull request #212 from 100-hours-a-week/feature/veronica
yzooop Sep 24, 2024
fcd2bd5
Style : 랭킹등록버튼 위치 수정 및 랭킹 박스 css 수정
lucy726j Sep 24, 2024
e07f213
Merge branch 'dev' into feature/lucy
lucy726j Sep 24, 2024
630531e
Merge pull request #213 from 100-hours-a-week/feature/lucy
yzooop Sep 24, 2024
961ce79
Fix : 스크롤 안됨 현상 해결
Yeonsu00-12 Sep 24, 2024
f940714
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 24, 2024
8ac1952
Merge pull request #214 from 100-hours-a-week/feature/elle
lucy726j Sep 24, 2024
6217d31
pull
lucy726j Sep 24, 2024
b925368
Merge branch 'dev' into feature/lucy
lucy726j Sep 24, 2024
f960d6c
Bug : dev PlayPage 복구
Yeonsu00-12 Sep 25, 2024
fc478c7
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 25, 2024
b7ddd43
Merge pull request #215 from 100-hours-a-week/feature/elle
Yeonsu00-12 Sep 25, 2024
72485bf
Feat : progressBar 구현(게임진행도 표시)
Yeonsu00-12 Sep 25, 2024
6be670c
Merge pull request #223 from 100-hours-a-week/feature/elle
lucy726j Sep 25, 2024
aede0cb
Merge branch 'dev' into feature/lucy
lucy726j Sep 25, 2024
c121e05
Fix : 이슈 수정
yzooop Sep 25, 2024
24d430e
Merge branch 'dev' into feature/veronica
yzooop Sep 25, 2024
f932e0e
Merge pull request #224 from 100-hours-a-week/feature/veronica
lucy726j Sep 25, 2024
d1ac19f
Merge branch 'dev' into feature/lucy
lucy726j Sep 25, 2024
a0e0531
Feat : 루시 소원 달성
Yeonsu00-12 Sep 25, 2024
cc549c8
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 25, 2024
53e9192
Fix :프로그래스바 수정
Yeonsu00-12 Sep 25, 2024
42c93b7
Fix : 루시 소원 취소..
Yeonsu00-12 Sep 25, 2024
ab4fb50
Fix : 프로그래다시 수정
Yeonsu00-12 Sep 26, 2024
7e2dbc7
Fix : 튜토리얼 수정
Yeonsu00-12 Sep 26, 2024
fb069ec
Merge pull request #225 from 100-hours-a-week/feature/elle
Yeonsu00-12 Sep 26, 2024
4b3f5ac
Feat : 마지막 턴에 거래 안되게 하기
yzooop Sep 26, 2024
efaedf0
Merge pull request #226 from 100-hours-a-week/feature/veronica
yzooop Sep 26, 2024
8c03797
Fix : 튜토리얼 해당하지 않은 페이지 삭제
Yeonsu00-12 Sep 26, 2024
6e76635
pull
lucy726j Sep 26, 2024
2c09b1a
Merge branch 'dev' into feature/lucy
lucy726j Sep 26, 2024
b527f0b
Merge pull request #227 from 100-hours-a-week/feature/elle
lucy726j Sep 26, 2024
b73e949
Fix : 랭킹 등록 버튼 nav 삭제, 등록 확인 모달 띄우기로 수정
lucy726j Sep 27, 2024
50b7a47
Fix : 게임 헤더에 룰 설명 달리는 거 게임중에만 달리도록 수정
lucy726j Sep 27, 2024
b883d08
Fix : 랭킹 박스 항목 추가 #222
lucy726j Sep 27, 2024
0434ff9
Style : 최종 결과 페이지 수정
lucy726j Sep 27, 2024
43650b2
Style : 랭킹 박스 안에 수익률 등락에 따른 색상 적용
lucy726j Sep 28, 2024
c6e15c9
Style : 홈 화면 CSS 수정 및 의미 명확하게 설명 추가 #219
lucy726j Sep 28, 2024
3fbc0a2
Style : 뉴스 외부 이동 아이콘 추가 #219
lucy726j Sep 28, 2024
deb2b43
Fix : swipe 오류 수정
yzooop Sep 28, 2024
9c7ce5d
Merge pull request #228 from 100-hours-a-week/feature/veronica
lucy726j Sep 28, 2024
23e92af
pull
lucy726j Sep 28, 2024
7f3a9cf
pull
lucy726j Sep 26, 2024
0411207
Fix : 검색 시 특수문자, 공백 못들어가게 막음
lucy726j Sep 28, 2024
46a9fce
Fix : 헤더, 네비바, 버튼 등 cursor : pointer 설정 #188
lucy726j Sep 28, 2024
14ed161
Fix : 주식 상세 정보 조회 페이지 주식 정보 @media 적용 #192
lucy726j Sep 28, 2024
21a3ea7
Style : 진척율, 룰설명 css 수정
lucy726j Sep 28, 2024
57c3872
Fix : 정보거래소에서 룰설명 안보이게 수정
lucy726j Sep 28, 2024
674751b
Style : 정보 거래소 뉴스 내용 길면 css 깨지는 오류 수정
lucy726j Sep 28, 2024
61e9d91
Docs: 자잘한거
lucy726j Sep 28, 2024
3237e81
Feat : 페이지 유효성 검사 -> url에 년도 입력해서 접속하는 경우 정상적인 접근 경로가 아닙니다 페이지 보여주도록 추가
lucy726j Sep 28, 2024
342083b
Fix : 힌트 가격 조정
Yeonsu00-12 Sep 29, 2024
16b0d2d
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 29, 2024
098915b
Merge pull request #229 from 100-hours-a-week/feature/lucy
Yeonsu00-12 Sep 29, 2024
190bb2d
Docs : 아까했는데 또 하래...
Yeonsu00-12 Sep 29, 2024
bb39a7e
Feat : 정보거래소 전체 종목에서 1,2,3단계만 구매 가능하게 수정/ zustand 이용해 구매한 뉴스 상태저장
Yeonsu00-12 Sep 29, 2024
5905ab3
Fix : 캐로셀 버튼 위치 수정
lucy726j Sep 30, 2024
3a5992f
Merge branch 'dev' into feature/lucy
lucy726j Sep 30, 2024
b5d13f2
Merge pull request #230 from 100-hours-a-week/feature/elle
lucy726j Sep 30, 2024
bcf5f0b
Merge branch 'dev' into feature/lucy
lucy726j Sep 30, 2024
47935a6
Feat : zustand 미들웨어를 사용해 스토리지에 전역 상태 저장
Yeonsu00-12 Sep 30, 2024
aeeb5c2
Merge branch 'dev' into feature/elle
Yeonsu00-12 Sep 30, 2024
9bef331
Merge pull request #231 from 100-hours-a-week/feature/elle
lucy726j Sep 30, 2024
0af1665
Docs : 이미 거래된 종목 swal text변경
Yeonsu00-12 Sep 30, 2024
86fb602
#217 Fix : 벤토바 위치 수정
Yeonsu00-12 Sep 30, 2024
20fae21
Fix : 인트로 skip 버튼 fixed로 수정 #244
yzooop Sep 30, 2024
075eb1c
Feat : 사용자가 구매한 힌트 보여주기
Yeonsu00-12 Sep 30, 2024
88be3fa
Fix: 버튼 호버하면 커서로 수정 #239
yzooop Sep 30, 2024
b9eefdf
Merge pull request #245 from 100-hours-a-week/feature/elle
lucy726j Sep 30, 2024
594247e
Merge branch 'dev' into feature/lucy
lucy726j Sep 30, 2024
4b8f7fb
Fix : 해당 일자에 뉴스가 없으면 모달창 안뜨게 수정
Yeonsu00-12 Sep 30, 2024
fec79ee
Docs : layout GameNav url 수정
Yeonsu00-12 Sep 30, 2024
ae72fa1
Fix: 해당 종목 보유수 추가 #234
yzooop Sep 30, 2024
798bd6d
Feat : 주식 종목 확인 페이지에서 게임 결과 확인 페이지 이동 버튼 생성
lucy726j Sep 30, 2024
da5daf0
Merge pull request #247 from 100-hours-a-week/feature/veronica
lucy726j Sep 30, 2024
ffc9856
Merge branch 'dev' into feature/lucy
lucy726j Sep 30, 2024
de8bacd
Feat: Button 컴포넌트 disabled 속성 추가/ 정보거래소 종목 선택 안했을 시 버튼 활성화 x
Yeonsu00-12 Sep 30, 2024
9e83cc1
Merge pull request #246 from 100-hours-a-week/feature/elle
lucy726j Sep 30, 2024
2131072
Fix : css수정
yzooop Sep 30, 2024
a62cb84
Fix : css 수정
yzooop Sep 30, 2024
12a4557
Merge pull request #248 from 100-hours-a-week/feature/veronica
lucy726j Sep 30, 2024
71e8b1d
Fix : 2023년도 게임 결과가 없으면 게임 주식 종목 조회, 게임 결과 페이지 이동 못하도록
lucy726j Sep 30, 2024
860925e
Fix : css 수정
yzooop Sep 30, 2024
37e78cd
Merge pull request #250 from 100-hours-a-week/feature/veronica
lucy726j Sep 30, 2024
21e38b5
Merge pull request #249 from 100-hours-a-week/feature/lucy
Yeonsu00-12 Sep 30, 2024
33a3708
Style : 프로그래스바 위치 수정
Yeonsu00-12 Oct 1, 2024
3dff099
Fix : 보유주식/실시간 랭킹 탭 열어두기로 기본 설정 변경
lucy726j Oct 1, 2024
3158556
Fix : css 수정
yzooop Oct 1, 2024
468ecb0
Merge pull request #252 from 100-hours-a-week/feature/veronica
yzooop Oct 1, 2024
3856f9b
Fix : 수량 초기값 수정
yzooop Oct 1, 2024
3e1ac2b
Feat : 랭킹 등록 여러번 되지 않도록 수정 중
lucy726j Oct 1, 2024
d56b6d8
Merge pull request #251 from 100-hours-a-week/feature/elle
lucy726j Oct 1, 2024
2954b8e
Merge pull request #253 from 100-hours-a-week/feature/veronica
lucy726j Oct 1, 2024
6401049
Merge branch 'dev' into feature/lucy
lucy726j Oct 1, 2024
5654bd3
Merge pull request #254 from 100-hours-a-week/feature/lucy
lucy726j Oct 1, 2024
e139640
Fix : 뒤로가기/새로고침 시 현재 페이지에 머물도록 수정
Yeonsu00-12 Oct 1, 2024
30ca7d0
Merge branch 'dev' into feature/elle
Yeonsu00-12 Oct 1, 2024
51ff053
Fix : 게임 결과 페이지 -> 게임 재시작시 시작이 안되는 이슈
lucy726j Oct 1, 2024
6abce07
Fix : 상장폐지 주식 구매 수정 #258
yzooop Oct 1, 2024
6702e95
Feat : 루띠 음성추가 완료
Yeonsu00-12 Oct 2, 2024
1fdf327
Fix : 메인에서 새로고침 후 게임으로 이동 오류 수정
Yeonsu00-12 Oct 2, 2024
3923975
Update README.md
lucy726j Oct 2, 2024
d9d4b3c
Merge pull request #259 from 100-hours-a-week/feature/elle
Yeonsu00-12 Oct 3, 2024
a65a0f6
Merge pull request #260 from 100-hours-a-week/lucy726j-patch-3
Yeonsu00-12 Oct 3, 2024
5eb8d8d
Fix : 포트폴리오 수익률 안뜨는 이슈 수정
lucy726j Oct 6, 2024
3fe9fcb
Fix : 전체 수익률도 수정
lucy726j Oct 6, 2024
4e81365
Style : ts 파일 분리
lucy726j Oct 7, 2024
85b0ab0
Fix : 보유종목 주수 #256
yzooop Oct 7, 2024
60d00d8
Fix : pie chart label 수정 #92
yzooop Oct 7, 2024
bc54b28
Merge branch 'dev' into feature/veronica
yzooop Oct 7, 2024
421817d
Merge pull request #261 from 100-hours-a-week/feature/veronica
yzooop Oct 7, 2024
554689b
Feat : 검색 기능 Debounce 함수로 리팩토링
lucy726j Oct 7, 2024
57144cc
Fix : Debounce 함수 수정
lucy726j Oct 7, 2024
2d24f7e
Fix : 스껄 계산기에 공백 및 특수문자 입력 불가하도록 수정 #240
lucy726j Oct 7, 2024
c84bb11
Merge pull request #262 from 100-hours-a-week/feature/lucy
yzooop Oct 7, 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 @@ -26,6 +26,7 @@ yarn-debug.log*
yarn-error.log*

# env
.env
.env.production
.env.development
.env.local
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
32 changes: 32 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,34 @@
# 5-HRTH-ustock-fe
카카오 테크 부트캠프 과정 파이널 프로젝트 프론트엔드 리포지토리

<br><br>
# 💡 **프로젝트 소개**
<br>
### 핵심 키워드
1. elle 키워드
2. veronica 키워드
3. lucy 키워드

### 사용한 데이터
- 한국투자증권 api 주식 데이터
- 크롤링한 뉴스 데이터
- 54 건의 유저 데이터 + 전체 유입 유저

<br><br>
# 🛠️ 아키텍쳐
(새로이 그릴 예정)

<br><br>

# 📍 기술스택
|분류|기술|
|:- |:- |
|Language|<img src="https://img.shields.io/badge/TypeScript-blue?style=for-the-badge&logo=typescript&logoColor=white">|
|Framework|<img src="https://img.shields.io/badge/React-61DAFB?style=for-the-badge&logo=React&logoColor=white"/>
|Remote Data|<img src="https://img.shields.io/badge/Axios-5A29E4?style=for-the-badge&logo=Axios&logoColor=white"/>
|Data Management|<img src="https://img.shields.io/badge/Zustand-gray?style=for-the-badge&logo=Zustand&logoColor=white"/> <img src="https://img.shields.io/badge/Tanstack Query-FF4154?style=for-the-badge&logo=ReactQuery&logoColor=white"/>
|Library|<img src="https://img.shields.io/badge/Styled components-DB7093?style=for-the-badge&logo=StyledComponents&logoColor=white"/> <img src="https://img.shields.io/badge/React spring-E00033?style=for-the-badge&logo=ReactSpring&logoColor=white"/> <img src="https://img.shields.io/badge/Embla Carousel-FAFAFA?style=for-the-badge&logo=EmblaCarousel&logoColor=white"/> <img src="https://img.shields.io/badge/Lottie-00FFDA?style=for-the-badge&logo=Lottie&logoColor=white"/> <img src="https://img.shields.io/badge/Frarmer Motion-0055FF?style=for-the-badge&logo=Framer&logoColor=white"/> <img src="https://img.shields.io/badge/Sweetalert-F6D70?style=for-the-badge&logo=Sweetalert&logoColor=white"/> <img src="https://img.shields.io/badge/ApexCharts-ECD53F?style=for-the-badge&logo=ApexCharts&logoColor=white"/>
|DevOps|<img src="https://img.shields.io/badge/Github-181717?style=for-the-badge&logo=Github&logoColor=white"/> <img src="https://img.shields.io/badge/Github Actions-2088FF?style=for-the-badge&logo=Github Actions&logoColor=white"/> <img src="https://img.shields.io/badge/Amazon S3-569A31?style=for-the-badge&logo=Amazon S3&logoColor=white"/> <img src="https://img.shields.io/badge/Amazon CloudFront-FFFF66?style=for-the-badge&logo=Amazon CloudFront&logoColor=white"/>


<br><br><br>
Loading
Loading