From d95eac09630194c21b4cfd367e66bae74d0d0a01 Mon Sep 17 00:00:00 2001 From: yaso Date: Thu, 11 Jun 2026 16:10:42 +0200 Subject: [PATCH] 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