Commit acbb85e1 authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main' 

CompilaciónMain

See merge request !69
parents 4eea0c5a bc4c1006

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/common/contexts/data_context';

import { StateSelectionPage } from './src/place/screens/state_selection_page';



export default function App() {

  return (

mobile/app/(tabs)/_layout.tsx

+1 −1
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 { LIGHT_THEME } from "../../src/common/constants/theme";

import { LIGHT_THEME } from "../../src/common/const/theme";

import { useAuth } from "../../src/auth/contexts/auth_context";

import { useTranslation } from "react-i18next";

import { useSetUp } from "../../src/common/contexts/set_up_context";

mobile/app/_layout.tsx

+1 −1
Original line number Diff line number Diff line 
import { Stack, Tabs } from "expo-router";

import { DataContextProvider } from "../src/common/contexts/data_context";

import { LIGHT_THEME } from "../src/common/constants/theme";

import { LIGHT_THEME } from "../src/common/const/theme";

import {

  AuthContextProvider,

  useAuth,

mobile/app/profile/_layout.tsx

+1 −1
Original line number Diff line number Diff line 
import { Stack } from "expo-router";

import { LIGHT_THEME } from "../../src/common/constants/theme";

import { LIGHT_THEME } from "../../src/common/const/theme";



export default function Layout() {

    return (

mobile/app/state/[stateId]/town/_layout.tsx

+1 −1
Original line number Diff line number Diff line 
import { Stack } from "expo-router";

import { LIGHT_THEME } from "../../../../src/common/constants/theme";

import { LIGHT_THEME } from "../../../../src/common/const/theme";



export default function Layout() {

    return (