diff --git a/Frontend/patient_manager/lib/Authentication/authCheck.dart b/Frontend/patient_manager/lib/Authentication/authCheck.dart index caa1c380..c94183a3 100644 --- a/Frontend/patient_manager/lib/Authentication/authCheck.dart +++ b/Frontend/patient_manager/lib/Authentication/authCheck.dart @@ -5,6 +5,8 @@ import 'package:patient_manager/pages/home.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; class AuthCheck extends StatelessWidget { + const AuthCheck({super.key}); + @override Widget build(BuildContext context) { return StreamBuilder( @@ -15,9 +17,11 @@ class AuthCheck extends StatelessWidget { if (user == null) { // User not authenticated, show login screen return const SignInOrRegister(); + //Navigator.of(context).pushNamed('/signin'); } else { // User authenticated, show home screen return const Home(); + //Navigator.of(context).pushNamed('/homme'); } } diff --git a/Frontend/patient_manager/lib/components/homeTileGrid.dart b/Frontend/patient_manager/lib/components/homeTileGrid.dart index 84a32549..499d9298 100644 --- a/Frontend/patient_manager/lib/components/homeTileGrid.dart +++ b/Frontend/patient_manager/lib/components/homeTileGrid.dart @@ -19,20 +19,22 @@ class HomeTileGrid extends StatelessWidget { crossAxisCount: 3, children: [ HomeTile( - onTap: navigateToPage, + onTap: () { + Navigator.of(context).pushNamed('/patient-manager'); + }, tileName: "Patient Manager", tileDescription: "This is a digital solution for doctors Offices to manage their patients", ), HomeTile( onTap: navigateToPage, - tileName: "Patient Manager", + tileName: "Test", tileDescription: "This is a digital solution for doctors Offices to manage their patients", ), HomeTile( onTap: navigateToPage, - tileName: "Patient Manager", + tileName: "Test 1", tileDescription: "This is a digital solution for doctors Offices to manage their patients", ), diff --git a/Frontend/patient_manager/lib/components/myAppBar.dart b/Frontend/patient_manager/lib/components/myAppBar.dart index c34d100a..067aef38 100644 --- a/Frontend/patient_manager/lib/components/myAppBar.dart +++ b/Frontend/patient_manager/lib/components/myAppBar.dart @@ -29,7 +29,7 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget { title: Text( barTitle, style: const TextStyle( - fontWeight: FontWeight.normal, + fontWeight: FontWeight.bold, color: Colors.black, ), ), diff --git a/Frontend/patient_manager/lib/pages/home.dart b/Frontend/patient_manager/lib/pages/home.dart index 896b7f16..733d4cc6 100644 --- a/Frontend/patient_manager/lib/pages/home.dart +++ b/Frontend/patient_manager/lib/pages/home.dart @@ -20,9 +20,9 @@ class _HomeState extends State { Future getUserEmail() async { final res = await client.auth.getUser(); if (res.user!.email != null) { - print("emai not null"); + //print("emai not null"); useremail = res.user!.email!; - print(useremail); + //print(useremail); } } @@ -32,18 +32,19 @@ class _HomeState extends State { @override Widget build(BuildContext context) { - return FutureBuilder( + return Scaffold( + appBar: MyAppBar(barTitle: "Mzanzi Innovation Hub"), + body: HomeTileGrid(), + drawer: FutureBuilder( future: getUserEmail(), - builder: (context, snapshot) { + builder: (contexts, snapshot) { if (snapshot.connectionState == ConnectionState.done) { - return Scaffold( - appBar: MyAppBar(barTitle: "Mzanzi Innovation Hub"), - body: HomeTileGrid(), - drawer: MyAppDrawer(drawerTitle: useremail), - ); + return MyAppDrawer(drawerTitle: useremail); } else { return Center(child: CircularProgressIndicator()); } - }); + }, + ), + ); } } diff --git a/Frontend/patient_manager/lib/pages/patientManager.dart b/Frontend/patient_manager/lib/pages/patientManager.dart index 461a90da..e16f093e 100644 --- a/Frontend/patient_manager/lib/pages/patientManager.dart +++ b/Frontend/patient_manager/lib/pages/patientManager.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/components/myAppBar.dart'; +import 'package:patient_manager/components/myAppDrawer.dart'; +import 'package:patient_manager/main.dart'; class PatientManager extends StatefulWidget { const PatientManager({super.key}); @@ -9,15 +11,36 @@ class PatientManager extends StatefulWidget { } class _PatientManagerState extends State { + String useremail = ""; + + Future getUserEmail() async { + final res = await client.auth.getUser(); + if (res.user!.email != null) { + //print("emai not null"); + useremail = res.user!.email!; + //print(useremail); + } + } + + String getEmail() { + return useremail; + } + @override Widget build(BuildContext context) { - return const Scaffold( - appBar: PreferredSize( - preferredSize: Size.fromHeight(50), - child: MyAppBar( - barTitle: "Mzanzi Innovation Hub", - ), - ), + return FutureBuilder( + future: getUserEmail(), + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + return Scaffold( + appBar: const MyAppBar(barTitle: "Patient Manager"), + body: Center(child: Text(useremail)), + drawer: MyAppDrawer(drawerTitle: useremail), + ); + } else { + return Center(child: CircularProgressIndicator()); + } + }, ); } } diff --git a/Frontend/patient_manager/lib/pages/signin.dart b/Frontend/patient_manager/lib/pages/signin.dart index a84f6603..8b092011 100644 --- a/Frontend/patient_manager/lib/pages/signin.dart +++ b/Frontend/patient_manager/lib/pages/signin.dart @@ -26,7 +26,7 @@ class _SignInState extends State { password: passwordController.text, ); if (response.session != null) { - Navigator.of(context).pushNamed('/homme', arguments: "Yaso"); + Navigator.of(context).pushNamed('/homme'); } } on AuthException catch (error) { loginError(error.message); diff --git a/Frontend/patient_manager/lib/router/routeGenerator.dart b/Frontend/patient_manager/lib/router/routeGenerator.dart index f87b7f14..1fac5261 100644 --- a/Frontend/patient_manager/lib/router/routeGenerator.dart +++ b/Frontend/patient_manager/lib/router/routeGenerator.dart @@ -1,24 +1,23 @@ // ignore: file_names import 'package:flutter/material.dart'; import 'package:patient_manager/Authentication/authCheck.dart'; +import 'package:patient_manager/components/signInOrRegister.dart'; import 'package:patient_manager/pages/home.dart'; +import 'package:patient_manager/pages/patientManager.dart'; class RouteGenerator { static Route generateRoute(RouteSettings settings) { - final args = settings.arguments; + //final args = settings.arguments; switch (settings.name) { case '/': return MaterialPageRoute(builder: (_) => AuthCheck()); case '/home': - if (args is String) { - return MaterialPageRoute( - builder: (_) => const Home(), - ); - } - - // case '/signin': - // return MaterialPageRoute(builder: (_) => const SignInOrRegister()); + return MaterialPageRoute(builder: (_) => const Home()); + case '/patient-manager': + return MaterialPageRoute(builder: (_) => const PatientManager()); + case '/signin': + return MaterialPageRoute(builder: (_) => const SignInOrRegister()); // //case '/signIn': // // return MaterialPageRoute(builder: (_) => SignIn()); // case '/auth':