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

Merge

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
skolehjem/app/Http/Controllers/AlbumController.php
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)
{
//
}
}

9
skolehjem/app/Http/Controllers/ExternalLinkController.php
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.
*

77
skolehjem/app/Http/Controllers/ImageController.php
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)
{
//
}
}

29
skolehjem/app/Http/Controllers/UserController.php
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");
}
}

77
skolehjem/app/Http/Controllers/VideoController.php
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)
{
//
}
}

2
skolehjem/app/Http/Kernel.php
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
];
}

2
skolehjem/app/MenuPlan.php
View File

@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
class MenuPlan extends Model
{
protected $fillable = [
'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday"
'monday', "tuesday", 'wednesday', 'thursday'
];
}

3
skolehjem/database/migrations/2014_10_12_000000_create_users_table.php
View File

@ -13,6 +13,9 @@ class CreateUsersTable extends Migration
*/
public function up()
{
if(Schema::hasTable("users"))
return;
Schema::create('users', function (Blueprint $table) {
$table->id();
$table->string('name_first');

18
skolehjem/database/migrations/2020_06_08_080402_create_permission_tables.php
View File

@ -20,13 +20,17 @@ class CreatePermissionTables extends Migration
throw new \Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.');
}
Schema::create($tableNames['permissions'], function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('name');
$table->string('description');
$table->string('guard_name');
$table->timestamps();
});
if(!Schema::hasTable("permissions"))
{
Schema::create($tableNames['permissions'], function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('name');
$table->string('description');
$table->string('guard_name');
$table->timestamps();
});
}
Schema::create($tableNames['roles'], function (Blueprint $table) {
$table->bigIncrements('id');

38
skolehjem/database/migrations/2020_06_29_112658_create_staff_table.php
View File

@ -1,38 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateStaffTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('staff', function (Blueprint $table) {
$table->id();
$table->string('name_first');
$table->string('name_last');
$table->string('email')->unique();
$table->timestamp('email_verified_at')->nullable();
$table->string('password');
$table->integer("phone")->unique();
$table->rememberToken();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('staff');
}
}

31
skolehjem/database/migrations/2020_06_30_064605_create_gallery_album.php
View File

@ -1,31 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateGalleryAlbum extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('gallery_album', function (Blueprint $table) {
$table->id();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('gallery_album');
}
}

31
skolehjem/database/migrations/2020_06_30_064640_create_gallery_video.php
View File

@ -1,31 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateGalleryVideo extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('gallery_video', function (Blueprint $table) {
$table->id();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('gallery_video');
}
}

31
skolehjem/database/migrations/2020_06_30_064737_create_gallery_image.php
View File

@ -1,31 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateGalleryImage extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('gallery_image', function (Blueprint $table) {
$table->id();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('gallery_image');
}
}

1
skolehjem/database/seeds/DatabaseSeeder.php
View File

@ -12,5 +12,6 @@ class DatabaseSeeder extends Seeder
public function run()
{
$this->call(PermissionSeeder::class);
$this->call(UserSeeder::class);
}
}

22
skolehjem/database/seeds/PermissionSeeder.php
View File

@ -40,19 +40,29 @@ class PermissionSeeder extends Seeder
"link.external.edit" => "Allows editing of external links.",
"link.external.delete" => "Allows deletion of external links",
"event.create" => "Create a new event",
"event.list" => "Shows all events",
"event.show" => "Shows event",
"event.edit" => "Edit event",
"event.delete" => "Deletes an event",
"contact.create" => "Creates a new contact",
"contact.list" => ""
];
foreach ($permissions as $key => $value) {
if(Permission::findByName($key))
continue;
$permission = new Permission();
try {
if(Permission::findByName($key))
continue;
} catch (Exception $e) {
$permission = new Permission();
$permission->name = $key;
$permission->description = $value;
$permission->name = $key;
$permission->description = $value;
$permission->save();
$permission->save();
}
}
}
}

18
skolehjem/resources/js/calendar/calendar.js vendored
View File

@ -93,6 +93,7 @@ function generateCalendar(weekOffset = 0) {
function onDateSelect(date) {
let events;
let machinez;
let buttonz;
let container = document.getElementById("event-container");
@ -129,6 +130,23 @@ function onDateSelect(date) {
events = document.getElementById("events");
}
if(document.getElementById("create-reservation") != undefined)
buttonz = document.getElementById("create-reservation");
else {
// let span = document.createElement("span");
// span.classList.add("events__title");
// span.innerText = "Tider";
let button = document.createElement("button");
// button.classList.add("events__title");
button.id = "create-reservation";
button.innerText = "Reserver";
// container.appendChild(span);
container.appendChild(button);
buttonz = document.getElementById("events");
}
// events.innerHTML = "";

4
skolehjem/resources/views/admin/external-links/index.blade.php
View File

@ -19,8 +19,8 @@
</tr>
@foreach($links as $link)
<tr>
<th>{{$link->name}}</th>
<th><a href="{{$link->link}}">{{$link->link}}</th>
<td>{{$link->name}}</td>
<td><a href="{{$link->link}}">{{$link->link}}</td>
<td><a href="{{ route("external-links.edit", [ "external_link" => $link ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route("external-links.destroy", [ "external_link" => $link ]) }}" class="w-100 nostyle">
@csrf

24
skolehjem/resources/views/admin/layout/base.blade.php
View File

@ -50,23 +50,23 @@
</div>
</div>
<div class="segment">
<h3 class="text-white">Kontakter</h3>
<h3 class="text-white">Eksterne Links</h3>
<div class="row">
<a href="{{ route("contacts.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Kontakter</a>
<a href="{{ route("external-links.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Links</a>
</div>
<div class="row">
<a href="{{ route("contacts.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
</div>
</div>
<div class="segment">
<h3 class="text-white">Personale</h3>
<div class="row">
<a href="{{ route('staff.index') }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Personale</a>
</div>
<div class="row">
<a href="{{ route('staff.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Personal</a>
<a href="{{ route('external-links.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Link</a>
</div>
</div>
{{-- <div class="segment">--}}
{{-- <h3 class="text-white">Personale</h3>--}}
{{-- <div class="row">--}}
{{-- <a href="{{ route('staff.index') }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Personale</a>--}}
{{-- </div>--}}
{{-- <div class="row">--}}
{{-- <a href="{{ route('staff.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Personal</a>--}}
{{-- </div>--}}
{{-- </div>--}}
<div class="segment">
<h3 class="text-white">Feedback</h3>
<div class="row">

15
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -16,6 +16,10 @@
</button>
</header>
<div class="d-none bg-sde-blue col" id="menu">
<a href="{{ route("root.index") }}">
Home
</a>
<a href="{{ route("menu-plans.index") }}">
<img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
Menuplan
@ -28,15 +32,16 @@
<img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Reservationer">
Reservationer
</a>
{{-- MÅ IKKE SLETTES!!!! --}}
{{-- <a href="#">--}}
{{-- <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">--}}
{{-- Galleri--}}
{{-- </a>--}}
<a href="#">
<img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
Galleri
</a>
<a href="{{ route("contacts.index") }}">
<img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
Kontoret
</a>
<a href="#">
<a href="{{ route("phones.index") }}">
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
</a>

4
skolehjem/routes/web.php
View File

@ -25,11 +25,13 @@ Route::post("/login", "UserController@login")->name("users.login");
Route::get("/logout", "UserController@logout")->name("users.logout");
Route::get("phones", "PhoneController@index")->name("phones.index");
Route::resource("contacts", "ContactController");
Route::resource("menu-plans", "MenuPlanController");
Route::resource("users", "UserController");
Route::resource("staff", "StaffController");
//Route::resource("staff", "StaffController");
Route::resource("events", "EventController");
Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController");

2
swagger/dist/swagger-editor.js vendored
View File

File diff suppressed because one or more lines are too long