-
Notifications
You must be signed in to change notification settings - Fork 2
feat: improve home, setting, profile and error handling #15
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
QwertyMD
wants to merge
2
commits into
main
Choose a base branch
from
feat/improve
base: main
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
2 commits
Select commit
Hold shift + click to select a range
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
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
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 |
|---|---|---|
| @@ -1,12 +1,14 @@ | ||
| import { TouchableOpacity, Text, View } from "react-native"; | ||
| import { TouchableOpacity, Text, View, ActivityIndicator } from "react-native"; | ||
| import Ionicons from "@expo/vector-icons/Ionicons"; | ||
| import {ProfileDisplayProps} from "@/lib/types/profile" | ||
| import { ProfileDisplayProps } from "@/lib/types/profile"; | ||
| import { useProfile } from "@/lib/api/profile"; | ||
|
|
||
| export function ProfileDisplay({ onEditPress }: ProfileDisplayProps) { | ||
| const { data: profile } = useProfile(); | ||
| const { data: profile, isLoading, isError } = useProfile(); | ||
|
|
||
| if (!profile) { | ||
| if (isLoading) return <ActivityIndicator />; | ||
|
|
||
| if (isError || !profile) { | ||
| return null; | ||
| } | ||
|
Comment on lines
+9
to
13
|
||
|
|
||
|
|
||
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,44 @@ | ||
| import { RoutineCard } from "@/components/routine-card"; | ||
| import { Text, View } from "react-native"; | ||
| import type { RoutineContentProps } from "@/lib/types/routine"; | ||
|
|
||
| export function RoutineContent({ | ||
| isLoading, | ||
| routineData, | ||
| todayRoutine, | ||
| }: RoutineContentProps) { | ||
| if (isLoading || !routineData) return null; | ||
|
|
||
| const isWeekEmpty = routineData.week.every((day) => day.slots.length === 0); | ||
|
|
||
| if (isWeekEmpty) { | ||
| return ( | ||
| <View className="px-4 py-20"> | ||
| <Text className="text-center text-muted-foreground text-lg"> | ||
| No classes scheduled this week | ||
| </Text> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
| if (!todayRoutine?.slots.length) { | ||
| return ( | ||
| <View className="px-4 py-20"> | ||
| <Text className="text-center text-muted-foreground text-lg"> | ||
| No classes scheduled for this day | ||
| </Text> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| {todayRoutine.slots.map((slot) => ( | ||
| <RoutineCard | ||
| key={`${slot.moduleCode}-${slot.startTime}-${slot.classType}`} | ||
| slot={slot} | ||
| /> | ||
| ))} | ||
| </> | ||
| ); | ||
| } |
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,72 @@ | ||
| import { View, Text, TouchableOpacity } from "react-native"; | ||
| import Ionicons from "@expo/vector-icons/Ionicons"; | ||
| import { useColorScheme } from "@/lib/use-color-scheme"; | ||
| import type { SettingItemProps } from "@/lib/types/setting"; | ||
|
|
||
| export function SettingItem({ | ||
| icon, | ||
| label, | ||
| value, | ||
| onPress, | ||
| showChevron = true, | ||
| isDestructive = false, | ||
| rightElement, | ||
| isLast = false, | ||
| isDark, | ||
| }: SettingItemProps) { | ||
|
Comment on lines
+14
to
+16
|
||
| const { isDarkColorScheme } = useColorScheme(); | ||
| const effectiveDark = isDark ?? isDarkColorScheme; | ||
|
|
||
| return ( | ||
| <View> | ||
| <TouchableOpacity | ||
| onPress={onPress} | ||
| disabled={!onPress} | ||
| className={`flex-row items-center px-5 py-4 gap-4 ${ | ||
| onPress ? "active:bg-accent/50" : "" | ||
| }`} | ||
| > | ||
| <View | ||
| className={`w-9 h-9 rounded-full items-center justify-center ${ | ||
| isDestructive | ||
| ? "bg-destructive/15" | ||
| : effectiveDark | ||
| ? "bg-primary/20" | ||
| : "bg-primary/10" | ||
| }`} | ||
| > | ||
| <Ionicons | ||
| name={icon} | ||
| size={20} | ||
| color={ | ||
| isDestructive ? "#ef4444" : effectiveDark ? "#60a5fa" : "#2563eb" | ||
| } | ||
| /> | ||
| </View> | ||
| <View className="flex-1"> | ||
| <Text | ||
| className={`text-base font-semibold ${ | ||
| isDestructive ? "text-destructive" : "text-foreground" | ||
| }`} | ||
| > | ||
| {label} | ||
| </Text> | ||
| </View> | ||
| {value && ( | ||
| <Text className="text-muted-foreground text-sm mr-3 font-medium"> | ||
| {value} | ||
| </Text> | ||
| )} | ||
| {rightElement} | ||
| {showChevron && !rightElement && ( | ||
| <Ionicons | ||
| name="chevron-forward" | ||
| size={18} | ||
| color={effectiveDark ? "#9ca3af" : "#6b7280"} | ||
| /> | ||
| )} | ||
| </TouchableOpacity> | ||
| {!isLast && <View className="mx-5 h-[0.5px] bg-border" />} | ||
| </View> | ||
| ); | ||
| } | ||
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
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.
Changing
extra.eas.projectIdandownerwill repoint EAS builds/updates to a different Expo project/account. This isn’t mentioned in the PR description and is likely to break CI/CD or OTA updates for existing users. If this wasn’t intentional, revert these fields; if it was, please document why and ensureeas.json/deployment docs are updated accordingly.