From f0eae356aa82d7a65e1f2528ab6890b2cc7fe5c4 Mon Sep 17 00:00:00 2001 From: Supriyo Date: Tue, 31 Dec 2024 19:36:08 +0530 Subject: [PATCH] Finishing Touches !! v1 --- .vscode/settings.json | 3 + App.js | 14 +- android/app/build.gradle | 1 + android/app/src/main/AndroidManifest.xml | 47 +++-- .../src/main/java/com/playaa/MainActivity.kt | 1 + android/app/src/main/res/values/strings.xml | 2 +- ios/Podfile.lock | 96 ++++----- metro.config.js | 21 ++ package-lock.json | 196 ++++++------------ react-native.config.js | 10 +- screens/BookScreen.js | 2 +- screens/HomeScreen.js | 2 +- screens/LoginScreen.js | 17 +- screens/ManageRequests.js | 9 +- screens/RegisterScreen.js | 19 +- screens/SplashScreen.js | 4 +- yarn.lock | 26 +-- 17 files changed, 226 insertions(+), 244 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0e14d8e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "disabled" +} \ No newline at end of file diff --git a/App.js b/App.js index 4f0b2b3..57a77f7 100644 --- a/App.js +++ b/App.js @@ -5,7 +5,7 @@ * @format */ -import React from 'react'; +import React, {useState, useEffect} from 'react'; import { SafeAreaView, ScrollView, @@ -27,6 +27,7 @@ import AntDesign from 'react-native-vector-icons/AntDesign'; import StackNavigator from './navigation/StackNavigator'; import {AuthProvider} from './AuthContext'; import {ModalPortal} from 'react-native-modals'; +import SplashScreen from './screens/SplashScreen'; function Section({children, title}) { const isDarkMode = useColorScheme() === 'dark'; @@ -56,11 +57,22 @@ function Section({children, title}) { function App() { const isDarkMode = useColorScheme() === 'dark'; + const [isLoading, setIsLoading] = useState(true); + + useEffect(() => { + setTimeout(() => { + setIsLoading(false); + }, 3000); // Show splash screen for 3 seconds + }, []); const backgroundStyle = { backgroundColor: isDarkMode ? Colors.darker : Colors.lighter, }; + if (isLoading) { + return ; + } + return ( diff --git a/android/app/build.gradle b/android/app/build.gradle index 25c8c1e..5ac7347 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -117,3 +117,4 @@ dependencies { implementation jscFlavor } } +apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e189252..63db7a3 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,26 +1,31 @@ - - + + - - - - - - + android:icon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_launcher_round" + android:allowBackup="false" + android:theme="@style/AppTheme" + android:supportsRtl="true"> + + + + + + + + + - + \ No newline at end of file diff --git a/android/app/src/main/java/com/playaa/MainActivity.kt b/android/app/src/main/java/com/playaa/MainActivity.kt index c43b4ea..f54540b 100644 --- a/android/app/src/main/java/com/playaa/MainActivity.kt +++ b/android/app/src/main/java/com/playaa/MainActivity.kt @@ -4,6 +4,7 @@ import com.facebook.react.ReactActivity import com.facebook.react.ReactActivityDelegate import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled import com.facebook.react.defaults.DefaultReactActivityDelegate +import com.oblador.vectoricons.VectorIconsPackage; class MainActivity : ReactActivity() { diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 8bd36df..3dcb997 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - playaa + Playa diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4e3de7b..e842349 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1889,67 +1889,67 @@ SPEC CHECKSUMS: fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a hermes-engine: 0555a84ea495e8e3b4bde71b597cd87fbb382888 - RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648 + RCT-Folly: 84578c8756030547307e4572ab1947de1685c599 RCTDeprecation: 2c5e1000b04ab70b53956aa498bf7442c3c6e497 RCTRequired: 5f785a001cf68a551c5f5040fb4c415672dbb481 RCTTypeSafety: 6b98db8965005d32449605c0d005ecb4fee8a0f7 React: 8077bf7c185afb515be82518507e16f71a247a5e React-callinvoker: 519eee9520727805e2867a6d8dad4ebbeed543db - React-Core: e364ceda7d086c7d14adeec0eb880a90073e3dde - React-CoreModules: 291be650024d9db086c95fd1d7e7d9607c6de62b - React-cxxreact: 5cf17d13ca0fc0734e1bb0ed9615d1d1fc45ef78 + React-Core: 14708d0ebf0f961647347a7ae9cebcfaa75c99aa + React-CoreModules: 42b62e50cb4ac9a8ca92b48b263355cebcc1a523 + React-cxxreact: 846f1d9eb37a3dec19738d195d313deb7e9ee36b React-debug: 931ca94abd6b1bcab539e356e20df788afecae8f - React-defaultsnativemodule: 6afc2dd3619bac12dc54c1ee939bf14f9aa96b42 - React-domnativemodule: f140d46f6f3c3f1efc987c98b464fcbece0cc93a - React-Fabric: e1774fe4b579e34c2c5721e9351c8ce869e7b5f0 - React-FabricComponents: 528ff9f96d150379ed404221d70cc7019ca76865 - React-FabricImage: 31680b7ddc740e040277176fbd6541fcf0fd44af + React-defaultsnativemodule: 6bf85ecab795c74bfc1662ab34dd2428e65d2f29 + React-domnativemodule: bdcc445e1893ba53706a5229b1ba2dd17b0cc9f6 + React-Fabric: 2709bcae28c5b567337b3bad4ec1aa8b81aa1241 + React-FabricComponents: f35e150acf873109d244bd8c4535425d51f26672 + React-FabricImage: 6dd7af0496dae7924553f8b3cd2b134d86256a48 React-featureflags: 7c7a74b65ee5a228f520b387ebfe0e8d9cecc622 - React-featureflagsnativemodule: dd3450366b1c9557975e457ce6baa151ccee84da - React-graphics: 7f0d3e06d356e8476bd8ba95d90762fc01138ebc - React-hermes: f83fafe6a1c845dace7abad4a5d7366cbb42ab96 - React-idlecallbacksnativemodule: 14ce331438e2bca7d464a8a211b14543aff4dc91 - React-ImageManager: 2b9274ea973f43597a554a182d7ef525836172c6 - React-jserrorhandler: 3b521485275d295cfc6ec6bfa921a1d608693ecf - React-jsi: fd23c1d759feb709784fd4c835b510b90a94dd12 - React-jsiexecutor: 74628d57accc03d4b5df53db813ef6dcd704c9ae - React-jsinspector: 89a1e27e97c762de81bd4b9cb1314750304bba38 - React-jsitracing: 11b6646d7b2ecdc7a475f65b2cb12d3805964195 - React-logger: 26155dc23db5c9038794db915f80bd2044512c2e - React-Mapbuffer: ad1ba0205205a16dbff11b8ade6d1b3959451658 - React-microtasksnativemodule: e771eb9eb6ace5884ee40a293a0e14a9d7a4343c - react-native-maps: ee1e65647460c3d41e778071be5eda10e3da6225 - react-native-safe-area-context: 782fec0553f14a630a2bac87b116e512a9f35500 + React-featureflagsnativemodule: 5bfa52be77b3cd0d05fadd9694e5304705079095 + React-graphics: ba13cb82b71ec2e0ad9dac2ae31867b5656d5a28 + React-hermes: 4bfb5c90304c4d2aa36b3404ddd00df591dcae8a + React-idlecallbacksnativemodule: 5f0b9b4b18f28b43d80eb0cf94e1f559da6ceaba + React-ImageManager: 0464b2fac74d9d06d44abc3e85035424fc0d1a70 + React-jserrorhandler: 4c8ee0547d89d1bfe9cd740ca83d229934cc94e4 + React-jsi: 927e83b5aef299ca42842cd1ad696c4cf301d5eb + React-jsiexecutor: ba6b1fbaa388a99fcfb750529fed3ce65efbda4f + React-jsinspector: 1f9f161bf0961df50d2843802a431eb4fd4059cf + React-jsitracing: f6f65398e2d58bd24523ba210b277681e9cf2ee0 + React-logger: 2736a90a3fdaed3dab1e2e9c5a5e9b3be00c287d + React-Mapbuffer: bd6a2ffbf401f11cfc8b5e8f38acab9fe117620c + React-microtasksnativemodule: 2fa3b8c7a876b84bd8166f11e07f101929a87f97 + react-native-maps: 9febd31278b35cd21e4fad2cf6fa708993be5dab + react-native-safe-area-context: 2985d96d364676d1e2e2d5e77f64860874e31e13 React-nativeconfig: aeed6e2a8ac02b2df54476afcc7c663416c12bf7 - React-NativeModulesApple: c5b7813da94136f50ef084fa1ac077332dcfc658 - React-perflogger: 6afb7eebf7d9521cc70481688ccddf212970e9d3 - React-performancetimeline: 81884d35896b22d51832e7c8748c8330ec73c491 + React-NativeModulesApple: c0783e5e21c71aa2764ac33120abc96208466fa6 + React-perflogger: 2991d4258277af250eb7a2705980ebb3ef9ba85e + React-performancetimeline: 76a55d0be7293adfce8603eafb8dbae92234352d React-RCTActionSheet: c940a35d71686941ac2b96dd07bde11ea0f0c34f - React-RCTAnimation: e1dbb4e530d6f58437ab2fae372de3788ecdffab - React-RCTAppDelegate: f9825950ac2c52ae1cf46b648bb362b86b62fe41 - React-RCTBlob: 9cdac4721a76e2d132fb1760eafd0a8f150d1c96 - React-RCTFabric: c0aa01a448bcebb1326d068ed7545eb11561e663 - React-RCTImage: f09f5165807e1a69a2bbac6c7168a8ed57ed4e26 - React-RCTLinking: 4ea06b79cba7e15d8af4d86b1dcede6bd29a47fd - React-RCTNetwork: 43a38148c7a4a2380e76b08f07f02ee8eaac8965 - React-RCTSettings: cc60bb6b38eed0683696b5ddf45b0a4a1441147b - React-RCTText: fbe5e6e886beefd5d432790bc50b7aa2b6504264 - React-RCTVibration: 061dbf7a0a1e77bfc1c4672e7be6884dc12f18bf + React-RCTAnimation: db10ffa5b463794089b5319818f1df1e0b996422 + React-RCTAppDelegate: 9ab258d9de05f6ed56ea1f6b20e5adc6baaaf13f + React-RCTBlob: 2ede907cfc8039c5f5da32b3ba9e144b663c3c98 + React-RCTFabric: 6c5f6469b8a46a2c61cf954b20d36fdb1c6f010a + React-RCTImage: 3d6b5cc404c62d2b2cd767061a56bd48b4300f5e + React-RCTLinking: 548cf5c3fe935f3d0c8df5dc3c234283df48cea6 + React-RCTNetwork: 59f683fee79f9187b8ee4c270343b474ad37b42c + React-RCTSettings: b14bd94b2ac87c803375a0873746ef31c7b0eead + React-RCTText: 24e7a9b64341d6a1c98e1eabc5471b88c8bc61f1 + React-RCTVibration: 2830b19dca45d23dc61b3c93c25fbc7b85979202 React-rendererconsistency: 52b471890a1946991f2db81aa6867b14d93f4ea5 - React-rendererdebug: 3f63479f704e266a3bf104c897315a885c72859b + React-rendererdebug: c2496eb27c25d367b7e80a8a4a1babc21b6cc64b React-rncore: 33ea67bfd2eeaa4f4a0c9e0e8bd55e9b7ccb9faa - React-RuntimeApple: bcd91a191637ab5895593135de74ac54bf88df5d - React-RuntimeCore: 3a42a7f12f5f6cc4cb0e22446540165d204d7a15 + React-RuntimeApple: 28bcdbce4517b9428ab127d42d7b6bfeb27eb69c + React-RuntimeCore: d629b37225984a26c57803d857c8357c839f3fef React-runtimeexecutor: db3f17084ee7b71ab84912c527d428cc3a137841 - React-RuntimeHermes: 91bcd6aeec4bab20cebd33cb8984e3825ccdc77e - React-runtimescheduler: 92a5a092ded9a9aaac765ac940d26b52bac48901 + React-RuntimeHermes: 5d857268954776a1c6f0e0ecff1f7860806bb43b + React-runtimescheduler: 00be5844aa2c7d72fd47293e0798bb41462ecfee React-timing: 54693ad0872f64127f7cb41675b1be4fd28ea4dc - React-utils: 2bcaf4f4dfe361344bce2fae428603d518488630 - ReactCodegen: ae99a130606068ed40d1d9c0d5f25fda142a0647 - ReactCommon: 89c87b343deacc8610b099ac764848f0ce937e3e - RNCAsyncStorage: fe98f1b459a87b80f12207da80c50b3a3abb6081 - RNDateTimePicker: 6008d74df8122d6af6d9d08096bff19a8c6ba647 - RNScreens: d022507f2b6d76c73335e9e35aedcf7bb2f791b0 + React-utils: ee370a52b08a000963af1a60c31e6c87a70620a5 + ReactCodegen: 5148a0102fc8f0a1f9b05d955da886b44447679d + ReactCommon: b8485556b596ef2f44f59bc586113bda138fb804 + RNCAsyncStorage: 2edc69cf6db9299363a11477668b7f452f2cb4a6 + RNDateTimePicker: 9ec036a62ad0f5a2d04c1c7829338e87b4e423e7 + RNScreens: 351f431ef2a042a1887d4d90e1c1024b8ae9d123 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 Yoga: 3deb2471faa9916c8a82dda2a22d3fba2620ad37 diff --git a/metro.config.js b/metro.config.js index 9d41685..f1c6239 100644 --- a/metro.config.js +++ b/metro.config.js @@ -9,3 +9,24 @@ const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config'); const config = {}; module.exports = mergeConfig(getDefaultConfig(__dirname), config); + +// const {getDefaultConfig} = require('@react-native/metro-config'); +// const exclusionList = require('metro-config/src/defaults/exclusionList'); + +// module.exports = { +// resolver: { +// blacklistRE: exclusionList([ +// /node_modules\/.*\/node_modules\/react-native\/.*/, +// /\.git\/.*/, +// /.*\/__tests__\/.*/, +// ]), +// }, +// watchFolders: [__dirname], +// server: { +// enhanceMiddleware: (middleware) => (req, res, next) => { +// res.setHeader('Access-Control-Allow-Origin', '*'); +// middleware(req, res, next); +// }, +// }, +// maxWorkers: 2, // Reduce concurrent workers +// }; diff --git a/package-lock.json b/package-lock.json index 9abba3c..8475bb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2448,13 +2448,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/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==", - "dev": true, - "license": "MIT" - }, "node_modules/@jest/core/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -3507,12 +3500,6 @@ "react": ">= 18.2.0" } }, - "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/elements": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.2.5.tgz", @@ -8771,13 +8758,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-circus/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, - "license": "MIT" - }, "node_modules/jest-cli": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", @@ -8886,13 +8866,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-config/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, - "license": "MIT" - }, "node_modules/jest-diff": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", @@ -8937,13 +8910,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-diff/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, - "license": "MIT" - }, "node_modules/jest-docblock": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", @@ -9002,13 +8968,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-each/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, - "license": "MIT" - }, "node_modules/jest-environment-node": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", @@ -9102,13 +9061,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-leak-detector/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, - "license": "MIT" - }, "node_modules/jest-matcher-utils": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", @@ -9153,13 +9105,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-matcher-utils/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, - "license": "MIT" - }, "node_modules/jest-message-util": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", @@ -9206,12 +9151,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-message-util/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/jest-mock": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", @@ -9415,13 +9354,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-snapshot/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, - "license": "MIT" - }, "node_modules/jest-snapshot/node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", @@ -9507,12 +9439,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-validate/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/jest-watcher": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", @@ -10767,40 +10693,6 @@ "whatwg-url": "^13.0.0" } }, - "node_modules/mongodb-connection-string-url/node_modules/tr46": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", - "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", - "license": "MIT", - "dependencies": { - "punycode": "^2.3.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/mongodb-connection-string-url/node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - } - }, - "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", - "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", - "license": "MIT", - "dependencies": { - "tr46": "^4.1.1", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=16" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -10918,6 +10810,28 @@ } } }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/node-forge": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", @@ -11536,6 +11450,13 @@ "@types/yargs-parser": "*" } }, + "node_modules/pretty-format/node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "devOptional": true, + "license": "MIT" + }, "node_modules/private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", @@ -11736,10 +11657,9 @@ } }, "node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "devOptional": true, + "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-native": { @@ -11985,12 +11905,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/react-native/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-native/node_modules/regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", @@ -12047,13 +11961,6 @@ "react": "^18.3.1" } }, - "node_modules/react-test-renderer/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, - "license": "MIT" - }, "node_modules/react-test-renderer/node_modules/scheduler": { "version": "0.23.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", @@ -13083,6 +12990,7 @@ "version": "9.2.1", "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz", "integrity": "sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", "devOptional": true, "license": "MIT" }, @@ -13301,10 +13209,16 @@ } }, "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "license": "MIT" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", + "license": "MIT", + "dependencies": { + "punycode": "^2.3.0" + }, + "engines": { + "node": ">=14" + } }, "node_modules/trim-right": { "version": "1.0.1", @@ -13695,10 +13609,13 @@ } }, "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "license": "BSD-2-Clause" + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + } }, "node_modules/whatwg-fetch": { "version": "3.6.20", @@ -13707,13 +13624,16 @@ "license": "MIT" }, "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", "license": "MIT", "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" + "tr46": "^4.1.1", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=16" } }, "node_modules/which": { diff --git a/react-native.config.js b/react-native.config.js index 677dbf3..8581947 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -1,9 +1,3 @@ module.exports = { - dependencies: { - 'react-native-vector-icons': { - platforms: { - ios: null, - }, - }, - }, - }; \ No newline at end of file + assets: ['./node_modules/react-native-vector-icons/Fonts'], +}; \ No newline at end of file diff --git a/screens/BookScreen.js b/screens/BookScreen.js index afd84d1..332736c 100644 --- a/screens/BookScreen.js +++ b/screens/BookScreen.js @@ -105,7 +105,7 @@ const BookScreen = () => { }} > - + { headerTitle: '', headerLeft: () => ( - Kolkata + bangalore 📍 ), headerRight: () => ( diff --git a/screens/LoginScreen.js b/screens/LoginScreen.js index d06a3f0..93f2ba3 100644 --- a/screens/LoginScreen.js +++ b/screens/LoginScreen.js @@ -8,6 +8,7 @@ import { Pressable, Image, ScrollView, + ActivityIndicator, } from 'react-native'; import React, {useContext, useEffect, useState} from 'react'; import {useNavigation} from '@react-navigation/native'; @@ -18,6 +19,7 @@ import axios from 'axios'; const LoginScreen = () => { const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); + const [isLoading, setIsLoading] = useState(false); const navigation = useNavigation(); const {token, setToken} = useContext(AuthContext); useEffect(() => { @@ -26,6 +28,7 @@ const LoginScreen = () => { } }, [token, navigation]); const handleLogin = () => { + setIsLoading(true); const user = { email: email, password: password, @@ -36,10 +39,22 @@ const LoginScreen = () => { console.log("token",token) AsyncStorage.setItem('token', token); setToken(token); + setIsLoading(false); + }).catch(() => { + setIsLoading(false); }); }; + + if (isLoading) { + return ( + + + + ); + } + return ( - + { const [option, setOption] = useState('Requests'); const route = useRoute(); + const navigation = useNavigation(); + const userId = route?.params?.userId; const gameId = route?.params?.gameId; console.log(userId); console.log(gameId); + const acceptRequest = async userId => { try { @@ -92,7 +95,9 @@ import { gap: 5, justifyContent: 'space-between', }}> - + navigation.goBack()} + name="arrow-back" size={24} color="white" /> diff --git a/screens/RegisterScreen.js b/screens/RegisterScreen.js index 7ad0d0b..5e92c94 100644 --- a/screens/RegisterScreen.js +++ b/screens/RegisterScreen.js @@ -5,6 +5,7 @@ import { Text, TextInput, View, + ActivityIndicator, } from 'react-native'; import React, {useState, useEffect} from 'react'; import {useNavigation} from '@react-navigation/native'; @@ -12,6 +13,7 @@ import {saveRegistrationProgress, getRegistrationProgress} from '../registration const RegisterScreen = () => { const [email, setEmail] = useState(''); + const [isLoading, setIsLoading] = useState(false); const navigation = useNavigation(); useEffect(() => { @@ -24,11 +26,24 @@ const RegisterScreen = () => { const next = () => { if ((email || '').trim() !== '') { - saveRegistrationProgress('Register', { email }); + setIsLoading(true); + saveRegistrationProgress('Register', { email }).then(() => { + setIsLoading(false); + navigation.navigate('Password'); + }).catch(() => { + setIsLoading(false); + }); } - navigation.navigate('Password'); }; + if (isLoading) { + return ( + + + + ); + } + return ( diff --git a/screens/SplashScreen.js b/screens/SplashScreen.js index 18ff3e7..a3a931b 100644 --- a/screens/SplashScreen.js +++ b/screens/SplashScreen.js @@ -5,7 +5,7 @@ const SplashScreen = () => { return ( { diff --git a/yarn.lock b/yarn.lock index 534b632..dde05de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6121,30 +6121,20 @@ react-freeze@^1.0.0: resolved "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.4.tgz" integrity sha512-r4F0Sec0BLxWicc7HEyo2x3/2icUTrRmDjaaRyzzn+7aDyFZliszMDOgLVwSnQnYENOlL1o569Ze2HZefk8clA== -"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^17.0.1: - version "17.0.2" - resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0, react-is@^18.3.1: + 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== react-is@^16.13.1: version "16.13.1" resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^18.0.0: - 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== - -react-is@^18.2.0: - 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== - -react-is@^18.3.1: - 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== +react-is@^17.0.1: + version "17.0.2" + resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react-native-maps@^1.20.1: version "1.20.1"