spree_backend 3.7.14.1 → 4.0.0.beta

data/app/views/spree/admin/zones/_state_members.html.erb

@@ -1,12 +1,12 @@
 <div id="state_members" data-hook="member">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= Spree.t(:states) %>
       </h1>
     </div>
 
-    <div class="panel-body">
+    <div class="card-body">
       <%= zone_form.field_container :state_ids, class: ['form-group'] do %>
         <%= zone_form.label :state_ids, Spree.t(:states) %>
         <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { multiple: true, class: "select2" } %>

data/app/views/spree/admin/zones/index.html.erb

@@ -6,7 +6,7 @@
   <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_zone_link' %>
 <% end if can? :create, Spree::Zone %>
 
-<%= paginate @zones %>
+<%= paginate @zones, theme: 'twitter-bootstrap-4' %>
 
 <% if @zones.any? %>
   <table class="table" id='listing_zones' data-hook>
@@ -41,4 +41,4 @@
   </div>
 <% end %>
 
-<%= paginate @zones %>
+<%= paginate @zones, theme: 'twitter-bootstrap-4' %>

data/app/views/spree/layouts/admin.html.erb

@@ -30,16 +30,19 @@
         <%#-------------------------------------------------%>
         <%# Sidebar                                         %>
         <%#-------------------------------------------------%>
-        <div class="<%= main_sidebar_classes %>" id="main-sidebar" data-hook="admin_tabs">
+        <aside
+          class="<%= main_sidebar_classes %> sidebar position-fixed d-flex justify-content-between flex-column px-0"
+          id="main-sidebar"
+          data-hook="admin_tabs">
           <%= render partial: 'spree/admin/shared/main_menu' %>
 
           <%= render partial: 'spree/admin/shared/version' %>
-        </div>
+        </aside>
 
         <%#-------------------------------------------------%>
         <%# Content                                         %>
         <%#-------------------------------------------------%>
-        <div class="<%= main_part_classes %> main" id="main-part">
+        <main class="<%= main_part_classes %> main" id="main-part" role="main">
 
           <%#-------------------------------------------------%>
           <%# Content header (page title/actions)             %>
@@ -55,7 +58,7 @@
             <%#-------------------------------------------------%>
             <%# Main content                                    %>
             <%#-------------------------------------------------%>
-            <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-xs-8 col-md-9' : 'col-xs-12'  %>" id="content" data-hook>
+            <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-8 col-md-9' : 'col-12'  %>" id="content" data-hook>
               <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter)%>
               <%= yield %>
             </div>
@@ -64,14 +67,14 @@
             <%# Inner aside                                     %>
             <%#-------------------------------------------------%>
             <% if content_for?(:sidebar) %>
-              <div class="col-xs-4 col-md-3">
+              <div class="col-4 col-md-3">
                 <%= render partial: 'spree/admin/shared/sidebar' %>
               </div>
             <% end %>
           </div>
 
 
-        </div>
+        </main>
       </div>
     </div>
 

data/lib/spree/backend.rb

@@ -1,13 +1,14 @@
 require 'rails/all'
 require 'jquery-rails'
 require 'jquery-ui-rails'
-require 'deface'
 require 'select2-rails'
+require 'bootstrap'
+require 'glyphicons'
+require 'popper_js'
 
 require 'spree_core'
 require 'spree_api'
 
-require 'spree/responder'
 require 'spree/backend/action_callbacks'
 require 'spree/backend/callbacks'
 require 'spree/backend/engine'

data/lib/spree_backend.rb

@@ -1,3 +1,4 @@
 require 'spree/backend'
 require 'sprockets/rails'
-require 'bootstrap-sass'
+require 'bootstrap'
+require 'glyphicons'

data/spree_backend.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.summary     = 'backend e-commerce functionality for the Spree project.'
   s.description = 'Required dependency for Spree'
 
-  s.required_ruby_version = '>= 2.3.3'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.author      = 'Sean Schofield'
   s.email       = 'sean@spreecommerce.com'
@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_api', s.version
   s.add_dependency 'spree_core', s.version
 
-  s.add_dependency 'bootstrap-sass',  '~> 3.4'
+  s.add_dependency 'bootstrap',       '~> 4.3.1'
+  s.add_dependency 'glyphicons',      '~> 1.0.2'
   s.add_dependency 'jquery-rails',    '~> 4.3'
   s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
   s.add_dependency 'select2-rails',   '3.5.9.1' # 3.5.9.2 breaks several specs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.7.14.1
+  version: 4.0.0.beta
 platform: ruby
 authors:
 - Sean Schofield
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.14.1
+        version: 4.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.14.1
+        version: 4.0.0.beta
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.14.1
+        version: 4.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.14.1
+        version: 4.0.0.beta
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 4.3.1
+- !ruby/object:Gem::Dependency
+  name: glyphicons
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -145,24 +159,22 @@ files:
 - app/assets/javascripts/spree/backend/zone.js
 - app/assets/javascripts/spree/frontend/backend.js
 - app/assets/stylesheets/spree/backend.css
+- app/assets/stylesheets/spree/backend/components/_badges.scss
 - app/assets/stylesheets/spree/backend/components/_buttons.scss
 - app/assets/stylesheets/spree/backend/components/_filters.scss
 - app/assets/stylesheets/spree/backend/components/_icons.scss
-- app/assets/stylesheets/spree/backend/components/_labels.scss
 - app/assets/stylesheets/spree/backend/components/_main.scss
+- app/assets/stylesheets/spree/backend/components/_navbar.scss
 - app/assets/stylesheets/spree/backend/components/_navigation.scss
 - app/assets/stylesheets/spree/backend/components/_page_header.scss
-- app/assets/stylesheets/spree/backend/components/_panels.scss
 - app/assets/stylesheets/spree/backend/components/_progress.scss
 - app/assets/stylesheets/spree/backend/components/_sidebar.scss
 - app/assets/stylesheets/spree/backend/components/_spinner.scss
 - app/assets/stylesheets/spree/backend/components/_tables.scss
 - app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss
-- app/assets/stylesheets/spree/backend/components/_wells.scss
 - app/assets/stylesheets/spree/backend/global/_variables.scss
 - app/assets/stylesheets/spree/backend/plugins/_jquery_ui.scss
 - app/assets/stylesheets/spree/backend/plugins/_select2.scss
-- app/assets/stylesheets/spree/backend/sections/_account.scss
 - app/assets/stylesheets/spree/backend/shared/_base.scss
 - app/assets/stylesheets/spree/backend/shared/_forms.scss
 - app/assets/stylesheets/spree/backend/spree_admin.css.scss
@@ -234,13 +246,13 @@ files:
 - app/helpers/spree/admin/taxons_helper.rb
 - app/models/spree/admin/resource.rb
 - app/models/spree/backend_configuration.rb
-- app/views/kaminari/_first_page.html.erb
-- app/views/kaminari/_gap.html.erb
-- app/views/kaminari/_last_page.html.erb
-- app/views/kaminari/_next_page.html.erb
-- app/views/kaminari/_page.html.erb
-- app/views/kaminari/_paginator.html.erb
-- app/views/kaminari/_prev_page.html.erb
+- app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb
+- app/views/kaminari/twitter-bootstrap-4/_gap.html.erb
+- app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb
+- app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb
+- app/views/kaminari/twitter-bootstrap-4/_page.html.erb
+- app/views/kaminari/twitter-bootstrap-4/_paginator.html.erb
+- app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb
 - app/views/spree/admin/adjustments/_adjustment.html.erb
 - app/views/spree/admin/adjustments/_adjustments_table.html.erb
 - app/views/spree/admin/adjustments/_form.html.erb
@@ -524,7 +536,7 @@ homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -532,16 +544,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.2
+signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.
 test_files: []

data/app/assets/stylesheets/spree/backend/components/_labels.scss

@@ -1,55 +0,0 @@
-// Green
-.label-completed,
-.label-complete,
-.label-resumed,
-.label-considered_safe,
-.label-paid,
-.label-shipped,
-.label-ready,
-.label-active,
-.label-success,
-.label-sold,
-.label-open,
-.label-authorized
-{
-  background-color: $brand-success;
-
-  a {
-    color: white !important;
-  }
-}
-
-// Red
-.label-failed,
-.label-considered_risky,
-.label-error,
-.label-invalid,
-.label-closed {
-  background-color: $brand-danger;
-}
-
-// Orange
-.label-processing,
-.label-pending,
-.label-awaiting_return,
-.label-returned,
-.label-credit_owed,
-.label-balance_due,
-.label-backorder,
-.label-checkout,
-.label-cart,
-.label-address,
-.label-delivery,
-.label-payment,
-.label-confirm,
-.label-canceled,
-.label-void,
-.label-inactive,
-.label-notice,
-.label-partial {
-  background-color: $brand-warning;
-
-  a {
-    color: white !important;
-  }
-}

data/app/assets/stylesheets/spree/backend/components/_panels.scss

@@ -1,3 +0,0 @@
-.panel {
-  box-shadow: none;
-}

data/app/assets/stylesheets/spree/backend/components/_wells.scss

@@ -1,3 +0,0 @@
-.well {
-  box-shadow: none;
-}

data/app/assets/stylesheets/spree/backend/sections/_account.scss

@@ -1,20 +0,0 @@
-.dropdown.user-menu {
-  a {
-    color: white !important;
-    font-weight: 400;
-  }
-
-  .dropdown-menu {
-    width: 100%;
-    padding: 0 0;
-
-    hr {
-      margin: 0 0;
-    }
-
-    a {
-      color: $dropdown-link-color !important;
-      padding: 15px;
-    }
-  }
-}