From 48b90ed22e6604ca869de054b499ac1bd4a4d6a2 Mon Sep 17 00:00:00 2001 From: horus Date: Thu, 7 Jan 2021 03:23:42 +0100 Subject: Upgrade Laravel from 5.6 to 8. Switch to subdomain instead of subfolder. --- resources/views/index.blade.php | 6 ++--- resources/views/layouts/base.blade.php | 26 +++++----------------- resources/views/listoffer.blade.php | 8 +++---- resources/views/offers.blade.php | 2 +- resources/views/search.blade.php | 6 ++--- resources/views/snippets/breadcrumbs.blade.php | 8 +++---- resources/views/snippets/footer.blade.php | 16 ++++++------- resources/views/snippets/navbar.blade.php | 4 ++-- .../views/snippets/spirittypesbuttons.blade.php | 2 +- 9 files changed, 32 insertions(+), 46 deletions(-) (limited to 'resources/views') diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 8dfd47f..c542406 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -70,19 +70,19 @@ Angebote

{{ $offer->procent}} %

- +

- {{ ucfirst($offer->spirit_type) }} + {{ ucfirst($offer->spirit_type) }}

- +

Hier geht es zu {{ $offer->angebotsname }}

{{ $offer->linktext }}

 diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 406e52a..e8cbacb 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -7,28 +7,17 @@ + @yield('header') | {{ env("APP_BRANDING") }} - - - - - - - - - - - - + + - - - + - @yield('feed') @yield('css') @@ -82,10 +70,8 @@ if ( "" != env('PIWIK_URL') && "" != env('PIWIK_ID') ) { @include('snippets.footer') - - - - + + @yield('scripts') diff --git a/resources/views/listoffer.blade.php b/resources/views/listoffer.blade.php index 906c83a..05bdb9f 100644 --- a/resources/views/listoffer.blade.php +++ b/resources/views/listoffer.blade.php @@ -13,8 +13,8 @@ appends(Input::except('page'))->links('paginate') }} + {{ $data->appends(Request::except('page'))->links('paginate') }} @if ( !$data->count() ) @@ -56,7 +56,7 @@ @include('offers') - {{ $data->appends(Input::except('page'))->links('paginate') }} + {{ $data->appends(Request::except('page'))->links('paginate') }} @endif diff --git a/resources/views/offers.blade.php b/resources/views/offers.blade.php index 9d806c9..dbd1970 100644 --- a/resources/views/offers.blade.php +++ b/resources/views/offers.blade.php @@ -17,7 +17,7 @@

- {{ ucwords($offer->spirit_type) }} {{ $offer->shop }} + {{ ucwords($offer->spirit_type) }} {{ $offer->shop }}

diff --git a/resources/views/search.blade.php b/resources/views/search.blade.php index 03047ea..231dd16 100644 --- a/resources/views/search.blade.php +++ b/resources/views/search.blade.php @@ -24,7 +24,7 @@ Finde den besten Deal Leider hat Ihre Suche nach {{ ucwords($search_phrase) }} keine Ergebnisse ergeben. Bitte versuchen sie es erneut mit einem anderen Begriff.

-
+
@@ -56,11 +56,11 @@ Finde den besten Deal @include('snippets.spirittypesbuttons') - {{ $data->appends(Input::except('page'))->links('paginate') }} + {{ $data->appends(Request::except('page'))->links('paginate') }} @include('offers') - {{ $data->appends(Input::except('page'))->links('paginate') }} + {{ $data->appends(Request::except('page'))->links('paginate') }} diff --git a/resources/views/snippets/breadcrumbs.blade.php b/resources/views/snippets/breadcrumbs.blade.php index c338729..19d18ee 100644 --- a/resources/views/snippets/breadcrumbs.blade.php +++ b/resources/views/snippets/breadcrumbs.blade.php @@ -21,20 +21,20 @@
  • - + Angebote
    • -@if ( 1 == Input::get('page') || "" == Input::get('page') ) +@if ( 1 == Request::get('page') || "" == Request::get('page') )
  • {{ ucwords($breadcrumb) }}
    • -@elseif ( 1 < Input::get('page') ) +@elseif ( 1 < Request::get('page') )
  • @@ -45,7 +45,7 @@
  • - Seite {{ Input::get('page') }} + Seite {{ Request::get('page') }}
    • diff --git a/resources/views/snippets/footer.blade.php b/resources/views/snippets/footer.blade.php index a870301..397626b 100644 --- a/resources/views/snippets/footer.blade.php +++ b/resources/views/snippets/footer.blade.php @@ -9,16 +9,16 @@
    @@ -26,13 +26,13 @@

    Social Media

    • - Pinterest + Pinterest
    • - RSS Feed + RSS Feed
    diff --git a/resources/views/snippets/navbar.blade.php b/resources/views/snippets/navbar.blade.php index d9428bf..5278103 100644 --- a/resources/views/snippets/navbar.blade.php +++ b/resources/views/snippets/navbar.blade.php @@ -31,7 +31,7 @@ -
  • Sonderangebote
    • +
  • Sonderangebote
  • Fuselfotos
  • Über mich
    • @@ -47,7 +47,7 @@
    - +
    - {{ $o->spirit_type }} + {{ $o->spirit_type }} -- cgit v1.2.3