-
Notifications
You must be signed in to change notification settings - Fork 0
Develop #1
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
Merged
Develop #1
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
02ad263
chore: update dependencies and add Tailwind CSS support
Ericokim 4739ea6
feat(ui): add authentication, tab navigation, and app assets
Ericokim 8c61369
feat(constants): add data, icons, images, theme, types, and utilities
Ericokim 62a34a1
feat(layout): add RootLayout component with stack navigation
Ericokim a8a5d42
feat(navigation): implement tab navigation and refine routing structure
Ericokim d93701f
Update app/onboarding.tsx
Ericokim 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
Empty file.
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,6 @@ | ||
| import { Stack } from "expo-router"; | ||
| import "@/global.css"; | ||
|
|
||
| export default function RootLayout() { | ||
| return <Stack screenOptions={{ headerShown: false }} />; | ||
| } | ||
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,18 @@ | ||
| import { Link } from "expo-router"; | ||
| import { Text, View } from "react-native"; | ||
|
|
||
| const SignIn = () => { | ||
| return ( | ||
| <View className="flex-1 items-center justify-center"> | ||
| <Text className="font-bold text-lg">SignIn</Text> | ||
| <Link | ||
| href="/(auth)/sign-up" | ||
| className="p-4 bg-primary rounded-lg mt-4 text-white" | ||
| > | ||
| Create Account | ||
| </Link> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| export default SignIn; |
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,18 @@ | ||
| import { Link } from "expo-router"; | ||
| import { Text, View } from "react-native"; | ||
|
|
||
| const SignUp = () => { | ||
| return ( | ||
| <View className="flex-1 items-center justify-center"> | ||
| <Text className="font-bold text-lg">SignUp</Text> | ||
| <Link | ||
| href="/(auth)/sign-in" | ||
| className="p-4 bg-primary rounded-lg mt-4 text-white" | ||
| > | ||
| Sign In | ||
| </Link> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| export default SignUp; |
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,66 @@ | ||
| import { tabs } from "@/constants/data"; | ||
| import { colors, components } from "@/constants/theme"; | ||
| import { clsx } from "clsx"; | ||
| import { Tabs } from "expo-router"; | ||
| import { Image, View } from "react-native"; | ||
| import { useSafeAreaInsets } from "react-native-safe-area-context"; | ||
|
|
||
| const tabBar = components.tabBar; | ||
|
|
||
| const TabIcon = ({ focused, icon }: TabIconProps) => { | ||
| return ( | ||
| <View className="tabs-icon"> | ||
| <View className={clsx("tabs-pill", focused && "tabs-active")}> | ||
| <Image source={icon} resizeMode="contain" className="tabs-glyph" /> | ||
| </View> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| /* This `TabLayout` component is creating a tab navigation layout using the `Tabs` component from Expo | ||
| Router. Here's a breakdown of what it's doing: */ | ||
| const TabLayout = () => { | ||
| const insets = useSafeAreaInsets(); | ||
|
|
||
| return ( | ||
| <Tabs | ||
| screenOptions={{ | ||
| headerShown: false, | ||
| tabBarShowLabel: false, | ||
| tabBarStyle: { | ||
| position: "absolute", | ||
| bottom: Math.max(insets.bottom, tabBar.horizontalInset), | ||
| height: tabBar.height, | ||
| marginHorizontal: tabBar.horizontalInset, | ||
| borderRadius: tabBar.radius, | ||
| backgroundColor: colors.primary, | ||
| borderTopWidth: 0, | ||
| elevation: 0, | ||
| }, | ||
| tabBarItemStyle: { | ||
| paddingVertical: tabBar.height / 2 - tabBar.iconFrame / 1.6, | ||
| }, | ||
| tabBarIconStyle: { | ||
| width: tabBar.iconFrame, | ||
| height: tabBar.iconFrame, | ||
| alignItems: "center", | ||
| }, | ||
| }} | ||
| > | ||
| {tabs.map((tab) => ( | ||
| <Tabs.Screen | ||
| key={tab.name} | ||
| name={tab.name} | ||
| options={{ | ||
| title: tab.title, | ||
| tabBarIcon: ({ focused }) => ( | ||
| <TabIcon focused={focused} icon={tab.icon} /> | ||
| ), | ||
| }} | ||
| /> | ||
| ))} | ||
| </Tabs> | ||
| ); | ||
| }; | ||
|
|
||
| export default TabLayout; |
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,52 @@ | ||||
| import "@/global.css"; | ||||
|
||||
| import "@/global.css"; |
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,16 @@ | ||
| import { styled } from "nativewind"; | ||
| import React from "react"; | ||
| import { Text } from "react-native"; | ||
| import { SafeAreaView as RNSafeAreaView } from "react-native-safe-area-context"; | ||
|
|
||
| const SafeAreaView = styled(RNSafeAreaView); | ||
|
|
||
| const Insights = () => { | ||
| return ( | ||
| <SafeAreaView className="flex-1 bg-background p-5"> | ||
| <Text>Insights</Text> | ||
| </SafeAreaView> | ||
| ); | ||
| }; | ||
|
|
||
| export default Insights; |
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,16 @@ | ||
| import { styled } from "nativewind"; | ||
| import React from "react"; | ||
| import { Text } from "react-native"; | ||
| import { SafeAreaView as RNSafeAreaView } from "react-native-safe-area-context"; | ||
|
|
||
| const SafeAreaView = styled(RNSafeAreaView); | ||
|
|
||
| const Settings = () => { | ||
| return ( | ||
| <SafeAreaView className="flex-1 bg-background p-5"> | ||
| <Text>Settings</Text> | ||
| </SafeAreaView> | ||
| ); | ||
| }; | ||
|
|
||
| export default Settings; |
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,16 @@ | ||
| import { styled } from "nativewind"; | ||
| import React from "react"; | ||
| import { Text } from "react-native"; | ||
| import { SafeAreaView as RNSafeAreaView } from "react-native-safe-area-context"; | ||
|
|
||
| const SafeAreaView = styled(RNSafeAreaView); | ||
|
|
||
| const Subscriptions = () => { | ||
| return ( | ||
| <SafeAreaView className="flex-1 bg-background p-5"> | ||
| <Text>Subscriptions</Text> | ||
| </SafeAreaView> | ||
| ); | ||
| }; | ||
|
|
||
| export default Subscriptions; |
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,5 +1,17 @@ | ||
| import { Stack } from "expo-router"; | ||
| import "@/global.css"; | ||
|
|
||
| export const unstable_settings = { | ||
| initialRouteName: "(tabs)", | ||
| }; | ||
|
|
||
| export default function RootLayout() { | ||
| return <Stack />; | ||
| return ( | ||
| <Stack screenOptions={{ headerShown: false }}> | ||
| <Stack.Screen name="(tabs)" /> | ||
| <Stack.Screen name="(auth)" /> | ||
| <Stack.Screen name="onboarding" /> | ||
| <Stack.Screen name="subscriptions/[id]" /> | ||
| </Stack> | ||
| ); | ||
| } |
This file was deleted.
Oops, something went wrong.
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,12 @@ | ||
| import React from "react"; | ||
| import { Text, View } from "react-native"; | ||
|
|
||
| const Onboarding = () => { | ||
| return ( | ||
| <View> | ||
| <Text>Onboarding</Text> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| export default Onboarding; |
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,15 @@ | ||
| import { Link, useLocalSearchParams } from "expo-router"; | ||
| import React from "react"; | ||
| import { Text, View } from "react-native"; | ||
|
|
||
| const SubscriptionsDetails = () => { | ||
| const { id } = useLocalSearchParams<{ id: string }>(); | ||
| return ( | ||
| <View> | ||
| <Text>Subscriptions Details: {id}</Text> | ||
| <Link href={"/"}>Go Back</Link> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| export default SubscriptionsDetails; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| { | ||
| "fill" : { | ||
| "automatic-gradient" : "extended-srgb:0.00000,0.47843,1.00000,1.00000" | ||
| }, | ||
| "groups" : [ | ||
| { | ||
| "layers" : [ | ||
| { | ||
| "image-name" : "expo-symbol 2.svg", | ||
| "name" : "expo-symbol 2", | ||
| "position" : { | ||
| "scale" : 1, | ||
| "translation-in-points" : [ | ||
| 1.1008400065293245e-05, | ||
| -16.046875 | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "image-name" : "grid.png", | ||
| "name" : "grid" | ||
| } | ||
| ], | ||
| "shadow" : { | ||
| "kind" : "neutral", | ||
| "opacity" : 0.5 | ||
| }, | ||
| "translucency" : { | ||
| "enabled" : true, | ||
| "value" : 0.5 | ||
| } | ||
| } | ||
| ], | ||
| "supported-platforms" : { | ||
| "circles" : [ | ||
| "watchOS" | ||
| ], | ||
| "squares" : "shared" | ||
| } | ||
| } |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
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.
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.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Diff not rendered.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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 @@ | ||
| export {}; |
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.
global.cssis already imported at the app root (app/_layout.tsx). Importing it again here is redundant and can cause duplicate style injection/processing. Consider removing this import and relying on the root layout import only.