Merge pull request #9 from ARCANESOFT/develop

Updating the package
ARCANESOFT · Feb 20, 2017 · 1bfaa5c · 1bfaa5c
2 parents aee6dd0 + 86d819a
commit 1bfaa5c
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 85 deletions.
diff --git a/config/foundation.php b/config/foundation.php
@@ -1,24 +1,21 @@
 <?php
 
 return [
-    /* ------------------------------------------------------------------------------------------------
-     |  Route settings
-     | ------------------------------------------------------------------------------------------------
-     */
-    'route'     => [
-        //
-    ],
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Foundation Template
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
+
     'template'  => 'foundation::admin._template.master',
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Sidebar
-     | ------------------------------------------------------------------------------------------------
+    'skin'      => 'skin-blue',
+
+    /* -----------------------------------------------------------------
+     |  Sidebar Items
+     | -----------------------------------------------------------------
      */
+
     'sidebar'   => [
         'items' => [
             'arcanesoft.sidebar.foundation.dashboard',
@@ -33,10 +30,11 @@
         ],
     ],
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Modules
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  ARCANESOFT Modules
+     | -----------------------------------------------------------------
      */
+
     'modules' => [
         'providers' => [
             Arcanesoft\Auth\AuthServiceProvider::class,
@@ -45,34 +43,38 @@
             // Arcanesoft\Tracker\TrackerServiceProvider::class,
             // Arcanesoft\Seo\SeoServiceProvider::class,
         ],
+
         'setup' => [
             //
         ],
     ],
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Dashboards
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
+
     'dashboards' => [
         'auth::admin._composers.dashboard',
         // 'tracker::admin._composers.dashboard',
     ],
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  LogViewer
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
+
     'log-viewer' => [
         'per-page'     => 30,
 
         'filter-route' => 'admin::foundation.system.log-viewer.logs.filter',
     ],
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  RoutesViewer
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
+
     'routes-viewer' => [
         'per-page' => 30,
 
@@ -97,4 +99,5 @@
             ],
         ],
     ],
+
 ];
diff --git a/resources/views/admin/_template/master.blade.php b/resources/views/admin/_template/master.blade.php
@@ -13,11 +13,11 @@
     <![endif]-->
     @yield('head')
 </head>
-<body class="fixed sidebar-mini skin-purple hold-transition">
+<body class="fixed sidebar-mini hold-transition {{ config('arcanesoft.foundation.skin', 'skin-purple') }}">
     <div id="app" class="wrapper">
         @include('foundation::admin._template.header')
 
-        @include('foundation::admin._template.sidebar-main')
+        @include(Arcanesoft\Foundation\ViewComposers\SidebarComposer::VIEW)
 
         {{-- Content Wrapper. Contains page content --}}
         <main class="content-wrapper">

diff --git a/resources/views/admin/system/information/index.blade.php b/resources/views/admin/system/information/index.blade.php
@@ -8,10 +8,10 @@
             @include('foundation::admin.system.information._includes.application')
         </div>
         <div class="col-md-4">
-            @include(Arcanesoft\Foundation\ViewComposers\System\ServerRequirementsComposer::VIEW_NAME)
+            @include(Arcanesoft\Foundation\ViewComposers\System\ServerRequirementsComposer::VIEW)
         </div>
         <div class="col-md-4">
-            @include(Arcanesoft\Foundation\ViewComposers\System\FoldersPermissionsComposer::VIEW_NAME)
+            @include(Arcanesoft\Foundation\ViewComposers\System\FoldersPermissionsComposer::VIEW)
         </div>
     </div>
 

diff --git a/src/FoundationServiceProvider.php b/src/FoundationServiceProvider.php
@@ -10,9 +10,9 @@
  */
 class FoundationServiceProvider extends PackageServiceProvider
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Properties
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Package name.
@@ -21,23 +21,9 @@ class FoundationServiceProvider extends PackageServiceProvider
      */
     protected $package = 'foundation';
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Getters & Setters
-     | ------------------------------------------------------------------------------------------------
-     */
-    /**
-     * Get the base path of the package.
-     *
-     * @return string
-     */
-    public function getBasePath()
-    {
-        return dirname(__DIR__);
-    }
-
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Register the service provider.
@@ -86,9 +72,9 @@ public function provides()
         ];
     }
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Services Functions
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Register Foundation service.

diff --git a/src/Providers/AuthorizationServiceProvider.php b/src/Providers/AuthorizationServiceProvider.php
@@ -13,9 +13,9 @@
  */
 class AuthorizationServiceProvider extends ServiceProvider
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Register any application authentication / authorization services.

diff --git a/src/Providers/CommandServiceProvider.php b/src/Providers/CommandServiceProvider.php
@@ -11,9 +11,9 @@
  */
 class CommandServiceProvider extends ServiceProvider
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Properties
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Console commands.

diff --git a/src/Providers/PackagesServiceProvider.php b/src/Providers/PackagesServiceProvider.php
@@ -13,9 +13,9 @@
  */
 class PackagesServiceProvider extends ServiceProvider
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Register the service provider.
@@ -50,16 +50,16 @@ public function provides()
         ];
     }
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Register Services
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
 
     //
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Register Packages
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Register the LogViewer Package.

diff --git a/src/Providers/RouteServiceProvider.php b/src/Providers/RouteServiceProvider.php
@@ -11,9 +11,20 @@
  */
 class RouteServiceProvider extends ServiceProvider
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Properties
+     | -----------------------------------------------------------------
+     */
+    /**
+     * The admin controller namespace for the application.
+     *
+     * @var string
+     */
+    protected $adminNamespace = 'Arcanesoft\\Foundation\\Http\\Controllers\\Admin';
+
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Define the routes for the application.
@@ -23,24 +34,17 @@ public function map()
         $this->mapAdminRoutes();
     }
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Other Functions
-     | ------------------------------------------------------------------------------------------------
-     */
     /**
      * Map the admin routes.
      */
     private function mapAdminRoutes()
     {
-        $attributes = $this->getAdminAttributes(
-            'foundation.',
-            'Arcanesoft\\Foundation\\Http\\Controllers\\Admin'
-        );
-
-        $this->group($attributes, function () {
-            Routes\Admin\DashboardRoute::register();
-            Routes\Admin\SettingsRoutes::register();
-            Routes\Admin\SystemRoutes::register();
+        $this->adminGroup(function () {
+            $this->name('foundation.')->group(function () {
+                Routes\Admin\DashboardRoute::register();
+                Routes\Admin\SettingsRoutes::register();
+                Routes\Admin\SystemRoutes::register();
+            });
         });
     }
 }
diff --git a/src/Providers/ViewComposerServiceProvider.php b/src/Providers/ViewComposerServiceProvider.php
@@ -1,9 +1,7 @@
 <?php namespace Arcanesoft\Foundation\Providers;
 
 use Arcanedev\Support\Providers\ViewComposerServiceProvider as ServiceProvider;
-use Arcanesoft\Foundation\ViewComposers\SidebarComposer;
-use Arcanesoft\Foundation\ViewComposers\System\FoldersPermissionsComposer;
-use Arcanesoft\Foundation\ViewComposers\System\ServerRequirementsComposer;
+use Arcanesoft\Foundation\ViewComposers;
 
 /**
  * Class     ViewComposerServiceProvider
@@ -13,18 +11,18 @@
  */
 class ViewComposerServiceProvider extends ServiceProvider
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Properties
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * Register the composer classes.
      *
      * @var array
      */
     protected $composerClasses = [
-        SidebarComposer::VIEW_NAME            => SidebarComposer::class,
-        ServerRequirementsComposer::VIEW_NAME => ServerRequirementsComposer::class,
-        FoldersPermissionsComposer::VIEW_NAME => FoldersPermissionsComposer::class,
+        ViewComposers\SidebarComposer::VIEW                   => ViewComposers\SidebarComposer::class,
+        ViewComposers\System\ServerRequirementsComposer::VIEW => ViewComposers\System\ServerRequirementsComposer::class,
+        ViewComposers\System\FoldersPermissionsComposer::VIEW => ViewComposers\System\FoldersPermissionsComposer::class,
     ];
 }
diff --git a/src/ViewComposers/SidebarComposer.php b/src/ViewComposers/SidebarComposer.php
@@ -16,7 +16,7 @@ class SidebarComposer
      |  Constants
      | ------------------------------------------------------------------------------------------------
      */
-    const VIEW_NAME = 'foundation::admin._template.sidebar-main';
+    const VIEW = 'foundation::admin._template.sidebar-main';
 
     /* ------------------------------------------------------------------------------------------------
      |  Properties

diff --git a/src/ViewComposers/System/FoldersPermissionsComposer.php b/src/ViewComposers/System/FoldersPermissionsComposer.php
@@ -14,7 +14,7 @@ class FoldersPermissionsComposer
      |  Constants
      | ------------------------------------------------------------------------------------------------
      */
-    const VIEW_NAME = 'foundation::admin.system.information._includes.folders-permissions';
+    const VIEW = 'foundation::admin.system.information._includes.folders-permissions';
 
     /* ------------------------------------------------------------------------------------------------
      |  Main Functions

diff --git a/src/ViewComposers/System/ServerRequirementsComposer.php b/src/ViewComposers/System/ServerRequirementsComposer.php
@@ -14,7 +14,7 @@ class ServerRequirementsComposer
      |  Constants
      | ------------------------------------------------------------------------------------------------
      */
-    const VIEW_NAME = 'foundation::admin.system.information._includes.server-requirements';
+    const VIEW = 'foundation::admin.system.information._includes.server-requirements';
 
     /* ------------------------------------------------------------------------------------------------
      |  Main Functions