Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More compact admin spacing #4505

Merged
merged 1 commit into from
Dec 17, 2024
Merged

More compact admin spacing #4505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 38 additions & 32 deletions lib/sanbase_web/components/admin/admin_components.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,19 +261,21 @@ defmodule SanbaseWeb.AdminComponents do

def show_table(assigns) do
~H"""
<div class="mt-6">
<h3 class="text-3xl font-medium text-gray-700">Show <%= Inflex.singularize(@resource) %></h3>
<div class="table-responsive">
<div class="relative overflow-x-auto shadow-md sm:rounded-lg">
<table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
<div class="mt-4">
<h3 class="text-2xl font-medium text-gray-700 mb-2">
Show <%= Inflex.singularize(@resource) %>
</h3>
<div class="relative shadow-md sm:rounded-lg">
<div class="overflow-x-auto">
<table class="w-full text-xs text-left rtl:text-right text-gray-500 dark:text-gray-400 min-w-full table-fixed">
<tbody>
<%= for field <- @fields do %>
<tr class="hover:bg-gray-50 dark:hover:bg-gray-600">
<th class="text-xs pl-2 text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400 border-b border-gray-200">
<th class="text-xs px-2 py-1 text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400 border-b border-gray-200 whitespace-nowrap w-1/4">
<%= to_string(field) %>
</th>
<.td_show
class="px-6 py-4 border-b border-gray-200"
class="px-3 py-2 border-b border-gray-200 whitespace-pre-wrap break-words"
value={
result =
if @assocs[@data.id][field],
Expand Down Expand Up @@ -430,19 +432,21 @@ defmodule SanbaseWeb.AdminComponents do
<% end %>
<.search fields={@search_fields} resource={@resource} search={@search} />
</div>
<div class="relative overflow-x-auto shadow-md sm:rounded-lg">
<table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
<.thead fields={@fields} actions={@actions} />
<.tbody
resource={@resource}
rows={@rows}
fields={@fields}
assocs={@assocs}
field_type_map={@field_type_map}
actions={@actions}
funcs={@funcs}
/>
</table>
<div class="relative shadow-md sm:rounded-lg">
<div class="overflow-x-auto pr-4" style="max-height: calc(85vh - 180px);">
<table class="w-full text-xs text-left rtl:text-right text-gray-500 dark:text-gray-400 min-w-full table-fixed">
<.thead fields={@fields} actions={@actions} />
<.tbody
resource={@resource}
rows={@rows}
fields={@fields}
assocs={@assocs}
field_type_map={@field_type_map}
actions={@actions}
funcs={@funcs}
/>
</table>
</div>

<.pagination
resource={@resource}
Expand All @@ -459,13 +463,13 @@ defmodule SanbaseWeb.AdminComponents do

def thead(assigns) do
~H"""
<thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
<thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400 sticky top-0">
<tr>
<%= for field <- @fields do %>
<th scope="col" class="px-6 py-3"><%= field %></th>
<th scope="col" class="px-2 py-1 whitespace-nowrap min-w-[120px]"><%= field %></th>
<% end %>
<%= if @actions do %>
<th scope="col" class="px-6 py-3">Actions</th>
<th scope="col" class="px-2 py-1 whitespace-nowrap w-[140px] min-w-[140px]">Actions</th>
<% end %>
</tr>
</thead>
Expand All @@ -479,7 +483,7 @@ defmodule SanbaseWeb.AdminComponents do
<tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600">
<%= for field <- @fields do %>
<%= if field == :id do %>
<td class="px-6 py-4">
<td class="px-3 py-2 min-w-[120px]">
<.a resource={@resource} action={:show} row={row} label={Map.get(row, field)} />
</td>
<% else %>
Expand All @@ -505,11 +509,13 @@ defmodule SanbaseWeb.AdminComponents do
<% end %>
<% end %>
<%= if @actions do %>
<td class="px-6 py-4">
<% index_actions = @actions -- [:new] %>
<%= for action <- index_actions do %>
<.index_action_btn resource={@resource} action={action} label={action} row={row} />
<% end %>
<td class="px-3 py-2 w-[140px] min-w-[140px]">
<div class="flex flex-row flex-nowrap gap-1 items-center">
<% index_actions = @actions -- [:new] %>
<%= for action <- index_actions do %>
<.index_action_btn resource={@resource} action={action} label={action} row={row} />
<% end %>
</div>
</td>
<% end %>
</tr>
Expand Down Expand Up @@ -676,7 +682,7 @@ defmodule SanbaseWeb.AdminComponents do

def td_index(assigns) do
~H"""
<td class="px-6 py-4">
<td class="px-3 py-2 whitespace-nowrap overflow-hidden text-ellipsis min-w-[120px]">
<%= @value %>
</td>
"""
Expand Down Expand Up @@ -742,7 +748,7 @@ defmodule SanbaseWeb.AdminComponents do

def pagination(assigns) do
~H"""
<div class="flex justify-between items-center p-4">
<div class="flex justify-between items-center p-2 text-xs border-t">
<.pagination_buttons
resource={@resource}
rows_count={@rows_count}
Expand All @@ -751,7 +757,7 @@ defmodule SanbaseWeb.AdminComponents do
action={@action}
search={@search}
/>
<span class="text-sm text-gray-700">
<span class="text-xs text-gray-700">
Showing <%= @current_page * @page_size + 1 %> to <%= Enum.min([
(@current_page + 1) * @page_size,
@rows_count
Expand Down
58 changes: 34 additions & 24 deletions lib/sanbase_web/templates/generic_admin_html/show.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,41 @@

<%= for bt <- @belongs_to do %>
<div class="mt-4">
<h3 class="text-3xl font-medium text-gray-700"><%= bt.name %></h3>
<table class="table-auto border-collapse w-full mb-4">
<tbody>
<%= for field <- bt.fields do %>
<tr>
<td class="px-6 py-4 text-lg text-gray-700 border-b"><%= field.field_name %></td>
<td class="show"><pre><%= field.data %></pre></td>
</tr>
<% end %>
</tbody>
</table>
<h3 class="text-2xl font-medium text-gray-700 mb-2"><%= bt.name %></h3>
<div class="relative shadow-md sm:rounded-lg">
<div class="overflow-x-auto">
<table class="w-full text-xs text-left rtl:text-right text-gray-500 dark:text-gray-400 min-w-full table-fixed">
<tbody>
<%= for field <- bt.fields do %>
<tr class="hover:bg-gray-50 dark:hover:bg-gray-600">
<th class="text-xs px-2 py-1 text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400 border-b border-gray-200 whitespace-nowrap w-1/4">
<%= field.field_name %>
</th>
<td class="px-3 py-2 border-b border-gray-200 whitespace-pre-wrap break-words">
<pre class="text-xs"><%= field.data %></pre>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>

<%= for action <- bt.actions do %>
<span>
<%= link(to_string(action),
to:
Routes.generic_admin_path(SanbaseWeb.Endpoint, :show_action,
action: action,
resource: @resource,
id: @data.id
),
class: "flex-shrink-0 border-4 text-teal-500 hover:text-teal-800 py-1 px-2 rounded"
) %>
</span>
<% end %>
<div class="mt-2">
<%= for action <- bt.actions do %>
<span>
<%= link(to_string(action),
to:
Routes.generic_admin_path(SanbaseWeb.Endpoint, :show_action,
action: action,
resource: @resource,
id: @data.id
),
class: "text-xs text-blue-500 hover:text-blue-700 mr-2"
) %>
</span>
<% end %>
</div>
</div>
<% end %>

Expand Down
Loading