The personal finance app for everyone
Categories, tags, merchants, and menus improvements (#1135)
Zach Gollwitzer38c2b4670cdd
diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.cssindex 615faa67..0e96acec 100644--- a/app/assets/stylesheets/application.tailwind.css+++ b/app/assets/stylesheets/application.tailwind.css@@ -94,6 +94,14 @@.tooltip {@apply hidden absolute;}++ .btn {+ @apply px-3 py-2 rounded-lg;+ }++ .btn--primary {+ @apply bg-gray-900 text-white hover:bg-gray-700;+ }}/* Small, single purpose classes that should take precedence over other styles */@@ -110,4 +118,4 @@.scrollbar::-webkit-scrollbar-thumb:hover {background: #a6a6a6;}-}+}\ No newline at end of filediff --git a/app/helpers/menus_helper.rb b/app/helpers/menus_helper.rbindex b5ec8444..74ec8752 100644--- a/app/helpers/menus_helper.rb+++ b/app/helpers/menus_helper.rb@@ -1,6 +1,6 @@module MenusHelperdef contextual_menu(&block)- tag.div class: "relative cursor-pointer", data: { controller: "menu" } do+ tag.div data: { controller: "menu" } doconcat contextual_menu_iconconcat contextual_menu_content(&block)end@@ -25,13 +25,14 @@ module MenusHelperprivatedef contextual_menu_icon- tag.button class: "flex hover:bg-gray-100 p-2 rounded", data: { menu_target: "button" } do+ tag.button class: "flex hover:bg-gray-100 p-2 rounded cursor-pointer", data: { menu_target: "button" } dolucide_icon "more-horizontal", class: "w-5 h-5 text-gray-500"endenddef contextual_menu_content(&block)- tag.div class: "absolute z-10 top-10 right-0 border border-alpha-black-25 bg-white rounded-lg shadow-xs hidden", data: { menu_target: "content" } do+ tag.div class: "z-50 border border-alpha-black-25 bg-white rounded-lg shadow-xs hidden",+ data: { menu_target: "content" } docapture(&block)endenddiff --git a/app/javascript/controllers/merchant_avatar_controller.js b/app/javascript/controllers/color_avatar_controller.jssimilarity index 94%rename from app/javascript/controllers/merchant_avatar_controller.jsrename to app/javascript/controllers/color_avatar_controller.jsindex 077c9e9a..7a1ba0d0 100644--- a/app/javascript/controllers/merchant_avatar_controller.js+++ b/app/javascript/controllers/color_avatar_controller.js@@ -1,6 +1,6 @@import { Controller } from "@hotwired/stimulus";-// Connects to data-controller="merchant-avatar"+// Connects to data-controller="color-avatar"// Used by the transaction merchant form to show a preview of what the avatar will look likeexport default class extends Controller {static targets = [diff --git a/app/javascript/controllers/menu_controller.js b/app/javascript/controllers/menu_controller.jsindex 3c31e880..04d23a2c 100644--- a/app/javascript/controllers/menu_controller.js+++ b/app/javascript/controllers/menu_controller.js@@ -1,61 +1,57 @@import { Controller } from "@hotwired/stimulus";+import { computePosition, flip, shift, offset, autoUpdate } from '@floating-ui/dom';/*** A "menu" can contain arbitrary content including non-clickable items, links, buttons, and forms.- *- * - If you need a form-enabled "select" element, use the "listbox" controller instead.*/export default class extends Controller {- static targets = [- "button",- "content",- "submenu",- "submenuButton",- "submenuContent",- ];+ static targets = ["button", "content"];static values = {- show: { type: Boolean, default: false },- showSubmenu: { type: Boolean, default: false },+ show: Boolean,+ placement: { type: String, default: "bottom-end" },+ offset: { type: Number, default: 5 },};- initialize() {+ connect() {this.show = this.showValue;- this.showSubmenu = this.showSubmenuValue;+ this.boundUpdate = this.update.bind(this);+ this.addEventListeners();+ this.startAutoUpdate();}- connect() {+ disconnect() {+ this.removeEventListeners();+ this.stopAutoUpdate();+ this.close();+ }++ addEventListeners() {this.buttonTarget.addEventListener("click", this.toggle);this.element.addEventListener("keydown", this.handleKeydown);document.addEventListener("click", this.handleOutsideClick);document.addEventListener("turbo:load", this.handleTurboLoad);}- disconnect() {- this.element.removeEventListener("keydown", this.handleKeydown);+ removeEventListeners() {this.buttonTarget.removeEventListener("click", this.toggle);+ this.element.removeEventListener("keydown", this.handleKeydown);document.removeEventListener("click", this.handleOutsideClick);document.removeEventListener("turbo:load", this.handleTurboLoad);- this.close();}- // If turbo reloads, we maintain the state of the menuhandleTurboLoad = () => {if (!this.show) this.close();};handleOutsideClick = (event) => {- if (this.show && !this.element.contains(event.target)) {- this.close();- }+ if (this.show && !this.element.contains(event.target)) this.close();};handleKeydown = (event) => {- switch (event.key) {- case "Escape":- this.close();- this.buttonTarget.focus(); // Bring focus back to the button- break;+ if (event.key === "Escape") {+ this.close();+ this.buttonTarget.focus();}};@@ -63,6 +59,7 @@ export default class extends Controller {this.show = !this.show;this.contentTarget.classList.toggle("hidden", !this.show);if (this.show) {+ this.update();this.focusFirstElement();}};@@ -73,12 +70,41 @@ export default class extends Controller {}focusFirstElement() {- const focusableElements =- 'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';- const firstFocusableElement =- this.contentTarget.querySelectorAll(focusableElements)[0];+ const focusableElements = 'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';+ const firstFocusableElement = this.contentTarget.querySelectorAll(focusableElements)[0];if (firstFocusableElement) {firstFocusableElement.focus();}}++ startAutoUpdate() {+ if (!this._cleanup) {+ this._cleanup = autoUpdate(this.buttonTarget, this.contentTarget, this.boundUpdate);+ }+ }++ stopAutoUpdate() {+ if (this._cleanup) {+ this._cleanup();+ this._cleanup = null;+ }+ }++ update() {+ computePosition(this.buttonTarget, this.contentTarget, {+ placement: this.placementValue,+ middleware: [+ offset(this.offsetValue),+ flip(),+ shift({ padding: 5 })+ ],+ }).then(({ x, y }) => {+ Object.assign(this.contentTarget.style, {+ position: 'fixed',+ left: `${x}px`,+ top: `${y}px`,+ width: 'max-content',+ });+ });+ }}diff --git a/app/views/categories/_badge.html.erb b/app/views/categories/_badge.html.erbindex c89c0a98..2c04d43e 100644--- a/app/views/categories/_badge.html.erb+++ b/app/views/categories/_badge.html.erb@@ -1,10 +1,11 @@<%# locals: (category:) %><% category ||= null_category %>-<span class="border text-sm font-medium px-2.5 py-1 rounded-full content-center"- style="- background-color: color-mix(in srgb, <%= category.color %> 5%, white);- border-color: color-mix(in srgb, <%= category.color %> 10%, white);- color: <%= category.color %>;">- <%= category.name %>-</span>+<div>+ <span class="flex items-center gap-1 text-sm font-medium rounded-full px-1.5 py-1 border border-alpha-black-25"+ style="+ background-color: color-mix(in srgb, <%= category.color %> 5%, white);+ color: <%= category.color %>;">+ <%= category.name %>+ </span>+</div>diff --git a/app/views/categories/_category.html.erb b/app/views/categories/_category.html.erbnew file mode 100644index 00000000..f25e5c25--- /dev/null+++ b/app/views/categories/_category.html.erb@@ -0,0 +1,21 @@+<%# locals: (category:) %>++<div id="<%= dom_id(category) %>" class="flex justify-between items-center p-4 bg-white">+ <div class="flex w-full items-center gap-2.5">+ <%= render partial: "categories/badge", locals: { category: category } %>+ </div>+ <div class="justify-self-end">+ <%= contextual_menu do %>+ <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">+ <%= contextual_menu_modal_action_item t(".edit"), edit_category_path(category) %>++ <%= link_to new_category_deletion_path(category),+ class: "flex items-center w-full rounded-lg text-red-600 hover:bg-red-50 py-2 px-3 gap-2",+ data: { turbo_frame: :modal } do %>+ <%= lucide_icon "trash-2", class: "shrink-0 w-5 h-5" %>+ <span class="text-sm"><%= t(".delete") %></span>+ <% end %>+ </div>+ <% end %>+ </div>+</div>diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erbindex 0321b2bd..5f36f8d9 100644--- a/app/views/categories/_form.html.erb+++ b/app/views/categories/_form.html.erb@@ -1,38 +1,25 @@-<%= styled_form_with model: category, data: { turbo: false } do |form| %>- <div class="flex flex-col space-y-4 w-96" data-controller="color-select" data-color-select-selection-value="<%= category.color %>">- <fieldset class="relative">- <span data-color-select-target="decoration" class="pointer-events-none absolute inset-y-3.5 left-3 flex items-center pl-1 block w-1 rounded-lg"></span>- <%= form.text_field :name,- value: category.name,- autofocus: "",- required: true,- placeholder: "Enter Category name",- class: "rounded-lg w-full focus:ring-black focus:border-transparent placeholder:text-gray-500 pl-6" %>- </fieldset>-- <fieldset>- <%= form.hidden_field :color, data: { color_select_target: "input" } %>-- <ul role="radiogroup" class="flex justify-between items-center py-2">+<div data-controller="color-avatar">+ <%= styled_form_with model: category, class: "space-y-4", data: { turbo: false } do |f| %>+ <section class="space-y-4">+ <div class="w-fit m-auto">+ <%= render partial: "shared/color_avatar", locals: { name: category.name, color: category.color } %>+ </div>+ <div class="flex gap-2 items-center justify-center"><% Category::COLORS.each do |color| %>- <li tabindex="0"- role="radio"- data-action="click->color-select#select keydown.enter->color-select#select keydown.space->color-select#select"- data-value="<%= color %>"- class="flex shrink-0 justify-center items-center w-5 h-5 cursor-pointer hover:bg-gray-200 rounded-full">- </li>+ <label class="relative">+ <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->color-avatar#handleColorChange" } %>+ <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div>+ </label><% end %>- </ul>- </fieldset>+ </div>+ <div class="relative flex items-center border border-gray-200 rounded-lg">+ <%= f.text_field :name, placeholder: t(".placeholder"), class: "text-sm font-normal placeholder:text-gray-500 h-10 relative pl-3 w-full border-none rounded-lg", required: true, data: { color_avatar_target: "name" } %>+ </div>+ </section><section><%= hidden_field_tag :transaction_id, params[:transaction_id] %>-- <% if category.persisted? %>- <%= form.submit t(".update") %>- <% else %>- <%= form.submit t(".create") %>- <% end %>+ <%= f.submit %></section>- </div>-<% end %>+ <% end %>+</div>diff --git a/app/views/categories/_row.html.erb b/app/views/categories/_row.html.erbdeleted file mode 100644index ba2aea0b..00000000--- a/app/views/categories/_row.html.erb+++ /dev/null@@ -1,23 +0,0 @@-<div class="flex justify-between mx-4 py-5 border-b last:border-b-0 border-alpha-black-50">- <%= render partial: "categories/badge", locals: { category: row } %>-- <%= contextual_menu do %>- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">- <%= link_to edit_category_path(row),- class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",- data: { turbo_frame: :modal } do %>- <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>-- <span><%= t(".edit") %></span>- <% end %>-- <%= link_to new_category_deletion_path(row),- class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",- data: { turbo_frame: :modal } do %>- <%= lucide_icon "trash-2", class: "w-5 h-5" %>-- <span><%= t(".delete") %></span>- <% end %>- </div>- <% end %>-</div>diff --git a/app/views/categories/_ruler.html.erb b/app/views/categories/_ruler.html.erbnew file mode 100644index 00000000..fc1d8ce9--- /dev/null+++ b/app/views/categories/_ruler.html.erb@@ -0,0 +1,3 @@+<div class="bg-white">+ <div class="h-px bg-alpha-black-50 ml-4 mr-6"></div>+</div>diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erbindex 0cf2f577..f06a59fe 100644--- a/app/views/categories/index.html.erb+++ b/app/views/categories/index.html.erb@@ -1,24 +1,43 @@<% content_for :sidebar do %><%= render "settings/nav" %><% end %>+<section class="space-y-4"><header class="flex items-center justify-between"><h1 class="text-gray-900 text-xl font-medium"><%= t(".categories") %></h1>- <%= link_to new_category_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>+ <%= link_to new_category_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %><%= lucide_icon "plus", class: "w-5 h-5" %><p><%= t(".new") %></p><% end %></header><div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">- <div class="rounded-xl bg-gray-25 p-1">- <h2 class="uppercase px-4 py-2 text-gray-500 text-xs"><%= t(".categories") %> · <%= @categories.size %></h2>+ <% if @categories.any? %>+ <div class="rounded-xl bg-gray-25 space-y-1 p-1">+ <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">+ <p><%= t(".categories") %></p>+ <span class="text-gray-400">·</span>+ <p><%= @categories.count %></p>+ </div>- <div class="border border-alpha-gray-100 rounded-lg bg-white shadow-xs">- <%= render collection: @categories, partial: "categories/row" %>+ <div class="border border-alpha-black-25 rounded-md bg-white shadow-xs">+ <div class="overflow-hidden rounded-md">+ <%= render partial: @categories, spacer_template: "categories/ruler" %>+ </div>+ </div>+ </div>+ <% else %>+ <div class="flex justify-center items-center py-20">+ <div class="text-center flex flex-col items-center max-w-[300px]">+ <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>+ <%= link_to new_category_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>+ <%= lucide_icon("plus", class: "w-5 h-5") %>+ <span><%= t(".new") %></span>+ <% end %>+ </div></div>- </div>+ <% end %></div><footer class="flex justify-between gap-4">diff --git a/app/views/merchants/_avatar.html.erb b/app/views/merchants/_avatar.html.erbdeleted file mode 100644index a18d8006..00000000--- a/app/views/merchants/_avatar.html.erb+++ /dev/null@@ -1,7 +0,0 @@-<%# locals: (merchant:) %>-<% name = merchant.name || "?" %>-<% background_color = "color-mix(in srgb, #{merchant.color} 5%, white)" %>-<% border_color = "color-mix(in srgb, #{merchant.color} 10%, white)" %>-<span data-merchant-avatar-target="avatar" class="w-8 h-8 flex items-center justify-center rounded-full" style="background-color: <%= background_color %>; border-color: <%= border_color %>; color: <%= merchant.color %>">- <%= name[0].upcase %>-</span>diff --git a/app/views/merchants/_form.html.erb b/app/views/merchants/_form.html.erbindex 626ccb4c..4b748f67 100644--- a/app/views/merchants/_form.html.erb+++ b/app/views/merchants/_form.html.erb@@ -1,19 +1,19 @@-<div data-controller="merchant-avatar">+<div data-controller="color-avatar"><%= styled_form_with model: @merchant, class: "space-y-4", data: { turbo: false } do |f| %><section class="space-y-4"><div class="w-fit m-auto">- <%= render partial: "merchants/avatar", locals: { merchant: @merchant } %>+ <%= render partial: "shared/color_avatar", locals: { name: @merchant.name, color: @merchant.color } %></div><div class="flex gap-2 items-center justify-center"><% Merchant::COLORS.each do |color| %><label class="relative">- <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->merchant-avatar#handleColorChange" } %>+ <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->color-avatar#handleColorChange" } %><div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div></label><% end %></div><div class="relative flex items-center border border-gray-200 rounded-lg">- <%= f.text_field :name, placeholder: t(".name_placeholder"), class: "text-sm font-normal placeholder:text-gray-500 h-10 relative pl-3 w-full border-none rounded-lg", required: true, data: { merchant_avatar_target: "name" } %>+ <%= f.text_field :name, placeholder: t(".name_placeholder"), class: "text-sm font-normal placeholder:text-gray-500 h-10 relative pl-3 w-full border-none rounded-lg", required: true, data: { color_avatar_target: "name" } %></div></section>diff --git a/app/views/merchants/_merchant.html.erb b/app/views/merchants/_merchant.html.erbindex 60ffe80d..33fba7ee 100644--- a/app/views/merchants/_merchant.html.erb+++ b/app/views/merchants/_merchant.html.erb@@ -2,7 +2,7 @@<div class="flex justify-between items-center p-4 bg-white"><div class="flex w-full items-center gap-2.5">- <%= render partial: "merchants/avatar", locals: { merchant: } %>+ <%= render partial: "shared/color_avatar", locals: { name: merchant.name, color: merchant.color } %><p class="text-gray-900 text-sm truncate"><%= merchant.name %></p>diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erbindex 2bd36b7e..6a31839a 100644--- a/app/views/merchants/index.html.erb+++ b/app/views/merchants/index.html.erb@@ -2,17 +2,32 @@<%= render "settings/nav" %><% end %>-<div class="space-y-4">- <div class="flex items-center justify-between">+<section class="space-y-4">+ <header class="flex items-center justify-between"><h1 class="text-gray-900 text-xl font-medium"><%= t(".title") %></h1>- <%= link_to new_merchant_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>- <%= lucide_icon("plus", class: "w-5 h-5") %>- <span><%= t(".new") %></span>+ <%= link_to new_merchant_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %>+ <%= lucide_icon "plus", class: "w-5 h-5" %>+ <p><%= t(".new") %></p><% end %>- </div>+ </header>+<div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">- <% if @merchants.empty? %>+ <% if @merchants.any? %>+ <div class="rounded-xl bg-gray-25 space-y-1 p-1">+ <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">+ <p><%= t(".title") %></p>+ <span class="text-gray-400">·</span>+ <p><%= @merchants.count %></p>+ </div>++ <div class="border border-alpha-black-25 rounded-md bg-white shadow-xs">+ <div class="overflow-hidden rounded-md">+ <%= render partial: @merchants, spacer_template: "merchants/ruler" %>+ </div>+ </div>+ </div>+ <% else %><div class="flex justify-center items-center py-20"><div class="text-center flex flex-col items-center max-w-[300px]"><p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>@@ -22,21 +37,11 @@<% end %></div></div>- <% else %>- <div class="bg-gray-25 p-1 rounded-xl">- <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500">- <p><%= t(".title") %></p>- <span class="text-gray-400">·</span>- <p><%= @merchants.count %></p>- </div>- <div class="overflow-hidden rounded-lg">- <%= render partial: @merchants, spacer_template: "merchants/ruler" %>- </div>- </div><% end %></div>- <div class="flex justify-between gap-4">++ <footer class="flex justify-between gap-4"><%= previous_setting("Categories", categories_path) %><%= next_setting("Rules", rules_transactions_path) %>- </div>-</div>+ </footer>+</section>diff --git a/app/views/settings/_nav.html.erb b/app/views/settings/_nav.html.erbindex 2c0d823e..dda0e9db 100644--- a/app/views/settings/_nav.html.erb+++ b/app/views/settings/_nav.html.erb@@ -50,7 +50,7 @@<%= sidebar_link_to t(".tags_label"), tags_path, icon: "tags" %></li><li>- <%= sidebar_link_to t(".categories_label"), categories_path, icon: "tags" %>+ <%= sidebar_link_to t(".categories_label"), categories_path, icon: "shapes" %></li><li><%= sidebar_link_to t(".merchants_label"), merchants_path, icon: "store" %>diff --git a/app/views/shared/_color_avatar.html.erb b/app/views/shared/_color_avatar.html.erbnew file mode 100644index 00000000..be59ad7d--- /dev/null+++ b/app/views/shared/_color_avatar.html.erb@@ -0,0 +1,11 @@+<%# locals: (name: nil, color: "#000") %>++<% letter = name&.first || "?" %>++<% background_color = "color-mix(in srgb, #{color} 5%, white)" %>+<% border_color = "color-mix(in srgb, #{color} 10%, white)" %>+<span data-color-avatar-target="avatar"+ class="w-8 h-8 flex items-center justify-center rounded-full"+ style="background-color: <%= background_color %>; border-color: <%= border_color %>; color: <%= color %>">+ <%= letter.upcase %>+</span>diff --git a/app/views/tags/_form.html.erb b/app/views/tags/_form.html.erbindex 4ee675d5..99b1c706 100644--- a/app/views/tags/_form.html.erb+++ b/app/views/tags/_form.html.erb@@ -1,38 +1,25 @@-<%= styled_form_with model: tag, data: { turbo: false } do |form| %>- <div class="flex flex-col space-y-4 w-96" data-controller="color-select" data-color-select-selection-value="<%= tag.color %>">- <fieldset class="relative">- <span data-color-select-target="decoration" class="pointer-events-none absolute inset-y-3.5 left-3 flex items-center pl-1 block w-1 rounded-lg"></span>- <%= form.text_field :name,- value: tag.name,- autofocus: "",- required: true,- placeholder: "Enter tag name",- class: "rounded-lg w-full focus:ring-black focus:border-transparent placeholder:text-gray-500 pl-6" %>- </fieldset>-- <fieldset>- <%= form.hidden_field :color, data: { color_select_target: "input" } %>-- <ul role="radiogroup" class="flex justify-between items-center py-2">+<div data-controller="color-avatar">+ <%= styled_form_with model: tag, class: "space-y-4", data: { turbo: false } do |f| %>+ <section class="space-y-4">+ <div class="w-fit m-auto">+ <%= render partial: "shared/color_avatar", locals: { name: tag.name, color: tag.color } %>+ </div>+ <div class="flex gap-2 items-center justify-center"><% Tag::COLORS.each do |color| %>- <li tabindex="0"- role="radio"- data-action="click->color-select#select keydown.enter->color-select#select keydown.space->color-select#select"- data-value="<%= color %>"- class="flex shrink-0 justify-center items-center w-5 h-5 cursor-pointer hover:bg-gray-200 rounded-full">- </li>+ <label class="relative">+ <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->color-avatar#handleColorChange" } %>+ <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div>+ </label><% end %>- </ul>- </fieldset>+ </div>+ <div class="relative flex items-center border border-gray-200 rounded-lg">+ <%= f.text_field :name, placeholder: t(".placeholder"), class: "text-sm font-normal placeholder:text-gray-500 h-10 relative pl-3 w-full border-none rounded-lg", required: true, data: { color_avatar_target: "name" } %>+ </div>+ </section><section><%= hidden_field_tag :tag_id, params[:tag_id] %>-- <% if tag.persisted? %>- <%= form.submit t(".update") %>- <% else %>- <%= form.submit t(".create") %>- <% end %>+ <%= f.submit %></section>- </div>-<% end %>+ <% end %>+</div>diff --git a/app/views/tags/_ruler.html.erb b/app/views/tags/_ruler.html.erbnew file mode 100644index 00000000..fc1d8ce9--- /dev/null+++ b/app/views/tags/_ruler.html.erb@@ -0,0 +1,3 @@+<div class="bg-white">+ <div class="h-px bg-alpha-black-50 ml-4 mr-6"></div>+</div>diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erbindex 03ba11b5..5a65a341 100644--- a/app/views/tags/_tag.html.erb+++ b/app/views/tags/_tag.html.erb@@ -1,23 +1,24 @@-<div id="<%= dom_id(tag) %>" class="flex justify-between mx-4 py-5 border-b last:border-b-0 border-alpha-black-50">- <%= render "badge", tag: tag %>+<%# locals: (tag:) %>- <%= contextual_menu do %>- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">- <%= link_to edit_tag_path(tag),- class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",- data: { turbo_frame: :modal } do %>- <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>+<div id="<%= dom_id(tag) %>" class="flex justify-between items-center p-4 bg-white">+ <div class="flex w-full items-center gap-2.5">+ <%= render partial: "shared/color_avatar", locals: { name: tag.name, color: tag.color } %>+ <p class="text-gray-900 text-sm truncate">+ <%= tag.name %>+ </p>+ </div>+ <div class="justify-self-end">+ <%= contextual_menu do %>+ <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">+ <%= contextual_menu_modal_action_item t(".edit"), edit_tag_path(tag) %>- <span><%= t(".edit") %></span>- <% end %>-- <%= link_to new_tag_deletion_path(tag),- class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",- data: { turbo_frame: :modal } do %>- <%= lucide_icon "trash-2", class: "w-5 h-5" %>-- <span><%= t(".delete") %></span>- <% end %>- </div>- <% end %>+ <%= link_to new_tag_deletion_path(tag),+ class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",+ data: { turbo_frame: :modal } do %>+ <%= lucide_icon "trash-2", class: "w-5 h-5" %>+ <span><%= t(".delete") %></span>+ <% end %>+ </div>+ <% end %>+ </div></div>diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erbindex 6f28d6f5..610939bf 100644--- a/app/views/tags/index.html.erb+++ b/app/views/tags/index.html.erb@@ -6,28 +6,28 @@<header class="flex items-center justify-between"><h1 class="text-gray-900 text-xl font-medium"><%= t(".tags") %></h1>- <%= link_to new_tag_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>+ <%= link_to new_tag_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %><%= lucide_icon "plus", class: "w-5 h-5" %><p><%= t(".new") %></p><% end %></header><div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">-<% if @tags.any? %>+ <div class="rounded-xl bg-gray-25 space-y-1 p-1">+ <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">+ <p><%= t(".tags") %></p>+ <span class="text-gray-400">·</span>+ <p><%= @tags.count %></p>+ </div>- <div class="rounded-xl bg-gray-25 p-1">- <h2 class="uppercase px-4 py-2 text-gray-500 text-xs"><%= t(".tags") %> · <%= @tags.size %></h2>-- <div class="border border-alpha-gray-100 rounded-lg bg-white shadow-xs">-- <%= render @tags %>-+ <div class="border border-alpha-black-25 rounded-md bg-white shadow-xs">+ <div class="overflow-hidden rounded-md">+ <%= render partial: @tags, spacer_template: "tags/ruler" %>+ </div></div></div>-<% else %>-<div class="flex justify-center items-center py-20"><div class="text-center flex flex-col items-center max-w-[300px]"><p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>@@ -37,9 +37,7 @@<% end %></div></div>-<% end %>-</div><footer class="flex justify-between gap-4">diff --git a/config/locales/views/categories/en.yml b/config/locales/views/categories/en.ymlindex 3da3ab1e..5ef738c0 100644--- a/config/locales/views/categories/en.yml+++ b/config/locales/views/categories/en.yml@@ -1,22 +1,22 @@---en:categories:+ category:+ delete: Delete category+ edit: Edit categorycreate:success: New transaction category created successfullyedit:edit: Edit categoryform:- create: Create category- update: Update+ placeholder: Category nameindex:categories: Categories- new: New+ empty: No categories found+ new: New categorymenu:loading: Loading...new:new_category: New category- row:- delete: Delete category- edit: Edit categoryupdate:success: Transaction category updated successfullydiff --git a/config/locales/views/tags/en.yml b/config/locales/views/tags/en.ymlindex a2cc464f..4a78e350 100644--- a/config/locales/views/tags/en.yml+++ b/config/locales/views/tags/en.yml@@ -6,8 +6,7 @@ en:edit:edit: Edit tagform:- create: Create tag- update: Update+ placeholder: Tag nameindex:empty: No tags yetnew: New tag