Home page

lib/main.dart

@@ -33,6 +33,11 @@ class MyApp extends StatelessWidget {
         },
       ),
       theme: ThemeData(
+        textTheme: const TextTheme(
+          bodySmall:TextStyle(),
+          bodyLarge:TextStyle(),
+          bodyMedium:TextStyle(),
+        ),
         colorScheme: ColorScheme.fromSeed(
             seedColor: Colors.deepPurple), // Set up color scheme
         useMaterial3: true, // Enable Material 3

lib/pages/auth/bloc/auth_bloc.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_event.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_state.dart';
 import 'package:syncrow_web/pages/auth/model/login_with_email_model.dart';
+import 'package:syncrow_web/pages/auth/model/region_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
 import 'package:syncrow_web/services/auth_api.dart';
@@ -22,6 +22,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     on<StopTimerEvent>(_onStopTimer);
     on<UpdateTimerEvent>(_onUpdateTimer);
     on<PasswordVisibleEvent>(_passwordVisible);
+    on<RegionInitialEvent>(_fetchRegion);
   }
 
  ////////////////////////////// forget password //////////////////////////////////
@@ -31,26 +32,22 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   final forgetFormKey = GlobalKey<FormState>();
   Timer? _timer;
   int _remainingTime = 0;
+  List<RegionModel>? regionList;
 
   Future<void> _onStartTimer(StartTimerEvent event, Emitter<AuthState> emit) async {
     if (_validateInputs(emit)) return;
-    print("StartTimerEvent received");
     if (_timer != null && _timer!.isActive) {
-      print("Timer is already active");
       return;
     }
     _remainingTime = 60;
     add(UpdateTimerEvent(
         remainingTime: _remainingTime, isButtonEnabled: false));
-    print("Timer started, initial remaining time: $_remainingTime");
     await AuthenticationAPI.sendOtp(email: forgetEmailController.text);
     _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
       _remainingTime--;
-      print("Timer tick, remaining time: $_remainingTime"); // Debug print
       if (_remainingTime <= 0) {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
-        print("Timer finished"); // Debug print
       } else {
         add(UpdateTimerEvent(
             remainingTime: _remainingTime, isButtonEnabled: false));
@@ -92,8 +89,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
 
 
-
-
   /////////////////////////////////////  login  /////////////////////////////////////
   final TextEditingController loginEmailController = TextEditingController();
   final TextEditingController loginPasswordController = TextEditingController();
@@ -108,7 +103,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   bool showValidationMessage = false;
 
   void _login(LoginButtonPressed event, Emitter<AuthState> emit) async {
-    emit(LoginLoading());
+    emit(AuthLoading());
     if (isChecked) {
       try {
         if (event.username.isEmpty || event.password.isEmpty) {
@@ -128,7 +123,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         return;
       }
       if (token.accessTokenIsNotEmpty) {
-        debugPrint('token: ${token.accessToken}');
         FlutterSecureStorage storage = const FlutterSecureStorage();
         await storage.write(
             key: Token.loginAccessTokenKey, value: token.accessToken);
@@ -148,7 +142,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   checkBoxToggle(CheckBoxEvent event, Emitter<AuthState> emit,) {
-    emit(LoginLoading());
+    emit(AuthLoading());
     isChecked = event.newValue!;
     emit(LoginInitial());
   }
@@ -161,15 +155,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _passwordVisible(PasswordVisibleEvent event, Emitter<AuthState> emit) {
-    emit(LoginLoading());
+    emit(AuthLoading());
     obscureText = !event.newValue!;
     emit(PasswordVisibleState());
   }
 
   void launchURL(String url) {
-    if (kDebugMode) {
+
-      print('Launching URL: $url');
-    }
   }
 
 
@@ -320,6 +312,18 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     }
   }
 
+  void _fetchRegion(RegionInitialEvent event, Emitter<AuthState> emit) async {
+    try {
+      emit(AuthLoading());
+      regionList = await AuthenticationAPI.fetchRegion();
+      emit(LoginSuccess());
+    } catch (e) {
+      emit( LoginFailure(error: e.toString()));
+
+    }
+  }
+
+
 }
 
 

lib/pages/auth/bloc/auth_event.dart

@@ -17,7 +17,6 @@ class LoginButtonPressed extends AuthEvent {
   List<Object> get props => [username, password];
 }
 
-
 class CheckBoxEvent extends AuthEvent {
   final bool? newValue;
 
@@ -50,3 +49,7 @@ class PasswordVisibleEvent extends AuthEvent{
 
   const PasswordVisibleEvent({required this.newValue,});
 }
+
+class RegionInitialEvent extends AuthEvent {}
+
+class SelectRegionEvent extends AuthEvent {}

lib/pages/auth/bloc/auth_state.dart

@@ -11,7 +11,7 @@ class LoginInitial extends AuthState {}
 
 class AuthTokenLoading extends AuthState {}
 
-class LoginLoading extends AuthState {}
+class AuthLoading extends AuthState {}
 
 class LoginSuccess extends AuthState {}
 
@@ -74,5 +74,3 @@ class AuthSuccess extends AuthState {}
 
 class AuthTokenSuccess extends AuthSuccess {}
 
-
-// class AuthState extends AuthState {}

lib/pages/auth/model/region_model.dart

@@ -0,0 +1,25 @@
+
+
+class RegionModel {
+  final String name;
+  final String id;
+
+  RegionModel({
+    required this.name,
+    required this.id,
+  });
+
+  factory RegionModel.fromJson(Map<String, dynamic> json) {
+    return RegionModel(
+      name: json['regionName'],
+      id: json['uuid'].toString(), // Ensure id is a String
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'regionName': name,
+      'uuid': id,
+    };
+  }
+}

lib/pages/auth/view/forget_password_web_page.dart

@@ -19,9 +19,7 @@ class ForgetPasswordWebPage extends StatelessWidget {
         create: (context) => AuthBloc(),
         child: BlocConsumer<AuthBloc, AuthState>(
           listener: (context, state) {
-            if (state is LoadingForgetState) {
+          if  (state is SuccessForgetState){
-
-            } else if  (state is SuccessForgetState){
               Navigator.of(context).pop();
             }
             else if (state is FailureForgetState) {
@@ -47,30 +45,32 @@ class ForgetPasswordWebPage extends StatelessWidget {
   Widget _buildForm(BuildContext context, AuthState state) {
     final forgetBloc = BlocProvider.of<AuthBloc>(context);
     return FirstLayer(
-      second: Container(
+      second: Center(
+        child: ListView(
+          children: [
+            Container(
               padding:const EdgeInsets.all(50) ,
-        margin: const EdgeInsets.all(50),
+              margin: const EdgeInsets.all(90),
               decoration: BoxDecoration(
                 color: Colors.black.withOpacity(0.3),
                 borderRadius: const BorderRadius.all(Radius.circular(20)),
               ),
               child: Center(
-          child: ListView(
+                child: Row(
-            shrinkWrap: true,
-            children: [
-              Row(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     const Spacer(),
                     Expanded(
-                    flex: 2,
+                      flex: 3,
                       child: SvgPicture.asset(
                         Assets.loginLogo,
                       ),
                     ),
                     const Spacer(),
-                  Container(
+                    Expanded(
+                      flex: 3,
+                      child: Container(
                         decoration: BoxDecoration(
                           color: Colors.white.withOpacity(0.1),
                           borderRadius: const BorderRadius.all(Radius.circular(30)),
@@ -79,7 +79,6 @@ class ForgetPasswordWebPage extends StatelessWidget {
                         child: Form(
                           key: forgetBloc.forgetFormKey,
                           child: Padding(
-
                             padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 25),
                             child: Column(
                               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@@ -109,7 +108,6 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                     ),
                                     const SizedBox(height: 10),
                                     SizedBox(
-                                  width: MediaQuery.of(context).size.width * 0.2,
                                       child: DropdownButtonFormField<String>(
                                         validator: forgetBloc.validateRegion,
                                         icon: const Icon(
@@ -118,11 +116,16 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                         decoration: textBoxDecoration()!.copyWith(
                                           hintText: null,
                                         ),
-                                    hint: const Align(
+                                        hint: SizedBox(
+                                          width: MediaQuery.sizeOf(context).width * 0.11,
+                                          child: const Align(
                                             alignment: Alignment.centerLeft,
                                             child: Text(
                                               'Select your region/country',
                                               textAlign: TextAlign.center,
+                                              overflow: TextOverflow.ellipsis,
+
+                                            ),
                                           ),
                                         ),
                                         isDense: true,
@@ -146,10 +149,10 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                   mainAxisAlignment: MainAxisAlignment.start,
                                   children: [
                                     Text("Account",
-                                  style: smallTextStyle,),
+                                      style: smallTextStyle,
+                                    ),
                                     const SizedBox(height: 10),
                                     SizedBox(
-                                  width: MediaQuery.sizeOf(context).width * 0.2,
                                       child: TextFormField(
                                         validator: forgetBloc.validateEmail,
                                         controller: forgetBloc.forgetEmailController,
@@ -168,7 +171,6 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                       style: smallTextStyle,),
                                     const SizedBox(height: 10),
                                     SizedBox(
-                                  width: MediaQuery.sizeOf(context).width * 0.2,
                                       child: TextFormField(
                                         validator: forgetBloc.validateCode,
                                         keyboardType: TextInputType.visiblePassword,
@@ -208,7 +210,6 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                       style: smallTextStyle,),
                                     const SizedBox(height: 10),
                                     SizedBox(
-                                  width: MediaQuery.sizeOf(context).width * 0.2,
                                       child: TextFormField(
                                         validator: forgetBloc.passwordValidator,
                                         keyboardType: TextInputType.visiblePassword,
@@ -266,13 +267,15 @@ class ForgetPasswordWebPage extends StatelessWidget {
                           ),
                         ),
                       ),
+                    ),
                     const Spacer(),
                   ],
                 ),
+              ),
+            ),
           ],
         ),
-        ),
+      )
-      ),
     );
   }
 }

lib/pages/auth/view/login_mobile_page.dart

@@ -15,7 +15,6 @@ import 'package:syncrow_web/utils/style.dart';
 
 class LoginMobilePage extends StatelessWidget {
   const LoginMobilePage({super.key});
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -39,7 +38,7 @@ class LoginMobilePage extends StatelessWidget {
             }
           },
           builder: (context, state) {
-            if (state is LoginLoading) {
+            if (state is AuthLoading) {
               return const Center(child: CircularProgressIndicator());
             } else {
               return _buildLoginForm(context);
@@ -311,90 +310,6 @@ class LoginMobilePage extends StatelessWidget {
                                 },
                               ),
                             ),
-                            // Padding(
-                            //   padding: const EdgeInsets.all(5.0),
-                            //   child: SizedBox(
-                            //     width: MediaQuery.sizeOf(context).width * 0.2,
-                            //     child: Row(
-                            //       mainAxisAlignment: MainAxisAlignment.center,
-                            //       crossAxisAlignment: CrossAxisAlignment.center,
-                            //       children: [
-                            //         Expanded(child: Image.asset(Assets.liftLine)),
-                            //         Expanded(
-                            //             child: Padding(
-                            //               padding: const EdgeInsets.all(5.0),
-                            //               child: Text('Or sign in with',
-                            //                 style: smallTextStyle.copyWith(fontSize: 10),
-                            //               ),
-                            //             )
-                            //         ),
-                            //         Expanded(child: Image.asset(Assets.rightLine)),
-                            //       ],
-                            //     ),
-                            //   ),
-                            // ),
-                            // SizedBox(
-                            //   width: MediaQuery.sizeOf(context).width * 0.2,
-                            //   child: Row(
-                            //     crossAxisAlignment: CrossAxisAlignment.center,
-                            //     children: [
-                            //       Expanded(
-                            //         child: Container(
-                            //           decoration: containerDecoration,
-                            //           child:InkWell(
-                            //             child: Padding(
-                            //               padding: const EdgeInsets.all(8.0),
-                            //               child:  Row(
-                            //                 mainAxisAlignment: MainAxisAlignment.spaceAround,
-                            //                 crossAxisAlignment: CrossAxisAlignment.center,
-                            //                 children: [
-                            //                   SvgPicture.asset(
-                            //                     Assets.google,
-                            //                     fit: BoxFit.cover,
-                            //                   ),
-                            //                   const Flexible(
-                            //                     child: Text('Google',
-                            //                       style: TextStyle(color: Colors.black),
-                            //                     ),
-                            //                   ),
-                            //                 ],
-                            //               ),
-                            //             ),
-                            //             onTap: () {},
-                            //           ),
-                            //         ),
-                            //       ),
-                            //       SizedBox(width: 10,),
-                            //       Expanded(
-                            //         child: Container(
-                            //           decoration: containerDecoration,
-                            //           child:InkWell(
-                            //             child: Padding(
-                            //               padding: const EdgeInsets.all(8.0),
-                            //               child:  Row(
-                            //                 mainAxisAlignment: MainAxisAlignment.spaceAround,
-                            //                 crossAxisAlignment: CrossAxisAlignment.center,
-                            //                 children: [
-                            //                   SvgPicture.asset(
-                            //                     Assets.facebook,
-                            //                     fit: BoxFit.cover,
-                            //                   ),
-                            //                   const Flexible(
-                            //                     child: Text('Facebook',
-                            //                       style: TextStyle(color: Colors.black),
-                            //                     ),
-                            //                   ),
-                            //                 ],
-                            //               ),
-                            //             ),
-                            //             onTap: () {},
-                            //           ),
-                            //         ),
-                            //       ),
-                            //
-                            //     ],
-                            //   ),
-                            // ),
                             const SizedBox(
                               child: Row(
                                 mainAxisAlignment: MainAxisAlignment.center,

lib/pages/auth/view/login_web_page.dart

@@ -22,7 +22,7 @@ class LoginWebPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       body: BlocProvider(
-        create: (context) => AuthBloc(),
+        create: (BuildContext context) => AuthBloc()..add(RegionInitialEvent()),
         child: BlocConsumer<AuthBloc, AuthState>(
           listener: (context, state) {
             if (state is LoginSuccess) {
@@ -41,7 +41,7 @@ class LoginWebPage extends StatelessWidget {
             }
           },
           builder: (context, state) {
-            if (state is LoginLoading) {
+            if (state is AuthLoading) {
               return const Center(child: CircularProgressIndicator());
             } else {
               return _buildLoginForm(context,state);
@@ -55,29 +55,33 @@ class LoginWebPage extends StatelessWidget {
   Widget _buildLoginForm(BuildContext context,AuthState state) {
     final loginBloc = BlocProvider.of<AuthBloc>(context);
     return FirstLayer(
-      second: Container(
+      second: Center(
-        margin: const EdgeInsets.all(50),
+        child: ListView(
+          shrinkWrap: true,
+          children: [
+            Container(
+              padding:const EdgeInsets.all(50) ,
+              margin: const EdgeInsets.all(90),
               decoration: BoxDecoration(
                 color: Colors.black.withOpacity(0.3),
                 borderRadius: const BorderRadius.all(Radius.circular(20)),
               ),
               child: Center(
-            child: ListView(
+                child:Row(
-              shrinkWrap: true,
-              children: [
-                Row(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     const Spacer(),
                     Expanded(
-                      flex: 2,
+                      flex: 3,
                       child: SvgPicture.asset(
                         Assets.loginLogo,
                       ),
                     ),
                     const Spacer(),
-                    Container(
+                    Expanded(
+                     flex: 3,
+                     child:  Container(
                          decoration: BoxDecoration(
                              color: Colors.white.withOpacity(0.1),
                              borderRadius: const BorderRadius.all(Radius.circular(30)),
@@ -107,24 +111,25 @@ class LoginWebPage extends StatelessWidget {
                                      "Country/Region",
                                      style: smallTextStyle,
                                    ),
-                                    const SizedBox(
+                                     const SizedBox(height: 10,),
-                                      height: 10,
-                                    ),
                                      SizedBox(
-                                      width: MediaQuery.of(context).size.width * 0.2,
                                        child: DropdownButtonFormField<String>(
                                          validator:loginBloc.validateRegion ,
                                          icon: const Icon(
                                            Icons.keyboard_arrow_down_outlined,
                                          ),
                                          decoration: textBoxDecoration()!.copyWith(
-                                          hintText: null,
+                                           hintText: null,),
-                                        ),
+                                         hint: SizedBox(
-                                        hint: const Align(
+                                           width: MediaQuery.sizeOf(context).width * 0.11,
+                                           child: const Align(
                                              alignment: Alignment.centerLeft,
                                              child: Text(
                                                'Select your region/country',
                                                textAlign: TextAlign.center,
+                                               style: TextStyle(fontSize: 14),
+                                               overflow: TextOverflow.ellipsis,
+                                             ),
                                            ),
                                          ),
                                          isDense: true,
@@ -154,7 +159,6 @@ class LoginWebPage extends StatelessWidget {
                                        height: 10,
                                      ),
                                      SizedBox(
-                                      width: MediaQuery.sizeOf(context).width * 0.2,
                                        child: TextFormField(
                                          validator:loginBloc.validateEmail ,
                                          controller:loginBloc.loginEmailController,
@@ -174,7 +178,6 @@ class LoginWebPage extends StatelessWidget {
                                           height: 10,
                                         ),
                                         SizedBox(
-                                      width: MediaQuery.sizeOf(context).width * 0.2,
                                           child: TextFormField(
                                             validator:loginBloc.validatePassword,
                                             obscureText:loginBloc.obscureText,
@@ -205,7 +208,6 @@ class LoginWebPage extends StatelessWidget {
                                       height: 20,
                                     ),
                                     SizedBox(
-                                  width: MediaQuery.of(context).size.width * 0.2,
                                       child: Row(
                                         mainAxisAlignment: MainAxisAlignment.end,
                                         children: [
@@ -240,7 +242,7 @@ class LoginWebPage extends StatelessWidget {
                                           ),
                                         ),
                                         SizedBox(
-                                      width: MediaQuery.sizeOf(context).width * 0.2,
+                                          width: MediaQuery.sizeOf(context).width * 0.16,
                                           child: RichText(
                                             text: TextSpan(
                                               text: 'Agree to ',
@@ -249,7 +251,7 @@ class LoginWebPage extends StatelessWidget {
                                                 TextSpan(
                                                   text: '(Terms of Service)',
                                                   style: const TextStyle(
-                                                  color: Colors.black),
+                                                      color: Colors.black,),
                                                   recognizer: TapGestureRecognizer()
                                                     ..onTap = () {
                                                       loginBloc.launchURL(
@@ -304,115 +306,14 @@ class LoginWebPage extends StatelessWidget {
                                 ),
                               ),
                             )
-                    ),
+                        )),
                     const Spacer(),
                   ],
-                ),
+                ),),
+            )
           ],
-            )),
+        ),
       ),
     );
   }
 }
-// Padding(
-//   padding: const EdgeInsets.all(5.0),
-//   child: SizedBox(
-//     width: MediaQuery.sizeOf(context).width * 0.2,
-//     child: Row(
-//       mainAxisAlignment: MainAxisAlignment.center,
-//       crossAxisAlignment: CrossAxisAlignment.center,
-//       children: [
-//         Expanded(child: Image.asset(Assets.liftLine)),
-//         Expanded(
-//             child: Padding(
-//               padding: const EdgeInsets.all(5.0),
-//               child: Text('Or sign in with',
-//                 style: smallTextStyle.copyWith(fontSize: 10),
-//               ),
-//             )
-//         ),
-//         Expanded(child: Image.asset(Assets.rightLine)),
-//       ],
-//     ),
-//   ),
-// ),
-// SizedBox(
-//   width: MediaQuery.sizeOf(context).width * 0.2,
-//   child: Row(
-//     crossAxisAlignment: CrossAxisAlignment.center,
-//     children: [
-//       Expanded(
-//         child: Container(
-//           decoration: containerDecoration,
-//           child:InkWell(
-//             child: Padding(
-//               padding: const EdgeInsets.all(8.0),
-//               child:  Row(
-//                 mainAxisAlignment: MainAxisAlignment.spaceAround,
-//                 crossAxisAlignment: CrossAxisAlignment.center,
-//                 children: [
-//                   SvgPicture.asset(
-//                     Assets.google,
-//                     fit: BoxFit.cover,
-//                   ),
-//                   const Flexible(
-//                     child: Text('Google',
-//                       style: TextStyle(color: Colors.black),
-//                     ),
-//                   ),
-//                 ],
-//               ),
-//             ),
-//             onTap: () {},
-//           ),
-//         ),
-//       ),
-//       SizedBox(width: 10,),
-//       Expanded(
-//         child: Container(
-//           decoration: containerDecoration,
-//           child:InkWell(
-//             child: Padding(
-//               padding: const EdgeInsets.all(8.0),
-//               child:  Row(
-//                 mainAxisAlignment: MainAxisAlignment.spaceAround,
-//                 crossAxisAlignment: CrossAxisAlignment.center,
-//                 children: [
-//                   SvgPicture.asset(
-//                     Assets.facebook,
-//                     fit: BoxFit.cover,
-//                   ),
-//                   const Flexible(
-//                     child: Text('Facebook',
-//                       style: TextStyle(color: Colors.black),
-//                     ),
-//                   ),
-//                 ],
-//               ),
-//             ),
-//             onTap: () {},
-//           ),
-//         ),
-//       ),
-//
-//     ],
-//   ),
-// ),
-// SizedBox(
-//   width: MediaQuery.sizeOf(context).width * 0.2,
-//   child: const Row(
-//     mainAxisAlignment: MainAxisAlignment.center,
-//     crossAxisAlignment: CrossAxisAlignment.center,
-//     children: [
-//       Flexible(
-//           child: Text(
-//             "Don't you have an account? ",
-//             style: TextStyle(color: Colors.white),
-//           )),
-//       Flexible(
-//           child: Text(
-//             "Sign up",
-//           )),
-//     ],
-//   ),
-// )

lib/services/api/http_interceptor.dart

@@ -13,6 +13,7 @@ class HTTPInterceptor extends InterceptorsWrapper {
 
   List<String> headerExclusionListOfAddedParameters = [
     ApiEndpoints.login,
+    ApiEndpoints.getRegion
   ];
 
   @override

lib/services/auth_api.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:syncrow_web/pages/auth/model/region_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
@@ -17,45 +18,32 @@ class AuthenticationAPI {
     return response;
   }
 
-  static Future forgetPassword({ required var email, required var password}) async {
+  static Future forgetPassword(
+      {required var email, required var password}) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.forgetPassword,
-        body: {
+        body: {"email": email, "password": password},
-          "email": email,
-          "password": password
-        },
         showServerMessage: true,
-        expectedResponseModel: (json) {
+        expectedResponseModel: (json) {});
-        });
     return response;
   }
 
   static Future sendOtp({required var email}) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.sendOtp,
-        body: {
+        body: {"email": email, "type": "VERIFICATION"},
-          "email": email,
-          "type": "VERIFICATION"
-        },
         showServerMessage: true,
-        expectedResponseModel: (json) {
+        expectedResponseModel: (json) {});
-          print('json===$json');
-        });
-
     return response;
   }
 
-  static Future<bool> verifyOtp({ required String email, required String otpCode}) async {
+  static Future<bool> verifyOtp(
+      {required String email, required String otpCode}) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.verifyOtp,
-        body: {
+        body: {"email": email, "type": "VERIFICATION", "otpCode": otpCode},
-            "email": email,
-            "type": "VERIFICATION",
-            "otpCode": otpCode
-        },
         showServerMessage: true,
         expectedResponseModel: (json) {
-        print('json===${json['message']}');
           if (json['message'] == 'Otp Verified Successfully') {
             return true;
           } else {
@@ -64,4 +52,16 @@ class AuthenticationAPI {
         });
     return response;
   }
+
+  static Future<List<RegionModel>> fetchRegion() async {
+    final response = await HTTPService().get(
+        path: ApiEndpoints.getRegion,
+        showServerMessage: true,
+        expectedResponseModel: (json) {
+          return (json as List).map((zone) => RegionModel.fromJson(zone)).toList();
+        }
+    );
+    return response as List<RegionModel>;
+  }
+
 }

lib/utils/constants/api_const.dart

@@ -8,4 +8,5 @@ abstract class ApiEndpoints {
   static const String forgetPassword = '$baseUrl/authentication/user/forget-password';
   static const String sendOtp = '$baseUrl/authentication/user/send-otp';
   static const String verifyOtp = '$baseUrl/authentication/user/verify-otp';
+  static const String getRegion = '$baseUrl/region';
 }