From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 28 Aug 2019 18:30:54 +0000 (+0200)
Subject: wip #2965 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=79c3fead014099c9a2868c335252a7ca1bec5eab;p=cubist_cms-back.git

wip #2965 @1
---

diff --git a/src/CubistBackpackServiceProvider.php b/src/CubistBackpackServiceProvider.php
index 6fb6111..d9f768e 100644
--- a/src/CubistBackpackServiceProvider.php
+++ b/src/CubistBackpackServiceProvider.php
@@ -40,6 +40,10 @@ class CubistBackpackServiceProvider extends ServiceProvider
         Blade::directive('vendor_asset', function ($path) {
             return vendor_asset($path);
         });
+
+        Blade::directive('favicon', function () {
+            return "<?php echo \$__env->make('" . self::NAMESPACE . "::favicon', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>";
+        });
     }
 
 
diff --git a/src/app/Http/Controllers/CubistPWAController.php b/src/app/Http/Controllers/CubistPWAController.php
index 1499e09..e943f4b 100644
--- a/src/app/Http/Controllers/CubistPWAController.php
+++ b/src/app/Http/Controllers/CubistPWAController.php
@@ -7,6 +7,10 @@ use Illuminate\Http\Request;
 
 class CubistPWAController extends CubistFrontController
 {
+    public static $androidSizes = [36, 48, 72, 96, 144, 192, 256, 512, 1024];
+    public static $iosSizes = [57, 72, 76, 114, 120, 144, 152, 167, 182];
+    public static $faviconSizes = [16, 32,48,96,144, 192,256,384,512];
+
     public function manifest(Request $request)
     {
         $icons = [];
diff --git a/src/app/Magic/Models/CubistMagicPageModel.php b/src/app/Magic/Models/CubistMagicPageModel.php
index ca5ebdb..3f4bd0c 100644
--- a/src/app/Magic/Models/CubistMagicPageModel.php
+++ b/src/app/Magic/Models/CubistMagicPageModel.php
@@ -76,5 +76,10 @@ class CubistMagicPageModel extends CubistMagicModel
             'fake' => true,
             'store_in' => 'seo',
         ]);
+
+//        $this->addField(['name'=>'url_alias',
+//            'label'=>'URL Alias',
+//            'type'=>'Table',
+//            'hint'=>'Liste des anciennes URL correspondant à cette page. Peut être utilisé lors de la migration ']);
     }
 }
diff --git a/src/app/Magic/Models/Settings.php b/src/app/Magic/Models/Settings.php
index 1d6e437..83cd986 100644
--- a/src/app/Magic/Models/Settings.php
+++ b/src/app/Magic/Models/Settings.php
@@ -3,6 +3,8 @@
 
 namespace Cubist\Backpack\app\Magic\Models;
 
+use Cubist\Backpack\app\Http\Controllers\CubistPWAController;
+use Spatie\MediaLibrary\Models\Media;
 
 class Settings extends CubistMagicModel
 {
@@ -13,6 +15,26 @@ class Settings extends CubistMagicModel
         'plural' => 'paramètres',
         'oneinstance' => true];
 
+    public function registerMediaConversions(Media $media = null)
+    {
+        foreach (CubistPWAController::$androidSizes as $size) {
+            $this->addMediaConversion('favicon_android_' . $size)
+                ->width($size)
+                ->height($size)
+                ->format('png');
+        }
+        foreach (CubistPWAController::$iosSizes as $size) {
+            $this->addMediaConversion('favicon_ios_' . $size)
+                ->width($size)
+                ->height($size)->format('png');
+        }
+        foreach (CubistPWAController::$faviconSizes as $size) {
+            $this->addMediaConversion('favicon_' . $size)
+                ->width($size)
+                ->height($size)->format('png');
+        }
+    }
+
     public function setFields()
     {
         parent::setFields();
diff --git a/src/resources/views/favicon.blade.php b/src/resources/views/favicon.blade.php
new file mode 100644
index 0000000..e14cdaf
--- /dev/null
+++ b/src/resources/views/favicon.blade.php
@@ -0,0 +1,6 @@
+@foreach(Cubist\Backpack\app\Http\Controllers\CubistPWAController::$faviconSizes as $size)
+    <link rel="icon" type="image/png" sizes="{{$size}}x{{$size}}" href="{{ $global->getImageUrl('favicon','favicon_'.$size) }}" />
+@endforeach
+@foreach(Cubist\Backpack\app\Http\Controllers\CubistPWAController::$iosSizes as $size)
+    <link rel="apple-touch-icon" sizes="{{$size}}x{{$size}}" href="{{ $global->getImageUrl('favicon_ios','favicon_ios_'.$size) }}" type="image/png" />
+@endforeach