Merge branch 'issue-378' into 'develop'
fix: 🐛 error with routing on redis timeout
See merge request ldc-web/projets/le-gaulois!364
This commit is contained in:
commit
c4a2da57c8
4 changed files with 52 additions and 18 deletions
|
|
@ -36,6 +36,7 @@
|
|||
@import "./pages/search";
|
||||
@import "./pages/page-tdf";
|
||||
@import "./pages/page-golden-crush";
|
||||
@import "./pages/page-500";
|
||||
|
||||
// * PARTIALS
|
||||
@import "./partials/breeder-card";
|
||||
|
|
|
|||
10
resources/sass/fo/pages/page-500.scss
Normal file
10
resources/sass/fo/pages/page-500.scss
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
#page500 {
|
||||
.logo {
|
||||
margin-bottom: 60px;
|
||||
|
||||
img {
|
||||
width: 70%;
|
||||
max-width: 300px;
|
||||
}
|
||||
}
|
||||
}
|
||||
15
resources/views/fo/layout-page-500.blade.php
Normal file
15
resources/views/fo/layout-page-500.blade.php
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<!doctype html>
|
||||
<html dir="ltr" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||
|
||||
<head>
|
||||
@include('fo.layouts.head')
|
||||
</head>
|
||||
{{-- blade-formatter-disable --}}
|
||||
<body @hasSection('bodyClass') class="@yield('bodyClass')" @endif>
|
||||
<main @class([$__env->yieldContent('bg-color'), 'no-offset' => $__env->yieldContent('bg-offset')])>
|
||||
@yield('content')
|
||||
</main>
|
||||
</body>
|
||||
{{-- blade-formatter-enable --}}
|
||||
|
||||
</html>
|
||||
44
resources/views/vendor/errors/500.blade.php
vendored
44
resources/views/vendor/errors/500.blade.php
vendored
|
|
@ -1,4 +1,4 @@
|
|||
@extends('fo.layout')
|
||||
@extends('fo.layout-page-500')
|
||||
|
||||
@section('title', __('Erreur 500'))
|
||||
@section('description', __('Il semble qu\'il y ait des erreurs pour répondre à votre demande.'))
|
||||
|
|
@ -6,22 +6,30 @@
|
|||
@section('bodyClass', 'bg-white-wood')
|
||||
|
||||
@section('content')
|
||||
<div class="container my-5 py-5">
|
||||
<div class="row">
|
||||
<div class="col text-center">
|
||||
<h1>{{ str(__('Erreur serveur !'))->upper() }}</h1>
|
||||
<h4 class="h4 my-4">
|
||||
{{ str(
|
||||
__('erreur :number, :message', [
|
||||
'number' => '500',
|
||||
'message' => 'le serveur a rencontré une situation inattendue qui l\'a empêché de répondre à la demande.',
|
||||
]),
|
||||
)->upper() }}
|
||||
</h4>
|
||||
<a class="btn btn-secondary" href="{{ route('fo.home.show') }}" title="{{ __('Accéder à la page d\'accueil') }}">
|
||||
{{ str(__('retour à la page d\'accueil'))->upper() }}
|
||||
</a>
|
||||
<div class="container my-5 py-5" id="page500">
|
||||
<div class="container-fluid">
|
||||
{{-- TOP LOGO --}}
|
||||
<div class="row">
|
||||
<div class="col col-logo text-center w-50">
|
||||
<div class="logo">
|
||||
<img src="{{ Vite::asset('resources/assets/images/legaulois-logo.png') }}"
|
||||
title="{{ __(':appname, Volaille 100% Française', ['appname' => config('app.name')]) }}"
|
||||
alt="{{ config('app.name') }}" role="img">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col text-center">
|
||||
<h1>{{ str(__('Erreur serveur !'))->upper() }}</h1>
|
||||
<h4 class="h4 my-4">
|
||||
{{ str(
|
||||
__('erreur :number, :message', [
|
||||
'number' => '500',
|
||||
'message' => 'le serveur a rencontré une situation inattendue qui l\'a empêché de répondre à la demande.',
|
||||
]),
|
||||
)->upper() }}
|
||||
</h4>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@endsection
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue