diff --git a/sass/base/_layout.scss b/sass/base/_layout.scss index c82caaf..2203d92 100644 --- a/sass/base/_layout.scss +++ b/sass/base/_layout.scss @@ -8,6 +8,14 @@ body { } } + @include media-breakpoint-up(xxxl, map.merge($grid-breakpoints, ("xxxl": 1600px))) { + .game-logo-banner { + position: absolute; + top: 0; + } + } + + .rest-in-game-banner { transform: skew(12deg) translateX(5%); @@ -32,13 +40,6 @@ body { transform: translateY(-50%); } } - - @include media-breakpoint-up(xxxl, map.merge($grid-breakpoints, ("xxxl": 1600px))) { - .navbar-brand { - position: absolute; - top: 0; - } - } } > footer { @@ -80,7 +81,7 @@ body { > a { position: absolute; - top: -6rem; + top: -3rem; left: 50%; width: 11rem; max-height: 8rem; diff --git a/sass/mail-theme.scss b/sass/mail-theme.scss index f818313..6adfa17 100644 --- a/sass/mail-theme.scss +++ b/sass/mail-theme.scss @@ -5,7 +5,7 @@ @import "utilities/bootstrap-variables"; // 2. Include functions first (so you can manipulate colors, SVGs, calc, etc) -@import "bootstrap/scss/functions"; +// @import "bootstrap/scss/functions"; // 3. Include remainder of required Bootstrap stylesheets @import "bootstrap/scss/variables"; @@ -67,6 +67,7 @@ a img { h1 { margin-top: 0; color: $color-primary; + color: $color-tertiary; font-size: 18px; font-weight: bold; text-align: left; @@ -74,6 +75,7 @@ h1 { h2 { margin-top: 0; + color: $color-tertiary; font-size: 16px; font-weight: bold; text-align: left; @@ -81,6 +83,7 @@ h2 { h3 { margin-top: 0; + color: $color-tertiary; font-size: 14px; font-weight: bold; text-align: left; diff --git a/sass/utilities/_bootstrap-custom.scss b/sass/utilities/_bootstrap-custom.scss index 50438f2..f50fbd5 100644 --- a/sass/utilities/_bootstrap-custom.scss +++ b/sass/utilities/_bootstrap-custom.scss @@ -1,5 +1,7 @@ @use "sass:list"; @import "mixins"; +@import "bootstrap/scss/functions"; +@import "./bs-customs/input"; // SET SOME CLASSES WITH BOOTSTRAP BREAKPOINTS // * Reponsive borders diff --git a/sass/utilities/_variables.scss b/sass/utilities/_variables.scss index 9dae5b9..ed2d5ec 100644 --- a/sass/utilities/_variables.scss +++ b/sass/utilities/_variables.scss @@ -11,7 +11,7 @@ $color-warning: #e6cd00; $color-primary: #0f437e; $color-secondary: #135ba7; $color-tertiary: #db275a; -$color-quad: #0179a9; +$color-quad: #00719e; $color-quint: #fba629; // * BACKGROUNDS COLORS @@ -29,6 +29,12 @@ $font-default-size-base: 1rem; // Assumes the browser default, typically `16px` $line-default-height-base: 1.65; +// * Inputs + +$input-bg: color.adjust($color-tertiary, $lightness: 45%); +$input-color: color.adjust($color-tertiary, $lightness: -10%); + + // * Cookie Notice $ck-primary-color: $color-primary; $ck-secondary-color: color.adjust($color-tertiary, $lightness: -10%); diff --git a/sass/utilities/bs-customs/_input.scss b/sass/utilities/bs-customs/_input.scss new file mode 100644 index 0000000..f2bb723 --- /dev/null +++ b/sass/utilities/bs-customs/_input.scss @@ -0,0 +1,32 @@ +@use "sass:color"; + +// * Input Form floating text +.form-floating { + > label { + color: #{color.adjust($color-tertiary, $lightness: -4%)}; + font-weight: bold; + } + + > .form-control, + > .form-control-plaintext { + &::placeholder { + color: transparent; + } + } + + > .form-control-plaintext, + > .form-control:focus, + > .form-control:not(:placeholder-shown), + > .form-select { + /* stylelint-disable-next-line no-descending-specificity */ + ~ label { + color: #{rgba(color.adjust($color-tertiary, $lightness: -4%), $form-floating-label-opacity)}; + } + } + // Duplicated because `:-webkit-autofill` invalidates other selectors when grouped + // > .form-control:-webkit-autofill { + // ~ label { + // color: rgba(var(--#{$prefix}body-color-rgb), #{$form-floating-label-opacity}); + // } + // } +} diff --git a/ts/components/InputBirthDate.vue b/ts/components/InputBirthDate.vue new file mode 100644 index 0000000..79dabee --- /dev/null +++ b/ts/components/InputBirthDate.vue @@ -0,0 +1,102 @@ + + + diff --git a/ts/components/PasswordVisibility.vue b/ts/components/PasswordVisibility.vue new file mode 100644 index 0000000..ab2f2cf --- /dev/null +++ b/ts/components/PasswordVisibility.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/ts/components/shims-vue.d.ts b/ts/components/shims-vue.d.ts deleted file mode 100644 index 166cfb8..0000000 --- a/ts/components/shims-vue.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -declare module "*.vue" { - import type { DefineComponent } from "vue"; - const component: DefineComponent<{}, {}, any>; - export default component; -} diff --git a/views/auth/login.blade.php b/views/auth/login.blade.php new file mode 100644 index 0000000..3bb7ec2 --- /dev/null +++ b/views/auth/login.blade.php @@ -0,0 +1,100 @@ +@extends('theme::layout') + +@section('title', __('Connexion')) +@section('description', __('Connexion')) + +@section('no-flash', true) + +@section('content') +
+ @error('email') +
+
+ +
+
+ @enderror +
+
+ {{ __('Je m\'inscris') }} +

{{ __('Pour participer et tenter votre chance, inscrivez-vous !') }}

+ {{ __('Inscription') }} +
+
+
+
+ + {{ __('Je me connecte') }} +

{{ __('Si vous possédez déjà un compte Club Le Gaulois, vous pouvez utiliser les mêmes identifiants.') }}

+
+ @csrf + +
+
+
+
+ + +
+ @error('email') + + @enderror +
+
+
+ +
+
+
+
+ + +
+ @error('password') + + @enderror +
+
+
+ +
+
+
+ + + +
+
+
+ +
+
+ + + @if (Route::has('fo.password.request')) + + {{ __('Forgot Your Password?') }} + + @endif +
+
+
+
+
+
+@endsection diff --git a/views/auth/password-min-strength.blade.php b/views/auth/password-min-strength.blade.php new file mode 100644 index 0000000..de08693 --- /dev/null +++ b/views/auth/password-min-strength.blade.php @@ -0,0 +1,13 @@ +
+
+ + {!! nl2br( + clean( + __( + "Le mot de passe doit avoir une longueur de 8 caractères minimum,\n doit contenir une lettre majuscule et une lettre minucule,\n doit contenir un caractère spécial comme une virgule par exemple,\n doit contenir un chiffre.", + ), + ), + ) !!} + +
+
diff --git a/views/auth/passwords/confirm.blade.php b/views/auth/passwords/confirm.blade.php new file mode 100644 index 0000000..442c203 --- /dev/null +++ b/views/auth/passwords/confirm.blade.php @@ -0,0 +1,53 @@ +@extends('theme::layout') + +@section('title', __('Confirmer son adresse e-mail')) +@section('description', __('Confirmer son adresse e-mail')) + +@section('content') +
+
+
+
+
{{ __('Confirm Password') }}
+ +
+ {{ __('Please confirm your password before continuing.') }} + +
+ @csrf + +
+ + +
+ + + @error('password') + + {{ $message }} + + @enderror +
+
+ +
+
+ + + @if (Route::has('fo.password.request')) + + {{ __('Forgot Your Password?') }} + + @endif +
+
+
+
+
+
+
+
+@endsection diff --git a/views/auth/passwords/email.blade.php b/views/auth/passwords/email.blade.php new file mode 100644 index 0000000..ac51509 --- /dev/null +++ b/views/auth/passwords/email.blade.php @@ -0,0 +1,44 @@ +@extends('theme::layout') + +@section('title', __('Réinitialiser son mot de passe')) +@section('description', __('Réinitialiser son mot de passe')) + +@section('content') +
+
+
+

{{ __('Reset Password') }}

+
+
+
+
+
+ @csrf + +
+ + +
+ + + @error('email') + + {{ $message }} + + @enderror +
+
+ +
+
+ +
+
+
+
+
+
+@endsection diff --git a/views/auth/passwords/reset.blade.php b/views/auth/passwords/reset.blade.php new file mode 100644 index 0000000..7aacea6 --- /dev/null +++ b/views/auth/passwords/reset.blade.php @@ -0,0 +1,85 @@ +@extends('theme::layout') + +@section('title', __('Réinitialiser son mot de passe')) +@section('description', __('Réinitialiser son mot de passe')) + +@section('content') +
+
+
+

{{ __('Reset Password') }}

+
+
+
+
+
+ @csrf + + + +
+
+
+
+ + + @foreach ($errors->get('email') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ +
+
+
+
+ + +
+ @php $dataPassword = ['inputId' => 'register-password']; @endphp + + @foreach ($errors->get('password') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ +
+
+
+
+ + +
+ @php $dataConfirmPassword = ['inputId' => 'register-password-confirmation']; @endphp + + @foreach ($errors->get('password_confirmation') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ @include('theme::auth.password-min-strength') + +
+
+ +
+
+
+
+
+
+
+@endsection diff --git a/views/auth/register.blade.php b/views/auth/register.blade.php new file mode 100644 index 0000000..78ac3d4 --- /dev/null +++ b/views/auth/register.blade.php @@ -0,0 +1,259 @@ +@extends('theme::layout') + +@section('title', __('Créer un compte')) +@section('description', __('Créer un compte')) + +@section('content') +
+
+
+

{{ __('S\'inscrire au club Le Gaulois') }}

+ +
+ @csrf + +
+
+ {{ __("Merci de renseigner les champs ci-dessous\u{00A0}:") }} +
+
+ +
+ {{ __('Votre profil') }} + +
+
+
+
+ + + @foreach ($errors->get('lastname') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ +
+
+
+ + + @foreach ($errors->get('firstname') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ +
+
+
+ @php + $dataBirthDate = [ + 'id' => 'register-birth_date', + 'class' => 'form-control mx-auto ' . ($errors->has('birth_date') ? 'is-invalid' : ''), + 'name' => 'birth_date', + 'placeholder' => __('Date de naissance'), + 'autocomplete' => 'bday', + 'required' => true, + 'value' => old('birth_date', $crmCustomer->birth_date ?? null), + ]; + @endphp +
+ @foreach ($errors->get('birth_date') as $message) +
{{ $message }}
+ @endforeach +
+
+
+
+
+ +
+ {{ __('Vos coordonnées') }} + +
+
+
+ + + @foreach ($errors->get('address') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ +
+
+
+ + + @foreach ($errors->get('address2') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ +
+
+
+ + + @foreach ($errors->get('city') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ +
+
+
+ + + @foreach ($errors->get('postcode') as $message) +
{{ $message }}
+ @endforeach +
+
+
+
+ +
+ {{ __('Vos identifiants') }} + +
+
+
+
+ + + @foreach ($errors->get('email') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ + @if (empty($displayEdit)) +
+
+
+
+ + +
+ @php $dataPassword = ['inputId' => 'register-password']; @endphp + + @foreach ($errors->get('password') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ +
+
+
+
+ + +
+ @php $dataConfirmPassword = ['inputId' => 'register-password-confirmation']; @endphp + + @foreach ($errors->get('password_confirmation') as $message) +
{{ $message }}
+ @endforeach +
+
+
+ + @include('theme::auth.password-min-strength') + @endif +
+
+ +
+
+
+ + +
+ @foreach ($errors->get('opt_in') as $message) +
{{ $message }}
+ @endforeach +
+
+ +
+
+
+ + +
+ @foreach ($errors->get('ok_cgv') as $message) +
{{ $message }}
+ @endforeach +
+
+ +
+
+ +
+
+ +
+
+ {{ __('* champs obligatoires') }} +
+
+
+
+
+
+@endsection diff --git a/views/auth/verify.blade.php b/views/auth/verify.blade.php new file mode 100644 index 0000000..0483e6c --- /dev/null +++ b/views/auth/verify.blade.php @@ -0,0 +1,30 @@ +@extends('theme::layout') + +@section('title', __('Vérifier son adresse e-mail')) +@section('description', __('Vérifier son adresse e-mail')) + +@section('content') +
+
+
+

{{ __('Verify Your Email Address') }}

+
+
+
+
+ @if (session('resent')) + + @endif + + {{ __('Before proceeding, please check your email for a verification link.') }} + {{ __('If you did not receive the email') }}, +
+ @csrf + . +
+
+
+
+@endsection diff --git a/views/confirm-email.blade.php b/views/confirm-email.blade.php deleted file mode 100644 index bd5a6b5..0000000 --- a/views/confirm-email.blade.php +++ /dev/null @@ -1,44 +0,0 @@ -@extends('theme::layout') - -@section('title', 'Activation de votre compte') - -@section('content') -
-
-
-
-

Activation du compte

- @if ($result === true) -

Compte activé avec succès, vous pouvez désormais vous connecter

-
- Se connecter -
- @if (session('success')) -
- {{ session('success') }} -
- @endif - @else - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif -
-

Oups !

-

Votre compte n'a pu être activé. Le lien d'activation que vous avez reçu par mail doit être périmé.


-

Cliquez sur le bouton ci-dessous pour vous inscrire.

-
-
- Je m'inscris -
- @endif -
-
- -
-@endsection diff --git a/views/forgot-password.blade.php b/views/forgot-password.blade.php deleted file mode 100644 index 507c051..0000000 --- a/views/forgot-password.blade.php +++ /dev/null @@ -1,67 +0,0 @@ -@extends('theme::layout') - -@section('title', 'Mot de passe oublié') - -@section('content') -
-
-
- -
- @if (!isset($tokenValid) || !$tokenValid) -

Mot de passe oublié

-
- @method('PUT') - @csrf - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - @if (session('success')) -
- {{ session('success') }} -
- @endif -

Pour que nous puissions vous envoyer un lien de réinitialisation de votre mot de passe, merci de nous indiquer - l'adresse e-mail saisie lors de votre inscription.

-
- -
- -
- @elseif ($tokenValid) -

Changement de votre mot de passe

-
- @method('PUT') - @csrf - @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - @if (session('success')) -
- {{ session('success') }} -
- @endif - - - - -
- @endif -
-
-
-@endsection diff --git a/views/pages/gain1.blade.php b/views/gain1.blade.php similarity index 100% rename from views/pages/gain1.blade.php rename to views/gain1.blade.php diff --git a/views/pages/gain2.blade.php b/views/gain2.blade.php similarity index 100% rename from views/pages/gain2.blade.php rename to views/gain2.blade.php diff --git a/views/layout.blade.php b/views/layout.blade.php index 3ecf2c3..b46bb19 100644 --- a/views/layout.blade.php +++ b/views/layout.blade.php @@ -8,6 +8,16 @@ @include('theme::layouts.header') + @sectionMissing('no-flash') +
+
+
+ @include('theme::modules.flash-messages') +
+
+
+ @endif +
@yield('content')
@@ -16,6 +26,7 @@ @include('theme::layouts.footer') + @include('back::modules.script-routes') {{-- @include('theme::cookie') --}} @include('theme::vendor.cn-cookies') @vite(['resources/theme/mounted/ts/fo.ts']) diff --git a/views/layouts/footer.blade.php b/views/layouts/footer.blade.php index aeee6ad..03d4087 100644 --- a/views/layouts/footer.blade.php +++ b/views/layouts/footer.blade.php @@ -7,12 +7,13 @@
@include('theme::partials.icons.facebook')
+ title="{{ __('Aller voir la page Instagram Le Gaulois') }}" target="_blank"> @include('theme::partials.icons.instagram') @@ -25,19 +26,24 @@ {{-- LINKS --}}