(Remove) Select2 ♻️

- closes #683

app/Http/Controllers/BonusController.php

@@ -133,11 +133,9 @@ class BonusController extends Controller
     public function gift(Request $request)
     {
         $user = $request->user();
-        $users = User::oldest('username')->get();
         $userbon = $user->getSeedbonus();
 
         return view('bonus.gift', [
-            'users'             => $users,
             'userbon'           => $userbon,
         ]);
     }
@@ -151,7 +149,6 @@ class BonusController extends Controller
     public function bonus(Request $request, $username = '')
     {
         $user = $request->user();
-        $users = User::oldest('username')->get();
         $userbon = $user->getSeedbonus();
 
         //Dying Torrent
@@ -191,7 +188,6 @@ class BonusController extends Controller
         $second = $minute / 60;
 
         return view('bonus.index', [
-            'users'             => $users,
             'userbon'           => $userbon,
             'dying'             => $dying,
             'legendary'         => $legendary,
@@ -335,7 +331,7 @@ class BonusController extends Controller
         }
 
         if ($v->passes()) {
-            $recipient = User::where('username', 'LIKE', $request->input('to_username'))->first();
+            $recipient = User::where('username', '=', $request->input('to_username'))->first();
 
             if (! $recipient || $recipient->id == $user->id) {
                 return redirect()->to('/bonus/store')

app/Http/Controllers/PrivateMessageController.php

@@ -115,10 +115,8 @@ class PrivateMessageController extends Controller
     public function makePrivateMessage(Request $request, $receiver_id = '', $username = '')
     {
         $user = $request->user();
-        $usernames = User::oldest('username')->get();
 
-        return view('pm.send', ['usernames' => $usernames, 'user' => $user, 'receiver_id' => $receiver_id,
-            'username'                      => $username, ]);
+        return view('pm.send', ['user' => $user, 'receiver_id' => $receiver_id, 'username' => $username]);
     }
 
     /**
@@ -137,9 +135,16 @@ class PrivateMessageController extends Controller
             $dest = 'profile';
         }
 
+        if ($request->has('receiver_id')) {
+            $recipient = User::where('username', '=', $request->input('receiver_id'))->firstOrFail();
+        } else {
+            return redirect()->route('create', ['username' => $request->user()->username, 'id' => $request->user()->id])
+                ->withErrors($v->errors());
+        }
+
         $pm = new PrivateMessage();
         $pm->sender_id = $user->id;
-        $pm->receiver_id = $request->input('receiver_id');
+        $pm->receiver_id = $recipient->id;
         $pm->subject = $request->input('subject');
         $pm->message = $request->input('message');
         $pm->read = 0;
@@ -152,13 +157,6 @@ class PrivateMessageController extends Controller
             'read'        => 'required',
         ]);
 
-        if ($request->has('receiver_id')) {
-            $recipient = User::where('id', '=', (int) $request->input('receiver_id'))->firstOrFail();
-        } else {
-            return redirect()->route('create', ['username' => $request->user()->username, 'id' => $request->user()->id])
-                ->withErrors($v->errors());
-        }
-
         if ($v->fails()) {
             if ($dest == 'profile') {
                 return redirect()->route('profile', ['username' => $recipient->slug, 'id'=> $recipient->id])

app/Http/Controllers/Staff/GiftController.php

@@ -27,9 +27,7 @@ class GiftController extends Controller
      */
     public function index()
     {
-        $users = User::oldest('username')->get();
-
-        return view('Staff.gift.index', ['users' => $users]);
+        return view('Staff.gift.index');
     }
 
     /**
@@ -59,7 +57,7 @@ class GiftController extends Controller
             return redirect()->route('systemGift')
                 ->withErrors($v->errors());
         } else {
-            $recipient = User::where('username', 'LIKE', $username)->first();
+            $recipient = User::where('username', '=', $username)->first();
 
             if (! $recipient) {
                 return redirect()->route('systemGift')

package-lock.json

@@ -8013,16 +8013,6 @@
       "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
       "dev": true
     },
-    "select2": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.6.tgz",
-      "integrity": "sha512-P5NqUcH+FFBwHAbC2mEWMDS446YdIGvXRM9tSGFLuNIFRP/ng0IOtjJ4zkzVyCl43RM/NyXJa6SAPT9MGg634A==",
-      "dev": true,
-      "requires": {
-        "almond": "~0.3.1",
-        "jquery-mousewheel": "~3.1.13"
-      }
-    },
     "selfsigned": {
       "version": "1.10.4",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",

package.json

@@ -26,7 +26,6 @@
     "resolve-url-loader": "2.3.2",
     "sass": "^1.20.1",
     "sass-loader": "^7.1.0",
-    "select2": "^4.0.6",
     "socket.io": "^2.2.0",
     "socket.io-client": "^2.2.0",
     "spin.js": "^4.0.0",

resources/js/bootstrap.js

@@ -63,7 +63,6 @@ window.Echo = new Echo({
 /**
  * UNIT3D
  */
-require('select2');
 window.Ladda = require('ladda');
 
 /*

resources/views/Staff/gift/index.blade.php

@@ -27,12 +27,8 @@
         <form action="{{ route('sendSystemGift') }}" method="post">
             @csrf
             <div class="form-group">
-                <label for="users">Select a User</label>
-                <select class="form-control user-select-placeholder-single" name="username">
-                    @foreach ($users as $user)
-                        <option value="{{ $user->username }}">{{ $user->username }}</option>
-                    @endforeach
-                </select>
+                <label for="users">@lang('common.username')</label>
+                <input name="username" class="form-control" placeholder="@lang('common.username')" required>
             </div>
 
             <div class="form-group">

resources/views/bonus/gift.blade.php

@@ -36,11 +36,8 @@
                         <label for="to_username">@lang('bon.gift-to')</label>
                     </div>
                     <div class="form-group">
-                            <select class="form-control user-select-placeholder-single" name="to_username">
-                                @foreach ($users as $user)
-                                    <option value="{{ $user->username }}">{{ $user->username }}</option>
-                                @endforeach
-                            </select>
+                        <label for="users">@lang('pm.select')</label>
+                        <input name="username" class="form-control" placeholder="@lang('common.username')" required>
                     </div>
 
                     <div class="form-group">
@@ -84,12 +81,4 @@
     </div>
     </div>
     </div>
-@endsection
-
-@section('javascripts')
-    <script nonce="{{ Bepsvpt\SecureHeaders\SecureHeaders::nonce() }}">
-        $(document).ready(function () {
-            $('.user-select-placeholder-single').select2()
-        })
-    </script>
 @endsection

resources/views/bonus/index.blade.php

@@ -261,13 +261,4 @@
             </div>
         </div>
     </div>
-
-@endsection
-
-@section('javascripts')
-    <script nonce="{{ Bepsvpt\SecureHeaders\SecureHeaders::nonce() }}">
-        $(document).ready(function () {
-            $('.user-select-placeholder-single').select2()
-        })
-    </script>
 @endsection

resources/views/bonus/store.blade.php

@@ -117,12 +117,4 @@
             </div>
     </div>
     </div>
-@endsection
-
-@section('javascripts')
-    <script nonce="{{ Bepsvpt\SecureHeaders\SecureHeaders::nonce() }}">
-        $(document).ready(function () {
-            $('.user-select-placeholder-single').select2()
-        })
-    </script>
 @endsection

resources/views/pm/send.blade.php

@@ -24,13 +24,8 @@
                     <form role="form" method="POST" action="{{ route('send-pm') }}">
                         @csrf
                         <div class="form-group">
-                            <label for="users">@lang('pm.select')</label>
-                            <select class="js-example-basic-single form-control" name="receiver_id">
-                                    <option value="{{ $receiver_id }}">{{ $username }}</option>
-                                @foreach ($usernames as $username)
-                                    <option value="{{ $username->id }}">{{ $username->username }}</option>
-                                @endforeach
-                            </select>
+                            <label for="users">@lang('common.username')</label>
+                            <input name="receiver_id" class="form-control" placeholder="@lang('common.username')" required>
                         </div>
 
                         <div class="form-group">
@@ -55,12 +50,6 @@
 @endsection
 
 @section('javascripts')
-    <script nonce="{{ Bepsvpt\SecureHeaders\SecureHeaders::nonce() }}">
-      $(document).ready(function () {
-        $('.js-example-basic-single').select2()
-      })
-    </script>
-
     <script nonce="{{ Bepsvpt\SecureHeaders\SecureHeaders::nonce() }}">
       $(document).ready(function () {
         $('#message').wysibb({});

resources/views/user/user_modals.blade.php

@@ -54,7 +54,7 @@
                     <form role="form" method="POST" action="{{ route('send-pm') }}">
                         @csrf
                         <input type="hidden" name="dest" value="profile" />
-                        <input type="hidden" name="receiver_id" value="{{ $user->id }}" />
+                        <input type="hidden" name="receiver_id" value="{{ $user->username }}" />
                         <div class="form-group">
                             <label for="">@lang('pm.subject')</label>
                         </div>