Hasan/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

feature(registration): remove .env

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/presentation/plans/plan_create_screen/bloc/plan_create_bloc.dart
View File

@@ -1,15 +1,16 @@
import 'dart:async';
import 'dart:convert';
import 'package:eatvio_app/app_router.dart';
import 'package:eatvio_app/presentation/plans/plan_create_screen/models/plan_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/plans/plan_create_screen/models/plan_create_model.dart';
import 'package:go_router/go_router.dart';
part 'plan_create_event.dart';
part 'plan_create_state.dart';
@@ -31,21 +32,27 @@ class PlanCreateBloc extends Bloc<PlanCreateEvent, PlanCreateState> {
}
if (state is PlanCreateLoadedState) {
var currentState = state as PlanCreateLoadedState;
emit(currentState.copyWith(
planModelObj: currentState.planModelObj,
name: currentState.name,
details: currentState.details,
),);
emit(
currentState.copyWith(
planModelObj: currentState.planModelObj,
name: currentState.name,
details: currentState.details,
),
);
} else {
emit(PlanCreateLoadedState(
name: TextEditingController(),
details: TextEditingController(),
),);
emit(
PlanCreateLoadedState(
name: TextEditingController(),
details: TextEditingController(),
),
);
}
}
FutureOr<void> _createPlan(
CreatePlan event, Emitter<PlanCreateState> emit,) async {
CreatePlan event,
Emitter<PlanCreateState> emit,
) async {
if (state is PlanCreateLoadedState) {
var currentState = state as PlanCreateLoadedState;
@@ -58,7 +65,8 @@ class PlanCreateBloc extends Bloc<PlanCreateEvent, PlanCreateState> {
AppRouter.navigatorKey.currentContext?.goNamed('planSelectScreen');
} else {
print(
'Failed to create blog post. Status Code: ${response.statusCode} ${response.body}',);
'Failed to create blog post. Status Code: ${response.statusCode} ${response.body}',
);
}
}
}
@@ -67,7 +75,7 @@ class PlanCreateBloc extends Bloc<PlanCreateEvent, PlanCreateState> {
String? name,
String? details,
) async {
String url = '${dotenv.env['SERVER_ROOT']!}/plans/create';
String url = '${baseUrl}/api/plans/create';
final Map<String, dynamic> credentials = {
'name': name,

3
lib/presentation/plans/plan_create_screen/bloc/plan_create_state.dart
View File

@@ -60,6 +60,5 @@ class PlanCreateErrorState extends PlanCreateState {
}
class PlanCreateInitialState extends PlanCreateState {
PlanCreateInitialState({required PlanCreateModel planModelObj})
: super(planModelObj: planModelObj);
PlanCreateInitialState({required PlanCreateModel planModelObj}) : super(planModelObj: planModelObj);
}

49
lib/presentation/plans/plan_create_screen/plan_create_screen.dart
View File

@@ -1,16 +1,18 @@
import 'bloc/plan_create_bloc.dart';
import 'models/plan_create_model.dart';
import 'package:eatvio_app/core/app_export.dart';
import 'package:flutter/material.dart';
import 'bloc/plan_create_bloc.dart';
import 'models/plan_create_model.dart';
class PlanCreateScreen extends StatelessWidget {
const PlanCreateScreen({Key? key}) : super(key: key);
static Widget builder(BuildContext context) {
final planID = ModalRoute.of(context)!.settings.arguments;
return BlocProvider<PlanCreateBloc>(
create: (context) => PlanCreateBloc(PlanCreateState(planModelObj: PlanCreateModel(planID: planID.toString())))..add(PlanCreateInitialEvent()),
child: PlanCreateScreen(),);
create: (context) => PlanCreateBloc(PlanCreateState(planModelObj: PlanCreateModel(planID: planID.toString())))..add(PlanCreateInitialEvent()),
child: PlanCreateScreen(),
);
}
Widget build(BuildContext context) {
@@ -65,24 +67,27 @@ class PlanCreateScreen extends StatelessWidget {
),
],
),
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<PlanCreateBloc>().add(CreatePlan()),
child: Text('Создать'),
),
],),
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<PlanCreateBloc>().add(CreatePlan()),
child: Text('Создать'),
),
],
),
),
],
),

27
lib/presentation/plans/plan_edit_screen/bloc/plan_edit_bloc.dart
View File

@@ -1,18 +1,17 @@
import 'dart:async';
import 'dart:convert';
import 'package:eatvio_app/app_router.dart';
import 'package:eatvio_app/presentation/plans/plan_edit_screen/models/plan_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/plans/plan_edit_screen/models/plan_edit_model.dart';
import 'package:go_router/go_router.dart';
part 'plan_edit_event.dart';
part 'plan_edit_state.dart';
/// A bloc that manages the state of a PlanEdit according to the event that is dispatched to it.
@@ -34,7 +33,7 @@ class PlanEditBloc extends Bloc<PlanEditEvent, PlanEditState> {
}
final String? planID = state.planModelObj?.planID;
final response = await http.get(
Uri.parse(dotenv.env['SERVER_ROOT']! + '/plans/show/$planID'),
Uri.parse(baseUrl + '/api/plans/show/$planID'),
headers: {
'Authorization': 'Bearer $token',
},
@@ -44,18 +43,24 @@ class PlanEditBloc extends Bloc<PlanEditEvent, PlanEditState> {
if (data is Map<String, dynamic>) {
if (state is PlanEditLoadedState) {
var currentState = state as PlanEditLoadedState;
emit(currentState.copyWith(
emit(
currentState.copyWith(
planModelObj: currentState.planModelObj,
plan: currentState.plan,
name: currentState.name,
duration: currentState.duration,
details: currentState.details,),);
details: currentState.details,
),
);
} else {
emit(PlanEditLoadedState(
emit(
PlanEditLoadedState(
plan: data,
name: TextEditingController(text: data['name']),
details: TextEditingController(text: data['details']),
duration: TextEditingController(text: data['duration'].toString()),),);
duration: TextEditingController(text: data['duration'].toString()),
),
);
}
} else {
// Один или несколько ключевых полей отсутствуют, обрабатываем ошибку
@@ -96,7 +101,7 @@ class PlanEditBloc extends Bloc<PlanEditEvent, PlanEditState> {
String? duration,
) async {
int id = plan?['id'];
String url = '${dotenv.env['SERVER_ROOT']!}/plans/update/$id';
String url = '${baseUrl}/api/plans/update/$id';
final Map<String, dynamic> credentials = {
'id': id,

12
lib/presentation/plans/plan_edit_screen/bloc/plan_edit_state.dart
View File

@@ -22,8 +22,13 @@ class PlanEditState extends Equatable {
}
class PlanEditLoadedState extends PlanEditState {
PlanEditLoadedState(
{this.planModelObj, this.plan, this.name, this.details, this.duration,});
PlanEditLoadedState({
this.planModelObj,
this.plan,
this.name,
this.details,
this.duration,
});
PlanEditModel? planModelObj;
Map<String, dynamic>? plan;
@@ -59,6 +64,5 @@ class PlanEditErrorState extends PlanEditState {
}
class PlanEditInitialState extends PlanEditState {
PlanEditInitialState({required PlanEditModel planModelObj})
: super(planModelObj: planModelObj);
PlanEditInitialState({required PlanEditModel planModelObj}) : super(planModelObj: planModelObj);
}

15
lib/presentation/plans/plan_edit_screen/plan_edit_screen.dart
View File

@@ -1,9 +1,9 @@
import 'bloc/plan_edit_bloc.dart';
import 'models/plan_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/plan_edit_bloc.dart';
import 'models/plan_edit_model.dart';
class PlanEditScreen extends StatelessWidget {
const PlanEditScreen({Key? key}) : super(key: key);
@@ -11,8 +11,9 @@ class PlanEditScreen extends StatelessWidget {
static Widget builder(BuildContext context) {
final planID = ModalRoute.of(context)!.settings.arguments;
return BlocProvider<PlanEditBloc>(
create: (context) => PlanEditBloc(PlanEditState(planModelObj: PlanEditModel(planID: planID.toString())))..add(PlanEditInitialEvent()),
child: PlanEditScreen(),);
create: (context) => PlanEditBloc(PlanEditState(planModelObj: PlanEditModel(planID: planID.toString())))..add(PlanEditInitialEvent()),
child: PlanEditScreen(),
);
}
Widget build(BuildContext context) {
@@ -71,7 +72,7 @@ class PlanEditScreen extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
CachedNetworkImage(
imageUrl: dotenv.env['STORAGE_URL']! + (state.plan?['image'] ?? ''),
imageUrl: baseUrl + '/storage/' + (state.plan?['image'] ?? ''),
imageBuilder: (context, imageProvider) => CircleAvatar(
backgroundImage: imageProvider,
radius: 25,

34
lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart
View File

@@ -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/plans/plan_select_screen/models/plan_select_model.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
import '/core/app_export.dart';
import 'package:eatvio_app/presentation/plans/plan_select_screen/models/plan_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 'plan_select_event.dart';
part 'plan_select_state.dart';
@@ -33,7 +33,7 @@ class PlanSelectBloc extends Bloc<PlanSelectEvent, PlanSelectState> {
AppRouter.navigatorKey.currentContext?.goNamed('authScreen');
}
final response = await http.get(
Uri.parse(dotenv.env['SERVER_ROOT']! + '/plans/index'),
Uri.parse(baseUrl + '/api/plans/index'),
);
print('Got response');
if (response.statusCode == 200) {
@@ -44,15 +44,19 @@ class PlanSelectBloc extends Bloc<PlanSelectEvent, PlanSelectState> {
if (state is PlanSelectLoadedState) {
print('Got loaded');
var currentState = state as PlanSelectLoadedState;
emit((currentState).copyWith(
posts: data,
myProfileModelObj: currentState.myProfileModelObj,
),);
emit(
(currentState).copyWith(
posts: data,
myProfileModelObj: currentState.myProfileModelObj,
),
);
} else {
print('Got unloaded');
emit(PlanSelectLoadedState(
posts: data,
),);
emit(
PlanSelectLoadedState(
posts: data,
),
);
}
} else {
// Один или несколько ключевых полей отсутствуют, обрабатываем ошибку

6
lib/presentation/plans/plan_select_screen/bloc/plan_select_state.dart
View File

@@ -12,14 +12,12 @@ class PlanSelectState extends Equatable {
}
class PlanSelectInitialState extends PlanSelectState {
PlanSelectInitialState({required PlanSelectModel myProfileModelObj})
: super(myProfileModelObj: myProfileModelObj);
PlanSelectInitialState({required PlanSelectModel myProfileModelObj}) : super(myProfileModelObj: myProfileModelObj);
}
/// Represents the state of PlanSelect in the application.
class PlanSelectLoadedState extends PlanSelectState {
PlanSelectLoadedState({this.myProfileModelObj, this.posts})
: super(myProfileModelObj: null);
PlanSelectLoadedState({this.myProfileModelObj, this.posts}) : super(myProfileModelObj: null);
PlanSelectModel? myProfileModelObj;
List<dynamic>? posts;

19
lib/presentation/plans/plan_select_screen/plan_select_screen.dart
View File

@@ -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/plan_select_bloc.dart';
import 'models/plan_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 PlanSelectScreen extends StatelessWidget {
static Widget builder(BuildContext context) {
return BlocProvider<PlanSelectBloc>(
create: (context) => PlanSelectBloc(PlanSelectState(myProfileModelObj: PlanSelectModel()))..add(PlanSelectInitialEvent()), child: PlanSelectScreen(),);
create: (context) => PlanSelectBloc(PlanSelectState(myProfileModelObj: PlanSelectModel()))..add(PlanSelectInitialEvent()),
child: PlanSelectScreen(),
);
}
Widget build(BuildContext context) {
@@ -133,7 +134,7 @@ class PlanSelectScreen extends StatelessWidget {
),
child: ListTile(
leading: CachedNetworkImage(
imageUrl: dotenv.env['STORAGE_URL']! + post['image'],
imageUrl: baseUrl + '/storage/' + post['image'],
imageBuilder: (context, imageProvider) => CircleAvatar(
backgroundImage: imageProvider,
radius: 25,

13
lib/presentation/plans/plan_show_screen/bloc/plan_show_bloc.dart
View File

@@ -1,18 +1,17 @@
import 'dart:async';
import 'dart:convert';
import 'package:eatvio_app/app_router.dart';
import 'package:eatvio_app/presentation/plans/plan_show_screen/models/plan_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/plans/plan_show_screen/models/plan_show_model.dart';
import 'package:go_router/go_router.dart';
part 'plan_show_event.dart';
part 'plan_show_state.dart';
/// A bloc that manages the state of a Plan according to the event that is dispatched to it.
@@ -34,7 +33,7 @@ class PlanBloc extends Bloc<PlanEvent, PlanState> {
}
final String? planID = state.planModelObj?.planID;
final response = await http.get(
Uri.parse(dotenv.env['SERVER_ROOT']! + '/plans/show/$planID'),
Uri.parse(baseUrl + '/api/plans/show/$planID'),
headers: {
'Authorization': 'Bearer $token',
},
@@ -70,7 +69,7 @@ class PlanBloc extends Bloc<PlanEvent, PlanState> {
}
final int id = event.id;
final response = await http.post(
Uri.parse(dotenv.env['SERVER_ROOT']! + '/plans/delete/$id'),
Uri.parse(baseUrl + '/api/plans/delete/$id'),
headers: {
'Authorization': 'Bearer $token',
},

6
lib/presentation/plans/plan_show_screen/bloc/plan_show_state.dart
View File

@@ -28,8 +28,7 @@ class PlanLoadedState extends PlanState {
Map<String, dynamic>? plan;
@override
List<Object?> get props => [planModelObj, plan];
PlanLoadedState copyWith(
{PlanModel? planModelObj, Map<String, dynamic>? plan}) {
PlanLoadedState copyWith({PlanModel? planModelObj, Map<String, dynamic>? plan}) {
return PlanLoadedState(
planModelObj: planModelObj ?? this.planModelObj,
plan: plan ?? this.plan,
@@ -47,6 +46,5 @@ class PlanErrorState extends PlanState {
}
class PlanInitialState extends PlanState {
PlanInitialState({required PlanModel planModelObj})
: super(planModelObj: planModelObj);
PlanInitialState({required PlanModel planModelObj}) : super(planModelObj: planModelObj);
}

85
lib/presentation/plans/plan_show_screen/plan_show_screen.dart
View File

@@ -1,12 +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/plan_show_bloc.dart';
import 'models/plan_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 PlanScreen extends StatelessWidget {
const PlanScreen({Key? key}) : super(key: key);
@@ -14,7 +12,9 @@ class PlanScreen extends StatelessWidget {
static Widget builder(BuildContext context) {
final planID = ModalRoute.of(context)!.settings.arguments;
return BlocProvider<PlanBloc>(
create: (context) => PlanBloc(PlanState(planModelObj: PlanModel(planID: planID.toString())))..add(PlanInitialEvent()), child: PlanScreen(),);
create: (context) => PlanBloc(PlanState(planModelObj: PlanModel(planID: planID.toString())))..add(PlanInitialEvent()),
child: PlanScreen(),
);
}
Widget build(BuildContext context) {
@@ -69,43 +69,46 @@ class PlanScreen extends StatelessWidget {
),
],
),
child: Column(mainAxisSize: MainAxisSize.min, children: [
CachedNetworkImage(
imageUrl: dotenv.env['STORAGE_URL']! + (state.plan?['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,
),
),
SizedBox(height: 16.0),
Text(state.plan?['name'], style: CustomTextStyles.titleMediumBlack),
SizedBox(height: 8.0),
Text(
state.plan?['details'],
),
SizedBox(height: 16.0),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
ElevatedButton(
onPressed: () {
// Действие для редактирования
},
child: Text('Редактировать'),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
CachedNetworkImage(
imageUrl: baseUrl + '/storage/' + (state.plan?['image'] ?? ''),
imageBuilder: (context, imageProvider) => CircleAvatar(
backgroundImage: imageProvider,
radius: 25,
),
ElevatedButton(
onPressed: () => context.read<PlanBloc>().add(DeleteEntry(state.plan?['id'])),
child: Text('Удалить'),
placeholder: (context, url) => CircularProgressIndicator(),
errorWidget: (context, url, error) => CircleAvatar(
child: Icon(Icons.person),
backgroundColor: Colors.white,
radius: 25,
),
],
),
],),
),
SizedBox(height: 16.0),
Text(state.plan?['name'], style: CustomTextStyles.titleMediumBlack),
SizedBox(height: 8.0),
Text(
state.plan?['details'],
),
SizedBox(height: 16.0),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
ElevatedButton(
onPressed: () {
// Действие для редактирования
},
child: Text('Редактировать'),
),
ElevatedButton(
onPressed: () => context.read<PlanBloc>().add(DeleteEntry(state.plan?['id'])),
child: Text('Удалить'),
),
],
),
],
),
),
],
),