[4/8] Fix navigation, Add env setting, Test axios #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
sjsjmine129
commented
Apr 8, 2024
sjsjmine129
commented
- 네비게이션 조금 수정
- 애니메이션이 있는 버튼 컴포넌트 추가
- 헤더 컴포넌트 추가
- env 환경변수 사용할 수 있도록 세팅
- axios 설치 및 Hello 테스트
There was a problem hiding this comment.
conflict가 나고 있습니다 ㅎㅎ
커밋기록을 보니
KAN-13에서 작업 -> PR -> merge
KAN-13에서 KAN-19 branch 생성 및 작업 -> PR
이렇게 하신 것으로 보이는데
KAN-13에서 작업마무리하시고나서는
main에서 branch를 만드시는걸 추천드립니다.
만약 리뷰전에 작업하려고 위 방법으로 진행하시는거라면 PR때 conflict 해결 해주시면 됩니다~
우선 이거 conflict해결하시고나서 머지해주세요!
그리고 나중에 찾아보기편하게 다음부터는 커밋명이랑 PR명에 지라 티켓명도 넣어주시면 좋을 것 같아요!
sinkyoungdeok
approved these changes
Apr 8, 2024
github-actions
bot
requested review from
jhpark223,
m1nse0kim,
newlysong and
sinkyoungdeok
|
다음 부터는 머지 후에 새 브랜치 파야겠네요. |
sjsjmine129
added a commit
that referenced
this pull request
May 18, 2024
* Fi/gitignore * Add/NavigationSetting_1 * Add/navigation_2 * Add/react-native-svg * Add/Navigator_done * Add/Header * Add/env * Fix * Add/axios&Test
sjsjmine129
added a commit
that referenced
this pull request
May 19, 2024
* Initial commit * feat: auto assign (#1) * Add/FirstSetting (#2) * [4/7] Add/ screen folders and navigation controls (#3) * Fi/gitignore * Add/NavigationSetting_1 * Add/navigation_2 * Add/react-native-svg * Add/Navigator_done * [4/8] Fix navigation, Add env setting, Test axios (#4) * Fi/gitignore * Add/NavigationSetting_1 * Add/navigation_2 * Add/react-native-svg * Add/Navigator_done * Add/Header * Add/env * Fix * Add/axios&Test * [4/11] Kan 20 회원가입/로그인 화면 & 로직 구현 (#5) * Add/loginScreen * Add/signup screen * Feat/loginAPI * feat/sutoLogin * Feat/Context -> 토큰을 전역변수로 사용하도록 * Fix/disablebutton * Fix * [4/12] Kan 22 Connect API (login, signup, autoLogin) (#6) * Feat/APIconnect * Feat/Auto Login with token * Add/annotation * [4/23 Kan 23] 홈 화면 UI 구현 (#7) * Fix/ splash Font * Add/ image * Fix * Add/Slider * Add/ 오늘의 픽 창 UI * Add/ 카테고리 * Fix/ compo set * Add/ kingo Pass UI * [4/27 Kan 27] 맵 스크린 UI 구현 (#8) * [4/30] Add/ list screen UI (#9) * Add/ list screen UI * Add/category select in list * Add/ category Fillter in map * [5/10 Kan 43] 검색, 상세페이지들 페이지 구현 (#10) * Add/SearchScreen * Add/Store Detail, ReviewWrite Screen * Add/userDataChangeScreen * Fix/ ui Bug * Fix/ ui Bug * Add/passwordCheck * Add/passwordCheck * Fix/env * Fix/env * Fix * Fix * Add/email and validation * Add/email and validation * Add/ profileSetScreen * Add/ profileSetScreen * Fix * Fix * Add/ image picker * Add/ image picker * Fix * Fix * Add/signup * Add/signup * Add/resetPassword * Add/resetPassword * Fix/env * Fix/env * Delete/env,url data * Fix/test * Fix/ image * Add/ImageModal --------- Co-authored-by: Bob Sin <[email protected]> Co-authored-by: Bob Sin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.