Merge pull request #15 from ErnestoMoraes/dev

Dev
ErnestoMoraes · May 10, 2023 · 245ba19 · 245ba19
2 parents d80caaf + 6d2ba03
commit 245ba19
Show file tree

Hide file tree

Showing 44 changed files with 924 additions and 417 deletions.
diff --git a/.env b/.env
@@ -1,3 +1 @@
-base_url=http://192.168.0.123:8080/
-URL_LOGIN=https://qacademico.ifce.edu.br/qacademico/index.asp?t=1001
-URL_SCHEDULE=https://qacademico.ifce.edu.br/qacademico/index.asp?t=2010
+base_url=http://192.168.0.123:3000/
diff --git a/README.md b/README.md
@@ -1 +1,16 @@
 # academico_mobile
+
+
+Link do Figma: https://www.figma.com/file/tFLY9uOoiAXYoHrqj7uHiI/Untitled?node-id=0%3A1&t=LloEngcQkWGb6Bna-1
+
+Atividade 01:
+ - [ ] Instalar Assets (Imagens e Fonts)
+ - [ ] ThemeData
+ - [ ] Estilos diferentes de Fonts
+ - [ ] Preparando Extensions de UI
+ - [ ] Dotenv
+ - [ ] RestClient - Dio
+
+ - [ ] senha: cddbdabqeujfjluo
+ - [ ] lembrar do delay na requisição de 2s.
+=======
diff --git a/assets/images/images_cards/report-card.png b/assets/images/images_cards/report-card.png
diff --git a/assets/images/images_cards/schedule.png b/assets/images/images_cards/schedule.png
diff --git a/assets/images/images_cards/timetable.png b/assets/images/images_cards/timetable.png
diff --git a/assets/images/logos/logo_academico.png b/assets/images/logos/logo_academico.png
diff --git a/lib/academico_mobile.dart b/lib/academico_mobile.dart
@@ -2,7 +2,7 @@ import 'package:academico_mobile/app/core/provider/application_binding.dart';
 import 'package:academico_mobile/app/core/ui/theme/theme_config.dart';
 import 'package:academico_mobile/app/pages/daily/daily_router.dart';
 import 'package:academico_mobile/app/pages/home/home_router.dart';
-import 'package:academico_mobile/app/pages/login/login_page.dart';
+import 'package:academico_mobile/app/pages/login/login_router.dart';
 import 'package:academico_mobile/app/pages/recover_password/recover_password_page.dart';
 import 'package:academico_mobile/app/pages/schedule/schedule_router.dart';
 import 'package:academico_mobile/app/pages/splash/splash_page.dart';
@@ -20,7 +20,7 @@ class AcademicoMobile extends StatelessWidget {
         debugShowCheckedModeBanner: false,
         routes: {
           '/': (context) => const SplashPage(),
-          '/login': (context) => const LoginPage(),
+          '/login': (context) => LoginRouter.page,
           '/schedule': (context) => ScheduleRouter.page,
           '/daily': (context) => DailyRouter.page,
           '/home': (context) => HomeRouter.page,

diff --git a/lib/app/core/exceptions/unauthorized_exception.dart b/lib/app/core/exceptions/unauthorized_exception.dart
@@ -0,0 +1 @@
+class UnauthorizedException implements Exception {}
diff --git a/lib/app/core/provider/application_binding.dart b/lib/app/core/provider/application_binding.dart
@@ -1,4 +1,6 @@
 import 'package:academico_mobile/app/core/rest_client/custom_dio.dart';
+import 'package:academico_mobile/app/repositories/auth/auth_repository.dart';
+import 'package:academico_mobile/app/repositories/auth/auth_repository_impl.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -16,7 +18,12 @@ class ApplicationBinding extends StatelessWidget {
       providers: [
         Provider(
           create: (context) => CustomDio(),
-        )
+        ),
+        Provider<AuthRepository>(
+          create: (context) => AuthRepositoryImpl(
+            dio: context.read(),
+          ),
+        ),
       ],
       child: child,
     );

diff --git a/lib/app/core/rest_client/custom_dio.dart b/lib/app/core/rest_client/custom_dio.dart
@@ -7,8 +7,8 @@ class CustomDio extends DioForNative {
       : super(
           BaseOptions(
             baseUrl: Env.instance['base_url'] ?? '',
-            connectTimeout: const Duration(milliseconds: 5000),
-            receiveTimeout: const Duration(milliseconds: 60000),
+            connectTimeout: const Duration(milliseconds: 10000),
+            receiveTimeout: const Duration(milliseconds: 180000),
           ),
         ) {
     interceptors.add(LogInterceptor(

diff --git a/lib/app/core/ui/widgets/my_appbar.dart b/lib/app/core/ui/widgets/my_appbar.dart
@@ -15,7 +15,33 @@ class MyAppbar extends AppBar {
     required final VoidCallback onPressed,
   }) : super(
           elevation: elevation,
-          title: Text(title, style: TextStyles.instance.labelPage),
+          title: Text(
+            title,
+            style: TextStyles.instance.labelPage.copyWith(
+              fontSize: 15,
+            ),
+          ),
+          centerTitle: true,
+          backgroundColor: ColorsApp.instance.background,
+          leading: IconButton(
+            icon: Icon(icon),
+            onPressed: onPressed,
+          ),
+        );
+
+  MyAppbar.normal({
+    super.key,
+    double elevation = 0,
+    required String title,
+    String subtitle = '',
+    IconData icon = Icons.arrow_back_ios,
+    required final VoidCallback onPressed,
+  }) : super(
+          elevation: elevation,
+          title: Text(
+            title,
+            style: TextStyles.instance.labelPage
+          ),
           centerTitle: true,
           backgroundColor: ColorsApp.instance.background,
           leading: IconButton(
@@ -43,7 +69,7 @@ class MyAppbar extends AppBar {
                 return Container(
                   alignment: Alignment.center,
                   padding:
-                      const EdgeInsets.symmetric(vertical: 10, horizontal: 10),
+                      const EdgeInsets.symmetric(vertical: 10, horizontal: 15),
                   margin:
                       const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
                   decoration: BoxDecoration(
@@ -58,7 +84,7 @@ class MyAppbar extends AppBar {
                       color: state.isOn
                           ? ColorsApp.instance.cardwhite
                           : ColorsApp.instance.cardwhite,
-                      fontSize: 15,
+                      fontSize: 12,
                       fontWeight:
                           TextStyles.instance.textButtonLabel.fontWeight,
                     ),

diff --git a/lib/app/core/ui/widgets/my_input_button.dart b/lib/app/core/ui/widgets/my_input_button.dart
@@ -1,4 +1,5 @@
 import 'package:academico_mobile/app/core/ui/styles/app_styles.dart';
+import 'package:academico_mobile/app/core/ui/styles/colors_app.dart';
 import 'package:flutter/material.dart';
 
 class MyInputButton extends StatelessWidget {
@@ -21,7 +22,11 @@ class MyInputButton extends StatelessWidget {
       width: width,
       height: height,
       child: ElevatedButton(
-        style: context.appStyles.buttonStyle,
+        style: context.appStyles.buttonStyle.copyWith(
+          backgroundColor: MaterialStateProperty.all<Color>(
+            ColorsApp.instance.cardblue,
+          ),
+        ),
         onPressed: onPressed,
         child: Text(label),
       ),

diff --git a/lib/app/models/auth_model.dart b/lib/app/models/auth_model.dart
@@ -0,0 +1,25 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+import 'dart:convert';
+
+class AuthModel {
+  final String accessToken;
+
+  AuthModel({required this.accessToken});
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'access_token': accessToken,
+    };
+  }
+
+  factory AuthModel.fromMap(Map<String, dynamic> map) {
+    return AuthModel(
+      accessToken: map['access_token'] ?? '',
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory AuthModel.fromJson(String source) =>
+      AuthModel.fromMap(json.decode(source) as Map<String, dynamic>);
+}
diff --git a/lib/app/models/daily_model.dart b/lib/app/models/daily_model.dart
@@ -19,7 +19,7 @@ class SemestreModel {
 }
 
 class DisciplinaModel {
-  int id;
+  String id;
   String nome;
   String professor;
   Resumo resumo;
@@ -37,8 +37,8 @@ class DisciplinaModel {
     List<String> avaliacoes =
         List<String>.from(json["avaliacoes"].map((x) => x.toString()));
     return DisciplinaModel(
-        id: json["id"],
-        nome: json["nome"],
+        id: json["id"] ?? '0',
+        nome: json["nome"] ?? '',
         professor: json["professor"],
         resumo: Resumo.fromJson(json["resumo"]),
         avaliacoes: avaliacoes);
@@ -56,7 +56,7 @@ class DisciplinaModel {
 class Resumo {
   String cargaHoraria;
   String faltas;
-  List<String> aulasFuturas;
+  String aulasFuturas;
   List<String> presencas;
   List<String> ausencias;
   List<String> pendentes;
@@ -80,13 +80,10 @@ class Resumo {
     List<String> pendentes = List<String>.from(
       json["pendentes"].map((x) => x.toString()),
     );
-    List<String> aulasFuturas = List<String>.from(
-      json["aulas_futuras"].map((x) => x.toString()),
-    );
     return Resumo(
         cargaHoraria: json["carga_horaria"],
         faltas: json["faltas"],
-        aulasFuturas: aulasFuturas,
+        aulasFuturas: json["aulas_futuras"],
         presencas: presencas,
         ausencias: ausencias,
         pendentes: pendentes);
@@ -95,7 +92,7 @@ class Resumo {
   Map<String, dynamic> toJson() => {
         "carga_horaria": cargaHoraria,
         "faltas": faltas,
-        "aulas_futuras": List<dynamic>.from(aulasFuturas.map((x) => x)),
+        "aulas_futuras": aulasFuturas,
         "presencas": List<dynamic>.from(presencas.map((x) => x)),
         "ausencias": List<dynamic>.from(ausencias.map((x) => x)),
         "pendentes": List<dynamic>.from(pendentes.map((x) => x)),

diff --git a/lib/app/pages/daily/daily_controller.dart b/lib/app/pages/daily/daily_controller.dart
@@ -15,15 +15,18 @@ class DailyController extends Cubit<DailyState> {
   Future<void> loadSemestre() async {
     emit(state.copyWith(status: DailyStateSatus.loading));
     try {
-      await Future.delayed(const Duration(seconds: 2));
       final semestres = await _dailyRepository.findDaily();
       emit(
-          state.copyWith(status: DailyStateSatus.loaded, semestres: semestres));
+        state.copyWith(status: DailyStateSatus.loaded, semestres: semestres),
+      );
     } catch (e, s) {
       log('Erro ao buscar semestres', error: e, stackTrace: s);
-      emit(state.copyWith(
+      emit(
+        state.copyWith(
           status: DailyStateSatus.error,
-          errorMessage: 'Erro ao buscar semestres'));
+          errorMessage: 'Erro ao buscar semestres',
+        ),
+      );
     }
   }
 
@@ -32,12 +35,19 @@ class DailyController extends Cubit<DailyState> {
     await Future.delayed(
       const Duration(seconds: 2),
     );
-    emit(state.copyWith(status: DailyStateSatus.loaded, isNow: !state.isNow));
+    emit(
+      state.copyWith(
+        status: DailyStateSatus.loaded,
+        isNow: !state.isNow,
+
+      ),
+    );
   }
 
   Future<void> selectedDay(int index) async {
     emit(state.copyWith(status: DailyStateSatus.loading));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(status: DailyStateSatus.loaded, selected: index));
   }
+
 }
diff --git a/lib/app/pages/daily/daily_page.dart b/lib/app/pages/daily/daily_page.dart
@@ -20,19 +20,19 @@ class DailyPage extends StatefulWidget {
 }
 
 class _DailyPageState extends BaseState<DailyPage, DailyController> {
+  late List<DisciplinaModel> list = [];
   @override
-  void onReady() {
-    super.onReady();
-    controller.loadSemestre();
-    list = controller.state.semestres[0].disciplinas;
+  void onReady() async {
+    await controller.loadSemestre();
+    if (controller.state.isNow) {
+      list = controller.state.semestres[0].disciplinas;
+    }
   }
 
-  List<DisciplinaModel> list = [];
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: MyAppbar(
+      appBar: MyAppbar.normal(
         title: 'Meus Diários',
         onPressed: () => Navigator.pop(context),
       ),
@@ -79,7 +79,12 @@ class _DailyPageState extends BaseState<DailyPage, DailyController> {
                           borderRadius: BorderRadius.circular(5),
                         ),
                         child: TextButton(
-                          onPressed: () => controller.selectedDay(index),
+                          onPressed: () {
+                            setState(() {
+                              controller.selectedDay(index);
+                              list = state.semestres[index].disciplinas;
+                            });
+                          },
                           child: Text(
                             state.semestres[index].semestre,
                             style: TextStyles.instance.texLabelH2.copyWith(
@@ -102,20 +107,41 @@ class _DailyPageState extends BaseState<DailyPage, DailyController> {
                 padding: EdgeInsets.only(left: context.percentWidth(0.03)),
                 child: const LabelSubtitle(title: 'Disciplinas'),
               ),
-              BlocListener<DailyController, DailyState>(
+              BlocConsumer<DailyController, DailyState>(
                 listener: (context, state) {
-                  list = state.semestres[state.selected].disciplinas;
-                },
-                child: Expanded(
-                  child: ListView.builder(
-                    itemCount: list.length,
-                    itemBuilder: (context, index) {
-                      return ListaCardDisciplina(
-                        disciplina: list[index],
-                      );
+                  state.status.matchAny(
+                    any: () => hideLoader(),
+                    loading: () => showLoader(),
+                    error: () {
+                      hideLoader();
+                      showError(state.errorMessage ??
+                          'Erro ao carregar o cronograma');
                     },
-                  ),
+                  );
+                },
+                buildWhen: (previous, current) => current.status.matchAny(
+                  any: () => false,
+                  initial: () => true,
+                  loaded: () => true,
                 ),
+                builder: (context, state) {
+                  if (state.isNow) {
+                    list = state.semestres[0].disciplinas;
+                  } else {
+                    list = state.semestres[state.selected].disciplinas;
+                  }
+                  return Expanded(
+                    child: ListView.builder(
+                      shrinkWrap: true,
+                      itemCount: list.length,
+                      itemBuilder: (BuildContext context, int index) {
+                        return ListaCardDisciplina(
+                          disciplina: list[index],
+                        );
+                      },
+                    ),
+                  );
+                },
               ),
               SizedBox(height: context.percentHeight(0.02))
             ],

diff --git a/lib/app/pages/daily/daily_state.dart b/lib/app/pages/daily/daily_state.dart
@@ -22,6 +22,7 @@ class DailyState extends Equatable {
   final String? errorMessage;
   final bool isNow;
   final int selected;
+
 
   const DailyState({
     required this.status,
@@ -33,7 +34,7 @@ class DailyState extends Equatable {
 
   DailyState.initial()
       : status = DailyStateSatus.initial,
-        semestres = [],
+        semestres = <SemestreModel>[],
         errorMessage = null,
         isNow = true,
         selected = 0;