docker-compose.yml

@@ -18,39 +18,39 @@ services:
       - ./mih_nginx/letsencrypt:/etc/letsencrypt
     networks:
       - mih-network
-  #============== FORGEJO ====================================================================
+  #============== GITEA ====================================================================
-  mih-forgejo:
+  mih-gitea:
-    image: codeberg.org/forgejo/forgejo:11
+    image: gitea/gitea:latest-rootless
-    container_name: mih-forgejo
+    container_name: mih-gitea
     environment:
       - USER_UID=1000
       - USER_GID=1000
       - TZ=Africa/Johannesburg
-      - FORGEJO__database__DB_TYPE=mysql
+      - GITEA__database__DB_TYPE=mysql
-      - FORGEJO__database__HOST=mih-forgejo-db:3306
+      - GITEA__database__HOST=mih-gitea-db:3306
-      - FORGEJO__database__NAME=${FORGEJO_SQL_DB}
+      - GITEA__database__NAME=${GITEA_SQL_DB}
-      - FORGEJO__database__USER=${FORGEJO_SQL_USER}
+      - GITEA__database__USER=${GITEA_SQL_USER}
-      - FORGEJO__database__PASSWD=${FORGEJO_SQL_PW}
+      - GITEA__database__PASSWD=${GITEA_SQL_PW}
     restart: always
     networks:
       - mih-network
     volumes:
-      - ./mih_git/forgejo:/data
+      - ./mih_git/gitea:/data
     ports:
       - "127.0.0.1:3000:3000"
       - "127.0.0.1:222:22"
     depends_on:
-      mih-forgejo-db:
+      mih-gitea-db:
         condition: service_healthy
-  mih-forgejo-db:
+  mih-gitea-db:
     image: mysql:8.0
-    container_name: mih-forgejo-db
+    container_name: mih-gitea-db
     restart: always
     environment:
-      - MYSQL_ROOT_PASSWORD=${FORGEJO_SQL_ROOT_PW}
+      - MYSQL_ROOT_PASSWORD=${GITEA_SQL_ROOT_PW}
-      - MYSQL_USER=${FORGEJO_SQL_USER}
+      - MYSQL_USER=${GITEA_SQL_USER}
-      - MYSQL_PASSWORD=${FORGEJO_SQL_PW}
+      - MYSQL_PASSWORD=${GITEA_SQL_PW}
-      - MYSQL_DATABASE=${FORGEJO_SQL_DB}
+      - MYSQL_DATABASE=${GITEA_SQL_DB}
     networks:
       - mih-network
     volumes:

mih_ui/.gitignore

@@ -52,4 +52,4 @@ app.*.map.json
 #Flatpak build files
 build-dir/
 .flatpak-builder/
-repo/
+

mih_ui/app/share/applications/za.co.mzansiinnovationhub.mih.desktop

@@ -4,9 +4,9 @@ Type=Application
 Name=MIH
 GenericName=Personal and Business Super App
 Comment=Your all-in-one super app for personal and business life in Mzansi
-Exec=mih %u
+Exec=mzansi_innovation_hub %u
 Icon=za.co.mzansiinnovationhub.mih
 Terminal=false
 Categories=Utility;Office;ProjectManagement;
 Keywords=MIH;Mzansi;Innovation;Hub;Profile;Wallet;Calendar;AI;
-StartupWMClass=mih
+StartupWMClass=mzansi_innovation_hub

mih_ui/flatpak/mih-wrapper.sh

@@ -2,4 +2,4 @@
 # Generated by flutpak — https://github.com/o-murphy/flutpak
 APP=/app/mih
 export LD_LIBRARY_PATH="$APP/lib:${LD_LIBRARY_PATH:-}"
-exec "$APP/mzansi_innovation_hub" "$@"
+exec "$APP/mih" "$@"

mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml

@@ -11,26 +11,8 @@ finish-args:
   - --socket=wayland
   - --device=dri
 modules:
-  - name: pdfium
-    buildsystem: simple
-    build-commands:
-      - mkdir -p /app/src/pdfium/
-      - cp -r * /app/src/pdfium/
-    sources:
-      - type: archive
-        url: https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F7881/pdfium-linux-x64.tgz
-        sha256: 1470e21b8b4a3b4ad7f85684e2da11d94f3b69a86d81dee11b9b6709d927ac1d
-        only-arches: [x86_64]
-        strip-components: 0
-      - type: archive
-        url: https://github.com/bblanchon/pdfium-binaries/releases/download/chromium%2F7881/pdfium-linux-arm64.tgz
-        sha256: ee7f7b7d5468958336a818c1cd580bdd20972846b7377b13f9a923d92d1d4674
-        only-arches: [aarch64]
-        strip-components: 0
-
   - name: mih
     buildsystem: simple
-    subdir: mih_ui
     build-options:
       arch:
         x86_64:
@@ -44,10 +26,8 @@ modules:
       env:
         PUB_CACHE: /run/build/mih/.pub-cache
     build-commands:
-      - mkdir -p "$BUNDLE_PATH/../pdfium-src/"
-      - cp -r /app/src/pdfium/* "$BUNDLE_PATH/../pdfium-src/"
       - flutter pub get --offline
-      - flutter build linux --release --no-pub -t lib/main_prod.dart
+      - flutter build linux --release --no-pub
       - mkdir -p /app/mih
       - cp -r "$BUNDLE_PATH"/. /app/mih/
       - install -Dm755 flatpak/mih-wrapper.sh /app/bin/mih
@@ -56,4 +36,4 @@ modules:
       - install -Dm644 app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png /app/share/icons/hicolor/256x256/apps/za.co.mzansiinnovationhub.mih.png
     sources:
       - type: git
-        url: https://github.com/yaso-meth/mih-project.git
+        url: https://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project.git

mih_ui/lib/main_dev.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_web_plugins/url_strategy.dart'
     if (dart.library.html) 'package:flutter_web_plugins/url_strategy.dart';
@@ -42,6 +43,7 @@ void main() async {
     debugPrint('APP INSTALLED!');
   });
   final GoRouter appRouter = MihGoRouter().mihRouter;
+  await dotenv.load(fileName: ".env");
   FlutterNativeSplash.remove();
   runApp(MzansiInnovationHub(
     router: appRouter,

mih_ui/lib/main_prod.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_web_plugins/url_strategy.dart'
     if (dart.library.html) 'package:flutter_web_plugins/url_strategy.dart';
@@ -33,6 +34,7 @@ void main() async {
     debugPrint('APP INSTALLED!');
   });
   final GoRouter appRouter = MihGoRouter().mihRouter;
+  await dotenv.load(fileName: ".env");
   FlutterNativeSplash.remove();
   runApp(MzansiInnovationHub(
     router: appRouter,

mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_register.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_provider.dart';
@@ -101,6 +102,7 @@ class _MihRegisterState extends State<MihRegister> {
               headers: {
                 'Content-type': 'application/json',
                 'Accept': 'application/json',
+                "Authorization": dotenv.env['SUPERTOKENS_API_KEY'] ?? "",
               },
             );
             //print("response 2: ${response2.statusCode}");

mih_ui/lib/mih_services/mih_authentication_services.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
@@ -28,6 +29,7 @@ class MihAuthenticationServices {
       headers: {
         'Content-type': 'application/json',
         'Accept': 'application/json',
+        "Authorization": dotenv.env['SUPERTOKENS_API_KEY'] ?? "",
       },
     );
     if (response.statusCode == 200) {

mih_ui/pubspec.lock

@@ -678,6 +678,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
+  flutter_dotenv:
+    dependency: "direct main"
+    description:
+      name: flutter_dotenv
+      sha256: d4130c4a43e0b13fefc593bc3961f2cb46e30cb79e253d4a526b1b5d24ae1ce4
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.0"
   flutter_launcher_icons:
     dependency: "direct main"
     description:

mih_ui/pubspec.yaml

@@ -11,6 +11,8 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
+  flutter_dotenv: ^6.0.0
+
   mih_package_toolkit: ^0.0.6
   cupertino_icons: ^1.0.8
   font_awesome_flutter: ^11.0.0
@@ -79,6 +81,7 @@ dev_dependencies:
 flutter:
   uses-material-design: true
   assets:
+    - .env
     - lib/mih_package_components/assets/images/
     - lib/mih_package_components/assets/fonts/
     - lib/mih_package_components/assets/images/loyalty_cards/

test/test.txt

@@ -1,3 +1 @@
 testing new test branch wth ruleset
-testing again
-