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: 커서공유 테스트 #262

Merged
merged 85 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
09ce832
Feat: 상품가격 수정 구현
LeHiHo Jan 21, 2024
6c06d4e
Refactor: 여정 아이템 문자열 넘침방지 구현
LeHiHo Jan 21, 2024
43379cc
Merge pull request #216 from FinalDoubleTen/FE-77--feat/Trips
LeHiHo Jan 21, 2024
d530e38
Merge pull request #214 from FinalDoubleTen/FE-94--feat/Trips/DragAnd…
LeHiHo Jan 21, 2024
7a9352f
Feat: 내 여행취향 설정하러가기 구현
LeHiHo Jan 22, 2024
a1da71d
Fix: 비용입력 x버튼 밀림현상 해결
LeHiHo Jan 22, 2024
ad8818a
Fix: 경보정보 음수일때 대체 텍스트 추가
LeHiHo Jan 22, 2024
d3f5e18
Fix: 여정아이템 toLocaleString 적용
LeHiHo Jan 22, 2024
f250001
Fix: 여정장소 없을 때 default 지도 설정
suehub Jan 22, 2024
f75b4f9
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
suehub Jan 22, 2024
e9612e9
Design: 계획스케줄 날짜 변환
suehub Jan 22, 2024
caf0992
Design: 여정편집 모달 width 재설정
suehub Jan 22, 2024
0a54823
Style: 오타 수정
jseo9732 Jan 22, 2024
8c9ac4d
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
jseo9732 Jan 22, 2024
48f8ca1
Fix: 여행취향 디폴트 디자인 구현 및 디버깅
seungjun222 Jan 22, 2024
7f7145c
Fix: 빌드 에러 해결
seungjun222 Jan 22, 2024
50e7c9d
Merge branch 'dev' into FE-96--feat/ConnectedTripMembers/socket
seungjun222 Jan 22, 2024
64521b5
Merge pull request #220 from FinalDoubleTen/TripsQA/Map
LeHiHo Jan 22, 2024
dbb6382
Merge pull request #221 from FinalDoubleTen/FE-96--feat/ConnectedTrip…
LeHiHo Jan 22, 2024
369e188
Refactor: button 중복 해결
jseo9732 Jan 22, 2024
8366747
Fix: jsx 오류 해결
jseo9732 Jan 22, 2024
1354cbc
Style: 오타 수정
jseo9732 Jan 22, 2024
ff7809a
Refactor: 비로그인 유저 편집 버튼 클릭 시 로그인 모달 표시
jseo9732 Jan 22, 2024
2aadf8b
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
jseo9732 Jan 22, 2024
62eeeda
Merge pull request #222 from FinalDoubleTen/FE-95--feat/Share
jseo9732 Jan 22, 2024
0fb24e8
Refactor: 여정 편집 상태 판단 수정
jseo9732 Jan 22, 2024
e1a54e6
Merge pull request #224 from FinalDoubleTen/FE-95--feat/Share
jseo9732 Jan 22, 2024
5e35835
Fix: input 밖으로 clear버튼 튀어나가는 에러 수정
joanShim Jan 22, 2024
f4391d2
Fix: 비용 수정 모달 input width 재설정
suehub Jan 22, 2024
a33c163
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
suehub Jan 22, 2024
1071cf2
Design: Tab 리스트 x-scroll 추가
suehub Jan 22, 2024
1c2ec94
Refactor: 여정 수정 버그 해결
suehub Jan 22, 2024
1646993
feat: 공유중멤버 타입 추가
NohWookJin Jan 22, 2024
ffaf305
style: 디자인 변경
NohWookJin Jan 22, 2024
f98693b
refactor: 당일치기 0박 1일 삭제
NohWookJin Jan 22, 2024
3c68fe6
refactor: 당일치기 0박 1일 삭제
NohWookJin Jan 22, 2024
0210a73
refactor: 주소 시군구까지만 나오도록 변경
NohWookJin Jan 22, 2024
769ecf0
style: MapIcon size 변경
NohWookJin Jan 22, 2024
982f635
refactor: unused 삭제
NohWookJin Jan 22, 2024
0f82187
Design: 메인페이지 디자인 QA 반영
suehub Jan 22, 2024
6708940
Merge pull request #225 from FinalDoubleTen/TripsQA/Budget
suehub Jan 22, 2024
51c5234
Merge pull request #226 from FinalDoubleTen/FE-83--feat/myTrip
suehub Jan 22, 2024
8bce534
Fix: 배경 제거, 화면 높이 수정
joanShim Jan 22, 2024
094f473
Delete: 테스트페이지 삭제
joanShim Jan 22, 2024
e6f71f8
Design: 여정 나가기 텍스트 변경
suehub Jan 22, 2024
1f1bb71
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
suehub Jan 22, 2024
08497ac
Merge pull request #228 from FinalDoubleTen/FE-69--feat/create/whereWhen
suehub Jan 22, 2024
c9b408f
Merge pull request #229 from FinalDoubleTen/TripsQA/Budget
suehub Jan 22, 2024
d11dacd
Feat: 일정 추가하기 구현
LeHiHo Jan 22, 2024
85fe0b5
Fix: 스와이퍼 왼쪽정렬
LeHiHo Jan 22, 2024
09cdfce
Merge pull request #230 from FinalDoubleTen/FE-94--feat/Trips/DragAnd…
LeHiHo Jan 22, 2024
ec90343
Fix: 댓글 삭제 확인 alert
seungjun222 Jan 22, 2024
5a188aa
Fix: 화면 높이 수정
joanShim Jan 22, 2024
7de0a1c
Chore: msw관련 코드 제거
LeHiHo Jan 22, 2024
be40bf3
Merge pull request #232 from FinalDoubleTen/FE-69--feat/create/whereWhen
suehub Jan 23, 2024
8782d15
Fix: 별점 필수 입력
seungjun222 Jan 23, 2024
e3c46fa
Design: 바텀 시트 넓이 수정
jseo9732 Jan 23, 2024
953e92b
Refactor: 여행 취향 수정 후 경로 변경
jseo9732 Jan 23, 2024
81648e8
Fix: 바텀시트 반응형 적용(양옆짤림 해결)
LeHiHo Jan 23, 2024
cb9d1a0
Design: 여정 편집 모달 width 수정
suehub Jan 23, 2024
60570e7
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
suehub Jan 23, 2024
52a17bf
Fix: 디자인 수정
seungjun222 Jan 23, 2024
42bc3b8
Merge pull request #234 from FinalDoubleTen/FE-95--feat/Share
suehub Jan 23, 2024
be6e753
Merge pull request #236 from FinalDoubleTen/TripsQA/Budget
suehub Jan 23, 2024
21775c6
Fix: 버튼 크기 수정, 여정상세 가로스크롤 수정
LeHiHo Jan 23, 2024
86f7e19
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
LeHiHo Jan 23, 2024
4077270
Refactor: 유저 정보 조회 위치 수정
jseo9732 Jan 23, 2024
1b3f105
Merge pull request #238 from FinalDoubleTen/FE-95--feat/Share
jseo9732 Jan 23, 2024
d5de300
Design: 여정 수정 페이지 QA 반영
suehub Jan 23, 2024
b19b245
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
suehub Jan 23, 2024
2d9ffff
Merge pull request #240 from FinalDoubleTen/TripsQA/Budget
suehub Jan 23, 2024
adca5c6
Fix: 안쓰는 속성 삭제
seungjun222 Jan 23, 2024
b8a8616
Merge pull request #241 from FinalDoubleTen/FE-101--feat/DesignQA/1st
seungjun222 Jan 23, 2024
06d1aa1
Design: 여행 아이템 input width 수정
suehub Jan 23, 2024
210b853
Merge pull request #242 from FinalDoubleTen/FE-100--feat/DesignQA
suehub Jan 23, 2024
3cccc6d
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
suehub Jan 23, 2024
5fa5cb7
Merge pull request #243 from FinalDoubleTen/TripsQA/Budget
suehub Jan 23, 2024
696ec0b
Design: 버튼 높이 수정
joanShim Jan 23, 2024
3e9ec46
Fix: 수정페이지 인풋 클리어버튼 수정
joanShim Jan 23, 2024
13979d1
Fix: 버튼 높이 변경
seungjun222 Jan 23, 2024
7cccbb7
Merge pull request #245 from FinalDoubleTen/FE-101--feat/DesignQA/1st
seungjun222 Jan 23, 2024
891905d
Merge pull request #244 from FinalDoubleTen/QA/minorFix
suehub Jan 23, 2024
5f1130d
Merge pull request #246 from FinalDoubleTen/FE-100--feat/DesignQA
suehub Jan 23, 2024
b638a60
Fix: 슬라이더 크기고정
LeHiHo Jan 23, 2024
c5b93a4
feat: 커서공유 테스트
LeHiHo Jan 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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^18.2.0",
"react-hook-form": "^7.49.2",
"react-icons": "^5.0.1",
"react-infinite-scroller": "^1.2.6",
"react-kakao-maps-sdk": "^1.1.24",
"react-modal": "^3.16.1",
Expand Down
11 changes: 11 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

338 changes: 0 additions & 338 deletions public/mockServiceWorker.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/@types/member.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface MemberInfo {
// | 'TEENAGER'
// | 'TWENTIES'
// | 'THIRTIES'
// | 'FOURTIES'
// | 'FORTIES'
// | 'ABOVE_FIFTIES'
// | 'DEFATULT'
genderType: string | null;
Expand Down
Loading
Loading