From 908b5979a80a64ce7e909266cb9dc5fa64b3aabf Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Mon, 20 May 2024 02:48:27 +0300 Subject: [PATCH] 5/20/1 --- .../auth/captin/login_captin_controller.dart | 12 +++++++----- .../auth/captin/register_captin_controller.dart | 3 ++- lib/controller/auth/google_sign.dart | 12 ++++++------ lib/controller/functions/gemeni.dart | 1 - lib/controller/home/splash_screen_controlle.dart | 6 ++++-- lib/views/auth/captin/cards/egypt_card_a_i.dart | 1 - 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lib/controller/auth/captin/login_captin_controller.dart b/lib/controller/auth/captin/login_captin_controller.dart index 3009cb9..805adca 100644 --- a/lib/controller/auth/captin/login_captin_controller.dart +++ b/lib/controller/auth/captin/login_captin_controller.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:math'; import 'package:SEFER/controller/functions/location_background_controller.dart'; +import 'package:SEFER/views/auth/captin/cards/sms_signup.dart'; import 'package:SEFER/views/auth/captin/register_captin.dart'; import 'package:flutter/material.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; @@ -124,10 +125,10 @@ class LoginCaptinController extends GetxController { print(res); if (res == 'failure') { //Failure - Get.offAll(const RegisterCaptin()); + Get.offAll(SmsSignupEgypt()); isloading = false; update(); - Get.snackbar('Failure', '', backgroundColor: Colors.red); + // Get.snackbar('Failure', '', backgroundColor: Colors.red); } else { var jsonDecoeded = jsonDecode(res); // print(jsonDecoeded['data'][0]['is_verified']); @@ -135,10 +136,11 @@ class LoginCaptinController extends GetxController { if (jsonDecoeded['status'] == 'success' && jsonDecoeded['data'][0]['is_verified'] == 1) { // - Get.offAll(const MyApp()); + Get.off(HomeCaptain()); } else { - Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'], - backgroundColor: Colors.redAccent); + Get.offAll(SmsSignupEgypt()); + // Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'], + // backgroundColor: Colors.redAccent); isloading = false; update(); } diff --git a/lib/controller/auth/captin/register_captin_controller.dart b/lib/controller/auth/captin/register_captin_controller.dart index a6e297e..0319aec 100644 --- a/lib/controller/auth/captin/register_captin_controller.dart +++ b/lib/controller/auth/captin/register_captin_controller.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:math'; import 'package:SEFER/controller/auth/captin/login_captin_controller.dart'; +import 'package:SEFER/views/auth/captin/cards/egypt_card_a_i.dart'; import 'package:SEFER/views/auth/captin/register_captin.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -112,7 +113,7 @@ class RegisterCaptainController extends GetxController { link: AppLink.updateAccountBank, payload: {'phone': '+2${phoneController.text}'}); if (jsonDecode(res1)['status'] == 'success') { - Get.to(LoginCaptin()); + Get.to(EgyptCardAI()); } } } diff --git a/lib/controller/auth/google_sign.dart b/lib/controller/auth/google_sign.dart index 2dcd1d2..caa69c2 100644 --- a/lib/controller/auth/google_sign.dart +++ b/lib/controller/auth/google_sign.dart @@ -1,11 +1,11 @@ import 'package:SEFER/constant/box_name.dart'; import 'package:SEFER/controller/auth/captin/login_captin_controller.dart'; import 'package:SEFER/main.dart'; +import 'package:SEFER/views/auth/captin/cards/sms_signup.dart'; import 'package:get/get.dart'; import 'package:google_sign_in/google_sign_in.dart'; import '../../views/auth/captin/ai_page.dart'; -import '../../views/auth/captin/cards/egypt_card_a_i.dart'; class GoogleSignInHelper { static final GoogleSignIn _googleSignIn = GoogleSignIn( @@ -22,7 +22,7 @@ class GoogleSignInHelper { if (googleUser != null) { await _handleSignUp(googleUser); if (box.read(BoxName.countryCode) == 'Egypt') { - Get.to(() => EgyptCardAI()); + Get.to(() => SmsSignupEgypt()); } else if (box.read(BoxName.countryCode) == 'Jordan') { Get.to(() => AiPage()); } @@ -76,16 +76,16 @@ class GoogleSignInHelper { // Store driver information box.write(BoxName.driverID, user.id); box.write(BoxName.emailDriver, user.email); - box.write(BoxName.nameDriver, user.displayName); - box.write(BoxName.driverPhotoUrl, user.photoUrl); + // box.write(BoxName.nameDriver, user.displayName); + // box.write(BoxName.driverPhotoUrl, user.photoUrl); // Perform any additional sign-up tasks or API calls here // For example, you can send the user data to your server for registration print('driverID = ${box.read(BoxName.driverID)}'); print('emailDriver = ${box.read(BoxName.emailDriver)}'); - print('nameDriver = ${box.read(BoxName.nameDriver)}'); - print('driverPhotoUrl = ${box.read(BoxName.driverPhotoUrl)}'); + // print('nameDriver = ${box.read(BoxName.nameDriver)}'); + // print('driverPhotoUrl = ${box.read(BoxName.driverPhotoUrl)}'); } // Method to handle sign-out process diff --git a/lib/controller/functions/gemeni.dart b/lib/controller/functions/gemeni.dart index f99e385..f38188f 100644 --- a/lib/controller/functions/gemeni.dart +++ b/lib/controller/functions/gemeni.dart @@ -6,7 +6,6 @@ import 'package:SEFER/constant/style.dart'; import 'package:SEFER/controller/functions/crud.dart'; import 'package:SEFER/controller/functions/device_info.dart'; import 'package:SEFER/main.dart'; -import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:image_cropper/image_cropper.dart'; diff --git a/lib/controller/home/splash_screen_controlle.dart b/lib/controller/home/splash_screen_controlle.dart index c6947f1..39185c9 100644 --- a/lib/controller/home/splash_screen_controlle.dart +++ b/lib/controller/home/splash_screen_controlle.dart @@ -47,12 +47,14 @@ class SplashScreenController extends GetxController Timer(const Duration(seconds: 5), () { box.read(BoxName.onBoarding) == null ? Get.off(() => OnBoardingPage()) - : box.read(BoxName.emailDriver) != null && + : box.read(BoxName.emailDriver) != null + // todo + && box.read(BoxName.deviceInfo) != null && box.read(BoxName.phoneVerified) == '1' // ? Get.off(() => SmsSignupEgypt()) ? Get.off(() => HomeCaptain()) - : Get.off(() => SmsSignupEgypt()); + : Get.off(() => LoginCaptin()); }); } diff --git a/lib/views/auth/captin/cards/egypt_card_a_i.dart b/lib/views/auth/captin/cards/egypt_card_a_i.dart index e2ae574..085f01a 100644 --- a/lib/views/auth/captin/cards/egypt_card_a_i.dart +++ b/lib/views/auth/captin/cards/egypt_card_a_i.dart @@ -2,7 +2,6 @@ import 'package:SEFER/controller/functions/gemeni.dart'; import 'package:SEFER/controller/functions/tts.dart'; import 'package:SEFER/views/widgets/elevated_btn.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:get/get.dart'; import '../../../../constant/colors.dart';