diff --git a/lib/bloc.dart b/lib/bloc/bloc.dart similarity index 94% rename from lib/bloc.dart rename to lib/bloc/bloc.dart index c734589..7a72813 100644 --- a/lib/bloc.dart +++ b/lib/bloc/bloc.dart @@ -1,8 +1,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'events.dart'; import 'state.dart'; -import 'character_service.dart'; -import 'character.dart'; +import '../utils/character_service.dart'; +import '../models/character.dart'; import 'dart:async'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/lib/events.dart b/lib/bloc/events.dart similarity index 100% rename from lib/events.dart rename to lib/bloc/events.dart diff --git a/lib/state.dart b/lib/bloc/state.dart similarity index 91% rename from lib/state.dart rename to lib/bloc/state.dart index 0216afe..01dac59 100644 --- a/lib/state.dart +++ b/lib/bloc/state.dart @@ -1,6 +1,6 @@ import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; -import '../character.dart'; // Добавим импорт для Character +import '../models/character.dart'; // Добавим импорт для Character enum HomeStatus { initial, loading, loaded, error } diff --git a/lib/main.dart b/lib/main.dart index bab2434..3a692b8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'bloc.dart'; -import 'events.dart'; -import 'state.dart'; -import 'character_service.dart'; -import 'character.dart'; +import 'bloc/bloc.dart'; +import 'bloc/events.dart'; +import 'bloc/state.dart'; +import 'utils/character_service.dart'; +import 'models/character.dart'; import 'pages/character_detail_page.dart'; void main() { diff --git a/lib/character.dart b/lib/models/character.dart similarity index 100% rename from lib/character.dart rename to lib/models/character.dart diff --git a/lib/pages/character_detail_page.dart b/lib/pages/character_detail_page.dart index 6beffed..47cb339 100644 --- a/lib/pages/character_detail_page.dart +++ b/lib/pages/character_detail_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../character.dart'; // Убедитесь, что путь правильный +import '../models/character.dart'; // Убедитесь, что путь правильный class CharacterDetailPage extends StatelessWidget { final Character character; diff --git a/lib/character_service.dart b/lib/utils/character_service.dart similarity index 97% rename from lib/character_service.dart rename to lib/utils/character_service.dart index 7edb1c3..75e5279 100644 --- a/lib/character_service.dart +++ b/lib/utils/character_service.dart @@ -1,6 +1,6 @@ import 'dart:convert'; import 'package:http/http.dart' as http; -import 'character.dart'; +import '../models/character.dart'; const String baseUrl = 'http://192.168.1.83:5000'; // IP-адрес вместо localhost