mirror of
https://github.com/we-promise/sure.git
synced 2026-05-28 06:54:56 +00:00
cdce00c71e
* refactor(design-system): migrate 9 hand-rolled buttons with orphan btn-- classes to DS::Button / DS::Link Part of #1715 §5. The `btn`, `btn--primary`, `btn--outline`, `btn--ghost`, `btn--sm` CSS classes have no backing styles anywhere in the codebase (no .btn definition in app/assets/, no Bootstrap dependency). These callsites have been rendering unstyled buttons / links since the underlying CSS was last removed. Migrate the 9 broken callsites: - `app/views/transactions/show.html.erb` — duplicate-merge action buttons (×2): `button_to ... class: "btn btn--primary btn--sm"` / `class: "btn btn--outline btn--sm"` → DS::Button with href + variant + size + `data: { turbo_method: :post }`. - `app/views/snaptrade_items/select_existing_account.html.erb` — "Go to Provider Settings" link → DS::Link primary sm. - `app/views/indexa_capital_items/select_existing_account.html.erb` — same pattern → DS::Link primary sm. - `app/views/import/confirms/show.html.erb` — Publish button + Cancel link → DS::Button primary full-width + DS::Link ghost full-width. - `app/views/simplefin_items/new.html.erb` — Cancel link (`class: "btn"` only) + Connect submit → DS::Link secondary + bare `f.submit` (already routes to DS::Button via StyledFormBuilder). - `app/views/settings/providers/_ibkr_panel.html.erb`, `_snaptrade_panel.html.erb`, `_indexa_capital_panel.html.erb` — strip the orphan `class: "btn btn--primary"` from `f.submit` callers; the submit is already a styled DS::Button via the form builder. The next PR in this chain (Phase B) will tackle the larger inline- button cluster (~29 files, 38 instances) — provider panels and provider-item flows hand-rolling the same `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-primary transition-colors` string. * refactor(design-system): migrate 38 hand-rolled provider buttons to DS::Button / DS::Link (#1715 §5 part B) Bulk sweep of the second cluster from §5. 29 files, 38 button instances — each one hand-rolled the same long Tailwind string for the primary action button: 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-primary transition-colors (some variations used `button-bg-primary hover:button-bg-primary-hover` instead of `bg-inverse hover:bg-inverse-hover` — same intent). Every instance is now a DS::Button / DS::Link with `variant: :primary`, which: - Picks up the new focus-ring + touch-target work from #1840 once that merges. - Stops duplicating the long Tailwind string across 29 files — single source of truth in `DS::Buttonish::VARIANTS[:primary]`. - Picks up consistent `aria-label` derivation for icon-only forms. - Removes the misnamed `focus:ring-primary` (no token) — the new ring comes from `base.css` automatically. Migration patterns applied: - `f.submit text, class: "inline-flex …"` inside `styled_form_with` → bare `<%= f.submit text %>`. StyledFormBuilder routes through DS::Button. - `link_to text, path, class: "inline-flex …"` → DS::Link primary. - `button_to text, path, method: :X, class: "inline-flex …"` → DS::Button with `href: path` and `data: { turbo_method: :X }`. - `submit_tag text, class: "inline-flex …"` inside raw `form_with` → DS::Button with `type: :submit`. Notable adjustments: - `holdings/show.html.erb` — the form was `form_with` (not styled). Switched to `styled_form_with` so `f.submit` routes through DS::Button. `f.combobox` (hotwire_combobox) still works through the styled builder. - Two `link_to settings_providers_path` callsites in `coinstats_items/new.html.erb` + `enable_banking_items/new.html.erb` had `w-full inline-flex … hidden md:inline-flex` — the responsive pair conflicted (both `inline-flex` and `hidden md:inline-flex` on the same element). Migrated to `full_width: true` without the responsive split; the buttons now render at all breakpoints consistently. (Pre-existing copy-paste bug, fixed in passing.) - `enable_banking_panel` add-connection button gained `icon: "plus"` via the DS::Button API; the explicit `gap-2 … icon "plus"` markup is now redundant. Sibling buttons that don't match the primary spec (destructive trash, secondary outline-bordered, button-bg-secondary-strong on holdings/show.html.erb, etc.) are intentionally left alone — they need their own audit pass once #1840 lands and the focus-ring behavior on those variants is stable. * fix(review): restore SimpleFIN submit styling + i18n provider_form label - SimpleFIN new modal: switch form_with -> styled_form_with so f.submit picks up the DS::Button render via styled builder (Codex #1860). - _provider_form: replace hardcoded "Save and connect" with t(".save_and_connect") and add scoped key under settings.providers.provider_form (CodeRabbit).
93 lines
4.2 KiB
Plaintext
93 lines
4.2 KiB
Plaintext
<div class="space-y-4">
|
|
<%= render DS::Alert.new(message: t("providers.snaptrade.free_tier_warning"), variant: :warning) %>
|
|
|
|
<%= render "settings/providers/setup_steps",
|
|
steps: [
|
|
t("providers.snaptrade.step_1_html").html_safe,
|
|
t("providers.snaptrade.step_2"),
|
|
t("providers.snaptrade.step_3"),
|
|
t("providers.snaptrade.step_4")
|
|
] %>
|
|
|
|
<% error_msg = local_assigns[:error_message] || @error_message %>
|
|
<% if error_msg.present? %>
|
|
<%= render DS::Alert.new(message: error_msg, variant: :error) %>
|
|
<% end %>
|
|
|
|
<%
|
|
snaptrade_item = Current.family.snaptrade_items.first_or_initialize(name: "SnapTrade Connection")
|
|
is_new_record = snaptrade_item.new_record?
|
|
is_configured = snaptrade_item.persisted? && snaptrade_item.credentials_configured?
|
|
is_registered = snaptrade_item.persisted? && snaptrade_item.user_registered?
|
|
%>
|
|
|
|
<%= styled_form_with model: snaptrade_item,
|
|
url: is_new_record ? snaptrade_items_path : snaptrade_item_path(snaptrade_item),
|
|
scope: :snaptrade_item,
|
|
method: is_new_record ? :post : :patch,
|
|
data: { turbo: true },
|
|
class: "space-y-3" do |form| %>
|
|
<%= form.text_field :client_id,
|
|
label: t("providers.snaptrade.client_id_label"),
|
|
placeholder: is_new_record ? t("providers.snaptrade.client_id_placeholder") : t("providers.snaptrade.client_id_update_placeholder"),
|
|
type: :password %>
|
|
|
|
<%= form.text_field :consumer_key,
|
|
label: t("providers.snaptrade.consumer_key_label"),
|
|
placeholder: is_new_record ? t("providers.snaptrade.consumer_key_placeholder") : t("providers.snaptrade.consumer_key_update_placeholder"),
|
|
type: :password %>
|
|
|
|
<div class="flex justify-end">
|
|
<%= form.submit is_new_record ? t("providers.snaptrade.save_button") : t("providers.snaptrade.update_button") %>
|
|
</div>
|
|
<% end %>
|
|
|
|
<% items = local_assigns[:snaptrade_items] || @snaptrade_items || Current.family.snaptrade_items.where.not(client_id: [nil, ""]) %>
|
|
|
|
<% if items&.any? %>
|
|
<% item = items.first %>
|
|
<% unless item.user_registered? %>
|
|
<div class="flex items-center gap-2 border-t border-primary pt-4 mt-4">
|
|
<span class="w-2 h-2 bg-warning rounded-full"></span>
|
|
<p class="text-sm text-secondary"><%= t("providers.snaptrade.status_needs_registration") %></p>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% if items&.any? && items.first.user_registered? %>
|
|
<% item = items.first %>
|
|
<div class="border-t border-primary pt-4 mt-4">
|
|
<details class="group"
|
|
data-controller="lazy-load"
|
|
data-action="toggle->lazy-load#toggled"
|
|
data-lazy-load-url-value="<%= connections_snaptrade_item_path(item) %>"
|
|
data-lazy-load-auto-open-param-value="manage">
|
|
<summary class="flex items-center justify-between cursor-pointer list-none [&::-webkit-details-marker]:hidden">
|
|
<div class="flex items-center gap-2">
|
|
<p class="text-sm text-secondary">
|
|
<%= t("providers.snaptrade.status_connected", count: item.snaptrade_accounts.count) %>
|
|
<% if item.unlinked_accounts_count > 0 %>
|
|
<span class="text-warning">(<%= t("providers.snaptrade.needs_setup", count: item.unlinked_accounts_count) %>)</span>
|
|
<% end %>
|
|
</p>
|
|
</div>
|
|
<span class="flex items-center gap-1 text-sm text-secondary hover:text-primary">
|
|
<%= t("providers.snaptrade.manage_connections") %>
|
|
<%= icon "chevron-right", class: "w-3 h-3 transition-transform group-open:rotate-90" %>
|
|
</span>
|
|
</summary>
|
|
|
|
<div class="mt-3 space-y-3" data-lazy-load-target="content">
|
|
<div data-lazy-load-target="loading" class="flex items-center gap-2 text-sm text-secondary py-2">
|
|
<%= icon "loader-2", class: "w-4 h-4 animate-spin" %>
|
|
<%= t("providers.snaptrade.loading_connections") %>
|
|
</div>
|
|
|
|
<div data-lazy-load-target="frame">
|
|
</div>
|
|
</div>
|
|
</details>
|
|
</div>
|
|
<% end %>
|
|
</div>
|