Updated default config file.

Providers and aliases list moved to config.
LaravelRUS · Feb 28, 2016 · 33194f1 · 33194f1
1 parent bb19060
commit 33194f1
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 101 deletions.
diff --git a/config/sleeping_owl.php b/config/sleeping_owl.php
@@ -2,65 +2,146 @@
 
 return [
     /*
-     * Admin title
-     * Displays in page title and header
-     */
-    'title'                 => 'Sleeping Owl administrator',
+    |--------------------------------------------------------------------------
+    | Admin Title
+    |--------------------------------------------------------------------------
+    |
+    | Displays in page title and header
+    |
+    */
+
+    'title' => 'Sleeping Owl administrator',
 
     /*
-     * Displays in navbar
-     */
-    'logo'                  => '<svg style="padding:10px;" class="pull-left" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 216.123 216.123" style="enable-background:new 0 0 216.123 216.123;" xml:space="preserve" width="48px" height="48px"><g><path d="M173.65,106.51c6.549-7.024,10.567-16.436,10.567-26.774c0-8.585-2.775-16.529-7.464-23.001   c5.319-16.633,5.063-34.71-0.795-51.16L173.974,0l-5.827,1.03c-12.002,2.121-23.325,6.931-33.201,14.037H81.537v0.252   C71.577,8.071,60.122,3.176,47.977,1.03L42.149,0l-1.985,5.575c-5.858,16.45-6.114,34.527-0.795,51.16   c-4.689,6.472-7.464,14.417-7.464,23.001c0,10.338,4.018,19.75,10.567,26.773c-1.028,0.797-1.846,1.88-2.308,3.179   c-10.874,30.534-2.352,64.292,21.71,86c1.048,0.945,2.171,1.862,3.332,2.761v10.673c0,3.866,3.134,7,7,7s7-3.134,7-7v-2.194   c8.347,3.957,17.834,6.887,27.532,8.373c0.352,0.054,0.706,0.081,1.06,0.081s0.708-0.027,1.06-0.081   c4.446-0.681,16.123-2.878,28.059-8.434v2.255c0,3.866,3.134,7,7,7s7-3.134,7-7v-10.656c1.139-0.883,2.254-1.805,3.332-2.777   c24.062-21.709,32.583-55.466,21.71-86C175.496,108.389,174.678,107.306,173.65,106.51z M107.969,152.066   c-4.506-10.226-11.165-19.465-19.743-27.206c-2.717-2.451-5.583-4.7-8.571-6.748c13.12-2.887,23.804-12.341,28.406-24.734   c4.602,12.393,15.286,21.847,28.406,24.734c-2.988,2.048-5.854,4.297-8.57,6.748C119.346,132.575,112.595,141.88,107.969,152.066z    M71.206,54.436c13.951,0,25.301,11.35,25.301,25.301s-11.35,25.301-25.301,25.301s-25.301-11.35-25.301-25.301   S57.255,54.436,71.206,54.436z M170.218,79.736c0,13.951-11.35,25.301-25.301,25.301s-25.301-11.35-25.301-25.301   s11.35-25.301,25.301-25.301S170.218,65.786,170.218,79.736z M108.041,48.088c-3.04-6.825-7.023-13.231-11.845-19.021h23.699   C115.052,34.867,111.074,41.273,108.041,48.088z M164.562,16.17c2.468,9.767,2.65,20.018,0.566,29.875   c-5.909-3.558-12.824-5.61-20.21-5.61c-7.254,0-14.05,1.983-19.889,5.425c3.327-5.397,7.423-10.367,12.248-14.72   C145.142,24.043,154.479,18.934,164.562,16.17z M51.562,16.17c10.082,2.763,19.419,7.872,27.286,14.97   c4.792,4.324,8.877,9.293,12.205,14.695c-5.83-3.426-12.61-5.401-19.847-5.401c-7.386,0-14.301,2.051-20.21,5.61   C48.912,36.188,49.094,25.937,51.562,16.17z M51.555,120.283c10.084,2.763,19.425,7.873,27.293,14.972   c13.908,12.549,21.704,29.884,21.95,48.812v15.742c-10.093-2.564-21.543-7.294-29.546-14.514   C52.951,168.783,45.553,143.818,51.555,120.283z M144.871,185.295c-7.99,7.21-19.708,11.96-30.073,14.539v-15.766   c0.239-18.349,8.431-36.14,22.478-48.813c7.868-7.1,17.209-12.209,27.293-14.972C170.57,143.818,163.172,168.783,144.871,185.295z" fill="#FFFFFF"/><circle cx="71.206" cy="79.736" r="9.757" fill="#FFFFFF"/><circle cx="144.917" cy="79.736" r="9.757" fill="#FFFFFF"/></g></svg> <span class="pull-left">SleepingOwl</span>',
+    |--------------------------------------------------------------------------
+    | Admin Logo
+    |--------------------------------------------------------------------------
+    |
+    | Displays in navbar
+    |
+    */
+
+    'logo'      => '<svg style="padding:10px;" class="pull-left" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 216.123 216.123" style="enable-background:new 0 0 216.123 216.123;" xml:space="preserve" width="48px" height="48px"><g><path d="M173.65,106.51c6.549-7.024,10.567-16.436,10.567-26.774c0-8.585-2.775-16.529-7.464-23.001   c5.319-16.633,5.063-34.71-0.795-51.16L173.974,0l-5.827,1.03c-12.002,2.121-23.325,6.931-33.201,14.037H81.537v0.252   C71.577,8.071,60.122,3.176,47.977,1.03L42.149,0l-1.985,5.575c-5.858,16.45-6.114,34.527-0.795,51.16   c-4.689,6.472-7.464,14.417-7.464,23.001c0,10.338,4.018,19.75,10.567,26.773c-1.028,0.797-1.846,1.88-2.308,3.179   c-10.874,30.534-2.352,64.292,21.71,86c1.048,0.945,2.171,1.862,3.332,2.761v10.673c0,3.866,3.134,7,7,7s7-3.134,7-7v-2.194   c8.347,3.957,17.834,6.887,27.532,8.373c0.352,0.054,0.706,0.081,1.06,0.081s0.708-0.027,1.06-0.081   c4.446-0.681,16.123-2.878,28.059-8.434v2.255c0,3.866,3.134,7,7,7s7-3.134,7-7v-10.656c1.139-0.883,2.254-1.805,3.332-2.777   c24.062-21.709,32.583-55.466,21.71-86C175.496,108.389,174.678,107.306,173.65,106.51z M107.969,152.066   c-4.506-10.226-11.165-19.465-19.743-27.206c-2.717-2.451-5.583-4.7-8.571-6.748c13.12-2.887,23.804-12.341,28.406-24.734   c4.602,12.393,15.286,21.847,28.406,24.734c-2.988,2.048-5.854,4.297-8.57,6.748C119.346,132.575,112.595,141.88,107.969,152.066z    M71.206,54.436c13.951,0,25.301,11.35,25.301,25.301s-11.35,25.301-25.301,25.301s-25.301-11.35-25.301-25.301   S57.255,54.436,71.206,54.436z M170.218,79.736c0,13.951-11.35,25.301-25.301,25.301s-25.301-11.35-25.301-25.301   s11.35-25.301,25.301-25.301S170.218,65.786,170.218,79.736z M108.041,48.088c-3.04-6.825-7.023-13.231-11.845-19.021h23.699   C115.052,34.867,111.074,41.273,108.041,48.088z M164.562,16.17c2.468,9.767,2.65,20.018,0.566,29.875   c-5.909-3.558-12.824-5.61-20.21-5.61c-7.254,0-14.05,1.983-19.889,5.425c3.327-5.397,7.423-10.367,12.248-14.72   C145.142,24.043,154.479,18.934,164.562,16.17z M51.562,16.17c10.082,2.763,19.419,7.872,27.286,14.97   c4.792,4.324,8.877,9.293,12.205,14.695c-5.83-3.426-12.61-5.401-19.847-5.401c-7.386,0-14.301,2.051-20.21,5.61   C48.912,36.188,49.094,25.937,51.562,16.17z M51.555,120.283c10.084,2.763,19.425,7.873,27.293,14.972   c13.908,12.549,21.704,29.884,21.95,48.812v15.742c-10.093-2.564-21.543-7.294-29.546-14.514   C52.951,168.783,45.553,143.818,51.555,120.283z M144.871,185.295c-7.99,7.21-19.708,11.96-30.073,14.539v-15.766   c0.239-18.349,8.431-36.14,22.478-48.813c7.868-7.1,17.209-12.209,27.293-14.972C170.57,143.818,163.172,168.783,144.871,185.295z" fill="#FFFFFF"/><circle cx="71.206" cy="79.736" r="9.757" fill="#FFFFFF"/><circle cx="144.917" cy="79.736" r="9.757" fill="#FFFFFF"/></g></svg> <span class="pull-left">SleepingOwl</span>',
+    'logo_mini' => '<svg style="padding:7px;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 216.123 216.123" style="enable-background:new 0 0 216.123 216.123;" xml:space="preserve" width="48px" height="48px"><g><path d="M173.65,106.51c6.549-7.024,10.567-16.436,10.567-26.774c0-8.585-2.775-16.529-7.464-23.001   c5.319-16.633,5.063-34.71-0.795-51.16L173.974,0l-5.827,1.03c-12.002,2.121-23.325,6.931-33.201,14.037H81.537v0.252   C71.577,8.071,60.122,3.176,47.977,1.03L42.149,0l-1.985,5.575c-5.858,16.45-6.114,34.527-0.795,51.16   c-4.689,6.472-7.464,14.417-7.464,23.001c0,10.338,4.018,19.75,10.567,26.773c-1.028,0.797-1.846,1.88-2.308,3.179   c-10.874,30.534-2.352,64.292,21.71,86c1.048,0.945,2.171,1.862,3.332,2.761v10.673c0,3.866,3.134,7,7,7s7-3.134,7-7v-2.194   c8.347,3.957,17.834,6.887,27.532,8.373c0.352,0.054,0.706,0.081,1.06,0.081s0.708-0.027,1.06-0.081   c4.446-0.681,16.123-2.878,28.059-8.434v2.255c0,3.866,3.134,7,7,7s7-3.134,7-7v-10.656c1.139-0.883,2.254-1.805,3.332-2.777   c24.062-21.709,32.583-55.466,21.71-86C175.496,108.389,174.678,107.306,173.65,106.51z M107.969,152.066   c-4.506-10.226-11.165-19.465-19.743-27.206c-2.717-2.451-5.583-4.7-8.571-6.748c13.12-2.887,23.804-12.341,28.406-24.734   c4.602,12.393,15.286,21.847,28.406,24.734c-2.988,2.048-5.854,4.297-8.57,6.748C119.346,132.575,112.595,141.88,107.969,152.066z    M71.206,54.436c13.951,0,25.301,11.35,25.301,25.301s-11.35,25.301-25.301,25.301s-25.301-11.35-25.301-25.301   S57.255,54.436,71.206,54.436z M170.218,79.736c0,13.951-11.35,25.301-25.301,25.301s-25.301-11.35-25.301-25.301   s11.35-25.301,25.301-25.301S170.218,65.786,170.218,79.736z M108.041,48.088c-3.04-6.825-7.023-13.231-11.845-19.021h23.699   C115.052,34.867,111.074,41.273,108.041,48.088z M164.562,16.17c2.468,9.767,2.65,20.018,0.566,29.875   c-5.909-3.558-12.824-5.61-20.21-5.61c-7.254,0-14.05,1.983-19.889,5.425c3.327-5.397,7.423-10.367,12.248-14.72   C145.142,24.043,154.479,18.934,164.562,16.17z M51.562,16.17c10.082,2.763,19.419,7.872,27.286,14.97   c4.792,4.324,8.877,9.293,12.205,14.695c-5.83-3.426-12.61-5.401-19.847-5.401c-7.386,0-14.301,2.051-20.21,5.61   C48.912,36.188,49.094,25.937,51.562,16.17z M51.555,120.283c10.084,2.763,19.425,7.873,27.293,14.972   c13.908,12.549,21.704,29.884,21.95,48.812v15.742c-10.093-2.564-21.543-7.294-29.546-14.514   C52.951,168.783,45.553,143.818,51.555,120.283z M144.871,185.295c-7.99,7.21-19.708,11.96-30.073,14.539v-15.766   c0.239-18.349,8.431-36.14,22.478-48.813c7.868-7.1,17.209-12.209,27.293-14.972C170.57,143.818,163.172,168.783,144.871,185.295z" fill="#FFFFFF"/><circle cx="71.206" cy="79.736" r="9.757" fill="#FFFFFF"/><circle cx="144.917" cy="79.736" r="9.757" fill="#FFFFFF"/></g></svg>',
 
     /*
-     * Displays in navbar
-     */
-    'logo_mini'             => '<svg style="padding:7px;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 216.123 216.123" style="enable-background:new 0 0 216.123 216.123;" xml:space="preserve" width="48px" height="48px"><g><path d="M173.65,106.51c6.549-7.024,10.567-16.436,10.567-26.774c0-8.585-2.775-16.529-7.464-23.001   c5.319-16.633,5.063-34.71-0.795-51.16L173.974,0l-5.827,1.03c-12.002,2.121-23.325,6.931-33.201,14.037H81.537v0.252   C71.577,8.071,60.122,3.176,47.977,1.03L42.149,0l-1.985,5.575c-5.858,16.45-6.114,34.527-0.795,51.16   c-4.689,6.472-7.464,14.417-7.464,23.001c0,10.338,4.018,19.75,10.567,26.773c-1.028,0.797-1.846,1.88-2.308,3.179   c-10.874,30.534-2.352,64.292,21.71,86c1.048,0.945,2.171,1.862,3.332,2.761v10.673c0,3.866,3.134,7,7,7s7-3.134,7-7v-2.194   c8.347,3.957,17.834,6.887,27.532,8.373c0.352,0.054,0.706,0.081,1.06,0.081s0.708-0.027,1.06-0.081   c4.446-0.681,16.123-2.878,28.059-8.434v2.255c0,3.866,3.134,7,7,7s7-3.134,7-7v-10.656c1.139-0.883,2.254-1.805,3.332-2.777   c24.062-21.709,32.583-55.466,21.71-86C175.496,108.389,174.678,107.306,173.65,106.51z M107.969,152.066   c-4.506-10.226-11.165-19.465-19.743-27.206c-2.717-2.451-5.583-4.7-8.571-6.748c13.12-2.887,23.804-12.341,28.406-24.734   c4.602,12.393,15.286,21.847,28.406,24.734c-2.988,2.048-5.854,4.297-8.57,6.748C119.346,132.575,112.595,141.88,107.969,152.066z    M71.206,54.436c13.951,0,25.301,11.35,25.301,25.301s-11.35,25.301-25.301,25.301s-25.301-11.35-25.301-25.301   S57.255,54.436,71.206,54.436z M170.218,79.736c0,13.951-11.35,25.301-25.301,25.301s-25.301-11.35-25.301-25.301   s11.35-25.301,25.301-25.301S170.218,65.786,170.218,79.736z M108.041,48.088c-3.04-6.825-7.023-13.231-11.845-19.021h23.699   C115.052,34.867,111.074,41.273,108.041,48.088z M164.562,16.17c2.468,9.767,2.65,20.018,0.566,29.875   c-5.909-3.558-12.824-5.61-20.21-5.61c-7.254,0-14.05,1.983-19.889,5.425c3.327-5.397,7.423-10.367,12.248-14.72   C145.142,24.043,154.479,18.934,164.562,16.17z M51.562,16.17c10.082,2.763,19.419,7.872,27.286,14.97   c4.792,4.324,8.877,9.293,12.205,14.695c-5.83-3.426-12.61-5.401-19.847-5.401c-7.386,0-14.301,2.051-20.21,5.61   C48.912,36.188,49.094,25.937,51.562,16.17z M51.555,120.283c10.084,2.763,19.425,7.873,27.293,14.972   c13.908,12.549,21.704,29.884,21.95,48.812v15.742c-10.093-2.564-21.543-7.294-29.546-14.514   C52.951,168.783,45.553,143.818,51.555,120.283z M144.871,185.295c-7.99,7.21-19.708,11.96-30.073,14.539v-15.766   c0.239-18.349,8.431-36.14,22.478-48.813c7.868-7.1,17.209-12.209,27.293-14.972C170.57,143.818,163.172,168.783,144.871,185.295z" fill="#FFFFFF"/><circle cx="71.206" cy="79.736" r="9.757" fill="#FFFFFF"/><circle cx="144.917" cy="79.736" r="9.757" fill="#FFFFFF"/></g></svg>',
+    |--------------------------------------------------------------------------
+    | Admin URL prefix
+    |--------------------------------------------------------------------------
+    */
+
+    'url_prefix' => 'admin',
 
     /*
-     * Admin url prefix
-     */
-    'prefix'                => 'admin',
+    |--------------------------------------------------------------------------
+    | Middleware to use in admin routes
+    |--------------------------------------------------------------------------
+    |
+    | Use command `php artisan make:auth` to make authentication views and routes
+    |
+    | see https://laravel.com/docs/5.2/authentication#authentication-quickstart
+    |
+    */
+
+    'middleware' => ['web', 'auth'],
 
     /*
-     * Admin url prefix
-     */
-    'alias_prefix'          => 'Admin',
+    |--------------------------------------------------------------------------
+    |  Path to admin bootstrap files directory
+    |--------------------------------------------------------------------------
+    |
+    | Default: app_path('Admin')
+    |
+    */
+
+    'bootstrapDirectory' => app_path('Admin'),
 
     /*
-     * Middleware to use in admin routes
-     */
-    //'middleware'            => ['admin.auth'],
-    'middleware'            => ['web'],
+    |--------------------------------------------------------------------------
+    |  Directory to upload images to (relative to public directory)
+    |--------------------------------------------------------------------------
+    */
+
+    'imagesUploadDirectory' => 'images/uploads',
 
     /*
-     * Path to admin bootstrap files directory
-     * Default: app_path('Admin')
-     */
-    'bootstrapDirectory'    => app_path('Admin'),
+    |--------------------------------------------------------------------------
+    |  Template to use
+    |--------------------------------------------------------------------------
+    */
+
+    'template' => SleepingOwl\Admin\Templates\TemplateDefault::class,
 
     /*
-     * Directory to upload images to (relative to public directory)
-     */
-    'imagesUploadDirectory' => 'images/uploads',
+    |--------------------------------------------------------------------------
+    |  Default date and time formats
+    |--------------------------------------------------------------------------
+    */
+
+    'datetimeFormat' => 'd.m.Y H:i',
+    'dateFormat'     => 'd.m.Y',
+    'timeFormat'     => 'H:i',
 
     /*
-     * Template to use
-     */
-    'template'              => SleepingOwl\Admin\Templates\TemplateDefault::class,
+    |--------------------------------------------------------------------------
+    |  If you want, you can extend ckeditor default configuration with this
+    |  PHP Hash variable.
+    |--------------------------------------------------------------------------
+    |
+    | Checkout http://docs.ckeditor.com/#!/api/CKEDITOR.config for more information.
+    |
+    */
+
+    'ckeditor' => [],
 
     /*
-     * Default date and time formats
-     */
-    'datetimeFormat'        => 'd.m.Y H:i',
-    'dateFormat'            => 'd.m.Y',
-    'timeFormat'            => 'H:i',
+   |--------------------------------------------------------------------------
+   | Autoloaded Service Providers
+   |--------------------------------------------------------------------------
+   |
+   | The service providers listed here will be automatically loaded on the
+   | request to your application. Feel free to add your own services to
+   | this array to grant expanded functionality to your applications.
+   |
+   */
+
+    'providers' => [
+        SleepingOwl\Admin\Providers\ColumnFilterServiceProvider::class,
+        SleepingOwl\Admin\Providers\ColumnServiceProvider::class,
+        SleepingOwl\Admin\Providers\DisplayServiceProvider::class,
+        SleepingOwl\Admin\Providers\FilterServiceProvider::class,
+        SleepingOwl\Admin\Providers\FormServiceProvider::class,
+        SleepingOwl\Admin\Providers\FormElementsServiceProvider::class,
+        KodiCMS\Assets\AssetsServiceProvider::class,
+        Collective\Html\HtmlServiceProvider::class,
+        SleepingOwl\Admin\Providers\AdminServiceProvider::class
+    ],
 
     /*
-     * If you want, you can extend ckeditor default configuration
-     * with this PHP Hash variable.
-     *
-     * Checkout http://docs.ckeditor.com/#!/api/CKEDITOR.config for more information.
-     */
-    'ckeditor'              => [],
+    |--------------------------------------------------------------------------
+    | Class Aliases
+    |--------------------------------------------------------------------------
+    |
+    | This array of class aliases will be registered when this application
+    | is started.
+    |
+    */
+
+    'aliases' => [
+        'Assets'            => KodiCMS\Assets\Facades\Assets::class,
+        'PackageManager'    => KodiCMS\Assets\Facades\PackageManager::class,
+        'Meta'              => KodiCMS\Assets\Facades\Meta::class,
+        'Form'              => Collective\Html\FormFacade::class,
+        'HTML'              => Collective\Html\HtmlFacade::class,
+
+        'AdminSection'       => SleepingOwl\Admin\Facades\AdminSection::class,
+        'AdminTemplate'      => SleepingOwl\Admin\Facades\AdminTemplate::class,
+        'AdminNavigation'    => SleepingOwl\Admin\Facades\AdminNavigation::class,
+        'AdminColumn'        => SleepingOwl\Admin\TableColumn::class,
+        'AdminColumnFilter'  => SleepingOwl\Admin\TableColumnFilter::class,
+        'AdminDisplayFilter' => SleepingOwl\Admin\DisplayFilter::class,
+        'AdminForm'          => SleepingOwl\Admin\Form::class,
+        'AdminFormElement'   => SleepingOwl\Admin\FormElement::class,
+        'AdminDisplay'       => SleepingOwl\Admin\Display::class
+    ]
 ];
diff --git a/src/AliasBinder.php b/src/AliasBinder.php
@@ -17,7 +17,7 @@ public static function register($alias, $class)
     {
         static::$aliases[$alias] = $class;
         Route::group([
-            'prefix' => config('sleeping_owl.prefix'),
+            'prefix' => config('sleeping_owl.url_prefix'),
             'middleware' => config('sleeping_owl.middleware'),
         ], function () use ($class) {
             if (method_exists($class, 'registerRoutes')) {

diff --git a/src/Http/Controllers/AdminController.php b/src/Http/Controllers/AdminController.php
@@ -222,7 +222,7 @@ public function getScripts()
         $data = [
             'locale'       => App::getLocale(),
             'token'        => csrf_token(),
-            'prefix'       => config('sleeping_owl.prefix'),
+            'prefix'       => config('sleeping_owl.url_prefix'),
             'lang'         => $lang,
             'ckeditor_cfg' => config('sleeping_owl.ckeditor'),
         ];