Merge pull request #10 from prateekkarki/develop

Develop
prateekkarki · Feb 14, 2019 · 2061ae3 · 2061ae3
2 parents e2e0f62 + adc2067
commit 2061ae3
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 10 deletions.
diff --git a/src/Generators/Model.php b/src/Generators/Model.php
@@ -33,7 +33,7 @@ protected function getForeignMethods()
                 $foreignMethods .= $this->buildTemplate('Model-parent', [
                     '{{parent}}'      => str_singular($parent),
                     '{{columnName}}'  => str_singular($column),
-                    '{{parentModel}}' => ucfirst(camel_case(str_singular($parent)))
+                    '{{parentModel}}' => ($parent == 'users' && class_exists('\\App\\User')) ? "\\App\\User" : ucfirst(camel_case(str_singular($parent)))
                 ]);
             }
         }

diff --git a/src/Generators/View.php b/src/Generators/View.php
@@ -7,7 +7,7 @@ class View extends BaseGenerator implements GeneratorInterface
 {
     public function generate()
     {
-        $viewsToBeGenerated = ['index', '_list', '_show', '_empty']; // To be generated dynamically
+        $viewsToBeGenerated = ['index', 'show', '_list', '_show', '_empty']; // To be generated dynamically
 
         $generatedFiles = [];
         foreach ($viewsToBeGenerated as $view) {
@@ -19,8 +19,17 @@ public function generate()
 
             $fullFilePath = $this->getPath("resources/views/" . $this->module->getModuleName()) . "/{$view}.blade.php";
             file_put_contents($fullFilePath, $viewTemplate);
-            $generatedFiles[] =  $fullFilePath;         
+            $generatedFiles[] =  $fullFilePath;
         }
+
+        $layoutPath = $this->getPath("resources/views/laragen/layouts/") . "app.blade.php";
+        if(!file_exists($layoutPath)){
+
+            $viewTemplate = $this->buildTemplate('Views/layouts/app', []);
+            file_put_contents($layoutPath, $viewTemplate);
+            $generatedFiles[] =  $layoutPath;
+        }
+
         return $generatedFiles;
     }
 }
diff --git a/src/resources/stubs/Views/_show.stub b/src/resources/stubs/Views/_show.stub
@@ -12,7 +12,7 @@
 	@endif
 	<div class="{{modelNameSingularLowercase}}-grid-info">
 		<h3>
-			<a href="{{ route('{{moduleName}}.show', ['slug' => ${{modelNameSingularLowercase}}->slug]) }}">
+			<a href="{{ route('{{moduleName}}.show', ${{modelNameSingularLowercase}}) }}">
 				{{ ${{modelNameSingularLowercase}}->title }}
 			</a>
 		</h3>
@@ -21,7 +21,7 @@
 				{{ ${{modelNameSingularLowercase}}->content }}
 			</p>
 
-			<a href="{{ route('{{moduleName}}.show', ['slug' => ${{modelNameSingularLowercase}}->slug]) }}">
+			<a href="{{ route('{{moduleName}}.show', ${{modelNameSingularLowercase}}) }}">
 				Read More
 			</a>
 		</div>

diff --git a/src/resources/stubs/Views/index.stub b/src/resources/stubs/Views/index.stub
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('laragen.layouts.app')
 
 @section('content')
 

diff --git a/src/resources/stubs/Views/layouts/app.stub b/src/resources/stubs/Views/layouts/app.stub
@@ -0,0 +1,39 @@
+<!doctype html>
+<html lang="{{ app()->getLocale() }}">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- CSRF Token -->
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    @auth
+        <meta name="api-token" content="{{ auth()->user()->api_token }}">
+    @endauth
+
+    <title>{{ config('app.name', 'Laravel') }}</title>
+
+
+    <!-- Styles -->
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css" media="all" />
+</head>
+<body>
+    <div id="app">
+        <div class="wrap">
+            <div class="header"> 
+                <div class="logo">
+					<a href="{{ url('/') }}">
+						{{ config('app.name', 'Laravel') }}
+					</a>
+                </div>
+            </div>
+        </div>
+
+        @yield('content')
+
+    </div>
+
+    @stack('inline-scripts')
+</body>
+</html>
diff --git a/src/resources/stubs/Views/show.stub b/src/resources/stubs/Views/show.stub
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('laragen.layouts.app')
 
 @section('content')
 
@@ -14,7 +14,7 @@
 
         <div class="{{modelNameSingularLowercase}}-grid-info">
             <h3>
-                <a href="{{ route('{{moduleName}}.show', ['slug' => ${{modelNameSingularLowercase}}->slug]) }}">
+                <a href="{{ route('{{moduleName}}.show', ${{modelNameSingularLowercase}}) }}">
                     {{ ${{modelNameSingularLowercase}}->title }}
                 </a>
             </h3>
@@ -23,8 +23,8 @@
                     {{ ${{modelNameSingularLowercase}}->content }}
                 </p>
 
-                <a href="{{ route('{{moduleName}}.show', ['slug' => ${{modelNameSingularLowercase}}->slug]) }}">
-                    Read More
+                <a href="{{ route('{{moduleName}}.index') }}">
+                    Back to {{moduleName}}
                 </a>
             </div>
         </div>