diff --git a/Frontend/lib/mih_components/mih_objects/arguments.dart b/Frontend/lib/mih_components/mih_objects/arguments.dart index 66d2a10e..75cb7d9a 100644 --- a/Frontend/lib/mih_components/mih_objects/arguments.dart +++ b/Frontend/lib/mih_components/mih_objects/arguments.dart @@ -229,17 +229,13 @@ class MzansiAiArguments { } class MzansiDirectoryArguments { - final String? startUpSearch; final bool personalSearch; final int? packageIndex; - MzansiDirectoryArguments( - { - this.startUpSearch, + MzansiDirectoryArguments({ required this.personalSearch, this.packageIndex, - } - ); + }); } class TestArguments { diff --git a/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart b/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart index 3233fba4..4a8ae396 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart @@ -66,7 +66,6 @@ class _MzansiDirectoryState extends State { .replaceAll("Longitude: ", ""); } return MihSearchMzansi( - startUpSearch: widget.arguments.startUpSearch, personalSearch: widget.arguments.personalSearch, myLocation: myLocation, ); diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart index d3527ce0..f3e959e4 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart @@ -16,12 +16,10 @@ import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart'; class MihSearchMzansi extends StatefulWidget { - final String? startUpSearch; final bool personalSearch; final String? myLocation; const MihSearchMzansi({ super.key, - required this.startUpSearch, required this.personalSearch, required this.myLocation, }); @@ -100,18 +98,10 @@ class _MihSearchMzansiState extends State { super.initState(); setState(() { userSearch = widget.personalSearch; - mzansiSearchController.text = widget.startUpSearch ?? ""; + mzansiSearchController.text = ""; // businessTypeController.text = "All"; availableBusinessTypes = MihBusinessDetailsServices().fetchAllBusinessTypes(); - if (userSearch) { - futureUserSearchResults = - MihUserServices().searchUsers(mzansiSearchController.text, context); - } else { - futureBusinessSearchResults = MihBusinessDetailsServices() - .searchBusinesses(mzansiSearchController.text, - businessTypeController.text, context); - } }); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart index 154908dd..089ad3ca 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart @@ -12,11 +12,9 @@ import 'package:supertokens_flutter/supertokens.dart'; class MihAddBookmarkAlert extends StatefulWidget { final Business business; - final String? startUpSearch; const MihAddBookmarkAlert({ super.key, required this.business, - required this.startUpSearch, }); @override @@ -40,7 +38,6 @@ class _MihAddBookmarkAlertState extends State { '/mzansi-directory', ModalRoute.withName('/'), arguments: MzansiDirectoryArguments( - startUpSearch: widget.startUpSearch, // startUpSearch personalSearch: false, // personalSearch packageIndex: 1, ), diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart index cf2b00d4..6ef8bbdc 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart @@ -647,7 +647,6 @@ class _MihBusinessCardState extends State { businessReview: myReview, screenWidth: width, readOnly: false, - startUpSearch: widget.startUpSearch, ), ); } @@ -657,7 +656,6 @@ class _MihBusinessCardState extends State { context: context, builder: (context) => MihAddBookmarkAlert( business: widget.business, - startUpSearch: widget.startUpSearch, ), ); } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart index 9905c1b8..22bf008f 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart @@ -52,7 +52,6 @@ class _MihDeleteBookmarkAlertState extends State { '/mzansi-directory', ModalRoute.withName('/'), arguments: MzansiDirectoryArguments( - startUpSearch: widget.startUpSearch, // startUpSearch personalSearch: false, // personalSearch packageIndex: 1, ), diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart index 9dce47dc..32af8ace 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart @@ -23,14 +23,12 @@ class MihReviewBusinessWindow extends StatefulWidget { final BusinessReview? businessReview; final double screenWidth; final bool readOnly; - final String? startUpSearch; const MihReviewBusinessWindow({ super.key, required this.business, required this.businessReview, required this.screenWidth, required this.readOnly, - required this.startUpSearch, }); @override @@ -101,7 +99,6 @@ class _MihReviewBusinessWindowState extends State { Navigator.of(context).pushNamed( '/mzansi-directory', arguments: MzansiDirectoryArguments( - startUpSearch: widget.startUpSearch, // startUpSearch personalSearch: false, // personalSearch ), ); @@ -191,8 +188,7 @@ class _MihReviewBusinessWindowState extends State { Navigator.of(context).pushNamed( '/mzansi-directory', arguments: MzansiDirectoryArguments( - startUpSearch: widget.startUpSearch, // startUpSearch - personalSearch: false, // personalSearch + personalSearch: false, // personalSearch ), ); MihAlertServices().successAlert( @@ -227,7 +223,6 @@ class _MihReviewBusinessWindowState extends State { Navigator.of(context).pushNamed( '/mzansi-directory', arguments: MzansiDirectoryArguments( - startUpSearch: widget.startUpSearch, // startUpSearch personalSearch: false, // personalSearch ), ); @@ -386,7 +381,8 @@ class _MihReviewBusinessWindowState extends State { emptyColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - halfFilledColor: MihColors.getYellowColor(context), isHalfAllowed: true, + halfFilledColor: MihColors.getYellowColor(context), + isHalfAllowed: true, initialRating: widget.businessReview != null ? double.parse(_reviewScoreController.text) : 1, diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart index dd70efec..12683c97 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart @@ -40,7 +40,6 @@ class _MihBusinessReviewsState extends State { businessReview: businessReview, screenWidth: width, readOnly: true, - startUpSearch: null, ); }, ); diff --git a/Frontend/lib/mih_services/mih_business_details_services.dart b/Frontend/lib/mih_services/mih_business_details_services.dart index 33d34a02..252c707d 100644 --- a/Frontend/lib/mih_services/mih_business_details_services.dart +++ b/Frontend/lib/mih_services/mih_business_details_services.dart @@ -39,6 +39,9 @@ class MihBusinessDetailsServices { if (searchType.isNotEmpty) { newSearchType = searchType; } + if (searchText.isEmpty && searchType.isEmpty) { + return []; + } var response = await http.get( Uri.parse( "${AppEnviroment.baseApiUrl}/business/search/$newSearchType/$newSearchText"),