-
Notifications
You must be signed in to change notification settings - Fork 0
feat : PLI-6 메인페이지 (+일정케이스) #77
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
Open
PJW03
wants to merge
6
commits into
develop
Choose a base branch
from
feature-PLI-6
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e3b99f2
feat : PLI-6 메인페이지 (+일정케이스)
bdd53aa
Merge branch 'develop' into feature-PLI-6
cd2790c
Merge branch 'develop' into feature-PLI-6
f3b61fa
fix : PLI-6 메인페이지 피드백 수정
0b3529a
Merge branch 'develop' into feature-PLI-6
175134f
fix : PLI-6 메인페이지 폰트 수정
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import React from 'react'; | ||
| import { View, Text } from 'react-native'; | ||
|
|
||
| export interface MainRecChipProps { | ||
| label: string; | ||
| className?: string; | ||
| } | ||
|
|
||
| export const MainRecChip: React.FC<MainRecChipProps> = ({ label, className }) => { | ||
| return ( | ||
| <View className={`px-3 py-[2px] rounded-full bg-chip items-center justify-center ${className ?? ''}`}> | ||
| <Text className="text-p text-black">{label}</Text> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| export default MainRecChip; |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import React from 'react'; | ||
| import { MainTripCardEmpty } from './MainTripCardEmpty'; | ||
| import { MainTripCardPlanned } from './MainTripCardPlanned'; | ||
| import { MainTripCardInProgress } from './MainTripCardInProgress'; | ||
|
|
||
| interface MainTripCardProps { | ||
| hasPlannedTrip: boolean; | ||
| isInTripScheduleView: boolean; | ||
| onAddTrip: () => void; | ||
| onOpenTripSchedule: () => void; | ||
| onViewAllSchedule: () => void; | ||
| } | ||
|
|
||
| const MainTripCard: React.FC<MainTripCardProps> = ({ | ||
| hasPlannedTrip, | ||
| isInTripScheduleView, | ||
| onAddTrip, | ||
| onOpenTripSchedule, | ||
| onViewAllSchedule, | ||
| }) => { | ||
| if (!hasPlannedTrip) { | ||
| return <MainTripCardEmpty onAddTrip={onAddTrip} />; | ||
| } | ||
|
|
||
| if (!isInTripScheduleView) { | ||
| return <MainTripCardPlanned onOpenTripSchedule={onOpenTripSchedule} />; | ||
| } | ||
|
|
||
| return <MainTripCardInProgress onViewAllSchedule={onViewAllSchedule} />; | ||
| }; | ||
|
|
||
| export default MainTripCard; | ||
| export { MainTripCard }; |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
현재 ContentContainer 내부의 쉐도우는 borderRadius가 8로 잡혀있어 화면 구현 상으로는 알림 밖 컨테이너의 borderRadius 8픽셀로 확인이 됩니다 12픽셀로 보이도록 수정해주세요