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

Merge branch 'main' into 'main'

Se arregló el enrutamiento de la aplicación

See merge request !14
parents 8ee7813e 7fcd4463
Loading
Loading
Loading
Loading
+0 −19
Original line number Diff line number Diff line
import { useLocalSearchParams } from "expo-router";
import { View, Text } from "react-native";
import { ActivityDescriptionPage } from "../../../src/screens/activity_description/activity_description_page";

export default function ActivityScreen() {
    const { id, townId, activityId } = useLocalSearchParams<{ id: string, townId: string, activityId: string }>();

    if (!townId || !id || !activityId) {
        return (
            <View>
                <Text>Invalid activity id</Text>
            </View>
        );
    }
    
    return (
        <ActivityDescriptionPage activityId={+activityId} />
    );
}
 No newline at end of file

mobile/app/state/[id]/town.tsx

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line
import { useLocalSearchParams } from "expo-router";
import { View, Text } from "react-native";
import { TownActivitiesPage } from "../../../src/screens/town_activities/town_activities_page";

export default function TownScreen() {
    const { id, townId } = useLocalSearchParams<{ id: string, townId: string }>();
    console.log(id, townId);
    if (!townId || !id) {
        return (
            <View>
                <Text>Invalid town id</Text>
            </View>
        );
    }
    return (
        <TownActivitiesPage townId={+townId} stateId={+id}/>
    );
}
 No newline at end of file
+12 −0
Original line number Diff line number Diff line
import { useLocalSearchParams } from "expo-router";
import { TownSelectionPage } from "../../../src/screens/town_selection/town_selection_page";

export default function Index() {
  const { stateId } = useLocalSearchParams<{stateId: string}>();
  if (!stateId) {
    throw new Error("stateId is required");
  }
  return (
    <TownSelectionPage stateId={+stateId}/>
  );
}
 No newline at end of file
+13 −0
Original line number Diff line number Diff line
import { useLocalSearchParams } from "expo-router";
import { ActivityDescriptionPage } from "../../../../../../../src/screens/activity_description/activity_description_page";

export default function ActivitySelectionScreen() {
    const { activityId, stateId, townId } = useLocalSearchParams<{activityId: string, stateId: string, townId: string}>();
    if (!activityId || !stateId || !townId) {
        throw new Error("activityId, stateId and townId are required");
    }
    
    return (
        <ActivityDescriptionPage activityId={+activityId}/>   
    );
}
 No newline at end of file
+9 −0
Original line number Diff line number Diff line
import { View, Text } from "react-native";

export default function Travel() {
    return (
        <View>
            <Text>Travel</Text>
        </View>
    );
}
 No newline at end of file
Loading