Merge remote-tracking branch 'origin/master'

# Conflicts: # skolehjem/app/Http/Controllers/UserEventController.php
2020-08-07 10:52:25 +02:00
parent a23337b9d4 c02c1aacd3
commit e0b998dec0
8 changed files with 112 additions and 11 deletions
@@ -18,7 +18,7 @@ class UserEventController extends Controller
     *
     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
-    public function index()
+    public function index(Request $request)
    {
        $userevents = UserEvent::join('events', 'events.id', '=', 'user_events.event_id')->orderBY('date' , 'asc')->where('user_id', auth()->user()->id)->get();