spree_backend 4.3.3 → 4.4.0.rc1

data/app/views/spree/admin/cms_sections/types/_hero_image.html.erb

@@ -1,25 +1,25 @@
 <div class="row pb-0">
   <div class="col-12 col-md-6">
-    <%= f.field_container :title, class: ['form-group'] do %>
+    <%= f.field_container :title do %>
       <%= f.label :title, Spree.t('admin.cms.title') %>
       <%= f.text_field :title, class: 'form-control' %>
       <%= f.error_message_on :title %>
     <% end %>
 
-    <%= f.field_container :button_text, class: ['form-group'] do %>
+    <%= f.field_container :button_text do %>
       <%= f.label :button_text, Spree.t('admin.cms.button_text') %>
       <%= f.text_field :button_text, class: 'form-control' %>
       <%= f.error_message_on :button_text %>
     <% end %>
 
     <div class="row">
-      <%= f.field_container :fit, class: ['form-group col-6'] do %>
+      <%= f.field_container :fit, class: ['col-6'] do %>
         <%= f.label :fit, Spree.t('admin.cms.fit') %>
         <%= f.select(:fit, @cms_section.boundaries, {include_blank: false}, class: 'select2') %>
         <%= f.error_message_on :fit %>
       <% end %>
 
-      <%= f.field_container :gutters, class: ['form-group col-6'] do %>
+      <%= f.field_container :gutters, class: ['col-6'] do %>
         <%= f.label :gutters, Spree.t('admin.cms.gutters') %>
         <%= f.select(:gutters, @cms_section.gutters_sizes, {include_blank: false}, class: 'select2') %>
         <%= f.error_message_on :gutters %>
@@ -27,7 +27,7 @@
     </div>
   </div>
   <div class="col-12 col-md-6 pt-4">
-    <%= f.field_container :image_one, class: ['form-group'] do %>
+    <%= f.field_container :image_one do %>
       <% if @cms_section.image_one.attached? && @cms_section.image_one.variable? %>
         <figure class="admin-img-holder">
           <%= image_tag main_app.url_for(@cms_section.image_one.variant(resize: '244x104>')) %>
@@ -45,7 +45,7 @@
   </div>
   <div class="col-12"><hr></div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :linked_resource_type, class: ['form-group'] do %>
+    <%= f.field_container :linked_resource_type do %>
       <%= f.label :linked_resource_type, Spree.t('admin.navigation.link_to') %>
       <%= f.select(:linked_resource_type,
           spree_humanize_dropdown_values('Spree::Cms::Sections::HeroImage',

data/app/views/spree/admin/cms_sections/types/_image_gallery.html.erb

@@ -9,7 +9,7 @@
       </div>
     </div>
 
-    <%= f.field_container :layout_style, class: ['form-group'] do %>
+    <%= f.field_container :layout_style do %>
       <%= f.label :layout_style, Spree.t('admin.cms.image_gallery.layout_style') %>
       <%= f.select(:layout_style,
           spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
@@ -25,7 +25,7 @@
     <div id="image_a_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_a') %></h4>
-        <%= f.field_container :image_one, class: ['form-group'] do %>
+        <%= f.field_container :image_one do %>
           <% if @cms_section.image_one.attached? && @cms_section.image_one.variable? %>
             <figure class="admin-img-holder">
               <%= image_tag main_app.url_for(@cms_section.image_one.variant(resize: '244x104>')) %>
@@ -42,7 +42,7 @@
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.square_image') %></small>
 
-      <%= f.field_container :title_one, class: ['form-group'] do %>
+      <%= f.field_container :title_one do %>
         <%= f.label :title_one, Spree.t('admin.cms.title') %>
         <%= f.text_field :title_one, class: 'form-control' %>
         <%= f.error_message_on :title_one %>
@@ -50,7 +50,7 @@
 
       <div class="col-12"><hr></div>
       <% unless rails_5? %>
-        <%= f.field_container :link_type_one, class: ['form-group'] do %>
+        <%= f.field_container :link_type_one do %>
           <%= f.label :link_type_one, Spree.t('admin.navigation.link_to') %>
           <%= f.select(:link_type_one,
               spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
@@ -69,7 +69,7 @@
     <div id="image_b_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_b') %></h4>
-        <%= f.field_container :image_two, class: ['form-group'] do %>
+        <%= f.field_container :image_two do %>
           <% if @cms_section.image_two.attached? && @cms_section.image_two.variable? %>
             <figure class="admin-img-holder">
               <%= image_tag main_app.url_for(@cms_section.image_two.variant(resize: '244x104>')) %>
@@ -86,7 +86,7 @@
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.tall_image') %></small>
 
-      <%= f.field_container :title_two, class: ['form-group'] do %>
+      <%= f.field_container :title_two do %>
         <%= f.label :title_two, Spree.t('admin.cms.title') %>
         <%= f.text_field :title_two, class: 'form-control' %>
         <%= f.error_message_on :title_two %>
@@ -94,7 +94,7 @@
 
       <div class="col-12"><hr></div>
       <% unless rails_5? %>
-        <%= f.field_container :link_type_two, class: ['form-group'] do %>
+        <%= f.field_container :link_type_two do %>
           <%= f.label :link_type_two, Spree.t('admin.navigation.link_to') %>
           <%= f.select(:link_type_two,
               spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
@@ -113,7 +113,7 @@
     <div id="image_c_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_c') %></h4>
-        <%= f.field_container :image_three, class: ['form-group'] do %>
+        <%= f.field_container :image_three do %>
           <% if @cms_section.image_three.attached? && @cms_section.image_three.variable? %>
             <figure class="admin-img-holder">
               <%= image_tag main_app.url_for(@cms_section.image_three.variant(resize: '244x104>')) %>
@@ -130,7 +130,7 @@
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.square_image') %></small>
 
-      <%= f.field_container :title_three, class: ['form-group'] do %>
+      <%= f.field_container :title_three do %>
         <%= f.label :title_three, Spree.t('admin.cms.title') %>
         <%= f.text_field :title_three, class: 'form-control' %>
         <%= f.error_message_on :title_three %>
@@ -138,7 +138,7 @@
 
       <div class="col-12"><hr></div>
       <% unless rails_5? %>
-        <%= f.field_container :link_type_three, class: ['form-group'] do %>
+        <%= f.field_container :link_type_three do %>
           <%= f.label :link_type_three, Spree.t('admin.navigation.link_to') %>
           <%= f.select(:link_type_three,
               spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
@@ -156,13 +156,13 @@
 
 <div class="row pb-0">
   <div class="col-12"> <hr></div>
-  <%= f.field_container :fit, class: ['form-group col-6'] do %>
+  <%= f.field_container :fit, class: ['col-6'] do %>
     <%= f.label :fit, Spree.t('admin.cms.fit') %>
     <%= f.select(:fit, @cms_section.boundaries, {include_blank: false}, class: 'select2') %>
     <%= f.error_message_on :fit %>
   <% end %>
 
-  <%= f.field_container :display_labels, class: ['form-group col-6'] do %>
+  <%= f.field_container :display_labels, class: ['col-6'] do %>
     <%= f.label :display_labels, Spree.t('admin.cms.image_gallery.display_labels') %>
     <%= f.select(:display_labels,
         spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',

data/app/views/spree/admin/cms_sections/types/_rich_text_content.html.erb

@@ -1,4 +1,4 @@
-<%= f.field_container :rte_content, class: ['form-group mb-0'] do %>
+<%= f.field_container :rte_content, class: ['mb-0'] do %>
   <%= f.text_area :rte_content, { rows: "20", class: 'form-control spree-rte' } %>
   <%= f.error_message_on :rte_content %>
 <% end %>

data/app/views/spree/admin/cms_sections/types/_side_by_side_images.html.erb

@@ -3,7 +3,7 @@
     <div id="left_image_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.side_by_side.left_image') %></h4>
-        <%= f.field_container :image_one, class: ['form-group'] do %>
+        <%= f.field_container :image_one do %>
           <% if @cms_section.image_one.attached? && @cms_section.image_one.variable? %>
             <figure class="admin-img-holder">
               <%= image_tag main_app.url_for(@cms_section.image_one.variant(resize: '244x104>')) %>
@@ -13,7 +13,7 @@
               <%= image_tag main_app.url_for(@cms_section.image_one) %>
             </figure>
           <% end %>
-          <%= f.field_container :image_one, class: ['form-group mb-0'] do %>
+          <%= f.field_container :image_one, class: ['mb-0'] do %>
             <%= f.file_field :image_one %>
             <%= f.error_message_on :image_one %>
           <% end %>
@@ -21,13 +21,13 @@
         <% end %>
       </div>
 
-      <%= f.field_container :title_one, class: ['form-group'] do %>
+      <%= f.field_container :title_one do %>
         <%= f.label :title_one, Spree.t('admin.cms.title') %>
         <%= f.text_field :title_one, class: 'form-control' %>
         <%= f.error_message_on :title_one %>
       <% end %>
 
-      <%= f.field_container :subtitle_one, class: ['form-group'] do %>
+      <%= f.field_container :subtitle_one do %>
         <%= f.label :subtitle_one, Spree.t('admin.cms.subtitle') %>
         <%= f.text_field :subtitle_one, class: 'form-control' %>
         <%= f.error_message_on :subtitle_one %>
@@ -35,7 +35,7 @@
 
       <div class="col-12"><hr></div>
       <% unless rails_5? %>
-        <%= f.field_container :link_type_one, class: ['form-group'] do %>
+        <%= f.field_container :link_type_one do %>
           <%= f.label :link_type_one, Spree.t('admin.navigation.link_to') %>
           <%= f.select(:link_type_one,
               spree_humanize_dropdown_values('Spree::Cms::Sections::SideBySideImages',
@@ -54,7 +54,7 @@
     <div id="right_image_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.side_by_side.right_image') %></h4>
-        <%= f.field_container :image_two, class: ['form-group'] do %>
+        <%= f.field_container :image_two do %>
           <% if @cms_section.image_two.attached? && @cms_section.image_two.variable? %>
             <figure class="admin-img-holder">
               <%= image_tag main_app.url_for(@cms_section.image_two.variant(resize: '244x104>')) %>
@@ -64,7 +64,7 @@
               <%= image_tag main_app.url_for(@cms_section.image_two) %>
             </figure>
           <% end %>
-          <%= f.field_container :image_two, class: ['form-group mb-0'] do %>
+          <%= f.field_container :image_two, class: ['mb-0'] do %>
             <%= f.file_field :image_two %>
             <%= f.error_message_on :image_two %>
           <% end %>
@@ -72,13 +72,13 @@
         <% end %>
       </div>
 
-      <%= f.field_container :title_two, class: ['form-group'] do %>
+      <%= f.field_container :title_two do %>
         <%= f.label :title_two, Spree.t('admin.cms.title') %>
         <%= f.text_field :title_two, class: 'form-control' %>
         <%= f.error_message_on :title_two %>
       <% end %>
 
-      <%= f.field_container :subtitle_two, class: ['form-group'] do %>
+      <%= f.field_container :subtitle_two do %>
         <%= f.label :subtitle_two, Spree.t('admin.cms.subtitle') %>
         <%= f.text_field :subtitle_two, class: 'form-control' %>
         <%= f.error_message_on :subtitle_two %>
@@ -87,7 +87,7 @@
       <div class="col-12"><hr></div>
 
       <% unless rails_5? %>
-        <%= f.field_container :link_type_two, class: ['form-group'] do %>
+        <%= f.field_container :link_type_two do %>
           <%= f.label :link_type_two, Spree.t('admin.navigation.link_to') %>
           <%= f.select(:link_type_two,
               spree_humanize_dropdown_values('Spree::Cms::Sections::SideBySideImages',
@@ -104,7 +104,7 @@
 
 <div class="col-12"><hr></div>
   <div class="col-6">
-    <%= f.field_container :fit, class: ['form-group'] do %>
+    <%= f.field_container :fit do %>
       <%= f.label :fit, Spree.t('admin.cms.fit') %>
       <%= f.select(:fit, @cms_section.boundaries, {include_blank: false}, class: 'select2') %>
       <%= f.error_message_on :fit %>
@@ -112,7 +112,7 @@
   </div>
 
   <div class="col-6">
-    <%= f.field_container :gutters, class: ['form-group'] do %>
+    <%= f.field_container :gutters do %>
       <%= f.label :gutters, Spree.t('admin.cms.set_gutters') %>
       <%= f.select(:gutters, @cms_section.gutters_sizes, {include_blank: false}, class: 'select2') %>
       <%= f.error_message_on :gutters %>

data/app/views/spree/admin/countries/_form.html.erb

@@ -1,23 +1,23 @@
 <div data-hook="admin_country_form_fields">
-  <%= f.field_container :name, class: ['form-group'], 'data-hook' => 'name' do %>
+  <%= f.field_container :name, 'data-hook' => 'name' do %>
     <%= f.label :name, Spree.t(:name) %>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>
 
-  <%= f.field_container :iso_name, class: ['form-group'], 'data-hook' => 'iso_name' do %>
+  <%= f.field_container :iso_name, 'data-hook' => 'iso_name' do %>
     <%= f.label :iso_name, Spree.t(:iso_name) %>
     <%= f.text_field :iso_name, class: 'form-control' %>
     <%= f.error_message_on :iso_name %>
   <% end %>
 
-  <%= f.field_container :iso, class: ['form-group'], 'data-hook' => 'iso' do %>
+  <%= f.field_container :iso, 'data-hook' => 'iso' do %>
     <%= f.label :iso, Spree.t(:iso) %>
     <%= f.text_field :iso, class: 'form-control' %>
     <%= f.error_message_on :iso %>
   <% end %>
 
-  <%= f.field_container :iso3, class: ['form-group'], 'data-hook' => 'iso3' do %>
+  <%= f.field_container :iso3, 'data-hook' => 'iso3' do %>
     <%= f.label :iso3, Spree.t(:iso3) %>
     <%= f.text_field :iso3, class: 'form-control' %>
     <%= f.error_message_on :iso3 %>

data/app/views/spree/admin/customer_returns/new.html.erb

@@ -22,7 +22,7 @@
           <% end %>
         </fieldset>
 
-        <%= f.field_container :stock_location, class: ['form-group'] do %>
+        <%= f.field_container :stock_location do %>
           <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
           <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location %>

data/app/views/spree/admin/digitals/_form.html.erb

@@ -0,0 +1,35 @@
+<%= form_for :digital, url: admin_product_digitals_path(@product) do |f| %>
+  <% if variant.digital? %>
+    <div class="row">
+      <% variant.digitals.each do |digital| %>
+        <div class="col-12 col-md-6 mb-3 removable-dom-element">
+          <div class="d-flex flex-row align-items-center digital-container border rounded">
+            <div class="col p-0 delete-digital-icon-container">
+              <%= asset_icon(digital) %>
+            </div>
+            <div class="col p-2 delete-digital-info-container">
+              <span>Name:</span> <span class="text-secondary"><%= digital.attachment.filename %></span><br>
+              <span>Size:</span> <span class="text-secondary"><%= number_to_human_size(digital.attachment.byte_size) %></span>
+            </div>
+            <div class="col p-2 text-right delete-digital-button-container">
+              <%= link_to (svg_icon name: "close.svg", width: '20', height: '20'), admin_product_digital_url(@product, digital), data: { confirm: Spree.t('admin.digitals.delete_file_confirmation', filename: digital.attachment.filename) }, method: :delete, class: 'btn delete-resource delete-digital-asset' %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  <% else %>
+    <div class="alert alert-info no-objects-found">
+      <%= Spree.t('admin.digitals.no_digital_assets_added') %>
+    </div>
+  <% end %>
+
+  <%= f.field_container :attachment, data: {controller: "upload-button"} do %>
+    <%= f.label :file, Spree.t('admin.digitals.add_new_file'), id: "digital_attachment_#{variant.id}" %> <span class="required">*</span><br>
+    <%= f.file_field :attachment, id: "digital_attachment_#{variant.id}", required: true, data: { action: "input->upload-button#buttonState" } %>
+    <%= hidden_field_tag 'digital[variant_id]', variant.id %>
+    <%= button Spree.t('admin.digitals.upload'), 'add.svg', 'submit', { data: { upload_button_target: "uploadButton" } } %>
+    <br>
+    <%= f.error_message_on :attachment %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,25 @@
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :digitals } %>
+
+<div class="row">
+  <% if @product.has_variants? %>
+    <% @product.variants.each do |variant| %>
+      <div class="col-12 mb-5 ">
+        <div class="card">
+          <div class="card-header">
+            <h5 class="card-title mb-0"><%= variant.options_text %></h5>
+          </div>
+          <div class="card-body">
+            <div class="col-12 p-0">
+              <%= render 'form', variant: variant %>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  <% else %>
+    <div class="col-12">
+      <%= render 'form', variant: @product.master %>
+    </div>
+  <% end %>
+</div>
+

data/app/views/spree/admin/general_settings/edit.html.erb

@@ -67,7 +67,7 @@
 
             <div class="card-body">
               <div class="alert alert-warning col-12">
-                This can be overriden by individual Store settings
+                This can be overridden by individual Store settings
               </div>
               <div class="form-group">
                 <%= label_tag :currency, Spree.t(:default_currency) %>
@@ -75,27 +75,6 @@
               </div>
             </div>
           </div>
-
-          <div class="card mb-3" id="general-settings-stores" data-hook="general_settings_stores">
-            <div class="card-header">
-              <h1 class="card-title mb-0 h5">
-                <%= Spree.t(:multiple_stores) %>
-              </h1>
-            </div>
-            <div class="card-body">
-              <div class="alert alert-warning col-12">
-                <%= Spree.t('show_store_selector.long') %>
-              </div>
-              <div class="form-group">
-                <div class="checkbox">
-                  <label>
-                    <%= check_box('', :show_store_selector, { checked: Spree::Config.show_store_selector }) %>
-                    <%= Spree.t('show_store_selector.short') %>
-                  </label>
-                </div>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
 

data/app/views/spree/admin/menu_items/_form.html.erb

@@ -6,13 +6,13 @@
           <h5 class="mb-0"><%= Spree.t('admin.navigation.settings') %></h5>
         </div>
         <div class="card-body">
-          <%= f.field_container :item_type, class: ['form-group'] do %>
+          <%= f.field_container :item_type do %>
             <%= f.label :item_type, Spree.t('admin.navigation.item_type') %>
             <%= f.select(:item_type, @menu_item_types, {include_blank: false}) %>
             <%= f.error_message_on :item_type %>
           <% end %>
 
-          <%= f.field_container :code, class: ['form-group'] do %>
+          <%= f.field_container :code do %>
             <%= f.label :code, Spree.t('admin.navigation.code') %>
             <%= f.text_field :code, class: 'form-control' %>
             <%= f.error_message_on :code %>
@@ -21,7 +21,7 @@
             </small>
           <% end %>
 
-          <%= f.field_container :parent_id, class: ['form-group'] do %>
+          <%= f.field_container :parent_id do %>
             <%= f.label :parent_id, Spree.t('admin.navigation.nested_under') %>
             <%= f.select :parent_id, nested_set_options(@menu.menu_items, @menu_item) {|i| "#{'-' * i.level} #{i.name}" }, {include_blank: false}, {class: 'select2'} %>
             <%= f.error_message_on :parent_id %>
@@ -39,13 +39,13 @@
           <h5 class="mb-0"><%= Spree.t('admin.navigation.public_details') %></h5>
         </div>
         <div class="card-body">
-          <%= f.field_container :name, class: ['form-group'] do %>
+          <%= f.field_container :name do %>
             <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
             <%= f.text_field :name, class: 'form-control', required: true %>
             <%= f.error_message_on :name %>
           <% end %>
 
-          <%= f.field_container :subtitle, class: ['form-group'] do %>
+          <%= f.field_container :subtitle do %>
             <%= f.label :subtitle, Spree.t('admin.navigation.subtitle') %>
             <%= f.text_field :subtitle, class: 'form-control' %>
             <%= f.error_message_on :subtitle %>
@@ -93,7 +93,7 @@
           <div class="card-body">
             <div class="row">
               <div class="col-12 col-md-6">
-                <%= f.field_container :linked_resource_type, class: ['form-group'] do %>
+                <%= f.field_container :linked_resource_type do %>
                   <%= f.label :linked_resource_type, Spree.t('admin.navigation.link_to') %>
                   <%= f.select(:linked_resource_type, spree_humanize_dropdown_values('Spree::MenuItem', {const: 'LINKED_RESOURCE_TYPE'}), {include_blank: false}, class: 'link_switcher') %>
                   <%= f.error_message_on :linked_resource_type %>

data/app/views/spree/admin/menus/_form.html.erb

@@ -1,17 +1,17 @@
 <div data-hook="admin_menu_form_fields" class="row">
-  <%= f.field_container :name, class: ['form-group col-12 col-md-4'] do %>
+  <%= f.field_container :name, class: ['col-12 col-md-4'] do %>
     <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
     <%= f.text_field :name, class: 'form-control', required: true %>
     <%= f.error_message_on :name %>
   <% end %>
 
-  <%= f.field_container :location, class: ['form-group col-12 col-md-4'] do %>
+  <%= f.field_container :location, class: ['col-12 col-md-4'] do %>
     <%= f.label :location, Spree.t('location') %>
     <%= f.select(:location, spree_humanize_dropdown_values('Spree::Menu', { const: 'MENU_LOCATIONS', paramterize_values: true }), {include_blank: false}, class: 'select2') %>
     <%= f.error_message_on :location %>
   <% end %>
 
-  <%= f.field_container :locale, class: ['form-group col-12 col-md-4'] do %>
+  <%= f.field_container :locale, class: ['col-12 col-md-4'] do %>
     <%= f.label :language %>
     <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @menu.locale || I18n.locale), {}, { class: 'select2' } %>
     <%= f.error_message_on :default_locale %>

data/app/views/spree/admin/menus/edit.html.erb

@@ -3,25 +3,25 @@
 <% end %>
 
 <div class="row">
-    <div class="col-12">
-      <div class="card mb-3">
-        <div class="card-header">
-          <h5 class="mb-0"><%= Spree.t('settings') %></h5>
-        </div>
-        <div class="card-body">
-          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @menu } %>
-          <%= form_for [:admin, @menu] do |f| %>
-            <%= render partial: 'form', locals: { f: f } %>
-            <div class="d-flex ">
-              <%= render partial: 'spree/admin/shared/edit_resource_links' %>
-            </div>
-          <% end %>
-        </div>
+  <div class="col-12">
+    <div class="card mb-3">
+      <div class="card-header">
+        <h5 class="mb-0"><%= Spree.t('settings') %></h5>
+      </div>
+      <div class="card-body">
+        <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @menu } %>
+        <%= form_for [:admin, @menu] do |f| %>
+          <%= render partial: 'form', locals: { f: f } %>
+          <div class="d-flex ">
+            <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+          </div>
+        <% end %>
+      </div>
     </div>
   </div>
 </div>
 
-<div id="menuArea">
+<div id="sortableTreeArea">
   <div class="row mt-2">
     <div class="col-12">
       <div class="card mb-3">
@@ -37,11 +37,11 @@
         </div>
 
         <% if @menu.root.present? %>
-          <div class="card-body p-0 bg-light">
-            <div id="primaryMenuContainer" class="menu-container" data-parent-id="<%= @menu.root.id %>">
+          <div class="card-body p-0 bg-light" data-controller="sortable-tree" data-sortable-tree-handle-value=".move-handle">
+            <div data-sortable-tree-parent-id-value="<%= @menu.root.id %>">
               <% if @menu.root.children.present? %>
                 <% @menu.root.children.each do |root_children| %>
-                     <%= build_menu_item(@menu, root_children) %>
+                     <%= build_sortable_tree(@menu, root_children) %>
                 <% end %>
               <% else %>
                 <div class="alert alert-info no-objects-found m-5">

data/app/views/spree/admin/oauth_applications/_form.html.erb

@@ -0,0 +1,22 @@
+<div data-hook="admin_oauth_application_form_fields">
+  <%= f.field_container :name, 'data-hook' => "oauth_application_name" do %>
+    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= f.text_field :name, class: 'form-control', required: true %>
+    <%= f.error_message_on :name %>
+  <% end %>
+
+  <%= f.field_container :scopes, 'data-hook' => "oauth_application_scopes" do %>
+    <%= f.label :scopes, Spree.t(:scopes) %> <span class="required">*</span>
+    <%= f.text_field :scopes, class: 'form-control' %>
+    <%= f.error_message_on :scopes %>
+    <small class="form-text text-muted">
+      Possible values:
+      <ul>
+        <li><strong>admin read</strong> - read only access</li>
+        <li><strong>admin write</strong> - read and write access</li>
+      </ul>
+    </small>
+  <% end %>
+
+  <div data-hook="additional_oauth_application_fields"></div>
+</div>

data/app/views/spree/admin/oauth_applications/create.turbo_stream.erb

@@ -0,0 +1,38 @@
+<%= turbo_stream.replace "new_oauth_application" do %>
+  <div data-controller="clipboard" class="mb-3 p-3 col-lg-7">
+    <div class="form-group">
+      <%= label_tag :client_id, 'Client ID' %>
+      <div class="input-group">
+        <%= text_area_tag :client_id, @object.uid, class: 'form-control bg-transparent p-0 mt-4 mr-4 border-0', rows: 2, data: { clipboard_target: 'source', action: 'clipboard#copy' }, readonly: true %>
+        <div class="input-append">
+          <button data-action="clipboard#copy" class="btn m-0 mt-4">
+            <%= svg_icon name: 'clone.svg', width: 18, height: 18 %>
+            <%= Spree.t(:copy_to_clipboard, scope: :admin ) %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div data-controller="clipboard" class="mb-3 p-3 col-lg-7">
+    <div class="form-group">
+      <%= label_tag :client_secret, 'Client Secret' %>
+      <div class="input-group">
+        <%= text_area_tag :client_secret, @object.plaintext_secret, class: 'form-control bg-transparent p-0 mt-4 mr-4 border-0', rows: 2, data: { clipboard_target: 'source', action: 'clipboard#copy' }, readonly: true %>
+        <div class="input-append">
+          <button data-action="clipboard#copy" class="btn m-0 mt-4">
+            <%= svg_icon name: 'clone.svg', width: 18, height: 18 %>
+            <%= Spree.t(:copy_to_clipboard, scope: :admin ) %>
+          </button>
+        </div>
+      </div>
+      <small class="form-text text-muted mt-4">
+        This is your application's secret token, copy it now and keep it safe. It won't be shown again.
+      </small>
+    </div>
+  </div>
+
+  <hr />
+
+  <%= link_to 'Back to list', spree.admin_oauth_applications_url %>
+<% end %>

data/app/views/spree/admin/oauth_applications/edit.html.erb

@@ -0,0 +1,13 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.oauth_applications.list'), spree.admin_oauth_applications_url %> /
+  <%= @oauth_application.name.capitalize %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>
+
+<%= form_for [:admin, @oauth_application] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>