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

 Conflicts:

	skolehjem/resources/views/admin/events/create.blade.php

skolehjem/app/Event.php

@@ -20,6 +20,6 @@ class Event extends Model
      */
     //protected variable which contains name of database field(s) to be filled.
     protected $fillable = [
-        "name", "description", "date"
+        "name", "accountable", "description", "date"
     ];
 }

skolehjem/app/Http/Controllers/ContactController.php

@@ -13,6 +13,7 @@ class ContactController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:contact.list" ])->only("index");
         $this->middleware([ "check.auth:contact.show" ])->only("show");

skolehjem/app/Http/Controllers/EventController.php

@@ -16,6 +16,7 @@ class EventController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:event.list" ])->only("index");
         $this->middleware([ "check.auth:event.show" ])->only("show");
@@ -60,6 +61,7 @@ class EventController extends Controller
     {
         $requestBody = $request->validate([
             "name" => "required|max:255",
+            "accountable" => "required|max:255",
             "description" => "required|max:255",
             "date" => "required"
         ]);

skolehjem/app/Http/Controllers/FeedbackController.php

@@ -13,6 +13,7 @@ class FeedbackController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:feedback.list" ])->only("index");
         $this->middleware([ "check.auth:feedback.show" ])->only("show");

skolehjem/app/Http/Controllers/GuideController.php

@@ -14,6 +14,7 @@ class GuideController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:guides.list" ])->only("index");
         $this->middleware([ "check.auth:guides.show" ])->only("show");
@@ -144,13 +145,14 @@ class GuideController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\Guide  $guide
+     * @param  Guide  $guide
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Guide $guide)
+    public function destroy($guide)
     {
-        $guide = MenuPlan::find($guide);
+        $guide = Guide::find($guide);
         $guide->delete();
+
         return redirect()->route("guides.index");
     }
 }

skolehjem/app/Http/Controllers/LocationController.php

@@ -11,6 +11,7 @@ class LocationController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:locations.list" ])->only("index");
         $this->middleware([ "check.auth:locations.show" ])->only("show");

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -17,6 +17,7 @@ class MenuPlanController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:menuplan.list" ])->only("index");
         $this->middleware([ "check.auth:menuplan.show" ])->only("show");

skolehjem/app/Http/Controllers/PermissionController.php

@@ -8,6 +8,12 @@ use Spatie\Permission\Models\Permission;
 
 class PermissionController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware(["auth"]);
+        $this->middleware(["lang"]);
+    }
+
     /**
      * Display a listing of the resource.
      *

skolehjem/app/Http/Controllers/PhoneController.php

@@ -7,6 +7,12 @@ use Illuminate\Http\Response;
 
 class PhoneController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware(["auth"]);
+        $this->middleware(["lang"]);
+    }
+
     function index() {
         return Response::detect("vagttelefons.index");
     }

skolehjem/app/Http/Controllers/ResourceCategoryController.php

@@ -11,6 +11,7 @@ class ResourceCategoryController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:resource.category.list" ])->only("index");
         $this->middleware([ "check.auth:resource.category.show" ])->only("show");

skolehjem/app/Http/Controllers/ResourceController.php

@@ -12,6 +12,7 @@ class ResourceController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:resource.list" ])->only("index");
         $this->middleware([ "check.auth:resource.show" ])->only("show");

skolehjem/app/Http/Controllers/ResourceExtensionController.php

@@ -11,6 +11,7 @@ class ResourceExtensionController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:resource.extension.list" ])->only("index");
         $this->middleware([ "check.auth:resource.extension.show" ])->only("show");

skolehjem/app/Http/Controllers/RolesController.php

@@ -12,6 +12,7 @@ class rolesController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:roles.list" ])->only("index");
         $this->middleware([ "check.auth:roles.show" ])->only("show");

skolehjem/app/Http/Controllers/RootController.php

@@ -10,6 +10,7 @@ class RootController extends Controller
     function __construct()
     {
         $this->middleware("auth");
+        $this->middleware([ "lang" ]);
     }
 
     public function index() {

skolehjem/app/Http/Controllers/UserController.php

@@ -6,6 +6,7 @@ use App\Helpers\Detector;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\User;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
@@ -20,6 +21,7 @@ class UserController extends Controller
     {
         $this->middleware([ "auth" ])->only("logout");
         $this->middleware([ "guest" ])->only("login");
+        $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot"]);
 
         $this->middleware([ "check.auth:user.list" ])->only("index");
         $this->middleware([ "check.auth:user.show" ])->only("show");
@@ -209,13 +211,13 @@ class UserController extends Controller
             return redirect()->route("root.index");
         }
 
-        return redirect()->back(303);
+        return redirect()->back(303)->with('error#wrongcredentials', '<p><b>Email eller Password matchede ikke!</b></p>');
     }
 
     public function logout(Request $request) {
         Auth::logout();
 
-        return redirect()->route("users.login");
+        return redirect()->route("users.login")->with('success#loggedout', '<p><b>Du er hermed logget ud!</b></p>');
     }
 
     /*******************************************/
@@ -457,4 +459,23 @@ class UserController extends Controller
             return Response($output);
         }
     }
+
+
+
+   public function setLanguages(Request $request){
+        if($request->ajax()){
+            if($request->lang === "en"){
+                $response = new Response('Set Cookie');
+                $response->withCookie(cookie('languagesSetting', $request->lang, 5259488));
+
+                return $response;
+            }elseif($request->lang === "dk"){
+                $response = new Response('Set Cookie');
+                $response->withCookie(cookie('languagesSetting', $request->lang, 5259488));
+
+                return $response;
+            }
+        }
+    }
+
 }

skolehjem/app/Http/Controllers/UserEventController.php

@@ -8,6 +8,11 @@ use Illuminate\Http\Response;
 
 class UserEventController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware(["auth"]);
+        $this->middleware(["lang"]);
+    }
     /**
      * Update the specified resource in storage.
      *

skolehjem/app/Http/Controllers/WashingMachineController.php

@@ -17,6 +17,7 @@ class WashingMachineController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:washing.machine.list" ])->only("index");
         $this->middleware([ "check.auth:washing.machine.show" ])->only("show");

skolehjem/app/Http/Controllers/WashingReservationController.php

@@ -20,6 +20,7 @@ class WashingReservationController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:washing.machine.reservation.list" ])->only(["index", "appindex"]);
         $this->middleware([ "check.auth:washing.machine.reservation.show" ])->only("show");

skolehjem/app/Http/Kernel.php

@@ -2,6 +2,7 @@
 
 namespace App\Http;
 
+use App\Http\Middleware\SetLocale;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -67,7 +68,7 @@ class Kernel extends HttpKernel
         'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
         'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
         'role_or_permission' => \Spatie\Permission\Middlewares\RoleOrPermissionMiddleware::class,
-
+        'lang' => \App\Http\Middleware\SetLocale::class,
         "check.auth" => \App\Http\Middleware\CheckAuth::class
     ];
 }

skolehjem/app/Http/Middleware/SetLocale.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class SetLocale
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        app()->setLocale($request->user()->getLocale($request));
+        return $next($request);
+    }
+}

skolehjem/app/User.php

@@ -7,6 +7,7 @@
 namespace App;
 
 //allows the use of many libraries.
+use http\Env\Request;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -52,4 +53,8 @@ class User extends Authenticatable
     public function setPasswordAttribute($password) {
         $this->attributes["password"] = Hash::make($password);
     }
+
+    public function getLocale(\Illuminate\Http\Request $request) {
+        return $request->cookie('languagesSetting');
+    }
 }