forge-joniko/ldc-legaulois
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'trunk'

Browse source
This commit is contained in:
Vincent BRIDIER 2024-09-20 12:05:34 +02:00
commit 498d407850
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
11 changed files with 96 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
database/migrations/2024_09_20_115443_alter_customers_for_migration.php Normal file
View file

@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up(): void
{
Schema::table('customers', function (Blueprint $table) {
$table->string('hashcode')->after('email')->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down(): void
{
Schema::table('customers', function (Blueprint $table) {
$table->string('email')->after('hashcode')->change();
});
}
};

3
resources/sass/fo/base/_header-banner.scss
View file

@ -41,7 +41,7 @@
position: absolute;
top: -1rem;
right: 0;
max-width: 55%;
max-width: 50%;
height: 110%;
img {
@ -51,6 +51,7 @@
}
@include media-breakpoint-up(xxl) {
right: -3rem;
max-width: 100%;
}

6
resources/sass/fo/pages/commitments.scss Executable file → Normal file
View file

@ -97,7 +97,7 @@
}
.row {
width: 390px;
width: 100%;
@include media-breakpoint-up(md) {
width: 500px;
@ -429,13 +429,13 @@
.pictogram {
top: -3rem;
left: -2rem;
width: 8rem;
width: 6rem;
&-reversed {
top: -3rem;
right: -2rem;
left: auto;
width: 8rem;
width: 6rem;
}
}

16
resources/sass/fo/pages/recruitment.scss
View file

@ -7,11 +7,17 @@
height: 2rem;
}
.swiper-recruitment-offers img {
width: 100%;
.swiper-recruitment-offers {
img {
width: 100%;
@include media-breakpoint-up(md) {
width: 50%;
@include media-breakpoint-up(md) {
width: 50%;
}
}
.swiper-slide {
height: auto !important;
}
}
}
@ -28,7 +34,7 @@
}
}
&-news-corporate{
&-news-corporate {
.swiper-recruitment-news-corporates-pagination {
height: 25px;
}

5
resources/ts/fo/base/common.ts
View file

@ -144,7 +144,7 @@ document.addEventListener("DOMContentLoaded", function () {
"swiper-recruitment-offers": {
modules: [Navigation, Keyboard, Pagination],
grabCursor: true,
slidesPerView: 1.3,
slidesPerView: 1,
initialSlide: 0,
spaceBetween: 10,
navigation: {
@ -165,6 +165,7 @@ document.addEventListener("DOMContentLoaded", function () {
576: {
slidesPerView: 2,
spaceBetween: 25,
slidesPerGroup: 2,
},
768: {
slidesPerView: 2,
@ -283,7 +284,7 @@ document.addEventListener("DOMContentLoaded", function () {
"swiper-cards-commitments": {
modules: [Navigation],
grabCursor: true,
slidesPerView: 1.3,
slidesPerView: 1,
navigation: {
nextEl: "#swiper-cards-commitments ~ .swiper-cards-commitments-button-next",
prevEl: "#swiper-cards-commitments ~ .swiper-cards-commitments-button-prev",

4
resources/views/fo/layouts/main-menu/menu-nodes/breedings.blade.php
View file

@ -29,9 +29,7 @@
],
[
'name' => __('L\'élevage de volailles'),
'link' => route(
'fo.breeding.show',
$breedingPages->where('type', \App\Enums\StaticPageType::breedingPoultry)->first()),
'link' => route('fo.breeding.show', 'slug'),
],
[
'name' => __('Le métier d\'élevage de volailles'),

16
resources/views/fo/pages/commitments/eat.blade.php
View file

@ -129,21 +129,6 @@
'background_color' => 'white',
])
{{-- PARAGRAPH WITH PICTURE --}}
@php
$newsCategory = new stdClass();
$newsCategory->title = __('Actu');
$newsModel = new stdClass();
$newsModel->title = __('découvrez notre charte nutritionnelle pour alliers plaisir et santé');
$newsModel->slug = str($newsModel->title)->slug();
$newsModel->thumbnail = Vite::asset('resources/assets/images/commitments/pictograms/picto-medications.svg');
$newsModel->thumbnail_alt = __('Pictogramme de plusieurs médicaments.');
$newsModel->thumbnail_title = __('Pictogramme d’une diminution de l’utilisation des antibiotiques.');
$newsModel->date = now()->subDays(rand(0, 31));
$newsModel->link = 'FIXME: route to the news';
$newsModel->newsCategory = $newsCategory;
$newsModel->updated_at = now();
@endphp
@include('fo.partials.commitments.paragraph-with-visual', [
'title' => __('découvrez notre charte nutrionnelle pour allier plaisir et santé'),
'text' => __(
@ -154,7 +139,6 @@
'picture_alt' => __('Photo d’une famille prenant le repas du midi.'),
'picture_title' => __('Photo d’une famille prenant le repas du midi.'),
'reversedMobile' => true,
'newsModel' => $newsModel,
])
{{-- BANNER TEXT --}}
@php

3
resources/views/fo/partials/breeding-card.blade.php
View file

@ -9,7 +9,8 @@
<div class="breeding-card bottom-left-shadow position-relative card mb-5 border-0 bg-transparent">
<div class="card-img-top line-border-medium img-wrapper bg-white p-2">
<img class="w-100 line-border-medium" src="{{ asset($picture['src']) }}" title="{{ $picture['alt'] }}" alt="{{ $picture['title'] }}">
<img class="w-100 line-border-medium" src="{{ Vite::asset($picture['src']) }}" title="{{ $picture['alt'] }}"
alt="{{ $picture['title'] }}">
</div>
<div class="card-body position-absolute w-100 d-flex flex-column p-0">
<div class="position-relative">

25
resources/views/fo/partials/commitments/complex-flex-items.blade.php
View file

@ -1,11 +1,11 @@
<section id="commitments-complex-flex-items" class="position-relative">
<section class="position-relative" id="commitments-complex-flex-items">
@if (isset($title) && isset($picto))
<div class="position-absolute start-50 translate-middle w-100 px-5 z-1">
<div class="position-relative d-flex justify-content-center align-items-center w-fit mx-auto">
<img class="title-image position-absolute start-0 top-50 translate-middle img-fluid z-1"
src="{{ Vite::asset($picto) }}" alt="{{ $picto_alt }}" title="{{ $picto_title }}">
<div class="bg-tertiary line-border-small w-fit ps-5 p-3">
<h3 class="m-0">{{ $title }}</h3>
<div class="position-absolute start-50 translate-middle w-100 z-1 px-5">
<div class="position-relative d-flex justify-content-center align-items-center mx-auto w-fit">
<img class="title-image position-absolute top-50 translate-middle img-fluid z-1 start-0" src="{{ Vite::asset($picto) }}"
title="{{ $picto_title }}" alt="{{ $picto_alt }}">
<div class="bg-tertiary line-border-small w-fit p-3 ps-5">
<h3 class="m-0 text-center">{{ $title }}</h3>
@if (isset($subtitle))
<p class="f-bourton-base m-0">{{ $subtitle }}</p>
@endif
@ -14,15 +14,14 @@
</div>
@endif
<div class="line-border-large bg-{{ $background_color }} pb-5">
<div
class="container d-flex flex-column flex-md-row justify-content-center justify-content-evenly align-items-start pt-5 pb-4">
<div class="row justify-content-evenly align-items-start w-100 mx-auto mt-4 mt-lg-0">
<div class="d-flex flex-column flex-md-row justify-content-center justify-content-evenly align-items-start container pb-4 pt-5">
<div class="row justify-content-evenly align-items-start w-100 mt-lg-0 mx-auto mt-4">
@foreach ($collection as $item)
<div class="col-6 col-lg-4 card border-0 bg-transparent mb-3">
<div class="col-6 col-lg-4 card mb-3 border-0 bg-transparent">
<div class="row g-0">
<div class="col-12 d-flex justify-content-center align-items-center">
<img class="img-fluid" src="{{ Vite::asset($item->picto) }}"
alt="{{ $item->picto_alt }}" title="{{ $item->picto_title }}">
<img class="img-fluid" src="{{ Vite::asset($item->picto) }}" title="{{ $item->picto_title }}"
alt="{{ $item->picto_alt }}">
</div>
<div class="col-12">
<div class="card-body text-center">

34
resources/views/fo/partials/commitments/visual-with-cards.blade.php
View file

@ -1,15 +1,17 @@
<section id="commitments-visual-with-cards" class="position-relative">
<section class="position-relative" id="commitments-visual-with-cards">
<div class="line-border-large bg-tertiary pb-5">
<div
class="container d-flex flex-column flex-md-row justify-content-center justify-content-evenly align-items-start pt-5 pb-4">
<div class="d-flex flex-column flex-md-row justify-content-center justify-content-evenly align-items-start container pb-4 pt-5">
<div class="row justify-content-evenly align-items-start gx-5">
<div class="col-12 mb-3">
<h2>{{ $title }}</h2>
</div>
<div class="col-12 col-md-5">
<div class="bottom-left-shadow mb-3">
<img class="line-border-small bg-white p-3 img-fluid" src="{{ Vite::asset($picture) }}"
alt="{{ $picture_alt }}" title="{{ $picture_title }}">
<div class="line-border-small bg-white p-2">
<img class="line-border-small img-fluid" src="{{ Vite::asset($picture) }}" title="{{ $picture_title }}"
alt="{{ $picture_alt }}">
</div>
</div>
<div class="bottom-left-shadow mb-3">
<div class="line-border-small bg-white p-3">
@ -18,20 +20,20 @@
</div>
</div>
<div class="col-12 col-md-7">
<div class="row w-100 mx-auto gx-5">
<div class="row w-100 gx-5 mx-auto">
<div class="col-12">
{!! $subtext !!}
</div>
<div class="col-12">
<div class="row w-100 mx-auto">
<div class="col-6">
<div class="col-12 col-md-6">
@foreach ($collection->slice(0, 2) as $item)
<div class="custom-card bottom-left-shadow position-relative my-4">
<div class="position-absolute d-flex justify-content-between align-items-center w-100 z-1">
<p class="h6 m-0 p-2 text-white bg-secondary rotate-left">
<p class="h6 bg-secondary rotate-left m-0 p-2 text-white">
{{ $item->title }}</p>
<img class="img-fluid" src="{{ Vite::asset($item->picto) }}"
alt="{{ $item->picto_alt }}" title="{{ $item->picto_title }}">
title="{{ $item->picto_title }}" alt="{{ $item->picto_alt }}">
</div>
<div class="line-border-small bg-white p-3 pt-5">
{!! $item->text !!}
@ -39,14 +41,14 @@
</div>
@endforeach
</div>
<div class="col-6">
<div class="col-12 col-md-6">
@foreach ($collection->slice(2, 2) as $item)
<div class="custom-card bottom-left-shadow position-relative my-4">
<div class="position-absolute d-flex justify-content-between align-items-center w-100 z-1">
<p class="h6 m-0 p-2 text-white bg-secondary rotate-left">
<p class="h6 bg-secondary rotate-left m-0 p-2 text-white">
{{ $item->title }}</p>
<img class="img-fluid" src="{{ Vite::asset($item->picto) }}"
alt="{{ $item->picto_alt }}" title="{{ $item->picto_title }}">
title="{{ $item->picto_title }}" alt="{{ $item->picto_alt }}">
</div>
<div class="line-border-small bg-white p-3 pt-5">
{!! $item->text !!}
@ -56,13 +58,13 @@
</div>
<div class="col-12">
<div class="custom-card bottom-left-shadow position-relative">
<div class="position-absolute w-fit z-1">
<p class="h6 m-0 p-2 text-white bg-secondary rotate-left">
<div class="position-absolute z-1 w-fit">
<p class="h6 bg-secondary rotate-left m-0 p-2 text-white">
{{ $collection->last()->title }}</p>
</div>
<div class="line-border-small bg-white d-flex justify-content-between align-items-center p-3">
<div class="line-border-small d-flex justify-content-between align-items-center bg-white p-3">
<img class="img-fluid" src="{{ Vite::asset($collection->last()->picto) }}"
alt="{{ $collection->last()->picto_alt }}" title="{{ $collection->last()->picto_title }}">
title="{{ $collection->last()->picto_title }}" alt="{{ $collection->last()->picto_alt }}">
<div class="ms-2">
{!! $collection->last()->text !!}
</div>

22
resources/views/fo/partials/offer-card.blade.php
View file

@ -1,13 +1,13 @@
<div class="news-small-card bottom-left-shadow border-0 bg-transparent">
<a class="text-decoration-none" href="{{ $offerModel->link }}" target="_blank"
title="{{ __('Accéder à l\'offre : :name', ['name' => $offerModel->title]) }}">
<div class="line-border-small bg-white p-md-3">
<div class="row w-100 mx-auto align-items-center">
<div class="offer-small-card bottom-left-shadow h-100 border-0 bg-transparent">
<a class="text-decoration-none" href="{{ $offerModel->link }}"
title="{{ __('Accéder à l\'offre : :name', ['name' => $offerModel->title]) }}" target="_blank">
<div class="line-border-small p-md-3 h-100 d-flex flex-column bg-white">
<div class="row w-100 align-items-center mx-auto">
<div class="col-12 d-flex flex-column flex-md-row justify-content-center align-items-center p-0">
<img class="img-fluid" src="{{ $offerModel->picture }}" title="{{ $offerModel->picture_title }}"
alt="{{ $offerModel->picture_alt }}">
<div
class="d-flex flex-column justify-content-start justify-content-md-center align-items-start w-100 mb-2 mt-3 m-md-0 ms-md-2 px-3 px-md-0">
class="d-flex flex-column justify-content-start justify-content-md-center align-items-start w-100 m-md-0 ms-md-2 px-md-0 mb-2 mt-3 px-3">
<h4>{{ $offerModel->title }}</h4>
<p class="mb-0">
{{ Str::limit($offerModel->description, 180) }}
@ -17,14 +17,16 @@
</p>
</div>
</div>
<div class="col-12 d-flex flex-wrap p-3 pt-0 p-md-0 mt-md-1">
<div class="bg-quad text-uppercase f-bourton-base text-white fs-5 mt-2 me-3 px-2 py-1">
</div>
<div class="row w-100 align-items-center flex-fill mx-auto">
<div class="col-12 d-flex p-md-0 mt-md-1 align-items-center flex-wrap p-3 pt-0">
<div class="bg-quad text-uppercase f-bourton-base fs-5 me-3 mt-2 px-2 py-1 text-white">
{{ $offerModel->contract }}
</div>
<div class="bg-secondary text-uppercase f-bourton-base text-white fs-5 mt-2 me-3 px-2 py-1">
<div class="bg-secondary text-uppercase f-bourton-base fs-5 me-3 mt-2 px-2 py-1 text-white">
{{ $offerModel->location }}
</div>
<div class="bg-tertiary text-uppercase f-bourton-base fs-5 mt-2 me-3 px-2 py-1">
<div class="bg-tertiary text-uppercase f-bourton-base fs-5 me-3 mt-2 px-2 py-1">
{{ $offerModel->function }}
</div>
</div>