Task fix builds (#53)

* - fix builds

* - refactoring and bug fixing

* - refactoring driver app to use components from morrotaxi shared components

* - refactoring driver app to use shared components

* - refactoring driver app to use shared mapview

* - refactoring

apps/driver-app/.env

@@ -1,6 +1,6 @@
-EXPO_PUBLIC_MORRO_API_BASE_URL=http://chriscoder.tplinkdns.com:3000
-EXPO_PUBLIC_MAPBOX_ACCESS_TOKEN=sk.eyJ1IjoiY2dvbWV6bWVuZGV6IiwiYSI6ImNtMndhbDAwZjAzMXQyanNkMHF2NjR3bmUifQ.f6E28fydW9bkhLBP7L_lCQ
-EXPO_PUBLIC_MQTT_BROKER_URL=chriscoder.tplinkdns.com
+EXPO_PUBLIC_MORRO_API_BASE_URL=https://api.morrotaxi.chriscoder.com
+EXPO_PUBLIC_MAPBOX_ACCESS_TOKEN=sk.eyJ1IjoiY2dvbWV6bWVuZGV6IiwiYSI6ImNtM2F2NnI4bjFkdXkybG9sZjhqMHQyc2IifQ.qw20ez2ATs1s6nAoC-Ip-g
+EXPO_PUBLIC_MQTT_BROKER_URL=chriscoder.com
 EXPO_PUBLIC_MQTT_PORT=8883
 EXPO_PUBLIC_MQTT_TOPIC_RIDE_REQUESTS_BASE=/drivers/:driver_id/ride-request
 EXPO_PUBLIC_MQTT_TOPIC_DRIVER_LOCATION_BASE=/drivers/:driver_id/location

apps/driver-app/.gitignore

@@ -17,4 +17,6 @@ web-build/
 # The following patterns were generated by expo-cli
 
 expo-env.d.ts
-# @end expo-cli
+# @end expo-cli
+
+.env

apps/driver-app/android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
   <uses-permission android:name="android.permission.INTERNET"/>
@@ -26,7 +27,7 @@
         <action android:name="android.intent.action.VIEW"/>
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.BROWSABLE"/>
-        <data android:scheme="myapp"/>
+        <data android:scheme="morrotaxidriverapp"/>
         <data android:scheme="com.chriscoder.driverapp"/>
         <data android:scheme="exp+driver-app"/>
       </intent-filter>

apps/driver-app/android/app/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <resources>
-  <color name="splashscreen_background">#ffffff</color>
+  <color name="splashscreen_background">#181A20</color>
   <color name="iconBackground">#ffffff</color>
   <color name="colorPrimary">#023c69</color>
-  <color name="colorPrimaryDark">#ffffff</color>
+  <color name="colorPrimaryDark">#181A20</color>
 </resources>

apps/driver-app/android/app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-  <string name="app_name">driver-app</string>
+  <string name="app_name">MorroTaxi Driver</string>
   <string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
   <string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
   <string name="expo_system_ui_user_interface_style" translatable="false">automatic</string>

apps/driver-app/android/app/src/main/res/values/styles.xml

@@ -4,7 +4,7 @@
     <item name="android:editTextStyle">@style/ResetEditText</item>
     <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="android:statusBarColor">#ffffff</item>
+    <item name="android:statusBarColor">#181A20</item>
   </style>
   <style name="ResetEditText" parent="@android:style/Widget.EditText">
     <item name="android:padding">0dp</item>

apps/driver-app/android/gradle.properties

@@ -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

apps/driver-app/android/settings.gradle

@@ -44,7 +44,7 @@ if (getRNMinorVersion() >= 75) {
   }
 }
 
-rootProject.name = 'driver-app'
+rootProject.name = 'MorroTaxi Driver'
 
 dependencyResolutionManagement {
   versionCatalogs {

apps/driver-app/app.json

@@ -1,37 +1,38 @@
 {
   "expo": {
-    "name": "driver-app",
+    "name": "MorroTaxi Driver",
     "slug": "driver-app",
-    "bundleidentifier": "com.chriscoder.driverapp",
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "morrotaxidriverapp",
     "userInterfaceStyle": "automatic",
-    "associatedDomains": [
-      "applinks:taxi.chriscoder.com"
-    ],
+
     "splash": {
       "image": "./assets/images/splash.png",
       "resizeMode": "contain",
-      "backgroundColor": "#ffffff"
+      "backgroundColor": "#181A20"
     },
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "com.chriscoder.driverapp",
       "infoPlist": {
-        "UIBackgroundModes": [
-          "location",
-          "fetch",
-          "remote-notification"
-        ]
+        "UIBackgroundModes": ["location", "fetch"],
+        "NSAppTransportSecurity": {
+          "NSAllowsArbitraryLoads": true
+        }
       }
     },
     "android": {
       "adaptiveIcon": {
-        "foregroundImage": "./assets/images/app-icon.png",
+        "foregroundImage": "./assets/images/icon.png",
         "backgroundColor": "#ffffff"
       },
+      "permissions": [
+        "ACCESS_FINE_LOCATION",
+        "ACCESS_COARSE_LOCATION",
+        "ACCESS_BACKGROUND_LOCATION"
+      ],
       "package": "com.chriscoder.driverapp"
     },
     "web": {
@@ -44,7 +45,7 @@
         "@rnmapbox/maps",
         {
           "RNMapboxMapsImpl": "mapbox",
-          "RNMapboxMapsVersion": "11.3.0",
+          "RNMapboxMapsVersion": "11.7.1",
           "RNMapboxMapsDownloadToken": "sk.eyJ1IjoiY2dvbWV6bWVuZGV6IiwiYSI6ImNtMndhbDAwZjAzMXQyanNkMHF2NjR3bmUifQ.f6E28fydW9bkhLBP7L_lCQ"
         }
       ],

apps/driver-app/app/login.tsx

@@ -1,10 +1,34 @@
-import LoginForm from '@/src/components/login-form';
-import ScrollableFormContainer from '@/src/components/scrollable-form-container';
+import { useAppDispatch } from '@/src/hooks/use-app-dispatch';
+import { RootState } from '@/src/store';
+import { loginDriver } from '@/src/store/slices/auth-slice';
+import { useRouter } from 'expo-router';
+import {
+  LoginForm,
+  ScrollableFormContainer,
+  ILoginUser
+} from 'react-native-morro-taxi-rn-components';
+import { useSelector } from 'react-redux';
 
 export default function Login() {
+  const dispatch = useAppDispatch();
+  const isLoading = useSelector((state: RootState) => state.auth.loading);
+  const router = useRouter();
+
+  const onLoginUser = (data: ILoginUser) => {
+    dispatch(loginDriver({ ...data }));
+  };
+
+  const onGoToRegister = () => {
+    router.navigate('/signup');
+  };
+
   return (
     <ScrollableFormContainer>
-      <LoginForm />
+      <LoginForm
+        onGoToRegister={onGoToRegister}
+        isLoading={isLoading}
+        loginUser={onLoginUser}
+      />
     </ScrollableFormContainer>
   );
-}
+}

apps/driver-app/app/main.tsx

@@ -1,21 +1,25 @@
 import MapView from '@/src/components/map-view';
-import PermissionBlocker from '@/src/components/permission-blocker';
+import { PermissionBlocker } from 'react-native-morro-taxi-rn-components';
 import RideRequestDashboard from '@/src/components/ride-request-dashboard';
 import StatusCard from '@/src/components/status-card';
 import useForegroundLocation from '@/src/hooks/use-foreground-location';
-import { View } from 'react-native';
 
 export default function Map() {
-  // useBackgroundLocation(); // TODO: Implement useBackgroundLocation hook
   useForegroundLocation();
 
   return (
-    <View style={{ flex: 1 }}>
-      <PermissionBlocker>
-        <StatusCard />
-        <MapView />
-        <RideRequestDashboard />
-      </PermissionBlocker>
-    </View>
+    <PermissionBlocker
+      title="Permissions Required"
+      subtitle="To receive ride requests and navigate to passengers, we need access to notifications, location, and background location. Please enable these permissions in your settings to start accepting rides."
+      alertTitle="Permissions Required"
+      alertSubtitle="We need location, background location, and notification permissions to provide ride services."
+      requireLocation
+      requireNotification
+      requireBackgroundLocation
+    >
+      <StatusCard />
+      <MapView />
+      <RideRequestDashboard />
+    </PermissionBlocker>
   );
 }

apps/driver-app/app/signup.tsx

@@ -1,10 +1,34 @@
-import ScrollableFormContainer from '@/src/components/scrollable-form-container';
-import SignUpForm from '@/src/components/sign-up-form';
+import { useAppDispatch } from '@/src/hooks/use-app-dispatch';
+import { RootState } from '@/src/store';
+import { registerDriver } from '@/src/store/slices/auth-slice';
+import { useRouter } from 'expo-router';
+import {
+  IRegisterUser,
+  ScrollableFormContainer,
+  SignUpForm
+} from 'react-native-morro-taxi-rn-components';
+import { useSelector } from 'react-redux';
 
 export default function SignUp() {
+  const dispatch = useAppDispatch();
+  const isLoading = useSelector((state: RootState) => state.auth.loading);
+  const router = useRouter();
+
+  const onRegisterUser = (data: IRegisterUser) => {
+    dispatch(registerDriver({ ...data }));
+  };
+
+  const onGoToLogin = () => {
+    router.navigate('/login');
+  };
+
   return (
     <ScrollableFormContainer>
-      <SignUpForm />
+      <SignUpForm
+        isLoading={isLoading}
+        registerUser={onRegisterUser}
+        onGoToLogin={onGoToLogin}
+      />
     </ScrollableFormContainer>
   );
-}
+}