diff --git a/mobile/App.tsx b/mobile/App.tsx index 1f2524956405f01b2efd04ba0567f9d36f9358cc..d41dfd91956a7c05de7a2137cc36295afe299231 100644 --- a/mobile/App.tsx +++ b/mobile/App.tsx @@ -1,7 +1,7 @@ import { StatusBar } from 'expo-status-bar'; import { StyleSheet, Text, View } from 'react-native'; import { StateSelectionPage } from './src/screens/state_selection/state_selection_page'; -import { DataContextProvider } from './src/contexts/data_context'; +import { DataContextProvider } from './src/common/contexts/data_context'; export default function App() { return ( diff --git a/mobile/app/(tabs)/_layout.tsx b/mobile/app/(tabs)/_layout.tsx index 8a503eb8ab3183d346708fc8f5939cead5aa84a7..1081d4af5f1717d706e826a1913879caa4d79966 100644 --- a/mobile/app/(tabs)/_layout.tsx +++ b/mobile/app/(tabs)/_layout.tsx @@ -1,8 +1,8 @@ import { Redirect, Tabs } from "expo-router"; import { Ionicons } from "@expo/vector-icons"; import { FontAwesome5 } from "@expo/vector-icons"; -import { LIGTHT_THEME } from "../../src/constants/theme"; -import { useAuth } from "../../src/contexts/auth_context"; +import { LIGTHT_THEME } from "../../src/common/constants/theme"; +import { useAuth } from "../../src/auth/contexts/auth_context"; export default function Layout() { const { user } = useAuth(); diff --git a/mobile/app/(tabs)/account.tsx b/mobile/app/(tabs)/account.tsx index 64a31b2656e51ef36c81e9b7ed4d375ac42bb46c..96163b6ccdcbf28044f532227af3257a1b07c582 100644 --- a/mobile/app/(tabs)/account.tsx +++ b/mobile/app/(tabs)/account.tsx @@ -1,4 +1,4 @@ -import { AccountPage } from "../../src/screens/account/account_page"; +import { AccountPage } from "../../src/account/screens/account_page"; export default function AccountScreen() { return ( diff --git a/mobile/app/(tabs)/index.tsx b/mobile/app/(tabs)/index.tsx index 9c27cc41088bc8b8aa55884c331e0e26f3b1ac82..e29e42d612d09f3081537068a83881c219c108a8 100644 --- a/mobile/app/(tabs)/index.tsx +++ b/mobile/app/(tabs)/index.tsx @@ -1,4 +1,4 @@ -import { DataContextProvider } from '../../src/contexts/data_context'; +import { DataContextProvider } from '../../src/common/contexts/data_context'; import { StateSelectionPage } from '../../src/screens/state_selection/state_selection_page'; export default function Main () { return ( diff --git a/mobile/app/_layout.tsx b/mobile/app/_layout.tsx index aaff8dba5e6c2b6451ed525b4ee0440fd6e1b145..0024ab5ecc9a36ba126278e5518970346cc1f89c 100644 --- a/mobile/app/_layout.tsx +++ b/mobile/app/_layout.tsx @@ -1,10 +1,10 @@ import { Stack, Tabs } from "expo-router"; -import { DataContextProvider } from "../src/contexts/data_context"; -import { LIGTHT_THEME } from "../src/constants/theme"; -import { AuthContextProvider, useAuth } from "../src/contexts/auth_context"; +import { DataContextProvider } from "../src/common/contexts/data_context"; +import { LIGTHT_THEME } from "../src/common/constants/theme"; +import { AuthContextProvider, useAuth } from "../src/auth/contexts/auth_context"; import { ActivityIndicator } from "react-native"; import { GestureHandlerRootView } from "react-native-gesture-handler"; -import { AudioContextProvider } from "../src/contexts/audio_context"; +import { AudioContextProvider } from "../src/common/contexts/audio_context"; export default function Root() { return ( @@ -82,6 +82,10 @@ const MainLayout = () => { headerShown: false, statusBarColor: LIGTHT_THEME.color.primary, }}/> + ); }; diff --git a/mobile/app/routes/generate_route.tsx b/mobile/app/routes/generate_route.tsx new file mode 100644 index 0000000000000000000000000000000000000000..468a48eb51ed6eebc88159ac12f7add9c16eca94 --- /dev/null +++ b/mobile/app/routes/generate_route.tsx @@ -0,0 +1,11 @@ +import { useLocalSearchParams } from "expo-router"; +import { Text } from "react-native"; +import { RoutePreviewPage } from "../../src/route/screens/route_preview"; + +export default function GenerateRoute() { + const { townId } = useLocalSearchParams<{ townId: string }>(); + if (!townId) { + return Invalid town id; + } + return ; +} \ No newline at end of file diff --git a/mobile/app/sign_up.tsx b/mobile/app/sign_up.tsx index 26e0aa2bf8e6c42a2d7681850d3278f4f074dcb6..c6f7ba00592207537c0c451f83140ee4536735e2 100644 --- a/mobile/app/sign_up.tsx +++ b/mobile/app/sign_up.tsx @@ -1,64 +1,14 @@ import { View, StyleSheet, Image, Text, Button } from "react-native"; -import { LIGTHT_THEME } from "../src/constants/theme"; +import { LIGTHT_THEME } from "../src/common/constants/theme"; import { SignUpForm } from "../src/auth/components/sign_up_form"; import { router } from "expo-router"; +import { SignUpPage } from "../src/auth/pages/sign_up_page"; const loginImage = require("../assets/login-image.jpg"); const SignUp = () => { return ( - - - - - - -