🐛 getCustomIcon()

MarceauKa · Oct 30, 2019 · 2fdc536 · 2fdc536
1 parent 38d72bf
commit 2fdc536
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/app/Http/Controllers/PwaController.php b/app/Http/Controllers/PwaController.php
@@ -24,7 +24,7 @@ public function manifest(Request $request, Shaarli $shaarli)
             'prefer_related_applications' => false,
             'icons' => [
                 [
-                    'src' => url($shaarli->getCustomIcon()),
+                    'src' => $shaarli->getCustomIconUrl(),
                     'type' => 'image/png',
                     'sizes' => '192x192 512x512',
                 ]

diff --git a/app/Services/Shaarli/Concerns/HandleCustomSettings.php b/app/Services/Shaarli/Concerns/HandleCustomSettings.php
@@ -24,6 +24,17 @@ public function handleCustomIcon(?UploadedFile $value): void
         return;
     }
 
+    public function getCustomIconUrl(): string
+    {
+        $icon = $this->getCustomIcon();
+
+        if ($icon === $this->getSettingsConfig()['custom_icon']['default']) {
+            return url($icon);
+        }
+
+        return Storage::disk('public')->url($icon);
+    }
+
     public function handleCustomBackground($value): void
     {
         $data = (array)json_decode($value);

diff --git a/resources/views/layouts/partials/head.blade.php b/resources/views/layouts/partials/head.blade.php
@@ -12,7 +12,7 @@
 @stack('meta')
 <link rel="manifest" href="{{ route('pwa.manifest') }}">
 <base href="{{ url()->route('home') }}">
-<link rel="icon" type="image/png" href="{{ url(app('shaarli')->getCustomIcon()) }}">
+<link rel="icon" type="image/png" href="{{ app('shaarli')->getCustomIconUrl() }}">
 <link rel="dns-prefetch" href="//fonts.gstatic.com">
 <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
 <link href="{{ mix('css/app.css') }}" rel="stylesheet">

diff --git a/resources/views/layouts/partials/navbar.blade.php b/resources/views/layouts/partials/navbar.blade.php
@@ -1,7 +1,7 @@
 <nav class="navbar navbar-expand-md navbar-light mb-3">
     <div class="container">
         <a class="navbar-brand" href="{{ url('/') }}">
-            <img src="{{ url(app('shaarli')->getCustomIcon()) }}">
+            <img src="{{ app('shaarli')->getCustomIconUrl() }}">
             <span>
                 {{ app('shaarli')->getName() }}
                 <sup class="fa-stack" v-if="!online">

diff --git a/resources/views/manage/settings.blade.php b/resources/views/manage/settings.blade.php
@@ -96,7 +96,7 @@
                             <input type="file" class="custom-file-input" name="custom_icon" id="custom_icon" accept="image/png" />
                         </div>
                         <div class="input-group-append">
-                            <img src="{{ url(app('shaarli')->getCustomIcon()) }}" class="img-fluid img-thumbnail" style="height: 37px;" />
+                            <img src="{{ app('shaarli')->getCustomIconUrl() }}" class="img-fluid img-thumbnail" style="height: 37px;" />
                         </div>
                     </div>
                     @error('custom_icon')