Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix edge cases to ensure /setup loads

Browse Source
This commit is contained in:
Hillel Coren 2024-07-11 14:29:33 +03:00
parent a10e65d382
commit e549b34f6a
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/portal/ninja2020/layout/clean_setup.blade.php → resources/views/setup/clean_setup.blade.php
View File

@ -42,13 +42,7 @@
@endif @endif
<!-- Title --> <!-- Title -->
@auth('contact') <title>@yield('meta_title', '') — {{ config('app.name') }}</title>
<title>@yield('meta_title', '') — {{ auth()->guard('contact')->user()->user->account->isPaid() ? auth()->guard('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
@endauth
@guest
<title>@yield('meta_title', '') — {{ config('app.name') }}</title>
@endguest
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
@ -86,10 +80,6 @@
<link href="{{ str_replace("setup", "", Request::url())}}css/app.css" rel="stylesheet"> <link href="{{ str_replace("setup", "", Request::url())}}css/app.css" rel="stylesheet">
@endif @endif
@if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid())
{{-- <link href="{{ mix('favicon.png') }}" rel="shortcut icon" type="image/png"> --}}
@endif
<link rel="canonical" href="{{ config('ninja.app_url') }}/{{ request()->path() }}"/> <link rel="canonical" href="{{ config('ninja.app_url') }}/{{ request()->path() }}"/>
{{-- Feel free to push anything to header using @push('header') --}} {{-- Feel free to push anything to header using @push('header') --}}
@ -102,8 +92,6 @@
<link rel="stylesheet" type="text/css" href="{{ asset('vendor/cookieconsent@3/cookieconsent.min.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ asset('vendor/cookieconsent@3/cookieconsent.min.css') }}" />
</head> </head>
@include('portal.ninja2020.components.primary-color')
<body class="antialiased {{ $custom_body_class ?? '' }}"> <body class="antialiased {{ $custom_body_class ?? '' }}">
@if(session()->has('message')) @if(session()->has('message'))
<div class="py-1 text-sm text-center text-white bg-primary disposable-alert"> <div class="py-1 text-sm text-center text-white bg-primary disposable-alert">

2
resources/views/setup/index.blade.php
View File

@ -1,4 +1,4 @@
@extends('portal.ninja2020.layout.clean_setup') @extends('setup.clean_setup')
@section('meta_title', ctrans('texts.setup')) @section('meta_title', ctrans('texts.setup'))
@section('body') @section('body')