From 5be86648ee9db388fbde32c045446d45d4431ac4 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 20 Aug 2025 09:22:10 +0200 Subject: [PATCH] update Mzansi Directory nav pt1 --- .../build_business_search_resultsList.dart | 14 +++++++++++--- .../builders/build_user_search_results_list.dart | 11 ++++++++--- .../mzansi_directory/mzansi_directory.dart | 9 ++++++++- .../package_tiles/mzansi_directory_tile.dart | 14 +++++++++++--- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart b/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart index f52381ce..9740c534 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; @@ -41,13 +42,20 @@ class _BuildBusinessSearchResultsListState MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: InkWell( onTap: () { - Navigator.of(context).pushNamed( - '/business-profile/view', - arguments: BusinessViewArguments( + context.goNamed( + 'businessProfileView', + extra: BusinessViewArguments( widget.businessList[index], widget.businessList[index].Name, ), ); + // // Navigator.of(context).pushNamed( + // // '/business-profile/view', + // // arguments: BusinessViewArguments( + // // widget.businessList[index], + // // widget.businessList[index].Name, + // // ), + // ); }, splashColor: MihColors.getSecondaryColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark") diff --git a/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart b/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart index 9e0f940d..8135ce94 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_personal_profile_preview.dart'; @@ -36,10 +37,14 @@ class _BuildUserSearchResultsListState MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: InkWell( onTap: () { - Navigator.of(context).pushNamed( - '/mzansi-profile/view', - arguments: widget.userList[index], + context.goNamed( + 'mzansiProfileView', + extra: widget.userList[index], ); + // Navigator.of(context).pushNamed( + // '/mzansi-profile/view', + // arguments: widget.userList[index], + // ); }, splashColor: MihColors.getSecondaryColor( MzansiInnovationHub.of(context)!.theme.mode == "Dark") diff --git a/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart b/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart index 8b48989b..e77b9b4b 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; +import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; @@ -97,7 +98,13 @@ class _MzansiDirectoryState extends State { icon: const Icon(Icons.arrow_back), iconSize: 35, onTap: () { - Navigator.of(context).pop(); + context.goNamed( + 'mihHome', + extra: AuthArguments( + true, + false, + ), + ); FocusScope.of(context).unfocus(); }, ); diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart index 1f534131..9185b8d2 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; @@ -21,13 +22,20 @@ class _MzansiDirectoryTileState extends State { Widget build(BuildContext context) { return MihPackageTile( onTap: () { - Navigator.of(context).pushNamed( - '/mzansi-directory', - arguments: MzansiDirectoryArguments( + context.goNamed( + "mzansiDirectory", + extra: MzansiDirectoryArguments( personalSearch: true, startSearchText: null, ), ); + // Navigator.of(context).pushNamed( + // '/mzansi-directory', + // arguments: MzansiDirectoryArguments( + // personalSearch: true, + // startSearchText: null, + // ), + // ); }, appName: "Mzansi Directory", appIcon: Icon(