diff --git a/Frontend/patient_manager/lib/mih_components/mih_layout/mih_layout_builder.dart b/Frontend/patient_manager/lib/mih_components/mih_layout/mih_layout_builder.dart index 3c8cbae2..dc847cd1 100644 --- a/Frontend/patient_manager/lib/mih_components/mih_layout/mih_layout_builder.dart +++ b/Frontend/patient_manager/lib/mih_components/mih_layout/mih_layout_builder.dart @@ -5,9 +5,11 @@ import 'package:patient_manager/mih_components/mih_layout/mih_header.dart'; class MIHLayoutBuilder extends StatefulWidget { final Widget actionButton; + final Widget? secondaryActionButton; final MIHHeader header; final MIHBody body; - final MIHAppDrawer? rightDrawer; + final MIHAppDrawer? actionDrawer; + final MIHAppDrawer? secondaryActionDrawer; final Widget? bottomNavBar; //final String type; @@ -15,8 +17,10 @@ class MIHLayoutBuilder extends StatefulWidget { super.key, required this.actionButton, required this.header, + required this.secondaryActionButton, required this.body, - required this.rightDrawer, + required this.actionDrawer, + required this.secondaryActionDrawer, required this.bottomNavBar, //required this.type, }); @@ -52,7 +56,8 @@ class _MIHLayoutBuilderState extends State { Size screenSize = MediaQuery.sizeOf(context); return Scaffold( //drawerEnableOpenDragGesture: true, - drawer: widget.rightDrawer, + drawer: widget.actionDrawer, + endDrawer: widget.secondaryActionButton, body: SafeArea( child: SizedBox( width: screenSize.width, diff --git a/Frontend/patient_manager/lib/mih_packages/about_mih/mih_about.dart b/Frontend/patient_manager/lib/mih_packages/about_mih/mih_about.dart index 38b65be7..fae02e59 100644 --- a/Frontend/patient_manager/lib/mih_packages/about_mih/mih_about.dart +++ b/Frontend/patient_manager/lib/mih_packages/about_mih/mih_about.dart @@ -324,9 +324,11 @@ class _MIHAboutState extends State { Widget build(BuildContext context) { return MIHLayoutBuilder( actionButton: getActionButton(), + secondaryActionButton: null, header: getHeader(), body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); } diff --git a/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart b/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart index 8273c7d3..76b622d5 100644 --- a/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart +++ b/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart @@ -349,8 +349,10 @@ class _PatientAccessRequestState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); // return Scaffold( diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/auth_check.dart b/Frontend/patient_manager/lib/mih_packages/authentication/auth_check.dart index 7c746921..0de605fc 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/auth_check.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/auth_check.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/mih_packages/authentication/signin_or_register.dart'; -import 'package:patient_manager/mih_packages/mih_home/home.dart'; +import 'package:patient_manager/mih_packages/mih_home/MIH_Profile_Getter.dart'; import 'package:supertokens_flutter/supertokens.dart'; class AuthCheck extends StatefulWidget { @@ -30,7 +30,7 @@ class _AuthCheckState extends State { future: signedIn, builder: (context, snapshot) { if (snapshot.data == true) { - return const Home(); + return const MIHProfileGetter(); } else { return const SignInOrRegister(); } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart b/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart index 8703ba1b..c9d0f11f 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart @@ -354,8 +354,10 @@ class _ForgotPasswordState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/register.dart b/Frontend/patient_manager/lib/mih_packages/authentication/register.dart index ce0289fe..718a33ce 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/register.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/register.dart @@ -410,8 +410,10 @@ class _RegisterState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart b/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart index 93d3c94f..d118897e 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart @@ -412,8 +412,10 @@ class _ResetPasswordState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart b/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart index 928f6c17..ac9654cd 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart @@ -577,8 +577,10 @@ class _SignInState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); } diff --git a/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart b/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart index 7023838d..8d5a379c 100644 --- a/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart +++ b/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart @@ -370,9 +370,11 @@ class _ManageBusinessProfileState extends State { Widget build(BuildContext context) { return MIHLayoutBuilder( actionButton: getActionButton(), + secondaryActionButton: null, header: getHeader(), body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); // return Scaffold( diff --git a/Frontend/patient_manager/lib/mih_packages/manage_business/profile_business_add.dart b/Frontend/patient_manager/lib/mih_packages/manage_business/profile_business_add.dart index 984a0c1a..1991ff13 100644 --- a/Frontend/patient_manager/lib/mih_packages/manage_business/profile_business_add.dart +++ b/Frontend/patient_manager/lib/mih_packages/manage_business/profile_business_add.dart @@ -435,9 +435,11 @@ class _ProfileBusinessAddState extends State { Widget build(BuildContext context) { return MIHLayoutBuilder( actionButton: getActionButton(), + secondaryActionButton: null, header: getHeader(), body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); diff --git a/Frontend/patient_manager/lib/mih_packages/mzansi_profile/profile_user_update.dart b/Frontend/patient_manager/lib/mih_packages/mzansi_profile/profile_user_update.dart index 910a1e09..15c28bcc 100644 --- a/Frontend/patient_manager/lib/mih_packages/mzansi_profile/profile_user_update.dart +++ b/Frontend/patient_manager/lib/mih_packages/mzansi_profile/profile_user_update.dart @@ -438,8 +438,10 @@ class _ProfileUserUpdateState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); } diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_add.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_add.dart index 010d56a0..b6ac48c0 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_add.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_add.dart @@ -395,8 +395,10 @@ class _AddPatientState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); // return Scaffold( diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_edit.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_edit.dart index 5a813512..0892bae7 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_edit.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_edit.dart @@ -659,8 +659,10 @@ class _EditPatientState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); // return Scaffold( diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart index da12c082..8dbc880b 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart @@ -415,8 +415,10 @@ class _PatientManagerState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); // return Scaffold( diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart index f55e5715..2a783e3b 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart @@ -179,8 +179,10 @@ class _PatientViewState extends State { return MIHLayoutBuilder( actionButton: getActionButton(), header: getHeader(), + secondaryActionButton: null, body: getBody(), - rightDrawer: null, + actionDrawer: null, + secondaryActionDrawer: null, bottomNavBar: null, ); // return Scaffold( diff --git a/Frontend/patient_manager/lib/mih_router/routeGenerator.dart b/Frontend/patient_manager/lib/mih_router/routeGenerator.dart index 48be83b7..9b21a72e 100644 --- a/Frontend/patient_manager/lib/mih_router/routeGenerator.dart +++ b/Frontend/patient_manager/lib/mih_router/routeGenerator.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/mih_packages/authentication/auth_check.dart'; -import 'package:patient_manager/mih_packages/mih_home/MIH_Profile_Getter.dart'; import 'package:patient_manager/mih_packages/patient_profile/add_or_view_patient.dart'; import 'package:patient_manager/mih_packages/patient_profile/patient_add.dart'; import 'package:patient_manager/mih_packages/patient_profile/patient_edit.dart'; @@ -45,10 +44,6 @@ class RouteGenerator { settings: settings, builder: (_) => const ForgotPassword()); //http://mzansi-innovation-hub.co.za/auth/reset-password //=============================================================== - //Home v2 - case '/homev2': - return MaterialPageRoute( - settings: settings, builder: (_) => const MIHProfileGetter()); //About MIH case '/about': return MaterialPageRoute(