Fix needed in the default controller Stub

LICENSE

@@ -1,5 +1,6 @@
 MIT License
 
+Copyright (c) 2020 Daniel Scheff
 Copyright (c) 2018 Muhammad Awais
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

@@ -1,16 +1,23 @@
-![Laravel Crud Generator](https://banners.beyondco.de/Laravel%20CRUD.png?theme=dark&packageManager=composer+require&packageName=ibex%2Fcrud-generator&pattern=architect&style=style_1&description=Laravel+CRUD+Generator&md=1&showWatermark=0&fontSize=100px&images=gift)
+![Laravel Crud Generator with Column Filters](https://banners.beyondco.de/Laravel%20Crud%20Generator%20with%20Column%20Filters%20and%20Sorting.png?theme=dark&packageManager=composer+require&packageName=dscheff%2Fcrud-generator&pattern=graphPaper&style=style_1&description=Column+Filtering+and+Sorting+&md=1&showWatermark=0&fontSize=70px&images=filter&images=arrow-narrow-down)
 
-
-![Packagist](https://img.shields.io/badge/Packagist-v1.1.2-green.svg?style=flat-square)
+![Packagist](https://img.shields.io/badge/Packagist-v1.3.10-green.svg?style=flat-square)
 ![Licence](https://img.shields.io/badge/Licence-MIT-green.svg?style=flat-square)
-![StyleCI](https://img.shields.io/badge/StyleCI-pass-green.svg?style=flat-square)
 
+This package is a fork of https://packagist.org/packages/ibex/crud-generator, and adds column sorting and 
+filtering to the index view, as well as a handful of other tweaks.
+
+This Laravel Generator package generates your MVC code (with eloquent relations) in **Bootstrap** for your app 
+development, with a single command.
 
-This Laravel Generator package provides and generate Controller, Model (with eloquent relations) and Views in **Bootstrap** for your development of your applications with single command.
+@todo - Add related models to the sorting and filtering
+
+@todo - Adding subview generation for views that integrate mutiple models, with 
+Ajax/modal/inline forms
 
 - Will create **Model** with Eloquent relations
 - Will create **Controller** with all resources
-- Will create **views** in Bootstrap
+- Will create **views** in Bootstrap 4
+- Will add **Column Sorting and Filtering** to your index action/view 
 
 ## Requirements
     Laravel >= 5.5
@@ -19,11 +26,19 @@ This Laravel Generator package provides and generate Controller, Model (with elo
 ## Installation
 1 - Install
 ```
-composer require ibex/crud-generator --dev
+composer require dscheff/crud-generator --dev
 ```
-2- Publish the default package's config
+2 - Publish the default package's config, and js/css assets
 ```
 php artisan vendor:publish --tag=crud
+php artisan vendor:publish --tag=public --force
+```
+
+You will need to add the following to your **app layout**, just inside your closing body tag:
+
+```
+@stack('scripts-body')
+</body>
 ```
 
 ## Usage
@@ -40,9 +55,16 @@ Route::resource('banks', 'BankController');
 Route name in plural slug case.
 
 #### Options
- - Custom Route
+- Custom Route
 ```
-php artisan make:crud {table_name} --route={route_name}
+php artisan make:crud {table_name} --route={route_name} 
+```
+
+- Custom Display Name for Views
+```
+php artisan make:crud {table_name} --title={displayed_model_name}
+
+php artisan make:crud sales_rep --title="Sales Representatives"
 ```
 
 ## Example
@@ -63,10 +85,6 @@ php artisan make:crud {table_name} --route={route_name}
 ![Form](https://i.imgur.com/poRiZRO.png)
 
 
-## Author
-
-M Awais // [Email Me](mailto:[email protected])
-
-[Buy me a Coffee](https://ko-fi.com/C0C8VT1M)
+## Author(s)
 
-[![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/C0C8VT1M)
+Daniel Scheff, on the back of the great work of M Awais (https://packagist.org/packages/ibex/crud-generator)

composer.json

@@ -1,27 +1,31 @@
 {
-    "name": "ibex/crud-generator",
-    "description": "Laravel Crud Generator",
+    "name": "dscheff/crud-generator",
+    "description": "Laravel Crud Generator with Column Filters",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Daniel Scheff",
+            "email": "[email protected]"
+        },
         {
             "name": "M Awais",
             "email": "[email protected]"
         }
     ],
-    "keywords": ["laravel", "crud", "crud generator", "laravel crud generator", "laravel package"],
+    "keywords": ["laravel", "column filters", "crud", "crud generator", "laravel crud generator", "laravel package"],
     "require": {
         "laravel/framework": "^5.5|^6.20.12|^7.0|^8.0",
         "laravelcollective/html": "^5.4|^6.0|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {
-            "Ibex\\CrudGenerator\\": "src/"
+            "Dscheff\\CrudGenerator\\": "src/"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Ibex\\CrudGenerator\\CrudServiceProvider"
+                "Dscheff\\CrudGenerator\\CrudServiceProvider"
             ]
         }
     },

src/Commands/CrudGenerator.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace Ibex\CrudGenerator\Commands;
+namespace Dscheff\CrudGenerator\Commands;
 
 use Illuminate\Support\Str;
 
 /**
  * Class CrudGenerator.
  *
+ * @author Daniel Scheff <[email protected]>
  * @author  Awais <[email protected]>
  */
 class CrudGenerator extends GeneratorCommand
@@ -18,7 +19,10 @@ class CrudGenerator extends GeneratorCommand
      */
     protected $signature = 'make:crud
                             {name : Table name}
-                            {--route= : Custom route name}';
+                            {--route= : Custom route name}
+                            {--title= : Visible model name}';
+
+    // {--model-name= : Model name if not studly table name}
 
     /**
      * The console command description.
@@ -27,12 +31,20 @@ class CrudGenerator extends GeneratorCommand
      */
     protected $description = 'Create bootstrap CRUD operations';
 
+    /**
+     * The stubs to be generated.
+     *
+     * @var array
+     */
+//    protected $stubs = ['index', 'create', 'edit', 'form', 'show', '_index', '_create', '_edit'];
+    protected $stubs = ['index', 'create', 'edit', 'form', 'show'];
+
     /**
      * Execute the console command.
      *
-     * @return bool|null
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      *
+     * @return bool|null
      */
     public function handle()
     {
@@ -64,94 +76,103 @@ public function handle()
     /**
      * Build the Controller Class and save in app/Http/Controllers.
      *
-     * @return $this
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      *
+     * @return $this
      */
     protected function buildController()
     {
-        $controllerPath = $this->_getControllerPath($this->name);
+        $path = $this->_getControllerPath($this->name);
 
-        if ($this->files->exists($controllerPath) && $this->ask('Already exist Controller. Do you want overwrite (y/n)?', 'y') == 'n') {
+        if ($this->files->exists($path) && $this->ask('Controller exists. Overwrite (y/n)?', 'y') == 'n') {
             return $this;
         }
 
-        $this->info('Creating Controller ...');
+        $this->info('Creating Controller...');
 
         $replace = $this->buildReplacements();
 
-        $controllerTemplate = str_replace(
-            array_keys($replace), array_values($replace), $this->getStub('Controller')
+        $template = str_replace(
+            array_keys($replace),
+            array_values($replace),
+            $this->getStub('Controller')
         );
 
-        $this->write($controllerPath, $controllerTemplate);
+        $this->write($path, $template);
 
         return $this;
     }
 
     /**
-     * @return $this
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      *
+     * @return $this
      */
     protected function buildModel()
     {
-        $modelPath = $this->_getModelPath($this->name);
+        $path = $this->_getModelPath($this->name);
 
-        if ($this->files->exists($modelPath) && $this->ask('Already exist Model. Do you want overwrite (y/n)?', 'y') == 'n') {
+        if ($this->files->exists($path) && $this->ask('Model exists. Overwrite (y/n)?', 'y') == 'n') {
             return $this;
         }
 
-        $this->info('Creating Model ...');
+        $this->info('Creating Model...');
 
         // Make the models attributes and replacement
         $replace = array_merge($this->buildReplacements(), $this->modelReplacements());
 
-        $modelTemplate = str_replace(
-            array_keys($replace), array_values($replace), $this->getStub('Model')
+        $template = str_replace(
+            array_keys($replace),
+            array_values($replace),
+            $this->getStub('Model')
         );
 
-        $this->write($modelPath, $modelTemplate);
+        $this->write($path, $template);
 
         return $this;
     }
 
     /**
-     * @return $this
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     *
      * @throws \Exception
+     *
+     * @return $this
      */
     protected function buildViews()
     {
         $this->info('Creating Views ...');
 
         $tableHead = "\n";
         $tableBody = "\n";
+        $tableColumnFilters = "\n";
         $viewRows = "\n";
         $form = "\n";
 
         foreach ($this->getFilteredColumns() as $column) {
             $title = Str::title(str_replace('_', ' ', $column));
 
-            $tableHead .= $this->getHead($title);
+            $tableHead .= $this->getHead($title, $column);
             $tableBody .= $this->getBody($column);
+            $tableColumnFilters .= $this->getTableColumnFilters($column);
             $viewRows .= $this->getField($title, $column, 'view-field');
             $form .= $this->getField($title, $column, 'form-field');
         }
 
         $replace = array_merge($this->buildReplacements(), [
-            '{{tableHeader}}' => $tableHead,
-            '{{tableBody}}' => $tableBody,
-            '{{viewRows}}' => $viewRows,
-            '{{form}}' => $form,
+            '{{tableHeader}}'        => $tableHead,
+            '{{tableBody}}'          => $tableBody,
+            '{{tableColumnFilters}}' => $tableColumnFilters,
+            '{{viewRows}}'           => $viewRows,
+            '{{form}}'               => $form,
         ]);
 
         $this->buildLayout();
 
-        foreach (['index', 'create', 'edit', 'form', 'show'] as $view) {
+        foreach ($this->stubs as $view) {
             $viewTemplate = str_replace(
-                array_keys($replace), array_values($replace), $this->getStub("views/{$view}")
+                array_keys($replace),
+                array_values($replace),
+                $this->getStub("views/{$view}")
             );
 
             $this->write($this->_getViewPath($view), $viewTemplate);