register page add first name and last name && remove username and display_name

This commit is contained in:
vedatakd 2020-01-16 11:58:29 +03:00
parent 4d56b4baf7
commit d4eb3f74d6
8 changed files with 39 additions and 36 deletions

View File

@ -0,0 +1,10 @@
.login-section,
.register-section {
border: 1px solid #dfdfdf;
}
.login-section button, .login-section a,
.register-section button,
.register-section a {
font-size: 16px;
}

View File

@ -24,15 +24,4 @@
.register-section {
padding: 100px 50px;
}
}
.login-section,
.register-section {
border: 1px solid #dfdfdf;
}
.login-section button, .login-section a,
.register-section button,
.register-section a {
font-size: 16px;
}

View File

@ -16,8 +16,8 @@ return [
'reset_code' => 'Reset Code',
'password_confirmation' => 'Password Confirmation',
'password' => 'Password',
'display_name' => 'Display Name',
'username' => 'Username',
'first_name' => 'First Name',
'last_name' => 'Last Name',
'remember_me' => 'Remember Me',
'not_a_member_yet' => 'Not a Member Yet',
'not_a_member_yet_message' => 'Sign up for our members to benefit from our special service',

View File

@ -16,8 +16,8 @@ return [
'reset_code' => 'Sıfırlama Kodu',
'password_confirmation' => 'Şifrenizi Onaylayın',
'password' => 'Şifreniz',
'display_name' => 'İsim Soyisim',
'username' => 'Kullanıcı Adı',
'first_name' => 'Adınız',
'last_name' => 'Soyadınız',
'remember_me' => 'Beni Hatırla',
'not_a_member_yet' => 'Henüz Üye Değil Misiniz',
'not_a_member_yet_message' => 'Üyelerimize özel hizmetlerimizden faydalanabilmek için üye olun',

View File

@ -83,4 +83,5 @@
</div>
</div>
</div>
{{ asset_add('styles.css','visiosoft.theme.base::css/login.css') }}
{% endblock %}

View File

@ -3,7 +3,7 @@
{% block content %}
<div class="row justify-content-center">
<div class="col-12 col-sm-8 col-md-6 col-lg-4 text-left bg-light p-3 m-0">
{% set form = form('register').redirect(request_get('redirect', '/'))
{% set form = form('register2').redirect(request_get('redirect', '/'))
.get() %}
{{ form_open({
'class': 'row form ' ~ form.options.class ,
@ -13,24 +13,24 @@
<div class="col-12">
<div class="form-group display_name-field display_name-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.display_name') }}
{{ trans('visiosoft.theme.base::field.first_name') }}
<span class="required">*</span>
</label>
<div class="input-wrapper">
{{ form.fields.display_name.input|raw }}
{{ form.fields.first_name.input|raw }}
</div>
</div>
</div>
<div class="col-12">
<div class="form-group username-field username-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.username') }}
{{ trans('visiosoft.theme.base::field.last_name') }}
<span class="required">*</span>
</label>
<div class="input-wrapper">
{{ form.fields.username.input|raw }}
{{ form.fields.last_name.input|raw }}
</div>
</div>
</div>

View File

@ -38,16 +38,18 @@ class Register2FormBuilder extends FormBuilder
* @var array
*/
protected $fields = [
'display_name' => [
'first_name' => [
'instructions' => false,
'required' => true,
],
'last_name' => [
'instructions' => false,
'required' => true,
],
'email' => [
'instructions' => false,
],
'username' => [
'instructions' => false,
],
'email' => [
'instructions' => false,
],
'password' => [
'password' => [
'instructions' => false,
],
];
@ -69,10 +71,10 @@ class Register2FormBuilder extends FormBuilder
* @var array
*/
protected $options = [
'redirect' => '/',
'success_message' => 'anomaly.module.users::success.user_registered',
'pending_message' => 'anomaly.module.users::message.pending_admin_activation',
'confirm_message' => 'anomaly.module.users::message.pending_email_activation',
'redirect' => '/',
'success_message' => 'anomaly.module.users::success.user_registered',
'pending_message' => 'anomaly.module.users::message.pending_admin_activation',
'confirm_message' => 'anomaly.module.users::message.pending_email_activation',
'activated_message' => 'anomaly.module.users::message.account_activated',
];

View File

@ -26,9 +26,9 @@ class Register2FormHandler
/**
* Handle the form.
*
* @param Repository $config
* @param RegisterFormBuilder $builder
* @param UserActivator $activator
* @param Repository $config
* @param RegisterFormBuilder $builder
* @param UserActivator $activator
* @throws \Exception
*/
public function handle(
@ -36,7 +36,8 @@ class Register2FormHandler
Dispatcher $events,
Register2FormBuilder $builder,
UserActivator $activator
) {
)
{
if (!$builder->canSave()) {
return;