diff --git a/lib/helpers/services/api_endpoints.dart b/lib/helpers/services/api_endpoints.dart index e5b417d..d0ffb2a 100644 --- a/lib/helpers/services/api_endpoints.dart +++ b/lib/helpers/services/api_endpoints.dart @@ -1,7 +1,7 @@ class ApiEndpoints { static const String baseUrl = "https://stageapi.marcoaiot.com/api"; // static const String baseUrl = "https://api.marcoaiot.com/api"; - // static const String baseUrl = "https://devapi.marcoaiot.com/api"; + //static const String baseUrl = "https://devapi.marcoaiot.com/api"; // Dashboard Module API Endpoints static const String getDashboardAttendanceOverview = diff --git a/lib/routes.dart b/lib/routes.dart index b2d37a1..7070b0d 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -2,76 +2,135 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:marco/helpers/services/auth_service.dart'; import 'package:marco/helpers/services/tenant_service.dart'; - -// Screens -import 'package:marco/view/auth/login_option_screen.dart'; +import 'package:marco/view/auth/forgot_password_screen.dart'; import 'package:marco/view/auth/login_screen.dart'; import 'package:marco/view/auth/register_account_screen.dart'; import 'package:marco/view/auth/reset_password_screen.dart'; -import 'package:marco/view/auth/forgot_password_screen.dart'; -import 'package:marco/view/auth/mpin_screen.dart'; -import 'package:marco/view/auth/mpin_auth_screen.dart'; +import 'package:marco/view/error_pages/coming_soon_screen.dart'; +import 'package:marco/view/error_pages/error_404_screen.dart'; +import 'package:marco/view/error_pages/error_500_screen.dart'; import 'package:marco/view/dashboard/dashboard_screen.dart'; -import 'package:marco/view/tenant/tenant_selection_screen.dart'; import 'package:marco/view/Attendence/attendance_screen.dart'; import 'package:marco/view/taskPlanning/daily_task_planning.dart'; import 'package:marco/view/taskPlanning/daily_progress_report.dart'; import 'package:marco/view/employees/employees_screen.dart'; +import 'package:marco/view/auth/login_option_screen.dart'; +import 'package:marco/view/auth/mpin_screen.dart'; +import 'package:marco/view/auth/mpin_auth_screen.dart'; +import 'package:marco/view/directory/directory_main_screen.dart'; import 'package:marco/view/expense/expense_screen.dart'; import 'package:marco/view/document/user_document_screen.dart'; -import 'package:marco/view/directory/directory_main_screen.dart'; -import 'package:marco/view/error_pages/error_404_screen.dart'; -import 'package:marco/view/error_pages/error_500_screen.dart'; -import 'package:marco/view/error_pages/coming_soon_screen.dart'; +import 'package:marco/view/tenant/tenant_selection_screen.dart'; import 'package:marco/view/payment/payment_screen.dart'; import 'package:marco/view/subscriptions/subscriptions_screen.dart'; - class AuthMiddleware extends GetMiddleware { - @override - RouteSettings? redirect(String? route) { - if (!AuthService.isLoggedIn) { - return const RouteSettings(name: '/auth/login-option'); - } else if (!TenantService.isTenantSelected) { - return const RouteSettings(name: '/select-tenant'); - } - return null; - } +@override +RouteSettings? redirect(String? route) { +if (!AuthService.isLoggedIn) { +if (route != '/auth/login-option') { +return const RouteSettings(name: '/auth/login-option'); +} +} else if (!TenantService.isTenantSelected) { +if (route != '/select-tenant') { +return const RouteSettings(name: '/select-tenant'); +} +} +return null; +} } -List getPageRoute() { - return [ - GetPage(name: '/', page: () => DashboardScreen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/dashboard', page: () => DashboardScreen(), middlewares: [AuthMiddleware()]), +getPageRoute() { +var routes = [ +GetPage( +name: '/', +page: () => DashboardScreen(), +middlewares: [AuthMiddleware()]), +GetPage( +name: '/dashboard', +page: () => DashboardScreen(), // or your actual home screen +middlewares: [AuthMiddleware()], +), +GetPage( +name: '/select-tenant', +page: () => const TenantSelectionScreen(), +middlewares: [AuthMiddleware()]), - // Tenant - GetPage(name: '/select-tenant', page: () => TenantSelectionScreen(), middlewares: [AuthMiddleware()]), - - // Modules - GetPage(name: '/dashboard/attendance', page: () => AttendanceScreen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/dashboard/employees', page: () => EmployeesScreen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/dashboard/daily-task-planning', page: () => DailyTaskPlanningScreen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/dashboard/daily-task-progress', page: () => DailyProgressReportScreen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/dashboard/directory-main-page', page: () => DirectoryMainScreen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/dashboard/expense-main-page', page: () => ExpenseMainScreen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/dashboard/document-main-page', page: () => UserDocumentsPage(), middlewares: [AuthMiddleware()]), - - // Auth - GetPage(name: '/auth/login', page: () => LoginScreen()), - GetPage(name: '/auth/login-option', page: () => LoginOptionScreen()), - GetPage(name: '/auth/register_account', page: () => RegisterAccountScreen()), - GetPage(name: '/auth/mpin', page: () => MPINScreen()), - GetPage(name: '/auth/mpin-auth', page: () => MPINAuthScreen()), - GetPage(name: '/auth/forgot_password', page: () => ForgotPasswordScreen()), - GetPage(name: '/auth/reset_password', page: () => ResetPasswordScreen()), - - // Payment - GetPage(name: '/dashboard/payment', page: () => PaymentScreen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/subscription', page: () => SubscriptionScreen(), middlewares: [AuthMiddleware()]), - - // Error Pages - GetPage(name: '/error/404', page: () => Error404Screen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/error/500', page: () => Error500Screen(), middlewares: [AuthMiddleware()]), - GetPage(name: '/error/coming_soon', page: () => ComingSoonScreen(), middlewares: [AuthMiddleware()]), - ]; -} +// Dashboard +GetPage( +name: '/dashboard/attendance', +page: () => AttendanceScreen(), +middlewares: [AuthMiddleware()]), +GetPage( +name: '/dashboard', +page: () => DashboardScreen(), +middlewares: [AuthMiddleware()]), +GetPage( +name: '/dashboard/employees', +page: () => EmployeesScreen(), +middlewares: [AuthMiddleware()]), +// Daily Task Planning +GetPage( +name: '/dashboard/daily-task-Planning', +page: () => DailyTaskPlanningScreen(), +middlewares: [AuthMiddleware()]), +GetPage( +name: '/dashboard/daily-task-progress', +page: () => DailyProgressReportScreen(), +middlewares: [AuthMiddleware()]), +GetPage( +name: '/dashboard/directory-main-page', +page: () => DirectoryMainScreen(), +middlewares: [AuthMiddleware()]), +// Expense +GetPage( +name: '/dashboard/expense-main-page', +page: () => ExpenseMainScreen(), +middlewares: [AuthMiddleware()]), +// Documents +GetPage( +name: '/dashboard/document-main-page', +page: () => UserDocumentsPage(), +middlewares: [AuthMiddleware()]), +// Payment +GetPage( +name: '/dashboard/payment', +page: () => PaymentScreen(), +middlewares: [AuthMiddleware()]), +GetPage( +name: '/subscription', +page: () => SubscriptionScreen(), +middlewares: [AuthMiddleware()]), +// Authentication +GetPage(name: '/auth/login', page: () => LoginScreen()), +GetPage(name: '/auth/login-option', page: () => LoginOptionScreen()), +GetPage(name: '/auth/mpin', page: () => MPINScreen()), +GetPage(name: '/auth/mpin-auth', page: () => MPINAuthScreen()), +GetPage( +name: '/auth/register_account', +page: () => const RegisterAccountScreen()), +GetPage(name: '/auth/forgot_password', page: () => ForgotPasswordScreen()), +GetPage( +name: '/auth/reset_password', page: () => const ResetPasswordScreen()), +// Error +GetPage( +name: '/error/coming_soon', +page: () => ComingSoonScreen(), +middlewares: [AuthMiddleware()]), +GetPage( +name: '/error/500', +page: () => Error500Screen(), +middlewares: [AuthMiddleware()]), +GetPage( +name: '/error/404', +page: () => Error404Screen(), +middlewares: [AuthMiddleware()]), +]; +return routes +.map((e) => GetPage( +name: e.name, +page: e.page, +middlewares: e.middlewares, +transition: Transition.noTransition)) +.toList(); +} \ No newline at end of file diff --git a/lib/view/layouts/user_profile_right_bar.dart b/lib/view/layouts/user_profile_right_bar.dart index aa7650f..081d6dd 100644 --- a/lib/view/layouts/user_profile_right_bar.dart +++ b/lib/view/layouts/user_profile_right_bar.dart @@ -307,8 +307,8 @@ class _UserProfileBarState extends State icon: LucideIcons.bell, label: 'Subscribe', onTap: _onSubscribeTap, - iconColor: Colors.green.shade600, - textColor: Colors.green.shade800, + iconColor: Colors.redAccent, + textColor: Colors.redAccent, ), SizedBox(height: spacingHeight), _menuItemRow( diff --git a/lib/view/subscriptions/subscriptions_screen.dart b/lib/view/subscriptions/subscriptions_screen.dart index b5566d7..c11a8fc 100644 --- a/lib/view/subscriptions/subscriptions_screen.dart +++ b/lib/view/subscriptions/subscriptions_screen.dart @@ -13,7 +13,12 @@ class SubscriptionScreen extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: const Text('Subscription Plans'), + title: const Text( + 'Subscription Plans', + style: TextStyle( + color: Colors.black87, + ), + ), leading: IconButton( icon: const Icon(Icons.arrow_back_ios_new), onPressed: () => Get.back(), @@ -33,16 +38,15 @@ class SubscriptionScreen extends StatelessWidget { } return RefreshIndicator( - onRefresh: () => controller - .fetchPlans(controller.selectedFrequency.value), + onRefresh: () => + controller.fetchPlans(controller.selectedFrequency.value), child: SingleChildScrollView( physics: const AlwaysScrollableScrollPhysics(), padding: const EdgeInsets.all(16), child: Column( children: controller.plans.map((plan) { final features = _extractFeatures(plan); - final currency = - plan['currency']?['symbol'] ?? '₹'; + final currency = plan['currency']?['symbol'] ?? '₹'; return Card( margin: const EdgeInsets.only(bottom: 16), shape: RoundedRectangleBorder( @@ -140,8 +144,7 @@ class SubscriptionScreen extends StatelessWidget { child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: controller.frequencies.map((freq) { - final isSelected = - controller.selectedFrequency.value == freq; + final isSelected = controller.selectedFrequency.value == freq; return GestureDetector( onTap: () => controller.fetchPlans(freq), child: Container( @@ -182,7 +185,8 @@ class SubscriptionScreen extends StatelessWidget { final supports = plan['features']?['supports'] ?? {}; supports.forEach((k, v) { if (v == true) { - features.add(k.toString().replaceAll(RegExp(r'([a-z])([A-Z])'), r'\1 \2')); + features.add( + k.toString().replaceAll(RegExp(r'([a-z])([A-Z])'), r'\1 \2')); } }); } catch (e) {