Move flag icons to public/images/flags

Arbify · Jun 12, 2020 · a426d8f · a426d8f
1 parent 4c5f4f1
commit a426d8f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/app/Repositories/CountryFlagRepository.php b/app/Repositories/CountryFlagRepository.php
@@ -4,13 +4,13 @@
 
 namespace Arbify\Repositories;
 
-use Storage;
-
 class CountryFlagRepository implements \Arbify\Contracts\Repositories\CountryFlagRepository
 {
     public function getAllFlags(): array
     {
-        return collect(Storage::disk('public')->allFiles('flags'))
+        $flags = glob(resource_path('images/flags') . '/*.svg');
+
+        return collect($flags)
             ->map(fn($flagPath) => basename($flagPath, '.svg'))
             ->toArray();
     }

diff --git a/resources/views/languages/index.blade.php b/resources/views/languages/index.blade.php
@@ -36,7 +36,7 @@
                     <tr>
                         <td class="p-0 text-center align-middle">
                             @if(!is_null($language->flag))
-                                <img src="{{ asset("storage/flags/$language->flag.svg") }}" alt="" class="country-flag">
+                                <img src="{{ asset("images/flags/$language->flag.svg") }}" alt="" class="country-flag">
                             @endif
                         </td>
                         <td class="align-middle">{{ $language->code }}</td>

diff --git a/resources/views/partials/languages-options.blade.php b/resources/views/partials/languages-options.blade.php
@@ -3,7 +3,8 @@
             @empty($language->flag))
                 data-content="<span class='country-flag-selectpicker-placeholder'></span> {{ $language->getDisplayName() }}"
             @else
-                data-content="<img src='{{ asset("storage/flags/$language->flag.svg") }}' alt='' class='country-flag-selectpicker'> {{ $language->getDisplayName() }}"
+                data-content="<img src='{{ asset("images/flags/$language->flag.svg") }}' alt='' class='country-flag-selectpicker'>
+                {{ $language->getDisplayName() }}"
             @endif
             {{ $selected($language) ? 'selected' : '' }}>
         {{ $language->getDisplayName() }}

diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php
@@ -60,7 +60,7 @@
                                 @foreach($project->languages as $language)
                                     @if(!is_null($language->flag))
                                         <li>
-                                            <img src="{{ asset("storage/flags/$language->flag.svg") }}"
+                                            <img src="{{ asset("images/flags/$language->flag.svg") }}"
                                                  alt="{{ $language->getDisplayName() }}">
                                         </li>
                                     @endif

diff --git a/resources/views/projects/languages/index.blade.php b/resources/views/projects/languages/index.blade.php
@@ -34,7 +34,7 @@
                         <tr>
                             <td class="py-0 align-middle">
                                 @if(!is_null($language->flag))
-                                    <img src="{{ asset("storage/flags/$language->flag.svg") }}" alt="" class="country-flag">
+                                    <img src="{{ asset("images/flags/$language->flag.svg") }}" alt="" class="country-flag">
                                 @endif
                             </td>
                             <td>

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -13,4 +13,4 @@ const mix = require('laravel-mix');
 
 mix.js('resources/js/app.js', 'public/js')
     .sass('resources/sass/app.scss', 'public/css')
-    .copyDirectory('resources/images/flags', 'storage/app/public/flags');
+    .copyDirectory('resources/images', 'public/images');