diff --git a/app/Livewire/Tables/ActivityLogTable.php b/app/Livewire/Tables/ActivityLogTable.php index c5a2b3c..6653f09 100644 --- a/app/Livewire/Tables/ActivityLogTable.php +++ b/app/Livewire/Tables/ActivityLogTable.php @@ -30,7 +30,7 @@ final class ActivityLogTable extends PowerGridComponent $header = PowerGrid::header() ->withoutLoading() ->showToggleColumns(); - $header->includeViewOnTop('livewire.header.admin.activity-log'); + $header->includeViewOnTop('livewire.headers.activity-log'); $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); diff --git a/app/Livewire/Tables/MachineStatusTable.php b/app/Livewire/Tables/MachineStatusTable.php index 212c8ad..cf5196c 100644 --- a/app/Livewire/Tables/MachineStatusTable.php +++ b/app/Livewire/Tables/MachineStatusTable.php @@ -41,7 +41,7 @@ final class MachineStatusTable extends PowerGridComponent ->withoutLoading() ->showToggleColumns(); - $header->includeViewOnTop('livewire.header.admin.machine-status'); + $header->includeViewOnTop('livewire.headers.machine-status'); $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); diff --git a/app/Livewire/Tables/RoomStatusLogTable.php b/app/Livewire/Tables/RoomStatusLogTable.php index 4283ee5..6fb4d13 100644 --- a/app/Livewire/Tables/RoomStatusLogTable.php +++ b/app/Livewire/Tables/RoomStatusLogTable.php @@ -28,7 +28,7 @@ final class RoomStatusLogTable extends PowerGridComponent $header = PowerGrid::header() ->withoutLoading() ->showToggleColumns(); - $header->includeViewOnTop('livewire.header.admin.room-status-log'); + $header->includeViewOnTop('livewire.headers.room-status-log'); $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); diff --git a/app/Livewire/Tables/RoomTable.php b/app/Livewire/Tables/RoomTable.php index fbed69d..1131d3d 100644 --- a/app/Livewire/Tables/RoomTable.php +++ b/app/Livewire/Tables/RoomTable.php @@ -53,7 +53,7 @@ final class RoomTable extends PowerGridComponent ->withoutLoading() ->showToggleColumns(); if($this->canCreate){ - $header->includeViewOnTop('livewire.header.admin.room'); + $header->includeViewOnTop('livewire.headers.room'); } $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); diff --git a/app/Livewire/Tables/SongLibraryCacheTable.php b/app/Livewire/Tables/SongLibraryCacheTable.php index 8896be7..632c121 100644 --- a/app/Livewire/Tables/SongLibraryCacheTable.php +++ b/app/Livewire/Tables/SongLibraryCacheTable.php @@ -36,7 +36,7 @@ final class SongLibraryCacheTable extends PowerGridComponent ->withoutLoading() ->showToggleColumns(); - $header->includeViewOnTop('livewire.header.admin.song-library-cache'); + $header->includeViewOnTop('livewire.headers.song-library-cache'); $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); diff --git a/app/Livewire/Tables/TextAdsTable.php b/app/Livewire/Tables/TextAdsTable.php index db23dfa..310e409 100644 --- a/app/Livewire/Tables/TextAdsTable.php +++ b/app/Livewire/Tables/TextAdsTable.php @@ -53,7 +53,7 @@ final class TextAdsTable extends PowerGridComponent } $header = PowerGrid::header()->showSoftDeletes()->showToggleColumns(); if($this->canCreate){ - $header->includeViewOnTop('livewire.header.text-ad'); + $header->includeViewOnTop('livewire.headers.text-ad'); } $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); diff --git a/app/Livewire/Tables/UserTable.php b/app/Livewire/Tables/UserTable.php index cb635ac..4ecc98f 100644 --- a/app/Livewire/Tables/UserTable.php +++ b/app/Livewire/Tables/UserTable.php @@ -30,7 +30,7 @@ final class UserTable extends PowerGridComponent $actions = []; $header = PowerGrid::header() ->showToggleColumns(); - $header->includeViewOnTop('livewire.header.admin.user'); + $header->includeViewOnTop('livewire.headers.user'); $actions[]=$header; $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount(); return $actions; diff --git a/database/seeders/CreateAdminUserSeeder.php b/database/seeders/CreateAdminUserSeeder.php deleted file mode 100644 index 97d063b..0000000 --- a/database/seeders/CreateAdminUserSeeder.php +++ /dev/null @@ -1,33 +0,0 @@ - 'Allen Yan(admin)', - 'email' => 'admin@gmail.com', - 'phone' => '0900000000', - 'birthday' => now()->toDateString(), - 'password' => bcrypt('aa1234') - ]); - $user->assignRole('Admin'); - $user = User::create([ - 'name' => 'Allen Yan(User)', - 'email' => 'allen.yan@gmail.com', - 'phone' => '0900000001', - 'birthday' => now()->toDateString(), - 'password' => bcrypt('aa1234') - ]); - $user->assignRole('User'); - } -} diff --git a/database/seeders/FavoriteSongsSeeder.php b/database/seeders/FavoriteSongsSeeder.php deleted file mode 100644 index e370bce..0000000 --- a/database/seeders/FavoriteSongsSeeder.php +++ /dev/null @@ -1,23 +0,0 @@ -insert([ - 'songNumber' => 999996, - 'userPhone' => '0912345678', - 'created_at' => Carbon::now(), - 'updated_at' => Carbon::now(), - ]); - } -} \ No newline at end of file diff --git a/database/seeders/PermissionTableSeeder.php b/database/seeders/PermissionTableSeeder.php deleted file mode 100644 index 281fea6..0000000 --- a/database/seeders/PermissionTableSeeder.php +++ /dev/null @@ -1,38 +0,0 @@ - $permission]); - } - // 建立 Admin 角色，給所有權限 - $adminRole = Role::firstOrCreate(['name' => 'Admin']); - $adminRole->syncPermissions(Permission::all()); - - // 建立 User 角色，不給任何權限 - Role::firstOrCreate(['name' => 'User']); - } -} diff --git a/database/seeders/TextAdPermissionSeeder.php b/database/seeders/TextAdPermissionSeeder.php deleted file mode 100644 index f418ace..0000000 --- a/database/seeders/TextAdPermissionSeeder.php +++ /dev/null @@ -1,33 +0,0 @@ - $permission]); - } - - // 把權限加給 Admin 角色 - $adminRole = Role::where('name', 'Admin')->first(); - if ($adminRole) { - $adminRole->givePermissionTo($permissions); - } - } -} diff --git a/database/seeders/TextAdSeeder.php b/database/seeders/TextAdSeeder.php deleted file mode 100644 index 10ab4a3..0000000 --- a/database/seeders/TextAdSeeder.php +++ /dev/null @@ -1,51 +0,0 @@ - '本公司消費方式：包廂費（原價 * 時數 * 折數）+ 清潔費（一次）+ 總金額10%服務費（一次）。', - 'color' => TextAdColors::Red, - ], - [ - 'content' => '一般專案為包廂計費，免收低消及人頭費；如各族群優惠專案為包廂計費、不限人數K歌一口價。', - 'color' => TextAdColors::Red, - ], - [ - 'content' => '工商專案 上班族趕快來報到 不限人數 包廂計費 歡唱K歌一口價★星期一至星期日 上午08：00 ~ 下午17：00 ★歡唱3小時 小包廂 666元 中包廂 999元 大包廂(臺中公園店為中大包廂) 1299元', - 'color' => TextAdColors::Green, - ], - [ - 'content' => '趁年輕 一定要大膽瘋狂不限人數 包廂計費 歡唱K歌一口價★星期一至星期五 上午08：00 ~ 下午17：00 ★歡唱3小時(員林中山店為4小時) 小包廂 333元 中包廂 666元 大包廂(臺中公園店為中大包廂) 999元', - 'color' => TextAdColors::Blue, - ], - [ - 'content' => '重拾當年意氣風發的活力 不輸少年人啦不限人數 包廂計費 歡唱K歌一口價 ★星期一至星期五 上午08：00 ~ 下午17：00 ★歡唱４小時 小包廂 333元 中包廂 666元 大包廂 999元', - 'color' => TextAdColors::Blue, - ], - [ - 'content' => '各分店皆適用 生日快樂！吹個蠟燭 許個心願吧 壽星們 生日開趴的通通站出來 ★當日壽星限定(須出示相關證件供服務人員確認)．享有好禮雙重送 ★好禮一：生日紅酒一瓶🍷．超級巨星6吋特製蛋糕．什錦水果一盤．義式冰淇淋．莓果調酒(五選一) ★好禮二：餐飲券600元(可當日折抵使用)', - 'color' => TextAdColors::White, - ], - ]; - foreach ($ads as $ad) { - TextAd::create([ - 'content' => $ad['content'], - 'color' => $ad['color'], - 'duration' => 1, - 'is_active' => true, - ]); - } - } -} diff --git a/resources/views/livewire/header/admin/activity-log.blade.php b/resources/views/livewire/headers/activity-log.blade.php similarity index 100% rename from resources/views/livewire/header/admin/activity-log.blade.php rename to resources/views/livewire/headers/activity-log.blade.php diff --git a/resources/views/livewire/header/admin/machine-status.blade.php b/resources/views/livewire/headers/machine-status.blade.php similarity index 100% rename from resources/views/livewire/header/admin/machine-status.blade.php rename to resources/views/livewire/headers/machine-status.blade.php diff --git a/resources/views/livewire/header/admin/room-status-log.blade.php b/resources/views/livewire/headers/room-status-log.blade.php similarity index 100% rename from resources/views/livewire/header/admin/room-status-log.blade.php rename to resources/views/livewire/headers/room-status-log.blade.php diff --git a/resources/views/livewire/header/admin/room.blade.php b/resources/views/livewire/headers/room.blade.php similarity index 100% rename from resources/views/livewire/header/admin/room.blade.php rename to resources/views/livewire/headers/room.blade.php diff --git a/resources/views/livewire/header/admin/song-library-cache.blade.php b/resources/views/livewire/headers/song-library-cache.blade.php similarity index 100% rename from resources/views/livewire/header/admin/song-library-cache.blade.php rename to resources/views/livewire/headers/song-library-cache.blade.php diff --git a/resources/views/livewire/header/text-ad.blade.php b/resources/views/livewire/headers/text-ad.blade.php similarity index 100% rename from resources/views/livewire/header/text-ad.blade.php rename to resources/views/livewire/headers/text-ad.blade.php diff --git a/resources/views/livewire/header/admin/user.blade.php b/resources/views/livewire/headers/user.blade.php similarity index 100% rename from resources/views/livewire/header/admin/user.blade.php rename to resources/views/livewire/headers/user.blade.php