Merge pull request 'Linux Flatpak config set up' (#26) from V.1.2.6 into main

Reviewed-on: #26

.gitignore

@@ -1,16 +1,14 @@
-# *database/auto.cnf
+mih_minio/
-# *database/binlog.index
+mih_db/
-# *database/mysql.sock
+mih_git/
-File_Storage
+mih_nginx/
-database/
+mih_monitor/
+mih_wp/
 certbot/
 Firebase-emulator/
 Mzansi_Mail/
-# database/ibdata1
-# database/mysql.ibd
-# database/undo*
-# database/#innodb_redo/#ib_redo*
 .venv
 google-chrome-stable_current_amd64.deb
 .env
-Frontend/android/app/.cxx/
+Frontend/android/app/.cxx/
+.DS_Store

.vscode/launch.json

@@ -6,14 +6,25 @@
     "configurations": [
         {
             "name": "Debug",
-            "cwd": "Frontend",
+            "cwd": "mih_ui",
             "request": "launch",
             "type": "dart",
             "program": "lib/main_dev.dart"
         },
+        {
+            "name": "Debug (web)",
+            "cwd": "mih_ui",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main_dev.dart",
+            "args": [
+                "--web-port",
+                "1995"
+            ]
+        },
         {
             "name": "Profile",
-            "cwd": "Frontend",
+            "cwd": "mih_ui",
             "request": "launch",
             "type": "dart",
             "flutterMode": "profile",
@@ -21,7 +32,7 @@
         },
         {
             "name": "Release",
-            "cwd": "Frontend",
+            "cwd": "mih_ui",
             "request": "launch",
             "type": "dart",
             "flutterMode": "release",

Frontend/.metadata

@@ -1,45 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: "8defaa71a77c16e8547abdbfad2053ce3a6e2d5b"
-  channel: "stable"
-
-project_type: app
-
-# Tracks metadata for the flutter migrate command
-migration:
-  platforms:
-    - platform: root
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-    - platform: android
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-    - platform: ios
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-    - platform: linux
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-    - platform: macos
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-    - platform: web
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-    - platform: windows
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
-
-  # User provided section
-
-  # List of Local paths (relative to this file) that should be
-  # ignored by the migrate tool.
-  #
-  # Files that are not part of the templates will be ignored by default.
-  unmanaged_files:
-    - 'lib/main.dart'
-    - 'ios/Runner.xcodeproj/project.pbxproj'

Frontend/Dockerfile

@@ -1,48 +0,0 @@
-# Install Operating system and dependencies
-#FROM ubuntu:22.04
-FROM debian:latest AS build-env
-
-#ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update --fix-missing
-
-RUN apt-get install -y curl git wget unzip gdb libstdc++6 libglu1-mesa fonts-droid-fallback
-# RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback
-RUN apt-get install python3 -y
-
-# download Flutter SDK from Flutter Github repo
-RUN git clone -b flutter-3.32-candidate.0 https://github.com/flutter/flutter.git /usr/local/flutter
-# RUN git clone -b stable https://github.com/flutter/flutter.git /usr/local/flutter
-
-# Set flutter environment path
-ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PATH}"
-#ENV PATH "$PATH:/home/developer/flutter/bin"
-
-RUN flutter doctor -v
-
-# Enable flutter web
-RUN flutter channel flutter-3.32-candidate.0
-# RUN flutter channel stable
-RUN flutter config --enable-web
-
-# Copy files to container and build
-RUN mkdir /app/
-COPY . /app/
-
-WORKDIR /app
-# RUN flutter upgrade
-RUN flutter build web --release -t ./lib/main_prod.dart
-# RUN flutter build web --release --web-renderer canvaskit -t ./lib/main_prod.dart
-
-
-# RUN cd ..
-
-# WORKDIR /app/build/web/
-
-EXPOSE 83
-
-RUN ["chmod", "+x", "/app/server/server.sh"]
-
-ENTRYPOINT [ "/app/server/server.sh"]
-
-# RUN ["python3", "-u", "/app/server/MIH_web_server.py"]

Frontend/android/app/src/main/res/values/colors.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#3A4454</color>
-</resources>

Frontend/flutter_launcher_icons.yaml

@@ -1,32 +0,0 @@
-# flutter pub run flutter_launcher_icons
-flutter_launcher_icons:
-  image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_app_icon.png"
-
-  android: "launcher_icon"
-  # image_path_android: "assets/icon/icon.png"
-  min_sdk_android: 21 # android min sdk min:16, default 21
-  adaptive_icon_background: "#3A4454"
-  adaptive_icon_foreground: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_app_icon.png"
-  # adaptive_icon_monochrome: "assets/icon/monochrome.png"
-
-  ios: true
-  image_path_ios: "lib/mih_components/mih_package_components/assets/images/app_icon/mih_app_icon.png"
-  remove_alpha_channel_ios: true
-  # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
-  # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
-  # desaturate_tinted_to_grayscale_ios: true
-
-  web:
-    generate: true
-    image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/circle_logo.png"
-    background_color: "#3A4454"
-    theme_color: "#3A4454"
-
-  windows:
-    generate: true
-    image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/circle_logo.png"
-    icon_size: 48 # min:48, max:256, default: 48
-
-  macos:
-    generate: true
-    image_path: "lib/mih_components/mih_package_components/assets/images/app_icon/circle_logo.png"

Frontend/lib/main.dart

@@ -1,144 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/about_mih_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_authentication_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_banner_ad_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calculator_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:provider/provider.dart';
-import 'package:upgrader/upgrader.dart';
-import 'mih_config/mih_env.dart';
-import 'mih_config/mih_theme.dart';
-
-class MzansiInnovationHub extends StatefulWidget {
-  final GoRouter router;
-  const MzansiInnovationHub({
-    super.key,
-    required this.router,
-  });
-
-  @override
-  State<MzansiInnovationHub> createState() => _MzansiInnovationHubState();
-
-  // ignore: library_private_types_in_public_api
-  static _MzansiInnovationHubState? of(BuildContext context) =>
-      context.findAncestorStateOfType<_MzansiInnovationHubState>();
-}
-
-class _MzansiInnovationHubState extends State<MzansiInnovationHub> {
-  late MihTheme theme;
-
-  Color getPrimany() {
-    return MihColors.getPrimaryColor(theme.mode == "Dark");
-  }
-
-  String getTitle() {
-    if (AppEnviroment.getEnv() == "Dev") {
-      return "Dev | MIH App: Mzansi Innovation Hub";
-    } else {
-      return "MIH App: Mzansi Innovation Hub";
-    }
-  }
-
-  void changeTheme(ThemeMode themeMode) {
-    setState(() {
-      if (themeMode == ThemeMode.light) {
-        setState(() {
-          theme.mode = "Light";
-        });
-      } else if (themeMode == ThemeMode.dark) {
-        setState(() {
-          theme.mode = "Dark";
-        });
-      } else {
-        setState(() {
-          theme.mode = "Dark";
-        });
-      }
-    });
-  }
-
-  @override
-  void initState() {
-    theme = MihTheme();
-    super.initState();
-    theme.mode = "Dark";
-    theme.platform = Theme.of(context).platform;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double width = MediaQuery.sizeOf(context).width;
-    theme.setScreenType(width);
-    precacheImage(theme.loadingImage(), context);
-    return MultiProvider(
-      providers: [
-        ChangeNotifierProvider(
-          create: (context) => MihAuthenticationProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MzansiProfileProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MzansiWalletProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MzansiAiProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MzansiDirectoryProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MihBannerAdProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MihCalculatorProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MihAccessControllsProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MihCalendarProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => AboutMihProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => MihMineSweeperProvider(),
-        ),
-        ChangeNotifierProvider(
-          create: (context) => PatientManagerProvider(),
-        ),
-      ],
-      child: MaterialApp.router(
-        title: getTitle(),
-        themeMode: ThemeMode.dark,
-        theme: theme.getThemeData(),
-        darkTheme: theme.getThemeData(),
-        debugShowCheckedModeBanner: false,
-        routerConfig: widget.router,
-        builder: (context, child) {
-          if (child == null) {
-            return const Scaffold(
-              body: Center(
-                child: CircularProgressIndicator(),
-              ),
-            );
-          }
-          return UpgradeAlert(
-            navigatorKey: widget.router.routerDelegate.navigatorKey,
-            child: child,
-          );
-        },
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_layout/mih_action.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-
-class MIHAction extends StatefulWidget {
-  final void Function()? onTap;
-  final double iconSize;
-  final Widget icon;
-  const MIHAction({
-    super.key,
-    required this.icon,
-    required this.iconSize,
-    required this.onTap,
-  });
-
-  @override
-  State<MIHAction> createState() => _MIHActionState();
-}
-
-class _MIHActionState extends State<MIHAction> {
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return IconButton(
-      iconSize: widget.iconSize,
-      padding: const EdgeInsets.all(0),
-      onPressed: widget.onTap,
-      icon: widget.icon,
-    );
-  }
-}

Frontend/lib/mih_components/mih_layout/mih_body.dart

@@ -1,106 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../main.dart';
-
-class MIHBody extends StatefulWidget {
-  final bool borderOn;
-  final List<Widget> bodyItems;
-  const MIHBody({
-    super.key,
-    required this.borderOn,
-    required this.bodyItems,
-  });
-
-  @override
-  State<MIHBody> createState() => _MIHBodyState();
-}
-
-class _MIHBodyState extends State<MIHBody> {
-  //double paddingSize = 10;
-
-  double getHorizontalPaddingSize(Size screenSize) {
-    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
-      if (widget.borderOn) {
-        return 10;
-      } else {
-        return 0;
-      }
-    } else {
-      // mobile
-      if (widget.borderOn) {
-        return 10;
-      } else {
-        return 0;
-      }
-    }
-  }
-
-  double getVerticalPaddingSize(Size screenSize) {
-    // mobile
-    if (widget.borderOn) {
-      return 10;
-    } else {
-      return 0;
-    }
-  }
-
-  Decoration? getBoader() {
-    if (widget.borderOn) {
-      return BoxDecoration(
-        color: MihColors.getPrimaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        borderRadius: BorderRadius.circular(25.0),
-        border: Border.all(
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            width: 3.0),
-      );
-    } else {
-      return null;
-    }
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    Size screenSize = MediaQuery.sizeOf(context);
-    return Padding(
-      padding: EdgeInsets.only(
-        left: getHorizontalPaddingSize(screenSize),
-        right: getHorizontalPaddingSize(screenSize),
-        bottom: getVerticalPaddingSize(screenSize),
-        top: 0,
-      ),
-      child: Container(
-        padding: EdgeInsets.only(
-          left: 10,
-          right: 10,
-          bottom: 10,
-          top: getVerticalPaddingSize(screenSize),
-        ),
-        width: screenSize.width,
-        height: screenSize.height,
-        decoration: getBoader(),
-        child: ScrollConfiguration(
-          behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              mainAxisSize: MainAxisSize.max,
-              children: widget.bodyItems,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_layout/mih_header.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/material.dart';
-
-class MIHHeader extends StatefulWidget {
-  final MainAxisAlignment headerAlignment;
-  final List<Widget> headerItems;
-  const MIHHeader({
-    super.key,
-    required this.headerAlignment,
-    required this.headerItems,
-  });
-
-  @override
-  State<MIHHeader> createState() => _MIHHeaderState();
-}
-
-class _MIHHeaderState extends State<MIHHeader> {
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: 50,
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisAlignment: widget.headerAlignment,
-        mainAxisSize: MainAxisSize.max,
-        children: widget.headerItems,
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_layout/mih_layout_builder.dart

@@ -1,152 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../../mih_packages/mih_home/components/mih_app_drawer.dart';
-import 'mih_body.dart';
-import 'mih_header.dart';
-
-class MIHLayoutBuilder extends StatefulWidget {
-  final Widget actionButton;
-  final Widget? secondaryActionButton;
-  final MIHHeader header;
-  final MIHBody body;
-  final MIHAppDrawer? actionDrawer;
-  final Widget? secondaryActionDrawer;
-  final Widget? bottomNavBar;
-  final bool pullDownToRefresh;
-  final Future<void> Function() onPullDown;
-  //final String type;
-  const MIHLayoutBuilder({
-    super.key,
-    required this.actionButton,
-    required this.header,
-    required this.secondaryActionButton,
-    required this.body,
-    required this.actionDrawer,
-    required this.secondaryActionDrawer,
-    required this.bottomNavBar,
-    required this.pullDownToRefresh,
-    required this.onPullDown,
-  });
-
-  @override
-  State<MIHLayoutBuilder> createState() => _MIHLayoutBuilderState();
-}
-
-class _MIHLayoutBuilderState extends State<MIHLayoutBuilder> {
-  List<Widget> getList() {
-    List<Widget> temp = [];
-    temp.add(widget.header);
-    temp.add(widget.body);
-    return temp;
-  }
-
-  // openTheDrawer() {
-  //   _scaffoldKey.currentState!.openEndDrawer();
-  // }
-
-  Widget getLayoutHeader() {
-    List<Widget> temp = [];
-    temp.add(widget.actionButton);
-    temp.add(Flexible(child: widget.header));
-    if (widget.secondaryActionButton != null) {
-      temp.add(widget.secondaryActionButton!);
-    } else {
-      //print(widget.header.headerItems.length);
-      if (widget.header.headerItems.length == 1) {
-        temp.add(const SizedBox(
-          width: 50,
-        ));
-      }
-    }
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: temp,
-    );
-  }
-
-  Widget getBody(double width, double height) {
-    if (widget.pullDownToRefresh == true) {
-      return SafeArea(
-        child: LayoutBuilder(builder: (context, BoxConstraints constraints) {
-          double newheight = constraints.maxHeight;
-          //print(newheight);
-          return RefreshIndicator(
-            onRefresh: widget.onPullDown,
-            child: ListView.builder(
-              itemCount: 1,
-              itemBuilder: (BuildContext context, int index) {
-                return SafeArea(
-                  child: SizedBox(
-                    width: width,
-                    height: newheight,
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        const SizedBox(height: 5),
-                        getLayoutHeader(),
-                        const SizedBox(height: 5),
-                        Expanded(child: widget.body),
-                      ],
-                    ),
-                  ),
-                );
-              },
-              // child: SafeArea(
-              //   child: SizedBox(
-              //     width: width,
-              //     height: height,
-              //     child: Column(
-              //       mainAxisAlignment: MainAxisAlignment.start,
-              //       children: [
-              //         getLayoutHeader(),
-              //         Expanded(child: widget.body),
-              //       ],
-              //     ),
-              //   ),
-              // ),
-            ),
-          );
-        }),
-      );
-    } else {
-      return SafeArea(
-        child: SizedBox(
-          width: width,
-          height: height,
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: [
-              const SizedBox(height: 5),
-              getLayoutHeader(),
-              const SizedBox(height: 5),
-              Expanded(child: widget.body),
-            ],
-          ),
-        ),
-      );
-    }
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    Size screenSize = MediaQuery.sizeOf(context);
-    return Scaffold(
-      //drawerEnableOpenDragGesture: true,
-      drawer: widget.actionDrawer,
-      endDrawer: widget.secondaryActionDrawer,
-      body: getBody(screenSize.width, screenSize.height),
-      bottomNavigationBar: widget.bottomNavBar,
-    );
-  }
-}

Frontend/lib/mih_components/mih_layout/mih_tile.dart

@@ -1,126 +0,0 @@
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_yt_video_player.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-
-class MIHTile extends StatefulWidget {
-  final String tileName;
-  final String? videoID;
-  final Widget tileIcon;
-  final void Function() onTap;
-  // final Widget tileIcon;
-  final Color p;
-  final Color s;
-
-  const MIHTile({
-    super.key,
-    required this.onTap,
-    required this.tileName,
-    this.videoID,
-    required this.tileIcon,
-    required this.p,
-    required this.s,
-  });
-
-  @override
-  State<MIHTile> createState() => _MIHTileState();
-}
-
-class _MIHTileState extends State<MIHTile> {
-  late Color mainC;
-  late Color secondC;
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    mainC = widget.p;
-    secondC = widget.s;
-    super.initState();
-  }
-
-  void displayHint() {
-    if (widget.videoID != null) {
-      showDialog(
-        context: context,
-        builder: (context) {
-          return MihPackageWindow(
-            fullscreen: false,
-            windowTitle: widget.tileName,
-            onWindowTapClose: () {
-              Navigator.pop(context);
-            },
-            windowBody: Column(
-              children: [
-                MIHYTVideoPlayer(videoYTLink: widget.videoID!),
-              ],
-            ),
-          );
-        },
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    // print(
-    //     "Tile Name: ${widget.tileName}\nTitle Type: ${widget.tileIcon.runtimeType.toString()}");
-    return FittedBox(
-      alignment: Alignment.center,
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        mainAxisAlignment: MainAxisAlignment.center,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          AnimatedContainer(
-            //alignment: Alignment.center,
-            width: 250,
-            height: 250,
-            duration: const Duration(seconds: 2),
-            child: Material(
-              color: mainC,
-              // shadowColor:
-              //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              // elevation: 5,
-              borderRadius: BorderRadius.circular(80),
-              child: InkWell(
-                borderRadius: BorderRadius.circular(80),
-                // ho
-                onTap: widget.onTap,
-                onLongPress: () {
-                  displayHint();
-                },
-                // hoverDuration: ,
-                splashColor: MihColors.getHighlightColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                highlightColor: MihColors.getHighlightColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                child: widget.tileIcon,
-              ),
-            ),
-          ),
-          const SizedBox(height: 10),
-          SizedBox(
-            width: 300,
-            child: Text(
-              widget.tileName,
-              textAlign: TextAlign.center,
-              softWrap: true,
-              overflow: TextOverflow.visible,
-              style: TextStyle(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                fontSize: 40.0,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          )
-        ],
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_package_components/Example/package_test.dart

@@ -1,164 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-
-class PackageTest extends StatefulWidget {
-  // final AppUser user;
-  // final Business business;
-  final TestArguments arguments;
-  const PackageTest({
-    super.key,
-    required this.arguments,
-    // required this.user,
-    // required this.business,
-  });
-
-  @override
-  State<PackageTest> createState() => _PackageTestState();
-}
-
-class _PackageTestState extends State<PackageTest> {
-  int _selcetedIndex = 0;
-
-  MihPackageAction getAction() {
-    return MihPackageAction(
-      icon: const Icon(Icons.arrow_back),
-      iconSize: 35,
-      onTap: () {
-        context.goNamed(
-          'mihHome',
-          extra: true,
-        );
-        FocusScope.of(context).unfocus();
-        // Navigator.of(context).pop();
-        // Navigator.of(context).popAndPushNamed(
-        //   '/',
-        //   arguments: AuthArguments(true, false),
-        // );
-      },
-    );
-  }
-
-  MihPackageTools getTools() {
-    Map<Widget, void Function()?> temp = Map();
-    temp[const Icon(Icons.inbox)] = () {
-      setState(() {
-        _selcetedIndex = 0;
-      });
-    };
-    temp[const Icon(Icons.outbond)] = () {
-      setState(() {
-        _selcetedIndex = 1;
-      });
-    };
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: _selcetedIndex,
-    );
-  }
-
-  void showAlert() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.warning_amber_rounded,
-            size: 100,
-            color: MihColors.getRedColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Oops! Looks like some fields are missing.",
-          alertBody: Column(
-            children: [
-              Text(
-                "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.",
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-              RichText(
-                text: TextSpan(
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 15,
-                    fontWeight: FontWeight.bold,
-                  ),
-                  children: <TextSpan>[
-                    TextSpan(
-                        text: "Here's a quick tip: ",
-                        style: TextStyle(
-                            fontStyle: FontStyle.italic,
-                            color: MihColors.getRedColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"))),
-                    const TextSpan(text: "Look for fields with an asterisk ("),
-                    TextSpan(
-                        text: "*",
-                        style: TextStyle(
-                            color: MihColors.getRedColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"))),
-                    const TextSpan(
-                        text: ") next to them, as these are mandatory."),
-                  ],
-                ),
-              ),
-            ],
-          ),
-          alertColour: MihColors.getRedColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-      },
-    );
-  }
-
-  List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
-      PackageToolOne(
-        user: widget.arguments.user,
-        business: widget.arguments.business,
-      ),
-      const PackageToolTwo(),
-    ];
-    return toolBodies;
-  }
-
-  List<String> getToolTitle() {
-    List<String> toolTitles = [
-      "Tool One",
-      "Tool Two",
-    ];
-    return toolTitles;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: _selcetedIndex,
-      onIndexChange: (newValue) {
-        setState(() {
-          _selcetedIndex = newValue;
-        });
-        print("Index: $_selcetedIndex");
-      },
-    );
-  }
-}

Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart

@@ -1,173 +0,0 @@
-import 'dart:io';
-
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-
-class MihCircleAvatar extends StatefulWidget {
-  final ImageProvider<Object>? imageFile;
-  final double width;
-  final bool editable;
-  final TextEditingController? fileNameController;
-  final onChange;
-  final PlatformFile? userSelectedfile;
-  final Color frameColor;
-  final Color? backgroundColor;
-  const MihCircleAvatar({
-    super.key,
-    required this.imageFile,
-    required this.width,
-    required this.editable,
-    required this.fileNameController,
-    required this.userSelectedfile,
-    required this.frameColor,
-    required this.backgroundColor,
-    required this.onChange,
-  });
-
-  @override
-  State<MihCircleAvatar> createState() => _MihCircleAvatarState();
-}
-
-class _MihCircleAvatarState extends State<MihCircleAvatar> {
-  late ImageProvider<Object>? imagePreview;
-
-  ImageProvider<Object>? getAvatar() {
-    // Color dark = const Color(0XFF3A4454);
-    if (widget.imageFile == null) {
-      return null;
-      // if (widget.backgroundColor == dark) {
-      //   print("here in light icon");
-      //   return const AssetImage(
-      //       'lib/mih_components/mih_package_components/assets/images/i-dont-know-light.png');
-      // } else {
-      //   print("here in dark icon");
-      //   return const AssetImage(
-      //       'lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png');
-      // }
-    } else {
-      return widget.imageFile;
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    setState(() {
-      imagePreview = getAvatar();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      // color: Colors.white,
-      alignment: Alignment.center,
-      width: widget.width,
-      height: widget.width,
-      child: Stack(
-        alignment: Alignment.center,
-        children: [
-          Visibility(
-            visible: imagePreview != null,
-            child: Positioned(
-              right: widget.width * 0.03,
-              child: CircleAvatar(
-                radius: widget.width / 2.2,
-                backgroundColor: widget.backgroundColor,
-                backgroundImage: imagePreview,
-              ),
-            ),
-          ),
-          Visibility(
-            visible: imagePreview != null,
-            child: Icon(
-              size: widget.width,
-              MihIcons.mihRing,
-              color: widget.frameColor,
-            ),
-          ),
-          Visibility(
-            visible: imagePreview == null,
-            child: Icon(
-              MihIcons.iDontKnow,
-              size: widget.width,
-              color: widget.frameColor,
-            ),
-          ),
-          Visibility(
-            visible: widget.editable,
-            child: Positioned(
-              bottom: 0,
-              right: 0,
-              child: IconButton.filled(
-                style: ButtonStyle(
-                  backgroundColor: WidgetStateProperty.all<Color>(
-                    MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                ),
-                onPressed: () async {
-                  try {
-                    FilePickerResult? result =
-                        await FilePicker.platform.pickFiles(
-                      type: FileType.image,
-                    );
-                    // print("Here 1");
-                    if (MzansiInnovationHub.of(context)!.theme.getPlatform() ==
-                        "Web") {
-                      // print("Here 2");
-                      if (result == null) return;
-                      // print("Here 3");
-                      PlatformFile? selectedFile = result.files.first;
-                      setState(() {
-                        // print("Here 4");
-                        widget.onChange(selectedFile);
-                        // print("Here 5");
-                        imagePreview = MemoryImage(selectedFile.bytes!);
-                      });
-
-                      setState(() {
-                        widget.fileNameController!.text = selectedFile.name;
-                      });
-                    } else {
-                      if (result != null) {
-                        File file = File(result.files.single.path!);
-                        PlatformFile? androidFile = PlatformFile(
-                          path: file.path,
-                          name: file.path.split('/').last,
-                          size: file.lengthSync(),
-                          bytes: await file.readAsBytes(), // Read file bytes
-                          //extension: fileExtension,
-                        );
-                        setState(() {
-                          widget.onChange(androidFile);
-                          imagePreview = FileImage(file);
-                        });
-
-                        setState(() {
-                          widget.fileNameController!.text =
-                              file.path.split('/').last;
-                        });
-                      } else {
-                        print("here in else");
-                        // User canceled the picker
-                      }
-                    }
-                  } catch (e) {
-                    print("Here Error: $e");
-                  }
-                },
-                icon: Icon(
-                  Icons.edit,
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart

@@ -1,248 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-
-class MihDropdownField extends StatefulWidget {
-  final TextEditingController controller;
-  final String hintText;
-  final bool requiredText;
-  final List<String> dropdownOptions;
-  final bool editable;
-  final bool enableSearch;
-  final FormFieldValidator<String>? validator;
-  final Function(String?)? onSelected;
-
-  const MihDropdownField({
-    super.key,
-    required this.controller,
-    required this.hintText,
-    required this.dropdownOptions,
-    required this.requiredText,
-    required this.editable,
-    required this.enableSearch,
-    this.validator,
-    this.onSelected,
-  });
-
-  @override
-  State<MihDropdownField> createState() => _MihDropdownFieldState();
-}
-
-class _MihDropdownFieldState extends State<MihDropdownField> {
-  late List<DropdownMenuEntry<String>> menu;
-
-  List<DropdownMenuEntry<String>> buildMenuOptions(List<String> options) {
-    List<DropdownMenuEntry<String>> menuList = [];
-    for (final i in options) {
-      menuList.add(DropdownMenuEntry(
-        value: i,
-        label: i,
-        style: ButtonStyle(
-          foregroundColor: WidgetStatePropertyAll(MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
-        ),
-      ));
-    }
-    return menuList;
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    menu = buildMenuOptions(widget.dropdownOptions);
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    menu = widget.dropdownOptions
-        .map((e) => DropdownMenuEntry(value: e, label: e))
-        .toList();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text(
-              widget.hintText,
-              style: TextStyle(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                fontSize: 18,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-            if (!widget.requiredText)
-              Text(
-                "(Optional)",
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-          ],
-        ),
-        const SizedBox(height: 4),
-        FormField<String>(
-          validator: widget.validator,
-          autovalidateMode: AutovalidateMode.onUserInteraction,
-          initialValue: widget.controller.text,
-          builder: (field) {
-            return Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Theme(
-                  data: Theme.of(context).copyWith(
-                    textSelectionTheme: TextSelectionThemeData(
-                      cursorColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      selectionColor: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark")
-                          .withValues(alpha: 0.3),
-                      selectionHandleColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                    ),
-                  ),
-                  child: DropdownMenu(
-                    controller: widget.controller,
-                    dropdownMenuEntries: menu,
-                    enableSearch: widget.enableSearch,
-                    enableFilter: widget.enableSearch,
-                    enabled: widget.editable,
-                    textInputAction: widget.enableSearch
-                        ? TextInputAction.search
-                        : TextInputAction.none,
-                    requestFocusOnTap: widget.enableSearch,
-                    menuHeight: 400,
-                    expandedInsets: EdgeInsets.zero,
-                    textStyle: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontWeight: FontWeight.w500,
-                    ),
-                    trailingIcon: Icon(
-                      Icons.arrow_drop_down,
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                    ),
-                    selectedTrailingIcon: Icon(
-                      Icons.arrow_drop_up,
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                    ),
-                    leadingIcon: IconButton(
-                      onPressed: () {
-                        widget.controller.clear();
-                        field.didChange('');
-                      },
-                      icon: Icon(
-                        Icons.delete_outline_rounded,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                    onSelected: (String? selectedValue) {
-                      field.didChange(selectedValue);
-                      widget.onSelected?.call(selectedValue);
-                    },
-                    menuStyle: MenuStyle(
-                      backgroundColor: WidgetStatePropertyAll(
-                          MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark")),
-                      side: WidgetStatePropertyAll(
-                        BorderSide(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            width: 1.0),
-                      ),
-                      shape: WidgetStatePropertyAll(
-                        RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(
-                              10), // Increase for more roundness
-                        ),
-                      ),
-                    ),
-                    inputDecorationTheme: InputDecorationTheme(
-                      errorStyle: const TextStyle(height: 0, fontSize: 0),
-                      contentPadding: const EdgeInsets.symmetric(
-                          horizontal: 10.0, vertical: 8.0),
-                      filled: true,
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      enabledBorder: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(8.0),
-                        borderSide: BorderSide.none,
-                      ),
-                      focusedBorder: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(8.0),
-                        borderSide: BorderSide(
-                          color: field.hasError
-                              ? MihColors.getRedColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark")
-                              : MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                          width: 3.0,
-                        ),
-                      ),
-                      errorBorder: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(8.0),
-                        borderSide: BorderSide(
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          width: 3.0,
-                        ),
-                      ),
-                      focusedErrorBorder: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(8.0),
-                        borderSide: BorderSide(
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          width: 3.0,
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-                if (field.hasError)
-                  Padding(
-                    padding: const EdgeInsets.only(left: 8.0, top: 4.0),
-                    child: Text(
-                      field.errorText ?? '',
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-              ],
-            );
-          },
-        ),
-      ],
-    );
-  }
-}

Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart

@@ -1,117 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-
-class MihPackageAlert extends StatefulWidget {
-  final Widget alertIcon;
-  final String alertTitle;
-  final Widget alertBody;
-  final Color alertColour;
-  const MihPackageAlert({
-    super.key,
-    required this.alertIcon,
-    required this.alertTitle,
-    required this.alertBody,
-    required this.alertColour,
-  });
-
-  @override
-  State<MihPackageAlert> createState() => _MihPackageAlertState();
-}
-
-class _MihPackageAlertState extends State<MihPackageAlert> {
-  late double popUpWidth;
-  late double? popUpheight;
-  late double popUpTitleSize;
-  late double popUpSubtitleSize;
-  late double popUpBodySize;
-  late double popUpIconSize;
-  late double popUpPaddingSize;
-  Size? size;
-
-  void checkScreenSize() {
-    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
-      setState(() {
-        popUpWidth = (size!.width / 4) * 2;
-        popUpheight = null;
-        popUpTitleSize = 30.0;
-        popUpSubtitleSize = 20.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 25.0;
-        popUpIconSize = 100;
-      });
-    } else {
-      setState(() {
-        popUpWidth = size!.width - (size!.width * 0.1);
-        popUpheight = null;
-        popUpTitleSize = 25.0;
-        popUpSubtitleSize = 18.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 15.0;
-        popUpIconSize = 100;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    size = MediaQuery.of(context).size;
-    checkScreenSize();
-    return Dialog(
-      child: Stack(
-        children: [
-          Container(
-            padding: EdgeInsets.all(popUpPaddingSize),
-            width: popUpWidth,
-            height: popUpheight,
-            decoration: BoxDecoration(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              borderRadius: BorderRadius.circular(25.0),
-              border: Border.all(color: widget.alertColour, width: 5.0),
-            ),
-            child: SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  widget.alertIcon,
-                  //const SizedBox(height: 5),
-                  Text(
-                    widget.alertTitle,
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                      color: widget.alertColour,
-                      fontSize: popUpTitleSize,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const SizedBox(height: 15),
-                  widget.alertBody,
-                  const SizedBox(height: 10),
-                ],
-              ),
-            ),
-          ),
-          Positioned(
-            top: 5,
-            right: 5,
-            width: 50,
-            height: 50,
-            child: IconButton(
-              onPressed: () {
-                context.pop();
-              },
-              icon: Icon(
-                Icons.close,
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                size: 35,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart

@@ -1,234 +0,0 @@
-import 'package:app_settings/app_settings.dart';
-import 'package:flutter/foundation.dart';
-import 'package:local_auth/local_auth.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_yt_video_player.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-
-class MihPackageTile extends StatefulWidget {
-  final String appName;
-  final String? ytVideoID;
-  final Widget appIcon;
-  final void Function() onTap;
-  final double iconSize;
-  final Color primaryColor;
-  final Color secondaryColor;
-  final bool? authenticateUser;
-  const MihPackageTile({
-    super.key,
-    required this.onTap,
-    required this.appName,
-    this.ytVideoID,
-    required this.appIcon,
-    required this.iconSize,
-    required this.primaryColor,
-    required this.secondaryColor,
-    this.authenticateUser,
-  });
-
-  @override
-  State<MihPackageTile> createState() => _MihPackageTileState();
-}
-
-class _MihPackageTileState extends State<MihPackageTile> {
-  final LocalAuthentication _auth = LocalAuthentication();
-
-  void displayHint() {
-    if (widget.ytVideoID != null) {
-      showDialog(
-        context: context,
-        builder: (context) {
-          return MihPackageWindow(
-            fullscreen: false,
-            windowTitle: widget.appName,
-            // windowTools: const [],
-            onWindowTapClose: () {
-              Navigator.pop(context);
-            },
-            windowBody: MIHYTVideoPlayer(
-              videoYTLink: widget.ytVideoID!,
-            ),
-          );
-        },
-      );
-    }
-  }
-
-  Future<bool> isUserAuthenticated() async {
-    final bool canAuthWithBio = await _auth.canCheckBiometrics;
-    final bool canAuthenticate =
-        canAuthWithBio || await _auth.isDeviceSupported();
-    print("Auth Available: $canAuthenticate");
-    if (canAuthenticate) {
-      try {
-        final bool didBioAuth = await _auth.authenticate(
-          localizedReason: "Authenticate to access ${widget.appName}",
-          options: const AuthenticationOptions(
-            biometricOnly: false,
-          ),
-        );
-        if (didBioAuth) {
-          return true;
-        } else {
-          authErrorPopUp();
-        }
-        // print("Authenticated: $didBioAuth");
-      } catch (error) {
-        print("Auth Error: $error");
-        authErrorPopUp();
-      }
-    } else {
-      print("Auth Error: No Biometrics Available");
-      authErrorPopUp();
-    }
-    return false;
-  }
-
-  void authErrorPopUp() {
-    Widget alertpopUp = MihPackageAlert(
-      alertIcon: Icon(
-        Icons.fingerprint,
-        color: MihColors.getRedColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        size: 100,
-      ),
-      alertTitle: "Biometric Authentication Required",
-      alertBody: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Text(
-            "Hi there! To jump into the ${widget.appName} Package, you'll need to authenticate yourself with your devices biometrics, please set up biometric authentication (like fingerprint, face ID, pattern or pin) on your device first.\n\nIf you have already set up biometric authentication, press \"Authenticate now\" to try again or press \"Set Up Authentication\" to go to your device settings.",
-            style: TextStyle(
-              fontSize: 15,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-          const SizedBox(height: 20),
-          Wrap(
-            runAlignment: WrapAlignment.center,
-            crossAxisAlignment: WrapCrossAlignment.center,
-            spacing: 10,
-            runSpacing: 10,
-            children: [
-              MihButton(
-                onPressed: () {
-                  AppSettings.openAppSettings(
-                    type: AppSettingsType.security,
-                  );
-                  Navigator.of(context).pop();
-                },
-                buttonColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 300,
-                child: Text(
-                  "Set Up Authentication",
-                  style: TextStyle(
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-              MihButton(
-                onPressed: () {
-                  Navigator.of(context).pop();
-                  authenticateUser();
-                },
-                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 300,
-                child: Text(
-                  "Authenticate Now",
-                  style: TextStyle(
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-      alertColour: MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    );
-    showDialog(
-      context: context,
-      builder: (context) {
-        return alertpopUp;
-      },
-    );
-  }
-
-  Future<void> authenticateUser() async {
-    if (widget.authenticateUser != null &&
-        widget.authenticateUser! &&
-        !kIsWeb) {
-      if (await isUserAuthenticated()) {
-        widget.onTap();
-      }
-    } else {
-      widget.onTap();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      // alignment: Alignment.topCenter,
-      // color: Colors.black,
-      // width: widget.iconSize,
-      // height: widget.iconSize + widget.iconSize / 3,
-      child: GestureDetector(
-        onTap: () async {
-          authenticateUser();
-        },
-        onLongPress: null, // Do this later
-        child: Column(
-          children: [
-            Flexible(
-              flex: 3,
-              child: LayoutBuilder(
-                builder: (context, constraints) {
-                  double iconHeight = constraints.maxWidth;
-                  return Container(
-                    width: iconHeight,
-                    height: iconHeight,
-                    child:
-                        FittedBox(fit: BoxFit.fitHeight, child: widget.appIcon),
-                  );
-                },
-              ),
-            ),
-            const SizedBox(height: 10),
-            Flexible(
-              flex: 1,
-              child: FittedBox(
-                child: Text(
-                  widget.appName,
-                  textAlign: TextAlign.center,
-                  // softWrap: true,
-                  // overflow: TextOverflow.visible,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 20.0,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_package_components/mih_package_window.dart

@@ -1,217 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_speed_dial/flutter_speed_dial.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-
-class MihPackageWindow extends StatefulWidget {
-  final String windowTitle;
-  final Widget windowBody;
-  final List<SpeedDialChild>? menuOptions;
-  final void Function() onWindowTapClose;
-  final bool fullscreen;
-  const MihPackageWindow({
-    super.key,
-    required this.fullscreen,
-    required this.windowTitle,
-    this.menuOptions,
-    required this.onWindowTapClose,
-    required this.windowBody,
-  });
-
-  @override
-  State<MihPackageWindow> createState() => _MihPackageWindowState();
-}
-
-class _MihPackageWindowState extends State<MihPackageWindow> {
-  late double windowTitleSize;
-  late double horizontralWindowPadding;
-  late double vertticalWindowPadding;
-  late double windowWidth;
-  late double windowHeight;
-  late double width;
-  late double height;
-
-  void checkScreenSize() {
-    // print("screen width: $width");
-    // print("screen height: $height");
-    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
-      setState(() {
-        windowTitleSize = 25;
-        horizontralWindowPadding = width / 7;
-        vertticalWindowPadding = 10;
-        windowWidth = width;
-        windowHeight = height;
-      });
-    } else {
-      setState(() {
-        windowTitleSize = 20;
-        horizontralWindowPadding = 10;
-        vertticalWindowPadding = 10;
-        windowWidth = width;
-        windowHeight = height;
-      });
-    }
-  }
-
-  Widget getHeader() {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        Container(
-          // color: Colors.white,
-          decoration: BoxDecoration(
-            borderRadius:
-                BorderRadius.circular(25), // Optional: rounds the corners
-            boxShadow: const [
-              BoxShadow(
-                color: Color.fromARGB(
-                    60, 0, 0, 0), // 0.2 opacity = 51 in alpha (255 * 0.2)
-                spreadRadius: -2,
-                blurRadius: 10,
-                offset: Offset(0, 5),
-              ),
-            ],
-          ),
-          child: Padding(
-            padding: const EdgeInsets.only(
-              top: 2.0,
-              left: 5.0,
-            ),
-            child: SizedBox(
-              width: 40,
-              child: IconButton.filled(
-                style: ButtonStyle(
-                  backgroundColor: WidgetStateProperty.all<Color>(
-                      MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark")),
-                ),
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                iconSize: 20,
-                onPressed: () {
-                  widget.onWindowTapClose();
-                },
-                icon: const Icon(
-                  Icons.close,
-                ),
-              ),
-            ),
-          ),
-        ),
-        Expanded(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 10.0),
-            child: Text(
-              widget.windowTitle,
-              overflow: TextOverflow.ellipsis,
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                fontSize: windowTitleSize,
-                fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              ),
-            ),
-          ),
-        ),
-        Visibility(
-          visible: (widget.menuOptions?.isNotEmpty ?? false),
-          child: Padding(
-            padding: const EdgeInsets.only(
-              top: 2.0,
-              right: 5.0,
-            ),
-            child: SizedBox(
-              width: 40,
-              child: MihFloatingMenu(
-                iconSize: 40,
-                animatedIcon: AnimatedIcons.menu_close,
-                direction: SpeedDialDirection.down,
-                children: widget.menuOptions != null ? widget.menuOptions! : [],
-              ),
-            ),
-          ),
-        ),
-        // If no menu, add a SizedBox to keep alignment
-        if (!(widget.menuOptions?.isNotEmpty ?? false))
-          const SizedBox(width: 40),
-      ],
-    );
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    var size = MediaQuery.of(context).size;
-    setState(() {
-      width = size.width;
-      height = size.height;
-    });
-    checkScreenSize();
-    return Dialog(
-      insetPadding: EdgeInsets.symmetric(
-        horizontal: horizontralWindowPadding,
-        vertical: vertticalWindowPadding,
-      ),
-      insetAnimationCurve: Easing.emphasizedDecelerate,
-      insetAnimationDuration: Durations.short1,
-      child: Container(
-        decoration: BoxDecoration(
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          borderRadius: BorderRadius.circular(25.0),
-          border: Border.all(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              width: 5.0),
-        ),
-        child: widget.fullscreen
-            ? Column(
-                mainAxisSize: MainAxisSize.max,
-                children: [
-                  getHeader(),
-                  const SizedBox(height: 5),
-                  Expanded(
-                      child: SingleChildScrollView(child: widget.windowBody)),
-                ],
-              )
-            : Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  getHeader(),
-                  const SizedBox(height: 5),
-                  Flexible(
-                    child: Padding(
-                      padding: EdgeInsets.only(
-                        left: 25,
-                        right: 25,
-                        bottom: vertticalWindowPadding,
-                      ),
-                      child: ConstrainedBox(
-                        constraints: BoxConstraints(
-                          maxHeight: windowHeight * 0.85,
-                          maxWidth: windowWidth * 0.85,
-                        ),
-                        child: MihSingleChildScroll(child: widget.windowBody),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart

@@ -1,109 +0,0 @@
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-
-class MihPersonalProfilePreview extends StatefulWidget {
-  final AppUser user;
-  const MihPersonalProfilePreview({
-    super.key,
-    required this.user,
-  });
-
-  @override
-  State<MihPersonalProfilePreview> createState() =>
-      _MihPersonalProfilePreviewState();
-}
-
-class _MihPersonalProfilePreviewState extends State<MihPersonalProfilePreview> {
-  late Future<String> futureImageUrl;
-  // String imageUrl = "";
-  PlatformFile? file;
-
-  @override
-  void initState() {
-    super.initState();
-    futureImageUrl =
-        MihFileApi.getMinioFileUrl(widget.user.pro_pic_path, context);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double profilePictureWidth = 60;
-    return Row(
-      children: [
-        FutureBuilder(
-          future: futureImageUrl,
-          builder: (context, asyncSnapshot) {
-            if (asyncSnapshot.connectionState == ConnectionState.done &&
-                asyncSnapshot.hasData) {
-              if (asyncSnapshot.requireData != "") {
-                return MihCircleAvatar(
-                  imageFile: NetworkImage(asyncSnapshot.requireData),
-                  width: profilePictureWidth,
-                  editable: false,
-                  fileNameController: TextEditingController(),
-                  userSelectedfile: file,
-                  frameColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  backgroundColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  onChange: () {},
-                );
-              } else {
-                return Icon(
-                  MihIcons.iDontKnow,
-                  size: profilePictureWidth,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                );
-              }
-            } else {
-              return Icon(
-                MihIcons.mihRing,
-                size: profilePictureWidth,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              );
-            }
-          },
-        ),
-        const SizedBox(width: 15),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              widget.user.username.isNotEmpty
-                  ? widget.user.username
-                  : "Username",
-              style: TextStyle(
-                fontWeight: FontWeight.bold,
-                fontSize: 18,
-              ),
-            ),
-            Text(
-              widget.user.fname.isNotEmpty
-                  ? "${widget.user.fname} ${widget.user.lname}"
-                  : "Name Surname",
-              style: TextStyle(
-                fontWeight: FontWeight.bold,
-                fontSize: 15,
-              ),
-            ),
-            Text(
-              widget.user.type.toUpperCase(),
-              style: TextStyle(
-                fontWeight: FontWeight.bold,
-                fontSize: 10,
-              ),
-            ),
-          ],
-        )
-      ],
-    );
-  }
-}

Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart

@@ -1,530 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../main.dart';
-
-class MIHDeleteMessage extends StatefulWidget {
-  final String deleteType;
-  final void Function() onTap;
-  const MIHDeleteMessage({
-    super.key,
-    required this.deleteType,
-    required this.onTap,
-  });
-
-  @override
-  State<MIHDeleteMessage> createState() => _MIHDeleteMessageState();
-}
-
-class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
-  var messageTypes = <String, Widget>{};
-  late double popUpWidth;
-  late double? popUpheight;
-  late double popUpTitleSize;
-  late double popUpSubtitleSize;
-  late double popUpBodySize;
-  late double popUpIconSize;
-  late double popUpPaddingSize;
-  late double width;
-  late double height;
-
-  void checkScreenSize() {
-    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
-      setState(() {
-        popUpWidth = (width / 4) * 2;
-        popUpheight = null;
-        popUpTitleSize = 25.0;
-        popUpSubtitleSize = 20.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 25.0;
-        popUpIconSize = 100;
-      });
-    } else {
-      setState(() {
-        popUpWidth = width - (width * 0.1);
-        popUpheight = null;
-        popUpTitleSize = 20.0;
-        popUpSubtitleSize = 18.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 15.0;
-        popUpIconSize = 100;
-      });
-    }
-  }
-
-  void setDeleteNote() {
-    messageTypes["Note"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Are you sure you want to delete this?",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "This note will be deleted permanently. Are you certain you want to delete it?",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                MihButton(
-                  onPressed: widget.onTap,
-                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  width: 300,
-                  child: Text(
-                    "Delete",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setFileNote() {
-    messageTypes["File"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Are you sure you want to delete this?",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "This file will be deleted permanently. Are you certain you want to delete it?",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                MihButton(
-                  onPressed: widget.onTap,
-                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  width: 300,
-                  child: Text(
-                    "Delete",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setDeleteEmployee() {
-    messageTypes["Employee"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Are you sure you want to delete this?",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "This team member will be deleted permanently from the business profile. Are you certain you want to delete it?",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-
-                MihButton(
-                  onPressed: widget.onTap,
-                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  width: 300,
-                  child: Text(
-                    "Delete",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setDeleteAppointment() {
-    messageTypes["Appointment"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Are you sure you want to delete this?",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "This appointment will be deleted permanently from your calendar. Are you certain you want to delete it?",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                MihButton(
-                  onPressed: widget.onTap,
-                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  width: 300,
-                  child: Text(
-                    "Delete",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setDeleteLoyaltyCard() {
-    messageTypes["Loyalty Card"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Are you sure you want to delete this?",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "This Card will be deleted permanently from your Mzansi Wallet. Are you certain you want to delete it?",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                MihButton(
-                  onPressed: widget.onTap,
-                  buttonColor: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  width: 300,
-                  child: Text(
-                    "Delete",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget? getDeleteMessage(String type) {
-    return messageTypes[type];
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    var size = MediaQuery.of(context).size;
-    setState(() {
-      width = size.width;
-      height = size.height;
-    });
-    checkScreenSize();
-    setDeleteNote();
-    setFileNote();
-    setDeleteEmployee();
-    setDeleteAppointment();
-    setDeleteLoyaltyCard();
-    //print(size);
-    // setState(() {
-    //   width = size.width;
-    //   height = size.height;
-    // });
-    return Dialog(child: getDeleteMessage(widget.deleteType));
-  }
-}

Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart

@@ -1,909 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../main.dart';
-
-class MIHErrorMessage extends StatefulWidget {
-  final String errorType;
-  const MIHErrorMessage({
-    super.key,
-    required this.errorType,
-  });
-
-  @override
-  State<MIHErrorMessage> createState() => _MIHErrorMessageState();
-}
-
-class _MIHErrorMessageState extends State<MIHErrorMessage> {
-  var messageTypes = <String, Widget>{};
-  late double popUpWidth;
-  late double? popUpheight;
-  late double popUpTitleSize;
-  late double popUpSubtitleSize;
-  late double popUpBodySize;
-  late double popUpIconSize;
-  late double popUpPaddingSize;
-  Size? size;
-
-  void checkScreenSize() {
-    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
-      setState(() {
-        popUpWidth = (size!.width / 4) * 2;
-        popUpheight = null;
-        popUpTitleSize = 25.0;
-        popUpSubtitleSize = 20.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 25.0;
-        popUpIconSize = 100;
-      });
-    } else {
-      setState(() {
-        popUpWidth = size!.width - (size!.width * 0.1);
-        popUpheight = null;
-        popUpTitleSize = 20.0;
-        popUpSubtitleSize = 18.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 15.0;
-        popUpIconSize = 100;
-      });
-    }
-  }
-
-  void setInputError() {
-    messageTypes["Input Error"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 5),
-                Text(
-                  "Oops! Looks like some fields are missing.",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 25),
-                RichText(
-                  text: TextSpan(
-                    style: TextStyle(
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: popUpBodySize,
-                      fontWeight: FontWeight.bold,
-                    ),
-                    children: <TextSpan>[
-                      TextSpan(
-                          text: "Here's a quick tip: ",
-                          style: TextStyle(
-                              fontStyle: FontStyle.italic,
-                              color: MihColors.getRedColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"))),
-                      const TextSpan(
-                          text: "Look for fields with an asterisk ("),
-                      TextSpan(
-                          text: "*",
-                          style: TextStyle(
-                              color: MihColors.getRedColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"))),
-                      const TextSpan(
-                          text: ") next to them, as these are mandatory."),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 10),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setPasswordRequirementsError() {
-    messageTypes["Password Requirements"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Password Doesn't Meet Requirements",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "Oops! Your password doesn't quite meet our standards. To keep your account secure, please make sure your password meets the following requirements",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 25),
-                RichText(
-                  text: TextSpan(
-                    style: TextStyle(
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 15.0,
-                      fontWeight: FontWeight.bold,
-                    ),
-                    children: <TextSpan>[
-                      TextSpan(
-                          text: "Requirements:\n",
-                          style: TextStyle(
-                              fontStyle: FontStyle.italic,
-                              fontSize: popUpBodySize,
-                              color: MihColors.getRedColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"))),
-                      const TextSpan(
-                        text: "1) Contailes at least 8 characters\n",
-                      ),
-                      const TextSpan(
-                        text: "2) Contains at least 1 uppercase letter (A-Z)\n",
-                      ),
-                      const TextSpan(
-                        text: "3) Contains at least 1 lowercase letter (a-z)\n",
-                      ),
-                      const TextSpan(
-                        text: "4) Contains at least 1 number (0-9)\n",
-                      ),
-                      const TextSpan(
-                        text:
-                            "5) Contains at least 1 special character (!@#\$%^&*)\n",
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 10),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setInvalidUsernameError() {
-    messageTypes["Invalid Username"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Let's Fix That Username",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "Let's create a great username for you! Just a few quick tips:\n• Your username should start with a letter.\n• You can use letters, numbers, and/ or underscores.\n• Keep it between 6 and 20 characters.\n• Avoid special characters like @, #, or \$.\"",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 25),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setInvalidEmailError() {
-    messageTypes["Invalid Email"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Oops! Invalid Email",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "Looks like there's a little hiccup with that email address. Please double-check that you've entered it correctly, including the \"@\" symbol and a domain (like example@email.com).",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 25),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setUserExistsError() {
-    messageTypes["User Exists"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //SizedBox(height: 15),
-                Text(
-                  "Email Already Exists",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "An account is already registered with this email address. Please try logging in or use a different email.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "Here are some things to keep in mind:",
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpSubtitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.",
-                  textAlign: TextAlign.left,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 15.0,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setPwdMatchError() {
-    messageTypes["Password Match"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //SizedBox(height: 15),
-                Text(
-                  "Passwords Don't Match",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "The password and confirm password fields do not match. Please make sure they are identical.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "Here are some things to keep in mind:",
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpSubtitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.",
-                  textAlign: TextAlign.left,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setinvalidCredError() {
-    messageTypes["Invalid Credentials"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //SizedBox(height: 15),
-                Text(
-                  "Uh oh! Login attempt unsuccessful.",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "The email address or password you entered doesn't seem to match our records. Please double-check your information and try again.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "Here are some things to keep in mind:",
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpSubtitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.",
-                  textAlign: TextAlign.left,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setInternetError() {
-    messageTypes["Internet Connection"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Internet Connection Lost!",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "We seem to be having some trouble connecting you to the internet. This could be due to a temporary outage or an issue with your device's connection.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "Here are a few things you can try:",
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpSubtitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "1) Check your Wi-Fi signal strength or try connecting to a different network.\n2) Restart your device (computer, phone, etc.) and your router/modem.\n3) If you're using cellular data, ensure you have a strong signal and haven't reached your data limit.",
-                  textAlign: TextAlign.left,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 10),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setLocationError() {
-    messageTypes["Location Denied"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Location Services Not Enabled",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "To get the most out of MIH, we need your location. Please go to the site settings of the app and enable location services. Once you do that, we can start showing you relevant information based on your location.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                // const SizedBox(height: 15),
-                // Text(
-                //   "Here are a few things you can try:",
-                //   style: TextStyle(
-                //     color: MihColors.getRedColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                //     fontSize: popUpSubtitleSize,
-                //     fontWeight: FontWeight.bold,
-                //   ),
-                // ),
-                // const SizedBox(height: 10),
-                // Text(
-                //   "1) Check your Wi-Fi signal strength or try connecting to a different network.\n2) Restart your device (computer, phone, etc.) and your router/modem.\n3) If you're using cellular data, ensure you have a strong signal and haven't reached your data limit.",
-                //   textAlign: TextAlign.left,
-                //   style: TextStyle(
-                //     color:
-                //         MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                //     fontSize: popUpBodySize,
-                //     fontWeight: FontWeight.bold,
-                //   ),
-                // ),
-                const SizedBox(height: 10),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget? getErrorMessage(String type) {
-    return messageTypes[type];
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    size = MediaQuery.of(context).size;
-    checkScreenSize();
-    setInputError();
-    setinvalidCredError();
-    setInternetError();
-    setUserExistsError();
-    setPwdMatchError();
-    setPasswordRequirementsError();
-    setInvalidEmailError();
-    setInvalidUsernameError();
-    setLocationError();
-    //print(size);
-    // setState(() {
-    //   width = size.width;
-    //   height = size.height;
-    // });
-    return Dialog(child: getErrorMessage(widget.errorType));
-  }
-}

Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart

@@ -1,97 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../main.dart';
-import 'package:gif_view/gif_view.dart';
-
-class Mihloadingcircle extends StatefulWidget {
-  final String? message;
-  const Mihloadingcircle({super.key, this.message});
-
-  @override
-  State<Mihloadingcircle> createState() => _MihloadingcircleState();
-}
-
-class _MihloadingcircleState extends State<Mihloadingcircle> {
-  // final GifController _controller = GifController();
-  late double popUpPaddingSize;
-  late double popUpWidth;
-  late double? popUpheight;
-
-  late double width;
-  late double height;
-
-  void checkScreenSize() {
-    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
-      setState(() {
-        popUpWidth = 250;
-        popUpheight = 250;
-        popUpPaddingSize = 25.0;
-      });
-    } else {
-      setState(() {
-        popUpWidth = 250;
-        popUpheight = 250;
-        popUpPaddingSize = 15.0;
-      });
-    }
-  }
-
-  @override
-  void initState() {
-    //_controller.animateTo(26);
-    super.initState();
-    checkScreenSize();
-  }
-
-  @override
-  void dispose() {
-    // _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Dialog(
-      child: IntrinsicWidth(
-        child: IntrinsicHeight(
-          child: Container(
-              padding: EdgeInsets.all(popUpPaddingSize),
-              // width: 250,
-              // height: 275,
-              decoration: BoxDecoration(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                borderRadius: BorderRadius.circular(25.0),
-                border: Border.all(
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    width: 5.0),
-              ),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  GifView.asset(
-                    MzansiInnovationHub.of(context)!
-                        .theme
-                        .loadingImageLocation(),
-                    height: 200,
-                    width: 200,
-                    frameRate: 30,
-                  ),
-                  widget.message != null
-                      ? Text(
-                          widget.message!,
-                          textAlign: TextAlign.center,
-                          style: TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        )
-                      : SizedBox(),
-                ],
-              )),
-        ),
-      ),
-    );
-  }
-}

Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart

@@ -1,150 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../main.dart';
-
-class MIHSuccessMessage extends StatefulWidget {
-  final String successType;
-  final String successMessage;
-  const MIHSuccessMessage({
-    super.key,
-    required this.successType,
-    required this.successMessage,
-  });
-
-  @override
-  State<MIHSuccessMessage> createState() => _MIHSuccessMessageState();
-}
-
-class _MIHSuccessMessageState extends State<MIHSuccessMessage> {
-  var messageTypes = <String, Widget>{};
-  late String message;
-  late double popUpWidth;
-  late double? popUpheight;
-  late double popUpTitleSize;
-  late double popUpSubtitleSize;
-  late double popUpBodySize;
-  late double popUpIconSize;
-  late double popUpPaddingSize;
-  late Size? size;
-
-  void checkScreenSize() {
-    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
-      setState(() {
-        popUpWidth = (size!.width / 4) * 2;
-        popUpheight = null;
-        popUpTitleSize = 25.0;
-        popUpSubtitleSize = 20.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 25.0;
-        popUpIconSize = 100;
-      });
-    } else {
-      setState(() {
-        popUpWidth = size!.width - (size!.width * 0.1);
-        popUpheight = null;
-        popUpTitleSize = 20.0;
-        popUpSubtitleSize = 18.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 15.0;
-        popUpIconSize = 100;
-      });
-    }
-  }
-
-  void setSuccessmessage() {
-    messageTypes["Success"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Icon(
-                Icons.check_circle_outline_rounded,
-                size: popUpIconSize,
-                color: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              ),
-              //const SizedBox(height: 15),
-              Text(
-                "Success!",
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                  color: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: popUpTitleSize,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 15),
-              Center(
-                child: Text(
-                  message,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-              const SizedBox(height: 15),
-              MihButton(
-                onPressed: () {
-                  Navigator.pop(context);
-                },
-                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 300,
-                child: Text(
-                  "Dismiss",
-                  style: TextStyle(
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget? getSuccessMessage(String type) {
-    return messageTypes[type];
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    size = MediaQuery.of(context).size;
-    checkScreenSize();
-    message = widget.successMessage;
-    setSuccessmessage();
-    return Dialog(child: getSuccessMessage(widget.successType));
-  }
-}

Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart

@@ -1,519 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../main.dart';
-
-class MIHWarningMessage extends StatefulWidget {
-  final String warningType;
-  const MIHWarningMessage({
-    super.key,
-    required this.warningType,
-  });
-
-  @override
-  State<MIHWarningMessage> createState() => _MIHDeleteMessageState();
-}
-
-class _MIHDeleteMessageState extends State<MIHWarningMessage> {
-  var messageTypes = <String, Widget>{};
-  late double popUpWidth;
-  late double? popUpheight;
-  late double popUpTitleSize;
-  late double popUpSubtitleSize;
-  late double popUpBodySize;
-  late double popUpIconSize;
-  late double popUpPaddingSize;
-  late double width;
-  late double height;
-
-  void checkScreenSize() {
-    if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") {
-      setState(() {
-        popUpWidth = (width / 4) * 2;
-        popUpheight = null;
-        popUpTitleSize = 25.0;
-        popUpSubtitleSize = 20.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 25.0;
-        popUpIconSize = 100;
-      });
-    } else {
-      setState(() {
-        popUpWidth = width - (width * 0.1);
-        popUpheight = null;
-        popUpTitleSize = 20.0;
-        popUpSubtitleSize = 18.0;
-        popUpBodySize = 15;
-        popUpPaddingSize = 15.0;
-        popUpIconSize = 100;
-      });
-    }
-  }
-
-  void setNoAccess() {
-    messageTypes["No Access"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Access Pending",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "Your access request is currently being reviewed.\nOnce approved, you'll be able to view patient data.\nPlease follow up with the patient to approve your access request.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setNoPatientAccess() {
-    messageTypes["No Patient Access"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Patient Profile Access Needed",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "To proceed with booking an appointment, you must have access to the patient's profile. This will allow you to view their medical history and other relevant information. Please contact the appropriate administrator to request access.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setAppointmentCanelled() {
-    messageTypes["Appointment Canelled"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Appointment Cancelled",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "This appointment has been canceled. As a result, you no longer have access to the patient's profile. If you would like to view the patient's profile again, please book a new appointment.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setAccessCanelled() {
-    messageTypes["Access Cancelled"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Access Cancelled",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "This appointment has been canceled. As a result, access has been cancelled and the doctor no longer have access to the patient's profile. If you would like them to view the patient's profile again, please book a new appointment through them.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setAccessDeclined() {
-    messageTypes["Access Declined"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Access Declined",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "Your request to access the patient's profile has been denied. Please contact the patient directly to inquire about the reason for this restriction.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  void setExpiredAccess() {
-    messageTypes["Expired Access"] = Stack(
-      children: [
-        Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
-          width: popUpWidth,
-          height: popUpheight,
-          decoration: BoxDecoration(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            borderRadius: BorderRadius.circular(25.0),
-            border: Border.all(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 5.0),
-          ),
-          child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Icon(
-                  Icons.warning_amber_rounded,
-                  size: popUpIconSize,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //const SizedBox(height: 15),
-                Text(
-                  "Access Expired",
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpTitleSize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-                Text(
-                  "You no longer have access to this patient profile. The authorized access period has ended. Access to a patients profile is limited to 7 days from appointment date.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: popUpBodySize,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 15),
-              ],
-            ),
-          ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget? getDeleteMessage(String type) {
-    return messageTypes[type];
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    var size = MediaQuery.of(context).size;
-    setState(() {
-      width = size.width;
-      height = size.height;
-    });
-    checkScreenSize();
-    setNoAccess();
-    setExpiredAccess();
-    setAccessDeclined();
-    setAppointmentCanelled();
-    setAccessCanelled();
-    //print(size);
-    // setState(() {
-    //   width = size.width;
-    //   height = size.height;
-    // });
-    return Dialog(child: getDeleteMessage(widget.warningType));
-  }
-}

Frontend/lib/mih_components/mih_providers/mih_banner_ad_provider.dart

@@ -1,62 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:google_mobile_ads/google_mobile_ads.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-
-class MihBannerAdProvider extends ChangeNotifier {
-  BannerAd? bannerAd;
-  final adUnitId = AppEnviroment.bannerAdUnitId;
-  bool isBannerAdLoaded = false;
-  String errorMessage = '';
-
-  MihBannerAdProvider({
-    this.bannerAd,
-    this.isBannerAdLoaded = false,
-    this.errorMessage = '',
-  });
-
-  void reset() {
-    bannerAd = null;
-    isBannerAdLoaded = false;
-    errorMessage = "";
-    notifyListeners();
-  }
-
-  @override
-  void dispose() {
-    bannerAd?.dispose();
-    super.dispose();
-  }
-
-  void loadBannerAd() {
-    if (bannerAd != null) {
-      bannerAd!.dispose();
-      bannerAd = null;
-      isBannerAdLoaded = false;
-    }
-    bannerAd = BannerAd(
-      adUnitId: adUnitId,
-      request: const AdRequest(),
-      size: AdSize.banner,
-      listener: BannerAdListener(
-        onAdLoaded: (ad) {
-          debugPrint('$ad loaded.');
-          isBannerAdLoaded = true;
-          notifyListeners();
-        },
-        onAdFailedToLoad: (ad, err) {
-          debugPrint('BannerAd failed to load: $err');
-          errorMessage =
-              'Failed to load ad- Message: ${err.message} Code :${err.code}';
-          ad.dispose(); // Dispose the ad to free resources
-          isBannerAdLoaded = false; // ⬅️ Explicitly set to false
-          bannerAd = null; // ⬅️ Explicitly set to null
-          notifyListeners();
-        },
-        onAdOpened: (Ad ad) => debugPrint('$ad opened.'),
-        onAdClosed: (Ad ad) => debugPrint('$ad closed.'),
-        onAdImpression: (Ad ad) => debugPrint('$ad impression.'),
-      ),
-    );
-    bannerAd!.load();
-  }
-}

Frontend/lib/mih_components/mih_providers/mzansi_ai_provider.dart

@@ -1,26 +0,0 @@
-import 'package:flutter/material.dart';
-
-class MzansiAiProvider extends ChangeNotifier {
-  int toolIndex;
-  String? startUpQuestion;
-
-  MzansiAiProvider({
-    this.toolIndex = 0,
-  });
-
-  void reset() {
-    toolIndex = 0;
-    startUpQuestion = null;
-    notifyListeners();
-  }
-
-  void setToolIndex(int index) {
-    toolIndex = index;
-    notifyListeners();
-  }
-
-  void setStartUpQuestion(String? question) {
-    startUpQuestion = question;
-    notifyListeners();
-  }
-}

Frontend/lib/mih_config/mih_theme.dart

@@ -1,253 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import "package:universal_html/html.dart" as html;
-
-class MihTheme {
-  // late int _mainColor;
-  // late int _secondColor;
-  //late int _errColor;
-  //late int _succColor;
-  // late int _mesColor;
-  late String mode;
-  late String screenType;
-  late AssetImage loading;
-  late String loadingAssetText;
-  late TargetPlatform platform;
-  bool kIsWeb = const bool.fromEnvironment('dart.library.js_util');
-  String latestVersion = "1.2.2";
-  // Options:-
-  // f3f9d2 = Cream
-  // f0f0c9 = cream2
-  // caffd0 = light green
-  // B0F2B4 = light grean 2 *
-  // 85bda6 = light green 3
-  // 70f8ba = green
-  // F7F3EA = white
-  // a63446 = red
-  //747474
-
-  MihTheme() {
-    mode = "Dark";
-    //_errColor = 0xffD87E8B;
-    //_succColor = 0xffB0F2B4;
-    //_mesColor = 0xffc8c8c8d9;
-  }
-
-  ThemeData getData(bool bool) {
-    return ThemeData(
-        fontFamily: 'Segoe UI',
-        scaffoldBackgroundColor: MihColors.getPrimaryColor(mode == "Dark"),
-        // pageTransitionsTheme: PageTransitionsTheme(
-        //   builders: Map<TargetPlatform, PageTransitionsBuilder>.fromIterable(
-        //     TargetPlatform.values,
-        //     value: (dynamic _) => const FadeUpwardsPageTransitionsBuilder(),
-        //   ),
-        // ),
-        colorScheme: ColorScheme(
-          brightness: getBritness(),
-          primary: MihColors.getSecondaryColor(mode == "Dark"),
-          onPrimary: MihColors.getPrimaryColor(mode == "Dark"),
-          secondary: MihColors.getPrimaryColor(mode == "Dark"),
-          onSecondary: MihColors.getSecondaryColor(mode == "Dark"),
-          error: MihColors.getRedColor(mode == "Dark"),
-          onError: MihColors.getPrimaryColor(mode == "Dark"),
-          surface: MihColors.getPrimaryColor(mode == "Dark"),
-          onSurface: MihColors.getSecondaryColor(mode == "Dark"),
-        ),
-        datePickerTheme: DatePickerThemeData(
-          backgroundColor: MihColors.getPrimaryColor(mode == "Dark"),
-          headerBackgroundColor: MihColors.getSecondaryColor(mode == "Dark"),
-          headerForegroundColor: MihColors.getPrimaryColor(mode == "Dark"),
-        ),
-        appBarTheme: AppBarTheme(
-          color: MihColors.getSecondaryColor(mode == "Dark"),
-          foregroundColor: MihColors.getPrimaryColor(mode == "Dark"),
-          titleTextStyle: TextStyle(
-            color: MihColors.getPrimaryColor(mode == "Dark"),
-            fontSize: 25,
-            fontWeight: FontWeight.bold,
-          ),
-        ),
-        floatingActionButtonTheme: FloatingActionButtonThemeData(
-          backgroundColor: MihColors.getSecondaryColor(mode == "Dark"),
-          foregroundColor: MihColors.getPrimaryColor(mode == "Dark"),
-          extendedTextStyle:
-              TextStyle(color: MihColors.getPrimaryColor(mode == "Dark")),
-        ),
-        drawerTheme: DrawerThemeData(
-          backgroundColor: MihColors.getPrimaryColor(mode == "Dark"),
-        ));
-  }
-
-  String getPlatform() {
-    // if (isPwa()) {
-    //   if (platform == TargetPlatform.android) {
-    //     return "Android";
-    //   } else if (platform == TargetPlatform.iOS) {
-    //     return "iOS";
-    //   }
-    // } else
-    if (kIsWeb) {
-      return "Web";
-    } else if (!kIsWeb) {
-      if (platform == TargetPlatform.android) {
-        return "Android";
-      } else if (platform == TargetPlatform.iOS) {
-        return "iOS";
-      }
-    }
-    return "Other";
-  }
-
-  bool isPwa() {
-    return html.window.matchMedia('(display-mode: standalone)').matches;
-  }
-
-  void setMode(String m) {
-    mode;
-  }
-
-  String getLatestVersion() {
-    return latestVersion;
-  }
-
-  ThemeData getThemeData() {
-    return getData(mode == "Dark");
-  }
-
-  ThemeData darkMode() {
-    return getData(mode == "Dark");
-  }
-
-  ThemeData lightMode() {
-    return getData(mode == "Dark");
-  }
-
-  Brightness getBritness() {
-    if (mode == "Dark") {
-      return Brightness.dark;
-    } else {
-      return Brightness.light;
-    }
-  }
-
-  // Color messageTextColor() {
-  //   if (mode == "Dark") {
-  //     _mesColor = 0XFFc8c8c8;
-  //   } else {
-  //     _mesColor = 0XFF747474;
-  //   }
-  //   return Color(_mesColor);
-  // }
-
-  // Color errorColor() {
-  //   if (mode == "Dark") {
-  //     return const Color(0xffD87E8B);
-  //   } else {
-  //     return const Color(0xffbb3d4f);
-  //   }
-  //   //return Color(_errColor);
-  // }
-
-  // Color highlightColor() {
-  //   if (mode == "Dark") {
-  //     return const Color(0XFF9bc7fa);
-  //   } else {
-  //     return const Color(0XFF354866);
-  //   }
-  // }
-
-  // Color successColor() {
-  //   if (mode == "Dark") {
-  //     return const Color(0xffB0F2B4);
-  //   } else {
-  //     return const Color(0xff56a95b);
-  //   }
-  // }
-
-  AssetImage loadingImage() {
-    if (mode == "Dark") {
-      loading = const AssetImage(
-        'lib/mih_components/mih_package_components/assets/images/loading_light.gif',
-      );
-    } else {
-      loading = const AssetImage(
-        'lib/mih_components/mih_package_components/assets/images/loading_dark.gif',
-      );
-    }
-    return loading;
-  }
-
-  AssetImage altLoadingImage() {
-    if (mode == "Dark") {
-      loading = const AssetImage(
-        'lib/mih_components/mih_package_components/assets/images/loading_dark.gif',
-      );
-    } else {
-      loading = const AssetImage(
-        'lib/mih_components/mih_package_components/assets/images/loading_light.gif',
-      );
-    }
-    return loading;
-  }
-
-  String loadingImageLocation() {
-    if (mode == "Dark") {
-      loadingAssetText =
-          'lib/mih_components/mih_package_components/assets/images/loading_light.gif';
-    } else {
-      loadingAssetText =
-          'lib/mih_components/mih_package_components/assets/images/loading_dark.gif';
-    }
-    return loadingAssetText;
-  }
-
-  String altLoadingImageLocation() {
-    if (mode == "Dark") {
-      loadingAssetText =
-          'lib/mih_components/mih_package_components/assets/images/loading_dark.gif';
-    } else {
-      loadingAssetText =
-          'lib/mih_components/mih_package_components/assets/images/loading_light.gif';
-    }
-    return loadingAssetText;
-  }
-
-  AssetImage aiLogoImage() {
-    if (mode == "Dark") {
-      return const AssetImage(
-        'lib/mih_components/mih_package_components/assets/images/mzansi_ai-dark.png',
-      );
-    } else {
-      return const AssetImage(
-        'lib/mih_components/mih_package_components/assets/images/mzansi_ai-light.png',
-      );
-    }
-  }
-
-  void setScreenType(double width) {
-    if (width <= 800) {
-      screenType = "mobile";
-    } else {
-      screenType = "desktop";
-    }
-  }
-
-  // Color MihColors.getPrimaryColor(mode == "Dark") {
-  //   if (mode == "Dark") {
-  //     _mainColor = 0XFF3A4454;
-  //   } else {
-  //     _mainColor = 0XFFbedcfe;
-  //   }
-  //   return Color(_mainColor);
-  // }
-
-//   Color MihColors.getSecondaryColor(mode == "Dark") {
-//     if (mode == "Dark") {
-//       _secondColor = 0XFFbedcfe;
-//     } else {
-//       _secondColor = 0XFF3A4454;
-//     }
-//     return Color(_secondColor);
-//   }
-}

Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart

@@ -1,287 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class MihAttributes extends StatefulWidget {
-  const MihAttributes({super.key});
-
-  @override
-  State<MihAttributes> createState() => _MihAttributesState();
-}
-
-class _MihAttributesState extends State<MihAttributes> {
-  Future<void> launchUrlLink(Uri linkUrl) async {
-    if (!await launchUrl(linkUrl)) {
-      throw Exception('Could not launch $linkUrl');
-    }
-  }
-
-  TableRow displayIcon(IconData icon, String creator, String link) {
-    return TableRow(
-      children: [
-        TableCell(
-          verticalAlignment: TableCellVerticalAlignment.middle,
-          child: SizedBox(
-            height: 150,
-            child: Padding(
-              padding: const EdgeInsets.only(bottom: 15.0),
-              child: FittedBox(
-                child: Center(
-                  child: Icon(
-                    icon,
-                    // size: 125,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ),
-        TableCell(
-          verticalAlignment: TableCellVerticalAlignment.middle,
-          child: Padding(
-            padding: const EdgeInsets.all(15.0),
-            child: Center(
-              child: Text(
-                creator,
-                textAlign: TextAlign.center,
-                style: const TextStyle(
-                  fontSize: 20,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ),
-          ),
-        ),
-        TableCell(
-          verticalAlignment: TableCellVerticalAlignment.middle,
-          child: Padding(
-            padding: const EdgeInsets.only(bottom: 15.0),
-            child: MihButton(
-              onPressed: () {
-                launchUrlLink(
-                  Uri.parse(
-                    link,
-                  ),
-                );
-              },
-              buttonColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              width: 100,
-              child: Text(
-                "Visit",
-                style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 20,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MihPackageToolBody(
-      borderOn: false,
-      innerHorizontalPadding: 10,
-      bodyItem: getBody(),
-    );
-  }
-
-  Widget getBody() {
-    String message =
-        "Some APIs, Icons and Assets used in MIH were sourced from third party providers.\n";
-    message +=
-        "We are grateful to the talented creators for providing these resources.\n";
-    message +=
-        "As per the terms for free use for these third party providers, the following assets require attribution";
-
-    return MihSingleChildScroll(
-      child: Column(
-        children: [
-          Icon(
-            MihIcons.mihLogo,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            size: 165,
-          ),
-          const SizedBox(
-            height: 10,
-          ),
-          SelectableText(
-            message,
-            style: const TextStyle(
-              fontSize: 15,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-          const SizedBox(
-            height: 10,
-          ),
-          SizedBox(
-            width: 700,
-            child: Table(
-              defaultVerticalAlignment: TableCellVerticalAlignment.middle,
-              columnWidths: const {
-                0: FlexColumnWidth(1),
-                1: FlexColumnWidth(1),
-                2: FlexColumnWidth(1),
-              },
-              children: [
-                const TableRow(
-                  children: [
-                    TableCell(
-                      verticalAlignment: TableCellVerticalAlignment.middle,
-                      child: Padding(
-                        padding: const EdgeInsets.only(bottom: 15.0),
-                        child: Center(
-                          child: Text(
-                            "Resources",
-                            style: TextStyle(
-                              fontSize: 25,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                    TableCell(
-                      verticalAlignment: TableCellVerticalAlignment.middle,
-                      child: Padding(
-                        padding: const EdgeInsets.only(bottom: 15.0),
-                        child: Center(
-                          child: Text(
-                            "Creator",
-                            style: TextStyle(
-                              fontSize: 25,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                    TableCell(
-                      child: Padding(
-                        padding: const EdgeInsets.only(bottom: 15.0),
-                        child: Center(
-                          child: Text(
-                            "Link",
-                            style: TextStyle(
-                              fontSize: 25,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-                displayIcon(MihIcons.mihRing, "Tarah Meth",
-                    "https://www.linkedin.com/in/tarah-meth-3b6309254/"),
-                displayIcon(MihIcons.mihLogo, "Tarah Meth",
-                    "https://www.linkedin.com/in/tarah-meth-3b6309254/"),
-                displayIcon(MihIcons.mzansiAi, "Ollama", "https://ollama.com/"),
-                displayIcon(MihIcons.mzansiWallet, "Freepik",
-                    "https://www.flaticon.com/free-icon/wallet-passes-app_3884407?term=wallet&page=1&position=21&origin=search&related_id=3884407"),
-                displayIcon(MihIcons.patientProfile, "RaftelDesign",
-                    "https://www.flaticon.com/free-icon/patient_2376100?term=medication&page=1&position=6&origin=search&related_id=2376100"),
-                displayIcon(MihIcons.patientProfile, "Srip",
-                    "https://www.flaticon.com/free-icon/hospital_1233930?term=medical+snake&page=1&position=7&origin=search&related_id=1233930"),
-                displayIcon(MihIcons.calendar, "Freepik",
-                    "https://www.flaticon.com/free-icon/calendar_2278049?term=calendar&page=1&position=5&origin=search&related_id=2278049"),
-                displayIcon(MihIcons.calculator, "Freepik",
-                    "https://www.flaticon.com/free-icon/calculator_2374409?term=calculator&page=1&position=20&origin=search&related_id=2374409"),
-                displayIcon(MihIcons.aboutMih, "Chanut",
-                    "https://www.flaticon.com/free-icon/info_151776?term=about&page=1&position=8&origin=search&related_id=151776"),
-                displayIcon(MihIcons.personalProfile, "Freepik",
-                    "https://www.flaticon.com/free-icon/user_1077063?term=profile&page=1&position=6&origin=search&related_id=1077063"),
-                displayIcon(MihIcons.businessProfile, "Gravisio",
-                    "https://www.flaticon.com/free-icon/contractor_11813336?term=company+profile&page=1&position=2&origin=search&related_id=11813336"),
-                displayIcon(MihIcons.patientManager, "Vector Tank",
-                    "https://www.flaticon.com/free-icon/doctor_10215061?term=doctor&page=1&position=73&origin=search&related_id=10215061"),
-                displayIcon(MihIcons.profileSetup, "Freepik",
-                    "https://www.flaticon.com/free-icon/add-user_748137?term=profile+add&page=1&position=1&origin=search&related_id=748137"),
-                displayIcon(MihIcons.businessSetup, "kerismaker",
-                    "https://www.flaticon.com/free-icon/business_13569850?term=company+add&page=1&position=25&origin=search&related_id=13569850"),
-                displayIcon(MihIcons.calculator, "fawazahmed0",
-                    "https://github.com/fawazahmed0/exchange-api"),
-                displayIcon(MihIcons.iDontKnow, "Freepik",
-                    "https://www.flaticon.com/free-icon/i-dont-know_5359909?term=i+dont+know&page=1&position=7&origin=search&related_id=5359909"),
-              ],
-            ),
-          ),
-          // SizedBox(
-          //   width: 500,
-          //   child: Column(
-          //     children: [
-          //       const SizedBox(
-          //         width: double.infinity,
-          //         child: Row(
-          //           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          //           mainAxisSize: MainAxisSize.max,
-          //           children: [
-          //             Flexible(
-          //               child: Text(
-          //                 "Icon",
-          //                 style: TextStyle(
-          //                   fontSize: 25,
-          //                   fontWeight: FontWeight.bold,
-          //                 ),
-          //               ),
-          //             ),
-          //             Flexible(
-          //               child: Text(
-          //                 "Creator",
-          //                 style: TextStyle(
-          //                   fontSize: 25,
-          //                   fontWeight: FontWeight.bold,
-          //                 ),
-          //               ),
-          //             ),
-          //             Flexible(
-          //               child: Text(
-          //                 "Link",
-          //                 style: TextStyle(
-          //                   fontSize: 25,
-          //                   fontWeight: FontWeight.bold,
-          //                 ),
-          //               ),
-          //             ),
-          //           ],
-          //         ),
-          //       ),
-          //       const Padding(
-          //         padding: EdgeInsets.symmetric(vertical: 10.0),
-          //         child: Divider(),
-          //       ),
-          //       displayIcon(MihIcons.mihLogo, "Tarah Meth",
-          //           "https://app.mzansi-innovation-hub.co.za/"),
-          //       const SizedBox(height: 10),
-          //       displayIcon(MihIcons.mihLogo, "Test",
-          //           "https://www.flaticon.com/free-icons/mih"),
-          //       const SizedBox(height: 10),
-          //       displayIcon(MihIcons.mihLogo, "Test",
-          //           "https://www.flaticon.com/free-icons/mih"),
-          //       const SizedBox(height: 10),
-          //       displayIcon(MihIcons.mihLogo, "Test",
-          //           "https://www.flaticon.com/free-icons/mih"),
-          //       const SizedBox(height: 10),
-          //     ],
-          //   ),
-          // )
-        ],
-      ),
-    );
-  }
-}

Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart

@@ -1,960 +0,0 @@
-import 'package:flutter_speed_dial/flutter_speed_dial.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_install_services.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_tile.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:redacted/redacted.dart';
-import 'package:share_plus/share_plus.dart';
-
-class MihInfo extends StatefulWidget {
-  const MihInfo({super.key});
-
-  @override
-  State<MihInfo> createState() => _MihInfoState();
-}
-
-class _MihInfoState extends State<MihInfo> {
-  late Future<int> _futureUserCount;
-  late Future<int> _futureBusinessCount;
-  final Uri _tiktokUrl =
-      Uri.parse('https://www.tiktok.com/@mzansi.innovation.hub');
-  final Uri _whatsappUrl =
-      Uri.parse('https://whatsapp.com/channel/0029Vax3INCIyPtMn8KgeM2F');
-  final Uri _twitch = Uri.parse('https://www.twitch.tv/mzansi_innovation_hub');
-  final Uri _kick = Uri.parse('https://kick.com/mzansi-innovation-hub');
-  final Uri _threadsUrl =
-      Uri.parse('https://www.threads.net/@mzansi.innovation.hub');
-  final Uri _instagramUrl =
-      Uri.parse('https://www.instagram.com/mzansi.innovation.hub');
-  final Uri _youtubeUrl =
-      Uri.parse('https://www.youtube.com/@mzansiinnovationhub');
-  final Uri _xUrl = Uri.parse('https://x.com/mzansi_inno_hub');
-  final Uri _linkedinUrl =
-      Uri.parse('https://www.linkedin.com/company/mzansi-innovation-hub/');
-  final Uri _facebookUrl =
-      Uri.parse('https://www.facebook.com/profile.php?id=61565345762136');
-  final Uri _redditUrl =
-      Uri.parse('https://www.reddit.com/r/Mzani_Innovation_Hub/');
-
-  Widget founderBio() {
-    String bio = "";
-    bio += "BSc Computer Science & Information Systems\n";
-    bio += "(University of the Western Cape)\n";
-    bio +=
-        "6 Year of banking experience with one of the big 5 banks of South Africa.";
-    return Wrap(
-      alignment: WrapAlignment.center,
-      crossAxisAlignment: WrapCrossAlignment.center,
-      spacing: 10,
-      runSpacing: 10,
-      children: [
-        SizedBox(
-          width: 300,
-          child: Stack(
-            alignment: Alignment.center,
-            fit: StackFit.loose,
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(left: 4.0),
-                child: CircleAvatar(
-                  backgroundColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  backgroundImage: const AssetImage(
-                      "lib/mih_components/mih_package_components/assets/images/founder.jpg"),
-                  //'https://media.licdn.com/dms/image/D4D03AQGd1-QhjtWWpA/profile-displayphoto-shrink_400_400/0/1671698053061?e=2147483647&v=beta&t=a3dJI5yxs5-KeXjj10LcNCFuC9IOfa8nNn3k_Qyr0CA'),
-                  radius: 75,
-                ),
-              ),
-              Icon(
-                MihIcons.mihRing,
-                size: 165,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              ),
-            ],
-          ),
-        ),
-        SizedBox(
-          width: 400,
-          child: Text(
-            bio,
-            textAlign: TextAlign.center,
-            style: const TextStyle(
-              //fontWeight: FontWeight.bold,
-              fontSize: 17,
-            ),
-          ),
-        ),
-        const SizedBox(
-          height: 10,
-        ),
-      ],
-    );
-  }
-
-  Widget founderTitle() {
-    String heading = "Yasien Meth (Founder & CEO)";
-    return Column(
-      children: [
-        Text(
-          heading,
-          textAlign: TextAlign.center,
-          style: const TextStyle(
-            fontWeight: FontWeight.bold,
-            fontSize: 25,
-          ),
-        ),
-        const SizedBox(
-          height: 10,
-        ),
-      ],
-    );
-  }
-
-  Widget ourVision() {
-    String heading = "Our Vision";
-    String vision =
-        "Digitizing Mzansi one process at a time. Discover essential Mzansi apps to streamline your personal and professional life. Simplify your daily tasks with our user-friendly solutions.";
-
-    return SizedBox(
-      width: 500,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.start,
-        mainAxisSize: MainAxisSize.max,
-        children: [
-          Text(
-            heading,
-            textAlign: TextAlign.center,
-            style: const TextStyle(
-              fontWeight: FontWeight.bold,
-              fontSize: 25,
-            ),
-          ),
-          const SizedBox(
-            height: 10,
-          ),
-          Text(
-            vision,
-            textAlign: TextAlign.center,
-            style: const TextStyle(
-              //fontWeight: FontWeight.bold,
-              fontSize: 17,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget ourMission() {
-    String heading = "Our Mission";
-    String mission =
-        "Bridge the digital divide in Mzansi, ensuring that everyone can benefit from the power of technology. We empower lives by providing simple, elegant solutions that elevate daily experiences. With our user-friendly approach, we're making the digital world accessible to all, ensuring no one is left behind in the digital revolution.";
-
-    return SizedBox(
-      width: 500,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.start,
-        children: [
-          Text(
-            heading,
-            textAlign: TextAlign.center,
-            style: const TextStyle(
-              fontWeight: FontWeight.bold,
-              fontSize: 25,
-            ),
-          ),
-          const SizedBox(
-            height: 10,
-          ),
-          Text(
-            mission,
-            textAlign: TextAlign.center,
-            style: const TextStyle(
-              //fontWeight: FontWeight.bold,
-              fontSize: 17,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget mihSocials() {
-    String heading = "Follow Our Journey";
-    return Column(
-      children: [
-        Text(
-          heading,
-          textAlign: TextAlign.center,
-          style: const TextStyle(
-            fontWeight: FontWeight.bold,
-            fontSize: 25,
-          ),
-        ),
-        const SizedBox(
-          height: 10,
-        ),
-        SizedBox(
-          width: 500,
-          height: 600,
-          child: GridView.builder(
-            padding: const EdgeInsets.only(
-                // left: width / 10,
-                // right: width / 10,
-                // //bottom: height / 5,
-                // top: 20,
-                ),
-            physics: const NeverScrollableScrollPhysics(),
-            // shrinkWrap: true,
-            itemCount: getSocialsList().length,
-            gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-                mainAxisSpacing: 15, maxCrossAxisExtent: 150),
-            itemBuilder: (context, index) {
-              return getSocialsList()[index];
-            },
-          ),
-        ),
-      ],
-    );
-  }
-
-  List<Widget> getSocialsList() {
-    List<Widget> socials = [];
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_youtubeUrl);
-      },
-      tileName: "YouTube",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.youtube,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 175,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_tiktokUrl);
-      },
-      tileName: "TikTok",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.tiktok,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_twitch);
-      },
-      tileName: "Twitch",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.twitch,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_threadsUrl);
-      },
-      tileName: "Threads",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.threads,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_whatsappUrl);
-      },
-      tileName: "Whatsapp",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.whatsapp,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_instagramUrl);
-      },
-      tileName: "Instagram",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.instagram,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_xUrl);
-      },
-      tileName: "X",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.xTwitter,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_linkedinUrl);
-      },
-      tileName: "LinkedIn",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.linkedin,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_facebookUrl);
-      },
-      tileName: "FaceBook",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.facebook,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_redditUrl);
-      },
-      tileName: "Reddit",
-      tileIcon: Center(
-        child: FaIcon(
-          FontAwesomeIcons.reddit,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          size: 200,
-        ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    socials.add(MIHTile(
-      onTap: () {
-        launchSocialUrl(_kick);
-      },
-      tileName: "Kick",
-      tileIcon: Center(
-        child: Text(
-          "KICK",
-          style: TextStyle(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            fontWeight: FontWeight.bold,
-            fontSize: 100,
-          ),
-        ),
-        // FaIcon(
-        //   FontAwesomeIcons.tv,
-        //   color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        //   size: 200,
-        // ),
-      ),
-      p: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      s: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    ));
-    //==================================================================
-    return socials;
-  }
-
-  Future<void> launchSocialUrl(Uri linkUrl) async {
-    if (!await launchUrl(linkUrl)) {
-      throw Exception('Could not launch $linkUrl');
-    }
-  }
-
-  Widget getInstallButtonText() {
-    final isWebAndroid =
-        kIsWeb && (defaultTargetPlatform == TargetPlatform.android);
-    final isWebIos = kIsWeb && (defaultTargetPlatform == TargetPlatform.iOS);
-    String btnText = "";
-    IconData platformIcon;
-    if (isWebAndroid) {
-      btnText = "Install MIH";
-      platformIcon = FontAwesomeIcons.googlePlay;
-    } else if (isWebIos) {
-      btnText = "Install MIH";
-      platformIcon = FontAwesomeIcons.appStoreIos;
-    } else if (MzansiInnovationHub.of(context)!.theme.getPlatform() ==
-        "Android") {
-      btnText = "Update MIH";
-      platformIcon = FontAwesomeIcons.googlePlay;
-    } else if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "iOS") {
-      btnText = "Update MIH";
-      platformIcon = FontAwesomeIcons.appStoreIos;
-    } else {
-      btnText = "Install MIH";
-      platformIcon = FontAwesomeIcons.globe;
-    }
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        FaIcon(
-          platformIcon,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        ),
-        const SizedBox(width: 10),
-        Text(
-          btnText,
-          style: TextStyle(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            fontSize: 20,
-            fontWeight: FontWeight.bold,
-          ),
-        ),
-      ],
-    );
-  }
-
-  void shareMIHLink(BuildContext context, String message, String link) {
-    String shareText = "$message: $link";
-    SharePlus.instance.share(
-      ShareParams(text: shareText),
-    );
-  }
-
-  Widget displayBusinessCount() {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        FutureBuilder<int>(
-          future: _futureBusinessCount,
-          builder: (context, snapshot) {
-            bool isLoading = true;
-            String userCount = "⚠️";
-            if (snapshot.connectionState == ConnectionState.waiting) {
-              isLoading = true;
-            } else if (snapshot.connectionState == ConnectionState.done &&
-                snapshot.hasError) {
-              isLoading = false;
-            } else if (snapshot.connectionState == ConnectionState.done &&
-                snapshot.hasData) {
-              isLoading = false;
-              userCount = snapshot.data.toString();
-            } else {
-              isLoading = true;
-            }
-            return SizedBox(
-              child: Text(
-                userCount,
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 23,
-                ),
-              ),
-            ).redacted(
-              context: context,
-              redact: isLoading,
-              configuration: RedactedConfiguration(
-                defaultBorderRadius: BorderRadius.circular(5),
-                redactedColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-                ),
-              ),
-            );
-          },
-        ),
-        const SizedBox(width: 10),
-        Text(
-          "Businesses",
-          textAlign: TextAlign.center,
-          style: TextStyle(
-            fontWeight: FontWeight.normal,
-            fontSize: 20,
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget displayUserCount() {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        FutureBuilder<int>(
-          future: _futureUserCount,
-          builder: (context, snapshot) {
-            bool isLoading = true;
-            String userCount = "⚠️";
-            if (snapshot.connectionState == ConnectionState.waiting) {
-              isLoading = true;
-            } else if (snapshot.connectionState == ConnectionState.done &&
-                snapshot.hasError) {
-              isLoading = false;
-            } else if (snapshot.connectionState == ConnectionState.done &&
-                snapshot.hasData) {
-              isLoading = false;
-              userCount = snapshot.data.toString();
-            } else {
-              isLoading = true;
-            }
-            return SizedBox(
-              child: Text(
-                userCount,
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 23,
-                ),
-              ),
-            ).redacted(
-              context: context,
-              redact: isLoading,
-              configuration: RedactedConfiguration(
-                defaultBorderRadius: BorderRadius.circular(5),
-                redactedColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-                ),
-              ),
-            );
-          },
-        ),
-        const SizedBox(width: 10),
-        Text(
-          "People",
-          textAlign: TextAlign.center,
-          style: TextStyle(
-            fontWeight: FontWeight.normal,
-            fontSize: 20,
-          ),
-        ),
-      ],
-    );
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _futureUserCount = MihUserServices().fetchUserCount();
-    _futureBusinessCount = MihBusinessDetailsServices().fetchBusinessCount();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MihPackageToolBody(
-      borderOn: false,
-      innerHorizontalPadding: 10,
-      bodyItem: getBody(),
-    );
-  }
-
-  Widget getBody() {
-    return Stack(
-      children: [
-        MihSingleChildScroll(
-          child: Column(
-            children: [
-              SizedBox(
-                width: 165,
-                child: FittedBox(
-                  child: Icon(
-                    MihIcons.mihLogo,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                ),
-              ),
-              const SizedBox(
-                height: 10,
-              ),
-              const Text(
-                "Mzansi Innovation Hub",
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 30,
-                ),
-              ),
-              Text(
-                "MIH App Version: ${MzansiInnovationHub.of(context)!.theme.getLatestVersion()}",
-                textAlign: TextAlign.center,
-                style: const TextStyle(
-                  fontWeight: FontWeight.normal,
-                  fontSize: 15,
-                ),
-              ),
-              // ===================== Divider
-              // Padding(
-              //   padding: EdgeInsets.symmetric(
-              //     vertical: 10.0,
-              //     horizontal: 25,
-              //   ),
-              //   child: Divider(
-              //     thickness: 1,
-              //     color: MihColors.getGreyColor(
-              //         MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              //   ),
-              // ),
-              const SizedBox(
-                height: 10,
-              ),
-              // Text(
-              //   "The MIH Community",
-              //   textAlign: TextAlign.center,
-              //   style: TextStyle(
-              //     fontWeight: FontWeight.bold,
-              //     fontSize: 22,
-              //   ),
-              // ),
-              Wrap(
-                alignment: WrapAlignment.spaceAround,
-                crossAxisAlignment: WrapCrossAlignment.center,
-                spacing: 25,
-                runSpacing: 10,
-                children: [
-                  displayUserCount(),
-                  displayBusinessCount(),
-                ],
-              ),
-              Text(
-                "The MIH Community",
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 22,
-                ),
-              ),
-              // ===================== Divider
-              Padding(
-                padding: EdgeInsets.symmetric(
-                  vertical: 10.0,
-                  horizontal: 25,
-                ),
-                child: Divider(
-                  thickness: 1,
-                  color: MihColors.getGreyColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-              ),
-              // const SizedBox(
-              //   height: 10,
-              // ),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 25.0),
-                child: Wrap(
-                  alignment: WrapAlignment.start,
-                  crossAxisAlignment: WrapCrossAlignment.start,
-                  spacing: 10,
-                  runSpacing: 10,
-                  children: [
-                    ourVision(),
-                    ourMission(),
-                  ],
-                ),
-              ),
-              const SizedBox(
-                height: 25,
-              ),
-              Wrap(
-                  alignment: WrapAlignment.center,
-                  crossAxisAlignment: WrapCrossAlignment.center,
-                  spacing: 10,
-                  runSpacing: 10,
-                  children: [
-                    MihButton(
-                      onPressed: () {
-                        MihInstallServices().installMihTrigger(context);
-                      },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      width: 300,
-                      child: getInstallButtonText(),
-                    ),
-                    MihButton(
-                      onPressed: () {
-                        launchSocialUrl(
-                          Uri.parse(
-                            "https://www.youtube.com/playlist?list=PLuT35kJIui0H5kXjxNOZlHoOPZbQLr4qh",
-                          ),
-                        );
-                      },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      width: 300,
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          FaIcon(
-                            FontAwesomeIcons.youtube,
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                          ),
-                          const SizedBox(width: 10),
-                          Text(
-                            "MIH Beginners Guide",
-                            style: TextStyle(
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              fontSize: 20,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    MihButton(
-                      onPressed: () {
-                        launchSocialUrl(
-                          Uri.parse(
-                            "https://patreon.com/MzansiInnovationHub?utm_medium=unknown&utm_source=join_link&utm_campaign=creatorshare_creator&utm_content=copyLink",
-                          ),
-                        );
-                      },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      width: 300,
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          FaIcon(
-                            FontAwesomeIcons.patreon,
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                          ),
-                          const SizedBox(width: 10),
-                          Text(
-                            "Support Our Journey",
-                            style: TextStyle(
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              fontSize: 20,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ]),
-              const SizedBox(
-                height: 10,
-              ),
-              // ===================== Divider
-              Padding(
-                padding: EdgeInsets.symmetric(
-                  vertical: 10.0,
-                  horizontal: 25,
-                ),
-                child: Divider(
-                  thickness: 1,
-                  color: MihColors.getGreyColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-              ),
-              Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                mainAxisSize: MainAxisSize.max,
-                // spacing: 10,
-                // runSpacing: 10,
-                children: [
-                  founderTitle(),
-                  founderBio(),
-                ],
-              ),
-              // ===================== Divider
-              Padding(
-                padding: EdgeInsets.symmetric(
-                  vertical: 10.0,
-                  horizontal: 25,
-                ),
-                child: Divider(
-                  thickness: 1,
-                  color: MihColors.getGreyColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-              ),
-              mihSocials(),
-            ],
-          ),
-        ),
-        Positioned(
-          right: 10,
-          bottom: 10,
-          child: MihFloatingMenu(
-            icon: Icons.share,
-            children: [
-              SpeedDialChild(
-                child: Icon(
-                  Icons.vpn_lock,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                label: "MIH - Web",
-                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                labelStyle: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontWeight: FontWeight.bold,
-                ),
-                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                onTap: () {
-                  shareMIHLink(
-                    context,
-                    "Check out the MIH app on the Web",
-                    "https://app.mzansi-innovation-hub.co.za/",
-                  );
-                },
-              ),
-              SpeedDialChild(
-                child: Icon(
-                  Icons.apple,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                label: "MIH - iOS",
-                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                labelStyle: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontWeight: FontWeight.bold,
-                ),
-                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                onTap: () {
-                  shareMIHLink(
-                    context,
-                    "Check out the MIH app on the App Store",
-                    "https://apps.apple.com/za/app/mzansi-innovation-hub/id6743310890",
-                  );
-                },
-              ),
-              SpeedDialChild(
-                child: Icon(
-                  Icons.android,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                label: "MIH - Android",
-                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                labelStyle: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontWeight: FontWeight.bold,
-                ),
-                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                onTap: () {
-                  shareMIHLink(
-                    context,
-                    "Check out the MIH app on the Play Store",
-                    "https://play.google.com/store/apps/details?id=za.co.mzansiinnovationhub.mih",
-                  );
-                },
-              ),
-            ],
-          ),
-        )
-      ],
-    );
-  }
-}

Frontend/lib/mih_packages/access_review/mih_access.dart

@@ -1,71 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart';
-import 'package:mzansi_innovation_hub/mih_packages/access_review/package_tools/mih_access_requests.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class MihAccess extends StatefulWidget {
-  const MihAccess({
-    super.key,
-  });
-
-  @override
-  State<MihAccess> createState() => _MihAccessState();
-}
-
-class _MihAccessState extends State<MihAccess> {
-  @override
-  Widget build(BuildContext context) {
-    return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<MihAccessControllsProvider>().toolIndex,
-      onIndexChange: (newValue) {
-        context.read<MihAccessControllsProvider>().setToolIndex(newValue);
-      },
-    );
-  }
-
-  MihPackageAction getAction() {
-    return MihPackageAction(
-      icon: const Icon(Icons.arrow_back),
-      iconSize: 35,
-      onTap: () {
-        context.goNamed(
-          'mihHome',
-        );
-        FocusScope.of(context).unfocus();
-      },
-    );
-  }
-
-  MihPackageTools getTools() {
-    Map<Widget, void Function()?> temp = {};
-    temp[const Icon(Icons.people)] = () {
-      context.read<MihAccessControllsProvider>().setToolIndex(0);
-    };
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: context.watch<MihAccessControllsProvider>().toolIndex,
-    );
-  }
-
-  List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
-      MihAccessRequest(),
-    ];
-    return toolBodies;
-  }
-
-  List<String> getToolTitle() {
-    List<String> toolTitles = [
-      "Access",
-    ];
-    return toolTitles;
-  }
-}

Frontend/lib/mih_packages/calendar/mzansi_calendar.dart

@@ -1,77 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_packages/calendar/package_tools/appointments.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class MzansiCalendar extends StatefulWidget {
-  const MzansiCalendar({
-    super.key,
-  });
-
-  @override
-  State<MzansiCalendar> createState() => _MzansiCalendarState();
-}
-
-class _MzansiCalendarState extends State<MzansiCalendar> {
-  @override
-  Widget build(BuildContext context) {
-    return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<MihCalendarProvider>().toolIndex,
-      onIndexChange: (newIndex) {
-        context.read<MihCalendarProvider>().setToolIndex(newIndex);
-      },
-    );
-  }
-
-  MihPackageAction getAction() {
-    return MihPackageAction(
-      icon: const Icon(Icons.arrow_back),
-      iconSize: 35,
-      onTap: () {
-        context.read<MihCalendarProvider>().resetSelectedDay();
-        context.goNamed(
-          'mihHome',
-        );
-        FocusScope.of(context).unfocus();
-      },
-    );
-  }
-
-  MihPackageTools getTools() {
-    Map<Widget, void Function()?> temp = {};
-    temp[const Icon(Icons.calendar_month)] = () {
-      context.read<MihCalendarProvider>().setToolIndex(0);
-    };
-
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: context.watch<MihCalendarProvider>().toolIndex,
-    );
-  }
-
-  List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
-      //appointment here
-      Appointments(),
-    ];
-    return toolBodies;
-  }
-
-  List<String> getToolTitle() {
-    MzansiProfileProvider mzansiProfileProvider =
-        context.read<MzansiProfileProvider>();
-    List<String> toolTitles = [
-      mzansiProfileProvider.personalHome == true ? "Personal" : "Business",
-    ];
-    return toolTitles;
-  }
-}

Frontend/lib/mih_packages/mih_authentication/package_tools/mih_forgot_password.dart

@@ -1,295 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_authentication_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-
-class MihForgotPassword extends StatefulWidget {
-  const MihForgotPassword({super.key});
-
-  @override
-  State<MihForgotPassword> createState() => _MihForgotPasswordState();
-}
-
-class _MihForgotPasswordState extends State<MihForgotPassword> {
-  final emailController = TextEditingController();
-  bool successfulForgotPassword = false;
-  final _formKey = GlobalKey<FormState>();
-  final FocusNode _focusNode = FocusNode();
-  bool acceptWarning = false;
-
-  Future<void> submitPasswodReset() async {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const Mihloadingcircle();
-      },
-    );
-    try {
-      var resetPassEmailSent = await MihAuthenticationServices()
-          .forgotPassword(emailController.text);
-      context.pop();
-      if (resetPassEmailSent) {
-        setState(() {
-          successfulForgotPassword = true;
-        });
-      }
-    } on Exception {
-      //loginError();
-    }
-  }
-
-  void prePassResteWarning() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.warning_amber_rounded,
-            size: 100,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Password Reset Confirmation",
-          alertBody: Column(
-            //mainAxisSize: MainAxisSize.max,
-            children: [
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 25.0),
-                child: Text(
-                  "Before you reset your password, please be aware that you'll receive an email with a link to confirm your identity and set a new password. Make sure to check your inbox, including spam or junk folders. If you don't receive the email within a few minutes, please try resending the reset request.",
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 15.0,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-              const SizedBox(height: 25),
-              MihButton(
-                onPressed: () {
-                  setState(() {
-                    acceptWarning = true;
-                  });
-                  Navigator.of(context).pop();
-                  validateInput();
-                },
-                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                width: 300,
-                child: Text(
-                  "Continue",
-                  style: TextStyle(
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ],
-          ),
-          alertColour: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-      },
-    );
-  }
-
-  void resetLinkSentSuccessfully() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.check_circle_outline_rounded,
-            size: 150,
-            color: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Successfully Sent Reset Link",
-          alertBody: Column(
-            children: [
-              Text(
-                "We've sent a password reset link to your email address. Please check your inbox, including spam or junk folders.\n\nOnce you find the email, click on the link to reset your password.\n\nIf you don't receive the email within a few minutes, please try resending the reset request.\n\nThe reset link will expire after 2 hours",
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-              Center(
-                child: MihButton(
-                  onPressed: () {
-                    context.goNamed(
-                      'mihHome',
-                      extra: true,
-                    );
-                  },
-                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  elevation: 10,
-                  width: 300,
-                  child: Text(
-                    "Dismiss",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              )
-            ],
-          ),
-          alertColour: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-        // return const MIHSuccessMessage(
-        //     successType: "Success",
-        //     successMessage:
-        //         "We've sent a password reset link to your email address. Please check your inbox, including spam or junk folders.\n\nOnce you find the email, click on the link to reset your password.\n\nIf you don't receive the email within a few minutes, please try resending the reset request.\n\nThe reset link will expire after 2 hours");
-      },
-    );
-  }
-
-  void validateInput() async {
-    if (emailController.text.isEmpty) {
-      showDialog(
-        context: context,
-        builder: (context) {
-          return const MIHErrorMessage(errorType: "Input Error");
-        },
-      );
-    } else {
-      await submitPasswodReset();
-      if (successfulForgotPassword) {
-        // Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false);
-        resetLinkSentSuccessfully();
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double screenWidth = MediaQuery.of(context).size.width;
-    return MihPackageToolBody(
-      borderOn: false,
-      bodyItem: getBody(screenWidth),
-    );
-  }
-
-  Widget getBody(double width) {
-    return KeyboardListener(
-      focusNode: _focusNode,
-      autofocus: true,
-      onKeyEvent: (event) async {
-        if (event is KeyDownEvent &&
-            event.logicalKey == LogicalKeyboardKey.enter) {
-          validateInput();
-        }
-      },
-      child: SafeArea(
-        child: SingleChildScrollView(
-          physics: const BouncingScrollPhysics(),
-          child: Padding(
-            padding: MzansiInnovationHub.of(context)!.theme.screenType ==
-                    "desktop"
-                ? EdgeInsets.symmetric(vertical: 25, horizontal: width * 0.2)
-                : EdgeInsets.symmetric(vertical: 25, horizontal: width * 0.075),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              mainAxisSize: MainAxisSize.max,
-              children: [
-                //logo
-                Icon(
-                  Icons.lock,
-                  size: 100,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //spacer
-                const SizedBox(height: 10),
-                //Heading
-                Text(
-                  'Forgot Password',
-                  style: TextStyle(
-                    fontSize: 25,
-                    fontWeight: FontWeight.bold,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                ),
-                const SizedBox(height: 25),
-                MihForm(
-                  formKey: _formKey,
-                  formFields: [
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: emailController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      hintText: "Email",
-                      validator: (value) {
-                        return MihValidationServices().validateEmail(value);
-                      },
-                    ),
-                    //spacer
-                    const SizedBox(height: 20),
-                    Align(
-                      alignment: Alignment.center,
-                      child: MihButton(
-                        onPressed: () {
-                          if (_formKey.currentState!.validate()) {
-                            prePassResteWarning();
-                          } else {
-                            MihAlertServices().formNotFilledCompletely(context);
-                          }
-                        },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        width: 300,
-                        child: Text(
-                          "Reset Password",
-                          style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            fontSize: 20,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

Frontend/lib/mih_packages/mih_authentication/package_tools/mih_reset_password.dart

@@ -1,266 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_authentication_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-
-class MihResetPassword extends StatefulWidget {
-  final String token;
-  const MihResetPassword({
-    super.key,
-    required this.token,
-  });
-
-  @override
-  State<MihResetPassword> createState() => _MihResetPasswordState();
-}
-
-class _MihResetPasswordState extends State<MihResetPassword> {
-  final passwordController = TextEditingController();
-  final confirmPasswordController = TextEditingController();
-  final FocusNode _focusNode = FocusNode();
-  final _formKey = GlobalKey<FormState>();
-
-  void submitFormInput() async {
-    if (passwordController.text != confirmPasswordController.text) {
-      passwordError();
-    } else {
-      showDialog(
-        context: context,
-        builder: (context) {
-          return const Mihloadingcircle();
-        },
-      );
-      bool successfulResetPassword = await MihAuthenticationServices()
-          .resetPassword(widget.token, passwordController.text);
-      context.pop();
-      if (successfulResetPassword) {
-        resetSuccessfully();
-      } else {
-        loginError();
-      }
-    }
-  }
-
-  void resetSuccessfully() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.check_circle_outline_rounded,
-            size: 150,
-            color: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Successfully Reset Password",
-          alertBody: Column(
-            children: [
-              Text(
-                "Great news! Your password reset is complete. You can now log in to Mzansi Innovation Hub using your new password.",
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-              Center(
-                child: MihButton(
-                  onPressed: () {
-                    context.goNamed(
-                      'mihHome',
-                      extra: true,
-                    );
-                  },
-                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  elevation: 10,
-                  width: 300,
-                  child: Text(
-                    "Dismiss",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              )
-            ],
-          ),
-          alertColour: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-        // return const MIHSuccessMessage(
-        //     successType: "Success",
-        //     successMessage:
-        //         "We've sent a password reset link to your email address. Please check your inbox, including spam or junk folders.\n\nOnce you find the email, click on the link to reset your password.\n\nIf you don't receive the email within a few minutes, please try resending the reset request.\n\nThe reset link will expire after 2 hours");
-      },
-    );
-  }
-
-  void loginError() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const MIHErrorMessage(errorType: "Invalid Credentials");
-      },
-    );
-  }
-
-  void passwordError() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const MIHErrorMessage(errorType: "Password Match");
-      },
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double screenWidth = MediaQuery.of(context).size.width;
-    return MihPackageToolBody(
-      borderOn: false,
-      bodyItem: getBody(screenWidth),
-    );
-  }
-
-  Widget getBody(double width) {
-    return KeyboardListener(
-      focusNode: _focusNode,
-      autofocus: true,
-      onKeyEvent: (event) async {
-        if (event is KeyDownEvent &&
-            event.logicalKey == LogicalKeyboardKey.enter) {
-          if (_formKey.currentState!.validate()) {
-            submitFormInput();
-          } else {
-            MihAlertServices().formNotFilledCompletely(context);
-          }
-        }
-      },
-      child: SafeArea(
-        child: SingleChildScrollView(
-          physics: const BouncingScrollPhysics(),
-          child: Padding(
-            padding:
-                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
-                    ? EdgeInsets.symmetric(horizontal: width * 0.2)
-                    : EdgeInsets.symmetric(horizontal: width * 0.075),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                Text("Token: ${widget.token}"), // For testing purposes only
-                //logo
-                Icon(
-                  Icons.lock,
-                  size: 100,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                //spacer
-                const SizedBox(height: 10),
-                //Heading
-                Text(
-                  'Reset Password',
-                  style: TextStyle(
-                    fontSize: 25,
-                    fontWeight: FontWeight.bold,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                ),
-                //spacer
-                const SizedBox(height: 25),
-                MihForm(
-                  formKey: _formKey,
-                  formFields: [
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: passwordController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      hintText: "Password",
-                      passwordMode: true,
-                      autofillHints: const [AutofillHints.password],
-                      validator: (value) {
-                        return MihValidationServices().validatePassword(value);
-                      },
-                    ),
-                    //spacer
-                    const SizedBox(height: 10),
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: confirmPasswordController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      hintText: "Confirm Password",
-                      passwordMode: true,
-                      autofillHints: const [AutofillHints.password],
-                      validator: (value) {
-                        return MihValidationServices().validatePassword(value);
-                      },
-                    ),
-                    //spacer
-                    const SizedBox(height: 25),
-                    // sign in button
-                    Center(
-                      child: MihButton(
-                        onPressed: () {
-                          if (_formKey.currentState!.validate()) {
-                            submitFormInput();
-                          } else {
-                            MihAlertServices().formNotFilledCompletely(context);
-                          }
-                        },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        width: 300,
-                        child: Text(
-                          "Reset Password",
-                          style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            fontSize: 20,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

Frontend/lib/mih_packages/mih_home/mih_home.dart

@@ -1,558 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/user_consent.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_scack_bar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/about_mih_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_business_home.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_personal_home.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_my_business_user_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_consent_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
-import 'package:provider/provider.dart';
-
-class MihHome extends StatefulWidget {
-  const MihHome({
-    super.key,
-  });
-
-  @override
-  State<MihHome> createState() => _MihHomeState();
-}
-
-class _MihHomeState extends State<MihHome> {
-  DateTime latestPrivacyPolicyDate = DateTime.parse("2024-12-01");
-  DateTime latestTermOfServiceDate = DateTime.parse("2024-12-01");
-  bool _isLoadingInitialData = true;
-
-  Future<void> _loadInitialData() async {
-    if (mounted) {
-      setState(() {
-        _isLoadingInitialData = true;
-      });
-    }
-    MzansiProfileProvider mzansiProfileProvider =
-        context.read<MzansiProfileProvider>();
-    // Note: getUserData sets user and userProfilePicUrl in the provider
-    if (mzansiProfileProvider.user == null) {
-      await getUserData();
-    }
-    // Note: getUserConsentStatus sets userConsent in the provider
-    if (mzansiProfileProvider.userConsent == null) {
-      await getUserConsentStatus();
-    }
-    // 1. Get Business Data
-    if (mzansiProfileProvider.user != null &&
-        mzansiProfileProvider.user!.type == "business" &&
-        mzansiProfileProvider.business == null) {
-      KenLogger.success(mzansiProfileProvider.business == null
-          ? "Business is null, fetching business data..."
-          : "Business data already loaded.");
-      await getBusinessData();
-    }
-    // 2. Set state after all data is loaded
-    if (mounted) {
-      setState(() {
-        _isLoadingInitialData = false;
-      });
-    }
-  }
-
-  Future<void> getBusinessData() async {
-    AppUser? user = context.read<MzansiProfileProvider>().user;
-    String logoUrl;
-    String signatureUrl;
-    Business? responseBusiness =
-        await MihBusinessDetailsServices().getBusinessDetailsByUser(context);
-    // if (responseBusiness == null && user!.type == "business") {
-    //   if (mounted) {
-    //     context.goNamed(
-    //       'businessProfileSetup',
-    //       extra: user,
-    //     );
-    //   }
-    // }
-
-    if (responseBusiness != null && user!.type == "business") {
-      // Get Business
-      // Business Profile Set Up aleary
-      logoUrl = await MihFileApi.getMinioFileUrl(
-        context.read<MzansiProfileProvider>().business!.logo_path,
-        context,
-      );
-      context.read<MzansiProfileProvider>().setBusinessProfilePicUrl(logoUrl);
-      // Get Business User
-      await MihMyBusinessUserServices().getBusinessUser(context);
-      signatureUrl = await MihFileApi.getMinioFileUrl(
-        context.read<MzansiProfileProvider>().businessUser!.sig_path,
-        context,
-      );
-      context
-          .read<MzansiProfileProvider>()
-          .setBusinessUserSignatureUrl(signatureUrl);
-    }
-  }
-
-  bool showPolicyWindow(UserConsent? userConsent) {
-    if (userConsent == null) {
-      return true;
-    } else {
-      if (userConsent.privacy_policy_accepted
-              .isAfter(latestPrivacyPolicyDate) &&
-          userConsent.terms_of_services_accepted
-              .isAfter(latestTermOfServiceDate)) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-  }
-
-  void createOrUpdateAccpetance(MzansiProfileProvider mzansiProfileProvider) {
-    UserConsent? userConsent = mzansiProfileProvider.userConsent;
-    userConsent != null
-        ? MihUserConsentServices()
-            .updateUserConsentStatus(
-            DateTime.now().toIso8601String(),
-            DateTime.now().toIso8601String(),
-            mzansiProfileProvider,
-            context,
-          )
-            .then((value) {
-            if (value == 200) {
-              context.goNamed("mihHome");
-              ScaffoldMessenger.of(context).showSnackBar(
-                MihSnackBar(
-                  child: Text("Thank you for accepting our Policies"),
-                ),
-              );
-            } else {
-              ScaffoldMessenger.of(context).showSnackBar(
-                MihSnackBar(
-                  child: Text("There was an error, please try again later"),
-                ),
-              );
-            }
-          })
-        : MihUserConsentServices()
-            .insertUserConsentStatus(
-            DateTime.now().toIso8601String(),
-            DateTime.now().toIso8601String(),
-            mzansiProfileProvider,
-            context,
-          )
-            .then((value) {
-            if (value == 201) {
-              context.goNamed("mihHome");
-              ScaffoldMessenger.of(context).showSnackBar(
-                MihSnackBar(
-                  child: Text("Thank you for accepting our Policies"),
-                ),
-              );
-            } else {
-              ScaffoldMessenger.of(context).showSnackBar(
-                MihSnackBar(
-                  child: Text("There was an error, please try again later"),
-                ),
-              );
-            }
-          });
-  }
-
-  Future<void> getUserData() async {
-    if (!mounted) return;
-    String url;
-    await MihUserServices().getUserDetails(
-      context,
-    );
-    if (!mounted) return;
-    url = await MihFileApi.getMinioFileUrl(
-      context.read<MzansiProfileProvider>().user!.pro_pic_path,
-      context,
-    );
-    context.read<MzansiProfileProvider>().setUserProfilePicUrl(url);
-  }
-
-  Future<void> getUserConsentStatus() async {
-    if (!mounted) return;
-    await MihUserConsentServices().getUserConsentStatus(context);
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _loadInitialData();
-  }
-
-  List<String> getToolTitle() {
-    List<String> toolTitles = [
-      "Personal",
-      "Business",
-    ];
-    return toolTitles;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<MzansiProfileProvider>(
-      builder: (BuildContext context,
-          MzansiProfileProvider mzansiProfileProvider, Widget? child) {
-        if (_isLoadingInitialData) {
-          return Scaffold(
-            body: Center(
-              child: Mihloadingcircle(),
-            ),
-          );
-        }
-        // bool showConsentWindow =
-        //     showPolicyWindow(mzansiProfileProvider.userConsent);
-        return Stack(
-          children: [
-            RefreshIndicator(
-              onRefresh: () async {
-                await _loadInitialData();
-              },
-              child: SingleChildScrollView(
-                physics: const AlwaysScrollableScrollPhysics(),
-                child: SizedBox(
-                  height: MediaQuery.of(context).size.height,
-                  child: MihPackage(
-                    appActionButton: getAction(),
-                    appTools: getTools(mzansiProfileProvider,
-                        mzansiProfileProvider.user!.type != "personal"),
-                    appBody: getToolBody(mzansiProfileProvider),
-                    appToolTitles: getToolTitle(),
-                    actionDrawer: getActionDrawer(),
-                    selectedbodyIndex:
-                        mzansiProfileProvider.personalHome ? 0 : 1,
-                    onIndexChange: (newValue) {
-                      mzansiProfileProvider.setPersonalHome(newValue == 0);
-                    },
-                  ),
-                ),
-              ),
-            ),
-            Visibility(
-              visible: showPolicyWindow(mzansiProfileProvider.userConsent),
-              child: Container(
-                color: Colors.black.withValues(alpha: 0.5),
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.max,
-                  children: [
-                    MihPackageWindow(
-                      fullscreen: false,
-                      windowTitle: "Privacy Policy & Terms Of Service Alert!",
-                      onWindowTapClose: () {
-                        showDialog(
-                            context: context,
-                            builder: (context) {
-                              return MihPackageAlert(
-                                alertIcon: Icon(
-                                  Icons.warning_amber_rounded,
-                                  size: 100,
-                                  color: MihColors.getRedColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark",
-                                  ),
-                                ),
-                                alertTitle:
-                                    "Oops, Looks like you missed a step!",
-                                alertBody: Text(
-                                  "We're excited for you to keep using the MIH app! Before you do, please take a moment to accept our Privacy Policy and Terms of Service. Thanks for helping us keep your experience great!",
-                                  textAlign: TextAlign.center,
-                                  style: TextStyle(
-                                    color: MihColors.getSecondaryColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark",
-                                    ),
-                                    fontSize: 15,
-                                    fontWeight: FontWeight.normal,
-                                  ),
-                                ),
-                                alertColour: MihColors.getRedColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark",
-                                ),
-                              );
-                            });
-                      },
-                      windowBody: Column(
-                        children: [
-                          Icon(
-                            Icons.policy,
-                            size: 150,
-                            color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark",
-                            ),
-                          ),
-                          const SizedBox(height: 10),
-                          Text(
-                            "Welcome to the MIH App",
-                            textAlign: TextAlign.center,
-                            style: TextStyle(
-                              color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark",
-                              ),
-                              fontSize: 30,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                          const SizedBox(height: 10),
-                          Text(
-                            "To keep using the MIH app, please take a moment to review and accept our Policies. Our agreements helps us keep things running smoothly and securely.",
-                            textAlign: TextAlign.center,
-                            style: TextStyle(
-                              color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark",
-                              ),
-                              fontSize: 15,
-                              fontWeight: FontWeight.normal,
-                            ),
-                          ),
-                          const SizedBox(height: 20),
-                          Center(
-                            child: Wrap(
-                              alignment: WrapAlignment.center,
-                              spacing: 10,
-                              runSpacing: 10,
-                              children: [
-                                MihButton(
-                                  onPressed: () {
-                                    WidgetsBinding.instance
-                                        .addPostFrameCallback((_) async {
-                                      context
-                                          .read<AboutMihProvider>()
-                                          .setToolIndex(1);
-                                    });
-                                    context.goNamed("aboutMih",
-                                        extra:
-                                            mzansiProfileProvider.personalHome);
-                                  },
-                                  buttonColor: MihColors.getOrangeColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
-                                  elevation: 10,
-                                  width: 300,
-                                  child: Text(
-                                    "Privacy Policy",
-                                    style: TextStyle(
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
-                                      fontSize: 20,
-                                      fontWeight: FontWeight.bold,
-                                    ),
-                                  ),
-                                ),
-                                MihButton(
-                                  onPressed: () {
-                                    WidgetsBinding.instance
-                                        .addPostFrameCallback((_) async {
-                                      context
-                                          .read<AboutMihProvider>()
-                                          .setToolIndex(2);
-                                    });
-                                    context.goNamed("aboutMih",
-                                        extra:
-                                            mzansiProfileProvider.personalHome);
-                                  },
-                                  buttonColor: MihColors.getYellowColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
-                                  elevation: 10,
-                                  width: 300,
-                                  child: Text(
-                                    "Terms of Service",
-                                    style: TextStyle(
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
-                                      fontSize: 20,
-                                      fontWeight: FontWeight.bold,
-                                    ),
-                                  ),
-                                ),
-                                MihButton(
-                                  onPressed: () {
-                                    DateTime now = DateTime.now();
-                                    KenLogger.success("Date Time Now: $now");
-                                    createOrUpdateAccpetance(
-                                        mzansiProfileProvider);
-                                  },
-                                  buttonColor: MihColors.getGreenColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
-                                  elevation: 10,
-                                  width: 300,
-                                  child: Text(
-                                    "Accept",
-                                    style: TextStyle(
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
-                                      fontSize: 20,
-                                      fontWeight: FontWeight.bold,
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                          const SizedBox(height: 10),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget getAction() {
-    return Builder(builder: (context) {
-      return Consumer<MzansiProfileProvider>(
-        builder: (BuildContext context,
-            MzansiProfileProvider mzansiProfileProvider, Widget? child) {
-          ImageProvider<Object>? currentImage;
-          String imageKey;
-          if (mzansiProfileProvider.personalHome) {
-            currentImage = mzansiProfileProvider.userProfilePicture;
-            imageKey = 'user_${mzansiProfileProvider.userProfilePicUrl}';
-          } else {
-            currentImage = mzansiProfileProvider.businessProfilePicture;
-            imageKey =
-                'business_${mzansiProfileProvider.businessProfilePicUrl}';
-          }
-          return MihPackageAction(
-            icon: Padding(
-              padding: const EdgeInsets.only(left: 5.0),
-              child: MihCircleAvatar(
-                key: Key(imageKey),
-                imageFile: currentImage,
-                width: 50,
-                editable: false,
-                fileNameController: null,
-                userSelectedfile: null,
-                // frameColor: frameColor,
-                frameColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                backgroundColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                onChange: (_) {},
-              ),
-            ),
-            iconSize: 45,
-            onTap: () {
-              Scaffold.of(context).openDrawer();
-              FocusScope.of(context)
-                  .requestFocus(FocusNode()); // Fully unfocus all fields
-              // FocusScope.of(context).unfocus(); // Unfocus any text fields
-            },
-          );
-        },
-      );
-    });
-  }
-
-  MIHAppDrawer getActionDrawer() {
-    return MIHAppDrawer();
-  }
-
-  MihPackageTools getTools(
-      MzansiProfileProvider mzansiProfileProvider, bool isBusinessUser) {
-    Map<Widget, void Function()?> temp = {};
-    temp[const Icon(Icons.person)] = () {
-      setState(() {
-        mzansiProfileProvider.setPersonalHome(true);
-      });
-    };
-    if (isBusinessUser) {
-      temp[const Icon(Icons.business_center)] = () {
-        setState(() {
-          mzansiProfileProvider.setPersonalHome(false);
-        });
-      };
-    }
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: mzansiProfileProvider.personalHome ? 0 : 1,
-    );
-  }
-
-  List<Widget> getToolBody(MzansiProfileProvider mzansiProfileProvider) {
-    List<Widget> toolBodies = [];
-    AppUser? user = mzansiProfileProvider.user;
-    Business? business = mzansiProfileProvider.business;
-    BusinessUser? businessUser = mzansiProfileProvider.businessUser;
-    String userProfilePictureUrl =
-        mzansiProfileProvider.userProfilePicUrl ?? "";
-    toolBodies.add(
-      MihPersonalHome(
-        signedInUser: user!,
-        personalSelected: mzansiProfileProvider.personalHome,
-        business: business,
-        businessUser: businessUser,
-        propicFile: userProfilePictureUrl != ""
-            ? NetworkImage(userProfilePictureUrl)
-            : null,
-        isDevActive: AppEnviroment.getEnv() == "Dev",
-        isUserNew: user.username == "",
-      ),
-    );
-    if (user.type != "personal") {
-      toolBodies.add(
-        MihBusinessHome(
-          isLoading: _isLoadingInitialData,
-        ),
-      );
-    }
-    return toolBodies;
-  }
-}

Frontend/lib/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart

@@ -1,113 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:provider/provider.dart';
-
-class BuildMinesweeperLeaderboardList extends StatefulWidget {
-  const BuildMinesweeperLeaderboardList({super.key});
-
-  @override
-  State<BuildMinesweeperLeaderboardList> createState() =>
-      _BuildMinesweeperLeaderboardListState();
-}
-
-class _BuildMinesweeperLeaderboardListState
-    extends State<BuildMinesweeperLeaderboardList> {
-  Color getMedalColor(int index) {
-    switch (index) {
-      case (0):
-        return MihColors.getGoldColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
-      case (1):
-        return MihColors.getSilverColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
-      case (2):
-        return MihColors.getBronze(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
-      default:
-        return MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final double width = MediaQuery.sizeOf(context).width;
-    return Consumer2<MzansiProfileProvider, MihMineSweeperProvider>(
-      builder: (BuildContext context, MzansiProfileProvider profileProvider,
-          MihMineSweeperProvider mineSweeperProvider, Widget? child) {
-        return ListView.separated(
-          shrinkWrap: true,
-          physics: const NeverScrollableScrollPhysics(),
-          separatorBuilder: (BuildContext context, index) {
-            return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            );
-          },
-          itemCount: mineSweeperProvider.leaderboard!.length,
-          itemBuilder: (context, index) {
-            return Padding(
-              padding: EdgeInsets.symmetric(horizontal: width / 20),
-              child: Row(
-                children: [
-                  Text(
-                    "#${index + 1}",
-                    style: TextStyle(
-                      fontSize: 25,
-                      color: getMedalColor(index),
-                    ),
-                  ),
-                  const SizedBox(width: 10),
-                  MihCircleAvatar(
-                    key: UniqueKey(),
-                    imageFile:
-                        mineSweeperProvider.leaderboardUserPictures.isNotEmpty
-                            ? mineSweeperProvider.leaderboardUserPictures[index]
-                            : null,
-                    width: 80,
-                    editable: false,
-                    fileNameController: null,
-                    userSelectedfile: null,
-                    frameColor: getMedalColor(index),
-                    backgroundColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    onChange: () {},
-                  ),
-                  const SizedBox(width: 10),
-                  Column(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        "${mineSweeperProvider.leaderboard![index].username}${profileProvider.user!.username == mineSweeperProvider.leaderboard![index].username ? " (You)" : ""}",
-                        textAlign: TextAlign.left,
-                        style: TextStyle(
-                          fontSize: 20,
-                          fontWeight: FontWeight.bold,
-                          color: getMedalColor(index),
-                        ),
-                      ),
-                      Text(
-                        "Score: ${mineSweeperProvider.leaderboard![index].game_score}\nTime: ${mineSweeperProvider.leaderboard![index].game_time}",
-                        textAlign: TextAlign.left,
-                        style: TextStyle(
-                          fontSize: 18,
-                          // fontWeight: FontWeight.bold,
-                          color: getMedalColor(index),
-                        ),
-                      ),
-                    ],
-                  )
-                ],
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/mine_sweeper/mih_mine_sweeper.dart

@@ -1,101 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_banner_ad_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/package_tools/mih_mine_sweeper_leader_board.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/package_tools/mine_sweeper_game.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/package_tools/mine_sweeper_quick_start_guide.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/package_tools/my_score_board.dart';
-import 'package:provider/provider.dart';
-
-class MihMineSweeper extends StatefulWidget {
-  const MihMineSweeper({super.key});
-
-  @override
-  State<MihMineSweeper> createState() => _MihMineSweeperState();
-}
-
-class _MihMineSweeperState extends State<MihMineSweeper> {
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      context.read<MihBannerAdProvider>().loadBannerAd();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appToolTitles: getToolTitle(),
-      appBody: getToolBody(),
-      selectedbodyIndex: context.watch<MihMineSweeperProvider>().toolIndex,
-      onIndexChange: (newIndex) {
-        context.read<MihMineSweeperProvider>().setToolIndex(newIndex);
-      },
-    );
-  }
-
-  MihPackageAction getAction() {
-    return MihPackageAction(
-      icon: const Icon(Icons.arrow_back),
-      iconSize: 35,
-      onTap: () {
-        MihMineSweeperProvider mineSweeperProvider =
-            context.read<MihMineSweeperProvider>();
-        mineSweeperProvider.setToolIndex(0);
-        mineSweeperProvider.setDifficulty("Easy");
-        context.goNamed(
-          'mihHome',
-        );
-        FocusScope.of(context).unfocus();
-      },
-    );
-  }
-
-  MihPackageTools getTools() {
-    Map<Widget, void Function()?> temp = {};
-    temp[const Icon(FontAwesomeIcons.bomb)] = () {
-      context.read<MihMineSweeperProvider>().setToolIndex(0);
-    };
-    temp[const Icon(Icons.leaderboard_rounded)] = () {
-      context.read<MihMineSweeperProvider>().setToolIndex(1);
-    };
-    temp[const Icon(Icons.perm_identity_rounded)] = () {
-      context.read<MihMineSweeperProvider>().setToolIndex(2);
-    };
-    temp[const Icon(Icons.rule_rounded)] = () {
-      context.read<MihMineSweeperProvider>().setToolIndex(3);
-    };
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: context.watch<MihMineSweeperProvider>().toolIndex,
-    );
-  }
-
-  List<String> getToolTitle() {
-    List<String> toolTitles = [
-      "Minesweeper",
-      "Leader Board",
-      "My Scores",
-      "Guide",
-    ];
-    return toolTitles;
-  }
-
-  List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
-      const MineSweeperGame(),
-      const MihMineSweeperLeaderBoard(),
-      const MyScoreBoard(),
-      const MineSweeperQuickStartGuide(),
-    ];
-    return toolBodies;
-  }
-}

Frontend/lib/mih_packages/mine_sweeper/package_tools/mih_mine_sweeper_leader_board.dart

@@ -1,198 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_minesweeper_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:provider/provider.dart';
-
-class MihMineSweeperLeaderBoard extends StatefulWidget {
-  const MihMineSweeperLeaderBoard({super.key});
-
-  @override
-  State<MihMineSweeperLeaderBoard> createState() =>
-      _MihMineSweeperLeaderBoardState();
-}
-
-class _MihMineSweeperLeaderBoardState extends State<MihMineSweeperLeaderBoard> {
-  TextEditingController filterController = TextEditingController();
-
-  Future<void> initialiseLeaderboard() async {
-    MihMineSweeperProvider mineSweeperProvider =
-        context.read<MihMineSweeperProvider>();
-    filterController.text = mineSweeperProvider.difficulty;
-    KenLogger.success("getting data");
-    await MihMinesweeperServices().getTop20Leaderboard(mineSweeperProvider);
-    List<ImageProvider<Object>?> userPictures = [];
-    String userPicUrl = "";
-    for (final ranking in mineSweeperProvider.leaderboard!) {
-      userPicUrl = await MihFileApi.getMinioFileUrl(ranking.proPicUrl, context);
-      userPictures.add(NetworkImage(userPicUrl));
-    }
-    mineSweeperProvider.setLeaderboardUserPictures(
-        leaderboardUserPictures: userPictures);
-  }
-
-  void refreshLeaderBoard(
-      MihMineSweeperProvider mineSweeperProvider, String difficulty) {
-    mineSweeperProvider.setDifficulty(difficulty);
-    mineSweeperProvider.setLeaderboard(leaderboard: null);
-    mineSweeperProvider.setMyScoreboard(myScoreboard: null);
-    initialiseLeaderboard();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await initialiseLeaderboard();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final double width = MediaQuery.sizeOf(context).width;
-    return Consumer<MihMineSweeperProvider>(
-      builder: (BuildContext context,
-          MihMineSweeperProvider mineSweeperProvider, Widget? child) {
-        return RefreshIndicator(
-          onRefresh: () async {
-            refreshLeaderBoard(mineSweeperProvider, filterController.text);
-          },
-          child: MihPackageToolBody(
-            borderOn: false,
-            bodyItem: getBody(width),
-          ),
-        );
-      },
-    );
-  }
-
-  Widget getBody(double width) {
-    return Consumer<MihMineSweeperProvider>(
-      builder: (BuildContext context,
-          MihMineSweeperProvider mineSweeperProvider, Widget? child) {
-        if (mineSweeperProvider.leaderboard == null) {
-          return Center(
-            child: Mihloadingcircle(),
-          );
-        } else {
-          return SingleChildScrollView(
-            physics: const AlwaysScrollableScrollPhysics(),
-            child: Column(
-              children: [
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: width / 20),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    crossAxisAlignment: CrossAxisAlignment.end,
-                    mainAxisSize: MainAxisSize.max,
-                    children: [
-                      Flexible(
-                        child: MihDropdownField(
-                          controller: filterController,
-                          hintText: "Leaderboards",
-                          dropdownOptions: const [
-                            "Very Easy",
-                            "Easy",
-                            "Intermediate",
-                            "Hard",
-                          ],
-                          requiredText: true,
-                          editable: true,
-                          enableSearch: false,
-                          validator: (value) {
-                            return MihValidationServices().isEmpty(value);
-                          },
-                          onSelected: (selection) {
-                            refreshLeaderBoard(mineSweeperProvider, selection!);
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 10),
-                mineSweeperProvider.leaderboard!.isEmpty
-                    ? Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 10.0),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            const SizedBox(height: 50),
-                            Icon(
-                              MihIcons.mineSweeper,
-                              size: 165,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                            ),
-                            const SizedBox(height: 10),
-                            Text(
-                              "Be the first on the leaderboard.",
-                              textAlign: TextAlign.center,
-                              overflow: TextOverflow.visible,
-                              style: TextStyle(
-                                fontSize: 25,
-                                fontWeight: FontWeight.bold,
-                                color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
-                              ),
-                            ),
-                            const SizedBox(height: 25),
-                            Center(
-                              child: RichText(
-                                textAlign: TextAlign.center,
-                                text: TextSpan(
-                                  style: TextStyle(
-                                    fontSize: 20,
-                                    fontWeight: FontWeight.normal,
-                                    color: MihColors.getSecondaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
-                                  ),
-                                  children: [
-                                    TextSpan(text: "Press "),
-                                    WidgetSpan(
-                                      alignment: PlaceholderAlignment.middle,
-                                      child: Icon(
-                                        FontAwesomeIcons.bomb,
-                                        size: 20,
-                                        color: MihColors.getSecondaryColor(
-                                            MzansiInnovationHub.of(context)!
-                                                    .theme
-                                                    .mode ==
-                                                "Dark"),
-                                      ),
-                                    ),
-                                    TextSpan(text: " and start a new game"),
-                                  ],
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      )
-                    : BuildMinesweeperLeaderboardList(),
-              ],
-            ),
-          );
-        }
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/mine_sweeper/package_tools/my_score_board.dart

@@ -1,209 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/builders/build_my_scoreboard_list.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_minesweeper_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:provider/provider.dart';
-
-class MyScoreBoard extends StatefulWidget {
-  const MyScoreBoard({super.key});
-
-  @override
-  State<MyScoreBoard> createState() => _MihMineSweeperLeaderBoardState();
-}
-
-class _MihMineSweeperLeaderBoardState extends State<MyScoreBoard> {
-  TextEditingController filterController = TextEditingController();
-
-  Future<void> initialiseLeaderboard() async {
-    MzansiProfileProvider profileProvider =
-        context.read<MzansiProfileProvider>();
-    MihMineSweeperProvider mineSweeperProvider =
-        context.read<MihMineSweeperProvider>();
-    filterController.text = mineSweeperProvider.difficulty;
-    KenLogger.success("getting data");
-    await MihMinesweeperServices()
-        .getMyScoreboard(profileProvider, mineSweeperProvider);
-    KenLogger.success("${mineSweeperProvider.myScoreboard}");
-  }
-
-  void refreshLeaderBoard(
-      MihMineSweeperProvider mineSweeperProvider, String difficulty) {
-    mineSweeperProvider.setDifficulty(difficulty);
-    mineSweeperProvider.setLeaderboard(leaderboard: null);
-    mineSweeperProvider.setMyScoreboard(myScoreboard: null);
-    initialiseLeaderboard();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await initialiseLeaderboard();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final double width = MediaQuery.sizeOf(context).width;
-    return Consumer<MihMineSweeperProvider>(
-      builder: (BuildContext context,
-          MihMineSweeperProvider mineSweeperProvider, Widget? child) {
-        return RefreshIndicator(
-          onRefresh: () async {
-            refreshLeaderBoard(mineSweeperProvider, filterController.text);
-          },
-          child: MihPackageToolBody(
-            borderOn: false,
-            bodyItem: getBody(width),
-          ),
-        );
-      },
-    );
-  }
-
-  Widget getBody(double width) {
-    return Consumer2<MzansiProfileProvider, MihMineSweeperProvider>(
-      builder: (BuildContext context, MzansiProfileProvider profileProvider,
-          MihMineSweeperProvider mineSweeperProvider, Widget? child) {
-        if (mineSweeperProvider.myScoreboard == null) {
-          return Center(
-            child: Mihloadingcircle(),
-          );
-        } else {
-          return SingleChildScrollView(
-            physics: const AlwaysScrollableScrollPhysics(),
-            child: Column(
-              children: [
-                Center(
-                  child: MihCircleAvatar(
-                    imageFile: profileProvider.userProfilePicture,
-                    width: 150,
-                    editable: false,
-                    fileNameController: null,
-                    userSelectedfile: null,
-                    frameColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    backgroundColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    onChange: (selectedImage) {},
-                    key: ValueKey(profileProvider.userProfilePicUrl),
-                  ),
-                ),
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: width / 20),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    crossAxisAlignment: CrossAxisAlignment.end,
-                    mainAxisSize: MainAxisSize.max,
-                    children: [
-                      Flexible(
-                        child: MihDropdownField(
-                          controller: filterController,
-                          hintText: "Scoreboards",
-                          dropdownOptions: const [
-                            "Very Easy",
-                            "Easy",
-                            "Intermediate",
-                            "Hard",
-                          ],
-                          requiredText: true,
-                          editable: true,
-                          enableSearch: false,
-                          validator: (value) {
-                            return MihValidationServices().isEmpty(value);
-                          },
-                          onSelected: (selection) {
-                            refreshLeaderBoard(mineSweeperProvider, selection!);
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 10),
-                mineSweeperProvider.myScoreboard!.isEmpty
-                    ? Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 10.0),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            const SizedBox(height: 50),
-                            Icon(
-                              MihIcons.mineSweeper,
-                              size: 165,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                            ),
-                            const SizedBox(height: 10),
-                            Text(
-                              "You have played and ${mineSweeperProvider.difficulty} yet.",
-                              textAlign: TextAlign.center,
-                              overflow: TextOverflow.visible,
-                              style: TextStyle(
-                                fontSize: 25,
-                                fontWeight: FontWeight.bold,
-                                color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
-                              ),
-                            ),
-                            const SizedBox(height: 25),
-                            Center(
-                              child: RichText(
-                                textAlign: TextAlign.center,
-                                text: TextSpan(
-                                  style: TextStyle(
-                                    fontSize: 20,
-                                    fontWeight: FontWeight.normal,
-                                    color: MihColors.getSecondaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
-                                  ),
-                                  children: [
-                                    TextSpan(text: "Press "),
-                                    WidgetSpan(
-                                      alignment: PlaceholderAlignment.middle,
-                                      child: Icon(
-                                        FontAwesomeIcons.bomb,
-                                        size: 20,
-                                        color: MihColors.getSecondaryColor(
-                                            MzansiInnovationHub.of(context)!
-                                                    .theme
-                                                    .mode ==
-                                                "Dark"),
-                                      ),
-                                    ),
-                                    TextSpan(text: " and start a new game"),
-                                  ],
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      )
-                    : BuildMyScoreBoardList(),
-              ],
-            ),
-          );
-        }
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/mzansi_ai/mzansi_ai.dart

@@ -1,78 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mzansi_ai/package_tools/ai_chat.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class MzansiAi extends StatefulWidget {
-  const MzansiAi({
-    super.key,
-  });
-
-  @override
-  State<MzansiAi> createState() => _MzansiAiState();
-}
-
-class _MzansiAiState extends State<MzansiAi> {
-  MihPackageAction getAction() {
-    return MihPackageAction(
-      icon: const Icon(Icons.arrow_back),
-      iconSize: 35,
-      onTap: () {
-        context.read<MzansiAiProvider>().setStartUpQuestion(null);
-        context.goNamed(
-          'mihHome',
-        );
-        FocusScope.of(context).unfocus();
-      },
-    );
-  }
-
-  MihPackageTools getTools() {
-    Map<Widget, void Function()?> temp = {};
-    temp[const Icon(Icons.chat)] = () {
-      context.read<MzansiAiProvider>().setToolIndex(0);
-    };
-
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: context.watch<MzansiAiProvider>().toolIndex,
-    );
-  }
-
-  List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
-      AiChat(),
-    ];
-    return toolBodies;
-  }
-
-  List<String> getToolTitle() {
-    List<String> toolTitles = [
-      "Ask Mzansi",
-    ];
-    return toolTitles;
-  }
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<MzansiAiProvider>().toolIndex,
-      onIndexChange: (newValue) {
-        context.read<MzansiAiProvider>().setToolIndex(newValue);
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart

@@ -1,887 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'package:flutter_speed_dial/flutter_speed_dial.dart';
-import 'package:gpt_markdown/gpt_markdown.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_numeric_stepper.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_radio_options.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_chat_ui/flutter_chat_ui.dart';
-import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
-import 'package:flutter/services.dart' show rootBundle;
-import 'package:flutter_tts/flutter_tts.dart';
-import 'package:ollama_dart/ollama_dart.dart' as ollama;
-import 'package:provider/provider.dart';
-import 'package:uuid/uuid.dart';
-
-class AiChat extends StatefulWidget {
-  const AiChat({
-    super.key,
-  });
-
-  @override
-  State<AiChat> createState() => _AiChatState();
-}
-
-class _AiChatState extends State<AiChat> {
-  final TextEditingController _modelController = TextEditingController();
-  final TextEditingController _fontSizeController = TextEditingController();
-  final TextEditingController _ttsVoiceController = TextEditingController();
-  final ValueNotifier<bool> _showModelOptions = ValueNotifier(false);
-  FlutterTts _flutterTts = FlutterTts();
-  final ValueNotifier<String> _ttsVoiceName = ValueNotifier("");
-  // bool _ttsOn = false;
-  String? textStream;
-  List<Map> _voices = [];
-  List<String> _voicesString = [];
-  List<types.Message> _messages = [];
-  late types.User _user;
-  late types.User _mihAI;
-  String systemPromt = "0";
-  bool _aiThinking = false;
-  final client = ollama.OllamaClient(
-    baseUrl: "${AppEnviroment.baseAiUrl}/api",
-  );
-  List<ollama.Message> _chatHistory = [];
-  double _chatFrontSize = 15;
-
-  String getModel() {
-    return AppEnviroment.getEnv() == "Prod" ? 'gemma3n:e4b' : "gemma3:1b";
-  }
-
-  String setSystemPromt() {
-    String temp = "";
-    temp +=
-        "You are Mzansi AI, a helpful and friendly AI assistant running on the 'MIH App'.\n";
-    temp +=
-        "The MIH App was created by 'Mzansi Innovation Hub', a South African-based startup company.";
-    temp +=
-        "Your primary purpose is to assist users by answering general questions and helping with creative writing tasks or any other task a user might have for you.\n";
-    temp +=
-        "Maintain a casual and friendly tone, but always remain professional.\n";
-    temp +=
-        "Strive for a balance between being empathetic and delivering factual information accurately.\n";
-    temp +=
-        "You may use lighthearted or playful language if the context is appropriate and enhances the user experience.\n";
-    temp += "You operate within the knowledge domain of the 'MIH App'.\n";
-    temp += "Here is a description of the MIH App and its features:\n";
-    temp +=
-        "MIH App Description: MIH is the first super app of Mzansi, designed to streamline both personal and business life. It's an all-in-one platform for managing professional profiles, teams, appointments, and quick calculations. \n";
-    temp += "Key Features:\n";
-    temp +=
-        "- Mzansi Profile: Central hub for managing personal and business information, including business team details.";
-    temp += "- Mzansi Wallet: Digitally store loyalty cards.\n";
-    temp +=
-        "- Patient Manager (For Medical Practices): Seamless patient appointment scheduling and data management.\n";
-    temp +=
-        "- Mzansi AI: Your friendly AI assistant for quick answers and support (that's you!).\n";
-    temp +=
-        "- Mzansi Directory: A place to search and find out more about the people and businesses across Mzansi.\n";
-    temp +=
-        "- Calendar: Integrated calendar for managing personal and business appointments.\n";
-    temp +=
-        "- Calculator: Simple calculator with tip and forex calculation functionality.\n";
-    temp += "- MIH Access: Manage and view profile access security.\n";
-    temp +=
-        "- MIH Minesweeper: The first game from MIH! It's the classic brain-teaser ready to entertain you no matter where you are.\n";
-    temp += "**Core Rules and Guidelines:**\n";
-    temp +=
-        "- **Accuracy First:** Always prioritize providing correct information.\n";
-    temp +=
-        "- **Uncertainty Handling:** If you are unsure about an answer, politely respond with: 'Please bear with us as we are still learning and do not have all the answers.'\n";
-    temp +=
-        "- **Response Length:** Aim to keep responses under 250 words. If a more comprehensive answer is required, exceed this limit but offer to elaborate further (e.g., 'Would you like me to elaborate on this topic?').\n";
-    temp +=
-        "- **Language & Safety:** Never use offensive language or generate harmful content. If a user presses for information that is inappropriate or out of bounds, clearly state why you cannot provide it (e.g., 'I cannot assist with that request as it goes against my safety guidelines.').\n";
-    temp +=
-        "- **Out-of-Scope Questions:** - If a question is unclear, ask the user to rephrase or clarify it. - If a question is entirely out of your scope and you cannot provide a useful answer, admit you don't know. - If a user is unhappy with your response or needs further assistance beyond your capabilities, suggest they visit the 'Mzansi Innovation Hub Social Media Pages' for more direct support. Do not provide specific links, just refer to the pages generally.\n";
-    temp +=
-        "- **Target Audience:** Adapt your explanations to beginners and intermediate users, but be prepared for more complex questions from expert users. Ensure your language is clear and easy to understand.\n";
-    return temp;
-  }
-
-  void _addMessage(types.Message message) {
-    setState(() {
-      _messages.insert(0, message);
-    });
-  }
-
-  void _loadMessages() async {
-    final response = await rootBundle.loadString('assets/messages.json');
-    final messages = (jsonDecode(response) as List)
-        .map((e) => types.Message.fromJson(e as Map<String, dynamic>))
-        .toList();
-
-    setState(() {
-      _messages = messages;
-    });
-  }
-
-  void _handleSendPressed(types.PartialText message) {
-    FocusScope.of(context).unfocus();
-    final textMessage = types.TextMessage(
-      author: _user,
-      createdAt: DateTime.now().millisecondsSinceEpoch,
-      id: const Uuid().v4(),
-      text: message.text,
-    );
-    //Add user prompt to history
-    setState(() {
-      _chatHistory.add(
-        ollama.Message(
-          role: ollama.MessageRole.user,
-          content: message.text,
-        ),
-      );
-    });
-
-    _addMessage(textMessage);
-
-    _handleMessageBack(message.text);
-  }
-
-  void _handleMessageBack(String userMessage) async {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const Mihloadingcircle();
-      },
-    );
-    Stream<String> aiChatStream =
-        _generateChatCompletionWithHistoryStream(userMessage, client);
-
-    Navigator.of(context).pop();
-    showDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (context) {
-        return responseWindow(aiChatStream);
-      },
-    );
-  }
-
-  Widget responseWindow(
-    Stream<String> aiChatStream,
-  ) {
-    return StreamBuilder(
-      stream: aiChatStream,
-      builder: (context, snapshot) {
-        if (snapshot.hasData) {
-          textStream = snapshot.requireData;
-          // print("Text: $textStream");
-          // _speakText(textStream!);
-          return MihPackageWindow(
-            fullscreen: false,
-            windowTitle: 'Mzansi AI Thoughts',
-            menuOptions: _aiThinking == true
-                ? null
-                : [
-                    SpeedDialChild(
-                      child: Icon(
-                        Icons.volume_up,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                      label: "Read Aloud",
-                      labelBackgroundColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      labelStyle: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        fontWeight: FontWeight.bold,
-                      ),
-                      backgroundColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      onTap: () {
-                        _speakText(snapshot.requireData);
-                      },
-                    )
-                  ],
-            onWindowTapClose: () {
-              _captureAIResponse(snapshot.requireData);
-              _flutterTts.stop();
-              Navigator.of(context).pop();
-            },
-            windowBody: SizedBox(
-              width: double.infinity,
-              // color: Colors.black,
-              child: Column(
-                mainAxisSize: MainAxisSize.max,
-                children: [
-                  SelectionArea(
-                    child: GptMarkdown(
-                      snapshot.requireData,
-                      textAlign: TextAlign.left,
-                      style: TextStyle(
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        fontSize: _chatFrontSize,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        } else {
-          return MihPackageWindow(
-            fullscreen: false,
-            windowTitle: 'Mzansi AI Thoughts',
-            // windowTools: [],
-            onWindowTapClose: () {
-              Navigator.of(context).pop();
-            },
-            windowBody: Mihloadingcircle(),
-          );
-        }
-      },
-    );
-  }
-
-  void _captureAIResponse(String responseMessage) {
-    types.TextMessage textMessage;
-    setState(() {
-      _chatHistory.add(
-        ollama.Message(
-          role: ollama.MessageRole.assistant,
-          content: responseMessage,
-        ),
-      );
-    });
-    textMessage = types.TextMessage(
-      author: _mihAI,
-      createdAt: DateTime.now().millisecondsSinceEpoch,
-      id: const Uuid().v4(),
-
-      text: responseMessage
-          .replaceAll("<think>\n\n", "**Thinking:**\n")
-          .replaceAll("<think>\n", "**Thinking:**\n")
-          .replaceAll("</think>\n\n", "\n**Answer:**\n"), //message.text,
-    );
-
-    _addMessage(textMessage);
-  }
-
-  Stream<String> _generateChatCompletionWithHistoryStream(
-    String userMessage,
-    final ollama.OllamaClient client,
-  ) async* {
-    final aiStream = client.generateChatCompletionStream(
-      request: ollama.GenerateChatCompletionRequest(
-        model: _modelController.text,
-        messages: _chatHistory,
-      ),
-    );
-    String text = '';
-    setState(() {
-      _aiThinking = true;
-    });
-    await for (final res in aiStream) {
-      text += (res.message.content);
-      yield text;
-    }
-    setState(() {
-      _aiThinking = false;
-    });
-  }
-
-  void _resetChat() {
-    setState(() {
-      _messages = [];
-      _chatHistory = [];
-      _loadMessages();
-    });
-  }
-
-  ChatTheme getChatTheme() {
-    return DarkChatTheme(
-      backgroundColor: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      inputBackgroundColor: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      inputTextColor: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      inputTextCursorColor: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      primaryColor: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      secondaryColor: MihColors.getGreenColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      errorColor: MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      sentMessageBodyTextStyle: TextStyle(
-        color: MihColors.getPrimaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        fontSize: _chatFrontSize,
-        fontWeight: FontWeight.w500,
-        fontFamily: 'Segoe UI',
-      ),
-      receivedMessageBodyTextStyle: TextStyle(
-        color: MihColors.getPrimaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        fontSize: _chatFrontSize,
-        fontWeight: FontWeight.w500,
-        fontFamily: 'Segoe UI',
-      ),
-      emptyChatPlaceholderTextStyle: TextStyle(
-        color: MihColors.getGreyColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        fontSize: _chatFrontSize,
-        fontWeight: FontWeight.w500,
-        fontFamily: 'Segoe UI',
-      ),
-    );
-  }
-
-  Widget _getSettings() {
-    return ValueListenableBuilder(
-      valueListenable: _showModelOptions,
-      builder: (BuildContext context, bool value, Widget? child) {
-        return Visibility(
-          visible: value,
-          child: Padding(
-            padding: const EdgeInsets.all(10.0),
-            child: Align(
-              alignment: Alignment.centerLeft,
-              child: FittedBox(
-                child: Container(
-                  padding: const EdgeInsets.all(10.0),
-                  decoration: BoxDecoration(
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    borderRadius: BorderRadius.circular(25.0),
-                    border: Border.all(
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        width: 3.0),
-                  ),
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Text(
-                            "Settings",
-                            textAlign: TextAlign.center,
-                            style: TextStyle(
-                              fontSize: 25,
-                              fontWeight: FontWeight.bold,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                            ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 15),
-                      Row(
-                        children: [
-                          SizedBox(
-                            width: 300,
-                            child: MihRadioOptions(
-                              controller: _modelController,
-                              hintText: "AI Model",
-                              fillColor: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              secondaryFillColor: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              requiredText: true,
-                              radioOptions: [getModel()],
-                            ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 20),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.start,
-                        crossAxisAlignment: CrossAxisAlignment.end,
-                        children: [
-                          SizedBox(
-                            width: 230,
-                            child: MihDropdownField(
-                              controller: _ttsVoiceController,
-                              hintText: "AI Voice",
-                              dropdownOptions: _voicesString,
-                              editable: true,
-                              enableSearch: true,
-                              requiredText: true,
-                              validator: (value) {
-                                return MihValidationServices().isEmpty(value);
-                              },
-                            ),
-                          ),
-                          const SizedBox(width: 10),
-                          Container(
-                            // color: Colors.white,
-                            decoration: BoxDecoration(
-                              borderRadius: BorderRadius.circular(
-                                  25), // Optional: rounds the corners
-                              boxShadow: const [
-                                BoxShadow(
-                                  color: Color.fromARGB(60, 0, 0,
-                                      0), // 0.2 opacity = 51 in alpha (255 * 0.2)
-                                  spreadRadius: -2,
-                                  blurRadius: 10,
-                                  offset: Offset(0, 5),
-                                ),
-                              ],
-                            ),
-                            child: Padding(
-                              padding: const EdgeInsets.only(
-                                top: 2.0,
-                                left: 5.0,
-                              ),
-                              child: SizedBox(
-                                width: 50,
-                                height: 50,
-                                child: IconButton.filled(
-                                  style: ButtonStyle(
-                                    backgroundColor:
-                                        WidgetStateProperty.all<Color>(
-                                            MihColors.getGreenColor(
-                                                MzansiInnovationHub.of(context)!
-                                                        .theme
-                                                        .mode ==
-                                                    "Dark")),
-                                  ),
-                                  color: MihColors.getPrimaryColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
-                                  iconSize: 25,
-                                  onPressed: () {
-                                    print("Start TTS now");
-                                    _speakText(
-                                        "This is the sample of the Mzansi A.I Voice.");
-                                  },
-                                  icon: const Icon(
-                                    Icons.volume_up,
-                                  ),
-                                ),
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 10),
-                      Row(
-                        children: [
-                          SizedBox(
-                            width: 300,
-                            child: MihNumericStepper(
-                              controller: _fontSizeController,
-                              fillColor: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              inputColor: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              hintText: "Font Size",
-                              requiredText: true,
-                              minValue: 1,
-                              // maxValue: 5,
-                              validationOn: true,
-                            ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 15),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  static void loadingPopUp(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const Mihloadingcircle();
-      },
-    );
-  }
-
-  void _speakText(String text) async {
-    try {
-      loadingPopUp(context);
-      await _flutterTts.stop(); // Stop any ongoing speech
-      await _flutterTts.speak(text).then((value) {
-        Navigator.of(context).pop();
-      }); // Speak the new text
-    } catch (e) {
-      Navigator.of(context).pop();
-      print("TTS Error: $e");
-    }
-  }
-
-  void setTtsVoice(String voiceName) {
-    _flutterTts.setVoice(
-      {
-        "name": voiceName,
-        "locale": _voices
-            .where((_voice) => _voice["name"].contains(voiceName))
-            .first["locale"]
-      },
-    );
-    _ttsVoiceController.text = voiceName;
-  }
-
-  void voiceSelected() {
-    if (_ttsVoiceController.text.isNotEmpty) {
-      _ttsVoiceName.value = _ttsVoiceController.text;
-      // print(
-      //     "======================================== Voice Set ========================================");
-      setTtsVoice(_ttsVoiceController.text);
-    } else {
-      _ttsVoiceName.value = "";
-    }
-  }
-
-  void fontSizeChanged() {
-    setState(() {
-      _chatFrontSize = double.parse(_fontSizeController.text);
-    });
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    _modelController.dispose();
-    _fontSizeController.dispose();
-    _ttsVoiceController.dispose();
-    _ttsVoiceController.removeListener(voiceSelected);
-    _fontSizeController.removeListener(fontSizeChanged);
-    client.endSession();
-    _flutterTts.stop();
-  }
-
-  void initTTS() {
-    _flutterTts.setVolume(1);
-    _fontSizeController.addListener(fontSizeChanged);
-    // _flutterTts.setSpeechRate(0.6);
-    // _flutterTts.setPitch(1.0);
-    _flutterTts.getVoices.then(
-      (data) {
-        try {
-          _voices = List<Map>.from(data);
-
-          setState(() {
-            _voices = _voices
-                .where(
-                    (_voice) => _voice["name"].toLowerCase().contains("en-us"))
-                .toList();
-            _voicesString =
-                _voices.map((_voice) => _voice["name"] as String).toList();
-            _voicesString.sort();
-            // print(
-            //     "=================== Voices ===================\n$_voicesString");
-
-            setTtsVoice(_voicesString.first);
-          });
-        } catch (e) {
-          print(e);
-        }
-      },
-    );
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    MzansiAiProvider mzansiAiProvider = context.read<MzansiAiProvider>();
-    MzansiProfileProvider mzansiProfileProvider =
-        context.read<MzansiProfileProvider>();
-    _user = types.User(
-      firstName: mzansiProfileProvider.user!.fname,
-      id: mzansiProfileProvider
-          .user!.app_id, //'82091008-a484-4a89-ae75-a22bf8d6f3ac',
-    );
-    _mihAI = types.User(
-      firstName: "Mzansi AI",
-      id: const Uuid().v4(),
-    );
-    _modelController.text = getModel();
-    _fontSizeController.text = _chatFrontSize.ceil().toString();
-    systemPromt = setSystemPromt();
-    _chatHistory.add(
-      ollama.Message(
-        role: ollama.MessageRole.system,
-        content: systemPromt,
-      ),
-    );
-    initTTS();
-    _ttsVoiceController.addListener(voiceSelected);
-    if (mzansiAiProvider.startUpQuestion != null &&
-        mzansiAiProvider.startUpQuestion!.isNotEmpty) {
-      final partialText =
-          types.PartialText(text: mzansiAiProvider.startUpQuestion!);
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        _handleSendPressed(partialText);
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MihPackageToolBody(
-      borderOn: false,
-      bodyItem: getBody(),
-    );
-  }
-
-  Widget getBody() {
-    return Stack(
-      children: [
-        Column(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          mainAxisSize: MainAxisSize.max,
-          children: [
-            _getSettings(),
-            Expanded(
-              child: GestureDetector(
-                onTap: () {
-                  if (_showModelOptions.value == true) {
-                    setState(() {
-                      _showModelOptions.value = false;
-                    });
-                  }
-                },
-                child: Chat(
-                  messages: _messages,
-                  emptyState: noMessagescDisplay(),
-                  // onAttachmentPressed: _handleAttachmentPressed,
-                  // onMessageTap: _handleMessageTap,
-                  // onPreviewDataFetched: _handlePreviewDataFetched,
-                  onSendPressed: _handleSendPressed,
-                  showUserAvatars: false,
-                  showUserNames: false,
-                  user: _user,
-                  theme: getChatTheme(),
-                ),
-              ),
-            )
-          ],
-        ),
-        Positioned(
-          left: 15,
-          top: 15,
-          child: Visibility(
-            visible: _showModelOptions.value == true,
-            child: Container(
-              // color: Colors.white,
-              decoration: BoxDecoration(
-                borderRadius:
-                    BorderRadius.circular(25), // Optional: rounds the corners
-                boxShadow: const [
-                  BoxShadow(
-                    color: Color.fromARGB(
-                        60, 0, 0, 0), // 0.2 opacity = 51 in alpha (255 * 0.2)
-                    spreadRadius: -2,
-                    blurRadius: 10,
-                    offset: Offset(0, 5),
-                  ),
-                ],
-              ),
-              child: Padding(
-                padding: const EdgeInsets.only(
-                  top: 2.0,
-                  left: 5.0,
-                ),
-                child: SizedBox(
-                  width: 40,
-                  child: IconButton.filled(
-                    style: ButtonStyle(
-                      backgroundColor: WidgetStateProperty.all<Color>(
-                          MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark")),
-                    ),
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    iconSize: 20,
-                    onPressed: () {
-                      if (_showModelOptions.value == true) {
-                        setState(() {
-                          _showModelOptions.value = false;
-                        });
-                      } else {
-                        setState(() {
-                          _showModelOptions.value = true;
-                        });
-                      }
-                    },
-                    icon: const Icon(
-                      Icons.close,
-                    ),
-                  ),
-                ),
-              ),
-            ),
-            // IconButton.filled(
-            //   iconSize: 20,
-            //   onPressed: () {
-            //     if (_showModelOptions.value == true) {
-            //       setState(() {
-            //         _showModelOptions.value = false;
-            //       });
-            //     } else {
-            //       setState(() {
-            //         _showModelOptions.value = true;
-            //       });
-            //     }
-            //   },
-            //   icon: const Icon(
-            //     Icons.settings,
-            //   ),
-            // ),
-          ),
-        ),
-        Positioned(
-          right: 10,
-          bottom: 80,
-          child: MihFloatingMenu(
-            animatedIcon: AnimatedIcons.menu_close,
-            children: [
-              SpeedDialChild(
-                child: Icon(
-                  Icons.refresh,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                label: "New Chat",
-                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                labelStyle: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontWeight: FontWeight.bold,
-                ),
-                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                onTap: () {
-                  _resetChat();
-                },
-              ),
-              SpeedDialChild(
-                child: Icon(
-                  Icons.settings,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                label: "Settings",
-                labelBackgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                labelStyle: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontWeight: FontWeight.bold,
-                ),
-                backgroundColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                onTap: () {
-                  if (_showModelOptions.value == true) {
-                    setState(() {
-                      _showModelOptions.value = false;
-                    });
-                  } else {
-                    setState(() {
-                      _showModelOptions.value = true;
-                    });
-                  }
-                },
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget? noMessagescDisplay() {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 10.0),
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          // const SizedBox(height: 50),
-          Icon(
-            MihIcons.mzansiAi,
-            size: 165,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          const SizedBox(height: 10),
-          Text(
-            "Mzansi AI is here to help",
-            textAlign: TextAlign.center,
-            overflow: TextOverflow.visible,
-            style: TextStyle(
-              fontSize: 25,
-              fontWeight: FontWeight.bold,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-          const SizedBox(height: 25),
-          Center(
-            child: RichText(
-              textAlign: TextAlign.center,
-              text: TextSpan(
-                style: TextStyle(
-                  fontSize: 20,
-                  fontWeight: FontWeight.normal,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                children: [
-                  TextSpan(
-                      text:
-                          "Send us a message and we'll try our best to assist you"),
-                  // WidgetSpan(
-                  //   alignment: PlaceholderAlignment.middle,
-                  //   child: Icon(
-                  //     Icons.menu,
-                  //     size: 20,
-                  //     color: MzansiInnovationHub.of(context)!
-                  //         .theme
-                  //         .secondaryColor(),
-                  //   ),
-                  // ),
-                  // TextSpan(text: " to add your first loyalty card."),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart

@@ -1,142 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:go_router/go_router.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_location_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart';
-import 'package:provider/provider.dart';
-
-class MzansiDirectory extends StatefulWidget {
-  const MzansiDirectory({
-    super.key,
-  });
-
-  @override
-  State<MzansiDirectory> createState() => _MzansiDirectoryState();
-}
-
-class _MzansiDirectoryState extends State<MzansiDirectory> {
-  late Future<Position?> futurePosition =
-      MIHLocationAPI().getGPSPosition(context);
-
-  Future<void> initialiseGPSLocation() async {
-    MzansiDirectoryProvider directoryProvider =
-        context.read<MzansiDirectoryProvider>();
-    MIHLocationAPI().getGPSPosition(context).then((position) {
-      directoryProvider.setUserPosition(position);
-    });
-  }
-
-  Future<void> getFavouriteBusinesses() async {
-    MzansiDirectoryProvider directoryProvider =
-        context.read<MzansiDirectoryProvider>();
-    MzansiProfileProvider profileProvider =
-        context.read<MzansiProfileProvider>();
-    await MihMzansiDirectoryServices().getAllUserBookmarkedBusiness(
-      profileProvider.user!.app_id,
-      directoryProvider,
-    );
-    List<Business> favBus = [];
-    for (var bus in directoryProvider.bookmarkedBusinesses) {
-      await MihBusinessDetailsServices()
-          .getBusinessDetailsByBusinessId(bus.business_id)
-          .then((business) {
-        favBus.add(business!);
-      });
-    }
-    KenLogger.success(favBus);
-    directoryProvider.setFavouriteBusinesses(businesses: favBus);
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      initialiseGPSLocation();
-      getFavouriteBusinesses();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<MzansiDirectoryProvider>().toolIndex,
-      onIndexChange: (newValue) {
-        context.read<MzansiDirectoryProvider>().setToolIndex(newValue);
-      },
-    );
-  }
-
-  List<Widget> getToolBody() {
-    List<Widget> toolBodies = [];
-    // String myLocation = "Getting Your GPS Location Ready";
-    // if (directoryProvider.userPosition != null) {
-    //   myLocation = directoryProvider.userPosition
-    //       .toString()
-    //       .replaceAll("Latitude: ", "")
-    //       .replaceAll("Longitude: ", "");
-    // }
-    toolBodies.addAll([
-      MihSearchMzansi(
-          // personalSearch: directoryProvider.personalSearch,
-          // startSearchText: "",
-          ),
-      // MihContacts(),
-      MihFavouriteBusinesses(),
-    ]);
-    return toolBodies;
-  }
-
-  MihPackageAction getAction() {
-    return MihPackageAction(
-      icon: const Icon(Icons.arrow_back),
-      iconSize: 35,
-      onTap: () {
-        MzansiDirectoryProvider directoryProvider =
-            context.read<MzansiDirectoryProvider>();
-        context.goNamed(
-          'mihHome',
-        );
-        directoryProvider.setToolIndex(0);
-        directoryProvider.setPersonalSearch(true);
-        FocusScope.of(context).unfocus();
-      },
-    );
-  }
-
-  MihPackageTools getTools() {
-    Map<Widget, void Function()?> temp = {};
-    temp[const Icon(Icons.search)] = () {
-      context.read<MzansiDirectoryProvider>().setToolIndex(0);
-    };
-    temp[const Icon(Icons.business_center)] = () {
-      context.read<MzansiDirectoryProvider>().setToolIndex(1);
-    };
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: context.watch<MzansiDirectoryProvider>().toolIndex,
-    );
-  }
-
-  List<String> getToolTitle() {
-    List<String> toolTitles = [
-      "Mzansi Search",
-      "Favourite Businesses",
-      // "Contacts",
-    ];
-    return toolTitles;
-  }
-}

Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart

@@ -1,556 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
-import 'package:provider/provider.dart';
-
-class MihSearchMzansi extends StatefulWidget {
-  const MihSearchMzansi({
-    super.key,
-  });
-
-  @override
-  State<MihSearchMzansi> createState() => _MihSearchMzansiState();
-}
-
-class _MihSearchMzansiState extends State<MihSearchMzansi> {
-  final TextEditingController mzansiSearchController = TextEditingController();
-  final TextEditingController businessTypeController = TextEditingController();
-  final FocusNode searchFocusNode = FocusNode();
-  // late bool userSearch;
-  // Future<List<AppUser>?> futureUserSearchResults = Future.value();
-  List<AppUser> userSearchResults = [];
-  List<Business> businessSearchResults = [];
-  late Future<List<String>> availableBusinessTypes;
-  bool filterOn = false;
-  bool loadingSearchResults = false;
-
-  Future<void> swapPressed(MzansiProfileProvider profileProvider,
-      MzansiDirectoryProvider directoryProvider) async {
-    directoryProvider.setPersonalSearch(!directoryProvider.personalSearch);
-    setState(() {
-      if (filterOn) {
-        filterOn = !filterOn;
-      }
-    });
-    if (businessTypeController.text.isNotEmpty) {
-      setState(() {
-        businessTypeController.clear();
-      });
-    }
-    await searchPressed(profileProvider, directoryProvider);
-  }
-
-  void clearAll(MzansiDirectoryProvider directoryProvider) {
-    directoryProvider.setSearchedBusinesses(searchedBusinesses: []);
-    directoryProvider.setSearchedUsers(searchedUsers: []);
-    directoryProvider.setSearchTerm(searchTerm: "");
-    setState(() {
-      mzansiSearchController.clear();
-      businessTypeController.clear();
-    });
-  }
-
-  Future<void> searchPressed(MzansiProfileProvider profileProvider,
-      MzansiDirectoryProvider directoryProvider) async {
-    setState(() {
-      loadingSearchResults = true;
-    });
-    directoryProvider.setSearchTerm(searchTerm: mzansiSearchController.text);
-    directoryProvider.setBusinessTypeFilter(
-        businessTypeFilter: businessTypeController.text);
-    if (directoryProvider.personalSearch &&
-        directoryProvider.searchTerm.isNotEmpty) {
-      final userResults = await MihUserServices()
-          .searchUsers(profileProvider, directoryProvider.searchTerm, context);
-      directoryProvider.setSearchedUsers(searchedUsers: userResults);
-    } else {
-      List<Business>? businessSearchResults = [];
-      if (directoryProvider.businessTypeFilter.isNotEmpty) {
-        businessSearchResults = await MihBusinessDetailsServices()
-            .searchBusinesses(directoryProvider.searchTerm,
-                directoryProvider.businessTypeFilter, context);
-      } else if (directoryProvider.searchTerm.isNotEmpty) {
-        businessSearchResults = await MihBusinessDetailsServices()
-            .searchBusinesses(directoryProvider.searchTerm,
-                directoryProvider.businessTypeFilter, context);
-      }
-      directoryProvider.setSearchedBusinesses(
-          searchedBusinesses: businessSearchResults);
-    }
-    setState(() {
-      loadingSearchResults = false;
-    });
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    businessTypeController.dispose();
-    mzansiSearchController.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    MzansiDirectoryProvider directoryProvider =
-        context.read<MzansiDirectoryProvider>();
-    availableBusinessTypes =
-        MihBusinessDetailsServices().fetchAllBusinessTypes();
-    mzansiSearchController.text = "";
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      directoryProvider.setSearchedUsers(searchedUsers: []);
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final Size size = MediaQuery.sizeOf(context);
-    final double width = size.width;
-    return MihPackageToolBody(
-      borderOn: false,
-      bodyItem: getBody(width),
-    );
-  }
-
-  Widget getBody(double width) {
-    return Consumer2<MzansiProfileProvider, MzansiDirectoryProvider>(
-      builder: (BuildContext context, MzansiProfileProvider profileProvider,
-          MzansiDirectoryProvider directoryProvider, Widget? child) {
-        return MihSingleChildScroll(
-          child: Column(
-            children: [
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: width / 20),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Expanded(
-                      child: MihSearchBar(
-                        controller: mzansiSearchController,
-                        hintText: "Search Mzansi",
-                        prefixIcon: Icons.search,
-                        prefixAltIcon: directoryProvider.personalSearch
-                            ? Icons.person
-                            : Icons.business,
-                        suffixTools: [
-                          IconButton(
-                            onPressed: () {
-                              swapPressed(profileProvider, directoryProvider);
-                            },
-                            icon: Icon(
-                              Icons.swap_horiz_rounded,
-                              size: 35,
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                            ),
-                          ),
-                        ],
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        hintColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        onPrefixIconTap: () {
-                          searchPressed(profileProvider, directoryProvider);
-                        },
-                        onClearIconTap: () {
-                          clearAll(directoryProvider);
-                        },
-                        searchFocusNode: searchFocusNode,
-                      ),
-                    ),
-                    Visibility(
-                      visible: !directoryProvider.personalSearch,
-                      child: const SizedBox(width: 10),
-                    ),
-                    Visibility(
-                      visible: !directoryProvider.personalSearch,
-                      child: IconButton(
-                        onPressed: () {
-                          if (filterOn) {
-                            clearAll(directoryProvider);
-                          }
-                          setState(() {
-                            filterOn = !filterOn;
-                          });
-                        },
-                        icon: Icon(
-                          !filterOn
-                              ? Icons.filter_list_rounded
-                              : Icons.filter_list_off_rounded,
-                          size: 35,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(height: 10),
-              FutureBuilder(
-                  future: availableBusinessTypes,
-                  builder: (context, asyncSnapshot) {
-                    List<String> options = [];
-                    if (asyncSnapshot.connectionState == ConnectionState.done) {
-                      options.addAll(asyncSnapshot.data!);
-                    }
-                    return Visibility(
-                      visible: filterOn,
-                      child: Padding(
-                        padding: EdgeInsets.symmetric(horizontal: width / 20),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          crossAxisAlignment: CrossAxisAlignment.end,
-                          children: [
-                            Expanded(
-                              child: MihDropdownField(
-                                controller: businessTypeController,
-                                hintText: "Business Type",
-                                dropdownOptions: options,
-                                requiredText: true,
-                                editable: true,
-                                enableSearch: true,
-                              ),
-                            ),
-                            const SizedBox(width: 10),
-                            MihButton(
-                              onPressed: () {
-                                if (businessTypeController.text.isNotEmpty) {
-                                  searchPressed(
-                                      profileProvider, directoryProvider);
-                                } else {
-                                  MihAlertServices().errorAlert(
-                                    "Business Type Not Selected",
-                                    "Please ensure you have selected a Business Type before seareching for Businesses of Mzansi",
-                                    context,
-                                  );
-                                }
-                              },
-                              buttonColor: MihColors.getGreenColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              elevation: 10,
-                              child: Text(
-                                "Search",
-                                style: TextStyle(
-                                  color: MihColors.getPrimaryColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
-                                  fontSize: 20,
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    );
-                  }),
-              const SizedBox(height: 10),
-              displaySearchResults(directoryProvider),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  Widget displayBusinessSearchResults(
-      MzansiDirectoryProvider directoryProvider) {
-    KenLogger.success(
-        "Searched Businesses: ${directoryProvider.searchedBusinesses}");
-    if (directoryProvider.searchedBusinesses == null || loadingSearchResults) {
-      return Center(
-        child: const Mihloadingcircle(),
-      );
-    } else if (directoryProvider.searchedBusinesses!.isNotEmpty) {
-      // return Text("Pulled Data successfully");
-      directoryProvider.searchedBusinesses!
-          .sort((a, b) => a.Name.compareTo(b.Name));
-      return Column(
-        children: [
-          Text(
-            "Businesses of Mzansi",
-            style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
-          ),
-          const SizedBox(height: 10),
-          BuildBusinessSearchResultsList(
-            businessList: directoryProvider.searchedBusinesses!,
-          ),
-        ],
-      );
-    } else if (directoryProvider.searchedBusinesses!.isEmpty &&
-        directoryProvider.searchTerm.isNotEmpty) {
-      // return Text("Pulled Data successfully");
-      return Column(
-        children: [
-          const SizedBox(height: 50),
-          Icon(
-            MihIcons.iDontKnow,
-            size: 165,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          const SizedBox(height: 25),
-          Text(
-            "Let's try refining your search",
-            textAlign: TextAlign.center,
-            overflow: TextOverflow.visible,
-            style: TextStyle(
-              fontSize: 25,
-              fontWeight: FontWeight.bold,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-        ],
-      );
-    } else if (directoryProvider.searchedBusinesses!.isEmpty &&
-        directoryProvider.searchTerm.isEmpty) {
-      return Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 10.0),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            const SizedBox(height: 50),
-            Icon(
-              MihIcons.businessProfile,
-              size: 165,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              "Search for businesses of Mzansi!",
-              textAlign: TextAlign.center,
-              overflow: TextOverflow.visible,
-              style: TextStyle(
-                fontSize: 25,
-                fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              ),
-            ),
-            const SizedBox(height: 25),
-            Center(
-              child: RichText(
-                textAlign: TextAlign.center,
-                text: TextSpan(
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.normal,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                  children: [
-                    TextSpan(text: "Press "),
-                    WidgetSpan(
-                      alignment: PlaceholderAlignment.middle,
-                      child: Icon(
-                        Icons.swap_horiz_rounded,
-                        size: 20,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                    TextSpan(text: " to search for people of Mzansi"),
-                  ],
-                ),
-              ),
-            ),
-            const SizedBox(height: 10),
-            Center(
-              child: RichText(
-                textAlign: TextAlign.center,
-                text: TextSpan(
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.normal,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                  children: [
-                    TextSpan(text: "Press "),
-                    WidgetSpan(
-                      alignment: PlaceholderAlignment.middle,
-                      child: Icon(
-                        Icons.filter_list_rounded,
-                        size: 20,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                    TextSpan(text: " to filter business types"),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        ),
-      );
-    } else {
-      return Center(
-        child: Text(
-          "Error pulling Patients Data\n/users/search/${directoryProvider.searchTerm}",
-          style: TextStyle(
-              fontSize: 25,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
-          textAlign: TextAlign.center,
-        ),
-      );
-    }
-  }
-
-  Widget displayPersonalSearchResults(
-      MzansiDirectoryProvider directoryProvider) {
-    if (directoryProvider.searchedUsers == null || loadingSearchResults) {
-      return Center(
-        child: const Mihloadingcircle(),
-      );
-    } else if (directoryProvider.searchedUsers!.isNotEmpty) {
-      // return Text("Pulled Data successfully");
-      directoryProvider.searchedUsers!
-          .sort((a, b) => a.username.compareTo(b.username));
-      return Column(
-        children: [
-          Text(
-            "People of Mzansi",
-            style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
-          ),
-          const SizedBox(height: 10),
-          BuildUserSearchResultsList(
-              userList: directoryProvider.searchedUsers!),
-        ],
-      );
-    } else if (directoryProvider.searchedUsers!.isEmpty &&
-        directoryProvider.searchTerm.isEmpty) {
-      return Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 10.0),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            const SizedBox(height: 50),
-            Icon(
-              MihIcons.personalProfile,
-              size: 165,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-            const SizedBox(height: 10),
-            Text(
-              "Search for people of Mzansi!",
-              textAlign: TextAlign.center,
-              overflow: TextOverflow.visible,
-              style: TextStyle(
-                fontSize: 25,
-                fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              ),
-            ),
-            const SizedBox(height: 25),
-            Center(
-              child: RichText(
-                textAlign: TextAlign.center,
-                text: TextSpan(
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.normal,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                  children: [
-                    TextSpan(text: "Press "),
-                    WidgetSpan(
-                      alignment: PlaceholderAlignment.middle,
-                      child: Icon(
-                        Icons.swap_horiz_rounded,
-                        size: 20,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                    TextSpan(text: " to search for businesses of Mzansi"),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        ),
-      );
-    } else if (directoryProvider.searchedUsers!.isEmpty &&
-        directoryProvider.searchTerm.isNotEmpty) {
-      return Column(
-        children: [
-          const SizedBox(height: 50),
-          Icon(
-            MihIcons.iDontKnow,
-            size: 165,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          const SizedBox(height: 10),
-          Text(
-            "Let's try refining your search",
-            textAlign: TextAlign.center,
-            overflow: TextOverflow.visible,
-            style: TextStyle(
-              fontSize: 25,
-              fontWeight: FontWeight.bold,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-        ],
-      );
-    } else {
-      return Center(
-        child: Text(
-          "Error pulling Patients Data\n/users/search/${directoryProvider.searchTerm}",
-          style: TextStyle(
-              fontSize: 25,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
-          textAlign: TextAlign.center,
-        ),
-      );
-    }
-  }
-
-  Widget displaySearchResults(MzansiDirectoryProvider directoryProvider) {
-    if (directoryProvider.personalSearch) {
-      return displayPersonalSearchResults(directoryProvider);
-    } else {
-      return displayBusinessSearchResults(directoryProvider);
-    }
-  }
-}

Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_update_business_details_window.dart

@@ -1,705 +0,0 @@
-import 'package:country_code_picker/country_code_picker.dart';
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_location_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:provider/provider.dart';
-
-class MihUpdateBusinessDetailsWindow extends StatefulWidget {
-  final double width;
-  const MihUpdateBusinessDetailsWindow({
-    super.key,
-    required this.width,
-  });
-
-  @override
-  State<MihUpdateBusinessDetailsWindow> createState() =>
-      _MihUpdateBusinessDetailsWindowState();
-}
-
-class _MihUpdateBusinessDetailsWindowState
-    extends State<MihUpdateBusinessDetailsWindow> {
-  final _formKey = GlobalKey<FormState>();
-  PlatformFile? newSelectedLogoPic;
-  final fileNameController = TextEditingController();
-  final regController = TextEditingController();
-  final nameController = TextEditingController();
-  final typeController = TextEditingController();
-  final practiceNoController = TextEditingController();
-  final vatNoController = TextEditingController();
-  final countryCodeController = TextEditingController();
-  final contactController = TextEditingController();
-  final emailController = TextEditingController();
-  final locationController = TextEditingController();
-  final websiteController = TextEditingController();
-  final ratingController = TextEditingController();
-  final missionVisionController = TextEditingController();
-  final ValueNotifier<int> _counter = ValueNotifier<int>(0);
-  late String env;
-
-  void setContactNumberControllers(
-      MzansiProfileProvider mzansiProfileProvider) {
-    if (mzansiProfileProvider.business!.contact_no[0] == "+") {
-      List<String> contactDetails =
-          mzansiProfileProvider.business!.contact_no.split("-");
-      setState(() {
-        countryCodeController.text = contactDetails[0];
-        contactController.text = contactDetails[1];
-      });
-    } else {
-      setState(() {
-        countryCodeController.text = "+27";
-        contactController.text = mzansiProfileProvider.business!.contact_no;
-      });
-    }
-  }
-
-  void setControllers() {
-    MzansiProfileProvider mzansiProfileProvider =
-        context.read<MzansiProfileProvider>();
-    setState(() {
-      fileNameController.text =
-          mzansiProfileProvider.business!.logo_path.split("/").last;
-      regController.text = mzansiProfileProvider.business!.registration_no;
-      nameController.text = mzansiProfileProvider.business!.Name;
-      typeController.text = mzansiProfileProvider.business!.type;
-      practiceNoController.text = mzansiProfileProvider.business!.practice_no;
-      vatNoController.text = mzansiProfileProvider.business!.vat_no;
-      emailController.text = mzansiProfileProvider.business!.bus_email;
-      locationController.text = mzansiProfileProvider.business!.gps_location;
-      websiteController.text = mzansiProfileProvider.business!.website;
-      ratingController.text = mzansiProfileProvider.business!.rating;
-      missionVisionController.text =
-          mzansiProfileProvider.business!.mission_vision;
-    });
-    setContactNumberControllers(mzansiProfileProvider);
-    if (AppEnviroment.getEnv() == "Prod") {
-      env = "Prod";
-    } else {
-      env = "Dev";
-    }
-  }
-
-  Color getMissionVisionLimitColor(int limit) {
-    if (_counter.value <= limit) {
-      return MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
-    } else {
-      return MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
-    }
-  }
-
-  void _updateMissionVisionCounter() {
-    // New function name
-    // No need for setState since you are using a ValueNotifier for _counter
-    _counter.value = missionVisionController.text.characters.length;
-  }
-
-  String getNumberWithCountryCode() {
-    String numberWithoutBeginingZero = "";
-    if (contactController.text[0] == "0") {
-      numberWithoutBeginingZero = contactController.text
-          .replaceAll(" ", "")
-          .substring(1, contactController.text.length);
-    } else {
-      numberWithoutBeginingZero = contactController.text.replaceAll("-", " ");
-    }
-    return "${countryCodeController.text}-$numberWithoutBeginingZero";
-  }
-
-  bool isFormFilled() {
-    if (typeController.text.isEmpty) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  void successPopUp(String message, bool stayOnPersonalSide) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.check_circle_outline_rounded,
-            size: 150,
-            color: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Successfully Updated Profile",
-          alertBody: Column(
-            children: [
-              Text(
-                message,
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-              Center(
-                child: MihButton(
-                  onPressed: () {
-                    context.pop();
-                  },
-                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  elevation: 10,
-                  width: 300,
-                  child: Text(
-                    "Dismiss",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              )
-            ],
-          ),
-          alertColour: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-        // return MIHSuccessMessage(
-        //   successType: "Success",
-        //   successMessage: message,
-        // );
-      },
-    );
-  }
-
-  Future<bool> uploadFile(MzansiProfileProvider mzansiProfileProvider) async {
-    if (newSelectedLogoPic != null) {
-      int uploadStatusCode = 0;
-      uploadStatusCode = await MihFileApi.uploadFile(
-        mzansiProfileProvider.business!.business_id,
-        env,
-        "business_files",
-        newSelectedLogoPic!,
-        context,
-      );
-      if (uploadStatusCode == 200) {
-        int deleteStatusCode = 0;
-        deleteStatusCode = await MihFileApi.deleteFile(
-          mzansiProfileProvider.business!.logo_path.split("/").first,
-          env,
-          "business_files",
-          mzansiProfileProvider.business!.logo_path.split("/").last,
-          context,
-        );
-        if (deleteStatusCode == 200) {
-          return true;
-        } else {
-          return false;
-        }
-      } else {
-        return false;
-      }
-    } else {
-      return true; // No file selected, so no upload needed
-    }
-  }
-
-  Future<void> submitForm(MzansiProfileProvider mzansiProfileProvider) async {
-    KenLogger.success("Start Submit Form");
-    if (isFormFilled()) {
-      KenLogger.success("Form Filled");
-      KenLogger.success("Start File Upload");
-      bool successfullyUploadedFile = await uploadFile(mzansiProfileProvider);
-      KenLogger.success(
-          "File Upload Complete: outcome $successfullyUploadedFile");
-      if (!mounted) return;
-      KenLogger.success("is mounted");
-      if (successfullyUploadedFile) {
-        KenLogger.success("Start Details Update");
-        int statusCode = 0;
-        statusCode = await MihBusinessDetailsServices().updateBusinessDetailsV2(
-          mzansiProfileProvider.business!.business_id,
-          nameController.text,
-          typeController.text,
-          regController.text,
-          practiceNoController.text,
-          vatNoController.text,
-          emailController.text,
-          getNumberWithCountryCode(),
-          // contactController.text,
-          locationController.text,
-          fileNameController.text,
-          websiteController.text,
-          ratingController.text.isEmpty ? "0" : ratingController.text,
-          missionVisionController.text,
-          mzansiProfileProvider,
-          context,
-        );
-        KenLogger.success("Details Update Complete: status code $statusCode");
-        if (!mounted) return;
-        KenLogger.success("is mounted");
-        if (statusCode == 200) {
-          KenLogger.success("Start Success Message");
-          //You left of here
-          String message = "Your information has been updated successfully!";
-          context.pop();
-          successPopUp(message, false);
-          // File uploaded successfully
-        } else {
-          context.pop();
-          // File upload failed
-          showDialog(
-            context: context,
-            builder: (context) {
-              return MihPackageAlert(
-                alertIcon: Icon(
-                  Icons.warning_rounded,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                alertTitle: "Error Updating Business Details",
-                alertBody: Column(
-                  children: [
-                    Text(
-                      "An error occurred while updating the business details. Please check internet connection and try again.",
-                      style: TextStyle(
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                  ],
-                ),
-                alertColour: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              );
-            },
-          );
-        }
-      } else {
-        context.pop();
-        if (!mounted) return;
-        showDialog(
-          context: context,
-          builder: (context) {
-            return const MIHErrorMessage(errorType: "Internet Connection");
-          },
-        );
-      }
-    } else {
-      showDialog(
-        context: context,
-        builder: (context) {
-          return const MIHErrorMessage(errorType: "Input Error");
-        },
-      );
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    setControllers();
-    missionVisionController.addListener(_updateMissionVisionCounter);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<MzansiProfileProvider>(
-      builder: (BuildContext context,
-          MzansiProfileProvider mzansiProfileProvider, Widget? child) {
-        return MihPackageWindow(
-          fullscreen: false,
-          windowTitle: 'Edit Profile',
-          onWindowTapClose: () {
-            context.pop();
-          },
-          windowBody: MihSingleChildScroll(
-            child: Padding(
-              padding:
-                  MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
-                      ? EdgeInsets.symmetric(horizontal: widget.width * 0.05)
-                      : EdgeInsets.symmetric(horizontal: widget.width * 0),
-              child: Column(
-                children: [
-                  MihForm(
-                    formKey: _formKey,
-                    formFields: [
-                      Center(
-                        child: MihCircleAvatar(
-                          imageFile: newSelectedLogoPic != null
-                              ? MemoryImage(newSelectedLogoPic!.bytes!)
-                              : mzansiProfileProvider.businessProfilePicture,
-                          width: 150,
-                          editable: true,
-                          fileNameController: fileNameController,
-                          userSelectedfile: newSelectedLogoPic,
-                          frameColor: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          backgroundColor: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          onChange: (selectedfile) {
-                            setState(() {
-                              newSelectedLogoPic = selectedfile;
-                            });
-                          },
-                        ),
-                      ),
-                      Visibility(
-                        visible: false,
-                        child: MihTextFormField(
-                          fillColor: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          inputColor: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          controller: fileNameController,
-                          multiLineInput: false,
-                          requiredText: true,
-                          readOnly: true,
-                          hintText: "Selected File Name",
-                        ),
-                      ),
-                      const SizedBox(height: 20),
-                      MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: nameController,
-                        multiLineInput: false,
-                        requiredText: true,
-                        hintText: "Business Name",
-                        validator: (value) {
-                          return MihValidationServices().isEmpty(value);
-                        },
-                      ),
-                      const SizedBox(height: 10),
-                      MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: typeController,
-                        multiLineInput: false,
-                        requiredText: true,
-                        hintText: "Business Type",
-                        validator: (value) {
-                          return MihValidationServices()
-                              .validateNoSpecialChars(value);
-                        },
-                      ),
-                      const SizedBox(height: 10),
-                      MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: emailController,
-                        multiLineInput: false,
-                        requiredText: true,
-                        hintText: "Business Email",
-                        validator: (value) {
-                          return MihValidationServices().validateEmail(value);
-                        },
-                      ),
-                      const SizedBox(height: 10),
-                      Container(
-                        width: 300,
-                        alignment: Alignment.topLeft,
-                        child: const Text(
-                          "Contact Number:",
-                          style: TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                      Row(
-                        crossAxisAlignment: CrossAxisAlignment.end,
-                        children: [
-                          CountryCodePicker(
-                            padding: EdgeInsetsGeometry.all(0),
-                            onChanged: (selectedCode) {
-                              setState(() {
-                                countryCodeController.text =
-                                    selectedCode.toString();
-                              });
-                              debugPrint(
-                                  "Selected Country Code: ${countryCodeController.text}");
-                            },
-                            initialSelection: countryCodeController.text,
-                            showDropDownButton: false,
-                            pickerStyle: PickerStyle.bottomSheet,
-                            dialogBackgroundColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            barrierColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                          ),
-                          Expanded(
-                            child: MihTextFormField(
-                              fillColor: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              inputColor: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              controller: contactController,
-                              numberMode: true,
-                              multiLineInput: false,
-                              requiredText: true,
-                              hintText: null,
-                              validator: (value) {
-                                return MihValidationServices().isEmpty(value);
-                              },
-                            ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 10),
-                      MihTextFormField(
-                        height: 250,
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: missionVisionController,
-                        multiLineInput: true,
-                        requiredText: true,
-                        hintText: "Business Mission & Vision",
-                        validator: (value) {
-                          return MihValidationServices().validateLength(
-                              missionVisionController.text, 256);
-                        },
-                      ),
-                      SizedBox(
-                        height: 15,
-                        child: ValueListenableBuilder(
-                          valueListenable: _counter,
-                          builder:
-                              (BuildContext context, int value, Widget? child) {
-                            return Row(
-                              mainAxisSize: MainAxisSize.max,
-                              mainAxisAlignment: MainAxisAlignment.end,
-                              children: [
-                                Text(
-                                  "$value",
-                                  style: TextStyle(
-                                    color: getMissionVisionLimitColor(256),
-                                    fontWeight: FontWeight.bold,
-                                  ),
-                                ),
-                                const SizedBox(width: 5),
-                                Text(
-                                  "/256",
-                                  style: TextStyle(
-                                    color: getMissionVisionLimitColor(256),
-                                    fontWeight: FontWeight.bold,
-                                  ),
-                                ),
-                              ],
-                            );
-                          },
-                        ),
-                      ),
-                      const SizedBox(height: 10.0),
-                      MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: websiteController,
-                        multiLineInput: false,
-                        requiredText: false,
-                        hintText: "Business Website",
-                        validator: (value) {
-                          return MihValidationServices()
-                              .validateWebsite(value, false);
-                        },
-                      ),
-                      const SizedBox(height: 10),
-                      MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: regController,
-                        multiLineInput: false,
-                        requiredText: false,
-                        hintText: "Registration No.",
-                        validator: (value) {
-                          // return MihValidationServices().isEmpty(value);
-                          return null;
-                        },
-                      ),
-                      const SizedBox(height: 10),
-                      MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: practiceNoController,
-                        multiLineInput: false,
-                        requiredText: false,
-                        hintText: "Practice Number",
-                        validator: (validateValue) {
-                          return null;
-                        },
-                      ),
-                      const SizedBox(height: 10),
-                      MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: vatNoController,
-                        multiLineInput: false,
-                        requiredText: false,
-                        hintText: "VAT Number",
-                        validator: (value) {
-                          // return MihValidationServices().isEmpty(value);
-                          return null;
-                        },
-                      ),
-                      const SizedBox(height: 10),
-                      Row(
-                        crossAxisAlignment: CrossAxisAlignment.end,
-                        children: [
-                          Flexible(
-                            child: MihTextFormField(
-                              fillColor: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              inputColor: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              controller: locationController,
-                              multiLineInput: false,
-                              requiredText: true,
-                              readOnly: true,
-                              hintText: "GPS Location",
-                            ),
-                          ),
-                          const SizedBox(width: 10.0),
-                          MihButton(
-                            onPressed: () {
-                              showDialog(
-                                context: context,
-                                builder: (context) {
-                                  return const Mihloadingcircle(
-                                    message: "Getting your location",
-                                  );
-                                },
-                              );
-                              MIHLocationAPI()
-                                  .getGPSPosition(context)
-                                  .then((position) {
-                                if (position != null) {
-                                  setState(() {
-                                    locationController.text =
-                                        "${position.latitude}, ${position.longitude}";
-                                  });
-                                }
-                                //Dismiss loading indicator
-                                context.pop();
-                              });
-                            },
-                            buttonColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            width: 100,
-                            child: Text(
-                              "Set",
-                              style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
-                                fontSize: 20,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 25),
-                      Center(
-                        child: MihButton(
-                          onPressed: () {
-                            if (_formKey.currentState!.validate()) {
-                              submitForm(mzansiProfileProvider);
-                            } else {
-                              MihAlertServices()
-                                  .formNotFilledCompletely(context);
-                            }
-                          },
-                          buttonColor: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          width: 300,
-                          child: Text(
-                            "Update",
-                            style: TextStyle(
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              fontSize: 20,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ),
-                      ),
-                      const SizedBox(height: 20),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart

@@ -1,465 +0,0 @@
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_my_business_user_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_image_display.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-import 'package:provider/provider.dart';
-
-class MihMyBusinessUser extends StatefulWidget {
-  const MihMyBusinessUser({
-    super.key,
-  });
-
-  @override
-  State<MihMyBusinessUser> createState() => _MihMyBusinessUserState();
-}
-
-class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
-  PlatformFile? userPicFile;
-  PlatformFile? newSelectedSignaturePic;
-  final fileNameController = TextEditingController();
-  final titleTextController = TextEditingController();
-  final fnameController = TextEditingController();
-  final lnameController = TextEditingController();
-  final accessController = TextEditingController();
-  final signtureController = TextEditingController();
-  final _formKey = GlobalKey<FormState>();
-  late String env;
-
-  bool isFormFilled() {
-    if (titleTextController.text.isEmpty) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  Future<bool> uploadFile(MzansiProfileProvider mzansiProfileProvider) async {
-    if (newSelectedSignaturePic != null) {
-      int uploadStatusCode = 0;
-      uploadStatusCode = await MihFileApi.uploadFile(
-        mzansiProfileProvider.user!.app_id,
-        env,
-        "business_files",
-        newSelectedSignaturePic!,
-        context,
-      );
-      if (uploadStatusCode == 200) {
-        signtureController.text = newSelectedSignaturePic!.name;
-        int deleteStatusCode = 0;
-        deleteStatusCode = await MihFileApi.deleteFile(
-          mzansiProfileProvider.user!.app_id,
-          env,
-          "business_files",
-          mzansiProfileProvider.businessUser!.sig_path.split("/").last,
-          context,
-        );
-        if (deleteStatusCode == 200) {
-          return true;
-        } else {
-          return false;
-        }
-      } else {
-        return false;
-      }
-    } else {
-      return true; // No file selected, so no upload needed
-    }
-  }
-
-  Future<void> submitForm(MzansiProfileProvider mzansiProfileProvider) async {
-    KenLogger.success("Start Submit Form");
-    if (isFormFilled()) {
-      KenLogger.success("Form Filled");
-      KenLogger.success("Start File Upload");
-      bool successfullyUploadedFile = await uploadFile(mzansiProfileProvider);
-      KenLogger.success(
-          "File Upload Complete: outcome $successfullyUploadedFile");
-      if (!mounted) return;
-      KenLogger.success("is mounted");
-      if (successfullyUploadedFile) {
-        int statusCode = await MihMyBusinessUserServices().updateBusinessUser(
-          mzansiProfileProvider.user!.app_id,
-          mzansiProfileProvider.businessUser!.business_id,
-          titleTextController.text,
-          accessController.text,
-          signtureController.text,
-          mzansiProfileProvider,
-          context,
-        );
-        KenLogger.success("Details Update Complete: status code $statusCode");
-        if (!mounted) return;
-        KenLogger.success("is mounted");
-        if (statusCode == 200) {
-          KenLogger.success("Start Success Message");
-          String message = "Business details updated successfully";
-          successPopUp(message, false);
-        } else {
-          showDialog(
-            context: context,
-            builder: (context) {
-              return MihPackageAlert(
-                alertIcon: Icon(
-                  Icons.warning_rounded,
-                  color: MihColors.getRedColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                alertTitle: "Error Updating Business User Details",
-                alertBody: Column(
-                  children: [
-                    Text(
-                      "An error occurred while updating the business User details. Please check internet connection and try again.",
-                      style: TextStyle(
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                  ],
-                ),
-                alertColour: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              );
-            },
-          );
-        }
-      } else {
-        showDialog(
-          context: context,
-          builder: (context) {
-            return const MIHErrorMessage(errorType: "Internet Connection");
-          },
-        );
-      }
-    } else {
-      showDialog(
-        context: context,
-        builder: (context) {
-          return const MIHErrorMessage(errorType: "Input Error");
-        },
-      );
-    }
-  }
-
-  void successPopUp(String message, bool stayOnPersonalSide) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.check_circle_outline_rounded,
-            size: 150,
-            color: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Successfully Updated Profile",
-          alertBody: Column(
-            children: [
-              Text(
-                message,
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-              Center(
-                child: MihButton(
-                  onPressed: () {
-                    context.pop();
-                  },
-                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  elevation: 10,
-                  width: 300,
-                  child: Text(
-                    "Dismiss",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              )
-            ],
-          ),
-          alertColour: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-        // return MIHSuccessMessage(
-        //   successType: "Success",
-        //   successMessage: message,
-        // );
-      },
-    );
-  }
-
-  void setControllers() {
-    MzansiProfileProvider mzansiProfileProvider =
-        context.read<MzansiProfileProvider>();
-    fileNameController.text =
-        mzansiProfileProvider.user!.pro_pic_path.split("/").last;
-    signtureController.text =
-        mzansiProfileProvider.businessUser!.sig_path.split("/").last;
-    KenLogger.success("title: ${mzansiProfileProvider.businessUser!.title}");
-    KenLogger.success(
-        "sig url: ${mzansiProfileProvider.businessUser!.sig_path}");
-    titleTextController.text = mzansiProfileProvider.businessUser!.title;
-    fnameController.text = mzansiProfileProvider.user!.fname;
-    lnameController.text = mzansiProfileProvider.user!.lname;
-    accessController.text = mzansiProfileProvider.businessUser!.access;
-    if (AppEnviroment.getEnv() == "Prod") {
-      env = "Prod";
-    } else {
-      env = "Dev";
-    }
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    fileNameController.dispose();
-    titleTextController.dispose();
-    fnameController.dispose();
-    lnameController.dispose();
-    accessController.dispose();
-    signtureController.dispose();
-    userPicFile = null;
-    newSelectedSignaturePic = null;
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    setControllers();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double screenWidth = MediaQuery.of(context).size.width;
-    return MihPackageToolBody(
-      borderOn: false,
-      innerHorizontalPadding: 10,
-      bodyItem: getBody(screenWidth),
-    );
-  }
-
-  Widget getBody(double width) {
-    return Consumer<MzansiProfileProvider>(
-      builder: (BuildContext context,
-          MzansiProfileProvider mzansiProfileProvider, Widget? child) {
-        return MihSingleChildScroll(
-          child: Padding(
-            padding:
-                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
-                    ? EdgeInsets.symmetric(horizontal: width * 0.2)
-                    : EdgeInsets.symmetric(horizontal: width * 0.075),
-            child: Column(
-              children: [
-                MihForm(
-                  formKey: _formKey,
-                  formFields: [
-                    Center(
-                      child: MihCircleAvatar(
-                        imageFile: mzansiProfileProvider.userProfilePicture,
-                        width: 150,
-                        editable: false,
-                        fileNameController: fileNameController,
-                        userSelectedfile: userPicFile,
-                        frameColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        backgroundColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        onChange: (_) {},
-                      ),
-                    ),
-                    Visibility(
-                      visible: false,
-                      child: MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: fileNameController,
-                        multiLineInput: false,
-                        requiredText: true,
-                        readOnly: true,
-                        hintText: "Selected File Name",
-                      ),
-                    ),
-                    const SizedBox(height: 20),
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: titleTextController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      readOnly: false,
-                      hintText: "Title",
-                      validator: (value) {
-                        return MihValidationServices().isEmpty(value);
-                      },
-                    ),
-                    const SizedBox(height: 10),
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: fnameController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      readOnly: true,
-                      hintText: "First Name",
-                      validator: (value) {
-                        return MihValidationServices().isEmpty(value);
-                      },
-                    ),
-                    const SizedBox(height: 10),
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: lnameController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      readOnly: true,
-                      hintText: "Surname",
-                      validator: (value) {
-                        return MihValidationServices().isEmpty(value);
-                      },
-                    ),
-                    const SizedBox(height: 10),
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: accessController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      hintText: "Access Level",
-                      readOnly: true,
-                      validator: (value) {
-                        return MihValidationServices().isEmpty(value);
-                      },
-                    ),
-                    const SizedBox(height: 10),
-                    Container(
-                      width: 300,
-                      alignment: Alignment.topLeft,
-                      child: const Text(
-                        "Signature:",
-                        style: TextStyle(
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ),
-                    Center(
-                      child: MihImageDisplay(
-                        imageFile: newSelectedSignaturePic != null
-                            ? MemoryImage(newSelectedSignaturePic!.bytes!)
-                            : mzansiProfileProvider.businessUserSignature,
-                        width: 300,
-                        height: 200,
-                        editable: true,
-                        fileNameController: signtureController,
-                        userSelectedfile: newSelectedSignaturePic,
-                        onChange: (selectedFile) {
-                          setState(() {
-                            newSelectedSignaturePic = selectedFile;
-                          });
-                        },
-                      ),
-                    ),
-                    const SizedBox(height: 10),
-                    Visibility(
-                      visible: false,
-                      child: MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: fileNameController,
-                        multiLineInput: false,
-                        requiredText: true,
-                        readOnly: true,
-                        hintText: "Selected Signature File",
-                      ),
-                    ),
-                    const SizedBox(height: 15),
-                    Center(
-                      child: MihButton(
-                        onPressed: () {
-                          if (_formKey.currentState!.validate()) {
-                            submitForm(mzansiProfileProvider);
-                          } else {
-                            MihAlertServices().formNotFilledCompletely(context);
-                          }
-                        },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        width: 300,
-                        child: Text(
-                          "Update",
-                          style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            fontSize: 20,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                    ),
-                    const SizedBox(height: 20),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart

@@ -1,579 +0,0 @@
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_toggle.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:provider/provider.dart';
-
-class MihEditPersonalProfileWindow extends StatefulWidget {
-  const MihEditPersonalProfileWindow({super.key});
-
-  @override
-  State<MihEditPersonalProfileWindow> createState() =>
-      _MihEditPersonalProfileWindowState();
-}
-
-class _MihEditPersonalProfileWindowState
-    extends State<MihEditPersonalProfileWindow> {
-  TextEditingController proPicController = TextEditingController();
-  TextEditingController usernameController = TextEditingController();
-  TextEditingController fnameController = TextEditingController();
-  TextEditingController lnameController = TextEditingController();
-  TextEditingController purposeController = TextEditingController();
-  bool _controllersInitialized = false;
-  final ValueNotifier<int> _counter = ValueNotifier<int>(0);
-  final _formKey = GlobalKey<FormState>();
-  PlatformFile? newSelectedProPic;
-  String oldProPicName = "";
-  String env = "";
-  bool businessUser = false;
-
-  void initializeControllers(MzansiProfileProvider mzansiProfileProvider) {
-    businessUser = mzansiProfileProvider.user!.type == "business";
-    oldProPicName = mzansiProfileProvider.user!.pro_pic_path.isNotEmpty
-        ? mzansiProfileProvider.user!.pro_pic_path.split("/").last
-        : "";
-    env = AppEnviroment.getEnv() == "Prod" ? env = "Prod" : env = "Dev";
-    if (!_controllersInitialized && mzansiProfileProvider.user != null) {
-      usernameController.text = mzansiProfileProvider.user!.username;
-      fnameController.text = mzansiProfileProvider.user!.fname;
-      lnameController.text = mzansiProfileProvider.user!.lname;
-      purposeController.text = mzansiProfileProvider.user!.purpose;
-      proPicController.text =
-          mzansiProfileProvider.user!.pro_pic_path.isNotEmpty
-              ? mzansiProfileProvider.user!.pro_pic_path.split("/").last
-              : "";
-      businessUser = mzansiProfileProvider.user!.type == "business";
-      _controllersInitialized = true;
-    }
-  }
-
-  Future<void> submitForm(MzansiProfileProvider mzansiProfileProvider) async {
-    if (mzansiProfileProvider.user!.username != usernameController.text) {
-      bool isUsernameUnique = await MihUserServices.isUsernameUnique(
-          usernameController.text, context);
-      if (isUsernameUnique == false) {
-        notUniqueAlert();
-        return;
-      }
-    }
-    if (oldProPicName != proPicController.text) {
-      await uploadSelectedFile(mzansiProfileProvider, newSelectedProPic);
-    }
-    await updateUserApiCall(mzansiProfileProvider);
-  }
-
-  Future<void> updateUserApiCall(
-      MzansiProfileProvider mzansiProfileProvider) async {
-    KenLogger.success("businessUser: $businessUser");
-    int responseCode = await MihUserServices().updateUserV2(
-      mzansiProfileProvider.user!,
-      fnameController.text,
-      lnameController.text,
-      usernameController.text,
-      proPicController.text,
-      purposeController.text,
-      businessUser,
-      context,
-    );
-    if (responseCode == 200) {
-      setState(() {
-        setProfileVariables(mzansiProfileProvider);
-        newSelectedProPic = null;
-      });
-      // if (originalProfileTypeIsBusiness == false && businessUser == true) {
-      //   stayOnPersonalSide = false;
-      // }
-      String message = "Your information has been updated successfully!";
-      successPopUp(
-        mzansiProfileProvider,
-        message,
-      );
-    } else {
-      internetConnectionPopUp();
-    }
-  }
-
-  Future<void> uploadSelectedFile(
-      MzansiProfileProvider mzansiProfileProvider, PlatformFile? file) async {
-    var response = await MihFileApi.uploadFile(
-      mzansiProfileProvider.user!.app_id,
-      env,
-      "profile_files",
-      file,
-      context,
-    );
-    if (response == 200) {
-      deleteFileApiCall(mzansiProfileProvider, oldProPicName);
-    } else {
-      internetConnectionPopUp();
-    }
-  }
-
-  Future<void> deleteFileApiCall(
-      MzansiProfileProvider mzansiProfileProvider, String filename) async {
-    var response = await MihFileApi.deleteFile(
-      mzansiProfileProvider.user!.app_id,
-      env,
-      "profile_files",
-      filename,
-      context,
-    );
-    if (response == 200) {
-      //SQL delete
-    } else {
-      internetConnectionPopUp();
-    }
-  }
-
-  void setProfileVariables(MzansiProfileProvider mzansiProfileProvider) {
-    businessUser = mzansiProfileProvider.user!.type == "business";
-    oldProPicName = mzansiProfileProvider.user!.pro_pic_path.isNotEmpty
-        ? mzansiProfileProvider.user!.pro_pic_path.split("/").last
-        : "";
-    env = AppEnviroment.getEnv() == "Prod" ? env = "Prod" : env = "Dev";
-  }
-
-  Color getPurposeLimitColor(int limit) {
-    if (_counter.value <= limit) {
-      return MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
-    } else {
-      return MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
-    }
-  }
-
-  void successPopUp(
-    MzansiProfileProvider profileProvider,
-    String message,
-  ) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.check_circle_outline_rounded,
-            size: 150,
-            color: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Successfully Updated Profile",
-          alertBody: Column(
-            children: [
-              Text(
-                message,
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-              Center(
-                child: MihButton(
-                  onPressed: () {
-                    if (profileProvider.user!.type.toLowerCase() ==
-                            "business" &&
-                        profileProvider.business == null) {
-                      setupBusinessPopUp(profileProvider);
-                    } else {
-                      context.pop();
-                      context.pop();
-                    }
-                  },
-                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  elevation: 10,
-                  width: 300,
-                  child: Text(
-                    "Dismiss",
-                    style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              )
-            ],
-          ),
-          alertColour: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-        // return MIHSuccessMessage(
-        //   successType: "Success",
-        //   successMessage: message,
-        // );
-      },
-    );
-  }
-
-  void setupBusinessPopUp(
-    MzansiProfileProvider profileProvider,
-  ) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            MihIcons.businessSetup,
-            size: 150,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Setup Business Profile?",
-          alertBody: Column(
-            children: [
-              Text(
-                "It looks like this is the first time activating your business account. Would you like to set up your business now or would you like to do it later?",
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-              Center(
-                child: Wrap(
-                  alignment: WrapAlignment.center,
-                  runAlignment: WrapAlignment.center,
-                  spacing: 10,
-                  runSpacing: 10,
-                  children: [
-                    MihButton(
-                      onPressed: () {
-                        context.pop();
-                        context.goNamed(
-                          'businessProfileSetup',
-                          extra: profileProvider.user,
-                        );
-                      },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      elevation: 10,
-                      width: 300,
-                      child: Text(
-                        "Setup Business",
-                        style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          fontSize: 20,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ),
-                    MihButton(
-                      onPressed: () {
-                        context.pop();
-                        context.pop();
-                        context.pop();
-                      },
-                      buttonColor: MihColors.getOrangeColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      elevation: 10,
-                      width: 300,
-                      child: Text(
-                        "Setup Later",
-                        style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          fontSize: 20,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              )
-            ],
-          ),
-          alertColour: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-        // return MIHSuccessMessage(
-        //   successType: "Success",
-        //   successMessage: message,
-        // );
-      },
-    );
-  }
-
-  void internetConnectionPopUp() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const MIHErrorMessage(errorType: "Internet Connection");
-      },
-    );
-  }
-
-  void notUniqueAlert() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.warning_amber_rounded,
-            size: 100,
-            color: MihColors.getRedColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Too Slow, That Username is Taken",
-          alertBody: const Text(
-            "The username you have entered is already taken by another member of Mzansi. Please choose a different username and try again.",
-            style: TextStyle(
-              fontSize: 15,
-            ),
-          ),
-          alertColour: MihColors.getRedColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-      },
-    );
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    initializeControllers(context.read<MzansiProfileProvider>());
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double screenWidth = MediaQuery.of(context).size.width;
-    return Consumer<MzansiProfileProvider>(
-      builder: (BuildContext context,
-          MzansiProfileProvider mzansiProfileProvider, Widget? child) {
-        return MihPackageWindow(
-          fullscreen: false,
-          windowTitle: "Edit Profile",
-          onWindowTapClose: () {
-            Navigator.of(context).pop();
-          },
-          windowBody: Padding(
-            padding:
-                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
-                    ? EdgeInsets.symmetric(horizontal: screenWidth * 0.05)
-                    : EdgeInsets.symmetric(horizontal: screenWidth * 0),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                MihForm(
-                  formKey: _formKey,
-                  formFields: [
-                    Center(
-                      child: MihCircleAvatar(
-                        imageFile: newSelectedProPic != null
-                            ? MemoryImage(newSelectedProPic!.bytes!)
-                            : mzansiProfileProvider.userProfilePicture,
-                        width: 150,
-                        editable: true,
-                        fileNameController: proPicController,
-                        userSelectedfile: newSelectedProPic,
-                        frameColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        backgroundColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        onChange: (selectedImage) {
-                          setState(() {
-                            newSelectedProPic = selectedImage;
-                          });
-                        },
-                      ),
-                    ),
-                    // const SizedBox(height: 25.0),
-                    Visibility(
-                      visible: false,
-                      child: MihTextFormField(
-                        fillColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        inputColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        controller: proPicController,
-                        multiLineInput: false,
-                        requiredText: true,
-                        readOnly: true,
-                        hintText: "Selected File Name",
-                      ),
-                    ),
-                    const SizedBox(height: 10.0),
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: usernameController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      hintText: "Username",
-                      validator: (value) {
-                        return MihValidationServices().validateUsername(value);
-                      },
-                    ),
-                    const SizedBox(height: 10.0),
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: fnameController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      hintText: "First Name",
-                      validator: (value) {
-                        return MihValidationServices().isEmpty(value);
-                      },
-                    ),
-                    const SizedBox(height: 10.0),
-                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: lnameController,
-                      multiLineInput: false,
-                      requiredText: true,
-                      hintText: "Last Name",
-                      validator: (value) {
-                        return MihValidationServices().isEmpty(value);
-                      },
-                    ),
-                    const SizedBox(height: 10.0),
-                    MihTextFormField(
-                      height: 250,
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      controller: purposeController,
-                      multiLineInput: true,
-                      requiredText: true,
-                      hintText: "Your Personal Mission",
-                      validator: (value) {
-                        return MihValidationServices()
-                            .validateLength(purposeController.text, 256);
-                      },
-                    ),
-                    SizedBox(
-                      height: 15,
-                      child: ValueListenableBuilder(
-                        valueListenable: _counter,
-                        builder:
-                            (BuildContext context, int value, Widget? child) {
-                          return Row(
-                            mainAxisSize: MainAxisSize.max,
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            children: [
-                              Text(
-                                "$value",
-                                style: TextStyle(
-                                  color: getPurposeLimitColor(256),
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                              const SizedBox(width: 5),
-                              Text(
-                                "/256",
-                                style: TextStyle(
-                                  color: getPurposeLimitColor(256),
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                            ],
-                          );
-                        },
-                      ),
-                    ),
-                    const SizedBox(height: 10.0),
-                    MihToggle(
-                      hintText: "Activate Business Account",
-                      initialPostion: businessUser,
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      secondaryFillColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      onChange: (value) {
-                        setState(() {
-                          businessUser = value;
-                        });
-                        KenLogger.success("Business User: $businessUser");
-                      },
-                    ),
-                    const SizedBox(height: 30.0),
-                    Center(
-                      child: MihButton(
-                        onPressed: () {
-                          //Add validation here
-                          if (_formKey.currentState!.validate()) {
-                            submitForm(mzansiProfileProvider);
-                          } else {
-                            MihAlertServices().formNotFilledCompletely(context);
-                          }
-                        },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        width: 300,
-                        child: Text(
-                          mzansiProfileProvider.user!.username.isEmpty
-                              ? "Setup Profile"
-                              : "Update",
-                          style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            fontSize: 20,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.dart

@@ -1,81 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class MzansiProfile extends StatefulWidget {
-  const MzansiProfile({
-    super.key,
-  });
-
-  @override
-  State<MzansiProfile> createState() => _MzansiProfileState();
-}
-
-class _MzansiProfileState extends State<MzansiProfile> {
-  @override
-  Widget build(BuildContext context) {
-    return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<MzansiProfileProvider>().personalIndex,
-      onIndexChange: (newIndex) {
-        context.read<MzansiProfileProvider>().setPersonalIndex(newIndex);
-      },
-    );
-  }
-
-  MihPackageAction getAction() {
-    return MihPackageAction(
-      icon: const Icon(Icons.arrow_back),
-      iconSize: 35,
-      onTap: () {
-        // Navigator.of(context).pop();
-        context.goNamed(
-          'mihHome',
-        );
-        FocusScope.of(context).unfocus();
-      },
-    );
-  }
-
-  MihPackageTools getTools() {
-    Map<Widget, void Function()?> temp = {};
-    temp[const Icon(Icons.person)] = () {
-      context.read<MzansiProfileProvider>().setPersonalIndex(0);
-    };
-    // temp[const Icon(Icons.person)] = () {
-    //   context.read<MzansiProfileProvider>().setPersonalIndex(1);
-    // };
-    temp[const Icon(Icons.settings)] = () {
-      context.read<MzansiProfileProvider>().setPersonalIndex(1);
-    };
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: context.watch<MzansiProfileProvider>().personalIndex,
-    );
-  }
-
-  List<Widget> getToolBody() {
-    List<Widget> toolBodies = [];
-    toolBodies.add(MihPersonalProfile());
-    // toolBodies.add(MihPersonalProfile());
-    toolBodies.add(MihPersonalSettings());
-    return toolBodies;
-  }
-
-  List<String> getToolTitle() {
-    List<String> toolTitles = [
-      "Profile",
-      "Settings",
-    ];
-    return toolTitles;
-  }
-}

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart

@@ -1,196 +0,0 @@
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart';
-import 'package:provider/provider.dart';
-
-class MihPersonalProfile extends StatefulWidget {
-  const MihPersonalProfile({super.key});
-
-  @override
-  State<MihPersonalProfile> createState() => _MihPersonalProfileState();
-}
-
-class _MihPersonalProfileState extends State<MihPersonalProfile> {
-  TextEditingController proPicController = TextEditingController();
-  PlatformFile? newSelectedProPic;
-
-  void editProfileWindow(double width) {
-    showDialog(
-      context: context,
-      builder: (context) => Consumer<MzansiProfileProvider>(
-        builder: (BuildContext context,
-            MzansiProfileProvider mzansiProfileProvider, Widget? child) {
-          // usernameController.text = mzansiProfileProvider.user!.username;
-          // fnameController.text = mzansiProfileProvider.user!.fname;
-          // lnameController.text = mzansiProfileProvider.user!.lname;
-          // purposeController.text = mzansiProfileProvider.user!.purpose;
-          // proPicController.text =
-          //     mzansiProfileProvider.user!.pro_pic_path.isNotEmpty
-          //         ? mzansiProfileProvider.user!.pro_pic_path.split("/").last
-          //         : "";
-          return MihEditPersonalProfileWindow();
-        },
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double screenWidth = MediaQuery.of(context).size.width;
-    return MihPackageToolBody(
-      borderOn: false,
-      innerHorizontalPadding: 10,
-      bodyItem: getBody(screenWidth),
-    );
-  }
-
-  Widget getBody(double width) {
-    return Consumer<MzansiProfileProvider>(
-      builder: (BuildContext context,
-          MzansiProfileProvider mzansiProfileProvider, Widget? child) {
-        if (mzansiProfileProvider.user == null) {
-          //Change to new user flow
-          return Center(
-            child: Mihloadingcircle(),
-          );
-        }
-        // else if (mzansiProfileProvider.user!.username.isEmpty) {
-        //   editProfileWindow(width);
-        // }
-        else {
-          KenLogger.success(
-              mzansiProfileProvider.userProfilePicture.toString());
-          return MihSingleChildScroll(
-            child: Padding(
-              padding:
-                  MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
-                      ? EdgeInsets.symmetric(horizontal: width * 0.2)
-                      : EdgeInsets.symmetric(horizontal: width * 0.075),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.start,
-                children: [
-                  Center(
-                    child: MihCircleAvatar(
-                      imageFile: mzansiProfileProvider.userProfilePicture,
-                      width: 150,
-                      editable: false,
-                      fileNameController: proPicController,
-                      userSelectedfile: newSelectedProPic,
-                      frameColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      backgroundColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      onChange: (selectedImage) {
-                        setState(() {
-                          newSelectedProPic = selectedImage;
-                        });
-                      },
-                      key: ValueKey(mzansiProfileProvider.userProfilePicUrl),
-                    ),
-                  ),
-                  FittedBox(
-                    child: Text(
-                      mzansiProfileProvider.user!.username.isNotEmpty
-                          ? mzansiProfileProvider.user!.username
-                          : "username",
-                      style: TextStyle(
-                        fontSize: 35,
-                        fontWeight: FontWeight.bold,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                  ),
-                  FittedBox(
-                    child: Text(
-                      mzansiProfileProvider.user!.fname.isNotEmpty
-                          ? "${mzansiProfileProvider.user!.fname} ${mzansiProfileProvider.user!.lname}"
-                          : "Name Surname",
-                      style: TextStyle(
-                        fontSize: 25,
-                        fontWeight: FontWeight.bold,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                  ),
-                  FittedBox(
-                    child: Text(
-                      mzansiProfileProvider.user!.type == "business"
-                          ? "Business".toUpperCase()
-                          : "Personal".toUpperCase(),
-                      style: TextStyle(
-                        fontSize: 15,
-                        fontWeight: FontWeight.bold,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(height: 10.0),
-                  Center(
-                    child: SizedBox(
-                      width: 700,
-                      child: Text(
-                        mzansiProfileProvider.user!.purpose.isNotEmpty
-                            ? mzansiProfileProvider.user!.purpose
-                            : "No Personal Mission added yet",
-                        textAlign: TextAlign.center,
-                        style: TextStyle(
-                          fontSize: 15,
-                          fontWeight: FontWeight.bold,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                        ),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(height: 30.0),
-                  Center(
-                    child: MihButton(
-                      onPressed: () {
-                        // Connect with the user
-                        editProfileWindow(width);
-                      },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      width: 300,
-                      child: Text(
-                        mzansiProfileProvider.user!.username.isEmpty
-                            ? "Set Up Profile"
-                            : "Edit Profile",
-                        style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          fontSize: 20,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        }
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart

@@ -1,164 +0,0 @@
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:provider/provider.dart';
-
-class MihPersonalSettings extends StatefulWidget {
-  const MihPersonalSettings({
-    super.key,
-  });
-
-  @override
-  State<MihPersonalSettings> createState() => _MihPersonalSettingsState();
-}
-
-class _MihPersonalSettingsState extends State<MihPersonalSettings> {
-  @override
-  Widget build(BuildContext context) {
-    return MihPackageToolBody(
-      borderOn: false,
-      innerHorizontalPadding: 10,
-      bodyItem: getBody(),
-    );
-  }
-
-  void deleteAccountPopUp(BuildContext ctxtd) {
-    showDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (context) {
-        return Consumer<MzansiProfileProvider>(
-          builder: (BuildContext context,
-              MzansiProfileProvider mzansiProfileProvider, Widget? child) {
-            return MihPackageAlert(
-              alertIcon: Icon(
-                Icons.warning_amber_rounded,
-                size: 100,
-                color: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              ),
-              alertTitle:
-                  "Are you sure you want to permanently delete your MIH account?",
-              alertBody: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    "This action will remove all of your data, and it cannot be recovered. We understand this is a big decision, so please take a moment to double-check.\n\nIf you're certain, please confirm below. If you've changed your mind, you can simply close this window.",
-                    style: TextStyle(
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      fontSize: 15,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const SizedBox(height: 15),
-                  Wrap(
-                    spacing: 10,
-                    runSpacing: 10,
-                    children: [
-                      MihButton(
-                        onPressed: () {
-                          MihUserServices.deleteAccount(
-                              mzansiProfileProvider, context);
-                        },
-                        buttonColor: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        width: 300,
-                        child: Text(
-                          "Delete",
-                          style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            fontSize: 20,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                      MihButton(
-                        onPressed: () {
-                          Navigator.pop(context);
-                        },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        width: 300,
-                        child: Text(
-                          "Cancel",
-                          style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            fontSize: 20,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                      ),
-                    ],
-                  )
-                ],
-              ),
-              alertColour: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            );
-          },
-        );
-      },
-    );
-  }
-
-  Widget getBody() {
-    return MihSingleChildScroll(
-      child: Column(
-        children: [
-          Center(
-            child: FaIcon(
-              FontAwesomeIcons.trashCan,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              size: 150,
-            ),
-          ),
-          const SizedBox(height: 10.0),
-          Text(
-            "Would you like to delete your MIH account?",
-            textAlign: TextAlign.center,
-            style: TextStyle(
-              fontSize: 18,
-              fontWeight: FontWeight.bold,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-          const SizedBox(height: 10.0),
-          MihButton(
-            onPressed: () {
-              deleteAccountPopUp(context);
-            },
-            buttonColor: MihColors.getRedColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            width: 300,
-            child: Text(
-              "Delete Account",
-              style: TextStyle(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                fontSize: 20,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart

@@ -1,185 +0,0 @@
-import 'package:flutter/material.dart';
-
-class MihCardDisplay extends StatefulWidget {
-  final String shopName;
-  final String nickname;
-  final double height;
-  const MihCardDisplay({
-    super.key,
-    required this.shopName,
-    required this.height,
-    required this.nickname,
-  });
-
-  @override
-  State<MihCardDisplay> createState() => _MihCardDisplayState();
-}
-
-class _MihCardDisplayState extends State<MihCardDisplay> {
-  Widget? displayLoyaltyCard() {
-    switch (widget.shopName.toLowerCase()) {
-      case "apple tree":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png');
-      case "best before":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png');
-      case "checkers":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png');
-      case "clicks":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png');
-      case "cotton:on":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png');
-      case "dis-chem":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png');
-      case "pick n pay":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png');
-      case "shoprite":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png');
-      case "spar":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png');
-      case "woolworths":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png');
-      case "makro":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png');
-      case "fresh stop":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png');
-      case "panarottis":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png');
-      case "shell":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png');
-      case "edgars":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png');
-      case "jet":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png');
-      case "spur":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png');
-      case "infinity":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png');
-      case "eskom":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png');
-      case "+more":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png');
-      case "bp":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png');
-      case "builders warehouse":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png');
-      case "exclusive books":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png');
-      case "pna":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png');
-      case "pq clothing":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png');
-      case "rage":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png');
-      case "sasol":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png');
-      case "tfg group":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png');
-      case "toys r us":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png');
-      case "leroy merlin":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png');
-      case "signature cosmetics & fragrances":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png');
-      case "ok foods":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png');
-      case "choppies":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png');
-      case "boxer":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png');
-      case "carrefour":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png');
-      case "sefalana":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png');
-      case "big save":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png');
-      case "justrite":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png');
-      case "naivas":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png');
-      case "kero":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png');
-      case "auchan":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png');
-      case "woermann brock":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png');
-      case "continente":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png');
-      case "fresmart":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png');
-      case "total energies":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png');
-      case "engen":
-        return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png');
-      default:
-        return null;
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Visibility(
-      visible: displayLoyaltyCard() != null,
-      child: Column(
-        children: [
-          displayLoyaltyCard() != null ? displayLoyaltyCard()! : SizedBox(),
-          FittedBox(
-            child: Text(
-              widget.nickname,
-              textAlign: TextAlign.center,
-              style: const TextStyle(
-                fontSize: 25,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          )
-        ],
-      ),
-    );
-  }
-}

Frontend/lib/mih_packages/patient_manager/pat_profile/components/full_screen_file.dart

@@ -1,364 +0,0 @@
-import 'dart:async';
-
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import '../../../../main.dart';
-import 'package:syncfusion_flutter_core/theme.dart';
-import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
-import "package:universal_html/html.dart" as html;
-import 'package:http/http.dart' as http;
-
-import 'package:printing/printing.dart';
-import 'package:fl_downloader/fl_downloader.dart';
-
-import '../../../../mih_components/mih_layout/mih_action.dart';
-import '../../../../mih_components/mih_layout/mih_body.dart';
-import '../../../../mih_components/mih_layout/mih_header.dart';
-import '../../../../mih_components/mih_layout/mih_layout_builder.dart';
-
-class FullScreenFileViewer extends StatefulWidget {
-  final FileViewArguments arguments;
-  const FullScreenFileViewer({
-    super.key,
-    required this.arguments,
-  });
-
-  @override
-  State<FullScreenFileViewer> createState() => _FullScreenFileViewerState();
-}
-
-class _FullScreenFileViewerState extends State<FullScreenFileViewer> {
-  late PdfViewerController pdfViewerController = PdfViewerController();
-  int currentPageCount = 0;
-  int currentPage = 0;
-  double startZoomLevel = 1.0;
-  double zoomOut = 0;
-
-  int progress = 0;
-  late StreamSubscription progressStream;
-
-  String getExtType(String path) {
-    //print(pdfLink.split(".")[1]);
-    return path.split(".").last;
-  }
-
-  String getFileName(String path) {
-    //print(pdfLink.split(".")[1]);
-    return path.split("/").last;
-  }
-
-  void onPageSelect() {
-    setState(() {
-      currentPage = pdfViewerController.pageNumber;
-    });
-  }
-
-  void printDocument() async {
-    print("Printing ${widget.arguments.path.split("/").last}");
-    http.Response response = await http.get(Uri.parse(widget.arguments.link));
-    var pdfData = response.bodyBytes;
-    Navigator.of(context).pushNamed(
-      '/file-veiwer/print-preview',
-      arguments: pdfData,
-    );
-    // Navigator.of(context).push(
-    //   MaterialPageRoute(
-    //     builder: (context) => PdfPreview(
-    //       initialPageFormat: PdfPageFormat.a4,
-    //       build: (format) => pdfData,
-    //     ),
-    //   ),
-    // );
-    // try {
-    //   await Printing.layoutPdf(
-    //       onLayout: (PdfPageFormat format) async => pdfData);
-    // } on Exception catch (_) {
-    //   print("Print Error");
-    // }
-  }
-
-  void shareDocument() async {
-    http.Response response = await http.get(Uri.parse(widget.arguments.link));
-    var pdfData = response.bodyBytes;
-    await Printing.sharePdf(
-        bytes: pdfData, filename: widget.arguments.path.split("/").last);
-  }
-
-  MIHAction getActionButton() {
-    return MIHAction(
-      icon: const Icon(
-        Icons.fullscreen_exit,
-      ),
-      iconSize: 35,
-      onTap: () {
-        Navigator.pop(context);
-      },
-    );
-  }
-
-  MIHHeader getHeader(double width) {
-    bool isPDF;
-    if (getExtType(widget.arguments.path).toLowerCase() == "pdf") {
-      isPDF = true;
-    } else {
-      isPDF = false;
-    }
-    return MIHHeader(
-      headerAlignment: MainAxisAlignment.end,
-      headerItems: [
-        Visibility(
-          visible: isPDF,
-          child: IconButton(
-            iconSize: 30,
-            padding: const EdgeInsets.all(0),
-            onPressed: () {
-              pdfViewerController.previousPage();
-              //print(pdfViewerController.);
-              //if (pdfViewerController.pageNumber > 1) {
-              setState(() {
-                currentPage = pdfViewerController.pageNumber;
-              });
-              // }
-            },
-            icon: Icon(
-              Icons.arrow_back,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-        ),
-        Visibility(
-          visible: isPDF,
-          child: Text(
-            "$currentPage / $currentPageCount",
-            style: const TextStyle(fontSize: 20),
-          ),
-        ),
-        Visibility(
-          visible: isPDF,
-          child: IconButton(
-            iconSize: 30,
-            padding: const EdgeInsets.all(0),
-            onPressed: () {
-              pdfViewerController.nextPage();
-              //print(pdfViewerController.pageNumber);
-              //if (pdfViewerController.pageNumber < currentPageCount) {
-              setState(() {
-                currentPage = pdfViewerController.pageNumber;
-              });
-              //}
-            },
-            icon: Icon(
-              Icons.arrow_forward,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-        ),
-        Visibility(
-          visible: isPDF,
-          child: IconButton(
-            iconSize: 30,
-            padding: const EdgeInsets.all(0),
-            onPressed: () {
-              if (zoomOut > 0) {
-                setState(() {
-                  zoomOut = zoomOut - 100;
-                });
-              } else {
-                setState(() {
-                  pdfViewerController.zoomLevel = startZoomLevel + 0.25;
-                  startZoomLevel = pdfViewerController.zoomLevel;
-                });
-              }
-            },
-            icon: Icon(
-              Icons.zoom_in,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-        ),
-        Visibility(
-          visible: isPDF,
-          child: IconButton(
-            iconSize: 30,
-            padding: const EdgeInsets.all(0),
-            onPressed: () {
-              if (pdfViewerController.zoomLevel > 1) {
-                setState(() {
-                  pdfViewerController.zoomLevel = startZoomLevel - 0.25;
-                  startZoomLevel = pdfViewerController.zoomLevel;
-                });
-              } else {
-                if (zoomOut < (width - 100)) {
-                  setState(() {
-                    zoomOut = zoomOut + 100;
-                  });
-                }
-              }
-            },
-            icon: Icon(
-              Icons.zoom_out,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            ),
-          ),
-        ),
-        // IconButton(
-        //   iconSize: 30,
-        //   padding: const EdgeInsets.all(0),
-        //   onPressed: () {
-        //     printDocument();
-        //   },
-        //   icon: Icon(
-        //     Icons.print,
-        //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        //   ),
-        // ),
-        IconButton(
-          iconSize: 30,
-          padding: const EdgeInsets.all(0),
-          onPressed: () {
-            if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") {
-              html.window.open(
-                  widget.arguments.link,
-                  // '${AppEnviroment.baseFileUrl}/mih/$filePath',
-                  'download');
-            } else {
-              nativeFileDownload(
-                widget.arguments.link,
-              );
-            }
-          },
-          icon: Icon(
-            Icons.download,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-        ),
-      ],
-    );
-  }
-
-  MIHBody getBody(double width, double height) {
-    Widget fileViewer;
-    if (getExtType(widget.arguments.path).toLowerCase() == "pdf") {
-      fileViewer = SizedBox(
-        width: width - zoomOut,
-        height: height - 70,
-        child: SfPdfViewerTheme(
-          data: SfPdfViewerThemeData(
-            backgroundColor: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          child: SfPdfViewer.network(
-            widget.arguments.link,
-            controller: pdfViewerController,
-            initialZoomLevel: startZoomLevel,
-            pageSpacing: 2,
-            maxZoomLevel: 5,
-            interactionMode: PdfInteractionMode.pan,
-            onDocumentLoaded: (details) {
-              setState(() {
-                currentPage = pdfViewerController.pageNumber;
-                currentPageCount = pdfViewerController.pageCount;
-              });
-            },
-          ),
-        ),
-      );
-    } else {
-      fileViewer = SizedBox(
-        width: width,
-        height: height - 70,
-        child: InteractiveViewer(
-          maxScale: 5.0,
-          //minScale: 0.,
-          child: Image.network(widget.arguments.link),
-        ),
-      );
-    }
-    return MIHBody(
-      borderOn: false,
-      bodyItems: [
-        fileViewer,
-      ],
-    );
-  }
-
-  void mihLoadingPopUp() {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const Mihloadingcircle();
-      },
-    );
-  }
-
-  void nativeFileDownload(String fileLink) async {
-    var permission = await FlDownloader.requestPermission();
-    if (permission == StoragePermissionStatus.granted) {
-      try {
-        mihLoadingPopUp();
-        await FlDownloader.download(fileLink);
-        Navigator.of(context).pop();
-      } on Exception catch (error) {
-        Navigator.of(context).pop();
-        print(error);
-      }
-    } else {
-      print("denied");
-    }
-  }
-
-  @override
-  void dispose() {
-    pdfViewerController.dispose();
-    progressStream.cancel();
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    //pdfViewerController = widget.arguments.pdfViewerController!;
-    pdfViewerController.addListener(onPageSelect);
-    FlDownloader.initialize();
-    progressStream = FlDownloader.progressStream.listen((event) {
-      if (event.status == DownloadStatus.successful) {
-        setState(() {
-          progress = event.progress;
-        });
-        //Navigator.of(context).pop();
-        print("Progress $progress%: Success Downloading");
-        FlDownloader.openFile(filePath: event.filePath);
-      } else if (event.status == DownloadStatus.failed) {
-        print("Progress $progress%: Error Downloading");
-      } else if (event.status == DownloadStatus.running) {
-        print("Progress $progress%: Download Running");
-      }
-    });
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final Size size = MediaQuery.sizeOf(context);
-    double width = size.width;
-    double height = size.height;
-
-    return MIHLayoutBuilder(
-      actionButton: getActionButton(),
-      header: getHeader(width),
-      secondaryActionButton: null,
-      body: getBody(width, height),
-      actionDrawer: null,
-      secondaryActionDrawer: null,
-      bottomNavBar: null,
-      pullDownToRefresh: false,
-      onPullDown: () async {},
-    );
-  }
-}

Frontend/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart

@@ -1,69 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart';
-import 'package:provider/provider.dart';
-
-class PatientProfileTile extends StatefulWidget {
-  final PatientViewArguments arguments;
-  final double packageSize;
-
-  const PatientProfileTile({
-    super.key,
-    required this.arguments,
-    required this.packageSize,
-  });
-
-  @override
-  State<PatientProfileTile> createState() => _PatientProfileTileState();
-}
-
-class _PatientProfileTileState extends State<PatientProfileTile> {
-  @override
-  Widget build(BuildContext context) {
-    return MihPackageTile(
-      authenticateUser: true,
-      onTap: () async {
-        PatientManagerProvider patientManagerProvider =
-            context.read<PatientManagerProvider>();
-        MzansiProfileProvider profileProvider =
-            context.read<MzansiProfileProvider>();
-        String? app_id = profileProvider.user!.app_id;
-        if (patientManagerProvider.selectedPatient == null) {
-          await MihPatientServices()
-              .getPatientDetails(app_id, patientManagerProvider);
-        }
-        patientManagerProvider.setPersonalMode(true);
-        if (patientManagerProvider.selectedPatient != null) {
-          context.goNamed(
-            'patientProfile',
-          );
-        } else {
-          context.goNamed("patientProfileSetup");
-        }
-        // Navigator.of(context).pushNamed(
-        //   '/patient-profile',
-        //   arguments: widget.arguments,
-        // );
-      },
-      appName: "Patient Profile",
-      appIcon: Icon(
-        MihIcons.patientProfile,
-        color: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        // size: widget.packageSize,
-      ),
-      iconSize: widget.packageSize,
-      primaryColor: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      secondaryColor: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-    );
-  }
-}

Frontend/lib/mih_packages/patient_manager/pat_profile/package_tools/patient_info.dart

@@ -1,472 +0,0 @@
-import 'package:flutter_speed_dial/flutter_speed_dial.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_toggle.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/components/mih_edit_patient_details_window.dart';
-import 'package:provider/provider.dart';
-
-class PatientInfo extends StatefulWidget {
-  const PatientInfo({
-    super.key,
-  });
-
-  @override
-  State<PatientInfo> createState() => _PatientInfoState();
-}
-
-class _PatientInfoState extends State<PatientInfo> {
-  final idController = TextEditingController();
-  final fnameController = TextEditingController();
-  final lnameController = TextEditingController();
-  final cellController = TextEditingController();
-  final emailController = TextEditingController();
-  final medNoController = TextEditingController();
-  final medNameController = TextEditingController();
-  final medSchemeController = TextEditingController();
-  final addressController = TextEditingController();
-  final medAidController = TextEditingController();
-  final medMainMemController = TextEditingController();
-  final medAidCodeController = TextEditingController();
-  final _formKey = GlobalKey<FormState>();
-  double textFieldWidth = 300;
-  late String medAid;
-  late bool medAidPosition;
-
-  Widget getPatientDetailsField() {
-    return Center(
-      child: Wrap(
-        spacing: 10,
-        runSpacing: 10,
-        children: [
-          SizedBox(
-            width: textFieldWidth,
-            child: MihTextFormField(
-              // width: textFieldWidth,
-              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              controller: idController,
-              multiLineInput: false,
-              requiredText: true,
-              readOnly: true,
-              hintText: "ID No.",
-              // validator: (value) {
-              //   return MihValidationServices().isEmpty(value);
-              // },
-            ),
-          ),
-          SizedBox(
-            width: textFieldWidth,
-            child: MihTextFormField(
-              // width: textFieldWidth,
-              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              controller: fnameController,
-              multiLineInput: false,
-              requiredText: true,
-              readOnly: true,
-              hintText: "First Name",
-            ),
-          ),
-          SizedBox(
-            width: textFieldWidth,
-            child: MihTextFormField(
-              // width: textFieldWidth,
-              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              controller: lnameController,
-              multiLineInput: false,
-              requiredText: true,
-              hintText: "Surname",
-              readOnly: true,
-            ),
-          ),
-          SizedBox(
-            width: textFieldWidth,
-            child: MihTextFormField(
-              // width: textFieldWidth,
-              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              controller: cellController,
-              multiLineInput: false,
-              requiredText: true,
-              readOnly: true,
-              hintText: "Cell No.",
-            ),
-          ),
-          SizedBox(
-            width: textFieldWidth,
-            child: MihTextFormField(
-              // width: textFieldWidth,
-              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              controller: emailController,
-              multiLineInput: false,
-              requiredText: true,
-              readOnly: true,
-              hintText: "Email",
-            ),
-          ),
-          SizedBox(
-            width: textFieldWidth,
-            child: MihTextFormField(
-              // width: textFieldWidth,
-              height: 100,
-              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              inputColor: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              controller: addressController,
-              multiLineInput: true,
-              requiredText: true,
-              readOnly: true,
-              hintText: "Address",
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget getMedAidDetailsFields() {
-    List<Widget> medAidDet = [];
-    medAidDet.add(
-      SizedBox(
-        width: textFieldWidth,
-        child: MihToggle(
-          hintText: "Medical Aid",
-          initialPostion: medAidPosition,
-          fillColor: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          secondaryFillColor: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          readOnly: true,
-          onChange: (value) {
-            if (value) {
-              setState(() {
-                medAidController.text = "Yes";
-                medAidPosition = value;
-              });
-            } else {
-              setState(() {
-                medAidController.text = "No";
-                medAidPosition = value;
-              });
-            }
-          },
-        ),
-        // MihTextFormField(
-        //   // width: textFieldWidth,
-        //   fillColor: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        //   inputColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        //   controller: medAidController,
-        //   multiLineInput: false,
-        //   requiredText: true,
-        //   readOnly: true,
-        //   hintText: "Medical Aid",
-        // ),
-      ),
-    );
-    bool req;
-    if (medAid == "Yes") {
-      req = true;
-    } else {
-      req = false;
-    }
-    medAidDet.addAll([
-      Visibility(
-        visible: req,
-        child: SizedBox(
-          width: textFieldWidth,
-          child: MihTextFormField(
-            // width: textFieldWidth,
-            fillColor: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            inputColor: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            controller: medMainMemController,
-            multiLineInput: false,
-            requiredText: true,
-            readOnly: true,
-            hintText: "Main Member",
-          ),
-        ),
-      ),
-      Visibility(
-        visible: req,
-        child: SizedBox(
-          width: textFieldWidth,
-          child: MihTextFormField(
-            // width: textFieldWidth,
-            fillColor: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            inputColor: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            controller: medNoController,
-            multiLineInput: false,
-            requiredText: true,
-            readOnly: true,
-            hintText: "No.",
-          ),
-        ),
-      ),
-      Visibility(
-        visible: req,
-        child: SizedBox(
-          width: textFieldWidth,
-          child: MihTextFormField(
-            // width: textFieldWidth,
-            fillColor: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            inputColor: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            controller: medAidCodeController,
-            multiLineInput: false,
-            requiredText: true,
-            readOnly: true,
-            hintText: "Code",
-          ),
-        ),
-      ),
-      Visibility(
-        visible: req,
-        child: SizedBox(
-          width: textFieldWidth,
-          child: MihTextFormField(
-            // width: textFieldWidth,
-            fillColor: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            inputColor: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            controller: medNameController,
-            multiLineInput: false,
-            requiredText: true,
-            readOnly: true,
-            hintText: "Name",
-          ),
-        ),
-      ),
-      Visibility(
-        visible: req,
-        child: SizedBox(
-          width: textFieldWidth,
-          child: MihTextFormField(
-            // width: textFieldWidth,
-            fillColor: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            inputColor: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            controller: medSchemeController,
-            multiLineInput: false,
-            requiredText: true,
-            readOnly: true,
-            hintText: "Plan",
-          ),
-        ),
-      ),
-    ]);
-    return Center(
-      child: Wrap(
-        spacing: 10,
-        runSpacing: 10,
-        children: medAidDet,
-      ),
-    );
-  }
-
-  void initialiseControllers(PatientManagerProvider patientManagerProvider) {
-    idController.text = patientManagerProvider.selectedPatient!.id_no;
-    fnameController.text = patientManagerProvider.selectedPatient!.first_name;
-    lnameController.text = patientManagerProvider.selectedPatient!.last_name;
-    cellController.text = patientManagerProvider.selectedPatient!.cell_no;
-    emailController.text = patientManagerProvider.selectedPatient!.email;
-    medNameController.text =
-        patientManagerProvider.selectedPatient!.medical_aid_name;
-    medNoController.text =
-        patientManagerProvider.selectedPatient!.medical_aid_no;
-    medSchemeController.text =
-        patientManagerProvider.selectedPatient!.medical_aid_scheme;
-    addressController.text = patientManagerProvider.selectedPatient!.address;
-    medAidController.text = patientManagerProvider.selectedPatient!.medical_aid;
-    medMainMemController.text =
-        patientManagerProvider.selectedPatient!.medical_aid_main_member;
-    medAidCodeController.text =
-        patientManagerProvider.selectedPatient!.medical_aid_code;
-    medAid = patientManagerProvider.selectedPatient!.medical_aid;
-    if (medAid == "Yes") {
-      medAidPosition = true;
-    } else {
-      medAidPosition = false;
-    }
-  }
-
-  void showEditPatientWindow() {
-    showDialog(
-        context: context,
-        builder: (context) {
-          return MihEditPatientDetailsWindow();
-        });
-  }
-
-  @override
-  void dispose() {
-    idController.dispose();
-    fnameController.dispose();
-    lnameController.dispose();
-    cellController.dispose();
-    emailController.dispose();
-    medNameController.dispose();
-    medNoController.dispose();
-    medSchemeController.dispose();
-    addressController.dispose();
-    medAidController.dispose();
-    medMainMemController.dispose();
-    medAidCodeController.dispose();
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    double screenWidth = MediaQuery.of(context).size.width;
-    return MihPackageToolBody(
-      borderOn: false,
-      innerHorizontalPadding: 10,
-      bodyItem: getBody(screenWidth),
-    );
-  }
-
-  Widget getBody(double width) {
-    return Consumer2<MzansiProfileProvider, PatientManagerProvider>(
-      builder: (BuildContext context, MzansiProfileProvider profileProvider,
-          PatientManagerProvider patientManagerProvider, Widget? child) {
-        initialiseControllers(patientManagerProvider);
-        return Stack(
-          children: [
-            MihSingleChildScroll(
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  MihForm(
-                    formKey: _formKey,
-                    formFields: [
-                      Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          //crossAxisAlignment: ,
-                          children: [
-                            Text(
-                              "Personal",
-                              textAlign: TextAlign.center,
-                              style: TextStyle(
-                                fontSize: 25,
-                                fontWeight: FontWeight.bold,
-                                color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
-                              ),
-                            ),
-                          ]),
-                      Divider(
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark")),
-                      const SizedBox(height: 10),
-                      getPatientDetailsField(),
-                      const SizedBox(height: 10),
-                      Center(
-                        child: Text(
-                          "Medical Aid",
-                          textAlign: TextAlign.center,
-                          style: TextStyle(
-                            fontSize: 25,
-                            fontWeight: FontWeight.bold,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                          ),
-                        ),
-                      ),
-                      Divider(
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark")),
-                      const SizedBox(height: 10),
-                      getMedAidDetailsFields(),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-            Visibility(
-              visible: patientManagerProvider.personalMode,
-              child: Positioned(
-                right: 10,
-                bottom: 10,
-                child: MihFloatingMenu(
-                  icon: Icons.add,
-                  animatedIcon: AnimatedIcons.menu_close,
-                  children: [
-                    SpeedDialChild(
-                      child: Icon(
-                        Icons.edit,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                      ),
-                      label: "Edit Profile",
-                      labelBackgroundColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      labelStyle: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        fontWeight: FontWeight.bold,
-                      ),
-                      backgroundColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      onTap: () {
-                        // context.goNamed(
-                        //   'patientProfileEdit',
-                        //   extra: PatientEditArguments(
-                        //     profileProvider.user!,
-                        //     patientManagerProvider.selectedPatient!,
-                        //   ),
-                        // );
-                        showEditPatientWindow();
-                      },
-                    )
-                  ],
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}

Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart

@@ -1,144 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart';
-import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tools/patient_claim_or_statement.dart';
-import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tools/patient_consultation.dart';
-import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tools/patient_documents.dart';
-import 'package:mzansi_innovation_hub/mih_packages/patient_manager/pat_profile/package_tools/patient_info.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart';
-import 'package:provider/provider.dart';
-
-class PatientProfile extends StatefulWidget {
-  const PatientProfile({
-    super.key,
-  });
-
-  @override
-  State<PatientProfile> createState() => _PatientProfileState();
-}
-
-class _PatientProfileState extends State<PatientProfile> {
-  bool isLoading = true;
-
-  Future<void> initialisePatientData() async {
-    setState(() {
-      isLoading = true;
-    });
-    PatientManagerProvider patientManagerProvider =
-        context.read<PatientManagerProvider>();
-    if (patientManagerProvider.selectedPatient != null) {
-      await MihPatientServices()
-          .getPatientConsultationNotes(patientManagerProvider);
-      await MihPatientServices().getPatientDocuments(patientManagerProvider);
-      await MIHClaimStatementGenerationApi.getClaimStatementFilesByPatient(
-          patientManagerProvider);
-    }
-    setState(() {
-      isLoading = false;
-    });
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      initialisePatientData();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex:
-          context.watch<PatientManagerProvider>().patientProfileIndex,
-      onIndexChange: (newValue) {
-        context.read<PatientManagerProvider>().setPatientProfileIndex(newValue);
-      },
-    );
-  }
-
-  MihPackageAction getAction() {
-    PatientManagerProvider patientManagerProvider =
-        context.read<PatientManagerProvider>();
-    return MihPackageAction(
-      icon: const Icon(Icons.arrow_back),
-      iconSize: 35,
-      onTap: () {
-        patientManagerProvider.setPatientProfileIndex(0);
-        if (!patientManagerProvider.personalMode) {
-          context.pop();
-        } else {
-          context.goNamed(
-            'mihHome',
-          );
-        }
-        FocusScope.of(context).unfocus();
-      },
-    );
-  }
-
-  MihPackageTools getTools() {
-    PatientManagerProvider patientManagerProvider =
-        context.read<PatientManagerProvider>();
-    Map<Widget, void Function()?> temp = {};
-    temp[const Icon(Icons.perm_identity)] = () {
-      patientManagerProvider.setPatientProfileIndex(0);
-    };
-    temp[const Icon(Icons.article_outlined)] = () {
-      patientManagerProvider.setPatientProfileIndex(1);
-    };
-    temp[const Icon(Icons.file_present)] = () {
-      patientManagerProvider.setPatientProfileIndex(2);
-    };
-    temp[const Icon(Icons.file_open_outlined)] = () {
-      patientManagerProvider.setPatientProfileIndex(3);
-    };
-    return MihPackageTools(
-      tools: temp,
-      selcetedIndex: patientManagerProvider.patientProfileIndex,
-    );
-  }
-
-  List<Widget> getToolBody() {
-    if (isLoading) {
-      return [
-        Center(
-          child: Mihloadingcircle(),
-        ),
-      ];
-    }
-    PatientManagerProvider patientManagerProvider =
-        context.read<PatientManagerProvider>();
-    if (patientManagerProvider.selectedPatient == null) {
-      return [
-        const SizedBox(),
-      ];
-    }
-    List<Widget> toolBodies = [
-      PatientInfo(),
-      PatientConsultation(),
-      PatientDocuments(),
-      PatientClaimOrStatement(),
-    ];
-    return toolBodies;
-  }
-
-  List<String> getToolTitle() {
-    List<String> toolTitles = [
-      "Details",
-      "Notes",
-      "Documents",
-      "Claims",
-    ];
-    return toolTitles;
-  }
-}

Frontend/lib/mih_services/mih_alert_services.dart

@@ -1,127 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-
-class MihAlertServices {
-  void formNotFilledCompletely(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.warning_amber_rounded,
-            size: 150,
-            color: MihColors.getRedColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: "Oops! Looks like some fields are missing.",
-          alertBody: Column(
-            children: [
-              Text(
-                "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.",
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-              RichText(
-                text: TextSpan(
-                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    fontSize: 15,
-                    fontWeight: FontWeight.bold,
-                  ),
-                  children: <TextSpan>[
-                    TextSpan(
-                        text: "Here's a quick tip: ",
-                        style: TextStyle(
-                            fontStyle: FontStyle.italic,
-                            color: MihColors.getRedColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"))),
-                    const TextSpan(
-                        text:
-                            "Look for fields without the \"(Optional)\" indicator next to them, as these are mandatory."),
-                  ],
-                ),
-              ),
-            ],
-          ),
-          alertColour: MihColors.getRedColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-      },
-    );
-  }
-
-  void successAlert(String title, String message, BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.check_circle_outline_rounded,
-            size: 150,
-            color: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: title,
-          alertBody: Column(
-            children: [
-              Text(
-                message,
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-            ],
-          ),
-          alertColour: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-      },
-    );
-  }
-
-  void errorAlert(String title, String message, BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MihPackageAlert(
-          alertIcon: Icon(
-            Icons.warning_amber_rounded,
-            size: 150,
-            color: MihColors.getRedColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-          ),
-          alertTitle: title,
-          alertBody: Column(
-            children: [
-              Text(
-                message,
-                style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  fontSize: 15,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              const SizedBox(height: 25),
-            ],
-          ),
-          alertColour: MihColors.getRedColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        );
-      },
-    );
-  }
-}

Frontend/lib/mih_services/mih_authentication_services.dart

@@ -1,202 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-// import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
-import 'package:supertokens_flutter/http.dart' as http;
-// import 'package:supertokens_flutter/supertokens.dart';
-
-class MihAuthenticationServices {
-  final baseAPI = AppEnviroment.baseApiUrl;
-
-  // Future<void> signUserUp(
-  //   TextEditingController emailController,
-  //   TextEditingController passwordController,
-  //   TextEditingController confirmPasswordController,
-  //   BuildContext context,
-  // ) async {
-  //   showDialog(
-  //     context: context,
-  //     builder: (context) {
-  //       return const Mihloadingcircle();
-  //     },
-  //   );
-  //   try {
-  //     Uri uri = Uri.parse(
-  //         "$baseAPI/auth/emailpassword/email/exists?email=${emailController.text}");
-  //     var response = await http.get(uri);
-  //     if (response.statusCode == 200) {
-  //       var userExists = jsonDecode(response.body);
-  //       if (userExists["exists"]) {
-  //         Navigator.of(context).pop();
-  //         signUpError(context);
-  //       } else {
-  //         var response2 = await http.post(
-  //           Uri.parse("$baseAPI/auth/signup"),
-  //           body:
-  //               '{"formFields": [{"id": "email","value": "${emailController.text}"}, {"id": "password","value": "${passwordController.text}"}]}',
-  //           headers: {
-  //             'Content-type': 'application/json',
-  //             'Accept': 'application/json',
-  //             "Authorization": "leatucczyixqwkqqdrhayiwzeofkltds"
-  //           },
-  //         );
-  //         //print("response 2: ${response2.statusCode}");
-  //         if (response2.statusCode == 200) {
-  //           //print("response 2: ${response2.body}");
-  //           var userCreated = jsonDecode(response2.body);
-  //           //print("Created user $userCreated");
-  //           if (userCreated["status"] == "OK") {
-  //             //print("Here1");
-  //             //Creat user in db
-  //             String uid = await SuperTokens.getUserId();
-  //             //print("uid: $uid");
-  //             await MihUserServices()
-  //                 .createUser(emailController.text, uid, context);
-  //             // addUserAPICall(emailController.text, uid);
-  //             Navigator.of(context).pop();
-  //             //print("Here1");
-  //           } else if (userCreated["status"] == "FIELD_ERROR") {
-  //             Navigator.of(context).pop();
-  //             passwordReqError(context);
-  //           } else {
-  //             Navigator.of(context).pop();
-  //             internetConnectionPopUp(context);
-  //           }
-  //         }
-  //       }
-  //     }
-  //   } on Exception catch (error) {
-  //     Navigator.of(context).pop();
-  //     loginError(error.toString(), context);
-  //     emailController.clear();
-  //     passwordController.clear();
-  //     confirmPasswordController.clear();
-  //   }
-  // }
-
-  Future<bool> signUserIn(
-    String email,
-    String password,
-    BuildContext context,
-  ) async {
-    //var _backgroundColor = Colors.transparent;
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const Mihloadingcircle();
-      },
-    );
-    var response = await http.post(
-      Uri.parse("$baseAPI/auth/signin"),
-      body:
-          '{"formFields": [{"id": "email","value": "$email"}, {"id": "password","value": "$password"}]}',
-      headers: {
-        'Content-type': 'application/json',
-        'Accept': 'application/json',
-        "Authorization": "leatucczyixqwkqqdrhayiwzeofkltds"
-      },
-    );
-    if (response.statusCode == 200) {
-      var userSignedin = jsonDecode(response.body);
-      if (userSignedin["status"] == "OK") {
-        context.pop();
-        return true;
-      } else {
-        context.pop();
-        return false;
-      }
-    } else {
-      return false;
-    }
-  }
-
-  Future<bool> forgotPassword(
-    String email,
-  ) async {
-    var response = await http.post(
-      Uri.parse("$baseAPI/auth/user/password/reset/token"),
-      body: '{"formFields": [{"id": "email","value": "$email"}]}',
-      headers: {
-        'Content-type': 'application/json',
-        'Accept': 'application/json',
-      },
-    );
-    if (response.statusCode == 200) {
-      var userSignedin = jsonDecode(response.body);
-      if (userSignedin["status"] == "OK") {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  }
-
-  Future<bool> resetPassword(
-    String token,
-    String password,
-  ) async {
-    var response = await http.post(
-      Uri.parse("$baseAPI/auth/user/password/reset"),
-      body:
-          '{"method": "token","formFields": [{"id": "password","value": "$password"}],"token": "$token"}',
-      headers: {
-        'Content-type': 'application/json',
-        'Accept': 'application/json',
-      },
-    );
-    if (response.statusCode == 200) {
-      var userSignedin = jsonDecode(response.body);
-      if (userSignedin["status"] == "OK") {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  }
-
-  void internetConnectionPopUp(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const MIHErrorMessage(errorType: "Internet Connection");
-      },
-    );
-  }
-
-  void loginError(String error, BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return AlertDialog(
-          title: Text(error),
-        );
-      },
-    );
-  }
-
-  void passwordReqError(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const MIHErrorMessage(errorType: "Password Requirements");
-      },
-    );
-  }
-
-  void signUpError(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const MIHErrorMessage(errorType: "User Exists");
-      },
-    );
-  }
-}

Frontend/lib/mih_services/mih_service_calls.dart

@@ -1,569 +0,0 @@
-import 'dart:convert';
-import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_my_business_user_services.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_notification_services.dart';
-import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
-import 'package:supertokens_flutter/supertokens.dart';
-import 'package:supertokens_flutter/http.dart' as http;
-import '../mih_components/mih_pop_up_messages/mih_error_message.dart';
-import '../mih_components/mih_pop_up_messages/mih_success_message.dart';
-import '../mih_config/mih_env.dart';
-import '../mih_components/mih_objects/app_user.dart';
-import '../mih_components/mih_objects/arguments.dart';
-import '../mih_components/mih_objects/business.dart';
-import '../mih_components/mih_objects/business_user.dart';
-import '../mih_components/mih_objects/notification.dart';
-import '../mih_components/mih_objects/patient_access.dart';
-import '../mih_components/mih_objects/patient_queue.dart';
-import '../mih_components/mih_objects/patients.dart';
-
-class MIHApiCalls {
-  final baseAPI = AppEnviroment.baseApiUrl;
-
-//================== PROFILE DATA ==========================================================================
-
-  /// This function is used to get profile details of signed in user.
-  ///
-  /// Patameters: int notificationAmount which is used to get number of notifications to show.
-  ///
-  /// Returns HomeArguments which contains:-
-  /// - Signed In user data.
-  /// - Business user belongs to.
-  /// - Business User details.
-  /// - notifications.
-  /// - user profile picture.
-  Future<HomeArguments> getProfile(
-    int notificationAmount,
-    BuildContext context,
-  ) async {
-    AppUser userData;
-    Business? busData;
-    BusinessUser? bUserData;
-    Patient? patientData;
-    List<MIHNotification> notifi;
-    String userPic;
-
-    // Get Userdata
-    var uid = await SuperTokens.getUserId();
-    AppUser? user = await MihUserServices().getUserDetails(context);
-    if (user != null) {
-      userData = user;
-    } else {
-      throw Exception("Error: GetUserData returned null");
-    }
-
-    // Get BusinessUserdata
-    BusinessUser? businessUser =
-        await MihMyBusinessUserServices().getBusinessUser(context);
-    if (businessUser != null) {
-      bUserData = businessUser;
-    } else {
-      bUserData = null;
-    }
-
-    // Get Businessdata
-    Business? business =
-        await MihBusinessDetailsServices().getBusinessDetailsByUser(context);
-    if (business != null) {
-      busData = business;
-    } else {
-      busData = null;
-    }
-
-    //get profile picture
-    if (userData.pro_pic_path == "") {
-      userPic = "";
-    } else {
-      userPic =
-          await MihFileApi.getMinioFileUrl(userData.pro_pic_path, context);
-    }
-
-    //Get Notifications
-    notifi = await MihNotificationApis().getNotificationByUser(
-      uid,
-      notificationAmount,
-    );
-
-    //get patient profile
-    // Patient? patient = await MihPatientServices().getPatientDetails(
-    //   uid,
-    // );
-    // if (patient != null) {
-    //   patientData = patient;
-    // } else {
-    //   patientData = null;
-    // }
-
-    return HomeArguments(
-        userData, bUserData, busData, patientData, notifi, userPic);
-  }
-
-//================== BUSINESS PATIENT/PERSONAL ACCESS ==========================================================================
-
-  /// This function is used to check if a business has access to a specific patients profile.
-  ///
-  /// Patameters: String business_id & app_id (app_id of patient).
-  ///
-  /// Returns List<PatientAccess> (List of access that match the above parameters).
-  static Future<List<PatientAccess>> checkBusinessAccessToPatient(
-    String business_id,
-    String app_id,
-  ) async {
-    final response = await http.get(Uri.parse(
-        "${AppEnviroment.baseApiUrl}/access-requests/patient/check/$business_id?app_id=$app_id"));
-    // var errorCode = response.statusCode.toString();
-    //print(response.body);
-
-    if (response.statusCode == 200) {
-      Iterable l = jsonDecode(response.body);
-      List<PatientAccess> patientAccesses = List<PatientAccess>.from(
-          l.map((model) => PatientAccess.fromJson(model)));
-      return patientAccesses;
-    } else {
-      throw Exception('failed to pull patient access for business');
-    }
-  }
-
-  /// This function is used to UPDATE access the business has.
-  ///
-  /// Patameters:-
-  /// String business_id,
-  /// String business_name,
-  /// String app_id,
-  /// String status,
-  /// String approved_by,
-  /// AppUser signedInUser,
-  /// BuildContext context,
-  ///
-  /// Returns void (on success 200 navigate to /mih-access ).
-  static Future<void> updatePatientAccessAPICall(
-    String business_id,
-    String business_name,
-    String app_id,
-    String status,
-    String approved_by,
-    AppUser signedInUser,
-    BuildContext context,
-  ) async {
-    var response = await http.put(
-      Uri.parse(
-          "${AppEnviroment.baseApiUrl}/access-requests/update/permission/"),
-      headers: <String, String>{
-        "Content-Type": "application/json; charset=UTF-8"
-      },
-      // business_id: str
-      // app_id: str
-      // status: str
-      // approved_by: str
-      body: jsonEncode(<String, dynamic>{
-        "business_id": business_id,
-        "app_id": app_id,
-        "status": status,
-        "approved_by": approved_by,
-      }),
-    );
-    if (response.statusCode == 200) {
-      //Navigator.of(context).pushNamed('/home');
-      Navigator.of(context).pop();
-      Navigator.of(context).pop();
-      Navigator.of(context).pushNamed(
-        '/mih-access',
-        arguments: signedInUser,
-      );
-      String message = "";
-      if (status == "approved") {
-        message =
-            "You've successfully approved the access request! $business_name now has access to your profile forever.";
-      } else {
-        message =
-            "You've declined the access request. $business_name will not have access to your profile.";
-      }
-      successPopUp(message, context);
-    } else {
-      internetConnectionPopUp(context);
-    }
-  }
-
-  /// This function is used to reapply for access to patient.
-  ///
-  /// Patameters:-
-  /// String business_id,
-  /// String app_id,
-  /// BuildContext context,
-  ///
-  /// Returns void (on success 200 navigate to /mih-access ).
-  static Future<void> reapplyPatientAccessAPICall(
-    String business_id,
-    String app_id,
-    bool personalSelected,
-    BusinessArguments args,
-    BuildContext context,
-  ) async {
-    var response = await http.put(
-      Uri.parse("${AppEnviroment.baseApiUrl}/access-requests/re-apply/"),
-      headers: <String, String>{
-        "Content-Type": "application/json; charset=UTF-8"
-      },
-      // business_id: str
-      // app_id: str
-      // status: str
-      // approved_by: str
-      body: jsonEncode(<String, dynamic>{
-        "business_id": business_id,
-        "app_id": app_id,
-      }),
-    );
-    if (response.statusCode == 200) {
-      MihNotificationApis.reapplyAccessRequestNotificationAPICall(
-          app_id, personalSelected, args, context);
-      //notification here
-    } else {
-      internetConnectionPopUp(context);
-    }
-  }
-
-  /// This function is used to create patient access and trigger notification to patient
-  ///
-  /// Patameters:-
-  /// String business_id,
-  /// String app_id,
-  /// String type,
-  /// String requested_by,
-  /// BuildContext context,
-  ///
-  /// Returns void (triggers notification of success 201).
-  static Future<void> addPatientAccessAPICall(
-    String business_id,
-    String app_id,
-    String type,
-    String requested_by,
-    bool personalSelected,
-    BusinessArguments args,
-    BuildContext context,
-  ) async {
-    var response = await http.post(
-      Uri.parse("${AppEnviroment.baseApiUrl}/access-requests/insert/"),
-      headers: <String, String>{
-        "Content-Type": "application/json; charset=UTF-8"
-      },
-      // business_id: str
-      // app_id: str
-      // type: str
-      // requested_by: str
-      body: jsonEncode(<String, dynamic>{
-        "business_id": business_id,
-        "app_id": app_id,
-        "type": type,
-        "requested_by": requested_by,
-      }),
-    );
-    if (response.statusCode == 201) {
-      MihNotificationApis.addAccessRequestNotificationAPICall(
-          app_id, requested_by, personalSelected, args, context);
-    } else {
-      internetConnectionPopUp(context);
-    }
-  }
-
-  //================== PATIENT DATA ==========================================================================
-
-  /// This function is used to fetch a list of patients matching a search criteria
-  ///
-  /// Patameters: String dsearch.
-  ///
-  /// Returns List<Patient>.
-
-  static Future<List<Patient>> fetchPatients(String search) async {
-    final response = await http
-        .get(Uri.parse("${AppEnviroment.baseApiUrl}/patients/search/$search"));
-    if (response.statusCode == 200) {
-      Iterable l = jsonDecode(response.body);
-      List<Patient> patients =
-          List<Patient>.from(l.map((model) => Patient.fromJson(model)));
-      return patients;
-    } else {
-      throw Exception('failed to load patients');
-    }
-  }
-
-  /// This function is used to fetch a patient matching a app_id
-  ///
-  /// Patameters: String app_id.
-  ///
-  /// Returns Patient.
-  static Future<Patient> fetchPatientByAppId(
-    String app_id,
-  ) async {
-    final response = await http
-        .get(Uri.parse("${AppEnviroment.baseApiUrl}/patients/$app_id"));
-    // errorCode = response.statusCode.toString();
-    // errorBody = response.body;
-    //print(response.body);
-    if (response.statusCode == 200) {
-      Patient patient = Patient.fromJson(jsonDecode(response.body));
-      // userData = u;
-      // Iterable l = jsonDecode(response.body);
-      // List<Patient> patients =
-      //     List<Patient>.from(l.map((model) => Patient.fromJson(model)));
-      return patient;
-    } else {
-      throw Exception('failed to load patient');
-    }
-  }
-
-  //================== APPOINTMENT/ PATIENT QUEUE ==========================================================================
-
-  /// This function is used to fetch a list of appointments for a doctors office for a date.
-  ///
-  /// Patameters: String date & business_id .
-  ///
-  /// Returns List<PatientQueue>.
-  static Future<List<PatientQueue>> fetchBusinessAppointmentsAPICall(
-    String date,
-    String business_id,
-  ) async {
-    //print("Patien manager page: $endpoint");
-    final response = await http.get(Uri.parse(
-        "${AppEnviroment.baseApiUrl}/queue/appointments/business/$business_id?date=$date"));
-    // print("Here");
-    // print("Body: ${response.body}");
-    // print("Code: ${response.statusCode}");
-    // errorCode = response.statusCode.toString();
-    // errorBody = response.body;
-
-    if (response.statusCode == 200) {
-      //print("Here1");
-      Iterable l = jsonDecode(response.body);
-      //print("Here2");
-      List<PatientQueue> patientQueue = List<PatientQueue>.from(
-          l.map((model) => PatientQueue.fromJson(model)));
-      //print("Here3");
-      //print(patientQueue);
-      return patientQueue;
-    } else {
-      throw Exception('failed to fatch patient queue');
-    }
-  }
-
-  /// This function is used to fetch a list of appointments for a doctors office for a date.
-  ///
-  /// Patameters: String date & business_id .
-  ///
-  /// Returns List<PatientQueue>.
-  static Future<List<PatientQueue>> fetchPersonalAppointmentsAPICall(
-    String date,
-    String app_id,
-  ) async {
-    //print("Patien manager page: $endpoint");
-    final response = await http.get(Uri.parse(
-        "${AppEnviroment.baseApiUrl}/queue/appointments/personal/$app_id?date=$date"));
-    // print("Here");
-    // print("Body: ${response.body}");
-    // print("Code: ${response.statusCode}");
-    // errorCode = response.statusCode.toString();
-    // errorBody = response.body;
-
-    if (response.statusCode == 200) {
-      //print("Here1");
-      Iterable l = jsonDecode(response.body);
-      //print("Here2");
-      List<PatientQueue> patientQueue = List<PatientQueue>.from(
-          l.map((model) => PatientQueue.fromJson(model)));
-      //print("Here3");
-      //print(patientQueue);
-      return patientQueue;
-    } else {
-      throw Exception('failed to fatch patient queue');
-    }
-  }
-
-  /// This function is used to UPDATE AN appointments for a doctors office for a date.
-  ///
-  /// Patameters:-
-  /// int idpatient_queue,
-  /// String app_id,
-  /// String business_name,
-  /// String origDate_time,
-  /// String date,
-  /// String time,
-  /// BusinessArguments args,
-  /// BuildContext context,
-  ///
-  /// Returns VOID (TRIGGERS NOTIGICATIOPN ON SUCCESS)
-  static Future<void> updateApointmentAPICall(
-    int idpatient_queue,
-    String app_id,
-    bool personalSelected,
-    String business_name,
-    String origDate_time,
-    String date,
-    String time,
-    BusinessArguments args,
-    BuildContext context,
-  ) async {
-    var response = await http.put(
-      Uri.parse("${AppEnviroment.baseApiUrl}/queue/appointment/update/"),
-      headers: <String, String>{
-        "Content-Type": "application/json; charset=UTF-8"
-      },
-      body: jsonEncode(<String, dynamic>{
-        "idpatient_queue": idpatient_queue,
-        "date": date,
-        "time": time,
-      }),
-    );
-    if (response.statusCode == 200) {
-      MihNotificationApis.addRescheduledAppointmentNotificationAPICall(
-        app_id,
-        personalSelected,
-        business_name,
-        origDate_time,
-        date,
-        time,
-        args,
-        context,
-      );
-    } else {
-      internetConnectionPopUp(context);
-    }
-  }
-
-  /// This function is used to Delete/ cancel AN appointments for a doctors office for a date.
-  ///
-  /// Patameters:-
-  /// int idpatient_queue,
-  /// PatientViewArguments args,
-  /// BuildContext context,
-  ///
-  /// Returns VOID (TRIGGERS NOTIGICATIOPN ON SUCCESS)
-  static Future<void> deleteApointmentAPICall(
-    int idpatient_queue,
-    String app_id,
-    bool personalSelected,
-    String date_time,
-    BusinessArguments args,
-    BuildContext context,
-  ) async {
-    var response = await http.delete(
-      Uri.parse("${AppEnviroment.baseApiUrl}/queue/appointment/delete/"),
-      headers: <String, String>{
-        "Content-Type": "application/json; charset=UTF-8"
-      },
-      body: jsonEncode(<String, dynamic>{"idpatient_queue": idpatient_queue}),
-    );
-    //print("Here4");
-    //print(response.statusCode);
-    if (response.statusCode == 200) {
-      MihNotificationApis.addCancelledAppointmentNotificationAPICall(
-        app_id,
-        personalSelected,
-        date_time,
-        args,
-        context,
-      );
-      // Navigator.of(context).pop();
-      // Navigator.of(context).pop();
-      // String message =
-      //     "The note has been deleted successfully. This means it will no longer be visible on your and cannot be used for future appointments.";
-      // successPopUp(message, context);
-    } else {
-      internetConnectionPopUp(context);
-    }
-  }
-
-  /// This function is used to create AN appointments for a doctors office for a date.
-  ///
-  /// Patameters:-
-  /// int idpatient_queue,
-  /// PatientViewArguments args,
-  /// BuildContext context,
-  ///
-  /// Returns VOID (TRIGGERS NOTIGICATIOPN ON SUCCESS)
-  static Future<void> addAppointmentAPICall(
-    String business_id,
-    String app_id,
-    bool personalSelected,
-    String date,
-    String time,
-    BusinessArguments args,
-    BuildContext context,
-  ) async {
-    var response = await http.post(
-      Uri.parse("${AppEnviroment.baseApiUrl}/queue/appointment/insert/"),
-      headers: <String, String>{
-        "Content-Type": "application/json; charset=UTF-8"
-      },
-      body: jsonEncode(<String, dynamic>{
-        "business_id": business_id,
-        "app_id": app_id,
-        "date": date,
-        "time": time,
-      }),
-    );
-    if (response.statusCode == 201) {
-      // Navigator.pushNamed(context, '/patient-manager/patient',
-      //     arguments: widget.signedInUser);
-      // String message =
-      //     "The appointment has been successfully booked!\n\nAn approval request as been sent to the patient.Once the access request has been approved, you will be able to access the patientAccesses profile. ou can check the status of your request in patient queue under the appointment.";
-      //     "${fnameController.text} ${lnameController.text} patient profiole has been successfully added!\n";
-      // Navigator.pop(context);
-      // Navigator.pop(context);
-      // Navigator.pop(context);
-      // setState(() {
-      //   dateController.text = "";
-      //   timeController.text = "";
-      // });
-      // Navigator.of(context).pushNamed(
-      //   '/patient-manager',
-      //   arguments: BusinessArguments(
-      //     widget.arguments.signedInUser,
-      //     widget.arguments.businessUser,
-      //     widget.arguments.business,
-      //   ),
-      // );
-      // successPopUp(message);
-      // String app_id,
-      // String date,
-      // String time,
-      // BusinessArguments args,
-      // BuildContext context,
-      MihNotificationApis.addNewAppointmentNotificationAPICall(
-        app_id,
-        personalSelected,
-        date,
-        time,
-        args,
-        context,
-      );
-    } else {
-      internetConnectionPopUp(context);
-    }
-  }
-
-  //================== POP UPS ==========================================================================
-
-  static void internetConnectionPopUp(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return const MIHErrorMessage(
-          errorType: "Internet Connection",
-        );
-      },
-    );
-  }
-
-  static void successPopUp(String message, BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (context) {
-        return MIHSuccessMessage(
-          successType: "Success",
-          successMessage: message,
-        );
-      },
-    );
-  }
-}