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:
Sebastian Davaris 2020-06-24 10:15:49 +02:00
parent 9690a30437 d4d0615a4e
commit e8d44d7852
10 changed files with 51 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skolehjem/resources/views/webapp/booking/index.blade.php → skolehjem/resources/views/app/bookings/index.blade.php
View File

@ -1,5 +1,5 @@
@extends("webapp.layout.base")
@extends("webapp.layout.header")
@extends("app.layout.base")
@extends("app.layout.header")
@section("title")
Booking Liste
@endsection

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

@ -3,14 +3,48 @@
<head>
<title>@yield("title")</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
{{-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">--}}
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
</head>
<body>
{{-- @yield("header")--}}
<header class="row align-items-center">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
<button class="ml-auto" onclick="toggleMenu('menu')" id="toggle">
{{-- <img src="{{URL::asset('/images/icons/icon.svg')}}" id="menuIcon" alt="-">--}}
<i class="fas fa-bars"></i>
</button>
</header>
<div class="d-none bg-sde-blue col" id="menu">
<a href="">
<img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
Menuplan
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter">
Aktiviteter
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Vaske booking liste">
Vaske booking liste
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
Galleri
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
Kontoret
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
</a>
</div>
@yield("content")
@yield("content")
<script src="{{ mix("/js/app.js") }}"></script>
@yield("scripts")
<script src="{{ mix("/js/app.js") }}"></script>
@yield("scripts")
</body>
</html>

0
skolehjem/resources/views/webapp/layout/header.blade.php → skolehjem/resources/views/app/layout/header.blade.php
View File

4
skolehjem/resources/views/webapp/menuplan/index.blade.php → skolehjem/resources/views/app/menuplans/index.blade.php
View File

@ -1,5 +1,5 @@
@extends("webapp.layout.base")
@extends("webapp.layout.header")
@extends("app.layout.base")
@extends("app.layout.header")
@section("title")
Menuplan
@endsection

2
skolehjem/resources/views/webapp/users/index.blade.php → skolehjem/resources/views/app/users/index.blade.php
View File

@ -1,4 +1,4 @@
@extends('webapp.layout.base')
@extends('app.layout.base')
@section('content')
@endsection

2
skolehjem/resources/views/webapp/users/login.blade.php → skolehjem/resources/views/app/users/login.blade.php
View File

@ -1,4 +1,4 @@
@extends("webapp.layout.base")
@extends("app.layout.base")
@section("title")
Login

2
skolehjem/resources/views/webapp/users/register.blade.php → skolehjem/resources/views/app/users/register.blade.php
View File

@ -1,4 +1,4 @@
@extends("webapp.layout.base")
@extends("app.layout.base")
@section("title")
Register

4
skolehjem/resources/views/webapp/vagttelefon/index.blade.php → skolehjem/resources/views/app/vagttelefons/index.blade.php
View File

@ -1,5 +1,5 @@
@extends("webapp.layout.base")
@extends("webapp.layout.header")
@extends("app.layout.base")
@extends("app.layout.header")
@section("title")
Menuplan
@endsection

5
skolehjem/resources/views/index.blade.php
View File

@ -13,7 +13,7 @@
{{--@extends("webapp.vagttelefon.index")--}}
{{--Booking Liste--}}
{{----}}@extends("webapp.booking.index")
{{--@extends("webapp.booking.index")--}}
{{----}}
{{------Admin Panel
@ -39,3 +39,6 @@
{{--Update Menuplan--}}
{{--@extends("admin.menuplans.update")--}}
{{--Create booking--}}
{{----}}@extends("admin.menuplans.show")

50
skolehjem/resources/views/webapp/layout/base.blade.php
View File

@ -1,50 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>@yield("title")</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
{{-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">--}}
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
</head>
<body>
{{-- @yield("header")--}}
<header class="row align-items-center">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
<button class="ml-auto" onclick="toggleMenu('menu')" id="toggle">
{{-- <img src="{{URL::asset('/images/icons/icon.svg')}}" id="menuIcon" alt="-">--}}
<i class="fas fa-bars"></i>
</button>
</header>
<div class="d-none bg-sde-blue col" id="menu">
<a href="">
<img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
Menuplan
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter">
Aktiviteter
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Vaske booking liste">
Vaske booking liste
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
Galleri
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
Kontoret
</a>
<a href="">
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
</a>
</div>
@yield("content")
<script src="{{ mix("/js/app.js") }}"></script>
@yield("scripts")
</body>
</html>