diff --git a/public/images/eye-slash.svg b/public/images/eye-slash.svg new file mode 100644 index 000000000..bf17babc6 --- /dev/null +++ b/public/images/eye-slash.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/public/images/eye.svg b/public/images/eye.svg new file mode 100644 index 000000000..efcb24e6d --- /dev/null +++ b/public/images/eye.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/public/images/login_bg.png b/public/images/login_bg.png new file mode 100644 index 000000000..560957372 Binary files /dev/null and b/public/images/login_bg.png differ diff --git a/public/images/social/devicon_google.svg b/public/images/social/devicon_google.svg new file mode 100644 index 000000000..12d6c23de --- /dev/null +++ b/public/images/social/devicon_google.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/public/images/social/fe_github.svg b/public/images/social/fe_github.svg new file mode 100644 index 000000000..4ff99eefb --- /dev/null +++ b/public/images/social/fe_github.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/images/social/logos_facebook.svg b/public/images/social/logos_facebook.svg new file mode 100644 index 000000000..d133b9959 --- /dev/null +++ b/public/images/social/logos_facebook.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/images/social/prime_twitter.svg b/public/images/social/prime_twitter.svg new file mode 100644 index 000000000..7fccfd25d --- /dev/null +++ b/public/images/social/prime_twitter.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/resources/assets/sass/pages/login.scss b/resources/assets/sass/pages/login.scss index 65613f394..cc1167e63 100644 --- a/resources/assets/sass/pages/login.scss +++ b/resources/assets/sass/pages/login.scss @@ -135,4 +135,131 @@ border-right: 1px solid #ccc; flex: 1; } +} + +.help-block .errorlist { + margin: 0; +} + + +.reset_title { + color: var(--Dark-Blue-500, #1C4DA1); + + /* Display md/Montserrat Medium */ + font-family: Montserrat; + font-size: 36px; + font-style: normal; + font-weight: 500; + line-height: 44px; /* 122.222% */ + letter-spacing: -0.72px; + padding-bottom: 40px; +} +.reset_description { + color: var(--Slate-500, #333E48); + + /* Text xl/Blinker Regular */ + font-family: Blinker; + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 30px; /* 150% */ + padding-bottom: 40px; +} + +.codeweek-form-field input, .codeweek-form-field-wrapper input { + padding-left: 1rem; + padding-right: 1rem; +} + +#codeweek-login-page .codeweek-form-field{ + flex-direction: column; + align-items: flex-start; +} + +#codeweek-forgotpassword-page .codeweek-form-field, .codeweek-form-field-searchable { + display: flex; + justify-content: stretch; + flex: 1; + align-items: flex-start; + flex-direction: column; + align-content: flex-start; +} +.codeweek-form-field-add { + display: flex; + flex: 1; + flex-direction: row; + align-items: center; +} + +@media screen and (max-width: 1080px) { + .reset_title { + color: var(--Dark-Blue-500, #1C4DA1); + font-family: Montserrat; + font-size: 30px; + font-style: normal; + font-weight: 400; + line-height: 36px; + letter-spacing: -0.72px; + display: flex; + padding-bottom: 24px; + } + + .reset_description { + font-family: Blinker; + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 30px; /* 150% */ + padding-bottom: 24px; + } +} + +#codeweek-forgotpassword-page .codeweek-form-field label { + margin-right: 10px; + text-transform: capitalize; + width: 100%; + text-align: left; + font-family: Blinker; + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 30px; + +} + +#codeweek-forgotpassword-page input#email { + border-radius: 24px; + border: 2px solid var(--Dark-Blue-200, #A4B8D9); + padding: 12px 0; + color: var(--Slate-500, #333E48); + font-family: Blinker; + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 30px; +} + +#codeweek-login-page .bg-dark-blue-50 { + --tw-bg-opacity: 1; + background-color: rgb(232 237 246 / var(--tw-bg-opacity, 1)); +} + +.text-dark-blue-400 { + --tw-text-opacity: 1; + color: rgb(73 113 180 / var(--tw-text-opacity, 1)); +} + +.border-dark-blue-300 { + --tw-border-opacity: 1; + border-color: rgb(119 148 199 / var(--tw-border-opacity, 1)); +} + +.border-dark-blue-200 { + --tw-border-opacity: 1; + border-color: rgb(164 184 217 / var(--tw-border-opacity, 1)); +} + +.border-dark-blue-200 { + --tw-border-opacity: 1; + border-color: rgb(164 184 217 / var(--tw-border-opacity, 1)); } \ No newline at end of file diff --git a/resources/lang/en/login.php b/resources/lang/en/login.php index b0e3a3503..fc5430960 100644 --- a/resources/lang/en/login.php +++ b/resources/lang/en/login.php @@ -21,13 +21,14 @@ 'email' => 'E-Mail Address', 'password' => 'Password', - 'remember' => 'Remember Me', - 'forgotten_password' => 'Forgot Your Password ?', + 'remember' => 'Keep me signed in', + 'forgotten_password' => 'Forgot Your Password', 'no_account' => 'Don\'t have an account ?', 'signup' => 'Sign Up', 'reset' => 'Reset Your Password', - 'send_password' => 'Send Password Reset Link', + 'send_password' => 'Reset Password', 'confirm_password' => 'Confirm Password', - 'name' => 'name', - -]; + 'name' => 'Fullname', + 'resetpage_title' => 'Forgotten your password?', + 'resetpage_description'=>'Confirm your email address below and we’ll send you instructions on how to create your new password', +]; \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index fbd360632..e84fc0944 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,101 +1,146 @@ -@extends('layout.base') +@extends('layout.new_base') -@section('content') -
- -
-
-

#EUCodeWeek

-

@lang('login.login')

-
-
- -
- -
+@php + $list = [ + (object) ['label' => __('menu.signin'), 'href' => ''], + ]; +@endphp +@section('layout.breadcrumb') + @include('layout.breadcrumb', ['list' => $list]) +@endsection - +
+ @livewire('still-have-question-section')
@endsection + +@push('scripts') + +@endpush \ No newline at end of file diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 3fa73816a..6ba074376 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,25 +1,20 @@ -@extends('layout.base') +@extends('layout.new_base') @section('content') -
+
+
-
-
-

#EUCodeWeek

-

@lang('login.reset')

-
-
+
-
- -
+
@lang('login.resetpage_title')
+
@lang('login.resetpage_description')
@csrf
- - @lang('login.email') +
@@ -27,16 +22,19 @@
-
-
- -
+
+
+
+ + +
- -
- -
-@endsection + @endsection \ No newline at end of file diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 3cc291d3a..f1852865a 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -2,7 +2,7 @@ @section('content') -
+
@@ -13,7 +13,7 @@
-
+
@csrf @@ -26,7 +26,7 @@
@if ($errors->has('email')) @@ -88,5 +88,3 @@ class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : ''
- - diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index f7cb0cb59..656298027 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,88 +1,173 @@ -@extends('layout.base') +@extends('layout.new_base') -@section('content') -
- -
-
-

#EUCodeWeek

-

@lang('login.register')

-
-
- -
+@php + $list = [ + (object) ['label' => __('login.register'), 'href' => ''], + ]; +@endphp +@section('layout.breadcrumb') + @include('layout.breadcrumb', ['list' => $list]) +@endsection -
- +@section('content') +
+
+
+
+ + @lang('login.login') + + + @lang('login.register') + +
+
+
+ + + + + + + + + + + + +
+
+
+
@lang('base.or')
+
+ @csrf @honeypot -
-
- +
+
+ + +
+
+ @component('components.validation-errors', ['field'=>'email'])@endcomponent +
+
+
+
+ + class="border-2 border-solid border-dark-blue-200 w-full rounded-full h-12 px-4 mt-3" + value="{{old('name')}}" required autofocus>
-
+
@component('components.validation-errors', ['field'=>'name'])@endcomponent
- -
-
- - +
+
+ +
+ + + +
-
- @component('components.validation-errors', ['field'=>'email'])@endcomponent +
+ @component('components.validation-errors', ['field'=>'password'])@endcomponent
- - -
-
- - +
+
+ +
+ + + +
-
+
@component('components.validation-errors', ['field'=>'password'])@endcomponent
- -
-
- - +
+
+ + +
-
- @component('components.validation-errors', ['field'=>'password-confirm'])@endcomponent +
+ @component('components.validation-errors', ['field'=>'privacy'])@endcomponent
-
- - @component('components.validation-errors', ['field'=>'privacy']) - @endcomponent -
- -
-
- -
+
+
- -
+
+
+ @livewire('still-have-question-section')
@endsection + +@push('scripts') + +@endpush \ No newline at end of file