From a8910725b7ada4aa96201375e060c0c840550c0e Mon Sep 17 00:00:00 2001
From: Mahatma Mahardhika <mahatmamahardhika200588@gmail.com>
Date: Mon, 11 Nov 2024 14:55:03 +0700
Subject: [PATCH] chore: update ui import user

---
 app/Livewire/ImportUser.php                   |  13 +++-
 public/employee_data.xlsx                     | Bin 16767 -> 16915 bytes
 .../views/livewire/approval-table.blade.php   |   2 +-
 .../views/livewire/asset-table.blade.php      |   2 +-
 .../livewire/attendance-leave-table.blade.php |   2 +-
 .../attendance-overtime-table.blade.php       |   2 +-
 .../attendance-switch-off-table.blade.php     |   2 +-
 .../livewire/attendance-time-table.blade.php  |   2 +-
 .../views/livewire/import-branch.blade.php    |   2 +-
 .../views/livewire/import-brand.blade.php     |   2 +-
 .../views/livewire/import-category.blade.php  |   2 +-
 .../views/livewire/import-company.blade.php   |   2 +-
 .../livewire/import-department.blade.php      |   2 +-
 .../views/livewire/import-division.blade.php  |   2 +-
 .../views/livewire/import-inventory.blade.php |   2 +-
 .../views/livewire/import-level.blade.php     |   2 +-
 .../views/livewire/import-position.blade.php  |   2 +-
 .../livewire/import-sub-category.blade.php    |   2 +-
 .../livewire/import-sub-division.blade.php    |   2 +-
 .../views/livewire/import-user.blade.php      |  25 +++----
 .../import-working-calendar.blade.php         |   2 +-
 .../livewire/import-working-shift.blade.php   |   2 +-
 .../views/livewire/leave-type-table.blade.php |   2 +-
 resources/views/livewire/login-page.blade.php |   4 +-
 .../livewire/register-company-page.blade.php  |   8 +--
 resources/views/livewire/user-table.blade.php |  66 ++++++++++--------
 .../views/livewire/vacancy-table.blade.php    |   2 +-
 resources/views/ui/dropdowns.blade.php        |   4 +-
 28 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/app/Livewire/ImportUser.php b/app/Livewire/ImportUser.php
index 1eef9bb..d15507c 100644
--- a/app/Livewire/ImportUser.php
+++ b/app/Livewire/ImportUser.php
@@ -50,6 +50,17 @@ class ImportUser extends Component
 
     public $positionCode;
 
+    /**
+     * Handles the event when the import field is updated.
+     *
+     * This function will validate the uploaded file and store it in the
+     * 'photos' directory.
+     * The path of the uploaded file will be stored in
+    public function updatedImport(): void
+    {
+        $this->importUser();
+    }
+
     /**
      * Handles the event when the import field is updated.
      *
@@ -163,4 +174,4 @@ public function render(): View
     {
         return view('livewire.import-user');
     }
-}
+}
\ No newline at end of file
diff --git a/public/employee_data.xlsx b/public/employee_data.xlsx
index 4ae5442fb32d87076bb4710657a936d8624fa5b7..64550737d622910174b27957bf5c63409a773a1e 100644
GIT binary patch
delta 250
zcmez0#5lQyaYMf<-#TBFLyT+;3?MAQF!`Rn)aLD~!Hmp_d6kndY6x$ZRiDmWpR7=1
ztK@B@q)=k3R9sS|WM@-mXQL0o$#yniNgsTYzW5~l@JafEB{|`iZeFb=F3N>)^W-!3
zVT?N_D?8XQ<?2sPbg*W;J9(~y1yhjm<m(PLjGHHmINCAUm`@IIRAp<jX8-~KddNp4

delta 96
zcmbQ-!uY?5aYMf<*Q#fA9=WUx47seEXQ~!5Zst{A#k|==n@<!;W^#f<7^BMM?G83f
rH}xieb+BgioNVZ5!L-k4a<-!lqx|F*j&@8d%qG8ZRAqZ-#{dKXM|K~G

diff --git a/resources/views/livewire/approval-table.blade.php b/resources/views/livewire/approval-table.blade.php
index 48c1231..fda51db 100644
--- a/resources/views/livewire/approval-table.blade.php
+++ b/resources/views/livewire/approval-table.blade.php
@@ -54,7 +54,7 @@ class="w-6 h-6"
 					id="import"
 					name="import"
 					accept=".csv,.xlsx"
-					class="form-input"
+					
 				>
 			</label>
 			@error('import')
diff --git a/resources/views/livewire/asset-table.blade.php b/resources/views/livewire/asset-table.blade.php
index 0ff2625..7687a3f 100644
--- a/resources/views/livewire/asset-table.blade.php
+++ b/resources/views/livewire/asset-table.blade.php
@@ -54,7 +54,7 @@ class="w-6 h-6"
 					id="import"
 					name="import"
 					accept=".csv,.xlsx"
-					class="form-input"
+					
 				>
 			</label>
 			@error('import')
diff --git a/resources/views/livewire/attendance-leave-table.blade.php b/resources/views/livewire/attendance-leave-table.blade.php
index 64c8898..4c6e7d7 100644
--- a/resources/views/livewire/attendance-leave-table.blade.php
+++ b/resources/views/livewire/attendance-leave-table.blade.php
@@ -72,7 +72,7 @@ class="w-6 h-6"
 					id="import"
 					name="import"
 					accept=".csv,.xlsx"
-					class="form-input"
+					
 				>
 			</label>
 			@error('import')
diff --git a/resources/views/livewire/attendance-overtime-table.blade.php b/resources/views/livewire/attendance-overtime-table.blade.php
index facc8b3..7b390cd 100644
--- a/resources/views/livewire/attendance-overtime-table.blade.php
+++ b/resources/views/livewire/attendance-overtime-table.blade.php
@@ -72,7 +72,7 @@ class="w-6 h-6"
 					id="import"
 					name="import"
 					accept=".csv,.xlsx"
-					class="form-input"
+					
 				>
 			</label>
 			@error('import')
diff --git a/resources/views/livewire/attendance-switch-off-table.blade.php b/resources/views/livewire/attendance-switch-off-table.blade.php
index d68b31f..6f389d3 100644
--- a/resources/views/livewire/attendance-switch-off-table.blade.php
+++ b/resources/views/livewire/attendance-switch-off-table.blade.php
@@ -72,7 +72,7 @@ class="w-6 h-6"
 					id="import"
 					name="import"
 					accept=".csv,.xlsx"
-					class="form-input"
+					
 				>
 			</label>
 			@error('import')
diff --git a/resources/views/livewire/attendance-time-table.blade.php b/resources/views/livewire/attendance-time-table.blade.php
index 578b759..ac3a1d3 100644
--- a/resources/views/livewire/attendance-time-table.blade.php
+++ b/resources/views/livewire/attendance-time-table.blade.php
@@ -72,7 +72,7 @@ class="w-6 h-6"
 					id="import"
 					name="import"
 					accept=".csv,.xlsx"
-					class="form-input"
+					
 				>
 			</label>
 			@error('import')
diff --git a/resources/views/livewire/import-branch.blade.php b/resources/views/livewire/import-branch.blade.php
index 92990dd..d35602e 100644
--- a/resources/views/livewire/import-branch.blade.php
+++ b/resources/views/livewire/import-branch.blade.php
@@ -37,7 +37,7 @@ class="w-6 h-6"
 			id="import"
 			name="import"
 			accept=".csv,.xlsx"
-			class="form-input"
+			
 		>
 	</label>
 	@error('import')
diff --git a/resources/views/livewire/import-brand.blade.php b/resources/views/livewire/import-brand.blade.php
index a3e3ba7..edf9da8 100644
--- a/resources/views/livewire/import-brand.blade.php
+++ b/resources/views/livewire/import-brand.blade.php
@@ -37,7 +37,7 @@ class="w-6 h-6"
 			id="import"
 			name="import"
 			accept=".csv,.xlsx"
-			class="form-input"
+			
 		>
 	</label>
 	@error('import')
diff --git a/resources/views/livewire/import-category.blade.php b/resources/views/livewire/import-category.blade.php
index c48ff14..e90485f 100644
--- a/resources/views/livewire/import-category.blade.php
+++ b/resources/views/livewire/import-category.blade.php
@@ -37,7 +37,7 @@ class="w-6 h-6"
 			id="import"
 			name="import"
 			accept=".csv,.xlsx"
-			class="form-input"
+			
 		>
 	</label>
 	@error('import')
diff --git a/resources/views/livewire/import-company.blade.php b/resources/views/livewire/import-company.blade.php
index 8996328..be5474c 100644
--- a/resources/views/livewire/import-company.blade.php
+++ b/resources/views/livewire/import-company.blade.php
@@ -37,7 +37,7 @@ class="w-6 h-6"
 			id="import"
 			name="import"
 			accept=".csv,.xlsx"
-			class="form-input"
+			
 		>
 	</label>
 	@error('import')
diff --git a/resources/views/livewire/import-department.blade.php b/resources/views/livewire/import-department.blade.php
index 267c01c..dcf7134 100644
--- a/resources/views/livewire/import-department.blade.php
+++ b/resources/views/livewire/import-department.blade.php
@@ -38,7 +38,7 @@ class="w-6 h-6"
 				id="import"
 				name="import"
 				accept=".csv,.xlsx"
-				class="form-input"
+				
 			>
 		</label>
 		@error('import')
diff --git a/resources/views/livewire/import-division.blade.php b/resources/views/livewire/import-division.blade.php
index 2a77374..31978a5 100644
--- a/resources/views/livewire/import-division.blade.php
+++ b/resources/views/livewire/import-division.blade.php
@@ -38,7 +38,7 @@ class="w-6 h-6"
 				id="import"
 				name="import"
 				accept=".csv,.xlsx"
-				class="form-input"
+				
 			>
 		</label>
 		@error('import')
diff --git a/resources/views/livewire/import-inventory.blade.php b/resources/views/livewire/import-inventory.blade.php
index 6b2bc50..05a335b 100644
--- a/resources/views/livewire/import-inventory.blade.php
+++ b/resources/views/livewire/import-inventory.blade.php
@@ -37,7 +37,7 @@ class="w-6 h-6"
 			id="import"
 			name="import"
 			accept=".csv,.xlsx"
-			class="form-input"
+			
 		>
 	</label>
 	@error('import')
diff --git a/resources/views/livewire/import-level.blade.php b/resources/views/livewire/import-level.blade.php
index b53473f..f89bbc9 100644
--- a/resources/views/livewire/import-level.blade.php
+++ b/resources/views/livewire/import-level.blade.php
@@ -38,7 +38,7 @@ class="w-6 h-6"
 				id="import"
 				name="import"
 				accept=".csv,.xlsx"
-				class="form-input"
+				
 			>
 		</label>
 		@error('import')
diff --git a/resources/views/livewire/import-position.blade.php b/resources/views/livewire/import-position.blade.php
index a2f7751..2c32c0f 100644
--- a/resources/views/livewire/import-position.blade.php
+++ b/resources/views/livewire/import-position.blade.php
@@ -38,7 +38,7 @@ class="w-6 h-6"
 				id="import"
 				name="import"
 				accept=".csv,.xlsx"
-				class="form-input"
+				
 			>
 		</label>
 		@error('import')
diff --git a/resources/views/livewire/import-sub-category.blade.php b/resources/views/livewire/import-sub-category.blade.php
index e1d3e92..c33c93e 100644
--- a/resources/views/livewire/import-sub-category.blade.php
+++ b/resources/views/livewire/import-sub-category.blade.php
@@ -38,7 +38,7 @@ class="w-6 h-6"
 			id="import"
 			name="import"
 			accept=".csv,.xlsx"
-			class="form-input"
+			
 		>
 	</label>
 	@error('import')
diff --git a/resources/views/livewire/import-sub-division.blade.php b/resources/views/livewire/import-sub-division.blade.php
index 9bc9eee..415e7cc 100644
--- a/resources/views/livewire/import-sub-division.blade.php
+++ b/resources/views/livewire/import-sub-division.blade.php
@@ -38,7 +38,7 @@ class="w-6 h-6"
 				id="import"
 				name="import"
 				accept=".csv,.xlsx"
-				class="form-input"
+				
 			>
 		</label>
 		@error('import')
diff --git a/resources/views/livewire/import-user.blade.php b/resources/views/livewire/import-user.blade.php
index b9c27c3..fd4d265 100644
--- a/resources/views/livewire/import-user.blade.php
+++ b/resources/views/livewire/import-user.blade.php
@@ -1,4 +1,4 @@
-<div class="flex gap-2 h-10 w-full">
+<div class="flex gap-2 h-10 justify-end">
 	<a
 		href="{{ asset('employee_data.xlsx') }}"
 		class="
@@ -18,27 +18,22 @@ class="
 		</svg>
 		Employee Template
 	</a>
-	<label for="import" class="inline">
+	<div class="relative">
 		<input
 			wire:model="import"
 			type="file"
 			id="import"
 			name="import"
 			accept=".csv,.xlsx"
-			class="form-input"
+			class="hidden"
 		>
-	</label>
-	@error('import')
-	<div class="text-red-500 inline">{{ $message }}</div>
-	@enderror
-	<button
-		wire:click="importUser"
-		type="button"
-		class="btn bg-green-500 text-white"
-	>
-		<i class="mgc_upload_line"></i>
-	</button>
-	
+		<label for="import" class="inline-flex items-center px-4 py-3 bg-green-500 text-white rounded-md">
+			<i class="mgc_upload_line"></i>
+		</label>
+		@error('import')
+			<div class="text-red-500 inline">{{ $message }}</div>
+		@enderror
+	</div>
 	<div wire:loading.class.remove="hidden" class="hidden">
 		<div class="fixed top-0 left-0 right-0 bottom-0 w-full h-screen z-50 overflow-hidden bg-gray-700 opacity-75 flex flex-col items-center justify-center">
 			<div class="animate-spin h-12 w-12 border-b-4 border-gray-900 mb-4"></div>
diff --git a/resources/views/livewire/import-working-calendar.blade.php b/resources/views/livewire/import-working-calendar.blade.php
index e3f2f7a..513ac2a 100644
--- a/resources/views/livewire/import-working-calendar.blade.php
+++ b/resources/views/livewire/import-working-calendar.blade.php
@@ -38,7 +38,7 @@ class="w-6 h-6"
 				id="import"
 				name="import"
 				accept=".csv,.xlsx"
-				class="form-input"
+				
 			>
 		</label>
 		@error('import')
diff --git a/resources/views/livewire/import-working-shift.blade.php b/resources/views/livewire/import-working-shift.blade.php
index d27ab98..6e040cc 100644
--- a/resources/views/livewire/import-working-shift.blade.php
+++ b/resources/views/livewire/import-working-shift.blade.php
@@ -37,7 +37,7 @@ class="w-6 h-6"
 			id="import"
 			name="import"
 			accept=".csv,.xlsx"
-			class="form-input"
+			
 		>
 	</label>
 	@error('import')
diff --git a/resources/views/livewire/leave-type-table.blade.php b/resources/views/livewire/leave-type-table.blade.php
index 80dac06..e319b48 100644
--- a/resources/views/livewire/leave-type-table.blade.php
+++ b/resources/views/livewire/leave-type-table.blade.php
@@ -72,7 +72,7 @@ class="w-6 h-6"
 					id="import"
 					name="import"
 					accept=".csv,.xlsx"
-					class="form-input"
+					
 				>
 			</label>
 			@error('import')
diff --git a/resources/views/livewire/login-page.blade.php b/resources/views/livewire/login-page.blade.php
index 1eab42c..d571a68 100644
--- a/resources/views/livewire/login-page.blade.php
+++ b/resources/views/livewire/login-page.blade.php
@@ -13,13 +13,13 @@
 					
 					<div class="mb-4">
 						<label class="block text-sm font-medium text-gray-600 dark:text-gray-200 mb-2" for="email">Email Address or Username</label>
-						<input wire:model="loginAccount" id="loginAccount" class="form-input" type="text" placeholder="Enter your Email or username" name="loginAccount">
+						<input wire:model="loginAccount" id="loginAccount"  type="text" placeholder="Enter your Email or username" name="loginAccount">
 						@error('loginAccount') <span class="text-red-300">{{ $message }}</span> @enderror
 					</div>
 					
 					<div class="mb-4">
 						<label class="block text-sm font-medium text-gray-600 dark:text-gray-200 mb-2" for="password">Password</label>
-						<input wire:model="password" id="password" class="form-input" type="password" placeholder="Enter your password" name="password">
+						<input wire:model="password" id="password"  type="password" placeholder="Enter your password" name="password">
 						@error('password') <span class="text-red-300">{{ $message }}</span> @enderror
 					</div>
 					
diff --git a/resources/views/livewire/register-company-page.blade.php b/resources/views/livewire/register-company-page.blade.php
index d2329c8..eea6be0 100644
--- a/resources/views/livewire/register-company-page.blade.php
+++ b/resources/views/livewire/register-company-page.blade.php
@@ -14,7 +14,7 @@ class="text-gray-800 text-sm font-medium inline-block mb-2"
 						wire:model.live="companyName"
 						type="text"
 						id="company_name"
-						class="form-input"
+						
 					>
 					@error('companyName') {{ $message }} @enderror
 				</div>
@@ -28,7 +28,7 @@ class="text-gray-800 text-sm font-medium inline-block mb-2"
 					<textarea
 						wire:model.live="companyAddress"
 						id="company_address"
-						class="form-input"
+						
 						rows="4"
 					></textarea>
 					@error('companyAddress') {{ $message }} @enderror
@@ -44,7 +44,7 @@ class="text-gray-800 text-sm font-medium inline-block mb-2"
 						wire:model.live="companyPhone"
 						type="text"
 						id="company_phone"
-						class="form-input"
+						
 					>
 					@error('companyPhone') {{ $message }} @enderror
 				</div>
@@ -54,7 +54,7 @@ class="form-input"
 						wire:model.live="companyEmail"
 						type="text"
 						id="company_email"
-						class="form-input"
+						
 					>
 					@error('companyEmail') {{ $message }} @enderror
 				</div>
diff --git a/resources/views/livewire/user-table.blade.php b/resources/views/livewire/user-table.blade.php
index 027eb34..05e68b9 100644
--- a/resources/views/livewire/user-table.blade.php
+++ b/resources/views/livewire/user-table.blade.php
@@ -21,44 +21,48 @@ class="ml-auto"
 		</div>
 	</div>
 	@enderror
-	<div class="flex justify-between pt-2" x-show="!open" >
-		<div>
+	<div class="grid grid-cols-2 gap-4 pt-2" x-show="!open" >
+		<div class="col-span-1">
 			<button
 				type="button"
 				class="btn bg-primary text-white"
 				@click="open = true; $wire.dispatch('disableFilter')"
 			>+</button>
 		</div>
-		<div
-			class="flex items-center gap-2
-							justify-between w-2/4 relative"
-		>
-			<livewire:import-user />
-			<input
-				wire:model.live="search"
-				type="text"
-				id="search"
-				class="form-input pr-10 w-2/3"
-				placeholder="Search..."
-			>
-			@if($search)
-				<button
-					wire:click="$set('search',null)"
-					type="button"
-					class="absolute inset-y-0 right-0 flex items-center pr-3"
-				>
-					<svg
-						class="h-3 w-3 text-gray-500"
-						fill="none" viewBox="0 0 24 24" stroke="currentColor"
+		<div class="col-span-1">
+			<div class="grid grid-cols-4 gap-2">
+				<div class="col-span-2">
+					<livewire:import-user />
+				</div>
+				<div class="col-span-2">
+					<input
+						wire:model.live="search"
+						type="text"
+						id="search"
+						class="form-input pr-10"
+						placeholder="Search..."
 					>
-						<path
-							stroke-linecap="round"
-							stroke-linejoin="round"
-							stroke-width="2" d="M6 18L18 6M6 6l12 12"
-						></path>
-					</svg>
-				</button>
-			@endif
+					@if($search)
+						<button
+							wire:click="$set('search',null)"
+							type="button"
+							class="absolute inset-y-0 right-0 flex items-center pr-3"
+						>
+							<svg
+								class="h-3 w-3 text-gray-500"
+								fill="none" viewBox="0 0 24 24" stroke="currentColor"
+							>
+								<path
+									stroke-linecap="round"
+									stroke-linejoin="round"
+									stroke-width="2" d="M6 18L18 6M6 6l12 12"
+								></path>
+							</svg>
+						</button>
+					@endif
+				</div>
+			</div>
+			
 		</div>
 	</div>
 	<div x-show="open">
diff --git a/resources/views/livewire/vacancy-table.blade.php b/resources/views/livewire/vacancy-table.blade.php
index 706b99e..116d84e 100644
--- a/resources/views/livewire/vacancy-table.blade.php
+++ b/resources/views/livewire/vacancy-table.blade.php
@@ -54,7 +54,7 @@ class="w-6 h-6"
 					id="import"
 					name="import"
 					accept=".csv,.xlsx"
-					class="form-input"
+					
 				>
 			</label>
 			@error('import')
diff --git a/resources/views/ui/dropdowns.blade.php b/resources/views/ui/dropdowns.blade.php
index 0d3ee61..e63acac 100644
--- a/resources/views/ui/dropdowns.blade.php
+++ b/resources/views/ui/dropdowns.blade.php
@@ -1028,7 +1028,7 @@ class="fc-dropdown-open:opacity-100 hidden opacity-0 w-72 p-4 shadow-md rounded-
                                     <label for="exampleInputEmail1"
                                         class="text-gray-800 text-sm font-medium inline-block mb-2">Email
                                         address</label>
-                                    <input type="email" class="form-input" id="exampleInputEmail1"
+                                    <input type="email"  id="exampleInputEmail1"
                                         aria-describedby="emailHelp" placeholder="Enter email">
                                     <small id="emailHelp"
                                         class="form-text text-sm text-slate-700 dark:text-slate-400">We'll
@@ -1038,7 +1038,7 @@ class="form-text text-sm text-slate-700 dark:text-slate-400">We'll
                                 <div class="mb-3">
                                     <label for="exampleInputPassword1"
                                         class="text-gray-800 text-sm font-medium inline-block mb-2">Password</label>
-                                    <input type="password" class="form-input" id="exampleInputPassword1"
+                                    <input type="password"  id="exampleInputPassword1"
                                         placeholder="Password">
                                 </div>
                                 <div class="flex items-center gap-2 mb-3">