From 84ab0e86ddc28f5d978e285548d53b14aece76ff Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <masahamdev@gmail.com>
Date: Mon, 14 Aug 2023 07:09:32 +0300
Subject: [PATCH] 8-13/1

---
 lib/controller/auth/login_controller.dart    |  2 +-
 lib/controller/home/map_page_controller.dart |  7 ++++---
 lib/views/lang/languages.dart                | 14 ++++++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/controller/auth/login_controller.dart b/lib/controller/auth/login_controller.dart
index 74f63dc..c23f44d 100644
--- a/lib/controller/auth/login_controller.dart
+++ b/lib/controller/auth/login_controller.dart
@@ -83,6 +83,6 @@ class LoginController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-    goToMapPage();
+    // goToMapPage();
   }
 }
diff --git a/lib/controller/home/map_page_controller.dart b/lib/controller/home/map_page_controller.dart
index 9ade3c1..c0a5109 100644
--- a/lib/controller/home/map_page_controller.dart
+++ b/lib/controller/home/map_page_controller.dart
@@ -171,11 +171,12 @@ class MapController extends GetxController {
   Future getCarsLocationByPassenger() async {
     var res =
         await CRUD().get(link: AppLink.getCarsLocationByPassenger, payload: {});
-    List data = jsonDecode(res);
+    var data = jsonDecode(res);
     print(data);
     for (var i = 0; i < data.length; i++) {
-      carsLocationByPassenger.add(LatLng(double.parse(data[i]['latitude']),
-          double.parse(data[i]['longitude'])));
+      carsLocationByPassenger.add(LatLng(
+          double.parse(data['message'][i]['latitude']),
+          double.parse(data['message'][i]['longitude'])));
     }
 
     update();
diff --git a/lib/views/lang/languages.dart b/lib/views/lang/languages.dart
index 9276e5b..4606c58 100644
--- a/lib/views/lang/languages.dart
+++ b/lib/views/lang/languages.dart
@@ -3,8 +3,11 @@ import 'package:get/get.dart';
 import 'package:ride/main.dart';
 import 'package:ride/views/widgets/elevated_btn.dart';
 
+import '../../constant/box_name.dart';
 import '../../controller/local/local_controller.dart';
+import '../auth/login_page.dart';
 import '../home/home_page.dart';
+import '../home/map_page.dart';
 
 class Language extends GetView<LocaleController> {
   const Language({Key? key}) : super(key: key);
@@ -25,16 +28,19 @@ class Language extends GetView<LocaleController> {
                   title: 'Ar',
                   onPressed: () {
                     controller.changeLang("ar");
-                    main();
-                    // Get.offAll(() => HomePage());
+                    // main();
+                    box.read(BoxName.email).toString() != ''
+                        ? Get.offAll(() => const MapPage())
+                        : Get.offAll(() => LoginPage());
                   },
                 ),
                 MyElevatedButton(
                   title: "En",
                   onPressed: () {
                     controller.changeLang("en");
-                    main();
-                    // Get.offAll(() => HomePage());
+                    box.read(BoxName.email).toString() != ''
+                        ? Get.offAll(() => const MapPage())
+                        : Get.offAll(() => LoginPage());
                   },
                 ),
               ],