Don't use storefront_*_path preferences in frontend gems

spree · Sep 21, 2021 · 842d2a0 · 842d2a0
1 parent 06c1c5b
commit 842d2a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/frontend/app/controllers/spree/locale_controller.rb b/frontend/app/controllers/spree/locale_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   class LocaleController < Spree::StoreController
-    REDIRECT_TO_ROOT = /\/(#{Spree::Config[:storefront_pages_path]})\//.freeze
+    REDIRECT_TO_ROOT = /\/(pages)\//.freeze
 
     def index
       render :index, layout: false

diff --git a/...ces/spree/build_localized_redirect_url.rb → ...ces/spree/build_localized_redirect_url.rb b/...ces/spree/build_localized_redirect_url.rb → ...ces/spree/build_localized_redirect_url.rb
@@ -6,7 +6,7 @@ class BuildLocalizedRedirectUrl
 
     LOCALE_REGEX = /^\/[A-Za-z]{2}\/|^\/[A-Za-z]{2}-[A-Za-z]{2}\/|^\/[A-Za-z]{2}$|^\/[A-Za-z]{2}-[A-Za-z]{2}$/.freeze
 
-    SUPPORTED_PATHS_REGEX = /\/(#{Spree::Config[:storefront_products_path]}|#{Spree::Config[:storefront_taxons_path]}\/|cart|checkout|addresses|content|#{Spree::Config[:storefront_pages_path]})/.freeze
+    SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content|pages)/.freeze
 
     # rubocop:disable Lint/UnusedMethodArgument
     def call(url:, locale:, default_locale: nil)

diff --git a/frontend/config/routes.rb b/frontend/config/routes.rb
@@ -2,11 +2,11 @@
   scope '(:locale)', locale: /#{Spree.available_locales.join('|')}/, defaults: { locale: nil } do
     root to: 'home#index'
 
-    resources :products, only: [:index, :show], path: "/#{Spree::Config[:storefront_products_path]}"
+    resources :products, only: [:index, :show], path: '/products'
 
-    get "/#{Spree::Config[:storefront_products_path]}/:id/related", to: 'products#related'
+    get '/products/:id/related', to: 'products#related'
     # route globbing for pretty nested taxon and product paths
-    get "/#{Spree::Config[:storefront_taxons_path]}/*id", to: 'taxons#show', as: :nested_taxons
+    get '/t/*id', to: 'taxons#show', as: :nested_taxons
     get '/product_carousel/:id', to: 'taxons#product_carousel'
 
     # non-restful checkout stuff
@@ -34,7 +34,7 @@
     get '/api_tokens', to: 'store#api_tokens'
     post '/ensure_cart', to: 'store#ensure_cart'
 
-    get "#{Spree::Config[:storefront_pages_path]}/:slug", to: 'cms_pages#show', as: :page
+    get '/pages/:slug', to: 'cms_pages#show', as: :page
 
     get '/forbidden', to: 'errors#forbidden', as: :forbidden
     get '/unauthorized', to: 'errors#unauthorized', as: :unauthorized

diff --git a/...pree/build_localized_redirect_url_spec.rb → ...pree/build_localized_redirect_url_spec.rb b/...pree/build_localized_redirect_url_spec.rb → ...pree/build_localized_redirect_url_spec.rb