From 04df4fbe82823882cc2bf3fea1769fdfbfa1294a Mon Sep 17 00:00:00 2001 From: "allen.yan" Date: Tue, 13 May 2025 16:53:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=A8=98=E9=8C=84=20admin=20=E7=95=AB=E9=9D=A2=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=2020250513?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 10244 -> 10244 bytes app/Livewire/Admin/ActivityLogTable.php | 2 + resources/lang/zh-TW/activity-log.php | 5 + .../components/admin/section-header.blade.php | 13 +++ .../views/components/layouts/admin.blade.php | 2 - .../admin/activity-log-header.blade.php | 2 + .../livewire/admin/role-header.blade.php | 4 +- .../livewire/admin/user-header.blade.php | 5 +- .../layout/admin/navigation.blade.php | 110 ------------------ .../livewire/layout/admin/sidebar.blade.php | 85 +++++++++++--- 10 files changed, 92 insertions(+), 136 deletions(-) create mode 100644 resources/lang/zh-TW/activity-log.php create mode 100644 resources/views/components/admin/section-header.blade.php create mode 100644 resources/views/livewire/admin/activity-log-header.blade.php delete mode 100644 resources/views/livewire/layout/admin/navigation.blade.php diff --git a/.DS_Store b/.DS_Store index ce09d970a6f89ccb2ff4759507c57d29e879f329..ef4f14544d444fa041870534ba4da37deae63a59 100644 GIT binary patch delta 1651 zcmeH{UuYaf9LMK7sqHQ<&D{0=r0d1I_H2l4{`D^5Vw={BY0{+En9y94OA`op-A!F{ zw`XtnF4_<;#fY@@$+dm0QUnW4jl`-CT18aqgMy_f3YGRj5k*iGq@vZi-D{x;3O@PZ z!tBg<=C?Dy-+aF8;_%||@)m~It*idS4gR^gXtbj#6ltGt3e9!KVojmWtsV38qTmg; zZr?XGlg;V*V^*;)xZyYre7*z`f@5AvnzAJyk^K1Qq4VyN%wm-15r+@G8 zm0IR?t(!MvhPYpNo!3!=TU zQ4Y!zm6e`?%HK-$g9f=#N*X*dfu)_mEmE_ToY8beWQH@-CPn1^*>pzDicI0>M0qY9 zQcNBzIa!M=;herr>XK6j^SPX=n}+B@lQaFG+$~$nZcn*V#4fo{K43hOE~rDZx>^v} zB`0Wr&rh*hdu4ChFnblv%oi$I@?r;rvOHc%zFSf3)ZH#tEANw&0=q0sF{bGy%}iHr za)ft9LkK(9NJu!o*%^l8z2yaanAFobRrK77sP^D6>q!IYByo}?(F7#sndoY3£OsCX1J$U(zwv7CPEk9pt z8`0zS`9l?VcJ6q{`rb1na5vr)knRmyySxo$M}+SaxLw#?R~*@RKbHx%+L3|g7J*xn zQCmuZNL1toWHnXU9ODv>khXV;+=^^fRmQtTZY`Y=TL%KYeSD`knQ)tV`3~p{_I3Ol z=AV!+$Tji}`I+3nYTONmAR0O6ZHS`}yE*9u1~G~;&ia5&dK!nI;m{0B6j8$CID)6J zh^O%kj@iVYvxz^C7jOnI;yhl)GFET_7x6aU!Mk{md*EYy#@T;`uN{uJxjyXZTW|cb cvgG?oSXmSLb=B6t|Cjs^?Y{%fTJrtyC;Sp(%K!iX delta 1563 zcmeH_Piz!b9LL{xT3}|N_O0x8xAQEl-Pl%ksavG&+Nx~X{()9#p<7uBT6a4GPS~Ak zcV;WKX%+<&0R>@VJc)mzM~SA9gDD1XL{BEw(8NfBi5EQ>qaKV2zMWYQ7!M}Kn{$|# z@Ao(Fz2E%4pHpL}#y*TvTybJ__JM|lh3#Fj@V3NaEWD8D?v8~M9i5Adk{F0Q)VqJ` zSiWGGFFRj{HsiF@=MOfga(OdHNR5)4$?KLKkKcq)Q@dvEI#H6>vjdrf^2I>F8E$N! z%-Gs-dt85Bo3zZLoig*Kf|1duO{3yXQChOJ{aQY2>vLLv*48XPx%+{1c|)M7xg{F! z?Ag)3d(Xa=x_j!WPu?gytG;%zt|1s|R2XxhgvyyxPM`!48z?w4$Y(hD1j^w^x3QWv0zSK{ISi@*(EgNw$+cUAg*+tYweRXhx;2 zWv@2ChS;R_Y__P4K4)k}k>2q9VeU`Sdbd*9HlXUZS*$e82e3EH*g-Yxv$Z}|b$=z) z5UgY4%-PFWd5bsDw2>`nk!0Lc5)nxwX(vgtiyS5znIZG!74jyzL_Q!_$aV5L`GTyH zZ^$ijn|w=tAU~1cQHwg%gTe;|t!Tp*M6n%7^kFAPFot~?M;cEdhiPay0uv?7p>Q1Y zcoAoC7O&zQ-oV><2k+s1T*g&=ifg!z&+sL_!cDB=Hh#u0_!V~qNsxv0f?o&-K_MhW zg_zJO^av@hdjVBQ4prCcBJ^`QH!HJ$N2M}2wChhQC;mN^s~cPn@7?GRY>KpP-PYBc zbe?G%65({uw6-cA-yw0R3`$(BD5-va(lQmrNYcx^O#W%;ACXVUHFATj@X)^_-;*E7 z9f&+?1!1(fVMnnQUFb#vJ$MuY7{m~E^Vrjvz>~;el83JH*pEU-5f*G7{XiKf@B&Wa zB_8~Fyaora;}YKD2)tWGUR)OL-V!gIIJ&eh{9COv80h_f&i~b% GQ}_e+Jx~Pz diff --git a/app/Livewire/Admin/ActivityLogTable.php b/app/Livewire/Admin/ActivityLogTable.php index ad22c8b..c6ddc8b 100644 --- a/app/Livewire/Admin/ActivityLogTable.php +++ b/app/Livewire/Admin/ActivityLogTable.php @@ -44,6 +44,8 @@ final class ActivityLogTable extends PowerGridComponent ->showToggleColumns(); //->showSoftDeletes() //->showSearchInput() + $header->includeViewOnTop('livewire.admin.activity-log-header'); + $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); return $actions; diff --git a/resources/lang/zh-TW/activity-log.php b/resources/lang/zh-TW/activity-log.php new file mode 100644 index 0000000..5e31e84 --- /dev/null +++ b/resources/lang/zh-TW/activity-log.php @@ -0,0 +1,5 @@ + '操作記錄' +]; \ No newline at end of file diff --git a/resources/views/components/admin/section-header.blade.php b/resources/views/components/admin/section-header.blade.php new file mode 100644 index 0000000..0c2fd95 --- /dev/null +++ b/resources/views/components/admin/section-header.blade.php @@ -0,0 +1,13 @@ +
+
+ {{-- 左邊標題 --}} +

+ {{ $title }} +

+ + {{-- 右邊 slot 注入按鈕群 --}} +
+ {{ $slot }} +
+
+
\ No newline at end of file diff --git a/resources/views/components/layouts/admin.blade.php b/resources/views/components/layouts/admin.blade.php index c543901..14f4b2a 100644 --- a/resources/views/components/layouts/admin.blade.php +++ b/resources/views/components/layouts/admin.blade.php @@ -23,8 +23,6 @@
- {{-- Navigation --}} - {{-- Page Heading --}} @if (isset($header)) diff --git a/resources/views/livewire/admin/activity-log-header.blade.php b/resources/views/livewire/admin/activity-log-header.blade.php new file mode 100644 index 0000000..a7a7632 --- /dev/null +++ b/resources/views/livewire/admin/activity-log-header.blade.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/resources/views/livewire/admin/role-header.blade.php b/resources/views/livewire/admin/role-header.blade.php index a155538..28df373 100644 --- a/resources/views/livewire/admin/role-header.blade.php +++ b/resources/views/livewire/admin/role-header.blade.php @@ -1,8 +1,8 @@ -
+ -
\ No newline at end of file + \ No newline at end of file diff --git a/resources/views/livewire/admin/user-header.blade.php b/resources/views/livewire/admin/user-header.blade.php index 83378ef..3343200 100644 --- a/resources/views/livewire/admin/user-header.blade.php +++ b/resources/views/livewire/admin/user-header.blade.php @@ -1,4 +1,4 @@ -
+ - -
\ No newline at end of file + \ No newline at end of file diff --git a/resources/views/livewire/layout/admin/navigation.blade.php b/resources/views/livewire/layout/admin/navigation.blade.php deleted file mode 100644 index f63d2cb..0000000 --- a/resources/views/livewire/layout/admin/navigation.blade.php +++ /dev/null @@ -1,110 +0,0 @@ -redirect('/', navigate: true); - } -}; ?> - - diff --git a/resources/views/livewire/layout/admin/sidebar.blade.php b/resources/views/livewire/layout/admin/sidebar.blade.php index 782d827..db1b96c 100644 --- a/resources/views/livewire/layout/admin/sidebar.blade.php +++ b/resources/views/livewire/layout/admin/sidebar.blade.php @@ -1,28 +1,75 @@ -@php - use Illuminate\Support\Facades\Auth; + 'Dashboard', 'route' => 'admin.dashboard', 'icon' => 'home', 'permission' => null], ['label' => 'ActivityLog', 'route' => 'admin.activity-log', 'icon' => 'clock', 'permission' => null], ['label' => 'Role', 'route' => 'admin.roles', 'icon' => 'user-circle', 'permission' => 'role-list'], ['label' => 'User', 'route' => 'admin.users', 'icon' => 'user-circle', 'permission' => 'user-list'], ]; -@endphp -