From f17deffdd00c81786b282a8a10a4aeac1992e858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Mon, 27 Nov 2023 12:03:58 +0100 Subject: [PATCH] SYNC 6 Fully responsive home layout + static pages --- assets/images/up-arrow.svg | 1 - sass/base/_layout.scss | 47 +++++- sass/fo.scss | 1 + sass/pages/_static_page.scss | 18 +++ sass/utilities/_bootstrap-variables.scss | 38 +++++ sass/utilities/_variables.scss | 27 +++- ts/base/common.ts | 2 +- views/{fo => }/confirm-email.blade.php | 2 +- views/{fo => }/end.blade.php | 2 +- views/{fo => }/enter-code.blade.php | 2 +- views/{fo => }/error-arcadia-email.blade.php | 0 views/{fo => }/faq.blade.php | 2 +- views/fo/layouts/header.blade.php | 93 ------------ views/fo/pages/charte.blade.php | 13 -- views/fo/pages/legals.blade.php | 13 -- views/{fo => }/forgot-password.blade.php | 2 +- views/{fo => }/gains.blade.php | 2 +- views/{fo => }/how-to-play.blade.php | 2 +- views/{fo => }/kit.blade.php | 2 +- views/{fo => }/layout.blade.php | 10 +- views/{fo => }/layouts/footer.blade.php | 12 +- views/{fo => }/layouts/head.blade.php | 0 views/layouts/header.blade.php | 114 +++++++++++++++ views/{fo => }/livres.blade.php | 2 +- views/{fo => }/login.blade.php | 2 +- views/{fo => }/loose.blade.php | 2 +- views/{fo => }/notif-admin.blade.php | 0 .../{fo => }/notif-win-admin-email.blade.php | 0 views/{fo => }/pages/gain1.blade.php | 2 +- views/{fo => }/pages/gain2.blade.php | 2 +- views/{fo => }/pages/home.blade.php | 28 ++-- views/pages/static_page.blade.php | 22 +++ .../partials/icons/facebook.blade.php | 0 .../partials/icons/instagram.blade.php | 0 views/partials/icons/up-arrow.blade.php | 6 + .../{fo => }/partials/teaser-footer.blade.php | 2 +- .../{fo => }/partials/teaser-header.blade.php | 0 .../participation-exhausted.blade.php | 2 +- views/{fo => }/password-email.blade.php | 0 views/{fo => }/prize-mail.blade.php | 0 views/{fo => }/produits-porteurs.blade.php | 2 +- views/{fo => }/reduction-mail.blade.php | 0 views/{fo => }/reduction.blade.php | 2 +- views/{fo => }/register-crm.blade.php | 10 +- views/{fo => }/reglement.blade.php | 2 +- views/{fo => }/replay.blade.php | 2 +- views/{fo => }/teaser.blade.php | 2 +- views/vendor/cn-cookies.blade.php | 48 +++--- .../standard.blade.php | 39 ++--- views/vendor/cookie.blade.php | 137 ------------------ views/{fo => }/verifyemail.blade.php | 0 views/{fo => }/winning-proof-email.blade.php | 0 views/{fo => }/winning-proof.blade.php | 2 +- 53 files changed, 360 insertions(+), 361 deletions(-) delete mode 100644 assets/images/up-arrow.svg create mode 100644 sass/pages/_static_page.scss rename views/{fo => }/confirm-email.blade.php (98%) rename views/{fo => }/end.blade.php (92%) rename views/{fo => }/enter-code.blade.php (98%) rename views/{fo => }/error-arcadia-email.blade.php (100%) rename views/{fo => }/faq.blade.php (95%) delete mode 100644 views/fo/layouts/header.blade.php delete mode 100644 views/fo/pages/charte.blade.php delete mode 100644 views/fo/pages/legals.blade.php rename views/{fo => }/forgot-password.blade.php (99%) rename views/{fo => }/gains.blade.php (97%) rename views/{fo => }/how-to-play.blade.php (97%) rename views/{fo => }/kit.blade.php (99%) rename views/{fo => }/layout.blade.php (65%) rename views/{fo => }/layouts/footer.blade.php (86%) rename views/{fo => }/layouts/head.blade.php (100%) create mode 100644 views/layouts/header.blade.php rename views/{fo => }/livres.blade.php (99%) rename views/{fo => }/login.blade.php (99%) rename views/{fo => }/loose.blade.php (83%) rename views/{fo => }/notif-admin.blade.php (100%) rename views/{fo => }/notif-win-admin-email.blade.php (100%) rename views/{fo => }/pages/gain1.blade.php (99%) rename views/{fo => }/pages/gain2.blade.php (99%) rename views/{fo => }/pages/home.blade.php (89%) create mode 100644 views/pages/static_page.blade.php rename views/{fo => }/partials/icons/facebook.blade.php (100%) rename views/{fo => }/partials/icons/instagram.blade.php (100%) create mode 100644 views/partials/icons/up-arrow.blade.php rename views/{fo => }/partials/teaser-footer.blade.php (99%) rename views/{fo => }/partials/teaser-header.blade.php (100%) rename views/{fo => }/participation-exhausted.blade.php (93%) rename views/{fo => }/password-email.blade.php (100%) rename views/{fo => }/prize-mail.blade.php (100%) rename views/{fo => }/produits-porteurs.blade.php (96%) rename views/{fo => }/reduction-mail.blade.php (100%) rename views/{fo => }/reduction.blade.php (99%) rename views/{fo => }/register-crm.blade.php (92%) rename views/{fo => }/reglement.blade.php (89%) rename views/{fo => }/replay.blade.php (94%) rename views/{fo => }/teaser.blade.php (99%) delete mode 100644 views/vendor/cookie.blade.php rename views/{fo => }/verifyemail.blade.php (100%) rename views/{fo => }/winning-proof-email.blade.php (100%) rename views/{fo => }/winning-proof.blade.php (99%) diff --git a/assets/images/up-arrow.svg b/assets/images/up-arrow.svg deleted file mode 100644 index 1809a75..0000000 --- a/assets/images/up-arrow.svg +++ /dev/null @@ -1 +0,0 @@ -Arrow-Up-CircleCreated by IconSrcfrom the Noun Project \ No newline at end of file diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss index c33da02..c82caaf 100644 --- a/sass/base/_layout.scss +++ b/sass/base/_layout.scss @@ -1,9 +1,42 @@ +@use "sass:map"; + body { > header { + @include media-breakpoint-up(xl) { + .rest-in-game-banner-container { + overflow: hidden; + } + } + .rest-in-game-banner { + transform: skew(12deg) translateX(5%); + + >span { + transform: skew(-12deg); + } + } + + .btn-connect { + position: relative; + padding-left: 2.3rem; + &::before { - background-color: $color-primary; - content: ' '; + position: absolute; + top: 50%; + left: 0.3rem; + width: 1.5rem; + height: 1.5rem; + background-image: url('@Theme/images/connect.png'); + background-size: contain; + content: ""; + transform: translateY(-50%); + } + } + + @include media-breakpoint-up(xxxl, map.merge($grid-breakpoints, ("xxxl": 1600px))) { + .navbar-brand { + position: absolute; + top: 0; } } } @@ -69,13 +102,15 @@ body { padding: 0; margin-right: 1rem; - img { - width: 3rem; - } - &.show { display: block; } + + svg { + width: 3rem; + fill: $color-dark; + filter: drop-shadow(0 0 2px #{rgba($color-light, $alpha: 0.4)}); + } } } } diff --git a/sass/fo.scss b/sass/fo.scss index 7a221c0..26f5750 100644 --- a/sass/fo.scss +++ b/sass/fo.scss @@ -15,3 +15,4 @@ // * PAGES @import "./pages/home"; +@import "./pages/static_page"; diff --git a/sass/pages/_static_page.scss b/sass/pages/_static_page.scss new file mode 100644 index 0000000..8baf53b --- /dev/null +++ b/sass/pages/_static_page.scss @@ -0,0 +1,18 @@ +.static-page { + h1 { + color: $color-quint; + text-align: center; + text-transform: uppercase; + } + + h2,h3,h4,h5,h6 { + color: $color-quad; + text-transform: uppercase; + } + + hr { + width: 30%; + border-top: 0.2rem solid #{$color-quad}; + margin: 0 auto; + } +} \ No newline at end of file diff --git a/sass/utilities/_bootstrap-variables.scss b/sass/utilities/_bootstrap-variables.scss index 7af4d0e..6e7f846 100644 --- a/sass/utilities/_bootstrap-variables.scss +++ b/sass/utilities/_bootstrap-variables.scss @@ -1,3 +1,6 @@ +@use "sass:map"; +@import 'bootstrap/scss/functions'; + // Override bootstrap colors $primary: $color-primary; $secondary: $color-secondary; @@ -6,19 +9,54 @@ $info: $color-info; $warning: $color-warning; $danger: $color-danger; $light: $color-light; +$white: $color-white; $dark: $color-dark; +$tertiary: $color-tertiary; +$quad: $color-quad; +$quint: $color-quint; $theme-colors: ( primary: $primary, secondary: $secondary, + tertiary: $tertiary, + quad: $quad, + quint: $quint, success: $success, info: $info, warning: $warning, danger: $danger, light: $light, + "white": $white, dark: $dark, ); +$custom-theme-colors: map.merge($theme-colors, +( + 'tertiary': $tertiary, + 'quad': $quad, + 'quint': $quint, +)); +$theme-colors: map.merge($theme-colors, $custom-theme-colors); +$theme-colors-rgb: map-loop($theme-colors, to-rgb, '$value'); // Override bootstrap vars $font-family-base: $font-default-family-base; $font-size-base: $font-default-size-base; $line-height-base: $line-default-height-base; + +// Add font-size variable +$heading-multiplicator: 1; +$h1-font-size: $font-size-base * $heading-multiplicator * 2.5; +$h2-font-size: $font-size-base * $heading-multiplicator * 2; +$h3-font-size: $font-size-base * $heading-multiplicator * 1.75; +$h4-font-size: $font-size-base * $heading-multiplicator * 1.5; +$h5-font-size: $font-size-base * $heading-multiplicator * 1.25; +$h6-font-size: $font-size-base * $heading-multiplicator; + +// Add the new font-size in this map +$font-sizes: ( + 1: $h1-font-size, + 2: $h2-font-size, + 3: $h3-font-size, + 4: $h4-font-size, + 5: $h5-font-size, + 6: $h6-font-size, +); \ No newline at end of file diff --git a/sass/utilities/_variables.scss b/sass/utilities/_variables.scss index f6b3f76..9dae5b9 100644 --- a/sass/utilities/_variables.scss +++ b/sass/utilities/_variables.scss @@ -1,13 +1,18 @@ +@use "sass:color"; + // * COLORS $color-white: #fff; -$color-light: #f8f9fa; -$color-dark: #212529; -$color-success: #198754; -$color-danger: #dc3545; -$color-info: #0dcaf0; -$color-warning: #ffc107; -$color-primary: #0d6efd; -$color-secondary: #6c757d; +$color-light: #eceff3; +$color-dark: #070000; +$color-success: #00ac61; +$color-danger: #f71200; +$color-info: #508fdf; +$color-warning: #e6cd00; +$color-primary: #0f437e; +$color-secondary: #135ba7; +$color-tertiary: #db275a; +$color-quad: #0179a9; +$color-quint: #fba629; // * BACKGROUNDS COLORS $bg-lightened: $color-light; @@ -22,3 +27,9 @@ $color-default-texts: $color-dark; $font-default-family-base: "Imprima Regular", sans-serif; // - The default site font family. $font-default-size-base: 1rem; // Assumes the browser default, typically `16px` $line-default-height-base: 1.65; + + +// * Cookie Notice +$ck-primary-color: $color-primary; +$ck-secondary-color: color.adjust($color-tertiary, $lightness: -10%); +$ck-background-color: $color-light; diff --git a/ts/base/common.ts b/ts/base/common.ts index 7c31875..f1dedb5 100644 --- a/ts/base/common.ts +++ b/ts/base/common.ts @@ -55,7 +55,7 @@ document.addEventListener("DOMContentLoaded", function () { const pageUp = document.getElementById("page-up"); if (pageUp) { - pageUp.addEventListener("click", () => scrollTop("content-container", 150)), + pageUp.addEventListener("click", () => scrollTop("content-container", 250)), document.addEventListener("scroll", () => { if (window.scrollY > 250) { pageUp.classList.add("show"); diff --git a/views/fo/confirm-email.blade.php b/views/confirm-email.blade.php similarity index 98% rename from views/fo/confirm-email.blade.php rename to views/confirm-email.blade.php index 41e038c..bd5a6b5 100644 --- a/views/fo/confirm-email.blade.php +++ b/views/confirm-email.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Activation de votre compte') diff --git a/views/fo/end.blade.php b/views/end.blade.php similarity index 92% rename from views/fo/end.blade.php rename to views/end.blade.php index 4878733..e43b086 100644 --- a/views/fo/end.blade.php +++ b/views/end.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Fin du jeu') diff --git a/views/fo/enter-code.blade.php b/views/enter-code.blade.php similarity index 98% rename from views/fo/enter-code.blade.php rename to views/enter-code.blade.php index 07e8827..09acf44 100644 --- a/views/fo/enter-code.blade.php +++ b/views/enter-code.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Saisie du code') diff --git a/views/fo/error-arcadia-email.blade.php b/views/error-arcadia-email.blade.php similarity index 100% rename from views/fo/error-arcadia-email.blade.php rename to views/error-arcadia-email.blade.php diff --git a/views/fo/faq.blade.php b/views/faq.blade.php similarity index 95% rename from views/fo/faq.blade.php rename to views/faq.blade.php index 40aff28..dea2133 100644 --- a/views/fo/faq.blade.php +++ b/views/faq.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Accueil') diff --git a/views/fo/layouts/header.blade.php b/views/fo/layouts/header.blade.php deleted file mode 100644 index deacb21..0000000 --- a/views/fo/layouts/header.blade.php +++ /dev/null @@ -1,93 +0,0 @@ -{{--
- - - -
--}} - - diff --git a/views/fo/pages/charte.blade.php b/views/fo/pages/charte.blade.php deleted file mode 100644 index ef8419c..0000000 --- a/views/fo/pages/charte.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -@extends('theme::fo.layout') - -@section('title', 'Charte') - -@section('content') -
-
-
- {!! $content->value !!} -
- -
-@endsection diff --git a/views/fo/pages/legals.blade.php b/views/fo/pages/legals.blade.php deleted file mode 100644 index 774edec..0000000 --- a/views/fo/pages/legals.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -@extends('theme::fo.layout') - -@section('title', 'Mentions légales') - -@section('content') -
-
-
- {!! $content->value !!} -
- -
-@endsection diff --git a/views/fo/forgot-password.blade.php b/views/forgot-password.blade.php similarity index 99% rename from views/fo/forgot-password.blade.php rename to views/forgot-password.blade.php index 3952c5d..507c051 100644 --- a/views/fo/forgot-password.blade.php +++ b/views/forgot-password.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Mot de passe oublié') diff --git a/views/fo/gains.blade.php b/views/gains.blade.php similarity index 97% rename from views/fo/gains.blade.php rename to views/gains.blade.php index 4aa738e..7cced02 100644 --- a/views/fo/gains.blade.php +++ b/views/gains.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Les gains') diff --git a/views/fo/how-to-play.blade.php b/views/how-to-play.blade.php similarity index 97% rename from views/fo/how-to-play.blade.php rename to views/how-to-play.blade.php index 7056ff1..b3acff4 100644 --- a/views/fo/how-to-play.blade.php +++ b/views/how-to-play.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Comment jouer') diff --git a/views/fo/kit.blade.php b/views/kit.blade.php similarity index 99% rename from views/fo/kit.blade.php rename to views/kit.blade.php index 52c0c3d..61b192e 100644 --- a/views/fo/kit.blade.php +++ b/views/kit.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title') {{ $prize->gain_view->name }} diff --git a/views/fo/layout.blade.php b/views/layout.blade.php similarity index 65% rename from views/fo/layout.blade.php rename to views/layout.blade.php index b854e17..3ecf2c3 100644 --- a/views/fo/layout.blade.php +++ b/views/layout.blade.php @@ -1,22 +1,22 @@ -@include('theme::fo.layouts.head') +@include('theme::layouts.head')
- @include('theme::fo.layouts.header') + @include('theme::layouts.header')
-
+
@yield('content')
- @include('theme::fo.layouts.footer') + @include('theme::layouts.footer')
- {{-- @include('theme::fo.cookie') --}} + {{-- @include('theme::cookie') --}} @include('theme::vendor.cn-cookies') @vite(['resources/theme/mounted/ts/fo.ts']) @stack('scripts') diff --git a/views/fo/layouts/footer.blade.php b/views/layouts/footer.blade.php similarity index 86% rename from views/fo/layouts/footer.blade.php rename to views/layouts/footer.blade.php index 438d91b..aeee6ad 100644 --- a/views/fo/layouts/footer.blade.php +++ b/views/layouts/footer.blade.php @@ -1,4 +1,4 @@ -
+
{{-- Share LINKS --}}
@@ -8,12 +8,12 @@ data-size="small"> - @include('theme::fo.partials.icons.facebook') + @include('theme::partials.icons.facebook')
@@ -40,8 +40,8 @@ {{ __('Contact') }}
  • - {{ __('Gestion des cookies') }} + {{ __('Gestion des cookies') }}
    • @@ -54,7 +54,7 @@
    @push('scripts') diff --git a/views/fo/layouts/head.blade.php b/views/layouts/head.blade.php similarity index 100% rename from views/fo/layouts/head.blade.php rename to views/layouts/head.blade.php diff --git a/views/layouts/header.blade.php b/views/layouts/header.blade.php new file mode 100644 index 0000000..f628358 --- /dev/null +++ b/views/layouts/header.blade.php @@ -0,0 +1,114 @@ +{{--
    + + + +
    --}} + + diff --git a/views/fo/livres.blade.php b/views/livres.blade.php similarity index 99% rename from views/fo/livres.blade.php rename to views/livres.blade.php index c2d29fa..fc2861d 100644 --- a/views/fo/livres.blade.php +++ b/views/livres.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title') {{ $prize->gain_view->name }} diff --git a/views/fo/login.blade.php b/views/login.blade.php similarity index 99% rename from views/fo/login.blade.php rename to views/login.blade.php index ef4a381..5b22606 100644 --- a/views/fo/login.blade.php +++ b/views/login.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Connexion') diff --git a/views/fo/loose.blade.php b/views/loose.blade.php similarity index 83% rename from views/fo/loose.blade.php rename to views/loose.blade.php index a88cb5d..baa2317 100644 --- a/views/fo/loose.blade.php +++ b/views/loose.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('content')

    C'est perdu

    diff --git a/views/fo/notif-admin.blade.php b/views/notif-admin.blade.php similarity index 100% rename from views/fo/notif-admin.blade.php rename to views/notif-admin.blade.php diff --git a/views/fo/notif-win-admin-email.blade.php b/views/notif-win-admin-email.blade.php similarity index 100% rename from views/fo/notif-win-admin-email.blade.php rename to views/notif-win-admin-email.blade.php diff --git a/views/fo/pages/gain1.blade.php b/views/pages/gain1.blade.php similarity index 99% rename from views/fo/pages/gain1.blade.php rename to views/pages/gain1.blade.php index 2719d0b..8c2c902 100644 --- a/views/fo/pages/gain1.blade.php +++ b/views/pages/gain1.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title') {{ $prizesGlobal[0]->gain_view->name }} diff --git a/views/fo/pages/gain2.blade.php b/views/pages/gain2.blade.php similarity index 99% rename from views/fo/pages/gain2.blade.php rename to views/pages/gain2.blade.php index 75b3ff6..6568701 100644 --- a/views/fo/pages/gain2.blade.php +++ b/views/pages/gain2.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title') {{ $prizesGlobal[1]->gain_view->name }} diff --git a/views/fo/pages/home.blade.php b/views/pages/home.blade.php similarity index 89% rename from views/fo/pages/home.blade.php rename to views/pages/home.blade.php index a8ebff5..64b3aa8 100644 --- a/views/fo/pages/home.blade.php +++ b/views/pages/home.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Accueil') @@ -25,9 +25,9 @@
    {{ optional(Arr::get($prizesGlobal, 0))->quantity }} + class="bg-tertiary fs-3 rounded-pill fw-bold px-3 py-1 text-white">{{ optional(Arr::get($prizesGlobal, 0))->quantity }}
    -

    +

    {!! clean(nl2br(__("Wonderbox \nLoisirs"))) !!}

    @@ -41,9 +41,9 @@
    {{ optional(Arr::get($prizesGlobal, 1))->quantity }} + class="bg-tertiary fs-3 rounded-pill fw-bold px-3 py-1 text-white">{{ optional(Arr::get($prizesGlobal, 1))->quantity }}
    -

    +

    {!! clean(nl2br(__("Wonderbox \nHappy Day"))) !!}

    @@ -70,13 +70,13 @@ {{-- BTN JOUER --}}
    - {{ __('Jouer !') }}
    {{-- 2nd Row how to play --}} -
    +

    {{ __("Comment jouer\u{00A0}?") }}

    {{ __('Achetez un produit Le Gaulois porteur de l\'offre.') }}
    - {{ __('Voir la liste des produits porteurs') }}
    @@ -126,7 +126,7 @@
    -

    {{ __('Les cadeaux') }}

    +

    {{ __('Les cadeaux') }}

    @@ -150,7 +150,7 @@
    + class="d-inline-block text-bg-quint main-rotate carousel-text-pannel mx-md-4 p-md-4 mx-lg-5 p-lg-5 overflow-visible">

    {!! clean(nl2br(__("Wonderbox \n loisirs"))) !!}

    {{ __('1 activité pour 2 à 6 personnes') }}

    @@ -171,7 +171,7 @@
    + class="d-inline-block text-bg-quint main-rotate carousel-text-pannel mx-md-4 p-md-4 mx-lg-5 p-lg-5 overflow-visible">

    {!! clean(nl2br(__("Wonderbox \n Happy Day"))) !!}

    {{ __('1 activité pour 1 à 2 personnes') }}

    @@ -199,7 +199,7 @@ {{-- BTN JOUER --}}
    - {{ __('Jouer !') }}
    diff --git a/views/pages/static_page.blade.php b/views/pages/static_page.blade.php new file mode 100644 index 0000000..169c1d2 --- /dev/null +++ b/views/pages/static_page.blade.php @@ -0,0 +1,22 @@ +@extends('theme::layout') + +@section('title', $staticPageModel->seo_title) +@section('description', $staticPageModel->seo_description) + +@section('main-class', 'static-page') +@section('content') +
    +
    +
    +

    {{ $staticPageModel->title }}

    +
    +
    +
    +
    +
    + {!! $staticPageModel->content !!} +
    +
    +
    +
    +@endsection diff --git a/views/fo/partials/icons/facebook.blade.php b/views/partials/icons/facebook.blade.php similarity index 100% rename from views/fo/partials/icons/facebook.blade.php rename to views/partials/icons/facebook.blade.php diff --git a/views/fo/partials/icons/instagram.blade.php b/views/partials/icons/instagram.blade.php similarity index 100% rename from views/fo/partials/icons/instagram.blade.php rename to views/partials/icons/instagram.blade.php diff --git a/views/partials/icons/up-arrow.blade.php b/views/partials/icons/up-arrow.blade.php new file mode 100644 index 0000000..309f332 --- /dev/null +++ b/views/partials/icons/up-arrow.blade.php @@ -0,0 +1,6 @@ + + {{ __('Flèche pointant en direction du haut de la page') }} + + + + diff --git a/views/fo/partials/teaser-footer.blade.php b/views/partials/teaser-footer.blade.php similarity index 99% rename from views/fo/partials/teaser-footer.blade.php rename to views/partials/teaser-footer.blade.php index c76a09b..f85a51e 100644 --- a/views/fo/partials/teaser-footer.blade.php +++ b/views/partials/teaser-footer.blade.php @@ -61,7 +61,7 @@
    {{-- Cookie --}} -@include('theme::fo.cookie') +@include('theme::cookie') {{-- Fin des cookies --}} diff --git a/views/fo/partials/teaser-header.blade.php b/views/partials/teaser-header.blade.php similarity index 100% rename from views/fo/partials/teaser-header.blade.php rename to views/partials/teaser-header.blade.php diff --git a/views/fo/participation-exhausted.blade.php b/views/participation-exhausted.blade.php similarity index 93% rename from views/fo/participation-exhausted.blade.php rename to views/participation-exhausted.blade.php index 168789b..02d7c10 100644 --- a/views/fo/participation-exhausted.blade.php +++ b/views/participation-exhausted.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Plus de participations') diff --git a/views/fo/password-email.blade.php b/views/password-email.blade.php similarity index 100% rename from views/fo/password-email.blade.php rename to views/password-email.blade.php diff --git a/views/fo/prize-mail.blade.php b/views/prize-mail.blade.php similarity index 100% rename from views/fo/prize-mail.blade.php rename to views/prize-mail.blade.php diff --git a/views/fo/produits-porteurs.blade.php b/views/produits-porteurs.blade.php similarity index 96% rename from views/fo/produits-porteurs.blade.php rename to views/produits-porteurs.blade.php index 1d36ce0..77023de 100644 --- a/views/fo/produits-porteurs.blade.php +++ b/views/produits-porteurs.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Produits porteurs') diff --git a/views/fo/reduction-mail.blade.php b/views/reduction-mail.blade.php similarity index 100% rename from views/fo/reduction-mail.blade.php rename to views/reduction-mail.blade.php diff --git a/views/fo/reduction.blade.php b/views/reduction.blade.php similarity index 99% rename from views/fo/reduction.blade.php rename to views/reduction.blade.php index 5bb94d8..9b7a313 100644 --- a/views/fo/reduction.blade.php +++ b/views/reduction.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Réduction') diff --git a/views/fo/register-crm.blade.php b/views/register-crm.blade.php similarity index 92% rename from views/fo/register-crm.blade.php rename to views/register-crm.blade.php index 4715a29..96b775c 100644 --- a/views/fo/register-crm.blade.php +++ b/views/register-crm.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Connexion') @@ -24,10 +24,10 @@ @csrf

    Votre profil

    + + + + --> diff --git a/views/fo/reglement.blade.php b/views/reglement.blade.php similarity index 89% rename from views/fo/reglement.blade.php rename to views/reglement.blade.php index bc710a5..85d034d 100644 --- a/views/fo/reglement.blade.php +++ b/views/reglement.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Règlement') diff --git a/views/fo/replay.blade.php b/views/replay.blade.php similarity index 94% rename from views/fo/replay.blade.php rename to views/replay.blade.php index 2a69cda..01ba122 100644 --- a/views/fo/replay.blade.php +++ b/views/replay.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Rejouer') diff --git a/views/fo/teaser.blade.php b/views/teaser.blade.php similarity index 99% rename from views/fo/teaser.blade.php rename to views/teaser.blade.php index 6c1a355..a9f943d 100644 --- a/views/fo/teaser.blade.php +++ b/views/teaser.blade.php @@ -1,4 +1,4 @@ -@extends('theme::fo.layout') +@extends('theme::layout') @section('title', 'Accueil') diff --git a/views/vendor/cn-cookies.blade.php b/views/vendor/cn-cookies.blade.php index 68de6ec..799d4cd 100644 --- a/views/vendor/cn-cookies.blade.php +++ b/views/vendor/cn-cookies.blade.php @@ -2,29 +2,37 @@ @php $site_name = Str::ucfirst(config('app.name')); -$logo_picture_url = Vite::asset('resources/theme/mounted/assets/images/home_logo.png', 'build'); -$logo_alt_text = "Logo {$site_name}"; +$logo_picture_url = Vite::asset('resources/theme/mounted/assets/images/home_logo.png'); +$logo_title_text = __('Logo du site :name', ['name' => $site_name]); +$logo_alt_text = __('Logo :name', ['name' => $site_name]); $confidentiality_page_url = route('fo.charte'); $strings = (object)[ - 'button_customize_cookies' => __('cookie-notice.button_customize_cookies'), - 'button_forbid' => __('cookie-notice.button_forbid'), - 'button_allow' => __('cookie-notice.button_allow'), - 'button_forbid_all' => Str::upper(__('cookie-notice.button_forbid_all')), - 'button_allow_all' => Str::upper(__('cookie-notice.button_allow_all')), - 'button_customize' => Str::upper(__('cookie-notice.button_customize')), - 'button_back' => Str::upper(__('cookie-notice.button_back')), - 'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]), - 'banner_text_open' => __('cookie-notice.banner_text_open', ['site_name' => $site_name]), - 'banner_text' => __('cookie-notice.banner_text'), - 'banner_details' => __('cookie-notice.banner_details'), - 'banner_details_link' => __('cookie-notice.banner_details_link'), + 'modal_title' => __('Fenetre de gestion de cookies'), + 'button_customize_cookies' => __('cookie-notice.button_customize_cookies'), + 'button_close_cookies' => __('cookie-notice.button_close_cookies'), + 'button_forbid' => __('cookie-notice.button_forbid'), + 'button_allow' => __('cookie-notice.button_allow'), + 'button_forbid_all' => Str::upper(__('cookie-notice.button_forbid_all')), + 'button_allow_all' => Str::upper(__('cookie-notice.button_allow_all')), + 'button_customize' => Str::upper(__('cookie-notice.button_customize')), + 'button_forbid_all_title' => __('cookie-notice.button_forbid_all_title'), + 'button_allow_all_title' => __('cookie-notice.button_allow_all_title'), + 'button_back' => Str::upper(__('cookie-notice.button_back')), + 'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]), + 'banner_text_open' => __('cookie-notice.banner_text_open', ['site_name' => $site_name]), + 'banner_text' => __('cookie-notice.banner_text'), + 'banner_details' => __('cookie-notice.banner_details'), + 'banner_details_link' => __('cookie-notice.banner_details_link'), 'banner_details_link_title' => __('cookie-notice.banner_details_link_title'), - 'banner_more_details' => __('cookie-notice.banner_more_details'), - 'banner_less_details' => __('cookie-notice.banner_less_details'), - 'Panel_title' => __('cookie-notice.Panel_title'), - 'Panel_subtitle' => __('cookie-notice.Panel_subtitle'), - 'Panel_details' => __('cookie-notice.Panel_details'), + 'banner_more_details' => __('cookie-notice.banner_more_details'), + 'banner_less_details' => __('cookie-notice.banner_less_details'), + 'Panel_title' => __('cookie-notice.Panel_title'), + 'Panel_content' => __('cookie-notice.Panel_content'), + 'Panel_subtitle' => __('cookie-notice.Panel_subtitle'), + 'Panel_details' => __('cookie-notice.Panel_details'), + 'picture_cookie_title' => __('Image d\'un bon gros cookie'), + 'navigation_title' => __('Navigation du panneau des cookie'), ]; $cookies = []; @@ -80,7 +88,7 @@ SCRIPT; {{-- INCLUDE TEMPLATE --}} @include('theme::vendor.cookie-notice-templates.standard', compact( 'site_name', 'logo_picture_url', 'logo_alt_text', - 'confidentiality_page_url', 'strings' + 'logo_title_text', 'confidentiality_page_url', 'strings' )) @push('scripts') diff --git a/views/vendor/cookie-notice-templates/standard.blade.php b/views/vendor/cookie-notice-templates/standard.blade.php index 89a4a1c..c17f9b4 100644 --- a/views/vendor/cookie-notice-templates/standard.blade.php +++ b/views/vendor/cookie-notice-templates/standard.blade.php @@ -1,31 +1,32 @@ -