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

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

Browse Source 
 Conflicts:
	skolehjem/resources/views/admin/layout/base.blade.php
	skolehjem/resources/views/app/layout/base.blade.php
	skolehjem/routes/web.php
This commit is contained in:
Sebastian Davaris
2020-06-29 10:15:56 +02:00
parent c823bdd963 d4abbfc189
commit 03c609175d
9 changed files with 42 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/app/layout/base.blade.php
+4
View File
@@ -45,6 +45,10 @@
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
</a>
<a href="#">
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
Konto
</a>
</div>
@yield("content")
skolehjem/resources/views/app/root/index.blade.php
+2 -2
View File
@@ -21,10 +21,10 @@
{{--@extends("app.washing-reservations.index")--}}
{{--Menuplan--}}
{{--@extends("app.menuplans.index")--}}
{{----}}@extends("app.menuplans.index")
{{--Contact--}}
{{----}}@extends("app.contact.index")
{{--@extends("app.contact.index")--}}
{{----}}
{{------Admin Panel
skolehjem/resources/views/app/users/index.blade.php
+18 -16
View File
@@ -1,21 +1,23 @@
@extends('app.layout.base')
@section('content')
<div class="d-flex col block-container mt-2">
<a href="" class="block text-center mb-1">Menu</a>
<a href="" class="block text-center mb-1">Aktiviteter</a>
<a href="" class="block text-center mb-1">Kalender</a>
</div>
<div class="links row">
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
</a>
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
</a>
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
</a>
<main>
<div class="d-flex col block-container mt-2">
<a href="" class="block text-center mb-1">Menu</a>
<a href="" class="block text-center mb-1">Aktiviteter</a>
<a href="" class="block text-center mb-1">Kalender</a>
</div>
<div class="links row">
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
</a>
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
</a>
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
</a>
</div>
</div>
</main>
@endsection