From e7489965c5a081ba7d83d00c3e299ba279729de4 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Tue, 16 Feb 2021 15:56:32 -0800 Subject: [PATCH] move map icons to public/ --- app/serializers/api/cached_enterprise_serializer.rb | 2 +- .../api/enterprise_shopfront_list_serializer.rb | 2 +- app/services/image_path_generator.rb | 10 ---------- .../map_icons}/map_001-producer-only.svg | 0 .../map_icons}/map_002-producer-only-profile.svg | 0 .../map_icons}/map_003-producer-shop.svg | 0 .../map_icons}/map_004-producer-shop-profile.svg | 0 .../assets/images => public/map_icons}/map_005-hub.svg | 0 .../map_icons}/map_006-hub-profile.svg | 0 .../images => public/map_icons}/map_007-shop.svg | 0 .../map_icons}/map_008-shop-profile.svg | 0 .../images => public/map_icons}/map_009-cluster.svg | 0 12 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 app/services/image_path_generator.rb rename {app/assets/images => public/map_icons}/map_001-producer-only.svg (100%) rename {app/assets/images => public/map_icons}/map_002-producer-only-profile.svg (100%) rename {app/assets/images => public/map_icons}/map_003-producer-shop.svg (100%) rename {app/assets/images => public/map_icons}/map_004-producer-shop-profile.svg (100%) rename {app/assets/images => public/map_icons}/map_005-hub.svg (100%) rename {app/assets/images => public/map_icons}/map_006-hub-profile.svg (100%) rename {app/assets/images => public/map_icons}/map_007-shop.svg (100%) rename {app/assets/images => public/map_icons}/map_008-shop-profile.svg (100%) rename {app/assets/images => public/map_icons}/map_009-cluster.svg (100%) diff --git a/app/serializers/api/cached_enterprise_serializer.rb b/app/serializers/api/cached_enterprise_serializer.rb index 6239cfb19c..47892c8eda 100644 --- a/app/serializers/api/cached_enterprise_serializer.rb +++ b/app/serializers/api/cached_enterprise_serializer.rb @@ -129,7 +129,7 @@ module Api producer_shop: "map_003-producer-shop.svg", producer: "map_001-producer-only.svg", } - ImagePathGenerator.call(icons[enterprise.category]) + "map_icons/" + icons[enterprise.category] end # Choose regular icon font for enterprises. diff --git a/app/serializers/api/enterprise_shopfront_list_serializer.rb b/app/serializers/api/enterprise_shopfront_list_serializer.rb index 0dccfaa1c2..c82d9f1d8c 100644 --- a/app/serializers/api/enterprise_shopfront_list_serializer.rb +++ b/app/serializers/api/enterprise_shopfront_list_serializer.rb @@ -19,7 +19,7 @@ module Api producer_shop: "map_003-producer-shop.svg", producer: "map_001-producer-only.svg", } - ImagePathGenerator.call(icons[enterprise.category]) + "map_icons/" + icons[enterprise.category] end def icon_font diff --git a/app/services/image_path_generator.rb b/app/services/image_path_generator.rb deleted file mode 100644 index 48c9ee93d1..0000000000 --- a/app/services/image_path_generator.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: true - -class ImagePathGenerator - # Since Rails 4 has adjusted the way assets paths are handled, we have to access certain - # asset-based helpers like this when outside of a view or controller context. - # See: https://stackoverflow.com/a/16609815 - def self.call(path) - ActionController::Base.helpers.image_path(path) - end -end diff --git a/app/assets/images/map_001-producer-only.svg b/public/map_icons/map_001-producer-only.svg similarity index 100% rename from app/assets/images/map_001-producer-only.svg rename to public/map_icons/map_001-producer-only.svg diff --git a/app/assets/images/map_002-producer-only-profile.svg b/public/map_icons/map_002-producer-only-profile.svg similarity index 100% rename from app/assets/images/map_002-producer-only-profile.svg rename to public/map_icons/map_002-producer-only-profile.svg diff --git a/app/assets/images/map_003-producer-shop.svg b/public/map_icons/map_003-producer-shop.svg similarity index 100% rename from app/assets/images/map_003-producer-shop.svg rename to public/map_icons/map_003-producer-shop.svg diff --git a/app/assets/images/map_004-producer-shop-profile.svg b/public/map_icons/map_004-producer-shop-profile.svg similarity index 100% rename from app/assets/images/map_004-producer-shop-profile.svg rename to public/map_icons/map_004-producer-shop-profile.svg diff --git a/app/assets/images/map_005-hub.svg b/public/map_icons/map_005-hub.svg similarity index 100% rename from app/assets/images/map_005-hub.svg rename to public/map_icons/map_005-hub.svg diff --git a/app/assets/images/map_006-hub-profile.svg b/public/map_icons/map_006-hub-profile.svg similarity index 100% rename from app/assets/images/map_006-hub-profile.svg rename to public/map_icons/map_006-hub-profile.svg diff --git a/app/assets/images/map_007-shop.svg b/public/map_icons/map_007-shop.svg similarity index 100% rename from app/assets/images/map_007-shop.svg rename to public/map_icons/map_007-shop.svg diff --git a/app/assets/images/map_008-shop-profile.svg b/public/map_icons/map_008-shop-profile.svg similarity index 100% rename from app/assets/images/map_008-shop-profile.svg rename to public/map_icons/map_008-shop-profile.svg diff --git a/app/assets/images/map_009-cluster.svg b/public/map_icons/map_009-cluster.svg similarity index 100% rename from app/assets/images/map_009-cluster.svg rename to public/map_icons/map_009-cluster.svg