Master update

.gitignore

@@ -1,5 +1,6 @@
 vendor/
 node_modules/
+.idea/
 
 # Laravel 4 specific
 bootstrap/compiled.php

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Release Notes
+
+## 20th Apr 2016
+
+#### New Features
+- Introducing [Laravel Generator Builder](http://labs.infyom.com/laravelgenerator/docs/generator-gui-interface) ([#94](https://github.com/InfyOmLabs/laravel-generator/issues/94))
+- Introducing Support to Generate CRUD with [AdminLTE Templates](http://labs.infyom.com/laravelgenerator/docs/templates/adminlte)
+- Added [Support for DataTable](http://labs.infyom.com/laravelgenerator/docs/options/scaffold-options) in both Bootstrap & AdminLTE Templates ([#50](https://github.com/InfyOmLabs/laravel-generator/issues/50))
+- Introducing Support for [Publishing a full Admin Panel layout](http://labs.infyom.com/laravelgenerator/docs/advanced/publish-layout)
+- Added [Rollback command](http://labs.infyom.com/laravelgenerator/docs/advanced/commands) to delete generated files ([#44](https://github.com/InfyOmLabs/laravel-generator/issues/44))
+
+#### Enhancements
+- Swagger Document Fix via AppBaseController Publish ([#101](https://github.com/InfyOmLabs/laravel-generator/issues/101))
+
+#### Fixes
+- Support for custom Namespace ([#98](https://github.com/InfyOmLabs/laravel-generator/issues/98))

README.md

@@ -1,11 +1,52 @@
+<h1 align="center"><img src="https://assets.infyom.com/open-source/infyom-logo.png" alt="InfyOm"></h1>
+
 InfyOm Laravel Generator
-==============================
+==========================
 
 [![Total Downloads](https://poser.pugx.org/infyomlabs/laravel-generator/downloads)](https://packagist.org/packages/infyomlabs/laravel-generator)
 [![Monthly Downloads](https://poser.pugx.org/infyomlabs/laravel-generator/d/monthly)](https://packagist.org/packages/infyomlabs/laravel-generator)
 [![Daily Downloads](https://poser.pugx.org/infyomlabs/laravel-generator/d/daily)](https://packagist.org/packages/infyomlabs/laravel-generator)
-[![Latest Stable Version](https://poser.pugx.org/infyomlabs/laravel-generator/v/stable)](https://packagist.org/packages/infyomlabs/laravel-generator)
-[![Latest Unstable Version](https://poser.pugx.org/infyomlabs/laravel-generator/v/unstable)](https://packagist.org/packages/infyomlabs/laravel-generator)
 [![License](https://poser.pugx.org/infyomlabs/laravel-generator/license)](https://packagist.org/packages/infyomlabs/laravel-generator)
 
-Documentation is located [here](http://labs.infyom.com/laravelgenerator)
+Generate Admin Panels CRUDs and APIs in Minutes with tons of other features and customizations with 3 different themes.  
+Read [Documentation](https://www.infyom.com/open-source) for detailed installation steps and usage.
+
+## Support Us
+
+We have created [14+ Laravel packages](https://github.com/InfyOmLabs) and invested a lot of resources into creating these all packages and maintaining them.
+
+You can support us by either sponsoring us or buying one of our paid products. Or help us by spreading the word about us on social platforms via tweets and posts.
+
+### Sponsors
+
+[Become a sponsor](https://opencollective.com/infyomlabs#sponsor) and get your logo on our README on Github with a link to your site.
+
+<a href="https://opencollective.com/infyomlabs#sponsor"><img src="https://opencollective.com/infyomlabs/sponsors.svg?width=890"></a>
+
+### Backers
+
+[Become a backer](https://opencollective.com/infyomlabs#backer) and get your image on our README on Github with a link to your site.
+
+<a href="https://opencollective.com/infyomlabs#backer"><img src="https://opencollective.com/infyomlabs/backers.svg?width=890"></a>
+
+### Buy our Paid Products
+
+[![InfyChat](https://assets.infyom.com/open-source/infychat-banner.png)](https://bit.ly/3gYLWny)
+
+You can also check out our other paid products on [CodeCanyon](https://codecanyon.net/user/infyomlabs/portfolio).
+
+### Follow Us
+
+- [Twitter](https://twitter.com/infyom)
+- [Facebook](https://www.facebook.com/infyom)
+- [LinkedIn](https://in.linkedin.com/company/infyom-technologies)
+- [Youtube](https://www.youtube.com/channel/UC8IvwfChD6i7Wp4yZp3tNsQ)
+- [Contact Us](https://infyom.com/contact-us)
+
+## Made with InfyOm Generator
+
+Also, Do not forget to add your website to [Made with InfyOm Generator List](https://github.com/InfyOmLabs/laravel-generator/blob/develop/made-with-generator.md) list.
+
+## Video Tutorials
+
+Checkout [Video Tutorials](https://github.com/shailesh-ladumor/infyom-laravel-generator-tutorial) - **By**: [Shailesh Ladumor](https://github.com/shailesh-ladumor)

composer.json

@@ -26,11 +26,14 @@
         "php": ">=5.5.9",
         "illuminate/support": "~5.0",
         "prettus/l5-repository": "~2.1",
-        "laracasts/flash": "~1.3"
+        "laracasts/flash": "~2.0"
     },
     "autoload": {
         "psr-4": {
             "InfyOm\\Generator\\": "src/"
-        }
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     }
 }

config/laravel_generator.php

@@ -15,6 +15,8 @@
 
         'model'             => app_path('Models/'),
 
+        'datatables'        => app_path('DataTables/'),
+
         'repository'        => app_path('Repositories/'),
 
         'routes'            => app_path('Http/routes.php'),
@@ -53,6 +55,8 @@
 
         'model'             => 'App\Models',
 
+        'datatables'        => 'App\DataTables',
+
         'repository'        => 'App\Repositories',
 
         'controller'        => 'App\Http\Controllers',
@@ -103,6 +107,26 @@
     'options' => [
 
         'softDelete' => true,
+
+        'tables_searchable_default' => false,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Prefixes
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'prefixes' => [
+
+        'route' => '',  // using admin will create route('admin.?.index') type routes
+
+        'path' => '',
+
+        'view' => '',  // using backend will create return view('backend.?.index') type the backend views directory
+
+        'public' => '',
     ],
 
     /*
@@ -114,8 +138,36 @@
 
     'add_on' => [
 
-        'swagger'   => true,
+        'swagger'       => true,
+
+        'tests'         => true,
 
-        'tests'     => true,
+        'datatables'    => false,
+
+        'menu'          => [
+
+            'enabled'       => false,
+
+            'menu_file'     => 'layouts/menu.blade.php',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Timestamp Fields
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'timestamps' => [
+
+        'enabled'       => true,
+
+        'created_at'    => 'created_at',
+
+        'updated_at'    => 'updated_at',
+
+        'deleted_at'    => 'deleted_at',
     ],
+
 ];

samples/fields_sample.json

@@ -1,63 +1,104 @@
 [
-  {
-    "fieldInput": "id:increments",
-    "htmlType": "",
-    "validations": "",
-    "searchable": false,
-    "fillable": false,
-    "primary": true
-  },
-  {
-    "fieldInput": "title:string,20",
-    "htmlType": "text",
-    "validations": "required",
-    "searchable": true
-  },
-  {
-    "fieldInput": "email_test:string",
-    "htmlType": "email",
-    "searchable": true
-  },
-  {
-    "fieldInput": "date_test:datetime",
-    "htmlType": "date"
-  },
-  {
-    "fieldInput": "number_test:integer",
-    "htmlType": "number"
-  },
-  {
-    "fieldInput": "file_test:string",
-    "htmlType": "file"
-  },
-  {
-    "fieldInput": "password_test:string",
-    "htmlType": "password"
-  },
-  {
-    "fieldInput": "select_test:string",
-    "htmlType": "select:Option1,Option2,Option3,Option4,Option5",
-    "searchable": true
-  },
-  {
-    "fieldInput": "enum_test:enum",
-    "htmlType": "enum:Mon,Tue,Wed,Thu,Fri,Sat,Sun",
-    "searchable": true
-  },
-  {
-    "fieldInput": "radio_test:string",
-    "htmlType": "radio:Male,Female"
-  },
-  {
-    "fieldInput": "checkbox_test:string",
-    "htmlType": "checkbox:true"  
-  },
-    {
-    "fieldInput": "checkbox-group_test:string",
-    "htmlType": "checkbox-group:Check1,Check2"
-  },
-  {
-    "fieldInput": "body:text",
-    "htmlType": "textarea"
-  }
+    {
+        "fieldInput": "id:increments",
+        "htmlType": "",
+        "validations": "",
+        "searchable": false,
+        "fillable": false,
+        "primary": true,
+        "inForm": false,
+        "inIndex": false
+    },
+    {
+        "fieldInput": "title:string,20",
+        "htmlType": "text",
+        "validations": "required",
+        "searchable": true,
+        "inForm": true,
+        "inIndex": true
+    },
+    {
+        "fieldInput": "email:string",
+        "htmlType": "email",
+        "searchable": true
+    },
+    {
+        "fieldInput": "post_date:dateTime",
+        "htmlType": "date"
+    },
+    {
+        "fieldInput": "words:integer",
+        "htmlType": "number"
+    },
+    {
+        "fieldInput": "attachment:string",
+        "htmlType": "file"
+    },
+    {
+        "fieldInput": "password:string",
+        "htmlType": "password",
+        "inIndex": false
+    },
+    {
+        "fieldInput": "post_type:string",
+        "htmlType": "select:Type1,Type2,Type3,Type4",
+        "validations": "",
+        "searchable": true
+    },
+    {
+        "fieldInput": "post_day:enum",
+        "htmlType": "enum:Mon,Tue,Wed,Thu,Fri,Sat,Sun",
+        "validations": "",
+        "searchable": true
+    },
+    {
+        "fieldInput": "post_author_gender:string",
+        "htmlType": "radio:Male,Female",
+        "validations": "",
+        "searchable": false,
+        "fillable": true,
+        "primary": false,
+        "inForm": true,
+        "inIndex": false
+    },
+    {
+        "fieldInput": "body:text",
+        "htmlType": "textarea",
+        "validations": "",
+        "searchable": false,
+        "fillable": true,
+        "primary": false,
+        "inForm": true,
+        "inIndex": false
+    },
+    {
+        "fieldInput": "private_post:string",
+        "htmlType": "checkbox:Yes",
+        "validations": "",
+        "searchable": true,
+        "fillable": true,
+        "primary": false,
+        "inForm": true,
+        "inIndex": false
+    },
+    {
+        "fieldInput": "is_active:boolean",
+        "htmlType": "bool-checkbox:checked",
+        "validations": "",
+        "searchable": true,
+        "fillable": true,
+        "primary": false,
+        "inForm": true,
+        "inIndex": false
+    },
+    {
+        "fieldInput": "is_published:boolean",
+        "htmlType": "toggle-switch",
+        "validations": "",
+        "searchable": true,
+        "fillable": true,
+        "primary": false,
+        "inForm": true,
+        "inIndex": false
+    },
 ]

src/Commands/API/APIControllerGeneratorCommand.php

@@ -41,8 +41,6 @@ public function handle()
     {
         parent::handle();
 
-        $this->initAPIGeneratorCommandData();
-
         $controllerGenerator = new APIControllerGenerator($this->commandData);
         $controllerGenerator->generate();