diff --git a/docs.xlsx b/docs.xlsx new file mode 100644 index 0000000..2b3b747 Binary files /dev/null and b/docs.xlsx differ diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index c2d4a44..d7126a2 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -11,13 +11,13 @@ class UserController extends Controller { public function __construct() { - $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"); +// $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 fe7d217..0000000 Binary files a/skolehjem/laravel.sqlite and /dev/null differ 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" }