diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php index d4b9a0d..7637d17 100755 --- a/app/Entities/Projects/Project.php +++ b/app/Entities/Projects/Project.php @@ -31,15 +31,13 @@ class Project extends Model { parent::boot(); - if (auth()->user()) { - static::addGlobalScope('by_owner', function (Builder $builder) { - if ( ! is_null(auth()->user()->agency)) { - $builder->where('owner_id', auth()->user()->agency->id); - } else { - $builder->where('owner_id', 0); - } - }); - } + static::addGlobalScope('by_owner', function (Builder $builder) { + if ( ! is_null(auth()->user()->agency)) { + $builder->where('owner_id', auth()->user()->agency->id); + } else { + $builder->where('owner_id', 0); + } + }); } public function nameLink() diff --git a/app/Entities/Users/Role.php b/app/Entities/Users/Role.php deleted file mode 100755 index 54a33a5..0000000 --- a/app/Entities/Users/Role.php +++ /dev/null @@ -1,18 +0,0 @@ -belongsToMany(User::class, 'role_user'); - } -} diff --git a/app/Entities/Users/UsersRepository.php b/app/Entities/Users/UsersRepository.php index e44755e..5051264 100755 --- a/app/Entities/Users/UsersRepository.php +++ b/app/Entities/Users/UsersRepository.php @@ -51,11 +51,6 @@ class UsersRepository extends BaseRepository throw new UpdateUserException('Failed to update User'); } - public function getRolesList() - { - return Role::where('type', 0)->pluck('label', 'id')->all(); - } - public function delete($userId) { $user = $this->requireById($userId); diff --git a/app/Http/Controllers/Users/PermissionsController.php b/app/Http/Controllers/Users/PermissionsController.php deleted file mode 100755 index 41ffcfc..0000000 --- a/app/Http/Controllers/Users/PermissionsController.php +++ /dev/null @@ -1,66 +0,0 @@ -has('act') && in_array($req->get('act'), ['show','edit','del'])) { - $permission = $this->requireById($req->get('id')); - } - - $permissions = Permission::whereType(1)->withCount('roles')->get(); - return view('users.permissions',compact('permissions','permission')); - } - - public function store(CreateRequest $req) - { - $permissionData = $req->except('_token'); - $permissionData['type'] = 1; // Permission Type - $permission = Permission::create($permissionData); - flash()->success(trans('permission.created')); - return redirect()->route('permissions.index'); - } - - public function update(UpdateRequest $req, $permissionId) - { - $permission = $this->requireById($permissionId); - $permission->update($req->except(['_method','_token'])); - flash()->success(trans('permission.updated')); - return redirect()->back(); - } - - public function delete($permissionId) - { - $permission = $this->requireById($permissionId); - return view('permissions.delete', compact('permission')); - } - - public function destroy(DeleteRequest $req, $permissionId) - { - if ($permissionId == $req->get('permission_id')) - { - $this->requireById($permissionId)->delete(); - flash()->success(trans('permission.deleted')); - } - else - flash()->error(trans('permission.undeleted')); - - return redirect()->route('permissions.index'); - } - - private function requireById($permissionId) - { - return Permission::findOrFail($permissionId); - } - -} diff --git a/app/Http/Controllers/Users/ProfileController.php b/app/Http/Controllers/Users/ProfileController.php index 72c9a65..c9e8a60 100644 --- a/app/Http/Controllers/Users/ProfileController.php +++ b/app/Http/Controllers/Users/ProfileController.php @@ -8,7 +8,7 @@ class ProfileController extends Controller { public function show() { - return auth()->user(); + return view('users.profile.show'); } public function edit() diff --git a/app/Http/Controllers/Users/RolesController.php b/app/Http/Controllers/Users/RolesController.php deleted file mode 100755 index e14847d..0000000 --- a/app/Http/Controllers/Users/RolesController.php +++ /dev/null @@ -1,74 +0,0 @@ -has('act') && in_array($req->get('act'), ['show','edit','del'])) { - $role = $this->requireById($req->get('id')); - } - - $roles = Role::whereType(0)->get(); - return view('users.roles',compact('roles','role','permissions')); - } - - public function store(CreateRequest $req) - { - $roleData = $req->except('_token'); - $roleData['type'] = 0; // Role Type - $role = Role::create($roleData); - flash()->success(trans('role.created')); - return redirect()->route('roles.index'); - } - - public function update(UpdateRequest $req, $roleId) - { - $role = $this->requireById($roleId); - $role->update($req->except(['_method','_token'])); - flash()->success(trans('role.updated')); - return redirect()->back(); - } - - public function destroy(DeleteRequest $req, $roleId) - { - if ($roleId == $req->get('role_id')) - { - $role = $this->requireById($roleId); - $role->permissions()->detach(); - $role->delete(); - - flash()->success(trans('role.deleted')); - } - else - flash()->error(trans('role.undeleted')); - - return redirect()->route('roles.index'); - } - - public function updatePermissions(Request $req, $roleId) - { - $role = $this->requireById($roleId); - if ($req->has('permission')) - $role->permissions()->sync($req->get('permission')); - else - $role->permissions()->detach(); - - flash()->success(trans('role.updated')); - return redirect()->back(); - } - - private function requireById($roleId) - { - return Role::findOrFail($roleId); - } -} diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index f56aaa5..678a950 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -2,81 +2,79 @@ namespace App\Http\Controllers\Users; +use App\Entities\Users\UsersRepository; +use App\Http\Controllers\Controller; use App\Http\Requests\Users\CreateRequest; -use App\Http\Requests\Users\UpdateRequest; use App\Http\Requests\Users\DeleteRequest; -use App\Http\Controllers\Controller; -use App\Entities\Users\UsersRepository; - +use App\Http\Requests\Users\UpdateRequest; use Illuminate\Http\Request; -class UsersController extends Controller { - - private $repo; - - public function __construct(UsersRepository $repo) - { - $this->repo = $repo; - } - - public function index(Request $req) - { - $users = $this->repo->getUsers($req->get('q'), $req->get('role')); - return view('users.index',compact('users')); - } - - public function create() - { - $roles = $this->repo->getRolesList(); - return view('users.create', compact('roles')); - } - - public function store(CreateRequest $req) - { - $userData = $req->except(['_token','password_confirmation']); - $user = $this->repo->create($userData); - flash()->success(trans('user.created')); - return redirect()->route('users.index'); - } - - public function show($userId) - { - $user = $this->repo->requireById($userId); - return view('users.show', compact('user')); - } - - public function edit($userId) - { - $user = $this->repo->requireById($userId); - - $roles = $this->repo->getRolesList(); - return view('users.edit',compact('user','roles')); - } - - public function update(UpdateRequest $req, $userId) - { - $userData = $req->except(['_method','_token','password_confirmation']); - $user = $this->repo->update($userData, $userId); - flash()->success(trans('user.updated')); - return redirect()->route('users.edit', $userId); - } - - public function delete($userId) - { - $user = $this->repo->requireById($userId); - return view('users.delete', compact('user')); - } - - public function destroy(DeleteRequest $req, $userId) - { - if ($userId == $req->get('user_id')) { - $this->repo->delete($userId); - flash()->success(trans('user.deleted')); - } else { - flash()->error(trans('user.undeleted')); - } - - return redirect()->route('users.index'); - } +class UsersController extends Controller +{ + + private $repo; + + public function __construct(UsersRepository $repo) + { + $this->repo = $repo; + } + + public function index(Request $req) + { + $users = $this->repo->getUsers($req->get('q'), $req->get('role')); + return view('users.index', compact('users')); + } + + public function create() + { + return view('users.create'); + } + + public function store(CreateRequest $req) + { + $userData = $req->except(['_token', 'password_confirmation']); + $user = $this->repo->create($userData); + flash()->success(trans('user.created')); + return redirect()->route('users.index'); + } + + public function show($userId) + { + $user = $this->repo->requireById($userId); + return view('users.show', compact('user')); + } + + public function edit($userId) + { + $user = $this->repo->requireById($userId); + + return view('users.edit', compact('user')); + } + + public function update(UpdateRequest $req, $userId) + { + $userData = $req->except(['_method', '_token', 'password_confirmation']); + $user = $this->repo->update($userData, $userId); + flash()->success(trans('user.updated')); + return redirect()->route('users.edit', $userId); + } + + public function delete($userId) + { + $user = $this->repo->requireById($userId); + return view('users.delete', compact('user')); + } + + public function destroy(DeleteRequest $req, $userId) + { + if ($userId == $req->get('user_id')) { + $this->repo->delete($userId); + flash()->success(trans('user.deleted')); + } else { + flash()->error(trans('user.undeleted')); + } + + return redirect()->route('users.index'); + } } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d74001a..b2aa275 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -55,6 +55,5 @@ class Kernel extends HttpKernel 'can' => \Illuminate\Auth\Middleware\Authorize::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, - 'role' => \App\Http\Middleware\RoleMiddleware::class, ]; } diff --git a/app/Http/Middleware/RoleMiddleware.php b/app/Http/Middleware/RoleMiddleware.php deleted file mode 100644 index 8b39782..0000000 --- a/app/Http/Middleware/RoleMiddleware.php +++ /dev/null @@ -1,33 +0,0 @@ -check() == false) { - return redirect()->guest('login'); - } - - // Cek apakah grup user ada di dalam array $nameArray? - if (auth()->user()->hasRoles($nameArray) == false) - { - flash()->error('Anda tidak dapat mengakses halaman ' . $request->path() . '.'); - return redirect()->route('home'); - } - - return $next($request); - } -} diff --git a/app/Http/Requests/Users/CreateRequest.php b/app/Http/Requests/Users/CreateRequest.php index b95a3b3..ab48ae7 100644 --- a/app/Http/Requests/Users/CreateRequest.php +++ b/app/Http/Requests/Users/CreateRequest.php @@ -26,7 +26,6 @@ class CreateRequest extends Request return [ 'name' => 'required|min:5', 'email' => 'required|email|unique:users,email', - 'role' => 'required|array', 'password' => 'between:6,15|confirmed', 'password_confirmation' => 'required_with:password', ]; diff --git a/app/Http/Requests/Users/Roles/CreateRequest.php b/app/Http/Requests/Users/Roles/CreateRequest.php deleted file mode 100644 index d93a752..0000000 --- a/app/Http/Requests/Users/Roles/CreateRequest.php +++ /dev/null @@ -1,32 +0,0 @@ -user()->can('manage_role_permissions'); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'name' => 'required|max:60|unique:roles_permissions,name', - 'label' => 'required|max:60', - ]; - } - -} diff --git a/app/Http/Requests/Users/Roles/DeleteRequest.php b/app/Http/Requests/Users/Roles/DeleteRequest.php deleted file mode 100644 index 6ac7825..0000000 --- a/app/Http/Requests/Users/Roles/DeleteRequest.php +++ /dev/null @@ -1,31 +0,0 @@ -user()->can('manage_role_permissions'); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'role_id' => 'required' - ]; - } - -} diff --git a/app/Http/Requests/Users/Roles/UpdateRequest.php b/app/Http/Requests/Users/Roles/UpdateRequest.php deleted file mode 100644 index 57bef66..0000000 --- a/app/Http/Requests/Users/Roles/UpdateRequest.php +++ /dev/null @@ -1,32 +0,0 @@ -user()->can('manage_role_permissions'); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'name' => 'required|max:60|unique:roles_permissions,name,' . $this->segment(2), - 'label' => 'required|max:60', - ]; - } - -} diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 455d663..a5b65c0 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -61,7 +61,6 @@ class AuthServiceProvider extends ServiceProvider { return [ 'manage_users', - 'manage_role_permissions', 'manage_backups', 'manage_options', 'manage_projects', diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 14ac19c..fead664 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -94,12 +94,11 @@ $factory->define(Event::class, function (Faker\Generator $faker) { }); $factory->define(Invoice::class, function (Faker\Generator $faker) { - $invoice = new Invoice; return [ 'project_id' => function () { return factory(Project::class)->create()->id; }, - 'number' => $invoice->generateNewNumber(), + 'number' => (new Invoice)->generateNewNumber(), 'items' => [], 'amount' => 100000, 'notes' => $faker->paragraph, diff --git a/database/migrations/2015_08_12_205415_create_roles_permissions_table.php b/database/migrations/2015_08_12_205415_create_roles_permissions_table.php deleted file mode 100644 index 22f9646..0000000 --- a/database/migrations/2015_08_12_205415_create_roles_permissions_table.php +++ /dev/null @@ -1,33 +0,0 @@ -increments('id'); - $table->boolean('type')->unsigned()->index()->default(1); - $table->string('name', 60); - $table->string('label', 60); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('roles_permissions'); - } -} diff --git a/database/migrations/2016_03_04_020423_create_user_role_permission_table.php b/database/migrations/2016_03_04_020423_create_user_role_permission_table.php deleted file mode 100644 index a0e9fe6..0000000 --- a/database/migrations/2016_03_04_020423_create_user_role_permission_table.php +++ /dev/null @@ -1,31 +0,0 @@ -unsignedInteger('role_id'); - $table->unsignedInteger('permission_id'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('user_role_permission'); - } -} diff --git a/database/migrations/2016_03_05_083739_create_role_user_table.php b/database/migrations/2016_03_05_083739_create_role_user_table.php deleted file mode 100644 index fcf3ad7..0000000 --- a/database/migrations/2016_03_05_083739_create_role_user_table.php +++ /dev/null @@ -1,31 +0,0 @@ -unsignedInteger('user_id')->index(); - $table->unsignedInteger('role_id')->index(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('role_user'); - } -} diff --git a/resources/lang/id/auth.php b/resources/lang/id/auth.php index 18c7935..b56935c 100644 --- a/resources/lang/id/auth.php +++ b/resources/lang/id/auth.php @@ -1,39 +1,38 @@ 'Profil Saya', + 'profile_edit' => 'Edit Profil Saya', + 'update_profile' => 'Update Profil', + 'profile_updated' => 'Profil sudah diupdate.', - /* - |-------------------------------------------------------------------------- - | Baris-baris bahasa untuk autentifikasi - |-------------------------------------------------------------------------- - | - | Baris bahasa berikut digunakan selama proses autentifikasi untuk beberapa - | pesan yang perlu kita tampilkan ke pengguna. Anda bebas untuk memodifikasi - | baris bahasa sesuai dengan keperluan aplikasi anda. - | - */ + // Registration + 'register' => 'Buat Akun Baru', + 'need_account' => 'Belum punya Akun?', + 'have_an_account' => 'Saya sudah punya Akun', + // Login & Logout + 'login' => 'Login', + 'welcome' => 'Selamat datang kembali :name.', 'failed' => 'Identitas tersebut tidak cocok dengan data kami.', 'throttle' => 'Terlalu banyak usaha masuk. Silahkan coba lagi dalam :seconds detik.', - 'email' => 'Email', - 'password' => 'Password', - 'login' => 'Login', 'logout' => 'Keluar', - 'register' => 'Buat Akun Baru', - 'have_an_account' => 'Saya sudah punya Akun', - 'need_account' => 'Belum punya Akun?', + 'logged_out' => 'Anda telah logout.', + + // Password 'change_password' => 'Ganti Password', 'password_changed' => 'Password berhasil diubah.', 'forgot_password' => 'Lupa Password?', 'reset_password' => 'Reset Password', + 'send_reset_password_link' => 'Kirim Link Reset Password', + 'old_password_failed' => 'Password lama tidak cocok!', + + // Attributes + 'email' => 'Email', + 'password' => 'Password', 'password_confirmation' => 'Ulangi Password', 'old_password' => 'Password Lama', 'new_password' => 'Password Baru', 'new_password_confirmation' => 'Ulangi Password Baru', - 'send_reset_password_link' => 'Kirim Link Reset Password', - 'old_password_failed' => 'Password lama tidak cocok!', - 'welcome' => 'Selamat datang kembali :name.', - 'logged_out' => 'Anda telah logout.', - 'profile' => 'Profil Saya', - 'profile_updated' => 'Profil sudah diupdate.', ]; diff --git a/resources/views/auth/profile.blade.php b/resources/views/auth/profile.blade.php deleted file mode 100644 index 21461ba..0000000 --- a/resources/views/auth/profile.blade.php +++ /dev/null @@ -1,40 +0,0 @@ -@extends('layouts.app') - -@section('content') - -
-
- {!! Form::model($user, ['route'=>'auth.profile','method'=>'patch']) !!} -
-

{{ trans('auth.profile') }}

-
- - - - - - - - - - - - - - - - - - -
{{ trans('user.user_id') }}{{ $user->id }}
{{ trans('user.name') }}{!! FormField::text('name', ['label' => false]) !!}
{{ trans('user.email') }}{!! FormField::email('email', ['label' => false]) !!}
{{ trans('user.api_token') }}{{ $user->api_token }}
{{ trans('user.roles') }}{{ $user->present()->displayRoles }}
-
-
- {!! Form::submit(trans('app.update'), ['class'=>'btn btn-info']) !!} -
-
- {!! Form::close() !!} -
-
-@endsection \ No newline at end of file diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index e31a48c..064dda5 100755 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -20,8 +20,8 @@ groupBy('status_id') ->where('owner_id', auth()->id()) - ->pluck('count','status_id') - ->all(); ?> + ->pluck('count', 'status_id') + ->all();?> {!! html_link_to_route('projects.index', trans('project.projects') . ' ', [], ['icon' => 'table']) !!}