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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 

 Conflicts:
	skolehjem/resources/views/app/news/index.blade.php
This commit is contained in:
frederikpyt 2020-08-10 09:39:12 +02:00
parent bd7800f5a0 a011df41ee
commit fead36dd52
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
skolehjem/app/Http/Controllers/UserController.php
View File

@ -480,6 +480,13 @@ class UserController extends Controller
/* public function generateCookie(Request $cookieValue){
$response = new Response('Set Cookie');
$response->withCookie(cookie()->forever('languagesSetting', $cookieValue));
return $response;
}*/
public function setLanguages(Request $request){
if($request->ajax()){
if($request->lang === "en"){

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

@ -53,6 +53,8 @@ class UserEventController extends Controller
return redirect()->route("events.index")->with('error#' . $request->event_id, '<p class="text-center"><b>Du har allerede tilmeldt dig denne Aktivitet!</b></p>');
if (request()->cookie('languagesSetting') == "en")
return redirect()->route("events.index")->with('error#' . $request->event_id, '<p class="text-center"><b>You are already participating in this event!</b></p>');
return redirect()->route("events.index")->with('error#' . $request->event_id, '<p class="text-center"><b>Du har allerede tilmeldt dig denne Aktivitet!</b></p>');
}
// If not, then it keeps going and saves and shows a success message
@ -64,6 +66,8 @@ class UserEventController extends Controller
return redirect()->route("events.index")->with('signup#' . $request->event_id, '<p class="text-center"><b>Du er hermed tilmeldt denne aktivitet!</b></p>');
if (request()->cookie('languagesSetting') == "en")
return redirect()->route("events.index")->with('signup#' . $request->event_id, '<p class="text-center"><b>You are now participating in this event!</b></p>');
return redirect()->route("events.index")->with('signup#' . $request->event_id, '<p class="text-center"><b>Du er hermed tilmeldt denne aktivitet!</b></p>');
}
/**

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

@ -57,12 +57,43 @@
</a>
</div>
<style>
div.card {
margin-top: 1rem;
margin-bottom: 30px;
width: auto;
heigt: auto;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
}
div.header {
background-color: #00788a;
color: white;
padding: 1px;
font-size: 10px;
text-align: center;
}
div.container {
padding: 5px;
text-align: justify;
line-height: 1.5;
}
</style>
<main>
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
<div style="border: 4px solid rgba(0,0,0, 0.2); border-radius: 4px; padding: 4px; margin-top: 1.5rem">
<h2 class="sde-blue mt-0 mb-0 text-center" style="margin-bottom: 8px; ">{{ $new->name }}</h2>
<h4 class="sde-blue mt-0 mb-0 text-center" style="margin-bottom: 8px; ">{{ $new->subname }}</h4>
{!! $new->content !!}
<div class="card">
<div class="header">
<p><b>{{ $new->name }}</b></p>
<h1>{{ $new->subname }}</h1>
</div>
<div class="container">
<p>{!! $new->content !!}</p>
</div>
</div>
@endforeach
@if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)