diff --git a/Modules/Product/Resources/views/categories/edit.blade.php b/Modules/Product/Resources/views/categories/edit.blade.php index 31cdf98c..d673c204 100644 --- a/Modules/Product/Resources/views/categories/edit.blade.php +++ b/Modules/Product/Resources/views/categories/edit.blade.php @@ -2,10 +2,6 @@ @section('title', 'Edit Product Category') -@section('third_party_stylesheets') - -@endsection - @section('breadcrumb')
  1. Home
    2. diff --git a/Modules/Product/Resources/views/categories/partials/actions.blade.php b/Modules/Product/Resources/views/categories/partials/actions.blade.php index de219d01..2daa3593 100644 --- a/Modules/Product/Resources/views/categories/partials/actions.blade.php +++ b/Modules/Product/Resources/views/categories/partials/actions.blade.php @@ -2,13 +2,13 @@ + +
    +
    +
    + + +
    + +
    + +
    + +
    + +
    +
    +
    +
    + Products +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + +@endsection + diff --git a/Modules/User/Resources/views/roles/edit.blade.php b/Modules/User/Resources/views/roles/edit.blade.php new file mode 100644 index 00000000..29087e53 --- /dev/null +++ b/Modules/User/Resources/views/roles/edit.blade.php @@ -0,0 +1,160 @@ +@extends('layouts.app') + +@section('title', 'Edit Role') + +@section('breadcrumb') +
      +
    1. Home
      2. +
    2. Roles
      3. +
    3. Edit
      4. +
    +@endsection + +@push('page_css') + +@endpush + +@section('content') +
    +
    +
    +
    + @csrf + @method('patch') +
    + +
    +
    +
    +
    + + +
    + +
    + +
    + +
    + +
    + +
    +
    +
    + Roles & Permissions +
    +
    +
    +
    +
    + hasPermissionTo('access_roles_permissions') ? 'checked' : '' }}> + +
    +
    +
    +
    + hasPermissionTo('create_roles_permissions') ? 'checked' : '' }}> + +
    +
    +
    +
    + hasPermissionTo('edit_roles_permissions') ? 'checked' : '' }}> + +
    +
    +
    +
    + hasPermissionTo('delete_roles_permissions') ? 'checked' : '' }}> + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + Products +
    +
    +
    +
    +
    + hasPermissionTo('access_products') ? 'checked' : '' }}> + +
    +
    +
    +
    + hasPermissionTo('show_products') ? 'checked' : '' }}> + +
    +
    +
    +
    + hasPermissionTo('create_products') ? 'checked' : '' }}> + +
    +
    +
    +
    + hasPermissionTo('edit_products') ? 'checked' : '' }}> + +
    +
    +
    +
    + hasPermissionTo('delete_products') ? 'checked' : '' }}> + +
    +
    +
    +
    + hasPermissionTo('access_product_categories') ? 'checked' : '' }}> + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@endsection + diff --git a/Modules/User/Resources/views/roles/index.blade.php b/Modules/User/Resources/views/roles/index.blade.php new file mode 100644 index 00000000..f44090cc --- /dev/null +++ b/Modules/User/Resources/views/roles/index.blade.php @@ -0,0 +1,41 @@ +@extends('layouts.app') + +@section('title', 'Roles & Permissions') + +@section('third_party_stylesheets') + +@endsection + +@section('breadcrumb') +
      +
    1. Home
      2. +
    2. Roles
      3. +
    +@endsection + +@section('content') +
    +
    +
    +
    +
    + + + Add Role + + +
    + +
    + {!! $dataTable->table() !!} +
    +
    +
    +
    +
    +
    +@endsection + +@push('page_scripts') + {!! $dataTable->scripts() !!} +@endpush diff --git a/Modules/User/Resources/views/roles/partials/actions.blade.php b/Modules/User/Resources/views/roles/partials/actions.blade.php new file mode 100644 index 00000000..d677ce20 --- /dev/null +++ b/Modules/User/Resources/views/roles/partials/actions.blade.php @@ -0,0 +1,15 @@ + + + + diff --git a/Modules/User/Resources/views/roles/partials/permissions.blade.php b/Modules/User/Resources/views/roles/partials/permissions.blade.php new file mode 100644 index 00000000..c87c27c3 --- /dev/null +++ b/Modules/User/Resources/views/roles/partials/permissions.blade.php @@ -0,0 +1,3 @@ +@foreach($permissions as $permission) + {{ $permission }} +@endforeach diff --git a/Modules/User/Resources/views/users/create.blade.php b/Modules/User/Resources/views/users/create.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/User/Resources/views/users/edit.blade.php b/Modules/User/Resources/views/users/edit.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/User/Resources/views/users/index.blade.php b/Modules/User/Resources/views/users/index.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/User/Resources/views/users/partials/actions.blade.php b/Modules/User/Resources/views/users/partials/actions.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/User/Resources/views/users/show.blade.php b/Modules/User/Resources/views/users/show.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/User/Routes/.gitkeep b/Modules/User/Routes/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/User/Routes/api.php b/Modules/User/Routes/api.php new file mode 100644 index 00000000..96db6e9c --- /dev/null +++ b/Modules/User/Routes/api.php @@ -0,0 +1,18 @@ +get('/setting', function (Request $request) { + return $request->user(); +}); \ No newline at end of file diff --git a/Modules/User/Routes/web.php b/Modules/User/Routes/web.php new file mode 100644 index 00000000..3f3e557e --- /dev/null +++ b/Modules/User/Routes/web.php @@ -0,0 +1,16 @@ + 'auth'], function () { + + //Users + Route::resource('users', 'UsersController'); + //Roles + Route::resource('roles', 'RolesController')->except('show'); + +}); diff --git a/Modules/User/Tests/Feature/.gitkeep b/Modules/User/Tests/Feature/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/User/Tests/Unit/.gitkeep b/Modules/User/Tests/Unit/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/User/composer.json b/Modules/User/composer.json new file mode 100644 index 00000000..f2d7cf95 --- /dev/null +++ b/Modules/User/composer.json @@ -0,0 +1,23 @@ +{ + "name": "nwidart/user", + "description": "", + "authors": [ + { + "name": "Nicolas Widart", + "email": "n.widart@gmail.com" + } + ], + "extra": { + "laravel": { + "providers": [], + "aliases": { + + } + } + }, + "autoload": { + "psr-4": { + "Modules\\User\\": "" + } + } +} diff --git a/Modules/User/module.json b/Modules/User/module.json new file mode 100644 index 00000000..5309c1c0 --- /dev/null +++ b/Modules/User/module.json @@ -0,0 +1,13 @@ +{ + "name": "User", + "alias": "user", + "description": "", + "keywords": [], + "priority": 0, + "providers": [ + "Modules\\User\\Providers\\UserServiceProvider" + ], + "aliases": {}, + "files": [], + "requires": [] +} diff --git a/Modules/User/package.json b/Modules/User/package.json new file mode 100644 index 00000000..4599509f --- /dev/null +++ b/Modules/User/package.json @@ -0,0 +1,17 @@ +{ + "private": true, + "scripts": { + "dev": "npm run development", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch-poll": "npm run watch -- --watch-poll", + "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "prod": "npm run production", + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + }, + "devDependencies": { + "cross-env": "^7.0", + "laravel-mix": "^5.0.1", + "laravel-mix-merge-manifest": "^0.1.2" + } +} diff --git a/Modules/User/webpack.mix.js b/Modules/User/webpack.mix.js new file mode 100644 index 00000000..a851afc8 --- /dev/null +++ b/Modules/User/webpack.mix.js @@ -0,0 +1,14 @@ +const dotenvExpand = require('dotenv-expand'); +dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/})); + +const mix = require('laravel-mix'); +require('laravel-mix-merge-manifest'); + +mix.setPublicPath('../../public').mergeManifest(); + +mix.js(__dirname + '/Resources/assets/js/app.js', 'js/setting.js') + .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/setting.css'); + +if (mix.inProduction()) { + mix.version(); +} diff --git a/README.md b/README.md index b1f9893d..55589859 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -### Project On Development.... +### Work In Progress..... diff --git a/app/DataTables/ProductCategoriesDataTable.php b/app/DataTables/ProductCategoriesDataTable.php index aee585d3..ef17c06e 100644 --- a/app/DataTables/ProductCategoriesDataTable.php +++ b/app/DataTables/ProductCategoriesDataTable.php @@ -48,13 +48,19 @@ class ProductCategoriesDataTable extends DataTable ->setTableId('product_categories-table') ->columns($this->getColumns()) ->minifiedAjax() - ->dom('Bfltrip') + ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7 mt-2'p>>") ->orderBy(0, 'asc') ->buttons( - Button::make('excel'), - Button::make('print'), - Button::make('reset'), + Button::make('excel') + ->text(' Excel'), + Button::make('print') + ->text(' Print'), + Button::make('reset') + ->text(' Reset'), Button::make('reload') + ->text(' Reload') ); } diff --git a/app/DataTables/ProductDataTable.php b/app/DataTables/ProductDataTable.php index 02f17043..897b01f9 100644 --- a/app/DataTables/ProductDataTable.php +++ b/app/DataTables/ProductDataTable.php @@ -54,13 +54,19 @@ class ProductDataTable extends DataTable ->setTableId('product-table') ->columns($this->getColumns()) ->minifiedAjax() - ->dom('Bflrtip') + ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7 mt-2'p>>") ->orderBy(0) ->buttons( - Button::make('excel'), - Button::make('print'), - Button::make('reset'), + Button::make('excel') + ->text(' Excel'), + Button::make('print') + ->text(' Print'), + Button::make('reset') + ->text(' Reset'), Button::make('reload') + ->text(' Reload') ); } diff --git a/app/DataTables/RolesDataTable.php b/app/DataTables/RolesDataTable.php new file mode 100644 index 00000000..ad05fc86 --- /dev/null +++ b/app/DataTables/RolesDataTable.php @@ -0,0 +1,113 @@ +eloquent($query) + ->addColumn('action', function ($data) { + return view('user::roles.partials.actions', compact('data')); + }) + ->addColumn('permissions', function ($data) { + return view('user::roles.partials.permissions', [ + 'permissions' => $data->getPermissionNames() + ]); + }); + + } + + /** + * Get query source of dataTable. + * + * @param \Spatie\Permission\Models\Role $model + * @return \Illuminate\Database\Eloquent\Builder + */ + public function query(Role $model) + { + return $model->newQuery()->with(['permissions' => function($query) { + $query->select('name')->get(); + }]); + } + + /** + * Optional method if you want to use html builder. + * + * @return \Yajra\DataTables\Html\Builder + */ + public function html() + { + return $this->builder() + ->setTableId('roles-table') + ->columns($this->getColumns()) + ->minifiedAjax() + ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7 mt-2'p>>") + ->orderBy(1) + ->buttons( + Button::make('excel') + ->text(' Excel'), + Button::make('print') + ->text(' Print'), + Button::make('reset') + ->text(' Reset'), + Button::make('reload') + ->text(' Reload') + ); + } + + /** + * Get columns. + * + * @return array + */ + protected function getColumns() + { + return [ + Column::make('id') + ->addClass('text-center') + ->addClass('align-middle'), + + Column::make('name') + ->addClass('text-center') + ->addClass('align-middle'), + + Column::computed('permissions') + ->addClass('text-center') + ->addClass('align-middle') + ->width('700px'), + + Column::computed('action') + ->exportable(false) + ->printable(false) + ->addClass('text-center') + ->addClass('align-middle') + ]; + } + + /** + * Get filename for export. + * + * @return string + */ + protected function filename() + { + return 'Roles_' . date('YmdHis'); + } +} diff --git a/app/DataTables/UsersDataTable.php b/app/DataTables/UsersDataTable.php new file mode 100644 index 00000000..1372751c --- /dev/null +++ b/app/DataTables/UsersDataTable.php @@ -0,0 +1,94 @@ +eloquent($query) + ->addColumn('action', function ($data) { + return view('user::users.partials.actions', compact('data')); + }); + } + + /** + * Get query source of dataTable. + * + * @param \App\Models\User $model + * @return \Illuminate\Database\Eloquent\Builder + */ + public function query(User $model) + { + return $model->newQuery(); + } + + /** + * Optional method if you want to use html builder. + * + * @return \Yajra\DataTables\Html\Builder + */ + public function html() + { + return $this->builder() + ->setTableId('users-table') + ->columns($this->getColumns()) + ->minifiedAjax() + ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7 mt-2'p>>") + ->orderBy(1) + ->buttons( + Button::make('excel') + ->text(' Excel'), + Button::make('print') + ->text(' Print'), + Button::make('reset') + ->text(' Reset'), + Button::make('reload') + ->text(' Reload') + ); + } + + /** + * Get columns. + * + * @return array + */ + protected function getColumns() + { + return [ + Column::make('id'), + Column::make('created_at'), + Column::make('updated_at'), + Column::computed('action') + ->exportable(false) + ->printable(false) + ->addClass('text-center'), + ]; + } + + /** + * Get filename for export. + * + * @return string + */ + protected function filename() + { + return 'Users_' . date('YmdHis'); + } +} diff --git a/config/datatables-buttons.php b/config/datatables-buttons.php index f62272a2..78f85bd7 100644 --- a/config/datatables-buttons.php +++ b/config/datatables-buttons.php @@ -1,4 +1,9 @@ <'col-md-6'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7'p>> + "; return [ /* @@ -57,7 +62,9 @@ return [ * Default html builder parameters. */ 'parameters' => [ - 'dom' => 'Bfltrip', + 'dom' => "<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7 mt-2'p>>", 'order' => [[0, 'desc']], 'buttons' => [ 'excel', @@ -84,6 +91,6 @@ return [ /* * Default DOM to generate when not set. */ - 'dom' => 'Bfrtip', + 'dom' => 'Bfrtip', ], ]; diff --git a/config/datatables-html.php b/config/datatables-html.php deleted file mode 100644 index a7f0fd4c..00000000 --- a/config/datatables-html.php +++ /dev/null @@ -1,33 +0,0 @@ - 'LaravelDataTables', - - /* - * Default table attributes when generating the table. - */ - 'table' => [ - 'class' => 'table table-bordered', - 'id' => 'dataTableBuilder', - ], - - /* - * Default condition to determine if a parameter is a callback or not. - * Callbacks needs to start by those terms or they will be casted to string. - */ - 'callback' => ['$', '$.', 'function'], - - /* - * Html builder script template. - */ - 'script' => 'datatables::script', - - /* - * Html builder script template for DataTables Editor integration. - */ - 'editor' => 'datatables::editor', -]; diff --git a/modules_statuses.json b/modules_statuses.json index 20c8754a..2d7d1f00 100644 --- a/modules_statuses.json +++ b/modules_statuses.json @@ -1,4 +1,5 @@ { "Product": true, - "Upload": true -} \ No newline at end of file + "Upload": true, + "User": true +} diff --git a/public/css/app.css b/public/css/app.css index 1b70bc39..5cbf4288 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -18779,3 +18779,7 @@ h3 { border: 0; box-shadow: 0 1px 1px 0 rgba(60, 75, 100, 0.14), 0 2px 1px -1px rgba(60, 75, 100, 0.12), 0 1px 3px 0 rgba(60, 75, 100, 0.2); } + +table { + width: 100% !important; +} diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 517b01a2..6d7d88e4 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -6,3 +6,7 @@ border: 0; box-shadow: 0 1px 1px 0 rgb(60 75 100 / 14%), 0 2px 1px -1px rgb(60 75 100 / 12%), 0 1px 3px 0 rgb(60 75 100 / 20%); } + +table { + width: 100% !important; +} diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php index 57881568..a115025f 100644 --- a/resources/views/layouts/menu.blade.php +++ b/resources/views/layouts/menu.blade.php @@ -26,3 +26,26 @@ + +
  2. + + User Management + + +