From ad2c94c29a92fda5219c01548cbe9d1a9483b559 Mon Sep 17 00:00:00 2001
From: whysman <whysman@whystech.com>
Date: Tue, 12 Nov 2024 23:57:33 -0500
Subject: [PATCH] Removing dotenv, using env variables at build

---
 .gitea/workflows/build.yaml | 6 +-----
 lib/main.dart               | 6 +-----
 lib/status_page.dart        | 7 ++++---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 739fb82..fb5f525 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -35,11 +35,7 @@ jobs:
 
       - name: Build Flutter Web
         run: |
-          echo "WS_BASE_URL=${{ secrets.WS_BASE_URL }}" >> assets/.env
-          echo "REST_BASE_URL=${{ secrets.REST_BASE_URL }}" >> assets/.env
-          ls -l assets
-          cat assets/.env
-          /usr/local/flutter/bin/flutter build web --release
+          /usr/local/flutter/bin/flutter build web --release --dart-define=WS_BASE_URL=${{ secrets.WS_BASE_URL }} --dart-define=REST_BASE_URL=${{ secrets.REST_BASE_URL }}
           ls -l 
 
       - name: List Web Build Output
diff --git a/lib/main.dart b/lib/main.dart
index f8103d7..f89ffb7 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,16 +3,12 @@ import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 import 'profile_screen.dart';
 import 'shared_preferences_provider.dart';
 import 'status_page.dart';
 
-Future<void> main() async {
-  WidgetsFlutterBinding.ensureInitialized();
-  // Load environment variables
-  await dotenv.load();
+void main() {
   runApp(
     ChangeNotifierProvider(
       create: (_) => SharedPreferencesProvider(),
diff --git a/lib/status_page.dart b/lib/status_page.dart
index 19e5c76..de5092d 100644
--- a/lib/status_page.dart
+++ b/lib/status_page.dart
@@ -6,7 +6,6 @@ import 'package:provider/provider.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:http/http.dart' as http;
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 import 'shared_preferences_provider.dart';
 
@@ -25,8 +24,10 @@ class StatusPageState extends State<StatusPage> with WidgetsBindingObserver {
   late StreamController<dynamic> controller;
   List<Map<String, dynamic>> messages = [];
   final Map<String, ImageProvider> _imageCache = {};
-  final wsBaseUrl = dotenv.env['WS_BASE_URL'];
-  final restBaseUrl = dotenv.env['REST_BASE_URL'];
+  final wsBaseUrl = String.fromEnvironment('WS_BASE_URL',
+      defaultValue: 'ws://localhost:8080');
+  final restBaseUrl = String.fromEnvironment('REST_BASE_URL',
+      defaultValue: 'http://localhost:8080');
 
   @override
   void initState() {