From 4923f0f426cc391aad14b35a127c1ad723c0dd89 Mon Sep 17 00:00:00 2001 From: yaso-meth Date: Thu, 11 Jul 2024 15:58:55 +0200 Subject: [PATCH] Update app top cater for env variables --- .../lib/Authentication/constants.dart | 0 .../lib/components/buildFilesList.dart | 7 +++-- .../lib/components/medicineSearch.dart | 3 +- .../lib/components/patManAppDrawer.dart | 3 +- .../lib/components/patientFiles.dart | 12 ++++---- .../lib/components/patientNotes.dart | 5 ++-- Frontend/patient_manager/lib/env/env.dart | 5 +++- Frontend/patient_manager/lib/main.dart | 27 +++++++----------- Frontend/patient_manager/lib/pages/home.dart | 15 ---------- .../patient_manager/lib/pages/patientAdd.dart | 5 ++-- .../lib/pages/patientEdit.dart | 7 +++-- .../lib/pages/patientManager.dart | 3 +- database/#ib_16384_0.dblwr | Bin 6291456 -> 6291456 bytes database/#innodb_redo/#ib_redo18 | Bin 3276800 -> 3276800 bytes database/ibdata1 | Bin 12582912 -> 12582912 bytes 15 files changed, 42 insertions(+), 50 deletions(-) delete mode 100644 Frontend/patient_manager/lib/Authentication/constants.dart diff --git a/Frontend/patient_manager/lib/Authentication/constants.dart b/Frontend/patient_manager/lib/Authentication/constants.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/Frontend/patient_manager/lib/components/buildFilesList.dart b/Frontend/patient_manager/lib/components/buildFilesList.dart index 615443f3..25c857c4 100644 --- a/Frontend/patient_manager/lib/components/buildFilesList.dart +++ b/Frontend/patient_manager/lib/components/buildFilesList.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/components/BuildFileView.dart'; import 'package:patient_manager/components/mybutton.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/files.dart'; //import 'dart:js' as js; @@ -56,14 +57,16 @@ class _BuildFilesListState extends State { const SizedBox(height: 25.0), Expanded( child: BuildFileView( - pdfLink: "http://localhost:9000/mih/$filename")), + pdfLink: + "${AppEnviroment.baseFileUrl}/mih/$filename")), SizedBox( width: 300, height: 100, child: MyButton( onTap: () { html.window.open( - 'http://localhost:9000/mih/$filename', 'download'); + '${AppEnviroment.baseFileUrl}/mih/$filename', + 'download'); }, buttonText: "Dowload", buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/patient_manager/lib/components/medicineSearch.dart b/Frontend/patient_manager/lib/components/medicineSearch.dart index e0e96e2e..48e1d9d2 100644 --- a/Frontend/patient_manager/lib/components/medicineSearch.dart +++ b/Frontend/patient_manager/lib/components/medicineSearch.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:patient_manager/components/buildMedList.dart'; import 'package:patient_manager/components/myErrorMessage.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/medicine.dart'; import 'package:http/http.dart' as http; @@ -19,7 +20,7 @@ class MedicineSearch extends StatefulWidget { } class _MedicineSearchState extends State { - final String endpointMeds = "http://localhost:80/users/medicine/"; + final String endpointMeds = "${AppEnviroment.baseApiUrl}/users/medicine/"; //TextEditingController searchController = TextEditingController(); diff --git a/Frontend/patient_manager/lib/components/patManAppDrawer.dart b/Frontend/patient_manager/lib/components/patManAppDrawer.dart index be1c81ed..4e9901ce 100644 --- a/Frontend/patient_manager/lib/components/patManAppDrawer.dart +++ b/Frontend/patient_manager/lib/components/patManAppDrawer.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:http/http.dart' as http; import 'package:patient_manager/objects/appUser.dart'; @@ -15,7 +16,7 @@ class PatManAppDrawer extends StatefulWidget { } class _PatManAppDrawerState extends State { - String endpointUserData = "http://localhost:80/users/profile/"; + String endpointUserData = "${AppEnviroment.baseApiUrl}/users/profile/"; late Future signedInUser; Future getUserDetails() async { diff --git a/Frontend/patient_manager/lib/components/patientFiles.dart b/Frontend/patient_manager/lib/components/patientFiles.dart index 13adabcf..7315d9d0 100644 --- a/Frontend/patient_manager/lib/components/patientFiles.dart +++ b/Frontend/patient_manager/lib/components/patientFiles.dart @@ -10,6 +10,7 @@ import 'package:patient_manager/components/mySuccessMessage.dart'; import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/prescipInput.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/files.dart'; @@ -32,11 +33,12 @@ class PatientFiles extends StatefulWidget { } class _PatientFilesState extends State { - String endpointFiles = "http://localhost:80/files/patients/"; - String endpointUser = "http://localhost:80/users/profile/"; - String endpointGenFiles = "http://localhost:80/files/generate/med-cert/"; - String endpointFileUpload = "http://localhost:80/files/upload/file/"; - String endpointInsertFiles = "http://localhost:80/files/insert/"; + String endpointFiles = "${AppEnviroment.baseApiUrl}/files/patients/"; + String endpointUser = "${AppEnviroment.baseApiUrl}/users/profile/"; + String endpointGenFiles = + "${AppEnviroment.baseApiUrl}/files/generate/med-cert/"; + String endpointFileUpload = "${AppEnviroment.baseApiUrl}/files/upload/file/"; + String endpointInsertFiles = "${AppEnviroment.baseApiUrl}/files/insert/"; final startDateController = TextEditingController(); final endDateTextController = TextEditingController(); diff --git a/Frontend/patient_manager/lib/components/patientNotes.dart b/Frontend/patient_manager/lib/components/patientNotes.dart index 09cc0485..3d860dae 100644 --- a/Frontend/patient_manager/lib/components/patientNotes.dart +++ b/Frontend/patient_manager/lib/components/patientNotes.dart @@ -7,6 +7,7 @@ import 'package:patient_manager/components/myMLTextInput.dart'; import 'package:patient_manager/components/mySuccessMessage.dart'; import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/mybutton.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/notes.dart'; import 'package:http/http.dart' as http; @@ -20,8 +21,8 @@ class PatientNotes extends StatefulWidget { } class _PatientNotesState extends State { - String endpoint = "http://localhost:80/notes/patients/"; - String apiUrlAddNote = "http://localhost:80/notes/insert/"; + String endpoint = "${AppEnviroment.baseApiUrl}/notes/patients/"; + String apiUrlAddNote = "${AppEnviroment.baseApiUrl}/notes/insert/"; final titleController = TextEditingController(); final noteTextController = TextEditingController(); late Future> futueNotes; diff --git a/Frontend/patient_manager/lib/env/env.dart b/Frontend/patient_manager/lib/env/env.dart index 4bfc0802..43d54a94 100644 --- a/Frontend/patient_manager/lib/env/env.dart +++ b/Frontend/patient_manager/lib/env/env.dart @@ -2,6 +2,7 @@ enum Enviroment { dev, prod } abstract class AppEnviroment { static late String baseApiUrl; + static late String baseFileUrl; static late Enviroment _enviroment; static Enviroment get enviroment => _enviroment; static setupEnv(Enviroment env) { @@ -9,12 +10,14 @@ abstract class AppEnviroment { switch (env) { case Enviroment.dev: { - baseApiUrl = "http://localhost"; + baseApiUrl = "http://localhost:80"; + baseFileUrl = "http://localhost:9000"; break; } case Enviroment.prod: { baseApiUrl = "api"; + baseFileUrl = "minio"; break; } } diff --git a/Frontend/patient_manager/lib/main.dart b/Frontend/patient_manager/lib/main.dart index a6df0978..11c9adf7 100644 --- a/Frontend/patient_manager/lib/main.dart +++ b/Frontend/patient_manager/lib/main.dart @@ -4,29 +4,17 @@ import 'package:patient_manager/router/routeGenerator.dart'; import 'package:patient_manager/theme/mihTheme.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; -// void main() async { -// WidgetsFlutterBinding.ensureInitialized(); -// await Supabase.initialize( -// url: "https://stzluvsyhbwtfbztarmu.supabase.co", -// anonKey: -// "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InN0emx1dnN5aGJ3dGZienRhcm11Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3MTIwNzUyMTMsImV4cCI6MjAyNzY1MTIxM30.a7VHlk63JJcAotvsqtoqiKwjNK4EbnNgKilAqt1iRio", -// ); -// runApp(const MzanziInnovationHub()); -// } - final client = Supabase.instance.client; class MzanziInnovationHub extends StatefulWidget { - //final AppEnviroment appEnv; - const MzanziInnovationHub({ super.key, - //required this.appEnv, }); @override State createState() => _MzanziInnovationHubState(); + // ignore: library_private_types_in_public_api static _MzanziInnovationHubState? of(BuildContext context) => context.findAncestorStateOfType<_MzanziInnovationHubState>(); } @@ -39,20 +27,25 @@ class _MzanziInnovationHubState extends State { return theme.primaryColor(); } + String getTitle() { + if (AppEnviroment.getEnv() == "Dev") { + return "Mzansi Innovation Hub - Dev"; + } else { + return "Mzansi Innovation Hub"; + } + } + void changeTheme(ThemeMode themeMode) { setState(() { _themeMode = themeMode; - //print(_themeMode); if (_themeMode == ThemeMode.light) { setState(() { theme.mode = "Light"; }); - //print(theme.mode); } else { setState(() { theme.mode = "Dark"; }); - //print(theme.mode); } }); } @@ -68,7 +61,7 @@ class _MzanziInnovationHubState extends State { @override Widget build(BuildContext context) { return MaterialApp( - title: 'Mzansi Innovation Hub - ${AppEnviroment.getEnv()}', + title: getTitle(), themeMode: _themeMode, theme: theme.darkMode(), darkTheme: theme.lightMode(), diff --git a/Frontend/patient_manager/lib/pages/home.dart b/Frontend/patient_manager/lib/pages/home.dart index 5d869eab..07cedca3 100644 --- a/Frontend/patient_manager/lib/pages/home.dart +++ b/Frontend/patient_manager/lib/pages/home.dart @@ -89,20 +89,5 @@ class _HomeState extends State { } }, ); - - // Scaffold( - // appBar: MyAppBar(barTitle: "Mzanzi Innovation Hub"), - // body: HomeTileGrid(), - // drawer: FutureBuilder( - // future: getUserEmail(), - // builder: (contexts, snapshot) { - // if (snapshot.connectionState == ConnectionState.done) { - // return MyAppDrawer(drawerTitle: useremail); - // } else { - // return Center(child: CircularProgressIndicator()); - // } - // }, - // ), - // ); } } diff --git a/Frontend/patient_manager/lib/pages/patientAdd.dart b/Frontend/patient_manager/lib/pages/patientAdd.dart index dd1d562a..a42f2bb1 100644 --- a/Frontend/patient_manager/lib/pages/patientAdd.dart +++ b/Frontend/patient_manager/lib/pages/patientAdd.dart @@ -6,6 +6,7 @@ import 'package:patient_manager/components/myErrorMessage.dart'; import 'package:patient_manager/components/mySuccessMessage.dart'; import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/mybutton.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; import '../components/myAppBar.dart'; @@ -37,8 +38,8 @@ class _AddPatientState extends State { final medMainMemController = TextEditingController(); final medAidCodeController = TextEditingController(); - final docOfficeIdApiUrl = "http://localhost:80/users/profile/"; - final apiUrl = "http://localhost:80/patients/insert/"; + final docOfficeIdApiUrl = "${AppEnviroment.baseApiUrl}/users/profile/"; + final apiUrl = "${AppEnviroment.baseApiUrl}/patients/insert/"; late int futureDocOfficeId; late bool medRequired; diff --git a/Frontend/patient_manager/lib/pages/patientEdit.dart b/Frontend/patient_manager/lib/pages/patientEdit.dart index 5212adad..eb744586 100644 --- a/Frontend/patient_manager/lib/pages/patientEdit.dart +++ b/Frontend/patient_manager/lib/pages/patientEdit.dart @@ -6,6 +6,7 @@ import 'package:patient_manager/components/myErrorMessage.dart'; import 'package:patient_manager/components/mySuccessMessage.dart'; import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/mybutton.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/appUser.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; @@ -39,9 +40,9 @@ class _EditPatientState extends State { final medMainMemController = TextEditingController(); final medAidCodeController = TextEditingController(); - final docOfficeIdApiUrl = "http://localhost:80/users/profile/"; - final apiUrlEdit = "http://localhost:80/patients/update/"; - final apiUrlDelete = "http://localhost:80/patients/delete/"; + final docOfficeIdApiUrl = "${AppEnviroment.baseApiUrl}/users/profile/"; + final apiUrlEdit = "${AppEnviroment.baseApiUrl}/patients/update/"; + final apiUrlDelete = "${AppEnviroment.baseApiUrl}/patients/delete/"; late int futureDocOfficeId; late String userEmail; late bool medRequired; diff --git a/Frontend/patient_manager/lib/pages/patientManager.dart b/Frontend/patient_manager/lib/pages/patientManager.dart index 72c25aa8..b1025ef9 100644 --- a/Frontend/patient_manager/lib/pages/patientManager.dart +++ b/Frontend/patient_manager/lib/pages/patientManager.dart @@ -7,6 +7,7 @@ import 'package:patient_manager/components/myAppBar.dart'; import 'package:http/http.dart' as http; import 'package:patient_manager/components/mySearchInput.dart'; import 'package:patient_manager/components/patManAppDrawer.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:patient_manager/objects/patients.dart'; @@ -24,7 +25,7 @@ class PatientManager extends StatefulWidget { class _PatientManagerState extends State { TextEditingController searchController = TextEditingController(); - String endpoint = "http://localhost:80/patients/user/"; + String endpoint = "${AppEnviroment.baseApiUrl}/patients/user/"; late Future> futurePatients; String searchString = ""; diff --git a/database/#ib_16384_0.dblwr b/database/#ib_16384_0.dblwr index 16837ccf8a7ad267b49850055daa5094fb17312e..58b1a05db03205c11fa7909e2c36537b86f9c592 100644 GIT binary patch delta 281 zcmX|%wN8Tp00vu1p*XZiad&rbzv3>%{Y}U}T)vfogoT}ng|NWJqd^xgx#e;}5JZBU zgvld9K2ZuNBt{X%lu$|;$<&Q$sCvB&nx?Mw)1*g;v^Vr-M$q=%$BW`sinX zL53J+gi*#AXM#zlm}Z7q=9p)JMV445MLPNP{_+(Hg`$7{6M4-(ek2pAaQrh9ON5`( z>F-$X%XLdu##*sftu<@i+ORgQEoEY)WZgg9X delta 851 zcmYk)J4{ni7zgmL=iZi9z?Nq#Lcs@EAC+1~5qx|IC?aYRQGAp5h#fFhL*m9o|M?=D z8zwq9p`%F?SDkfnFb+EC>ZpSot>@AY;z{n!xxe$>|9Rwip67V}g8&R1xCkPIDufZi zI#iUF9`SEKLqTcd1<)}vY z+X+Zd_s6c_@wZt@G0Rj;nTurgwG1+gvW)?2~P;07oHTp aAbe4HO8AoSW#KErSB0+$Uti)IAN~Q+i_pvf diff --git a/database/#innodb_redo/#ib_redo18 b/database/#innodb_redo/#ib_redo18 index d63d093ef76bf45f3b2c9c29ed77ac9bfef170d4..f1e06e6a853a39f61384cdaa8b8e67b1f025c8e7 100644 GIT binary patch delta 18209 zcmeIyy$QlV9ES0`n8dI1BYw6KYy~F}6en;4XAmqyKu}w;a1BEW!PdqZ#0{Ll&R55f zr+ALzUmeHYFHP?@Rp+|rEs{LCzHDGNopk!!9>#->3wJKG%2Ng9t3Z9{MO9K|RZ&&t zR87@YLp4>TTB@x&s;hbz7xv$`Vq)gT7<-Bz(ef0}N`c!(dlO8Cnr>U!AhG`XxLW-V zl*iYnW#JBZ2Ydr4Ktd!$LL@{&Bt$|aL_#D)LL@{&Bt$|aL_#D)LL@{&Bt$|aL_#D) zLL@{&Bt$|aL_#D)LL@{&Bt$|aL_#D)LL@{&Bt$|aL_#D)LL@{&Bt$|aL_#D)LL@{& PBt$|a{BsGj@yLDvHFzyx delta 18196 zcmeIyI}QOs9LMpQwGWT+SkF+==p-9wkf=o=Q8<7TC^u24ReKGhkZ3i|AS$gB==?Z_ ze2ed7@~+vnyRJRXBT$f*Jy1f#u%IR@9`>o&V$}D*;v2!>Mnj~IQ1_N%fcP- z4)_L8fP_ehgh+^lNQi_;h=fRpgh+^lNQi_;h=fRpgh+^lNQi_;h=fRpgh+^lNQi_; zh=fRpgh+^lNQi_;h=fRpgh+^lNQi_;h=fRpgh+^lNQi_;h=fRpgh+^lNQi_;_~#NH Hlac)Zcy}td diff --git a/database/ibdata1 b/database/ibdata1 index 6ef134767ee747d24c5502fce80fe625fba48fca..2ae9b8d6d5d9327c99b07876d416c7293a1cb0af 100644 GIT binary patch delta 638 zcmX|-RacY&00sAx5HV2JSQ9Ml?t-;j6ca2^u^YP>QO5*K5K%D@3lkJD|C;QJbIv@? zeY!v*F>8Zpq`bbOITQ*dwECa8>YNKrk!TRk3{o2kf^bloRUEV=#ip?&fwYl0iI)UP zl(v#2?Ic;+O9$yFog_s%OBYF%uymDf(p`E;M0!du=`DSvuk@2NNtgaIKnBVn87vtx zM25;R87?Daq>Pf$GDgPAI2kV!WTH%x$udQz$~2iSGi0XBl1#~xsLYl*GFRrwd|4n1 zWsxkFC9+hO$#PjC*|JhrNsg?RHL_OL$$Hr!xsoRvWs_`{EwWYer9igHcG)3?vQu`+ zZrLMyWuNSq19DIf$zeGnN2N%P$#FR$C*_o!mNRlz&dGUceZE+bi&7$&vBVG$}K6CGAWnaa!2mUJ-IIrq(Um?p;XBusg}p`M4n2GJd@}0LS9O(yplS3EpOzl oyp#7*FCXNie3H-dMZQXdG|D&mE=|%bE%HNt$}jmXf9m+lKfV_n`Tzg` delta 638 zcmX|*=UdGI07mamN@j7xH6kOMWY4n^5DCf53W@L`f0*tU=XuVj z^L}`N1Y%YP(MVIq-`Y?p6yNNB;wth+)kmU1I4el5D-6Oxd3JHokQkfBk_6I1;-sa- zOML;Bw0F2Ckac6be1mCRU*<&x=Rn~DXG#+dP|!0k-pMT`b)YD zkbyEt2Fnl`D#K*BjF1c&DVfszYP5`zu`*7^%LJJylVq|?k*Sg;*%Fm$GF@iKOqnIK zWsc01c`{!XNRBL&Tv;TGB~S8Yi7b@@StiS6g{+iSvRc;2T3ILSWrGyTM%g5rWs7W; zZL(c<$WGZMyJe5;m3^{b4#+_{B!}gQ9F=2IB**21oRm{?TFywZAZO*Al*oCxAWErR zluJ@3m*t9Fm1}ZcZpcl!CAZ~{+?9J$F8AeuJd_G~B#)(1o=BBEm1pu?s^x{$$V+)8 qujP%rm3LAr@8yGhluzg0=jm2Xln-=#r*$WLjMU-G+#Kl}rvs2mai