diff --git a/app/Http/Controllers/Front/HomeController.php b/app/Http/Controllers/Front/HomeController.php index 52d2fe03..e3e08844 100644 --- a/app/Http/Controllers/Front/HomeController.php +++ b/app/Http/Controllers/Front/HomeController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Front; +use App\Http\Requests\Front\SingleOptinRequest; use App\Http\Requests\Front\UnsubscribeNewsletterRequest; use Illuminate\Support\Facades\Log; use LDC\LDCCRM\Enums\ApiError; @@ -63,4 +64,30 @@ class HomeController extends Controller } return view('front.pages.newsletter-unsubscribe'); } + + /** + * Call the CRM to add a single optin + * + * @param \App\Http\Requests\Fo\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) { + // Il y a deja un customerInfo avec optin a true pour ce customer. + if ($e->getApiError()->equals(ApiError::singleOptinCustomerExists)) { + return trans('Vous êtes déjà inscrit avec cette adresse email'); + } + \report($e); + return \response(trans('Une erreur est survenue, merci de réessayer ultérieurement'), 404); + } catch (CrmException $e) { + \report($e); + return \response(trans('Une erreur est survenue, merci de réessayer ultérieurement'), 404); + } + } } diff --git a/app/Http/Requests/Front/SingleOptinRequest.php b/app/Http/Requests/Front/SingleOptinRequest.php new file mode 100644 index 00000000..dd95ed72 --- /dev/null +++ b/app/Http/Requests/Front/SingleOptinRequest.php @@ -0,0 +1,20 @@ + 'required|email:rfc,dns,spoof', + ]; + } +} diff --git a/lang/fr/errors.php b/lang/fr/errors.php index 789db6cc..a771127e 100644 --- a/lang/fr/errors.php +++ b/lang/fr/errors.php @@ -14,8 +14,8 @@ return [ "description" => "Désolé, vous n’êtes pas autorisé à accéder à cette page.", ], "404" => [ - "title" => "Page introuvable", - "description" => "Désolé, la page que vous recherchez est introuvable.", + "title" => "VOUS ÊTES PERDU ?", + "description" => "Erreur 404, malheureusement cette page n'existe pas ou n'existe plus.", ], "405" => [ "title" => "Méthode non autorisée", diff --git a/lang/fr/front.php b/lang/fr/front.php index d20c87c8..2125549f 100644 --- a/lang/fr/front.php +++ b/lang/fr/front.php @@ -4,7 +4,7 @@ return [ "multiple_choice" => 'choix multiple', "required_field" => 'champs obligatoires', "go_to_the_back_end" => "accéder au back-office", - "back_to_homepage" => "Revenir à la page d'accueil", + "back_to_homepage" => "Retour à la page d'accueil", "homepage" => "LDC", "nos-engagements" => "nos engagements", "nos-engagements" => [ diff --git a/resources/sass/front/app.scss b/resources/sass/front/app.scss index d98fd70c..c1f1575e 100644 --- a/resources/sass/front/app.scss +++ b/resources/sass/front/app.scss @@ -5,3 +5,6 @@ // * VENDOR @use './vendor/cookie-notice'; + +// * BASE +@use './base/common'; diff --git a/resources/sass/front/base/_common.scss b/resources/sass/front/base/_common.scss new file mode 100644 index 00000000..d7f16195 --- /dev/null +++ b/resources/sass/front/base/_common.scss @@ -0,0 +1,16 @@ +#newsletter-message { + + margin: 6px 0; + + &.text-success { + color: green; + } + + &.text-danger { + color: red; + } + + &.d-none { + display: none; + } +} diff --git a/resources/ts/back/Components/Inputs/CompleteInputFile.tsx b/resources/ts/back/Components/Inputs/CompleteInputFile.tsx index 736e5eee..2e2f1b79 100644 --- a/resources/ts/back/Components/Inputs/CompleteInputFile.tsx +++ b/resources/ts/back/Components/Inputs/CompleteInputFile.tsx @@ -36,6 +36,7 @@ type CompleteInputFileProps = FileValidation & { parentErrors?: Record | null, setData: (name: string, value: File | string | null) => void; reset: (name?: string) => void; + hasFile?: (hasFile: boolean) => void; }; /* eslint-enable no-unused-vars, @typescript-eslint/no-unused-vars */ @@ -56,6 +57,7 @@ export default function CompleteInputFile(props: CompleteInputFileProps) { inputType = enumDynamicFieldTypes.image.value, fileName = "image", hasRefreshBtn = true, + hasFile } = props; const { toast } = useToast(); const { errors } = usePage().props; @@ -67,7 +69,7 @@ export default function CompleteInputFile(props: CompleteInputFileProps) { return { preview: `${url}/${localData}` } as FileWithPreview; } return null; } - const isRefreshDisabled = value != null && typeof value === 'string' + const isRefreshDisabled = value != null && typeof value === 'string'; const [selectedFile, setSelectedFile] = useState( () => { @@ -168,6 +170,10 @@ export default function CompleteInputFile(props: CompleteInputFileProps) { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + useEffect(() => { + hasFile?.(selectedFile ? true : false); + }, [selectedFile, hasFile]); + // This error message for the useDropZone can not be used directly in the hook because or react hook error, // they have to be used as they actually are. const dropErrorMessages = { diff --git a/resources/ts/back/Components/Inputs/ImageCropper.tsx b/resources/ts/back/Components/Inputs/ImageCropper.tsx index 5affdaf0..6404101f 100644 --- a/resources/ts/back/Components/Inputs/ImageCropper.tsx +++ b/resources/ts/back/Components/Inputs/ImageCropper.tsx @@ -136,59 +136,90 @@ import { cn } from "@/lib/utils"; * @return string */ function getCroppedImg(image: HTMLImageElement, crop: PixelCrop): string { - const canvas = document.createElement("canvas"); - canvas.width = validationRules.width; - canvas.height = validationRules.height; - const ctx = canvas.getContext("2d")!; - - const tmpCanvas = document.createElement("canvas"); - tmpCanvas.width = maxContainerWidth; - tmpCanvas.height = maxContainerHeight; - const tmpCtx = tmpCanvas.getContext("2d")!; - - tmpCtx.save(); - - // Taille de l'image affichée avec zoom - const displayedWidth = originalDimensions.width * scaleFactor * (1 + zoom); - const displayedHeight = originalDimensions.height * scaleFactor * (1 + zoom); - - // Coin supérieur gauche réel après zoom - const offsetX = imagePosition.x - (displayedWidth - originalDimensions.width * scaleFactor) / 2; - const offsetY = imagePosition.y - (displayedHeight - originalDimensions.height * scaleFactor) / 2; - - // Déplacer au centre pour rotation + flip - tmpCtx.translate(offsetX + displayedWidth / 2, offsetY + displayedHeight / 2); - tmpCtx.rotate((rotation * Math.PI) / 180); - tmpCtx.scale(flipX ? -1 : 1, flipY ? -1 : 1); - - // Appliquer les filtres - tmpCtx.filter = `brightness(${brightness}%) contrast(${contrast}%) saturate(${saturation}%) sepia(${sepia}%) grayscale(${grayscale}%)`; - - // Dessiner l'image centrée - tmpCtx.drawImage( - image, - -displayedWidth / 2, - -displayedHeight / 2, - displayedWidth, - displayedHeight - ); - - tmpCtx.restore(); - - // Extraire la zone cropée visible - ctx.drawImage( - tmpCanvas, - crop.x, - crop.y, - crop.width, - crop.height, - 0, - 0, - canvas.width, - canvas.height - ); - - return canvas.toDataURL("image/png"); + const canvas = document.createElement("canvas"); + canvas.width = validationRules.width; + canvas.height = validationRules.height; + const ctx = canvas.getContext("2d")!; + + // Calculer le ratio entre l'affichage et les dimensions originales + const displayScale = scaleFactor * (1 + zoom); + + // Position de l'image affichée avec zoom + const displayedWidth = originalDimensions.width * displayScale; + const displayedHeight = originalDimensions.height * displayScale; + const offsetX = imagePosition.x - (displayedWidth - originalDimensions.width * scaleFactor) / 2; + const offsetY = imagePosition.y - (displayedHeight - originalDimensions.height * scaleFactor) / 2; + + // Centre de l'image dans le container d'affichage + const imageCenterX = offsetX + displayedWidth / 2; + const imageCenterY = offsetY + displayedHeight / 2; + + // Centre du crop dans le container d'affichage + const cropCenterX = crop.x + crop.width / 2; + const cropCenterY = crop.y + crop.height / 2; + + // Distance du centre du crop au centre de l'image (en pixels d'affichage) + const deltaX = cropCenterX - imageCenterX; + const deltaY = cropCenterY - imageCenterY; + + // Calculer le ratio de qualité : on veut travailler à la résolution originale + // Le ratio est : taille originale / taille affichée + const qualityRatio = 1 / displayScale; + + // Taille du canvas temporaire basée sur la résolution originale de la zone croppée + // On limite toutefois pour éviter des canvas trop grands (max 4x la taille finale) + const maxRatio = Math.min(qualityRatio, 4); + const tmpWidth = Math.ceil(crop.width / displayScale); + const tmpHeight = Math.ceil(crop.height / displayScale); + + // Créer un canvas temporaire à haute résolution + const tmpCanvas = document.createElement("canvas"); + tmpCanvas.width = tmpWidth; + tmpCanvas.height = tmpHeight; + const tmpCtx = tmpCanvas.getContext("2d")!; + + tmpCtx.save(); + + // Appliquer les filtres + tmpCtx.filter = `brightness(${brightness}%) contrast(${contrast}%) saturate(${saturation}%) sepia(${sepia}%) grayscale(${grayscale}%)`; + + // Translater au centre du canvas temporaire + tmpCtx.translate(tmpWidth / 2, tmpHeight / 2); + + // Appliquer rotation et flip + tmpCtx.rotate((rotation * Math.PI) / 180); + tmpCtx.scale(flipX ? -1 : 1, flipY ? -1 : 1); + + // Calculer où dessiner l'image pour que la zone croppée soit centrée + // deltaX/deltaY sont en pixels d'affichage, on les convertit en pixels originaux + const originalDeltaX = deltaX / displayScale; + const originalDeltaY = deltaY / displayScale; + + // Dessiner l'image originale à sa pleine résolution + tmpCtx.drawImage( + image, + -originalDimensions.width / 2 - originalDeltaX, + -originalDimensions.height / 2 - originalDeltaY, + originalDimensions.width, + originalDimensions.height + ); + + tmpCtx.restore(); + + // Redimensionner vers la taille finale en une seule opération + ctx.drawImage( + tmpCanvas, + 0, + 0, + tmpWidth, + tmpHeight, + 0, + 0, + canvas.width, + canvas.height + ); + + return canvas.toDataURL("image/png"); } /** diff --git a/resources/ts/front/app.ts b/resources/ts/front/app.ts index 095e8b18..66fccc3f 100644 --- a/resources/ts/front/app.ts +++ b/resources/ts/front/app.ts @@ -1,7 +1,22 @@ import "../../sass/front/app.scss"; import Chart from 'chart.js/auto'; +import axios from "axios"; + +axios.defaults.headers.common = { + Accept: "application/json, text/plain, */*", + "X-Requested-With": "XMLHttpRequest", + "X-CSRF-TOKEN": document + .querySelector("meta[name=\"csrf-token\"]")! + .getAttribute("content"), +}; + +window.axios = axios; + // COOKIES import CookieNotice from "@ldc-web/cookie-notice"; window.CookieNotice = CookieNotice; window.Chart = Chart; + +// LOCAL IMPORTS +import "./base/common"; diff --git a/resources/ts/front/base/common.ts b/resources/ts/front/base/common.ts new file mode 100644 index 00000000..da21acac --- /dev/null +++ b/resources/ts/front/base/common.ts @@ -0,0 +1,48 @@ +import route from "../modules/route"; + +const laravelRoute = route.methods.route; + +document.addEventListener("DOMContentLoaded", function () { + // * NEWSLETTER + const newsletterSubmitBtn = document.getElementById("newsletter-submit"); + const newsletterEmailInput = document.getElementById("newsletter-email") as HTMLInputElement; + const newsletterMessageDiv = document.getElementById("newsletter-message"); + if (newsletterSubmitBtn && newsletterEmailInput && newsletterMessageDiv) { + // Submit the request + newsletterSubmitBtn.addEventListener("click", function () { + + const addSingleOptinRoute = laravelRoute("front.add-single-optin"); + if (addSingleOptinRoute === null) { + return; + } + // Reset error field + newsletterMessageDiv.classList.remove("text-success"); + newsletterMessageDiv.classList.remove("text-danger"); + newsletterMessageDiv.textContent = ""; + window.axios.post("/optin", { + email: newsletterEmailInput.value, + }) + .then(function (response) { + newsletterMessageDiv.classList.remove("d-none"); + newsletterMessageDiv.classList.add("text-success"); + newsletterMessageDiv.textContent = String(response.data); + newsletterEmailInput.value = ""; + }) + .catch(function (error) { + newsletterMessageDiv.classList.remove("d-none"); + newsletterMessageDiv.classList.add("text-danger"); + if (error.response.status == 422) { + const errors = error.response.data.errors; + for (const errorKey in errors) { + const errorP = document.createElement("p"); + errorP.classList.add("m-0"); + errorP.textContent = errors[errorKey]; + newsletterMessageDiv.appendChild(errorP); + } + } else { + newsletterMessageDiv.textContent = error.response.data; + } + }); + }); + } +}); diff --git a/resources/ts/front/index.d.ts b/resources/ts/front/index.d.ts new file mode 100644 index 00000000..170f533b --- /dev/null +++ b/resources/ts/front/index.d.ts @@ -0,0 +1,12 @@ +import type CookieNotice from "@ldc-web/cookie-notice"; +import { Chart } from "chart.js"; + +declare global { + interface Window { + CookieNotice: typeof CookieNotice; + Chart: typeof Chart; + __SYSTEM: { + _routes: Record; + }; + } +} diff --git a/resources/ts/front/modules/route.ts b/resources/ts/front/modules/route.ts new file mode 100644 index 00000000..955b9aa7 --- /dev/null +++ b/resources/ts/front/modules/route.ts @@ -0,0 +1,97 @@ +const route = { + methods: { + /** + * Same behavior as laravel route + * + * ! window.__SYSTEM._routes has to be defined + * + * @param routeName The route name. + * @param parameters Parameters, if a parameter name matches a route path level, + * it will be replaced, otherwise it will appear in query. + * @param keepActualQueries Pass this to keep current url queries. + * @param keepActualHashes Pass this to keep current url fragments + * @returns The newly formated string + */ + route( + routeName: string, + parameters: Record< + string, + string | number | Array + > = {}, + keepActualQueries: boolean = false, + keepActualHashes: boolean = false + ): string | null { + const routes = route.flattenProperties(window.__SYSTEM._routes); + const routeUrl = + Object.keys(routes).indexOf(routeName) !== -1 + ? (routes[routeName] as string) + : null; + + // * Return null if route url could not be found + if (!routeUrl) { + return null; + } + + const queryParameters: Record = {}, + url = new URL(window.location.origin), + searchParams = new URL(String(window.location)).searchParams, + hash = window.location.hash; + let pathname = routeUrl.replace(origin, ""); + + // * Replace parameters in path name. + for (const paramName in parameters) { + const paramValue = String(parameters[paramName]); + if (pathname.indexOf(paramName) !== -1) { + // * Replace pathname part with parameter + pathname = pathname.replace(paramName, paramValue); + } else { + // * push parameter to be in queries + queryParameters[paramName] = paramValue; + } + } + url.pathname = pathname; + + // * Build query + if (keepActualQueries) { + // * Push actual queries + for (const param of searchParams) { + url.searchParams.set(param[0], param[1]); + } + } + // * Push request queries + for (const paramName in queryParameters) { + url.searchParams.set( + paramName, + String(queryParameters[paramName]) + ); + } + + if (keepActualHashes) { + url.hash = hash; + } + + return String(url); + }, + }, + flattenProperties( + obj: Record, + parent: string | null = null, + res: Record = {} + ): Record { + for (const key of Object.keys(obj)) { + const propName = parent ? parent + "." + key : key; + if (obj[key] instanceof Object) { + route.flattenProperties( + obj[key] as Record, + propName, + res + ); + } else { + res[propName] = obj[key]; + } + } + return res; + }, +}; + +export default route; diff --git a/resources/views/components/front/page-404.blade.php b/resources/views/components/front/page-404.blade.php new file mode 100644 index 00000000..06821727 --- /dev/null +++ b/resources/views/components/front/page-404.blade.php @@ -0,0 +1,146 @@ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+ +
+
+
+
+
+

{{ __('errors.404.title') }}

+

{{ __('errors.404.description') }}

+ {{ trans('front.back_to_homepage') }} + +
+
+
+
+ + +
diff --git a/resources/views/components/front/pages/finance/bourse.blade.php b/resources/views/components/front/pages/finance/bourse.blade.php index db50043f..b3f8ce64 100644 --- a/resources/views/components/front/pages/finance/bourse.blade.php +++ b/resources/views/components/front/pages/finance/bourse.blade.php @@ -27,10 +27,10 @@ occasionnée. Nous nous efforçons de rétablir le service dans les meilleurs délais.

- @if(isset($bourseSection['wysiwyg_description'])) -

- {!! $bourseSection['wysiwyg_description'] !!} -

+ @if (isset($bourseSection['wysiwyg_description'])) +

+ {!! $bourseSection['wysiwyg_description'] !!} +

@endif

 

@if (!empty($bourseSection['string_subtitle'])) @@ -99,19 +99,21 @@ @endif

Inscrivez-vous à notre newsletter !

-
- + -
+ {{-- Error/Success message container --}} +
+
@if (!empty($closedWindows)) @@ -125,10 +127,12 @@ @if (!empty($closedWindows['list_document'][0]))
- +
@endif @endif diff --git a/resources/views/front/layouts/layout.blade.php b/resources/views/front/layouts/layout.blade.php index c7cf8728..f099ce0e 100644 --- a/resources/views/front/layouts/layout.blade.php +++ b/resources/views/front/layouts/layout.blade.php @@ -46,7 +46,7 @@ @stack('scripts') - + @include('front.modules.script-routes') @include('front.layouts.footer') diff --git a/resources/views/front/modules/script-routes.blade.php b/resources/views/front/modules/script-routes.blade.php new file mode 100644 index 00000000..1804c585 --- /dev/null +++ b/resources/views/front/modules/script-routes.blade.php @@ -0,0 +1,11 @@ +{{-- blade-formatter-disable --}} + diff --git a/resources/views/front/pages/error.blade.php b/resources/views/front/pages/error.blade.php index bebaccd4..f83a6aac 100644 --- a/resources/views/front/pages/error.blade.php +++ b/resources/views/front/pages/error.blade.php @@ -4,7 +4,13 @@ @section('description', trans("errors.$status.description")) @section('content') -

{{ sprintf("%s - %s", $status, trans("errors.$status.title")) }}

-

{{ trans("errors.$status.description") }}

- {{ trans("front.back_to_homepage") }} + + + @if ($status === 404) + + @else +

{{ sprintf('%s - %s', $status, trans("errors.$status.title")) }}

+

{{ trans("errors.$status.description") }}

+ {{ trans('front.back_to_homepage') }} + @endif @endsection diff --git a/resources/views/front/pages/newsletter-unsubscribe.blade.php b/resources/views/front/pages/newsletter-unsubscribe.blade.php index df5d7c28..693fb073 100644 --- a/resources/views/front/pages/newsletter-unsubscribe.blade.php +++ b/resources/views/front/pages/newsletter-unsubscribe.blade.php @@ -1,7 +1,7 @@ @extends('front.layouts.layout') @section('title', __('Désincription à la newsletter')) -@section('description', __('Page de désincription à la newsletter du site le Gaulois')) +@section('description', __('Page de désincription à la newsletter du site LDC')) @section('content')
diff --git a/routes/web-front.php b/routes/web-front.php index 20a29f3a..4b6ef033 100644 --- a/routes/web-front.php +++ b/routes/web-front.php @@ -21,11 +21,14 @@ Route::group( Route::post('/nous-contacter', 'send')->name('send'); }); - // Newsletter routes. + // * Newsletter routes. + Route::post('/optin', [HomeController::class, 'addOptIn'])->name('add-single-optin'); + // * Unsubscribe from newsletter Route::get('/{unsubscribe}', [HomeController::class, 'unsubscribeNewsletter']) ->where('unsubscribe', 'unsubscribe|unsubscribe.php|unsubscribe.html|newsletter') ->name('unsubscribeNewsletter'); + // Search routes. Route::get(LaravelLocalization::transRoute('routes.search'), [SearchController::class, 'search'])->name('search'); Route::post('/search/load/results', [SearchController::class, 'ajaxSearchLoadResults'])->name('search.ajax.news');