feature(registration): remove .env

lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart

@@ -1,17 +1,17 @@
 //import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart';
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:eatvio_app/app_router.dart';
+import 'package:eatvio_app/presentation/diets/diet_select_screen/models/diet_select_model.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import '/core/app_export.dart';
-import 'package:eatvio_app/presentation/diets/diet_select_screen/models/diet_select_model.dart';
-import 'package:http/http.dart' as http;
-import 'dart:convert';
-import 'package:hive/hive.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:image_picker/image_picker.dart';
 import 'package:go_router/go_router.dart';
+import 'package:hive/hive.dart';
+import 'package:http/http.dart' as http;
+import 'package:image_picker/image_picker.dart';
+
+import '/core/app_export.dart';
 
 part 'diet_select_event.dart';
 part 'diet_select_state.dart';
@@ -33,7 +33,7 @@ class DietSelectBloc extends Bloc<DietSelectEvent, DietSelectState> {
         AppRouter.navigatorKey.currentContext?.goNamed('authScreen');
       }
       final response = await http.get(
-        Uri.parse(dotenv.env['SERVER_ROOT']! + '/diets/index'),
+        Uri.parse(baseUrl + '/api/diets/index'),
         headers: {
           'Authorization': 'Bearer $token',
         },
@@ -47,15 +47,19 @@ class DietSelectBloc extends Bloc<DietSelectEvent, DietSelectState> {
           if (state is DietSelectLoadedState) {
             print('Got loaded');
             var currentState = state as DietSelectLoadedState;
-            emit((currentState).copyWith(
-              posts: data,
-              myProfileModelObj: currentState.myProfileModelObj,
-            ),);
+            emit(
+              (currentState).copyWith(
+                posts: data,
+                myProfileModelObj: currentState.myProfileModelObj,
+              ),
+            );
           } else {
             print('Got unloaded');
-            emit(DietSelectLoadedState(
-              posts: data,
-            ),);
+            emit(
+              DietSelectLoadedState(
+                posts: data,
+              ),
+            );
           }
         } else {
           // Один или несколько ключевых полей отсутствуют, обрабатываем ошибку

lib/presentation/diets/diet_select_screen/bloc/diet_select_state.dart

@@ -12,14 +12,12 @@ class DietSelectState extends Equatable {
 }
 
 class DietSelectInitialState extends DietSelectState {
-  DietSelectInitialState({required DietSelectModel myProfileModelObj})
-      : super(myProfileModelObj: myProfileModelObj);
+  DietSelectInitialState({required DietSelectModel myProfileModelObj}) : super(myProfileModelObj: myProfileModelObj);
 }
 
 /// Represents the state of DietSelect in the application.
 class DietSelectLoadedState extends DietSelectState {
-  DietSelectLoadedState({this.myProfileModelObj, this.posts})
-      : super(myProfileModelObj: null);
+  DietSelectLoadedState({this.myProfileModelObj, this.posts}) : super(myProfileModelObj: null);
 
   DietSelectModel? myProfileModelObj;
   List<dynamic>? posts;

lib/presentation/diets/diet_select_screen/diet_select_screen.dart

@@ -1,19 +1,20 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:eatvio_app/core/app_export.dart';
+import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
+import 'package:eatvio_app/widgets/app_bar/appbar_subtitle.dart';
+import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
+import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
 import 'bloc/diet_select_bloc.dart';
 import 'models/diet_select_model.dart';
-import 'package:eatvio_app/core/app_export.dart';
-import 'package:eatvio_app/widgets/app_bar/appbar_subtitle.dart';
-import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
-import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter/material.dart';
 
 class DietSelectScreen extends StatelessWidget {
   static Widget builder(BuildContext context) {
     return BlocProvider<DietSelectBloc>(
-        create: (context) => DietSelectBloc(DietSelectState(myProfileModelObj: DietSelectModel()))..add(DietSelectInitialEvent()), child: DietSelectScreen(),);
+      create: (context) => DietSelectBloc(DietSelectState(myProfileModelObj: DietSelectModel()))..add(DietSelectInitialEvent()),
+      child: DietSelectScreen(),
+    );
   }
 
   Widget build(BuildContext context) {
@@ -118,50 +119,51 @@ class DietSelectScreen extends StatelessWidget {
       itemBuilder: (context, index) {
         final post = state.posts?[index];
         return Container(
-            margin: EdgeInsets.only(bottom: 10),
-            decoration: BoxDecoration(
-              color: Colors.white,
-              borderRadius: const BorderRadius.all(Radius.circular(12)),
-              boxShadow: [
-                BoxShadow(
-                  color: Colors.grey.withOpacity(0.5),
-                  spreadRadius: 2,
-                  blurRadius: 5,
-                  offset: Offset(0, 3),
-                ),
-              ],
+          margin: EdgeInsets.only(bottom: 10),
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: const BorderRadius.all(Radius.circular(12)),
+            boxShadow: [
+              BoxShadow(
+                color: Colors.grey.withOpacity(0.5),
+                spreadRadius: 2,
+                blurRadius: 5,
+                offset: Offset(0, 3),
+              ),
+            ],
+          ),
+          child: ListTile(
+            leading: CachedNetworkImage(
+              imageUrl: baseUrl + '/storage/' + post['image'],
+              imageBuilder: (context, imageProvider) => CircleAvatar(
+                backgroundImage: imageProvider,
+                radius: 25,
+              ),
+              placeholder: (context, url) => CircularProgressIndicator(),
+              errorWidget: (context, url, error) => CircleAvatar(
+                child: Icon(Icons.person),
+                backgroundColor: Colors.white,
+                radius: 25,
+              ),
             ),
-            child: ListTile(
-              leading: CachedNetworkImage(
-                imageUrl: dotenv.env['STORAGE_URL']! + post['image'],
-                imageBuilder: (context, imageProvider) => CircleAvatar(
-                  backgroundImage: imageProvider,
-                  radius: 25,
-                ),
-                placeholder: (context, url) => CircularProgressIndicator(),
-                errorWidget: (context, url, error) => CircleAvatar(
-                  child: Icon(Icons.person),
-                  backgroundColor: Colors.white,
-                  radius: 25,
-                ),
-              ),
-              title: Text(
-                post?['name'] ?? '',
-                style: CustomTextStyles.titleMediumSemiBold,
-              ),
-              subtitle: Text(post?['details'] ?? ''),
+            title: Text(
+              post?['name'] ?? '',
+              style: CustomTextStyles.titleMediumSemiBold,
+            ),
+            subtitle: Text(post?['details'] ?? ''),
+            onTap: () => GoRouter.of(context).goNamed(
+              'dietScreen',
+              extra: post?['id'].toString(),
+            ),
+            trailing: GestureDetector(
               onTap: () => GoRouter.of(context).goNamed(
-                'dietScreen',
+                'dietEditScreen',
                 extra: post?['id'].toString(),
               ),
-              trailing: GestureDetector(
-                onTap: () => GoRouter.of(context).goNamed(
-                  'dietEditScreen',
-                  extra: post?['id'].toString(),
-                ),
-                child: Icon(Icons.edit),
-              ),
-            ),);
+              child: Icon(Icons.edit),
+            ),
+          ),
+        );
       },
     );
   }