Changes on design, publish

New views to publish like login, logo sidebar, automated alerts generators, changes on design.

README.md

@@ -17,5 +17,5 @@ php artisan vendor:publish --tag=mage-publish
 ### Update scripts
 
 ```
-php artisan vendor:publish --tag=mage-scripts --force
+php artisan vendor:publish --tag=mage-assets --force
 ```

composer.json

@@ -15,9 +15,6 @@
         }
     ],
     "autoload": {
-        "files" : [
-            "src/app/Helpers/IsRoute.php"
-        ],
         "psr-4": {
             "Omatech\\Mage\\": "src"
         }

package.json

@@ -16,17 +16,21 @@
   "license": "ISC",
   "dependencies": {},
   "devDependencies": {
-    "admin-lte": "git://github.com/almasaeed2010/AdminLTE.git#v3-dev",
+    "@fortawesome/fontawesome-free": "^5.7.2",
     "axios": "^0.18.0",
     "bootstrap": "^4.3.0",
+    "datatables": "^1.10.18",
+    "datatables.net-bs4": "^1.10.19",
+    "feather-icons": "^4.17.0",
     "ionicons": "^4.5.5",
     "jquery": "^3.3.1",
     "laravel-mix": "^4.0.14",
+    "open-sans-fonts": "^1.5.0",
     "popper.js": "^1.14.7",
     "resolve-url-loader": "2.3.1",
     "sass": "^1.17.0",
     "sass-loader": "7.*",
-    "source-sans-pro": "^2.45.0",
+    "select2": "^4.0.6-rc.1",
     "sweetalert": "^2.1.2",
     "vue-template-compiler": "^2.6.5"
   }

src/MageServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use Omatech\Mage\App\Providers\ViewServiceProvider;
+use Omatech\Mage\App\Providers\HelpersServiceProvider;
 use Omatech\Mage\App\Providers\PublishServiceProvider;
 use Omatech\Mage\App\Providers\RoutingServiceProvider;
 use Omatech\Mage\App\Providers\MiddlewareServiceProvider;
@@ -41,6 +42,7 @@ public function register()
         $this->app->register(ViewServiceProvider::class);
         $this->app->register(RoutingServiceProvider::class);
         $this->app->register(MiddlewareServiceProvider::class);
+        $this->app->register(HelpersServiceProvider::class);
 
         $this->app->register(SpatiePermissionsServiceProvider::class);
         $this->app->register(SpatieTranslatableServiceProvider::class);

src/app/Helpers/GetCurrentGitCommit.php

@@ -0,0 +1,13 @@
+<?php
+
+if (!function_exists('getCurrentGitCommit')) {
+    function getCurrentGitCommit()
+    {
+        $commitHash = trim(exec('git log --pretty="%h" -n1 HEAD'));
+
+        $commitDate = new \DateTime(trim(exec('git log -n1 --pretty=%ci HEAD')));
+        $commitDate->setTimezone(new \DateTimeZone('Europe/Madrid'));
+
+        return sprintf('#%s - (%s)', $commitHash, $commitDate->format('d/m/Y H:i:s'));
+    }
+}

src/app/Providers/HelpersServiceProvider.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Omatech\Mage\App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class HelpersServiceProvider extends ServiceProvider
+{
+    /**
+     * Register any other events for your application.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->helpers();
+    }
+
+    /**
+     * Register the application middlewares.
+     *
+     * @return void
+     */
+    private function helpers()
+    {
+        $files = array_diff(scandir(__DIR__.'/../Helpers/'), array('..', '.'));
+
+        foreach ($files as $file) {
+            require_once __DIR__.'/../Helpers/'.$file;
+        }
+    }
+}

src/app/Providers/PublishServiceProvider.php

@@ -46,29 +46,34 @@ private function assets()
             __DIR__.'/../../resources/dist/mage.js' => public_path('vendor/mage/mage.js'),
             __DIR__.'/../../resources/dist/mage.css' => public_path('vendor/mage/mage.css'),
             __DIR__.'/../../resources/dist/mix-manifest.json' => public_path('vendor/mage/mix-manifest.json'),
-        ], 'mage-scripts');
+            __DIR__.'/../../resources/img/' => public_path('vendor/mage/img/'),
+        ], 'mage-publish');
 
         $this->publishes([
             __DIR__.'/../../resources/dist/mage.js' => public_path('vendor/mage/mage.js'),
             __DIR__.'/../../resources/dist/mage.css' => public_path('vendor/mage/mage.css'),
             __DIR__.'/../../resources/dist/mix-manifest.json' => public_path('vendor/mage/mix-manifest.json'),
-            __DIR__.'/../../resources/img/' => public_path('vendor/mage/img/'),
-            __DIR__.'/../../resources/favicon/' => public_path('vendor/mage/favicon/'),
-        ], 'mage-publish');
+        ], 'mage-assets');
     }
 
     private function fonts()
     {
         $this->publishes([
             __DIR__.'/../../resources/dist/fonts' => public_path('fonts'),
         ], 'mage-publish');
+
+        $this->publishes([
+            __DIR__.'/../../resources/dist/fonts' => public_path('fonts'),
+        ], 'mage-assets');
     }
 
     private function views()
     {
         $this->publishes([
             __DIR__.'/../../resources/views/components/sidebar/sections/extends' => resource_path('views/vendor/mage/components/sidebar/sections/extends'),
+            __DIR__.'/../../resources/views/components/sidebar/logo.blade.php' => resource_path('views/vendor/mage/components/sidebar/logo.blade.php'),
             __DIR__.'/../../resources/views/components/favicon.blade.php' => resource_path('views/vendor/mage/components/favicon.blade.php'),
+            __DIR__.'/../../resources/views/pages/auth' => resource_path('views/vendor/mage/pages/auth'),
         ], 'mage-publish');
     }
 }