spree_storefront 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b5f53e77331921922ac1da27123087c2b06413b7e77bb9061709a3f4c331a6
-  data.tar.gz: 72d769742b732a7d2500dc4ce2ab6d25217198ac40d5010273b9ffb55a815a01
+  metadata.gz: 2d758772259f4e6e3ffd355b4252f2422bf78263a988a818c48e48d0c377655b
+  data.tar.gz: 49bbc7a193bdd072668c0de6ffce9586a1cc3b3b0c62be40e89b3c2313720ef4
 SHA512:
-  metadata.gz: e9eb50e07eee8427553b3ff7afb6e4e87a409c7a2bfdd0aa1fae44d31e146ef1595750f79e3a1e4a296390dfc3c9e9b589d17f3e3bf7131f277f859be4ea841d
-  data.tar.gz: 20e8fc5511fbedf98f50cdfe492e4765ca15fe39de324bd4988a2d03ac8b80b5e0a098cb59f0488d73b03cb75f086f02ef3bea757dbd6d0b5e3c434286cf7d88
+  metadata.gz: d129a479969498e9a6106a462ac4db503da5bf9ffae3a721c91ee74d3291bb3353fed199e0ac47bfcc3d96db1ea80fdd2422d32b9c2bb4450a28aaefb08aa8b1
+  data.tar.gz: ed4de551790ba08151199da2500b12f04f2b2d35573baa2c9c141436b04ff80547b551c0e48132994d74569a1cb4b05dffc1a1839853d74c5cd7d38622c655bb

data/app/controllers/concerns/spree/storefront/devise_concern.rb

@@ -0,0 +1,48 @@
+# This concern is used to include the necessary methods and helpers for the Devise controllers
+# It is used to avoid repeating the same code in each controller
+module Spree
+  module Storefront
+    module DeviseConcern
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :title
+        helper_method :stored_location
+        layout 'spree/storefront'
+
+        include Spree::Core::ControllerHelpers::Auth
+        include Spree::Core::ControllerHelpers::Store
+        include Spree::Core::ControllerHelpers::Order
+        include Spree::Core::ControllerHelpers::StrongParameters
+        include Spree::Core::ControllerHelpers::Locale
+        include Spree::Core::ControllerHelpers::Currency
+        include Spree::Core::ControllerHelpers::Turbo
+        include Spree::LocaleUrls
+        include Spree::ThemeConcern
+        include Spree::IntegrationsHelper if defined?(Spree::IntegrationsHelper)
+
+        helper 'spree/wishlist'
+        helper 'spree/currency'
+        helper 'spree/locale'
+        helper 'spree/storefront_locale'
+        helper 'spree/integrations' if defined?(Spree::IntegrationsHelper)
+      end
+
+      def stored_location
+        return unless defined?(after_sign_in_path_for)
+        return unless defined?(store_location_for)
+        return unless defined?(Devise)
+
+        path = after_sign_in_path_for(Devise.mappings.keys.first)
+
+        store_location_for(Devise.mappings.keys.first, path)
+
+        path
+      end
+
+      def password_path(_resource_or_scope = nil)
+        send("#{Spree.user_class.model_name.singular_route_key}_password_path")
+      end
+    end
+  end
+end

data/app/helpers/spree/storefront_helper.rb

@@ -52,9 +52,16 @@ module Spree
     end
 
     def svg_country_icon(country_code)
-      country_code = :us if country_code.to_s.downcase == 'en'
-      country_code = :jp if country_code.to_s.downcase == 'ja'
-      tag.span(class: "fi fi-#{country_code.downcase}")
+      language_to_country = {
+        'en' => 'us',
+        'ja' => 'jp',
+        'uk' => 'ua'
+      }
+
+      normalized_code = country_code.to_s.downcase
+      final_country_code = language_to_country.fetch(normalized_code, normalized_code)
+
+      tag.span(class: "fi fi-#{final_country_code}")
     end
 
     def show_account_pane?

data/app/views/themes/default/spree/shared/_account_pane.html.erb

@@ -20,7 +20,7 @@
       >
         <%= render 'spree/shared/icons/cross' %>
       </button>
-      <span class='text-xl font-medium uppercase leading-loose'><%= Spree.t(:account) %></span>
+      <span class='text-xl font-medium uppercase leading-none'><%= Spree.t(:account) %></span>
       <span></span>
     </div>
     <%= turbo_frame_tag "login", src: spree_login_path, loading: "lazy" %>

data/app/views/themes/default/spree/shared/_cart_pane.html.erb

@@ -24,7 +24,7 @@
       ) do %>
         <%= render 'spree/shared/icons/close' %>
       <% end %>
-      <span class='text-xl font-medium uppercase leading-loose'><%= Spree.t(:cart) %></span>
+      <span class='text-xl font-medium uppercase leading-none'><%= Spree.t(:cart) %></span>
       <span class='relative block w-6'>
         <%= render 'spree/shared/icons/cart' %>
         <span class='cart-counter w-full text-[8px] font-extrabold absolute top-[10px] text-center'>

data/lib/generators/spree/storefront/devise/devise_generator.rb

@@ -0,0 +1,47 @@
+require 'rails/generators'
+
+module Spree
+  module Storefront
+    module Generators
+      class DeviseGenerator < Rails::Generators::Base
+        desc 'Installs Spree Storefront Devise controllers'
+
+        def self.source_paths
+          [
+            File.expand_path('templates', __dir__),
+            File.expand_path('../templates', "../#{__FILE__}"),
+            File.expand_path('../templates', "../../#{__FILE__}")
+          ]
+        end
+
+        def install
+          template 'user_sessions_controller.rb', 'app/controllers/spree/user_sessions_controller.rb'
+          template 'user_registrations_controller.rb', 'app/controllers/spree/user_registrations_controller.rb'
+          template 'user_passwords_controller.rb', 'app/controllers/spree/user_passwords_controller.rb'
+
+          # add devise routes
+          insert_into_file 'config/routes.rb', after: "Rails.application.routes.draw do\n" do
+            <<-ROUTES.strip_heredoc.indent!(2)
+              Spree::Core::Engine.add_routes do
+                # Storefront routes
+                scope '(:locale)', locale: /\#{Spree.available_locales.join('|')\}/, defaults: { locale: nil } do
+                  devise_for(
+                    Spree.user_class.model_name.singular_route_key,
+                    class_name: Spree.user_class.to_s,
+                    path: :user,
+                    controllers: {
+                      sessions: 'spree/user_sessions',
+                      passwords: 'spree/user_passwords',
+                      registrations: 'spree/user_registrations'
+                    },
+                    router_name: :spree
+                  )
+                end
+              end
+            ROUTES
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/spree/storefront/devise/templates/user_passwords_controller.rb

@@ -0,0 +1,17 @@
+module Spree
+  class UserPasswordsController < ::Devise::PasswordsController
+    include Spree::Storefront::DeviseConcern
+
+    protected
+
+    def translation_scope
+      'devise.user_passwords'
+    end
+
+    private
+
+    def title
+      Spree.t(:forgot_password)
+    end
+  end
+end

data/lib/generators/spree/storefront/devise/templates/user_registrations_controller.rb

@@ -0,0 +1,17 @@
+module Spree
+  class UserRegistrationsController < ::Devise::RegistrationsController
+    include Spree::Storefront::DeviseConcern
+
+    protected
+
+    def translation_scope
+      'devise.user_registrations'
+    end
+
+    private
+
+    def title
+      Spree.t(:sign_up)
+    end
+  end
+end

data/lib/generators/spree/storefront/devise/templates/user_sessions_controller.rb

@@ -0,0 +1,17 @@
+module Spree
+  class UserSessionsController < ::Devise::SessionsController
+    include Spree::Storefront::DeviseConcern
+
+    protected
+
+    def translation_scope
+      'devise.user_sessions'
+    end
+
+    private
+
+    def title
+      Spree.t(:login)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_storefront
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-30 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.0.6
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ files:
 - app/controllers/concerns/spree/cart_methods.rb
 - app/controllers/concerns/spree/locale_urls.rb
 - app/controllers/concerns/spree/password_protected.rb
+- app/controllers/concerns/spree/storefront/devise_concern.rb
 - app/controllers/concerns/spree/theme_concern.rb
 - app/controllers/spree/account/addresses_controller.rb
 - app/controllers/spree/account/base_controller.rb
@@ -515,6 +516,10 @@ files:
 - config/initializers/heroicon.rb
 - config/locales/en.yml
 - config/routes.rb
+- lib/generators/spree/storefront/devise/devise_generator.rb
+- lib/generators/spree/storefront/devise/templates/user_passwords_controller.rb
+- lib/generators/spree/storefront/devise/templates/user_registrations_controller.rb
+- lib/generators/spree/storefront/devise/templates/user_sessions_controller.rb
 - lib/generators/spree/storefront/install/install_generator.rb
 - lib/generators/spree/storefront/install/templates/application.tailwind.css
 - lib/generators/spree/storefront/install/templates/dev
@@ -543,9 +548,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.5
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.6
 post_install_message:
 rdoc_options: []
 require_paths: