From d6dd976a69484e7ed53ddb673b2c318236310e0f Mon Sep 17 00:00:00 2001
From: e32232340-Nadif <e32232340@student.polije.ac.id>
Date: Sat, 14 Feb 2026 23:18:40 +0700
Subject: [PATCH] oke jadi coba

---
 lib/app_view.dart                             | 26 +++++++++----------
 lib/screens/auth/views/sign_up_screen.dart    | 13 +---------
 lib/screens/home/{ => views}/home_screen.dart |  6 ++---
 pubspec.lock                                  |  4 +--
 pubspec.yaml                                  |  7 ++---
 5 files changed, 21 insertions(+), 35 deletions(-)
 rename lib/screens/home/{ => views}/home_screen.dart (98%)

diff --git a/lib/app_view.dart b/lib/app_view.dart
index 8d576c4..3fd5d03 100644
--- a/lib/app_view.dart
+++ b/lib/app_view.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
-// import 'package:flutter_bloc/flutter_bloc.dart';
-// import 'package:klimatologiot/blocs/authentication_bloc/authentication_bloc.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:klimatologiot/blocs/authentication_bloc/authentication_bloc.dart';
 
-import 'package:klimatologiot/screens/home/home_screen.dart';
+import 'package:klimatologiot/screens/auth/views/welcome_screen.dart';
+import 'package:klimatologiot/screens/home/views/home_screen.dart';
 
 class MyAppView extends StatelessWidget {
   const MyAppView({super.key});
@@ -20,16 +21,15 @@ class MyAppView extends StatelessWidget {
           onPrimary: Colors.white
         ),
       ),
-      home: HomeScreen()
-      // home: BlocBuilder<AuthenticationBloc, AuthenticationState>(
-      //   builder: ((context, state){
-      //     if(state.status == AuthenticationStatus.authenticated){
-      //       return HomeScreen();
-      //       } else {
-      //       return WelcomeScreen();
-      //       }
-      //     }),
-      // )
+      home: BlocBuilder<AuthenticationBloc, AuthenticationState>(
+        builder: ((context, state){
+          if(state.status == AuthenticationStatus.authenticated){
+            return HomeScreen();
+            } else {
+            return WelcomeScreen();
+            }
+          }),
+      )
     );
   }
 }
\ No newline at end of file
diff --git a/lib/screens/auth/views/sign_up_screen.dart b/lib/screens/auth/views/sign_up_screen.dart
index 21a71e0..70c9b31 100644
--- a/lib/screens/auth/views/sign_up_screen.dart
+++ b/lib/screens/auth/views/sign_up_screen.dart
@@ -36,23 +36,12 @@ class _SignUpScreenState extends State<SignUpScreen> {
             setState(() {
               signUpRequired = false;
             });
-            // User sudah terdaftar dan auth state akan otomatis update via AuthenticationBloc
-            // Tungur sebentar agar Firestore selesai menyimpan data
-            ScaffoldMessenger.of(context).showSnackBar(
-              const SnackBar(content: Text('Registrasi berhasil! Mengarahkan...')),
-            );
           } else if (state is SignUpProcess) {
             setState(() {
               signUpRequired = true;
             });
           } else if (state is SignUpFailure) {
-            setState(() {
-              signUpRequired = false;
-            });
-            final message = (state as SignUpFailure).message ?? 'Registrasi gagal, silakan coba lagi';
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(content: Text(message)),
-            );
+            return;
           }
         },
         child: Form(
diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/views/home_screen.dart
similarity index 98%
rename from lib/screens/home/home_screen.dart
rename to lib/screens/home/views/home_screen.dart
index 4bb2f06..8a9f75e 100644
--- a/lib/screens/home/home_screen.dart
+++ b/lib/screens/home/views/home_screen.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
-import '../monitoring/evaporasi_monitoring_screen.dart';
-import '../monitoring/wind_speed_monitoring_screen.dart';
-import '../monitoring/air_quality_monitoring_screen.dart';
+import '../../monitoring/evaporasi_monitoring_screen.dart';
+import '../../monitoring/wind_speed_monitoring_screen.dart';
+import '../../monitoring/air_quality_monitoring_screen.dart';
 
 class HomeScreen extends StatelessWidget {
   const HomeScreen({super.key});
diff --git a/pubspec.lock b/pubspec.lock
index 7c518d0..bce6ad9 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -157,10 +157,10 @@ packages:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: "00b74ae680df6b1135bdbea00a7d1fc072a9180b7c3f3702e4b19a9943f5ed7d"
+      sha256: "7ca9a40f4eb85949190e54087be8b4d6ac09dc4c54238d782a34cf1f7c011de9"
       url: "https://pub.dev"
     source: hosted
-    version: "0.66.2"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index f82e774..8b9171e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,11 +7,6 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-<<<<<<< Updated upstream
-=======
-  fl_chart: ^0.66.0
-
->>>>>>> Stashed changes
   firebase_core: ^4.3.0
   firebase_auth: ^6.1.3
   cloud_firestore: ^6.1.1
@@ -23,6 +18,8 @@ dependencies:
   user_repository:
     path: packages/user_repository
   cupertino_icons: ^1.0.8
+  fl_chart: ^1.1.1
+
 dev_dependencies:
   flutter_test:
     sdk: flutter