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.

Sign up for GitHub

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

Jump to bottom

Main branch update from Dev branch #812

Merged
merged 48 commits into from
Aug 20, 2024
Merged

Main branch update from Dev branch #812

merged 48 commits into from
Aug 20, 2024

Conversation

kmc7468
Copy link
Member

@kmc7468 kmc7468 commented Aug 20, 2024

Summary

Main branch update from Dev branch

ybmin and others added 30 commits March 13, 2024 22:50
@ybmin
Add: SideMenu taxiFare section
b026b1e
@ybmin
Fix: roomInfo time
47fd84a
@happycastle114
Add: Firebase Configs
648dd65
@happycastle114
Add Permissions
c5ae406
@ybmin
Fix: object id & dev 버전에서 알림창을 생성하지 않음
47abda1
@ybmin
Merge branch 'dev' into #761-예상-택시-비용-보여주기-컴포넌트
5d696c2
@jinhyeonkwon
Add: 46 random candidate of default room name
946fa03
feat: chatMsg should contain at least one character except beginning …
68709cc 
…whitespaces
fix: css add whitespace break spaces to chat box
161b9aa
@jinhyeonkwon
Add : showing chatting msg length using react-circular-progressbar
7af5829
@jinhyeonkwon
Add : Pass BodyText from index.tsx to maxChatMsgLength to implement t…
29edf18 
…he feature that ban input exceeding max length
@jinhyeonkwon
Add: prohibit chat input exceeding max character number
74c9ee3
@happycastle114
Add: Firebase 관련 작업
813e2ec
@jinhyeonkwon
Fix: bug that maximum length violated when paste long string
867f92a
@jinhyeonkwon
Fix: Remove import of unused package
642d701
@ybmin
Add: addroom taxifare
cda57e3
@jinhyeonkwon
Merge branch 'dev' into #773-채팅-140자-넘으면-입력-막기-글자-수-circular-progress…
13e79d5 
…-bar로-표시
@happycastle114
Add: I hate native
e968ffd
@ybmin
Add: addroom, roomselection taxi fare component update
deb99c4
@ybmin
Merge branch 'dev' into #761-예상-택시-비용-보여주기-컴포넌트
66b16c1
@ybmin
Fix: remove unneccessary import
a2c5353
@ybmin
Merge branch '#761-예상-택시-비용-보여주기-컴포넌트' of https://github.com/sparcs-k…
c41df16 
…aist/taxi-front into #761-예상-택시-비용-보여주기-컴포넌트
@ybmin
Merge branch 'dev' into #761-예상-택시-비용-보여주기-컴포넌트
373ee6b
@ybmin
Style: floor taxi fare value
08c381f
@jinhyeonkwon
Fix: BodyText.tsx - chat length testing using regexp
251fce6
@jinhyeonkwon
Add : Prevent entering new room when paying is not complete
746410d
@jinhyeonkwon
Add : Prevent room creation when paying is not complete, and fix some…
98db18a 
… logic for disabling buttons
@jinhyeonkwon
Refactor: Using useMemo
2325074
@jinhyeonkwon
Refactor: 2024.07.07. Version
20526aa
@jinhyeonkwon
Refactor: used useMemo to notPaid
ec12eca
jinhyeonkwon and others added 18 commits July 9, 2024 21:55
@jinhyeonkwon
Merge branch 'dev' into #784-미정산-방이-있는-경우-추가-방-참여-제한
0e64ffa
@jinhyeonkwon
Merge pull request #787 from sparcs-kaist/#784-미정산-방이-있는-경우-추가-방-참여-제한
e3a20b1 
#784 송금하지 않은 방이 있는 경우 추가 방 참여 제한
@happycastle114
Add: Introduce to Tamagui
c0e21e8
@happycastle114
Add: Add pmpn tamagui
277400b
@jinhyeonkwon
fix: add flexGrow and flexShrink to room name and tag
e0db1dd
@jinhyeonkwon
Merge pull request #799 from sparcs-kaist/798-bug-방-이름이-길면-인원-수-tag가-…
b55acd7 
…찌그러짐
@jinhyeonkwon
Merge pull request #777 from sparcs-kaist/#773-채팅-140자-넘으면-입력-막기-글자-수…
da58947 
…-circular-progress-bar로-표시
@jinhyeonkwon
Merge pull request #772 from sparcs-kaist/#771-랜덤-생성-방-이름-추가
917037d 
랜덤 생성 방 이름 추가
@ybmin
Merge branch 'dev' into #761-예상-택시-비용-보여주기-컴포넌트
bc4dfa0
@ybmin
Merge pull request #762 from sparcs-kaist/#761-예상-택시-비용-보여주기-컴포넌트
5988c65 
예상 택시 비용 보여주기
@jinhyeonkwon
fix: adjust padding for room name
0011390
@ybmin
Fix: doesn't show up when fare is 0
7b4e6f0
@ybmin
Fix: taxiFare update when changed roomInfo._id
b31cccb
@happycastle114
Merge pull request #766 from sparcs-kaist/764-firebase-cloud-message
28656c1 
#764 firebase cloud message & Introduce to Tamagui
@jinhyeonkwon
fix: a bug in which the circular bar is out of sync after sending a m…
e816809 
…essage
@jinhyeonkwon
Merge pull request #810 from sparcs-kaist/809-bug-채팅에서-메시지-전송-시-글자-수-…
bd5bd9f 
…바가-초기화되지-않음
@ybmin
Merge pull request #804 from sparcs-kaist/#803-taxi-fare-관련-컴포넌트-dev-…
141ef87 
…및-서비스-연결이-되지-않았을-때-보이지-않도록-수정

taxi fare 관련 컴포넌트 백엔드 미동작시 숨김
@jinhyeonkwon
Merge pull request #802 from sparcs-kaist/801-bug-방-이름이-너무-길면-방-모달에서-…
a6e8429 
…방-이름이-x-버튼에-겹침

[Bug] 방 이름이 너무 길면 방 이름이 X 버튼에 겹침
@kmc7468 kmc7468 self-assigned this Aug 20, 2024
@netlify Netlify
Copy link

netlify bot commented Aug 20, 2024 •
edited
Loading

✅ Deploy Preview for taxi-dev-preview ready!

Name Link
🔨 Latest commit a6e8429
🔍 Latest deploy log https://app.netlify.com/sites/taxi-dev-preview/deploys/66c4a801797cc20008dc2cd3
😎 Deploy Preview https://deploy-preview-812--taxi-dev-preview.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@kmc7468 kmc7468 merged commit f7e789e into main Aug 20, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kmc7468 kmc7468

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kmc7468 @ybmin @happycastle114 @jinhyeonkwon