diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index ebd202a..f326cfc 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -83,7 +83,7 @@ class EventController extends Controller $news->name = "Ny aktivitet"; $news->content = "<p>" . $event->description . "</p>" . '<div class="row align-items-center">'. - '<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.store", ["event_id" => $event->id ]) .'">Tilmeld</a>'. + '<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'. '<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event_id" => $event->id ]) .'">Se deltagere</a>'. '</div>'; $news->save(); @@ -163,7 +163,7 @@ class EventController extends Controller $news->name = "Aktivitet opdateret"; $news->content = "<p>" . $event->description . "</p>" . '<div class="row align-items-center">'. - '<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.store", ["event_id" => $event->id ]) .'">Tilmeld</a>'. + '<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'. '<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event_id" => $event->id ]) .'">Se deltagere</a>'. '</div>'; $news->save(); diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index bb760dd..cfcc3b9 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -18,14 +18,14 @@ 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(); return Response::detect("events.yourevents", [ "userevents" => $userevents ]); } - public function create() { + public function store() { } @@ -36,7 +36,7 @@ class UserEventController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function store(Request $request) + public function create(Request $request) { // Get written data from events.index $data = $request->validate([ @@ -56,7 +56,7 @@ class UserEventController extends Controller $UserEvent->user_id = auth()->user()->id; $UserEvent->save(); - return redirect()->back(); + //return redirect()->back(); } /** diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index 403c7b2..debaba0 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -8,7 +8,7 @@ <h1 class="text-center sde-blue mb-0">{{ __('msg.aktiviteter') }}</h1> @if(!$events->isEmpty()) @foreach($events as $event) - <form method="get" action="{{ route("userevents.store") }}"> + <form method="get" action="{{ route("userevents.create") }}"> <h3 class="sde-blue bold text-center mb-0">{{$event->name}}</h3> <p class="text-center mt-0">Af: {{ $event->accountable }}</p> <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p> diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index e79ea1f..384e3bc 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -64,6 +64,9 @@ {!! $new->content !!} </div> @endforeach + @if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0) + <p class="text-center">Der er ingen nyheder.</p> + @endif </main> <script src="{{ mix("/js/app.js") }}"></script> @yield("scripts")