odon
/
silsilah
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Restructure profile edit page

pull/66/head
Nafies Luthfi 5 years ago
parent
50ff745ce4
commit
efdc1f5c52
11 changed files with 170 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      app/Http/Requests/Users/UpdateRequest.php
  2. 1
      resources/lang/en/user.php
  3. 1
      resources/lang/id/user.php
  4. 69
      resources/views/users/edit.blade.php
  5. 8
      resources/views/users/partials/edit_contact_address.blade.php
  6. 4
      resources/views/users/partials/edit_death.blade.php
  7. 7
      resources/views/users/partials/edit_login_account.blade.php
  8. 16
      resources/views/users/partials/edit_nav_tabs.blade.php
  9. 17
      resources/views/users/partials/edit_profile.blade.php
  10. 15
      resources/views/users/partials/update_photo.blade.php
  11. 77
      tests/Feature/UsersProfileTest.php

12
app/Http/Requests/Users/UpdateRequest.php
View File

@ -26,9 +26,9 @@ class UpdateRequest extends FormRequest
public function rules()
{
return [
'nickname' => 'required|string|max:255',
'name' => 'required|string|max:255',
'gender_id' => 'required|numeric',
'nickname' => 'sometimes|required|string|max:255',
'name' => 'sometimes|required|string|max:255',
'gender_id' => 'sometimes|required|numeric',
'dob' => 'nullable|date|date_format:Y-m-d',
'yob' => 'nullable|date_format:Y',
'dod' => 'nullable|date|date_format:Y-m-d',
@ -54,19 +54,23 @@ class UpdateRequest extends FormRequest
{
$formData = parent::validated();
if (isset($formData['dod'])) {
if ($formData['dod']) {
$formData['yod'] = substr($formData['dod'], 0, 4);
} else {
$formData['yod'] = $formData['yod'];
}
}
if (isset($formData['dob'])) {
if ($formData['dob']) {
$formData['yob'] = substr($formData['dob'], 0, 4);
} else {
$formData['yob'] = $formData['yob'];
}
}
if ($formData['password']) {
if (isset($formData['password']) && $formData['password']) {
$formData['password'] = bcrypt($formData['password']);
} else {
unset($formData['password']);

1
resources/lang/en/user.php
View File

@ -11,6 +11,7 @@ return [
'grand_childs' => 'Grand Childs',
'siblings' => 'Siblings',
'dead' => 'Dead',
'death' => 'Death',
'child_name' => 'Child Name',
'child_gender' => 'Child Gender',
'grand_mother' => 'Grand Mother',

1
resources/lang/id/user.php
View File

@ -11,6 +11,7 @@ return [
'grand_childs' => 'Cucu-cucu',
'siblings' => 'Saudara',
'dead' => 'Meninggal',
'death' => 'Kematian',
'child_name' => 'Nama Anak',
'child_gender' => 'Jenis Kelamin Anak',
'grand_mother' => 'Nenek',

69
resources/views/users/edit.blade.php
View File

@ -58,71 +58,30 @@
{{ __('user.edit') }} {{ $user->profileLink() }}
</h2>
<div class="row">
{{ Form::model($user, ['route' => ['users.update', $user->id], 'method' =>'patch', 'autocomplete' => 'off']) }}
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('user.edit') }}</h3></div>
<div class="panel-body">
{!! FormField::text('name', ['label' => __('user.name')]) !!}
{!! FormField::text('nickname', ['label' => __('user.nickname')]) !!}
<div class="row">
<div class="col-md-6">{!! FormField::radios('gender_id', [1 => __('app.male_code'), __('app.female_code')], ['label' => __('user.gender')]) !!}</div>
<div class="col-md-4">
{!! FormField::text('birth_order', ['label' => __('user.birth_order'), 'type' => 'number', 'min' => 1]) !!}
</div>
</div>
<div class="row">
<div class="col-md-6">{!! FormField::text('yob', ['label' => __('user.yob'), 'placeholder' => __('app.example').' 1959']) !!}</div>
<div class="col-md-6">{!! FormField::text('dob', ['label' => __('user.dob'), 'placeholder' => __('app.example').' 1959-07-20']) !!}</div>
</div>
<div class="col-md-2">@include('users.partials.edit_nav_tabs')</div>
<div class="col-md-10">
<div class="row">
<div class="col-md-6">{!! FormField::text('yod', ['label' => __('user.yod'), 'placeholder' => __('app.example').' 2003']) !!}</div>
<div class="col-md-6">{!! FormField::text('dod', ['label' => __('user.dod'), 'placeholder' => __('app.example').' 2003-10-17']) !!}</div>
</div>
</div>
</div>
{{ Form::model($user, ['route' => ['users.update', $user->id], 'method' =>'patch', 'autocomplete' => 'off']) }}
<div class="col-md-6">
@includeWhen(request('tab') == null, 'users.partials.edit_profile')
@includeWhen(request('tab') == 'death', 'users.partials.edit_death')
@includeWhen(request('tab') == 'contact_address', 'users.partials.edit_contact_address')
@includeWhen(request('tab') == 'login_account', 'users.partials.edit_login_account')
<div class="text-right">
{{ Form::submit(__('app.update'), ['class' => 'btn btn-primary']) }}
{{ link_to_route('users.show', __('app.cancel'), [$user->id], ['class' => 'btn btn-default']) }}
</div>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('app.address') }} &amp; {{ __('app.contact') }}</h3></div>
<div class="panel-body">
{!! FormField::textarea('address', ['label' => __('app.address')]) !!}
{!! FormField::text('city', ['label' => __('app.city'), 'placeholder' => __('app.example').' Jakarta']) !!}
{!! FormField::text('phone', ['label' => __('app.phone'), 'placeholder' => __('app.example').' 081234567890']) !!}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('app.login_account') }}</h3></div>
<div class="panel-body">
{!! FormField::email('email', ['label' => __('auth.email'), 'placeholder' => __('app.example').' nama@mail.com']) !!}
{!! FormField::password('password', ['label' => __('auth.password'), 'placeholder' => '******', 'value' => '']) !!}
</div>
</div>
</div>
{{ Form::close() }}
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('user.update_photo') }}</h3></div>
{{ Form::open(['route' => ['users.photo-upload', $user], 'method' => 'patch', 'files' => true]) }}
<div class="panel-body text-center">
{{ userPhoto($user, ['style' => 'width:100%;max-width:300px']) }}
</div>
<div class="panel-body">
{!! FormField::file('photo', ['required' => true, 'label' => __('user.reupload_photo'), 'info' => ['text' => 'Format jpg, maks: 200 Kb.', 'class' => 'warning']]) !!}
</div>
<div class="panel-footer">
{!! Form::submit(__('user.update_photo'), ['class' => 'btn btn-success']) !!}
{{ link_to_route('users.show', __('app.cancel'), [$user], ['class' => 'btn btn-default']) }}
</div>
{{ Form::close() }}
</div>
<div class="col-md-6">
@includeWhen(request('tab') == null, 'users.partials.update_photo')
@if (request('tab') == null)
@can('delete', $user)
{{ link_to_route('users.edit', __('user.delete'), [$user, 'action' => 'delete'], ['class' => 'btn btn-danger pull-right', 'id' => 'del-user-'.$user->id]) }}
@endcan
@endif
</div>
</div>
</div>
</div>
@endif

8
resources/views/users/partials/edit_contact_address.blade.php
View File

@ -0,0 +1,8 @@
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('app.address') }} &amp; {{ __('app.contact') }}</h3></div>
<div class="panel-body">
{!! FormField::textarea('address', ['label' => __('app.address')]) !!}
{!! FormField::text('city', ['label' => __('app.city'), 'placeholder' => __('app.example').' Jakarta']) !!}
{!! FormField::text('phone', ['label' => __('app.phone'), 'placeholder' => __('app.example').' 081234567890']) !!}
</div>
</div>

4
resources/views/users/partials/edit_death.blade.php
View File

@ -0,0 +1,4 @@
<div class="row">
<div class="col-md-6">{!! FormField::text('yod', ['label' => __('user.yod'), 'placeholder' => __('app.example').' 2003']) !!}</div>
<div class="col-md-6">{!! FormField::text('dod', ['label' => __('user.dod'), 'placeholder' => __('app.example').' 2003-10-17']) !!}</div>
</div>

7
resources/views/users/partials/edit_login_account.blade.php
View File

@ -0,0 +1,7 @@
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('app.login_account') }}</h3></div>
<div class="panel-body">
{!! FormField::email('email', ['label' => __('auth.email'), 'placeholder' => __('app.example').' nama@mail.com']) !!}
{!! FormField::password('password', ['label' => __('auth.password'), 'placeholder' => '******', 'value' => '']) !!}
</div>
</div>

16
resources/views/users/partials/edit_nav_tabs.blade.php
View File

@ -0,0 +1,16 @@
<!-- Nav tabs -->
<ul class="nav nav-pills nav-stacked">
<li class="{{ request('tab') == null ? 'active' : '' }}">
{!! link_to_route('users.edit', __('user.edit'), [$user->id]) !!}
</li>
<li class="{{ request('tab') == 'contact_address' ? 'active' : '' }}">
{!! link_to_route('users.edit', __('app.address').' &amp; '.__('app.contact'), [$user->id, 'tab' => 'contact_address']) !!}
</li>
<li class="{{ request('tab') == 'login_account' ? 'active' : '' }}">
{!! link_to_route('users.edit', __('app.login_account'), [$user->id, 'tab' => 'login_account']) !!}
</li>
<li class="{{ request('tab') == 'death' ? 'active' : '' }}">
{!! link_to_route('users.edit', __('user.death'), [$user->id, 'tab' => 'death']) !!}
</li>
</ul>
<br>

17
resources/views/users/partials/edit_profile.blade.php
View File

@ -0,0 +1,17 @@
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('user.edit') }}</h3></div>
<div class="panel-body">
{!! FormField::text('name', ['label' => __('user.name')]) !!}
{!! FormField::text('nickname', ['label' => __('user.nickname')]) !!}
<div class="row">
<div class="col-md-6">{!! FormField::radios('gender_id', [1 => __('app.male_code'), __('app.female_code')], ['label' => __('user.gender')]) !!}</div>
<div class="col-md-4">
{!! FormField::text('birth_order', ['label' => __('user.birth_order'), 'type' => 'number', 'min' => 1]) !!}
</div>
</div>
<div class="row">
<div class="col-md-6">{!! FormField::text('yob', ['label' => __('user.yob'), 'placeholder' => __('app.example').' 1959']) !!}</div>
<div class="col-md-6">{!! FormField::text('dob', ['label' => __('user.dob'), 'placeholder' => __('app.example').' 1959-07-20']) !!}</div>
</div>
</div>
</div>

15
resources/views/users/partials/update_photo.blade.php
View File

@ -0,0 +1,15 @@
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('user.update_photo') }}</h3></div>
{{ Form::open(['route' => ['users.photo-upload', $user], 'method' => 'patch', 'files' => true]) }}
<div class="panel-body text-center">
{{ userPhoto($user, ['style' => 'width:100%;max-width:300px']) }}
</div>
<div class="panel-body">
{!! FormField::file('photo', ['required' => true, 'label' => __('user.reupload_photo'), 'info' => ['text' => 'Format jpg, maks: 200 Kb.', 'class' => 'warning']]) !!}
</div>
<div class="panel-footer">
{!! Form::submit(__('user.update_photo'), ['class' => 'btn btn-success']) !!}
{{ link_to_route('users.show', __('app.cancel'), [$user], ['class' => 'btn btn-default']) }}
</div>
{{ Form::close() }}
</div>

77
tests/Feature/UsersProfileTest.php
View File

@ -47,13 +47,6 @@ class UsersProfileTest extends TestCase
'gender_id' => 1,
'dob' => '1959-06-09',
'yob' => '',
'dod' => '2003-10-17',
'yod' => '',
'address' => 'Jln. Angkasa, No. 70',
'city' => 'Nama Kota',
'phone' => '081234567890',
'email' => '',
'password' => '',
'birth_order' => 3,
]);
@ -63,14 +56,66 @@ class UsersProfileTest extends TestCase
'gender_id' => 1,
'dob' => '1959-06-09',
'yob' => '1959',
'dod' => '2003-10-17',
'yod' => '2003',
'birth_order' => 3,
]);
}
/** @test */
public function user_can_edit_contact_address()
{
$user = $this->loginAsUser();
$this->visit(route('users.edit', [$user->id, 'tab' => 'contact_address']));
$this->seePageIs(route('users.edit', [$user->id, 'tab' => 'contact_address']));
$this->submitForm(trans('app.update'), [
'address' => 'Jln. Angkasa, No. 70',
'city' => 'Nama Kota',
'phone' => '081234567890',
]);
$this->seeInDatabase('users', [
'id' => $user->id,
'address' => 'Jln. Angkasa, No. 70',
'city' => 'Nama Kota',
'phone' => '081234567890',
]);
}
/** @test */
public function user_can_edit_login_account()
{
$user = $this->loginAsUser();
$this->visit(route('users.edit', [$user->id, 'tab' => 'login_account']));
$this->seePageIs(route('users.edit', [$user->id, 'tab' => 'login_account']));
$this->submitForm(trans('app.update'), [
'email' => '',
'password' => '',
]);
$this->seeInDatabase('users', [
'id' => $user->id,
'email' => null,
'password' => null,
'birth_order' => 3,
]);
}
/** @test */
public function user_can_edit_death()
{
$user = $this->loginAsUser();
$this->visit(route('users.edit', [$user->id, 'tab' => 'death']));
$this->seePageIs(route('users.edit', [$user->id, 'tab' => 'death']));
$this->submitForm(trans('app.update'), [
'dod' => '2003-10-17',
'yod' => '',
]);
$this->seeInDatabase('users', [
'id' => $user->id,
'dod' => '2003-10-17',
'yod' => '2003',
]);
}
@ -79,8 +124,8 @@ class UsersProfileTest extends TestCase
{
$manager = $this->loginAsUser();
$user = factory(User::class)->create(['manager_id' => $manager->id]);
$this->visit(route('users.edit', $user->id));
$this->seePageIs(route('users.edit', $user->id));
$this->visit(route('users.edit', [$user->id, 'tab' => 'login_account']));
$this->seePageIs(route('users.edit', [$user->id, 'tab' => 'login_account']));
$this->submitForm(trans('app.update'), [
'email' => 'user@mail.com',
@ -97,8 +142,8 @@ class UsersProfileTest extends TestCase
{
$manager = $this->loginAsUser();
$user = factory(User::class)->create(['manager_id' => $manager->id]);
$this->visit(route('users.edit', $user->id));
$this->seePageIs(route('users.edit', $user->id));
$this->visit(route('users.edit', [$user->id, 'tab' => 'login_account']));
$this->seePageIs(route('users.edit', [$user->id, 'tab' => 'login_account']));
$this->submitForm(trans('app.update'), [
'email' => 'user@mail.com',
@ -118,8 +163,8 @@ class UsersProfileTest extends TestCase
'manager_id' => $manager->id,
'password' => 'some random string password',
]);
$this->visit(route('users.edit', $user->id));
$this->seePageIs(route('users.edit', $user->id));
$this->visit(route('users.edit', [$user->id, 'tab' => 'login_account']));
$this->seePageIs(route('users.edit', [$user->id, 'tab' => 'login_account']));
$this->submitForm(trans('app.update'), [
'email' => 'user@mail.com',

Write Preview
Loading…
Cancel
Save