From e7868868c4a260e109e7f7838b37f710d144bb82 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Wed, 28 Feb 2018 15:16:36 -0600
Subject: [PATCH] Fix the module stubs and sample module for admin closes #201

---
 .../Http/Controllers/Admin/AdminController.php     |  2 +-
 modules/Sample/Http/Routes/admin.php               |  1 +
 modules/Sample/Providers/SampleServiceProvider.php |  4 ++--
 .../Sample/Resources/views/admin/create.blade.php  | 14 ++++++++++++++
 .../Sample/Resources/views/admin/index.blade.php   |  4 ++--
 resources/stubs/modules/controller-admin.stub      |  2 +-
 resources/stubs/modules/routes-admin.stub          |  3 +--
 resources/stubs/modules/scaffold/provider.stub     |  4 ++--
 8 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 modules/Sample/Resources/views/admin/create.blade.php

diff --git a/modules/Sample/Http/Controllers/Admin/AdminController.php b/modules/Sample/Http/Controllers/Admin/AdminController.php
index ae17c5c8..f83d0bae 100644
--- a/modules/Sample/Http/Controllers/Admin/AdminController.php
+++ b/modules/Sample/Http/Controllers/Admin/AdminController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Sample\Http\Controllers;
+namespace Modules\Sample\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/modules/Sample/Http/Routes/admin.php b/modules/Sample/Http/Routes/admin.php
index a007034e..73601b23 100644
--- a/modules/Sample/Http/Routes/admin.php
+++ b/modules/Sample/Http/Routes/admin.php
@@ -4,4 +4,5 @@
 # an admin panel component.
 Route::group([], function () {
     Route::get('/', 'AdminController@index');
+    Route::get('/create', 'AdminController@create');
 });
diff --git a/modules/Sample/Providers/SampleServiceProvider.php b/modules/Sample/Providers/SampleServiceProvider.php
index 0089246c..2852a0d5 100644
--- a/modules/Sample/Providers/SampleServiceProvider.php
+++ b/modules/Sample/Providers/SampleServiceProvider.php
@@ -47,7 +47,7 @@ class SampleServiceProvider extends ServiceProvider
         // $this->moduleSvc->addFrontendLink('Sample', '/sample', '', $logged_in=true);
 
         // Admin links:
-        $this->moduleSvc->addAdminLink('Sample', '/sample/admin');
+        $this->moduleSvc->addAdminLink('Sample', '/admin/sample');
     }
 
     /**
@@ -73,7 +73,7 @@ class SampleServiceProvider extends ServiceProvider
          */
         Route::group([
             'as' => 'sample.',
-            'prefix' => 'api/sample/admin',
+            'prefix' => 'admin/sample',
             // If you want a RESTful module, change this to 'api'
             'middleware' => ['web', 'role:admin'],
             'namespace' => 'Modules\Sample\Http\Controllers\Admin'
diff --git a/modules/Sample/Resources/views/admin/create.blade.php b/modules/Sample/Resources/views/admin/create.blade.php
new file mode 100644
index 00000000..97403ae4
--- /dev/null
+++ b/modules/Sample/Resources/views/admin/create.blade.php
@@ -0,0 +1,14 @@
+@extends('sample::layouts.admin')
+
+@section('title', 'Sample Create')
+@section('actions')
+@endsection
+
+@section('content')
+    <div class="card border-blue-bottom">
+        <div class="content">
+            <div class="header"><h4 class="title">Create something!</h4></div>
+            <p>Add a form!</p>
+        </div>
+    </div>
+@endsection
diff --git a/modules/Sample/Resources/views/admin/index.blade.php b/modules/Sample/Resources/views/admin/index.blade.php
index 62e588c0..ab445b21 100644
--- a/modules/Sample/Resources/views/admin/index.blade.php
+++ b/modules/Sample/Resources/views/admin/index.blade.php
@@ -3,15 +3,15 @@
 @section('title', 'Sample')
 @section('actions')
     <li>
-        <a href="{!! url('/sample/admin/create') !!}">
+        <a href="{!! url('/admin/sample/create') !!}">
             <i class="ti-plus"></i>
             Add New</a>
     </li>
 @endsection
 @section('content')
     <div class="card border-blue-bottom">
-        <div class="header"><h4 class="title">Admin Scaffold!</h4></div>
         <div class="content">
+            <div class="header"><h4 class="title">Admin Scaffold!</h4></div>
             <p>This view is loaded from module: {!! config('sample.name') !!}</p>
         </div>
     </div>
diff --git a/resources/stubs/modules/controller-admin.stub b/resources/stubs/modules/controller-admin.stub
index 0bd0b4fb..7da89e7c 100644
--- a/resources/stubs/modules/controller-admin.stub
+++ b/resources/stubs/modules/controller-admin.stub
@@ -1,6 +1,6 @@
 <?php
 
-namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Http\Controllers;
+namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/resources/stubs/modules/routes-admin.stub b/resources/stubs/modules/routes-admin.stub
index a007034e..ad8120c7 100644
--- a/resources/stubs/modules/routes-admin.stub
+++ b/resources/stubs/modules/routes-admin.stub
@@ -1,7 +1,6 @@
 <?php
 
-# This is the admin path. Comment this out if you don't have
-# an admin panel component.
+# This is the admin path. Comment this out if you don't have an admin panel component.
 Route::group([], function () {
     Route::get('/', 'AdminController@index');
 });
diff --git a/resources/stubs/modules/scaffold/provider.stub b/resources/stubs/modules/scaffold/provider.stub
index 3cad79ab..0e24f2d4 100644
--- a/resources/stubs/modules/scaffold/provider.stub
+++ b/resources/stubs/modules/scaffold/provider.stub
@@ -47,7 +47,7 @@ class $CLASS$ extends ServiceProvider
         // $this->moduleSvc->addFrontendLink('$STUDLY_NAME$', '/$LOWER_NAME$', '', $logged_in=true);
 
         // Admin links:
-        $this->moduleSvc->addAdminLink('$STUDLY_NAME$', '/$LOWER_NAME$/admin');
+        $this->moduleSvc->addAdminLink('$STUDLY_NAME$', '/admin/$LOWER_NAME$');
     }
 
     /**
@@ -73,7 +73,7 @@ class $CLASS$ extends ServiceProvider
          */
         Route::group([
             'as' => '$LOWER_NAME$.',
-            'prefix' => 'api/$LOWER_NAME$/admin',
+            'prefix' => 'admin/$LOWER_NAME$',
             // If you want a RESTful module, change this to 'api'
             'middleware' => ['web', 'role:admin'],
             'namespace' => '$MODULE_NAMESPACE$\$STUDLY_NAME$\Http\Controllers\Admin'