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-08-05 09:24:08 +02:00
parent a78e7d90f6 07fa636a2e
commit 91f7a4aa05
9 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
skolehjem/app/Http/Controllers/WashingReservationController.php
View File

@ -153,7 +153,10 @@ class WashingReservationController extends Controller
$reservations = WashingReservation::query()->paginate( 20);
return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]);
if(app('router')->getRoutes()->match(app('request')->create(url()->previous()))->getName() == "washing-reservations.appindex")
return redirect()->route("washing-reservations.appindex");
else
return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]);
}
public function api(Request $request){

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

@ -6599,8 +6599,9 @@ header {
.brand {
width: calc(15% - 2rem);
padding: 0 1rem 0 1rem;
padding: 0.5rem 1rem;
min-width: calc(194px - 2rem);
height: calc(100% - 1rem);
}
main {

BIN
skolehjem/public/images/icons/facebook-icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
skolehjem/public/images/icons/instagram.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 58 KiB

BIN
skolehjem/public/images/icons/yt.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

3
skolehjem/resources/sass/admin/header/header.scss vendored
View File

@ -4,8 +4,9 @@ header {
.brand {
width: calc(15% - 2rem);
padding: 0 1rem 0 1rem;
padding: 0.5rem 1rem;
min-width: calc(194px - 2rem);
height: calc(100% - 1rem);
}
main {

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

@ -1,6 +1,6 @@
@section("header")
<header class="row align-items-center" style="background-color: #00788a;">
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="h-100 brand" alt="Syddansk Erhvervsskole">
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="brand" alt="Syddansk Erhvervsskole">
@auth
<a href="{{ route("users.account") }}" class="btn btn-dark text-white m-0 ml-auto">Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }}</a>

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

@ -6,8 +6,8 @@
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
</head>
<body>
<header class="row align-items-center" id="header">
<a href="{{ route("root.index") }}"><img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole"></a>
<header class="row align-items-center">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
<button class="ml-auto" id="toggle">
<i id="icon" class="fas fa-bars"></i>
</button>

3
skolehjem/resources/views/app/users/index.blade.php
View File

@ -10,6 +10,7 @@
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
<a href="{{ route('guides.index') }}" class="block text-center mb-1">Vejledninger</a>
</div>
<!--
<div class="row" style="align-self: center; margin: 8px 0 8px 0;">
<a href="https://www.facebook.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
@ -20,7 +21,7 @@
<a href="https://www.instagram.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
</a>
</div>
</div>-->
</main>
@endsection