From 077d418357231e1024388ae17ad7fc2093edab3b Mon Sep 17 00:00:00 2001 From: "allen.yan" Date: Fri, 2 May 2025 18:07:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=96=B0=E5=A2=9E=2020250502?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Enums/UserGender.php | 4 ++-- app/Livewire/Admin/ArtistTable.php | 1 + app/Livewire/Admin/RoleForm.php | 1 + app/Livewire/Admin/RoleTable.php | 5 +++-- app/Livewire/Admin/SongForm.php | 1 + app/Livewire/Admin/SongTable.php | 1 + app/Livewire/Admin/UserTable.php | 1 + resources/lang/zh-tw/artists.php | 2 +- resources/lang/zh-tw/roles.php | 2 +- resources/lang/zh-tw/songs.php | 2 +- resources/lang/zh-tw/users.php | 2 +- resources/views/livewire/admin/artist-form.blade.php | 6 +++--- resources/views/livewire/admin/artist-header.blade.php | 8 ++++++++ resources/views/livewire/admin/artists.blade.php | 6 ++---- resources/views/livewire/admin/role-form.blade.php | 4 ++-- resources/views/livewire/admin/role-header.blade.php | 8 ++++++++ resources/views/livewire/admin/roles.blade.php | 4 ---- resources/views/livewire/admin/song-form.blade.php | 4 ++-- resources/views/livewire/admin/song-header.blade.php | 8 ++++++++ resources/views/livewire/admin/songs.blade.php | 4 ---- resources/views/livewire/admin/user-form.blade.php | 4 ++-- resources/views/livewire/admin/user-header.blade.php | 8 ++++++++ resources/views/livewire/admin/users.blade.php | 4 ---- 23 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 resources/views/livewire/admin/artist-header.blade.php create mode 100644 resources/views/livewire/admin/role-header.blade.php create mode 100644 resources/views/livewire/admin/song-header.blade.php create mode 100644 resources/views/livewire/admin/user-header.blade.php diff --git a/app/Enums/UserGender.php b/app/Enums/UserGender.php index c5c15bc..9e6e4a7 100644 --- a/app/Enums/UserGender.php +++ b/app/Enums/UserGender.php @@ -13,8 +13,8 @@ enum UserGender: string public function labels(): string { return match($this) { - self::Male => __('enums.user.gender.Male'), - self::Female => __('enums.user.gender.Female'), + self::Male => __('enums.Male'), + self::Female => __('enums.Female'), self::Other => __('enums.Other'), self::Unset => __('enums.Unset'), }; diff --git a/app/Livewire/Admin/ArtistTable.php b/app/Livewire/Admin/ArtistTable.php index 3b5f604..83bec22 100644 --- a/app/Livewire/Admin/ArtistTable.php +++ b/app/Livewire/Admin/ArtistTable.php @@ -45,6 +45,7 @@ final class ArtistTable extends PowerGridComponent ->showToggleColumns() //->showSoftDeletes() //->showSearchInput() + ->includeViewOnTop('livewire.admin.artist-header') , PowerGrid::footer() ->showPerPage() diff --git a/app/Livewire/Admin/RoleForm.php b/app/Livewire/Admin/RoleForm.php index 482af39..dbf0973 100644 --- a/app/Livewire/Admin/RoleForm.php +++ b/app/Livewire/Admin/RoleForm.php @@ -59,6 +59,7 @@ class RoleForm extends Component $this->resetFields(); $this->showCreateModal = false; + $this->dispatch('pg:eventRefresh-role-table'); } public function deleteRole($id) diff --git a/app/Livewire/Admin/RoleTable.php b/app/Livewire/Admin/RoleTable.php index 5c216d3..4a27cca 100644 --- a/app/Livewire/Admin/RoleTable.php +++ b/app/Livewire/Admin/RoleTable.php @@ -27,8 +27,9 @@ final class RoleTable extends PowerGridComponent //$this->showCheckBox(); return [ - //PowerGrid::header() + PowerGrid::header() // ->showSearchInput(), + ->includeViewOnTop('livewire.admin.role-header'), //PowerGrid::footer() // ->showPerPage() // ->showRecordCount(), @@ -61,7 +62,7 @@ final class RoleTable extends PowerGridComponent return $rolePermissions->implode(', '); }) - ->add('created_at_formatted', fn (Role $model) => Carbon::parse($model->created_at)->format('d/m/Y H:i:s')); + ->add('created_at_formatted', fn (Role $model) => Carbon::parse($model->created_at)->format('Y-m-d H:i:s')); } public function columns(): array diff --git a/app/Livewire/Admin/SongForm.php b/app/Livewire/Admin/SongForm.php index c00ac80..25d8b6d 100644 --- a/app/Livewire/Admin/SongForm.php +++ b/app/Livewire/Admin/SongForm.php @@ -90,6 +90,7 @@ class SongForm extends Component $this->resetFields(); $this->showCreateModal = false; + $this->dispatch('pg:eventRefresh-song-table'); } public function deleteSong($id) diff --git a/app/Livewire/Admin/SongTable.php b/app/Livewire/Admin/SongTable.php index fb44c14..751bff9 100644 --- a/app/Livewire/Admin/SongTable.php +++ b/app/Livewire/Admin/SongTable.php @@ -46,6 +46,7 @@ final class SongTable extends PowerGridComponent ->showSoftDeletes() ->showToggleColumns() //->showSearchInput() + ->includeViewOnTop('livewire.admin.song-header') , PowerGrid::footer() ->showPerPage() diff --git a/app/Livewire/Admin/UserTable.php b/app/Livewire/Admin/UserTable.php index 207a1a4..5e0c166 100644 --- a/app/Livewire/Admin/UserTable.php +++ b/app/Livewire/Admin/UserTable.php @@ -43,6 +43,7 @@ final class UserTable extends PowerGridComponent //->showSoftDeletes() ->showToggleColumns() //->showSearchInput() + ->includeViewOnTop('livewire.admin.user-header') , PowerGrid::footer()->showPerPage()->showRecordCount(), ]; diff --git a/resources/lang/zh-tw/artists.php b/resources/lang/zh-tw/artists.php index c8b91c6..a07287e 100644 --- a/resources/lang/zh-tw/artists.php +++ b/resources/lang/zh-tw/artists.php @@ -3,7 +3,7 @@ return [ 'management' => '歌手管理', 'list' => '歌手列表', - 'CreateNewArtist' => '新增歌手', + 'CreateNew' => '新增歌手', 'create_edit' => '新增 / 編輯', 'create' => '新增', 'edit' => '編輯', diff --git a/resources/lang/zh-tw/roles.php b/resources/lang/zh-tw/roles.php index 6bf372b..23bcc13 100644 --- a/resources/lang/zh-tw/roles.php +++ b/resources/lang/zh-tw/roles.php @@ -2,7 +2,7 @@ return [ 'list' => '角色列表', - 'CreateNewRole' => '新增角色', + 'CreateNew' => '新增角色', 'edit' => '編輯', 'delete' => '刪除', diff --git a/resources/lang/zh-tw/songs.php b/resources/lang/zh-tw/songs.php index d6cfeba..f322295 100644 --- a/resources/lang/zh-tw/songs.php +++ b/resources/lang/zh-tw/songs.php @@ -3,7 +3,7 @@ return [ 'management' => '歌曲管理', 'list' => '歌曲列表', - 'CreateNewArtist' => '新增歌曲', + 'CreateNew' => '新增歌曲', 'create_edit' => '新增 / 編輯', 'create' => '新增', 'edit' => '編輯', diff --git a/resources/lang/zh-tw/users.php b/resources/lang/zh-tw/users.php index 9750b20..41361f2 100644 --- a/resources/lang/zh-tw/users.php +++ b/resources/lang/zh-tw/users.php @@ -2,7 +2,7 @@ return [ 'list' => '使用者列表', - 'CreateNewRole' => '新增使用者', + 'CreateNew' => '新增使用者', 'edit' => '編輯', 'delete' => '刪除', diff --git a/resources/views/livewire/admin/artist-form.blade.php b/resources/views/livewire/admin/artist-form.blade.php index 49c808c..b904ac6 100644 --- a/resources/views/livewire/admin/artist-form.blade.php +++ b/resources/views/livewire/admin/artist-form.blade.php @@ -12,9 +12,9 @@ -
- - +
+ +
diff --git a/resources/views/livewire/admin/artist-header.blade.php b/resources/views/livewire/admin/artist-header.blade.php new file mode 100644 index 0000000..e86265b --- /dev/null +++ b/resources/views/livewire/admin/artist-header.blade.php @@ -0,0 +1,8 @@ +
+ +
\ No newline at end of file diff --git a/resources/views/livewire/admin/artists.blade.php b/resources/views/livewire/admin/artists.blade.php index 042daf7..c60cb48 100644 --- a/resources/views/livewire/admin/artists.blade.php +++ b/resources/views/livewire/admin/artists.blade.php @@ -1,9 +1,5 @@ - - 歌手管理 - - @if (session()->has('message'))