Merge branch 'feat#71/US10-Gerenciar-area-de-conhecimento' of https:/…

…/github.com/fga-eps-mds/2024.2-ARANDU-APP into feat#71/US10-Gerenciar-area-de-conhecimento

lib/core/di/locator.dart

@@ -3,7 +3,7 @@ import 'package:aranduapp/core/network/token_manager/di/di_auth.dart';
 import 'package:aranduapp/ui/edit_delete_user/di/di_edit_delete_user.dart';
 import 'package:aranduapp/ui/edit_password/di/di_edit_password.dart';
 import 'package:aranduapp/ui/edit_profile/di/di_edit_profile.dart';
-import 'package:aranduapp/ui/home/di/di.dart';
+import 'package:aranduapp/ui/knowledge/di/di.dart';
 import 'package:aranduapp/ui/journey/di/di.dart';
 import 'package:aranduapp/ui/login/di/di_login.dart';
 import 'package:aranduapp/ui/navbar/di/di_navbar.dart';
@@ -36,5 +36,5 @@ void setupLocator() {
   setupJoinSubjectsDI();
   setupTrailsDI();
   setupPagesContentDI();
-  setupHomeDI();
+  setupknowledgeDI();
 }

lib/ui/knowledge/di/di.dart

@@ -0,0 +1,10 @@
+import 'package:aranduapp/ui/knowledge/service/knowledge_service.dart';
+import 'package:aranduapp/ui/knowledge/viewmodel/knowledge_viewmodel.dart';
+import 'package:get_it/get_it.dart';
+
+final GetIt locator = GetIt.instance;
+
+void setupknowledgeDI() {
+  locator.registerLazySingleton(() => KnowledgeService());
+  locator.registerFactory(() => KnowledgeViewmodel());
+}

lib/ui/home/model/home_request.dart → lib/ui/knowledge/model/knowledge_request.dart

@@ -1,21 +1,21 @@
 import 'dart:convert';
 
-class HomeRequest {
+class KnowledgeRequest {
   final String name;
   final String id;
   final String description;
 
-  HomeRequest(
+  KnowledgeRequest(
       {required this.name, required this.id, required this.description});
 
   Map<String, dynamic> toJson() {
     return <String, dynamic>{'name': name, '_id': id};
   }
 
-  factory HomeRequest.fromJsonString(String jsonString) {
+  factory KnowledgeRequest.fromJsonString(String jsonString) {
     final json = jsonDecode(jsonString);
 
-    return HomeRequest(
+    return KnowledgeRequest(
         name: json['name']! as String,
         id: json['_id']! as String,
         description: json["description"]! as String);

lib/ui/home/service/home_service.dart → lib/ui/knowledge/service/knowledge_service.dart

@@ -2,7 +2,7 @@ import 'package:aranduapp/core/log/log.dart';
 import 'package:aranduapp/core/network/studio_maker_api.dart';
 import 'package:dio/dio.dart';
 
-class HomeService {
+class KnowledgeService {
   Future<List<Map<String, dynamic>>?> getKnowledges() async {
     try {
       String path = '/knowledges';

lib/ui/home/view/home_view.dart → lib/ui/knowledge/view/knowledge_view.dart

@@ -1,19 +1,19 @@
-import 'package:aranduapp/ui/home/view/subject_by_knowledges_view.dart';
+import 'package:aranduapp/ui/subjects/view/subjects_view.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:get_it/get_it.dart';
-import 'package:aranduapp/ui/home/viewmodel/home_viewmodel.dart';
+import 'package:aranduapp/ui/knowledge/viewmodel/knowledge_viewmodel.dart';
 import 'package:aranduapp/ui/shared/grafismo.dart';
 
-class HomeView extends StatefulWidget {
-  const HomeView({super.key});
+class KnowledgeView extends StatefulWidget {
+  const KnowledgeView({super.key});
 
   @override
-  State<HomeView> createState() => _HomeViewState();
+  State<KnowledgeView> createState() => _KnowledgeViewState();
 }
 
-class _HomeViewState extends State<HomeView> {
-  final HomeViewModel viewModel = GetIt.instance<HomeViewModel>();
+class _KnowledgeViewState extends State<KnowledgeView> {
+  final KnowledgeViewmodel viewModel = GetIt.instance<KnowledgeViewmodel>();
 
   @override
   void initState() {
@@ -145,12 +145,7 @@ class _HomeViewState extends State<HomeView> {
       onTap: () {
         Navigator.push(
           context,
-          MaterialPageRoute(
-            builder: (context) => subjectsByKnowledgesView(
-              knowledgeId: item['_id'].toString(),
-              subjectName: item['name'].toString(),
-            ),
-          ),
+          MaterialPageRoute(builder: (context) => const Subject()),
         );
       },
       borderRadius: BorderRadius.circular(4.0),

lib/ui/home/viewmodel/home_viewmodel.dart → lib/ui/knowledge/viewmodel/knowledge_viewmodel.dart

@@ -1,20 +1,20 @@
 import 'package:aranduapp/core/state/command.dart';
-import 'package:aranduapp/ui/home/service/home_service.dart';
+import 'package:aranduapp/ui/knowledge/service/knowledge_service.dart';
 import 'package:async/async.dart'; // Certifique-se de importar o pacote que contém o tipo Result
 import 'package:flutter/material.dart';
 
-class HomeViewModel extends ChangeNotifier {
-  final HomeService _homeService = HomeService();
+class KnowledgeViewmodel extends ChangeNotifier {
+  final KnowledgeService _knowledgeService = KnowledgeService();
 
   List<Map<String, dynamic>> knowledges = [];
   String? erroMessage;
 
   late Command1<List<Map<String, dynamic>>, Null> fetchKnowledgesCommand;
 
-  HomeViewModel() {
+  KnowledgeViewmodel() {
     fetchKnowledgesCommand =
         Command1<List<Map<String, dynamic>>, Null>((_) async {
-      final knowledges = await _homeService.getKnowledges();
+      final knowledges = await _knowledgeService.getKnowledges();
       if (knowledges != null) {
         return Result.value(knowledges);
       } else {

lib/ui/navbar/view/navbar_view.dart

@@ -1,4 +1,4 @@
-import 'package:aranduapp/ui/home/view/home_view.dart';
+import 'package:aranduapp/ui/knowledge/view/knowledge_view.dart';
 import 'package:aranduapp/ui/profile/view/profile_view.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
@@ -27,7 +27,7 @@ class NavBarScreen extends StatelessWidget {
     NavbarViewModel viewModel = Provider.of<NavbarViewModel>(context);
 
     final List<Widget> pages = [
-      const HomeView(),
+      const KnowledgeView(),
       const Center(child: Text('Friends', style: TextStyle(fontSize: 20))),
       const Center(child: Text('Dashboard', style: TextStyle(fontSize: 20))),
       const Profile(),

lib/ui/trails/view/trails_view.dart

@@ -1,5 +1,3 @@
-import 'package:aranduapp/core/log/log.dart';
-import 'package:aranduapp/ui/content/view/content_view.dart';
 import 'package:aranduapp/ui/journey/model/journey_model.dart';
 import 'package:aranduapp/ui/pages_content/view/pages_content_view.dart';
 import 'package:aranduapp/ui/shared/erro_screen.dart';
@@ -108,7 +106,9 @@ class _TrailsScreen extends StatelessWidget {
               if (trails.contects != null) {
                 Navigator.of(context).push(
                   MaterialPageRoute(
-                    builder: (context) => PagesContentView(listContent: trails.contects ?? [],),
+                    builder: (context) => PagesContentView(
+                      listContent: trails.contects ?? [],
+                    ),
                   ),
                 );
               }

test/ui/home/view/home_view_test.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:aranduapp/ui/home/view/home_view.dart';
+import 'package:aranduapp/ui/knowledge/view/knowledge_view.dart';
 
 void main() {
   testWidgets('Home screen displays', (WidgetTester tester) async {
     // Carrega o widget HomeView
     await tester.pumpWidget(
       const MaterialApp(
-        home: HomeView(),
+        home: KnowledgeView(),
       ),
     );