vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v0.5.8a - Fix

This commit is contained in:
frederikpyt 2020-08-07 10:25:46 +02:00
parent 4c2b58f33b
commit f7941841fe
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skolehjem/app/Http/Controllers/EventController.php
View File

@ -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();

8
skolehjem/app/Http/Controllers/UserEventController.php
View File

@ -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();
}
/**

2
skolehjem/resources/views/app/events/index.blade.php
View File

@ -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>

3
skolehjem/resources/views/app/news/index.blade.php
View File

@ -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")