Merge branch 'develop'

Author: mckenziearts

composer.json

@@ -16,11 +16,13 @@
     "illuminate/support": "~5",
     "cartalyst/sentinel": "2.0.*",
     "cyrildewit/eloquent-viewable": "^3.0",
+    "composer/semver": "^1.4",
     "danielme85/laravel-cconverter": "^0.2.1",
     "ext-zip": "*",
     "ext-json": "*",
     "intervention/image": "^2.4",
     "intervention/imagecache": "^2.3",
+    "knplabs/packagist-api": "^1.5",
     "laravel/scout": "^7.1",
     "league/fractal": "^0.17.0",
     "mcamara/laravel-localization": "^1.3",

readme.md

@@ -9,7 +9,9 @@
 ## Introduction
 
 Shopper is an Admin Management build for Laravel 5.6+ (Not yet compatible with Laravel 5.8) which includes all the necessary for your online market application. This project is inspired by [Orchid/Platform](https://github.com/orchidsoftware/platform).
-This package is still in development.
+Please note that this package is still under active development.
+
+![Shopper Screenshot](https://pix.watch/kvtzzS/NK1CPv.png)
 
 ![Shopper Screenshot](https://pix.watch/kvtzzS/NK1CPv.png)
 

resources/views/pages/dashboard/index.blade.php

@@ -45,7 +45,25 @@
                                 </li>
                                 <li>
                                     <img src="{{ asset('/shopper/img/logo.svg') }}">
-                                    <span>{{ $shopper }}</span>
+                                    <span>
+                                        {{ $currentVersion }}
+                                        @if($updateAvailable)
+                                            <i class="fas fa-exclamation-circle text-warning"></i>
+                                        @else
+                                            <i class="fas fa-check-circle text-success"></i>
+                                        @endif
+                                    </span>
+                                </li>
+                                <li>
+                                    @if($updateAvailable)
+                                        <span class="text-warning">
+                                            {{ _('A new version of Shopper is available') }} - v{{ $latestVersion }}
+                                        </span>
+                                        <i class="fas fa-exclamation-circle text-warning"></i>
+                                    @else
+                                        <span>{{ __('You are up to date with Shopper') }}</span>
+                                        <i class="fas fa-check-circle text-success"></i>
+                                    @endif
                                 </li>
                             </ul>
                         </div>

src/Core/Version.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Mckenziearts\Shopper\Core;
+
+use Composer\Semver\Semver;
+use Composer\Semver\Comparator;
+use Composer\Semver\VersionParser;
+
+class Version extends Semver
+{
+    /**
+     * Normalize the version number.
+     *
+     * @param string $version
+     *
+     * @return string
+     */
+    public static function normalize($version)
+    {
+        $version = preg_replace('/^(v|\^|~)/', '', $version);
+        if (preg_match('/^\d\.\d$/', $version)) {
+            $version .= '.0';
+        }
+
+        return $version;
+    }
+    /**
+     * Get the last version number from a list of versions.
+     *
+     * @param array $versions
+     *
+     * @return string
+     */
+    public static function latest(array $versions)
+    {
+        // Normalize version numbers.
+        $versions = array_map(function ($version) {
+            return static::normalize($version);
+        }, $versions);
+        // Get the highest version number.
+        $latest = array_reduce($versions, function ($carry, $item) {
+            // Skip unstable versions.
+            if (VersionParser::parseStability($item) !== 'stable') {
+                return $carry;
+            }
+            return Comparator::greaterThan($carry, $item) ? $carry : $item;
+        }, '0.0.0');
+
+        return $latest;
+    }
+}

src/Http/Controllers/Backend/DashboardController.php

@@ -5,6 +5,7 @@
 use Algolia\ScoutExtended\Facades\Algolia;
 use Cartalyst\Sentinel\Laravel\Facades\Sentinel;
 use Illuminate\Support\Facades\DB;
+use Mckenziearts\Shopper\Core\Version;
 use Mckenziearts\Shopper\Http\Controllers\Controller;
 use Mckenziearts\Shopper\Plugins\Catalogue\Models\Brand;
 use Mckenziearts\Shopper\Plugins\Catalogue\Models\Category;
@@ -14,6 +15,7 @@
 use Mckenziearts\Shopper\Plugins\Users\Models\User;
 use Mckenziearts\Shopper\Plugins\Users\Repositories\UserRepository;
 use Mckenziearts\Shopper\Shopper;
+use Packagist\Api\Client;
 use Spatie\SslCertificate\SslCertificate;
 
 class DashboardController extends Controller
@@ -53,11 +55,20 @@ public function dashboard()
         $os = php_uname('s');
         $laravel = app()->version();
         $database = $this->getDatabase();
-        $shopper = Shopper::version();
         $php = phpversion();
 
         $algolia = $this->algoliaIndices();
 
+        $client = new Client();
+        $package = $client->get('mckenziearts/shopper');
+        $versions = array_map(function ($version) {
+            return $version->getVersion();
+        }, $package->getVersions());
+
+        $currentVersion = Shopper::version();
+        $latestVersion = Version::latest($versions);
+        $updateAvailable = version_compare($currentVersion, $latestVersion, '<');
+
         try {
             $certificate = SslCertificate::createForHostName(request()->getHost());
             $sslCertificate = [
@@ -79,10 +90,12 @@ public function dashboard()
                 'os',
                 'laravel',
                 'database',
-                'shopper',
                 'php',
                 'sslCertificate',
-                'algolia'
+                'algolia',
+                'currentVersion',
+                'latestVersion',
+                'updateAvailable'
             )
         );
     }