diff --git a/apps/expo/app/(tabs).tsx b/apps/expo/app/(tabs).tsx new file mode 100644 index 0000000..4f21c6a --- /dev/null +++ b/apps/expo/app/(tabs).tsx @@ -0,0 +1,61 @@ +import { Provider } from 'app/provider' +import { StatusBar } from 'expo-status-bar' +import { Tabs } from 'expo-router' +import { useDripsyTheme } from 'dripsy' +import { Ionicons } from '@expo/vector-icons' + +function MyTabs() { + const { colors } = useDripsyTheme().theme + return ( + + + ) + }, + }} + /> + + ) + }, + }} + /> + + ) +} + +export default function Root() { + return ( + + + + + ) +} diff --git a/apps/expo/app/(root)/index.tsx b/apps/expo/app/(tabs)/index.tsx similarity index 100% rename from apps/expo/app/(root)/index.tsx rename to apps/expo/app/(tabs)/index.tsx diff --git a/apps/expo/app/(root).tsx b/apps/expo/app/(tabs)/users.tsx similarity index 67% rename from apps/expo/app/(root).tsx rename to apps/expo/app/(tabs)/users.tsx index 0cfcdda..bfff9bd 100644 --- a/apps/expo/app/(root).tsx +++ b/apps/expo/app/(tabs)/users.tsx @@ -1,10 +1,7 @@ import { NativeStack as Stack } from 'expo-router' -import { Provider } from 'app/provider' - import { useDripsyTheme } from 'dripsy' -import { StatusBar } from 'expo-status-bar' -function MyStack() { +export default function MyStack() { const { colors } = useDripsyTheme().theme return ( ) } - -export default function Root() { - return ( - - - - - ) -} diff --git a/apps/expo/app/(root)/users/[id].tsx b/apps/expo/app/(tabs)/users/[id].tsx similarity index 100% rename from apps/expo/app/(root)/users/[id].tsx rename to apps/expo/app/(tabs)/users/[id].tsx diff --git a/apps/expo/app/(tabs)/users/index.tsx b/apps/expo/app/(tabs)/users/index.tsx new file mode 100644 index 0000000..cf197d2 --- /dev/null +++ b/apps/expo/app/(tabs)/users/index.tsx @@ -0,0 +1 @@ +export { default } from 'app/features/user/list-screen' diff --git a/apps/next/pages/users/index.tsx b/apps/next/pages/users/index.tsx new file mode 100644 index 0000000..cf197d2 --- /dev/null +++ b/apps/next/pages/users/index.tsx @@ -0,0 +1 @@ +export { default } from 'app/features/user/list-screen' diff --git a/packages/app/features/home/screen.tsx b/packages/app/features/home/screen.tsx index e5791b8..c18a623 100644 --- a/packages/app/features/home/screen.tsx +++ b/packages/app/features/home/screen.tsx @@ -11,7 +11,7 @@ export function HomeScreen() { alignItems: 'center', }} > - + + + {users.map((user) => { + return ( + + + + + + + + {user.id} + + + + + + ) + })} + + + ) +} diff --git a/packages/app/provider/dripsy.tsx b/packages/app/provider/dripsy.tsx index 73d5531..ea027cf 100644 --- a/packages/app/provider/dripsy.tsx +++ b/packages/app/provider/dripsy.tsx @@ -5,7 +5,7 @@ const theme = makeTheme({ colors: { $background: '#161618', $background2: 'rgb(28, 28, 31)', - + $background3: '#28282C', $purple3: '#32275F', $text: '#ffffff', },