From e657b04b25cc6429847be2cca8ae759495f32748 Mon Sep 17 00:00:00 2001 From: rhit-villencr Date: Mon, 16 Dec 2024 11:48:29 -0500 Subject: [PATCH] Some navigation bugs fixed --- app/_layout.tsx | 40 ++++++------ app/addEventPage.tsx | 3 +- backend/omniplanner.db | Bin 98304 -> 98304 bytes package-lock.json | 134 ++++++++++++++++++++++++----------------- package.json | 4 +- 5 files changed, 104 insertions(+), 77 deletions(-) diff --git a/app/_layout.tsx b/app/_layout.tsx index 1f01484..2341f34 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -13,10 +13,10 @@ import AddCalendarEvents from './addCalendarEvents'; import AddHealthEvents from './addHealthEvents'; import AddMeals from './addMeals'; import AddFinanceEvents from './addFinanceEvents'; +import { NavigationContainer } from '@react-navigation/native'; const Stack = createStackNavigator(); - const CustomTopBar = ({ navigation }: StackHeaderProps) => { return ( @@ -44,24 +44,26 @@ const CustomTopBar = ({ navigation }: StackHeaderProps) => { export default function Layout() { return ( - , - gestureEnabled: false, - cardStyle: { backgroundColor: 'white'} - }} - > - - - - - - - - - - - + + , + gestureEnabled: false, + cardStyle: { backgroundColor: 'white' } + }} + > + + + + + + + + + + + + ); } diff --git a/app/addEventPage.tsx b/app/addEventPage.tsx index 63f5b98..f29607e 100644 --- a/app/addEventPage.tsx +++ b/app/addEventPage.tsx @@ -5,9 +5,8 @@ import { Dropdown } from 'react-native-element-dropdown'; import { styles } from './styles'; import { RootStackParamList } from '@/components/Types'; import { StackNavigationProp } from '@react-navigation/stack'; -import { useNavigation } from 'expo-router'; +import { useNavigation } from '@react-navigation/native'; import MultiSelect from 'react-native-multiple-select'; -import { cLog } from './log'; interface FormProps { title: string; diff --git a/backend/omniplanner.db b/backend/omniplanner.db index 8a7963a8b8429db05db0c0baff839336a32f5d12..5e9ae1f5b4e7de95354f7cf097babb8a4d722748 100644 GIT binary patch delta 471 zcmZo@U~6b#n;^x+$S_gH2}o{CSklkzz_xrc`-E~Xb~|=SwqI2R3U48!2i0M{U(x)51Au#uu13>?Coyig-MXMe~As!L5yRknrOD9ULIv$E69 z0A{6ONNRD3vJH|dT#7a)PoE<({eM0qD-R3*BnJLx{Ac(#@lOK!tcgEFj)fECGmyU! z-a_(@1T$1#6ebUJ1K4f}CR{R`pY4}45S_@&z`(%9@58|VkpDFQO8#E{YFffGp-f!AfLiBpNs6`da00aob24xs P1sX8GwhK!$zD)rDd~SRP delta 115 zcmZo@U~6b#n;^x+@Oh$)6Oi1Pu%w^anmu_k`-Jk%f&x$3HYZP?Bf)LV%fP_E$p4Ii z{~1v94*%w7`y~w~|3A;l$I740!2gi{H2+HeUjA&LWF-IQ?Eg~)IQD|HXmJZqXBS`$ P1&VLy+Ab{3_%;Oq#(E`1 diff --git a/package-lock.json b/package-lock.json index 644b0dc..742f723 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@react-native-community/checkbox": "^0.5.17", "@react-native-community/datetimepicker": "^8.2.0", "@react-native-community/masked-view": "^0.1.11", - "@react-navigation/native": "^7.0.0", + "@react-navigation/native": "^6.1.18", "@react-navigation/stack": "^6.4.1", "axios": "^1.7.7", "expo": "^52.0.18", @@ -55,7 +55,7 @@ "globals": "^15.11.0", "jest": "^29.2.1", "jest-expo": "^52.0.2", - "react-test-renderer": "18.2.0", + "react-test-renderer": "^18.3.1", "typescript": "~5.3.3", "typescript-eslint": "^8.8.1" } @@ -5574,53 +5574,45 @@ } }, "node_modules/@react-navigation/core": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-7.3.1.tgz", - "integrity": "sha512-S3KCGvNsoqVk8ErAtQI2EAhg9185lahF5OY01ofrrD4Ij/uk3QEHHjoGQhR5l5DXSCSKr1JbMQA7MEKMsBiWZA==", + "version": "6.4.17", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.17.tgz", + "integrity": "sha512-Nd76EpomzChWAosGqWOYE3ItayhDzIEzzZsT7PfGcRFDgW5miHV2t4MZcq9YIK4tzxZjVVpYbIynOOQQd1e0Cg==", "license": "MIT", "dependencies": { - "@react-navigation/routers": "^7.1.2", + "@react-navigation/routers": "^6.1.9", "escape-string-regexp": "^4.0.0", - "nanoid": "3.3.8", + "nanoid": "^3.1.23", "query-string": "^7.1.3", - "react-is": "^18.2.0", - "use-latest-callback": "^0.2.1", - "use-sync-external-store": "^1.2.2" + "react-is": "^16.13.0", + "use-latest-callback": "^0.2.1" }, "peerDependencies": { - "react": ">= 18.2.0" + "react": "*" } }, - "node_modules/@react-navigation/core/node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "license": "MIT" - }, "node_modules/@react-navigation/native": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.0.14.tgz", - "integrity": "sha512-Gi6lLw4VOGSWAhmUdJOMauOKGK51/YA1CprjXm91sNfgERWvznqEMw8QmUQx9SEqYfi0LfZhbzpMst09SJ00lw==", + "version": "6.1.18", + "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.18.tgz", + "integrity": "sha512-mIT9MiL/vMm4eirLcmw2h6h/Nm5FICtnYSdohq4vTLA2FF/6PNhByM7s8ffqoVfE5L0uAa6Xda1B7oddolUiGg==", "license": "MIT", "dependencies": { - "@react-navigation/core": "^7.3.1", + "@react-navigation/core": "^6.4.17", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", - "nanoid": "3.3.8", - "use-latest-callback": "^0.2.1" + "nanoid": "^3.1.23" }, "peerDependencies": { - "react": ">= 18.2.0", + "react": "*", "react-native": "*" } }, "node_modules/@react-navigation/routers": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-7.1.2.tgz", - "integrity": "sha512-emdEjpVDK8zbiu2GChC8oYIAub9i/OpNuQJekVsbyFCBz4/TzaBzms38Q53YaNhdIFNmiYLfHv/Y1Ub7KYfm3w==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.9.tgz", + "integrity": "sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA==", "license": "MIT", "dependencies": { - "nanoid": "3.3.8" + "nanoid": "^3.1.23" } }, "node_modules/@react-navigation/stack": { @@ -9625,6 +9617,24 @@ "react-native-screens": ">= 4.0.0" } }, + "node_modules/expo-router/node_modules/@react-navigation/core": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-7.3.1.tgz", + "integrity": "sha512-S3KCGvNsoqVk8ErAtQI2EAhg9185lahF5OY01ofrrD4Ij/uk3QEHHjoGQhR5l5DXSCSKr1JbMQA7MEKMsBiWZA==", + "license": "MIT", + "dependencies": { + "@react-navigation/routers": "^7.1.2", + "escape-string-regexp": "^4.0.0", + "nanoid": "3.3.8", + "query-string": "^7.1.3", + "react-is": "^18.2.0", + "use-latest-callback": "^0.2.1", + "use-sync-external-store": "^1.2.2" + }, + "peerDependencies": { + "react": ">= 18.2.0" + } + }, "node_modules/expo-router/node_modules/@react-navigation/elements": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.2.5.tgz", @@ -9646,6 +9656,23 @@ } } }, + "node_modules/expo-router/node_modules/@react-navigation/native": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.0.14.tgz", + "integrity": "sha512-Gi6lLw4VOGSWAhmUdJOMauOKGK51/YA1CprjXm91sNfgERWvznqEMw8QmUQx9SEqYfi0LfZhbzpMst09SJ00lw==", + "license": "MIT", + "dependencies": { + "@react-navigation/core": "^7.3.1", + "escape-string-regexp": "^4.0.0", + "fast-deep-equal": "^3.1.3", + "nanoid": "3.3.8", + "use-latest-callback": "^0.2.1" + }, + "peerDependencies": { + "react": ">= 18.2.0", + "react-native": "*" + } + }, "node_modules/expo-router/node_modules/@react-navigation/native-stack": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-7.2.0.tgz", @@ -9663,6 +9690,21 @@ "react-native-screens": ">= 4.0.0" } }, + "node_modules/expo-router/node_modules/@react-navigation/routers": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-7.1.2.tgz", + "integrity": "sha512-emdEjpVDK8zbiu2GChC8oYIAub9i/OpNuQJekVsbyFCBz4/TzaBzms38Q53YaNhdIFNmiYLfHv/Y1Ub7KYfm3w==", + "license": "MIT", + "dependencies": { + "nanoid": "3.3.8" + } + }, + "node_modules/expo-router/node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "license": "MIT" + }, "node_modules/expo-router/node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", @@ -12083,12 +12125,6 @@ "dev": true, "peer": true }, - "node_modules/jest-expo/node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "dev": true - }, "node_modules/jest-expo/node_modules/react-server-dom-webpack": { "version": "19.0.0-rc-6230622a1a-20240610", "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-19.0.0-rc-6230622a1a-20240610.tgz", @@ -12107,20 +12143,6 @@ "webpack": "^5.59.0" } }, - "node_modules/jest-expo/node_modules/react-test-renderer": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.3.1.tgz", - "integrity": "sha512-KkAgygexHUkQqtvvx/otwxtuFu5cVjfzTCtjXLH9boS19/Nbtg84zS7wIQn39G8IlrhThBpQsMKkq5ZHZIYFXA==", - "dev": true, - "dependencies": { - "react-is": "^18.3.1", - "react-shallow-renderer": "^16.15.0", - "scheduler": "^0.23.2" - }, - "peerDependencies": { - "react": "^18.3.1" - } - }, "node_modules/jest-expo/node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", @@ -15234,6 +15256,7 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" }, @@ -15274,6 +15297,7 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", + "license": "MIT", "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.2" @@ -15692,17 +15716,18 @@ } }, "node_modules/react-test-renderer": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.2.0.tgz", - "integrity": "sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.3.1.tgz", + "integrity": "sha512-KkAgygexHUkQqtvvx/otwxtuFu5cVjfzTCtjXLH9boS19/Nbtg84zS7wIQn39G8IlrhThBpQsMKkq5ZHZIYFXA==", "dev": true, + "license": "MIT", "dependencies": { - "react-is": "^18.2.0", + "react-is": "^18.3.1", "react-shallow-renderer": "^16.15.0", - "scheduler": "^0.23.0" + "scheduler": "^0.23.2" }, "peerDependencies": { - "react": "^18.2.0" + "react": "^18.3.1" } }, "node_modules/react-test-renderer/node_modules/react-is": { @@ -17801,6 +17826,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.2.3.tgz", "integrity": "sha512-7vI3fBuyRcP91pazVboc4qu+6ZqM8izPWX9k7cRnT8hbD5svslcknsh3S9BUhaK11OmgTV4oWZZVSeQAiV53SQ==", + "license": "MIT", "peerDependencies": { "react": ">=16.8" } diff --git a/package.json b/package.json index e855c40..db92255 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@react-native-community/checkbox": "^0.5.17", "@react-native-community/datetimepicker": "^8.2.0", "@react-native-community/masked-view": "^0.1.11", - "@react-navigation/native": "^7.0.0", + "@react-navigation/native": "^6.1.18", "@react-navigation/stack": "^6.4.1", "axios": "^1.7.7", "expo": "^52.0.18", @@ -63,7 +63,7 @@ "globals": "^15.11.0", "jest": "^29.2.1", "jest-expo": "^52.0.2", - "react-test-renderer": "18.2.0", + "react-test-renderer": "^18.3.1", "typescript": "~5.3.3", "typescript-eslint": "^8.8.1" },