diff --git a/app/Entities/Users/Event.php b/app/Entities/Users/Event.php index 726c9cb..0fd8cb3 100644 --- a/app/Entities/Users/Event.php +++ b/app/Entities/Users/Event.php @@ -2,17 +2,18 @@ namespace App\Entities\Users; -use App\Entities\Findings\Finding; use App\Entities\Projects\Project; use App\Entities\Users\User; use Illuminate\Database\Eloquent\Model; -use Laracasts\Presenter\PresentableTrait; +/** + * @author Nafies Luthfi + */ class Event extends Model { - protected $table = 'user_events'; - protected $guarded = ['id','created_at','updated_at']; - protected $casts = ['is_allday' => 'boolean']; + protected $table = 'user_events'; + protected $guarded = ['id', 'created_at', 'updated_at']; + protected $casts = ['is_allday' => 'boolean']; public function user() { diff --git a/app/Entities/Users/User.php b/app/Entities/Users/User.php index 42d6e3b..525018b 100644 --- a/app/Entities/Users/User.php +++ b/app/Entities/Users/User.php @@ -2,18 +2,15 @@ namespace App\Entities\Users; -use App\Entities\Users\UserPresenter; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; -use Laracasts\Presenter\PresentableTrait; class User extends Authenticatable { - use Notifiable, PresentableTrait; + use Notifiable; - protected $fillable = ['name', 'email', 'password', 'api_token']; - protected $hidden = ['password', 'remember_token', 'api_token']; - protected $presenter = UserPresenter::class; + protected $fillable = ['name', 'email', 'password', 'api_token']; + protected $hidden = ['password', 'remember_token', 'api_token']; public function setPasswordAttribute($value) { diff --git a/app/Entities/Users/UserPresenter.php b/app/Entities/Users/UserPresenter.php deleted file mode 100644 index 69eb84e..0000000 --- a/app/Entities/Users/UserPresenter.php +++ /dev/null @@ -1,30 +0,0 @@ -name.' ('; - $string .= ')'; - - return $string; - } -} diff --git a/app/Entities/Users/UsersRepository.php b/app/Entities/Users/UsersRepository.php deleted file mode 100755 index f2da1e8..0000000 --- a/app/Entities/Users/UsersRepository.php +++ /dev/null @@ -1,59 +0,0 @@ -paginate($this->_paginate); - } - - public function create($userData) - { - if ($userData['password'] == '') { - $userData['password'] = Option::get('password_default', 'member'); - } - - $user = $this->storeArray($userData); - - return $user; - } - - public function update($userData, $userId) - { - $user = $this->requireById($userId); - - foreach ($userData as $key => $value) { - $user->{$key} = $value; - } - - if ($user->save()) { - return $user; - } - - throw new UpdateUserException('Failed to update User'); - } - - public function delete($userId) - { - $user = $this->requireById($userId); - - return $user->delete(); - } -} diff --git a/app/Http/Controllers/Users/AgencyController.php b/app/Http/Controllers/Users/AgencyController.php index 0856ada..9753b14 100644 --- a/app/Http/Controllers/Users/AgencyController.php +++ b/app/Http/Controllers/Users/AgencyController.php @@ -5,6 +5,9 @@ namespace App\Http\Controllers\Users; use App\Http\Controllers\Controller; use Option; +/** + * @author Nafies Luthfi + */ class AgencyController extends Controller { public function show() diff --git a/app/Http/Controllers/Users/ProfileController.php b/app/Http/Controllers/Users/ProfileController.php index 9acc2e9..a3c5bc2 100644 --- a/app/Http/Controllers/Users/ProfileController.php +++ b/app/Http/Controllers/Users/ProfileController.php @@ -4,6 +4,9 @@ namespace App\Http\Controllers\Users; use App\Http\Controllers\Controller; +/** + * @author Nafies Luthfi + */ class ProfileController extends Controller { public function show() diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 707f520..cba278c 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -3,25 +3,20 @@ namespace App\Http\Controllers\Users; use App\Entities\Users\User; -use App\Entities\Users\UsersRepository; use App\Http\Controllers\Controller; -use App\Http\Requests\Users\DeleteRequest; -use App\Http\Requests\Users\UpdateRequest; use Illuminate\Http\Request; +/** + * @author Nafies Luthfi + */ class UsersController extends Controller { - - private $repo; - - public function __construct(UsersRepository $repo) - { - $this->repo = $repo; - } - public function index(Request $request) { - $users = $this->repo->getUsers($request->get('q')); + $query = $request->get('q'); + $users = User::where('name', 'like', '%'.$query.'%') + ->paginate(25); + return view('users.index', compact('users')); } @@ -33,13 +28,17 @@ class UsersController extends Controller public function store(Request $request) { $userData = $request->validate([ - 'name' => 'required|min:5', - 'email' => 'required|email|unique:users,email', - 'password' => 'nullable|between:6,15|confirmed', - 'password_confirmation' => 'required_with:password', + 'name' => 'required|min:5', + 'email' => 'required|email|unique:users,email', + 'password' => 'nullable|between:6,15|confirmed', + // 'password_confirmation' => 'required_with:password', ]); - $user = $this->repo->create($userData); + if (!$userData['password']) { + $userData['password'] = \Option::get('password_default', 'member'); + } + + $user = User::create($userData); flash()->success(trans('user.created')); @@ -58,11 +57,16 @@ class UsersController extends Controller return view('users.edit', compact('user')); } - public function update(UpdateRequest $request, User $user) + public function update(Request $request, User $user) { $this->authorize('update', $user); - $userData = $request->except(['_method', '_token', 'password_confirmation']); + $userData = $request->validate([ + 'name' => 'required|min:5', + 'email' => 'required|email|unique:users,email,'.$request->segment(2), + 'password' => 'nullable|required_with:password_confirmation|between:6,15|confirmed', + 'password_confirmation' => 'required_with:password', + ]); $user->update($userData); @@ -77,15 +81,19 @@ class UsersController extends Controller return view('users.delete', compact('user')); } - public function destroy(DeleteRequest $request, User $user) + public function destroy(Request $request, User $user) { $this->authorize('delete', $user); + $request->validate([ + 'user_id' => 'required', + ]); + if ($request->get('user_id')) { - $this->repo->delete($user->id); - flash()->success(trans('user.deleted')); + $user->delete(); + flash(trans('user.deleted'), 'success'); } else { - flash()->error(trans('user.undeleted')); + flash(trans('user.undeleted'), 'error'); } return redirect()->route('users.index'); diff --git a/app/Http/Requests/Users/DeleteRequest.php b/app/Http/Requests/Users/DeleteRequest.php deleted file mode 100644 index ef21ed7..0000000 --- a/app/Http/Requests/Users/DeleteRequest.php +++ /dev/null @@ -1,30 +0,0 @@ -user()->can('manage_users'); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'user_id' => 'required', - ]; - } -} diff --git a/app/Http/Requests/Users/UpdateRequest.php b/app/Http/Requests/Users/UpdateRequest.php deleted file mode 100644 index 28a6037..0000000 --- a/app/Http/Requests/Users/UpdateRequest.php +++ /dev/null @@ -1,33 +0,0 @@ -user()->can('manage_users'); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'name' => 'required|min:5', - 'email' => 'required|email|unique:users,email,'.$this->segment(2), - 'password' => 'nullable|required_with:password_confirmation|between:6,15|confirmed', - 'password_confirmation' => 'required_with:password', - ]; - } -} diff --git a/resources/views/layouts/app-no-sidebar.blade.php b/resources/views/layouts/app-no-sidebar.blade.php deleted file mode 100755 index 3d56be2..0000000 --- a/resources/views/layouts/app-no-sidebar.blade.php +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - @yield('title', Option::get('app_name', 'Aplikasi Laravel')) - - {!! Html::style('assets/css/bootstrap.min.css') !!} - {!! Html::style('assets/css/bootstrap-theme.min.css') !!} - {!! Html::style('assets/css/plugins/metisMenu/metisMenu.min.css') !!} - {!! Html::style('assets/css/font-awesome.min.css') !!} - @yield('ext_css') - {!! Html::style('assets/css/sb-admin-2.css') !!} - {!! Html::style('assets/css/app.css') !!} - - - @include('layouts.partials.top-header') -
- -
- @include('flash::message') -
- @yield('content') -
- -
- - @include('layouts.partials.footer') -
- - - {!! Html::script(url('assets/js/jquery.js')) !!} - {!! Html::script(url('assets/js/bootstrap.min.js')) !!} - {!! Html::script(url('assets/js/plugins/metisMenu/metisMenu.min.js')) !!} - @yield('ext_js') - {!! Html::script(url('assets/js/sb-admin-2.js')) !!} - - - - @yield('script') - - - \ No newline at end of file diff --git a/resources/views/layouts/partials/top-header.blade.php b/resources/views/layouts/partials/top-header.blade.php deleted file mode 100755 index 150caee..0000000 --- a/resources/views/layouts/partials/top-header.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -
- @if (auth()->user()) - - @endif - - Logo {{ Option::get('agency_name', 'Aplikasi Laravel') }} -

{{ Option::get('app_name', 'Aplikasi Laravel') }}
{{ Option::get('agency_tagline', 'Tagline Aplikasi Laravel') }}

- -
- - diff --git a/resources/views/layouts/partials/top-nav.blade.php b/resources/views/layouts/partials/top-nav.blade.php deleted file mode 100755 index a70b316..0000000 --- a/resources/views/layouts/partials/top-nav.blade.php +++ /dev/null @@ -1,31 +0,0 @@ - - diff --git a/tests/Feature/Users/ManageUsersTest.php b/tests/Feature/Users/ManageUsersTest.php index e356f7f..f7ed2d5 100644 --- a/tests/Feature/Users/ManageUsersTest.php +++ b/tests/Feature/Users/ManageUsersTest.php @@ -5,6 +5,9 @@ namespace Tests\Feature\Users; use App\Entities\Users\User; use Tests\TestCase; +/** + * @author Nafies Luthfi + */ class ManageUsersTest extends TestCase { /** @test */