8-15/3

lib/controller/auth/login_controller.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@@ -7,8 +8,11 @@ import 'package:ride/constant/box_name.dart';
 import 'package:ride/constant/links.dart';
 import 'package:ride/controller/functions/crud.dart';
 import 'package:ride/main.dart';
+import 'package:ride/views/auth/verify_email_page.dart';
 import 'package:ride/views/home/map_page.dart';
 
+import '../firebase/firbase_messge.dart';
+
 class LoginController extends GetxController {
   final formKey = GlobalKey<FormState>();
   TextEditingController emailController = TextEditingController();
@@ -46,35 +50,57 @@ class LoginController extends GetxController {
       'phone': phoneController.text,
       'password': passwordController.text
     });
-
-    var jsonDecoeded = jsonDecode(res);
-    // print(jsonDecoeded);
-    if (jsonDecoeded.isNotEmpty) {
-      if (jsonDecoeded['status'] == 'success') {
-        if (jsonDecoeded['data'][0]['verified'] == '1') {
-          box.write(BoxName.pasengerID, jsonDecoeded['data'][0]['id']);
-          box.write(BoxName.email, jsonDecoeded['data'][0]['email']);
-          box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
-          Get.offAll(() => MapPage());
+    if (res == 'Failure') {
+      isloading = false;
+      update();
+      Get.snackbar('Failure', '', backgroundColor: Colors.red);
+    } else {
+      var jsonDecoeded = jsonDecode(res);
+      // print(jsonDecoeded);
+      if (jsonDecoeded.isNotEmpty) {
+        if (jsonDecoeded['status'] == 'success') {
+          print(jsonDecoeded['data'][0]['verified']);
+          if (jsonDecoeded['data'][0]['verified'] == 1) {
+            box.write(BoxName.pasengerID, jsonDecoeded['data'][0]['id']);
+            box.write(BoxName.email, jsonDecoeded['data'][0]['email']);
+            box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
+            Get.offAll(() => MapPage());
+            isloading = false;
+            update();
+            print(box.read(BoxName.pasengerID).toString());
+            print(box.read(BoxName.tokenFCM));
+            await CRUD().post(link: AppLink.addTokens, payload: {
+              'token': box.read(BoxName.tokenFCM),
+              'passengerID': box.read(BoxName.pasengerID).toString()
+            }).then((value) => print('cccc'));
+          } else {
+            isloading = false;
+            update();
+            Get.defaultDialog(
+              title: 'You must Verify email !.'.tr,
+              middleText: '',
+              backgroundColor: Colors.yellow[300],
+              onConfirm: () async {
+                int randomNumber = Random().nextInt(100000) + 1;
+                await CRUD().post(link: AppLink.sendVerifyEmail, payload: {
+                  'email': emailController.text,
+                  'token': randomNumber.toString(),
+                }).then((value) => print(value));
+                Get.to(() => const VerifyEmailPage());
+              },
+            );
+          }
+        } else if (jsonDecoeded['status'] == 'Failure') {
+          Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
+              backgroundColor: Colors.redAccent);
           isloading = false;
           update();
-          print(box.read(BoxName.pasengerID).toString());
-          await CRUD().post(link: AppLink.addTokens, payload: {
-            'token': box.read(BoxName.tokenFCM.toString()),
-            'passengerID': box.read(BoxName.pasengerID).toString()
-          }).then((value) => print('cccc'));
-        } else {
-          Get.snackbar('You must Verify email !.'.tr, '',
-              backgroundColor: Colors.yellow[300]);
         }
-      } else if (jsonDecoeded['status'] == 'Failure') {
-        Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
-            backgroundColor: Colors.redAccent);
+      } else {
+        print('res is null');
         isloading = false;
         update();
       }
-    } else {
-      print('res is null');
     }
   }
 
@@ -87,6 +113,7 @@ class LoginController extends GetxController {
   @override
   void onInit() {
     super.onInit();
+    FirebasMessagesController().requestPermission();
     // goToMapPage();
   }
 }

lib/controller/auth/register_controller.dart

@@ -61,11 +61,10 @@ class RegisterController extends GetxController {
       'email': emailController.text,
       'token': verfyCode.text,
     });
-    var jsondecod = jsonDecode(res);
 
-    if (jsondecod['status'] == 'success') {
-      Get.offAll(() => const MapPage());
-    }
+    // if (jsondecod['status'] == 'success') {
+    Get.offAll(() => const MapPage());
+    // }
   }
 
   void register() async {