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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-07-01 10:13:57 +02:00
parent 03b7f4236a 6ecc96ef55
commit b4f79c6f5e
30 changed files with 233 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
skolehjem/app/Http/Controllers/ContactController.php
View File

@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Contact;
use phpDocumentor\Reflection\Types\Context;
class ContactController extends Controller
{
@ -59,9 +60,15 @@ class ContactController extends Controller
]);
$contact = new Contact($requestContact);
$contact->save();
$saved = $contact->save();
if(!$saved){
return Response::detect("contacts.store");
}else{
$contact = Contact::query()->paginate($request->input("limit", 20));
return Response::detect("contacts.index", ['contacts' => $contact]);
}
}
/**
@ -101,9 +108,15 @@ class ContactController extends Controller
$data = $request->all();
$contact = Contact::find($id);
$contact->update($data);
$contact->save();
$saved = $contact->save();
if(!$saved){
return Response::detect("contacts.update", [ "contacts" => $contact ]);
}else{
$contact = Contact::query()->paginate($request->input("limit", 20));
return Response::detect("contacts.index", ['contacts' => $contact]);
}
}
/**

16
skolehjem/app/Http/Controllers/EventController.php
View File

@ -59,9 +59,15 @@ class EventController extends Controller
$event = new Event($requestBody);
$event->save();
$saved = $event->save();
if(!$saved){
return Response::detect("events.store");
}else{
$event = Event::query()->paginate($request->input("limit", 20));
return Response::detect("events.index", ['events' => $event]);
}
}
/**
@ -100,9 +106,15 @@ class EventController extends Controller
$event = Event::find($id);
$event->update($data);
$event->save();
$saved = $event->save();
if(!$saved){
return Response::detect("events.update", [ "event" => $event]);
}else{
$event = Event::query()->paginate($request->input("limit", 20));
return Response::detect("events.index", ['events' => $event]);
}
}
/**

16
skolehjem/app/Http/Controllers/ExternalLinkController.php
View File

@ -55,9 +55,15 @@ class ExternalLinkController extends Controller
]);
$externalLink = new ExternalLink($requestBody);
$externalLink->save();
$saved = $externalLink->save();
if(!$saved){
return Response::detect("external-links.store");
}else{
$externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
return Response::detect("external-links.index", ['links' => $externalLink]);
}
}
/**
@ -96,9 +102,15 @@ class ExternalLinkController extends Controller
$link = ExternalLink::find($id);
$link->update($data);
$link->save();
$saved = $link->save();
if(!$saved){
return Response::detect("external-links.update", [ "link" => $link]);
}else{
$externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
return Response::detect("external-links.index", ['links' => $externalLink]);
}
}
/**

15
skolehjem/app/Http/Controllers/MenuPlanController.php
View File

@ -60,9 +60,14 @@ class MenuPlanController extends Controller
]);
$menuPlans = new MenuPlan($requestMenuPlanCreate);
$menuPlans->save();
$saved = $menuPlans->save();
if(!$saved){
return Response::detect("menuplans.store");
}else{
$menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]);
}
}
/**
@ -102,9 +107,15 @@ class MenuPlanController extends Controller
$menuplan = MenuPlan::find($id);
$menuplan->update($data);
$menuplan->save();
$saved = $menuplan->save();
if(!$saved){
return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]);
}else{
$menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]);
}
}
/**

38
skolehjem/app/Http/Controllers/ResourceCategoryController.php
View File

@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\ResourceCategory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@ -23,9 +24,11 @@ class ResourceCategoryController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(Request $request)
{
//
$categories = ResourceCategory::query()->paginate($request->input("limit", 20));
return Response::detect("resource-categories.index", ["category"=> $categories]);
}
/**
@ -35,7 +38,7 @@ class ResourceCategoryController extends Controller
*/
public function create()
{
//
return Response::detect("resource-categories.create");
}
/**
@ -46,7 +49,15 @@ class ResourceCategoryController extends Controller
*/
public function store(Request $request)
{
//
$requestBody = $request->validate([
"name" => "unique|required|max:255",
"description" => "required|max:255",
"slug" => "unique|required|max:255"
]);
$category = new ResourceCategory($requestBody);
$category->save();
return Response::detect("resource-categories.store");
}
/**
@ -55,9 +66,9 @@ class ResourceCategoryController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
public function show(ResourceCategory $id)
{
//
return Response::detect("resource-categories.show", ["category" => $id]);
}
/**
@ -68,7 +79,8 @@ class ResourceCategoryController extends Controller
*/
public function edit($id)
{
//
$category = ResourceCategory::find($id);
return Response::detect("resource-categories.edit", ["category" => $category]);
}
/**
@ -80,7 +92,13 @@ class ResourceCategoryController extends Controller
*/
public function update(Request $request, $id)
{
//
$data = $request->all();
$category = ResourceCategory::find($id);
$category->update($data);
$category->save();
return Response::detect("resource-categories.update", ["category" => $category]);
}
/**
@ -91,6 +109,8 @@ class ResourceCategoryController extends Controller
*/
public function destroy($id)
{
//
$category = ResourceCategory::find($id);
$category->delete();
return redirect()->route("resource-categories.index");
}
}

17
skolehjem/app/Http/Controllers/RolesController.php
View File

@ -45,9 +45,16 @@ class rolesController extends Controller
]);
$role = new Role($requestRole);
$role->save();
$saved = $role->save();
if(!$saved){
return Response::detect("roles.store");
}else{
$roles = Role::query()->paginate($request->input("limit", 20));
return Response::detect("roles.index", ['roles' => $roles]);
}
}
/**
@ -85,9 +92,15 @@ class rolesController extends Controller
$data = $request->all();
$role = Role::find($id);
$role->update($data);
$role->save();
$saved = $role->save();
if(!$saved){
return Response::detect("roles.update", [ "role" => $role ]);
}else{
$roles = Role::query()->paginate($request->input("limit", 20));
return Response::detect("roles.index", ['roles' => $roles]);
}
}
/**

34
skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php Normal file
View File

@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateResourceCategories extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('resource_categories', function (Blueprint $table) {
$table->id();
$table->string("name")->unique();
$table->text("description");
$table->string("slug")->unique();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('resource_categories');
}
}

26
skolehjem/public/css/admin.css vendored
View File

@ -6588,16 +6588,18 @@ main {
min-width: 194px;
}
.segment {
margin-bottom: 1.25rem;
}
.segment > h3 {
margin-left: -1rem;
margin-top: 0;
width: calc(100% + 2rem);
background-color: rgba(0, 0, 0, 0.2);
width: calc(100% + 1rem);
text-align: center;
margin-bottom: 0;
font-size: 1.15em;
}
.segment > h3 > a {
padding: 1rem 2rem;
display: block;
}
.segment > div {
@ -6607,7 +6609,7 @@ main {
margin-bottom: 0.5rem;
}
.segment > div:hover {
.segment > h3:hover {
background-color: rgba(0, 0, 0, 0.2);
}
@ -6616,6 +6618,16 @@ main {
padding-right: 8px;
}
.btn-inline {
display: inline-flex;
align-items: center;
}
.btn-inline > img {
height: 1em;
margin-right: 4px;
}
.directorypath {
border-radius: 2px;
background-color: #333333;

28
skolehjem/resources/sass/admin/nav/nav.scss vendored
View File

@ -4,16 +4,18 @@
min-width: 194px;
}
.segment {
margin-bottom: 1.25rem;
}
.segment > h3 {
margin-left: -1rem;
margin-top: 0;
width: calc(100% + 2rem);
background-color: rgba(0,0,0, 0.2);
width: calc(100% + 1rem);
text-align: center;
margin-bottom: 0;
font-size: 1.15em;
}
.segment > h3 > a {
padding: 1rem 2rem;
display: block;
}
.segment > div {
@ -23,8 +25,8 @@
margin-bottom: .5rem;
}
.segment > div:hover {
background-color: rgba(0,0,0,0.2);
.segment > h3:hover {
background-color: rgba(0,0,0, 0.2);
}
.segment > div > a > img {
@ -35,3 +37,13 @@
.segment > div > a {
}
.btn-inline {
display: inline-flex;
align-items: center;
}
.btn-inline > img {
height: 1em;
margin-right: 4px;
}

5
skolehjem/resources/views/admin/contacts/index.blade.php
View File

@ -10,7 +10,10 @@
@endsection
@section("content")
<table class="tbl">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('contacts.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Kontakt Navn</th>
<th>Titel</th>

5
skolehjem/resources/views/admin/events/index.blade.php
View File

@ -10,7 +10,10 @@
@endsection
@section("content")
<table class="tbl">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('events.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Event</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Event Navn</th>
<th>Event Beskrivelse</th>

2
skolehjem/resources/views/admin/external-links/edit.blade.php
View File

@ -15,7 +15,7 @@
@csrf
@method("PUT")
<label for="title">Titel:</label>
<input value="{{$link->name}}" type="text" name="title" id="title" required>
<input value="{{$link->name}}" type="text" name="name" id="title" required>
<label for="link">Linket:</label>
<input value="{{$link->link}}" type="text" name="link" id="link" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">

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

@ -10,7 +10,10 @@
@endsection
@section("content")
<table class="tbl">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('external-links.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Ektern Link</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Title</th>
<th>Link</th>

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

@ -11,85 +11,34 @@
<main class="row">
<div class="col nav" style="background-color: #333333;">
<div class="segment">
<h3 class="text-white">Brugere</h3>
<div class="row">
<a href="{{ route('users.index') }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Brugere</a>
</div>
<div class="row">
<a href="{{ route('users.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger</a>
</div>
<h3 class="text-white"><a href="{{ route('users.index') }}" class="text-white">Brugere</a></h3>
</div>
<div class="segment">
<h3 class="text-white">Roller</h3>
<div class="row">
<a href="{{ route("roles.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Roller</a>
</div>
<div class="row">
<a href="{{ route('roles.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Rolle</a>
</div>
<h3 class="text-white"><a href="{{ route("roles.index") }}" class="text-white">Roller</a></h3>
</div>
<div class="segment">
<h3 class="text-white">Menuplan</h3>
<div class="row">
<a href="{{ route("menu-plans.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Menuplan</a>
</div>
<div class="row">
<a href="{{ route("menu-plans.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
</div>
<h3 class="text-white"><a href="{{ route("menu-plans.index")}}" class="text-white">Menuplan</a></h3>
</div>
<div class="segment">
<h3 class="text-white">Aktiviteter</h3>
<div class="row">
<a href="{{ route("events.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Aktiviteter</a>
</div>
<div class="row">
<a href="{{ route("events.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Aktivitet</a>
</div>
<h3 class="text-white"><a href="{{ route("events.index") }}" class="text-white">Aktiviteter</a></h3>
</div>
<div class="segment">
<h3 class="text-white">Vaskemaskiner</h3>
<div class="row">
<a href="{{ route("washing-machines.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskiner</a>
</div>
<div class="row">
<a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskine Reservationer</a>
</div>
<div class="row">
<a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
</div>
<h3 class="text-white"><a href="{{ route("washing-machines.index") }}" class="text-white">Vaskemaskiner</a></h3>
</div>
<div class="segment">
<h3 class="text-white">Eksterne Links</h3>
<div class="row">
<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('external-links.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Link</a>
<h3 class="text-white"><a href="{{ route("washing-reservations.index") }}" class="text-white">Vaskemaskiner Reservationer</a></h3>
</div>
<div class="segment">
<h3 class="text-white"><a href="{{ route("external-links.index") }}" class="text-white">Eksterne Links</a></h3>
</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>--}}
{{-- <h3 class="text-white"><a href="{{ route('staff.index') }}" class="text-white">Personale</a></h3>--}}
{{-- </div>--}}
<div class="segment">
<h3 class="text-white">Kontakter</h3>
<div class="row">
<a href="{{ route("contacts.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Kontakter</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>
<h3 class="text-white"><a href="{{ route("contacts.index") }}" class="text-white">Kontakter</a></h3>
</div>
<div class="segment">
<h3 class="text-white">Feedback</h3>
<div class="row">
<a href="{{ route('feedbacks.index') }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Feedback</a>
</div>
<h3 class="text-white"><a href="{{ route('feedbacks.index') }}" class="text-white">Feedback</a></h3>
</div>
</div>
<div class="w-85" style="background-color: #cccccc;">

2
skolehjem/resources/views/admin/layout/header.blade.php
View File

@ -3,7 +3,7 @@
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="h-100 brand" alt="Syddansk Erhvervsskole">
@auth
<a href="" class="btn btn-dark text-white m-0 ml-auto">User: {{ Auth::user()->name }}</a>
<a href="" class="btn btn-dark text-white m-0 ml-auto">Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }}</a>
<a href="{{ route('users.logout') }}" class="btn btn-dark text-white m-0 ml-1 mr-1">Log ud</a>
@else
<a href="{{ route('users.login') }}" class="btn btn-dark text-white m-0 ml-auto mr-1">Log ind</a>

5
skolehjem/resources/views/admin/menuplans/index.blade.php
View File

@ -10,7 +10,10 @@
@endsection
@section("content")
<table class="tbl">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('menu-plans.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Uge</th>
<th>Mandag</th>

0
skolehjem/resources/views/admin/resource-categories/create.blade.php Normal file
View File

0
skolehjem/resources/views/admin/resource-categories/delete.blade.php Normal file
View File

0
skolehjem/resources/views/admin/resource-categories/edit.blade.php Normal file
View File

0
skolehjem/resources/views/admin/resource-categories/index.blade.php Normal file
View File

0
skolehjem/resources/views/admin/resource-categories/show.blade.php Normal file
View File

0
skolehjem/resources/views/admin/resource-categories/store.blade.php Normal file
View File

0
skolehjem/resources/views/admin/resource-categories/update.blade.php Normal file
View File

5
skolehjem/resources/views/admin/roles/index.blade.php
View File

@ -10,7 +10,10 @@
@endsection
@section("content")
<table class="tbl">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('roles.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Rolle</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Navn</th>
<th>Beskrivelse</th>

1
skolehjem/resources/views/admin/users/create.blade.php
View File

@ -28,6 +28,7 @@
<label for="roles">Rolle:</label>
<select name="roles[]" id="roles" class="mb-2" multiple="multiple" required>
<option disabled selected value> -- Vælg Rolle(r) -- </option>
<option value="">Ingen Rolle</option>
@foreach($roles as $role)
<option value="{{ $role->name }}">{{ $role->name }}</option>
@endforeach

1
skolehjem/resources/views/admin/users/edit.blade.php
View File

@ -29,6 +29,7 @@
<label for="role">Rolle:</label>
<select name="roles[]" id="roles" class="mb-2" multiple="multiple" required>
<option disabled selected value> -- Vælg Rolle(r) -- </option>
<option value>Ingen Rolle</option>
@foreach($roles as $role)
<option value="{{ $role->name }}">{{ $role->name }}</option>
@endforeach

5
skolehjem/resources/views/admin/users/index.blade.php
View File

@ -10,7 +10,10 @@
@endsection
@section("content")
<table class="tbl">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('users.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Fornavn</th>
<th>Efternavn</th>

5
skolehjem/resources/views/admin/washing-machines/index.blade.php
View File

@ -10,7 +10,10 @@
@endsection
@section("content")
<table class="tbl">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('washing-machines.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Navn</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>

5
skolehjem/resources/views/admin/washing-reservations/index.blade.php
View File

@ -10,7 +10,10 @@
@endsection
@section("content")
<table class="tbl">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('washing-reservations.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Reservation</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Fornavn</th>
<th>Efternavn</th>

1
skolehjem/routes/web.php
View File

@ -42,4 +42,5 @@ Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController");
Route::resource("external-links", "ExternalLinkController");
Route::resource("resource-extensions", "ResourceExtensionController");
Route::resource("resource-categories", "ResourceCategoryController");
Route::resource("roles", "RolesController");