mirror of
https://github.com/we-promise/sure.git
synced 2026-05-25 13:34:58 +00:00
adea16f694
* fix(views): clear Rule 2 + Rule 5 findings from weekly DS drift (#1951) Token swaps + i18n cleanup across the three files flagged in the weekly merged-commit drift scan. **`app/views/admin/users/index.html.erb`** - `bg-green-100 text-green-800` → `bg-success/10 text-success` (2 callsites — active-subscription badge + super_admin role legend) - `bg-surface-default` → `bg-surface` (`--color-surface-default` isn't defined; canonical token is `--color-surface`) - `bg-red-50/30 dark:bg-red-950/20` → `bg-destructive/5` (pending-invitation row highlight; functional token resolves correctly in both themes via `--color-destructive`) - Hand-rolled destructive button classes (`text-red-600`, `border-red-300`, `hover:bg-red-50`) → functional tokens (`text-destructive`, `border-destructive`, `hover:bg-destructive/10`) - Drop redundant `default:` args from `t(".roles.member", default: "Member")` and `t(".role_descriptions.member", default: "Basic user access…")` — the locale keys exist in `config/locales/views/admin/users/en.yml` **`app/views/imports/new.html.erb`** - `icon_bg_class: "bg-gray-tint-5"` → `"bg-surface-inset"` (`gray-tint-5` isn't a defined utility; `bg-surface-inset` carries the same muted-background intent and theme-swaps correctly) **`app/views/settings/profiles/show.html.erb`** - Drop redundant `default:` args from `t(".group_title", default: "Group")`, `t(".group_form_label", default: "Group name")`, and `t(".group_form_input_placeholder", default: "Enter group name")` — all three keys exist in `config/locales/views/settings/en.yml` **Deferred** to a separate PR (Rule 1 findings on admin/users): - `<details>` block (lines 54–180) → `DS::Disclosure(:card)` — bigger refactor with custom summary content + Stimulus controller attributes; warrants its own diff. - Destructive button shell → `DS::Button(:destructive)` — same reason; the class-token swap in this PR clears the immediate violation without changing the form-with structure or visual. Refs #1951. * fix(profiles): restore i18n default: args for group_* keys @jjmata + @codex correctly flagged: `settings.profiles.show.group_title`, `group_form_label`, and `group_form_input_placeholder` are defined in en.yml + 4 other locales (de, es, pl, pt-BR), but missing from 8 locales (ca, fr, nb, nl, ro, tr, zh-CN, zh-TW). With `config.i18n.fallbacks = true` those locales currently fall back to en values, so end-users see English copy rather than a translation-missing marker. The `default:` arg makes the fallback explicit at the call site without depending on the Rails fallback chain being configured a particular way — restores the original defensive behavior from before #1955. Admin/users role keys keep their `default:` removal — verified that `roles.member` and `role_descriptions.member` exist in all 8 admin/users locales (`grep -c "^\s*member:"` returns 2 for every locale file).
220 lines
12 KiB
Plaintext
220 lines
12 KiB
Plaintext
<%= content_for :page_title, t(".title") %>
|
|
|
|
<div class="bg-container rounded-xl shadow-border-xs p-4 space-y-6">
|
|
<div>
|
|
<p class="text-sm text-secondary"><%= t(".description") %></p>
|
|
</div>
|
|
|
|
<!-- Filters -->
|
|
<div>
|
|
<%= form_with url: admin_users_path, method: :get, class: "flex gap-4 items-end flex-wrap" do |f| %>
|
|
<div class="w-full md:w-auto">
|
|
<%= f.label :role, t(".filters.role"), class: "block text-sm font-medium text-primary mb-1" %>
|
|
<%= f.select :role,
|
|
options_for_select(
|
|
[[t(".filters.role_all"), ""], [t(".roles.guest"), "guest"], [t(".roles.member"), "member"], [t(".roles.admin"), "admin"], [t(".roles.super_admin"), "super_admin"]],
|
|
params[:role]
|
|
),
|
|
{},
|
|
class: "rounded-lg border border-primary px-3 py-2 text-sm bg-container-inset text-primary w-full" %>
|
|
</div>
|
|
<div class="w-full md:w-auto">
|
|
<%= f.label :trial_status, t(".filters.trial_status"), class: "block text-sm font-medium text-primary mb-1" %>
|
|
<%= f.select :trial_status,
|
|
options_for_select(
|
|
[[t(".filters.trial_all"), ""], [t(".filters.trial_expiring_soon"), "expiring_soon"], [t(".filters.trial_trialing"), "trialing"]],
|
|
params[:trial_status]
|
|
),
|
|
{},
|
|
class: "rounded-lg border border-primary px-3 py-2 text-sm bg-container-inset text-primary w-full" %>
|
|
</div>
|
|
<%= render DS::Button.new(variant: :primary, size: :md, type: "submit", text: t(".filters.submit"), class: "md:w-auto w-full justify-center") %>
|
|
<% end %>
|
|
</div>
|
|
|
|
<!-- Summary: trials expiring in next 7 days -->
|
|
<div class="grid grid-cols-1 md:grid-cols-4 gap-4">
|
|
<div class="bg-container-inset rounded-lg p-4">
|
|
<div class="flex items-center gap-2 mb-2">
|
|
<%= icon "calendar-clock", class: "w-5 h-5 text-secondary" %>
|
|
<p class="text-xs font-medium text-secondary uppercase"><%= t(".summary.trials_expiring_7_days") %></p>
|
|
</div>
|
|
<p class="text-2xl font-semibold text-primary"><%= @trials_expiring_in_7_days %></p>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Families/Groups & Users -->
|
|
<div>
|
|
<h2 class="text-lg font-semibold text-primary mb-3"><%= t(".section_title") %></h2>
|
|
|
|
<% if @families_with_users.any? %>
|
|
<div class="space-y-4">
|
|
<% @families_with_users.each do |family, users| %>
|
|
<% pending_invitations = @invitations_by_family[family.id] || [] %>
|
|
<details class="bg-container-inset rounded-lg overflow-hidden group"
|
|
data-controller="admin-invitation-delete"
|
|
data-admin-invitation-delete-delete-all-label-value="<%= t(".invitations.delete_all") %>">
|
|
<summary class="flex items-center justify-between gap-4 px-4 py-3 cursor-pointer select-none hover:bg-surface-hover">
|
|
<div class="flex items-center gap-3">
|
|
<%= icon "users", class: "w-5 h-5 text-secondary shrink-0" %>
|
|
<div>
|
|
<p class="font-semibold text-primary"><%= family.name.presence || t(".unnamed_family") %></p>
|
|
<p class="text-xs text-secondary">
|
|
<%= t(".family_summary",
|
|
members: users.size,
|
|
accounts: number_with_delimiter(@accounts_count_by_family[family.id] || 0),
|
|
transactions: number_with_delimiter(@entries_count_by_family[family.id] || 0)) %>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div class="flex items-center gap-4 shrink-0">
|
|
<% sub = family.subscription %>
|
|
<% if sub&.trialing? %>
|
|
<span class="text-xs text-secondary">
|
|
<%= t(".table.trial_ends_at") %>: <%= sub.trial_ends_at&.to_fs(:long) || t(".not_available") %>
|
|
</span>
|
|
<% elsif sub %>
|
|
<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium
|
|
<%= sub.active? ? "bg-success/10 text-success" : "bg-surface text-secondary" %>">
|
|
<%= sub.status.humanize %>
|
|
</span>
|
|
<% else %>
|
|
<span class="text-xs text-secondary"><%= t(".no_subscription") %></span>
|
|
<% end %>
|
|
<%= icon "chevron-down", class: "w-4 h-4 text-secondary transition-transform group-open:rotate-180" %>
|
|
</div>
|
|
</summary>
|
|
|
|
<div class="border-t border-primary">
|
|
<table class="w-full">
|
|
<thead class="bg-surface border-b border-primary">
|
|
<tr>
|
|
<th class="px-4 py-2 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.user") %></th>
|
|
<th class="px-4 py-2 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.last_login") %></th>
|
|
<th class="px-4 py-2 text-right text-xs font-medium text-secondary uppercase"><%= t(".table.session_count") %></th>
|
|
<th class="px-4 py-2 text-right text-xs font-medium text-secondary uppercase"><%= t(".table.role") %></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody class="divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200">
|
|
<% users.each do |user| %>
|
|
<tr>
|
|
<td class="px-4 py-3">
|
|
<div class="flex items-center gap-3">
|
|
<div class="w-8 h-8 rounded-full bg-surface flex items-center justify-center shrink-0">
|
|
<span class="text-sm font-medium text-primary"><%= user.initials %></span>
|
|
</div>
|
|
<div>
|
|
<p class="font-medium text-primary"><%= user.display_name %></p>
|
|
<p class="text-sm text-secondary"><%= user.email %></p>
|
|
</div>
|
|
</div>
|
|
</td>
|
|
<td class="px-4 py-3 text-sm text-primary whitespace-nowrap">
|
|
<%= @last_login_by_user[user.id]&.to_fs(:long) || t(".table.never") %>
|
|
</td>
|
|
<td class="px-4 py-3 text-sm text-primary text-right whitespace-nowrap">
|
|
<%= number_with_delimiter(@sessions_count_by_user[user.id] || 0) %>
|
|
</td>
|
|
<td class="px-4 py-3 text-right">
|
|
<% if user.id == Current.user.id %>
|
|
<span class="text-sm text-secondary"><%= t(".you") %></span>
|
|
<% else %>
|
|
<%= form_with model: [:admin, user], method: :patch, class: "flex items-center justify-end gap-2", data: { controller: "auto-submit-form" } do |form| %>
|
|
<%= form.select :role,
|
|
options_for_select([
|
|
[t(".roles.guest"), "guest"],
|
|
[t(".roles.member"), "member"],
|
|
[t(".roles.admin"), "admin"],
|
|
[t(".roles.super_admin"), "super_admin"]
|
|
], user.role),
|
|
{},
|
|
class: "text-sm rounded-lg border border-primary bg-container text-primary px-2 py-1",
|
|
data: { auto_submit_form_target: "auto" } %>
|
|
<% end %>
|
|
<% end %>
|
|
</td>
|
|
</tr>
|
|
<% end %>
|
|
</tbody>
|
|
<% if pending_invitations.any? %>
|
|
<tbody class="divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200 border-t border-dashed border-primary">
|
|
<% pending_invitations.each do |invitation| %>
|
|
<tr class="bg-destructive/5">
|
|
<td class="px-4 py-3">
|
|
<div class="flex items-center gap-3">
|
|
<%= icon "mail", class: "w-5 h-5 text-secondary shrink-0" %>
|
|
<div>
|
|
<p class="font-medium text-secondary italic"><%= invitation.email %></p>
|
|
<p class="text-xs text-secondary"><%= t(".invitations.pending_label") %></p>
|
|
</div>
|
|
</div>
|
|
</td>
|
|
<td class="px-4 py-3 text-sm text-secondary whitespace-nowrap">
|
|
<%= t(".invitations.expires", date: invitation.expires_at.to_fs(:long)) %>
|
|
</td>
|
|
<td class="px-4 py-3 text-sm text-secondary text-right whitespace-nowrap">
|
|
—
|
|
</td>
|
|
<td class="px-4 py-3 text-right">
|
|
<%= form_with url: admin_invitation_path(invitation), method: :delete, class: "inline" do |f| %>
|
|
<button type="submit"
|
|
data-admin-invitation-delete-target="button"
|
|
data-action="click->admin-invitation-delete#handleClick"
|
|
class="text-sm text-destructive border border-destructive rounded-lg px-2 py-1 hover:bg-destructive/10 transition-colors">
|
|
<%= t(".invitations.delete") %>
|
|
</button>
|
|
<% end %>
|
|
</td>
|
|
</tr>
|
|
<% end %>
|
|
</tbody>
|
|
<% end %>
|
|
</table>
|
|
<% if pending_invitations.any? %>
|
|
<%= form_with url: invitations_admin_family_path(family), method: :delete,
|
|
data: { admin_invitation_delete_target: "destroyAllForm" },
|
|
class: "hidden" do |f| %>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
</details>
|
|
<% end %>
|
|
</div>
|
|
<% else %>
|
|
<div class="bg-container-inset rounded-lg p-8 text-center">
|
|
<%= icon "users", class: "w-12 h-12 mx-auto text-secondary mb-3" %>
|
|
<p class="text-secondary"><%= t(".no_users") %></p>
|
|
</div>
|
|
<% end %>
|
|
</div>
|
|
|
|
<%= settings_section title: t(".role_descriptions_title"), collapsible: true, open: true do %>
|
|
<div class="space-y-3 text-sm">
|
|
<div class="flex items-start gap-3">
|
|
<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-surface text-primary shrink-0">
|
|
<%= t(".roles.guest") %>
|
|
</span>
|
|
<p class="text-secondary"><%= t(".role_descriptions.guest") %></p>
|
|
</div>
|
|
<div class="flex items-start gap-3">
|
|
<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-surface text-primary shrink-0">
|
|
<%= t(".roles.member") %>
|
|
</span>
|
|
<p class="text-secondary"><%= t(".role_descriptions.member") %></p>
|
|
</div>
|
|
<div class="flex items-start gap-3">
|
|
<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-surface text-primary shrink-0">
|
|
<%= t(".roles.admin") %>
|
|
</span>
|
|
<p class="text-secondary"><%= t(".role_descriptions.admin") %></p>
|
|
</div>
|
|
<div class="flex items-start gap-3">
|
|
<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-success/10 text-success shrink-0">
|
|
<%= t(".roles.super_admin") %>
|
|
</span>
|
|
<p class="text-secondary"><%= t(".role_descriptions.super_admin") %></p>
|
|
</div>
|
|
</div>
|
|
<% end %>
|
|
</div>
|