From 6647c054cea97b9aaa2558968e8f390455bd7f53 Mon Sep 17 00:00:00 2001 From: Agung Sugiarto Date: Sun, 19 Apr 2020 07:40:29 +0000 Subject: [PATCH] Apply fixes from StyleCI --- .../Users/PermissionController.php | 2 +- src/Controllers/Users/RoleController.php | 2 +- src/Controllers/Users/UserController.php | 2 +- src/Models/GroupModel.php | 4 +- src/Models/PermissionModel.php | 4 +- src/Models/UserModel.php | 4 +- src/Views/Authentication/forgot.php | 14 +++--- src/Views/Authentication/index.php | 2 +- src/Views/Authentication/login.php | 14 +++--- src/Views/Authentication/message_block.php | 16 +++---- src/Views/Menu/index.php | 28 ++++++------ src/Views/Permission/index.php | 16 +++---- src/Views/Role/create.php | 16 +++---- src/Views/Role/edit.php | 22 +++++----- src/Views/Role/index.php | 14 +++--- src/Views/User/create.php | 32 +++++++------- src/Views/User/index.php | 14 +++--- src/Views/User/profile.php | 18 ++++---- src/Views/User/update.php | 44 +++++++++---------- src/Views/layout/index.php | 12 ++--- src/Views/layout/mainsidebar.php | 20 ++++----- src/Views/load/duallistbox.php | 6 +-- src/Views/load/nestable.php | 6 +-- 23 files changed, 156 insertions(+), 156 deletions(-) diff --git a/src/Controllers/Users/PermissionController.php b/src/Controllers/Users/PermissionController.php index 0efca6a..5fefeb0 100644 --- a/src/Controllers/Users/PermissionController.php +++ b/src/Controllers/Users/PermissionController.php @@ -26,7 +26,7 @@ public function index() $length = $this->request->getGet('length'); $search = $this->request->getGet('search[value]'); $collection = new Collection(); - + return $this->respond($collection->toColection( model(PermissionModel::class)->findPaginatedData($length, $start, $search), model(PermissionModel::class)->countAllResults(), diff --git a/src/Controllers/Users/RoleController.php b/src/Controllers/Users/RoleController.php index bdde806..437280d 100644 --- a/src/Controllers/Users/RoleController.php +++ b/src/Controllers/Users/RoleController.php @@ -26,7 +26,7 @@ public function index() $length = $this->request->getGet('length'); $search = $this->request->getGet('search[value]'); $collection = new Collection(); - + return $this->respond($collection->toColection( model(GroupModel::class)->findPaginatedData($length, $start, $search), model(GroupModel::class)->countAllResults(), diff --git a/src/Controllers/Users/UserController.php b/src/Controllers/Users/UserController.php index 7460e86..2779800 100644 --- a/src/Controllers/Users/UserController.php +++ b/src/Controllers/Users/UserController.php @@ -36,7 +36,7 @@ public function index() $length = $this->request->getGet('length'); $search = $this->request->getGet('search[value]'); $collection = new Collection(); - + return $this->respond($collection->toColection( model(UserModel::class)->findPaginatedData($length, $start, $search), model(UserModel::class)->countAllResults(), diff --git a/src/Models/GroupModel.php b/src/Models/GroupModel.php index 1583fcc..b67cc48 100644 --- a/src/Models/GroupModel.php +++ b/src/Models/GroupModel.php @@ -52,7 +52,7 @@ public function findPaginatedData(int $length, int $start, string $keyword = '') return $this->builder()->limit($length, $start)->get()->getResultObject(); } - + /** * FInd with count all data. * @@ -68,7 +68,7 @@ public function countFindData(string $keyword = ''): int ->orLike('description', $keyword) ->groupEnd() ->countAllResults() - + : $this->builder()->countAllResults(); } } diff --git a/src/Models/PermissionModel.php b/src/Models/PermissionModel.php index 6c088fb..cba65d8 100644 --- a/src/Models/PermissionModel.php +++ b/src/Models/PermissionModel.php @@ -26,7 +26,7 @@ public function findPaginatedData(int $length, int $start, string $keyword = '') return $this->builder()->limit($length, $start)->get()->getResultObject(); } - + /** * FInd with count all data. * @@ -42,7 +42,7 @@ public function countFindData(string $keyword = ''): int ->orLike('description', $keyword) ->groupEnd() ->countAllResults() - + : $this->builder()->countAllResults(); } } diff --git a/src/Models/UserModel.php b/src/Models/UserModel.php index 72b7515..ca4f987 100644 --- a/src/Models/UserModel.php +++ b/src/Models/UserModel.php @@ -26,7 +26,7 @@ public function findPaginatedData(int $length, int $start, string $keyword = '') return $this->builder()->where('deleted_at', null)->limit($length, $start)->get()->getResultObject(); } - + /** * FInd with count all data. * @@ -43,7 +43,7 @@ public function countFindData(string $keyword = ''): int ->groupEnd() ->where('deleted_at', null) ->countAllResults() - + : $this->builder()->where('deleted_at', null)->countAllResults(); } } diff --git a/src/Views/Authentication/forgot.php b/src/Views/Authentication/forgot.php index e035e1a..ad039e1 100644 --- a/src/Views/Authentication/forgot.php +++ b/src/Views/Authentication/forgot.php @@ -1,13 +1,13 @@ -extend('agungsugiarto\boilerplate\Views\Authentication\index') ?> -section('content') ?> +extend('agungsugiarto\boilerplate\Views\Authentication\index') ?> +section('content') ?>
@@ -32,11 +32,11 @@ class="form-control "

- allowRegistration) : ?> + allowRegistration) { ?>

- +
diff --git a/src/Views/Authentication/index.php b/src/Views/Authentication/index.php index 0398e7f..6c1a891 100644 --- a/src/Views/Authentication/index.php +++ b/src/Views/Authentication/index.php @@ -26,7 +26,7 @@ appName ?> - renderSection('content') ?> + renderSection('content') ?> diff --git a/src/Views/Authentication/login.php b/src/Views/Authentication/login.php index a38ccde..b23d449 100644 --- a/src/Views/Authentication/login.php +++ b/src/Views/Authentication/login.php @@ -7,7 +7,7 @@ include('agungsugiarto\boilerplate\Views\Authentication\message_block') ?> - validFields === ['email']) : ?> + validFields === ['email']) { ?>
- allowRemembering) : ?> + allowRemembering) { ?>
> @@ -59,7 +59,7 @@ class="form-control "
- +
@@ -71,11 +71,11 @@ class="form-control "

- allowRegistration) : ?> + allowRegistration) { ?>

- +
diff --git a/src/Views/Authentication/message_block.php b/src/Views/Authentication/message_block.php index a8eb96e..ae76798 100644 --- a/src/Views/Authentication/message_block.php +++ b/src/Views/Authentication/message_block.php @@ -1,19 +1,19 @@ -has('message')) : ?> +has('message')) { ?>
- + -has('error')) : ?> +has('error')) { ?>
- + -has('errors')) : ?> +has('errors')) { ?> - + diff --git a/src/Views/Menu/index.php b/src/Views/Menu/index.php index 5b608a3..dc46a96 100644 --- a/src/Views/Menu/index.php +++ b/src/Views/Menu/index.php @@ -49,18 +49,18 @@
  - +
- +
@@ -80,11 +80,11 @@
- +
- +   http://fontawesome.io/icons @@ -99,11 +99,11 @@ - +
- + @@ -115,11 +115,11 @@ - +
- + @@ -127,13 +127,13 @@
- +
- +
diff --git a/src/Views/Permission/index.php b/src/Views/Permission/index.php index 11c122b..c556b1e 100644 --- a/src/Views/Permission/index.php +++ b/src/Views/Permission/index.php @@ -1,11 +1,11 @@ -include('agungsugiarto\boilerplate\Views\load\datatables') ?> +include('agungsugiarto\boilerplate\Views\load\datatables') ?> -extend('agungsugiarto\boilerplate\Views\layout\index') ?> +extend('agungsugiarto\boilerplate\Views\layout\index') ?> -section('content') ?> - include('agungsugiarto\boilerplate\Views\Permission\create') ?> +section('content') ?> + include('agungsugiarto\boilerplate\Views\Permission\create') ?>
@@ -14,7 +14,7 @@
@@ -38,10 +38,10 @@
-endSection() ?> +endSection() ?> -section('js') ?> +section('js') ?> -endSection() ?> +endSection() ?> diff --git a/src/Views/Role/create.php b/src/Views/Role/create.php index 3f10759..062d82c 100644 --- a/src/Views/Role/create.php +++ b/src/Views/Role/create.php @@ -28,11 +28,11 @@ - +
- + @@ -44,11 +44,11 @@ - +
- + @@ -57,13 +57,13 @@
- +
- +
diff --git a/src/Views/Role/edit.php b/src/Views/Role/edit.php index 5d3dd7c..4f16c73 100644 --- a/src/Views/Role/edit.php +++ b/src/Views/Role/edit.php @@ -28,11 +28,11 @@ - +
- + @@ -44,11 +44,11 @@ - +
- + @@ -57,17 +57,17 @@
- +
- +
diff --git a/src/Views/Role/index.php b/src/Views/Role/index.php index a08d7e8..df2f5ee 100644 --- a/src/Views/Role/index.php +++ b/src/Views/Role/index.php @@ -1,10 +1,10 @@ -include('agungsugiarto\boilerplate\Views\load\datatables') ?> +include('agungsugiarto\boilerplate\Views\load\datatables') ?> -extend('agungsugiarto\boilerplate\Views\layout\index') ?> +extend('agungsugiarto\boilerplate\Views\layout\index') ?> -section('content') ?> +section('content') ?>
@@ -12,7 +12,7 @@ @@ -36,10 +36,10 @@
-endSection() ?> +endSection() ?> -section('js') ?> +section('js') ?> -endSection() ?> +endSection() ?> diff --git a/src/Views/User/create.php b/src/Views/User/create.php index 5e0b202..28db824 100644 --- a/src/Views/User/create.php +++ b/src/Views/User/create.php @@ -36,11 +36,11 @@ - +
- + @@ -52,11 +52,11 @@ - +
- + @@ -68,11 +68,11 @@ - +
- + @@ -84,11 +84,11 @@ - +
- + @@ -96,26 +96,26 @@
- +
- +
- +
- +
diff --git a/src/Views/User/index.php b/src/Views/User/index.php index a74241f..be6cbc3 100644 --- a/src/Views/User/index.php +++ b/src/Views/User/index.php @@ -1,17 +1,17 @@ -include('agungsugiarto\boilerplate\Views\load\select2') ?> -include('agungsugiarto\boilerplate\Views\load\datatables') ?> +include('agungsugiarto\boilerplate\Views\load\select2') ?> +include('agungsugiarto\boilerplate\Views\load\datatables') ?> -extend('agungsugiarto\boilerplate\Views\layout\index') ?> +extend('agungsugiarto\boilerplate\Views\layout\index') ?> -section('content') ?> +section('content') ?>
@@ -40,9 +40,9 @@
-endSection() ?> +endSection() ?> -section('js') ?> +section('js') ?> diff --git a/src/Views/layout/mainsidebar.php b/src/Views/layout/mainsidebar.php index 8b38559..a8ee8ae 100644 --- a/src/Views/layout/mainsidebar.php +++ b/src/Views/layout/mainsidebar.php @@ -4,7 +4,7 @@ theme['sidebar']['brand']['logo']['text'] ?> diff --git a/src/Views/load/duallistbox.php b/src/Views/load/duallistbox.php index 168cf5f..d9c25d1 100644 --- a/src/Views/load/duallistbox.php +++ b/src/Views/load/duallistbox.php @@ -1,12 +1,12 @@ -section('css') ?> +section('css') ?> -endSection() ?> +endSection() ?> -section('js') ?> +section('js') ?> endSection() ?> \ No newline at end of file diff --git a/src/Views/load/nestable.php b/src/Views/load/nestable.php index c5a9b15..9bd2dcc 100644 --- a/src/Views/load/nestable.php +++ b/src/Views/load/nestable.php @@ -1,11 +1,11 @@ -section('css') ?> +section('css') ?> -endSection() ?> +endSection() ?> -section('js') ?> +section('js') ?> endSection() ?> \ No newline at end of file