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

Frontend 시간은행 #94

Open
wants to merge 433 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
433 commits
Select commit Hold shift + click to select a range
1fdbfa6
Impl. create/scan QRCode using HMAC
ytjdud Apr 30, 2024
66a265d
Feat. Encrypt QR creation time and add verification for 2-min expiration
ytjdud May 2, 2024
6a6b538
Add. .env path
ytjdud May 2, 2024
b7b0572
Modify. userInfo schema
ytjdud May 2, 2024
358c3b4
Refactor. createQR's request body format
ytjdud May 2, 2024
7692a27
Add .env and data.sql
ytjdud May 2, 2024
d26487a
Create. entities and integrated with MySQL
ytjdud May 2, 2024
18aae35
Fix. typo in project name from 'admin-serive' to 'admin-service'
ytjdud May 2, 2024
326639c
Fix. typo in project name from 'admin-serive' to 'admin-service'
ytjdud May 2, 2024
599ab6b
Feat. createInquire APIs
ytjdud May 2, 2024
0c5aba4
Feat. getInquires API
ytjdud May 2, 2024
9dc759f
Feat. reply APIs
ytjdud May 2, 2024
95c5d06
Fix. Ambiguous handler methods mapped for '/inquiries/all'
ytjdud May 2, 2024
d15d8ba
Fix. HTTP Method: Get -> Post
ytjdud May 2, 2024
e35289b
Feat. add isCompleted Status field in Inquire Object
ytjdud May 2, 2024
3c23e19
Rename. method
ytjdud May 2, 2024
953c5b1
Rename. method
ytjdud May 2, 2024
d9ac917
Feat. updateReply API
ytjdud May 2, 2024
f1356c6
Chore. modify description
ytjdud May 2, 2024
5467edf
Feat. UpdateInquire API
ytjdud May 2, 2024
24ed0c2
Fix. Add try-catch to handle exceptions
ytjdud May 2, 2024
fcfdc37
Fix. add @UpdateTimestamp to insert creationDateTime automatically
ytjdud May 3, 2024
31fcf4b
Feat. add getMyInquire APIs
ytjdud May 3, 2024
f7d16b5
Feat. add deleteMyInquire API
ytjdud May 3, 2024
78b0f54
Feat. modfiy the response of getInquire with reply
ytjdud May 3, 2024
2560641
Refactor. Seperated InquireController into AdminInquireController and…
ytjdud May 3, 2024
2ee383b
카카오 로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
9d18ec4
카카오 로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
eb30c72
Feat. Add dynamic filtering for inquiries based on type and completio…
ytjdud May 3, 2024
3cf8c60
카카오로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
c9698c8
카카오로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
46d635d
카카오로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
7e35660
카카오로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
385fe85
카카오로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
b221754
카카오로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
7e0b278
http 연결을 위한 base 함수 -> 추후 삭제예정. 레퍼런스로 참고 하시라고 일단 올려둡니다.
sunJ0120 May 3, 2024
bf11666
http 연결을 위한 base 함수 -> 추후 삭제예정. 레퍼런스로 참고 하시라고 일단 올려둡니다.
sunJ0120 May 3, 2024
6bf9c00
alert
sunJ0120 May 3, 2024
a60ecfa
alert
sunJ0120 May 3, 2024
d59f0cd
api 연동 완료
sunJ0120 May 3, 2024
498a981
api 연동 완료
sunJ0120 May 3, 2024
cce82aa
api 연동을 위한 함수
sunJ0120 May 3, 2024
8a2b7e6
api 연동을 위한 함수
sunJ0120 May 3, 2024
9abd36a
qr
sunJ0120 May 3, 2024
3fbf073
qr
sunJ0120 May 3, 2024
c8f6965
permission 버튼 색상 변경
sunJ0120 May 3, 2024
350cc9f
permission 버튼 색상 변경
sunJ0120 May 3, 2024
1827116
유효시간 지난경우 alert
sunJ0120 May 3, 2024
f85531d
유효시간 지난경우 alert
sunJ0120 May 3, 2024
1d90fe1
송금 과정에서 사용하는 싱글톤 클래스
sunJ0120 May 3, 2024
e4fe47b
송금 과정에서 사용하는 싱글톤 클래스
sunJ0120 May 3, 2024
e484373
Create. init-Docker-configs and deploy to remote server
ytjdud May 3, 2024
2e83db3
Merge pull request #39 from kookmin-sw/36-backadmin-문의-관련-기본-apis
ytjdud May 3, 2024
a9df479
카카오 구글 파이어베이스 연동
Heo-jieun May 4, 2024
b2c41c3
카카오 구글 파이어베이스 연동
Heo-jieun May 4, 2024
d8822ed
Add. new field to API response based on client request
ytjdud May 4, 2024
d7ca551
[FIX] 배포 전 디버깅
IngenieurSong May 5, 2024
7982717
구글 로그인 구현 완료
Heo-jieun May 5, 2024
b859451
구글 로그인 구현 완료
Heo-jieun May 5, 2024
b747164
Merge branch 'dev/back/exchange' into 19-backqr-데이터-전송-시-보안-적용
ytjdud May 5, 2024
ea6cd97
Merge pull request #41 from kookmin-sw/19-backqr-데이터-전송-시-보안-적용
ytjdud May 5, 2024
f69c35e
유저, 계좌 생성 api연결 완료
Heo-jieun May 5, 2024
57f79b8
유저, 계좌 생성 api연결 완료
Heo-jieun May 5, 2024
12c4e7a
1차 배포용 거래내역 + 송금 완성
sunJ0120 May 5, 2024
2250a55
1차 배포용 거래내역 + 송금 완성
sunJ0120 May 5, 2024
30534a8
Create Account API 연결완료
Heo-jieun May 6, 2024
1b48823
Create Account API 연결완료
Heo-jieun May 6, 2024
70e4d95
drawer 기능 추가
Heo-jieun May 6, 2024
43307ef
drawer 기능 추가
Heo-jieun May 6, 2024
991ba53
drawer 적용
Heo-jieun May 6, 2024
578c4c2
drawer 적용
Heo-jieun May 6, 2024
714aa3c
1차 merge 완료
Heo-jieun May 6, 2024
b651d90
1차 merge 완료
Heo-jieun May 6, 2024
2bae68d
1차 배포용 수정사항 적용 완료
sunJ0120 May 6, 2024
c63a20b
1차 배포용 수정사항 적용 완료
sunJ0120 May 6, 2024
802ecd1
add login start screen
Heo-jieun Apr 7, 2024
07ba557
add login start screen
Heo-jieun Apr 7, 2024
d458ace
add kakaologin
Heo-jieun Apr 9, 2024
cbcf50f
add kakaologin
Heo-jieun Apr 9, 2024
4295785
add login screen, nickname screen
Heo-jieun Apr 9, 2024
64f680d
add login screen, nickname screen
Heo-jieun Apr 9, 2024
5a333d5
add nick name screen & httpResponse"
Heo-jieun Apr 12, 2024
a7526f9
add nick name screen & httpResponse"
Heo-jieun Apr 12, 2024
f6ee229
add default account screen, start screen edit
Heo-jieun Apr 26, 2024
e1426f6
add default account screen, start screen edit
Heo-jieun Apr 26, 2024
351d5e1
change api and modify account open
Heo-jieun Apr 29, 2024
2ba00ed
change api and modify account open
Heo-jieun Apr 29, 2024
12f47d4
글씨 사이즈, 패딩 사이즈 - 상대 크기로 변경 완료
Heo-jieun Apr 30, 2024
e344bfa
글씨 사이즈, 패딩 사이즈 - 상대 크기로 변경 완료
Heo-jieun Apr 30, 2024
ad295a1
카카오 로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
2f25eba
카카오 로그인 파이어베이스 연동 완료
Heo-jieun May 3, 2024
f377395
구글 로그인 구현 완료
Heo-jieun May 5, 2024
c1c62ba
구글 로그인 구현 완료
Heo-jieun May 5, 2024
cffe2f2
유저, 계좌 생성 api연결 완료
Heo-jieun May 5, 2024
9b644f8
유저, 계좌 생성 api연결 완료
Heo-jieun May 5, 2024
bb64d97
Create Account API 연결완료
Heo-jieun May 6, 2024
4fba43c
Create Account API 연결완료
Heo-jieun May 6, 2024
b2af37a
drawer 적용
Heo-jieun May 6, 2024
28b19d3
drawer 적용
Heo-jieun May 6, 2024
d04604d
1차 배포용 수정사항 적용 완료
sunJ0120 May 6, 2024
8773016
1차 배포용 수정사항 적용 완료
sunJ0120 May 6, 2024
26c9a95
디자인 변경 완료
Heo-jieun May 7, 2024
dfa4a8f
디자인 변경 완료
Heo-jieun May 7, 2024
af27a4a
송금 회원가입 연결 완료
Heo-jieun May 7, 2024
c653ba3
송금 회원가입 연결 완료
Heo-jieun May 7, 2024
72f453a
회원가입 프로세스 정리 완료
Heo-jieun May 8, 2024
a5caf3e
회원가입 프로세스 정리 완료
Heo-jieun May 8, 2024
f14f384
userid 싱글톤 클래스 구현 완료
Heo-jieun May 8, 2024
35960fc
userid 싱글톤 클래스 구현 완료
Heo-jieun May 8, 2024
56b2328
유저정보 계좌 정보 관리하는 파일 이름 register에서 manage로 변경
Heo-jieun May 8, 2024
bab9332
유저정보 계좌 정보 관리하는 파일 이름 register에서 manage로 변경
Heo-jieun May 8, 2024
57aa360
manage 위치 변경
Heo-jieun May 8, 2024
e2374de
manage 위치 변경
Heo-jieun May 8, 2024
db8352a
전체 요소 크기 변경 완료
sunJ0120 May 8, 2024
36d2579
전체 요소 크기 변경 완료
sunJ0120 May 8, 2024
95bcf97
화면 돌리기 막아둠(화면 돌릴시, ui가 심하게 깨짐)
sunJ0120 May 8, 2024
af27302
화면 돌리기 막아둠(화면 돌릴시, ui가 심하게 깨짐)
sunJ0120 May 8, 2024
ff06347
Merge branch 'sunJ' into frontend_dev
sunJ0120 May 8, 2024
eb6288b
Merge branch 'sunJ' into frontend_dev
sunJ0120 May 8, 2024
e1d4541
프로필 페이지 추가
Heo-jieun May 10, 2024
9d21236
프로필 페이지 추가
Heo-jieun May 10, 2024
be5756d
UI 사이즈 변경 완료
Heo-jieun May 10, 2024
9f6465c
UI 사이즈 변경 완료
Heo-jieun May 10, 2024
3173648
connect to external account database
ytjdud May 10, 2024
4cf22f1
user정보 api 연결 완료
Heo-jieun May 11, 2024
690e42d
user정보 api 연결 완료
Heo-jieun May 11, 2024
3c3c516
Refactor: move to 'domain' dir
ytjdud May 11, 2024
70c3ebc
connect to external 'user-serive'
ytjdud May 11, 2024
47a438b
Fix. use '==' instead of '.equals()' to check suspendType:null
ytjdud May 11, 2024
6c4032c
Merge pull request #52 from kookmin-sw/40-back-외부-서비스와-통신
ytjdud May 11, 2024
e55f9bf
계좌 생성 api 연결 완료
Heo-jieun May 11, 2024
ed957f0
계좌 생성 api 연결 완료
Heo-jieun May 11, 2024
3b7be9d
Delete environment:
ytjdud May 11, 2024
e236aac
Fix: change the data type received from user-service
ytjdud May 11, 2024
37afd4d
Docs: Update @Schema examples
ytjdud May 11, 2024
d8bb269
환불 페이지 구성 완료
sunJ0120 May 12, 2024
e997724
환불 페이지 구성 완료
sunJ0120 May 12, 2024
77eda92
Merge branch 'sunJ' into sunJ_dev
sunJ0120 May 12, 2024
8c6f009
Merge branch 'sunJ' into sunJ_dev
sunJ0120 May 12, 2024
5663c42
default drawer수정
Heo-jieun May 12, 2024
fc3ee5c
default drawer수정
Heo-jieun May 12, 2024
9eabadb
Fix response dto: show senderBalanceAfter when sender=true, and vice …
ytjdud May 12, 2024
fded60c
권한 페이지 "시간"으로 메세지 변경 완료
sunJ0120 May 12, 2024
71a66a8
권한 페이지 "시간"으로 메세지 변경 완료
sunJ0120 May 12, 2024
16288d3
qr 시간 1분 30초로 변경 완료
sunJ0120 May 12, 2024
8629ccf
qr 시간 1분 30초로 변경 완료
sunJ0120 May 12, 2024
99ebba9
Add UserRemittanceHistoryList API response value:createdAt
ytjdud May 12, 2024
6c20366
Chore: move sql config from root to local
ytjdud May 12, 2024
fea9909
qr 시간 1분 30초로 변경 완료
sunJ0120 May 13, 2024
fc0b5af
qr 시간 1분 30초로 변경 완료
sunJ0120 May 13, 2024
fcf5a51
Merge branch 'sunJ' into frontend_dev
sunJ0120 May 13, 2024
4624bf3
Merge branch 'sunJ' into frontend_dev
sunJ0120 May 13, 2024
7543553
HMAC 구현(임시)
sunJ0120 May 13, 2024
f61bda8
HMAC 구현(임시)
sunJ0120 May 13, 2024
fd32a22
송금 리스트에 새로고침 기능 추가
sunJ0120 May 13, 2024
41be875
송금 리스트에 새로고침 기능 추가
sunJ0120 May 13, 2024
10050e7
Merge branch 'frontend_dev' into sunJ_dev
sunJ0120 May 13, 2024
0c44fbd
Merge branch 'frontend_dev' into sunJ_dev
sunJ0120 May 13, 2024
d6aa99a
userInfo수정 완료& front 전체 연결 완료
Heo-jieun May 13, 2024
9490bfe
userInfo수정 완료& front 전체 연결 완료
Heo-jieun May 13, 2024
c8ca9da
로그인, 권한 설정 화면 연결
Heo-jieun May 13, 2024
82298d8
로그인, 권한 설정 화면 연결
Heo-jieun May 13, 2024
07f8598
권한 - 로그인 연동 완료
sunJ0120 May 13, 2024
d876790
권한 - 로그인 연동 완료
sunJ0120 May 13, 2024
028c9bd
매듭 -> 시간으로 변경 완료
Heo-jieun May 13, 2024
0caa838
매듭 -> 시간으로 변경 완료
Heo-jieun May 13, 2024
28d9d2c
number 페이지 오류 해결
Heo-jieun May 13, 2024
53ab5e5
number 페이지 오류 해결
Heo-jieun May 13, 2024
f94aa0e
송금시 userId 추가 완료
sunJ0120 May 13, 2024
5968851
송금시 userId 추가 완료
sunJ0120 May 13, 2024
61ce210
회원가입, 계좌생성 문제 발생시 alret추가
Heo-jieun May 14, 2024
03085c0
회원가입, 계좌생성 문제 발생시 alret추가
Heo-jieun May 14, 2024
77072f7
ddd
sunJ0120 May 14, 2024
43b9460
ddd
sunJ0120 May 14, 2024
6cf9e41
Merge remote-tracking branch 'origin/frontend_dev' into frontend_dev
sunJ0120 May 14, 2024
9f96a38
Merge remote-tracking branch 'origin/frontend_dev' into frontend_dev
sunJ0120 May 14, 2024
9bf895c
고객문의 질문하기 디자인 완료
Heo-jieun May 17, 2024
c2ae5b3
고객문의 질문하기 디자인 완료
Heo-jieun May 17, 2024
7cabe67
질문 내역 보기 화면 구성완료
Heo-jieun May 17, 2024
1e3c7c3
질문 내역 보기 화면 구성완료
Heo-jieun May 17, 2024
93e7339
질문 내역, 질문 상세 내역, 질문하기 api연결 완료
Heo-jieun May 17, 2024
2546186
질문 내역, 질문 상세 내역, 질문하기 api연결 완료
Heo-jieun May 17, 2024
e140160
관리자 문의 api연결 완료
Heo-jieun May 17, 2024
bbd4f21
관리자 문의 api연결 완료
Heo-jieun May 17, 2024
bed08fb
.env 파일로 서버 주소 갈아 끼움
sunJ0120 May 18, 2024
f106ee3
.env 파일로 서버 주소 갈아 끼움
sunJ0120 May 18, 2024
79d2199
Update README.md
sunJ0120 May 18, 2024
1bb04b1
Update README.md
sunJ0120 May 18, 2024
e38481c
Update README.md
sunJ0120 May 18, 2024
2ee4a42
Update README.md
sunJ0120 May 18, 2024
4e73ea1
Update README.md
sunJ0120 May 18, 2024
3f51b6d
Update README.md
sunJ0120 May 18, 2024
61a55b9
Update README.md
sunJ0120 May 18, 2024
997a0e4
Update README.md
sunJ0120 May 18, 2024
ef96537
Update README.md
sunJ0120 May 18, 2024
d14d44e
sha1 추가로 구글 서비스 파일 변경
sunJ0120 May 18, 2024
caf93ea
sha1 추가로 구글 서비스 파일 변경
sunJ0120 May 18, 2024
911278f
Update README.md
sunJ0120 May 18, 2024
a0316c7
구글 서비스 업데이트
sunJ0120 May 18, 2024
da51cea
Merge branch 'frontend_dev' into sunJ
sunJ0120 May 18, 2024
b1da23b
로고 색상 변경
sunJ0120 May 18, 2024
ea350e1
로고 색상 변경
sunJ0120 May 18, 2024
1bd69ac
.
sunJ0120 May 18, 2024
74e08e2
.
sunJ0120 May 18, 2024
599b288
.
sunJ0120 May 18, 2024
bcb4878
.
sunJ0120 May 18, 2024
6b4a60c
변경
sunJ0120 May 18, 2024
df211b8
변경
sunJ0120 May 18, 2024
cf77bbc
로그인 에러 해결 중
Heo-jieun May 18, 2024
a052862
로그인 에러 해결 중
Heo-jieun May 18, 2024
b3f22bc
파이업에이스 파일 변경
Heo-jieun May 19, 2024
e0030e7
파이업에이스 파일 변경
Heo-jieun May 19, 2024
8879b44
Update README.md
sunJ0120 May 19, 2024
add7fb2
api 주소 수정
Heo-jieun May 19, 2024
58e9021
api 주소 수정
Heo-jieun May 19, 2024
95ce542
Update README.md
sunJ0120 May 20, 2024
8901039
Merge branch 'frontend_dev' into sunJ
sunJ0120 May 20, 2024
4a21e3a
Remove sensitive file
Heo-jieun May 21, 2024
a64f11f
Remove sensitive file
Heo-jieun May 21, 2024
bc32963
충돌 해결
Heo-jieun May 21, 2024
fc6d999
카카오 로그인 완료
Heo-jieun May 21, 2024
f5f92ab
Merge branch 'frontend_dev' into sunJ
sunJ0120 May 23, 2024
50d0677
Update README.md
sunJ0120 May 23, 2024
86d7d41
change suspentionType name: None to Nothing
ytjdud May 23, 2024
50ac72c
Update README.md
sunJ0120 May 23, 2024
ded3599
앱 아이콘 변경 완료
sunJ0120 May 24, 2024
81e1b1b
add .DS_Store and .idea in .gitignore
ytjdud May 24, 2024
aa5e60f
delete tracked .DS_Store and .idea
ytjdud May 24, 2024
03d461e
change port 8081 to 80
ytjdud May 24, 2024
2a505fa
현재 구글 로그인만 반영
sunJ0120 May 24, 2024
663ec95
Add .DS_Store in .gitignore
ytjdud May 24, 2024
a3b91ba
delete tracked .idea and add it in .gitignore
ytjdud May 24, 2024
4f3185f
Merge pull request #58 from kookmin-sw/sunJ
sunJ0120 May 24, 2024
6d4b1d3
Merge pull request #59 from kookmin-sw/dev/back/exchange
ytjdud May 24, 2024
59039db
Merge branch 'backend-dev' into dev/back/admin
ytjdud May 24, 2024
774ffbb
Merge pull request #60 from kookmin-sw/dev/back/admin
ytjdud May 24, 2024
b001746
delete root files(README, _config, index.md)
ytjdud May 24, 2024
f31c93e
create back-end/timebank dir and mv all services into it
ytjdud May 24, 2024
5a1cbf4
Merge pull request #64 from kookmin-sw/account_core
ytjdud May 24, 2024
d56422b
Merge pull request #65 from kookmin-sw/auth
ytjdud May 24, 2024
c4469d7
mv auth and account services into back-end/timebank
ytjdud May 24, 2024
cd83330
Merge pull request #67 from kookmin-sw/backend-dev
ytjdud May 24, 2024
d2e8ffa
Create README.md
ytjdud May 24, 2024
1300cf1
Merge branch 'master' into sunJ_readme
ytjdud May 24, 2024
5fc722b
Merge pull request #63 from kookmin-sw/sunJ_readme
ytjdud May 24, 2024
51e2170
Create _config.yml
ytjdud May 24, 2024
a47a46c
Create index.md
ytjdud May 24, 2024
8cf5d0f
Create front-end dir
ytjdud May 24, 2024
fc2eda0
create default files
ytjdud May 24, 2024
a435b0c
Merge branch 'master' into frontend
ytjdud May 24, 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
Prev Previous commit
Next Next commit
change port 8081 to 80
  • Loading branch information
ytjdud committed May 24, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 03d461e72d35f2d7c8b169820cc090a952e143d4
2 changes: 1 addition & 1 deletion admin-service/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ services:
container_name: dev-admin
hostname: dev-admin
ports:
- 8081:8081
- 80:8081
env_file:
- .env
environment: