spree_frontend 4.3.0.rc1 → 4.3.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1d33bc829b31e15e9ff3fb6b935d5f0c8efe605bdb39eec91697295159834b97
4
- data.tar.gz: 324b305b9b070290425491a7f42f5d9873736d8458b4d74f59e5385f51a53fee
3
+ metadata.gz: 4dfedd18ceada846e58e5fd1418e4b1d0bb08e4a2fc400b139ca7880c1e7fb03
4
+ data.tar.gz: acb38763f1ee51a880e22b2cc884fb972eb2a8ee5e5eaa1c505cc9625a46aa53
5
5
  SHA512:
6
- metadata.gz: 9fa6e789d9d2c72f9111f65f0a877f25ef5418a5166b0ab3fa9018fcb6df813c75c47fdf6d99271858c7ad29e30d5e70c82b28c3f3193f65f55328e220a57714
7
- data.tar.gz: 8003796ac4b54d905d3723b69bc59090c16f9cb2a086629daff701f384b44dce88ba215d8ed1045d6ff680e29d45a1df3fc050702c30e57a4c4892f359b28bd9
6
+ metadata.gz: 1ef0fc9d4afa3fc9210b36e226f4f0ef85d23212e16701c2a9be63f8c4f75bc131d569efdc13f700f6cd2b4de295d682928a7a4c0bd745ce99c9ac345aadee42
7
+ data.tar.gz: 65dc6c169bada664d6e33d06b671feade1fb9d77f37a8e03399076f887d8507229c131c395ceaccee892d90b958f8e924f36aefe33031bd3d4a926c35666ba5d
@@ -0,0 +1,3 @@
1
+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-right-circle-fill" viewBox="0 0 16 16">
2
+ <path d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0zM4.5 7.5a.5.5 0 0 0 0 1h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 1 0-.708.708L10.293 7.5H4.5z"/>
3
+ </svg>
@@ -4,10 +4,6 @@ module Spree
4
4
  helper Spree::AddressesHelper
5
5
  load_and_authorize_resource class: Spree::Address
6
6
 
7
- def index
8
- @addresses = try_spree_current_user.addresses
9
- end
10
-
11
7
  def create
12
8
  @address = try_spree_current_user.addresses.build(address_params)
13
9
  if create_service.call(user: try_spree_current_user, address_params: @address.attributes).success?
@@ -8,12 +8,13 @@
8
8
  <%= render partial: 'spree/shared/head' %>
9
9
  </head>
10
10
  <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
11
+ <%= render partial: 'spree/shared/get_started' %>
11
12
  <%= render partial: 'spree/shared/header' %>
12
13
  <div id="overlay" class="overlay hide-on-esc"></div>
13
14
 
14
15
  <div data-hook>
16
+ <%= flash_messages %>
15
17
  <main class="col-12" id="content" data-hook>
16
- <%= flash_messages %>
17
18
  <%= yield %>
18
19
  </main>
19
20
 
@@ -1,5 +1,5 @@
1
1
  <% cache [common_product_cache_keys, products&.except(:group, :order)&.maximum(:updated_at)&.to_i, id, products&.ids&.join(',')] do %>
2
- <div id="<%= id %>-mobile" class="carousel slide d-md-none homepage-carousel" data-interval="false">
2
+ <div id="<%= id.parameterize %>-mobile" class="carousel slide d-md-none homepage-carousel" data-interval="false">
3
3
  <div class="carousel-inner">
4
4
  <% products.each_slice(2).with_index do |sliced_items, index| %>
5
5
  <div class="carousel-item <%= 'active' if index == 0 %>">
@@ -18,7 +18,7 @@
18
18
  </div>
19
19
  <a
20
20
  class="d-flex position-absolute justify-content-center align-items-center carousel-icon-control carousel-icon-control--previous"
21
- href="#<%= id %>-mobile"
21
+ href="#<%= id.parameterize %>-mobile"
22
22
  role="button"
23
23
  data-slide="prev">
24
24
  <span class="d-flex justify-content-center align-items-center carousel-icon-control-rounded" aria-hidden="true">
@@ -32,7 +32,7 @@
32
32
 
33
33
  <a
34
34
  class="d-flex position-absolute justify-content-center align-items-center carousel-icon-control carousel-icon-control--next"
35
- href="#<%= id %>-mobile"
35
+ href="#<%= id.parameterize %>-mobile"
36
36
  role="button"
37
37
  data-slide="next">
38
38
  <span class="d-flex justify-content-center align-items-center carousel-icon-control-rounded" aria-hidden="true">
@@ -45,14 +45,14 @@
45
45
  </a>
46
46
  </div>
47
47
 
48
- <div id="<%= id %>-desktop" class="carousel slide d-none d-md-block homepage-carousel" data-interval="false">
48
+ <div id="<%= id.parameterize %>-desktop" class="carousel slide d-none d-md-block homepage-carousel" data-interval="false">
49
49
  <div class="carousel-inner carousel-inner-width">
50
50
  <% products.each_slice(4).with_index do |sliced_items, index| %>
51
51
  <div class="carousel-item <%= 'active' if index == 0 %>">
52
52
  <div class="container position-relative">
53
53
  <a
54
54
  class="d-flex position-absolute justify-content-center align-items-center carousel-icon-control carousel-icon-control--previous"
55
- href="#<%= id %>-desktop"
55
+ href="#<%= id.parameterize %>-desktop"
56
56
  role="button"
57
57
  data-slide="prev">
58
58
  <span class="d-flex justify-content-center align-items-center carousel-icon-control-rounded" aria-hidden="true">
@@ -74,7 +74,7 @@
74
74
 
75
75
  <a
76
76
  class="d-md-flex position-absolute justify-content-center align-items-center carousel-icon-control carousel-icon-control--next"
77
- href="#<%= id %>-desktop"
77
+ href="#<%= id.parameterize %>-desktop"
78
78
  role="button"
79
79
  data-slide="next">
80
80
  <span class="d-flex justify-content-center align-items-center carousel-icon-control-rounded" aria-hidden="true">
@@ -1,17 +1,8 @@
1
1
  <div class="border-top footer-spree-copyright">
2
2
  <div class="container">
3
3
  <div class="d-flex flex-column flex-lg-row align-items-center justify-content-center py-3 footer-spree-copyright-content">
4
- <div>Designed and developed by</div>
5
- <div class="mb-1 mb-lg-0">
6
- <%= link_to 'https://sparksolutions.co/', target: :_blank, 'aria-label': 'Go to Spark Solutions', rel: :follow do %>
7
- <%= image_tag 'spark-logo@3x.png', class: 'footer-spree-copyright-logo-spark mx-2', alt: 'Spree Commerce & Ruby on Rails developers', title: 'Spree Commerce & Ruby on Rails developers' %>
8
- <% end %>
9
- </div>
10
- <div class="d-none d-lg-inline-block mr-2">|</div>
11
4
  <div>
12
- © <%= Time.current.year %>
13
- <%= link_to current_store.name, "https://#{current_store.url}" %>.
14
- <%= Spree.t(:all_rights_reserved) %>.
5
+ Designed and developed by <%= link_to 'Spark Solutions', 'https://sparksolutions.co/', target: :_blank, 'aria-label': 'Go to Spark Solutions', rel: :follow %> | © <%= Time.current.year %> <%= link_to current_store.name, current_store.formatted_url %>. <%= Spree.t(:all_rights_reserved) %>.
15
6
  </div>
16
7
  </div>
17
8
  </div>
@@ -47,11 +47,11 @@
47
47
  </div>
48
48
  </div>
49
49
  </div>
50
- <div class="row d-none d-xl-flex border-top py-5 text-uppercase footer-spree-menu-links">
50
+ <div class="row d-none d-xl-flex border-top pt-5 text-uppercase footer-spree-menu-links">
51
51
 
52
52
  <% if spree_menu('footer').present? %>
53
53
  <% spree_menu('footer').children.each do |parent| %>
54
- <div class="col-3">
54
+ <div class="col-3 mb-5">
55
55
  <div class="footer-spree-label">
56
56
  <% if parent.container? %>
57
57
  <%= parent.name %>
@@ -69,7 +69,7 @@
69
69
  <% end %>
70
70
 
71
71
  <% if spree.respond_to?(:account_path) %>
72
- <div class="col-3">
72
+ <div class="col-3 mb-5">
73
73
  <div class="footer-spree-label">
74
74
  <%= Spree.t('nav_bar.my_account') %>
75
75
  </div>
@@ -0,0 +1,32 @@
1
+ <!-- Styles And Script In A View Partial
2
+ If this view partial is removed from the spree_application.html.erb layout file, the storefront
3
+ will instantly snap back to the original look and feel with no hangover CSS or JavaScript related
4
+ to this partial.
5
+
6
+ Please do not transfer styles and JavaScript found here
7
+ into the main stylesheets or JavaScript files.
8
+ -->
9
+ <style>
10
+ #getStartedBar {
11
+ background: #33ba6f;
12
+ color: white;
13
+ z-index: 10;
14
+ }
15
+
16
+ #getStartedBar svg {
17
+ vertical-align: text-top;
18
+ }
19
+ </style>
20
+
21
+ <div id="getStartedBar" class="d-flex justify-content-center align-items-center p-1">
22
+ <div class="row">
23
+ <div class="col-12 text-center">
24
+ <h5 class="m-0">
25
+ <span style="font-weight: 200;">Create your own Spree project</span> <a href="https://spreecommerce.org/contact/" class="btn btn-outline-light btn-sm m-2" style="font-size: 1em; font-weight:800;">Get Started
26
+ <%= icon(name: 'arrow-right-circle-fill',
27
+ width: 22,
28
+ height: 22) %></a>
29
+ </h5>
30
+ </div>
31
+ </div>
32
+ </div>
@@ -13,7 +13,10 @@
13
13
 
14
14
  <div class="d-lg-inline-block account-page-user-info-item-store-credits">
15
15
  <p class="my-0 text-uppercase text-center">
16
- <%= Spree.t(:store_credit_name) %>: <b class="account-page-user-info-item-store-credits-amount"><%= Spree::Money.new(@user.total_available_store_credit(current_currency, current_store), currency: current_currency).to_s.gsub('.00', '') %></b>
16
+ <%= Spree.t(:store_credit_name) %>
17
+ <% @user.available_store_credits(current_store).each do |value| %>
18
+ <br><b class="account-page-user-info-item-store-credits-amount"><%= value %></b>
19
+ <% end %>
17
20
  </p>
18
21
  </div>
19
22
  </div>
data/config/routes.rb CHANGED
@@ -16,7 +16,7 @@ Spree::Core::Engine.add_routes do
16
16
 
17
17
  resources :orders, except: [:index, :new, :create, :destroy]
18
18
 
19
- resources :addresses, except: [:show]
19
+ resources :addresses, except: [:index, :show]
20
20
 
21
21
  get '/cart', to: 'orders#edit', as: :cart
22
22
  patch '/cart', to: 'orders#update', as: :update_cart
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
15
15
  s.metadata = {
16
16
  "bug_tracker_uri" => "https://github.com/spree/spree/issues",
17
17
  "changelog_uri" => "https://github.com/spree/spree/releases/tag/v#{s.version}",
18
- "documentation_uri" => "https://guides.spreecommerce.org/",
18
+ "documentation_uri" => "https://dev-docs.spreecommerce.org/",
19
19
  "source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
20
20
  }
21
21
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.3.0.rc1
4
+ version: 4.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2021-08-11 00:00:00.000000000 Z
12
+ date: 2022-01-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_api
@@ -17,28 +17,28 @@ dependencies:
17
17
  requirements:
18
18
  - - ">="
19
19
  - !ruby/object:Gem::Version
20
- version: 4.3.0.rc1
20
+ version: 4.3.1
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - ">="
26
26
  - !ruby/object:Gem::Version
27
- version: 4.3.0.rc1
27
+ version: 4.3.1
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: spree_core
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - ">="
33
33
  - !ruby/object:Gem::Version
34
- version: 4.3.0.rc1
34
+ version: 4.3.1
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - ">="
40
40
  - !ruby/object:Gem::Version
41
- version: 4.3.0.rc1
41
+ version: 4.3.1
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: babel-transpiler
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,7 @@ files:
211
211
  - Rakefile
212
212
  - app/assets/config/spree_frontend_manifest.js
213
213
  - app/assets/images/arrow-down.svg
214
+ - app/assets/images/arrow-right-circle-fill.svg
214
215
  - app/assets/images/arrow-right.svg
215
216
  - app/assets/images/arrow.svg
216
217
  - app/assets/images/bag.svg
@@ -548,7 +549,6 @@ files:
548
549
  - app/assets/images/radio-button.svg
549
550
  - app/assets/images/search-no-results.svg
550
551
  - app/assets/images/search.svg
551
- - app/assets/images/spark-logo@3x.png
552
552
  - app/assets/images/twitter.svg
553
553
  - app/assets/images/vimeo.svg
554
554
  - app/assets/javascripts/spree.js
@@ -762,6 +762,7 @@ files:
762
762
  - app/views/spree/shared/_error_messages.html.erb
763
763
  - app/views/spree/shared/_flashes.html.erb
764
764
  - app/views/spree/shared/_footer.html.erb
765
+ - app/views/spree/shared/_get_started.html.erb
765
766
  - app/views/spree/shared/_head.html.erb
766
767
  - app/views/spree/shared/_header.html.erb
767
768
  - app/views/spree/shared/_internationalization_options.html.erb
@@ -838,9 +839,9 @@ licenses:
838
839
  - BSD-3-Clause
839
840
  metadata:
840
841
  bug_tracker_uri: https://github.com/spree/spree/issues
841
- changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0.rc1
842
- documentation_uri: https://guides.spreecommerce.org/
843
- source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc1
842
+ changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.1
843
+ documentation_uri: https://dev-docs.spreecommerce.org/
844
+ source_code_uri: https://github.com/spree/spree/tree/v4.3.1
844
845
  post_install_message:
845
846
  rdoc_options: []
846
847
  require_paths:
@@ -852,12 +853,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
852
853
  version: '2.5'
853
854
  required_rubygems_version: !ruby/object:Gem::Requirement
854
855
  requirements:
855
- - - ">"
856
+ - - ">="
856
857
  - !ruby/object:Gem::Version
857
- version: 1.3.1
858
+ version: '0'
858
859
  requirements:
859
860
  - none
860
- rubygems_version: 3.2.3
861
+ rubygems_version: 3.2.22
861
862
  signing_key:
862
863
  specification_version: 4
863
864
  summary: The default Storefront built with Rails and Turbolinks for Spree eCommerce
Binary file