From 6af6f51af8ca1f7e7d345b4137f63799dc31928b Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Fri, 9 Aug 2019 16:13:14 +0200
Subject: [PATCH 1/2] Use a white svg icon for the Solidus menu icon

Fits better into the new Alchemy 4.1 admin colors.
---
 .../alchemy/solidus/alchemy_module_icon.png       | Bin 540 -> 0 bytes
 config/initializers/alchemy.rb                    |   4 +++-
 lib/alchemy/solidus/engine.rb                     |   6 ------
 .../solidus/install/templates/alchemy.rb.tt       |   4 +++-
 4 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 app/assets/images/alchemy/solidus/alchemy_module_icon.png

diff --git a/app/assets/images/alchemy/solidus/alchemy_module_icon.png b/app/assets/images/alchemy/solidus/alchemy_module_icon.png
deleted file mode 100644
index 6a4fc21a9c45cfc1c22721337537e63a6d3469a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~ta6AQWsu31<KR0jWtu
zK~zY`)s{U=98na8pL4x4`xRW#poy4(iiL$(Y8zV{D`RJ4lO|OPyI5HTQl&~^ErN|8
z_zSdJ0^1~z#(WUPsPSXn-O0>7DHJheXWfZAg$Je?xbtw{`=0lV07{BwNV#mImz_Do
zo97S7dIon(e;o!+tBzNz2UG)X4Un<I^mu`sZ@36tQ$WEt9A7vV*M2rs+r}OI?O^9)
zmF0~i!l-c@z7>{cx*2)oCzA+3fM1n}^4B^+3?SnPCsl|1&n4>>MFhI?hSxJaj1Bnz
z92U8wi=4vaF3a4+1J+;mGdY}XuT71>ryl|H@At7C!i%Y5`{%$Zl)u&aei-tk$HTXh
z!k{TAifCGsEMP=%X+?!xJx)P24S;|cKs8Z1Chh>0METn?;5<;i9EA+_TE?GdkQO<K
zT=aJ97=V?9K8Aa}HUog|&oyS>?XmHp!ogWYE7Q<4>@L0kca?T)ly+;^VRxIOY_qT{
z<_%*5K4H{YZ{I>OXPQbC3-Am)8_hF0l#Ts>0ENuu!bt?EhstKTLe3f@C01*_u`<J$
e-75F~ui_8xWrw77w*O850000<MNUMnLSTYlb?5j1

diff --git a/config/initializers/alchemy.rb b/config/initializers/alchemy.rb
index 5d55156..ca9c4f2 100644
--- a/config/initializers/alchemy.rb
+++ b/config/initializers/alchemy.rb
@@ -5,7 +5,9 @@
     controller: 'spree/admin/orders',
     action: 'index',
     name: 'Store',
-    image: 'alchemy/solidus/alchemy_module_icon.png',
+    inline_image: '<svg version="1.1" width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" style="vertical-align: middle">
+      <path d="M 6.687 21.839 L 17.314 21.839 L 17.314 2.162 L 6.687 2.162 Z M 19.476 24 L 4.525 24 L 4.525 0 L 19.476 0 Z M 13.89 17 C 13.307 16.662 13.078 16.287 13.05 15.313 L 13.05 8.574 C 13.05 6.554 12.05 5.814 9.911 4.794 L 8.99 6.434 L 10.111 7.074 C 10.693 7.412 10.923 7.786 10.951 8.761 L 10.951 15.5 C 10.951 17.52 11.951 18.26 14.09 19.279 L 15.01 17.64 Z" fill="currentColor"/>
+    </svg>',
     data: { turbolinks: false },
     sub_navigation: [
       {
diff --git a/lib/alchemy/solidus/engine.rb b/lib/alchemy/solidus/engine.rb
index 4de5635..439fd5a 100644
--- a/lib/alchemy/solidus/engine.rb
+++ b/lib/alchemy/solidus/engine.rb
@@ -8,12 +8,6 @@ module Solidus
     class Engine < ::Rails::Engine
       engine_name 'alchemy_solidus'
 
-      initializer 'alchemy_solidus.assets' do |app|
-        app.config.assets.precompile += [
-          'alchemy/solidus/alchemy_module_icon.png'
-        ]
-      end
-
       config.to_prepare do
         Alchemy.register_ability ::Spree::Ability
         ::Spree::Ability.register_ability ::Alchemy::Permissions
diff --git a/lib/generators/alchemy/solidus/install/templates/alchemy.rb.tt b/lib/generators/alchemy/solidus/install/templates/alchemy.rb.tt
index d3894c4..a436908 100644
--- a/lib/generators/alchemy/solidus/install/templates/alchemy.rb.tt
+++ b/lib/generators/alchemy/solidus/install/templates/alchemy.rb.tt
@@ -5,7 +5,9 @@ Alchemy::Modules.register_module({
     controller: 'spree/admin/orders',
     action: 'index',
     name: 'Store',
-    image: 'alchemy/solidus/alchemy_module_icon.png',
+    inline_image: '<svg version="1.1" width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" style="vertical-align: middle">
+      <path d="M 6.687 21.839 L 17.314 21.839 L 17.314 2.162 L 6.687 2.162 Z M 19.476 24 L 4.525 24 L 4.525 0 L 19.476 0 Z M 13.89 17 C 13.307 16.662 13.078 16.287 13.05 15.313 L 13.05 8.574 C 13.05 6.554 12.05 5.814 9.911 4.794 L 8.99 6.434 L 10.111 7.074 C 10.693 7.412 10.923 7.786 10.951 8.761 L 10.951 15.5 C 10.951 17.52 11.951 18.26 14.09 19.279 L 15.01 17.64 Z" fill="currentColor"/>
+    </svg>',
     data: { turbolinks: false },
     sub_navigation: [
       {

From 0a47fe225115874cb9f0b39eaa7f4462650bc214 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Fri, 9 Aug 2019 17:39:18 +0200
Subject: [PATCH 2/2] Enforce installation in dummy app during tests

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 5ceb816..bdc707d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,7 +21,7 @@ task :test_setup do
       export RAILS_ENV=test && \
       bin/rake db:environment:set db:drop && \
       bin/rails g spree:install --force --quiet --auto-accept --no-seed --no-sample && \
-      bin/rails g alchemy:solidus:install --auto-accept
+      bin/rails g alchemy:solidus:install --auto-accept --force
     SETUP
     exit($?.exitstatus) unless $?.success?
   end