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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Improve admin minimal layout (#12688)
Damian Legawiec8b5989f5f8fc
diff --git a/admin/app/assets/images/login_sidebar_background.png b/admin/app/assets/images/login_sidebar_background.pngnew file mode 100644index 0000000000..96ddb55dc4Binary files /dev/null and b/admin/app/assets/images/login_sidebar_background.png differdiff --git a/admin/app/views/layouts/spree/minimal.html.erb b/admin/app/views/layouts/spree/minimal.html.erbindex d39d2e69a6..196f36bd12 100644--- a/admin/app/views/layouts/spree/minimal.html.erb+++ b/admin/app/views/layouts/spree/minimal.html.erb@@ -4,8 +4,17 @@<%= render "spree/admin/shared/head" %></head><body class="admin min-vh-100 <%= controller_name %> <%= action_name %>">- <div class="container">- <%= yield %>+ <div class="container-fluid">+ <div class="row bg-white">+ <div+ class="col-lg-5 d-none d-lg-flex bg-light min-vh-100"+ style="background-image: url('<%= asset_path('login_sidebar_background.png') %>');background-repeat: no-repeat;background-size: cover;background-position: center')"+ >+ </div>+ <div class="col-lg-6 col-xl-4 offset-xl-1 py-3 d-flex flex-column justify-content-center vh-100">+ <%= yield %>+ </div>+ </div></div><%= render "spree/admin/shared/modal" %><%= render "spree/admin/shared/alerts" %>diff --git a/admin/app/views/spree/admin/admin_users/new.html.erb b/admin/app/views/spree/admin/admin_users/new.html.erbindex 428164f51d..57c96800a3 100644--- a/admin/app/views/spree/admin/admin_users/new.html.erb+++ b/admin/app/views/spree/admin/admin_users/new.html.erb@@ -1,36 +1,21 @@-<div class="col-lg-6 offset-lg-3">+<%= form_with model: @admin_user, url: spree.admin_admin_users_path(token: @invitation.token), method: :post, scope: :admin_user do |f| %>+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @admin_user } %>- <div class="mx-auto mt-5 mb-3">- <% if current_store.logo.attached? %>- <%= spree_image_tag current_store.logo, class: 'mx-auto d-block', height: 64 %>- <% else %>- <%= image_tag 'logo.png', class: 'mx-auto d-block', height: 64 %>- <% end %>- </div>-- <%= form_with model: @admin_user, url: spree.admin_admin_users_path(token: @invitation.token), method: :post, scope: :admin_user do |f| %>- <div class="card mb-5">- <div class="card-body">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @admin_user } %>-- <div class="rounded border p-3 mb-3 d-flex align-items-center gap-2">- <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>- <%= @invitation.inviter.name %> has invited you to join <strong><%= @invitation.resource.name %></strong>- </div>+ <div class="rounded border p-3 mb-3 d-flex align-items-center gap-2">+ <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>+ <%= @invitation.inviter.name %> has invited you to join <strong><%= @invitation.resource.name %></strong>+ </div>- <%= render 'form', f: f %>- <div class="form-group">- <%= f.label :password %>- <%= f.password_field :password, class: 'form-control', required: true %>- </div>- <div class="form-group">- <%= f.label :password_confirmation %>- <%= f.password_field :password_confirmation, class: 'form-control', required: true %>- </div>+ <%= render 'form', f: f %>+ <div class="form-group">+ <%= f.label :password %>+ <%= f.password_field :password, class: 'form-control', required: true %></div>- <div class="card-footer">- <%= turbo_save_button_tag(Spree.t('create_a_new_account')) %>+ <div class="form-group">+ <%= f.label :password_confirmation %>+ <%= f.password_field :password_confirmation, class: 'form-control', required: true %></div>- </div>- <% end %>-</div>++ <%= turbo_save_button_tag(Spree.t('create_a_new_account')) %>+<% end %>+diff --git a/admin/app/views/spree/admin/invitations/show.html.erb b/admin/app/views/spree/admin/invitations/show.html.erbindex 0d74016225..b21ef31c83 100644--- a/admin/app/views/spree/admin/invitations/show.html.erb+++ b/admin/app/views/spree/admin/invitations/show.html.erb@@ -1,17 +1,9 @@-<div class="col-lg-4 offset-lg-4 mt-5">- <div class="card mb-5">- <div class="card-body">- <div class="d-flex align-items-center gap-2">- <div>- <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>- </div>- <div>- <strong><%= @invitation.inviter.name %></strong> has invited you to join <strong><%= @invitation.resource.name %></strong>- </div>- </div>- </div>- <div class="card-footer border-top">- <%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary w-100', data: { turbo_method: :put } %>- </div>+<div class="d-flex align-items-center gap-2">+ <div>+ <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>+ </div>+ <div>+ <strong><%= @invitation.inviter.name %></strong> has invited you to join <strong><%= @invitation.resource.name %></strong></div></div>+<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary w-100', data: { turbo_method: :put } %>\ No newline at end of file