mirror of
https://github.com/we-promise/sure.git
synced 2026-05-09 21:54:58 +00:00
0d32bb70ec
* chore(design-system): swap raw gray classes for semantic tokens across remaining views Finalizes the raw-color sweep started in #1652 (settings) and continued in #1654 (holdings). Covers accounts, budgets, chats, pages, imports, provider integrations (mercury, lunchflow, sophtron, enable_banking, coinstats), auth flows (password reset, MFA, registrations), shared layouts, and selected DS component hover states. 35 files, ~56 line changes. Mappings (matching the patterns established in the prior sweeps): - text-white bg-gray-900 hover:bg-gray-800 (with optional focus:ring-gray-900) -> text-inverse button-bg-primary hover:button-bg-primary-hover -> focus:ring-button-bg-primary - text-gray-500 / 600 / 700 -> text-secondary - text-gray-800 -> text-primary - text-gray-400 -> text-subdued - hover:text-gray-700 / hover:text-gray-100 -> hover:text-primary - bg-gray-50 / 100 / 200 (standalone) -> bg-surface-inset - bg-gray-500/5 -> bg-gray-tint-5 - bg-gray-500/10 -> bg-gray-tint-10 - bg-gray-900 (decorative active states) -> bg-inverse - hover:bg-gray-50 / 100 (standalone) -> hover:bg-surface-inset - hover:bg-gray-300 -> hover:bg-surface-inset-hover - bg-white hover:bg-gray-100 -> bg-container hover:bg-container-hover - border-gray-300 -> border-secondary - focus:border-gray-200 -> focus:border-secondary - focus-within:border-gray-900 -> focus-within:border-primary - DS::Buttonish outline / ghost / icon hover: hover:bg-gray-100 theme-dark:hover:bg-gray-700 -> hover:bg-container-inset-hover Left intentionally raw, with rationale: - bg-gray-300 / bg-gray-400 decorative dots and avatar circles. The raw value reads OK against both bg-container variants; no semantic "neutral indicator" token exists. Same pattern as #1652 / #1654. - bg-gray-400/20 theme-dark:bg-gray-500/20 (onboardings/trial). Custom alpha tint with no equivalent token. - bg-white theme-dark:bg-gray-700 (DS::Tabs active pill, budgets tabs). Custom tab-pill pattern; gray-700 in dark mode (one shade lighter than page bg-gray-900) is intentional for visibility. - bg-gray-100 theme-dark:bg-gray-700 (DS::Toggle base bg). Closest match (bg-container-inset-hover) is semantically a hover state. - DS::Buttonish secondary variant gray-200/300/700/600 pattern. Same pattern as #1654 holdings; needs button-bg-secondary-strong from that PR. Will swap in a follow-up after #1654 merges. - disabled:bg-gray-500 theme-dark:disabled:bg-gray-400 on inverse buttons (DS::Buttonish primary, enable_banking, coinstats). Custom disabled state for the inverse pair; no token. - text-gray-300 SVG stroke (shared/_progress_circle). - bg-white text-gray-900 (layouts/print). Print contexts intentionally light regardless of theme. - bg-gray-800 / border-gray-700 / text-white / hover:text-gray-100 (impersonation_sessions/_super_admin_bar). Admin overlay styled to remain dark in both modes; not a theme-aware component. Files covered by other in-flight PRs were skipped to avoid rebase conflicts: chats/_ai_consent's fg-inverse swap (#1626), shared/_text_tooltip and shared/_money_field tooltip pills (#1626), investments/_value_tooltip (#1626), components/DS/tooltip (#1626). * fix(design-system): keep changelog avatar text raw to preserve dark-mode contrast The changelog avatar fallback (when @release_notes[:avatar] is missing) sits inside the "decorative + raw" exception list — bg-gray-300 stays fixed across themes since no semantic neutral-indicator token exists. The earlier sweep partially themed the pair: bg-gray-300 stayed raw but text-gray-600 became text-secondary. text-secondary resolves to gray-300 in dark mode, which matches the bg → text became invisible against its own background. Reverting only the text class to text-gray-600 restores the original fixed-light placeholder behavior. Both classes raw, both themes readable. * fix(design-system): address review feedback on raw-color-sweep-finalize Six issues caught by CodeRabbit + Codex review: 1. focus:ring-button-bg-primary silently emits no CSS (×6 files). button-bg-primary is a custom @utility, not a theme color, so Tailwind's ring-{name} resolution finds no --color-button-bg-primary. Replaces with focus:ring-gray-900 theme-dark:focus:ring-white — same color flip as the button bg, but resolved through theme colors so the ring actually renders. Files: lunchflow/mercury/sophtron _api_error + _setup_required, coinstats_items/new. 2. accounts/show/_activity.html.erb: focus-within:ring-gray-100 was dead (no ring-width on the parent). Removed. 3. import/confirms/show.html.erb: uniform hover:bg-surface-inset-hover applied to both active and inactive step indicators created a jarring dark-to-light flip on the active step (bg-inverse → bg-surface-inset-hover). Now hover follows the resting state: active uses hover:bg-inverse-hover, inactive uses hover:bg-surface-inset-hover. 4. password_resets/new.html.erb: bg-white left raw alongside the migrated hover:bg-surface-inset. Swapped to bg-container so dark mode flips properly. 5. registrations/new.html.erb + password_validator_controller.js: view now uses bg-surface-inset on password strength block lines, but the Stimulus controller still toggled bg-gray-200 on validate. Updated controller to add/remove bg-surface-inset matching the view, so unmet states reset to the tokenized class instead of leaving raw gray-200 stuck on the element.
129 lines
7.1 KiB
Plaintext
129 lines
7.1 KiB
Plaintext
<%= turbo_frame_tag "modal" do %>
|
|
<%= render DS::Dialog.new do |dialog| %>
|
|
<% dialog.with_header(title: t(".title")) %>
|
|
|
|
<% dialog.with_body do %>
|
|
<% error_msg = local_assigns[:error_message] || @error_message %>
|
|
<% if error_msg.present? %>
|
|
<div class="p-2 rounded-md bg-destructive/10 text-destructive text-sm overflow-hidden mb-3">
|
|
<p class="line-clamp-3" title="<%= error_msg %>"><%= error_msg %></p>
|
|
</div>
|
|
<% end %>
|
|
|
|
<% items = local_assigns[:coinstats_items] || @coinstats_items || Current.family.coinstats_items.where.not(api_key: nil) %>
|
|
<% selected_item = items&.first %>
|
|
|
|
<% if selected_item.present? %>
|
|
<% blockchains = local_assigns[:blockchains] || @blockchains || [] %>
|
|
<% exchanges = local_assigns[:exchanges] || @exchanges || [] %>
|
|
<% address_value = local_assigns[:address] || @address %>
|
|
<% blockchain_value = local_assigns[:blockchain] || @blockchain %>
|
|
<% exchange_connection_id = local_assigns[:exchange_connection_id] || @exchange_connection_id %>
|
|
<% exchange_connection_fields = local_assigns[:exchange_connection_fields] || @exchange_connection_fields || {} %>
|
|
|
|
<div class="space-y-5">
|
|
<section class="rounded-xl border border-primary bg-container p-4 space-y-3">
|
|
<div class="space-y-1">
|
|
<h3 class="text-sm font-medium text-primary"><%= t(".link_wallet_title") %></h3>
|
|
<p class="text-sm text-secondary"><%= t(".link_wallet_description") %></p>
|
|
</div>
|
|
|
|
<%= styled_form_with url: link_wallet_coinstats_items_path,
|
|
method: :post,
|
|
data: { turbo: true },
|
|
class: "space-y-3" do |form| %>
|
|
<%= form.hidden_field :coinstats_item_id, value: selected_item.id %>
|
|
|
|
<%= form.text_field :address,
|
|
label: t(".address_label"),
|
|
placeholder: t(".address_placeholder"),
|
|
value: address_value %>
|
|
|
|
<% if blockchains.present? %>
|
|
<%= form.select :blockchain,
|
|
options_for_select(blockchains, blockchain_value),
|
|
{ include_blank: t(".blockchain_select_blank") },
|
|
label: t(".blockchain_label"),
|
|
class: "w-full rounded-md border border-primary px-3 py-2 text-sm bg-container-inset text-primary" %>
|
|
<% else %>
|
|
<%= form.text_field :blockchain,
|
|
label: t(".blockchain_label"),
|
|
placeholder: t(".blockchain_placeholder"),
|
|
value: blockchain_value %>
|
|
<% end %>
|
|
|
|
<div class="flex justify-end">
|
|
<%= form.submit t(".link_wallet_submit"),
|
|
class: "inline-flex items-center justify-center rounded-lg px-4 py-2 text-sm font-medium text-inverse bg-inverse hover:bg-inverse-hover focus:outline-none focus:ring-2 focus:ring-gray-900 theme-dark:focus:ring-white focus:ring-offset-2 transition-colors" %>
|
|
</div>
|
|
<% end %>
|
|
</section>
|
|
|
|
<section class="rounded-xl border border-primary bg-container p-4 space-y-3"
|
|
data-controller="coinstats-exchange-fields"
|
|
data-coinstats-exchange-fields-exchanges-value="<%= html_escape(exchanges.to_json) %>"
|
|
data-coinstats-exchange-fields-initial-connection-id-value="<%= exchange_connection_id %>"
|
|
data-coinstats-exchange-fields-initial-fields-value="<%= html_escape(exchange_connection_fields.to_json) %>">
|
|
<div class="space-y-1">
|
|
<h3 class="text-sm font-medium text-primary"><%= t(".link_exchange_title") %></h3>
|
|
<p class="text-sm text-secondary"><%= t(".link_exchange_description") %></p>
|
|
<p class="text-xs text-secondary"><%= t(".link_exchange_note") %></p>
|
|
</div>
|
|
|
|
<%= styled_form_with url: link_exchange_coinstats_items_path,
|
|
method: :post,
|
|
data: { turbo: true },
|
|
class: "space-y-3" do |form| %>
|
|
<%= form.hidden_field :coinstats_item_id, value: selected_item.id %>
|
|
<%= form.hidden_field :exchange_connection_name, value: "", data: { coinstats_exchange_fields_target: "connectionName" } %>
|
|
|
|
<%= form.select :exchange_connection_id,
|
|
options_for_select(exchanges.map { |exchange| [ exchange[:name], exchange[:connection_id] ] }, exchange_connection_id),
|
|
{ include_blank: t(".exchange_select_blank") },
|
|
label: t(".exchange_label"),
|
|
class: "w-full rounded-md border border-primary px-3 py-2 text-sm bg-container-inset text-primary",
|
|
data: {
|
|
coinstats_exchange_fields_target: "select",
|
|
action: "change->coinstats-exchange-fields#render"
|
|
} %>
|
|
|
|
<div data-coinstats-exchange-fields-target="fields" class="space-y-3"></div>
|
|
|
|
<div class="flex justify-end">
|
|
<%= form.submit t(".link_exchange_submit"),
|
|
class: "inline-flex items-center justify-center rounded-lg px-4 py-2 text-sm font-medium text-inverse bg-inverse hover:bg-inverse-hover focus:outline-none focus:ring-2 focus:ring-gray-900 theme-dark:focus:ring-white focus:ring-offset-2 transition-colors" %>
|
|
</div>
|
|
<% end %>
|
|
</section>
|
|
</div>
|
|
<% else %>
|
|
<div class="space-y-4">
|
|
<div class="flex items-start gap-3">
|
|
<%= icon("alert-circle", class: "text-warning w-5 h-5 shrink-0 mt-0.5") %>
|
|
<div class="text-sm text-secondary">
|
|
<p class="font-medium text-primary mb-2"><%= t(".not_configured_title") %></p>
|
|
<p><%= t(".not_configured_message") %></p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="bg-surface rounded-lg p-4 space-y-2 text-sm">
|
|
<ol class="list-decimal list-inside space-y-1 text-secondary">
|
|
<li><%= t(".not_configured_step1_html").html_safe %></li>
|
|
<li><%= t(".not_configured_step2_html").html_safe %></li>
|
|
<li><%= t(".not_configured_step3_html").html_safe %></li>
|
|
</ol>
|
|
</div>
|
|
|
|
<div class="mt-4">
|
|
<%= link_to settings_providers_path,
|
|
class: "w-full inline-flex items-center justify-center rounded-lg font-medium whitespace-nowrap rounded-lg hidden md:inline-flex px-3 py-2 text-sm text-inverse bg-inverse hover:bg-inverse-hover disabled:bg-gray-500 theme-dark:disabled:bg-gray-400",
|
|
data: { turbo: false } do %>
|
|
<%= t(".go_to_settings") %>
|
|
<% end %>
|
|
</div>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|