=Fix multiple bugs with the views. Add client-side validation. Add functions to cover every LaraelCollective methods. Add multipleSelect and checkbox auto handling.

Author: malhayek2014

README.md

@@ -1,23 +1,29 @@
-# An awesome code generator for laravel framework
+# An awesome code generator for laravel framework - with client-side validation
 
-For full documentation please visit <a href="https://crestapps.com/laravel-code-generator/docs/1.0" target="_blank" title="Laravel Code Generator Documentation">CrestApps.com</a>
+For full documentation and screenshots please visit <a href="https://crestapps.com/laravel-code-generator/docs/1.0" target="_blank" title="Laravel Code Generator Documentation">CrestApps.com</a>
 
 
 ## Introduction
 
-A clean code generator for Laravel framework that will save you time! This awesome tool will help you generate resources like views, controllers, routes, migration or request form!
+A very clean code generator for Laravel framework that will save you time! This awesome tool will help you generate resources like views, controllers, routes, migration or request form!
 
 ## Features
 
-* Customizable templates to enable you to change the standard look and feel of your application.
-* Create standard CRUD controllers with standard or form-request validation.
+* Create full resource with a single command.
+* Create standard CRUD controllers with simple or form-request validation.
 * Create model.
 * Create named routes.
 * Create standard CRUD views.
-* Create Form-Request
-* Create layouts for your views.
-* Create languages/Locale files.
-* Json support to define your fields.
+* Very flexible and rich with configurable options.
+* (Beta) Client-side validation.
+* File uploading handling.
+* Auto multiple-response storing in the database.
+* Create form-request.
+* Customizable view’s templates to enable you to change the standard look and feel of your application.
+* Create view's layouts.
+* Change the template at run time.
+* Create code to upload file.
+* Lots of documentation.
 
 
 

composer.json

@@ -2,7 +2,7 @@
     "name": "crestapps/laravel-code-generator",
     "license": "MIT",
     "description": "An awesome code generator for laravel framework.",
-    "version": "v1.0.2",
+    "version": "v1.0.3",
     "keywords": [
         "laravel","crud","crud generator",
         "laravel crud generator","laravel crud builder",

src/CodeGeneratorServiceProvider.php

@@ -25,7 +25,7 @@ public function boot()
         ], 'config');
 
         $this->publishes([
-            __DIR__ . '/templates' => base_path('resources\\codegenerator-templates\\default'),
+            __DIR__ . '/templates/' => base_path('resources\\codegenerator-templates\\default'),
         ], 'templates');
 
         $this->createDirectory(base_path('resources\\codegenerator-files'));
@@ -52,7 +52,8 @@ public function register()
             'CrestApps\CodeGenerator\Commands\CreateRoutesCommand',
             'CrestApps\CodeGenerator\Commands\CreateMigrationCommand',
             'CrestApps\CodeGenerator\Commands\CreateResourceCommand',
-            'CrestApps\CodeGenerator\Commands\CreateViewLayoutCommand'
+            'CrestApps\CodeGenerator\Commands\CreateViewLayoutCommand',
+            'CrestApps\CodeGenerator\Commands\CreateLayoutCommand'
         );
     }
 

src/commands/CreateControllerCommand.php

@@ -86,7 +86,7 @@ protected function buildClass($name)
                     ->replaceFormRequestName($stub, $formRequestName)
                     ->replaceFormRequestFullName($stub, $this->getRequestsNamespace() . $formRequestName)
                     ->replacePaginationNumber($stub, $input->perPage)
-                    ->processModelData($stub, $this->isContainMultipleAnswers($fields))
+                    //->processModelData($stub, $this->isContainMultipleAnswers($fields))
                     ->replaceFileSnippet($stub, $this->getFileReadySnippet($fields))
                     ->replaceFileMethod($stub, $this->getUploadFileMethod($fields))
                     ->replaceClass($stub, $name);
@@ -122,11 +122,12 @@ protected function getRequestsNamespace()
      *
      * @return string
      */
+    /*
     protected function getModelDataConversionMethod()
     {
         return $this->getStubContent('controller-request-parameters', $this->getTemplateName());
     }
-
+    8/
     /**
      * Checks if a giving fields array conatins at least one multiple answers
      *
@@ -135,6 +136,7 @@ protected function getModelDataConversionMethod()
      *
      * @return $this
      */
+    /*
     protected function processModelData(& $stub, $withMultipleAnswers)
     {
         if($withMultipleAnswers)
@@ -149,7 +151,7 @@ protected function processModelData(& $stub, $withMultipleAnswers)
 
         return $this;
     }
-
+    */
     /**
      * Checks if a giving fields array conatins at least one multiple answers
      *
@@ -243,12 +245,14 @@ protected function getCommandInput()
      *
      * @return $this
      */
+    /*
     protected function replaceModelDataMethod(&$stub, $method)
     {
         $stub = str_replace('{{modelDataMethod}}', $method, $stub);
 
         return $this;
     }
+    */
 
     /**
      * Replace the modelData for the given stub.
@@ -258,12 +262,14 @@ protected function replaceModelDataMethod(&$stub, $method)
      *
      * @return $this
      */
+    /*
     protected function replaceModelData(&$stub, $method)
     {
         $stub = str_replace('{{modelData}}', $method, $stub);
 
         return $this;
     }
+    */
 
     /**
      * Replace the modelFullName for the given stub.

src/commands/CreateLayoutCommand.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace CrestApps\CodeGenerator\Commands;
+
+use File;
+use Illuminate\Console\Command;
+use CrestApps\CodeGenerator\Support\Helpers;
+
+use CrestApps\CodeGenerator\Traits\CommonCommand;
+use Exception;
+
+class CreateLayoutCommand extends Command
+{
+
+    use CommonCommand;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'create:layout
+                            {application-name : The name of your application.}
+                            {--layout-filename=app : The layout file name to be created.}
+                            {--layout-directory=layouts : The directory of the layouts.}
+                            {--without-validation : This option will create a layout without client-side validation.}
+                            {--template-name= : The template name to use when generating the code.}
+                            {--force : Override existsing layout.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create layout for the views.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $this->call('create:views-layout',
+                [
+                    'application-name' => $this->argument('application-name'),
+                    '--layout-filename' => $this->option('layout-filename'),
+                    '--layout-directory' => $this->option('layout-directory'),
+                    '--without-validation' => $this->option('without-validation'),
+                    '--template-name' => $this->option('template-name'),
+                    '--force' => $this->option('force')
+                ]
+            );
+
+    }
+
+    /**
+     * Creates a new file.
+     *
+     * @param string $filename
+     * @param string $content
+     * @param bool $force
+     *
+     * @return $this
+     */
+    protected function makeFile($filename, $content, $force)
+    {   
+        if($this->fileExists($filename, $force))
+        {
+            throw new Exception('The destenation file already exists. To override the existing file, pass "--force" option.');
+        }
+
+        if(!File::put($filename, $content))
+        {
+            throw new Exception('Unexpected error occurred while trying to create the file. please try your request again.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Checks if a file exists or not.
+     * if the file exists and $force is set to true the method will return true.
+     *
+     * @param string $filename
+     * @param bool $force
+     *
+     * @return bool
+     */
+    protected function fileExists($filename, $force)
+    {
+        return $force ? false : File::exists($filename);
+    }
+
+    /**
+     * Gets the destenation path
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    protected function getDestenationPath($path)
+    {
+        if(!empty($path) )
+        {
+            $path = Helpers::getPathWithSlash($path);
+        }
+
+        return $this->getViewsPath() . $path;
+    }
+
+    /**
+     * Gets a clean user inputs.
+     *
+     * @return object
+     */
+    protected function getCommandInput()
+    {
+        $appName = trim($this->argument('application-name'));
+        $layoutFileName =  Helpers::postFixWith(trim($this->option('layout-filename')) ?: 'layout-filename', '.blade.php');
+        $layoutDirectory =  trim($this->option('layout-directory'));
+        $withoutValidation = $this->option('without-validation');
+        $force =  $this->option('force');
+
+        return (object) compact('appName','layoutFileName','layoutDirectory','withoutValidation','force');
+    }
+
+    /**
+     * Replace the applicationName fo the given stub.
+     *
+     * @param string $stub
+     * @param string $appName
+     *
+     * @return $this
+     */
+    protected function replaceApplicationName(&$stub, $appName)
+    {
+        $stub = str_replace('{{applicationName}}', $appName, $stub);
+
+        return $this;
+    }
+}

src/commands/CreateMigrationCommand.php

@@ -28,7 +28,8 @@ class CreateMigrationCommand extends Command
                             {--fields= : The fields to create the validation rules from.}
                             {--fields-file= : File name to import fields from.}
                             {--template-name= : The template name to use when generating the code.}
-                            {--force : This option will override the form-request if one already exists.}';
+                            {--without-timestamps : Prevent Eloquent from maintaining both created_at and the updated_at properties.}
+                            {--force : This option will override the migration if one already exists.}';
 
     /**
      * The console command description.
@@ -66,6 +67,11 @@ public function handle()
         $stub = $this->getStubContent('migration', $input->template);
         $fields = $this->getFields($input->fields, 'migration', $input->fieldsFile);
 
+        if(count($fields) == 0)
+        {
+            throw new Exception('You must provide at least one field to generate the migration');
+        }
+
         $properites = $this->getTableProperties($fields, $input);
 
         $this->replaceSchemaUp($stub, $this->getSchemaUpCommand($input, $properites))
@@ -86,6 +92,7 @@ protected function getTableProperties(array $fields, $input)
 
         $this->addEngineName($properties, $input->engine)
              ->addPrimaryField($properties, $this->getPrimaryField($fields))
+             ->addTimestamps($properties, $input->withoutTimestamps)
              ->addFieldProperties($properties, $fields)
              ->addIndexes($properties, $input->indexes)
              ->addForeignConstraints($properties, $input->keys); 
@@ -342,7 +349,7 @@ protected function addFieldProperties(& $properties, array $fields)
 
         foreach($fields as $field)
         {
-            if($field instanceof Field && $field != $primaryField)
+            if($field instanceof Field && $field != $primaryField && !is_null($primaryField))
             {
                 $this->addFieldType($properties, $field)
                      ->addFieldComment($properties, $field)
@@ -711,7 +718,7 @@ protected function addEngineName(& $property, $engineName)
      * @param Field $field
      * @return $this
      */
-    protected function addPrimaryField(& $property, Field $field)
+    protected function addPrimaryField(& $property, Field $field = null)
     {
         if(!is_null($field))
         {
@@ -723,6 +730,24 @@ protected function addPrimaryField(& $property, Field $field)
         return $this;
     }
 
+    /**
+     * Adds 'updated_at' and 'created_at' columns to a giving $propery
+     *
+     * @param string $property
+     * @param Field $field
+     * @return $this
+     */
+    protected function addTimestamps(& $property, $without)
+    {
+        if(!$without)
+        {
+            $property .= sprintf("%s()", $this->getPropertyBase('timestamps'));
+            $this->addFieldPropertyClousure($property);
+        }
+    
+        return $this;
+    }
+
     /**
      * Gets the correct eloquent increment method from the giving type
      *
@@ -770,7 +795,10 @@ protected function getCommandInput()
         $force = $this->option('force');
         $keys = $this->getKeysCollections(trim($this->option('foreign-keys')));
         $template = $this->getTemplateName();
-        return (object) compact('tableName','className','connection','engine','fields','fieldsFile','force','indexes','keys','template');
+        $withoutTimestamps = $this->option('without-timestamps');
+
+        return (object) compact('tableName','className','connection','engine',
+                                'fields','fieldsFile','force','indexes','keys','template','withoutTimestamps');
     }