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

Merge

Browse Source
This commit is contained in:
Vedde
2020-06-30 08:55:41 +02:00
parent 3b2fec0e09
commit 139e62dedf
21 changed files with 332 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/AlbumController.php
+76 -1
View File
@@ -2,9 +2,84 @@
namespace App\Http\Controllers;
use App\Album;
use Illuminate\Http\Request;
class AlbumController extends Controller
{
//
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param \App\Album $album
* @return \Illuminate\Http\Response
*/
public function show(Album $album)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Album $album
* @return \Illuminate\Http\Response
*/
public function edit(Album $album)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Album $album
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Album $album)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \App\Album $album
* @return \Illuminate\Http\Response
*/
public function destroy(Album $album)
{
//
}
}
skolehjem/app/Http/Controllers/ExternalLinkController.php
+9
View File
@@ -9,6 +9,15 @@ use Illuminate\Http\Response;
class ExternalLinkController extends Controller
{
function __construct()
{
$this->middleware("permission:link.external.list")->only("index");
$this->middleware("permission:link.external.create")->only(["create", "store"]);
$this->middleware("permission:link.external.show")->only("show");
$this->middleware("permission:link.external.edit")->only(["edit", "update"]);
$this->middleware("permission:link.external.delete")->only("destroy");
}
/**
* Display a listing of the resource.
*
skolehjem/app/Http/Controllers/ImageController.php
+76 -1
View File
@@ -2,9 +2,84 @@
namespace App\Http\Controllers;
use App\Image;
use Illuminate\Http\Request;
class ImageController extends Controller
{
//
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param \App\Image $image
* @return \Illuminate\Http\Response
*/
public function show(Image $image)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Image $image
* @return \Illuminate\Http\Response
*/
public function edit(Image $image)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Image $image
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Image $image)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \App\Image $image
* @return \Illuminate\Http\Response
*/
public function destroy(Image $image)
{
//
}
}
skolehjem/app/Http/Controllers/UserController.php
+15 -14
View File
@@ -14,13 +14,14 @@ 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([ "check.auth:user.list" ])->only("index");
$this->middleware([ "check.auth:user.show" ])->only("show");
$this->middleware([ "check.auth:user.create" ])->only("create");
$this->middleware([ "check.auth:user.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:user.delete" ])->only("delete");
}
/**
@@ -54,7 +55,7 @@ class UserController extends Controller
*/
public function store(Request $request)
{
Log::debug("STORE FUNCTION");
// Log::debug("STORE FUNCTION");
$data = $request->validate([
"name_first" => "required|max:255",
@@ -65,15 +66,15 @@ class UserController extends Controller
]);
Log::debug("FINISHED VALIDATION?");
// Log::debug("FINISHED VALIDATION?");
$user = new User($data);
Log::debug("CREATED USER [NOT PERSISTED YET]");
// Log::debug("CREATED USER [NOT PERSISTED YET]");
$user->save();
Log::debug("SAVED USER");
// Log::debug("SAVED USER");
return Response::detect("users.store");
}
@@ -182,7 +183,7 @@ class UserController extends Controller
/*******************************************/
public function showLogin() {
return view("admin.users.login");
return Response::detect("users.login");
}
public function login(Request $request) {
@@ -190,7 +191,7 @@ class UserController extends Controller
if(Auth::attempt($data)) {
//TODO: Implement home?
return redirect()->route("users.index");
return redirect()->route("root.index");
}
return redirect()->back(303);
@@ -199,6 +200,6 @@ class UserController extends Controller
public function logout(Request $request) {
Auth::logout();
return redirect()->to("/");
return redirect()->route("root.index");
}
}
skolehjem/app/Http/Controllers/VideoController.php
+76 -1
View File
@@ -2,9 +2,84 @@
namespace App\Http\Controllers;
use App\Video;
use Illuminate\Http\Request;
class VideoController extends Controller
{
//
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param \App\Video $video
* @return \Illuminate\Http\Response
*/
public function show(Video $video)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Video $video
* @return \Illuminate\Http\Response
*/
public function edit(Video $video)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Video $video
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Video $video)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \App\Video $video
* @return \Illuminate\Http\Response
*/
public function destroy(Video $video)
{
//
}
}
skolehjem/app/Http/Kernel.php
+2
View File
@@ -67,5 +67,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,
"check.auth" => \App\Http\Middleware\CheckAuth::class
];
}