feature(registration): remove .env

2024-07-15 17:06:13 +03:00
parent 726b74a236
commit d859a15cfd
188 changed files with 2509 additions and 3147 deletions
--- a/lib/presentation/diets/diet_create_screen/bloc/diet_create_bloc.dart
+++ b/lib/presentation/diets/diet_create_screen/bloc/diet_create_bloc.dart
@@ -1,15 +1,15 @@
 import 'dart:async';
+import 'dart:convert';

 import 'package:eatvio_app/app_router.dart';
+import 'package:eatvio_app/presentation/diets/diet_create_screen/models/diet_create_model.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hive/hive.dart';
 import 'package:http/http.dart' as http;
-import 'dart:convert';
+
 import '/core/app_export.dart';
-import 'package:eatvio_app/presentation/diets/diet_create_screen/models/diet_create_model.dart';

 part 'diet_create_event.dart';
 part 'diet_create_state.dart';
@@ -32,21 +32,27 @@ class DietCreateBloc extends Bloc<DietCreateEvent, DietCreateState> {
    }
    if (state is DietCreateLoadedState) {
      var currentState = state as DietCreateLoadedState;
-      emit(currentState.copyWith(
-        dietModelObj: currentState.dietModelObj,
-        name: currentState.name,
-        details: currentState.details,
-      ),);
+      emit(
+        currentState.copyWith(
+          dietModelObj: currentState.dietModelObj,
+          name: currentState.name,
+          details: currentState.details,
+        ),
+      );
    } else {
-      emit(DietCreateLoadedState(
-        name: TextEditingController(),
-        details: TextEditingController(),
-      ),);
+      emit(
+        DietCreateLoadedState(
+          name: TextEditingController(),
+          details: TextEditingController(),
+        ),
+      );
    }
  }

  FutureOr<void> _createDiet(
-      CreateDiet event, Emitter<DietCreateState> emit,) async {
+    CreateDiet event,
+    Emitter<DietCreateState> emit,
+  ) async {
    if (state is DietCreateLoadedState) {
      var currentState = state as DietCreateLoadedState;

@@ -59,7 +65,8 @@ class DietCreateBloc extends Bloc<DietCreateEvent, DietCreateState> {
        AppRouter.navigatorKey.currentContext?.goNamed('dietSelectScreen');
      } else {
        print(
-            'Failed to create blog post. Status Code: ${response.statusCode} ${response.body}',);
+          'Failed to create blog post. Status Code: ${response.statusCode} ${response.body}',
+        );
      }
    }
  }
@@ -68,7 +75,7 @@ class DietCreateBloc extends Bloc<DietCreateEvent, DietCreateState> {
    String? name,
    String? details,
  ) async {
-    String url = '${dotenv.env['SERVER_ROOT']!}/diets/create';
+    String url = '${baseUrl}/api/diets/create';

    final Map<String, dynamic> credentials = {
      'name': name,
--- a/lib/presentation/diets/diet_create_screen/bloc/diet_create_state.dart
+++ b/lib/presentation/diets/diet_create_screen/bloc/diet_create_state.dart
@@ -60,6 +60,5 @@ class DietCreateErrorState extends DietCreateState {
 }

 class DietCreateInitialState extends DietCreateState {
-  DietCreateInitialState({required DietCreateModel dietModelObj})
-      : super(dietModelObj: dietModelObj);
+  DietCreateInitialState({required DietCreateModel dietModelObj}) : super(dietModelObj: dietModelObj);
 }
--- a/lib/presentation/diets/diet_create_screen/diet_create_screen.dart
+++ b/lib/presentation/diets/diet_create_screen/diet_create_screen.dart
@@ -1,16 +1,18 @@
-import 'bloc/diet_create_bloc.dart';
-import 'models/diet_create_model.dart';
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:flutter/material.dart';

+import 'bloc/diet_create_bloc.dart';
+import 'models/diet_create_model.dart';
+
 class DietCreateScreen extends StatelessWidget {
  const DietCreateScreen({Key? key}) : super(key: key);

  static Widget builder(BuildContext context) {
    final dietID = ModalRoute.of(context)!.settings.arguments;
    return BlocProvider<DietCreateBloc>(
-        create: (context) => DietCreateBloc(DietCreateState(dietModelObj: DietCreateModel(dietID: dietID.toString())))..add(DietCreateInitialEvent()),
-        child: DietCreateScreen(),);
+      create: (context) => DietCreateBloc(DietCreateState(dietModelObj: DietCreateModel(dietID: dietID.toString())))..add(DietCreateInitialEvent()),
+      child: DietCreateScreen(),
+    );
  }

  Widget build(BuildContext context) {
@@ -43,47 +45,52 @@ class DietCreateScreen extends StatelessWidget {
        body: Container(
          width: double.maxFinite,
          decoration: AppDecoration.fillGray,
-          child: ListView(children: [
-            SizedBox(height: 30.v),
-            Container(
-              margin: EdgeInsets.only(
-                left: 16.h,
-                right: 20.h,
-                bottom: 10.h,
+          child: ListView(
+            children: [
+              SizedBox(height: 30.v),
+              Container(
+                margin: EdgeInsets.only(
+                  left: 16.h,
+                  right: 20.h,
+                  bottom: 10.h,
+                ),
+                padding: EdgeInsets.all(12.h),
+                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: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    SizedBox(height: 16.0),
+                    TextFormField(
+                      controller: state.name,
+                      decoration: InputDecoration(labelText: 'Заголовок'),
+                    ),
+                    SizedBox(height: 16.0),
+                    TextFormField(
+                      controller: state.details,
+                      decoration: InputDecoration(labelText: 'Описание'),
+                    ),
+                    SizedBox(height: 16.0),
+                    // Здесь нужно добавить виджет для загрузки картинки
+                    ElevatedButton(
+                      onPressed: () => context.read<DietCreateBloc>().add(CreateDiet()),
+                      child: Text('Создать'),
+                    ),
+                  ],
+                ),
              ),
-              padding: EdgeInsets.all(12.h),
-              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: Column(mainAxisSize: MainAxisSize.min, children: [
-                SizedBox(height: 16.0),
-                TextFormField(
-                  controller: state.name,
-                  decoration: InputDecoration(labelText: 'Заголовок'),
-                ),
-                SizedBox(height: 16.0),
-                TextFormField(
-                  controller: state.details,
-                  decoration: InputDecoration(labelText: 'Описание'),
-                ),
-                SizedBox(height: 16.0),
-                // Здесь нужно добавить виджет для загрузки картинки
-                ElevatedButton(
-                  onPressed: () => context.read<DietCreateBloc>().add(CreateDiet()),
-                  child: Text('Создать'),
-                ),
-              ],),
-            ),
-          ],),
+            ],
+          ),
        ),
      ),
    );
--- a/lib/presentation/diets/diet_edit_screen/bloc/diet_edit_bloc.dart
+++ b/lib/presentation/diets/diet_edit_screen/bloc/diet_edit_bloc.dart
@@ -1,18 +1,17 @@
 import 'dart:async';
+import 'dart:convert';

 import 'package:eatvio_app/app_router.dart';
+import 'package:eatvio_app/presentation/diets/diet_edit_screen/models/diet_edit_model.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hive/hive.dart';
 import 'package:http/http.dart' as http;
-import 'dart:convert';
+
 import '/core/app_export.dart';
-import 'package:eatvio_app/presentation/diets/diet_edit_screen/models/diet_edit_model.dart';

 part 'diet_edit_event.dart';
-
 part 'diet_edit_state.dart';

 /// A bloc that manages the state of a DietEdit according to the event that is dispatched to it.
@@ -34,7 +33,7 @@ class DietEditBloc extends Bloc<DietEditEvent, DietEditState> {
      }
      final String? dietID = state.dietModelObj?.dietID;
      final response = await http.get(
-        Uri.parse(dotenv.env['SERVER_ROOT']! + '/diets/show/$dietID'),
+        Uri.parse(baseUrl + '/api/diets/show/$dietID'),
        headers: {
          'Authorization': 'Bearer $token',
        },
@@ -44,18 +43,24 @@ class DietEditBloc extends Bloc<DietEditEvent, DietEditState> {
        if (data is Map<String, dynamic>) {
          if (state is DietEditLoadedState) {
            var currentState = state as DietEditLoadedState;
-            emit(currentState.copyWith(
+            emit(
+              currentState.copyWith(
                dietModelObj: currentState.dietModelObj,
                diet: currentState.diet,
                name: currentState.name,
                duration: currentState.duration,
-                details: currentState.details,),);
+                details: currentState.details,
+              ),
+            );
          } else {
-            emit(DietEditLoadedState(
+            emit(
+              DietEditLoadedState(
                diet: data,
                name: TextEditingController(text: data['name']),
                details: TextEditingController(text: data['details']),
-                duration: TextEditingController(text: data['duration']),),);
+                duration: TextEditingController(text: data['duration']),
+              ),
+            );
          }
        } else {
          // Один или несколько ключевых полей отсутствуют, обрабатываем ошибку
@@ -96,7 +101,7 @@ class DietEditBloc extends Bloc<DietEditEvent, DietEditState> {
    String? duration,
  ) async {
    int id = diet?['id'];
-    String url = '${dotenv.env['SERVER_ROOT']!}/diets/update/$id';
+    String url = '${baseUrl}/api/diets/update/$id';

    final Map<String, dynamic> credentials = {
      'id': id,
--- a/lib/presentation/diets/diet_edit_screen/bloc/diet_edit_state.dart
+++ b/lib/presentation/diets/diet_edit_screen/bloc/diet_edit_state.dart
@@ -22,8 +22,13 @@ class DietEditState extends Equatable {
 }

 class DietEditLoadedState extends DietEditState {
-  DietEditLoadedState(
-      {this.dietModelObj, this.diet, this.name, this.details, this.duration,});
+  DietEditLoadedState({
+    this.dietModelObj,
+    this.diet,
+    this.name,
+    this.details,
+    this.duration,
+  });

  DietEditModel? dietModelObj;
  Map<String, dynamic>? diet;
@@ -59,6 +64,5 @@ class DietEditErrorState extends DietEditState {
 }

 class DietEditInitialState extends DietEditState {
-  DietEditInitialState({required DietEditModel dietModelObj})
-      : super(dietModelObj: dietModelObj);
+  DietEditInitialState({required DietEditModel dietModelObj}) : super(dietModelObj: dietModelObj);
 }
--- a/lib/presentation/diets/diet_edit_screen/diet_edit_screen.dart
+++ b/lib/presentation/diets/diet_edit_screen/diet_edit_screen.dart
@@ -1,9 +1,9 @@
-import 'bloc/diet_edit_bloc.dart';
-import 'models/diet_edit_model.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:flutter/material.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
+
+import 'bloc/diet_edit_bloc.dart';
+import 'models/diet_edit_model.dart';

 class DietEditScreen extends StatelessWidget {
  const DietEditScreen({Key? key}) : super(key: key);
@@ -11,8 +11,9 @@ class DietEditScreen extends StatelessWidget {
  static Widget builder(BuildContext context) {
    final dietID = ModalRoute.of(context)!.settings.arguments;
    return BlocProvider<DietEditBloc>(
-        create: (context) => DietEditBloc(DietEditState(dietModelObj: DietEditModel(dietID: dietID.toString())))..add(DietEditInitialEvent()),
-        child: DietEditScreen(),);
+      create: (context) => DietEditBloc(DietEditState(dietModelObj: DietEditModel(dietID: dietID.toString())))..add(DietEditInitialEvent()),
+      child: DietEditScreen(),
+    );
  }

  Widget build(BuildContext context) {
@@ -71,7 +72,7 @@ class DietEditScreen extends StatelessWidget {
                  mainAxisSize: MainAxisSize.min,
                  children: [
                    CachedNetworkImage(
-                      imageUrl: dotenv.env['STORAGE_URL']! + (state.diet?['image'] ?? ''),
+                      imageUrl: baseUrl + '/storage/' + (state.diet?['image'] ?? ''),
                      imageBuilder: (context, imageProvider) => CircleAvatar(
                        backgroundImage: imageProvider,
                        radius: 25,
--- a/lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart
+++ b/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 {
          // Один или несколько ключевых полей отсутствуют, обрабатываем ошибку
--- a/lib/presentation/diets/diet_select_screen/bloc/diet_select_state.dart
+++ b/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;
--- a/lib/presentation/diets/diet_select_screen/diet_select_screen.dart
+++ b/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),
+            ),
+          ),
+        );
      },
    );
  }
--- a/lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart
+++ b/lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart
@@ -1,18 +1,17 @@
 import 'dart:async';
+import 'dart:convert';

 import 'package:eatvio_app/app_router.dart';
+import 'package:eatvio_app/presentation/diets/diet_show_screen/models/diet_show_model.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:go_router/go_router.dart';
 import 'package:hive/hive.dart';
 import 'package:http/http.dart' as http;
-import 'dart:convert';
+
 import '/core/app_export.dart';
-import 'package:eatvio_app/presentation/diets/diet_show_screen/models/diet_show_model.dart';
-import 'package:go_router/go_router.dart';

 part 'diet_show_event.dart';
-
 part 'diet_show_state.dart';

 /// A bloc that manages the state of a Diet according to the event that is dispatched to it.
@@ -34,7 +33,7 @@ class DietBloc extends Bloc<DietEvent, DietState> {
      }
      final String? dietID = state.dietModelObj?.dietID;
      final response = await http.get(
-        Uri.parse(dotenv.env['SERVER_ROOT']! + '/diets/show/$dietID'),
+        Uri.parse(baseUrl + '/api/diets/show/$dietID'),
        headers: {
          'Authorization': 'Bearer $token',
        },
@@ -70,7 +69,7 @@ class DietBloc extends Bloc<DietEvent, DietState> {
    }
    final int id = event.id;
    final response = await http.post(
-      Uri.parse(dotenv.env['SERVER_ROOT']! + '/diets/delete/$id'),
+      Uri.parse(baseUrl + '/api/diets/delete/$id'),
      headers: {
        'Authorization': 'Bearer $token',
      },
--- a/lib/presentation/diets/diet_show_screen/bloc/diet_show_state.dart
+++ b/lib/presentation/diets/diet_show_screen/bloc/diet_show_state.dart
@@ -28,8 +28,7 @@ class DietLoadedState extends DietState {
  Map<String, dynamic>? diet;
  @override
  List<Object?> get props => [dietModelObj, diet];
-  DietLoadedState copyWith(
-      {DietModel? dietModelObj, Map<String, dynamic>? diet}) {
+  DietLoadedState copyWith({DietModel? dietModelObj, Map<String, dynamic>? diet}) {
    return DietLoadedState(
      dietModelObj: dietModelObj ?? this.dietModelObj,
      diet: diet ?? this.diet,
@@ -47,6 +46,5 @@ class DietErrorState extends DietState {
 }

 class DietInitialState extends DietState {
-  DietInitialState({required DietModel dietModelObj})
-      : super(dietModelObj: dietModelObj);
+  DietInitialState({required DietModel dietModelObj}) : super(dietModelObj: dietModelObj);
 }
--- a/lib/presentation/diets/diet_show_screen/diet_show_screen.dart
+++ b/lib/presentation/diets/diet_show_screen/diet_show_screen.dart
@@ -1,11 +1,10 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:eatvio_app/core/app_export.dart';
+import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';

 import 'bloc/diet_show_bloc.dart';
 import 'models/diet_show_model.dart';
-import 'package:eatvio_app/core/app_export.dart';
-import 'package:flutter/material.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';

 class DietScreen extends StatelessWidget {
  const DietScreen({Key? key}) : super(key: key);
@@ -13,7 +12,9 @@ class DietScreen extends StatelessWidget {
  static Widget builder(BuildContext context) {
    final dietID = ModalRoute.of(context)!.settings.arguments;
    return BlocProvider<DietBloc>(
-        create: (context) => DietBloc(DietState(dietModelObj: DietModel(dietID: dietID.toString())))..add(DietInitialEvent()), child: DietScreen(),);
+      create: (context) => DietBloc(DietState(dietModelObj: DietModel(dietID: dietID.toString())))..add(DietInitialEvent()),
+      child: DietScreen(),
+    );
  }

  Widget build(BuildContext context) {
@@ -68,44 +69,47 @@ class DietScreen extends StatelessWidget {
                    ),
                  ],
                ),
-                child: Column(mainAxisSize: MainAxisSize.min, children: [
-                  CachedNetworkImage(
-                    imageUrl: dotenv.env['STORAGE_URL']! + (state.diet?['image'] ?? ''),
-                    imageBuilder: (context, imageProvider) => CircleAvatar(
-                      backgroundImage: imageProvider,
-                      radius: 25,
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    CachedNetworkImage(
+                      imageUrl: baseUrl + '/storage/' + (state.diet?['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,
+                      ),
                    ),
-                    placeholder: (context, url) => CircularProgressIndicator(),
-                    errorWidget: (context, url, error) => CircleAvatar(
-                      child: Icon(Icons.person),
-                      backgroundColor: Colors.white,
-                      radius: 25,
+                    SizedBox(height: 16.0),
+                    Text(state.diet?['name'], style: CustomTextStyles.titleMediumBlack),
+                    SizedBox(height: 8.0),
+                    Text(
+                      state.diet?['details'],
                    ),
-                  ),
-                  SizedBox(height: 16.0),
-                  Text(state.diet?['name'], style: CustomTextStyles.titleMediumBlack),
-                  SizedBox(height: 8.0),
-                  Text(
-                    state.diet?['details'],
-                  ),
-                  SizedBox(height: 16.0),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceAround,
-                    children: [
-                      ElevatedButton(
-                        onPressed: () => GoRouter.of(context).goNamed(
-                          'dietEditScreen',
-                          extra: state.diet?['id'].toString(),
+                    SizedBox(height: 16.0),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      children: [
+                        ElevatedButton(
+                          onPressed: () => GoRouter.of(context).goNamed(
+                            'dietEditScreen',
+                            extra: state.diet?['id'].toString(),
+                          ),
+                          child: Text('Редактировать'),
                        ),
-                        child: Text('Редактировать'),
-                      ),
-                      ElevatedButton(
-                        onPressed: () => context.read<DietBloc>().add(DeleteEntry(state.diet?['id'])),
-                        child: Text('Удалить'),
-                      ),
-                    ],
-                  ),
-                ],),
+                        ElevatedButton(
+                          onPressed: () => context.read<DietBloc>().add(DeleteEntry(state.diet?['id'])),
+                          child: Text('Удалить'),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
              ),
            ],
          ),