202509021310

調整檔案位置

app/Livewire/Layout/Navigation.php

@@ -39,7 +39,7 @@ class Navigation extends Component
         if (session()->has('room_code')) {
             $this->menus = array_merge($this->menus, $this->roomMenus);
         }
-        if (auth()->check()) {
+        if (auth()->check() && !auth()->user()->hasRole('User')) {
             $user = auth()->user();
             foreach ($this->adminmenus as $menu) 
                 if (!$menu['permission'] || $user->can($menu['permission'])) 

resources/views/dashboard.blade.php

@@ -1,17 +0,0 @@
-<x-app-layout>
-    <x-slot name="header">
-        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('Dashboard') }}
-        </h2>
-    </x-slot>
-
-    <div class="py-12">
-        <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
-            <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
-                <div class="p-6 text-gray-900">
-                    {{ __("You're logged in!") }}
-                </div>
-            </div>
-        </div>
-    </div>
-</x-app-layout>

resources/views/livewire/app/profile.blade.php

@@ -1,8 +1,6 @@
 <x-app-layout>
     <x-slot name="header">
-        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
+        <div class="header">超級巨星 自助式KTV</div>
-            {{ __('Profile') }}
-        </h2>
     </x-slot>
 
     <div class="py-12">

routes/web.php

@@ -6,33 +6,29 @@ use App\Livewire\Admin\Dashboard as AdminDashboard;
 
 
 //Route::redirect('/', '/login');
-Route::view('/', 'welcome');
+Route::view('/', 'livewire.app.welcome');
+Route::view('/welcome', 'livewire.app.welcome')->name('welcome');
+Route::view('/new-songs', 'livewire.app.new-songs')->name('new-songs');
+Route::view('/top-ranking', 'livewire.app.top-ranking')->name('top-ranking');
+Route::view('/search-song', 'livewire.app.search-song')->name('search-song');
+Route::view('/clicked-song', 'livewire.app.clicked-song')->name('clicked-song');
+Route::view('/sound-control', 'livewire.app.sound-control')->name('sound-control');
+Route::view('/love-message', 'livewire.app.love-message')->name('love-message');
 
-Route::view('/welcome', 'welcome')->name('welcome');
+Route::middleware(['auth'])->group(function () {
-Route::view('/new-songs', 'new-songs')->name('new-songs');
+    // Profile
-Route::view('/top-ranking', 'top-ranking')->name('top-ranking');
+    //Route::view('profile', 'livewire.app.profile')->name('profile');
-Route::view('/search-song', 'search-song')->name('search-song');
-Route::view('/clicked-song', 'clicked-song')->name('clicked-song');
-Route::view('/sound-control', 'sound-control')->name('sound-control');
-Route::view('/love-message', 'love-message')->name('love-message');
 
-//Route::view('dashboard', 'dashboard')
+    // Admin
-//    ->middleware(['auth', 'verified'])
+    Route::prefix('admin')->name('admin.')->group(function () {
-//.   ->name('dashboard');
+        Route::view('/activity-log', 'livewire.admin.activity-log')->name('activity-log');
-
+        Route::view('/room-status-log', 'livewire.admin.room-status-log')->name('room-status-log');
-Route::view('profile', 'profile')
+        Route::view('/machine-status', 'livewire.admin.machine-status')->name('machine-status');
-    ->middleware(['auth'])
+        Route::view('/rooms', 'livewire.admin.rooms')->name('rooms'); 
-    ->name('profile');
+        Route::view('/room-grids', 'livewire.admin.room-grids')->name('room-grids'); 
-
+        Route::view('/users', 'livewire.admin.users')->name('users');
-require __DIR__.'/auth.php';
+        Route::view('/text-ads', 'livewire.admin.text-ads')->name('text-ads'); 
-
+        Route::view('/broadcast-templates', 'livewire.admin.broadcast-templates')->name('broadcast-templates'); 
-Route::middleware(['auth'])->prefix('admin')->name('admin.')->group(function () {
+    });
-    Route::get('/activity-log', function () {return view('livewire.admin.activity-log');})->name('activity-log');
-    Route::get('/room-status-log', function () {return view('livewire.admin.room-status-log');})->name('room-status-log');
-    Route::get('/machine-status', function () {return view('livewire.admin.machine-status');})->name('machine-status');
-    Route::get('/users', function () {return view('livewire.admin.users');})->name('users');
-    Route::get('/rooms', function () {return view('livewire.admin.rooms');})->name('rooms'); 
-    Route::get('/room-grids', function () {return view('livewire.admin.room-grids');})->name('room-grids'); 
-    Route::get('/text-ads', function () {return view('livewire.admin.text-ads');})->name('text-ads'); 
-    Route::get('/broadcast-templates', function () {return view('livewire.admin.broadcast-templates');})->name('broadcast-templates'); 
 });
+require __DIR__.'/auth.php';