some fixes

abourtnik · Dec 21, 2023 · 9463545 · 9463545
1 parent d811ef5
commit 9463545
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/app/Filters/Users/SearchFilter.php b/app/Filters/Users/SearchFilter.php
@@ -10,8 +10,10 @@ function __invoke(Builder $query, string $search): Builder
     {
         $match = '%'.$search.'%';
 
-        return $query->where('username', 'LIKE', $match)
+        return $query->where(fn($query) => $query
+            ->where('username', 'LIKE', $match)
             ->orWhere('email', 'LIKE', $match)
-            ->orWhere('description', 'LIKE', $match);
+            ->orWhere('description', 'LIKE', $match)
+        );
     }
 }
diff --git a/app/Helpers/Parser.php b/app/Helpers/Parser.php
@@ -46,7 +46,7 @@ private static function parseTimeCodes(string $string): string|null
                 return $carry + $times[$index] * pow(60, $index);
             }  , 0);
 
-            return "<button onclick='time($timecode)' class='btn btn-link btn-sm p-0 text-decoration-none' data-timecode='$timecode'>{$matches[0]}</button>";
+            return "<button style='vertical-align: inherit' onclick='time($timecode)' class='btn btn-link btn-sm p-0 text-decoration-none' data-timecode='$timecode'>{$matches[0]}</button>";
 
         }, $string);
     }

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -17,6 +17,7 @@ class UserController
     public function index (UserFilters $filters) : View {
         return view('admin.users.index', [
             'users' => User::filter($filters)
+                ->with('premium_subscription')
                 ->withCount([
                     'subscribers',
                     'videos',

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Enums\VideoStatus;
 use App\Models\Interfaces\Likeable;
 use App\Models\Interfaces\Reportable;
 use App\Models\Pivots\FavoritePlaylist;
@@ -21,7 +20,6 @@
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;

diff --git a/resources/views/layouts/menus/sidebars/front.blade.php b/resources/views/layouts/menus/sidebars/front.blade.php
@@ -1,5 +1,5 @@
 <div @class(["offcanvas offcanvas-start fixed overflow-auto", 'show_sidebar' => $show_sidebar ]) id="responsive-sidebar" data-bs-keyboard="false" data-bs-backdrop="true" data-bs-scroll="true" aria-modal="true" role="dialog">
-    <div @class(["offcanvas-header d-flex align-items-center bg-light border py-1", 'd-md-none' => $show_sidebar, 'd-flex gap-2' => Auth::user()?->is_premium, 'justify-content-between' => !Auth::user()?->is_premium])>
+    <div @class(["offcanvas-header d-flex align-items-center bg-light border py-2", 'd-md-none' => $show_sidebar, 'd-flex gap-2' => Auth::user()?->is_premium, 'justify-content-between' => !Auth::user()?->is_premium])>
         <a
             href="{{route('pages.home')}}"
             @class(['offcanvas-title text-danger fw-bold text-decoration-none d-flex gap-2', 'h6' => Auth::user()?->is_premium, 'h5' => !Auth::user()?->is_premium])