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

토이프로젝트2_10조_Talkhaja #9

Open
wants to merge 387 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
387 commits
Select commit Hold shift + click to select a range
94351fd
Design: 하단 네비게이션 z-index 수정
developer-jyyun Nov 14, 2023
15445a2
Design: 하단 네비게이션 z-index 수정
developer-jyyun Nov 14, 2023
431d86d
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
developer-jyyun Nov 14, 2023
1411174
feat : 채팅하는 유저 네임 나타내기
moana16 Nov 14, 2023
a5cbc8d
Merge branch 'TALK-6--feat/chat' of https://github.com/Toy2-team10/Ta…
moana16 Nov 14, 2023
2c88bd8
Refactor: 숙소 채팅 생성 후 채팅방 이름 전송
jseo9732 Nov 14, 2023
0f1aa9d
Merge pull request #27 from Toy2-team10/TALK-31--feat/chatList/hostChat
jseo9732 Nov 14, 2023
716e56e
Merge pull request #28 from Toy2-team10/TALK-6--feat/chat
jseo9732 Nov 14, 2023
a38ad19
Feat: 채팅방 출입유저 알림 기능 추가
junkue20 Nov 14, 2023
630cf46
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
junkue20 Nov 14, 2023
495e24d
Refactor: 채팅방 URL 수정
jseo9732 Nov 14, 2023
20dcb6e
Merge pull request #29 from Toy2-team10/TALK-4--feat/chatList
jseo9732 Nov 14, 2023
8b5df8f
style : 채팅 크기 다른거 수정
moana16 Nov 14, 2023
3833077
Feat: myPage 링크 수정
Eojoonhyuk Nov 14, 2023
74d63a8
Fix: 회원가입 사진 에러
Eojoonhyuk Nov 14, 2023
2662c52
Remove: 필요없는 파일 수정
jseo9732 Nov 14, 2023
5734243
Refactor: 숙소와 채팅이 존재하면 미생성 후 이동
jseo9732 Nov 14, 2023
b847702
feat : 채팅 추가 모달 구현 및 스타일 적용
moana16 Nov 14, 2023
445af84
Merge pull request #31 from Toy2-team10/TALK-31--feat/chatList/hostChat
jseo9732 Nov 14, 2023
51d8b91
Refactor: 이미지 업로드 함수 조건문 추가
Eojoonhyuk Nov 14, 2023
d856f0f
Merge pull request #30 from Toy2-team10/TALK-5--feat/user/myPage
jseo9732 Nov 14, 2023
33fde35
Refactor: 생성, 참여 시 채팅방 이름 전송
jseo9732 Nov 14, 2023
c946a5a
Merge pull request #33 from Toy2-team10/TALK-4--feat/chatList
jseo9732 Nov 14, 2023
744faaf
Design:숙소목록 상단 고정 헤더로 변경
developer-jyyun Nov 14, 2023
42ce667
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
developer-jyyun Nov 14, 2023
306e811
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
developer-jyyun Nov 14, 2023
55762b2
Fix: Jwtinterceptors 임시 수정
jseo9732 Nov 14, 2023
12a2902
Merge pull request #36 from Toy2-team10/TALK-4--feat/chatList
jseo9732 Nov 14, 2023
3e5bbc2
Feat: 채팅목록 최근 메시지 시간 포맷팅
developer-jyyun Nov 14, 2023
04ba258
Merge branch 'develop' into TALK-6--feat/chat
jseo9732 Nov 14, 2023
ad2d494
Merge pull request #32 from Toy2-team10/TALK-6--feat/chat
jseo9732 Nov 14, 2023
602f8e1
Refactor: 로그인 토큰 관리 재설정
Eojoonhyuk Nov 14, 2023
9f0f68b
Merge branch 'develop' into TALK-11--feat/chatList/chat-room-status
jseo9732 Nov 14, 2023
f29a570
Chore:폴더명 변경/파일 이동, 불필요 파일 삭제
developer-jyyun Nov 15, 2023
71c6b46
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
developer-jyyun Nov 15, 2023
c0cf858
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
moana16 Nov 15, 2023
fdc1f15
Merge branch 'TALK-6--feat/chat' of https://github.com/Toy2-team10/Ta…
moana16 Nov 15, 2023
f6e832e
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
moana16 Nov 15, 2023
832a33b
Merge branch 'TALK-6--feat/chat' of https://github.com/Toy2-team10/Ta…
moana16 Nov 15, 2023
822b4e5
Feat: 채팅방 출입메세지 기능 활성화
junkue20 Nov 15, 2023
007d281
Style: 채팅title 길이 조절 코드 추가 및 불필요한 코드 삭제
junkue20 Nov 15, 2023
f42c94a
fix : socket 연결 코드 변경
moana16 Nov 15, 2023
d5aada2
Merge pull request #37 from Toy2-team10/TALK-11--feat/chatList/chat-r…
jseo9732 Nov 15, 2023
5d9df98
Merge pull request #38 from Toy2-team10/TALK-6--feat/chat
jseo9732 Nov 15, 2023
2c8256c
Merge branch 'develop' into TALK-18--feat/chat/viewJoin
jseo9732 Nov 15, 2023
4597a91
fix : 쓸모없는 코드 삭제
moana16 Nov 15, 2023
6566f8e
Merge pull request #40 from Toy2-team10/TALK-6--feat/chat
jseo9732 Nov 15, 2023
fa9b5b4
Fix: 컨플릭트 에러 해결
junkue20 Nov 15, 2023
b4f7431
feat : 채팅방 이름 길이 제한
moana16 Nov 15, 2023
e916e11
Fix: Conflict로 인한 코드 변경 오류 수정
junkue20 Nov 15, 2023
41f4bb1
Style: chatId.tsx conflict 수정
junkue20 Nov 15, 2023
46392a8
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
developer-jyyun Nov 15, 2023
996097b
style : 오픈 채팅 목록 디자인 변경
moana16 Nov 15, 2023
fdcd2d9
Feat: 하단 네비게이션 관련 recoil 파일 생성
developer-jyyun Nov 15, 2023
12f4d13
refactor : mychat list 컴포넌트 분리
moana16 Nov 15, 2023
2970580
refactor
moana16 Nov 15, 2023
bd611cc
Merge pull request #41 from Toy2-team10/TALK-65--etc/chatList
moana16 Nov 15, 2023
32c134a
Merge pull request #42 from Toy2-team10/TALK-36--etc
jseo9732 Nov 15, 2023
0b878cc
Merge pull request #39 from Toy2-team10/TALK-18--feat/chat/viewJoin
jseo9732 Nov 15, 2023
0883208
fix : recoil 오류 해결
moana16 Nov 15, 2023
1a35924
Merge branch 'TALK-36--etc' of https://github.com/Toy2-team10/Talkhaj…
moana16 Nov 15, 2023
0eca973
style : logo이미지 svg로 변경
moana16 Nov 15, 2023
e87a5cf
Refactor: 채팅 최신순으로 정렬
jseo9732 Nov 15, 2023
cc79044
Merge branch 'develop' into TALK-21--feat/user/hostList
jseo9732 Nov 15, 2023
9b6332a
Feat: 채팅방 인원조회 기능 추가
junkue20 Nov 15, 2023
ba50f70
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
junkue20 Nov 15, 2023
542cb0f
sty;e : signup 모달 배경 수정
moana16 Nov 15, 2023
662f96c
Feat: 생성된 채팅 실시간 목록 추가 기능 구현
jseo9732 Nov 15, 2023
6d7f9a3
Style: 코드 정리
jseo9732 Nov 15, 2023
d5e7c6f
Refactor: 의존성 배열 추가
jseo9732 Nov 15, 2023
20842a8
Merge pull request #45 from Toy2-team10/TALK-9--feat/chatList/getList
jseo9732 Nov 15, 2023
11ff6ef
Merge pull request #43 from Toy2-team10/TALK-36--etc
jseo9732 Nov 15, 2023
49bd067
Style: console.log 제거
jseo9732 Nov 15, 2023
ade3ada
Merge pull request #46 from Toy2-team10/TALK-9--feat/chatList/getList
jseo9732 Nov 15, 2023
26fcd49
Merge branch 'develop' into TALK-4--feat/chatList
jseo9732 Nov 15, 2023
e0833c4
Merge pull request #44 from Toy2-team10/TALK-18--feat/chat/viewJoin
jseo9732 Nov 15, 2023
8bbacae
Feat: 채팅 목록 30분 마다 재요청 로직 추가
jseo9732 Nov 15, 2023
b933412
style : 회원가입 후 로딩 추가
moana16 Nov 15, 2023
a6a54da
Merge pull request #48 from Toy2-team10/TALK-66--etc/signup
moana16 Nov 15, 2023
2126122
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
moana16 Nov 15, 2023
a887846
style : login 로고 변경
moana16 Nov 15, 2023
4580026
style : 헤더 추가
moana16 Nov 15, 2023
de83114
chore : 쓸데없는 코멘트 제거
moana16 Nov 15, 2023
d66aaa2
style : 채팅방에도 헤더 적용!
moana16 Nov 15, 2023
ecedd73
Feat: firebase data 대신 api data 받아오기/해시태그 스크롤 위치 변경
developer-jyyun Nov 15, 2023
cd6d85f
Merge pull request #50 from Toy2-team10/TALK-38--etc/header
moana16 Nov 15, 2023
f1fd675
Fix: merge conflicts
developer-jyyun Nov 15, 2023
773de26
Fix: merge conflicts
developer-jyyun Nov 15, 2023
55bb108
Merge pull request #47 from Toy2-team10/TALK-4--feat/chatList
jseo9732 Nov 15, 2023
1ea0d37
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
moana16 Nov 15, 2023
ffed652
Merge branch 'develop' into TALK-36--etc
jseo9732 Nov 15, 2023
86fa372
Merge pull request #49 from Toy2-team10/TALK-36--etc
jseo9732 Nov 15, 2023
13776a2
Error: Axios 관련 에러 공유용 push 커밋
junkue20 Nov 15, 2023
60980ab
Merge branch 'TALK-36--etc' of https://github.com/Toy2-team10/Talkhaj…
moana16 Nov 15, 2023
68735b8
Fix: conflict error 해결
jseo9732 Nov 15, 2023
23bd9bd
Merge pull request #51 from Toy2-team10/TALK-4--feat/chatList
jseo9732 Nov 15, 2023
1e29b1b
Fix: 입퇴장 문제 해결
jseo9732 Nov 15, 2023
ad84467
Refactor: 채팅방 정보 요청 로직 이동
jseo9732 Nov 15, 2023
57724cd
Chore: recoil-persist 설치
Eojoonhyuk Nov 15, 2023
ea28b11
Fix: instance 수정
Eojoonhyuk Nov 15, 2023
e1386df
Fix: setStorage 수정
Eojoonhyuk Nov 15, 2023
a229cd1
Feat: recoile-persist 추가
Eojoonhyuk Nov 15, 2023
dfd5fe1
Refactor: 불필요한 파이어베이스 함수 호출 삭제
Eojoonhyuk Nov 15, 2023
891c8c1
Refactor: 불필요한 파이어베이스 함수 호출 삭제
Eojoonhyuk Nov 15, 2023
0e40dde
Feat: 하단 내비게이션 페이지별 미노출
developer-jyyun Nov 15, 2023
3f40a1b
Feat: 로그인 함수 추가
Eojoonhyuk Nov 15, 2023
ab4bfd7
Remove: ts 파일 삭제
Eojoonhyuk Nov 15, 2023
0d49a3d
Refactor: access token 수정
Eojoonhyuk Nov 15, 2023
ebbf9af
Refactor: 코드 수정
Eojoonhyuk Nov 15, 2023
9236a22
Feat: 마이페이지 구현
Eojoonhyuk Nov 15, 2023
2fddb83
Merge branch 'develop' into TALK-20--feat/layout/nav
jseo9732 Nov 15, 2023
03c2d2b
Merge pull request #52 from Toy2-team10/TALK-20--feat/layout/nav
jseo9732 Nov 15, 2023
99d6e64
merge
Eojoonhyuk Nov 15, 2023
79cbe5e
Fix
jseo9732 Nov 15, 2023
cd6bd7e
Merge pull request #55 from Toy2-team10/TALK-20--feat/layout/nav
jseo9732 Nov 15, 2023
e1016f8
Style: 필요없는 코드 삭제
jseo9732 Nov 15, 2023
3067497
Merge branch 'develop' into TALK-21--feat/user/hostList
jseo9732 Nov 15, 2023
7b02e4d
Merge pull request #54 from Toy2-team10/TALK-21--feat/user/hostList
jseo9732 Nov 15, 2023
16d66ab
Fix
jseo9732 Nov 15, 2023
524c65c
Merge pull request #56 from Toy2-team10/TALK-21--feat/user/hostList
jseo9732 Nov 15, 2023
f0168c6
Fix: 모달창 오류 수정 (작업중)
junkue20 Nov 15, 2023
a8d8686
Feat: 오픈 채팅목록 타임포맷팅 변경
developer-jyyun Nov 15, 2023
636974f
Merge pull request #57 from Toy2-team10/TALK-11--feat/chatList/chatTime
jseo9732 Nov 15, 2023
cf6e018
Design: 홈 상단 여백 추가
jseo9732 Nov 15, 2023
7839dda
Merge pull request #58 from Toy2-team10/TALK-21--feat/user/hostList
jseo9732 Nov 15, 2023
4bde090
Refactor: CreateChatButton 컴포넌트 분리
jseo9732 Nov 15, 2023
e4e39f3
Design: JudgeWrapper 컴포넌트 분리
jseo9732 Nov 15, 2023
b634059
Rename: ChatList관련 컴포넌트 폴더 이동
jseo9732 Nov 15, 2023
d0c555b
Refactor: AllChatListItem 컴포넌트 분리
jseo9732 Nov 15, 2023
6bf8941
Refactor: 의존성 배열 수정
jseo9732 Nov 15, 2023
503a736
Style: 태그 이동
jseo9732 Nov 15, 2023
770ff51
Style: 코드 정리
jseo9732 Nov 15, 2023
9c6cc7a
Fix: 오픈채팅 목록 1시간 이내 모두 n분으로 표시
developer-jyyun Nov 16, 2023
3530337
Merge pull request #59 from Toy2-team10/TALK-11--feat/chatList/chatTime
jseo9732 Nov 16, 2023
af4b306
Fix: 숙소 채팅 생성 오류 수정
jseo9732 Nov 16, 2023
3427fd7
Merge pull request #60 from Toy2-team10/TALK-10--feat/chatList/create
jseo9732 Nov 16, 2023
2f6f30a
Merge pull request #61 from Toy2-team10/TALK-10--feat/chatList/create
jseo9732 Nov 16, 2023
e24a506
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
moana16 Nov 16, 2023
2734f57
Feat: 검색어 입력후 초기화 및 전체 해시태그 추가
developer-jyyun Nov 16, 2023
bc2d6b2
Merge branch 'TALK-21--feat/user/hostList' of https://github.com/Toy2…
developer-jyyun Nov 16, 2023
5a257f3
Fix: 채팅방 출입유저 실시간 새로고침 기능 오류수정
junkue20 Nov 16, 2023
396c9f8
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
junkue20 Nov 16, 2023
b8c2531
fix : 유저아이디 무한 연결 해결
moana16 Nov 16, 2023
708faba
Update README.md
moana16 Nov 16, 2023
3fe9485
Feat: 채팅방 로딩화면 추가 및 타입오류 해결
junkue20 Nov 16, 2023
bb85d10
fix : 반복 호출 수정
moana16 Nov 16, 2023
71de48d
Merge pull request #63 from Toy2-team10/TALK-18--feat/chat/viewJoin
jseo9732 Nov 16, 2023
086d571
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
moana16 Nov 16, 2023
7155e12
fix : 쿼리에 채팅방 제목 삭제
moana16 Nov 16, 2023
282e3bb
style : my 채팅목록 제목 스타일 추가
moana16 Nov 16, 2023
0c77dca
style : 채팅목록 스타일 추가
moana16 Nov 16, 2023
6a36d38
Feat:검색키워드 삭제시 전체목록 불러오기
developer-jyyun Nov 16, 2023
79da32a
Merge pull request #64 from Toy2-team10/TALK-36--etc
jseo9732 Nov 16, 2023
094d73c
Design: 헤더, 네비게이션 컴포넌트 폴더 이동 / 네비게이션 디자인 수정
jseo9732 Nov 16, 2023
b42de37
style : 채팅방 hover 스타일 추가
moana16 Nov 16, 2023
6bfbcf5
Fix: 채팅입장 메세지 출력 오류 해결
junkue20 Nov 16, 2023
e1abc28
Merge pull request #65 from Toy2-team10/TALK-36--etc
jseo9732 Nov 16, 2023
5141c9c
Merge branch 'develop' into TALK-4--feat/chatList
jseo9732 Nov 16, 2023
92ba9b2
Merge pull request #66 from Toy2-team10/TALK-4--feat/chatList
jseo9732 Nov 16, 2023
b784b5d
feat : 채팅 중복유저대화 프로필이랑 아이디 삭제하는 기능추가
moana16 Nov 16, 2023
d402d73
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
moana16 Nov 16, 2023
d8a9f04
Refactor: 불필요 타입 및 코드 삭제
junkue20 Nov 16, 2023
94db981
Merge pull request #67 from Toy2-team10/TALK-18--feat/chat/viewJoin
jseo9732 Nov 16, 2023
d05ca3d
Feat: 데이터 병합 및 검색기능 수정
developer-jyyun Nov 16, 2023
735c242
Merge branch 'develop' into TALK-36--etc
jseo9732 Nov 16, 2023
50e2bb3
Merge pull request #68 from Toy2-team10/TALK-36--etc
jseo9732 Nov 16, 2023
55079c0
style : 전체 배경 색 변경
moana16 Nov 16, 2023
ce6ad49
Merge branch 'TALK-36--etc' of https://github.com/Toy2-team10/Talkhaj…
moana16 Nov 16, 2023
9dd82c8
chore : 쓸모없는 주석 제거
moana16 Nov 16, 2023
ff82fcc
fix : Image 태그 오류 수정
moana16 Nov 16, 2023
2ce9d22
Refactor: 숙소 타입 수정
jseo9732 Nov 16, 2023
7600645
style : 오픈채팅방 hover 스타일 수정
moana16 Nov 16, 2023
479c691
Style: 코드 정리
jseo9732 Nov 16, 2023
8cf1515
Merge branch 'develop' into TALK-21--feat/user/hostList
jseo9732 Nov 16, 2023
3c04ce5
Merge pull request #69 from Toy2-team10/TALK-21--feat/user/hostList
jseo9732 Nov 16, 2023
4f1e1b4
Merge branch 'develop' into TALK-36--etc
jseo9732 Nov 16, 2023
8096b6f
Merge pull request #70 from Toy2-team10/TALK-36--etc
jseo9732 Nov 16, 2023
6df4924
update: README.md 양식 업데이트
junkue20 Nov 16, 2023
1693cd2
Update README.md
moana16 Nov 16, 2023
a848fa7
Update README.md
moana16 Nov 16, 2023
58d4d44
Fix: 에러 해결
jseo9732 Nov 16, 2023
ad9b790
Merge pull request #71 from Toy2-team10/TALK-21--feat/user/hostList
jseo9732 Nov 16, 2023
ddc9ba2
Fix: 채팅방 height값 이슈 해결
junkue20 Nov 16, 2023
c1d24e2
Merge pull request #72 from Toy2-team10/TALK-18--feat/chat/viewJoin
jseo9732 Nov 16, 2023
c005002
Design: 숙소 모달 IMAGE, backgroundImage로 변경
developer-jyyun Nov 16, 2023
84963a2
Merge pull request #73 from Toy2-team10/TALK-21--feat/user/hostList
jseo9732 Nov 16, 2023
559d259
Update README.md
moana16 Nov 16, 2023
fbdcaaf
Chore: 모달 font-size 수정
developer-jyyun Nov 16, 2023
e12bccb
Merge pull request #74 from Toy2-team10/TALK-21--feat/user/hostList
jseo9732 Nov 16, 2023
39f4e6c
Feat: 비로그인시 로그인 페이지 리다이렉트 구현
Eojoonhyuk Nov 16, 2023
8fe376a
Update: Readme 회고 작성
junkue20 Nov 16, 2023
dff4631
Update: Readme.md 준규
junkue20 Nov 16, 2023
0a47fe1
Refactor: 서버 url .env 파일로 이동
jseo9732 Nov 16, 2023
442f9df
Fix: 500에러 해결
Eojoonhyuk Nov 16, 2023
3048550
Merge branch 'TALK-42--feat/user/redirect' of https://github.com/Toy2…
Eojoonhyuk Nov 16, 2023
ba8cff1
Remove: 야놀자체 삭제
jseo9732 Nov 16, 2023
875e636
Remove: 폰트 파일 이동
jseo9732 Nov 16, 2023
c844cfd
Rename: 컴포넌트 폴더명 수정
jseo9732 Nov 16, 2023
c5ae322
Rename: Chat 컴포넌트 정리
jseo9732 Nov 16, 2023
4d6d890
Rename: Common 컴포넌트 파일 정리
jseo9732 Nov 16, 2023
d486db6
Update README.md
developer-jyyun Nov 16, 2023
90932be
Rename: 컴포넌트 이동
jseo9732 Nov 16, 2023
a6c6df9
Remove: ChatList 관련 컴포넌트 이동
jseo9732 Nov 16, 2023
84114a8
Feat: 유저아이디 전역상태 관리
Eojoonhyuk Nov 17, 2023
2e257db
Merge branch 'develop' into TALK-42--feat/user/redirect
jseo9732 Nov 17, 2023
4e34ede
Merge pull request #75 from Toy2-team10/TALK-42--feat/user/redirect
jseo9732 Nov 17, 2023
5f9bd03
Update README.md
moana16 Nov 17, 2023
8307858
Merge branch 'develop' into organizeFolders
jseo9732 Nov 17, 2023
a26e384
Merge pull request #76 from Toy2-team10/organizeFolders
jseo9732 Nov 17, 2023
feb6e7c
Fix
jseo9732 Nov 17, 2023
5d829c0
Fix
jseo9732 Nov 17, 2023
2d9be7c
Fix
jseo9732 Nov 17, 2023
1ee44f1
Fix: authData 추가
jseo9732 Nov 17, 2023
c69c656
Fix
jseo9732 Nov 17, 2023
d5eb2d2
Fix
jseo9732 Nov 17, 2023
38b7431
Fix
jseo9732 Nov 17, 2023
7f5b2e6
Update: Readme.md
Eojoonhyuk Nov 17, 2023
de94e46
Fix
jseo9732 Nov 17, 2023
f6d270d
Docs: 회고 추가
Eojoonhyuk Nov 17, 2023
a25b977
Merge branch 'moana16-patch-1' of https://github.com/Toy2-team10/Talk…
Eojoonhyuk Nov 17, 2023
97f0214
Merge branch 'main' into develop
jseo9732 Nov 17, 2023
c9652d3
Merge pull request #77 from Toy2-team10/develop
jseo9732 Nov 17, 2023
d1a2449
Merge pull request #62 from Toy2-team10/moana16-patch-1
jseo9732 Nov 17, 2023
d5e9da4
Merge pull request #78 from Toy2-team10/develop
jseo9732 Nov 17, 2023
21c50e3
FIx
jseo9732 Nov 17, 2023
ce45a46
Merge branch 'develop' of https://github.com/Toy2-team10/Talkhaja int…
jseo9732 Nov 17, 2023
dc560ed
Merge pull request #79 from Toy2-team10/develop
jseo9732 Nov 17, 2023
fc8c680
Fix
jseo9732 Nov 17, 2023
4660bd2
Merge branch 'main' of https://github.com/Toy2-team10/Talkhaja
jseo9732 Nov 17, 2023
8fb6ce2
Fix
jseo9732 Nov 17, 2023
fdcbe34
Fix
jseo9732 Nov 17, 2023
8f3282c
Fix
jseo9732 Nov 17, 2023
a395ac3
Fix
jseo9732 Nov 17, 2023
e0e03ff
Fix
jseo9732 Nov 17, 2023
36e6c40
Update README.md
jseo9732 Nov 17, 2023
61f20b4
Merge pull request #80 from Toy2-team10/jseo9732-patch-1
jseo9732 Nov 17, 2023
235de8f
Fix
jseo9732 Nov 17, 2023
e142c36
Merge branch 'main' of https://github.com/Toy2-team10/Talkhaja
jseo9732 Nov 17, 2023
a7cc40f
Refactor: 불필요한 파일 정리, 제거
jseo9732 Nov 17, 2023
7120101
Rename: 파일명 수정
jseo9732 Nov 17, 2023
554f2a4
Merge pull request #81 from Toy2-team10/develop
jseo9732 Nov 17, 2023
3871014
Fix
jseo9732 Nov 17, 2023
f1d6142
Merge pull request #82 from Toy2-team10/develop
jseo9732 Nov 17, 2023
d415831
Merge remote-tracking branch 'from/main' into Y_FE_Toy2_Team10
jseo9732 Nov 18, 2023
0f24715
Docs: Update README.md
jseo9732 Nov 18, 2023
0d60939
Merge pull request #83 from Toy2-team10/jseo9732-patch-2
jseo9732 Nov 18, 2023
f3a77e5
Update README.md
jseo9732 Nov 18, 2023
51f6d93
Update README.md
jseo9732 Nov 18, 2023
c76308b
Merge remote-tracking branch 'from/main' into Y_FE_Toy2_Team10
jseo9732 Nov 18, 2023
f4e187a
Update README.md
jseo9732 Dec 22, 2023
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
39 changes: 39 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "prettier"],
"parserOptions": {
"project": "./tsconfig.json",
"createDefaultProgram": true
},
"env": {
// 전역객체를 eslint가 인식하는 구간
"browser": true, // document나 window 인식되게 함
"node": true,
"es6": true
},
"ignorePatterns": ["node_modules/"], // eslint 미적용될 폴더나 파일 명시
"extends": [
"airbnb",
"airbnb-typescript",
"airbnb/hooks",
"next/core-web-vitals",
"plugin:@typescript-eslint/recommended", // ts 권장
"plugin:prettier/recommended", // eslint의 포매팅을 prettier로 사용.
"prettier" // eslint-config-prettier prettier와 중복된 eslint 규칙 제거
],
"rules": {
"react/react-in-jsx-scope": "off", // react 17부턴 import 안해도돼서 기능 끔
// 경고표시, 파일 확장자를 .ts나 .tsx 모두 허용함
"react/jsx-filename-extension": ["warn", { "extensions": [".ts", ".tsx"] }],
"no-useless-catch": "off", // 불필요한 catch 못쓰게 하는 기능 끔
"react/jsx-props-no-spreading": "off",
"jsx-a11y/label-has-associated-control": [
2,
{
"labelAttributes": ["htmlFor"]
}
],
"no-console": "off"
}
}
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/✅-feat--이슈명.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: "✅[Feat] 이슈명"
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''

---

## 페이지

### ⚠️ Issue
- 이슈 개요를 입력해주세요.

### ✏️ ToDoList
- [ ] 할 일1
- [ ] 할 일2
15 changes: 15 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## 페이지
<!-- 작업한 페이지를 적어주세요 -->

## ✨ 작업 내용
<!-- 작업에 대한 설명을 적어주세요 -->

## ❗️ 참고 사항
<!-- 참고할 내용 적어주세요 -->
<!-- ex) 패키지를 새로 설치한 경우: npm i 부탁드립니다 -->

## 📸 스크린샷(선택)
<!-- 스크린샷이 필요한 과제면 스크린샷을 첨부해주세요 -->

## 📚 레퍼런스 (또는 새로 알게 된 내용) 혹은 궁금한 사항들
<!-- 참고할 사항이 있다면 적어주세요 -->
37 changes: 37 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local
.env

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
27 changes: 27 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"arrowParens": "avoid",
"bracketSpacing": true,
"endOfLine": "auto",
"htmlWhitespaceSensitivity": "css",
"jsxBracketSameLine": false,
"jsxSingleQuote": false,
"printWidth": 80,
"proseWrap": "preserve",
"quoteProps": "as-needed",
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all",
"useTabs": false,
"vueIndentScriptAndStyle": true,
"requirePragma": false,
"insertPragma": false,
"overrides": [
{
"files": "*.json",
"options": {
"printWidth": 200
}
}
]
}
46 changes: 46 additions & 0 deletions @types/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
export interface User {
id: string;
password: string;
name: string;
picture: string;
chats: string[]; // chat id만 속합니다.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- chats: string[]; //chat id만 속합니다
+ /** chat id만 속합니다. */
+ chats: string[];

JSDoc에 대해 알아보시면 좋을 것 같습니다!
이렇게 작성하시면 에디터에서 편하게 확인하실 수 있습니다.

}

export interface Chat {
id: string;
name: string;
isPrivate: boolean;
users: ChatUser[];
latestMessage: Message; // message 객체가 속합니다.
updatedAt: Date;
}

export interface ChatUser {
id: string;
username: string;
picture: string;
}

export interface Message {
id: string;
text: string;
userId: string;
createdAt: Date;
}

export interface JoinersData {
users: string[]; // 참여자들 id
joiners: string[]; // 새로운 참여자 id
}

export interface LeaverData {
users: string[]; // 참여자들 id
leaver: string; // 나간 사용자 id
}

export interface IsValidAuth {
authData: {
auth: boolean;
user: User;
};
}
22 changes: 22 additions & 0 deletions @types/user.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
export interface ClientRefresh {
accessToken: string;
}

export interface ClientAccessToken {
refreshToken: string;
}

export interface UserId {
id: string;
}

export interface UserPW {
password: string;
}

export interface UserLogin extends UserId, UserPW {}
Comment on lines +9 to +17
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 타입은 request body에 사용되는 것 같은데, 굳이 이렇게 두 타입으로 나누지 않아도 되지 않을까요?
하나가 별개로 쓰일 일은 많지 않을 것 같네요.


export interface UserLoginResponse {
accessToken: string;
refreshToken: string;
}
Loading