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-25 14:48:58 +02:00
parent 3b6b20f934 c1972e70c8
commit 0bd324e996
7 changed files with 30 additions and 35 deletions
skolehjem
app/Http/Controllers
RootController.phpWashingMachineController.php
public/css
webapp.csswebappdark.css
resources
js/navmenu
menu.js
sass/webapp
_default.scss
views/app/layout
base.blade.php

6
skolehjem/app/Http/Controllers/RootController.php
View File

@ -15,18 +15,18 @@ class RootController extends Controller
}
public function index() {
$perPage = 2;
$perPage = 5;
if(auth()->user()->can('admin.panel.show')) {
if(Response::detect("root.index")->name() == "admin.root.index")
return Response::detect("root.index");
else {
$news = News::query()->orderBy('id', 'asc')->paginate($perPage);
$news = News::query()->orderBy('id', 'desc')->paginate($perPage);
return Response::detect("root.index", ["news" => $news]);
}
}
else {
$news = News::query()->orderBy('id', 'asc')->paginate($perPage, ['*'], "page");
$news = News::query()->orderBy('id', 'desc')->paginate($perPage, ['*'], "page");
return view('app.root.index', ["news" => $news]);
}

4
skolehjem/app/Http/Controllers/WashingMachineController.php
View File

@ -202,7 +202,7 @@ class WashingMachineController extends Controller
}
}else{
$output.='<tr>'.
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu</td>'.
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu</td>'.
'<td></td>'.
'<td></td>'.
'<td></td>'.
@ -228,7 +228,7 @@ class WashingMachineController extends Controller
}
}else{
$output.='<tr>'.
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation i nu</td>'.
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu</td>'.
'<td></td>'.
'<td></td>'.
'<td></td>'.

7
skolehjem/public/css/webapp.css vendored
View File

@ -6675,11 +6675,7 @@ main {
header,
#menu {
padding: 1.25rem 1.75rem 0 1.75rem;
}
#menu {
padding-top: 4rem;
padding: 1.25rem 1.75rem 1.25rem 1.75rem;
}
#menu > a {
@ -7068,7 +7064,6 @@ main {
-webkit-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
overflow-x: hidden;
}
#snackbar.show {

7
skolehjem/public/css/webappdark.css vendored
View File

@ -6675,11 +6675,7 @@ main {
header,
#menu {
padding: 1.25rem 1.75rem 0 1.75rem;
}
#menu {
padding-top: 4rem;
padding: 1.25rem 1.75rem 1.25rem 1.75rem;
}
#menu > a {
@ -7068,7 +7064,6 @@ main {
-webkit-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
overflow-x: hidden;
}
#snackbar.show {

2
skolehjem/resources/js/navmenu/menu.js vendored
View File

@ -9,7 +9,7 @@ function toggleMenu(menu) {
menuElement.classList.remove("hide");
mainElement.classList.remove("d-none");
htmlElement.style.backgroundColor = 'rgb(255, 255, 255)';
logoElement.src = '/images/logos/Logo-normal.svg';
logoElement.src = '/images/logos/Logo-hvid.svg';
iconElement.classList.remove("fa-times");
iconElement.classList.add("fa-bars");
} else {

7
skolehjem/resources/sass/webapp/_default.scss vendored
View File

@ -34,11 +34,7 @@ and (max-width : 900px)
}
header, #menu {
padding: 1.25rem 1.75rem 0 1.75rem;
}
#menu {
padding-top: 4rem;
padding: 1.25rem 1.75rem 1.25rem 1.75rem;
}
#menu > a {
@ -527,7 +523,6 @@ $primary-color: $blue;
* {
word-break: break-word;
hyphens: auto;
overflow-x: hidden;
}
#snackbar.show {

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

@ -14,16 +14,16 @@
function setMain() {
var main = document.getElementsByTagName("main")[0];
var header = document.getElementsByTagName("header")[0];
main.style.minHeight = 'calc(100% - ' + header.clientHeight + 'px)';
main.style.minHeight = 'calc(100% - ' + (header.clientHeight+10) + 'px)';
}
</script>
</head>
<body onresize="setMain()" onload="setMain()">
<header class="row align-items-center" id="header">
<header class="row align-items-center" id="header" style="position: fixed; top: 0; width: calc(100% - 1.75rem - 1.75rem); background: #00788a; transition: top 0.3s;">
@if(request()->cookie("mode") == "dark")
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
@else
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
@endif
<button class="ml-auto" id="toggle">
<i id="icon" class="fas fa-bars" style="color: black;"></i>
@ -34,7 +34,6 @@
<img src="{{URL::asset('/images/icons/Home.svg')}}" alt="Home">
Home
</a>
<a href="{{ route("menu-plans.index") }}">
<img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
{{ __('msg.menuplan') }}
@ -47,11 +46,6 @@
<img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Reservationer">
{{ __('msg.reservationer') }}
</a>
{{-- MÅ IKKE SLETTES!!!! --}}
{{-- <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="Kontakter">
{{ __('msg.kontoret') }}
@ -108,7 +102,7 @@
logoElement.src = '/images/logos/Logo-hvid.svg';
iconElement.classList.remove("fa-times");
iconElement.classList.add("fa-bars");
headerElement.style.backgroundColor = '';
headerElement.style.position = 'fixed';
} else {
menuElement.classList.add("hide");
mainElement.classList.add("d-none");
@ -117,7 +111,8 @@
logoElement.src = '/images/logos/Logo-hvid.svg';
iconElement.classList.remove("fa-bars");
iconElement.classList.add("fa-times");
headerElement.style.backgroundColor = 'rgb(0, 120, 138)';
headerElement.style.position = 'relative';
headerElement.style.top = '0';
}
}
@ -128,5 +123,20 @@
</script>
@endif
@yield("scripts")
<script>
var prevScrollpos = window.pageYOffset;
window.onscroll = function() {
var currentScrollPos = window.pageYOffset;
if (prevScrollpos > currentScrollPos) {
document.getElementById("header").style.top = "0";
} else if(document.getElementById("header").style.position !== "relative" && window.scrollY > document.getElementById("header").clientHeight - 10) {
document.getElementById("header").style.top = "-" + document.getElementById("header").clientHeight + "px";
}
prevScrollpos = currentScrollPos;
}
document.getElementsByTagName("main")[0].style.paddingTop = (10+document.getElementById("header").clientHeight) + "px";
//document.getElementById("menu").style.paddingTop = document.getElementById("header").clientHeight + "px";
</script>
</body>
</html>