From 1c6f00b5b89b8381bd9dee1d5a5dfda7e33c6b16 Mon Sep 17 00:00:00 2001 From: yaso Date: Tue, 14 Jan 2025 12:57:29 +0200 Subject: [PATCH] add new authcheck args to action buttons --- Frontend/lib/mih_packages/about_mih/mih_about.dart | 3 ++- .../mih_packages/access_review/patient_access_review.dart | 3 ++- Frontend/lib/mih_packages/appointment/appointments.dart | 3 ++- .../manage_business/manage_business_profile.dart | 2 +- .../lib/mih_packages/mih_policy_tos/mih_privacy_polocy.dart | 3 ++- .../mih_packages/mih_policy_tos/mih_terms_of_service.dart | 6 ++++-- .../mih_packages/mzansi_profile/profile_user_update.dart | 2 +- Frontend/lib/mih_packages/mzansi_wallet/mzansi_wallet.dart | 3 ++- .../lib/mih_packages/patient_profile/patient_manager.dart | 2 +- Frontend/lib/mih_packages/patient_profile/patient_view.dart | 2 +- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Frontend/lib/mih_packages/about_mih/mih_about.dart b/Frontend/lib/mih_packages/about_mih/mih_about.dart index 75d83674..93e4063c 100644 --- a/Frontend/lib/mih_packages/about_mih/mih_about.dart +++ b/Frontend/lib/mih_packages/about_mih/mih_about.dart @@ -1,3 +1,4 @@ +import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; import '../../mih_components/mih_inputs_and_buttons/mih_button.dart'; import '../../mih_components/mih_layout/mih_action.dart'; @@ -42,7 +43,7 @@ class _MIHAboutState extends State { onTap: () { Navigator.of(context).pushNamedAndRemoveUntil( '/', - arguments: true, + arguments: AuthArguments(true, false), (route) => false, ); }, diff --git a/Frontend/lib/mih_packages/access_review/patient_access_review.dart b/Frontend/lib/mih_packages/access_review/patient_access_review.dart index 073f3bb3..ec024b93 100644 --- a/Frontend/lib/mih_packages/access_review/patient_access_review.dart +++ b/Frontend/lib/mih_packages/access_review/patient_access_review.dart @@ -1,3 +1,4 @@ +import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; import '../../main.dart'; import '../../mih_apis/mih_api_calls.dart'; @@ -105,7 +106,7 @@ class _PatientAccessRequestState extends State { Navigator.of(context).popAndPushNamed( '/', - arguments: true, + arguments: AuthArguments(true, false), ); }, ); diff --git a/Frontend/lib/mih_packages/appointment/appointments.dart b/Frontend/lib/mih_packages/appointment/appointments.dart index c41026a2..3509ca31 100644 --- a/Frontend/lib/mih_packages/appointment/appointments.dart +++ b/Frontend/lib/mih_packages/appointment/appointments.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; import '../../main.dart'; import 'package:supertokens_flutter/http.dart' as http; @@ -268,7 +269,7 @@ class _PatientAccessRequestState extends State { Navigator.of(context).popAndPushNamed( '/', - arguments: true, + arguments: AuthArguments(true, false), ); }, ); diff --git a/Frontend/lib/mih_packages/manage_business/manage_business_profile.dart b/Frontend/lib/mih_packages/manage_business/manage_business_profile.dart index 92360a42..d7464c32 100644 --- a/Frontend/lib/mih_packages/manage_business/manage_business_profile.dart +++ b/Frontend/lib/mih_packages/manage_business/manage_business_profile.dart @@ -296,7 +296,7 @@ class _ManageBusinessProfileState extends State { Navigator.of(context).popAndPushNamed( '/', - arguments: false, + arguments: AuthArguments(false, false), ); }, ); diff --git a/Frontend/lib/mih_packages/mih_policy_tos/mih_privacy_polocy.dart b/Frontend/lib/mih_packages/mih_policy_tos/mih_privacy_polocy.dart index 93cd8adb..54996152 100644 --- a/Frontend/lib/mih_packages/mih_policy_tos/mih_privacy_polocy.dart +++ b/Frontend/lib/mih_packages/mih_policy_tos/mih_privacy_polocy.dart @@ -2,6 +2,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_action.dart' import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_header.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_layout_builder.dart'; +import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mih_policy_tos/policy_and_terms_text.dart'; import 'package:flutter/material.dart'; @@ -20,7 +21,7 @@ class _MIHPrivacyPolocyState extends State { onTap: () { Navigator.of(context).pushNamedAndRemoveUntil( '/', - arguments: true, + arguments: AuthArguments(true, false), (route) => false, ); }, diff --git a/Frontend/lib/mih_packages/mih_policy_tos/mih_terms_of_service.dart b/Frontend/lib/mih_packages/mih_policy_tos/mih_terms_of_service.dart index ddab9968..3c914ad5 100644 --- a/Frontend/lib/mih_packages/mih_policy_tos/mih_terms_of_service.dart +++ b/Frontend/lib/mih_packages/mih_policy_tos/mih_terms_of_service.dart @@ -2,6 +2,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_action.dart' import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_header.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_layout_builder.dart'; +import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mih_policy_tos/policy_and_terms_text.dart'; import 'package:flutter/material.dart'; @@ -18,9 +19,10 @@ class _MIHTermsOfServiceState extends State { icon: const Icon(Icons.arrow_back), iconSize: 35, onTap: () { - Navigator.of(context).pushNamed( + Navigator.of(context).pushNamedAndRemoveUntil( '/', - arguments: true, + arguments: AuthArguments(true, false), + (route) => false, ); }, ); diff --git a/Frontend/lib/mih_packages/mzansi_profile/profile_user_update.dart b/Frontend/lib/mih_packages/mzansi_profile/profile_user_update.dart index c2935cba..d62a1e3d 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/profile_user_update.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/profile_user_update.dart @@ -247,7 +247,7 @@ class _ProfileUserUpdateState extends State { Navigator.of(context).popAndPushNamed( '/', - arguments: true, + arguments: AuthArguments(true, false), ); }, ); diff --git a/Frontend/lib/mih_packages/mzansi_wallet/mzansi_wallet.dart b/Frontend/lib/mih_packages/mzansi_wallet/mzansi_wallet.dart index 02089d2e..f8cc7dc1 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/mzansi_wallet.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/mzansi_wallet.dart @@ -3,6 +3,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_header.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_layout_builder.dart'; import 'package:Mzansi_Innovation_Hub/mih_objects/app_user.dart'; +import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_wallet/loyalty_cards.dart'; import 'package:flutter/material.dart'; @@ -28,7 +29,7 @@ class _MzansiWalletState extends State { Navigator.of(context).pop(); Navigator.of(context).popAndPushNamed( '/', - arguments: true, + arguments: AuthArguments(true, false), ); }, ); diff --git a/Frontend/lib/mih_packages/patient_profile/patient_manager.dart b/Frontend/lib/mih_packages/patient_profile/patient_manager.dart index 71f3c573..795add30 100644 --- a/Frontend/lib/mih_packages/patient_profile/patient_manager.dart +++ b/Frontend/lib/mih_packages/patient_profile/patient_manager.dart @@ -532,7 +532,7 @@ class _PatientManagerState extends State { Navigator.of(context).popAndPushNamed( '/', - arguments: false, + arguments: AuthArguments(false, false), ); }, ); diff --git a/Frontend/lib/mih_packages/patient_profile/patient_view.dart b/Frontend/lib/mih_packages/patient_profile/patient_view.dart index 4144506f..0fbc9277 100644 --- a/Frontend/lib/mih_packages/patient_profile/patient_view.dart +++ b/Frontend/lib/mih_packages/patient_profile/patient_view.dart @@ -125,7 +125,7 @@ class _PatientViewState extends State { Navigator.of(context).pop(); Navigator.of(context).popAndPushNamed( '/', - arguments: true, + arguments: AuthArguments(true, false), ); }, );