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

Merge branch 'le-gaulois-2024' into trunk

Browse source
This commit is contained in:
Noah Lancien 2024-09-10 18:26:32 +02:00
commit 433dd6e41b
9 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Enums/Breeders/EleveurOcbStatus.php
View file

@ -1,6 +1,6 @@
<?php
namespace App\Enums;
namespace App\Enums\Breeders;
use App\Traits\Enums\BaseEnum;

2
app/Enums/Breeders/GeoType.php
View file

@ -1,6 +1,6 @@
<?php
namespace App\Enums;
namespace App\Enums\Breeders;
use App\Traits\Enums\BaseEnum;

2
app/Enums/Breeders/OCBType.php
View file

@ -1,6 +1,6 @@
<?php
namespace App\Enums;
namespace App\Enums\Breeders;
use App\Traits\Enums\BaseEnum;

2
app/Enums/Breeders/PresentationType.php
View file

@ -1,6 +1,6 @@
<?php
namespace App\Enums;
namespace App\Enums\Breeders;
use App\Traits\Enums\BaseEnum;

8
app/Models/Breeder.php
View file

@ -4,10 +4,10 @@ namespace App\Models;
use App\Enums\Approaches\ApproachTypeEnum;
use App\Enums\Department;
use App\Enums\EleveurOcbStatus;
use App\Enums\GeoType;
use App\Enums\OCBType;
use App\Enums\PresentationType;
use App\Enums\Breeders\EleveurOcbStatus;
use App\Enums\Breeders\GeoType;
use App\Enums\Breeders\OCBType;
use App\Enums\Breeders\PresentationType;
use App\Lib\Helpers\FileStorageHelper;
use App\Traits\Models\ActivityLog;
use Illuminate\Database\Eloquent\Factories\HasFactory;

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

@ -130,13 +130,19 @@
])
{{-- 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->picture = 'resources/assets/images/commitments/pictograms/picto-medications.svg';
$newsModel->picture_alt = __('Pictogramme de plusieurs médicaments.');
$newsModel->picture_title = __('Pictogramme d’une diminution de l’utilisation des antibiotiques.');
$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é'),

12
resources/views/fo/pages/commitments/life.blade.php
View file

@ -125,13 +125,19 @@
])
{{-- 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->picture = 'resources/assets/images/commitments/pictograms/picto-medications.svg';
$newsModel->picture_alt = __('Pictogramme de plusieurs médicaments.');
$newsModel->picture_title = __('Pictogramme d’une diminution de l’utilisation des antibiotiques.');
$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' => __('2021, nos collaborateurs ont du cœur'),

12
resources/views/fo/pages/commitments/raise.blade.php
View file

@ -250,13 +250,19 @@
</section>
{{-- 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->picture = 'resources/assets/images/commitments/pictograms/picto-medications.svg';
$newsModel->picture_alt = __('Pictogramme de plusieurs médicaments.');
$newsModel->picture_title = __('Pictogramme d’une diminution de l’utilisation des antibiotiques.');
$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' => __('la santé de nos volailles : on en prend le plus grand soin'),

2
vite.config.ts
View file

@ -133,7 +133,7 @@ export default defineConfig({
// * Departments GeoJson file
path.normalize("resources/assets/departments.geojson"),
],
dest: path.normalize("public/build/assets")
dest: path.normalize("public")
},
],
copyOnce: true,