From 7cb1fe6ed6d21371b2772917e252913d773fe949 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 24 Jun 2020 09:25:59 +0200 Subject: [PATCH] Moved files --- .../booking => app/bookings}/index.blade.php | 4 +- .../resources/views/app/layout/base.blade.php | 42 ++++++++++++++-- .../{webapp => app}/layout/header.blade.php | 0 .../menuplans}/index.blade.php | 4 +- .../{webapp => app}/users/index.blade.php | 2 +- .../{webapp => app}/users/login.blade.php | 2 +- .../{webapp => app}/users/register.blade.php | 2 +- .../vagttelefons}/index.blade.php | 4 +- skolehjem/resources/views/index.blade.php | 5 +- .../views/webapp/layout/base.blade.php | 50 ------------------- 10 files changed, 51 insertions(+), 64 deletions(-) rename skolehjem/resources/views/{webapp/booking => app/bookings}/index.blade.php (99%) rename skolehjem/resources/views/{webapp => app}/layout/header.blade.php (100%) rename skolehjem/resources/views/{webapp/menuplan => app/menuplans}/index.blade.php (97%) rename skolehjem/resources/views/{webapp => app}/users/index.blade.php (51%) rename skolehjem/resources/views/{webapp => app}/users/login.blade.php (97%) rename skolehjem/resources/views/{webapp => app}/users/register.blade.php (96%) rename skolehjem/resources/views/{webapp/vagttelefon => app/vagttelefons}/index.blade.php (96%) delete mode 100644 skolehjem/resources/views/webapp/layout/base.blade.php diff --git a/skolehjem/resources/views/webapp/booking/index.blade.php b/skolehjem/resources/views/app/bookings/index.blade.php similarity index 99% rename from skolehjem/resources/views/webapp/booking/index.blade.php rename to skolehjem/resources/views/app/bookings/index.blade.php index 608651d..42b11be 100644 --- a/skolehjem/resources/views/webapp/booking/index.blade.php +++ b/skolehjem/resources/views/app/bookings/index.blade.php @@ -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 diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index eec0e7e..3fd9f7e 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -3,14 +3,48 @@ @yield("title") - +{{-- --}} +{{-- @yield("header")--}} +
+ + +
+ - @yield("content") +@yield("content") - - @yield("scripts") + +@yield("scripts") diff --git a/skolehjem/resources/views/webapp/layout/header.blade.php b/skolehjem/resources/views/app/layout/header.blade.php similarity index 100% rename from skolehjem/resources/views/webapp/layout/header.blade.php rename to skolehjem/resources/views/app/layout/header.blade.php diff --git a/skolehjem/resources/views/webapp/menuplan/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php similarity index 97% rename from skolehjem/resources/views/webapp/menuplan/index.blade.php rename to skolehjem/resources/views/app/menuplans/index.blade.php index 4c63dc6..cbd4249 100644 --- a/skolehjem/resources/views/webapp/menuplan/index.blade.php +++ b/skolehjem/resources/views/app/menuplans/index.blade.php @@ -1,5 +1,5 @@ -@extends("webapp.layout.base") -@extends("webapp.layout.header") +@extends("app.layout.base") +@extends("app.layout.header") @section("title") Menuplan @endsection diff --git a/skolehjem/resources/views/webapp/users/index.blade.php b/skolehjem/resources/views/app/users/index.blade.php similarity index 51% rename from skolehjem/resources/views/webapp/users/index.blade.php rename to skolehjem/resources/views/app/users/index.blade.php index eff75b4..2f2ba6c 100644 --- a/skolehjem/resources/views/webapp/users/index.blade.php +++ b/skolehjem/resources/views/app/users/index.blade.php @@ -1,4 +1,4 @@ -@extends('webapp.layout.base') +@extends('app.layout.base') @section('content') @endsection diff --git a/skolehjem/resources/views/webapp/users/login.blade.php b/skolehjem/resources/views/app/users/login.blade.php similarity index 97% rename from skolehjem/resources/views/webapp/users/login.blade.php rename to skolehjem/resources/views/app/users/login.blade.php index e05d82c..5d9ade1 100644 --- a/skolehjem/resources/views/webapp/users/login.blade.php +++ b/skolehjem/resources/views/app/users/login.blade.php @@ -1,4 +1,4 @@ -@extends("webapp.layout.base") +@extends("app.layout.base") @section("title") Login diff --git a/skolehjem/resources/views/webapp/users/register.blade.php b/skolehjem/resources/views/app/users/register.blade.php similarity index 96% rename from skolehjem/resources/views/webapp/users/register.blade.php rename to skolehjem/resources/views/app/users/register.blade.php index 5e07ceb..ace4023 100644 --- a/skolehjem/resources/views/webapp/users/register.blade.php +++ b/skolehjem/resources/views/app/users/register.blade.php @@ -1,4 +1,4 @@ -@extends("webapp.layout.base") +@extends("app.layout.base") @section("title") Register diff --git a/skolehjem/resources/views/webapp/vagttelefon/index.blade.php b/skolehjem/resources/views/app/vagttelefons/index.blade.php similarity index 96% rename from skolehjem/resources/views/webapp/vagttelefon/index.blade.php rename to skolehjem/resources/views/app/vagttelefons/index.blade.php index a1e8de2..0aa2c05 100644 --- a/skolehjem/resources/views/webapp/vagttelefon/index.blade.php +++ b/skolehjem/resources/views/app/vagttelefons/index.blade.php @@ -1,5 +1,5 @@ -@extends("webapp.layout.base") -@extends("webapp.layout.header") +@extends("app.layout.base") +@extends("app.layout.header") @section("title") Menuplan @endsection diff --git a/skolehjem/resources/views/index.blade.php b/skolehjem/resources/views/index.blade.php index 0c0c62a..b683be6 100644 --- a/skolehjem/resources/views/index.blade.php +++ b/skolehjem/resources/views/index.blade.php @@ -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") diff --git a/skolehjem/resources/views/webapp/layout/base.blade.php b/skolehjem/resources/views/webapp/layout/base.blade.php deleted file mode 100644 index 3fd9f7e..0000000 --- a/skolehjem/resources/views/webapp/layout/base.blade.php +++ /dev/null @@ -1,50 +0,0 @@ - - - - @yield("title") - -{{-- --}} - - - -{{-- @yield("header")--}} -
- - -
- - -@yield("content") - - -@yield("scripts") - -