Compare commits

..

No commits in common. "develop" and "saml-auth" have entirely different histories.

263 changed files with 8131 additions and 16281 deletions

View file

@ -43,12 +43,8 @@ GOOGLE_RECAPTCHA_PUBLIC=
GOOGLE_RECAPTCHA_PRIVATE= GOOGLE_RECAPTCHA_PRIVATE=
GOOGLE_RECAPTCHA_VERSION= GOOGLE_RECAPTCHA_VERSION=
# UWIL ADMIN SECURE # LDC Web Admin Secure
# - LIST SEPARATED WITH ',' (Required) LDC_WEB_API_KEY="MY_KEY"
UWIL_ADMIN_SECURE_CIDR_LIST=""
# - LIST SEPARATED WITH ',' (Optional)
UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST=""
# SAML # SAML
SAML2_DEFAULT_TENANT_UUID= SAML2_DEFAULT_TENANT_UUID=
@ -56,8 +52,3 @@ SAML2_SP_CERT_x509=
SAML2_SP_CERT_PRIVATEKEY= SAML2_SP_CERT_PRIVATEKEY=
SAML2_CONTACT_TECHNICAL_EMAIL= SAML2_CONTACT_TECHNICAL_EMAIL=
SAML2_CONTACT_SUPPORT_EMAIL= SAML2_CONTACT_SUPPORT_EMAIL=
# CRM
CRM_ENDPOINT=
CRM_PASSWORD=
CRM_TOKEN=

3
.gitignore vendored
View file

@ -23,9 +23,6 @@ Homestead.yaml
npm-debug.log npm-debug.log
yarn-error.log yarn-error.log
.npmrc .npmrc
.zshrc
.npm/
.composer/
# Ignore public favicon # Ignore public favicon
/public/android-chrome-192x192.png /public/android-chrome-192x192.png

View file

@ -7,7 +7,7 @@ include:
file: 'security/security.yml' file: 'security/security.yml'
- project: 'ldc-web/shared-ci' - project: 'ldc-web/shared-ci'
ref: 'main' ref: 'main'
file: 'build/docker-multistage.yml' file: 'build/build.yml'
- project: 'ldc-web/shared-ci' - project: 'ldc-web/shared-ci'
ref: 'main' ref: 'main'
file: 'test/test.yml' file: 'test/test.yml'

View file

@ -1,47 +1,5 @@
ARG PHP_8_5_TAG=latest FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.2:latest
COPY --chown=www-data:www-data . /app/srcs
FROM composer:2.8 AS vendor
ARG GITLAB_USER
ARG GITLAB_PASSWORD
COPY database/ database/
COPY composer.json composer.json
COPY composer.lock composer.lock
RUN composer config gitlab-token.lab.s-web.fr ${GITLAB_USER} ${GITLAB_PASSWORD}
RUN composer install \
--ignore-platform-reqs \
--no-interaction \
--no-plugins \
--no-scripts \
--no-dev \
--prefer-dist
FROM node:20.18 AS frontend
ARG GITLAB_PASSWORD
RUN mkdir -p /app/public/build
COPY package*.json tsconfig.json vite.config.ts .eslintrc.json .stylelintrc.json /app/
COPY resources/ /app/resources/
WORKDIR /app
RUN npm config set @ldc-web:registry https://lab.s-web.fr/api/v4/packages/npm/
RUN npm config set -- '//lab.s-web.fr/api/v4/packages/npm/:_authToken' "${GITLAB_PASSWORD}"
RUN npm ci && npm run prod
ARG PHP_8_5_TAG
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:${PHP_8_5_TAG}
ARG USER=www-data
COPY --chown=${USER}:${USER} . /app/srcs
COPY --chown=${USER}:${USER} ./resources/favicon /app/srcs/public
COPY --from=vendor --chown=${USER}:${USER} /app/vendor/ /app/srcs/vendor/
COPY --from=frontend --chown=${USER}:${USER} /app/public/build/ /app/srcs/public/build/
USER root USER root
RUN chmod -R 755 /app/srcs/storage RUN chmod -R 755 /app/srcs/storage
USER ${USER} USER www-data

View file

@ -0,0 +1,35 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Mail;
class TestMail extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'uwil:mail:test';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Send test email to equipe.web@ldc.fr';
/**
* Execute the console command.
*
* @return void
*/
public function handle()
{
Mail::raw(sprintf('UWIL mail-test from %s %s', \config('app.name'), \config('app.url')), function ($msg) {
$msg->to('equipe.web@ldc.fr')->subject('Test Email');
});
}
}

View file

@ -94,7 +94,7 @@ class UserCreate extends Command
)); ));
continue; continue;
} //end try } //end try
}; }; //end while
} }
/** /**
@ -119,7 +119,7 @@ class UserCreate extends Command
)); ));
continue; continue;
} //end try } //end try
}; }; //end while
} }
/** /**
@ -144,6 +144,6 @@ class UserCreate extends Command
)); ));
continue; continue;
} //end try } //end try
}; }; //end while
} }
} }

View file

@ -8,18 +8,17 @@ enum ProductSpeciesEnum: int
{ {
use BaseEnum; use BaseEnum;
case caille = 0; case caille = 0;
case canard = 1; case canard = 1;
case canette = 2; case canette = 2;
case coq = 3; case coq = 3;
case coquelet = 4; case coquelet = 4;
case dinde = 5; case dinde = 5;
case lapin = 6; case lapin = 6;
case pigeonneau = 7; case pigeonneau = 7;
case pintade = 8; case pintade = 8;
case poule = 9; case poule = 9;
case poulet = 10; case poulet = 10;
case volaille_festive = 11;
/** /**
* Optionnal labels definition. * Optionnal labels definition.
@ -27,17 +26,16 @@ enum ProductSpeciesEnum: int
* @phpstan-ignore-next-line * @phpstan-ignore-next-line
*/ */
private const LABELS = [ private const LABELS = [
self::caille->name => 'Caille', self::caille->name => 'Caille',
self::canard->name => 'Canard', self::canard->name => 'Canard',
self::canette->name => 'Canette', self::canette->name => 'Canette',
self::coq->name => 'Coq', self::coq->name => 'Coq',
self::coquelet->name => 'Coquelet', self::coquelet->name => 'Coquelet',
self::dinde->name => 'Dinde', self::dinde->name => 'Dinde',
self::lapin->name => 'Lapin', self::lapin->name => 'Lapin',
self::pigeonneau->name => 'Pigeonneau', self::pigeonneau->name => 'Pigeonneau',
self::pintade->name => 'Pintade', self::pintade->name => 'Pintade',
self::poule->name => 'Poule', self::poule->name => 'Poule',
self::poulet->name => 'Poulet', self::poulet->name => 'Poulet'
self::volaille_festive->name => 'Volaille festive'
]; ];
} }

View file

@ -16,7 +16,6 @@ enum StaticPageType: int
case expertise_chicken = 6; case expertise_chicken = 6;
case expertise_duck = 7; case expertise_duck = 7;
case expertise_rabbit = 8; case expertise_rabbit = 8;
case sitemap = 9;
/** /**
* Optionnal labels definition. * Optionnal labels definition.
@ -32,6 +31,5 @@ enum StaticPageType: int
self::expertise_chicken->name => 'Expertise poulet', self::expertise_chicken->name => 'Expertise poulet',
self::expertise_duck->name => 'Expertise canard', self::expertise_duck->name => 'Expertise canard',
self::expertise_rabbit->name => 'Expertise lapin', self::expertise_rabbit->name => 'Expertise lapin',
self::sitemap->name => 'Plan du site',
]; ];
} }

View file

@ -1,23 +0,0 @@
<?php
namespace App\Enums;
use App\Traits\Enums\BaseEnum;
enum TagTypeEnum: int
{
use BaseEnum;
case recipes = 1;
case products = 2;
/**
* Optionnal labels definition.
*
* @phpstan-ignore-next-line
*/
private const LABELS = [
self::recipes->name => 'Recettes / Astuces',
self::products->name => 'Produits',
];
}

View file

@ -3,14 +3,12 @@
namespace App\Http\Controllers\Bo; namespace App\Http\Controllers\Bo;
use App\Enums\Advices\AdviceTypeEnum; use App\Enums\Advices\AdviceTypeEnum;
use App\Enums\TagTypeEnum;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Bo\Advice\StoreAdviceRequest; use App\Http\Requests\Bo\Advice\StoreAdviceRequest;
use App\Http\Requests\Bo\Advice\UpdateAdviceRequest; use App\Http\Requests\Bo\Advice\UpdateAdviceRequest;
use App\Models\Advice; use App\Models\Advice;
use App\Models\Product; use App\Models\Product;
use App\Models\Tag; use App\Models\Tag;
use App\Traits\Controllers\ManagesOrder;
use App\Traits\Controllers\UpdateModelPublished; use App\Traits\Controllers\UpdateModelPublished;
use Illuminate\Contracts\Database\Eloquent\Builder; use Illuminate\Contracts\Database\Eloquent\Builder;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -21,7 +19,6 @@ use Illuminate\Support\Str;
class AdviceController extends Controller class AdviceController extends Controller
{ {
use UpdateModelPublished; use UpdateModelPublished;
use ManagesOrder;
/** /**
* Display a listing of the resource. * Display a listing of the resource.
@ -30,7 +27,7 @@ class AdviceController extends Controller
* @param \App\Enums\Advices\AdviceTypeEnum|null $type * @param \App\Enums\Advices\AdviceTypeEnum|null $type
* @return \Illuminate\Contracts\View\View * @return \Illuminate\Contracts\View\View
*/ */
public function index(Request $request, AdviceTypeEnum|null $type = null): \Illuminate\Contracts\View\View public function index(Request $request, AdviceTypeEnum $type = null): \Illuminate\Contracts\View\View
{ {
$type = $type ?: AdviceTypeEnum::all; $type = $type ?: AdviceTypeEnum::all;
/** @var \Illuminate\Database\Eloquent\Builder $adviceModels */ /** @var \Illuminate\Database\Eloquent\Builder $adviceModels */
@ -73,7 +70,7 @@ class AdviceController extends Controller
public function create(AdviceTypeEnum $type): \Illuminate\Contracts\View\View public function create(AdviceTypeEnum $type): \Illuminate\Contracts\View\View
{ {
$advice = new Advice(); $advice = new Advice();
$adviceTags = Tag::query()->where('type', TagTypeEnum::recipes)->select(['id', 'label', 'slug'])->get(); $adviceTags = Tag::query()->select(['id', 'label', 'slug'])->get();
$adviceProducts = Product::all(); $adviceProducts = Product::all();
$recipeList = Advice::query()->where('type', '=', AdviceTypeEnum::recipes)->get(); $recipeList = Advice::query()->where('type', '=', AdviceTypeEnum::recipes)->get();
$tipList = Advice::query()->where('type', '=', AdviceTypeEnum::tips)->get(); $tipList = Advice::query()->where('type', '=', AdviceTypeEnum::tips)->get();
@ -152,7 +149,7 @@ class AdviceController extends Controller
public function edit(Advice $advice): \Illuminate\Contracts\View\View public function edit(Advice $advice): \Illuminate\Contracts\View\View
{ {
$currentType = $advice->type; $currentType = $advice->type;
$adviceTags = Tag::query()->where('type', TagTypeEnum::recipes) $adviceTags = Tag::query()->whereNotIn('id', $advice->tags()->pluck('id'))
->select(['id', 'label', 'slug'])->get(); ->select(['id', 'label', 'slug'])->get();
$adviceProducts = Product::all(); $adviceProducts = Product::all();
$recipeList = Advice::query()->where([ $recipeList = Advice::query()->where([

View file

@ -1,152 +0,0 @@
<?php
namespace App\Http\Controllers\Bo;
use App\Http\Requests\Bo\BrigadeSections\StoreBrigadeSectionsRequest;
use App\Http\Requests\Bo\BrigadeSections\UpdateBrigadeSectionsRequest;
use App\Models\BrigadeSection;
use App\Traits\Controllers\ChangesModelOrder;
use App\Traits\Controllers\UpdateModelPublished;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Uwil\Laravel\Common\Controllers\Controller;
class BrigadeSectionController extends Controller
{
use UpdateModelPublished;
use ChangesModelOrder;
/**
* Display a listing of the resource.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\View\View
*/
public function index(Request $request): \Illuminate\Contracts\View\View
{
/** @var \Illuminate\Database\Eloquent\Builder $brigadeSectionModels */
$brigadeSectionModels = BrigadeSection::query();
/** @var string $search Search field */
$search = $request->search;
if ($search) {
$this->searchQuery(
$brigadeSectionModels,
$search,
null,
'title',
'content',
'button_text',
'button_url'
);
}
$searchFields = trans('Titre, Texte, CTA, Lien');
/** Sort columns with a query */
$this->sortQuery($brigadeSectionModels);
/** Custom pagination */
$brigadeSectionModels = $this->paginate($brigadeSectionModels);
return view('bo.pages.brigade_sections.index', compact('brigadeSectionModels', 'searchFields'));
}
/**
* Show the form for creating a new resource.
*
* @param \App\Models\BrigadeSection $brigadeSection
* @return \Illuminate\Contracts\View\View
*/
public function create(BrigadeSection $brigadeSection): \Illuminate\Contracts\View\View
{
$brigadeSection = $brigadeSection->exists() ? $brigadeSection : new BrigadeSection();
return view('bo.pages.brigade_sections.create', [
'brigadeSectionModel' => $brigadeSection,
]);
}
/**
* Store a newly created resource in storage.
*
* @param \App\Http\Requests\Bo\BrigadeSections\StoreBrigadeSectionsRequest $request
* @return \Illuminate\Http\RedirectResponse
*/
public function store(StoreBrigadeSectionsRequest $request): \Illuminate\Http\RedirectResponse
{
return DB::transaction(function () use ($request) {
$brigadeSection = new BrigadeSection();
$brigadeSection->fill($request->validated());
if ($brigadeSection->saveOrFail()) {
return redirect()->route('bo.brigade_sections.edit', $brigadeSection->id)
->with('success', __('crud.messages.has_been_created', [
'model' => trans_choice('models.classes.brigade_section', 1)
]));
}
return redirect()->back()
->with('error', __('crud.messages.cannot_be_created', [
'model' => trans_choice('models.classes.brigade_section', 1)
]));
});
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Models\BrigadeSection $brigadeSection
* @return \Illuminate\Contracts\View\View
*/
public function edit(BrigadeSection $brigadeSection): \Illuminate\Contracts\View\View
{
return view('bo.pages.brigade_sections.edit', [
'brigadeSectionModel' => $brigadeSection,
]);
}
/**
* Update the specified resource in storage.
*
* @param \App\Http\Requests\Bo\BrigadeSections\UpdateBrigadeSectionsRequest $request
* @param \App\Models\BrigadeSection $brigadeSection
* @return \Illuminate\Http\RedirectResponse
*/
public function update(UpdateBrigadeSectionsRequest $request, BrigadeSection $brigadeSection): RedirectResponse
{
return DB::transaction(function () use ($request, $brigadeSection) {
$brigadeSection->fill($request->validated());
if ($brigadeSection->saveOrFail()) {
return redirect()->route('bo.brigade_sections.edit', $brigadeSection->id)
->with('success', __('crud.messages.has_been_updated', [
'model' => trans_choice('models.classes.brigade_section', 1)
]));
}
return redirect()->route('bo.brigade_sections.edit', $brigadeSection->id)
->with('error', __('crud.messages.cannot_be_updated', [
'model' => trans_choice('models.classes.brigade_section', 1)
]));
});
}
/**
* Remove the specified resource from storage.
*
* @param \App\Models\BrigadeSection $brigadeSection
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(BrigadeSection $brigadeSection): \Illuminate\Http\RedirectResponse
{
if ($brigadeSection->deleteOrFail()) {
return redirect()->route('bo.brigade_sections.index')
->with('success', __('crud.messages.has_been_deleted', [
'model' => trans_choice('models.classes.brigade_section', 1)
]));
}
return redirect()->back()
->with('error', __('crud.messages.cannot_be_deleted', [
'model' => trans_choice('models.classes.brigade_section', 1)
]));
}
}

View file

@ -93,7 +93,7 @@ class NewsController extends Controller
{ {
return DB::transaction(function () use ($request) { return DB::transaction(function () use ($request) {
$news = new News(); $news = new News();
$news->fill($request->safe()->except(['categories', 'products', 'associated_news_list'])); $news->fill($request->validated());
if ($news->saveOrFail()) { if ($news->saveOrFail()) {
$news->categories()->sync($request->categories_list); $news->categories()->sync($request->categories_list);
@ -156,7 +156,7 @@ class NewsController extends Controller
$news->products()->sync($request->products_list); $news->products()->sync($request->products_list);
$news->news()->sync($request->news_list); $news->news()->sync($request->news_list);
$news->fill($request->safe()->except(['categories', 'products', 'associated_news_list'])); $news->fill($request->validated());
if ($news->saveOrFail()) { if ($news->saveOrFail()) {
return redirect()->route('bo.news.edit', $news->id) return redirect()->route('bo.news.edit', $news->id)

View file

@ -2,25 +2,22 @@
namespace App\Http\Controllers\Bo; namespace App\Http\Controllers\Bo;
use App\Enums\TagTypeEnum;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Bo\Products\StoreProductRequest; use App\Http\Requests\Bo\Products\StoreProductRequest;
use App\Http\Requests\Bo\Products\UpdateProductRequest; use App\Http\Requests\Bo\Products\UpdateProductRequest;
use App\Lib\Helpers\FileStorageHelper; use App\Lib\Helpers\FileStorageHelper;
use App\Models\Product; use App\Models\Product;
use App\Models\Range;
use App\Models\Subrange; use App\Models\Subrange;
use App\Models\Tag;
use App\Traits\Controllers\UpdateModelPublished; use App\Traits\Controllers\UpdateModelPublished;
use App\Traits\Controllers\ManagesOrder; use App\Traits\Controllers\ChangesModelOrder;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str; use Illuminate\Support\Str;
class ProductController extends Controller class ProductController extends Controller
{ {
use ChangesModelOrder;
use UpdateModelPublished; use UpdateModelPublished;
use ManagesOrder;
/** /**
* Display a listing of the resource. * Display a listing of the resource.
@ -43,13 +40,6 @@ class ProductController extends Controller
'label' 'label'
); );
} }
if ($request->range) {
$productModels->whereHas('subrange', function ($q) use ($request) {
$q->where('subranges.range_id', '=', $request->range);
})->get();
}
$searchFields = trans('Label'); $searchFields = trans('Label');
/** Sort columns with a query */ /** Sort columns with a query */
@ -58,9 +48,7 @@ class ProductController extends Controller
/** Custom pagination */ /** Custom pagination */
$productModels = $this->paginate($productModels); $productModels = $this->paginate($productModels);
$ranges = Range::all(); return view('bo.pages.products.index', compact('productModels', 'search', 'searchFields'));
return view('bo.pages.products.index', compact('productModels', 'search', 'searchFields', 'ranges'));
} }
/** /**
@ -73,12 +61,10 @@ class ProductController extends Controller
{ {
/** @var \Illuminate\Database\Eloquent\Builder $subrangeModels */ /** @var \Illuminate\Database\Eloquent\Builder $subrangeModels */
$subrangeModels = Subrange::get(); $subrangeModels = Subrange::get();
$productTags = Tag::query()->where('type', TagTypeEnum::products)->select(['id', 'label', 'slug'])->get();
return view('bo.pages.products.create', [ return view('bo.pages.products.create', [
'productModel' => $product, 'productModel' => $product,
'subrangeModels' => $subrangeModels, 'subrangeModels' => $subrangeModels
'productTags' => $productTags,
]); ]);
} }
@ -92,11 +78,10 @@ class ProductController extends Controller
{ {
return DB::transaction(function () use ($request) { return DB::transaction(function () use ($request) {
$product = new Product(); $product = new Product();
$product->fill($request->safe()->except('tags')); $product->fill($request->validated());
$this->storePictures($request, $product); $this->storePictures($request, $product);
if ($product->saveOrFail()) { if ($product->saveOrFail()) {
$product->tags()->sync(collect($request->input('tags'))->pluck('id'));
return redirect()->route('bo.products.edit', $product->id) return redirect()->route('bo.products.edit', $product->id)
->with('success', __('crud.messages.has_been_created', [ ->with('success', __('crud.messages.has_been_created', [
'model' => Str::singular(__('models.classes.products')) 'model' => Str::singular(__('models.classes.products'))
@ -120,13 +105,9 @@ class ProductController extends Controller
/** @var \Illuminate\Database\Eloquent\Builder $subrangeModels */ /** @var \Illuminate\Database\Eloquent\Builder $subrangeModels */
$subrangeModels = Subrange::get(); $subrangeModels = Subrange::get();
$productTags = Tag::query()->where('type', TagTypeEnum::products)
->select(['id', 'label', 'slug'])->get();
return view('bo.pages.products.edit', [ return view('bo.pages.products.edit', [
'productModel' => $product, 'productModel' => $product,
'subrangeModels' => $subrangeModels, 'subrangeModels' => $subrangeModels,
'productTags' => $productTags,
]); ]);
} }
@ -140,8 +121,7 @@ class ProductController extends Controller
public function update(UpdateProductRequest $request, Product $product): \Illuminate\Http\RedirectResponse public function update(UpdateProductRequest $request, Product $product): \Illuminate\Http\RedirectResponse
{ {
return DB::transaction(function () use ($request, $product) { return DB::transaction(function () use ($request, $product) {
$product->tags()->sync(collect($request->input('tags'))->pluck('id')); $product->fill($request->validated());
$product->fill($request->safe()->except('tags'));
$this->storePictures($request, $product); $this->storePictures($request, $product);
if ($product->saveOrFail()) { if ($product->saveOrFail()) {
@ -167,7 +147,6 @@ class ProductController extends Controller
{ {
$product->advices()->sync([]); $product->advices()->sync([]);
$product->news()->sync([]); $product->news()->sync([]);
$product->tags()->sync([]);
if ($product->deleteOrFail()) { if ($product->deleteOrFail()) {
return redirect()->route('bo.products.index') return redirect()->route('bo.products.index')
@ -192,7 +171,7 @@ class ProductController extends Controller
{ {
if (is_array($request->input('slider_pictures'))) { if (is_array($request->input('slider_pictures'))) {
$product->slider_pictures = []; $product->slider_pictures = [];
$product->slider_pictures = collect($request->file('slider_pictures')) $product->slider_pictures = collect($request->input('slider_pictures'))
->map(function ($picture) use ($product) { ->map(function ($picture) use ($product) {
return FileStorageHelper::storeFile($product, $picture, true); return FileStorageHelper::storeFile($product, $picture, true);
})->all(); })->all();

View file

@ -7,7 +7,6 @@ use App\Http\Requests\Bo\Slides\StoreSlideRequest;
use App\Http\Requests\Bo\Slides\UpdateSlideRequest; use App\Http\Requests\Bo\Slides\UpdateSlideRequest;
use App\Models\Slide; use App\Models\Slide;
use App\Traits\Controllers\ChangesModelOrder; use App\Traits\Controllers\ChangesModelOrder;
use App\Traits\Controllers\UpdateModelPublished;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -15,7 +14,6 @@ use Illuminate\Support\Str;
class SlideController extends Controller class SlideController extends Controller
{ {
use ChangesModelOrder; use ChangesModelOrder;
use UpdateModelPublished;
/** /**
* Display a listing of the resource. * Display a listing of the resource.

View file

@ -2,7 +2,6 @@
namespace App\Http\Controllers\Bo; namespace App\Http\Controllers\Bo;
use App\Enums\TagTypeEnum;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Bo\Tags\StoreTagRequest; use App\Http\Requests\Bo\Tags\StoreTagRequest;
use App\Http\Requests\Bo\Tags\UpdateTagRequest; use App\Http\Requests\Bo\Tags\UpdateTagRequest;
@ -23,7 +22,6 @@ class TagController extends Controller
{ {
/** @var \Illuminate\Database\Eloquent\Builder $tagModels */ /** @var \Illuminate\Database\Eloquent\Builder $tagModels */
$tagModels = Tag::query(); $tagModels = Tag::query();
$tagModels = $request->type ? $tagModels->where('type', TagTypeEnum::{$request->type}) : $tagModels;
/** @var string $search Search field */ /** @var string $search Search field */
$search = $request->search; $search = $request->search;
@ -32,11 +30,10 @@ class TagController extends Controller
$tagModels, $tagModels,
$search, $search,
null, null,
'label', 'label'
'type',
); );
} }
$searchFields = trans('Nom, Type'); $searchFields = trans('Nom');
/** Sort columns with a query */ /** Sort columns with a query */
$this->sortQuery($tagModels); $this->sortQuery($tagModels);

View file

@ -29,7 +29,7 @@ class Controller extends BaseController
* *
* @param \Illuminate\Database\Eloquent\Builder $query The eloquent query builder. * @param \Illuminate\Database\Eloquent\Builder $query The eloquent query builder.
* @param string $search The query string. * @param string $search The query string.
* @param callable|null $searchQuery The query string. * @param callable $searchQuery The query string.
* @param string ...$fields Either a simple array or a string * @param string ...$fields Either a simple array or a string
* in case of a string the two fields * in case of a string the two fields
* would be concatenate to make the search. * would be concatenate to make the search.
@ -38,7 +38,7 @@ class Controller extends BaseController
protected function searchQuery( protected function searchQuery(
Builder $query, Builder $query,
string $search, string $search,
callable|null $searchQuery = null, callable $searchQuery = null,
string ...$fields string ...$fields
): \Illuminate\Database\Eloquent\Builder { ): \Illuminate\Database\Eloquent\Builder {
if (count($fields)) { if (count($fields)) {
@ -203,7 +203,7 @@ class Controller extends BaseController
*/ */
protected function paginate( protected function paginate(
Builder $query, Builder $query,
ItemsPerPaginationEnum|null $pagination = null ItemsPerPaginationEnum $pagination = null
): \Illuminate\Contracts\Pagination\LengthAwarePaginator { ): \Illuminate\Contracts\Pagination\LengthAwarePaginator {
$currentRoutePath = Str::slug(request()->route()->getName()); $currentRoutePath = Str::slug(request()->route()->getName());
$cacheKey = "pagination.{$currentRoutePath}"; $cacheKey = "pagination.{$currentRoutePath}";
@ -237,7 +237,7 @@ class Controller extends BaseController
*/ */
protected function getProductQuery(string $search): Builder protected function getProductQuery(string $search): Builder
{ {
return Product::query()->where('published', true)->where(function ($query) use ($search) { return Product::query()->where('status', true)->where(function ($query) use ($search) {
// Par leur désignation. // Par leur désignation.
$query->where('label', 'like', "%{$search}%"); $query->where('label', 'like', "%{$search}%");
// Par ingrédients. // Par ingrédients.
@ -279,7 +279,7 @@ class Controller extends BaseController
*/ */
protected function getNewsQuery(string $search): Builder protected function getNewsQuery(string $search): Builder
{ {
return News::query()->where('published', true)->where(function ($query) use ($search) { return News::query()->where('status', true)->where(function ($query) use ($search) {
$query->where('title', 'like', "%{$search}%"); $query->where('title', 'like', "%{$search}%");
$query->orWhere('subtitle', 'like', "%{$search}%"); $query->orWhere('subtitle', 'like', "%{$search}%");
$query->orWhere('content', 'like', "%{$search}%"); $query->orWhere('content', 'like', "%{$search}%");
@ -298,7 +298,7 @@ class Controller extends BaseController
*/ */
protected function getRecipeQuery(string $search): Builder protected function getRecipeQuery(string $search): Builder
{ {
return Advice::query()->where('published', true) return Advice::query()->where('status', true)
->where('type', '=', AdviceTypeEnum::recipes->value) ->where('type', '=', AdviceTypeEnum::recipes->value)
->where(function ($query) use ($search) { ->where(function ($query) use ($search) {
$query->where('title', 'like', "%{$search}%"); $query->where('title', 'like', "%{$search}%");

View file

@ -16,6 +16,16 @@ class AdnController extends Controller
return view('fo.pages.adn.adn'); return view('fo.pages.adn.adn');
} }
/**
* Undocumented function
*
* @return \Illuminate\Contracts\View\View
*/
public function story(): \Illuminate\Contracts\View\View
{
return view('fo.pages.adn.story');
}
/** /**
* Undocumented function * Undocumented function
* *

View file

@ -1,26 +0,0 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
use App\Models\BrigadeSection;
class BrigadeController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Contracts\View\View
*/
public function index(): \Illuminate\Contracts\View\View
{
$sections = BrigadeSection::query()
->where('published', true)
->orderBy('order')
->get();
return view('fo.pages.brigade', compact(
'sections',
));
}
}

View file

@ -7,13 +7,8 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\Fo\Contact\ContactRequest; use App\Http\Requests\Fo\Contact\ContactRequest;
use App\Mail\ContactFormMail; use App\Mail\ContactFormMail;
use App\Models\StaticPage; use App\Models\StaticPage;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Session;
use LDC\LDCCRM\Exceptions\ApiErrorException;
use LDC\LDCCRM\Exceptions\CrmException;
use LDC\LDCCRM\Models\SingleOptin;
class ContactController extends Controller class ContactController extends Controller
{ {
@ -37,63 +32,12 @@ class ContactController extends Controller
*/ */
public function contactSubmit(ContactRequest $request): \Illuminate\Http\RedirectResponse public function contactSubmit(ContactRequest $request): \Illuminate\Http\RedirectResponse
{ {
$recipients = config('mail.contactsList.contactform'); Mail::to(config('mail.contactsList.contactform'))->send(new ContactFormMail($request));
if (empty($recipients)) {
Log::warning('Aucun destinataire configuré pour le formulaire de contact.');
return back()
->withErrors(['global' => __('Une erreur est survenue, veuillez réessayer plus tard.')])
->withInput();
}
$redirection = back()->with('success', trans(
'Votre message a bien été envoyé, merci de votre intérêt, nous répondrons dans les meilleurs délais.'
));
if ($request->opt_in) {
try {
SingleOptin::setStatus($request->email, true);
} catch (ApiErrorException $e) {
\report($e);
$redirection = $redirection->withErrors([
'opt_in' => trans('Une erreur est survenue,
votre inscription à la newsletter n\'a pas été prise en compte.')
]);
} catch (CrmException $e) {
\report($e);
$redirection = $redirection->withErrors([
'opt_in' => trans('Une erreur est survenue,
votre inscription à la newsletter n\'a pas été prise en compte.')
]);
}
} //end if
foreach ($recipients as $recipient) {
Mail::to($recipient)->send(new ContactFormMail($request));
}
Session::forget('saveProductInBasket'); Session::forget('saveProductInBasket');
Session::forget('contact_draft'); return back()->with('success', trans(
'Votre message a bien été envoyé, merci de votre intérêt, nous répondrons dans les meilleurs délais.'
Session::flash('matomo_generate_lead'); ));
return $redirection;
}
/**
* Save data form as draft
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function saveDraft(Request $request): \Illuminate\Http\JsonResponse
{
$request->session()->put('contact_draft', $request->only([
'firstname', 'lastname', 'email', 'phone',
'activity', 'society', 'postcode', 'city',
'message', 'callTime', 'opt_in',
]));
return response()->json(['success' => true]);
} }
} }

View file

@ -107,7 +107,7 @@ class ExpertiseController extends Controller
$productVipModels = ExpertiseProduct::query()->where('page', $enumExpertiseProductPage->value())->get(); $productVipModels = ExpertiseProduct::query()->where('page', $enumExpertiseProductPage->value())->get();
/** @var \App\Models\Product $productModels */ /** @var \App\Models\Product $productModels */
$productModels = Product::query()->where('published', true) $productModels = Product::query()->where('status', true)
->where('species', $enumProductSpecies->value()) ->where('species', $enumProductSpecies->value())
->inRandomOrder() ->inRandomOrder()
->limit(3) ->limit(3)

View file

@ -3,17 +3,10 @@
namespace App\Http\Controllers\Fo; namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\Fo\Newsletter\SingleOptinRequest;
use App\Http\Requests\Fo\Newsletter\UnsubscribeNewsletterRequest;
use App\Models\News; use App\Models\News;
use App\Models\Product; use App\Models\Product;
use App\Models\Range; use App\Models\Range;
use App\Models\Slide; use App\Models\Slide;
use Illuminate\Support\Facades\Log;
use LDC\LDCCRM\Enums\ApiError;
use LDC\LDCCRM\Exceptions\ApiErrorException;
use LDC\LDCCRM\Exceptions\CrmException;
use LDC\LDCCRM\Models\SingleOptin;
class HomeController extends Controller class HomeController extends Controller
{ {
@ -27,31 +20,30 @@ class HomeController extends Controller
// Get Slides. // Get Slides.
/** @var \Illuminate\Database\Eloquent\Builder $slides */ /** @var \Illuminate\Database\Eloquent\Builder $slides */
$slides = Slide::query() $slides = Slide::query();
->where('published', true) $slides->orderBy('order', 'DESC');
->orderBy('order', 'DESC') $slides = $slides->get();
->get();
// Gammes. // Gammes.
$ranges = Range::all(); $ranges = Range::all();
// VIP Products. // VIP Products.
$threeproducts = Product::where('published', true) $threeproducts = Product::where('status', true)
->where('is_vip', true) ->where('is_vip', true)
->take(3) ->take(3)
->orderBy('priority_order', 'DESC') ->orderBy('order', 'DESC')
->with('subrange.range') ->with('subrange.range')
->get(); ->get();
// Get Agenda. // Get Agenda.
// Events starting in the future. // Events starting in the future.
$events = News::query()->where('published', true) $events = News::query()->where('status', true)
->where('event_start', '>', now()) ->where('event_start', '>', now())
->orderBy('event_start', 'desc') ->orderBy('event_start', 'desc')
->take(2)->get()->reverse(); ->take(2)->get()->reverse();
// Get last 3 News. // Get last 3 News.
$news = News::query()->latest()->where('published', true) $news = News::query()->latest()->where('status', true)
->take(3)->with('categories')->get(); ->take(3)->with('categories')->get();
return view('fo.pages.home', compact( return view('fo.pages.home', compact(
@ -62,66 +54,4 @@ class HomeController extends Controller
'news' 'news'
)); ));
} }
/**
* Call the CRM to add a single optin
*
* @param \App\Http\Requests\Fo\Newsletter\SingleOptinRequest $request
* @return string|array|null|\Illuminate\Contracts\Translation\Translator
* @throws \LDC\LDCCRM\Exceptions\ValidationException ValidationException.
* @throws \Illuminate\Contracts\Container\BindingResolutionException BindingResolutionException.
*/
public function addOptIn(SingleOptinRequest $request)
{
try {
SingleOptin::setStatus($request->email, true);
return \response(trans("Votre inscription à la newsletter a été prise en compte"), 200);
} catch (ApiErrorException $e) {
\report($e);
return \response(trans('Une erreur est survenue, merci de réessayer ultérieurement'), 500);
} catch (CrmException $e) {
\report($e);
return \response(trans('Une erreur est survenue, merci de réessayer ultérieurement'), 500);
}
}
/**
* unsubscribeNewsletter method
*
* @param \App\Http\Requests\Fo\Newsletter\UnsubscribeNewsletterRequest $request
* @return \Illuminate\Contracts\View\View
*/
public function unsubscribeNewsletter(UnsubscribeNewsletterRequest $request): \Illuminate\Contracts\View\View
{
$error = null;
$hashcode = $request->hashcode;
try {
SingleOptin::unsetStatusWithHashcode($hashcode);
} catch (ApiErrorException $e) {
Log::debug($e->getMessage());
if ($e->getApiError()->equals(ApiError::modelNotFound)) {
abort(404);
} else {
if (app()->bound('sentry')) {
app('sentry')->captureException($e);
}
$error = true;
}
} catch (CrmException $e) {
Log::debug($e->getMessage());
$error = true;
if (app()->bound('sentry')) {
app('sentry')->captureException($e);
}
} //end try
if (!is_null($error)) {
return view('fo.pages.newsletter-unsubscribe')->with(
'error',
trans('Une erreur est survenue, merci de réessayer ultérieurement')
);
}
return view('fo.pages.newsletter-unsubscribe');
}
} }

View file

@ -26,8 +26,8 @@ class NewsController extends Controller
$news = News::query()->with('categories')->when( $news = News::query()->with('categories')->when(
$filters_activated->first() !== 'all', $filters_activated->first() !== 'all',
fn(Builder $q) => $q->with('categories') fn (Builder $q) => $q->with('categories')
->whereRelation('categories', fn(Builder $q) => ->whereRelation('categories', fn (Builder $q) =>
$q->where(function (Builder $q) use ($filters_activated) { $q->where(function (Builder $q) use ($filters_activated) {
foreach ($filters_activated as $value) { foreach ($filters_activated as $value) {
if (is_string($value)) { if (is_string($value)) {
@ -35,7 +35,7 @@ class NewsController extends Controller
} }
} }
})) }))
)->where('published', true)->orderByDesc('created_at')->paginate(6); )->where('status', true)->orderBy('created_at')->paginate(6);
return view('fo.pages.news.index', compact('categories', 'news', 'filters_activated')); return view('fo.pages.news.index', compact('categories', 'news', 'filters_activated'));
} }
@ -51,7 +51,7 @@ class NewsController extends Controller
{ {
$news->load('categories', 'news.categories', 'products'); $news->load('categories', 'news.categories', 'products');
$readingTime = $news->getReadingTime(); $readingTime = $news->getReadingTime();
$products = $news->products()->with(['subrange', 'subrange.range'])->get(); $products = $news->products()->get();
return view('fo.pages.news.post', compact('news', 'readingTime', 'products')); return view('fo.pages.news.post', compact('news', 'readingTime', 'products'));
} }

View file

@ -61,8 +61,7 @@ class ProductsController extends Controller
$search = htmlspecialchars($request->query('search') ?? ''); $search = htmlspecialchars($request->query('search') ?? '');
$productsQuery = !empty($search) ? $this->getProductQuery($search) : Product::query(); $productsQuery = !empty($search) ? $this->getProductQuery($search) : Product::query();
$productsQuery->with('subrange.range'); $productsQuery->with('subrange.range');
$productsQuery->where('published', true); $productsQuery->where('status', true);
$productsQuery->orderBy('priority_order', 'ASC');
// * Range filter (obligatoire). // * Range filter (obligatoire).
$productsQuery->whereHas('subrange', function (Builder $q) use ($range) { $productsQuery->whereHas('subrange', function (Builder $q) use ($range) {
@ -85,6 +84,7 @@ class ProductsController extends Controller
if ($request->vip) { if ($request->vip) {
$productsQuery->where('is_vip', $request->vip); $productsQuery->where('is_vip', $request->vip);
} }
return \response()->json(new ProductPaginatedCollectionResource($productsQuery->paginate(6))); return \response()->json(new ProductPaginatedCollectionResource($productsQuery->paginate(6)));
} }
@ -97,12 +97,12 @@ class ProductsController extends Controller
public function show(Product $publishedProduct): \Illuminate\Contracts\View\View public function show(Product $publishedProduct): \Illuminate\Contracts\View\View
{ {
/** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Advice> */ /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Advice> */
$recipes = $publishedProduct->recipesQuery()->where('published', true)->with('tags')->get(); $recipes = $publishedProduct->recipesQuery()->where('status', true)->get();
/** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Advice> */ /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Advice> */
$tips = $publishedProduct->tipsQuery()->where('published', true)->get(); $tips = $publishedProduct->tipsQuery()->where('status', true)->get();
// Force load subrange and range. // Force load subrange and range.
$publishedProduct->load(['subrange.range', 'tags']); $publishedProduct->load('subrange.range');
/** @var \App\Models\Subrange */ /** @var \App\Models\Subrange */
$subrange = $publishedProduct->subrange; $subrange = $publishedProduct->subrange;
@ -113,7 +113,7 @@ class ProductsController extends Controller
$randomProducts = Product::query() $randomProducts = Product::query()
->with('subrange.range') ->with('subrange.range')
->where('id', '!=', $publishedProduct->id) ->where('id', '!=', $publishedProduct->id)
->where('published', true) ->where('status', true)
->whereHas('subrange', function (Builder $q) use ($range) { ->whereHas('subrange', function (Builder $q) use ($range) {
$q->whereHas('range', function (Builder $q) use ($range) { $q->whereHas('range', function (Builder $q) use ($range) {
$q->where('id', $range->id); $q->where('id', $range->id);
@ -136,13 +136,13 @@ class ProductsController extends Controller
* @param \App\Models\Product $publishedProduct * @param \App\Models\Product $publishedProduct
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function printCommercialSheet(Product $publishedProduct): Response public function printCommericalSheet(Product $publishedProduct): Response
{ {
$title = trans('Fiche commerciale du produit : :label - :appname', [ $title = trans('Fiche commerciale du produit : :label - :appname', [
'label' => $publishedProduct->label, 'label' => $publishedProduct->label,
'appname' => \config('app.name', 'Le Gaulois Pro') 'appname' => \config('app.name', 'Le Gaulois Pro')
]); ]);
$filename = trans('fiche-commerciale-:slug-:date.pdf', [ $filename = trans('fiche-commerciale-:slug-:date', [
'slug' => Str::slug($publishedProduct->label), 'slug' => Str::slug($publishedProduct->label),
'date' => \now()->format('Y-m-d') 'date' => \now()->format('Y-m-d')
]); ]);
@ -153,15 +153,17 @@ class ProductsController extends Controller
* ! apres avoir header et echo dans le corps de la réponse php (Nasty trick) * ! apres avoir header et echo dans le corps de la réponse php (Nasty trick)
*/ */
return \response( return \response(
$this->generateProductCommercialPdf($publishedProduct, $title)->download($filename), $this->generateProductCommercialPdf($publishedProduct, $title)->output(),
200, 200,
[ [
'Content-Type' => 'application/pdf', 'Content-Type' => 'application/pdf',
'Content-disposition' => "inline; filename=\"{$filename}\"", 'Content-disposition' => "inline; filename=\"{$filename}\"",
'Cache-Control' => 'public, must-revalidate, max-age=0', 'Cache-Control' => 'public, must-revalidate, max-age=0',
'Pragma' => 'public', 'Pragma' => 'public',
'Expires' => 'Sat, 26 Jul 1997 05:00:00 GMT', // * For glory
'Last-Modified' => gmdate('D, d M Y H:i:s') . ' GMT', 'X-Generator' => 'mPDF',
'Expires' => 'Sat, 26 Jul 1997 05:00:00 GMT',
'Last-Modified' => gmdate('D, d M Y H:i:s') . ' GMT',
] ]
); );
} }

View file

@ -43,39 +43,39 @@ class RecipesController extends Controller
/** @var \App\Enums\Advices\AdviceTimeEnum|null $cooking_time */ /** @var \App\Enums\Advices\AdviceTimeEnum|null $cooking_time */
/** @var \App\Enums\Advices\AdviceTimeEnum|null $preparation_time */ /** @var \App\Enums\Advices\AdviceTimeEnum|null $preparation_time */
$query = Advice::query()->with('tags')->where('type', 1)->where('published', true)->when( $query = Advice::query()->with('tags')->where('type', 1)->where('status', true)->when(
is_numeric($search_range), is_numeric($search_range),
fn(Builder $q) => fn (Builder $q) =>
$q->whereHas( $q->whereHas(
'products', 'products',
fn(Builder $q) => fn (Builder $q) =>
$q->whereHas( $q->whereHas(
'subrange', 'subrange',
fn(Builder $q) => fn (Builder $q) =>
$q->whereHas( $q->whereHas(
'range', 'range',
fn(Builder $q) => fn (Builder $q) =>
$q->where('id', 'LIKE', $search_range) $q->where('id', 'LIKE', $search_range)
) )
) )
) )
)->when( )->when(
$cooking_time, $cooking_time,
fn(Builder $q) => fn (Builder $q) =>
$q->whereBetween('cooking_time', [ $q->whereBetween('cooking_time', [
Arr::get($cooking_time->times(), 0), Arr::get($cooking_time->times(), 0),
Arr::get($cooking_time->times(), 1) Arr::get($cooking_time->times(), 1)
]) ])
)->when( )->when(
$preparation_time, $preparation_time,
fn(Builder $q) => fn (Builder $q) =>
$q->whereBetween('preparation_time', [ $q->whereBetween('preparation_time', [
Arr::get($preparation_time->times(), 0), Arr::get($preparation_time->times(), 0),
Arr::get($preparation_time->times(), 1) Arr::get($preparation_time->times(), 1)
]) ])
); );
$recipes = $query->orderBy('priority_order', 'ASC')->paginate(9); $recipes = $query->orderBy('slug', 'ASC')->paginate(9);
return view('fo.pages.ideas.recipes', compact( return view('fo.pages.ideas.recipes', compact(
'ranges', 'ranges',

View file

@ -5,7 +5,6 @@ namespace App\Http\Controllers\Fo;
use App\Enums\StaticPageType; use App\Enums\StaticPageType;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\StaticPage; use App\Models\StaticPage;
use Uwil\SitemapGenerator\Lib\SitemapHelper;
class StaticPageController extends Controller class StaticPageController extends Controller
{ {
@ -32,17 +31,4 @@ class StaticPageController extends Controller
$policiesPage = StaticPage::query()->where('type', StaticPageType::confidentiality)->first(); $policiesPage = StaticPage::query()->where('type', StaticPageType::confidentiality)->first();
return view('fo.pages.legals', ['staticPageModel' => $policiesPage]); return view('fo.pages.legals', ['staticPageModel' => $policiesPage]);
} }
/**
* Sitemap show
*
* @param \App\Models\StaticPage $sitemap
* @return \Illuminate\Contracts\View\View
*/
public function sitemap(StaticPage $sitemap)
{
$sitemap = StaticPage::query()->where('type', StaticPageType::sitemap)->first();
$singlePages = SitemapHelper::getSinglePages();
return view('fo.pages.sitemap', ['staticPageModel' => $sitemap, 'singlePages' => $singlePages]);
}
} }

View file

@ -0,0 +1,18 @@
<?php
namespace App\Http\Controllers\Fo;
use App\Http\Controllers\Controller;
class StoryController extends Controller
{
/**
* Undocumented function
*
* @return \Illuminate\Contracts\View\View
*/
public function index(): \Illuminate\Contracts\View\View
{
return view('fo.pages.story');
}
}

View file

@ -17,7 +17,7 @@ class TipsController extends Controller
{ {
$advices = Advice::query()->with('tags') $advices = Advice::query()->with('tags')
->where('type', AdviceTypeEnum::tips) ->where('type', AdviceTypeEnum::tips)
->where('published', true) ->where('status', true)
->paginate(9); ->paginate(9);
return view('fo.pages.ideas.tips', \compact('advices')); return view('fo.pages.ideas.tips', \compact('advices'));
} }
@ -31,9 +31,7 @@ class TipsController extends Controller
public function show(Advice $publishedAdvice): \Illuminate\Contracts\View\View public function show(Advice $publishedAdvice): \Illuminate\Contracts\View\View
{ {
$publishedAdvice->load([ $publishedAdvice->load([
'advices', 'advices', 'products.subrange.range', 'tags'
'products.subrange.range',
'tags'
]); ]);
return view('fo.pages.ideas.tip', [ return view('fo.pages.ideas.tip', [
'adviceModel' => $publishedAdvice 'adviceModel' => $publishedAdvice

View file

@ -39,6 +39,7 @@ class SecureHeaders
View::share('nonce', $nonce = Vite::useCspNonce()); View::share('nonce', $nonce = Vite::useCspNonce());
// * For VueJS dev tool to execute // * For VueJS dev tool to execute
$jsDev = config('app.debug') ? "'unsafe-eval' 'unsafe-inline'" : "'nonce-{$nonce}' 'strict-dynamic'"; $jsDev = config('app.debug') ? "'unsafe-eval' 'unsafe-inline'" : "'nonce-{$nonce}' 'strict-dynamic'";
$scheme = config('app.env') === 'local' ? 'http' : 'https';
$reportUri = Route::has('cspReportUri') ? $reportUri = Route::has('cspReportUri') ?
\sprintf(' report-uri %s ;', \parse_url(route('cspReportUri'), \PHP_URL_PATH)) : ''; \sprintf(' report-uri %s ;', \parse_url(route('cspReportUri'), \PHP_URL_PATH)) : '';
$this->removeUnwantedHeaders($this->unwantedHeaderList); $this->removeUnwantedHeaders($this->unwantedHeaderList);
@ -60,7 +61,6 @@ class SecureHeaders
]) . ';', ]) . ';',
"img-src 'self' data: blob: " . implode(' ', [ "img-src 'self' data: blob: " . implode(' ', [
'https://yl.s-web.fr', 'https://yl.s-web.fr',
'https://i3.ytimg.com/',
// * VITE DEV // * VITE DEV
config('app.debug') ? "https://{$host}:4443" : '', config('app.debug') ? "https://{$host}:4443" : '',
// * MESBR // * MESBR
@ -99,6 +99,7 @@ class SecureHeaders
'https: blob:', 'https: blob:',
'https://www.googletagmanager.com', 'https://www.googletagmanager.com',
'https://cdnjs.cloudflare.com', 'https://cdnjs.cloudflare.com',
"$scheme://www.google-analytics.com",
// * VITE DEV // * VITE DEV
config('app.debug') ? "https://{$host}:4443" : '', config('app.debug') ? "https://{$host}:4443" : '',
]) . ';' ]) . ';'

View file

@ -4,7 +4,6 @@ namespace App\Http\Requests\Bo\Advice;
use App\Enums\Advices\AdviceDifficultyEnum; use App\Enums\Advices\AdviceDifficultyEnum;
use App\Enums\Advices\AdviceTypeEnum; use App\Enums\Advices\AdviceTypeEnum;
use App\Rules\WysiwygLength;
use App\Traits\Requests\HasPicture; use App\Traits\Requests\HasPicture;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -36,7 +35,7 @@ class StoreAdviceRequest extends FormRequest
//phpcs:enable //phpcs:enable
$this->merge([ $this->merge([
'slug' => Str::slug(strip_tags($this->input('title'))), 'slug' => Str::slug(strip_tags($this->input('title'))),
'published' => $this->boolean('published'), 'status' => $this->boolean('status'),
'tags' => $this->input('tags', []), 'tags' => $this->input('tags', []),
'products' => $this->input('products', []), 'products' => $this->input('products', []),
'associated_tips_list' => $this->input('associated_tips_list', []), 'associated_tips_list' => $this->input('associated_tips_list', []),
@ -80,28 +79,18 @@ class StoreAdviceRequest extends FormRequest
'sticker_title' => 'required_with:sticker|nullable|min:3|max:255', 'sticker_title' => 'required_with:sticker|nullable|min:3|max:255',
'sticker_sm_alt' => 'required_with:sticker_sm|nullable|min:3|max:255', 'sticker_sm_alt' => 'required_with:sticker_sm|nullable|min:3|max:255',
'sticker_sm_title' => 'required_with:sticker_sm|nullable|min:3|max:255', 'sticker_sm_title' => 'required_with:sticker_sm|nullable|min:3|max:255',
'preparation' => [ 'preparation' => 'required|string|min:15',
'required', 'advice' => 'nullable|string|min:15',
'string',
new WysiwygLength(15, 2500)
],
'advice' => [
'nullable',
'string',
new WysiwygLength(15, 2500)
],
'ingredients' => [ 'ingredients' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) < 1 || count($value) > 15) { if (count($value) < 1 || count($value) > 15) {
$fail(\trans('Vous devez associer 1 à 15 lignes d\'ingrédients.')); $fail(\trans('Vous devez associer 1 à 15 lignes d\'ingrédients.'));
} }
} }
], ],
'ingredients.*' => 'required|array', 'ingredients.*' => 'required|array',
'ingredients.*.value' => 'nullable|regex:/^\d*\.?\d{0,1}$/|between:0,65535', 'ingredients.*.value' => 'nullable|numeric|max:65535',
'ingredients.*.label' => [ 'ingredients.*.label' => [
Rule::requiredIf(function () { Rule::requiredIf(function () {
return $this->type === AdviceTypeEnum::recipes->value(); return $this->type === AdviceTypeEnum::recipes->value();
@ -129,22 +118,16 @@ class StoreAdviceRequest extends FormRequest
) { ) {
$fail(\trans('Le nombre de convives est obligatoire')); $fail(\trans('Le nombre de convives est obligatoire'));
} }
}, }, 'nullable', 'numeric', 'min:1', 'max:99'
'nullable',
'numeric',
'min:1',
'max:99'
], ],
'youtube_title' => 'required_with:youtube_video_id|nullable|min:3|max:255', 'youtube_title' => 'required_with:youtube_video_id|nullable|min:3|max:255',
'youtube_video_id' => 'required_with:youtube_title|nullable|min:3|max:50|regex:%([^"&?\/\s]{11})%i', 'youtube_video_id' => 'required_with:youtube_title|nullable|regex:%([^"&?\/\s]{11})%i',
'cooking_time' => 'nullable|numeric|min:0|max:65535', 'cooking_time' => 'nullable|numeric|min:0|max:65535',
'preparation_time' => [ 'preparation_time' => [
Rule::requiredIf(function () { Rule::requiredIf(function () {
return $this->type === AdviceTypeEnum::recipes->value(); return $this->type === AdviceTypeEnum::recipes->value();
}), }),
'numeric', 'numeric', 'min:0', 'max:65535'
'min:0',
'max:65535'
], ],
'difficulty' => [ 'difficulty' => [
Rule::requiredIf(function () { Rule::requiredIf(function () {
@ -152,12 +135,10 @@ class StoreAdviceRequest extends FormRequest
}), }),
new Enum(AdviceDifficultyEnum::class) new Enum(AdviceDifficultyEnum::class)
], ],
'published' => 'required|boolean', 'status' => 'required|boolean',
'tags' => [ 'tags' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) > 2) { if (count($value) > 2) {
$fail(\trans('Vous devez associer au maximum 2 tags.')); $fail(\trans('Vous devez associer au maximum 2 tags.'));
} }
@ -167,10 +148,8 @@ class StoreAdviceRequest extends FormRequest
'tags.*.id' => 'required|numeric|exists:tags,id|distinct', 'tags.*.id' => 'required|numeric|exists:tags,id|distinct',
'tags.*.label' => 'required|string', 'tags.*.label' => 'required|string',
'products' => [ 'products' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if ($this->type == AdviceTypeEnum::recipes->value()) { if ($this->type == AdviceTypeEnum::recipes->value()) {
if (count($value) < 1 || count($value) > 3) { if (count($value) < 1 || count($value) > 3) {
$fail(\trans('Vous devez associer 1 à 3 produits.')); $fail(\trans('Vous devez associer 1 à 3 produits.'));
@ -186,10 +165,8 @@ class StoreAdviceRequest extends FormRequest
'products.*.value' => 'required|exists:products,id', 'products.*.value' => 'required|exists:products,id',
'products.*.label' => 'required|string', 'products.*.label' => 'required|string',
'associated_tips_list' => [ 'associated_tips_list' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) > 3) { if (count($value) > 3) {
$fail(\trans('Vous devez associer au maximum 3 astuces.')); $fail(\trans('Vous devez associer au maximum 3 astuces.'));
} }
@ -199,10 +176,8 @@ class StoreAdviceRequest extends FormRequest
'associated_tips_list.*.value' => 'required|exists:advice,id', 'associated_tips_list.*.value' => 'required|exists:advice,id',
'associated_tips_list.*.label' => 'required|string', 'associated_tips_list.*.label' => 'required|string',
'associated_recipes_list' => [ 'associated_recipes_list' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) > 3) { if (count($value) > 3) {
$fail(\trans('Vous devez associer au maximum 3 recettes.')); $fail(\trans('Vous devez associer au maximum 3 recettes.'));
} }
@ -214,9 +189,9 @@ class StoreAdviceRequest extends FormRequest
]; ];
return \array_merge( return \array_merge(
$rules, $rules,
$this->pictureRules('picture', 650, 690, 650, 690, false), $this->pictureRules('picture', 650, 690, 650, 690, true),
$this->pictureRules('sticker', 370, 300, 370, 300, false), $this->pictureRules('sticker', 370, 300, 370, 300, true),
$this->pictureRules('sticker_sm', 270, 145, 270, 145, false), $this->pictureRules('sticker_sm', 270, 145, 270, 145, true),
); );
} }

View file

@ -1,84 +0,0 @@
<?php
namespace App\Http\Requests\Bo\BrigadeSections;
use App\Rules\WysiwygLength;
use App\Traits\Requests\HasPicture;
use Illuminate\Foundation\Http\FormRequest;
class StoreBrigadeSectionsRequest extends FormRequest
{
use HasPicture;
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize(): bool
{
return auth('backend')->check();
}
/**
* Prepare the data for validation.
*
* @return void
*/
protected function prepareForValidation(): void
{
$this->merge([
'published' => $this->boolean('published'),
'button_display' => $this->boolean('button_display'),
'button_newtab' => $this->boolean('button_newtab'),
]);
$this->mergePicture('picture');
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules(): array
{
$rules = [
'title' => 'required|string|min:3|max:500',
'content' => [
'required',
'string',
new WysiwygLength(15, 1500)
],
'picture_alt' => 'required|string|min:3|max:255',
'picture_title' => 'required|string|min:3|max:255',
'button_display' => 'required|boolean',
'button_text' => 'required_if_accepted:button_display|nullable|string|min:3|max:255',
'button_url' => 'required_if_accepted:button_display|nullable|url:https|min:3|max:255',
'button_newtab' => 'required|boolean',
'published' => 'required|boolean',
];
return \array_merge(
$rules,
$this->pictureRules('picture', 800, 535, 800, 535, false),
);
}
/**
* Get custom attributes for validator errors.
*
* @return array
*/
public function attributes(): array
{
return [
'title' => trans('Titre'),
'picture' => trans('Image'),
'picture_alt' => trans('Attribut alt de l\'image'),
'picture_title' => trans('Titre de l\'image'),
'content' => trans('Contenu'),
'button_text' => trans('Texte du CTA'),
'button_url' => trans('URL du CTA'),
'published' => trans('Statut'),
];
}
}

View file

@ -1,7 +0,0 @@
<?php
namespace App\Http\Requests\Bo\BrigadeSections;
class UpdateBrigadeSectionsRequest extends StoreBrigadeSectionsRequest
{
}

View file

@ -2,7 +2,6 @@
namespace App\Http\Requests\Bo\News; namespace App\Http\Requests\Bo\News;
use App\Rules\WysiwygLength;
use App\Traits\Requests\HasPicture; use App\Traits\Requests\HasPicture;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -32,7 +31,7 @@ class StoreNewsRequest extends FormRequest
//phpcs:enable //phpcs:enable
$this->merge([ $this->merge([
'slug' => Str::slug($this->title), 'slug' => Str::slug($this->title),
'published' => $this->published ? true : false, 'status' => $this->status ? true : false,
'categories' => $this->categories ?? [], 'categories' => $this->categories ?? [],
'products' => $this->products ?? [], 'products' => $this->products ?? [],
'associated_news_list' => $this->associated_news_list ?? [], 'associated_news_list' => $this->associated_news_list ?? [],
@ -67,18 +66,8 @@ class StoreNewsRequest extends FormRequest
'picture_title' => 'required_with:picture|nullable|min:3|max:255', 'picture_title' => 'required_with:picture|nullable|min:3|max:255',
'picture2_alt' => 'required_with:picture2|nullable|min:3|max:255', 'picture2_alt' => 'required_with:picture2|nullable|min:3|max:255',
'picture2_title' => 'required_with:picture2|nullable|min:3|max:255', 'picture2_title' => 'required_with:picture2|nullable|min:3|max:255',
'content' => [ 'content' => 'required_with:picture|nullable|string|min:15',
'required_with:picture', 'content2' => 'required_with:picture2|nullable|string|min:15',
'nullable',
'string',
new WysiwygLength(15, 2500)
],
'content2' => [
'required_with:picture2',
'nullable',
'string',
new WysiwygLength(15, 2500)
],
'event_start' => 'nullable|date_format:Y-m-d', 'event_start' => 'nullable|date_format:Y-m-d',
'event_end' => [ 'event_end' => [
'required_with:event_start', 'required_with:event_start',
@ -92,12 +81,10 @@ class StoreNewsRequest extends FormRequest
'min:3', 'min:3',
'max:255' 'max:255'
], ],
'published' => 'required|boolean', 'status' => 'required|boolean',
'categories' => [ 'categories' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) < 1 || count($value) > 2) { if (count($value) < 1 || count($value) > 2) {
$fail(\trans('Vous devez associer une actualité à 1 ou 2 catégories.')); $fail(\trans('Vous devez associer une actualité à 1 ou 2 catégories.'));
} }
@ -107,10 +94,8 @@ class StoreNewsRequest extends FormRequest
'categories.*.value' => 'required|exists:news_categories,id', 'categories.*.value' => 'required|exists:news_categories,id',
'categories.*.label' => 'required|string', 'categories.*.label' => 'required|string',
'products' => [ 'products' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) > 3) { if (count($value) > 3) {
$fail(\trans('Vous devez associer au maximum 3 produits.')); $fail(\trans('Vous devez associer au maximum 3 produits.'));
} }
@ -120,10 +105,8 @@ class StoreNewsRequest extends FormRequest
'products.*.value' => 'required|exists:products,id', 'products.*.value' => 'required|exists:products,id',
'products.*.label' => 'required|string', 'products.*.label' => 'required|string',
'associated_news_list' => [ 'associated_news_list' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) > 3) { if (count($value) > 3) {
$fail(\trans('Vous devez associer au maximum 3 actualités.')); $fail(\trans('Vous devez associer au maximum 3 actualités.'));
} }
@ -135,8 +118,8 @@ class StoreNewsRequest extends FormRequest
]; ];
return \array_merge( return \array_merge(
$rules, $rules,
$this->pictureRules('picture', 590, 645, 590, 645, false), $this->pictureRules('picture', 920, 1025, 920, 1025, true),
$this->pictureRules('picture2', 590, 645, 590, 645, true, requiredWith: 'content2') $this->pictureRules('picture2', 920, 1025, 920, 1025, false)
); );
} }
@ -164,7 +147,7 @@ class StoreNewsRequest extends FormRequest
'event_start' => trans('Date de début de l\'évènement'), 'event_start' => trans('Date de début de l\'évènement'),
'event_end' => trans('Date de fin de l\'évènement'), 'event_end' => trans('Date de fin de l\'évènement'),
'event_text' => trans('Description de l\'évènement'), 'event_text' => trans('Description de l\'évènement'),
'published' => trans('Status'), 'status' => trans('Status'),
]; ];
} }
} }

View file

@ -4,7 +4,6 @@ namespace App\Http\Requests\Bo\Products;
use App\Enums\NutriscoreEnum; use App\Enums\NutriscoreEnum;
use App\Enums\Products\ProductSpeciesEnum; use App\Enums\Products\ProductSpeciesEnum;
use App\Rules\WysiwygLength;
use App\Traits\Requests\HasPicture; use App\Traits\Requests\HasPicture;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -36,19 +35,9 @@ class StoreProductRequest extends FormRequest
'is_frenchpoultry' => $this->is_frenchpoultry ? true : false, 'is_frenchpoultry' => $this->is_frenchpoultry ? true : false,
'is_vip' => $this->is_vip ? true : false, 'is_vip' => $this->is_vip ? true : false,
'is_egalim' => $this->is_egalim ? true : false, 'is_egalim' => $this->is_egalim ? true : false,
'published' => $this->published ? true : false, 'status' => $this->status ? true : false
'tags' => $this->input('tags', []),
// * For sync relations
'tags_list' => \collect($this->input('tags'))->map(function ($value) {
return \is_array($value) ? ($value['value'] ?? null) : null;
})->filter()->all(),
]); ]);
$this->mergePicture('sticker_sm'); $this->mergePicture('sticker_sm');
($this->slider_pictures)
? $this->mergePictures('slider_pictures')
: $this->merge([
'slider_pictures' => [],
]);
} }
/** /**
@ -67,26 +56,12 @@ class StoreProductRequest extends FormRequest
'nutriscore' => ['required', new Enum(NutriscoreEnum::class)], 'nutriscore' => ['required', new Enum(NutriscoreEnum::class)],
'sticker_sm_alt' => 'required|min:3|max:255', 'sticker_sm_alt' => 'required|min:3|max:255',
'sticker_sm_title' => 'required|min:3|max:255', 'sticker_sm_title' => 'required|min:3|max:255',
'ingredients' => [ 'ingredients' => 'required|string|min:15',
'required', 'advantage' => 'required|string|min:15',
'string', 'preparation' => 'required|string|min:15',
new WysiwygLength(15, 2500)
],
'advantage' => [
'required',
'string',
new WysiwygLength(15, 2500)
],
'preparation' => [
'required',
'string',
new WysiwygLength(15, 2500)
],
'packaging' => [ 'packaging' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (1 > count($value) || count($value) > 6) { if (1 > count($value) || count($value) > 6) {
$fail(\trans('Vous devez remplir au moins 1 ligne et au plus 6 lignes de conditionnement.')); $fail(\trans('Vous devez remplir au moins 1 ligne et au plus 6 lignes de conditionnement.'));
} }
@ -95,10 +70,8 @@ class StoreProductRequest extends FormRequest
'packaging.*' => 'required|array', 'packaging.*' => 'required|array',
'packaging.*.value' => 'required|string|min:2|max:255', 'packaging.*.value' => 'required|string|min:2|max:255',
'caliber' => [ 'caliber' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (1 > count($value) || count($value) > 6) { if (1 > count($value) || count($value) > 6) {
$fail(\trans('Vous devez remplir au moins 1 ligne et au plus 6 lignes de calibre.')); $fail(\trans('Vous devez remplir au moins 1 ligne et au plus 6 lignes de calibre.'));
} }
@ -106,29 +79,25 @@ class StoreProductRequest extends FormRequest
], ],
'caliber.*' => 'required|array', 'caliber.*' => 'required|array',
'caliber.*.value' => 'required|string|min:1|max:255', 'caliber.*.value' => 'required|string|min:1|max:255',
'is_frenchpoultry' => 'required|boolean', 'nutritionnal_values' => [
'is_vip' => 'required|boolean',
'is_egalim' => 'required|boolean',
'published' => 'required|boolean',
// * TAGS
'tags' => [
'present',
'array',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, array $value, $fail) { 'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) > 2) { if (count($value) != 9) {
$fail(\trans('Vous devez associer au maximum 2 tags.')); $fail(\trans('Vous devez remplir seulement 9 lignes de valeurs nutritionnelles.'));
} }
} }
], ],
'tags.*' => 'required|array', 'nutritionnal_values.*' => 'nullable|array',
'tags.*.id' => 'required|numeric|exists:tags,id|distinct', 'nutritionnal_values.*.label' => 'nullable|string|min:3|max:255',
'tags.*.label' => 'required|string', 'nutritionnal_values.*.value' => 'nullable|numeric|min:0',
'is_frenchpoultry' => 'required|boolean',
'is_vip' => 'required|boolean',
'is_egalim' => 'required|boolean',
'status' => 'required|boolean'
]; ];
return \array_merge( return \array_merge(
$rules, $rules,
$this->pictureRules('sticker_sm', 206, 159, 206, 159, false), $this->pictureRules('sticker_sm', 206, 159, 206, 159, true),
$this->picturesRules('slider_pictures', 396, 286, 396, 286, 1, 5, true), $this->picturesRules('slider_pictures', 396, 286, 396, 286, 1, 5, true),
); );
} }
@ -141,30 +110,29 @@ class StoreProductRequest extends FormRequest
public function attributes(): array public function attributes(): array
{ {
return [ return [
'label' => trans('title'), 'label' => trans('title'),
'slug' => trans('slug'), 'slug' => trans('slug'),
'seo_title' => trans('title') . ' seo', 'seo_title' => trans('title') . ' seo',
'seo_description' => trans('description') . ' seo', 'seo_description' => trans('description') . ' seo',
'subrange_id' => trans('sous-gamme'), 'subrange_id' => trans('sous-gamme'),
'species' => trans('Espèce du produit'), 'species' => trans('Espèce du produit'),
'nutriscore' => trans('Label Nutriscore'), 'nutriscore' => trans('Label Nutriscore'),
'sticker_sm' => trans('miniature'), 'sticker_sm' => trans('miniature'),
'sticker_sm_alt' => trans('attribut alt de la miniature'), 'sticker_sm_alt' => trans('attribut alt de la miniature'),
'sticker_sm_title' => trans('titre de la miniature'), 'sticker_sm_title' => trans('titre de la miniature'),
'slider_pictures' => trans('images du slider'), 'slider_pictures' => trans('images du slider'),
'slider_pictures.*' => trans('image du slider'), 'slider_pictures.*' => trans('image du slider'),
'packaging' => trans('conditionnement'), 'packaging' => trans('conditionnement'),
'packaging.*.value' => trans('valeur du conditionnement'), 'packaging.*.value' => trans('valeur du conditionnement'),
'caliber' => trans('calibre'), 'caliber' => trans('calibre'),
'caliber.*.value' => trans('valeur du calibre'), 'caliber.*.value' => trans('valeur du calibre'),
'is_frenchpoultry' => trans('Label volaille française'), 'nutritionnal_values' => trans('valeurs nutritionnelles'),
'is_vip' => trans('Produit VIP'), 'nutritionnal_values.*.label' => trans('libellé de la valeur nutritionnelle'),
'is_egalim' => trans('Produit Égalim'), 'nutritionnal_values.*.value' => trans('valeur de la valeur nutritionnelle'),
'published' => trans('publish'), 'is_frenchpoultry' => trans('Label volaille française'),
'tags' => trans('tag'), 'is_vip' => trans('Produit VIP'),
'tags.*' => trans('tag'), 'is_egalim' => trans('Produit Égalim'),
'tags.*.id' => trans('id du tag'), 'status' => trans('publish')
'tags.*.label' => trans('label du tag'),
]; ];
} }
} }

View file

@ -2,7 +2,6 @@
namespace App\Http\Requests\Bo\Slides; namespace App\Http\Requests\Bo\Slides;
use App\Rules\WysiwygLength;
use App\Traits\Requests\HasPicture; use App\Traits\Requests\HasPicture;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
@ -28,9 +27,8 @@ class StoreSlideRequest extends FormRequest
protected function prepareForValidation(): void protected function prepareForValidation(): void
{ {
$this->merge([ $this->merge([
'button_display' => $this->boolean('button_display'), 'button_display' => $this->button_display ? true : false,
'button_targetblank' => $this->boolean('button_targetblank'), 'button_targetblank' => $this->button_targetblank ? true : false,
'published' => $this->boolean('published'),
]); ]);
$this->mergePicture('picture'); $this->mergePicture('picture');
$this->mergePicture('picture_thumbnail'); $this->mergePicture('picture_thumbnail');
@ -45,11 +43,7 @@ class StoreSlideRequest extends FormRequest
{ {
$rules = [ $rules = [
'title' => 'required|min:3|max:255', 'title' => 'required|min:3|max:255',
'content' => [ 'content' => 'required|string|min:15|max:540',
'required',
'string',
new WysiwygLength(15, 2500)
],
'button_display' => 'required|boolean', 'button_display' => 'required|boolean',
'button_text' => 'nullable|min:3|max:45', 'button_text' => 'nullable|min:3|max:45',
'button_url' => 'nullable|min:3|max:255|url', 'button_url' => 'nullable|min:3|max:255|url',
@ -57,8 +51,7 @@ class StoreSlideRequest extends FormRequest
'picture_alt' => 'required|min:3|max:255', 'picture_alt' => 'required|min:3|max:255',
'picture_title' => 'required|min:3|max:255', 'picture_title' => 'required|min:3|max:255',
'picture_thumbnail_alt' => 'required|min:3|max:255', 'picture_thumbnail_alt' => 'required|min:3|max:255',
'picture_thumbnail_title' => 'required|min:3|max:255', 'picture_thumbnail_title' => 'required|min:3|max:255'
'published' => 'required|boolean',
]; ];
return \array_merge( return \array_merge(
$rules, $rules,

View file

@ -2,10 +2,8 @@
namespace App\Http\Requests\Bo\Tags; namespace App\Http\Requests\Bo\Tags;
use App\Enums\TagTypeEnum;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Illuminate\Validation\Rule;
class StoreTagRequest extends FormRequest class StoreTagRequest extends FormRequest
{ {
@ -40,10 +38,6 @@ class StoreTagRequest extends FormRequest
{ {
return [ return [
'label' => 'required|min:2|max:30', 'label' => 'required|min:2|max:30',
'type' => [
'required',
Rule::enum(TagTypeEnum::class),
]
]; ];
} }
@ -57,7 +51,6 @@ class StoreTagRequest extends FormRequest
return [ return [
'label' => trans('libellé'), 'label' => trans('libellé'),
'slug' => trans('slug'), 'slug' => trans('slug'),
'type' => trans('type'),
]; ];
} }
} }

View file

@ -1,68 +0,0 @@
<?php
namespace App\Http\Requests\Bo;
use App\Interfaces\OrderableInterface;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Http\FormRequest;
class UpdateOrderRequest extends FormRequest
{
/**
* Attribute model needed.
*
* @var Model $orderable
*/
private Model $orderable;
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize(): bool
{
return auth('backend')->check();
}
/**
* Prepare the data for validation.
*
* @return void
*/
protected function prepareForValidation(): void
{
$this->orderable = collect($this->route()->parameters())
->first(fn($param) => $param instanceof Model);
$groupField = $this->orderable->getOrderGroupField();
if ($groupField) {
$this->orderable::query()->where($groupField, $this->orderable->{$groupField});
}
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules(): array
{
return [
'priority_order' => [
'required',
'integer',
'min:1',
sprintf('max:%s', $this->orderable->max('priority_order')),
function ($value, $fail) {
// phpcs:ignore Generic.Files.LineLength.TooLong
if ($this->orderable instanceof OrderableInterface && intval($value) === $this->orderable->getPriorityOrder()) {
$fail(trans('validation.custom.same_priority'));
}
},
],
];
}
}

View file

@ -20,18 +20,6 @@ class ContactRequest extends FormRequest
return true; return true;
} }
/**
* Prepare the data for validation.
*
* @return void
*/
public function prepareForValidation(): void
{
$this->merge([
'opt_in' => $this->boolean('opt_in'),
]);
}
/** /**
* Get the validation rules that apply to the request. * Get the validation rules that apply to the request.
* *
@ -48,12 +36,10 @@ class ContactRequest extends FormRequest
'phone' => 'required|max:255|phone:' . implode(',', $this->isoCodes()), 'phone' => 'required|max:255|phone:' . implode(',', $this->isoCodes()),
'activity' => ['required', new Enum(ContactActivityEnum::class)], 'activity' => ['required', new Enum(ContactActivityEnum::class)],
'society' => 'nullable|string|max:255', 'society' => 'nullable|string|max:255',
'postcode' => 'required|postal_code:' . implode(',', $this->isoCodes()), 'postcode' => 'nullable|postal_code:' . implode(',', $this->isoCodes()),
'city' => 'nullable|string|max:255', 'city' => 'nullable|string|max:255',
'message' => 'required|string|min:20|max:255', 'message' => 'required|string|min:20|max:255',
'callTime' => ['required', new Enum(ContactTimeEnum::class)], 'callTime' => ['required', new Enum(ContactTimeEnum::class)],
'brigade' => 'nullable|boolean',
'opt_in' => 'required|boolean',
]; ];
} }
@ -94,8 +80,6 @@ class ContactRequest extends FormRequest
'city' => trans('ville'), 'city' => trans('ville'),
'message' => trans('message'), 'message' => trans('message'),
'callTime' => trans('préférence de rappel'), 'callTime' => trans('préférence de rappel'),
'brigade' => trans('La Brigade'),
'opt_in' => trans('newsletter'),
]; ];
} }

View file

@ -1,30 +0,0 @@
<?php
namespace App\Http\Requests\Fo\Newsletter;
use Illuminate\Foundation\Http\FormRequest;
class SingleOptinRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'email' => 'required|email:rfc,dns,spoof',
];
}
}

View file

@ -1,30 +0,0 @@
<?php
namespace App\Http\Requests\Fo\Newsletter;
use Illuminate\Foundation\Http\FormRequest;
class UnsubscribeNewsletterRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'hashcode' => 'required|uuid'
];
}
}

View file

@ -24,7 +24,7 @@ class AjaxAddProductBasket extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ return [
'packaging' => 'array', 'packaging' => 'required|array|min:1',
'packaging.*' => [ 'packaging.*' => [
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, $value, $fail) { function ($attribute, $value, $fail) {
@ -37,7 +37,7 @@ class AjaxAddProductBasket extends FormRequest
} }
} }
], ],
'caliber' => 'array', 'caliber' => 'required|array|min:1',
'caliber.*' => [ 'caliber.*' => [
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, $value, $fail) { function ($attribute, $value, $fail) {

View file

@ -28,6 +28,7 @@ class ProductCommercialSheetResource extends JsonResource
'ingredients' => '', 'ingredients' => '',
'preparation' => '', 'preparation' => '',
'sticker_sm' => '', 'sticker_sm' => '',
'nutritionnal_values' => [],
'slider_pictures' => [], 'slider_pictures' => [],
'subrange' => null, 'subrange' => null,
]; ];
@ -64,6 +65,7 @@ class ProductCommercialSheetResource extends JsonResource
'caliber' => $this->product->caliber, 'caliber' => $this->product->caliber,
'ingredients' => $this->product->ingredients, 'ingredients' => $this->product->ingredients,
'preparation' => $this->product->preparation, 'preparation' => $this->product->preparation,
'nutritionnal_values' => $this->product->nutritionnal_values,
'sticker_sm' => $this->product->sticker_sm, 'sticker_sm' => $this->product->sticker_sm,
'slider_pictures' => $this->product->slider_pictures, 'slider_pictures' => $this->product->slider_pictures,
'subrange' => (new SubrangeResource($this->product->subrange))->toArray($request), 'subrange' => (new SubrangeResource($this->product->subrange))->toArray($request),

View file

@ -1,21 +0,0 @@
<?php
namespace App\Interfaces;
interface OrderableInterface
{
/**
* Returns the priority order value.
*
* @return integer
*/
public function getPriorityOrder(): int;
/**
* Returns the grouping field used for ordering.
* Returns null if the order is global.
*
* @return string|null
*/
public function getOrderGroupField(): ?string;
}

View file

@ -0,0 +1,37 @@
<?php
namespace App\Lib;
use App\Enums\Advices\AdviceTypeEnum;
use App\Models\Advice;
use App\Models\Product;
use LDC\SitemapGenerator\Lib\Sitemap;
class CompleteSitemapWith
{
/**
* Use this method to append a list of links to the sitemap
*
* * Please call $sitemap->mergeUrls to append url for any specific route name.
*
* @param \LDC\SitemapGenerator\Lib\Sitemap $sitemap
* @return void
*/
public static function append(Sitemap $sitemap): void
{
// * Ajouts des éléments qui sont affichés en random
$sitemap->mergeUrls(Product::query()->where('status', true)->pluck('slug')->transform(function (string $slug) {
return \route('fo.product.show', $slug);
}));
$sitemap->mergeUrls(Advice::query()
->where('status', true)->where('type', AdviceTypeEnum::recipes)
->pluck('slug')->transform(function (string $slug) {
return \route('fo.recipes.show', $slug);
}));
$sitemap->mergeUrls(Advice::query()
->where('status', true)->where('type', AdviceTypeEnum::tips)
->pluck('slug')->transform(function (string $slug) {
return \route('fo.tips.show', $slug);
}));
}
}

View file

@ -63,20 +63,6 @@ class FileStorageHelper
} }
} }
/**
* Destroy files associate with the attribute.
*
* @param \Illuminate\Database\Eloquent\Model $model
* @param array $array
* @return void
*/
public static function removeFiles(Model $model, array $array): void
{
foreach ($array as $item) {
self::removeFile($model, $item);
}
}
/** /**
* Destroy the file associate with the attribute old value (before updated to DB). * Destroy the file associate with the attribute old value (before updated to DB).
* *
@ -119,7 +105,7 @@ class FileStorageHelper
Model $model, Model $model,
$file, $file,
bool $slugify = false, bool $slugify = false,
string|null $filename = null, string $filename = null,
bool $private = false bool $private = false
): string { ): string {
// phpcs:enable // phpcs:enable
@ -180,7 +166,7 @@ class FileStorageHelper
public static function storeModelFilesFromHtml( public static function storeModelFilesFromHtml(
Model $model, Model $model,
string $htmlString, string $htmlString,
string|null $oldHtmlString = null string $oldHtmlString = null
): string { ): string {
\collect(self::onlyUploadedFilesWithFileManager(self::findFilesInHtml($htmlString))) \collect(self::onlyUploadedFilesWithFileManager(self::findFilesInHtml($htmlString)))
->each(function (string $path) use ($model, &$htmlString) { ->each(function (string $path) use ($model, &$htmlString) {

View file

@ -30,7 +30,7 @@ class ContactFormMail extends Mailable
*/ */
public function build() public function build()
{ {
return $this->from(config('mail.from.address')) return $this->from(config('mail.contactsList.contactform'))
->subject(sprintf("%s : %s", config('app.name'), trans("Nouveau contact"))) ->subject(sprintf("%s : %s", config('app.name'), trans("Nouveau contact")))
->markdown('fo.emails.contact-form', $this->request->toArray()); ->markdown('fo.emails.contact-form', $this->request->toArray());
} }

View file

@ -2,25 +2,18 @@
namespace App\Models; namespace App\Models;
use App\Interfaces\OrderableInterface;
use App\Enums\Advices\AdviceDifficultyEnum;
use App\Enums\Advices\AdviceTypeEnum; use App\Enums\Advices\AdviceTypeEnum;
use App\Enums\Advices\AdviceDifficultyEnum;
use App\Lib\Helpers\FileStorageHelper; use App\Lib\Helpers\FileStorageHelper;
use App\Lib\Helpers\ToolboxHelper; use App\Lib\Helpers\ToolboxHelper;
use App\Traits\Models\Orderable;
use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Spatie\Sitemap\Contracts\Sitemapable;
use Spatie\Sitemap\Tags\Url;
use Uwil\Laravel\Redirections\Interfaces\RedirectableInterface;
use Uwil\Laravel\Redirections\Traits\IsRedirectable;
use Uwil\Seo\Laravel\Interfaces\SeoInterface; use Uwil\Seo\Laravel\Interfaces\SeoInterface;
use Uwil\Seo\Laravel\Objects\SeoItem;
use Uwil\Seo\Laravel\Traits\SeoTrait; use Uwil\Seo\Laravel\Traits\SeoTrait;
use Uwil\SitemapGenerator\Lib\SitemapHelper; use Uwil\Seo\Laravel\Objects\SeoItem;
/** /**
* @property integer $id Id. * @property integer $id Id.
@ -47,8 +40,7 @@ use Uwil\SitemapGenerator\Lib\SitemapHelper;
* @property integer|null $cooking_time Time of cooking. * @property integer|null $cooking_time Time of cooking.
* @property integer|null $preparation_time Time of preparation. * @property integer|null $preparation_time Time of preparation.
* @property \App\Enums\Advices\AdviceDifficultyEnum|null $difficulty Difficulty. * @property \App\Enums\Advices\AdviceDifficultyEnum|null $difficulty Difficulty.
* @property boolean $published Status. * @property boolean $status Status.
* @property integer $priority_order Priority Order.
* @property-read \Illuminate\Support\Carbon $created_at Created date. * @property-read \Illuminate\Support\Carbon $created_at Created date.
* @property-read \Illuminate\Support\Carbon $updated_at Updated date. * @property-read \Illuminate\Support\Carbon $updated_at Updated date.
* *
@ -63,12 +55,10 @@ use Uwil\SitemapGenerator\Lib\SitemapHelper;
* @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Tag> $tags * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Tag> $tags
* Tags Morph-To-Many relationship. * Tags Morph-To-Many relationship.
*/ */
class Advice extends Authenticatable implements SeoInterface, Sitemapable, RedirectableInterface, OrderableInterface class Advice extends Authenticatable implements SeoInterface
{ {
use HasFactory; use HasFactory;
use SeoTrait; use SeoTrait;
use IsRedirectable;
use Orderable;
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.
@ -99,8 +89,7 @@ class Advice extends Authenticatable implements SeoInterface, Sitemapable, Redir
'cooking_time', 'cooking_time',
'preparation_time', 'preparation_time',
'difficulty', 'difficulty',
'published', 'status'
'priority_order'
]; ];
/** /**
@ -110,7 +99,7 @@ class Advice extends Authenticatable implements SeoInterface, Sitemapable, Redir
*/ */
protected $casts = [ protected $casts = [
'ingredients' => 'array', 'ingredients' => 'array',
'published' => 'bool', 'status' => 'bool',
'type' => AdviceTypeEnum::class, 'type' => AdviceTypeEnum::class,
'difficulty' => AdviceDifficultyEnum::class, 'difficulty' => AdviceDifficultyEnum::class,
]; ];
@ -124,7 +113,6 @@ class Advice extends Authenticatable implements SeoInterface, Sitemapable, Redir
{ {
static::creating(function (self $model) { static::creating(function (self $model) {
self::manageFields($model); self::manageFields($model);
self::bootOrderable();
}); });
static::updating(function (self $model) { static::updating(function (self $model) {
self::manageFields($model); self::manageFields($model);
@ -139,7 +127,6 @@ class Advice extends Authenticatable implements SeoInterface, Sitemapable, Redir
FileStorageHelper::removeFile($model, 'picture'); FileStorageHelper::removeFile($model, 'picture');
FileStorageHelper::removeFile($model, 'sticker'); FileStorageHelper::removeFile($model, 'sticker');
FileStorageHelper::removeFile($model, 'sticker_sm'); FileStorageHelper::removeFile($model, 'sticker_sm');
self::setOrder($model);
}); });
} }
@ -281,7 +268,7 @@ class Advice extends Authenticatable implements SeoInterface, Sitemapable, Redir
protected function recipes(): Attribute protected function recipes(): Attribute
{ {
return Attribute::make( return Attribute::make(
get: fn() => $this->recipesQuery(), get: fn () => $this->recipesQuery(),
); );
} }
@ -303,24 +290,10 @@ class Advice extends Authenticatable implements SeoInterface, Sitemapable, Redir
protected function tips(): Attribute protected function tips(): Attribute
{ {
return Attribute::make( return Attribute::make(
get: fn() => $this->tipsQuery(), get: fn () => $this->tipsQuery(),
); );
} }
// * REDIRECTIONS.
/**
* Get the front url of this model.
* Should return the model.show route, with all binded elements if needed.
*
* @param string $modelKey
* @return string
*/
public function getFrontUrl(string $modelKey): string
{
return route('fo.tips.show', $modelKey);
}
// * RELATIONSHIPS // * RELATIONSHIPS
/** /**
@ -364,33 +337,9 @@ class Advice extends Authenticatable implements SeoInterface, Sitemapable, Redir
\trans($this->getTable()), \trans($this->getTable()),
$this->seo_title, $this->seo_title,
$this->seo_description, $this->seo_description,
$this->published ?? false, $this->status ?? false,
\route(\config('seo.bo_route_prefix') . $this->getTable() . '.edit', $this), \route(\config('seo.bo_route_prefix') . $this->getTable() . '.edit', $this),
$this->type === AdviceTypeEnum::recipes ? route('fo.recipes.show', $this) : route('fo.tips.show', $this) $this->type === AdviceTypeEnum::recipes ? route('fo.recipes.show', $this) : route('fo.tips.show', $this)
); );
} }
/**
* toSitemapTag method
*
* @return Url|string|array
*/
public function toSitemapTag(): Url | string | array
{
$model = $this;
$route = $this->type === AdviceTypeEnum::tips ? 'fo.tips.show' : 'fo.recipes.show';
$params = ['publishedAdvice' => $model];
return SitemapHelper::generateUrl($route, $params, $model);
}
/**
* Group ordering by type.
*
* @return string
*/
public function getOrderGroupField(): string
{
return 'type';
}
} }

View file

@ -1,124 +0,0 @@
<?php
namespace App\Models;
use App\Lib\Helpers\FileStorageHelper;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Validation\ValidationException;
use Uwil\Laravel\Common\Helpers\ToolboxHelper;
class BrigadeSection extends Model
{
use HasFactory;
/**
* The attributes that are mass assignable.
*
* @var array<int, string>
*/
protected $fillable = [
'title',
'content',
'picture',
'picture_alt',
'picture_title',
'button_display',
'button_text',
'button_url',
'button_newtab',
'published',
'order'
];
/**
* The attributes that should be cast.
*
* @var array<string,string>
*/
protected $casts = [
'button_display' => 'bool',
'button_newtab' => 'bool',
'published' => 'bool',
];
/**
* Perform any actions required after the model boots.
*
* @return void
*/
protected static function booted(): void
{
static::creating(function (self $model) {
self::setOrder($model);
self::manageFields($model);
});
static::updating(function (self $model) {
self::manageFields($model);
});
static::updated(function (self $model) {
FileStorageHelper::removeOldFile($model, 'picture');
});
static::updating(function (self $model) {
self::manageFields($model);
});
static::deleting(function (self $model) {
self::assertLimitPublishedSections($model, true);
});
static::deleted(function (self $model) {
FileStorageHelper::removeFile($model, 'picture');
});
}
// * METHODS
/**
* Common methods function.
*
* @param self $model
* @return void
*/
private static function manageFields(self $model): void
{
self::assertLimitPublishedSections($model);
ToolboxHelper::assertNoInternalBoUrls('content', $model->content);
ToolboxHelper::assertNoInternalBoUrls('button_url', $model->content);
$model->content = clean($model->content);
$model->picture = FileStorageHelper::storeFile($model, $model->picture);
}
/**
* Set order after the last element of the list.
*
* @param self $model
* @return void
*/
private static function setOrder(self $model): void
{
$model->order = \intval(self::query()->max('order')) + 1;
}
/**
* Check if the limit of published element is reached.
*
* @param self $model
* @param boolean $isDeletion
* @return void
* @throws \Illuminate\Validation\ValidationException Returns if fails.
*/
private static function assertLimitPublishedSections(self $model, bool $isDeletion = false)
{
$count = self::query()->where('published', true)->count();
if (
(!$model->published && $count <= 1) ||
($model->published && $count >= 5) ||
($isDeletion && $count === 1)
) {
throw ValidationException::withMessages([
'Il doit y avoir entre 1 et 5 sections publiées simultanément.'
]);
}
}
}

View file

@ -2,22 +2,16 @@
namespace App\Models; namespace App\Models;
use Illuminate\Support\Str;
use Spatie\Sitemap\Tags\Url;
use Spatie\CalendarLinks\Link;
use App\Lib\Helpers\ToolboxHelper;
use Uwil\Seo\Laravel\Objects\SeoItem;
use Uwil\Seo\Laravel\Traits\SeoTrait;
use App\Lib\Helpers\FileStorageHelper; use App\Lib\Helpers\FileStorageHelper;
use Spatie\Sitemap\Contracts\Sitemapable; use App\Lib\Helpers\ToolboxHelper;
use Uwil\SitemapGenerator\Lib\SitemapHelper;
use Uwil\Seo\Laravel\Interfaces\SeoInterface;
use Illuminate\Validation\ValidationException;
use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Casts\Attribute;
use Uwil\Laravel\Redirections\Traits\IsRedirectable;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Uwil\Laravel\Redirections\Interfaces\RedirectableInterface; use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
use Spatie\CalendarLinks\Link;
use Uwil\Seo\Laravel\Interfaces\SeoInterface;
use Uwil\Seo\Laravel\Traits\SeoTrait;
/** /**
*/ */
@ -39,7 +33,7 @@ use Uwil\Laravel\Redirections\Interfaces\RedirectableInterface;
* @property \Illuminate\Support\Carbon|null $event_start Start of the event. * @property \Illuminate\Support\Carbon|null $event_start Start of the event.
* @property \Illuminate\Support\Carbon|null $event_end End of the event. * @property \Illuminate\Support\Carbon|null $event_end End of the event.
* @property string|null $event_text Text of the event. * @property string|null $event_text Text of the event.
* @property boolean $published Status. * @property boolean $status Status.
* @property-read string $reading_time Time reading of a news' page * @property-read string $reading_time Time reading of a news' page
* @property-read \Illuminate\Support\Carbon $created_at Created date. * @property-read \Illuminate\Support\Carbon $created_at Created date.
* @property-read \Illuminate\Support\Carbon $updated_at Updated date. * @property-read \Illuminate\Support\Carbon $updated_at Updated date.
@ -53,11 +47,10 @@ use Uwil\Laravel\Redirections\Interfaces\RedirectableInterface;
* @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Tags> $categories * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Tags> $categories
* Categories Morph-To-Many relationship. * Categories Morph-To-Many relationship.
*/ */
class News extends Authenticatable implements SeoInterface, Sitemapable, RedirectableInterface class News extends Authenticatable implements SeoInterface
{ {
use HasFactory; use HasFactory;
use SeoTrait; use SeoTrait;
use IsRedirectable;
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.
@ -81,7 +74,7 @@ class News extends Authenticatable implements SeoInterface, Sitemapable, Redirec
'event_start', 'event_start',
'event_end', 'event_end',
'event_text', 'event_text',
'published', 'status',
]; ];
/** /**
@ -92,7 +85,7 @@ class News extends Authenticatable implements SeoInterface, Sitemapable, Redirec
protected $casts = [ protected $casts = [
'event_start' => 'datetime', 'event_start' => 'datetime',
'event_end' => 'datetime', 'event_end' => 'datetime',
'published' => 'bool', 'status' => 'bool',
]; ];
/** /**
@ -131,7 +124,7 @@ class News extends Authenticatable implements SeoInterface, Sitemapable, Redirec
public function calLink(): Attribute public function calLink(): Attribute
{ {
return Attribute::make( return Attribute::make(
get: fn() => ( get: fn () => (
$this->exists() and $this->exists() and
($this->event_start && $this->event_end && $this->event_text) ($this->event_start && $this->event_end && $this->event_text)
) ? Link::create( ) ? Link::create(
@ -249,20 +242,6 @@ class News extends Authenticatable implements SeoInterface, Sitemapable, Redirec
return ($time < 1) ? round(($allWords / 140) * 60, 0) . " seconde(s)" : $time . " minute(s)"; return ($time < 1) ? round(($allWords / 140) * 60, 0) . " seconde(s)" : $time . " minute(s)";
} }
// * REDIRECTIONS.
/**
* Get the front url of this model.
* Should return the model.show route, with all binded elements if needed.
*
* @param string $modelKey
* @return string
*/
public function getFrontUrl(string $modelKey): string
{
return route('fo.news.show', $modelKey);
}
// * RELATIONSHIPS // * RELATIONSHIPS
/** /**
@ -296,34 +275,4 @@ class News extends Authenticatable implements SeoInterface, Sitemapable, Redirec
{ {
return $this->belongsToMany(NewsCategory::class); return $this->belongsToMany(NewsCategory::class);
} }
/**
* toSitemapTag method
*
* @return Url|string|array
*/
public function toSitemapTag(): Url | string | array
{
$model = $this;
$route = 'fo.news.show';
$params = ['actu' => $model];
return SitemapHelper::generateUrl($route, $params, $model);
}
/**
* Transform to seoModel
*
* @return \Uwil\Seo\Laravel\Objects\SeoItem
*/
public function toSeoItem(): SeoItem
{
return new SeoItem(
\trans($this->getTable()),
$this->seo_title,
$this->seo_description,
$this->published ?? false,
\route(\config('seo.bo_route_prefix') . $this->getTable() . '.edit', $this),
route('fo.news.show', $this)
);
}
} }

View file

@ -2,24 +2,16 @@
namespace App\Models; namespace App\Models;
use App\Interfaces\OrderableInterface;
use App\Enums\Advices\AdviceTypeEnum; use App\Enums\Advices\AdviceTypeEnum;
use App\Enums\NutriscoreEnum; use App\Enums\NutriscoreEnum;
use App\Enums\Products\ProductSpeciesEnum; use App\Enums\Products\ProductSpeciesEnum;
use App\Lib\Helpers\FileStorageHelper; use App\Lib\Helpers\FileStorageHelper;
use App\Lib\Helpers\ToolboxHelper; use App\Lib\Helpers\ToolboxHelper;
use App\Traits\Models\Orderable;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Spatie\Sitemap\Contracts\Sitemapable;
use Spatie\Sitemap\Tags\Url;
use Uwil\Laravel\Redirections\Interfaces\RedirectableInterface;
use Uwil\Laravel\Redirections\Traits\IsRedirectable;
use Uwil\Seo\Laravel\Interfaces\SeoInterface; use Uwil\Seo\Laravel\Interfaces\SeoInterface;
use Uwil\Seo\Laravel\Objects\SeoItem;
use Uwil\Seo\Laravel\Traits\SeoTrait; use Uwil\Seo\Laravel\Traits\SeoTrait;
use Uwil\SitemapGenerator\Lib\SitemapHelper;
/** /**
* @property integer $id Id. * @property integer $id Id.
@ -36,15 +28,15 @@ use Uwil\SitemapGenerator\Lib\SitemapHelper;
* @property array<string> $slider_pictures Array of paths of pictures. * @property array<string> $slider_pictures Array of paths of pictures.
* @property array<array<string,string>> $packaging Packaging. * @property array<array<string,string>> $packaging Packaging.
* @property array<array<string,string>> $caliber Caliber. * @property array<array<string,string>> $caliber Caliber.
* @property array<array<string,string>> $nutritionnal_values Nutritionnal values.
* @property string $ingredients Ingredients. * @property string $ingredients Ingredients.
* @property string $advantage Advantage. * @property string $advantage Advantage.
* @property string $preparation Preparation. * @property string $preparation Preparation.
* @property boolean $is_frenchpoultry Is frenchpoultry or not. * @property boolean $is_frenchpoultry Is frenchpoultry or not.
* @property boolean $is_vip Is vip or not. * @property boolean $is_vip Is vip or not.
* @property boolean $is_egalim Is egalim or not. * @property boolean $is_egalim Is egalim or not.
* @property boolean $published Status. * @property boolean $status Status.
* @property integer $order Order. * @property integer $order Order.
* @property integer $priority_order Priority Order.
* @property-read \Illuminate\Support\Carbon $created_at Created date. * @property-read \Illuminate\Support\Carbon $created_at Created date.
* @property-read \Illuminate\Support\Carbon $updated_at Updated date. * @property-read \Illuminate\Support\Carbon $updated_at Updated date.
* *
@ -54,12 +46,10 @@ use Uwil\SitemapGenerator\Lib\SitemapHelper;
* @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\News> $news * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\News> $news
* News Belongs-To-Many relation. * News Belongs-To-Many relation.
*/ */
class Product extends Model implements SeoInterface, Sitemapable, RedirectableInterface, OrderableInterface class Product extends Model implements SeoInterface
{ {
use HasFactory; use HasFactory;
use SeoTrait; use SeoTrait;
use IsRedirectable;
use Orderable;
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.
@ -83,11 +73,11 @@ class Product extends Model implements SeoInterface, Sitemapable, RedirectableIn
'slider_pictures', 'slider_pictures',
'packaging', 'packaging',
'caliber', 'caliber',
'nutritionnal_values',
'is_frenchpoultry', 'is_frenchpoultry',
'is_vip', 'is_vip',
'is_egalim', 'is_egalim',
'published', 'status'
'priority_order',
]; ];
/** /**
@ -96,15 +86,16 @@ class Product extends Model implements SeoInterface, Sitemapable, RedirectableIn
* @var array<string,string> * @var array<string,string>
*/ */
protected $casts = [ protected $casts = [
'slider_pictures' => 'array', 'slider_pictures' => 'array',
'packaging' => 'array', 'packaging' => 'array',
'caliber' => 'array', 'caliber' => 'array',
'is_frenchpoultry' => 'bool', 'nutritionnal_values' => 'array',
'is_vip' => 'bool', 'is_frenchpoultry' => 'bool',
'is_egalim' => 'bool', 'is_vip' => 'bool',
'published' => 'bool', 'is_egalim' => 'bool',
'species' => ProductSpeciesEnum::class, 'status' => 'bool',
'nutriscore' => NutriscoreEnum::class 'species' => ProductSpeciesEnum::class,
'nutriscore' => NutriscoreEnum::class
]; ];
/** /**
@ -117,25 +108,16 @@ class Product extends Model implements SeoInterface, Sitemapable, RedirectableIn
// * EVENT CLOSURES. // * EVENT CLOSURES.
static::creating(function (self $model) { static::creating(function (self $model) {
self::manageFields($model); self::manageFields($model);
self::bootOrderable(); $model->order = \intval(self::query()->max('order')) + 1;
}); });
static::updating(function (self $model) { static::updating(function (self $model) {
self::manageFields($model); self::manageFields($model);
}); });
static::updated(function (self $model) { static::updated(function (self $model) {
FileStorageHelper::removeOldFile($model, 'sticker_sm'); FileStorageHelper::removeOldFile($model, 'sticker_sm');
FileStorageHelper::removeOldFiles(
!is_array($model->getOriginal('slider_pictures')) ? [] : $model->getOriginal('slider_pictures'),
$model->slider_pictures
);
}); });
static::deleted(function (self $model) { static::deleted(function (self $model) {
FileStorageHelper::removeFile($model, 'sticker_sm'); FileStorageHelper::removeFile($model, 'sticker_sm');
FileStorageHelper::removeFiles(
$model,
!is_array($model->getOriginal('slider_pictures')) ? [] : $model->getOriginal('slider_pictures'),
);
self::setOrder($model);
}); });
} }
@ -160,16 +142,22 @@ class Product extends Model implements SeoInterface, Sitemapable, RedirectableIn
foreach ($model->caliber as $calib) { foreach ($model->caliber as $calib) {
ToolboxHelper::assertNoInternalBoUrls('caliber', $calib['value']); ToolboxHelper::assertNoInternalBoUrls('caliber', $calib['value']);
} }
foreach ($model->nutritionnal_values as $nutritionnal_value) {
if (!empty($nutritionnal_value['value'])) {
ToolboxHelper::assertNoInternalBoUrls('nutritionnal_values', $nutritionnal_value['value']);
}
}
// * TRANSFORMATIONS // * TRANSFORMATIONS
$model->slug = Str::slug($model->label); $model->slug = Str::slug($model->label);
$model->sticker_sm = FileStorageHelper::storeFile($model, $model->sticker_sm, true); $model->sticker_sm = FileStorageHelper::storeFile($model, $model->sticker_sm, true);
$model->ingredients = clean($model->ingredients); $model->ingredients = clean($model->ingredients);
$model->advantage = clean($model->advantage); $model->advantage = clean($model->advantage);
$model->preparation = clean($model->preparation); $model->preparation = clean($model->preparation);
$model->slider_pictures = clean($model->slider_pictures); $model->slider_pictures = clean($model->slider_pictures);
$model->packaging = clean($model->packaging); $model->packaging = clean($model->packaging);
$model->caliber = clean($model->caliber); $model->caliber = clean($model->caliber);
$model->nutritionnal_values = clean($model->nutritionnal_values);
} }
/** /**
@ -228,20 +216,6 @@ class Product extends Model implements SeoInterface, Sitemapable, RedirectableIn
return $this->recipesQuery()->get(); return $this->recipesQuery()->get();
} }
// * REDIRECTIONS.
/**
* Get the front url of this model.
* Should return the model.show route, with all binded elements if needed.
*
* @param string $modelKey
* @return string
*/
public function getFrontUrl(string $modelKey): string
{
return route('fo.product.show', $modelKey);
}
// * RELATIONSHIPS // * RELATIONSHIPS
/** /**
@ -273,44 +247,4 @@ class Product extends Model implements SeoInterface, Sitemapable, RedirectableIn
{ {
return $this->belongsToMany(News::class); return $this->belongsToMany(News::class);
} }
/**
* Tags Morph-To-Many relationship.
*
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
public function tags(): \Illuminate\Database\Eloquent\Relations\MorphToMany
{
return $this->morphToMany(Tag::class, 'taggable');
}
/**
* toSitemapTag method
*
* @return Url|string|array
*/
public function toSitemapTag(): Url | string | array
{
$model = $this;
$route = 'fo.product.show';
$params = ['publishedProduct' => $model];
return SitemapHelper::generateUrl($route, $params, $model);
}
/**
* Transform to seoModel
*
* @return \Uwil\Seo\Laravel\Objects\SeoItem
*/
public function toSeoItem(): SeoItem
{
return new SeoItem(
\trans($this->getTable()),
$this->seo_title,
$this->seo_description,
$this->published ?? false,
\route(\config('seo.bo_route_prefix') . $this->getTable() . '.edit', $this),
route('fo.product.show', $this)
);
}
} }

View file

@ -11,11 +11,6 @@ use Illuminate\Support\Str;
use Uwil\Seo\Laravel\Interfaces\SeoInterface; use Uwil\Seo\Laravel\Interfaces\SeoInterface;
use Uwil\Seo\Laravel\Objects\SeoItem; use Uwil\Seo\Laravel\Objects\SeoItem;
use Uwil\Seo\Laravel\Traits\SeoTrait; use Uwil\Seo\Laravel\Traits\SeoTrait;
use Spatie\Sitemap\Contracts\Sitemapable;
use Spatie\Sitemap\Tags\Url;
use Uwil\Laravel\Redirections\Interfaces\RedirectableInterface;
use Uwil\Laravel\Redirections\Traits\IsRedirectable;
use Uwil\SitemapGenerator\Lib\SitemapHelper;
/** /**
* @property integer $id Id. * @property integer $id Id.
@ -37,11 +32,10 @@ use Uwil\SitemapGenerator\Lib\SitemapHelper;
* @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Subrange> $subranges * @property-read \Illuminate\Database\Eloquent\Collection<\App\Models\Subrange> $subranges
* Subranges Has-Many relationship. * Subranges Has-Many relationship.
*/ */
class Range extends Model implements SeoInterface, Sitemapable, RedirectableInterface class Range extends Model implements SeoInterface
{ {
use HasFactory; use HasFactory;
use SeoTrait; use SeoTrait;
use IsRedirectable;
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.
@ -114,30 +108,6 @@ class Range extends Model implements SeoInterface, Sitemapable, RedirectableInte
ToolboxHelper::assertFieldIsUnique($table, 'slug', Str::slug($label), $id); ToolboxHelper::assertFieldIsUnique($table, 'slug', Str::slug($label), $id);
} }
// * REDIRECTIONS.
/**
* All models that belongs to it.
*
* @return array<string>
*/
protected function getRouteChildrenModels(): array
{
return ['App\Models\Subrange'];
}
/**
* Get the front url of this model.
* Should return the model.show route, with all binded elements if needed.
*
* @param string $modelKey
* @return string
*/
public function getFrontUrl(string $modelKey): string
{
return route('fo.products.range-products', $modelKey);
}
// * RELATIONSHIPS // * RELATIONSHIPS
/** /**
@ -168,17 +138,4 @@ class Range extends Model implements SeoInterface, Sitemapable, RedirectableInte
\route('fo.products.range-products', $this) \route('fo.products.range-products', $this)
); );
} }
/**
* toSitemapTag method
*
* @return Url|string|array
*/
public function toSitemapTag(): Url | string | array
{
$model = $this;
$route = 'fo.products.range-products';
$params = ['range' => $model];
return SitemapHelper::generateUrl($route, $params, $model);
}
} }

View file

@ -23,7 +23,6 @@ use Illuminate\Validation\ValidationException;
* @property string $picture_thumbnail_alt Thumbnail picture's attribute alt. * @property string $picture_thumbnail_alt Thumbnail picture's attribute alt.
* @property string $picture_thumbnail_title Thumbnail picture's attribute title. * @property string $picture_thumbnail_title Thumbnail picture's attribute title.
* @property integer $order Order. * @property integer $order Order.
* @property boolean $published Is the slide published ?
* @property-read \Illuminate\Support\Carbon $created_at Created date. * @property-read \Illuminate\Support\Carbon $created_at Created date.
* @property-read \Illuminate\Support\Carbon $updated_at Updated date. * @property-read \Illuminate\Support\Carbon $updated_at Updated date.
*/ */
@ -49,8 +48,7 @@ class Slide extends Model
'picture_thumbnail', 'picture_thumbnail',
'picture_thumbnail_alt', 'picture_thumbnail_alt',
'picture_thumbnail_title', 'picture_thumbnail_title',
'order', 'order'
'published'
]; ];
/** /**
@ -59,9 +57,8 @@ class Slide extends Model
* @var array<string,string> * @var array<string,string>
*/ */
protected $casts = [ protected $casts = [
'button_display' => 'bool', 'button_display' => 'bool',
'button_targetblank' => 'bool', 'button_targetblank' => 'bool'
'published' => 'bool'
]; ];
/** /**
@ -72,6 +69,9 @@ class Slide extends Model
protected static function booted(): void protected static function booted(): void
{ {
static::creating(function (self $model) { static::creating(function (self $model) {
if (count(self::get()) >= 4) {
self::assertNumberOfSlides();
}
self::manageFields($model); self::manageFields($model);
$model->order = \intval(self::query()->max('order')) + 1; $model->order = \intval(self::query()->max('order')) + 1;
}); });
@ -82,8 +82,10 @@ class Slide extends Model
FileStorageHelper::removeOldFile($model, 'picture'); FileStorageHelper::removeOldFile($model, 'picture');
FileStorageHelper::removeOldFile($model, 'picture_thumbnail'); FileStorageHelper::removeOldFile($model, 'picture_thumbnail');
}); });
static::deleting(function (self $model) { static::deleting(function () {
self::assertNumberOfSlides($model, true); if (1 >= count(self::get())) {
self::assertNumberOfSlides();
}
}); });
static::deleted(function (self $model) { static::deleted(function (self $model) {
FileStorageHelper::removeFile($model, 'picture'); FileStorageHelper::removeFile($model, 'picture');
@ -102,7 +104,6 @@ class Slide extends Model
private static function manageFields(self $model): void private static function manageFields(self $model): void
{ {
self::assertTitleIsUnique($model->title, $model->id); self::assertTitleIsUnique($model->title, $model->id);
self::assertNumberOfSlides($model);
ToolboxHelper::assertNoInternalBoUrls($model->content, 'content'); ToolboxHelper::assertNoInternalBoUrls($model->content, 'content');
$model->content = clean($model->content); $model->content = clean($model->content);
if ($model->button_url) { if ($model->button_url) {
@ -116,31 +117,14 @@ class Slide extends Model
/** /**
* Asserts the number of slides in the slider. * Asserts the number of slides in the slider.
* *
* @param self $model
* @param boolean $isDeleting
* @return void * @return void
* @throws \Illuminate\Validation\ValidationException If there is less 1 or more than 4 slides. * @throws \Illuminate\Validation\ValidationException If there is less 1 or more than 4 slides.
*/ */
private static function assertNumberOfSlides(self $model, bool $isDeleting = false): void private static function assertNumberOfSlides(): void
{ {
if ( throw ValidationException::withMessages([
$isDeleting && 'Opération impossible, minimum un et maximum quatre slides doivent être présentes.'
$model->published && ]);
self::query()->where('published', true)->count() <= 1
) {
throw ValidationException::withMessages(
[trans('Minimum 1 slide doit être publiée, la slide n\'a pas été supprimée.')]
);
}
if ($model->published !== $model->getOriginal('published')) {
if (self::query()->where('published', true)->count() + 1 > 4 && $model->published) {
$model->published = false;
\session()->flash('info', \trans('Maximum 4 slides peuvent être publiées, la slide a été dépubliée.'));
} elseif (self::query()->where('published', true)->count() <= 1 && !$model->published) {
$model->published = true;
\session()->flash('info', \trans('Minimum 1 slide doit être publiée, la slide a été publiée.'));
}
}
} }
/** /**

View file

@ -2,7 +2,6 @@
namespace App\Models; namespace App\Models;
use App\Enums\TagTypeEnum;
use App\Lib\Helpers\ToolboxHelper; use App\Lib\Helpers\ToolboxHelper;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@ -12,7 +11,6 @@ use Illuminate\Support\Str;
* @property integer $id Id. * @property integer $id Id.
* @property string $slug Slug. * @property string $slug Slug.
* @property string $label Label. * @property string $label Label.
* @property \App\Enums\TagTypeEnum $type Type (ENUM).
* @property-read \Illuminate\Support\Carbon $created_at Created date. * @property-read \Illuminate\Support\Carbon $created_at Created date.
* @property-read \Illuminate\Support\Carbon $updated_at Updated date. * @property-read \Illuminate\Support\Carbon $updated_at Updated date.
* *
@ -29,17 +27,7 @@ class Tag extends Model
* @var array<int, string> * @var array<int, string>
*/ */
protected $fillable = [ protected $fillable = [
'label', 'label'
'type',
];
/**
* The attributes that should be cast.
*
* @var array<string,string>
*/
protected $casts = [
'type' => TagTypeEnum::class,
]; ];
/** /**
@ -90,14 +78,4 @@ class Tag extends Model
{ {
return $this->morphedByMany(Advice::class, 'taggable'); return $this->morphedByMany(Advice::class, 'taggable');
} }
/**
* Product Morphed-By-Many relation.
*
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
public function products(): \Illuminate\Database\Eloquent\Relations\MorphToMany
{
return $this->morphedByMany(Product::class, 'taggable');
}
} }

View file

@ -1,26 +0,0 @@
<?php
namespace App\Providers;
use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider;
use LDC\LDCCRM\CrmApiV4;
class CrmApiServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot(): void
{
App::singleton('crmAPI', function () {
return new CrmApiV4(
config('crm.endpoint'),
config('crm.token'),
config('crm.password')
);
});
}
}

View file

@ -3,7 +3,6 @@
namespace App\Providers; namespace App\Providers;
use App\Models\Advice; use App\Models\Advice;
use App\Models\BrigadeSection;
use App\Models\ExpertiseProduct; use App\Models\ExpertiseProduct;
use App\Models\News; use App\Models\News;
use App\Models\NewsCategory; use App\Models\NewsCategory;
@ -58,7 +57,6 @@ class RouteServiceProvider extends ServiceProvider
Route::model('range', Range::class); Route::model('range', Range::class);
Route::model('product', Product::class); Route::model('product', Product::class);
Route::model('advice', Advice::class); Route::model('advice', Advice::class);
Route::model('brigade_section', BrigadeSection::class);
} }
Route::bind('actu', function ($value) { Route::bind('actu', function ($value) {
@ -67,7 +65,7 @@ class RouteServiceProvider extends ServiceProvider
// * Front binded Models // * Front binded Models
Route::bind('publishedAdvice', function ($value) { Route::bind('publishedAdvice', function ($value) {
return Advice::where('slug', $value)->where('published', true)->firstOrFail(); return Advice::where('slug', $value)->where('status', true)->firstOrFail();
}); });
} }
@ -112,11 +110,8 @@ class RouteServiceProvider extends ServiceProvider
})->all(); })->all();
// * Filter array keys // * Filter array keys
$cspReport = collect(array_intersect_key($cspReport, [ $cspReport = collect(array_intersect_key($cspReport, [
'blocked-uri' => '', 'blocked-uri' => '', 'document-uri' => '', 'original-policy' => '',
'document-uri' => '', 'referrer' => '', 'violated-directive' => ''
'original-policy' => '',
'referrer' => '',
'violated-directive' => ''
])); ]));
\Illuminate\Support\Facades\Log::warning(sprintf( \Illuminate\Support\Facades\Log::warning(sprintf(
"CSP REPORT for %s : \n %s", "CSP REPORT for %s : \n %s",

View file

@ -1,83 +0,0 @@
<?php
namespace App\Rules;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Support\Str;
/**
* Check the length of a Wysiwyg field, excluding tags and end spaces.
*
* @package App\Rules
*/
class WysiwygLength implements ValidationRule
{
/**
* Construct method.
*
* @param integer $min The minimum length of the content (excluding tags). Default is 15.
* @param integer|null $max The maximum length of the content (excluding tags).
* Default is null (max will be defined by the type of the column in DB).
* @return void
* @throws \InvalidArgumentException If $max < $min.
*/
public function __construct(private int $min = 15, private int|null $max = null)
{
if ($max !== null && $max < $min && $min < 0) {
throw new \InvalidArgumentException(sprintf(
'$max should be higher than $min. $max = %d. $min = %d.',
$max,
$min
));
}
}
/**
* Run the validation rule.
*
* @param string $attribute
* @param mixed $value
* @param \Closure $fail
*
* @return void
*/
public function validate(string $attribute, mixed $value, \Closure $fail): void
{
$length = Str::length(\strip_tags($value));
$translatedAttribute = self::getTranslatedAttribute($attribute);
if (!\is_null($this->max) and !($length >= $this->min && $length <= $this->max)) {
$fail(trans('validation.between.string', [
'attribute' => $translatedAttribute,
'min' => $this->min,
'max' => $this->max
]));
return;
}
if ($length < $this->min) {
$fail(trans('validation.min.string', [
'attribute' => $translatedAttribute,
'min' => $this->min
]));
}
}
/**
* Get the correct translation for the given attrribute.
*
* @param string $attribute
* @return string
*/
private static function getTranslatedAttribute(string $attribute): string
{
/** @var \Illuminate\Translation\Translator $trans */
$trans = trans();
if ($trans->has('validation.attributes.' . $attribute)) {
return trans('validation.attributes.' . $attribute);
}
if ($trans->has('validation.custom.' . $attribute)) {
return trans('validation.custom.' . $attribute);
}
return $attribute;
}
}

View file

@ -3,7 +3,7 @@
namespace App\Traits\Controllers; namespace App\Traits\Controllers;
use App\Http\Requests\Bo\UpdateChangeOrderRequest; use App\Http\Requests\Bo\UpdateChangeOrderRequest;
use Illuminate\Support\Arr; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Session;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -14,16 +14,15 @@ trait ChangesModelOrder
* Change order. * Change order.
* *
* @param \App\Http\Requests\Bo\UpdateChangeOrderRequest $request * @param \App\Http\Requests\Bo\UpdateChangeOrderRequest $request
* @param mixed ...$params * @param \Illuminate\Database\Eloquent\Model $model
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
* @throws \RuntimeException Si le nom du parametre de la route ne correspond pas au model utilisé. * @throws \RuntimeException Si le nom du parametre de la route ne correspond pas au model utilisé.
*/ */
public function changeOrder(UpdateChangeOrderRequest $request, mixed ...$params): \Illuminate\Http\RedirectResponse public function changeOrder(UpdateChangeOrderRequest $request, Model $model): \Illuminate\Http\RedirectResponse
{ {
$paramNames = collect(request()->route()->parameterNames); $params = collect(request()->route()->parameterNames);
$className = Str::of($paramNames->get($paramNames->count() - 2))->lower()->studly(); $className = Str::ucfirst(Str::lower($params->get($params->count() - 2)));
$className = "\\App\\Models\\$className"; $className = "\\App\\Models\\$className";
$model = Arr::get($params, $paramNames->count() - 2);
if (!class_exists($className)) { if (!class_exists($className)) {
throw new \RuntimeException("The $className class doesn't exist."); throw new \RuntimeException("The $className class doesn't exist.");

View file

@ -1,55 +0,0 @@
<?php
namespace App\Traits\Controllers;
use App\Http\Requests\Bo\UpdateOrderRequest;
use App\Interfaces\OrderableInterface;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\DB;
trait ManagesOrder
{
/**
* Updates the order of a model and reorders all impacted elements.
*
* Shifts by +1 or -1 all elements located between the old
* and new position of the model, then assigns the new position
* to the target model. The whole operation runs inside a
* database transaction to ensure data consistency.
*
* @param UpdateOrderRequest $request The validated request containing the 'priority' field.
* @param Model&OrderableInterface $model The model to reorder (must use the Orderable trait).
* @return RedirectResponse
*
* @throws \Throwable Returns if save fail.
*/
public function changeOrderPriority(UpdateOrderRequest $request, Model&OrderableInterface $model): RedirectResponse
{
$newPriority = (int) $request->validated('priority_order');
return DB::transaction(function () use ($model, $newPriority): RedirectResponse {
$query = $model::query()
->whereKeyNot($model)
->whereBetween('priority_order', [
min($model->getPriorityOrder(), $newPriority),
max($model->getPriorityOrder(), $newPriority),
]);
$groupField = $model->getOrderGroupField();
if ($groupField) {
$query->where($groupField, $model->{$groupField});
}
$model->getPriorityOrder() < $newPriority
? $query->decrement('priority_order', 1)
: $query->increment('priority_order', 1);
$model->setAttribute('priority_order', $newPriority);
$model->saveOrFail();
return redirect()->back()->with('success', trans('crud.messages.order_changed'));
});
}
}

View file

@ -20,6 +20,6 @@ trait UpdateModelPublished
public function changePublished(Model $model) public function changePublished(Model $model)
{ {
$model->update(['published' => !$model->getOriginal('published')]); $model->update(['published' => !$model->getOriginal('published')]);
return redirect()->back()->with('success', trans('crud.messages.publish_status_saved')); return redirect()->back()->with('success', trans(__('crud.messages.publish_status_saved')));
} }
} }

View file

@ -1,78 +0,0 @@
<?php
namespace App\Traits\Models;
use App\Interfaces\OrderableInterface;
use Illuminate\Database\Eloquent\Model;
trait Orderable
{
/**
* @property int $priority_order
*/
/**
* Returns the grouping field used for ordering.
* Returns null if the order is global
*
* @return string|null
*/
public function getOrderGroupField(): ?string
{
return null;
}
/**
* Returns the priority order value of the model.
*
* @return integer
*/
public function getPriorityOrder(): int
{
return $this->priority_order ?? 0;
}
/**
* shifts down by 1 all elements positioned after the delete.
*
* @param Model&OrderableInterface $model
* @return void
*/
public static function setOrder(OrderableInterface $model): void
{
$groupField = $model->getOrderGroupField();
$query = $model::query()->where('priority_order', '>', $model->getPriorityOrder());
if ($groupField) {
$query->where($groupField, $model->{$groupField});
}
$query->each(function (Model $item): void {
/** @var Model&OrderableInterface $item */
$item->setAttribute('priority_order', $item->getPriorityOrder() - 1);
$item->saveOrFail();
});
}
/**
* Assigns the next order value on creation.
*
* @return void
*/
public static function bootOrderable(): void
{
static::creating(function (Model $model): void {
/** @var Model&OrderableInterface $model */
if (!$model->getPriorityOrder()) {
$groupField = $model->getOrderGroupField();
$query = static::query();
if ($groupField) {
$query->where($groupField, $model->{$groupField});
}
$model->setAttribute('priority_order', ($query->max('priority_order') ?? 0) + 1);
}
});
}
}

View file

@ -112,7 +112,8 @@ trait HasPicture
]; ];
return [ return [
$name => [!$nullable ? 'required' : 'nullable', 'array', "between:{$limitMin},{$limitMax}"], $name => [!$nullable ? 'required' : 'nullable', 'array', "between:{$limitMin},{$limitMax}"],
"{$name}.*" => [ "{$name}Validate" => "required_with:{$name}|array",
"{$name}Validate.*" => [
'required', 'required',
function (string $attribute, $value, callable $fail) use ($sizes) { function (string $attribute, $value, callable $fail) use ($sizes) {
ToolboxHelper::validatePicture($attribute, $value, $fail, $sizes); ToolboxHelper::validatePicture($attribute, $value, $fail, $sizes);

View file

@ -12,28 +12,25 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^8.5", "php": "^8.2",
"24slides/laravel-saml2": "^2.4", "24slides/laravel-saml2": "^2.4",
"axlon/laravel-postal-code-validation": "^3.4", "axlon/laravel-postal-code-validation": "^3.4",
"carlos-meneses/laravel-mpdf": "^2.1.13", "carlos-meneses/laravel-mpdf": "^2.1.13",
"diglactic/laravel-breadcrumbs": "^9.0", "diglactic/laravel-breadcrumbs": "^8.1.1",
"guzzlehttp/guzzle": "^7.2", "guzzlehttp/guzzle": "^7.2",
"kaishiyoku/laravel-color-validation": "*", "kaishiyoku/laravel-color-validation": "^2.1.1",
"laravel/framework": "^11.0", "kwaadpepper/image-resizer": "^2.1.0",
"laravel/framework": "^10.0",
"laravel/tinker": "^2.8", "laravel/tinker": "^2.8",
"laravel/ui": "^4.2", "laravel/ui": "^4.2",
"ldc/ldccrmv4client": "^4.0", "ldc/sitemap-generator": "^2.0",
"ldc/web-admin-secure-laravel": "^2.0.0",
"mews/purifier": "^3.4", "mews/purifier": "^3.4",
"propaganistas/laravel-phone": "^5.0.3", "propaganistas/laravel-phone": "^5.0.3",
"sentry/sentry-laravel": "^4.9", "sentry/sentry-laravel": "^3.8",
"spatie/calendar-links": "^1.8.5", "spatie/calendar-links": "^1.8.5",
"uwil/admin-secure-laravel": "^5.0",
"uwil/k8s-laravel": "^1.2", "uwil/k8s-laravel": "^1.2",
"uwil/laravel-common": "^2.0", "uwil/seo-laravel": "^1.0"
"uwil/laravel-redirections": "^2.0",
"uwil/seo-laravel": "^3.0",
"uwil/sitemap-generator": "^3.0",
"verschuur/laravel-robotstxt": "^5.1"
}, },
"require-dev": { "require-dev": {
"doctrine/dbal": "^3.3", "doctrine/dbal": "^3.3",
@ -43,7 +40,7 @@
"laravel/pint": "^1.0", "laravel/pint": "^1.0",
"laravel/sail": "^1.18", "laravel/sail": "^1.18",
"mockery/mockery": "^1.4.4", "mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^8.1", "nunomaduro/collision": "^7.0",
"phpunit/phpunit": "^10.0", "phpunit/phpunit": "^10.0",
"slevomat/coding-standard": "^8.10", "slevomat/coding-standard": "^8.10",
"spatie/laravel-ignition": "^2.3" "spatie/laravel-ignition": "^2.3"
@ -94,10 +91,7 @@
"pestphp/pest-plugin": true, "pestphp/pest-plugin": true,
"php-http/discovery": true, "php-http/discovery": true,
"dealerdirect/phpcodesniffer-composer-installer": true "dealerdirect/phpcodesniffer-composer-installer": true
}, }
"gitlab-domains": [
"lab.s-web.fr"
]
}, },
"minimum-stability": "stable", "minimum-stability": "stable",
"prefer-stable": true "prefer-stable": true

6100
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -179,7 +179,6 @@ return [
App\Providers\EventServiceProvider::class, App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class, App\Providers\RouteServiceProvider::class,
App\Providers\ViewServiceProvider::class, App\Providers\ViewServiceProvider::class,
App\Providers\CrmApiServiceProvider::class,
], ],
/* /*

View file

@ -1,7 +0,0 @@
<?php
return [
'endpoint' => env('CRM_ENDPOINT'),
'token' => env('CRM_TOKEN'),
'password' => env('CRM_PASSWORD')
];

View file

@ -5,7 +5,7 @@ return [
* The php image driver to use * The php image driver to use
* this can be 'imagick' or 'gd' * this can be 'imagick' or 'gd'
*/ */
'driver' => 'imagick', 'driver' => 'gd',
/** /**
* The cache driver to use as defined * The cache driver to use as defined
@ -57,9 +57,6 @@ return [
* ] * ]
*/ */
'templates' => [ 'templates' => [
'toWebp' => [
'format' => 'webp'
],
'tipsBigCard' => [ 'tipsBigCard' => [
'height' => 300, 'height' => 300,
'width' => 370, 'width' => 370,

View file

@ -120,6 +120,6 @@ return [
*/ */
'contactsList' => [ 'contactsList' => [
'contactform' => array_filter(explode(',', env('MAIL_LIST_CONTACTFORM', '') ?? '')), 'contactform' => env('MAIL_LIST_CONTACTFORM')
] ]
]; ];

View file

@ -1,20 +0,0 @@
<?php
return [
'environments' => [
'production' => [
'paths' => [
'*' => [
'disallow' => [
'/bo',
'*.pdf$'
],
'allow' => []
],
],
'sitemaps' => [
'sitemap.xml'
]
]
]
];

View file

@ -51,14 +51,10 @@ return [
'missing_routes' => false, 'missing_routes' => false,
], ],
/** // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#send-default-pii.
* @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#send-default-pii.
*/
'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false), 'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false),
/** // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate.
* @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate.
*/
'traces_sample_rate' => env('SENTRY_TRACES_SAMPLE_RATE') === null ? null : (float)env('SENTRY_TRACES_SAMPLE_RATE'), 'traces_sample_rate' => env('SENTRY_TRACES_SAMPLE_RATE') === null ? null : (float)env('SENTRY_TRACES_SAMPLE_RATE'),
'before_send' => [\App\Lib\Helpers\ExceptionsHelper::class, 'sentryEventHandler'], 'before_send' => [\App\Lib\Helpers\ExceptionsHelper::class, 'sentryEventHandler'],

View file

@ -1,88 +1,77 @@
<?php <?php
use App\Lib\CompleteSitemapWith;
use Spatie\Sitemap\Tags\Url;
return [ return [
/** /**
* Single route names * A list of url to ignore
* These are hard coded
* Each url does not have to be exhaustive
* *
* Ex: * For example, if you want to ignore all routes
* of the backoffice group
* just add 'bo' into this table
* *
* 'singlePages' => [ * * Note that this can take route names (both partially or full)
* 'homepage', * * You can use a wild card just as for routeIs method
* ],
*/ */
'singlePages' => [ 'ignoreRoutes' => [
'fo.homepage', 'back.*',
'fo.adn.adn', 'bo.*',
'fo.adn.btob', 'front.frame',
'fo.adn.breeder', 'cspReportUri',
'fo.engagments.francais',
'fo.engagments.eleverdurablement',
'fo.engagments.biennourrir',
'fo.engagments.respecterlaterre',
'fo.engagments.vivreensemble',
'fo.expertise.canard',
'fo.expertise.dinde',
'fo.expertise.lapin',
'fo.expertise.pintade',
'fo.expertise.poulet',
'fo.ideas.ideas',
'fo.ideas.tips.index',
'fo.ideas.recipes.index',
'fo.products.index',
'fo.news.index',
'fo.contact.show',
'fo.group',
'fo.trade',
'fo.dealer',
'fo.baker',
'fo.policies',
'fo.legals',
'fo.search'
], ],
/** /**
* Model namespaces with filters * This should be filled using the command `php artisan sitemap:install-completer`
* *
* Ex: * 'completeWith' => [CLASS, 'METHOD'],
* 'cruds' => [ * eg : 'completeWith' => [CompleteSitemapWith::class, 'append'],
* [ *
* 'model' => 'App\Models\Product', * This should point to a static method which will be called with the folowing parameter
* 'filters' => [ * (LDC\SitemapGenerator\Lib\Sitemap $sitemap)
* ['published', '=', true] *
* ] * You may now use $sitemap->addLinks('route.myRouteName', string[] $links)
* ],
* [
* 'model' => 'App\Models\Article',
* 'filters' => []
* ]
* ],
*/ */
'cruds' => [ 'completeWith' => [CompleteSitemapWith::class, 'append'],
[
'model' => 'App\Models\Advice', /**
'filters' => [ * The default route frequency to use with sitemap generator
['published', '=', true] */
] 'routeDefaultFrequency' => Url::CHANGE_FREQUENCY_DAILY,
],
[ /**
'model' => 'App\Models\Range', * The default route priority to use with sitemap generator
'filters' => [] *
], * priority should be a number between 0 and 1
[ * https://www.sitemaps.org/protocol.html
'model' => 'App\Models\Product', */
'filters' => [ 'routeDefaultPriority' => 0.5,
['published', '=', true]
] /**
], * Frequencies for routes
[ * use the full or partial route name as index
'model' => 'App\Models\News', * and a frequency within \Spatie\Sitemap\Tags\Url constants
'filters' => [ *
['published', '=', true] * eg: 'engagments.*' => \Spatie\Sitemap\Tags\Url::CHANGE_FREQUENCY_HOURLY
] */
] 'routeFrequencies' => [
'news.show' => Url::CHANGE_FREQUENCY_HOURLY
], ],
/**
* Priorities for routes
* use the full or partial route name as index
* and a priority in 1.0, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1, and 0.0.
*
* 1.0 is the Highest
*
* eg: 'engagments.*' => 1.0
*/
'routePriorities' => [],
/** /**
* Enable or disable schedule for the job * Enable or disable schedule for the job
* If set to true the sitemap generator will be run * If set to true the sitemap generator will be run
@ -101,4 +90,13 @@ return [
* Default is every day at 15:45 * Default is every day at 15:45
*/ */
'cron' => '45 15 * * *', 'cron' => '45 15 * * *',
/**
* The sitemap generator can execute JavaScript on each page so it will
* discover links that are generated by your JS scripts. This feature
* is powered by headless Chrome.
*
* ! This needs pupetter installed with npm : npm i puppeteer (not to put in dev dependencies)
*/
'executeJavascript' => false,
]; ];

View file

@ -81,7 +81,7 @@ class AdviceFactory extends Factory
'cooking_time' => $cooking_time, 'cooking_time' => $cooking_time,
'preparation_time' => $preparation_time, 'preparation_time' => $preparation_time,
'difficulty' => $difficulty, 'difficulty' => $difficulty,
'published' => $this->faker->boolean(75) 'status' => $this->faker->boolean(75)
]; ];
} }
} }

View file

@ -56,7 +56,7 @@ class NewsFactory extends Factory
'event_start' => $eventStart, 'event_start' => $eventStart,
'event_end' => $eventEnd, 'event_end' => $eventEnd,
'event_text' => $eventText, 'event_text' => $eventText,
'published' => $this->faker->boolean(75) 'status' => $this->faker->boolean(75)
]; ];
} }
} }

View file

@ -38,6 +38,14 @@ class ProductFactory extends Factory
]); ]);
} }
$nutritionnal_values = [];
for ($jj = 1; $jj <= 9; $jj++) {
array_push($nutritionnal_values, [
"label" => $this->faker->unique()->words(rand(2, 8), true),
"value" => $this->faker->numberBetween(6, 30)
]);
}
$label = $this->faker->unique()->words(rand(2, 4), true); $label = $this->faker->unique()->words(rand(2, 4), true);
return [ return [
@ -51,13 +59,14 @@ class ProductFactory extends Factory
'sticker_sm_alt' => $this->faker->words(8, true), 'sticker_sm_alt' => $this->faker->words(8, true),
'packaging' => $packaging, 'packaging' => $packaging,
'caliber' => $caliber, 'caliber' => $caliber,
'nutritionnal_values' => $nutritionnal_values,
'ingredients' => $this->faker->unique()->words(rand(15, 25), true), 'ingredients' => $this->faker->unique()->words(rand(15, 25), true),
'advantage' => $this->faker->unique()->words(rand(15, 25), true), 'advantage' => $this->faker->unique()->words(rand(15, 25), true),
'preparation' => $this->faker->unique()->words(rand(15, 25), true), 'preparation' => $this->faker->unique()->words(rand(15, 25), true),
'is_frenchpoultry' => $this->faker->boolean(75), 'is_frenchpoultry' => $this->faker->boolean(75),
'is_vip' => $this->faker->boolean(25), 'is_vip' => $this->faker->boolean(25),
'is_egalim' => $this->faker->boolean(25), 'is_egalim' => $this->faker->boolean(25),
'published' => $this->faker->boolean(75) 'status' => $this->faker->boolean(75)
]; ];
} }
} }

View file

@ -44,8 +44,7 @@ class SlideFactory extends Factory
'picture_alt' => $picture_alt, 'picture_alt' => $picture_alt,
'picture_title' => $picture_title, 'picture_title' => $picture_title,
'picture_thumbnail_alt' => $picture_alt, 'picture_thumbnail_alt' => $picture_alt,
'picture_thumbnail_title' => $picture_title, 'picture_thumbnail_title' => $picture_title
'published' => $this->faker->boolean(),
]; ];
} }
} }

View file

@ -1,35 +0,0 @@
<?php
use App\Models\Slide;
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('slides', function (Blueprint $table) {
$table->boolean('published')->comment('Is the slide published ?')
->after('order');
});
Slide::query()->update(['published' => true]);
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down(): void
{
Schema::table('slides', function (Blueprint $table) {
$table->dropColumn('published');
});
}
};

View file

@ -1,44 +0,0 @@
<?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('advice', function (Blueprint $table) {
$table->renameColumn('status', 'published');
});
Schema::table('news', function (Blueprint $table) {
$table->renameColumn('status', 'published');
});
Schema::table('products', function (Blueprint $table) {
$table->renameColumn('status', 'published');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down(): void
{
Schema::table('advice', function (Blueprint $table) {
$table->renameColumn('published', 'status');
});
Schema::table('news', function (Blueprint $table) {
$table->renameColumn('published', 'status');
});
Schema::table('products', function (Blueprint $table) {
$table->renameColumn('published', 'status');
});
}
};

View file

@ -1,32 +0,0 @@
<?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('products', function (Blueprint $table) {
$table->dropColumn('nutritionnal_values');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down(): void
{
Schema::table('products', function (Blueprint $table) {
$table->json('nutritionnal_values')->comment('Valeurs nutritionnelles du produit')->nullable();
});
}
};

View file

@ -1,40 +0,0 @@
<?php
use App\Models\Product;
use App\Models\Range;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up(): void
{
Range::with('subranges.products')->get()->map(function ($range) {
$range->subranges->flatMap(function ($subrange) {
return $subrange->products;
})->map(function ($product, $productIndex) {
$product->order = $productIndex + 1;
$product->saveQuietly();
});
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down(): void
{
Product::query()->get()->map(function ($product, $productIndex) {
$product->order = $productIndex + 1;
$product->saveQuietly();
});
}
};

View file

@ -1,29 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('tags', function (Blueprint $table) {
// Default is 'recipes' because actually, it is only used for this model.
$table->unsignedTinyInteger('type')->default(1)->comment('ENUM - Type of the tag')->after('slug');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('tags', function (Blueprint $table) {
$table->dropColumn('type');
});
}
};

View file

@ -1,38 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('brigade_sections', function (Blueprint $table) {
$table->id();
$table->string('title', 500)->comment('Title of the section');
$table->text('content')->comment('WYSIWYG - Content of the section');
$table->string('picture')->comment('Picture of the section');
$table->string('picture_alt')->comment('Alt attribute for the picture');
$table->string('picture_title')->comment('Title attribute for the picture');
$table->string('button_text')->nullable()->comment('Text of the CTA');
$table->string('button_url')->nullable()->comment('URL the CTA');
$table->boolean('button_newtab')->comment('Should the URL be opened in a new tab ?');
$table->boolean('button_display')->comment('Should the CTA be displayed ?');
$table->unsignedTinyInteger('order')->comment('Order of the section');
$table->boolean('published')->comment('Is the section visible ?');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('brigade_sections');
}
};

View file

@ -1,38 +0,0 @@
<?php
use App\Models\Product;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('products', function (Blueprint $table) {
$table->unsignedInteger('priority_order')->comment('Ordre de priorite')->default(0)->after('order');
});
$order = 1;
Product::query()
->orderBy('order')
->each(function (Product $product) use (&$order) {
$product->priority_order = $order++;
$product->saveOrFail();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('products', function (Blueprint $table) {
$table->dropColumn('priority_order');
});
}
};

View file

@ -1,43 +0,0 @@
<?php
use App\Enums\Advices\AdviceTypeEnum;
use App\Models\Advice;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('advice', function (Blueprint $table) {
$table->unsignedInteger('priority_order')->comment('Ordre de priorite')->default(0)->after('published');
});
// loop through all types and in each type we order
Advice::query()->select('type')->pluck('type')
->each(function (AdviceTypeEnum $type) {
$order = 1;
Advice::query()
->where('type', $type)
->orderBy('created_at')
->each(function (Advice $advice) use (&$order) {
$advice->priority_order = $order++;
$advice->saveOrFail();
});
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('advice', function (Blueprint $table) {
$table->dropColumn('priority_order');
});
}
};

View file

@ -1,26 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('products', function (Blueprint $table) {
$table->dropColumn('order');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
$table->integer('order')->comment('Ordre du slide');
}
};

View file

@ -21,7 +21,7 @@ class ExpertiseProductSeeder extends Seeder
ExpertiseProduct::factory(rand(0, 3))->make()->each( ExpertiseProduct::factory(rand(0, 3))->make()->each(
// @phpstan-ignore-next-line // @phpstan-ignore-next-line
function (ExpertiseProduct $expertiseProduct) use ($enum) { function (ExpertiseProduct $expertiseProduct) use ($enum) {
$expertiseProduct->page = ExpertiseProductPageEnum::make($enum->value); $expertiseProduct->page = $enum;
$expertiseProduct->saveQuietly(); $expertiseProduct->saveQuietly();
} }
); );

View file

@ -647,18 +647,5 @@ class StaticPageSeeder extends Seeder
viande désossée et goûteuse, aux atouts nutritionnels indiscutables.</p>', viande désossée et goûteuse, aux atouts nutritionnels indiscutables.</p>',
] ]
); );
// Sitemap.
StaticPage::query()->updateOrCreate(
[
'type' => StaticPageType::sitemap,
],
[
'seo_title' => 'Plan du site',
'seo_description' => 'Plan du site internet Le Gaulois Professionnel',
'title' => 'Plan du site',
'type' => StaticPageType::sitemap,
'content' => '',
]
);
} }
} }

View file

@ -8,9 +8,9 @@ data:
APP_ENV: "${APP_APP_ENV}" APP_ENV: "${APP_APP_ENV}"
APP_KEY: "${APP_APP_KEY}" APP_KEY: "${APP_APP_KEY}"
APP_DEBUG: "${APP_APP_DEBUG}" APP_DEBUG: "${APP_APP_DEBUG}"
APP_URL: "https://${REDIRECT}${APP_DOMAIN}" APP_URL: "https://www.${APP_DOMAIN}"
LOG_CHANNEL: "k8s" LOG_CHANNEL: "k8s"
DB_HOST: "${APP_DB_HOST}" DB_HOST: "mariadb.common-services"
DB_DATABASE: "${APP_DB_DATABASE}" DB_DATABASE: "${APP_DB_DATABASE}"
DB_USERNAME: "${APP_DB_USERNAME}" DB_USERNAME: "${APP_DB_USERNAME}"
DB_PASSWORD: "${APP_DB_PASSWORD}" DB_PASSWORD: "${APP_DB_PASSWORD}"
@ -22,6 +22,7 @@ data:
MAIL_FROM_ADDRESS: "${APP_MAIL_FROM_ADDRESS}" MAIL_FROM_ADDRESS: "${APP_MAIL_FROM_ADDRESS}"
MAIL_FROM_NAME: "${APP_APP_NAME}" MAIL_FROM_NAME: "${APP_APP_NAME}"
MAIL_LIST_CONTACTFORM: "${APP_MAIL_LIST_CONTACTFORM}" MAIL_LIST_CONTACTFORM: "${APP_MAIL_LIST_CONTACTFORM}"
LDC_WEB_API_KEY: "${APP_LDC_WEB_API_KEY}"
GOOGLE_RECAPTCHA_PRIVATE: "${APP_GOOGLE_RECAPTCHA_PRIVATE}" GOOGLE_RECAPTCHA_PRIVATE: "${APP_GOOGLE_RECAPTCHA_PRIVATE}"
GOOGLE_RECAPTCHA_PUBLIC: "${APP_GOOGLE_RECAPTCHA_PUBLIC}" GOOGLE_RECAPTCHA_PUBLIC: "${APP_GOOGLE_RECAPTCHA_PUBLIC}"
GOOGLE_RECAPTCHA_VERSION: "${APP_GOOGLE_RECAPTCHA_VERSION}" GOOGLE_RECAPTCHA_VERSION: "${APP_GOOGLE_RECAPTCHA_VERSION}"
@ -32,10 +33,6 @@ data:
SAML2_CONTACT_TECHNICAL_EMAIL: "${APP_SAML2_CONTACT_TECHNICAL_EMAIL}" SAML2_CONTACT_TECHNICAL_EMAIL: "${APP_SAML2_CONTACT_TECHNICAL_EMAIL}"
SAML2_CONTACT_SUPPORT_EMAIL: "${APP_SAML2_CONTACT_SUPPORT_EMAIL}" SAML2_CONTACT_SUPPORT_EMAIL: "${APP_SAML2_CONTACT_SUPPORT_EMAIL}"
SAML2_DEFAULT_TENANT_UUID: "${APP_SAML2_DEFAULT_TENANT_UUID}" SAML2_DEFAULT_TENANT_UUID: "${APP_SAML2_DEFAULT_TENANT_UUID}"
CRM_ENDPOINT: "${APP_CRM_ENDPOINT}"
CRM_PASSWORD: "${APP_CRM_PASSWORD}"
CRM_TOKEN: "${APP_CRM_TOKEN}"
UWIL_ADMIN_SECURE_CIDR_LIST: "${APP_GLOBAL_UWIL_ADMIN_SECURE_CIDR_LIST}"
--- ---
apiVersion: v1 apiVersion: v1
@ -71,28 +68,22 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: ${CI_PROJECT_PATH_SLUG}-config-map name: ${CI_PROJECT_PATH_SLUG}-config-map
resources:
limits:
cpu: "${APP_CI_CPU_LIMIT}"
memory: "${APP_CI_MEMORY_LIMIT}"
requests:
cpu: "${APP_CI_CPU_REQUEST}"
memory: "${APP_CI_MEMORY_REQUEST}"
volumeMounts: volumeMounts:
- name: storage - name: storage
mountPath: /app/srcs/storage mountPath: /app/srcs/storage
imagePullSecrets: imagePullSecrets:
- name: docker-registry-credentials - name: docker-registry-credentials
securityContext: securityContext:
runAsUser: 82 runAsUser: 33
runAsGroup: 82 runAsGroup: 33
fsGroup: 82 fsGroup: 33
fsGroupChangePolicy: "OnRootMismatch" fsGroupChangePolicy: "OnRootMismatch"
volumes: volumes:
- name: storage - name: storage
persistentVolumeClaim: persistentVolumeClaim:
claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@ -103,7 +94,7 @@ spec:
app: ${CI_PROJECT_PATH_SLUG}-app app: ${CI_PROJECT_PATH_SLUG}-app
ports: ports:
- port: 80 - port: 80
targetPort: 80 targetPort: 443
--- ---
apiVersion: traefik.io/v1alpha1 apiVersion: traefik.io/v1alpha1
@ -122,6 +113,7 @@ spec:
port: 80 port: 80
middlewares: middlewares:
- name: redirect-no-www-to-www - name: redirect-no-www-to-www
namespace: common-services
tls: tls:
secretName: ${CRT_TLS_NAME} secretName: ${CRT_TLS_NAME}
@ -132,9 +124,6 @@ metadata:
name: ${CI_PROJECT_PATH_SLUG}-cronjob name: ${CI_PROJECT_PATH_SLUG}-cronjob
spec: spec:
schedule: "* * * * *" schedule: "* * * * *"
successfulJobsHistoryLimit: 1
failedJobsHistoryLimit: 1
concurrencyPolicy: Forbid
jobTemplate: jobTemplate:
spec: spec:
template: template:
@ -142,38 +131,38 @@ spec:
affinity: affinity:
podAffinity: podAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - labelSelector:
matchExpressions: matchExpressions:
- key: app - key: app
operator: In operator: In
values: values:
- ${CI_PROJECT_PATH_SLUG}-app - ${CI_PROJECT_PATH_SLUG}-app
topologyKey: "kubernetes.io/hostname" topologyKey: "kubernetes.io/hostname"
namespaces: [$KUBE_NAMESPACE] namespaces: [$KUBE_NAMESPACE]
containers: containers:
- name: ${CI_PROJECT_PATH_SLUG}-scheduled - name: ${CI_PROJECT_PATH_SLUG}-scheduled
image: $IMAGE_TAG image: $IMAGE_TAG
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- "php" - "php"
args: args:
- "artisan" - "artisan"
- "schedule:run" - "schedule:run"
envFrom: envFrom:
- configMapRef: - configMapRef:
name: ${CI_PROJECT_PATH_SLUG}-config-map name: ${CI_PROJECT_PATH_SLUG}-config-map
volumeMounts: volumeMounts:
- name: storage
mountPath: /app/srcs/storage
imagePullSecrets:
- name: docker-registry-credentials
volumes:
- name: storage - name: storage
persistentVolumeClaim: mountPath: /app/srcs/storage
claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage imagePullSecrets:
- name: docker-registry-credentials
volumes:
- name: storage
persistentVolumeClaim:
claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
securityContext: securityContext:
runAsUser: 82 runAsUser: 33
runAsGroup: 82 runAsGroup: 33
fsGroup: 82 fsGroup: 33
fsGroupChangePolicy: "OnRootMismatch" fsGroupChangePolicy: "OnRootMismatch"
restartPolicy: OnFailure restartPolicy: OnFailure

5771
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -22,7 +22,7 @@
"@fortawesome/free-regular-svg-icons": "^6.5.1", "@fortawesome/free-regular-svg-icons": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/vue-fontawesome": "^3.0.5", "@fortawesome/vue-fontawesome": "^3.0.5",
"@ldc-web/cookie-notice": "^6.1.0", "@ldc-web/cookie-notice": "^5.0.7",
"@sipec/vue3-tags-input": "^3.0.4", "@sipec/vue3-tags-input": "^3.0.4",
"@types/bootstrap": "^5.2.7", "@types/bootstrap": "^5.2.7",
"@types/node": "^20.8.2", "@types/node": "^20.8.2",
@ -30,23 +30,23 @@
"@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.36.2", "@typescript-eslint/parser": "^5.36.2",
"@vitejs/plugin-basic-ssl": "^1.0.1", "@vitejs/plugin-basic-ssl": "^1.0.1",
"@vitejs/plugin-vue": "^4.5", "@vitejs/plugin-vue": "latest",
"@vue/compiler-sfc": "^3.3", "@vue/compiler-sfc": "latest",
"@vue/eslint-config-typescript": "^12.0", "@vue/eslint-config-typescript": "latest",
"@vue/tsconfig": "^0.4.0", "@vue/tsconfig": "^0.4.0",
"axios": "^1.5.1", "axios": "^1.5.1",
"bootstrap": "^5.3.2", "bootstrap": "^5.3.2",
"cropperjs": "^1.6.1", "cropperjs": "^1.6.1",
"eslint": "^8.56", "eslint": "latest",
"eslint-import-resolver-alias": "^1.1.2", "eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-vue": "^9.19", "eslint-plugin-vue": "latest",
"laravel-vite-plugin": "^0.8.1", "laravel-vite-plugin": "^0.8.1",
"meow": "^9.0.0",
"postcss-discard-comments": "^6.0.0", "postcss-discard-comments": "^6.0.0",
"prettier": "^3.1", "prettier": "latest",
"print-js": "^1.6.0",
"resolve-url-loader": "^5.0.0", "resolve-url-loader": "^5.0.0",
"rollup-plugin-copy": "^3.5.0", "rollup-plugin-copy": "^3.5.0",
"sass": "^1.69", "sass": "latest",
"slugify": "^1.6.6", "slugify": "^1.6.6",
"stylelint": "^15.11.0", "stylelint": "^15.11.0",
"stylelint-config-idiomatic-order": "github:ream88/stylelint-config-idiomatic-order", "stylelint-config-idiomatic-order": "github:ream88/stylelint-config-idiomatic-order",
@ -55,17 +55,17 @@
"stylelint-scss": "^5.3.2", "stylelint-scss": "^5.3.2",
"sweetalert2": "^11.7.31", "sweetalert2": "^11.7.31",
"swiper": "^11.0.5", "swiper": "^11.0.5",
"terser": "^5.26", "terser": "latest",
"toastify-js": "^1.12.0", "toastify-js": "^1.12.0",
"ts-loader": "^9.3.1", "ts-loader": "^9.3.1",
"typescript": ">=3.3.1 <5.2.0", "typescript": ">=3.3.1 <5.2.0",
"typescript-eslint": "0.0.1-alpha.0", "typescript-eslint": "latest",
"vite": "^4.5.1", "vite": "^4.5.1",
"vite-plugin-babel": "^1.2", "vite-plugin-babel": "latest",
"vite-plugin-checker": "^0.6", "vite-plugin-checker": "latest",
"vite-plugin-eslint": "^1.8", "vite-plugin-eslint": "latest",
"vite-plugin-stylelint": "^5.3", "vite-plugin-stylelint": "latest",
"vue": "^3.3", "vue": "latest",
"vue-eslint-parser": "^9.3.2", "vue-eslint-parser": "^9.3.2",
"vue-loader": "^17.3.1", "vue-loader": "^17.3.1",
"vue-tsc": "1.8.11" "vue-tsc": "1.8.11"

View file

@ -29,6 +29,8 @@
<rule ref="Generic.Files.LineLength"/> <rule ref="Generic.Files.LineLength"/>
<rule ref="Generic.Formatting.DisallowMultipleStatements"/> <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
<rule ref="Generic.Formatting.MultipleStatementAlignment"/> <rule ref="Generic.Formatting.MultipleStatementAlignment"/>
<rule ref="Generic.Formatting.NoSpaceAfterCast"/>
<rule ref="Generic.Functions.CallTimePassByReference"/>
<rule ref="Generic.Functions.FunctionCallArgumentSpacing"/> <rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
<rule ref="Generic.Metrics.CyclomaticComplexity"/> <rule ref="Generic.Metrics.CyclomaticComplexity"/>
<rule ref="Generic.Metrics.NestingLevel"/> <rule ref="Generic.Metrics.NestingLevel"/>
@ -42,6 +44,9 @@
<rule ref="Generic.Strings.UnnecessaryStringConcat"/> <rule ref="Generic.Strings.UnnecessaryStringConcat"/>
<rule ref="Generic.WhiteSpace.DisallowTabIndent"/> <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
<rule ref="Generic.WhiteSpace.ScopeIndent"/> <rule ref="Generic.WhiteSpace.ScopeIndent"/>
<rule ref="MySource.PHP.EvalObjectFactory"/>
<rule ref="MySource.PHP.GetRequestData"/>
<rule ref="MySource.PHP.AjaxNullComparison"/>
<rule ref="PEAR.Classes.ClassDeclaration"/> <rule ref="PEAR.Classes.ClassDeclaration"/>
<rule ref="PEAR.Commenting.InlineComment"/> <rule ref="PEAR.Commenting.InlineComment"/>
<rule ref="PSR1.Classes.ClassDeclaration"/> <rule ref="PSR1.Classes.ClassDeclaration"/>
@ -74,6 +79,7 @@
<rule ref="Squiz.Scope.MemberVarScope"/> <rule ref="Squiz.Scope.MemberVarScope"/>
<rule ref="Squiz.Scope.MethodScope"/> <rule ref="Squiz.Scope.MethodScope"/>
<rule ref="Squiz.Scope.StaticThisUsage"/> <rule ref="Squiz.Scope.StaticThisUsage"/>
<rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
<rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/> <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
<rule ref="Squiz.WhiteSpace.MemberVarSpacing"> <rule ref="Squiz.WhiteSpace.MemberVarSpacing">
<properties> <properties>

View file

@ -5,51 +5,9 @@ metadata:
name: $APP_DOMAIN name: $APP_DOMAIN
spec: spec:
dnsNames: dnsNames:
- $APP_DOMAIN - $APP_DOMAIN
- www.${APP_DOMAIN} - www.${APP_DOMAIN}
secretName: $APP_DOMAIN secretName: $APP_DOMAIN
issuerRef: issuerRef:
name: $APP_CERT_ISSUER name: $APP_CERT_ISSUER
kind: ClusterIssuer kind: ClusterIssuer
---
# Redirect with domain replacement
apiVersion: traefik.io/v1alpha1
kind: Middleware
metadata:
name: redirect-lglpronet-to-lglprofr
spec:
redirectRegex:
regex: ^https://(.*)legauloisprofessionnel.net/(.*)
replacement: https://${REDIRECT}${APP_DOMAIN}
permanent: true
---
apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
name: redirect-lglpronet-to-lglprofr
spec:
entryPoints:
- websecure
routes:
- match: Host(`legauloisprofessionnel.net`) || Host(`www.legauloisprofessionnel.net`)
kind: Rule
services:
- name: api@internal
kind: TraefikService
middlewares:
- name: redirect-lglpronet-to-lglprofr
tls:
secretName: legauloisprofessionnel.net
---
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: legauloisprofessionnel.net
spec:
dnsNames:
- legauloisprofessionnel.net
- www.legauloisprofessionnel.net
secretName: legauloisprofessionnel.net
issuerRef:
name: $APP_CERT_ISSUER
kind: ClusterIssuer

View file

@ -14,10 +14,6 @@
RewriteCond %{REQUEST_URI} (.+)/$ RewriteCond %{REQUEST_URI} (.+)/$
RewriteRule ^ %1 [L,R=301] RewriteRule ^ %1 [L,R=301]
# Redirect /index.php/anything to /anything
RewriteCond %{THE_REQUEST} /index\.php/([^\s?]*) [NC]
RewriteRule ^index\.php/(.*)$ /$1 [L,R=301,NC]
# Send Requests To Front Controller... # Send Requests To Front Controller...
RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f

Binary file not shown.

Before

Width:  |  Height:  |  Size: 602 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 733 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 711 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Some files were not shown because too many files have changed in this diff Show more