From c54530d8dab8088603cdced2e33dca305b5769ee Mon Sep 17 00:00:00 2001 From: Kazem Alghasi Date: Sat, 3 Oct 2026 07:01:54 +0330 Subject: [PATCH] refactor(admin): optimize dashboard layout and enhance sidebar UX Refactor the Filament admin dashboard by decoupling the recent shipments logic into a dedicated widget and improving the sidebar navigation experience. Additionally, implement several improvements to the WordPress theme for better client-side usability. Laravel/Filament: - Extract `RecentShipmentsWidget` from `DashboardInfoWidget` to improve modularization and dashboard performance. - Update widget sorting and layout to accommodate the new structure. - Inject custom CSS and Alpine.js logic into the admin head to provide sidebar group toggling and a "collapse all" utility. - Improve sidebar group label visibility and hover states. WordPress: - Implement `ifnex_login_url()` to support Polylang-aware, language-specific login pages. - Hide the WordPress admin bar for non-administrator users to provide a cleaner client interface. - Add conditional rendering for the registration link in the login template based on WordPress user registration settings. --- .../wp-content/themes/ifnex/functions.php | 25 ++++ .../wp-content/themes/ifnex/header.php | 2 +- .../themes/ifnex/template-login.php | 3 + .../Filament/Widgets/DashboardInfoWidget.php | 80 ++--------- .../Filament/Widgets/ExchangeRateWidget.php | 2 +- .../Widgets/RecentShipmentsWidget.php | 73 ++++++++++ .../app/Filament/Widgets/WalletStats.php | 2 +- .../Providers/Filament/AdminPanelProvider.php | 1 + .../views/filament/hooks/head.blade.php | 130 +++++++++++++++++- .../filament/widgets/dashboard-info.blade.php | 105 +++----------- .../widgets/recent-shipments.blade.php | 58 ++++++++ 11 files changed, 327 insertions(+), 154 deletions(-) create mode 100644 04_Laravel/app/Filament/Widgets/RecentShipmentsWidget.php create mode 100644 04_Laravel/resources/views/filament/widgets/recent-shipments.blade.php diff --git a/03_WordPress/wp-content/themes/ifnex/functions.php b/03_WordPress/wp-content/themes/ifnex/functions.php index bc6d5f9..74d6035 100644 --- a/03_WordPress/wp-content/themes/ifnex/functions.php +++ b/03_WordPress/wp-content/themes/ifnex/functions.php @@ -30,6 +30,15 @@ function ifnex_theme_setup() { } add_action('after_setup_theme', 'ifnex_theme_setup'); +// ─── مخفی‌کردن نوار مدیریت وردپرس برای غیرمدیرها ────── +// مشتریان نباید نوار پیش‌فرض ادمین را در پنل خود ببینند +add_filter('show_admin_bar', function ($show) { + if (current_user_can('administrator')) { + return $show; + } + return false; +}); + // ─── بارگذاری فایل‌های کمکی ────────────────────────── $ifnex_includes = ['/inc/customizer.php']; foreach ($ifnex_includes as $file) { @@ -68,6 +77,22 @@ function ifnex_text_direction() { return ifnex_is_english() ? 'ltr' : 'rtl'; } +// ─── آدرس صفحه لاگین سازگار با زبان جاری (Polylang) ─── +// صفحه EN با slug یگانه login-en ساخته شده تا با صفحه FA تداخل canonical رخ ندهد +function ifnex_login_url() { + $page = get_page_by_path('login'); + if (!$page) { + return home_url('/login/'); + } + if (function_exists('pll_get_post')) { + $translated = pll_get_post($page->ID, ifnex_get_current_lang()); + if ($translated) { + return get_permalink($translated); + } + } + return get_permalink($page->ID); +} + // ─── سوئیچر زبان (سازگار با Polylang) ─────────────── function ifnex_language_switcher() { if (function_exists('pll_the_languages')) { diff --git a/03_WordPress/wp-content/themes/ifnex/header.php b/03_WordPress/wp-content/themes/ifnex/header.php index 4d3fc6e..4aa235a 100644 --- a/03_WordPress/wp-content/themes/ifnex/header.php +++ b/03_WordPress/wp-content/themes/ifnex/header.php @@ -16,7 +16,7 @@ if (is_user_logged_in()) { $login_btn_text = ifnex_t('پنل کاربری', 'Dashboard'); $login_btn_class = 'btn btn-primary'; } else { - $login_btn_url = esc_url(home_url('/login/')); + $login_btn_url = esc_url(ifnex_login_url()); $login_btn_text = ifnex_t('ورود مشتریان', 'Client Login'); $login_btn_class = 'btn btn-secondary'; } diff --git a/03_WordPress/wp-content/themes/ifnex/template-login.php b/03_WordPress/wp-content/themes/ifnex/template-login.php index f103e99..861250e 100644 --- a/03_WordPress/wp-content/themes/ifnex/template-login.php +++ b/03_WordPress/wp-content/themes/ifnex/template-login.php @@ -142,10 +142,13 @@ get_header();
+ +

+ diff --git a/04_Laravel/app/Filament/Widgets/DashboardInfoWidget.php b/04_Laravel/app/Filament/Widgets/DashboardInfoWidget.php index 3949d9d..471e3ee 100644 --- a/04_Laravel/app/Filament/Widgets/DashboardInfoWidget.php +++ b/04_Laravel/app/Filament/Widgets/DashboardInfoWidget.php @@ -2,84 +2,32 @@ namespace App\Filament\Widgets; -use App\Models\Shipment; use Filament\Widgets\Widget; use Morilog\Jalali\Jalalian; +/** + * کارت کوچک تاریخ/ساعت/خوش‌آمد — گوشه داشبورد. + * جدول «آخرین سفارشات» به RecentShipmentsWidget جدا منتقل شده است. + */ class DashboardInfoWidget extends Widget { - protected static ?int $sort = 1; // اولین ویجت + protected static ?int $sort = 1; + protected static bool $isLazy = false; - - protected int | string | array $columnSpan = 'full'; - + + protected int | string | array $columnSpan = 1; + protected static string $view = 'filament.widgets.dashboard-info'; protected function getViewData(): array { $now = now(); - - // تاریخ میلادی - $gregorianDate = $now->format('l, j F Y'); - - // تاریخ شمسی با Morilog\Jalali (ساده‌تر) - $jalaliDate = Jalalian::fromCarbon($now)->format('l، d F Y'); - - // ساعت - $time = $now->format('H:i'); - - // آخرین ۵ سفارش - $recentShipments = Shipment::query() - ->with(['fromCountry', 'toCountry']) - ->orderBy('created_at', 'desc') - ->limit(5) - ->get() - ->map(function ($s) { - return [ - 'awb' => $s->awb_no, - 'route' => ($s->fromCountry?->name ?? '?') . ' → ' . ($s->toCountry?->name ?? '?'), - 'status' => $s->status?->value ?? '—', - 'status_label' => $this->statusLabel($s->status?->value), - 'status_color' => $this->statusColor($s->status?->value), - 'date' => Jalalian::fromCarbon($s->created_at)->format('Y/m/d'), - 'amount' => $s->total_fee ? number_format($s->total_fee) . ' ریال' : '—', - ]; - }); return [ - 'gregorianDate' => $gregorianDate, - 'jalaliDate' => $jalaliDate, - 'time' => $time, - 'recentShipments' => $recentShipments, - 'userName' => auth()->user()?->name ?? 'کاربر', + 'gregorianDate' => $now->format('l, j F Y'), + 'jalaliDate' => Jalalian::fromCarbon($now)->format('l، d F Y'), + 'time' => $now->format('H:i'), + 'userName' => auth()->user()?->name ?? 'کاربر', ]; } - - private function statusLabel(?string $status): string - { - return match($status) { - 'processed' => 'پردازش شده', - 'picked_up' => 'تحویل گرفته شده', - 'in_transit' => 'در حال حمل', - 'out_for_delivery' => 'در مسیر تحویل', - 'delivered' => 'تحویل داده شده', - 'failed' => 'ناموفق', - 'returned' => 'برگشتی', - default => '—', - }; - } - - private function statusColor(?string $status): string - { - return match($status) { - 'processed' => 'bg-gray-100 text-gray-700 dark:bg-gray-800 dark:text-gray-300', - 'picked_up' => 'bg-blue-100 text-blue-700 dark:bg-blue-900 dark:text-blue-300', - 'in_transit' => 'bg-amber-100 text-amber-700 dark:bg-amber-900 dark:text-amber-300', - 'out_for_delivery' => 'bg-purple-100 text-purple-700 dark:bg-purple-900 dark:text-purple-300', - 'delivered' => 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300', - 'failed' => 'bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300', - 'returned' => 'bg-orange-100 text-orange-700 dark:bg-orange-900 dark:text-orange-300', - default => 'bg-gray-100 text-gray-700', - }; - } -} \ No newline at end of file +} diff --git a/04_Laravel/app/Filament/Widgets/ExchangeRateWidget.php b/04_Laravel/app/Filament/Widgets/ExchangeRateWidget.php index 88d0337..4455cb2 100644 --- a/04_Laravel/app/Filament/Widgets/ExchangeRateWidget.php +++ b/04_Laravel/app/Filament/Widgets/ExchangeRateWidget.php @@ -9,7 +9,7 @@ use App\Models\ExchangeRateHistory; class ExchangeRateWidget extends BaseWidget { - protected static ?int $sort = 2; + protected static ?int $sort = 3; protected static bool $isLazy = false; protected int | string | array $columnSpan = 'full'; diff --git a/04_Laravel/app/Filament/Widgets/RecentShipmentsWidget.php b/04_Laravel/app/Filament/Widgets/RecentShipmentsWidget.php new file mode 100644 index 0000000..608a494 --- /dev/null +++ b/04_Laravel/app/Filament/Widgets/RecentShipmentsWidget.php @@ -0,0 +1,73 @@ +with(['fromCountry', 'toCountry']) + ->orderBy('created_at', 'desc') + ->limit(5) + ->get() + ->map(function ($s) { + return [ + 'awb' => $s->awb_no, + 'route' => ($s->fromCountry?->name ?? '?') . ' → ' . ($s->toCountry?->name ?? '?'), + 'status' => $s->status?->value ?? '—', + 'status_label' => $this->statusLabel($s->status?->value), + 'status_color' => $this->statusColor($s->status?->value), + 'date' => Jalalian::fromCarbon($s->created_at)->format('Y/m/d'), + 'amount' => $s->total_fee ? number_format($s->total_fee) . ' ریال' : '—', + ]; + }); + + return [ + 'recentShipments' => $recentShipments, + ]; + } + + private function statusLabel(?string $status): string + { + return match($status) { + 'processed' => 'پردازش شده', + 'picked_up' => 'تحویل گرفته شده', + 'in_transit' => 'در حال حمل', + 'out_for_delivery' => 'در مسیر تحویل', + 'delivered' => 'تحویل داده شده', + 'failed' => 'ناموفق', + 'returned' => 'برگشتی', + default => '—', + }; + } + + private function statusColor(?string $status): string + { + return match($status) { + 'processed' => 'bg-gray-100 text-gray-700 dark:bg-gray-800 dark:text-gray-300', + 'picked_up' => 'bg-blue-100 text-blue-700 dark:bg-blue-900 dark:text-blue-300', + 'in_transit' => 'bg-amber-100 text-amber-700 dark:bg-amber-900 dark:text-amber-300', + 'out_for_delivery' => 'bg-purple-100 text-purple-700 dark:bg-purple-900 dark:text-purple-300', + 'delivered' => 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300', + 'failed' => 'bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300', + 'returned' => 'bg-orange-100 text-orange-700 dark:bg-orange-900 dark:text-orange-300', + default => 'bg-gray-100 text-gray-700', + }; + } +} diff --git a/04_Laravel/app/Filament/Widgets/WalletStats.php b/04_Laravel/app/Filament/Widgets/WalletStats.php index 3a46339..c9b0609 100644 --- a/04_Laravel/app/Filament/Widgets/WalletStats.php +++ b/04_Laravel/app/Filament/Widgets/WalletStats.php @@ -10,7 +10,7 @@ use Illuminate\Support\Facades\DB; class WalletStats extends BaseWidget { - protected static ?int $sort = 3; // سومین ویجت + protected static ?int $sort = 4; // چهارمین ویجت protected static bool $isLazy = false; protected int | string | array $columnSpan = 'full'; diff --git a/04_Laravel/app/Providers/Filament/AdminPanelProvider.php b/04_Laravel/app/Providers/Filament/AdminPanelProvider.php index fdf90b4..4f76a0a 100644 --- a/04_Laravel/app/Providers/Filament/AdminPanelProvider.php +++ b/04_Laravel/app/Providers/Filament/AdminPanelProvider.php @@ -73,6 +73,7 @@ class AdminPanelProvider extends PanelProvider ->widgets([ // ویجت‌های سفارشی IFNEX (به ترتیب sort) \App\Filament\Widgets\DashboardInfoWidget::class, + \App\Filament\Widgets\RecentShipmentsWidget::class, \App\Filament\Widgets\ExchangeRateWidget::class, \App\Filament\Widgets\WalletStats::class, ]) diff --git a/04_Laravel/resources/views/filament/hooks/head.blade.php b/04_Laravel/resources/views/filament/hooks/head.blade.php index e211eb9..ca5c7ca 100644 --- a/04_Laravel/resources/views/filament/hooks/head.blade.php +++ b/04_Laravel/resources/views/filament/hooks/head.blade.php @@ -187,4 +187,132 @@ .fi-ta-text-wrap { gap: 0.125rem !important; } - \ No newline at end of file + + /* ─── عناوین گروه‌های سایدبار: سفید روی پس‌زمینه تیره ─── */ + .fi-sidebar-group-label { + color: #e2e8f0 !important; + font-weight: 600 !important; + } + + .fi-sidebar-group-icon { + color: #cbd5e1 !important; + } + + .fi-sidebar-group-collapse-button { + color: #cbd5e1 !important; + } + + .fi-sidebar-group-button:hover .fi-sidebar-group-label, + .fi-sidebar-group-button:hover .fi-sidebar-group-icon, + .fi-sidebar-group-button:hover .fi-sidebar-group-collapse-button { + color: #f59e0b !important; + } + + /* ─── دکمه بستن/باز کردن همه منوها ─── */ + .ifnex-sidebar-collapse-all { + display: block; + width: calc(100% - 16px); + margin: 4px 8px 8px; + padding: 7px 10px; + font-size: 11.5px; + font-family: inherit; + color: #cbd5e1; + background: rgba(255, 255, 255, .06); + border: 1px solid rgba(255, 255, 255, .14); + border-radius: 8px; + cursor: pointer; + text-align: center; + transition: all .2s; + } + + .ifnex-sidebar-collapse-all:hover { + background: rgba(245, 158, 11, .15); + border-color: rgba(245, 158, 11, .35); + color: #f59e0b; + } + + + \ No newline at end of file diff --git a/04_Laravel/resources/views/filament/widgets/dashboard-info.blade.php b/04_Laravel/resources/views/filament/widgets/dashboard-info.blade.php index def9589..4f0ec71 100644 --- a/04_Laravel/resources/views/filament/widgets/dashboard-info.blade.php +++ b/04_Laravel/resources/views/filament/widgets/dashboard-info.blade.php @@ -1,92 +1,29 @@ -
- - {{-- کارت تاریخ و ساعت --}} -
-
-
- -
-
-
امروز
-
{{ $time }}
-
+
+
+
+
- -
-
- 📅 شمسی: - {{ $jalaliDate }} -
-
- 🌍 میلادی: - {{ $gregorianDate }} -
-
- -
-
خوش آمدید
-
{{ $userName }}
+
+
امروز
+
{{ $time }}
- {{-- کارت آخرین سفارشات --}} -
-
-
- -

آخرین سفارشات

-
- - مشاهده همه ← - +
+
+ 📅 شمسی: + {{ $jalaliDate }} +
+
+ 🌍 میلادی: + {{ $gregorianDate }}
- - @if($recentShipments->isEmpty()) -
- -

هنوز سفارشی ثبت نشده است

-
- @else -
- - - - - - - - - - - - @foreach($recentShipments as $shipment) - - - - - - - - @endforeach - -
AWBمسیروضعیتتاریخمبلغ
- {{ $shipment['awb'] }} - - {{ $shipment['route'] }} - - - {{ $shipment['status_label'] }} - - - {{ $shipment['date'] }} - - {{ $shipment['amount'] }} -
-
- @endif
- + +
+
خوش آمدید
+
{{ $userName }}
+
- \ No newline at end of file + diff --git a/04_Laravel/resources/views/filament/widgets/recent-shipments.blade.php b/04_Laravel/resources/views/filament/widgets/recent-shipments.blade.php new file mode 100644 index 0000000..103d514 --- /dev/null +++ b/04_Laravel/resources/views/filament/widgets/recent-shipments.blade.php @@ -0,0 +1,58 @@ + +
+
+
+ +

آخرین سفارشات

+
+ + مشاهده همه ← + +
+ + @if($recentShipments->isEmpty()) +
+ +

هنوز سفارشی ثبت نشده است

+
+ @else +
+ + + + + + + + + + + + @foreach($recentShipments as $shipment) + + + + + + + + @endforeach + +
AWBمسیروضعیتتاریخمبلغ
+ {{ $shipment['awb'] }} + + {{ $shipment['route'] }} + + + {{ $shipment['status_label'] }} + + + {{ $shipment['date'] }} + + {{ $shipment['amount'] }} +
+
+ @endif +
+