StageAndSuitcase/stage-and-suitcase-mih
1
0
Fork 0
forked from yaso_meth/mih-project
Code Pull Requests Activity

Merge pull request #34 from yaso-meth/Bug-Post-Set-Up-Profile-Navigation-fix

Browse Source 
Bug-Post-Set-Up-Profile-Navigation-fix
This commit is contained in:
yaso-meth
2025-01-13 13:22:27 +02:00
committed by GitHub
parent 4a2cb70c36 f922001f86
commit 6d60ad7fc6
7 changed files with 72 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Frontend/lib/mih_apis/mih_api_calls.dart
View File

@@ -141,12 +141,12 @@ class MIHApiCalls {
// var errorBody = response.body;
if (response.statusCode == 200) {
print("Here1");
// print("Here1");
var decodedData = jsonDecode(response.body);
print("Here2");
// print("Here2");
Patient patients = Patient.fromJson(decodedData as Map<String, dynamic>);
print("Here3");
print(patients);
// print("Here3");
// print(patients);
patientData = patients;
} else {
patientData = null;

2
Frontend/lib/mih_components/mih_inputs_and_buttons/mih_button.dart
View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
class MIHButton extends StatefulWidget {
final void Function() onTap;
final void Function()? onTap;
final String buttonText;
final Color buttonColor;
final Color textColor;

2
Frontend/lib/mih_components/mih_layout/mih_app_drawer.dart
View File

@@ -283,7 +283,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
onTap: () async {
await SuperTokens.signOut(
completionHandler: (error) {
//print(error);
print(error);
});
if (await SuperTokens.doesSessionExist() ==
false) {

21
Frontend/lib/mih_packages/authentication/register.dart
View File

@@ -297,7 +297,7 @@ class _RegisterState extends State<Register> {
const SizedBox(height: 10),
//Heading
Text(
'Register',
'Create a New Account',
style: TextStyle(
fontSize: 25,
fontWeight: FontWeight.bold,
@@ -349,10 +349,10 @@ class _RegisterState extends State<Register> {
width: 500.0,
height: 50.0,
child: MIHButton(
buttonText: "Sign Up",
buttonText: "Create New Account",
buttonColor: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
.successColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
@@ -362,6 +362,21 @@ class _RegisterState extends State<Register> {
),
),
const SizedBox(height: 10),
// SizedBox(
// width: 500.0,
// height: 50.0,
// child: MIHButton(
// buttonText: "Sign In",
// buttonColor: MzanziInnovationHub.of(context)!
// .theme
// .secondaryColor(),
// textColor: MzanziInnovationHub.of(context)!
// .theme
// .primaryColor(),
// onTap: widget.onTap,
// ),
// ),
// const SizedBox(height: 10),
//register text
SizedBox(
width: 500.0,

76
Frontend/lib/mih_packages/authentication/signin.dart
View File

@@ -457,41 +457,57 @@ class _SignInState extends State<SignIn> {
),
//spacer
const SizedBox(height: 10),
//register text
SizedBox(
width: 500.0,
//height: 100.0,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Text(
'New User?',
style: TextStyle(
fontSize: 18,
color: MzanziInnovationHub.of(context)!
.theme
.messageTextColor()),
),
const SizedBox(
width: 6,
),
GestureDetector(
onTap: widget.onTap,
child: Text(
'Register Now',
style: TextStyle(
fontSize: 18,
color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontWeight: FontWeight.bold,
),
),
),
],
height: 50.0,
child: MIHButton(
buttonText: "Create New Account",
buttonColor: MzanziInnovationHub.of(context)!
.theme
.successColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
onTap: widget.onTap,
),
),
//spacer
const SizedBox(height: 10),
//register text
// SizedBox(
// width: 500.0,
// //height: 100.0,
// child: Row(
// mainAxisAlignment: MainAxisAlignment.end,
// children: [
// Text(
// 'New User?',
// style: TextStyle(
// fontSize: 18,
// color: MzanziInnovationHub.of(context)!
// .theme
// .messageTextColor()),
// ),
// const SizedBox(
// width: 6,
// ),
// GestureDetector(
// onTap: widget.onTap,
// child: Text(
// 'Register Now',
// style: TextStyle(
// fontSize: 18,
// color: MzanziInnovationHub.of(context)!
// .theme
// .secondaryColor(),
// fontWeight: FontWeight.bold,
// ),
// ),
// ),
// ],
// ),
// ),
//spacer
const SizedBox(height: 15),
SizedBox(
width: 500.0,

2
Frontend/lib/mih_packages/mih_home/mih_home.dart
View File

@@ -172,7 +172,7 @@ class _MIHHomeState extends State<MIHHome> {
p: getPrim(),
s: getSec(),
));
print("Pat Prof: ${widget.patient}");
// print("Pat Prof: ${widget.patient}");
if (widget.patient != null) {
tileList.add(MIHTile(
videoID: "NUDdoWrbXNc",

1
Frontend/lib/mih_packages/mzansi_profile/profile_user_update.dart
View File

@@ -164,6 +164,7 @@ class _ProfileUserUpdateState extends State<ProfileUserUpdate> {
//print("Here4");
//print(response.statusCode);
if (response.statusCode == 200) {
Navigator.of(context).pop();
Navigator.of(context)
.popAndPushNamed('/', arguments: widget.arguments.signedInUser);
String message =