From e549b34f6a5fdf3b47e994b484c1b8762d10b491 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 11 Jul 2024 14:29:33 +0300 Subject: [PATCH] Fix edge cases to ensure /setup loads --- .../layout => setup}/clean_setup.blade.php | 14 +------------- resources/views/setup/index.blade.php | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) rename resources/views/{portal/ninja2020/layout => setup}/clean_setup.blade.php (89%) diff --git a/resources/views/portal/ninja2020/layout/clean_setup.blade.php b/resources/views/setup/clean_setup.blade.php similarity index 89% rename from resources/views/portal/ninja2020/layout/clean_setup.blade.php rename to resources/views/setup/clean_setup.blade.php index 62d64724417a..d1bd3dfd792a 100644 --- a/resources/views/portal/ninja2020/layout/clean_setup.blade.php +++ b/resources/views/setup/clean_setup.blade.php @@ -42,13 +42,7 @@ @endif - @auth('contact') - @yield('meta_title', '') — {{ auth()->guard('contact')->user()->user->account->isPaid() ? auth()->guard('contact')->user()->company->present()->name() : 'Invoice Ninja' }} - @endauth - - @guest - @yield('meta_title', '') — {{ config('app.name') }} - @endguest + @yield('meta_title', '') — {{ config('app.name') }} @@ -86,10 +80,6 @@ @endif - @if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid()) - {{-- --}} - @endif - {{-- Feel free to push anything to header using @push('header') --}} @@ -102,8 +92,6 @@ - @include('portal.ninja2020.components.primary-color') - @if(session()->has('message'))
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php index cc80a848317c..c77d84ef06d1 100644 --- a/resources/views/setup/index.blade.php +++ b/resources/views/setup/index.blade.php @@ -1,4 +1,4 @@ -@extends('portal.ninja2020.layout.clean_setup') +@extends('setup.clean_setup') @section('meta_title', ctrans('texts.setup')) @section('body')