added softdeletes and view changes

awais-vteams · Dec 18, 2018 · c925553 · c925553
1 parent 6bb2fb9
commit c925553
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,15 @@
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+/.idea
+/.vscode
+/nbproject
+/.vagrant
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+.env
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -8,28 +8,21 @@
             "email": "awais.sds@nxvt.com"
         }
     ],
-    "keywords": [
-        "laravel",
-        "crud",
-        "crud generator",
-        "laravel crud generator",
-        "laravel package"
-    ],
-    "minimum-stability": "dev",
+    "keywords": ["laravel", "crud", "crud generator", "laravel crud generator", "laravel package"],
     "require": {
         "php": "^7.1.3",
-        "laravel/framework": "5.7.*"
-    },
-    "autoload": {
-        "psr-4": {
-            "Ibex\\CrudGenerator\\": "src/"
-        }
+        "laravel/framework": ">=5.6.*"
     },
     "extra": {
         "laravel": {
             "providers": [
                 "Ibex\\CrudGenerator\\CrudServiceProvider"
             ]
+        },
+        "branch-alias": {
+            "dev-master": "0.0.1-dev"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/src/Commands/GeneratorCommand.php b/src/Commands/GeneratorCommand.php
@@ -281,13 +281,19 @@ protected function modelReplacements()
     {
         $properties = '*';
         $rulesArray = [];
+        $softDeletesNamespace = $softDeletes = '';
 
         foreach ($this->getColumns() as $value) {
             $properties .= "\n * @property $$value->Field";
 
             if ($value->Null == "NO") {
                 $rulesArray[$value->Field] = 'required';
             }
+
+            if($value->Field == 'deleted_at') {
+                $softDeletesNamespace = "use Illuminate\Database\Eloquent\SoftDeletes;\n";
+                $softDeletes = "use SoftDeletes;\n";
+            }
         }
 
         $rules = function () use ($rulesArray) {
@@ -326,6 +332,8 @@ protected function modelReplacements()
             '{{rules}}' => $rules(),
             '{{relations}}' => $relations,
             '{{properties}}' => $properties,
+            '{{softDeletesNamespace}}' => $softDeletesNamespace,
+            '{{softDeletes}}' => $softDeletes,
         ];
     }
 

diff --git a/src/stubs/Model.stub b/src/stubs/Model.stub
@@ -3,14 +3,15 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
-
+{{softDeletesNamespace}}
 /**
  * Class {{modelName}}
  {{properties}}
  * @package App
  */
 class {{modelName}} extends Model
 {
+    {{softDeletes}}
     static $rules = [{{rules}}
     ];
 

diff --git a/src/stubs/views/create.stub b/src/stubs/views/create.stub
@@ -13,13 +13,13 @@
 
                 <div class="card card-default">
                     <div class="card-header">
-                        <h4 class="card-title">Create {{modelName}}</h4>
+                        <span class="card-title">Create {{modelName}}</span>
                     </div>
                     <div class="card-body">
                         <form method="POST" action="{{ route('{{modelNamePluralLowerCase}}.store') }}"  role="form" enctype="multipart/form-data">
                             @csrf
 
-                            @include('{{modelNameLowerCase}}.form', [${{modelNameLowerCase}}])
+                            @include('{{modelNameLowerCase}}.form')
 
                         </form>
                     </div>

diff --git a/src/stubs/views/edit.stub b/src/stubs/views/edit.stub
@@ -13,14 +13,14 @@
 
                 <div class="card card-default">
                     <div class="card-header">
-                        <h4 class="card-title">Update {{modelName}}</h4>
+                        <span class="card-title">Update {{modelName}}</span>
                     </div>
                     <div class="card-body">
                         <form method="POST" action="{{ route('{{modelNamePluralLowerCase}}.update', ${{modelNameLowerCase}}->id) }}"  role="form" enctype="multipart/form-data">
                             {{ method_field('PATCH') }}
                             @csrf
 
-                            @include('{{modelNameLowerCase}}.form',  [${{modelNameLowerCase}}])
+                            @include('{{modelNameLowerCase}}.form')
 
                         </form>
                     </div>

diff --git a/src/stubs/views/form-field.stub b/src/stubs/views/form-field.stub
@@ -1,5 +1,5 @@
-        <div class="form-group  {{ $errors->has('{{column}}') ? "has-error" : ""}}">
+        <div class="form-group">
             {{ Form::label('{{column}}') }}
-            {{ Form::text('{{column}}', ${{modelNameLowerCase}}->{{column}}, ['class' => 'form-control', 'placeholder' => '{{title}}']) }}
-            {!! $errors->first('{{column}}', '<p class="help-block">:message</p>') !!}
+            {{ Form::text('{{column}}', ${{modelNameLowerCase}}->{{column}}, ['class' => 'form-control' . ($errors->has('{{column}}') ? ' is-invalid' : ''), 'placeholder' => '{{title}}']) }}
+            {!! $errors->first('{{column}}', '<div class="invalid-feedback">:message</p>') !!}
         </div>
diff --git a/src/stubs/views/index.stub b/src/stubs/views/index.stub
@@ -17,7 +17,7 @@
                             </span>
 
                              <div class="float-right">
-                                <a href="{{ route('{{modelNamePluralLowerCase}}.create') }}" class="btn back-btn btn-light btn-sm float-right"  data-placement="left">
+                                <a href="{{ route('{{modelNamePluralLowerCase}}.create') }}" class="btn btn-primary btn-sm float-right"  data-placement="left">
                                   {{ __('Create New') }}
                                 </a>
                               </div>

diff --git a/src/stubs/views/show.stub b/src/stubs/views/show.stub
@@ -5,18 +5,24 @@
 @endsection
 
 @section('content')
-    <div class="card">
-        <div class="card-header">
-            <div class="pull-left">
-                <h4 class="card-title">Show {{modelName}}</h4>
-            </div>
-            <div class="pull-right">
-                <a class="btn btn-primary" href="{{ route('{{modelNamePluralLowerCase}}.index') }}"> Back</a>
-            </div>
-        </div>
+    <section class="content container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <div class="float-left">
+                            <span class="card-title">Show {{modelName}}</span>
+                        </div>
+                        <div class="float-right">
+                            <a class="btn btn-primary" href="{{ route('{{modelNamePluralLowerCase}}.index') }}"> Back</a>
+                        </div>
+                    </div>
 
-        <div class="card-body">
-            {{viewRows}}
+                    <div class="card-body">
+                        {{viewRows}}
+                    </div>
+                </div>
+            </div>
         </div>
-    </div>
+    </section>
 @endsection
diff --git a/src/stubs/views/view-field.stub b/src/stubs/views/view-field.stub
@@ -1,4 +1,4 @@
-            <div class="form-group">
-                <strong>{{title}}:</strong>
-                {{ ${{modelNameLowerCase}}->{{column}} }}
-            </div>
+                        <div class="form-group">
+                            <strong>{{title}}:</strong>
+                            {{ ${{modelNameLowerCase}}->{{column}} }}
+                        </div>