Merge branch pueblosmagicosconia:main into main (d759dddf) · Commits · Lorenzo Trujillo Rojas / PueblosMagicosConIAFK

mobile/app.json

+2 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,8 @@
		}
		],
		"expo-router",
		"expo-secure-store"
		"expo-secure-store",
		"expo-localization"
		],
		"extra": {
		"router": {

mobile/app/state/[stateId]/town/[townId]/activity/[activityId]/travel.tsx

+10 −3

Original line number	Diff line number	Diff line
		import { useLocalSearchParams } from "expo-router";
		import { View, Text } from "react-native";
		import { ActivityPointScreen } from "../../../../../../../src/screens/activity_point/activity_point";


		export default function Travel() {
		const { ...rest } = useLocalSearchParams<{ stateId: string, townId: string, activityId: string, id: string }>();

		if (!rest.stateId \|\| !rest.townId \|\| !rest.activityId \|\| !rest.id) {
		return null;
		}

		return (
		<View>
		<Text>Travel</Text>
		</View>
		<ActivityPointScreen stateId={parseInt(rest.stateId)} townId={parseInt(rest.townId)} activityId={parseInt(rest.activityId)} id={parseInt(rest.id)} />
		);
		}
		No newline at end of file

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,11 @@ export default function ActivitySelectionScreen() {
		headerShown: false
		}
		} />
		<Stack.Screen name="[activityId]/travel" options={
		{
		headerShown: false
		}
		} />
		</Stack>
		);
		}
		No newline at end of file

mobile/package-lock.json

+50 −0

Original line number	Diff line number	Diff line
		@@ -12,16 +12,19 @@
		"@react-native-community/datetimepicker": "7.6.1",
		"axios": "^1.6.8",
		"expo": "~50.0.14",
		"expo-av": "~13.10.6",
		"expo-barcode-scanner": "~12.9.3",
		"expo-camera": "~14.1.1",
		"expo-checkbox": "~2.7.0",
		"expo-constants": "~15.4.5",
		"expo-image-picker": "~14.7.1",
		"expo-linking": "~6.2.2",
		"expo-localization": "~14.8.4",
		"expo-router": "~3.4.8",
		"expo-screen-orientation": "~6.4.1",
		"expo-secure-store": "~12.8.1",
		"expo-status-bar": "~1.11.1",
		"i18n-js": "^4.4.3",
		"nativewind": "^2.0.11",
		"react": "18.2.0",
		"react-hook-form": "^7.51.2",
		@@ -6854,6 +6857,14 @@
		"node": ">=0.6"
		}
		},
		"node_modules/bignumber.js": {
		"version": "9.1.2",
		"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
		"integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
		"engines": {
		"node": "*"
		}
		},
		"node_modules/binary-extensions": {
		"version": "2.3.0",
		"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
		@@ -8182,6 +8193,14 @@
		"md5-file": "^3.2.3"
		}
		},
		"node_modules/expo-av": {
		"version": "13.10.6",
		"resolved": "https://registry.npmjs.org/expo-av/-/expo-av-13.10.6.tgz",
		"integrity": "sha512-h3c1fg5yhWnP0RIGO+fhgPx6cmh4B4lnKdXR2i69aC3vs5D5Cu+JlzBon1gLIu6eUo2IVfC0RjSLpfQbcJ4doQ==",
		"peerDependencies": {
		"expo": "*"
		}
		},
		"node_modules/expo-barcode-scanner": {
		"version": "12.9.3",
		"resolved": "https://registry.npmjs.org/expo-barcode-scanner/-/expo-barcode-scanner-12.9.3.tgz",
		@@ -8275,6 +8294,17 @@
		"invariant": "^2.2.4"
		}
		},
		"node_modules/expo-localization": {
		"version": "14.8.4",
		"resolved": "https://registry.npmjs.org/expo-localization/-/expo-localization-14.8.4.tgz",
		"integrity": "sha512-WWcG6Bg9s8p9wk5BvdXfxBLCEcvzS75O+nN5O+kWA3+cGDKcbfvExWmXcCSz8hn8y8rRVIEx8wwSgysMTtptUA==",
		"dependencies": {
		"rtl-detect": "^1.0.2"
		},
		"peerDependencies": {
		"expo": "*"
		}
		},
		"node_modules/expo-modules-autolinking": {
		"version": "1.10.3",
		"resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.10.3.tgz",
		@@ -9097,6 +9127,16 @@
		"node": ">=10.17.0"
		}
		},
		"node_modules/i18n-js": {
		"version": "4.4.3",
		"resolved": "https://registry.npmjs.org/i18n-js/-/i18n-js-4.4.3.tgz",
		"integrity": "sha512-QIIyvJ+wOKdigL4BlgwiFFrpoXeGdlC8EYgori64YSWm1mnhNYYjIfRu5wETFrmiNP2fyD6xIjVG8dlzaiQr/A==",
		"dependencies": {
		"bignumber.js": "*",
		"lodash": "*",
		"make-plural": "*"
		}
		},
		"node_modules/ieee754": {
		"version": "1.2.1",
		"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
		@@ -10593,6 +10633,11 @@
		"semver": "bin/semver"
		}
		},
		"node_modules/make-plural": {
		"version": "7.3.0",
		"resolved": "https://registry.npmjs.org/make-plural/-/make-plural-7.3.0.tgz",
		"integrity": "sha512-/K3BC0KIsO+WK2i94LkMPv3wslMrazrQhfi5We9fMbLlLjzoOSJWr7TAdupLlDWaJcWxwoNosBkhFDejiu5VDw=="
		},
		"node_modules/makeerror": {
		"version": "1.0.12",
		"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
		@@ -13044,6 +13089,11 @@
		"rimraf": "bin.js"
		}
		},
		"node_modules/rtl-detect": {
		"version": "1.1.2",
		"resolved": "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.1.2.tgz",
		"integrity": "sha512-PGMBq03+TTG/p/cRB7HCLKJ1MgDIi07+QU1faSjiYRfmY5UsAttV9Hs08jDAHVwcOwmVLcSJkpwyfXszVjWfIQ=="
		},
		"node_modules/run-parallel": {
		"version": "1.2.0",
		"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",

mobile/package.json

+4 −1

Original line number	Diff line number	Diff line
		@@ -17,11 +17,14 @@
		"expo-camera": "~14.1.1",
		"expo-checkbox": "~2.7.0",
		"expo-constants": "~15.4.5",
		"expo-image-picker": "~14.7.1",
		"expo-linking": "~6.2.2",
		"expo-localization": "~14.8.4",
		"expo-router": "~3.4.8",
		"expo-screen-orientation": "~6.4.1",
		"expo-secure-store": "~12.8.1",
		"expo-status-bar": "~1.11.1",
		"i18n-js": "^4.4.3",
		"nativewind": "^2.0.11",
		"react": "18.2.0",
		"react-hook-form": "^7.51.2",
		@@ -31,7 +34,7 @@
		"react-native-reanimated": "~3.6.2",
		"react-native-safe-area-context": "4.8.2",
		"react-native-screens": "~3.29.0",
		"expo-image-picker": "~14.7.1"
		"expo-av": "~13.10.6"
		},
		"devDependencies": {
		"@babel/core": "^7.20.0",