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

v1.4.8c Add new icons, added a new tab in the navbar, added manifest to git

This commit is contained in:
victor 2020-10-23 08:43:42 +02:00
parent 0d84fcd1ca
commit 077a6c57ea
7 changed files with 104 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/encodings.xml
View File

@ -9,6 +9,7 @@
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/phone.svg" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/print-hvid.svg" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/questionmark.svg" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/statistics.svg" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/users-hvid.svg" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/skolehjem/public/images/icons/wash.svg" charset="UTF-8" />
</component>

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

@ -29,7 +29,8 @@ class RolesController extends Controller
*/
public function index(Request $request)
{
$roles = Role::query()->where("id", "!=", 1)->where("id", "!=", 2)->get();
//$roles = Role::query()->where("id", "!=", 1)->where("id", "!=", 2)->get(); Add this bitch if the users isn't allowed to se the rolls with id 1 and 2
$roles = Role::query()->get();
return Response::detect("roles.index", [ "roles" => $roles]);
}

53
skolehjem/public/images/icons/statistics.svg Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 478 478" style="enable-background:new 0 0 478 478;" xml:space="preserve">
<g>
<g>
<path fill="#fff" d="M119.5,187.75H17.1c-9.4,0-17,7.6-17.1,17.1v256c0,9.5,7.7,17.1,17.1,17.1h102.4c9.5,0,17.1-7.7,17.1-17.1v-256
C136.6,195.35,128.9,187.75,119.5,187.75z"/>
</g>
</g>
<g>
<g>
<path fill="#fff" d="M290.2,0.05H187.8c-9.4,0-17.1,7.6-17.1,17v443.8c0,9.5,7.7,17.1,17.1,17.1h102.4c9.5,0,17.1-7.7,17.1-17.1V17.15
C307.3,7.65,299.6,0.05,290.2,0.05z"/>
</g>
</g>
<g>
<g>
<path fill="#fff" d="M460.9,136.55H358.5c-9.5,0-17.1,7.6-17.1,17.1v307.2c0,9.5,7.7,17.1,17.1,17.1h102.4c9.5,0,17.1-7.7,17.1-17.1v-307.2
C478,144.15,470.3,136.55,460.9,136.55z"/>
</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

19
skolehjem/public/manifest.json Normal file
View File

@ -0,0 +1,19 @@
{
"short_name": "Ekapp",
"name": "Syddansk Erhverskollegie App",
"description": "Informations app about Erhverskollegiet",
"icons": [
{
"src": "icon/appIcon.svg",
"sizes": "192x192"
}
],
"lang": "da-DK",
"dir": "ltr",
"orientation": "portrait-primary",
"start_url": "https://ekapp.sde.dk",
"background_color": "#00788a",
"display": "standalone",
"scope": "/",
"theme_color": "#00788a"
}

10
skolehjem/resources/views/admin/guides/create.blade.php
View File

@ -10,6 +10,7 @@
@endsection
@section("content")
<style>
.toggle__label::before, .toggle__label::after {
border-color: black;
@ -150,7 +151,14 @@
})
$(document).ready(function (){
change();
})
function change() {
$('#delete_event').hide();
if ($('#isNews').is(":checked"))
{
$('#delete_event').show(400);
@ -158,7 +166,7 @@
$('#delete_event').hide(400);
}
}
change();
</script>

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

@ -115,6 +115,11 @@
.tooltip:hover .tooltiptext {
/*visibility: visible;*/
}
.letterSpaceingNavBar{
letter-spacing: 1.2px;
}
</style>
@yield("header")
<main class="row">
@ -126,53 +131,57 @@
</div>
</div>
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "root.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('root.index') }}" class="text-white"><img src="{{asset("/images/icons/statistics.svg")}}" class="fa"><span style="margin-left: 4px;">Statistik</span></a></h3><span class="tooltiptext">Statistik</span></div>
</div>
@if(auth()->user()->can('user.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "users.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "users.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('users.index') }}" class="text-white"><img src="{{asset("/images/icons/users-hvid.svg")}}" class="fa"><span style="margin-left: 4px;">Brugere</span></a></h3><span class="tooltiptext">Brugere</span></div>
</div>
@endif
@if(auth()->user()->can('roles.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "roles.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "roles.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('roles.index') }}" class="text-white"><img src="{{asset("/images/icons/role.svg")}}" class="fa"><span style="margin-left: 4px;">Roller</span></a></h3><span class="tooltiptext">Roller</span></div>
</div>
@endif
@if(auth()->user()->can('news.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "news.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "news.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('news.index') }}" class="text-white"><img src="{{asset("/images/icons/news.svg")}}" class="fa"><span style="margin-left: 4px;">Nyheder</span></a></h3><span class="tooltiptext">Nyheder</span></div>
</div>
@endif
@if(auth()->user()->can('menuplan.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "menu-plans.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "menu-plans.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('menu-plans.index') }}" class="text-white"><img src="{{asset("/images/icons/Menuplan.svg")}}" class="fa"><span style="margin-left: 4px;">Menuplan</span></a></h3><span class="tooltiptext">Menuplan</span></div>
</div>
@endif
@if(auth()->user()->can('event.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "events.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "events.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('events.index') }}" class="text-white"><img src="{{asset("/images/icons/Aktiviteter.svg")}}" class="fa"><span style="margin-left: 4px;">Aktiviteter</span></a></h3><span class="tooltiptext">Aktiviteter</span></div>
</div>
@endif
@if(auth()->user()->can('washing.machine.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-machines.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-machines.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('washing-machines.index') }}" class="text-white"><img src="{{asset("/images/icons/wash.svg")}}" class="fa"><span style="margin-left: 4px;">Vaskemaskiner</span></a></h3><span class="tooltiptext">Vaskemaskiner</span></div>
</div>
@endif
@if(auth()->user()->can('washing.machine.reservation.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-reservations.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-reservations.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('washing-reservations.index') }}" class="text-white"><img src="{{asset("/images/icons/wash_res.svg")}}" class="fa"><span style="margin-left: 4px;">Reservationer</span></a></h3><span class="tooltiptext">Reservationer</span></div>
</div>
@endif
@if(auth()->user()->can('contact.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "contacts.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "contacts.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('contacts.index') }}" class="text-white"><img src="{{asset("/images/icons/phone.svg")}}" class="fa"><span style="margin-left: 4px;">Kontakter</span></a></h3><span class="tooltiptext">Kontakter</span></div>
</div>
@endif
@if(auth()->user()->can('guides.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "guides.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "guides.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('guides.index') }}" class="text-white"><img src="{{asset("/images/icons/Vejledninger.svg")}}" class="fa"><span style="margin-left: 4px;">Vejledning</span></a></h3><span class="tooltiptext">Vejledning</span></div>
</div>
@endif
@if(auth()->user()->can('feedback.show'))
<div class="segment @if(\Illuminate\Support\Facades\Request::route()->getName() == "feedbacks.index") active @endif">
<div class="segment letterSpaceingNavBar @if(\Illuminate\Support\Facades\Request::route()->getName() == "feedbacks.index") active @endif">
<div class="tooltip"><h3 class="text-white"><a href="{{ route('feedbacks.index') }}" class="text-white"><img src="{{asset("/images/icons/feedback.svg")}}" class="fa"><span style="margin-left: 4px;">Feedback</span></a></h3><span class="tooltiptext">Feedback</span></div>
</div>
@endif

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

@ -61,6 +61,7 @@
);
});
function change() {
if ($('#isNews').is(":checked"))
{