Merge branch 'develop' into trunk

This commit is contained in:
Vincent BRIDIER 2023-06-05 11:01:34 +02:00
commit 61c00d0bb0
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
5 changed files with 65 additions and 10 deletions

View file

@ -57,7 +57,9 @@ return [
* ]
*
*/
'queryConditions' => [],
'queryConditions' => [
'status' => true,
],
/**
* The default route frequency to use with sitemap generator

View file

@ -0,0 +1,37 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
@include('fo.layouts.head')
<meta name="p:domain_verify" content="5f89c5d6c41555aa17ff8d26cc6661f2" />
</head>
<body class="relative w-full min-h-screen font-roboto bg-hellgrau text-p lg:text-p-lg mt-[87px] scroll-smooth">
<a name="top" id="top"></a>
@include('fo.layouts.header')
@yield('content')
@include('fo.layouts.footer')
@include('fo.layouts.navigation')
@include('fo.vendor.ldcweb-cookies')
@stack('scripts-constants')
@include('modules.script-constants')
@stack('scripts')
@vite(['resources/ts/fo.ts'])
<script nonce="{{ $nonce }}">
let mobileMenuOpen = false;
function toggleMobileMenuOpen() {
mobileMenuOpen = !mobileMenuOpen;
const navMenu = document.getElementById('navigationModule');
navMenu.classList.toggle('hidden');
navMenu.classList.toggle('flex');
}
</script>
</body>
</html>

View file

@ -27,8 +27,10 @@
</ul>
</li>
<li class="mr-6 mb-4 relative">
@php $firstConcept = \App\Models\Concept::query()->firstOrFail(); @endphp
@php $firstConcept = \App\Models\Concept::query()->first(); @endphp
@if($firstConcept)
<a href="{{ route('concept.show', ['concept' => $firstConcept]) }}">{{ __('Our concept') }}</a>
@endif
<ul class="xinvisible xgroup-hover:visible pl-8 lg:pl-0 lg:absolute lg:left-0 lg:right-auto w-max pt-2">
@foreach ($conceptListGlobal as $concept)
<li class="mt-2">

View file

@ -19,8 +19,10 @@
<a href="">{{ __('Home') }}</a>
</li>
<li class="mb-2 block leading-[180%] relative">
@php $concept = \App\Models\Concept::query()->firstOrFail(); @endphp
@php $concept = \App\Models\Concept::query()->first(); @endphp
@if($concept)
<a href="{{ route('concept.show', ['concept' => $concept]) }}">{{ __('Our concept') }}</a>
@endif
<ul class="pl-8 sm:absolute sm:top-0 sm:left-full sm:pl-24 w-max">
@foreach ($conceptListGlobal as $concept)
<li class="mb-2 block leading-[180%]">

View file

@ -1,14 +1,26 @@
@extends('fo.layout-frame')
@php $nonce = $nonce ?? uniqid(); @endphp
@extends('fo.layout-minimal')
@section('title', __('Not Found'))
@section('description', __('Not Found'))
@section('code', '404')
@section('message', __('Not Found'))
@section('submessage', __('We could not find the page'))
@section('image')
<img src="{{ Vite::asset('resources/assets/images/Icons/404-grafik.svg') }}" class="inline max-w-sm w-full px-4" alt="{{ config('app.name') }}">
@endsection
@section('content')
<div class="mx-auto max-w-7xl py-6 px-4 sm:px-8 mb-24 mt-32 text-center pt-16 pb-16">
<img class="inline max-w-sm w-full px-4" src="{{ Vite::asset('resources/assets/images/Icons/404-grafik.svg') }}">
<h1 class="font-scarletwood text-hellgruen text-[100px] leading-[100px] mt-8">404</h1>
<p class="font-scarletwood text-hellgruen">{{ __('We could not find the page') }}</p>
<a href="/" class="button brown inline-flex items-center px-4 my-2 mt-12 mr-6 text-sm text-white">
<span>{{ __('Back to home page') }}</span>
@yield('image')
<h1 class="font-scarletwood text-hellgruen text-[100px] leading-[100px] mt-8">@yield('code', __('Oh no'))</h1>
<p class="font-scarletwood text-hellgruen">@yield('message')</p>
<p class="font-scarletwood text-hellgruen">@yield('submessage')</p>
<a href="{{ app('router')->has('home') ? route('home') : url('/') }}" class="button brown inline-flex items-center px-4 my-2 mt-12 mr-6 text-sm text-white">
<span>{{ __('Go to page :page', [
'page' => __('home')
]) }}</span>
</a>
</div>
@endsection