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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

This commit is contained in:
Neerholt 2020-07-01 09:43:24 +02:00
parent 7b4610f02f 6b294972e4
commit 2b69938251
15 changed files with 91 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>

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>

5
skolehjem/resources/views/admin/feedbacks/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('feedbacks.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Feedback</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Feedback Besked</th>
<th>Ris el. Ros</th>

75
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>
</div>
<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>

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

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

@ -28,7 +28,8 @@
<input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
<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 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>