feature(registration): remove .env

This commit is contained in:
mso7nueh
2024-07-15 17:06:13 +03:00
parent 726b74a236
commit d859a15cfd
188 changed files with 2509 additions and 3147 deletions

View File

@@ -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,

View File

@@ -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);
}

View File

@@ -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,