diff --git a/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin b/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin index a4e96e7a..4b62e333 100644 Binary files a/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin and b/File_Storage/Mzanzi_Innovation_Hub/.minio.sys/buckets/.tracker.bin differ diff --git a/Frontend/patient_manager/Dockerfile b/Frontend/patient_manager/Dockerfile index a7ddb566..a9780c53 100644 --- a/Frontend/patient_manager/Dockerfile +++ b/Frontend/patient_manager/Dockerfile @@ -46,7 +46,7 @@ WORKDIR /app/ # RUN flutter pub add web:^0.5.0 # RUN flutter pub run pdfx:install_web RUN flutter upgrade -RUN flutter build web +RUN flutter build web -t ./lib/main_prod.dart # Record the exposed port EXPOSE 8080 diff --git a/Frontend/patient_manager/lib/env/env.dart b/Frontend/patient_manager/lib/env/env.dart new file mode 100644 index 00000000..4bfc0802 --- /dev/null +++ b/Frontend/patient_manager/lib/env/env.dart @@ -0,0 +1,36 @@ +enum Enviroment { dev, prod } + +abstract class AppEnviroment { + static late String baseApiUrl; + static late Enviroment _enviroment; + static Enviroment get enviroment => _enviroment; + static setupEnv(Enviroment env) { + _enviroment = env; + switch (env) { + case Enviroment.dev: + { + baseApiUrl = "http://localhost"; + break; + } + case Enviroment.prod: + { + baseApiUrl = "api"; + break; + } + } + } + + static String getEnv() { + //_enviroment = env; + switch (_enviroment) { + case Enviroment.dev: + { + return "Dev"; + } + case Enviroment.prod: + { + return "Prod"; + } + } + } +} diff --git a/Frontend/patient_manager/lib/main.dart b/Frontend/patient_manager/lib/main.dart index 447fdc57..a6df0978 100644 --- a/Frontend/patient_manager/lib/main.dart +++ b/Frontend/patient_manager/lib/main.dart @@ -1,22 +1,28 @@ import 'package:flutter/material.dart'; +import 'package:patient_manager/env/env.dart'; 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()); -} +// 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 { - const MzanziInnovationHub({super.key}); + //final AppEnviroment appEnv; + + const MzanziInnovationHub({ + super.key, + //required this.appEnv, + }); @override State createState() => _MzanziInnovationHubState(); @@ -62,7 +68,7 @@ class _MzanziInnovationHubState extends State { @override Widget build(BuildContext context) { return MaterialApp( - title: 'Mzansi Innovation Hub', + title: 'Mzansi Innovation Hub - ${AppEnviroment.getEnv()}', themeMode: _themeMode, theme: theme.darkMode(), darkTheme: theme.lightMode(), diff --git a/Frontend/patient_manager/lib/main_dev.dart b/Frontend/patient_manager/lib/main_dev.dart index cec4e1b6..fb8e7eaa 100644 --- a/Frontend/patient_manager/lib/main_dev.dart +++ b/Frontend/patient_manager/lib/main_dev.dart @@ -1,14 +1,16 @@ import 'package:flutter/material.dart'; +import 'package:patient_manager/env/env.dart'; import 'package:patient_manager/main.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; void main() async { + AppEnviroment.setupEnv(Enviroment.dev); WidgetsFlutterBinding.ensureInitialized(); await Supabase.initialize( url: "https://stzluvsyhbwtfbztarmu.supabase.co", anonKey: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InN0emx1dnN5aGJ3dGZienRhcm11Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3MTIwNzUyMTMsImV4cCI6MjAyNzY1MTIxM30.a7VHlk63JJcAotvsqtoqiKwjNK4EbnNgKilAqt1iRio", ); - print(String.fromEnvironment('baseURL')); + //print(AppEnviroment.baseApiUrl); runApp(const MzanziInnovationHub()); } diff --git a/Frontend/patient_manager/lib/main_prod.dart b/Frontend/patient_manager/lib/main_prod.dart new file mode 100644 index 00000000..aa7c3cba --- /dev/null +++ b/Frontend/patient_manager/lib/main_prod.dart @@ -0,0 +1,16 @@ +import 'package:flutter/material.dart'; +import 'package:patient_manager/env/env.dart'; +import 'package:patient_manager/main.dart'; +import 'package:supabase_flutter/supabase_flutter.dart'; + +void main() async { + AppEnviroment.setupEnv(Enviroment.prod); + WidgetsFlutterBinding.ensureInitialized(); + await Supabase.initialize( + url: "https://stzluvsyhbwtfbztarmu.supabase.co", + anonKey: + "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InN0emx1dnN5aGJ3dGZienRhcm11Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3MTIwNzUyMTMsImV4cCI6MjAyNzY1MTIxM30.a7VHlk63JJcAotvsqtoqiKwjNK4EbnNgKilAqt1iRio", + ); + //print(AppEnviroment.baseApiUrl); + runApp(const MzanziInnovationHub()); +} diff --git a/database/#ib_16384_0.dblwr b/database/#ib_16384_0.dblwr index 9a657503..16837ccf 100644 Binary files a/database/#ib_16384_0.dblwr and b/database/#ib_16384_0.dblwr differ diff --git a/database/#innodb_redo/#ib_redo18 b/database/#innodb_redo/#ib_redo18 index 8f24765e..d63d093e 100644 Binary files a/database/#innodb_redo/#ib_redo18 and b/database/#innodb_redo/#ib_redo18 differ diff --git a/database/#innodb_temp/temp_1.ibt b/database/#innodb_temp/temp_1.ibt index 1ae8784e..bc6c133a 100644 Binary files a/database/#innodb_temp/temp_1.ibt and b/database/#innodb_temp/temp_1.ibt differ diff --git a/database/#innodb_temp/temp_10.ibt b/database/#innodb_temp/temp_10.ibt index d74de676..183aa862 100644 Binary files a/database/#innodb_temp/temp_10.ibt and b/database/#innodb_temp/temp_10.ibt differ diff --git a/database/#innodb_temp/temp_2.ibt b/database/#innodb_temp/temp_2.ibt index 428ce7fc..e222e950 100644 Binary files a/database/#innodb_temp/temp_2.ibt and b/database/#innodb_temp/temp_2.ibt differ diff --git a/database/#innodb_temp/temp_3.ibt b/database/#innodb_temp/temp_3.ibt index 4829ebff..e99b43ef 100644 Binary files a/database/#innodb_temp/temp_3.ibt and b/database/#innodb_temp/temp_3.ibt differ diff --git a/database/#innodb_temp/temp_4.ibt b/database/#innodb_temp/temp_4.ibt index 67e541a4..21ea0f63 100644 Binary files a/database/#innodb_temp/temp_4.ibt and b/database/#innodb_temp/temp_4.ibt differ diff --git a/database/#innodb_temp/temp_5.ibt b/database/#innodb_temp/temp_5.ibt index 6d3f70e7..3aa4d6ae 100644 Binary files a/database/#innodb_temp/temp_5.ibt and b/database/#innodb_temp/temp_5.ibt differ diff --git a/database/#innodb_temp/temp_6.ibt b/database/#innodb_temp/temp_6.ibt index 01f55afc..8d4654c6 100644 Binary files a/database/#innodb_temp/temp_6.ibt and b/database/#innodb_temp/temp_6.ibt differ diff --git a/database/#innodb_temp/temp_7.ibt b/database/#innodb_temp/temp_7.ibt index a252baf2..af592d23 100644 Binary files a/database/#innodb_temp/temp_7.ibt and b/database/#innodb_temp/temp_7.ibt differ diff --git a/database/#innodb_temp/temp_8.ibt b/database/#innodb_temp/temp_8.ibt index 6cec37c6..06833ec6 100644 Binary files a/database/#innodb_temp/temp_8.ibt and b/database/#innodb_temp/temp_8.ibt differ diff --git a/database/#innodb_temp/temp_9.ibt b/database/#innodb_temp/temp_9.ibt index a2a076b0..af15201e 100644 Binary files a/database/#innodb_temp/temp_9.ibt and b/database/#innodb_temp/temp_9.ibt differ diff --git a/database/binlog.000058 b/database/binlog.000058 index bdfcaa3e..8b24e54a 100644 Binary files a/database/binlog.000058 and b/database/binlog.000058 differ diff --git a/database/binlog.000059 b/database/binlog.000059 new file mode 100644 index 00000000..1ccc8c69 Binary files /dev/null and b/database/binlog.000059 differ diff --git a/database/ib_buffer_pool b/database/ib_buffer_pool index be63064a..c0e2f357 100644 --- a/database/ib_buffer_pool +++ b/database/ib_buffer_pool @@ -1,6 +1,5 @@ -4294967294,448 -4294967278,398 -4294967278,397 +4294967294,449 +4294967278,389 4294967293,131 4294967293,130 4294967293,129 @@ -267,9 +266,9 @@ 4294967278,280 4294967278,413 4294967278,6 +4294967278,398 4294967278,258 4294967278,5 -4294967278,389 4294967278,257 4294967278,4 4294967278,3 @@ -295,3 +294,6 @@ 4294967279,442 4294967279,126 4294967279,441 +4294967279,256 +4294967279,125 +4294967279,440 diff --git a/database/ibdata1 b/database/ibdata1 index 8208e08f..6ef13476 100644 Binary files a/database/ibdata1 and b/database/ibdata1 differ diff --git a/database/ibtmp1 b/database/ibtmp1 index fa15d028..41817fce 100644 Binary files a/database/ibtmp1 and b/database/ibtmp1 differ diff --git a/database/mysql.ibd b/database/mysql.ibd index 974ecd6f..1dd4226a 100644 Binary files a/database/mysql.ibd and b/database/mysql.ibd differ diff --git a/database/undo_001 b/database/undo_001 index 6e0f6978..c091453d 100644 Binary files a/database/undo_001 and b/database/undo_001 differ diff --git a/database/undo_002 b/database/undo_002 index 12bbc5b9..d6215035 100644 Binary files a/database/undo_002 and b/database/undo_002 differ