From 77a1ba39e4adb2cfbb515961d00830b86fc0ad08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 19 Jun 2024 11:15:03 +0200 Subject: [PATCH 1/9] nav-menu html fix --- resources/views/fo/layouts/nav-menu.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/fo/layouts/nav-menu.blade.php b/resources/views/fo/layouts/nav-menu.blade.php index 9012f18..5e20172 100644 --- a/resources/views/fo/layouts/nav-menu.blade.php +++ b/resources/views/fo/layouts/nav-menu.blade.php @@ -8,7 +8,7 @@ alt="{{ __('Volena - Vollailers Engagés pour l\'Avenir') }}" role="img" aria-label="{{ __('Volena - Vollailers Engagés pour l\'Avenir') }}"> -
From 1538e17a6bb2bdfefdc4fd0c15816c30623e7f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 19 Jun 2024 12:15:41 +0200 Subject: [PATCH 2/9] Closes #45 --- .../seeders/Development/SectionSeeder.php | 4 -- .../sass/fo/vendor/_ckEditorContent.scss | 5 ++ .../pages/produce/banner-elements.blade.php | 4 +- .../views/fo/pages/produce/flex-row.blade.php | 2 +- .../views/fo/pages/produce/show.blade.php | 53 +++++++++++-------- 5 files changed, 40 insertions(+), 28 deletions(-) diff --git a/database/seeders/Development/SectionSeeder.php b/database/seeders/Development/SectionSeeder.php index 15802f9..8523e3a 100644 --- a/database/seeders/Development/SectionSeeder.php +++ b/database/seeders/Development/SectionSeeder.php @@ -465,10 +465,6 @@ class SectionSeeder extends Seeder '../database/factories/assets/sections/default-picture-100x100.png' )) ), fake()->sentence(), fake()->sentence(), 200, 200); - $data = array_merge( - $data, - $section->emptyWysiwygBloc([], 'accompagnant l\'image', clean(\fake()->randomHtml())) - ); $data = array_merge($data, $section->emptyWysiwygBloc([], 'text', clean(\fake()->randomHtml()))); return $data; } diff --git a/resources/sass/fo/vendor/_ckEditorContent.scss b/resources/sass/fo/vendor/_ckEditorContent.scss index 26e3d02..19bd7f5 100644 --- a/resources/sass/fo/vendor/_ckEditorContent.scss +++ b/resources/sass/fo/vendor/_ckEditorContent.scss @@ -24,6 +24,11 @@ @include media-breakpoint-up(md) { hyphens: initial; } + + h2,h3,h4,.h2,.h3,.h4 { + color: $color-sixt !important; + font-weight: 600 !important; + } } /* diff --git a/resources/views/fo/pages/produce/banner-elements.blade.php b/resources/views/fo/pages/produce/banner-elements.blade.php index 4c38786..585cafe 100644 --- a/resources/views/fo/pages/produce/banner-elements.blade.php +++ b/resources/views/fo/pages/produce/banner-elements.blade.php @@ -1,8 +1,8 @@
- {{ $data[
-
+
@for ($i = 1; $i <= $itemMax; $i++) @include('fo.pages.produce.flex-row', [ 'image' => $data["bloc_image{$i}_{$partName}"]['value'], diff --git a/resources/views/fo/pages/produce/flex-row.blade.php b/resources/views/fo/pages/produce/flex-row.blade.php index 0f5e79a..33df4a3 100644 --- a/resources/views/fo/pages/produce/flex-row.blade.php +++ b/resources/views/fo/pages/produce/flex-row.blade.php @@ -5,7 +5,7 @@ {{ $alt }}
- {!! $text !!} +
{!! clean($text) !!}
diff --git a/resources/views/fo/pages/produce/show.blade.php b/resources/views/fo/pages/produce/show.blade.php index 6a96233..49b8cf6 100644 --- a/resources/views/fo/pages/produce/show.blade.php +++ b/resources/views/fo/pages/produce/show.blade.php @@ -21,8 +21,13 @@

{{ $localSection->h2_title }}

+
+
+
{!! clean($localSection->text) !!}
+
+
-
+
@include('fo.pages.produce.flex-row', [ 'image' => $localSection->data['bloc_image']['value'], 'alt' => $localSection->data['bloc_image']['alt'], @@ -40,8 +45,8 @@

{{ $gmsSection->h2_title }}

-
-
+
+
{!! clean($gmsSection->text) !!}
@@ -73,23 +78,23 @@

{{ $rhdSection->h2_title }}

-
+
{{-- PART 1 --}} @include('fo.pages.produce.banner-elements', [ 'partName' => 'de_la_partie1', 'data' => $rhdSection->data, 'itemMax' => 3, ]) -
+
{!! clean($rhdSection->text) !!}
-
+
{{-- PART 2 --}} -
+

{{ __('le saviez-vous ?') }}

@@ -117,7 +122,7 @@

{{ $exportSection->h2_title }}

-
+
@include('fo.pages.produce.banner-elements', [ 'partName' => 'de_la_partie', 'data' => $exportSection->data, @@ -131,8 +136,8 @@
-
-
+
+

{{ $qualitySection->h2_title }}

{!! clean($qualitySection->text) !!}
@if ($qualitySection->data['bloc_button__on_vous_explique_comment_lire_cetteetiquette']['value']) @@ -145,7 +150,7 @@ 'data' => $qualitySection->data, 'itemMax' => 1, ]) -
+
{!! clean($qualitySection->data['bloc_text_de_la_partie2_content']['value']) !!}
@@ -154,27 +159,33 @@
-
-
+
+
+
+
{!! $qualitySection->data['bloc_accompagnant_le_bouton_on_vousecoute_content']['value'] !!}
@if ($qualitySection->data['bloc_button__on_vousecoute']['value']) - - {{ __('On vous écoute') }} - + @endif
-
-
+
+
{!! $qualitySection->data['bloc_accompagnant_le_bouton_on_se_devoile_content']['value'] !!}
@if ($qualitySection->data['bloc_button__on_se_devoile']['value']) - - {{ __('On se dévoile') }} - + @endif
From bc18f01f3ed4c136ab06cd70f5d18d77fea189ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 19 Jun 2024 16:28:34 +0200 Subject: [PATCH 3/9] bump ts code --- .../BelongsToManyDropdownComponent.vue | 6 +- .../ts/bo/components/ImageInputComponent.vue | 1264 +++++++++-------- .../bo/components/InputTextAutoComponent.vue | 175 ++- .../ts/bo/components/PasswordVisibility.vue | 173 +-- .../ts/bo/components/WordCounterComponent.vue | 4 +- resources/ts/bo/utilities/bootstrap.ts | 4 +- resources/ts/fo/utilities/bootstrap.ts | 4 +- resources/ts/index.d.ts | 1 + resources/ts/modules/bsTooltips.ts | 153 +- .../ts/modules/parseLaravelErrorMessages.ts | 4 +- resources/ts/modules/route.ts | 2 +- 11 files changed, 944 insertions(+), 846 deletions(-) diff --git a/resources/ts/bo/components/BelongsToManyDropdownComponent.vue b/resources/ts/bo/components/BelongsToManyDropdownComponent.vue index c4ae5dd..bda8283 100644 --- a/resources/ts/bo/components/BelongsToManyDropdownComponent.vue +++ b/resources/ts/bo/components/BelongsToManyDropdownComponent.vue @@ -67,9 +67,9 @@ import type VueTagsInput from "@sipec/vue3-tags-input"; import { VueTagsInput as VueTagsInputCls } from "@sipec/vue3-tags-input"; import slugify from "slugify"; import { defineComponent } from "vue"; -import parseLaravelErrorMessages from "./../../modules/parseLaravelErrorMessages"; -import route from "./../../modules/route"; -import trans from "./../../modules/trans"; +import parseLaravelErrorMessages from "../../modules/parseLaravelErrorMessages"; +import route from "../../modules/route"; +import trans from "../../modules/trans"; export default defineComponent({ name: "BelongsToManyDropdownComponent", diff --git a/resources/ts/bo/components/ImageInputComponent.vue b/resources/ts/bo/components/ImageInputComponent.vue index f9aae93..23cdf2e 100644 --- a/resources/ts/bo/components/ImageInputComponent.vue +++ b/resources/ts/bo/components/ImageInputComponent.vue @@ -1,138 +1,157 @@ - diff --git a/resources/ts/bo/components/WordCounterComponent.vue b/resources/ts/bo/components/WordCounterComponent.vue index 19abb51..b012275 100644 --- a/resources/ts/bo/components/WordCounterComponent.vue +++ b/resources/ts/bo/components/WordCounterComponent.vue @@ -11,7 +11,7 @@