Update: 2026-05-06 17:10:14

musadaq-app/android/app/src/main/AndroidManifest.xml

@@ -18,7 +18,8 @@
     <application
         android:label="musadaq_app"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"

musadaq-app/lib/app/routes/app_pages.dart

@@ -5,6 +5,7 @@ import '../../features/auth/views/otp_verify_view.dart';
 import '../../features/auth/views/biometric_setup_view.dart';
 import '../../features/auth/views/biometric_auth_view.dart';
 import '../../features/dashboard/views/dashboard_view.dart';
+import '../../features/dashboard/controllers/dashboard_controller.dart';
 import '../../features/scanner/views/scanner_view.dart';
 import '../../features/scanner/controllers/scanner_controller.dart';
 import '../../core/storage/secure_storage.dart';
@@ -61,7 +62,10 @@ class AppPages {
     ),
     GetPage(
       name: AppRoutes.DASHBOARD,
-      page: () => DashboardView(),
+      page: () => const DashboardView(),
+      binding: BindingsBuilder(() {
+        Get.put(DashboardController());
+      }),
     ),
     GetPage(
       name: AppRoutes.SCANNER,

musadaq-app/lib/features/dashboard/controllers/dashboard_controller.dart

@@ -0,0 +1,77 @@
+import 'package:get/get.dart';
+import 'package:dio/dio.dart';
+import '../../../core/storage/secure_storage.dart';
+import '../../../core/utils/app_snackbar.dart';
+import '../../../core/utils/logger.dart';
+import '../../../app/routes/app_pages.dart';
+
+class DashboardController extends GetxController {
+  final SecureStorage _storage = SecureStorage();
+  final Dio _dio = Dio(BaseOptions(
+    baseUrl: 'https://musadaq.intaleqapp.com/api/v1',
+    connectTimeout: const Duration(seconds: 15),
+    receiveTimeout: const Duration(seconds: 15),
+    responseType: ResponseType.json,
+  ));
+
+  var isLoading = true.obs;
+  var stats = {}.obs;
+  var recentActivities = [].obs;
+  var userRole = ''.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    _loadDashboardData();
+  }
+
+
+
+  Future<void> _loadDashboardData() async {
+    try {
+      isLoading.value = true;
+      final token = await _storage.getToken();
+      
+      if (token == null || token.isEmpty) {
+        Get.offAllNamed(AppRoutes.PHONE_INPUT);
+        return;
+      }
+
+      _dio.options.headers['Authorization'] = 'Bearer $token';
+
+      // Fetch Stats
+      final statsResponse = await _dio.get('/dashboard/stats');
+      if (statsResponse.data['success'] == true) {
+        stats.value = statsResponse.data['data'];
+        userRole.value = statsResponse.data['data']['role'] ?? '';
+      }
+
+      // Fetch Recent Activity
+      final activityResponse = await _dio.get('/dashboard/recent-activity');
+      if (activityResponse.data['success'] == true) {
+        recentActivities.value = activityResponse.data['data'];
+      }
+    } on DioException catch (e) {
+      AppLogger.error('Dashboard Data Fetch Error', e);
+      if (e.response?.statusCode == 401 || e.response?.statusCode == 403) {
+        await logout();
+      } else {
+        AppSnackbar.showError(
+            'خطأ', 'فشل في جلب البيانات. الرجاء التحقق من اتصالك بالإنترنت.');
+      }
+    } catch (e) {
+      AppLogger.error('Unexpected error fetching dashboard', e);
+    } finally {
+      isLoading.value = false;
+    }
+  }
+
+  Future<void> logout() async {
+    await _storage.clearAll();
+    Get.offAllNamed(AppRoutes.PHONE_INPUT);
+  }
+
+  void refreshData() {
+    _loadDashboardData();
+  }
+}

musadaq-app/lib/features/dashboard/views/dashboard_view.dart

@@ -1,59 +1,317 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import '../../../app/routes/app_pages.dart';
-import '../../../core/storage/secure_storage.dart';
+import '../controllers/dashboard_controller.dart';
 
-class DashboardView extends StatelessWidget {
-  DashboardView({super.key});
-
-  final SecureStorage _storage = SecureStorage();
-
-  void _logout() async {
-    await _storage.clearAll();
-    Get.offAllNamed(AppRoutes.PHONE_INPUT);
-  }
+class DashboardView extends GetView<DashboardController> {
+  const DashboardView({super.key});
 
   @override
   Widget build(BuildContext context) {
+    // We instantiate the controller here if not bound, though we should use binding in routes.
+    // For safety, let's put it here or rely on the router binding.
+    Get.put(DashboardController());
+
     return Scaffold(
+      backgroundColor: const Color(0xFFF5F7FA),
       appBar: AppBar(
-        title: const Text('لوحة التحكم - مُصادَق'),
+        title: const Text('لوحة التحكم - مُصادَق', style: TextStyle(fontWeight: FontWeight.bold)),
+        backgroundColor: const Color(0xFF0F4C81),
+        foregroundColor: Colors.white,
+        elevation: 0,
         actions: [
+          IconButton(
+            icon: const Icon(Icons.refresh),
+            onPressed: () => controller.refreshData(),
+          ),
           IconButton(
             icon: const Icon(Icons.logout),
-            onPressed: _logout,
+            onPressed: () => controller.logout(),
           )
         ],
       ),
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
+      body: Obx(() {
+        if (controller.isLoading.value) {
+          return const Center(child: CircularProgressIndicator(color: Color(0xFF0F4C81)));
+        }
+
+        final stats = controller.stats;
+        final role = controller.userRole.value;
+
+        return RefreshIndicator(
+          onRefresh: () async => controller.refreshData(),
+          child: SingleChildScrollView(
+            physics: const AlwaysScrollableScrollPhysics(),
+            padding: const EdgeInsets.all(16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                _buildWelcomeHeader(role),
+                const SizedBox(height: 24),
+                
+                // Action Buttons
+                _buildQuickActions(),
+                const SizedBox(height: 32),
+
+                // Invoice Stats
+                const Text('إحصائيات الفواتير', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                const SizedBox(height: 12),
+                _buildInvoiceStats(stats),
+                
+                // Role Specific Stats (Companies, Users, Tenants)
+                if (role == 'admin' || role == 'super_admin') ...[
+                  const SizedBox(height: 24),
+                  const Text('نظرة عامة', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                  const SizedBox(height: 12),
+                  _buildRoleSpecificStats(stats, role),
+                ],
+
+                // Quota
+                if (role == 'admin' && stats['subscription'] != null) ...[
+                  const SizedBox(height: 24),
+                  _buildQuotaMeter(stats['subscription']),
+                ],
+
+                const SizedBox(height: 32),
+                const Text('أحدث النشاطات', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                const SizedBox(height: 12),
+                _buildRecentActivity(),
+                const SizedBox(height: 40),
+              ],
+            ),
+          ),
+        );
+      }),
+    );
+  }
+
+  Widget _buildWelcomeHeader(String role) {
+    String roleName = 'مستخدم';
+    switch (role) {
+      case 'super_admin': roleName = 'مدير النظام'; break;
+      case 'admin': roleName = 'مدير المكتب'; break;
+      case 'accountant': roleName = 'محاسب'; break;
+      case 'viewer': roleName = 'مشاهد'; break;
+    }
+
+    return Row(
+      children: [
+        const CircleAvatar(
+          radius: 30,
+          backgroundColor: Color(0xFFE2E8F0),
+          child: Icon(Icons.person, size: 30, color: Color(0xFF64748B)),
+        ),
+        const SizedBox(width: 16),
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            const Icon(Icons.check_circle, size: 80, color: Colors.green),
-            const SizedBox(height: 24),
-            const Text(
-              'أهلاً بك في مُصادَق!',
-              style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
+            const Text('مرحباً بك في مُصادَق 👋', style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold)),
+            Text('صلاحيات: $roleName', style: const TextStyle(color: Colors.grey, fontSize: 14)),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _buildQuickActions() {
+    return Row(
+      children: [
+        Expanded(
+          child: ElevatedButton.icon(
+            icon: const Icon(Icons.document_scanner),
+            label: const Text('المسح الضوئي', style: TextStyle(fontWeight: FontWeight.bold)),
+            style: ElevatedButton.styleFrom(
+              backgroundColor: const Color(0xFF0F4C81),
+              foregroundColor: Colors.white,
+              padding: const EdgeInsets.symmetric(vertical: 16),
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
             ),
-            const SizedBox(height: 16),
-            const Text(
-              'تم تسجيل الدخول بنجاح وتفعيل الـ HMAC.',
-              style: TextStyle(color: Colors.grey),
-            ),
-            const SizedBox(height: 48),
-            ElevatedButton.icon(
-              icon: const Icon(Icons.document_scanner),
-              label: const Text('مسح فاتورة جديدة'),
-              style: ElevatedButton.styleFrom(
-                backgroundColor: const Color(0xFF0F4C81),
-                foregroundColor: Colors.white,
-                padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
+            onPressed: () => Get.toNamed(AppRoutes.SCANNER),
+          ),
+        ),
+        const SizedBox(width: 12),
+        if (controller.userRole.value == 'admin')
+          Expanded(
+            child: OutlinedButton.icon(
+              icon: const Icon(Icons.business),
+              label: const Text('إدارة الشركات', style: TextStyle(fontWeight: FontWeight.bold)),
+              style: OutlinedButton.styleFrom(
+                foregroundColor: const Color(0xFF0F4C81),
+                side: const BorderSide(color: Color(0xFF0F4C81)),
+                padding: const EdgeInsets.symmetric(vertical: 16),
+                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
               ),
-              onPressed: () => Get.toNamed(AppRoutes.SCANNER),
-            )
+              onPressed: () {
+                Get.snackbar('قريباً', 'سيتم إطلاق هذه الميزة قريباً');
+              },
+            ),
+          ),
+      ],
+    );
+  }
+
+  Widget _buildInvoiceStats(Map stats) {
+    final inv = stats['invoices'] ?? {'total': 0, 'pending': 0, 'approved': 0};
+    return Row(
+      children: [
+        _buildStatCard('الكل', inv['total'].toString(), Icons.receipt_long, Colors.blue),
+        const SizedBox(width: 12),
+        _buildStatCard('قيد المعالجة', inv['pending'].toString(), Icons.hourglass_empty, Colors.orange),
+        const SizedBox(width: 12),
+        _buildStatCard('معتمدة', inv['approved'].toString(), Icons.check_circle, Colors.green),
+      ],
+    );
+  }
+
+  Widget _buildRoleSpecificStats(Map stats, String role) {
+    if (role == 'super_admin') {
+      return Row(
+        children: [
+          _buildStatCard('المستأجرين', (stats['tenants'] ?? 0).toString(), Icons.business_center, Colors.indigo),
+          const SizedBox(width: 12),
+          _buildStatCard('المستخدمين', (stats['total_users'] ?? 0).toString(), Icons.people, Colors.purple),
+        ],
+      );
+    } else {
+      return Row(
+        children: [
+          _buildStatCard('الشركات', (stats['companies'] ?? 0).toString(), Icons.business, Colors.indigo),
+          const SizedBox(width: 12),
+          _buildStatCard('المستخدمين', (stats['users'] ?? 0).toString(), Icons.people, Colors.purple),
+        ],
+      );
+    }
+  }
+
+  Widget _buildStatCard(String title, String count, IconData icon, Color color) {
+    return Expanded(
+      child: Container(
+        padding: const EdgeInsets.all(16),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(12),
+          boxShadow: [
+            BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10, offset: const Offset(0, 4)),
+          ],
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Icon(icon, color: color, size: 28),
+            const SizedBox(height: 12),
+            Text(count, style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold)),
+            Text(title, style: const TextStyle(color: Colors.grey, fontSize: 12)),
           ],
         ),
       ),
     );
   }
+
+  Widget _buildQuotaMeter(Map subscription) {
+    int limit = subscription['limit'] ?? 100;
+    int used = subscription['used'] ?? 0;
+    double progress = limit > 0 ? (used / limit) : 0;
+    
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(color: const Color(0xFFE2E8F0)),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const Text('استهلاك الباقة الشهرية (AI)', style: TextStyle(fontWeight: FontWeight.bold)),
+          const SizedBox(height: 12),
+          LinearProgressIndicator(
+            value: progress,
+            backgroundColor: Colors.grey.shade200,
+            color: progress > 0.9 ? Colors.red : const Color(0xFF0F4C81),
+            minHeight: 8,
+            borderRadius: BorderRadius.circular(4),
+          ),
+          const SizedBox(height: 8),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text('$used فاتورة', style: const TextStyle(fontWeight: FontWeight.bold, color: Color(0xFF0F4C81))),
+              Text('من $limit', style: const TextStyle(color: Colors.grey)),
+            ],
+          )
+        ],
+      ),
+    );
+  }
+
+  Widget _buildRecentActivity() {
+    if (controller.recentActivities.isEmpty) {
+      return const Center(child: Text('لا توجد نشاطات حديثة', style: TextStyle(color: Colors.grey)));
+    }
+
+    return ListView.builder(
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      itemCount: controller.recentActivities.length,
+      itemBuilder: (context, index) {
+        final act = controller.recentActivities[index];
+        return Card(
+          margin: const EdgeInsets.only(bottom: 8),
+          elevation: 0,
+          color: Colors.white,
+          shape: RoundedRectangleBorder(
+            side: const BorderSide(color: Color(0xFFE2E8F0)),
+            borderRadius: BorderRadius.circular(12),
+          ),
+          child: ListTile(
+            leading: CircleAvatar(
+              backgroundColor: const Color(0xFFF1F5F9),
+              child: Icon(_getActivityIcon(act['action']), color: const Color(0xFF64748B), size: 18),
+            ),
+            title: Text(_formatAction(act['action'])),
+            subtitle: Text('بواسطة: ${act['user_name'] ?? 'مستخدم مجهول'}'),
+            trailing: Text(
+              _timeAgo(act['created_at']),
+              style: const TextStyle(fontSize: 12, color: Colors.grey),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  IconData _getActivityIcon(String action) {
+    if (action.contains('approved')) return Icons.check_circle;
+    if (action.contains('created')) return Icons.add_circle;
+    if (action.contains('deleted')) return Icons.delete;
+    if (action.contains('login')) return Icons.login;
+    return Icons.info;
+  }
+
+  String _formatAction(String action) {
+    switch (action) {
+      case 'invoice.approved': return 'اعتماد فاتورة';
+      case 'invoice.extracted': return 'استخراج بيانات فاتورة';
+      case 'company.created': return 'إضافة شركة';
+      case 'company.deleted': return 'حذف شركة';
+      case 'user.created': return 'إضافة مستخدم';
+      case 'user.deleted': return 'حذف مستخدم';
+      case 'user.login': return 'تسجيل دخول';
+      default: return action;
+    }
+  }
+
+  String _timeAgo(String datetime) {
+    // A simple timeAgo formatter for demo purposes
+    try {
+      final dt = DateTime.parse(datetime);
+      final diff = DateTime.now().difference(dt);
+      if (diff.inDays > 0) return 'منذ ${diff.inDays} يوم';
+      if (diff.inHours > 0) return 'منذ ${diff.inHours} ساعة';
+      if (diff.inMinutes > 0) return 'منذ ${diff.inMinutes} دقيقة';
+      return 'الآن';
+    } catch (e) {
+      return '';
+    }
+  }
 }