Merge branch 'develop' into trunk
This commit is contained in:
Jérémy Munsch
commit
37913f0206
12 changed files with 67 additions and 62 deletions
|
|
@ -26,7 +26,7 @@ enum StaticPageType: int
|
|||
*/
|
||||
private const LABELS = [
|
||||
self::contact->name => 'Contact',
|
||||
self::legals->name => 'Mentions légales',
|
||||
self::legals->name => 'Mentions légales et CGU',
|
||||
self::confidentiality->name => 'Confidentialité',
|
||||
self::home->name => 'Accueil',
|
||||
self::conviction->name => 'Nos Convictions',
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ class StaticPageSeeder extends Seeder
|
|||
'type' => StaticPageType::legals,
|
||||
],
|
||||
[
|
||||
'seo_title' => 'Seo title pour la page mentions légales',
|
||||
'seo_description' => 'Seo description pour la page mentions légales',
|
||||
'title' => 'Mentions légales',
|
||||
'slug' => Str::slug('Mentions légales'),
|
||||
'seo_title' => 'Seo title pour la page mentions légales et CGU',
|
||||
'seo_description' => 'Seo description pour la page mentions légales et CGU',
|
||||
'title' => 'Mentions légales et CGU',
|
||||
'slug' => Str::slug('Mentions légales et CGU'),
|
||||
'type' => StaticPageType::legals,
|
||||
'content' => \clean(\fake()->randomHtml(6, 7)),
|
||||
]
|
||||
|
|
|
|||
40
package-lock.json
generated
40
package-lock.json
generated
|
|
@ -12,7 +12,7 @@
|
|||
"@fortawesome/free-regular-svg-icons": "^6.5.1",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||
"@fortawesome/vue-fontawesome": "^3.0.5",
|
||||
"@ldc-web/cookie-notice": "^4.0.0",
|
||||
"@ldc-web/cookie-notice": "^4.1.0",
|
||||
"@sipec/vue3-tags-input": "^3.0.4",
|
||||
"@types/bootstrap": "^5.2.7",
|
||||
"@types/node": "^20.8.2",
|
||||
|
|
@ -1050,9 +1050,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"node_modules/@ldc-web/cookie-notice": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-4.0.1.tgz",
|
||||
"integrity": "sha1-NvTFoKF7Ki/+3PDr9hmqjjTFuZE=",
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-4.1.0.tgz",
|
||||
"integrity": "sha1-bhDGIDjM6T0uMaovPpEc2hjTa+4=",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@nodelib/fs.scandir": {
|
||||
|
|
@ -3830,9 +3830,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"node_modules/follow-redirects": {
|
||||
"version": "1.15.5",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
|
||||
"integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
|
||||
"version": "1.15.6",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
|
||||
"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -4911,24 +4911,12 @@
|
|||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash.debounce": {
|
||||
"version": "4.0.8",
|
||||
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
|
||||
"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash.merge": {
|
||||
"version": "4.6.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
|
||||
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash.pick": {
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
|
||||
"integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash.truncate": {
|
||||
"version": "4.4.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
|
||||
|
|
@ -6997,9 +6985,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"node_modules/sweetalert2": {
|
||||
"version": "11.10.4",
|
||||
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.4.tgz",
|
||||
"integrity": "sha512-MOVRuEW/yQsyzgkaiHqAJcYKxW3vhtE5o3Skp6vZdyJejCOWo4FOicbjRfvqHAXTyTMuwDHA+0lYbO6BiHl1Gw==",
|
||||
"version": "11.10.6",
|
||||
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.6.tgz",
|
||||
"integrity": "sha512-CINZPLZXZRSZqSOE7H7j1F7X8e8O1kLOiXPmtJn1DYxvXsKBr3d16d90+IcwTTs7dJww20h8r8QIxIwsLGX+6A==",
|
||||
"dev": true,
|
||||
"funding": {
|
||||
"type": "individual",
|
||||
|
|
@ -7630,9 +7618,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/vite-plugin-checker": {
|
||||
"version": "0.6.2",
|
||||
"resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.2.tgz",
|
||||
"integrity": "sha512-YvvvQ+IjY09BX7Ab+1pjxkELQsBd4rPhWNw8WLBeFVxu/E7O+n6VYAqNsKdK/a2luFlX/sMpoWdGFfg4HvwdJQ==",
|
||||
"version": "0.6.4",
|
||||
"resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.4.tgz",
|
||||
"integrity": "sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@babel/code-frame": "^7.12.13",
|
||||
|
|
@ -7642,8 +7630,6 @@
|
|||
"commander": "^8.0.0",
|
||||
"fast-glob": "^3.2.7",
|
||||
"fs-extra": "^11.1.0",
|
||||
"lodash.debounce": "^4.0.8",
|
||||
"lodash.pick": "^4.4.0",
|
||||
"npm-run-path": "^4.0.1",
|
||||
"semver": "^7.5.0",
|
||||
"strip-ansi": "^6.0.0",
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
"@fortawesome/free-regular-svg-icons": "^6.5.1",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||
"@fortawesome/vue-fontawesome": "^3.0.5",
|
||||
"@ldc-web/cookie-notice": "^4.0.1",
|
||||
"@ldc-web/cookie-notice": "^4.1.0",
|
||||
"@sipec/vue3-tags-input": "^3.0.4",
|
||||
"@types/bootstrap": "^5.2.7",
|
||||
"@types/node": "^20.8.2",
|
||||
|
|
@ -69,4 +69,4 @@
|
|||
"vue-loader": "^17.3.1",
|
||||
"vue-tsc": "1.8.11"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ return [
|
|||
'title' => 'reCAPTACHA',
|
||||
'description' => 'The purpose of the cookies placed on forms via the recaptcha is to prevent them from being submitted by robots.',
|
||||
'labelLink' => 'Learn more',
|
||||
'warning' => 'You must accept cookies to send the form',
|
||||
'warning' => 'You must accept reCAPTACHA cookies to send the form',
|
||||
]
|
||||
]
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@ return [
|
|||
'acceptcgu' => "J’autorise AGIS à traiter mes données personnelles " .
|
||||
"conformément à la :startACharte de confidentialité:endA.",
|
||||
'senddata' => "J'ai lu et j'accepte la politique de confidentialité " .
|
||||
"de ce site: :startA Voir nos mentions légales:endA.",
|
||||
"de ce site: :startA Voir nos mentions légales et CGU:endA.",
|
||||
'send' => 'Envoyer'
|
||||
];
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ return [
|
|||
'title' => 'reCAPTACHA',
|
||||
'description' => 'Les cookies qui sont déposés via le recaptcha sur les formulaires ont pour finalité d’empêcher que ceux-ci ne soient soumis par des robots.',
|
||||
'labelLink' => 'En apprendre plus',
|
||||
'warning' => 'Vous devez accepter les cookies pour envoyer le formulaire',
|
||||
'warning' => 'Vous devez accepter les cookies reCAPTACHA pour envoyer le formulaire',
|
||||
]
|
||||
]
|
||||
];
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@
|
|||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-uppercase @if (request()->routeIs('fo.legals.show')) active @endif py-1" data-bs-toggle="tooltip"
|
||||
href="{{ route('fo.legals.show') }}" title="{{ __('Mentions légales') }}">
|
||||
{{ __('Mentions légales') }}
|
||||
href="{{ route('fo.legals.show') }}" title="{{ __('Mentions légales et CGU') }}">
|
||||
{{ __('Mentions légales et CGU') }}
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<nav class="main-menu navbar">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand" data-bs-toggle="tooltip" data-bs-placement="bottom" href="{{ route('fo.homepage') }}"
|
||||
title="{{ __('Accéder au front du projet') }}">
|
||||
title="{{ __('Accéder à la page d\'accueil') }}">
|
||||
<img class="img-fluid" src="{{ Vite::asset('resources/assets/images/layout/logo.svg', 'build') }}" alt="{{ config('app.name') }}"
|
||||
width="200">
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -233,13 +233,23 @@
|
|||
</fieldset>
|
||||
</div>
|
||||
<div class="col text-center">
|
||||
<span>{{ __('Les informations recueillies à partir de ce formulaire sont traitées par le Responsable de Traitement pour donner suite à votre demande de contact. Pour connaître vos droits, vous pouvez consulter la Charte de confidentialité. !') }}</span>
|
||||
<span>{!! clean(
|
||||
__(
|
||||
'Les informations recueillies à partir de ce formulaire sont traitées par le Responsable de Traitement pour donner suite à votre demande de contact. Pour connaître vos droits, vous pouvez consulter la :startA Charte de confidentialité:endA. !',
|
||||
[
|
||||
'startA' => '<a href="' . route('fo.legals.show') . '">',
|
||||
'endA' => '</a>',
|
||||
],
|
||||
),
|
||||
) !!}</span>
|
||||
</div>
|
||||
<a class="cn-cookie-link" id="recaptcha-warning" href="" rel="nofollow">
|
||||
<span id="recaptcha-warning" href="" rel="nofollow">
|
||||
<strong class="text-underline text-bold text-normal text-danger">
|
||||
{{ __('cookie-notice.custom.recaptcha.warning') }}
|
||||
</strong>
|
||||
</a>
|
||||
<button class="btn btn-sm btn-primary"
|
||||
id="recaptcha-accept">{{ __('Accepter Recaptcha uniquement') }}</button>
|
||||
</span>
|
||||
<div class="d-flex flex-column justify-content-center align-items-center">
|
||||
<div id="r_captcha"></div>
|
||||
@if ($errors->has('g-recaptcha-response'))
|
||||
|
|
@ -279,6 +289,10 @@
|
|||
element.inert = false;
|
||||
});
|
||||
};
|
||||
document.getElementById("recaptcha-accept")?.addEventListener('click', function(e) {
|
||||
e.preventDefault();
|
||||
window.WebCookieNotice.acceptCookie('recaptcha');
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
|
||||
@section('title', $staticPageModel->seo_title ?? __('Rejoignez-nous'))
|
||||
@section('description', $staticPageModel->seo_description ?? __('Rejoignez-nous la description.'))
|
||||
@section('breadcrumb',
|
||||
request()->route()->getName())
|
||||
@section('breadcrumb', request()->route()->getName())
|
||||
|
||||
@section('content')
|
||||
<section class="joinus overflow-hidden">
|
||||
|
|
@ -105,22 +104,22 @@
|
|||
<p>{{ __('Une équipe de talents à renforcer.') }}</p>
|
||||
<div class="ratio ratio-16x9">
|
||||
@if (\App\Rules\IsValidYoutubeId::validates($joinuspageModel->video_id))
|
||||
<div class="video-inlaid" type="youtube" href="https://www.youtube.com/embed/{{ $joinuspageModel->video_id }}">
|
||||
<a class="cn-cookie-link" id="youtube-warning" href="" rel="nofollow">
|
||||
<strong class="text-underline text-bold text-normal text-danger">
|
||||
{{ __('cookie-notice.custom.youtube.warning') }}
|
||||
</strong>
|
||||
</a>
|
||||
</div>
|
||||
<div class="video-inlaid" type="youtube" href="https://www.youtube.com/embed/{{ $joinuspageModel->video_id }}">
|
||||
<a class="cn-cookie-link" id="youtube-warning" href="" rel="nofollow">
|
||||
<strong class="text-underline text-bold text-normal text-danger">
|
||||
{{ __('cookie-notice.custom.youtube.warning') }}
|
||||
</strong>
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
@if (\App\Rules\IsValidVimeoId::validates($joinuspageModel->video_id))
|
||||
<div class="video-inlaid" type="vimeo" href="https://player.vimeo.com/video/{{ $joinuspageModel->video_id }}">
|
||||
<a class="cn-cookie-link" id="vimeo-warning" href="" rel="nofollow">
|
||||
<strong class="text-underline text-bold text-normal text-danger">
|
||||
{{ __('cookie-notice.custom.vimeo.warning') }}
|
||||
</strong>
|
||||
</a>
|
||||
</div>
|
||||
<div class="video-inlaid" type="vimeo" href="https://player.vimeo.com/video/{{ $joinuspageModel->video_id }}">
|
||||
<a class="cn-cookie-link" id="vimeo-warning" href="" rel="nofollow">
|
||||
<strong class="text-underline text-bold text-normal text-danger">
|
||||
{{ __('cookie-notice.custom.vimeo.warning') }}
|
||||
</strong>
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<p>
|
||||
|
|
@ -237,10 +236,12 @@
|
|||
</label>
|
||||
<textarea class="form-control" id="message" name="message" rows="6" required>{{ old('message') }}</textarea>
|
||||
</fieldset>
|
||||
<a class="cn-cookie-link" id="recaptcha-warning" rel="nofollow">
|
||||
<a id="recaptcha-warning" rel="nofollow">
|
||||
<strong class="text-underline text-bold text-normal text-danger">
|
||||
{{ __('cookie-notice.custom.recaptcha.warning') }}
|
||||
</strong>
|
||||
<button class="btn btn-sm btn-primary"
|
||||
id="recaptcha-accept">{{ __('Accepter Recaptcha uniquement') }}</button>
|
||||
</a>
|
||||
<div class="d-flex flex-column justify-content-center align-items-center mt-2">
|
||||
<div id="r_captcha"></div>
|
||||
|
|
@ -281,6 +282,10 @@
|
|||
document.getElementById('recaptcha-warning').remove();
|
||||
document.getElementById('joinus-form').inert = false;
|
||||
};
|
||||
document.getElementById("recaptcha-accept")?.addEventListener('click', function(e) {
|
||||
e.preventDefault();
|
||||
window.WebCookieNotice.acceptCookie('recaptcha');
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ Route::middleware(['throttle:web'])->name('fo.')->group(function () {
|
|||
// * LEGALS
|
||||
Route::get('/nous-connaitre', [StaticPageController::class, 'aboutUs'])->name('aboutus.show');
|
||||
|
||||
Route::get('/mentions-legales', [StaticPageController::class, 'legals'])->name('legals.show');
|
||||
Route::get('/mentions-legales-et-cgu', [StaticPageController::class, 'legals'])->name('legals.show');
|
||||
Route::get('/charte-de-confidentialite', [StaticPageController::class, 'policies'])->name('policies.show');
|
||||
|
||||
// * NEWS.
|
||||
|
|
@ -51,7 +51,7 @@ Route::middleware(['throttle:web'])->name('fo.')->group(function () {
|
|||
'rubrique/plan-d-acces' => 'contact',
|
||||
'rubrique/service-consommateurs' => 'contact',
|
||||
'rubrique/nos-savoir-faire' => 'gammes',
|
||||
'mentions' => 'mentions-legales',
|
||||
'mentions' => 'mentions-legales-et-cgu',
|
||||
'actualite/{any}' => 'news',
|
||||
'rubrique/nos-engagements' => 'nos-convictions',
|
||||
'rubrique/la-societe' => 'nous-connaitre',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue