Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Added google autocomplete suggestions for both storefront and admin (#12585)

Damian Legawiec7d2541cff477
diff --git a/admin/app/views/spree/admin/shared/_head.html.erb b/admin/app/views/spree/admin/shared/_head.html.erb
index 304a4bf88b..c460b67c52 100644
--- a/admin/app/views/spree/admin/shared/_head.html.erb
+++ b/admin/app/views/spree/admin/shared/_head.html.erb
@@ -48,3 +48,5 @@
}
</style>
<% end %>
+
+<%= render 'spree/shared/google_places_api_loader' %>
\ No newline at end of file
diff --git a/core/app/assets/config/spree_core_manifest.js b/core/app/assets/config/spree_core_manifest.js
index c61e9b24d4..743ae4d297 100644
--- a/core/app/assets/config/spree_core_manifest.js
+++ b/core/app/assets/config/spree_core_manifest.js
@@ -1,3 +1,4 @@
//= link_tree ../../javascript/spree/core/controllers .js
//= link_tree ../../javascript/spree/core/helpers .js
//= link_tree ../../../vendor/javascript .js
+//= link_tree ../images
diff --git a/core/app/assets/images/google_on_white_hdpi.png b/core/app/assets/images/google_on_white_hdpi.png
new file mode 100644
index 0000000000..5424b56d5d
Binary files /dev/null and b/core/app/assets/images/google_on_white_hdpi.png differ
diff --git a/core/app/javascript/spree/core/helpers/address_autocomplete/google_places_suggestions_provider.js b/core/app/javascript/spree/core/helpers/address_autocomplete/google_places_suggestions_provider.js
index 0be34c4774..41a50c2045 100644
--- a/core/app/javascript/spree/core/helpers/address_autocomplete/google_places_suggestions_provider.js
+++ b/core/app/javascript/spree/core/helpers/address_autocomplete/google_places_suggestions_provider.js
@@ -1,7 +1,7 @@
export default class {
async connect() {
if (typeof google?.maps === 'undefined') {
- console.error('Google Maps API is not loaded')
+ console.error('Google Places API is not loaded')
return
}
this.placesApi = await google.maps.importLibrary('places')
diff --git a/core/app/views/spree/addresses/_suggestions_box.erb b/core/app/views/spree/addresses/_suggestions_box.erb
index e69de29bb2..4e8c177701 100644
--- a/core/app/views/spree/addresses/_suggestions_box.erb
+++ b/core/app/views/spree/addresses/_suggestions_box.erb
@@ -0,0 +1,14 @@
+<div class="absolute position-absolute top-full z-10 z-index-9999 bg-white bg-input-bg w-full w-auto border rounded-md rounded shadow-lg hidden" data-address-autocomplete-target="suggestionsBoxContainer" aria-label="suggestions">
+ <template data-address-autocomplete-target="suggestionsOptionTemplate">
+ <li class="list-group-item list-group-item-action text-input-text opacity-80 hover:bg-sidebar px-4 py-2 suggestions-option-container cursor-pointer aria-selected:bg-accent" role="option" aria-selected="false">
+ <mark class="bg-transparent suggestions-option-marked-text">
+ </mark>
+ </li>
+ </template>
+ <ul class="flex flex-col flex-grow opacity-80 list-group" data-address-autocomplete-target="suggestionsBoxList" role="listbox" id="suggestions-box-options">
+ </ul>
+ <div class="bg-accent px-4 py-2 overflow-hidden text-dark">
+ <%= Spree.t(:powered_by) %>
+ <%= image_tag 'google_on_white_hdpi.png', title: 'Powered by Google', style: 'height: 1rem;' %>
+ </div>
+</div>
diff --git a/core/app/views/spree/shared/_google_places_api_loader.html.erb b/core/app/views/spree/shared/_google_places_api_loader.html.erb
new file mode 100644
index 0000000000..21e5358f26
--- /dev/null
+++ b/core/app/views/spree/shared/_google_places_api_loader.html.erb
@@ -0,0 +1,7 @@
+<% if Spree.google_places_api_key.present? %>
+ <script>
+ (g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
+ key: "<%= Spree.google_places_api_key %>",
+ });
+ </script>
+<% end %>
\ No newline at end of file
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 2d98cbe1f2..d79fb257cf 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -39,7 +39,8 @@ StateMachines::Machine.ignore_method_conflicts = true
module Spree
mattr_accessor :base_class, :user_class, :admin_user_class,
:private_storage_service_name, :public_storage_service_name,
- :cdn_host, :root_domain, :searcher_class, :queues
+ :cdn_host, :root_domain, :searcher_class, :queues,
+ :google_places_api_key
def self.base_class(constantize: true)
@@base_class ||= 'Spree::Base'
@@ -117,6 +118,10 @@ module Spree
end
end
+ def self.google_places_api_key
+ @@google_places_api_key
+ end
+
def self.always_use_translations?
Spree::Config.always_use_translations
end
diff --git a/storefront/app/views/spree/shared/_head.html.erb b/storefront/app/views/spree/shared/_head.html.erb
index 920165698b..4e7e56b214 100644
--- a/storefront/app/views/spree/shared/_head.html.erb
+++ b/storefront/app/views/spree/shared/_head.html.erb
@@ -32,3 +32,5 @@
}
</style>
<% end %>
+
+<%= render 'spree/shared/google_places_api_loader' %>
\ No newline at end of file