From 63764d0718526073c7a2acdfa9ec4d8f9bed1a6a Mon Sep 17 00:00:00 2001 From: antv Date: Tue, 7 Jul 2026 11:21:21 +0700 Subject: [PATCH] feature: make style like main page --- resources/css/app.css | 49 ++++++- resources/views/admin/users/create.blade.php | 13 +- resources/views/admin/users/edit.blade.php | 13 +- resources/views/admin/users/index.blade.php | 57 ++++++-- .../admin/users/partials/stats.blade.php | 47 +++++- .../admin/users/partials/table.blade.php | 35 +++-- .../admin/users/partials/title.blade.php | 2 +- .../views/components/action-panel.blade.php | 17 ++- .../views/components/month-filter.blade.php | 4 +- .../components/transaction-history.blade.php | 32 ++--- .../components/user-filter-form.blade.php | 18 +-- .../views/components/user-form.blade.php | 136 +++++++++--------- resources/views/layouts/app.blade.php | 16 ++- .../views/user/change_password.blade.php | 24 +++- resources/views/user/send.blade.php | 107 ++++++++------ 15 files changed, 385 insertions(+), 185 deletions(-) diff --git a/resources/css/app.css b/resources/css/app.css index 7339476..0836cda 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -72,7 +72,7 @@ --color-warning: #ed6c02; --color-info: #0288d1; - --color-bg-main: #f0f4f9; + --color-bg-main: #FAFBFF; --color-bg-sidebar: #ffffff; --color-bg-card: #ffffff; --color-bg-card-soft: #eef2f6; @@ -270,3 +270,50 @@ select.form-input { @import "./login.css"; +@media (min-width: 1024px) { + body.sidebar-collapsed .sidebar { + width: 80px !important; + min-width: 80px !important; + } + + body.sidebar-collapsed .sidebar span { + display: none !important; + } + + body.sidebar-collapsed .sidebar nav { + padding-left: 0.5rem !important; + padding-right: 0.5rem !important; + } + body.sidebar-collapsed .sidebar a { + justify-content: center !important; + padding-left: 0 !important; + padding-right: 0 !important; + gap: 0 !important; + } + + body.sidebar-collapsed #sidebar-profile div.flex-col, + body.sidebar-collapsed #sidebar-profile svg { + display: none !important; + } + + body.sidebar-collapsed #sidebar-profile { + justify-content: center !important; + padding-left: 0.75rem !important; + padding-right: 0.75rem !important; + } + + body.sidebar-collapsed .sidebar div.xl\:flex { + display: none !important; + } + + body.sidebar-collapsed .sidebar img[alt="GMO-Z.com RUNSYSTEM"] { + display: none !important; + } + + body.sidebar-collapsed .sidebar div.shrink-0 { + padding-left: 0.5rem !important; + padding-right: 0.5rem !important; + justify-content: center !important; + } +} + diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php index 75723d8..ef1ea9e 100644 --- a/resources/views/admin/users/create.blade.php +++ b/resources/views/admin/users/create.blade.php @@ -2,5 +2,16 @@ @section('title', 'Thêm User Mới') @section('content') - +
+
+

+ Thêm User Mới +

+

+ Tạo tài khoản nhân viên mới và thiết lập các thông tin cơ bản. +

+
+
+ + @endsection diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index ef592a5..ca75eb7 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -2,5 +2,16 @@ @section('title', 'Chi tiết User') @section('content') - +
+
+

+ Chi tiết User +

+

+ Quản lý thông tin thẻ và theo dõi lịch sử nhận gửi của nhân viên. +

+
+
+ + @endsection diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php index ad391bd..0c00883 100644 --- a/resources/views/admin/users/index.blade.php +++ b/resources/views/admin/users/index.blade.php @@ -2,25 +2,62 @@ @section('title', 'Quản lý Users') @section('content') -
-

- @include('admin.users.partials.title') -

-
- @csrf - -
+
+
+

+ + @include('admin.users.partials.title') + +

+

+ Xem danh sách nhân viên, cấp phát thẻ và cập nhật trạng thái làm việc. +

+
+ +
+ + + + + Thêm user mới + + +
-
+
@include('admin.users.partials.stats')
-
+
@include('admin.users.partials.table')
+ + +
+
+ + + +
+
+

Xác nhận reset card tháng

+

+ Bạn có chắc chắn muốn reset toàn bộ số card hiện tại của các user về 0?

Hành động này thường chỉ thực hiện vào cuối tháng và không thể hoàn tác. +

+
+
+ + +
+ @csrf + +
+ + + @endsection diff --git a/resources/views/admin/users/partials/stats.blade.php b/resources/views/admin/users/partials/stats.blade.php index 9aaf676..708b74b 100644 --- a/resources/views/admin/users/partials/stats.blade.php +++ b/resources/views/admin/users/partials/stats.blade.php @@ -1,2 +1,45 @@ - - +
+
+
+ + + +
+
+ User nhận nhiều nhất + @if($topReceivedUser) + {{ $topReceivedUser->name }} + MSNV: {{ $topReceivedUser->msnv }} + @else + Không có dữ liệu + @endif +
+
+
+ {{ $topReceivedUser?->total_received ?? 0 }} + Thẻ Nhận +
+
+ +
+
+
+ + + +
+
+ User gửi nhiều nhất + @if($topSentUser) + {{ $topSentUser->name }} + MSNV: {{ $topSentUser->msnv }} + @else + Không có dữ liệu + @endif +
+
+
+ {{ $topSentUser?->total_sent ?? 0 }} + Thẻ Gửi +
+
diff --git a/resources/views/admin/users/partials/table.blade.php b/resources/views/admin/users/partials/table.blade.php index 4090b27..2148f86 100644 --- a/resources/views/admin/users/partials/table.blade.php +++ b/resources/views/admin/users/partials/table.blade.php @@ -1,18 +1,18 @@ -
- +
+ @if($users->total() > 0) - Showing {{ $users->firstItem() }}-{{ $users->lastItem() }} of {{ $users->total() }} users + Hiển thị {{ $users->firstItem() }}-{{ $users->lastItem() }} trên {{ $users->total() }} nhân viên @else - Showing 0 users + Hiển thị 0 nhân viên @endif
- - +
+ - + @@ -20,24 +20,29 @@ - + @forelse($users as $u) - + - + @empty @@ -49,7 +54,7 @@
MSNVEmailNhân viên Đã Nhận Đã Gửi Số dư thẻThao tác
{{ $u->msnv }}{{ $u->mail }} +
+ {{ $u->name }} + {{ $u->mail }} +
+ 		+{{ $u->total_received }} {{ $u->total_sent }} {{ $u->card }} @if($u->flag_send) - Được gửi + Được gửi @else - Không + Không @endif - Quản lý - + Quản lý +
@if($users->hasPages()) -
+
{{ $users->links() }}
@endif diff --git a/resources/views/admin/users/partials/title.blade.php b/resources/views/admin/users/partials/title.blade.php index 8391b80..3460eef 100644 --- a/resources/views/admin/users/partials/title.blade.php +++ b/resources/views/admin/users/partials/title.blade.php @@ -1,4 +1,4 @@ Danh sách User -