Merge pull request #166 from Laravel-Backpack/fixes-page-command

Added route and layout options to PageBackpackCommand

Author: tabacitu

src/Console/Commands/PageBackpackCommand.php

@@ -23,7 +23,8 @@ class PageBackpackCommand extends GeneratorCommand
      */
     protected $signature = 'backpack:page {name}
         {--view-path=admin : Path for the view, after resources/views/}
-        {--layout= : Base layout for the page}';
+        {--route= : Path for the route, after admin/}
+        {--layout=blank : Base layout for the page}';
 
     /**
      * The console command description.
@@ -53,16 +54,20 @@ public function handle()
             ->replace('.', '/')
             ->start('/')
             ->prepend($this->option('view-path'))
+            ->replace('\\', '/')
             ->replace('//', '/')
             ->trim('/');
 
-        $name = $input->afterLast('/')->replace('-', '_')->snake();
-        $path = $input->beforeLast('/');
-        $filePath = "$path/$name";
-        $fullpath = $this->getPath($filePath);
-        $layout = $this->option('layout');
+        $name = $input->afterLast('/');
+        $nameSnake = $name->snake();
+        $nameTitle = $nameSnake->replace('_', ' ')->replace('-', ' ')->title();
+        $path = $input->beforeLast($name)->trim('/\\');
+        $filePath = Str::of("$path/$name")->trim('/\\');
+        $fullPath = $this->getPath($filePath);
+        $layout = Str::of($this->option('layout'))->replace('\\', '/')->replace('/', '.');
+        $route = Str::of($this->option('route') ?? $nameSnake)->replace('\\', '/')->trim('/');
 
-        $this->infoBlock("Creating {$name->replace('_', ' ')->title()} page");
+        $this->infoBlock("Creating {$nameTitle} page");
 
         $this->progressBlock("Creating view <fg=blue>resources/views/${filePath}.blade.php</>");
 
@@ -73,40 +78,37 @@ public function handle()
             return false;
         }
 
-        $this->makeDirectory($fullpath);
+        $this->makeDirectory($fullPath);
 
         // create page view
         $stub = $this->buildClass($filePath);
         $stub = str_replace('layout', $layout, $stub);
-        $stub = str_replace('Dummy Name', $name->replace('_', ' ')->title(), $stub);
-        $this->files->put($fullpath, $stub);
+        $stub = str_replace('Dummy Name', $nameTitle, $stub);
+        $this->files->put($fullPath, $stub);
 
         $this->closeProgressBlock();
 
-        // Clean up name
-        $name = $name->replace('_', ' ')->replace('-', ' ')->title();
-
         // create controller
         $this->call('backpack:page-controller', [
-            'name' => $name,
+            'name' => $nameTitle,
             '--view-path' => $path,
         ]);
 
         // create route
         $this->call('backpack:add-custom-route', [
-            'code' => "Route::get('{$name->kebab()}', '{$name->studly()}Controller@index')->name('page.{$name->kebab()}.index');",
+            'code' => "Route::get('{$route}', '{$nameTitle->studly()}Controller@index')->name('page.{$nameSnake}.index');",
         ]);
 
         // create the sidebar item
         $this->call('backpack:add-sidebar-content', [
-            'code' => "<li class=\"nav-item\"><a class=\"nav-link\" href=\"{{ backpack_url('{$name->kebab()}') }}\"><i class=\"nav-icon la la-question\"></i> {$name}</a></li>",
+            'code' => "<li class=\"nav-item\"><a class=\"nav-link\" href=\"{{ backpack_url('{$route}') }}\"><i class=\"nav-icon la la-question\"></i> {$nameTitle}</a></li>",
         ]);
 
-        $url = Str::of(config('app.url'))->finish('/')->append("admin/{$name->kebab()}");
+        $url = backpack_url($route);
 
         $this->newLine();
-        $this->note("Page {$name} created.");
-        $this->note("Go to <fg=blue>$url</> to access your new page.");
+        $this->note("Page {$nameTitle} created.");
+        $this->note("Go to <fg=blue>{$url}</> to access your new page.");
         $this->newLine();
     }
 

src/Console/Commands/PageControllerBackpackCommand.php

@@ -22,7 +22,8 @@ class PageControllerBackpackCommand extends GeneratorCommand
      *
      * @var string
      */
-    protected $signature = 'backpack:page-controller {name} {--view-path=}';
+    protected $signature = 'backpack:page-controller {name}
+        {--view-path=admin : Path of the view, after resources/views/}';
 
     /**
      * The console command description.
@@ -158,8 +159,8 @@ protected function replaceNameStrings(&$stub)
     {
         $name = $this->getNameInput();
 
-        $stub = str_replace('DummyName', $name, $stub);
-        $stub = str_replace('dummyName', lcfirst($name), $stub);
+        $stub = str_replace('DummyName', $name->value, $stub);
+        $stub = str_replace('dummyName', lcfirst($name->value), $stub);
         $stub = str_replace('Dummy Name', $name->kebab()->replace('-', ' ')->title(), $stub);
 
         return $this;

src/Console/stubs/page.stub

@@ -1,9 +1,9 @@
-@extends(backpack_view('blank'))
+@extends(backpack_view('layout'))
 
 @section('content')
 <div class="jumbotron">
     <h1 class="mb-4">Dummy Name</h1>
 
     <p>Go to <code>{{ $page }}</code> to edit this view or <code>{{ $controller }}</code> to edit the controller.</p>
 </div>
-@endsection
+@endsection