From a2c7d619b1cec4cea362e4b5442a7218a3982a47 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 16 Jun 2020 08:28:37 +0200 Subject: [PATCH] Added docs.xlsx --- docs.xlsx | Bin 0 -> 9345 bytes .../app/Http/Controllers/UserController.php | 32 +++++++++--------- skolehjem/app/User.php | 1 - skolehjem/laravel.sqlite | Bin 118784 -> 0 bytes skolehjem/public/mix-manifest.json | 4 ++- 5 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 docs.xlsx delete mode 100644 skolehjem/laravel.sqlite diff --git a/docs.xlsx b/docs.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2b3b747f6cb60d3784550246f63c51c3b8171dbe GIT binary patch literal 9345 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 o2bcZ||9b-bE1aM4FYrIoq4pzmmiddleware([ "auth" ])->only("logout"); - $this->middleware([ "guest" ])->only("login"); - - $this->middleware([ "permission:user.list", "role:admin" ])->only("index"); - $this->middleware([ "permission:user.show", "role:admin" ])->only("show"); - $this->middleware([ "permission:user.edit", "role:admin" ])->only([ "edit", "update" ]); - $this->middleware([ "permission:user.delete", "role:admin" ])->only("delete"); +// $this->middleware([ "auth" ])->only("logout"); +// $this->middleware([ "guest" ])->only("login"); +// +// $this->middleware([ "permission:user.list", "role:admin" ])->only("index"); +// $this->middleware([ "permission:user.show", "role:admin" ])->only("show"); +// $this->middleware([ "permission:user.edit", "role:admin" ])->only([ "edit", "update" ]); +// $this->middleware([ "permission:user.delete", "role:admin" ])->only("delete"); } /** @@ -30,7 +30,7 @@ class UserController extends Controller { $users = User::query()->paginate($request->query("page", 1)); - return view("user.index", [ "users" => $users ]); + return view("admin.user.index", [ "users" => $users ]); } /** @@ -40,7 +40,7 @@ class UserController extends Controller */ public function create() { - return view("user.create"); + return view("admin.user.create"); } /** @@ -63,7 +63,7 @@ class UserController extends Controller $user = new User($data); $user->save(); - return view("user.store"); + return view("admin.user.store"); } /** @@ -76,7 +76,7 @@ class UserController extends Controller { $user = User::find($id); - return view("user.show", [ + return view("admin.user.show", [ "user" => $user ]); } @@ -91,7 +91,7 @@ class UserController extends Controller { $user = User::find($id); - return view("user.edit", [ + return view("admin.user.edit", [ "user" => $user ]); } @@ -130,7 +130,7 @@ class UserController extends Controller $user->save(); } - return view("user.edit", [ + return view("admin.user.edit", [ "user" => $user ]); } @@ -153,7 +153,7 @@ class UserController extends Controller $user->delete(); } - return view("user.delete"); + return view("admin.user.delete"); } /*******************************************/ @@ -161,7 +161,7 @@ class UserController extends Controller /*******************************************/ public function showLogin() { - return view("user.login"); + return view("admin.user.login"); } public function login(Request $request) { @@ -169,7 +169,7 @@ class UserController extends Controller if(Auth::attempt($data)) { //TODO: Implement home? - return view("user.home", [ "user" => Auth::user() ]); + return view("admin.user.home", [ "user" => Auth::user() ]); } return redirect()->back(303); diff --git a/skolehjem/app/User.php b/skolehjem/app/User.php index e0df5d5..061c7ba 100644 --- a/skolehjem/app/User.php +++ b/skolehjem/app/User.php @@ -10,7 +10,6 @@ use Spatie\Permission\Traits\HasRoles; class User extends Authenticatable { - use SoftDeletes; use Notifiable; use HasRoles; diff --git a/skolehjem/laravel.sqlite b/skolehjem/laravel.sqlite deleted file mode 100644 index fe7d217d5254f9dd2d4e6186525f7d8eba63761b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118784 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 I91MZ~0;oS^<^TWy diff --git a/skolehjem/public/mix-manifest.json b/skolehjem/public/mix-manifest.json index 2d60117..c5852b6 100644 --- a/skolehjem/public/mix-manifest.json +++ b/skolehjem/public/mix-manifest.json @@ -1,4 +1,6 @@ { "/js/app.js": "/js/app.js", - "/css/app.css": "/css/app.css" + "/css/app.css": "/css/app.css", + "/css/webapp.css": "/css/webapp.css", + "/css/admin.css": "/css/admin.css" }