=Fixes couple bugs with the views command

Author: malhayek2014

README.md

@@ -1,7 +1,6 @@
 # An awesome code generator for laravel framework - with client-side validation
 
-For full documentation and screenshots please visit <a href="https://crestapps.com/laravel-code-generator/docs/1.1" target="_blank" title="Laravel Code Generator Documentation">CrestApps.com</a>
-
+For full documentation and live demo please visit <a href="https://crestapps.com/laravel-code-generator/docs/1.1" target="_blank" title="Laravel Code Generator Documentation">CrestApps.com</a>
 
 ## Introduction
 
@@ -26,10 +25,8 @@ A clean code generator for Laravel framework that will save you time! This aweso
 * Ability to generate views with and without Laravel-Collective.
 * Lots of documentation.
 
-
 ## Installation
 
-
  To download this package into your laravel project, use the command-line to execute the following command 
 ```
 composer require crestapps/laravel-code-generator --dev
@@ -71,7 +68,9 @@ php artisan vendor:publish --provider="CrestApps\CodeGenerator\CodeGeneratorServ
 * php artisan create:language [language-file-name]
 * php artisan create:fields-file [table-name]
 
-> Full documentation available at [CrestApps.com](https://crestapps.com/laravel-code-generator/docs/1.1 "Laravel Code Generator Documentation"). 
+> Full documentation available at [CrestApps.com](https://www.crestapps.com/laravel-code-generator/docs/1.1 "Laravel Code Generator Documentation"). 
+
+> Live demo is available at [CrestApps.com](https://www.crestapps.com/laravel-code-generator/demos/1.1 "Laravel Code Generator Live Demo"). 
 
 
 ## License

src/Commands/CreateControllerCommand.php

@@ -139,7 +139,7 @@ protected function isContainMultipleAnswers(array $fields)
     /**
      * Calls the create:form-request command
      *
-     * @param  CrestApps\CodeGenerator\Support\ViewInput $input
+     * @param  CrestApps\CodeGenerator\Models\ViewInput $input
      *
      * @return $this
      */

src/Commands/CreateCreateViewCommand.php

@@ -52,13 +52,15 @@ protected function handleCreateView()
         $fields = $this->getFields($input->fields, $input->languageFileName, $input->fieldsFile);
         $destenationFile = $this->getDestinationViewFullname($input->viewsDirectory, $input->prefix, 'create');
 
-        $this->handleNewFilePolicy($destenationFile, $input->force)
-             ->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
-             ->createMissingViews($input)
-             ->replaceCommonTemplates($stub, $input)
-             ->replaceFileUpload($stub, $fields)
-             ->createViewFile($stub, $destenationFile)
-             ->info('A "create view" was created successfully.');
+        if($this->canCreateView($destenationFile, $input->force))
+        {
+            $this->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
+                 ->createMissingViews($input)
+                 ->replaceCommonTemplates($stub, $input)
+                 ->replaceFileUpload($stub, $fields)
+                 ->createViewFile($stub, $destenationFile)
+                 ->info('Create view was crafted successfully.');
+        }
 
     }
 

src/Commands/CreateEditViewCommand.php

@@ -52,14 +52,16 @@ protected function handleCreateView()
         $fields = $this->getFields($input->fields, $input->languageFileName, $input->fieldsFile);
         $destenationFile = $this->getDestinationViewFullname($input->viewsDirectory, $input->prefix, 'edit');
 
-        $this->handleNewFilePolicy($destenationFile, $input->force, $fields)
-             ->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
-             ->createMissingViews($input)
-             ->replaceCommonTemplates($stub, $input)
-             ->replaceFileUpload($stub, $fields)
-             ->replacePrimaryKey($stub, $this->getPrimaryKeyName($fields))
-             ->createViewFile($stub, $destenationFile)
-             ->info('An "edit-view" view was created successfully.');
+        if($this->canCreateView($destenationFile, $input->force, $fields))
+        {
+            $this->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
+                 ->createMissingViews($input)
+                 ->replaceCommonTemplates($stub, $input)
+                 ->replaceFileUpload($stub, $fields)
+                 ->replacePrimaryKey($stub, $this->getPrimaryKeyName($fields))
+                 ->createViewFile($stub, $destenationFile)
+                 ->info('Edit view view was crafted successfully.');
+        }
     }
 
 

src/Commands/CreateFieldsFileCommand.php

@@ -3,7 +3,7 @@
 namespace CrestApps\CodeGenerator\Commands;
 
 use Illuminate\Console\Command;
-use CrestApps\CodeGenerator\Support\Field;
+use CrestApps\CodeGenerator\Models\Field;
 use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\traits\CommonCommand;
 use DB;

src/Commands/CreateFormViewCommand.php

@@ -55,12 +55,14 @@ protected function handleCreateView()
         $destenationFile = $this->getDestinationViewFullname($input->viewsDirectory, $input->prefix, 'form');
         $htmlCreator = $this->getHtmlGenerator($fields, $input->modelName ,$this->getTemplateName());
 
-        $this->handleNewFilePolicy($destenationFile, $input->force)
-             ->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
-             ->replaceCommonTemplates($stub, $input)
-             ->replaceFields($stub, $htmlCreator->getHtmlFields())
-             ->createViewFile($stub, $destenationFile)
-             ->info('Form view was created successfully.');
+        if($this->canCreateView($destenationFile, $input->force))
+        {
+            $this->createLanguageFile($input->languageFileName, $input->fields, $input->fieldsFile)
+                 ->replaceCommonTemplates($stub, $input)
+                 ->replaceFields($stub, $htmlCreator->getHtmlFields())
+                 ->createViewFile($stub, $destenationFile)
+                 ->info('Form view was crafted successfully.');
+        }
     }
 
     /**

src/Commands/CreateIndexViewCommand.php

@@ -55,13 +55,15 @@ protected function handleCreateView()
         $destenationFile = $this->getDestinationViewFullname($input->viewsDirectory, $input->prefix, 'index');
         $htmlCreator = $this->getHtmlGenerator($fields, $input->modelName ,$this->getTemplateName());
 
-        $this->handleNewFilePolicy($destenationFile, $input->force, $fields)
-             ->replaceCommonTemplates($stub, $input)
-             ->replacePrimaryKey($stub, $this->getPrimaryKeyName($fields))
-             ->replaceHeaderCells($stub, $htmlCreator->getIndexHeaderCells())
-             ->replaceBodyCells($stub, $htmlCreator->getIndexBodyCells())
-             ->createViewFile($stub, $destenationFile)
-             ->info('Index view was created successfully.');
+        if($this->canCreateView($destenationFile, $input->force, $fields))
+        {
+            $this->replaceCommonTemplates($stub, $input)
+                 ->replacePrimaryKey($stub, $this->getPrimaryKeyName($fields))
+                 ->replaceHeaderCells($stub, $htmlCreator->getIndexHeaderCells())
+                 ->replaceBodyCells($stub, $htmlCreator->getIndexBodyCells())
+                 ->createViewFile($stub, $destenationFile)
+                 ->info('Index view was crafted successfully.');
+        }
     }
 
     /**

src/Commands/CreateLanguageCommand.php

@@ -6,7 +6,7 @@
 use Illuminate\Console\Command;
 use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
-use CrestApps\CodeGenerator\Support\Label;
+use CrestApps\CodeGenerator\Models\Label;
 use CrestApps\CodeGenerator\Support\CrestAppsTranslator;
 
 class CreateLanguageCommand extends Command

src/Commands/CreateMigrationCommand.php

@@ -6,7 +6,7 @@
 use Exception;
 use Illuminate\Console\Command;
 use CrestApps\CodeGenerator\Support\Helpers;
-use CrestApps\CodeGenerator\Support\Field;
+use CrestApps\CodeGenerator\Models\Field;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
 
 class CreateMigrationCommand extends Command
@@ -395,7 +395,7 @@ protected function addFieldPropertyClousure(& $property)
      * Adds a 'field type' to the property
      *
      * @param string $property
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return $this
      */
@@ -425,7 +425,7 @@ protected function getTypeToMethodMap()
     /**
      * Constructs the second parameter to the type method
      *
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return string
      */
@@ -444,7 +444,7 @@ protected function getMethodParamerters(Field $field)
     /**
      * Constructs the second parameter to the enum type method
      *
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return string
      */
@@ -596,7 +596,7 @@ protected function replaceConnectionName(&$stub, $name)
      * Adds the field's "default" value to the giving property.
      *
      * @param string $property
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return $this
      */
@@ -614,7 +614,7 @@ protected function addFieldDefaultValue(& $property, Field $field)
      * Adds the field's "unsigned" value to the giving property.
      *
      * @param string $property
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return $this
      */
@@ -632,7 +632,7 @@ protected function addFieldUnsigned(& $property, Field $field)
      * Adds the field's "unique" value to the giving property.
      *
      * @param string $property
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return $this
      */
@@ -650,7 +650,7 @@ protected function addFieldUnique(& $property, Field $field)
      * Adds the field's "index" value to the giving property.
      *
      * @param string $property
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return $this
      */
@@ -668,7 +668,7 @@ protected function addFieldIndex(& $property, Field $field)
      * Adds the field's "nullable" value to the giving property.
      *
      * @param string $property
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return $this
      */
@@ -686,7 +686,7 @@ protected function addFieldNullable(& $property, Field $field)
      * Adds the field's "comment" value to the giving property.
      *
      * @param string $property
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return $this
      */
@@ -723,7 +723,7 @@ protected function addEngineName(& $property, $name)
      * Adds the table's "primary column" to the giving property.
      *
      * @param string $property
-     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param CrestApps\CodeGenerator\Models\Field $field
      *
      * @return $this
      */
@@ -823,7 +823,7 @@ protected function makeFileName($name)
     {
         $filename = sprintf('%s_create_%s_table.php', date('Y_m_d_His'), strtolower($name));
 
-        return Helpers::postFixWith($name, '.php');
+        return Helpers::postFixWith($filename, '.php');
     }
 
 
@@ -887,15 +887,16 @@ protected function makeFile($fileFullname, $stub, $force = false)
     {
         if(File::exists($fileFullname) && !$force)
         {
-            throw new Exception('There is a migration exists with the same name! To override existing file try passing "--force" command');
+            $this->error('The provided migration\'s name already exists!');
+            return $this;
         }
 
         if( ! File::put($fileFullname, $stub))
         {
             throw new Exception('The migration failed to create');
         }
 
-        $this->info('New migrations have been created');
+        $this->info('Migrations have been created');
 
         return $this;
     }

src/Commands/CreateModelCommand.php

@@ -5,7 +5,7 @@
 use Illuminate\Console\GeneratorCommand;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
 use CrestApps\CodeGenerator\Support\Helpers;
-use CrestApps\CodeGenerator\Support\Field;
+use CrestApps\CodeGenerator\Models\Field;
 
 class CreateModelCommand extends GeneratorCommand
 {
@@ -284,7 +284,7 @@ protected function getMutators(array $fields = null)
     /**
      * Gets accessor for a giving field.
      *
-     * @param  CrestApps\CodeGenerator\Support\Field  $field
+     * @param  CrestApps\CodeGenerator\Models\Field  $field
      *
      * @return string
      */
@@ -301,7 +301,7 @@ protected function getAccessor(Field $field)
     /**
      * Gets mutator for a giving field.
      *
-     * @param  CrestApps\CodeGenerator\Support\Field  $field
+     * @param  CrestApps\CodeGenerator\Models\Field  $field
      *
      * @return string
      */