fazendo merge de iury com dev

ES2-UFPI · Jan 20, 2025 · eb3b03e · eb3b03e
2 parents 2ee831b + 9ba749d
commit eb3b03e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/backend/model/Paciente.js b/backend/model/Paciente.js
@@ -55,4 +55,4 @@ class Paciente {
     }
   }
 
-  module.exports = Paciente;
+module.exports = Paciente; // Exporta a classe para uso em outros módulos
diff --git a/healthway_app/ios/Flutter/flutter_export_environment.sh b/healthway_app/ios/Flutter/flutter_export_environment.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/lemuelcavalcante/Documents/development/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/lemuelcavalcante/Documents/engenharia2/Healthway/healthway_app"
+export "FLUTTER_ROOT=/home/kaua/flutter"
+export "FLUTTER_APPLICATION_PATH=/home/kaua/VSCode/Healthway/healthway_app"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=/Users/lemuelcavalcante/Documents/engenharia2/Healthway/healthway_app/lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"

diff --git a/healthway_app/lib/geral_screens/chat_screen.dart b/healthway_app/lib/geral_screens/chat_screen.dart
@@ -9,6 +9,8 @@ import '../widgets/chat_message_bubble.dart';
 class ChatScreen extends StatelessWidget {
   final ChatController chatController = Get.put(ChatController());
 
+  ChatScreen({super.key});
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

diff --git a/healthway_app/lib/geral_screens/login_screen.dart b/healthway_app/lib/geral_screens/login_screen.dart
@@ -64,8 +64,9 @@ class _LoginScreenState extends State<LoginScreen> {
                     SizedBox(height: 30),
                     _buildLoginButton(),
                     SizedBox(height: 20),
-                    _buildPatientButton(),
-                    _buildNutricionistButton(),
+                    _buildSignupAsPatientButton(),
+                    SizedBox(height: 10),
+                    _buildSignupAsNutricionistButton(),
                   ],
                 ),
               ),
@@ -201,12 +202,14 @@ class _LoginScreenState extends State<LoginScreen> {
           borderRadius: BorderRadius.circular(30),
         ),
       ),
-      child: Text('Entrar',
-          style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+      child: _isLoading
+          ? CircularProgressIndicator(color: Colors.white)
+          : Text('Entrar',
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
     );
   }
 
-  Widget _buildPatientButton() {
+  Widget _buildSignupAsPatientButton() {
     return TextButton(
       onPressed: () {
         Navigator.pushNamed(context, '/signup_patient');
@@ -218,7 +221,7 @@ class _LoginScreenState extends State<LoginScreen> {
     );
   }
 
-  Widget _buildNutricionistButton() {
+  Widget _buildSignupAsNutricionistButton() {
     return TextButton(
       onPressed: () {
         Navigator.pushNamed(context, '/signup_nutritionist');

diff --git a/healthway_app/lib/geral_screens/presentation_screen.dart b/healthway_app/lib/geral_screens/presentation_screen.dart
@@ -2,7 +2,7 @@ import 'package:healthway_app/constants.dart';
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:healthway_app/geral_screens/login_screen.dart';
+import 'package:healthway_app/geral_screens/login_screen.dart' as login;
 
 class PresentationScreen extends StatefulWidget {
   const PresentationScreen({super.key});
@@ -36,7 +36,7 @@ class _PresentationScreenState extends State<PresentationScreen>
     // Navegar para a próxima tela após a animação
     Timer(Duration(seconds: 3), () {
       Navigator.of(context).pushReplacement(
-        MaterialPageRoute(builder: (_) => LoginScreen()),
+        MaterialPageRoute(builder: (_) => login.LoginScreen()),
       );
     });
   }

diff --git a/healthway_app/lib/main.dart b/healthway_app/lib/main.dart
@@ -2,7 +2,7 @@ import 'package:healthway_app/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:healthway_app/geral_screens/alimentos_screen.dart';
 import 'package:healthway_app/geral_screens/chat_screen.dart';
-import 'package:healthway_app/geral_screens/login_screen.dart';
+import 'package:healthway_app/geral_screens/login_screen.dart' as login;
 import 'package:healthway_app/geral_screens/nutricionistas_screen.dart';
 import 'package:healthway_app/geral_screens/presentation_screen.dart';
 import 'package:healthway_app/screens_nutricionist/meal_plan_screen.dart';
@@ -51,7 +51,7 @@ class MyApp extends StatelessWidget {
         '/': (context) => PresentationScreen(),
         '/signup_patient': (context) => CadastroPacienteScreen(),
         '/signup_nutritionist': (context) => CadastroNutricionistaScreen(),
-        '/login': (context) => LoginScreen(),
+        '/login': (context) => login.LoginScreen(),
         '/chat': (context) => ChatScreen(),
         // '/historic': (context) => PlanoAlimentarScreen(
         //       pacienteId: '',

diff --git a/healthway_app/lib/screens_nutricionist/schedule_screen.dart b/healthway_app/lib/screens_nutricionist/schedule_screen.dart
@@ -6,7 +6,7 @@ class ScheduleScreen extends StatefulWidget {
   const ScheduleScreen({super.key});
 
   @override
-  _ScheduleScreenState createState() => _ScheduleScreenState();
+  State<ScheduleScreen> createState() => _ScheduleScreenState();
 }
 
 class _ScheduleScreenState extends State<ScheduleScreen> {
@@ -89,7 +89,7 @@ class _ScheduleScreenState extends State<ScheduleScreen> {
           shape: BoxShape.circle,
         ),
         todayDecoration: BoxDecoration(
-          color: kPrimaryColor.withOpacity(0.5),
+          color: kPrimaryColor.withValues(alpha: 0.5),
           shape: BoxShape.circle,
         ),
         markerDecoration: BoxDecoration(

diff --git a/healthway_app/lib/widgets/chat_input_field.dart b/healthway_app/lib/widgets/chat_input_field.dart
@@ -7,7 +7,7 @@ class ChatInputField extends StatefulWidget {
   const ChatInputField({super.key, required this.onSendMessage});
 
   @override
-  _ChatInputFieldState createState() => _ChatInputFieldState();
+  State<ChatInputField> createState() => _ChatInputFieldState();
 }
 
 class _ChatInputFieldState extends State<ChatInputField> {
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,4 +55,4 @@ class Paciente { @@
         }
       }
-      module.exports = Paciente;
+    module.exports = Paciente; // Exporta a classe para uso em outros módulos