diff --git a/lib/api/api_client.dart b/lib/api/api_client.dart index b87e842..8b0d887 100644 --- a/lib/api/api_client.dart +++ b/lib/api/api_client.dart @@ -10,8 +10,8 @@ import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/exceptions/api_exception.dart'; import 'package:mc_common_app/main.dart'; -import 'package:mc_common_app/models/user/refresh_token.dart'; -import 'package:mc_common_app/models/user/user.dart'; +import 'package:mc_common_app/models/user_models/refresh_token.dart'; +import 'package:mc_common_app/models/user_models/user.dart'; import 'package:mc_common_app/utils/shared_prefrence.dart'; typedef FactoryConstructor = U Function(dynamic); diff --git a/lib/classes/app_state.dart b/lib/classes/app_state.dart index 208654d..02ba4b9 100644 --- a/lib/classes/app_state.dart +++ b/lib/classes/app_state.dart @@ -1,6 +1,6 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:mc_common_app/models/general/post_params_model.dart'; -import 'package:mc_common_app/models/user/user.dart'; +import 'package:mc_common_app/models/user_models/user.dart'; import 'package:mc_common_app/utils/enums.dart'; class AppState { diff --git a/lib/config/routes.dart b/lib/config/routes.dart index e934484..0db2a2c 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -1,4 +1,4 @@ -import 'package:mc_common_app/models/user/register_user.dart'; +import 'package:mc_common_app/models/user_models/register_user.dart'; import 'package:mc_common_app/views/user/change_email_page.dart'; import 'package:mc_common_app/views/user/change_mobile_page.dart'; diff --git a/lib/models/appointments_models/appointment_list_model.dart b/lib/models/appointments_models/appointment_list_model.dart index 091a898..d3da5c0 100644 --- a/lib/models/appointments_models/appointment_list_model.dart +++ b/lib/models/appointments_models/appointment_list_model.dart @@ -1,5 +1,5 @@ import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/utils/enums.dart'; class AppointmentListModel { diff --git a/lib/models/appointments_models/schedule_model.dart b/lib/models/appointments_models/schedule_model.dart index 47c13e6..2f65cd2 100644 --- a/lib/models/appointments_models/schedule_model.dart +++ b/lib/models/appointments_models/schedule_model.dart @@ -4,7 +4,7 @@ import 'dart:convert'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; Schedule scheduleFromJson(String str) => Schedule.fromJson(json.decode(str)); diff --git a/lib/models/appointments_models/service_schedule_model.dart b/lib/models/appointments_models/service_schedule_model.dart index 4e3671a..8a30e93 100644 --- a/lib/models/appointments_models/service_schedule_model.dart +++ b/lib/models/appointments_models/service_schedule_model.dart @@ -1,5 +1,5 @@ import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/models/general/widgets_models.dart'; class CustomTimeDateSlotModel { diff --git a/lib/models/chat/cat_message_model.dart b/lib/models/chat_models/cat_message_model.dart similarity index 100% rename from lib/models/chat/cat_message_model.dart rename to lib/models/chat_models/cat_message_model.dart diff --git a/lib/models/provider_branches_models/branch_detail_model.dart b/lib/models/provider_branches_models/branch_detail_model.dart index 70768c3..6ed2ed9 100644 --- a/lib/models/provider_branches_models/branch_detail_model.dart +++ b/lib/models/provider_branches_models/branch_detail_model.dart @@ -1,6 +1,6 @@ import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/models/provider_branches_models/profile/categroy.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/utils/enums.dart'; class BranchDetailModel { diff --git a/lib/models/provider_branches_models/profile/categroy.dart b/lib/models/provider_branches_models/profile/categroy.dart index 33feaae..cca86fd 100644 --- a/lib/models/provider_branches_models/profile/categroy.dart +++ b/lib/models/provider_branches_models/profile/categroy.dart @@ -6,7 +6,7 @@ import 'dart:convert'; import 'package:equatable/equatable.dart'; import 'package:mc_common_app/models/provider_branches_models/provider_profile_model.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; Category categoryFromJson(String str) => Category.fromJson(json.decode(str)); diff --git a/lib/models/requests/offers_model.dart b/lib/models/requests_models/offers_model.dart similarity index 100% rename from lib/models/requests/offers_model.dart rename to lib/models/requests_models/offers_model.dart diff --git a/lib/models/requests/request_model.dart b/lib/models/requests_models/request_model.dart similarity index 100% rename from lib/models/requests/request_model.dart rename to lib/models/requests_models/request_model.dart diff --git a/lib/models/services/item_model.dart b/lib/models/services_models/item_model.dart similarity index 100% rename from lib/models/services/item_model.dart rename to lib/models/services_models/item_model.dart diff --git a/lib/models/services/service_model.dart b/lib/models/services_models/service_model.dart similarity index 98% rename from lib/models/services/service_model.dart rename to lib/models/services_models/service_model.dart index 2581b63..d158bee 100644 --- a/lib/models/services/service_model.dart +++ b/lib/models/services_models/service_model.dart @@ -1,4 +1,4 @@ -import 'package:mc_common_app/models/services/item_model.dart'; +import 'package:mc_common_app/models/services_models/item_model.dart'; class ServiceModel { final int? serviceProviderServiceId; diff --git a/lib/models/subscriptions_models/subscription_model.dart b/lib/models/subscriptions_models/subscription_model.dart new file mode 100644 index 0000000..d192566 --- /dev/null +++ b/lib/models/subscriptions_models/subscription_model.dart @@ -0,0 +1,125 @@ +// To parse this JSON data, do +// +// final subscription = subscriptionFromJson(jsonString); + +import 'dart:convert'; + +Subscription subscriptionFromJson(String str) => Subscription.fromJson(json.decode(str)); + +String subscriptionToJson(Subscription data) => json.encode(data.toJson()); + +class SubscriptionModel { + SubscriptionModel({ + this.messageStatus, + this.totalItemsCount, + this.data, + this.message, + }); + + int? messageStatus; + int? totalItemsCount; + List? data; + String? message; + + factory SubscriptionModel.fromJson(Map json) => SubscriptionModel( + messageStatus: json["messageStatus"], + totalItemsCount: json["totalItemsCount"], + data: json["data"] == null ? [] : List.from(json["data"]!.map((x) => Subscription.fromJson(x))), + message: json["message"], + ); + + Map toJson() => { + "messageStatus": messageStatus, + "totalItemsCount": totalItemsCount, + "data": data == null ? [] : List.from(data!.map((x) => x.toJson())), + "message": message, + }; +} + +class Subscription { + Subscription({ + this.id, + this.name, + this.description, + this.durationName, + this.durationDays, + this.price, + this.currency, + this.numberOfBranches, + this.numberOfSubUsers, + this.numberOfAds, + this.countryId, + this.countryName, + this.isSubscribed, + this.subscriptionAppliedId, + this.serviceProviderId, + this.dateStart, + this.dateEnd, + this.isExpired, + this.isActive, + }); + + int? id; + String? name; + String? description; + String? durationName; + int? durationDays; + double? price; + String? currency; + int? numberOfBranches; + int? numberOfSubUsers; + int? numberOfAds; + int? countryId; + String? countryName; + bool? isSubscribed; + int? subscriptionAppliedId; + int? serviceProviderId; + DateTime? dateStart; + DateTime? dateEnd; + bool? isExpired; + bool? isActive; + + factory Subscription.fromJson(Map json) => Subscription( + id: json["id"], + name: json["name"], + description: json["description"], + durationName: json["durationName"], + durationDays: json["durationDays"], + price: json["price"]?.toDouble(), + currency: json["currency"], + numberOfBranches: json["numberOfBranches"], + numberOfSubUsers: json["numberOfSubUsers"], + numberOfAds: json["numberOfAds"], + countryId: json["countryID"], + countryName: json["countryName"]!, + isSubscribed: json["isSubscribed"], + subscriptionAppliedId: json["subscriptionAppliedID"], + serviceProviderId: json["serviceProviderID"], + dateStart: json["dateStart"] == null ? null : DateTime.parse(json["dateStart"]), + dateEnd: json["dateEnd"] == null ? null : DateTime.parse(json["dateEnd"]), + isExpired: json["isExpired"], + isActive: json["isActive"], + ); + + Map toJson() => { + "id": id, + "name": name, + "description": description, + "durationName": durationName, + "durationDays": durationDays, + "price": price, + "currency": currency, + "numberOfBranches": numberOfBranches, + "numberOfSubUsers": numberOfSubUsers, + "numberOfAds": numberOfAds, + "countryID": countryId, + "countryName": countryName, + "isSubscribed": isSubscribed, + "subscriptionAppliedID": subscriptionAppliedId, + "serviceProviderID": serviceProviderId, + "dateStart": dateStart?.toIso8601String(), + "dateEnd": dateEnd?.toIso8601String(), + "isExpired": isExpired, + "isActive": isActive, + }; +} diff --git a/lib/models/user/basic_otp.dart b/lib/models/user_models/basic_otp.dart similarity index 100% rename from lib/models/user/basic_otp.dart rename to lib/models/user_models/basic_otp.dart diff --git a/lib/models/user/branch_user.dart b/lib/models/user_models/branch_user.dart similarity index 100% rename from lib/models/user/branch_user.dart rename to lib/models/user_models/branch_user.dart diff --git a/lib/models/user/change_email.dart b/lib/models/user_models/change_email.dart similarity index 100% rename from lib/models/user/change_email.dart rename to lib/models/user_models/change_email.dart diff --git a/lib/models/user/change_mobile.dart b/lib/models/user_models/change_mobile.dart similarity index 100% rename from lib/models/user/change_mobile.dart rename to lib/models/user_models/change_mobile.dart diff --git a/lib/models/user/change_password.dart b/lib/models/user_models/change_password.dart similarity index 100% rename from lib/models/user/change_password.dart rename to lib/models/user_models/change_password.dart diff --git a/lib/models/user/cities.dart b/lib/models/user_models/cities.dart similarity index 100% rename from lib/models/user/cities.dart rename to lib/models/user_models/cities.dart diff --git a/lib/models/user/confirm_email.dart b/lib/models/user_models/confirm_email.dart similarity index 100% rename from lib/models/user/confirm_email.dart rename to lib/models/user_models/confirm_email.dart diff --git a/lib/models/user/confirm_mobile.dart b/lib/models/user_models/confirm_mobile.dart similarity index 100% rename from lib/models/user/confirm_mobile.dart rename to lib/models/user_models/confirm_mobile.dart diff --git a/lib/models/user/confirm_password.dart b/lib/models/user_models/confirm_password.dart similarity index 100% rename from lib/models/user/confirm_password.dart rename to lib/models/user_models/confirm_password.dart diff --git a/lib/models/user/country.dart b/lib/models/user_models/country.dart similarity index 100% rename from lib/models/user/country.dart rename to lib/models/user_models/country.dart diff --git a/lib/models/user/email_verify.dart b/lib/models/user_models/email_verify.dart similarity index 100% rename from lib/models/user/email_verify.dart rename to lib/models/user_models/email_verify.dart diff --git a/lib/models/user/email_verify_otp.dart b/lib/models/user_models/email_verify_otp.dart similarity index 100% rename from lib/models/user/email_verify_otp.dart rename to lib/models/user_models/email_verify_otp.dart diff --git a/lib/models/user/forget_password_otp_compare.dart b/lib/models/user_models/forget_password_otp_compare.dart similarity index 100% rename from lib/models/user/forget_password_otp_compare.dart rename to lib/models/user_models/forget_password_otp_compare.dart diff --git a/lib/models/user/forget_password_otp_request.dart b/lib/models/user_models/forget_password_otp_request.dart similarity index 100% rename from lib/models/user/forget_password_otp_request.dart rename to lib/models/user_models/forget_password_otp_request.dart diff --git a/lib/models/user/image_response.dart b/lib/models/user_models/image_response.dart similarity index 100% rename from lib/models/user/image_response.dart rename to lib/models/user_models/image_response.dart diff --git a/lib/models/user/login_password.dart b/lib/models/user_models/login_password.dart similarity index 100% rename from lib/models/user/login_password.dart rename to lib/models/user_models/login_password.dart diff --git a/lib/models/user/refresh_token.dart b/lib/models/user_models/refresh_token.dart similarity index 100% rename from lib/models/user/refresh_token.dart rename to lib/models/user_models/refresh_token.dart diff --git a/lib/models/user/register_user.dart b/lib/models/user_models/register_user.dart similarity index 100% rename from lib/models/user/register_user.dart rename to lib/models/user_models/register_user.dart diff --git a/lib/models/user/role.dart b/lib/models/user_models/role.dart similarity index 100% rename from lib/models/user/role.dart rename to lib/models/user_models/role.dart diff --git a/lib/models/user/user.dart b/lib/models/user_models/user.dart similarity index 100% rename from lib/models/user/user.dart rename to lib/models/user_models/user.dart diff --git a/lib/models/user/verify_email.dart b/lib/models/user_models/verify_email.dart similarity index 100% rename from lib/models/user/verify_email.dart rename to lib/models/user_models/verify_email.dart diff --git a/lib/models/user/verify_email_otp.dart b/lib/models/user_models/verify_email_otp.dart similarity index 100% rename from lib/models/user/verify_email_otp.dart rename to lib/models/user_models/verify_email_otp.dart diff --git a/lib/models/verify_usage_before_deleting_these/subscription_model.dart b/lib/models/verify_usage_before_deleting_these/subscription_model.dart deleted file mode 100644 index c8e781a..0000000 --- a/lib/models/verify_usage_before_deleting_these/subscription_model.dart +++ /dev/null @@ -1,125 +0,0 @@ -// // To parse this JSON data, do -// // -// // final subscription = subscriptionFromJson(jsonString); -// -// import 'dart:convert'; -// -// Subscription subscriptionFromJson(String str) => Subscription.fromJson(json.decode(str)); -// -// String subscriptionToJson(Subscription data) => json.encode(data.toJson()); -// -// class SubscriptionModel { -// SubscriptionModel({ -// this.messageStatus, -// this.totalItemsCount, -// this.data, -// this.message, -// }); -// -// int? messageStatus; -// int? totalItemsCount; -// List? data; -// String? message; -// -// factory SubscriptionModel.fromJson(Map json) => SubscriptionModel( -// messageStatus: json["messageStatus"], -// totalItemsCount: json["totalItemsCount"], -// data: json["data"] == null ? [] : List.from(json["data"]!.map((x) => Subscription.fromJson(x))), -// message: json["message"], -// ); -// -// Map toJson() => { -// "messageStatus": messageStatus, -// "totalItemsCount": totalItemsCount, -// "data": data == null ? [] : List.from(data!.map((x) => x.toJson())), -// "message": message, -// }; -// } -// -// class Subscription { -// Subscription({ -// this.id, -// this.name, -// this.description, -// this.durationName, -// this.durationDays, -// this.price, -// this.currency, -// this.numberOfBranches, -// this.numberOfSubUsers, -// this.numberOfAds, -// this.countryId, -// this.countryName, -// this.isSubscribed, -// this.subscriptionAppliedId, -// this.serviceProviderId, -// this.dateStart, -// this.dateEnd, -// this.isExpired, -// this.isActive, -// }); -// -// int? id; -// String? name; -// String? description; -// String? durationName; -// int? durationDays; -// double? price; -// String? currency; -// int? numberOfBranches; -// int? numberOfSubUsers; -// int? numberOfAds; -// int? countryId; -// String? countryName; -// bool? isSubscribed; -// int? subscriptionAppliedId; -// int? serviceProviderId; -// DateTime? dateStart; -// DateTime? dateEnd; -// bool? isExpired; -// bool? isActive; -// -// factory Subscription.fromJson(Map json) => Subscription( -// id: json["id"], -// name: json["name"], -// description: json["description"], -// durationName: json["durationName"], -// durationDays: json["durationDays"], -// price: json["price"]?.toDouble(), -// currency: json["currency"], -// numberOfBranches: json["numberOfBranches"], -// numberOfSubUsers: json["numberOfSubUsers"], -// numberOfAds: json["numberOfAds"], -// countryId: json["countryID"], -// countryName: json["countryName"]!, -// isSubscribed: json["isSubscribed"], -// subscriptionAppliedId: json["subscriptionAppliedID"], -// serviceProviderId: json["serviceProviderID"], -// dateStart: json["dateStart"] == null ? null : DateTime.parse(json["dateStart"]), -// dateEnd: json["dateEnd"] == null ? null : DateTime.parse(json["dateEnd"]), -// isExpired: json["isExpired"], -// isActive: json["isActive"], -// ); -// -// Map toJson() => { -// "id": id, -// "name": name, -// "description": description, -// "durationName": durationName, -// "durationDays": durationDays, -// "price": price, -// "currency": currency, -// "numberOfBranches": numberOfBranches, -// "numberOfSubUsers": numberOfSubUsers, -// "numberOfAds": numberOfAds, -// "countryID": countryId, -// "countryName": countryName, -// "isSubscribed": isSubscribed, -// "subscriptionAppliedID": subscriptionAppliedId, -// "serviceProviderID": serviceProviderId, -// "dateStart": dateStart?.toIso8601String(), -// "dateEnd": dateEnd?.toIso8601String(), -// "isExpired": isExpired, -// "isActive": isActive, -// }; -// } diff --git a/lib/repositories/common_repo.dart b/lib/repositories/common_repo.dart index 8ede9a0..26cc5f5 100644 --- a/lib/repositories/common_repo.dart +++ b/lib/repositories/common_repo.dart @@ -6,9 +6,9 @@ import 'package:mc_common_app/models/advertisment_models/ss_car_check_schedule_m import 'package:mc_common_app/models/advertisment_models/ss_photo_schedule_model.dart'; import 'package:mc_common_app/models/appointments_models/appointment_list_model.dart'; import 'package:mc_common_app/models/general/generic_resp_model.dart'; -import 'package:mc_common_app/models/user/cities.dart'; -import 'package:mc_common_app/models/user/country.dart'; -import 'package:mc_common_app/models/user/role.dart'; +import 'package:mc_common_app/models/user_models/cities.dart'; +import 'package:mc_common_app/models/user_models/country.dart'; +import 'package:mc_common_app/models/user_models/role.dart'; import '../models/advertisment_models/vehicle_details_models.dart'; import '../models/general/enums_model.dart'; diff --git a/lib/repositories/provider_repo.dart b/lib/repositories/provider_repo.dart index 2709588..36a9a39 100644 --- a/lib/repositories/provider_repo.dart +++ b/lib/repositories/provider_repo.dart @@ -7,7 +7,7 @@ import 'package:mc_common_app/config/dependencies.dart'; import 'package:mc_common_app/models/general/generic_resp_model.dart'; import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart'; import 'package:mc_common_app/models/provider_branches_models/provider_profile_model.dart'; -import 'package:mc_common_app/models/services/item_model.dart'; +import 'package:mc_common_app/models/services_models/item_model.dart'; abstract class ProviderRepo { Future> getAllNearBranchAndServices(); diff --git a/lib/repositories/request_repo.dart b/lib/repositories/request_repo.dart index 8095e4b..ffaa33d 100644 --- a/lib/repositories/request_repo.dart +++ b/lib/repositories/request_repo.dart @@ -3,8 +3,8 @@ import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/config/dependencies.dart'; import 'package:mc_common_app/models/general/generic_resp_model.dart'; -import 'package:mc_common_app/models/requests/offers_model.dart'; -import 'package:mc_common_app/models/requests/request_model.dart'; +import 'package:mc_common_app/models/requests_models/offers_model.dart'; +import 'package:mc_common_app/models/requests_models/request_model.dart'; abstract class RequestRepo { Future createRequest(Map map); diff --git a/lib/repositories/user_repo.dart b/lib/repositories/user_repo.dart index 6d69a24..dba85f4 100644 --- a/lib/repositories/user_repo.dart +++ b/lib/repositories/user_repo.dart @@ -8,22 +8,22 @@ import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/config/dependencies.dart'; import 'package:mc_common_app/models/general/m_response.dart'; -import 'package:mc_common_app/models/user/basic_otp.dart'; -import 'package:mc_common_app/models/user/change_email.dart'; -import 'package:mc_common_app/models/user/change_mobile.dart'; -import 'package:mc_common_app/models/user/cities.dart'; -import 'package:mc_common_app/models/user/confirm_email.dart'; -import 'package:mc_common_app/models/user/confirm_mobile.dart'; -import 'package:mc_common_app/models/user/confirm_password.dart'; -import 'package:mc_common_app/models/user/country.dart'; -import 'package:mc_common_app/models/user/forget_password_otp_compare.dart'; -import 'package:mc_common_app/models/user/image_response.dart'; -import 'package:mc_common_app/models/user/login_password.dart'; -import 'package:mc_common_app/models/user/refresh_token.dart'; -import 'package:mc_common_app/models/user/register_user.dart'; -import 'package:mc_common_app/models/user/role.dart'; -import 'package:mc_common_app/models/user/user.dart'; -import 'package:mc_common_app/models/user/verify_email.dart'; +import 'package:mc_common_app/models/user_models/basic_otp.dart'; +import 'package:mc_common_app/models/user_models/change_email.dart'; +import 'package:mc_common_app/models/user_models/change_mobile.dart'; +import 'package:mc_common_app/models/user_models/cities.dart'; +import 'package:mc_common_app/models/user_models/confirm_email.dart'; +import 'package:mc_common_app/models/user_models/confirm_mobile.dart'; +import 'package:mc_common_app/models/user_models/confirm_password.dart'; +import 'package:mc_common_app/models/user_models/country.dart'; +import 'package:mc_common_app/models/user_models/forget_password_otp_compare.dart'; +import 'package:mc_common_app/models/user_models/image_response.dart'; +import 'package:mc_common_app/models/user_models/login_password.dart'; +import 'package:mc_common_app/models/user_models/refresh_token.dart'; +import 'package:mc_common_app/models/user_models/register_user.dart'; +import 'package:mc_common_app/models/user_models/role.dart'; +import 'package:mc_common_app/models/user_models/user.dart'; +import 'package:mc_common_app/models/user_models/verify_email.dart'; import 'package:mc_common_app/utils/shared_prefrence.dart'; abstract class UserRepo { @@ -81,7 +81,7 @@ class UserRepoImp implements UserRepo { String? t; if (isNeedToPassToken) { t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); + debugPrint("token $t"); } return await injector.get().postJsonForObject((json) => BasicOtpRespModel.fromJson(json), ApiConsts.BasicOTP, postParams, token: t); } @@ -96,7 +96,7 @@ class UserRepoImp implements UserRepo { String? t; if (isNeedToPassToken) { t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); + debugPrint("token $t"); } return await injector.get().postJsonForObject((json) => RegisterUserRespModel.fromJson(json), ApiConsts.BasicVerify, postParams, token: t); } @@ -112,7 +112,7 @@ class UserRepoImp implements UserRepo { String? t; if (isNeedToPassToken) { t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); + debugPrint("token $t"); } return await injector.get().postJsonForObject((json) => RegisterUserRespModel.fromJson(json), ApiConsts.BasicComplete, postParams, token: t); } @@ -212,7 +212,7 @@ class UserRepoImp implements UserRepo { // return await injector.get().postJsonForResponse(ApiConsts.ChangePassword, postParams); String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); + debugPrint("token $t"); return await injector.get().postJsonForObject((json) => MResponse.fromJson(json), ApiConsts.ChangePassword, postParams, token: t); } @@ -274,7 +274,7 @@ class UserRepoImp implements UserRepo { // return await injector.get().postJsonForResponse(ApiConsts.ChangePassword, postParams); String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); + debugPrint("token $t"); return await injector.get().postJsonForObject((json) => ImageResponse.fromJson(json), ApiConsts.UpdateUserImage, postParams, token: t); } @@ -284,7 +284,7 @@ class UserRepoImp implements UserRepo { // return await injector.get().postJsonForResponse(ApiConsts.ChangePassword, postParams); String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); + debugPrint("token $t"); return await injector.get().postJsonForObject((json) => ImageResponse.fromJson(json), ApiConsts.UpdateUserImage, postParams, token: t); } diff --git a/lib/view_models/appointments_view_model.dart b/lib/view_models/appointments_view_model.dart index da26459..10c0e4d 100644 --- a/lib/view_models/appointments_view_model.dart +++ b/lib/view_models/appointments_view_model.dart @@ -9,8 +9,8 @@ import 'package:mc_common_app/models/general/generic_resp_model.dart'; import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart'; import 'package:mc_common_app/models/provider_branches_models/provider_profile_model.dart'; import 'package:mc_common_app/models/appointments_models/service_schedule_model.dart'; -import 'package:mc_common_app/models/services/item_model.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/item_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/models/general/widgets_models.dart'; import 'package:mc_common_app/repositories/appointment_repo.dart'; import 'package:mc_common_app/repositories/common_repo.dart'; diff --git a/lib/view_models/dashboard_view_model_customer.dart b/lib/view_models/dashboard_view_model_customer.dart index d8ab0d4..513bbe0 100644 --- a/lib/view_models/dashboard_view_model_customer.dart +++ b/lib/view_models/dashboard_view_model_customer.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; -import 'package:mc_common_app/models/user/image_response.dart'; +import 'package:mc_common_app/models/user_models/image_response.dart'; import 'package:mc_common_app/repositories/user_repo.dart'; import 'package:mc_common_app/services/common_services.dart'; import 'package:mc_common_app/utils/utils.dart'; diff --git a/lib/view_models/requests_view_model.dart b/lib/view_models/requests_view_model.dart index c7ac932..44f6f4c 100644 --- a/lib/view_models/requests_view_model.dart +++ b/lib/view_models/requests_view_model.dart @@ -7,8 +7,8 @@ import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/models/advertisment_models/vehicle_details_models.dart'; import 'package:mc_common_app/models/general/enums_model.dart'; import 'package:mc_common_app/models/general/generic_resp_model.dart'; -import 'package:mc_common_app/models/requests/offers_model.dart'; -import 'package:mc_common_app/models/requests/request_model.dart'; +import 'package:mc_common_app/models/requests_models/offers_model.dart'; +import 'package:mc_common_app/models/requests_models/request_model.dart'; import 'package:mc_common_app/models/general/widgets_models.dart'; import 'package:mc_common_app/repositories/common_repo.dart'; import 'package:mc_common_app/repositories/request_repo.dart'; diff --git a/lib/view_models/user_view_model.dart b/lib/view_models/user_view_model.dart index 3e2f511..ac41cd1 100644 --- a/lib/view_models/user_view_model.dart +++ b/lib/view_models/user_view_model.dart @@ -9,19 +9,19 @@ import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/models/general/m_response.dart'; -import 'package:mc_common_app/models/user/basic_otp.dart'; -import 'package:mc_common_app/models/user/change_email.dart'; -import 'package:mc_common_app/models/user/change_mobile.dart'; -import 'package:mc_common_app/models/user/confirm_email.dart'; -import 'package:mc_common_app/models/user/confirm_mobile.dart'; -import 'package:mc_common_app/models/user/confirm_password.dart'; -import 'package:mc_common_app/models/user/country.dart'; -import 'package:mc_common_app/models/user/forget_password_otp_compare.dart'; -import 'package:mc_common_app/models/user/forget_password_otp_request.dart'; -import 'package:mc_common_app/models/user/login_password.dart'; -import 'package:mc_common_app/models/user/register_user.dart'; -import 'package:mc_common_app/models/user/user.dart'; -import 'package:mc_common_app/models/user/verify_email.dart'; +import 'package:mc_common_app/models/user_models/basic_otp.dart'; +import 'package:mc_common_app/models/user_models/change_email.dart'; +import 'package:mc_common_app/models/user_models/change_mobile.dart'; +import 'package:mc_common_app/models/user_models/confirm_email.dart'; +import 'package:mc_common_app/models/user_models/confirm_mobile.dart'; +import 'package:mc_common_app/models/user_models/confirm_password.dart'; +import 'package:mc_common_app/models/user_models/country.dart'; +import 'package:mc_common_app/models/user_models/forget_password_otp_compare.dart'; +import 'package:mc_common_app/models/user_models/forget_password_otp_request.dart'; +import 'package:mc_common_app/models/user_models/login_password.dart'; +import 'package:mc_common_app/models/user_models/register_user.dart'; +import 'package:mc_common_app/models/user_models/user.dart'; +import 'package:mc_common_app/models/user_models/verify_email.dart'; import 'package:mc_common_app/repositories/user_repo.dart'; import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/navigator.dart'; diff --git a/lib/views/appointments/appointment_detail_view.dart b/lib/views/appointments/appointment_detail_view.dart index 4eca313..6cf7f54 100644 --- a/lib/views/appointments/appointment_detail_view.dart +++ b/lib/views/appointments/appointment_detail_view.dart @@ -3,7 +3,7 @@ import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/models/appointments_models/appointment_list_model.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/dialogs_and_bottomsheets.dart'; import 'package:mc_common_app/utils/enums.dart'; diff --git a/lib/views/appointments/book_appointment_schedules_view.dart b/lib/views/appointments/book_appointment_schedules_view.dart index 6580be6..37738f4 100644 --- a/lib/views/appointments/book_appointment_schedules_view.dart +++ b/lib/views/appointments/book_appointment_schedules_view.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/models/appointments_models/service_schedule_model.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/views/appointments/widgets/custom_calender_widget.dart'; diff --git a/lib/views/appointments/book_appointment_services_view.dart b/lib/views/appointments/book_appointment_services_view.dart index cadd2e4..ae38cd3 100644 --- a/lib/views/appointments/book_appointment_services_view.dart +++ b/lib/views/appointments/book_appointment_services_view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/models/services/item_model.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/item_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/views/advertisement/custom_add_button.dart'; diff --git a/lib/views/appointments/book_appointments_item_view.dart b/lib/views/appointments/book_appointments_item_view.dart index 07a5f37..09f892f 100644 --- a/lib/views/appointments/book_appointments_item_view.dart +++ b/lib/views/appointments/book_appointments_item_view.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/models/services/item_model.dart'; +import 'package:mc_common_app/models/services_models/item_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/view_models/appointments_view_model.dart'; diff --git a/lib/views/appointments/review_appointment_view.dart b/lib/views/appointments/review_appointment_view.dart index 6f26aa8..75fbe46 100644 --- a/lib/views/appointments/review_appointment_view.dart +++ b/lib/views/appointments/review_appointment_view.dart @@ -6,8 +6,8 @@ import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/models/appointments_models/service_schedule_model.dart'; -import 'package:mc_common_app/models/services/item_model.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/item_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/widgets/button/show_fill_button.dart'; diff --git a/lib/views/requests/offer_list_page.dart b/lib/views/requests/offer_list_page.dart index d97689f..995e863 100644 --- a/lib/views/requests/offer_list_page.dart +++ b/lib/views/requests/offer_list_page.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/models/requests/offers_model.dart'; +import 'package:mc_common_app/models/requests_models/offers_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; diff --git a/lib/views/requests/widget/request_item.dart b/lib/views/requests/widget/request_item.dart index 3c37086..842035a 100644 --- a/lib/views/requests/widget/request_item.dart +++ b/lib/views/requests/widget/request_item.dart @@ -4,8 +4,8 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/models/requests/offers_model.dart'; -import 'package:mc_common_app/models/requests/request_model.dart'; +import 'package:mc_common_app/models/requests_models/offers_model.dart'; +import 'package:mc_common_app/models/requests_models/request_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/utils.dart'; diff --git a/lib/views/requests/widget/request_status_chip.dart b/lib/views/requests/widget/request_status_chip.dart index e93bdbd..3c0b462 100644 --- a/lib/views/requests/widget/request_status_chip.dart +++ b/lib/views/requests/widget/request_status_chip.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/models/requests/request_model.dart'; +import 'package:mc_common_app/models/requests_models/request_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; diff --git a/lib/views/user/complete_profile_page.dart b/lib/views/user/complete_profile_page.dart index db5b30d..ffa7189 100644 --- a/lib/views/user/complete_profile_page.dart +++ b/lib/views/user/complete_profile_page.dart @@ -2,7 +2,7 @@ import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; -import 'package:mc_common_app/models/user/register_user.dart'; +import 'package:mc_common_app/models/user_models/register_user.dart'; import 'package:mc_common_app/view_models/user_view_model.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/button/show_fill_button.dart'; diff --git a/lib/views/user/forget_password_page.dart b/lib/views/user/forget_password_page.dart index d26bcfd..c4add4b 100644 --- a/lib/views/user/forget_password_page.dart +++ b/lib/views/user/forget_password_page.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:mc_common_app/models/user/country.dart'; +import 'package:mc_common_app/models/user_models/country.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; diff --git a/lib/views/user/login_with_password_page.dart b/lib/views/user/login_with_password_page.dart index 8b1dff1..07460f7 100644 --- a/lib/views/user/login_with_password_page.dart +++ b/lib/views/user/login_with_password_page.dart @@ -7,7 +7,7 @@ import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; -import 'package:mc_common_app/models/user/country.dart'; +import 'package:mc_common_app/models/user_models/country.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/view_models/user_view_model.dart'; diff --git a/lib/views/user/register_page.dart b/lib/views/user/register_page.dart index 25411cf..bfbf74f 100644 --- a/lib/views/user/register_page.dart +++ b/lib/views/user/register_page.dart @@ -1,7 +1,7 @@ import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; -import 'package:mc_common_app/models/user/country.dart'; +import 'package:mc_common_app/models/user_models/country.dart'; import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/view_models/user_view_model.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; diff --git a/lib/views/user/register_provider_page.dart b/lib/views/user/register_provider_page.dart index 4a416fa..121a3f2 100644 --- a/lib/views/user/register_provider_page.dart +++ b/lib/views/user/register_provider_page.dart @@ -2,8 +2,8 @@ import 'package:mc_common_app/config/dependencies.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; -import 'package:mc_common_app/models/user/country.dart'; -import 'package:mc_common_app/models/user/role.dart'; +import 'package:mc_common_app/models/user_models/country.dart'; +import 'package:mc_common_app/models/user_models/role.dart'; import 'package:mc_common_app/repositories/user_repo.dart'; import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/view_models/user_view_model.dart'; diff --git a/lib/widgets/common_widgets/provider_details_card.dart b/lib/widgets/common_widgets/provider_details_card.dart index 169f1c2..f621d3c 100644 --- a/lib/widgets/common_widgets/provider_details_card.dart +++ b/lib/widgets/common_widgets/provider_details_card.dart @@ -4,7 +4,7 @@ import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; -import 'package:mc_common_app/models/services/service_model.dart'; +import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';