Move images to asset pipeline

This reverts commit 63f6567.
openfoodfoundation · Apr 13, 2023 · 5d2c156 · 5d2c156
1 parent 2a44789
commit 5d2c156
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/models/spree/app_configuration.rb b/app/models/spree/app_configuration.rb
@@ -27,7 +27,7 @@ module Spree
   class AppConfiguration < Preferences::Configuration
     # Should state/state_name be required
     preference :address_requires_state, :boolean, default: true
-    preference :admin_interface_logo, :string, default: '/default_images/ofn-logo.png'
+    preference :admin_interface_logo, :string, default: 'ofn-logo.png'
     preference :admin_products_per_page, :integer, default: 10
     # Should only be true if you don't need to track inventory
     preference :allow_backorder_shipping, :boolean, default: false
@@ -46,7 +46,7 @@ class AppConfiguration < Preferences::Configuration
     preference :default_seo_title, :string, default: ''
     preference :hide_cents, :boolean, default: false
     preference :layout, :string, default: 'darkswarm'
-    preference :logo, :string, default: '/default_images/ofn-logo.png'
+    preference :logo, :string, default: 'ofn-logo.png'
 
     # Maximum nesting level in taxons menu
     preference :max_level_in_taxons_menu, :integer, default: 1

diff --git a/config/webpacker.yml b/config/webpacker.yml
@@ -14,7 +14,7 @@ default: &default
     'vendor',
     'app/webpacker/css',
     'app/assets/fonts',
-    'app/webpacker/images',
+    'app/assets/images',
     'engines/web/app/assets/stylesheets',
     'app/components'
   ]

diff --git a/spec/support/file_helper.rb b/spec/support/file_helper.rb
@@ -10,10 +10,10 @@ def white_logo_file
   end
 
   def black_logo_path
-    Rails.root.join('app/webpacker/images/logo-black.png')
+    Rails.root.join('app/assets/images/logo-black.png')
   end
 
   def white_logo_path
-    Rails.root.join('app/webpacker/images/logo-white.png')
+    Rails.root.join('app/assets/images/logo-white.png')
   end
 end