Fixing Bug

app/Exports/UserTemplateExport.php

@@ -4,8 +4,9 @@
 
 use App\Models\User;
 use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 
-class UserTemplateExport implements FromCollection
+class UserTemplateExport implements FromCollection, ShouldAutoSize
 {
     /**
     * @return \Illuminate\Support\Collection

app/Http/Controllers/AuthController.php

@@ -114,7 +114,6 @@ public function showLinkRequestForm(Request $request)
         return view('auth.forgot-password');
     }
 
-    // Mengirim email tautan reset password
     public function sendResetLinkEmail(Request $request)
     {
         $request->validate(['email' => 'required|email']);
@@ -128,7 +127,6 @@ public function sendResetLinkEmail(Request $request)
             : back()->withErrors(['email' => __($status)]);
     }
 
-    // Menangani proses reset password
     public function resetPassword(Request $request)
     {
         $request->validate([
@@ -144,7 +142,6 @@ function ($user, $password) {
                     'password' => bcrypt($password),
                     'remember_token' => Str::random(60),
                 ])->save();
-                // Hapus token "remember me" setelah reset password
                 $user->tokens()->delete();
             }
         );

app/Http/Controllers/DataUserController.php

@@ -22,13 +22,9 @@ public function userexport(){
     public function userimport(Request $request)
     {
         $request->validate([
-            'file' => 'required|file|mimes:xlsx,xls|max:2048',
+            'file' => 'required|file|mimes:xlsx',
         ]);
 
-        if ($request->fails()) {
-            return redirect()->back()->withErrors($request->errors());
-        }
-
         $file = $request->file('file');
         $nameFile = $file->getClientOriginalName();
         $file->move('DataUser', $nameFile);

app/Http/Controllers/SubCriteriaController.php

@@ -51,7 +51,7 @@ public function index(Request $request)
     {
         if ($request->has('search')) {
             $subcriterias = SubCriteria::where('nama', 'LIKE', '%'.$request->search.'%')
-                                        ->orWhere('criteria_id', 'LIKE', '%'.$request->search.'%')
+                                        ->orWhere('deskripsi', 'LIKE', '%'.$request->search.'%')
                                         ->paginate(10);
         } else {
             $subcriterias = SubCriteria::paginate(10);

resources/views/user/user.blade.php

@@ -107,11 +107,11 @@ class="badge btn-primary" data-toggle="modal"
                     </div>
                 </div>
             </div>
-        </div>
             <div class="footer-wrap pd-20 mb-20 card-box">
                 <strong>Sistem Pendukung Keputusan Pemilihan Ekstrakurikuler Metode SMARTER</strong>
             </div>
         </div>
+    </div>
 
     {{-- Modal Add --}}
     <div class="modal fade" id="add-user" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel"
@@ -173,9 +173,9 @@ class="badge btn-primary" data-toggle="modal"
                                 <label class="col-sm-2 col-form-label">Role</label>
                                 <div class="col-sm-10">
                                     <select class="form-control" name="role" id="role" required>
-                                        <option value="" disabled {{ $user->role ? 'selected' : '' }}>Pilih Role</option>
+                                        <option value="" disabled>Pilih Role</option>
                                         @foreach(\App\Models\User::getPossibleEnumValues('role') as $role)
-                                            <option value="{{ $role }}">{{ $role }}</option>
+                                            <option value="{{ $role }}" {{ Auth::user()->role == $role ? 'selected' : '' }}>{{ $role }}</option>
                                         @endforeach
                                     </select>
                                     <div class="valid-feedback">