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

Merge branch 'main' into 'main'

Se completó el reseteo de contraseña

See merge request !66
parents af22303b 84c78b4f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
import { DataContextProvider } from '../../src/common/contexts/data_context';
import { StateSelectionPage } from '../../src/screens/state_selection/state_selection_page';
import { StateSelectionPage } from "../../src/place/screens/state_selection_page";

export default function Main () {
    return (
        <StateSelectionPage />
+1 −2
Original line number Diff line number Diff line
import { View } from "react-native";
import { TravelHistoryPage } from "../../src/screens/travel_history/travel_history_page";
import { TravelHistoryPage } from "../../src/travel/screens/travel_history_page";

export default function TravelHistoryScreen() {
  return (
+1 −1
Original line number Diff line number Diff line
import { EditProfilePage } from "../../src/screens/edit_profile/edit_profile_page";
import { EditProfilePage } from "../../src/profile/screens/edit_profile_page";

export default function EditProfileScreen() {
    return (
+0 −1
Original line number Diff line number Diff line
import { View } from "react-native";
import { ChangeInterestsScreen } from "../../src/profile/screens/change_interests_screen";

export default function Interests() {
+0 −1
Original line number Diff line number Diff line
import { View } from "react-native";
import { FirstTimeComfigScreen } from "../../src/profile/screens/first_time_config_screen";

export default function SetUp() {
Loading