Merge pull request #9 from prateekkarki/develop

Develop

README.md

@@ -11,19 +11,21 @@ This is a work in progress. Please check back later for complete package.
 ## Features
 Generate and scaffold everything required for a basic laravel project. Starting with controllers, models, requests, views, assets, migrations, seeders, routes. More to be added in future releases.
 
-## Usage
-
-To be updated later.
-
 ## Install
 
 Via Composer
 
 ``` bash
 $ composer require prateekkarki/laragen
-$ php artisan vendor:publish --provider="Prateekkarki\Laragen\LaragenServiceProvider"
 ```
 
+## Usage
+
+To be updated later.
+
+``` bash
+$ php artisan laragen:make
+```
 
 ## Security
 

src/Generators/Seeder.php

@@ -37,17 +37,17 @@ protected function getUsedModels(){
 
         foreach ($foreignModels as $models) {
             foreach($models as $column => $module){
-                $usedModels .= PHP_EOL . "use " . $namespace . $this->moduleToModelName($module) . ";";
+                $namespace = ($module == 'users' && class_exists('App\\User')) ? "App\\" : "App\\Models\\";
+                $class = $namespace . $this->moduleToModelName($module);
+                $usedModels .= PHP_EOL . "use " . $class . ";";
             }
         }
         return $usedModels;
     }
 
     protected function getDataDefinition(){
-        $typeToDefinition = [];
-
         $specialTypesToDefinition = [
-            'title'             => 'title',
+            'title'             => 'realText(50)',
             'firstname'         => 'firstname',
             'lastname'          => 'lastname',
             'name'              => 'name',

src/resources/stubs/Views/_show.stub

@@ -11,16 +11,19 @@
 		</div>
 	@endif
 	<div class="{{modelNameSingularLowercase}}-grid-info">
-		<h3 v-pre >{{ link_to_route('{{moduleName}}.show', ${{modelNameSingularLowercase}}->title, ${{modelNameSingularLowercase}}) }}</h3>
+		<h3>
+			<a href="{{ route('{{moduleName}}.show', ['slug' => ${{modelNameSingularLowercase}}->slug]) }}">
+				{{ ${{modelNameSingularLowercase}}->title }}
+			</a>
+		</h3>
 		<div class="{{modelNameSingularLowercase}}-single">
 			<p class="desc">
-				@if ($stripped{{modelNameSingularLowercase}}>260)
-					{{ substr($stripped{{modelNameSingularLowercase}}, 0, strpos($stripped{{modelNameSingularLowercase}}, ' ', 260))  }}...
-				@else
-					{{ $stripped{{modelNameSingularLowercase}} }}
-				@endif
+				{{ ${{modelNameSingularLowercase}}->content }}
 			</p>
-			{{ link_to_route('{{moduleName}}.show', 'Read More', ${{modelNameSingularLowercase}}) }}
+
+			<a href="{{ route('{{moduleName}}.show', ['slug' => ${{modelNameSingularLowercase}}->slug]) }}">
+				Read More
+			</a>
 		</div>
 	</div>
 	<div class="clear"> </div>

src/resources/stubs/Views/show.stub

@@ -13,12 +13,19 @@
         @endif
 
         <div class="{{modelNameSingularLowercase}}-grid-info">
-            <h3 v-pre >{{ link_to_route('{{moduleName}}.show', ${{modelNameSingularLowercase}}->title, ${{modelNameSingularLowercase}}) }}</h3>
+            <h3>
+                <a href="{{ route('{{moduleName}}.show', ['slug' => ${{modelNameSingularLowercase}}->slug]) }}">
+                    {{ ${{modelNameSingularLowercase}}->title }}
+                </a>
+            </h3>
             <div class="{{modelNameSingularLowercase}}-single">
                 <p class="desc">
                     {{ ${{modelNameSingularLowercase}}->content }}
                 </p>
-                {{ link_to_route('{{moduleName}}.show', 'Read More', ${{modelNameSingularLowercase}}) }}
+
+                <a href="{{ route('{{moduleName}}.show', ['slug' => ${{modelNameSingularLowercase}}->slug]) }}">
+                    Read More
+                </a>
             </div>
         </div>
         <div class="clear"> </div>