From df7847c6665311360c4f774cb4e5dc4b85f2f399 Mon Sep 17 00:00:00 2001 From: yaso Date: Thu, 11 Jun 2026 12:39:51 +0200 Subject: [PATCH 1/6] testing branch protect --- test/test.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test.txt b/test/test.txt index 59e7265e..f54f6d47 100644 --- a/test/test.txt +++ b/test/test.txt @@ -1 +1,3 @@ testing new test branch wth ruleset +testing again + From d95eac09630194c21b4cfd367e66bae74d0d0a01 Mon Sep 17 00:00:00 2001 From: yaso Date: Thu, 11 Jun 2026 16:10:42 +0200 Subject: [PATCH 2/6] remove .env from flutter app and update flutpak --- .../flatpak/za.co.mzansiinnovationhub.mih.yml | 24 +++++++++++++++++-- mih_ui/lib/main_dev.dart | 2 -- mih_ui/lib/main_prod.dart | 2 -- .../package_tools/mih_register.dart | 2 -- .../mih_authentication_services.dart | 2 -- mih_ui/pubspec.lock | 8 ------- mih_ui/pubspec.yaml | 2 -- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml index c72b8eff..86200f15 100644 --- a/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml +++ b/mih_ui/flatpak/za.co.mzansiinnovationhub.mih.yml @@ -11,8 +11,26 @@ 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: @@ -26,8 +44,10 @@ 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 + - flutter build linux --release --no-pub -t lib/main_prod.dart - mkdir -p /app/mih - cp -r "$BUNDLE_PATH"/. /app/mih/ - install -Dm755 flatpak/mih-wrapper.sh /app/bin/mih @@ -36,4 +56,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://git.mzansi-innovation-hub.co.za/yaso_meth/mih-project.git + url: https://github.com/yaso-meth/mih-project.git diff --git a/mih_ui/lib/main_dev.dart b/mih_ui/lib/main_dev.dart index e1c394dd..437c62b9 100644 --- a/mih_ui/lib/main_dev.dart +++ b/mih_ui/lib/main_dev.dart @@ -2,7 +2,6 @@ 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'; @@ -43,7 +42,6 @@ void main() async { debugPrint('APP INSTALLED!'); }); final GoRouter appRouter = MihGoRouter().mihRouter; - await dotenv.load(fileName: ".env"); FlutterNativeSplash.remove(); runApp(MzansiInnovationHub( router: appRouter, diff --git a/mih_ui/lib/main_prod.dart b/mih_ui/lib/main_prod.dart index b7026b50..c8ce2935 100644 --- a/mih_ui/lib/main_prod.dart +++ b/mih_ui/lib/main_prod.dart @@ -2,7 +2,6 @@ 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'; @@ -34,7 +33,6 @@ void main() async { debugPrint('APP INSTALLED!'); }); final GoRouter appRouter = MihGoRouter().mihRouter; - await dotenv.load(fileName: ".env"); FlutterNativeSplash.remove(); runApp(MzansiInnovationHub( router: appRouter, diff --git a/mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_register.dart b/mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_register.dart index 219c1687..b855acea 100644 --- a/mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_register.dart +++ b/mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_register.dart @@ -2,7 +2,6 @@ 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'; @@ -102,7 +101,6 @@ class _MihRegisterState extends State { headers: { 'Content-type': 'application/json', 'Accept': 'application/json', - "Authorization": dotenv.env['SUPERTOKENS_API_KEY'] ?? "", }, ); //print("response 2: ${response2.statusCode}"); diff --git a/mih_ui/lib/mih_services/mih_authentication_services.dart b/mih_ui/lib/mih_services/mih_authentication_services.dart index 9945dcf1..25ffbe14 100644 --- a/mih_ui/lib/mih_services/mih_authentication_services.dart +++ b/mih_ui/lib/mih_services/mih_authentication_services.dart @@ -1,7 +1,6 @@ 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'; @@ -29,7 +28,6 @@ class MihAuthenticationServices { headers: { 'Content-type': 'application/json', 'Accept': 'application/json', - "Authorization": dotenv.env['SUPERTOKENS_API_KEY'] ?? "", }, ); if (response.statusCode == 200) { diff --git a/mih_ui/pubspec.lock b/mih_ui/pubspec.lock index 0271d47e..56090626 100644 --- a/mih_ui/pubspec.lock +++ b/mih_ui/pubspec.lock @@ -678,14 +678,6 @@ 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: diff --git a/mih_ui/pubspec.yaml b/mih_ui/pubspec.yaml index 97bff19e..1d9bc8f4 100644 --- a/mih_ui/pubspec.yaml +++ b/mih_ui/pubspec.yaml @@ -11,8 +11,6 @@ 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 From 3e41acecd71790d3c7a87e21b7ce627f5ef7b541 Mon Sep 17 00:00:00 2001 From: yaso Date: Thu, 11 Jun 2026 16:33:28 +0200 Subject: [PATCH 3/6] final flatpak config --- mih_ui/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/mih_ui/pubspec.yaml b/mih_ui/pubspec.yaml index 1d9bc8f4..72c76f1c 100644 --- a/mih_ui/pubspec.yaml +++ b/mih_ui/pubspec.yaml @@ -79,7 +79,6 @@ 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/ From 06623e00e1b7d5a7cbd39b7bc9faa1ce2682008a Mon Sep 17 00:00:00 2001 From: yaso Date: Thu, 11 Jun 2026 21:17:25 +0200 Subject: [PATCH 4/6] update .desktop --- mih_ui/.gitignore | 2 +- .../share/applications/za.co.mzansiinnovationhub.mih.desktop | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mih_ui/.gitignore b/mih_ui/.gitignore index 844c8fea..8414602b 100644 --- a/mih_ui/.gitignore +++ b/mih_ui/.gitignore @@ -52,4 +52,4 @@ app.*.map.json #Flatpak build files build-dir/ .flatpak-builder/ - +repo/ diff --git a/mih_ui/app/share/applications/za.co.mzansiinnovationhub.mih.desktop b/mih_ui/app/share/applications/za.co.mzansiinnovationhub.mih.desktop index 42f7da21..7978a0fe 100644 --- a/mih_ui/app/share/applications/za.co.mzansiinnovationhub.mih.desktop +++ b/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=mzansi_innovation_hub %u +Exec=mih %u Icon=za.co.mzansiinnovationhub.mih Terminal=false Categories=Utility;Office;ProjectManagement; Keywords=MIH;Mzansi;Innovation;Hub;Profile;Wallet;Calendar;AI; -StartupWMClass=mzansi_innovation_hub +StartupWMClass=mih From aa66033e28193075f7bdadc98b55cf1ec0656b25 Mon Sep 17 00:00:00 2001 From: yaso Date: Thu, 11 Jun 2026 21:54:03 +0200 Subject: [PATCH 5/6] fix wrapper --- mih_ui/flatpak/mih-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mih_ui/flatpak/mih-wrapper.sh b/mih_ui/flatpak/mih-wrapper.sh index 85d6bf04..6b13e767 100644 --- a/mih_ui/flatpak/mih-wrapper.sh +++ b/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/mih" "$@" +exec "$APP/mzansi_innovation_hub" "$@" From f2076676f2e7183703f92de12b663502ccef88a1 Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 12 Jun 2026 11:40:15 +0200 Subject: [PATCH 6/6] forgejo git migraton --- docker-compose.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f6d3e2b..29d49f13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,39 +18,39 @@ services: - ./mih_nginx/letsencrypt:/etc/letsencrypt networks: - mih-network - #============== GITEA ==================================================================== - mih-gitea: - image: gitea/gitea:latest-rootless - container_name: mih-gitea + #============== FORGEJO ==================================================================== + mih-forgejo: + image: codeberg.org/forgejo/forgejo:11 + container_name: mih-forgejo environment: - USER_UID=1000 - USER_GID=1000 - TZ=Africa/Johannesburg - - GITEA__database__DB_TYPE=mysql - - GITEA__database__HOST=mih-gitea-db:3306 - - GITEA__database__NAME=${GITEA_SQL_DB} - - GITEA__database__USER=${GITEA_SQL_USER} - - GITEA__database__PASSWD=${GITEA_SQL_PW} + - FORGEJO__database__DB_TYPE=mysql + - FORGEJO__database__HOST=mih-forgejo-db:3306 + - FORGEJO__database__NAME=${FORGEJO_SQL_DB} + - FORGEJO__database__USER=${FORGEJO_SQL_USER} + - FORGEJO__database__PASSWD=${FORGEJO_SQL_PW} restart: always networks: - mih-network volumes: - - ./mih_git/gitea:/data + - ./mih_git/forgejo:/data ports: - "127.0.0.1:3000:3000" - "127.0.0.1:222:22" depends_on: - mih-gitea-db: + mih-forgejo-db: condition: service_healthy - mih-gitea-db: + mih-forgejo-db: image: mysql:8.0 - container_name: mih-gitea-db + container_name: mih-forgejo-db restart: always environment: - - MYSQL_ROOT_PASSWORD=${GITEA_SQL_ROOT_PW} - - MYSQL_USER=${GITEA_SQL_USER} - - MYSQL_PASSWORD=${GITEA_SQL_PW} - - MYSQL_DATABASE=${GITEA_SQL_DB} + - MYSQL_ROOT_PASSWORD=${FORGEJO_SQL_ROOT_PW} + - MYSQL_USER=${FORGEJO_SQL_USER} + - MYSQL_PASSWORD=${FORGEJO_SQL_PW} + - MYSQL_DATABASE=${FORGEJO_SQL_DB} networks: - mih-network volumes: