diff --git a/app/Entities/Projects/ProjectsRepository.php b/app/Entities/Projects/ProjectsRepository.php index c0882df..e407483 100755 --- a/app/Entities/Projects/ProjectsRepository.php +++ b/app/Entities/Projects/ProjectsRepository.php @@ -63,7 +63,6 @@ class ProjectsRepository extends BaseRepository $newCustomer = new User; $newCustomer->name = $customerName; $newCustomer->email = $customerEmail; - $newCustomer->username = str_replace(' ', '_', strtolower($customerName)); $newCustomer->password = Option::get('default_password', 'member'); $newCustomer->remember_token = str_random(10); $newCustomer->save(); diff --git a/app/Entities/Users/User.php b/app/Entities/Users/User.php index 78d0ecc..d5953ee 100644 --- a/app/Entities/Users/User.php +++ b/app/Entities/Users/User.php @@ -11,7 +11,7 @@ class User extends Authenticatable { use Notifiable, PresentableTrait, HasRoles; - protected $fillable = ['name', 'username', 'email', 'password']; + protected $fillable = ['name', 'email', 'password']; protected $hidden = ['password', 'remember_token', 'api_token']; protected $presenter = UserPresenter::class; diff --git a/app/Entities/Users/UserPresenter.php b/app/Entities/Users/UserPresenter.php index 679473a..c980cf4 100644 --- a/app/Entities/Users/UserPresenter.php +++ b/app/Entities/Users/UserPresenter.php @@ -31,7 +31,7 @@ class UserPresenter extends Presenter public function usernameRoles() { - $string = $this->username . ' ('; + $string = $this->name . ' ('; foreach($this->roles as $key => $role) { $string .= ($key != 0) ? ' | ' : ''; $string .= $role->label; diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 0833d5d..dc031af 100755 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -46,7 +46,7 @@ class AuthController extends Controller { public function postLogin(LoginRequest $req) { - $loginData = $req->only('username','password'); + $loginData = $req->only('email','password'); if (Auth::attempt($loginData, $req->has('remember'))) { @@ -54,7 +54,7 @@ class AuthController extends Controller { return redirect()->intended('home'); } - flash()->error('Mohon maaf, anda tidak dapat login, cek kembali username/password anda!'); + flash()->error('Mohon maaf, anda tidak dapat login, cek kembali email/password anda!'); return redirect()->back()->withInput(); } @@ -72,7 +72,7 @@ class AuthController extends Controller { public function postRegister(RegisterRequest $req) { - $registerData = $req->only('name','username','email','password'); + $registerData = $req->only('name','email','password'); $user = User::create($registerData); $user->assignRole('customer'); diff --git a/app/Http/Requests/Accounts/LoginRequest.php b/app/Http/Requests/Accounts/LoginRequest.php index 42b5988..fd9632a 100644 --- a/app/Http/Requests/Accounts/LoginRequest.php +++ b/app/Http/Requests/Accounts/LoginRequest.php @@ -24,7 +24,7 @@ class LoginRequest extends Request public function rules() { return [ - 'username' => 'required', + 'email' => 'required|email', 'password' => 'required', ]; } @@ -32,7 +32,7 @@ class LoginRequest extends Request public function messages() { return [ - 'username.required' => 'Username harus diisi.', + 'email.required' => 'Email harus diisi.', 'password.required' => 'Password harus diisi.', ]; } diff --git a/app/Http/Requests/Accounts/RegisterRequest.php b/app/Http/Requests/Accounts/RegisterRequest.php index 34247bd..a1bae41 100644 --- a/app/Http/Requests/Accounts/RegisterRequest.php +++ b/app/Http/Requests/Accounts/RegisterRequest.php @@ -25,7 +25,6 @@ class RegisterRequest extends Request { return [ 'name' => 'required', - 'username' => 'required|alpha_num', 'email' => 'required|email|unique:users,email', 'password' => 'required|between:6,15|confirmed', 'password_confirmation' => 'required', @@ -36,8 +35,6 @@ class RegisterRequest extends Request { return [ 'name.required' => 'Nama harus diisi.', - 'username.required' => 'Username harus diisi.', - 'username.alpha_num' => 'Username harus berupa huruf dan angka.', 'email.required' => 'Email harus diisi.', 'email.email' => 'Email tidak valid.', 'email.unique' => 'Email ini sudah terdaftar.', diff --git a/app/Http/Requests/Users/CreateRequest.php b/app/Http/Requests/Users/CreateRequest.php index eff275b..b95a3b3 100644 --- a/app/Http/Requests/Users/CreateRequest.php +++ b/app/Http/Requests/Users/CreateRequest.php @@ -25,7 +25,6 @@ class CreateRequest extends Request { return [ 'name' => 'required|min:5', - 'username' => 'required|alpha_dash|min:4|unique:users,username', 'email' => 'required|email|unique:users,email', 'role' => 'required|array', 'password' => 'between:6,15|confirmed', diff --git a/app/Http/Requests/Users/UpdateRequest.php b/app/Http/Requests/Users/UpdateRequest.php index ba3d4c2..d1a0421 100644 --- a/app/Http/Requests/Users/UpdateRequest.php +++ b/app/Http/Requests/Users/UpdateRequest.php @@ -25,7 +25,6 @@ class UpdateRequest extends Request { return [ 'name' => 'required|min:5', - 'username' => 'required|alpha_dash|min:4|unique:users,username,' . $this->segment(2), 'email' => 'required|email|unique:users,email,' . $this->segment(2), 'role' => 'required|array', 'password' => 'nullable|required_with:password_confirmation|between:6,15|confirmed', diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 2972fd8..771ef77 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -12,7 +12,6 @@ use App\Entities\Users\User; $factory->define(User::class, function (Faker\Generator $faker) { return [ 'name' => $faker->name, - 'username' => $faker->unique()->username, 'email' => $faker->unique()->email, 'password' => 'member', 'remember_token' => str_random(10), diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 0b916fe..eb0bbd5 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -16,7 +16,6 @@ class CreateUsersTable extends Migration { $table->increments('id'); $table->string('name'); - $table->string('username', 60)->unique(); $table->string('email')->unique(); $table->string('password', 60); $table->rememberToken(); diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php index c850ebe..bff3ece 100644 --- a/database/seeds/UsersTableSeeder.php +++ b/database/seeds/UsersTableSeeder.php @@ -17,7 +17,6 @@ class UsersTableSeeder extends Seeder DB::table($this->tableToSeed)->insert([ [ 'name' => 'Administrator', - 'username' => 'admin', 'email' => 'admin@app.dev', 'password' => bcrypt('admin'), 'remember_token' => str_random(10), @@ -26,7 +25,6 @@ class UsersTableSeeder extends Seeder ], [ 'name' => 'Customer', - 'username' => 'member', 'email' => 'member@app.dev', 'password' => bcrypt('member'), 'remember_token' => str_random(10), diff --git a/resources/lang/id/auth.php b/resources/lang/id/auth.php index 2fb6d28..ced9b61 100644 --- a/resources/lang/id/auth.php +++ b/resources/lang/id/auth.php @@ -15,7 +15,7 @@ return [ 'failed' => 'Identitas tersebut tidak cocok dengan data kami.', 'throttle' => 'Terlalu banyak usaha masuk. Silahkan coba lagi dalam :seconds detik.', - 'username' => 'Login ID', + 'email' => 'Email', 'password' => 'Password', 'login' => 'Login', 'logout' => 'Keluar', diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index cbb81d5..4afefdf 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -13,8 +13,8 @@
@include('auth.partials._errors') {!! Form::open(['route'=>'auth.login']) !!} -
- {!! Form::text('username', null, ['class'=>'form-control', 'placeholder'=> trans('auth.username')]) !!} +
+ {!! Form::email('email', null, ['class'=>'form-control', 'placeholder'=> trans('auth.email')]) !!}
{!! Form::password('password', ['class'=>'form-control', 'placeholder'=> trans('auth.password')]) !!} diff --git a/resources/views/auth/profile.blade.php b/resources/views/auth/profile.blade.php index 1c474e6..fd6827c 100644 --- a/resources/views/auth/profile.blade.php +++ b/resources/views/auth/profile.blade.php @@ -18,7 +18,6 @@ {{ $user->name }} - {{ trans('user.username') }}{{ $user->username }} {{ trans('user.roles') }} {{ $user->present()->displayRoles }} diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 77d25be..9c6b758 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -15,12 +15,6 @@ {!! Form::text('name', null, ['class'=>'form-control','placeholder' => trans('app.name')]) !!}
-
- {!! Form::label('username', trans('auth.username'), ['class'=>'col-md-4 control-label']) !!} -
- {!! Form::text('username', null, ['class'=>'form-control','placeholder'=>trans('auth.username')]) !!} -
-
{!! Form::label('email', trans('user.email'), ['class'=>'col-md-4 control-label']) !!}
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index e90f7e2..3965b0a 100755 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -11,7 +11,6 @@

User Data

{!! FormField::text('name', ['label' => trans('app.name')]) !!} - {!! FormField::text('username', ['label' => trans('auth.username')]) !!} {!! FormField::email('email', ['label' => trans('user.email')]) !!} {!! FormField::checkboxes('role', $roles, ['label' => trans('user.role')]) !!} diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php index 3fded75..d543ee6 100755 --- a/resources/views/users/delete.blade.php +++ b/resources/views/users/delete.blade.php @@ -18,7 +18,6 @@ - diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 6ba2efa..62c6943 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -11,7 +11,6 @@

{{ trans('user.show') }}

{!! FormField::text('name', ['label' => trans('app.name')]) !!} - {!! FormField::text('username', ['label' => trans('auth.username')]) !!} {!! FormField::email('email', ['label' => trans('user.email')]) !!} {!! FormField::password('password', [ diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 91fdeaa..9ee66f9 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -22,7 +22,6 @@
- @@ -32,7 +31,6 @@ -
{{ trans('app.name') }}{{ $user->name }}
{{ trans('auth.username') }}{{ $user->username }}
{{ trans('user.email') }}{{ $user->email }}
{{ trans('user.role') }}
{{ trans('app.table_no') }} {{ trans('app.name') }}{{ trans('auth.username') }} {{ trans('user.email') }} {{ trans('user.roles') }} {{ trans('app.action') }}
{{ $users->firstItem() + $key }} {{ $user->name }}{{ $user->username }} {{ $user->email }} {!! $user->present()->roleslink !!} diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php index 746ed6a..3eac1a7 100755 --- a/resources/views/users/show.blade.php +++ b/resources/views/users/show.blade.php @@ -12,7 +12,6 @@ - diff --git a/tests/Feature/Auth/MemberChangePasswordTest.php b/tests/Feature/Auth/MemberChangePasswordTest.php index 4be6adc..ce03252 100644 --- a/tests/Feature/Auth/MemberChangePasswordTest.php +++ b/tests/Feature/Auth/MemberChangePasswordTest.php @@ -33,7 +33,7 @@ class MemberChangePasswordTest extends TestCase // Logout and login using new Password $this->click('Keluar'); $this->seePageIs(route('auth.login')); - $this->type($user->username,'username'); + $this->type($user->email,'email'); $this->type('rahasia','password'); $this->press('Login'); $this->seePageIs(route('home')); diff --git a/tests/Feature/Auth/MemberLoginTest.php b/tests/Feature/Auth/MemberLoginTest.php index 705a6a0..60bbf08 100644 --- a/tests/Feature/Auth/MemberLoginTest.php +++ b/tests/Feature/Auth/MemberLoginTest.php @@ -10,11 +10,11 @@ class MemberLoginTest extends TestCase /** @test */ public function member_register_and_login_successfully() { - $user = factory(User::class)->create(['name' => 'Nama Member', 'username' => 'namamember', 'email' => 'email@mail.com']); + $user = factory(User::class)->create(['name' => 'Nama Member', 'email' => 'email@mail.com']); $user->assignRole('customer'); $this->visit(route('auth.login')); - $this->type('namamember','username'); + $this->type('email@mail.com','email'); $this->type('member','password'); $this->press(trans('auth.login')); $this->seePageIs(route('home')); @@ -28,7 +28,7 @@ class MemberLoginTest extends TestCase public function member_invalid_login() { $this->visit(route('auth.login')); - $this->type('namamember','username'); + $this->type('email@mail.com','email'); $this->type('password.112','password'); $this->press(trans('auth.login')); $this->seePageIs(route('auth.login')); diff --git a/tests/Feature/Auth/MemberRegistrationTest.php b/tests/Feature/Auth/MemberRegistrationTest.php index 4eff33d..929221c 100644 --- a/tests/Feature/Auth/MemberRegistrationTest.php +++ b/tests/Feature/Auth/MemberRegistrationTest.php @@ -12,20 +12,17 @@ class MemberRegistrationTest extends TestCase { $this->visit(route('auth.register')); $this->type('', 'name'); - $this->type('', 'username'); $this->type('member@app.dev', 'email'); $this->type('', 'password'); $this->type('', 'password_confirmation'); $this->press('Buat Akun Baru'); $this->seePageIs(route('auth.register')); $this->see('Nama harus diisi.'); - $this->see('Username harus diisi.'); $this->see('Email ini sudah terdaftar.'); $this->see('Password harus diisi.'); $this->see('Konfirmasi password harus diisi.'); $this->type('Nama Member', 'name'); - $this->type('namamember', 'username'); $this->type('email', 'email'); $this->type('password', 'password'); $this->type('password..', 'password_confirmation'); @@ -40,7 +37,6 @@ class MemberRegistrationTest extends TestCase { $this->visit(route('auth.register')); $this->type('Nama Member', 'name'); - $this->type('namamember', 'username'); $this->type('email@mail.com', 'email'); $this->type('password.111', 'password'); $this->type('password.111', 'password_confirmation'); diff --git a/tests/Feature/Auth/ResetPasswordTest.php b/tests/Feature/Auth/ResetPasswordTest.php index a16d1f0..d9965f6 100644 --- a/tests/Feature/Auth/ResetPasswordTest.php +++ b/tests/Feature/Auth/ResetPasswordTest.php @@ -11,7 +11,7 @@ class ResetPasswordTest extends TestCase public function user_can_reset_password_by_their_email() { // $user = factory(User::class)->create(); - $user1 = factory(User::class)->create(['username' => '123456', 'email' => 'testing@app.dev']); + $user1 = factory(User::class)->create(['email' => 'testing@app.dev']); // Reset Request $this->visit('password/reset'); diff --git a/tests/Feature/ManageUsersTest.php b/tests/Feature/ManageUsersTest.php index 2aaed12..792f21e 100644 --- a/tests/Feature/ManageUsersTest.php +++ b/tests/Feature/ManageUsersTest.php @@ -19,7 +19,6 @@ class ManageUsersTest extends TestCase $this->seePageIs('users/create'); $this->submitForm(trans('user.create'), [ 'name' => 'Nama User', - 'username' => 'user_name', 'email' => 'user@mail.com', 'password' => 'password', 'password_confirmation' => 'password', @@ -29,7 +28,7 @@ class ManageUsersTest extends TestCase $this->see(trans('user.created')); $this->see('Nama User'); $this->see('user@mail.com'); - $this->seeInDatabase('users',['name' => 'Nama User','username' => 'user_name', 'email' => 'user@mail.com']); + $this->seeInDatabase('users',['name' => 'Nama User', 'email' => 'user@mail.com']); } /** @test */ @@ -44,15 +43,13 @@ class ManageUsersTest extends TestCase $this->visit('users/' . $user2->id . '/edit'); $this->type('Ganti nama User', 'name'); - $this->type('user_name', 'username'); $this->type('member@mail.dev', 'email'); $this->press(trans('user.update')); $this->seePageIs('users/' . $user2->id . '/edit'); $this->see(trans('user.updated')); $this->see('Ganti nama User'); - $this->see('user_name'); $this->see('member@mail.dev'); - $this->seeInDatabase('users', ['id' => $user2->id, 'name' => 'Ganti nama User', 'username' => 'user_name','email' => 'member@mail.dev']); + $this->seeInDatabase('users', ['id' => $user2->id, 'name' => 'Ganti nama User','email' => 'member@mail.dev']); } /** @test */ @@ -66,7 +63,7 @@ class ManageUsersTest extends TestCase $user2->assignRole('customer'); $this->visit('users/' . $user2->id . '/edit'); - $this->seeInDatabase('users', ['id' => $user2->id, 'name' => $user2->name, 'username' => $user2->username,'email' => $user2->email]); + $this->seeInDatabase('users', ['id' => $user2->id, 'name' => $user2->name,'email' => $user2->email]); $this->click(trans('app.delete')); $this->seePageIs('users/' . $user2->id . '/delete'); $this->press(trans('app.delete_confirm_button'));
{{ trans('app.name') }}{{ $user->name }}
{{ trans('auth.username') }}{{ $user->username }}
{{ trans('user.email') }}{{ $user->email }}
{{ trans('user.role') }}