spree_admin 5.2.6 → 5.3.0.rc1

data/app/views/spree/admin/bulk_operations/forms/_tag_picker.html.erb

@@ -0,0 +1,8 @@
+<%# locals: (allow_create: false) %>
+<%= tom_select_tag 'tags',
+                   multiple: true,
+                   class: 'w-full',
+                   options: tags_json_array,
+                   required: true,
+                   value_field: :name,
+                   create: allow_create %>

data/app/views/spree/admin/bulk_operations/forms/_taxon_picker.html.erb

@@ -0,0 +1,5 @@
+<%= tom_select_tag 'taxon_ids',
+                   multiple: true,
+                   class: 'w-full',
+                   url: spree.admin_taxons_select_options_path(format: :json),
+                   required: true %>

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

@@ -0,0 +1,16 @@
+<%= turbo_frame_tag :bulk_dialog do %>
+  <%= dialog_header(@title, 'bulk-dialog') %>
+  <div class="dialog-body overflow-visible">
+    <% if @body.present? %>
+      <p class="mb-3"><%= @body %></p>
+    <% end %>
+
+    <% if @form_partial.present? %>
+      <%= render partial: @form_partial, locals: @form_partial_locals || {} %>
+    <% end %>
+  </div>
+  <div class="dialog-footer">
+    <%= dialog_discard_button('bulk-dialog') %>
+    <%= turbo_save_button_tag(@button_text, class: "btn #{@button_class}") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:draft_orders) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.new_admin_order_path, class: "btn btn-primary" if can?(:create, Spree::Order) %>
+<% end %>
+
+<%= render_table @collection, :checkouts, edit_object_url: nil %>

data/app/views/spree/admin/classifications/_classification.html.erb

@@ -1,24 +1,24 @@
-<div class="row mx-0 hover-light rounded" id="<%= spree_dom_id(classification) %>" data-sortable-update-url="<%= spree.admin_taxon_classification_path(classification.taxon_id, classification, format: :turbo_stream) %>">
+<div class="grid grid-cols-12 gap-6 mx-0 hover:bg-gray-25 rounded" id="<%= spree_dom_id(classification) %>" data-sortable-update-url="<%= spree.admin_taxon_classification_path(classification.taxon_id, classification, format: :turbo_stream) %>">
   <% if classification.taxon.manual_sort_order? %>
-    <div class="col-1 text-center align-self-center">
-      <span class="rounded p-2 hover-gray move-handle cursor-grab">
+    <div class="col-span-1 text-center self-center">
+      <span class="rounded-md p-2 hover:bg-gray-100 move-handle cursor-grab">
         <%= icon('grip-vertical', class: 'mr-0') %>
       </span>
     </div>
   <% end %>
 
-  <div class="<%= classification.taxon.manual_sort_order? ? 'col-5' : 'col-6' %>">
-    <%= link_to spree.edit_admin_product_path(classification.product), data: { 'turbo-frame': '_top' }, class: "d-flex align-items-center text-dark hover-none #{classification.taxon.manual_sort_order? ? 'py-3' : 'p-3'}" do  %>
+  <div class="<%= classification.taxon.manual_sort_order? ? 'col-span-5' : 'col-span-6' %>">
+    <%= link_to spree.edit_admin_product_path(classification.product), data: { 'turbo-frame': '_top' }, class: "flex items-center text-gray-900 hover-none #{classification.taxon.manual_sort_order? ? 'py-4' : 'p-4'}" do  %>
       <%= render 'spree/admin/shared/product_image', object: classification.product %>
-      <span class="ml-3">
+      <span class="ml-4">
         <%= classification.product.name %>
       </span>
     <% end %>
   </div>
-  <div class="col-2 text-center align-self-center">
+  <div class="col-span-2 text-center self-center">
     <%= product_status(classification.product) %>
   </div>
-  <div class="col-2 text-center align-self-center">
+  <div class="col-span-2 text-center self-center">
     <% if classification.product.in_stock? %>
       <span class="badge badge-success">
         <%= Spree.t(:in_stock) %>
@@ -30,7 +30,7 @@
     <% end %>
   </div>
 
-  <div class="col-2 text-center align-self-center">
+  <div class="col-span-2 text-center self-center">
     <%= button_to spree.admin_taxon_classification_path(classification.taxon_id, classification), class: 'btn btn-danger btn-sm', method: :delete, data: { controller: 'tooltip', turbo_confirm: Spree.t(:are_you_sure) } do %>
       <%= icon 'trash', class: 'mr-0', style: 'pointer-events: none' %>
       <%= tooltip(Spree.t('actions.destroy')) %>

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

@@ -1,6 +1,6 @@
 <%= turbo_close_dialog %>
 
-<%= turbo_stream.update :product_count, @taxon.products.count %>
+<%= turbo_stream.update :product_count, @taxon.classification_count %>
 
 <%= turbo_stream.replace :classifications do %>
   <%= render template: 'spree/admin/classifications/index' %>

data/app/views/spree/admin/classifications/destroy.turbo_stream.erb

@@ -1,2 +1,2 @@
-<%= turbo_stream.update :product_count, @taxon.products.count %>
+<%= turbo_stream.update :product_count, @taxon.classification_count %>
 <%= turbo_stream.remove spree_dom_id(@classification) %>

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

@@ -9,7 +9,7 @@
                   cached: can?(:delete, Spree::Classification) ? spree_base_cache_scope : false %>
     </div>
   <% else %>
-    <p class="text-center text-muted px-5 pt-5 pb-2">
+    <p class="text-center text-gray-600 px-12 pt-12 pb-2">
       <%= Spree.t(:no_products_added) %>
     </p>
     <p class="text-center">

data/app/views/spree/admin/coupon_codes/_filters.html.erb

@@ -1,11 +1,11 @@
 <%= search_form_for [:admin, @promotion, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>
-  <div class="d-flex flex-column flex-lg-row gap-2">
+  <div class="flex flex-col lg:flex-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont %>
 
-    <div class="d-flex align-items-center justify-content-between">
+    <div class="flex items-center justify-between">
       <%= dropdown do %>
         <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
-          <span class="text-muted font-weight-normal mr-1">
+          <span class="text-gray-600 font-normal mr-1">
             <%= Spree.t(:show) %>
           </span>
           <%= Spree.t(:all) if (params[:q] || {}).values_at(:state_eq).all?(&:blank?) %>

data/app/views/spree/admin/coupon_codes/_table_row.html.erb

@@ -1,8 +1,8 @@
 <tr id="<%= spree_dom_id coupon_code %>">
-  <td class="w-50">
+  <td class="w-1/2">
     <code><%= coupon_code.code.upcase %></code>
     <%= clipboard_component(coupon_code.code.upcase) %>
   </td>
-  <td class="w-25 font-size-sm"><%= active_badge(coupon_code.state == 'used') %></td>
-  <td class="w-25 font-size-sm"><%= spree_time(coupon_code.created_at) %></td>
+  <td class="w-1/4 text-sm"><%= active_badge(coupon_code.state == 'used') %></td>
+  <td class="w-1/4 text-sm"><%= spree_time(coupon_code.created_at) %></td>
 </tr>

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

@@ -6,12 +6,12 @@
 
 <%= render_admin_partials(:coupon_codes_header_partials) %>
 
-<div class="row">
-  <div class="col-12 col-lg-8">
+<div class="grid grid-cols-12 gap-6">
+  <div class="col-span-12 lg:col-span-8">
     <%= render 'spree/admin/shared/index_table', new_object_url: nil %>
   </div>
 
-  <div class="col-12 col-lg-4">
+  <div class="col-span-12 lg:col-span-4">
     <%= render 'spree/admin/promotions/sidebar' %>
   </div>
 </div>

data/app/views/spree/admin/custom_domains/_custom_domains.html.erb

@@ -1,5 +1,5 @@
 <% if current_store.custom_domains.any? %>
-  <div class="table-responsive rounded mt-3 border">
+  <div class="table-responsive rounded-lg  mt-4 border">
     <table class="table">
       <thead>
         <tr>

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

@@ -1,4 +1,4 @@
-<div class="card mb-3">
+<div class="card mb-6">
   <div class="card-body">
     <%= f.spree_text_field :url, label: Spree.t(:domain), prepend: 'https://', autofocus: f.object.new_record?, required: true %>
 

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

@@ -8,21 +8,21 @@
 
 <%= render_admin_partials(:custom_domains_header_partials) %>
 
-<div class="card-lg p-4">
-  <h5 class="mb-3">Internal URL</h5>
-  <div class="row mb-4">
-    <div class="col-lg-4">
-      <p class="text-muted">
+<div class="card-lg p-6">
+  <h5 class="mb-2">Internal URL</h5>
+  <div class="grid grid-cols-12 gap-6 mb-6">
+    <div class="col-span-12 lg:col-span-4">
+      <p class="text-gray-600">
         This is your internal Admin URL.
       </p>
     </div>
-    <div class="col-lg-7 offset-lg-1">
+    <div class="col-span-12 lg:col-span-7 lg:col-start-6">
       <%= form_for current_store, url: spree.admin_store_path, data: { turbo: false, controller: 'enable-button', 'enable-button-disable-when-not-changed-value': true } do |f| %>
         <% if Spree.root_domain.present? %>
-          <div class="d-flex align-items-center gap-3">
-            <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border pr-2 gap-1 <% if current_store.custom_domains.any? %>disabled<% end %>">
-              <span class="text-muted">https://</span>
-              <%= f.text_field :code, class: 'form-control-plaintext pl-0', data: { enable_button_target: 'input' }, required: true, disabled: current_store.custom_domains.any? %>
+          <div class="flex items-center gap-6">
+            <div class="input-group pr-2 grow <% if current_store.custom_domains.any? %>disabled<% end %>">
+              <span class="text-gray-400 pl-3 pr-0">https://</span>
+              <%= f.text_field :code, class: 'border-0 focus:ring-0 focus:outline-none grow rounded-lg text-base pl-0', data: { enable_button_target: 'input' }, required: true, disabled: current_store.custom_domains.any? %>
               <span>.<%= Spree.root_domain %></span>
 
               <%= clipboard_component(current_store.formatted_url) %>
@@ -32,10 +32,10 @@
             <% end %>
           </div>
         <% else %>
-          <div class="d-flex align-items-center gap-3">
-            <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border pr-2 gap-1">
-              <span class="text-muted">https://</span>
-              <%= f.text_field :url, class: 'form-control-plaintext pl-0', required: true, data: { enable_button_target: 'input' } %>
+          <div class="flex items-center gap-6">
+            <div class="input-group pr-2 grow">
+              <span class="text-gray-400 pl-3 pr-0">https://</span>
+              <%= f.text_field :url, class: 'border-0 focus:ring-0 focus:outline-none grow rounded-lg text-base pl-0', required: true, data: { enable_button_target: 'input' } %>
               <%= clipboard_component(current_store.formatted_url) %>
             </div>
             <%= turbo_save_button_tag %>
@@ -44,15 +44,15 @@
       <% end %>
     </div>
   </div>
-  <hr class="my-5" />
-  <h5><%= Spree.t(:custom_domains) %></h5>
-  <div class="row">
-    <div class="col-lg-4">
-      <p class="text-muted">
+  <hr class="my-12" />
+  <h5 class="mb-2"><%= Spree.t(:custom_domains) %></h5>
+  <div class="grid grid-cols-12 gap-6">
+    <div class="col-span-12 lg:col-span-4">
+      <p class="text-gray-600">
         Connect your domain or subdomain to your storefront.
       </p>
     </div>
-    <div class="col-lg-7 offset-lg-1">
+    <div class="col-span-12 lg:col-span-7 lg:col-start-6">
       <div class="text-right">
         <%= link_to Spree.t(:new_domain), spree.new_admin_custom_domain_path, class: "btn btn-primary" %>
       </div>

data/app/views/spree/admin/customer_group_users/bulk_create.turbo_stream.erb

@@ -0,0 +1,15 @@
+<%= turbo_close_drawer %>
+
+<%= turbo_render_alerts %>
+
+<%= turbo_stream.replace :customer_group_users do %>
+  <%= render template: 'spree/admin/customer_group_users/index' %>
+<% end %>
+
+<%= turbo_stream.replace 'customers_header' do %>
+  <%= render 'spree/admin/customer_groups/customers_header' %>
+<% end %>
+
+<%= turbo_stream.update 'customer_group_users_count' do %>
+  <%= @customer_group.users_count %>
+<% end %>

data/app/views/spree/admin/customer_group_users/bulk_destroy.turbo_stream.erb

@@ -0,0 +1,17 @@
+<%= turbo_render_alerts %>
+
+<%= turbo_stream.replace 'bulk-dialog' do %>
+  <%= render 'spree/admin/shared/bulk_modal' %>
+<% end %>
+
+<% params[:ids]&.each do |id| %>
+  <%= turbo_stream.remove("user_#{id}") %>
+<% end %>
+
+<%= turbo_stream.replace 'customers_header' do %>
+  <%= render 'spree/admin/customer_groups/customers_header' %>
+<% end %>
+
+<%= turbo_stream.update 'customer_group_users_count' do %>
+  <%= @customer_group.users_count %>
+<% end %>

data/app/views/spree/admin/customer_group_users/bulk_new.html.erb

@@ -0,0 +1,27 @@
+<%= turbo_frame_tag :drawer do %>
+  <div data-controller="search-picker" class="flex flex-col justify-between h-full">
+    <%= drawer_header(Spree.t(:add_customers)) %>
+
+    <div class="drawer-body border-b flex-none">
+      <%= form_with url: spree.search_admin_users_path, method: :post, data: { controller: 'auto-submit' } do |form| %>
+        <%= form.hidden_field :omit_ids, value: @customer_group.users.pluck(:id).join(',') %>
+        <%= form.search_field :q, value: params[:q], class: 'form-input w-full', placeholder: Spree.t(:search_customers), data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>
+      <% end %>
+    </div>
+
+    <%= form_with url: spree.bulk_create_admin_customer_group_customer_group_users_path(@customer_group), method: :post, class: 'grow flex flex-col justify-between' do |form| %>
+      <div class="drawer-body grow">
+        <div id="users_search_results" class="search-results overflow-y-auto max-h-96">
+          <p class="text-gray-500 text-center py-8">
+            <%= Spree.t(:type_to_search_customers) %>
+          </p>
+        </div>
+      </div>
+
+      <div class="drawer-footer">
+        <%= turbo_save_button_tag Spree.t(:add_selected), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %>
+        <%= drawer_discard_button %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1 @@
+<%= render_table @collection, :customer_group_users, container_class: 'card-body p-0', bulk_operations: true %>

data/app/views/spree/admin/customer_groups/_customers_header.html.erb

@@ -0,0 +1,12 @@
+<div class="card-header flex justify-between items-center border-gray-200 pr-3" id="customers_header">
+  <h5 class="card-title flex items-center gap-2">
+    <%= Spree.t(:customers) %>
+    <span class="badge badge-info"><%= @customer_group.users_count %></span>
+  </h5>
+  <div class="flex gap-2">
+    <%= link_to_with_icon 'plus', Spree.t(:add_customers),
+        spree.bulk_new_admin_customer_group_customer_group_users_path(@customer_group),
+        class: 'btn btn-sm btn-primary',
+        data: { action: 'drawer#open', turbo_frame: :drawer } if can?(:update, @customer_group) %>
+  </div>
+</div>

data/app/views/spree/admin/customer_groups/_details.html.erb

@@ -0,0 +1,59 @@
+<div class="card mb-6" id="<%= spree_dom_id(@customer_group) %>_details">
+  <div class="card-header flex justify-between">
+    <h5 class="card-title">
+      <%= Spree.t(:details) %>
+    </h5>
+    <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_customer_group_path(@customer_group),
+          class: 'btn btn-sm btn-light', data: { turbo_frame: :drawer, action: 'drawer#open' } if can?(:update, @customer_group) %>
+  </div>
+  <div class="card-body p-0">
+    <ul class="list-group list-group-flush">
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:name) %>
+        </span>
+        <span>
+          <%= @customer_group.name %>
+        </span>
+      </li>
+
+      <% if @customer_group.description.present? %>
+        <li class="list-group-item flex justify-between items-top gap-10">
+          <span class="text-gray-600">
+            <%= Spree.t(:description) %>
+          </span>
+          <span class="text-right">
+            <%= @customer_group.description %>
+          </span>
+        </li>
+      <% end %>
+
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:customers) %>
+        </span>
+        <span id="customer_group_users_count">
+          <%= @customer_group.users_count %>
+        </span>
+      </li>
+
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:created_at) %>
+        </span>
+        <span>
+          <%= spree_time(@customer_group.created_at, format: :long) %>
+        </span>
+      </li>
+
+      <li class="list-group-item flex justify-between items-center">
+        <span class="text-gray-600">
+          <%= Spree.t(:updated_at) %>
+        </span>
+        <span>
+          <%= spree_time(@customer_group.updated_at, format: :long) %>
+        </span>
+      </li>
+    </ul>
+  </div>
+</div>

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

@@ -0,0 +1,6 @@
+<div class="card mb-6">
+  <div class="card-body">
+    <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
+    <%= f.spree_text_area :description %>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/edit_resource_in_drawer' %>

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

@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:customer_groups) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_customer_group), spree.new_admin_customer_group_path, class: 'btn btn-primary' if can?(:create, Spree::CustomerGroup) %>
+<% end %>
+
+<%= render_table @collection, :customer_groups %>

data/app/views/spree/admin/customer_groups/show.html.erb

@@ -0,0 +1,19 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button(spree.admin_customer_groups_path) %>
+  <%= @customer_group.name %>
+<% end %>
+
+<div class="grid grid-cols-12 gap-6">
+  <div class="col-span-12 lg:col-span-8">
+    <div class="card mb-6">
+      <%= render 'customers_header' %>
+      <%= turbo_frame_tag :customer_group_users, src: spree.admin_customer_group_customer_group_users_path(@customer_group) do %>
+        <%= render 'spree/admin/shared/spinner' %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="col-span-12 lg:col-span-4">
+    <%= render 'details' %>
+  </div>
+</div>

data/app/views/spree/admin/customer_groups/update.turbo_stream.erb

@@ -0,0 +1,17 @@
+<% if @customer_group.valid? %>
+  <%= turbo_close_drawer %>
+  <%= turbo_render_alerts %>
+
+  <%= turbo_stream.replace spree_dom_id(@customer_group) + '_details' do %>
+    <%= render 'spree/admin/customer_groups/details' %>
+  <% end %>
+
+  <%= turbo_stream.update 'page_title' do %>
+    <%= page_header_back_button(spree.admin_customer_groups_path) %>
+    <%= @customer_group.name %>
+  <% end %>
+<% else %>
+  <%= turbo_stream.replace :drawer do %>
+    <%= render 'spree/admin/shared/edit_resource_in_drawer' %>
+  <% end %>
+<% end %>

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

@@ -4,7 +4,7 @@
     data-controller="row-link"
     class="cursor-pointer"
   >
-    <td class="font-weight-bold" data-action="click->row-link#openLink">
+    <td class="font-bold" data-action="click->row-link#openLink">
       <% if can?(:edit, customer_return) %>
         <%= link_to customer_return.number,
         spree.edit_admin_order_customer_return_path( customer_return.order, customer_return),

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

@@ -12,4 +12,4 @@
 
 <%= render_admin_partials(:customer_returns_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table', new_object_url: nil %>
+<%= render_table @collection, :customer_returns, edit_object_url: nil %>

data/app/views/spree/admin/dashboard/_setup_progress.html.erb

@@ -1,10 +1,10 @@
-<div class="card mb-3" id="setup_progress">
+<div class="card mb-6" id="setup_progress">
   <div class="card-body">
-    <div class="mb-3">
+    <div class="mb-4">
       Your overall setup progress
       <span class="float-right badge badge-<%= current_store.setup_completed? ? 'success' : 'info' %>">
         <% if current_store.setup_completed? %>
-          <%= icon('check', class: 'text-success') %>
+          <%= icon('check', class: 'text-green-700') %>
         <% end %>
 
         <span>

data/app/views/spree/admin/dashboard/_setup_tasks.html.erb

@@ -1,22 +1,28 @@
-<div id="setup_tasks">
+<div id="setup_tasks" class="flex flex-col gap-4">
   <% task_in_progress = nil %>
   <% current_store.setup_tasks_list.each_with_index do |task, index| %>
     <% done = current_store.setup_task_done?(task) %>
     <% unless done %>
       <% task_in_progress ||= task %>
     <% end %>
+    <% is_expanded = task_in_progress == task %>
 
-    <details class="collapsable-card mb-3" <% if task_in_progress == task %>open<% end %> id="setup_task_<%= task %>">
-      <summary class="card-header border-0 h-auto text-decoration-none d-flex align-items-center p-3 text-dark font-weight-normal w-100 card-title bg-transparent list-style-none" role="button" tabindex="0">
+    <div class="card overflow-hidden" data-controller="reveal" data-reveal-hidden-class="is-collapsed" id="setup_task_<%= task %>">
+      <div class="card-header card-header--collapsible border-0 h-auto no-underline flex items-center p-3 text-gray-900 font-normal w-full bg-transparent cursor-pointer focus:outline-none focus:ring-0 hover:bg-gray-50"
+           role="button"
+           tabindex="0"
+           data-action="click->reveal#toggle keydown.enter->reveal#toggle keydown.space->reveal#toggle">
         <%= onboarding_check_circle(done) %>
-        <span class="ml-3"><%= Spree.t("admin.store_setup_tasks.#{task}") %></span>
-        <%= icon('chevron-right', class: 'arrow ml-auto') %>
-      </summary>
-      <div class="animate__animated animate__fadeIn animate__faster">
-        <div class="card-body">
-          <%= render "spree/admin/dashboard/setup_tasks/#{task}", done: done %>
+        <span class="ml-6 font-medium"><%= Spree.t("admin.store_setup_tasks.#{task}") %></span>
+        <%= icon('chevron-right', class: 'arrow ml-auto transition-transform duration-200') %>
+      </div>
+      <div data-reveal-target="item" class="collapsible-content <%= 'is-collapsed' unless is_expanded %>">
+        <div>
+          <div class="card-body flex flex-col gap-3">
+            <%= render "spree/admin/dashboard/setup_tasks/#{task}", done: done %>
+          </div>
         </div>
       </div>
-    </details>
+    </div>
   <% end %>
 </div>

data/app/views/spree/admin/dashboard/_sidebar.html.erb

@@ -1,2 +1 @@
-<%= render 'updater' %>
-<%= render 'store_preview' %>
+<%= render 'updater' %>

data/app/views/spree/admin/dashboard/_top_products.html.erb

@@ -1,7 +1,7 @@
 <% report_link = spree.new_admin_report_path(type: 'products_performance', date_from: params[:date_from], date_to: params[:date_to], vendor_id: @vendor.try(:id)) %>
 
-<div class="card mt-3 mb-4">
-  <div class="card-header d-flex justify-content-between align-items-center">
+<div class="card mt-4 mb-6">
+  <div class="card-header flex justify-between items-center">
     <h5 class="card-title">
       <%= Spree.t('admin.dashboard.top_products') %>
     </h5>
@@ -13,8 +13,8 @@
     <div class="table-responsive">
       <table class="table">
         <thead>
-          <tr class="border-bottom">
-            <th scope="col">
+          <tr class="border-b">
+            <th scope="col" class="rounded-none">
               <%= Spree.t(:product) %>
             </th>
             <% if defined?(Spree::Vendor) && !@vendor %>
@@ -28,7 +28,7 @@
             <th class="text-center">
               <%= Spree.t(:quantity) %>
             </th>
-            <th class="text-right">
+            <th class="text-right rounded-none">
               <%= Spree.t(:total_sales) %>
             </th>
           </tr>
@@ -40,8 +40,8 @@
             <tr>
               <% cache_unless @vendor, spree_base_cache_scope.call(product) do %>
                 <td>
-                  <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center font-weight-bold', data: { 'turbo-frame': '_top' } do %>
-                    <div class="mr-3">
+                  <%= link_to spree.edit_admin_product_path(product), class: 'flex items-center font-bold', data: { 'turbo-frame': '_top' } do %>
+                    <div class="mr-4">
                       <%= render 'spree/admin/shared/product_image', object: product %>
                     </div>
                     <%= product.name %>
@@ -66,7 +66,7 @@
           <% end %>
         <% else %>
           <tr>
-            <td colspan="5" class="text-center text-muted py-5">
+            <td colspan="5" class="text-center text-gray-600 py-12">
               <%= Spree.t(:no_resource_found, resource: Spree::Product.name.demodulize.underscore.humanize) %>
             </td>
           </tr>
@@ -75,8 +75,8 @@
     </table>
   </div>
   <% if @top_products.any? && can?(:manage, Spree::Report) %>
-    <p class="text-center mt-0 border-top py-2 mb-0">
-      <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-50 btn btn-light mt-2', data: { turbo_frame: '_top' } %>
+    <p class="text-center mt-0 border-t py-2 mb-0">
+      <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-1/2 btn btn-light mt-2', data: { turbo_frame: '_top' } %>
     </p>
   <% end %>
   </div>

data/app/views/spree/admin/dashboard/_updater.html.erb

@@ -1,7 +1,7 @@
 <% if show_spree_updater_notice? %>
   <div id="updater-notice" class="mb-3">
     <%= image_tag 'favicon_256x256.png', alt: 'Spree', width: 32, height: 32 %>
-    <div class="d-flex flex-column">
+    <div class="flex flex-col">
       <p class="mb-1">
         <strong>Spree <%= spree_updater.latest_release['name'] %></strong> is available.
         <br />Your current version is <strong>Spree <%= spree_updater.current_release %></strong>.