Merge branch 'trunk'

This commit is contained in:
Vincent BRIDIER 2024-07-26 17:20:23 +02:00
commit d3aec78d8d
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
4 changed files with 79 additions and 67 deletions

View file

@ -3,7 +3,7 @@
return [
'classes' => [
'advice' => 'Astuces / Recettes',
'home' => 'Accueil',
'home' => 'Tableau de bord',
'news' => 'Actualités',
'newscategories' => 'Catégories d\'actualités',
'ranges' => 'Gammes',

View file

@ -6,6 +6,22 @@
{{ __('models.classes.home') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.seo.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.seo.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Show the SEO informations') }}">
{{ __('SEO') }}
</a>
</li>
@can('viewAny', \App\Models\StaticPage::class)
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.static_pages.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.static_pages.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => trans_choice('models.classes.static_page', '*')]) }}">
{{ Str::title(trans_choice('models.classes.static_page', '*')) }}
</a>
</li>
@endcan
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.slides.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.slides.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
@ -13,28 +29,32 @@
{{ __('models.classes.slides') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.vips.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.vips.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', [
'model' => Str::singular(trans_choice('models.classes.vips', 2)),
]) }}">
{{ trans_choice('models.classes.vips', 2) }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.ranges.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.ranges.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => __('models.classes.ranges')]) }}">
{{ __('models.classes.ranges') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.products.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.products.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => __('models.classes.products')]) }}">
{{ __('models.classes.products') }}
</a>
<li class="nav-item dropdown">
<button class="btn nav-link dropdown-toggle d-flex align-items-center flex-row" data-bs-toggle="dropdown" type="button">
<div class="d-flex flex-column align-items-start align-items-lg-end me-1">
<span class="text-dark">{{ __('models.classes.products') }}</span>
</div>
</button>
<div class="dropdown-menu dropdown-menu-end m-0 mt-2 p-0 text-center" aria-labelledby="navbarDropdown">
<a class="nav-link text-dark @if (request()->routeIs('bo.ranges.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.ranges.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => __('models.classes.ranges')]) }}">
{{ __('models.classes.ranges') }}
</a>
<a class="nav-link text-dark @if (request()->routeIs('bo.products.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.products.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => __('models.classes.products')]) }}">
{{ __('models.classes.products') }}
</a>
<a class="nav-link text-dark @if (request()->routeIs('bo.vips.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.vips.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', [
'model' => Str::singular(trans_choice('models.classes.vips', 2)),
]) }}">
{{ trans_choice('models.classes.vips', 2) }}
</a>
</div>
</li>
<li>
<a class="nav-link text-dark @if (request()->routeIs('bo.advice.*') && $currentType->value == \App\Enums\Advices\AdviceTypeEnum::recipes->value()) fw-bold @endif" data-bs-toggle="tooltip"
@ -50,35 +70,25 @@
{{ __('models.classes.tips') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.news.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.news.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => __('models.classes.news')]) }}">
{{ __('models.classes.news') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.newscategories.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.newscategories.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => __('models.classes.newscategories')]) }}">
{{ __('models.classes.newscategories') }}
</a>
</li>
@can('viewAny', \App\Models\StaticPage::class)
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.static_pages.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.static_pages.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => trans_choice('models.classes.static_page', '*')]) }}">
{{ Str::title(trans_choice('models.classes.static_page', '*')) }}
<li class="nav-item dropdown">
<button class="btn nav-link dropdown-toggle d-flex align-items-center flex-row" data-bs-toggle="dropdown" type="button">
<div class="d-flex flex-column align-items-start align-items-lg-end me-1">
<span class="text-dark">{{ __('models.classes.news') }}</span>
</div>
</button>
<div class="dropdown-menu dropdown-menu-end m-0 mt-2 p-0 text-center" aria-labelledby="navbarDropdown">
<a class="nav-link text-dark @if (request()->routeIs('bo.newscategories.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.newscategories.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => __('models.classes.newscategories')]) }}">
{{ __('models.classes.newscategories') }}
</a>
</li>
@endcan
<li class="nav-item">
<a class="nav-link text-dark @if (request()->routeIs('bo.seo.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.seo.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Show the SEO informations') }}">
{{ __('SEO') }}
</a>
<a class="nav-link text-dark @if (request()->routeIs('bo.news.*')) fw-bold @endif" data-bs-toggle="tooltip"
href="{{ route('bo.news.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) }}"
title="{{ __('Administrer les :model', ['model' => __('models.classes.news')]) }}">
{{ __('models.classes.news') }}
</a>
</div>
</li>
{{-- NOTE: A décommenter si on veut que les tags soient administrable. --}}
{{-- <li class="nav-item">

View file

@ -1,28 +1,32 @@
@extends('bo.layout')
@section('title', __('Accueil'))
@section('description', __('Description site'))
@section('title', __('Tableau de bord'))
@section('description', __('Tableau de bord du site'))
@section('breadcrumb', 'no')
@section('content')
<div class="card text-center">
<div class="card">
<div class="card-header fw-bold">
<h1 class="h2 fw-bold">{{ __('Page d\'accueil') }}</h1>
<h1 class="h2 fw-bold">{{ __('models.classes.home') }}</h1>
</div>
<div class="card-body">
<h5 class="card-title">
{{ __('Bonjour :firstname :lastname !', [
<h5 class="card-title text-center">
<b>{{ __('Bonjour :firstname :lastname !', [
'firstname' => Auth::user()->firstname,
'lastname' => Auth::user()->lastname,
]) }}
</b>
</h5>
<p class="card-text m-0">
{{ __('Bienvenue dans le back-office, où vous pouvez gérer votre application web.') }}
</p>
<p class="card-text">
{{ __('Pour tout problème ou évolution souhaitée, veuillez nous contacter via notre outil : ') }}
<a data-bs-toggle="tooltip" href="https://support.uwil.fr/" title="{{ __('Accéder à notre outil de ticketing') }}"
target="blank">https://support.uwil.fr/</a>.
{{ __('Bienvenue dans le back-office, où vous pouvez gérer votre application web.') }}
<br><br>
<b>{{ __('Pour accéder à vos statistiques : ') }}</b>
<a data-bs-toggle="tooltip" href="https://report.uwil.fr" title="{{ __('Accéder à notre outil de statistiques') }}"
target="blank">https://report.uwil.fr</a>
<br>
<b>{{ __('Pour tout problème ou évolution souhaitée, veuillez nous contacter via notre outil : ') }}</b>
<a data-bs-toggle="tooltip" href="https://support.uwil.fr" title="{{ __('Accéder à notre outil de ticketing') }}"
target="blank">https://support.uwil.fr</a>
</p>
</div>
</div>

View file

@ -31,16 +31,14 @@
<tr class="border-bottom">
<td class="text-center align-middle">{{ $slideModel->title }}</td>
<td class="text-center align-middle">
{!! Str::limit(clean($slideModel->content), 50) !!}
{!! Str::limit(clean(strip_tags($slideModel->content)), 50) !!}
</td>
<td class="text-center align-middle">
<img class="bo-image-preview" src="{{ asset($slideModel->picture) }}" alt="{{ __('Preview slide picture') }}">
</td>
<td class="text-center align-middle"><span class="badge bg-secondary">{{ $slideModel->updated_at }}</span></td>
@php
$routeName = request()
->route()
->getName();
$routeName = request()->route()->getName();
@endphp
@if (empty(request()->search) && Session::get("$routeName.sort_col") === 'order')
@include('bo.modules.change-model-order', [