Co-authored-by: MENDOZA BALLARDO GAEL RICARDO <gael-meb123@users.noreply.github.com>

Co-authored-by: Azareth-Tr <Azareth-Tr@users.noreply.github.com>
Co-authored-by: eddgranados12 <eddgranados12@users.noreply.github.com>

implementacion de login, vistas, correcion de errores en vista registro, domicilios
This commit is contained in:
shinra32
2026-05-22 23:07:24 -06:00
parent b4ee3e7b49
commit c91b6e2091
52 changed files with 3940 additions and 4368 deletions

View File

@@ -0,0 +1,154 @@
// ── Usuario (presentación UI) ─────────────────────────────────────────────────
class UIUserModel {
final String id;
final String nombre;
final String apellido;
final String email;
final String telefono;
final String role;
const UIUserModel({
required this.id,
required this.nombre,
required this.apellido,
required this.email,
required this.telefono,
this.role = 'citizen',
});
String get nombreCompleto => '$nombre $apellido'.trim();
String get iniciales {
final n = nombre.isNotEmpty ? nombre[0] : '';
final a = apellido.isNotEmpty ? apellido[0] : '';
return '$n$a'.toUpperCase();
}
bool get isAdmin => role == 'admin';
}
// ── Casa / Domicilio ──────────────────────────────────────────────────────────
class UIHouseModel {
final String id;
final String alias;
final String calle;
final String colonia;
final String? routeId;
final int radioAlertaMetros;
final bool alertaCercana;
final bool alertaMedia;
final bool recordatorioDiario;
final bool activa;
const UIHouseModel({
required this.id,
this.alias = 'Casa principal',
required this.calle,
required this.colonia,
this.routeId,
this.radioAlertaMetros = 200,
this.alertaCercana = true,
this.alertaMedia = false,
this.recordatorioDiario = true,
this.activa = true,
});
String get direccionCompleta => '$calle, Col. $colonia';
UIHouseModel copyWith({
String? alias,
String? calle,
String? colonia,
String? routeId,
int? radioAlertaMetros,
bool? alertaCercana,
bool? alertaMedia,
bool? recordatorioDiario,
bool? activa,
}) {
return UIHouseModel(
id: id,
alias: alias ?? this.alias,
calle: calle ?? this.calle,
colonia: colonia ?? this.colonia,
routeId: routeId ?? this.routeId,
radioAlertaMetros: radioAlertaMetros ?? this.radioAlertaMetros,
alertaCercana: alertaCercana ?? this.alertaCercana,
alertaMedia: alertaMedia ?? this.alertaMedia,
recordatorioDiario: recordatorioDiario ?? this.recordatorioDiario,
activa: activa ?? this.activa,
);
}
factory UIHouseModel.fromJson(Map<String, dynamic> json) {
return UIHouseModel(
id: json['id'] as String? ?? '',
alias: json['label'] as String? ?? 'Casa principal',
calle: json['calle'] as String? ?? '',
colonia: json['colonia'] as String? ?? '',
routeId: json['route_id'] as String?,
);
}
}
// ── Alerta ───────────────────────────────────────────────────────────────────
enum TipoAlerta { cercana, media, recordatorio }
class UIAlertaModel {
final String id;
final TipoAlerta tipo;
final double distanciaMetros;
final DateTime fecha;
final String direccionCasa;
final bool leida;
const UIAlertaModel({
required this.id,
required this.tipo,
required this.distanciaMetros,
required this.fecha,
required this.direccionCasa,
this.leida = false,
});
String get distanciaTexto {
if (distanciaMetros < 1000) {
return '${distanciaMetros.toStringAsFixed(0)} m';
}
return '${(distanciaMetros / 1000).toStringAsFixed(1)} km';
}
String get tiempoEstimadoTexto {
final segundos = (distanciaMetros / (5000 / 3600)).round();
if (segundos < 60) return 'Menos de 1 min';
final minutos = (segundos / 60).ceil();
return '~$minutos min';
}
String get fechaFormateada {
final ahora = DateTime.now();
final hoy = DateTime(ahora.year, ahora.month, ahora.day);
final fechaDia = DateTime(fecha.year, fecha.month, fecha.day);
if (fechaDia == hoy) return 'Hoy, ${_formatHora(fecha)}';
final ayer = hoy.subtract(const Duration(days: 1));
if (fechaDia == ayer) return 'Ayer, ${_formatHora(fecha)}';
const dias = ['Lun', 'Mar', 'Mié', 'Jue', 'Vie', 'Sáb', 'Dom'];
const meses = ['ene','feb','mar','abr','may','jun','jul','ago','sep','oct','nov','dic'];
return '${dias[fecha.weekday - 1]} ${fecha.day} ${meses[fecha.month - 1]}, ${_formatHora(fecha)}';
}
String get etiquetaFecha {
final ahora = DateTime.now();
final hoy = DateTime(ahora.year, ahora.month, ahora.day);
final fechaDia = DateTime(fecha.year, fecha.month, fecha.day);
if (fechaDia == hoy) return 'Hoy';
const dias = ['Lun', 'Mar', 'Mié', 'Jue', 'Vie', 'Sáb', 'Dom'];
return dias[fecha.weekday - 1];
}
String _formatHora(DateTime dt) {
final h = dt.hour > 12 ? dt.hour - 12 : dt.hour == 0 ? 12 : dt.hour;
final m = dt.minute.toString().padLeft(2, '0');
final ampm = dt.hour >= 12 ? 'p.m.' : 'a.m.';
return '$h:$m $ampm';
}
}

View File

@@ -7,10 +7,12 @@ import '../constants/auth_constants.dart';
import '../storage/secure_storage.dart';
final apiClientProvider = Provider<Dio>((ref) {
final defaultBaseUrl = kIsWeb
? 'http://localhost:8000'
: 'http://10.0.2.2:8000';
final baseUrl = dotenv.env['API_BASE_URL'] ?? defaultBaseUrl;
final envUrl = dotenv.env['API_BASE_URL'];
final baseUrl = kIsWeb
? (envUrl != null && envUrl.contains('localhost')
? envUrl
: 'http://localhost:8000')
: (envUrl ?? 'http://10.0.2.2:8000');
final secureStorage = ref.read(secureStorageProvider);
final dio = Dio(

View File

@@ -0,0 +1,140 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:recolecta_app/features/admin/admin_shell.dart';
import 'package:recolecta_app/features/auth/login_page.dart';
import 'package:recolecta_app/features/driver/driver_shell.dart';
import 'package:recolecta_app/features/driver/screens/driver_collections_screen.dart';
import 'package:recolecta_app/features/driver/screens/driver_home_screen.dart';
import 'package:recolecta_app/features/driver/screens/driver_incident_screen.dart';
import 'package:recolecta_app/features/feedback/feedback_screen.dart';
import 'package:recolecta_app/features/home/citizen_home_screen.dart';
import 'package:recolecta_app/features/home/citizen_shell.dart';
import 'package:recolecta_app/features/separation_guide/screens/category_detail_screen.dart';
import 'package:recolecta_app/features/separation_guide/screens/separation_guide_screen.dart';
import 'package:recolecta_app/core/services/auth_controller.dart';
// Mock Admin Screens
class AdminDashboardScreen extends StatelessWidget {
const AdminDashboardScreen({super.key});
@override
Widget build(BuildContext context) =>
const Scaffold(body: Center(child: Text('Admin Dashboard')));
}
class AdminRouteDetailScreen extends StatelessWidget {
const AdminRouteDetailScreen({super.key, required this.routeId});
final String routeId;
@override
Widget build(BuildContext context) =>
Scaffold(body: Center(child: Text('Admin Route Detail: $routeId')));
}
class AdminReassignScreen extends StatelessWidget {
const AdminReassignScreen({super.key, required this.routeId});
final String routeId;
@override
Widget build(BuildContext context) =>
Scaffold(body: Center(child: Text('Admin Reassign: $routeId')));
}
final routerProvider = Provider<GoRouter>((ref) {
final authState = ref.watch(authControllerProvider);
return GoRouter(
initialLocation: '/login',
redirect: (BuildContext context, GoRouterState state) {
final isAuthenticated = authState.value?.isAuthenticated ?? false;
final role = authState.value?.userRole;
final isLoggingIn = state.matchedLocation == '/login';
if (!isAuthenticated) {
return isLoggingIn ? null : '/login';
}
if (isLoggingIn) {
switch (role) {
case 'admin':
return '/admin';
case 'driver':
return '/driver';
case 'citizen':
return '/home';
default:
return '/login';
}
}
return null;
},
routes: [
GoRoute(path: '/login', builder: (context, state) => const LoginPage()),
ShellRoute(
builder: (context, state, child) => AdminShell(child: child),
routes: [
GoRoute(
path: '/admin',
builder: (context, state) => const AdminDashboardScreen(),
routes: [
GoRoute(
path: 'routes/:routeId',
builder: (context, state) => AdminRouteDetailScreen(
routeId: state.pathParameters['routeId']!,
),
),
GoRoute(
path: 'reassign/:routeId',
builder: (context, state) => AdminReassignScreen(
routeId: state.pathParameters['routeId']!,
),
),
],
),
],
),
ShellRoute(
builder: (context, state, child) => DriverShell(child: child),
routes: [
GoRoute(
path: '/driver',
builder: (context, state) => const DriverHomeScreen(),
),
GoRoute(
path: '/driver/collections',
builder: (context, state) => const DriverCollectionsScreen(),
),
GoRoute(
path: '/driver/incident',
builder: (context, state) => const DriverIncidentScreen(),
),
],
),
ShellRoute(
builder: (context, state, child) => CitizenShell(child: child),
routes: [
GoRoute(
path: '/home',
builder: (context, state) => const CitizenHomeScreen(),
),
GoRoute(
path: '/feedback',
builder: (context, state) => const FeedbackScreen(),
),
GoRoute(
path: '/guide',
builder: (context, state) => const SeparationGuideScreen(),
routes: [
GoRoute(
path: ':categoryId',
builder: (context, state) => CategoryDetailScreen(
categoryId: state.pathParameters['categoryId']!,
),
),
],
),
],
),
],
);
});

View File

@@ -0,0 +1,130 @@
import 'package:flutter/material.dart';
class AppTheme {
static const Color primary = Color(0xFF1D9E75);
static const Color primaryDark = Color(0xFF0F6E56);
static const Color primaryLight = Color(0xFFE1F5EE);
static const Color primaryMid = Color(0xFF9FE1CB);
static const Color blue = Color(0xFF185FA5);
static const Color blueLight = Color(0xFFE6F1FB);
static const Color amber = Color(0xFF854F0B);
static const Color amberLight = Color(0xFFFAEEDA);
static const Color danger = Color(0xFFE24B4A);
static const Color dangerLight = Color(0xFFFCEBEB);
static const Color textPrimary = Color(0xFF1A1A1A);
static const Color textSecondary = Color(0xFF6B7280);
static const Color textHint = Color(0xFFAAAAAA);
static const Color surface = Color(0xFFFFFFFF);
static const Color background = Color(0xFFF5F7F5);
static const Color border = Color(0xFFE5E7EB);
static const Color borderLight = Color(0xFFF0F2F0);
static const double radiusSm = 8.0;
static const double radiusMd = 12.0;
static const double radiusLg = 16.0;
static const double radiusXl = 24.0;
static const double radiusFull = 100.0;
static List<BoxShadow> get cardShadow => [
BoxShadow(
color: Colors.black.withValues(alpha: 0.06),
blurRadius: 12,
offset: const Offset(0, 4),
),
];
static List<BoxShadow> get softShadow => [
BoxShadow(
color: Colors.black.withValues(alpha: 0.04),
blurRadius: 8,
offset: const Offset(0, 2),
),
];
static ThemeData get lightTheme => ThemeData(
useMaterial3: true,
colorScheme: ColorScheme.fromSeed(
seedColor: primary,
primary: primary,
secondary: primaryDark,
surface: surface,
),
scaffoldBackgroundColor: background,
appBarTheme: const AppBarTheme(
backgroundColor: primary,
foregroundColor: Colors.white,
elevation: 0,
centerTitle: false,
titleTextStyle: TextStyle(
inherit: false,
fontSize: 18,
fontWeight: FontWeight.w600,
color: Colors.white,
),
iconTheme: IconThemeData(color: Colors.white),
),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
backgroundColor: primary,
foregroundColor: Colors.white,
elevation: 0,
minimumSize: const Size(double.infinity, 52),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(radiusMd),
),
),
),
filledButtonTheme: FilledButtonThemeData(
style: FilledButton.styleFrom(
backgroundColor: primary,
foregroundColor: Colors.white,
minimumSize: const Size(double.infinity, 52),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(radiusMd),
),
),
),
outlinedButtonTheme: OutlinedButtonThemeData(
style: OutlinedButton.styleFrom(
foregroundColor: Colors.white,
side: const BorderSide(color: Colors.white54, width: 1.5),
minimumSize: const Size(double.infinity, 52),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(radiusMd),
),
),
),
inputDecorationTheme: InputDecorationTheme(
filled: true,
fillColor: surface,
contentPadding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(radiusSm),
borderSide: const BorderSide(color: border),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(radiusSm),
borderSide: const BorderSide(color: border),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(radiusSm),
borderSide: const BorderSide(color: primary, width: 1.5),
),
errorBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(radiusSm),
borderSide: const BorderSide(color: danger),
),
focusedErrorBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(radiusSm),
borderSide: const BorderSide(color: danger, width: 1.5),
),
labelStyle: const TextStyle(color: textSecondary, fontSize: 13),
hintStyle: const TextStyle(color: textHint, fontSize: 13),
),
);
}

View File

@@ -0,0 +1,430 @@
import 'package:flutter/material.dart';
import '../theme/app_theme.dart';
// ── Badge de estado ───────────────────────────────────────────────────────────
class AppStatusBadge extends StatelessWidget {
final String label;
final Color backgroundColor;
final Color textColor;
const AppStatusBadge({
super.key,
required this.label,
this.backgroundColor = AppTheme.primaryLight,
this.textColor = AppTheme.primaryDark,
});
factory AppStatusBadge.green(String label) => AppStatusBadge(
label: label,
backgroundColor: AppTheme.primaryLight,
textColor: AppTheme.primaryDark,
);
factory AppStatusBadge.amber(String label) => AppStatusBadge(
label: label,
backgroundColor: AppTheme.amberLight,
textColor: AppTheme.amber,
);
factory AppStatusBadge.gray(String label) => AppStatusBadge(
label: label,
backgroundColor: const Color(0xFFF1EFE8),
textColor: const Color(0xFF5F5E5A),
);
factory AppStatusBadge.danger(String label) => AppStatusBadge(
label: label,
backgroundColor: AppTheme.dangerLight,
textColor: AppTheme.danger,
);
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
decoration: BoxDecoration(
color: backgroundColor,
borderRadius: BorderRadius.circular(AppTheme.radiusFull),
),
child: Text(
label,
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: textColor,
),
),
);
}
}
// ── Tarjeta base ──────────────────────────────────────────────────────────────
class AppCard extends StatelessWidget {
final Widget child;
final EdgeInsets? padding;
final Color? borderColor;
final VoidCallback? onTap;
const AppCard({
super.key,
required this.child,
this.padding,
this.borderColor,
this.onTap,
});
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
child: Container(
width: double.infinity,
padding: padding ?? const EdgeInsets.all(16),
decoration: BoxDecoration(
color: AppTheme.surface,
borderRadius: BorderRadius.circular(AppTheme.radiusLg),
border: Border.all(color: borderColor ?? AppTheme.border, width: 0.5),
boxShadow: AppTheme.softShadow,
),
child: child,
),
);
}
}
// ── Fila de información con ícono ─────────────────────────────────────────────
class AppInfoRow extends StatelessWidget {
final IconData icon;
final String label;
final String value;
final Widget? trailing;
const AppInfoRow({
super.key,
required this.icon,
required this.label,
required this.value,
this.trailing,
});
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.all(14),
decoration: BoxDecoration(
color: AppTheme.surface,
borderRadius: BorderRadius.circular(AppTheme.radiusLg),
border: Border.all(color: AppTheme.border, width: 0.5),
boxShadow: AppTheme.softShadow,
),
child: Row(
children: [
Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: AppTheme.primaryLight,
borderRadius: BorderRadius.circular(10),
),
child: Icon(icon, color: AppTheme.primary, size: 20),
),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(value,
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
color: AppTheme.textPrimary)),
const SizedBox(height: 2),
Text(label,
style: const TextStyle(
fontSize: 12, color: AppTheme.textSecondary)),
],
),
),
?trailing,
],
),
);
}
}
// ── Campo de formulario ───────────────────────────────────────────────────────
class AppFormField extends StatelessWidget {
final String label;
final String? hint;
final TextEditingController? controller;
final bool obscureText;
final TextInputType? keyboardType;
final String? initialValue;
final Widget? suffix;
final int? maxLines;
final String? Function(String?)? validator;
const AppFormField({
super.key,
required this.label,
this.hint,
this.controller,
this.obscureText = false,
this.keyboardType,
this.initialValue,
this.suffix,
this.maxLines = 1,
this.validator,
});
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(label,
style: const TextStyle(
fontSize: 12,
fontWeight: FontWeight.w500,
color: AppTheme.textSecondary)),
const SizedBox(height: 6),
TextFormField(
controller: controller,
initialValue: initialValue,
obscureText: obscureText,
keyboardType: keyboardType,
maxLines: maxLines,
validator: validator,
style: const TextStyle(fontSize: 14, color: AppTheme.textPrimary),
decoration: InputDecoration(hintText: hint, suffixIcon: suffix),
),
],
);
}
}
// ── Sección con título ────────────────────────────────────────────────────────
class AppSectionTitle extends StatelessWidget {
final String title;
final Widget? action;
const AppSectionTitle({super.key, required this.title, this.action});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.only(bottom: 10),
child: Row(
children: [
Text(
title.toUpperCase(),
style: const TextStyle(
fontSize: 11,
fontWeight: FontWeight.w600,
color: AppTheme.textSecondary,
letterSpacing: 0.8,
),
),
const Spacer(),
if (action != null) action!,
],
),
);
}
}
// ── Toggle con label ──────────────────────────────────────────────────────────
class AppLabeledSwitch extends StatelessWidget {
final String label;
final bool value;
final ValueChanged<bool> onChanged;
const AppLabeledSwitch({
super.key,
required this.label,
required this.value,
required this.onChanged,
});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
child: Row(
children: [
Expanded(
child: Text(label,
style: const TextStyle(
fontSize: 14, color: AppTheme.textPrimary)),
),
Switch.adaptive(
value: value,
onChanged: onChanged,
activeTrackColor: AppTheme.primary,
),
],
),
);
}
}
// ── Ítem de menú ──────────────────────────────────────────────────────────────
class AppMenuTile extends StatelessWidget {
final IconData icon;
final String title;
final String? subtitle;
final VoidCallback? onTap;
final Color? iconColor;
final Color? titleColor;
final Widget? trailing;
const AppMenuTile({
super.key,
required this.icon,
required this.title,
this.subtitle,
this.onTap,
this.iconColor,
this.titleColor,
this.trailing,
});
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
child: Container(
margin: const EdgeInsets.only(bottom: 8),
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 13),
decoration: BoxDecoration(
color: AppTheme.surface,
borderRadius: BorderRadius.circular(AppTheme.radiusMd),
border: Border.all(color: AppTheme.border, width: 0.5),
boxShadow: AppTheme.softShadow,
),
child: Row(
children: [
Icon(icon, color: iconColor ?? AppTheme.primary, size: 20),
const SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title,
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
color: titleColor ?? AppTheme.textPrimary)),
if (subtitle != null) ...[
const SizedBox(height: 2),
Text(subtitle!,
style: const TextStyle(
fontSize: 12, color: AppTheme.textSecondary)),
],
],
),
),
trailing ??
const Icon(Icons.chevron_right,
color: AppTheme.textSecondary, size: 18),
],
),
),
);
}
}
// ── Tarjeta de formulario con ícono ───────────────────────────────────────────
class AppFormCard extends StatelessWidget {
final IconData icon;
final String title;
final Widget child;
const AppFormCard({
super.key,
required this.icon,
required this.title,
required this.child,
});
@override
Widget build(BuildContext context) {
return Container(
width: double.infinity,
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: AppTheme.surface,
borderRadius: BorderRadius.circular(AppTheme.radiusLg),
border: Border.all(color: AppTheme.border, width: 0.5),
boxShadow: AppTheme.softShadow,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(icon, color: AppTheme.primary, size: 18),
const SizedBox(width: 8),
Text(title,
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: AppTheme.textPrimary)),
],
),
const SizedBox(height: 16),
child,
],
),
);
}
}
// ── Bottom Nav Bar ────────────────────────────────────────────────────────────
class AppBottomNav extends StatelessWidget {
final int currentIndex;
final Function(int) onTap;
const AppBottomNav({
super.key,
required this.currentIndex,
required this.onTap,
});
@override
Widget build(BuildContext context) {
return BottomNavigationBar(
currentIndex: currentIndex,
onTap: onTap,
type: BottomNavigationBarType.fixed,
backgroundColor: AppTheme.surface,
selectedItemColor: AppTheme.primary,
unselectedItemColor: AppTheme.textSecondary,
selectedFontSize: 11,
unselectedFontSize: 11,
elevation: 12,
items: const [
BottomNavigationBarItem(
icon: Icon(Icons.notifications_outlined),
activeIcon: Icon(Icons.notifications),
label: 'ETA',
),
BottomNavigationBarItem(
icon: Icon(Icons.history_outlined),
activeIcon: Icon(Icons.history),
label: 'Alertas',
),
BottomNavigationBarItem(
icon: Icon(Icons.home_outlined),
activeIcon: Icon(Icons.home),
label: 'Mi casa',
),
BottomNavigationBarItem(
icon: Icon(Icons.person_outline),
activeIcon: Icon(Icons.person),
label: 'Perfil',
),
],
);
}
}