Skip to content

Commit

Permalink
feat(#49): User Story: As a new rider, I want to provide my personal …
Browse files Browse the repository at this point in the history
…information to create an account.

- fixes regarding shared components
  • Loading branch information
chriscoderdr committed Nov 6, 2024
1 parent 8543790 commit 4c94f46
Show file tree
Hide file tree
Showing 44 changed files with 795 additions and 560 deletions.
1 change: 1 addition & 0 deletions apps/rider-app/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="morrotaxiriderapp"/>
<data android:scheme="com.chriscoder.riderapp"/>
<data android:scheme="exp+rider-app"/>
</intent-filter>
</activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
Expand Down
2 changes: 1 addition & 1 deletion apps/rider-app/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ EX_DEV_CLIENT_NETWORK_INSPECTOR=true
expo.useLegacyPackaging=false

expoRNMapboxMapsImpl=mapbox
expoRNMapboxMapsVersion=11.3.0
expoRNMapboxMapsVersion=11.7.1
MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiY2dvbWV6bWVuZGV6IiwiYSI6ImNtMndhbDAwZjAzMXQyanNkMHF2NjR3bmUifQ.f6E28fydW9bkhLBP7L_lCQ
2 changes: 1 addition & 1 deletion apps/rider-app/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@rnmapbox/maps",
{
"RNMapboxMapsImpl": "mapbox",
"RNMapboxMapsVersion": "11.3.0",
"RNMapboxMapsVersion": "11.7.1",
"RNMapboxMapsDownloadToken": "sk.eyJ1IjoiY2dvbWV6bWVuZGV6IiwiYSI6ImNtMndhbDAwZjAzMXQyanNkMHF2NjR3bmUifQ.f6E28fydW9bkhLBP7L_lCQ"
}
],
Expand Down
5 changes: 5 additions & 0 deletions apps/rider-app/app/_layout.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import React from 'react';




import Setup from '@/src/components/setup';
import config from '@/src/config';
import store, { persistor } from '@/src/store';
Expand Down
8 changes: 4 additions & 4 deletions apps/rider-app/app/main.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { MapView } from '@rnmapbox/maps';
import { View } from 'react-native';
import { PermissionBlocker } from 'react-native-morro-taxi-rn-components';
import { InputPhone, PermissionBlocker } from 'react-native-morro-taxi-rn-components';

export default function Home() {
// // useBackgroundLocation(); // TODO: Implement useBackgroundLocation hook
// useForegroundLocation();

return (
<View style={{ flex: 1 }}>
{/* <PermissionBlocker> */}
<MapView />
{/* </PermissionBlocker> */}
<PermissionBlocker>
<InputPhone />
</PermissionBlocker>
</View>
);
}
4 changes: 2 additions & 2 deletions apps/rider-app/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ install! 'cocoapods',

prepare_react_native_project!

# @generated begin @rnmapbox/maps-rnmapboxmapsimpl - expo prebuild (DO NOT MODIFY) sync-b94567ed9975fb718d9a8be476261d2111df5143
# @generated begin @rnmapbox/maps-rnmapboxmapsimpl - expo prebuild (DO NOT MODIFY) sync-58461881473eb07f7ed36473b9adf3aaafe420fc
$RNMapboxMapsDownloadToken = 'sk.eyJ1IjoiY2dvbWV6bWVuZGV6IiwiYSI6ImNtMndhbDAwZjAzMXQyanNkMHF2NjR3bmUifQ.f6E28fydW9bkhLBP7L_lCQ'
$RNMapboxMapsImpl = 'mapbox'
$RNMapboxMapsVersion = '11.3.0'
$RNMapboxMapsVersion = '11.7.1'
# @generated end @rnmapbox/maps-rnmapboxmapsimpl
target 'riderapp' do
use_expo_modules!
Expand Down
57 changes: 41 additions & 16 deletions apps/rider-app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,13 @@ PODS:
- hermes-engine (0.74.5):
- hermes-engine/Pre-built (= 0.74.5)
- hermes-engine/Pre-built (0.74.5)
- MapboxCommon (24.3.1)
- MapboxCoreMaps (11.3.0):
- MapboxCommon (~> 24.3)
- MapboxMaps (11.3.0):
- MapboxCommon (= 24.3.1)
- MapboxCoreMaps (= 11.3.0)
- Turf (= 2.8.0)
- MapboxCommon (24.7.1)
- MapboxCoreMaps (11.7.1):
- MapboxCommon (~> 24.7)
- MapboxMaps (11.7.1):
- MapboxCommon (= 24.7.1)
- MapboxCoreMaps (= 11.7.1)
- Turf (= 3.0.0)
- RCT-Folly (2024.01.01.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -1230,6 +1230,27 @@ PODS:
- React-Mapbuffer (0.74.5):
- glog
- React-debug
- react-native-morro-taxi-rn-components (0.1.0):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Codegen
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- react-native-safe-area-context (4.10.5):
- React-Core
- React-nativeconfig (0.74.5)
Expand Down Expand Up @@ -1485,13 +1506,13 @@ PODS:
- ReactCommon/turbomodule/core
- Yoga
- rnmapbox-maps (10.1.33):
- MapboxMaps (= 11.3.0)
- MapboxMaps (= 11.7.1)
- React
- React-Core
- rnmapbox-maps/DynamicLibrary (= 10.1.33)
- Turf
- rnmapbox-maps/DynamicLibrary (10.1.33):
- MapboxMaps (= 11.3.0)
- MapboxMaps (= 11.7.1)
- React
- React-Core
- Turf
Expand Down Expand Up @@ -1539,7 +1560,7 @@ PODS:
- ReactCommon/turbomodule/core
- Yoga
- SocketRocket (0.7.0)
- Turf (2.8.0)
- Turf (3.0.0)
- UMAppLoader (4.6.0)
- Yoga (0.0.0)

Expand Down Expand Up @@ -1600,6 +1621,7 @@ DEPENDENCIES:
- React-jsitracing (from `../node_modules/react-native/ReactCommon/hermes/executor/`)
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
- React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
- react-native-morro-taxi-rn-components (from `../node_modules/react-native-morro-taxi-rn-components`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
- React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
Expand Down Expand Up @@ -1750,6 +1772,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/logger"
React-Mapbuffer:
:path: "../node_modules/react-native/ReactCommon"
react-native-morro-taxi-rn-components:
:path: "../node_modules/react-native-morro-taxi-rn-components"
react-native-safe-area-context:
:path: "../node_modules/react-native-safe-area-context"
React-nativeconfig:
Expand Down Expand Up @@ -1844,9 +1868,9 @@ SPEC CHECKSUMS:
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
hermes-engine: 8c1577f3fdb849cbe7729c2e7b5abc4b845e88f8
MapboxCommon: e6d0d15f1e34278e21bae28bdc548d378757b51e
MapboxCoreMaps: 0e3eab0bd5787e833d48261fa1d01f356d6c4ad8
MapboxMaps: 5aba2ba70a85d08e0ea00ad011ca3d2965e69a59
MapboxCommon: 0ba7bc2bbf20b6e7687747a9959ef5f82adffd85
MapboxCoreMaps: 02656fd04e2e2ad8c7db39adba301cef55a4c2cf
MapboxMaps: 3a77eda93f83ad27c178df86122dc3ad8645078d
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
RCTDeprecation: 3afceddffa65aee666dafd6f0116f1d975db1584
RCTRequired: ec1239bc9d8bf63e10fb92bd8b26171a9258e0c1
Expand All @@ -1871,6 +1895,7 @@ SPEC CHECKSUMS:
React-jsitracing: 3b6060bbf5317663667e1dd93560c7943ab86ccc
React-logger: 257858bd55f3a4e1bc0cf07ddc8fb9faba6f8c7c
React-Mapbuffer: 6c1cacdbf40b531f549eba249e531a7d0bfd8e7f
react-native-morro-taxi-rn-components: 8f0a0a85bfc8ed8d56cf5f3f8ce400298d443336
react-native-safe-area-context: a240ad4b683349e48b1d51fed1611138d1bdad97
React-nativeconfig: ba9a2e54e2f0882cf7882698825052793ed4c851
React-NativeModulesApple: 8d11ff8955181540585c944cf48e9e7236952697
Expand All @@ -1897,14 +1922,14 @@ SPEC CHECKSUMS:
ReactCommon: f7da14a8827b72704169a48c929bcde802698361
RNCAsyncStorage: d35c79ffba52c1013013e16b1fc295aec2feabb6
RNGestureHandler: 2282cfbcf86c360d29f44ace393203afd5c6cff7
rnmapbox-maps: f28bfc278a0bcb8e3c3483f1813ede8eb9c6f5fa
rnmapbox-maps: a1bd9bf7535374077344074d282e52ce23b74e08
RNReanimated: 35f9ac9c3ac42d0497ebd1cce5c39d7687a8493e
RNScreens: b32a9ff15bea7fcdbe5dff6477bc503f792b1208
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
Turf: a1604e74adce15c58462c9ae2acdbf049d5be35e
UMAppLoader: f17a5ee8e85b536ace0fc254b447a37ed198d57e
Yoga: 950bbfd7e6f04790fdb51149ed51df41f329fcc8

PODFILE CHECKSUM: de27ec0d3109ee75392fe84df17df701983049ab
PODFILE CHECKSUM: 6e33492c1ed5f72858ff2c86d3a3fcbeb95b05c9

COCOAPODS: 1.15.2
Loading

0 comments on commit 4c94f46

Please sign in to comment.