make page template fully dynamic

ctf0 · ctf0 · commit b1c69ab88230 · 2018-01-17T05:09:58.000+02:00
v3.2.0
diff --git a/README.md b/README.md
@@ -90,11 +90,6 @@ return [
         'a'  => 'is-active',
     ],
 
-    /*
-     * where to search for the template views ? (relative to "resources\views" folder)
-     */
-    'templatePath' => 'pages',
-
     /*
      * the path where we will save the routes list
      */
diff --git a/logs/v3.1.7.txt b/logs/v3.1.7.txt
diff --git a/logs/v3.2.0.txt b/logs/v3.2.0.txt
@@ -0,0 +1,7 @@
+- make page controller fully dynamic
+- make page template fully dynamic
+- fix menu list not taking full height
+- cleanup pages seeder
+- add search
+- update readme
+- update resources
diff --git a/src/Controllers/BaseController.php b/src/Controllers/BaseController.php
@@ -8,7 +8,6 @@ class BaseController extends Controller
 {
     protected $cache;
     protected $adminPath;
-    protected $templatePath;
     protected $crud_prefix;
     protected $userModel;
 
@@ -20,7 +19,6 @@ public function __construct()
 
         $this->cache        = app('cache');
         $this->adminPath    = 'SimpleMenu::admin.' . config('simpleMenu.framework');
-        $this->templatePath = config('simpleMenu.templatePath');
         $this->crud_prefix  = config('simpleMenu.crud_prefix');
         $this->userModel    = app(config('simpleMenu.userModel'));
     }
diff --git a/src/Controllers/DummyController.php b/src/Controllers/DummyController.php
@@ -11,6 +11,6 @@ public function handle()
     {
         extract(SimpleMenu::getRouteData(Route::currentRouteName()));
 
-        return view("$this->templatePath.$template", compact('title', 'body', 'desc', 'meta', 'cover', 'breadCrumb'));
+        return view($template, compact('title', 'body', 'desc', 'meta', 'cover', 'breadCrumb'));
     }
 }
diff --git a/src/config/simpleMenu.php b/src/config/simpleMenu.php
@@ -11,16 +11,14 @@
     ],
 
     /*
-     * where to search for the template views ?
-     * (relative to "resources\views" folder)
-     * ex."resources\views\pages"
+     * the path where we will save the routes list
      */
-    'templatePath' => 'pages',
+    'routeListPath' => storage_path('logs/simpleMenu.php'),
 
     /*
-     * the path where we will save the routes list
+     * dynamic pages controller namespace
      */
-    'routeListPath' => storage_path('logs/simpleMenu.php'),
+    'pagesControllerNS' => 'App\Http\Controllers',
 
     /*
      * where to redirect when a route is available in one locale "en" but not in another "fr" ?
diff --git a/src/database/seeds/PagesTableSeeder.php b/src/database/seeds/PagesTableSeeder.php
@@ -20,7 +20,7 @@ public function run()
             $fr = $faker->unique()->city;
 
             Page::create([
-                'template'  => 'hero',
+                'template'  => 'SimpleMenu::template-example',
                 'route_name'=> str_slug($en),
                 'title'     => [
                      'en' => title_case($en),
diff --git a/src/resources/views/admin/bulma/menus/create.blade.php b/src/resources/views/admin/bulma/menus/create.blade.php
@@ -14,7 +14,7 @@
         </div>
         <div class="field has-addons">
             <div class="control is-expanded">
-                {{ Form::text('name', null, ['class' => 'input', 'placeholder'=>'name']) }}
+                {{ Form::text('name', null, ['class' => 'input', 'placeholder' => 'name']) }}
                 @if($errors->has('name'))
                     <p class="help is-danger">
                         {{ $errors->first('name') }}
diff --git a/src/resources/views/admin/bulma/menus/edit.blade.php b/src/resources/views/admin/bulma/menus/edit.blade.php
@@ -19,8 +19,8 @@ class="button is-success">
     </h3>
 
     <sm-menu inline-template
-        get-menu-pages="{{ route($crud_prefix.'.menus.getMenuPages',['id'=>$menu->id]) }}"
-        del-page="{{ route($crud_prefix.'.menus.removePage',['id'=>$menu->id]) }}"
+        get-menu-pages="{{ route($crud_prefix.'.menus.getMenuPages',['id' => $menu->id]) }}"
+        del-page="{{ route($crud_prefix.'.menus.removePage',['id' => $menu->id]) }}"
         del-child="{{ route($crud_prefix.'.menus.removeChild') }}"
         locale="{{ LaravelLocalization::getCurrentLocale() }}">
         <div>
diff --git a/src/resources/views/admin/bulma/menus/index.blade.php b/src/resources/views/admin/bulma/menus/index.blade.php
@@ -92,8 +92,8 @@ class="cbx-checkbox"
                                     {{ Form::open([
                                         'method' => 'DELETE',
                                         'route' => [$crud_prefix.'.menus.destroy', $menu->id],
-                                        'data-id'=>'menu-'.$menu->id,
-                                        '@submit.prevent'=>'DelItem($event,"'.$menu->name.'")'
+                                        'data-id' => 'menu-'.$menu->id,
+                                        '@submit.prevent' => 'DelItem($event,"'.$menu->name.'")'
                                     ]) }}
                                         {{ Form::submit(trans('SimpleMenu::messages.delete'), ['class' => 'button is-danger']) }}
                                     {{ Form::close() }}
diff --git a/src/resources/views/admin/bulma/pages/create.blade.php b/src/resources/views/admin/bulma/pages/create.blade.php
@@ -12,7 +12,7 @@
 
     <sm-page inline-template select-first="{{ LaravelLocalization::getCurrentLocale() }}">
         <div>
-            {{ Form::open(['method' => 'POST', 'route' => $crud_prefix.'.pages.store', 'files'=>true]) }}
+            {{ Form::open(['method' => 'POST', 'route' => $crud_prefix.'.pages.store', 'files' => true]) }}
 
                 {{-- Meta --}}
                 <div class="columns">
@@ -60,8 +60,8 @@ class="input toggle-pad"
                                     'action',
                                     null,
                                     ['class' => 'input',
-                                    'placeholder'=>"App\Http\Controllers\SomeController@index",
-                                    'ref'=>'action'])
+                                    'placeholder' => "Any\Name\Space\SomeController@methodName",
+                                    'ref' => 'action'])
                                 }}
                                 <span class="help">
                                     <code class="link" data-value="App\Http\Controllers\" @click="updateValue($event, 'action')">App\Http\Controllers\</code>
@@ -78,7 +78,13 @@ class="input toggle-pad"
                         <div class="field">
                             {{ Form::label('template', trans('SimpleMenu::messages.template'), ['class' => 'label']) }}
                             <div class="control">
-                                {{ Form::text('template', null, ['class' => 'input','placeholder'=>"hero", 'ref'=>'template']) }}
+                                {{ Form::text(
+                                    'template',
+                                    null,
+                                    ['class' => 'input',
+                                    'placeholder' => "ex.'folder.abc' or 'Vendor::xyz'",
+                                    'ref' => 'template'])
+                                }}
                             </div>
                             @if (count($templates))
                                 <span class="help">
@@ -98,7 +104,7 @@ class="input toggle-pad"
                         <div class="field">
                             {{ Form::label('route_name', trans('SimpleMenu::messages.route_name'), ['class' => 'label']) }}
                             <div class="control">
-                                {{ Form::text('route_name', null, ['class' => 'input','placeholder'=>"route-name"]) }}
+                                {{ Form::text('route_name', null, ['class' => 'input','placeholder' => "route-name"]) }}
                             </div>
                             @if($errors->has('route_name'))
                                 <p class="help is-danger">
diff --git a/src/resources/views/admin/bulma/pages/edit.blade.php b/src/resources/views/admin/bulma/pages/edit.blade.php
@@ -22,7 +22,7 @@ class="button is-success">
 
     <sm-page inline-template select-first="{{ LaravelLocalization::getCurrentLocale() }}">
         <div>
-            {{ Form::model($page, ['method' => 'PUT', 'route' => [$crud_prefix.'.pages.update', $page->id], 'files'=>true]) }}
+            {{ Form::model($page, ['method' => 'PUT', 'route' => [$crud_prefix.'.pages.update', $page->id], 'files' => true]) }}
 
                 {{-- Meta --}}
                 <div class="columns">
@@ -70,8 +70,8 @@ class="input toggle-pad"
                                     'action',
                                     $page->action,
                                     ['class' => 'input',
-                                    'placeholder'=>"App\Http\Controllers\SomeController@index",
-                                    'ref'=>'action'])
+                                    'placeholder' => "Any\Name\Space\SomeController@methodName",
+                                    'ref' => 'action'])
                                 }}
                                 <span class="help">
                                     <code class="link" data-value="App\Http\Controllers\" @click="updateValue($event, 'action')">App\Http\Controllers\</code>
@@ -91,7 +91,9 @@ class="input toggle-pad"
                                 {{ Form::text(
                                     'template',
                                     $page->template,
-                                    ['class' => 'input','placeholder'=>"hero", 'ref'=>'template'])
+                                    ['class' => 'input',
+                                    'placeholder' => "ex.'folder.hero' or 'Vendor::xyz'",
+                                    'ref' => 'template'])
                                 }}
                             </div>
                             @if (count($templates))
@@ -115,7 +117,7 @@ class="input toggle-pad"
                                 {{ Form::text(
                                     'route_name',
                                     $page->route_name,
-                                    ['class' => 'input','placeholder'=>"route-name"])
+                                    ['class' => 'input','placeholder' => "route-name"])
                                 }}
                             </div>
                             @if($errors->has('route_name'))
diff --git a/src/resources/views/admin/bulma/pages/index.blade.php b/src/resources/views/admin/bulma/pages/index.blade.php
@@ -150,8 +150,8 @@ class="button is-link is-inline-block">
                                         {{ Form::open([
                                             'method' => 'DELETE',
                                             'route' => [$crud_prefix.'.pages.destroy', $page->id],
-                                            'data-id'=>'item-'.$page->id,
-                                            '@submit.prevent'=>'DelItem($event,"'.$page->title.'")'
+                                            'data-id' => 'item-'.$page->id,
+                                            '@submit.prevent' => 'DelItem($event,"'.$page->title.'")'
                                         ]) }}
                                             <button type="submit" class="button is-danger">
                                                 {{ trans('SimpleMenu::messages.delete') }}
diff --git a/src/resources/views/admin/bulma/permissions/index.blade.php b/src/resources/views/admin/bulma/permissions/index.blade.php
@@ -99,8 +99,8 @@ class="button is-link is-inline-block">
                                     {{ Form::open([
                                         'method' => 'DELETE',
                                         'route' => [$crud_prefix.'.permissions.destroy', $permission->id],
-                                        'data-id'=>'item-'.$permission->id,
-                                        '@submit.prevent'=>'DelItem($event,"'.$permission->name.'")'
+                                        'data-id' => 'item-'.$permission->id,
+                                        '@submit.prevent' => 'DelItem($event,"'.$permission->name.'")'
                                     ]) }}
                                         <button type="submit" class="button is-danger" {{ $check }}>
                                             {{ trans('SimpleMenu::messages.delete') }}
diff --git a/src/resources/views/admin/bulma/roles/index.blade.php b/src/resources/views/admin/bulma/roles/index.blade.php
@@ -108,8 +108,8 @@ class="button is-link is-inline-block">
                                     {{ Form::open([
                                         'method' => 'DELETE',
                                         'route' => [$crud_prefix.'.roles.destroy', $role->id],
-                                        'data-id'=>'item-'.$role->id,
-                                        '@submit.prevent'=>'DelItem($event,"'.$role->name.'")'
+                                        'data-id' => 'item-'.$role->id,
+                                        '@submit.prevent' => 'DelItem($event,"'.$role->name.'")'
                                     ]) }}
                                         <button type="submit" class="button is-danger" {{ $check }}>
                                             {{ trans('SimpleMenu::messages.delete') }}
diff --git a/src/resources/views/admin/bulma/shared.blade.php b/src/resources/views/admin/bulma/shared.blade.php
@@ -39,16 +39,34 @@
                 <div class="column is-2">
                     <aside class="menu">
                         <ul class="menu-list">
-                            <li><a class="{{ URL::has("$crud_prefix/users") ? 'is-active' : '' }}" href="{{ route($crud_prefix.'.users.index') }}">Users</a></li>
-                            <li><a class="{{ URL::has("$crud_prefix/roles") ? 'is-active' : '' }}" href="{{ route($crud_prefix.'.roles.index') }}">Roles</a></li>
-                            <li><a class="{{ URL::has("$crud_prefix/permissions") ? 'is-active' : '' }}" href="{{ route($crud_prefix.'.permissions.index') }}">Permissions</a></li>
-                            <li><a class="{{ URL::has("$crud_prefix/pages")  ? 'is-active' : '' }}" href="{{ route($crud_prefix.'.pages.index') }}">Pages</a></li>
+                            <li><a class="{{ URL::has("$crud_prefix/users") ? 'is-active' : '' }}"
+                                href="{{ route($crud_prefix.'.users.index') }}">
+                                Users
+                            </a></li>
+                            <li><a class="{{ URL::has("$crud_prefix/roles") ? 'is-active' : '' }}"
+                                href="{{ route($crud_prefix.'.roles.index') }}">
+                                Roles
+                            </a></li>
+                            <li><a class="{{ URL::has("$crud_prefix/permissions") ? 'is-active' : '' }}"
+                                href="{{ route($crud_prefix.'.permissions.index') }}">
+                                Permissions
+                            </a></li>
+                            <li><a class="{{ URL::has("$crud_prefix/pages")  ? 'is-active' : '' }}"
+                                href="{{ route($crud_prefix.'.pages.index') }}">
+                                Pages
+                            </a></li>
                             <li>
-                                <a class="{{ URL::has("$crud_prefix/menus") ? 'is-active' : '' }}" href="{{ route($crud_prefix.'.menus.index') }}">Menus</a>
+                                <a class="{{ URL::has("$crud_prefix/menus") ? 'is-active' : '' }}"
+                                    href="{{ route($crud_prefix.'.menus.index') }}">
+                                    Menus
+                                </a>
                                 <ul>
                                     @foreach (app('cache')->tags('sm')->get('menus') as $menu)
                                         <li data-id="menu-{{ $menu->id }}">
-                                            <a class="{{ URL::is($crud_prefix.'.menus.edit',['id'=>$menu->id]) ? 'is-active' : '' }}" href="{{ route($crud_prefix.'.menus.edit',[$menu->id]) }}">{{ $menu->name }}</a>
+                                            <a class="{{ URL::is($crud_prefix.'.menus.edit',['id' => $menu->id]) ? 'is-active' : '' }}"
+                                                href="{{ route($crud_prefix.'.menus.edit',[$menu->id]) }}">
+                                                {{ $menu->name }}
+                                            </a>
                                         </li>
                                     @endforeach
                                 </ul>
diff --git a/src/resources/views/admin/bulma/users/create.blade.php b/src/resources/views/admin/bulma/users/create.blade.php
@@ -6,7 +6,7 @@
         <a href="{{ route($crud_prefix.'.users.index') }}">{{ trans('SimpleMenu::messages.go_back') }}</a>
     </h3>
 
-    {{ Form::open(['method' => 'POST', 'route' => $crud_prefix.'.users.store', 'files'=>true]) }}
+    {{ Form::open(['method' => 'POST', 'route' => $crud_prefix.'.users.store', 'files' => true]) }}
 
         {{-- Account --}}
         <div class="columns">
@@ -53,7 +53,7 @@
                 <div class="field">
                     {{ Form::label('password', trans('SimpleMenu::messages.password'), ['class' => 'label']) }}
                     <div class="control">
-                        {{ Form::password('password', ['class' => 'input','placeholder'=>'******']) }}
+                        {{ Form::password('password', ['class' => 'input','placeholder' => '******']) }}
                     </div>
                     @if($errors->has('password'))
                         <p class="help is-danger">
diff --git a/src/resources/views/admin/bulma/users/edit.blade.php b/src/resources/views/admin/bulma/users/edit.blade.php
@@ -16,7 +16,7 @@ class="button is-success">
         </div>
     </div>
 
-    {{ Form::model($user, ['method' => 'PUT', 'route' => [$crud_prefix.'.users.update', $user->id], 'files'=>true]) }}
+    {{ Form::model($user, ['method' => 'PUT', 'route' => [$crud_prefix.'.users.update', $user->id], 'files' => true]) }}
 
         {{-- Account --}}
         <div class="columns">
@@ -70,7 +70,7 @@ class="button is-success">
                 <div class="field">
                     {{ Form::label('password', trans('SimpleMenu::messages.password'), ['class' => 'label']) }}
                     <div class="control">
-                        {{ Form::password('password', ['class' => 'input', 'placeholder'=>'******']) }}
+                        {{ Form::password('password', ['class' => 'input', 'placeholder' => '******']) }}
                     </div>
                     @if($errors->has('password'))
                         <p class="help is-danger">
diff --git a/src/resources/views/admin/bulma/users/index.blade.php b/src/resources/views/admin/bulma/users/index.blade.php
@@ -118,8 +118,8 @@ class="button is-link is-inline-block">
                                     {{ Form::open([
                                         'method' => 'DELETE',
                                         'route' => [$crud_prefix.'.users.destroy', $user->id],
-                                        'data-id'=>'item-'.$user->id,
-                                        '@submit.prevent'=>'DelItem($event,"'.$user->name.'")'
+                                        'data-id' => 'item-'.$user->id,
+                                        '@submit.prevent' => 'DelItem($event,"'.$user->name.'")'
                                     ]) }}
                                         <button type="submit" class="button is-danger" {{ $check }}>
                                             {{ trans('SimpleMenu::messages.delete') }}
diff --git a/src/resources/views/template-example.blade.php b/src/resources/views/template-example.blade.php
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+    <meta name="description" content="{{ str_limit($desc, 50) }}">
+    <meta name="keywords" content="{{ $meta }}">
+    <title>{{ $title }}</title>
+
+    {{-- styles --}}
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bulma/0.6.1/css/bulma.min.css">
+</head>
+<body>
+    <div class="columns">
+        <nav class="column is-3">
+            <aside class="menu">
+                @include('SimpleMenu::menu.example')
+            </aside>
+        </nav>
+
+        <div class="column">
+            <section class="hero">
+                <div class="hero-body">
+                    <h1 class="title">{!! $title !!}</h1>
+                    <h3 class="subtitle">{!! $desc !!}</h3>
+                    <div class="content">{!! $body !!}</div>
+                </div>
+            </section>
+        </div>
+    </div>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ class BaseController extends Controller`
`8`	`8`	`{`
`9`	`9`	`protected $cache;`
`10`	`10`	`protected $adminPath;`
`11`		`- protected $templatePath;`
`12`	`11`	`protected $crud_prefix;`
`13`	`12`	`protected $userModel;`
`14`	`13`
`@@ -20,7 +19,6 @@ public function __construct()`
`20`	`19`
`21`	`20`	`$this->cache = app('cache');`
`22`	`21`	`$this->adminPath = 'SimpleMenu::admin.' . config('simpleMenu.framework');`
`23`		`- $this->templatePath = config('simpleMenu.templatePath');`
`24`	`22`	`$this->crud_prefix = config('simpleMenu.crud_prefix');`
`25`	`23`	`$this->userModel = app(config('simpleMenu.userModel'));`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ public function handle()`
`11`	`11`	`{`
`12`	`12`	`extract(SimpleMenu::getRouteData(Route::currentRouteName()));`
`13`	`13`
`14`		`- return view("$this->templatePath.$template", compact('title', 'body', 'desc', 'meta', 'cover', 'breadCrumb'));`
	`14`	`+ return view($template, compact('title', 'body', 'desc', 'meta', 'cover', 'breadCrumb'));`
`15`	`15`	`}`
`16`	`16`	`}`