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

Browse Source 
 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
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/UserController.php
+7
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"){
skolehjem/app/Http/Controllers/UserEventController.php
+4
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>');
}
/**