Commit 3617e6d4 authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main' 

Actualización deel modulo de rutas

See merge request pueblosmagicosconia!27
parents c7b94c2a 7b9ccb51

mobile/App.tsx

+1 −1
Original line number Diff line number Diff line 
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 (

mobile/app/(tabs)/_layout.tsx

+2 −2
Original line number Diff line number Diff line 
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();

mobile/app/(tabs)/account.tsx

+1 −1
Original line number Diff line number Diff line 
import { AccountPage } from "../../src/screens/account/account_page";

import { AccountPage } from "../../src/account/screens/account_page";



export default function AccountScreen() {

    return (

mobile/app/(tabs)/index.tsx

+1 −1
Original line number Diff line number Diff line 
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 (

mobile/app/_layout.tsx

+8 −4
Original line number Diff line number Diff line 
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,

      }}/>

      <Stack.Screen name="routes/generate_route" options={{

        headerShown: false,

        statusBarColor: LIGTHT_THEME.color.primary,

      }}/>

    </Stack>

  );

};