diff --git a/app/Livewire/Admin/ArtistForm.php b/app/Livewire/Forms/ArtistForm.php
similarity index 97%
rename from app/Livewire/Admin/ArtistForm.php
rename to app/Livewire/Forms/ArtistForm.php
index cd55898..3bd5847 100644
--- a/app/Livewire/Admin/ArtistForm.php
+++ b/app/Livewire/Forms/ArtistForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Forms;
 
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Auth;
@@ -119,6 +119,6 @@ class ArtistForm extends Component
 
     public function render()
     {
-        return view('livewire.admin.artist-form');
+        return view('livewire.forms.artist-form');
     }
 }
diff --git a/app/Livewire/Admin/BranchForm.php b/app/Livewire/Forms/BranchForm.php
similarity index 98%
rename from app/Livewire/Admin/BranchForm.php
rename to app/Livewire/Forms/BranchForm.php
index 45d2c2b..b419e72 100644
--- a/app/Livewire/Admin/BranchForm.php
+++ b/app/Livewire/Forms/BranchForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Forms;
 
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Auth;
@@ -145,6 +145,6 @@ class BranchForm extends Component
 
     public function render()
     {
-        return view('livewire.admin.branch-form');
+        return view('livewire.forms.branch-form');
     }
 }
diff --git a/app/Livewire/Admin/ArtistImportData.php b/app/Livewire/Forms/ImportDatas/Artist.php
similarity index 95%
rename from app/Livewire/Admin/ArtistImportData.php
rename to app/Livewire/Forms/ImportDatas/Artist.php
index f645497..5d90ec7 100644
--- a/app/Livewire/Admin/ArtistImportData.php
+++ b/app/Livewire/Forms/ImportDatas/Artist.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Forms\ImportDatas;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
@@ -11,7 +11,7 @@ use Livewire\WithFileUploads;
 use App\Jobs\ImportJob;
 
 
-class ArtistImportData extends Component
+class Artist extends Component
 {
     use WithFileUploads, WireUiActions;
 
@@ -108,7 +108,7 @@ class ArtistImportData extends Component
 
     public function render()
     {
-        return view('livewire.admin.artist-import-data');
+        return view('livewire.forms.import-datas.artist');
     }
 
 }
\ No newline at end of file
diff --git a/app/Livewire/Admin/BranchImportData.php b/app/Livewire/Forms/ImportDatas/Branch.php
similarity index 95%
rename from app/Livewire/Admin/BranchImportData.php
rename to app/Livewire/Forms/ImportDatas/Branch.php
index ed47a83..c227e8e 100644
--- a/app/Livewire/Admin/BranchImportData.php
+++ b/app/Livewire/Forms/ImportDatas/Branch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Forms\ImportDatas;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
@@ -11,7 +11,7 @@ use Livewire\WithFileUploads;
 use App\Jobs\ImportJob;
 
 
-class BranchImportData extends Component
+class Branch extends Component
 {
     use WithFileUploads, WireUiActions;
 
@@ -108,7 +108,7 @@ class BranchImportData extends Component
 
     public function render()
     {
-        return view('livewire.admin.branch-import-data');
+        return view('livewire.forms.import-datas.branch');
     }
 
 }
\ No newline at end of file
diff --git a/app/Livewire/Admin/SongImportData.php b/app/Livewire/Forms/ImportDatas/Song.php
similarity index 95%
rename from app/Livewire/Admin/SongImportData.php
rename to app/Livewire/Forms/ImportDatas/Song.php
index 0b9d091..3b7459b 100644
--- a/app/Livewire/Admin/SongImportData.php
+++ b/app/Livewire/Forms/ImportDatas/Song.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Forms\ImportDatas;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
@@ -11,7 +11,7 @@ use Livewire\WithFileUploads;
 use App\Jobs\ImportJob;
 
 
-class SongImportData extends Component
+class Song extends Component
 {
     use WithFileUploads, WireUiActions;
 
@@ -108,7 +108,7 @@ class SongImportData extends Component
 
     public function render()
     {
-        return view('livewire.admin.song-import-data');
+        return view('livewire.forms.import-datas.song');
     }
 
 }
\ No newline at end of file
diff --git a/app/Livewire/Admin/RoleForm.php b/app/Livewire/Forms/RoleForm.php
similarity index 97%
rename from app/Livewire/Admin/RoleForm.php
rename to app/Livewire/Forms/RoleForm.php
index d954564..0645e95 100644
--- a/app/Livewire/Admin/RoleForm.php
+++ b/app/Livewire/Forms/RoleForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Forms;
 
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Auth;
@@ -109,6 +109,6 @@ class RoleForm extends Component
 
     public function render()
     {
-        return view('livewire.admin.role-form');
+        return view('livewire.forms.role-form');
     }
 }
diff --git a/app/Livewire/Admin/SongForm.php b/app/Livewire/Forms/SongForm.php
similarity index 98%
rename from app/Livewire/Admin/SongForm.php
rename to app/Livewire/Forms/SongForm.php
index 83a7cc0..41818bb 100644
--- a/app/Livewire/Admin/SongForm.php
+++ b/app/Livewire/Forms/SongForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Forms;
 
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Auth;
@@ -157,6 +157,6 @@ class SongForm extends Component
     }
     public function render()
     {
-        return view('livewire.admin.song-form');
+        return view('livewire.forms.song-form');
     }
 }
diff --git a/app/Livewire/Admin/UserForm.php b/app/Livewire/Forms/UserForm.php
similarity index 86%
rename from app/Livewire/Admin/UserForm.php
rename to app/Livewire/Forms/UserForm.php
index e920e3b..420dbb8 100644
--- a/app/Livewire/Admin/UserForm.php
+++ b/app/Livewire/Forms/UserForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Forms;
 
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Auth;
@@ -37,6 +37,8 @@ class UserForm extends Component
         'birthday' => '',
         'gender' => 'unset',
         'status' => 0,
+        'password' => '', // 新增
+        'password_confirmation' => '', // 新增
     ];
     
 
@@ -86,7 +88,16 @@ class UserForm extends Component
 
     public function save()
     {
-        //$this->validate();
+        $rules = $this->rules;
+        // 加入 email / phone 唯一性驗證，排除自己（編輯時）
+        $rules['fields.email'] .= '|unique:users,email' . ($this->userId ? ",{$this->userId}" : '');
+        $rules['fields.phone'] .= '|unique:users,phone' . ($this->userId ? ",{$this->userId}" : '');
+
+        // 新增時才驗證密碼
+        if (!$this->userId) {
+            $rules['fields.password'] = ['required', 'string', 'min:8', 'confirmed'];
+        }
+        $validated = $this->validate($rules);
 
         if ($this->userId) {
             if ($this->canEdit) {
@@ -148,6 +159,6 @@ class UserForm extends Component
     
     public function render()
     {
-        return view('livewire.admin.user-form');
+        return view('livewire.forms.user-form');
     }
 }
diff --git a/app/Livewire/Admin/RoomDetailModal.php b/app/Livewire/Grids/Modals/RoomDetailModal.php
similarity index 96%
rename from app/Livewire/Admin/RoomDetailModal.php
rename to app/Livewire/Grids/Modals/RoomDetailModal.php
index 56d2efc..c6fb3d6 100644
--- a/app/Livewire/Admin/RoomDetailModal.php
+++ b/app/Livewire/Grids/Modals/RoomDetailModal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Grids\Modals;
 
 use App\Models\Room;
 use App\Models\Branch;
@@ -110,6 +110,6 @@ class RoomDetailModal extends Component
     }
     public function render()
     {
-        return view('livewire.admin.room-detail-modal');
+        return view('livewire.grids.modals.room-detail-modal');
     }
 }
diff --git a/app/Livewire/Admin/RoomGrid.php b/app/Livewire/Grids/RoomGrid.php
similarity index 92%
rename from app/Livewire/Admin/RoomGrid.php
rename to app/Livewire/Grids/RoomGrid.php
index 9190b32..9bd4101 100644
--- a/app/Livewire/Admin/RoomGrid.php
+++ b/app/Livewire/Grids/RoomGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Grids;
 
 use App\Models\Room;
 use App\Models\Branch;
@@ -42,6 +42,6 @@ class RoomGrid extends Component
         // 取得樓層
         $floors = $rooms->pluck('floor')->unique()->sort()->values()->toArray();
 
-        return view('livewire.admin.room-grid',['rooms' =>$rooms,'floors' =>$floors]);
+        return view('livewire.grids.room-grid',['rooms' =>$rooms,'floors' =>$floors]);
     }
 }
diff --git a/app/Livewire/Admin/ActivityLogTable.php b/app/Livewire/Tables/ActivityLogTable.php
similarity index 97%
rename from app/Livewire/Admin/ActivityLogTable.php
rename to app/Livewire/Tables/ActivityLogTable.php
index 6e05423..0144bd3 100644
--- a/app/Livewire/Admin/ActivityLogTable.php
+++ b/app/Livewire/Tables/ActivityLogTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Tables;
 
 use App\Models\ActivityLog;
 use Illuminate\Support\Carbon;
@@ -44,7 +44,7 @@ final class ActivityLogTable extends PowerGridComponent
             ->showToggleColumns();
             //->showSoftDeletes()
             //->showSearchInput()
-        $header->includeViewOnTop('livewire.admin.activity-log-header');
+        $header->includeViewOnTop('livewire.forms.headers.activity-log');
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();     
         return $actions;
diff --git a/app/Livewire/Admin/ArtistTable.php b/app/Livewire/Tables/ArtistTable.php
similarity index 97%
rename from app/Livewire/Admin/ArtistTable.php
rename to app/Livewire/Tables/ArtistTable.php
index d0fc154..b053eae 100644
--- a/app/Livewire/Admin/ArtistTable.php
+++ b/app/Livewire/Tables/ArtistTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Tables;
 
 use App\Models\Artist;
 use App\Enums\ArtistCategory;
@@ -63,7 +63,7 @@ final class ArtistTable extends PowerGridComponent
             //->showSoftDeletes()
             //->showSearchInput()
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.admin.artist-header') ;
+            $header->includeViewOnTop('livewire.forms.headers.artist') ;
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();     
@@ -211,14 +211,14 @@ final class ArtistTable extends PowerGridComponent
                 ->slot(__('artists.edit'))
                 ->icon('solid-pencil-square')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.artist-form', 'openModal', ['id' => $row->id]);
+                ->dispatchTo('forms.artist-form', 'openModal', ['id' => $row->id]);
         }
         if($this->canDelect){
             $actions[] =Button::add('delete')
                 ->slot(__('artists.delete'))
                 ->icon('solid-trash')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.artist-form', 'deleteArtist', ['id' => $row->id]);
+                ->dispatchTo('forms.artist-form', 'deleteArtist', ['id' => $row->id]);
         }
         return $actions;
     }
diff --git a/app/Livewire/Admin/BranchTable.php b/app/Livewire/Tables/BranchTable.php
similarity index 96%
rename from app/Livewire/Admin/BranchTable.php
rename to app/Livewire/Tables/BranchTable.php
index 2a6d33c..79ff8d2 100644
--- a/app/Livewire/Admin/BranchTable.php
+++ b/app/Livewire/Tables/BranchTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Tables;
 
 use App\Models\Branch;
 use App\Jobs\ExportSqliteBranchJob;
@@ -61,7 +61,7 @@ final class BranchTable extends PowerGridComponent
             //->showSoftDeletes()
             //->showSearchInput()
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.admin.branch-header') ;
+            $header->includeViewOnTop('livewire.forms.headers.branch') ;
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();
@@ -205,7 +205,7 @@ final class BranchTable extends PowerGridComponent
             ->slot('包廂設定')
             ->icon('solid-cog')
             ->class('inline-flex items-center gap-1 px-3 py-1 rounded bg-amber-200 text-black')
-            ->dispatchTo('admin.room-grid', 'openModal', ['branch_id' => $row->id]);
+            ->dispatchTo('grids.room-grid', 'openModal', ['branch_id' => $row->id]);
         $actions[] = Button::add('room-synchronous')
             ->slot('包廂同步')
             ->icon('solid-cog')
@@ -216,14 +216,14 @@ final class BranchTable extends PowerGridComponent
                 ->slot(__('branches.edit'))
                 ->icon('solid-pencil-square')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.branch-form', 'openModal', ['id' => $row->id]);
+                ->dispatchTo('forms.branch-form', 'openModal', ['id' => $row->id]);
         }
         if($this->canDelect){
             $actions[] =Button::add('delete')
                 ->slot(__('branches.delete'))
                 ->icon('solid-trash')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.branch-form', 'deleteBranch', ['id' => $row->id]);
+                ->dispatchTo('forms.branch-form', 'deleteBranch', ['id' => $row->id]);
         }
         return $actions;
     }
diff --git a/app/Livewire/Admin/RoleTable.php b/app/Livewire/Tables/RoleTable.php
similarity index 96%
rename from app/Livewire/Admin/RoleTable.php
rename to app/Livewire/Tables/RoleTable.php
index b575225..d8317ad 100644
--- a/app/Livewire/Admin/RoleTable.php
+++ b/app/Livewire/Tables/RoleTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Tables;
 
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
@@ -42,7 +42,7 @@ final class RoleTable extends PowerGridComponent
         $actions = [];
         $header =PowerGrid::header();
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.admin.role-header');
+            $header->includeViewOnTop('livewire.forms.headers.role');
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()
@@ -155,14 +155,14 @@ final class RoleTable extends PowerGridComponent
                 ->slot(__('roles.edit'))
                 ->icon('solid-pencil-square')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.role-form', 'openEditRoleModal', ['id' => $row->id]);
+                ->dispatchTo('forms.role-form', 'openEditRoleModal', ['id' => $row->id]);
         }
         if($this->canDelect){
             $actions[] =Button::add('delete')
                 ->slot(__('roles.delete'))
                 ->icon('solid-trash')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.role-form', 'deleteRole', ['id' => $row->id]);
+                ->dispatchTo('forms.role-form', 'deleteRole', ['id' => $row->id]);
         }
         return $actions;
     }
diff --git a/app/Livewire/Admin/SongTable.php b/app/Livewire/Tables/SongTable.php
similarity index 98%
rename from app/Livewire/Admin/SongTable.php
rename to app/Livewire/Tables/SongTable.php
index f0fd015..56342d9 100644
--- a/app/Livewire/Admin/SongTable.php
+++ b/app/Livewire/Tables/SongTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Tables;
 
 use App\Models\Song;
 use App\Enums\SongLanguageType;
@@ -59,7 +59,7 @@ final class SongTable extends PowerGridComponent
         }
         $header = PowerGrid::header()->showSoftDeletes()->showToggleColumns();
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.admin.song-header');
+            $header->includeViewOnTop('livewire.forms.headers.song');
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();
@@ -261,14 +261,14 @@ final class SongTable extends PowerGridComponent
                 ->slot(__('songs.edit'))
                 ->icon('solid-pencil-square')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.song-form', 'openModal', ['id' => $row->id]);
+                ->dispatchTo('forms.song-form', 'openModal', ['id' => $row->id]);
         }
         if($this->canDelect){
             $actions[]=Button::add('delete')
                 ->slot(__('songs.delete'))
                 ->icon('solid-trash')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.song-form', 'deleteSong', ['id' => $row->id]);
+                ->dispatchTo('forms.song-form', 'deleteSong', ['id' => $row->id]);
         }
 
         return $actions;
diff --git a/app/Livewire/Tables/TextAdsTable.php b/app/Livewire/Tables/TextAdsTable.php
index db23dfa..ef950b1 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.forms.headers.text-ad');
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();
diff --git a/app/Livewire/Admin/UserTable.php b/app/Livewire/Tables/UserTable.php
similarity index 97%
rename from app/Livewire/Admin/UserTable.php
rename to app/Livewire/Tables/UserTable.php
index 49f1f3a..e80d0db 100644
--- a/app/Livewire/Admin/UserTable.php
+++ b/app/Livewire/Tables/UserTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Tables;
 
 use App\Models\User;
 use App\Enums\UserGender;
@@ -55,7 +55,7 @@ final class UserTable extends PowerGridComponent
         $header = PowerGrid::header()
             ->showToggleColumns();
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.admin.user-header');
+            $header->includeViewOnTop('livewire.forms.headers.user');
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();
@@ -239,14 +239,14 @@ final class UserTable extends PowerGridComponent
                 ->slot(__('users.edit'))
                 ->icon('solid-pencil-square')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.user-form', 'openModal', ['id' => $row->id]);
+                ->dispatchTo('forms.user-form', 'openModal', ['id' => $row->id]);
         }
         if($this->canDelect){
             $actions[]=Button::add('delete')
                 ->slot(__('users.delete'))
                 ->icon('solid-trash')
                 ->class('inline-flex items-center gap-1 px-3 py-1 rounded ')
-                ->dispatchTo('admin.user-form', 'deleteUser', ['id' => $row->id]);
+                ->dispatchTo('forms.user-form', 'deleteUser', ['id' => $row->id]);
         }
         return $actions;
     }
diff --git a/resources/lang/zh-tw/users.php b/resources/lang/zh-tw/users.php
index bb934dd..f61b6cb 100644
--- a/resources/lang/zh-tw/users.php
+++ b/resources/lang/zh-tw/users.php
@@ -14,6 +14,8 @@ return [
     'birthday' => '生日',
     'status' => '狀態',
     'role' =>'角色',
+    'password' => '密碼',
+    'password_confirmation' => '確認密碼',
 
     'select_gender'=>'選擇性別',
     'select_status'=>'選擇狀態',
diff --git a/resources/views/livewire/admin/activity-log.blade.php b/resources/views/livewire/admin/activity-log.blade.php
index 560ce2d..4619394 100644
--- a/resources/views/livewire/admin/activity-log.blade.php
+++ b/resources/views/livewire/admin/activity-log.blade.php
@@ -1,4 +1,4 @@
 
 <x-layouts.admin>
-    <livewire:admin.activity-log-table />
+    <livewire:tables.activity-log-table />
 </x-layouts.admin>
\ 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 6fb4311..53964dc 100644
--- a/resources/views/livewire/admin/artists.blade.php
+++ b/resources/views/livewire/admin/artists.blade.php
@@ -1,7 +1,7 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:admin.artist-table />
-    <livewire:admin.artist-form />
-    <livewire:admin.artist-import-data />
+    <livewire:tables.artist-table />
+    <livewire:forms.artist-form />
+    <livewire:forms.import-datas.artist />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/branches.blade.php b/resources/views/livewire/admin/branches.blade.php
index 73e8088..627fa26 100644
--- a/resources/views/livewire/admin/branches.blade.php
+++ b/resources/views/livewire/admin/branches.blade.php
@@ -1,8 +1,8 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:admin.branch-table />
-    <livewire:admin.room-grid />
-    <livewire:admin.branch-form />
-    <livewire:admin.branch-import-data />
+    <livewire:tables.branch-table />
+    <livewire:grids.room-grid />
+    <livewire:forms.branch-form />
+    <livewire:forms.import-datas.branch />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/roles.blade.php b/resources/views/livewire/admin/roles.blade.php
index 49ae7ed..6b5a159 100644
--- a/resources/views/livewire/admin/roles.blade.php
+++ b/resources/views/livewire/admin/roles.blade.php
@@ -1,6 +1,6 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:admin.role-table />
-    <livewire:admin.role-form />
+    <livewire:tables.role-table />
+    <livewire:forms.role-form />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/songs.blade.php b/resources/views/livewire/admin/songs.blade.php
index 0fda345..e8effd8 100644
--- a/resources/views/livewire/admin/songs.blade.php
+++ b/resources/views/livewire/admin/songs.blade.php
@@ -1,7 +1,7 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:admin.song-table />
-    <livewire:admin.song-form />
-    <livewire:admin.song-import-data />
+    <livewire:tables.song-table />
+    <livewire:forms.song-form />
+    <livewire:forms.import-datas.song />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/users.blade.php b/resources/views/livewire/admin/users.blade.php
index 33c11d8..2ee77c7 100644
--- a/resources/views/livewire/admin/users.blade.php
+++ b/resources/views/livewire/admin/users.blade.php
@@ -1,6 +1,6 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:admin.user-table />
-    <livewire:admin.user-form />
+    <livewire:tables.user-table />
+    <livewire:forms.user-form />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/artist-form.blade.php b/resources/views/livewire/forms/artist-form.blade.php
similarity index 100%
rename from resources/views/livewire/admin/artist-form.blade.php
rename to resources/views/livewire/forms/artist-form.blade.php
diff --git a/resources/views/livewire/admin/branch-form.blade.php b/resources/views/livewire/forms/branch-form.blade.php
similarity index 100%
rename from resources/views/livewire/admin/branch-form.blade.php
rename to resources/views/livewire/forms/branch-form.blade.php
diff --git a/resources/views/livewire/admin/activity-log-header.blade.php b/resources/views/livewire/forms/headers/activity-log.blade.php
similarity index 100%
rename from resources/views/livewire/admin/activity-log-header.blade.php
rename to resources/views/livewire/forms/headers/activity-log.blade.php
diff --git a/resources/views/livewire/admin/artist-header.blade.php b/resources/views/livewire/forms/headers/artist.blade.php
similarity index 72%
rename from resources/views/livewire/admin/artist-header.blade.php
rename to resources/views/livewire/forms/headers/artist.blade.php
index dde280a..6f16fc4 100644
--- a/resources/views/livewire/admin/artist-header.blade.php
+++ b/resources/views/livewire/forms/headers/artist.blade.php
@@ -1,13 +1,13 @@
 <x-admin.section-header title="{{ __('artists.list') }}">
     <x-wireui:button
-        wire:click="$dispatchTo('admin.artist-form', 'openModal')"
+        wire:click="$dispatchTo('forms.artist-form', 'openModal')"
         icon="plus"
         label="{{ __('artists.CreateNew') }}"
         class="bg-blue-600 text-white"
     />
 
     <x-wireui:button
-        wire:click="$dispatchTo('admin.artist-import-data','openModal')"
+        wire:click="$dispatchTo('forms.import-datas.artist','openModal')"
         icon="document-plus"
         label="{{ __('artists.ImportData') }}"
         class="bg-green-600 text-white"
diff --git a/resources/views/livewire/admin/branch-header.blade.php b/resources/views/livewire/forms/headers/branch.blade.php
similarity index 72%
rename from resources/views/livewire/admin/branch-header.blade.php
rename to resources/views/livewire/forms/headers/branch.blade.php
index d51980f..128586b 100644
--- a/resources/views/livewire/admin/branch-header.blade.php
+++ b/resources/views/livewire/forms/headers/branch.blade.php
@@ -1,13 +1,13 @@
 <x-admin.section-header title="{{ __('branches.list') }}">
     <x-wireui:button
-        wire:click="$dispatchTo('admin.branch-form', 'openModal')"
+        wire:click="$dispatchTo('forms.branch-form', 'openModal')"
         icon="plus"
         label="{{ __('branches.CreateNew') }}"
         class="bg-blue-600 text-white"
     />
 
     <x-wireui:button
-        wire:click="$dispatchTo('admin.branch-import-data','openModal')"
+        wire:click="$dispatchTo('forms.import-datas.branch','openModal')"
         icon="document-plus"
         label="{{ __('branches.ImportData') }}"
         class="bg-green-600 text-white"
diff --git a/resources/views/livewire/admin/role-header.blade.php b/resources/views/livewire/forms/headers/role.blade.php
similarity index 77%
rename from resources/views/livewire/admin/role-header.blade.php
rename to resources/views/livewire/forms/headers/role.blade.php
index 28df373..3324883 100644
--- a/resources/views/livewire/admin/role-header.blade.php
+++ b/resources/views/livewire/forms/headers/role.blade.php
@@ -1,6 +1,6 @@
 <x-admin.section-header title="{{ __('roles.list') }}">
     <x-wireui:button
-        wire:click="$dispatchTo('admin.role-form', 'openCreateRoleModal')"
+        wire:click="$dispatchTo('forms.role-form', 'openCreateRoleModal')"
         icon="plus"
         label="{{ __('roles.CreateNew') }}"
         class="bg-blue-600 text-white"
diff --git a/resources/views/livewire/admin/song-header.blade.php b/resources/views/livewire/forms/headers/song.blade.php
similarity index 72%
rename from resources/views/livewire/admin/song-header.blade.php
rename to resources/views/livewire/forms/headers/song.blade.php
index 57f7542..9617a26 100644
--- a/resources/views/livewire/admin/song-header.blade.php
+++ b/resources/views/livewire/forms/headers/song.blade.php
@@ -1,13 +1,13 @@
 <x-admin.section-header title="{{ __('songs.list') }}">
     <x-wireui:button
-        wire:click="$dispatchTo('admin.song-form', 'openModal')"
+        wire:click="$dispatchTo('forms.song-form', 'openModal')"
         icon="plus"
         label="{{ __('songs.CreateNew') }}"
         class="bg-blue-600 text-white"
     />
 
     <x-wireui:button
-        wire:click="$dispatchTo('admin.song-import-data','openModal')"
+        wire:click="$dispatchTo('forms.import-datas.song','openModal')"
         icon="document-plus"
         label="{{ __('songs.ImportData') }}"
         class="bg-green-600 text-white"
diff --git a/resources/views/livewire/forms/headers/text-ad.blade.php b/resources/views/livewire/forms/headers/text-ad.blade.php
new file mode 100644
index 0000000..0d02b72
--- /dev/null
+++ b/resources/views/livewire/forms/headers/text-ad.blade.php
@@ -0,0 +1,8 @@
+<x-admin.section-header title="{{ __('text_ads.list') }}">
+    <x-wireui:button
+        wire:click="$dispatchTo('forms.text-ads-form', 'openModal')"
+        icon="plus"
+        label="{{ __('text_ads.CreateNew') }}"
+        class="bg-blue-600 text-white"
+    />
+</x-admin.section-header>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/user-header.blade.php b/resources/views/livewire/forms/headers/user.blade.php
similarity index 76%
rename from resources/views/livewire/admin/user-header.blade.php
rename to resources/views/livewire/forms/headers/user.blade.php
index d6bf44e..128185d 100644
--- a/resources/views/livewire/admin/user-header.blade.php
+++ b/resources/views/livewire/forms/headers/user.blade.php
@@ -1,6 +1,6 @@
 <x-admin.section-header title="{{ __('users.list') }}">
     <x-wireui:button
-        wire:click="$dispatchTo('admin.user-form', 'openModal')"
+        wire:click="$dispatchTo('forms.user-form', 'openModal')"
         icon="plus"
         label="{{ __('users.CreateNew') }}"
         class="bg-blue-600 text-white"
diff --git a/resources/views/livewire/admin/artist-import-data.blade.php b/resources/views/livewire/forms/import-datas/artist.blade.php
similarity index 100%
rename from resources/views/livewire/admin/artist-import-data.blade.php
rename to resources/views/livewire/forms/import-datas/artist.blade.php
diff --git a/resources/views/livewire/admin/branch-import-data.blade.php b/resources/views/livewire/forms/import-datas/branch.blade.php
similarity index 100%
rename from resources/views/livewire/admin/branch-import-data.blade.php
rename to resources/views/livewire/forms/import-datas/branch.blade.php
diff --git a/resources/views/livewire/admin/song-import-data.blade.php b/resources/views/livewire/forms/import-datas/song.blade.php
similarity index 100%
rename from resources/views/livewire/admin/song-import-data.blade.php
rename to resources/views/livewire/forms/import-datas/song.blade.php
diff --git a/resources/views/livewire/admin/role-form.blade.php b/resources/views/livewire/forms/role-form.blade.php
similarity index 100%
rename from resources/views/livewire/admin/role-form.blade.php
rename to resources/views/livewire/forms/role-form.blade.php
diff --git a/resources/views/livewire/admin/song-form.blade.php b/resources/views/livewire/forms/song-form.blade.php
similarity index 100%
rename from resources/views/livewire/admin/song-form.blade.php
rename to resources/views/livewire/forms/song-form.blade.php
diff --git a/resources/views/livewire/admin/user-form.blade.php b/resources/views/livewire/forms/user-form.blade.php
similarity index 78%
rename from resources/views/livewire/admin/user-form.blade.php
rename to resources/views/livewire/forms/user-form.blade.php
index 3b0bb63..db90637 100644
--- a/resources/views/livewire/admin/user-form.blade.php
+++ b/resources/views/livewire/forms/user-form.blade.php
@@ -29,6 +29,21 @@
             option-value="value"
             :options="$rolesOptions->map(fn($p) => ['value' => $p->id, 'label' => $p->name])->toArray()"
         />
+
+        @if (!$userId)
+            <x-wireui:input
+                label="{{ __('users.password') }}"
+                wire:model.defer="fields.password"
+                type="password"
+                required
+            />
+            <x-wireui:input
+                label="{{ __('users.password_confirmation') }}"
+                wire:model.defer="fields.password_confirmation"
+                type="password"
+                required
+            />
+        @endif
     </div>
 
     <x-slot name="footer">
diff --git a/resources/views/livewire/admin/room-detail-modal.blade.php b/resources/views/livewire/grids/modals/room-detail-modal.blade.php
similarity index 94%
rename from resources/views/livewire/admin/room-detail-modal.blade.php
rename to resources/views/livewire/grids/modals/room-detail-modal.blade.php
index 2ac52f5..eac9688 100644
--- a/resources/views/livewire/admin/room-detail-modal.blade.php
+++ b/resources/views/livewire/grids/modals/room-detail-modal.blade.php
@@ -1,4 +1,4 @@
-<x-wireui:modal id="room-detail-modal"  wire:model.defer="showModal" persistent>
+<x-wireui:modal id="room-modal"  wire:model.defer="showModal" persistent>
     <x-wireui:card class="border border-gray-200">
         <x-slot name="action">
             <button class="cursor-pointer p-1 rounded-full focus:outline-none focus:outline-hidden focus:ring-2 focus:ring-secondary-200 text-secondary-300"
diff --git a/resources/views/livewire/admin/room-grid.blade.php b/resources/views/livewire/grids/room-grid.blade.php
similarity index 98%
rename from resources/views/livewire/admin/room-grid.blade.php
rename to resources/views/livewire/grids/room-grid.blade.php
index 892470b..fb16477 100644
--- a/resources/views/livewire/admin/room-grid.blade.php
+++ b/resources/views/livewire/grids/room-grid.blade.php
@@ -54,6 +54,6 @@
             </div>
         </div>
 
-        <livewire:admin.room-detail-modal />
+        <livewire:grids.modals.room-detail-modal />
     </x-wireui:card>
 </x-wireui:modal>
\ No newline at end of file