prateekkarki / laragen

src/Generators/Backend/Observer.php

Spacing +5 added lines, -5 removed lines

@@ -9,9 +9,9 @@ 
     protected static $initializeFlag = 0;
     public function generate()
     {   
-        $generatedFiles=[]; 
+        $generatedFiles = []; 
         
-        if($this::$initializeFlag == 0){
+        if ($this::$initializeFlag == 0) {
             $laragen = app('laragen');
             $modules = $laragen->getModules();
             $models = [];
@@ -22,9 +22,9 @@ 
             $modelsCode = '';
             $usedClasses = '';
             foreach ($models as $model) {
-                $modelsCode .= $model ."::observe(". $model ."Observer::class);" . PHP_EOL. $this->getTabs(2);
-                $usedClasses .= "use App\Observers\\". $model . "Observer;" . PHP_EOL;
-                $usedClasses .= "use App\Models\\". $model . ";" . PHP_EOL;
+                $modelsCode .= $model."::observe(".$model."Observer::class);".PHP_EOL.$this->getTabs(2);
+                $usedClasses .= "use App\Observers\\".$model."Observer;".PHP_EOL;
+                $usedClasses .= "use App\Models\\".$model.";".PHP_EOL;
             }
 
             $observerProviderTemplate = $this->buildTemplate('common/LaragenObserverServiceProvider', [

src/Generators/Backend/View.php

Indentation +2 added lines, -2 removed lines

@@ -43,14 +43,14 @@
         $this->insertIntoFile(

             $mainMenuFile,

             '{{-- Main Menu --}}',

-			"\n".'<li class="nav-item dropdown">

+            "\n".'<li class="nav-item dropdown">

                     <a href="#" class="nav-link has-dropdown" data-toggle="dropdown"><i class="fas fa-columns"></i> <span> '.str_plural($this->module->getModelName()).' </span></a>

                     <ul class="dropdown-menu">

                         <li><a class="nav-link" href="{{ route("backend.'.$this->module->getModuleName().'.create") }}"> Add new '.str_plural($this->module->getModelName()).'</a></li>

                         <li><a class="nav-link" href="{{ route("backend.'.$this->module->getModuleName().'.index") }}">All '.str_plural($this->module->getModelName()).'</a></li>

                     </ul>

                 </li>'

-		);

+        );

         return $this->generatedFiles;

     }

 

Spacing +15 added lines, -16 removed lines

@@ -61,10 +61,9 @@ 
         foreach ($columns as $column) {

             $headings .= 

                 $simple ? 

-                "<th>" . $column->getDisplay() . "</th>" : 

-                "<th> 

-                    <a href=\"{{ route('backend." . $this->module->getModuleName() . ".index') }}?sort=" . $column->getColumn() . "&sort_dir={{ request()->input('sort_dir')=='asc' ? 'desc' : 'asc' }}\">" . $column->getDisplay() . " 

-                        @if(request()->input('sort')=='" . $column->getColumn() . "')

+                "<th>".$column->getDisplay()."</th>" : "<th> 

+                    <a href=\"{{ route('backend." . $this->module->getModuleName().".index') }}?sort=".$column->getColumn()."&sort_dir={{ request()->input('sort_dir')=='asc' ? 'desc' : 'asc' }}\">".$column->getDisplay()." 

+                        @if(request()->input('sort')=='" . $column->getColumn()."')

                             {!! request()->input('sort_dir')=='asc' ? '<i class=\"fas fa-arrow-down\"></i>' : '<i class=\"fas fa-arrow-up\"></i>' !!}

                         @endif

                     </a>

@@ -78,11 +77,11 @@ 
         $tabs = $this->module->getTabTitles();

         $data = "";

         foreach ($tabs as $key => $tab) {

-            $activeClass = ($key==0) ? 'active' : '';

+            $activeClass = ($key == 0) ? 'active' : '';

             $data .= '<li class="nav-item">'.PHP_EOL.$this->getTabs(7);

-            $data .= '<a class="nav-link '. $activeClass .'" id="base-tab'.$key.'" data-toggle="tab" aria-controls="tab'.$key.'" href="#tab'.$key.'" aria-expanded="true">'.$tab. '</a>' . PHP_EOL . $this->getTabs(6);

+            $data .= '<a class="nav-link '.$activeClass.'" id="base-tab'.$key.'" data-toggle="tab" aria-controls="tab'.$key.'" href="#tab'.$key.'" aria-expanded="true">'.$tab.'</a>'.PHP_EOL.$this->getTabs(6);

             $data .= '</li>';

-            $data .= ($tab!==last($tabs)) ? PHP_EOL . $this->getTabs(6) : '';

+            $data .= ($tab !== last($tabs)) ? PHP_EOL . $this->getTabs(6) : '';

         }

         return $data;

     }

@@ -92,7 +91,7 @@ 
         $columns = $module->getDisplayColumns();

         $data = "";

         foreach ($columns as $column) {

-            $data .= "<td> {{ $" . $model . "->" . $column->getColumn() . " }}</td>" . PHP_EOL;

+            $data .= "<td> {{ $".$model."->".$column->getColumn()." }}</td>".PHP_EOL;

         }

         return $data;

     }

@@ -104,7 +103,7 @@ 
             $relatedModule = app('laragen')->getModule(Str::plural(strtolower(Str::snake($type->getRelatedModel()))));

             $displayColumn = $relatedModule->getDisplayColumns()[0]->getColumn();

         }

-        $formElement = $this->buildTemplate('backend/views/formelements/' . $page . '/' . $type->getFormType(), [

+        $formElement = $this->buildTemplate('backend/views/formelements/'.$page.'/'.$type->getFormType(), [

             '{{key}}'                       => $type->getColumnKey(),

             '{{column}}'                    => $type->getColumn(),

             '{{label}}'                     => $type->getDisplay(),

@@ -115,7 +114,7 @@ 
             '{{modelNameLowercase}}'        => $this->module->getModelNameLowercase(),

             '{{moduleName}}'                => $this->module->getModuleName(),

         ]);

-        return  "@if(auth()->user()->can('view_".$this->module->getModuleName()."_".$type->getColumnKey()."') || auth()->user()->can('edit_".$this->module->getModuleName()."_".$type->getColumnKey()."') )" . PHP_EOL . $formElement . PHP_EOL . "@endif" . PHP_EOL . PHP_EOL;

+        return  "@if(auth()->user()->can('view_".$this->module->getModuleName()."_".$type->getColumnKey()."') || auth()->user()->can('edit_".$this->module->getModuleName()."_".$type->getColumnKey()."') )".PHP_EOL.$formElement.PHP_EOL."@endif".PHP_EOL.PHP_EOL;

     }

 

 

@@ -124,7 +123,7 @@ 
         $displayColumn = $type->getRelatedModule() == 'users' ? 'name' : 'title';

         $relatedModule = app('laragen')->getModule($this->module->getModelNameLowercase()."_".$type->getColumn());

         $displayColumn = $relatedModule->getDisplayColumns()[0]->getColumn();

-        $formElement = $this->buildTemplate('backend/views/formelements/' . $page . '/' . $type->getFormType(), [

+        $formElement = $this->buildTemplate('backend/views/formelements/'.$page.'/'.$type->getFormType(), [

             '{{key}}'                       => $type->getColumn(),

             '{{label}}'                     => $type->getDisplay(),

             '{{relatedModule}}'             => $type->getRelatedModule(),

@@ -134,7 +133,7 @@ 
             '{{relatedModelDisplayColumn}}' => $displayColumn,

             '{{modelNameLowercase}}'        => $this->module->getModelNameLowercase(),

             '{{modulename}}'                => $this->module->getModuleName(),

-        ]) . PHP_EOL;

+        ]).PHP_EOL;

         return $formElement;

     }

 

@@ -143,7 +142,7 @@ 
         if (!in_array($page, ['create', 'edit'])) return "";

         $tabs = $this->module->getTabs();

         $tabTitles = $this->module->getTabTitles();

-        $viewTemplate ='<div class="tab-content px-1 pt-1">'.PHP_EOL;

+        $viewTemplate = '<div class="tab-content px-1 pt-1">'.PHP_EOL;

         foreach ($tabs as $key => $tab) {

             $activeClass = ($key == 0) ? 'active' : '';

             $viewTemplate .= $this->getTabs(6).'<div role="tabpanel" class="tab-pane '.$activeClass.'" id="tab'.$key.'" aria-expanded="true" aria-labelledby="base-tab'.$key.'">'.PHP_EOL;

@@ -152,17 +151,17 @@ 
 

 

             $typeTemplate = "";

-            if(is_string($tab)&&!in_array($tab, ['hasFile', 'hasImage', 'Seo'])){

+            if (is_string($tab) && !in_array($tab, ['hasFile', 'hasImage', 'Seo'])) {

                 $types = $this->module->getColumnsData();

                 $type = $types[Str::plural(strtolower(Str::snake($tab)))];

                 $typeTemplate .= $this->buildMultiple($page, $type);

-            }else{

+            } else {

                 foreach ($this->module->getFilteredColumns($tab) as $type) {

                     $typeTemplate .= $this->buildFormElement($page, $type);

                 }

             }

             

-            $viewTemplate .= $this->getTabs(9)."@include('backend.".$this->module->getModuleName().".".$page.".form_parts.". strtolower(Str::title($tabTitles[$key])) ."')".PHP_EOL;

+            $viewTemplate .= $this->getTabs(9)."@include('backend.".$this->module->getModuleName().".".$page.".form_parts.".strtolower(Str::title($tabTitles[$key]))."')".PHP_EOL;

             

             $fullFilePath = $this->getPath("resources/views/backend/".$this->module->getModuleName()."/".$page."/form_parts/").strtolower(Str::title($tabTitles[$key])).".blade.php";

             file_put_contents($fullFilePath, $typeTemplate);

Braces +4 added lines, -2 removed lines

@@ -140,7 +140,9 @@ 
 

     public function tabContents($page = "create")

     {

-        if (!in_array($page, ['create', 'edit'])) return "";

+        if (!in_array($page, ['create', 'edit'])) {
+            return "";
+        }
         $tabs = $this->module->getTabs();

         $tabTitles = $this->module->getTabTitles();

         $viewTemplate ='<div class="tab-content px-1 pt-1">'.PHP_EOL;

@@ -156,7 +158,7 @@ 
                 $types = $this->module->getColumnsData();

                 $type = $types[Str::plural(strtolower(Str::snake($tab)))];

                 $typeTemplate .= $this->buildMultiple($page, $type);

-            }else{

+            } else{

                 foreach ($this->module->getFilteredColumns($tab) as $type) {

                     $typeTemplate .= $this->buildFormElement($page, $type);

                 }

src/Generators/Backend/Request.php

Indentation +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
         $fullFilePath = $this->getPath("app/Http/Requests/Backend/").$this->module->getModelName()."Request".".php";

         file_put_contents($fullFilePath, $controllerTemplate);

         return $fullFilePath;

-	}

+    }

 	

     protected function getRules()

     {

@@ -30,5 +30,5 @@ 
         }

         $delimiter = ",\n{$this->getTabs(3)}";

         return (implode($delimiter, $validation));

-	}

+    }

 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
     protected function getRules()

     {

         $validation = [];

-        foreach($this->module->getColumns(true) as $column){

-            $validation[] =  "'{$column->getColumnKey()}'" . " => " .  $column->getValidationLine();

+        foreach ($this->module->getColumns(true) as $column) {

+            $validation[] = "'{$column->getColumnKey()}'"." => ".$column->getValidationLine();

         }

         $delimiter = ",\n{$this->getTabs(3)}";

         return (implode($delimiter, $validation));