[#3] Feature/home #23
Merged
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
images from freepik.com
hee-suh
approved these changes
Mar 6, 2022
| @@ -57,9 +58,18 @@ export default function App() { | |||
| name="Home" | |||
| component={HomeScreen} | |||
| options={{ | |||
| headerStyle: { backgroundColor: '#333D79' }, | |||
There was a problem hiding this comment.
import { theme } from './core/theme'; 해서 theme.colors.primary 로 사용 부탁~!
There was a problem hiding this comment.
string type만 가능하다고 해서 부득이하게 저렇게 사용했습니다 ^ㅅㅠ
There was a problem hiding this comment.
잘 작동해요! ForgotPasswordScreen 없애는 김에 수정해서 올릴게요~!
| headerRight: () => <LogoutButton/> | ||
| headerRight: () => <LogoutButton/>, | ||
|
|
||
| headerTitle: (props) => ( // App Logo |
react-native/types.ts
Outdated
| date: string, | ||
| notices: { | ||
| total_results: string[], | ||
| notice_body: { | ||
| id: number, | ||
| title: string, | ||
| summary: {id: number, content: string, highlight: boolean}[], | ||
| summary: {id: number; content: string; highlight: boolean}[], |
There was a problem hiding this comment.
여기에 있던 registered가 사라져버렸는데, 이전 commit에서 이미 registered 포함한 걸로 여러 파일들 수정해줘버려서 main pull 받고 type.ts 파일에 interface UserProfile 다시 추가해줘야할 것 같슴다!
| userId: 1, | ||
| username: "Suyeon", | ||
| gmail: "kaithape@gmail.com", | ||
| profileImageType: 1, |
| childId: 1, | ||
| childName: "Soo", | ||
| events: [{ | ||
| time: "10:00", |
There was a problem hiding this comment.
time이 없는 경우에는 어떻게 하나요?
구글 캘린더는 오전 8시를 기본 값으로 설정해버리는데 우리도 그렇게 할까??
There was a problem hiding this comment.
그것도 굿! 아니면 1교시 시작이 9시니까 9시로 해도 괜찮을듯!
| const [fontsLoaded, SetFontsLoaded] = useState<boolean>(false); | ||
| const [userProfile, setUserProfile] = useState<UserProfile>({userId: 0, username: "", gmail: "", profileImageType: 0, language: "", children: []}); | ||
| const [events, setEvents] = useState<{childId: number, childName: string, events: {time: string, content: string}[]}[]>(); | ||
| const [totalEventsCount, setTotalEventsCount] = useState<number>(4); |
| {events?.map(notice => | ||
| <TouchableHighlight style={[styles.childButton, { | ||
| backgroundColor: nowSelectedChildId === notice.childId ? theme.colors.primary : "#ffffff", | ||
| }]} onPress={() => handleNowSelectedChildId(notice.childId)}> |
There was a problem hiding this comment.
얘는 () => 이렇게 했을 때 잘 먹나여?? 언제 되고 언제 안되는 거지 😳
| )} | ||
| </View> | ||
| <View style={styles.todayNoticeWrapper}> | ||
| {events.filter(notice => notice.childId == nowSelectedChildId)[0].events.map(event => |
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.
메인 페이지 UI 전면 개선