diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..efd2186
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index f487688..e7a4022 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/skolehjem/app/Http/Controllers/EventController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Event;
+use App\UserEvent;
use App\User;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@@ -87,6 +88,23 @@ class EventController extends Controller
return Response::detect("events.show", [ "event" => $id ]);
}
+ /**
+ * Display signups for event.
+ *
+ * @param int $id
+ * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function signups(Request $request)
+ {
+ // Find every event you have clicked on. And find all users to that event, and the event name itself.
+ $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->get();
+
+ if (count($events) == 0)
+ $events = Event::where('id', $request->event)->get();
+
+ return Response::detect("events.signups", [ "events" => $events ]);
+ }
+
/**
* Show the form for editing the specified resource.-
*
@@ -130,11 +148,20 @@ class EventController extends Controller
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \Exception
*/
- public function destroy($id)
+ public function destroy(Request $request, $id)
{
- $event = Event::find($id);
- $event->delete();
- return redirect()->route("events.index");
+ if ($request->signup != null) { // If input signup is not empty, which has been set when you look at the individuel signup, then delete the user who have signed up for the event
+ $UserEvent = UserEvent::where('user_id', $request->signup)->where('event_id', $id);
+ $UserEvent->delete();
+ return redirect()->route("events.signups", [ "event" => $id ]);
+ } else { // Else if you are deleting an event. Then delete all the sign ups AND the event
+ $UserEvent = UserEvent::where('event_id', $id);
+ $UserEvent->delete();
+
+ $event = Event::find($id);
+ $event->delete();
+ return redirect()->route("events.index");
+ }
}
diff --git a/skolehjem/public/images/icons/eye-dark.svg b/skolehjem/public/images/icons/eye-dark.svg
new file mode 100644
index 0000000..578309c
--- /dev/null
+++ b/skolehjem/public/images/icons/eye-dark.svg
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php
index 22b9f4a..02a44f3 100644
--- a/skolehjem/resources/views/admin/events/index.blade.php
+++ b/skolehjem/resources/views/admin/events/index.blade.php
@@ -24,6 +24,7 @@