diff --git a/app/Helpers/DocumentHelper.php b/app/Helpers/DocumentHelper.php index e2b94237..5d26309c 100644 --- a/app/Helpers/DocumentHelper.php +++ b/app/Helpers/DocumentHelper.php @@ -99,16 +99,4 @@ class DocumentHelper return $query; } - - /** - * Return a document path from his id in front blade view - * - * @param int $id - * @return \Illuminate\Database\Eloquent\Builder<\App\Models\Document> $query - */ - public static function getDocumentFromId(int $id): string - { - $document = Document::find($id); - return $document->path ?? ""; - } } diff --git a/public/assets/css/style.css b/public/assets/css/style.css index e422ee5b..cdff07d6 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -4887,6 +4887,10 @@ div.wpcf7 .ajax-loader { align-self: center; } +.hero__block-text.description { + color: #fff; +} + .hero__block-info { display: flex; flex-direction: column; diff --git a/resources/sass/common/_wysiwyg.scss b/resources/sass/common/_wysiwyg.scss index 679cd8a4..b9427fcc 100644 --- a/resources/sass/common/_wysiwyg.scss +++ b/resources/sass/common/_wysiwyg.scss @@ -1,14 +1,6 @@ $primary-color: #ff4e4e; $secondary-color: #666666; $tertiary-color: #222222; -$white: #fff; - -.hero__block-text.description { - font-weight: 500; - font-size: 14px; - color: $white; - line-height: 1.75; -} .description { font-weight: 500; diff --git a/resources/ts/back/Layouts/AuthenticatedLayout.tsx b/resources/ts/back/Layouts/AuthenticatedLayout.tsx index d56c68f5..6e73ab07 100644 --- a/resources/ts/back/Layouts/AuthenticatedLayout.tsx +++ b/resources/ts/back/Layouts/AuthenticatedLayout.tsx @@ -1,7 +1,7 @@ // * Packages import { motion } from "motion/react"; import { ReactNode, useEffect, useState } from "react"; -import { Head } from "@inertiajs/react"; +import { Head, usePage } from "@inertiajs/react"; // * Components shadcn import { SidebarProvider, useSidebar } from "@/components/ui/sidebar"; import { Toaster } from "@/components/ui/toaster"; @@ -30,8 +30,12 @@ export default function AuthenticatedLayout({ ? localStorage.getItem("vite-ui-collapsed") : null; + const { locale } = usePage().props.appEnv as unknown as { + locale: string; + }; + return ( - + {beforeNode}

{title}

diff --git a/resources/ts/back/Pages/DynamicPages/Form.tsx b/resources/ts/back/Pages/DynamicPages/Form.tsx index 10c845f5..63e856d9 100644 --- a/resources/ts/back/Pages/DynamicPages/Form.tsx +++ b/resources/ts/back/Pages/DynamicPages/Form.tsx @@ -168,24 +168,6 @@ export default function Form({ return buildPath(current); } - useEffect(() => { - const modelTitleValue = model?.title ? model?.title[locale] : ""; - setData("title", modelTitleValue); - setData( - "slug", - model?.slug - ? model?.slug[locale] - : str(modelTitleValue).slug().value(), - ); - setData("content", model?.content ? model?.content[locale] : ""); - setData( - "config_id", - model?.config_id ?? configOptions[defaultConfigId].id, - ); - setData("status", model?.status ?? enumDynamicPageStatus.draft.value); - setData("isLocked", model?.isLocked ?? false); - }, [locale]); - return (
diff --git a/resources/ts/back/Pages/News/Form.tsx b/resources/ts/back/Pages/News/Form.tsx index 65ac8989..ed7b9e95 100644 --- a/resources/ts/back/Pages/News/Form.tsx +++ b/resources/ts/back/Pages/News/Form.tsx @@ -64,20 +64,18 @@ export default function Form({ /** Form section */ const { post, setData, data, reset } = useForm({ _method: method === Methods.POST ? "post" : "put", - seo_title: model?.seo_title ? model?.seo_title[locale] : "", - seo_description: model?.seo_description - ? model?.seo_description[locale] - : "", - title: model?.title ? model?.title[locale] : "", - slug: model?.slug ? model?.slug[locale] : "", - content: model?.content ? model?.content[locale] : "", + seo_title: model?.seo_title?.[locale] ?? "", + seo_description: model?.seo_description?.[locale] ?? "", + title: model?.title?.[locale] ?? "", + slug: model?.slug?.[locale] ?? "", + content: model?.content?.[locale] ?? "", + picture_alt: model?.picture_alt?.[locale] ?? "", + picture_title: model?.picture_title?.[locale] ?? "", inverted: model?.inverted ?? false, has_show_picture: model?.has_show_picture ?? true, vimeo_id: model?.vimeo_id ?? "", status: model?.status ?? enumNewsStatus.unpublished.value, picture: model?.picture, - picture_alt: model?.picture_alt ? model?.picture_alt[locale] : "", - picture_title: model?.picture_title ? model?.picture_title[locale] : "", tags: model?.tags ? defaultTagOptions : [], categories: model?.categories ? defaultCategoriesOptions : [], published_at: model?.published_at ? model?.published_at : null, @@ -116,6 +114,8 @@ export default function Form({ }); }, []); + + return ( diff --git a/resources/ts/back/Pages/PageConfigs/Form.tsx b/resources/ts/back/Pages/PageConfigs/Form.tsx index 4af44309..57cf9400 100644 --- a/resources/ts/back/Pages/PageConfigs/Form.tsx +++ b/resources/ts/back/Pages/PageConfigs/Form.tsx @@ -107,13 +107,6 @@ export default function Form({ && data.config !== model?.config[appEnv.locale] }; - useEffect(() => { - setData("label", model?.label ? model?.label[appEnv.locale] : ""); - setData("view", model?.view ?? null); - resetConfig(appEnv.locale); - setSelectedConfig(null); - }, [appEnv.locale]); - useEffect(() => { const isEmpty = data.config === null || (typeof data.config === "object" && Object.keys(data.config).length === 0); diff --git a/resources/views/components/front/pages/finance/bourse.blade.php b/resources/views/components/front/pages/finance/bourse.blade.php index c4ececbd..db50043f 100644 --- a/resources/views/components/front/pages/finance/bourse.blade.php +++ b/resources/views/components/front/pages/finance/bourse.blade.php @@ -47,7 +47,7 @@ @if (!empty($bourseSection['list_downloads'])) @foreach ($bourseSection['list_downloads'] as $btn) + class="finance-api__btn" :url="\App\Models\Document::getAccessModel($btn['model_internal_link'])" buttonIcon="btn__icon_dl" /> @endforeach @endif @@ -125,7 +125,7 @@ @if (!empty($closedWindows['list_document'][0]))
- diff --git a/resources/views/components/front/pages/finance/finance-3.blade.php b/resources/views/components/front/pages/finance/finance-3.blade.php index 56b68644..107b3819 100644 --- a/resources/views/components/front/pages/finance/finance-3.blade.php +++ b/resources/views/components/front/pages/finance/finance-3.blade.php @@ -49,7 +49,7 @@ $btn = $data['list_became_shareholders'][0]['list_button'][0]; @endphp @endif @@ -144,7 +144,7 @@
{{ $slide['string_label'] }}
diff --git a/resources/views/front/layouts/header.blade.php b/resources/views/front/layouts/header.blade.php index 72723c39..804a1dc1 100644 --- a/resources/views/front/layouts/header.blade.php +++ b/resources/views/front/layouts/header.blade.php @@ -32,13 +32,13 @@ ]; @endphp
    - @if(array_intersect($sections, array_keys($pageNosEngagements->content))) + @if(array_intersect($sections, array_keys($pageNousConnaitre->content)))