diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css index 6e535a767..b417b31d7 100644 --- a/app/assets/stylesheets/_global.css +++ b/app/assets/stylesheets/_global.css @@ -209,14 +209,6 @@ /* Colors: Cards */ --color-card-default: oklch(var(--lch-blue-dark)); --color-card-complete: var(--color-ink-darker); - --color-card-1: oklch(var(--lch-ink-medium)); - --color-card-2: oklch(var(--lch-uncolor-medium)); - --color-card-3: oklch(var(--lch-yellow-medium)); - --color-card-4: oklch(var(--lch-lime-medium)); - --color-card-5: oklch(var(--lch-aqua-medium)); - --color-card-6: oklch(var(--lch-violet-medium)); - --color-card-7: oklch(var(--lch-purple-medium)); - --color-card-8: oklch(var(--lch-pink-medium)); /* Colors: Syntax highlighting */ --color-code-token__att: oklch(var(--lch-blue-dark)); diff --git a/app/models/card/colored.rb b/app/models/card/colored.rb index 78152bab8..30b6fa066 100644 --- a/app/models/card/colored.rb +++ b/app/models/card/colored.rb @@ -1,24 +1,7 @@ module Card::Colored extend ActiveSupport::Concern - COLORS = %w[ - var(--color-card-1) - var(--color-card-2) - var(--color-card-3) - var(--color-card-4) - var(--color-card-5) - var(--color-card-6) - var(--color-card-7) - var(--color-card-8) - ] - DEFAULT_COLOR = "var(--color-card-default)" - def color - color_from_column || DEFAULT_COLOR + column&.color || Column::Colored::DEFAULT_COLOR end - - private - def color_from_column - column&.color&.presence - end end diff --git a/app/models/color.rb b/app/models/color.rb new file mode 100644 index 000000000..59c14774e --- /dev/null +++ b/app/models/color.rb @@ -0,0 +1,25 @@ +Color = Struct.new(:name, :value) + +class Color + class << self + def for_value(value) + COLORS.find { |it| it.value == value } + end + end + + def to_s + value + end + + COLORS = { + "Blue" => "var(--color-card-default)", + "Gray" => "oklch(var(--lch-ink-dark))", + "Tan" => "oklch(var(--lch-uncolor-medium))", + "Yellow" => "oklch(var(--lch-yellow-medium))", + "Lime" => "oklch(var(--lch-lime-medium))", + "Aqua" => "oklch(var(--lch-aqua-medium))", + "Violet" => "oklch(var(--lch-violet-medium))", + "Purple" => "oklch(var(--lch-purple-medium))", + "Pink" => "oklch(var(--lch-pink-medium))" + }.collect { |name, value| new(name, value) }.freeze +end diff --git a/app/models/column.rb b/app/models/column.rb index ec5fd6217..bf136969c 100644 --- a/app/models/column.rb +++ b/app/models/column.rb @@ -1,10 +1,9 @@ class Column < ApplicationRecord - include Positioned + include Colored, Positioned belongs_to :board, touch: true has_many :cards, dependent: :nullify - before_validation -> { self.color ||= Card::DEFAULT_COLOR } after_save_commit -> { cards.touch_all }, if: -> { saved_change_to_name? || saved_change_to_color? } after_destroy_commit -> { board.cards.touch_all } end diff --git a/app/models/column/colored.rb b/app/models/column/colored.rb new file mode 100644 index 000000000..176a28ac8 --- /dev/null +++ b/app/models/column/colored.rb @@ -0,0 +1,13 @@ +module Column::Colored + extend ActiveSupport::Concern + + DEFAULT_COLOR = Color::COLORS.first + + included do + before_validation -> { self[:color] ||= DEFAULT_COLOR.value } + end + + def color + Color.for_value(super) || DEFAULT_COLOR + end +end diff --git a/app/views/boards/show/menu/_column_form.html.erb b/app/views/boards/show/menu/_column_form.html.erb index b42549d3c..f9eab1c16 100644 --- a/app/views/boards/show/menu/_column_form.html.erb +++ b/app/views/boards/show/menu/_column_form.html.erb @@ -3,11 +3,11 @@ required: true, autocomplete: "off", pattern: ".*\\S.*", title: "Column name cannot be blank", data: { action: "focus->form#select" } %>
- <% ([Card::DEFAULT_COLOR] + Card::COLORS).each do |color| %> -
diff --git a/app/views/public/cards/show.html.erb b/app/views/public/cards/show.html.erb index a3fc7ffcc..a0663416e 100644 --- a/app/views/public/cards/show.html.erb +++ b/app/views/public/cards/show.html.erb @@ -19,7 +19,7 @@ <% end %>
+ class="card-perma card-perma--public" data-controller="lightbox" style="--card-color: <%= @card.color %>;">
<%= card_article_tag @card, class: "card" do %>
diff --git a/test/models/card/colored_test.rb b/test/models/card/colored_test.rb index e85718f85..dc83c00f5 100644 --- a/test/models/card/colored_test.rb +++ b/test/models/card/colored_test.rb @@ -3,7 +3,7 @@ require "test_helper" class Card::ColoredTest < ActiveSupport::TestCase test "use default color if no column" do cards(:logo).update! column: nil - assert_equal Card::DEFAULT_COLOR, cards(:logo).color + assert_equal Column::Colored::DEFAULT_COLOR, cards(:logo).color end test "infer color from column" do diff --git a/test/models/column/colored_test.rb b/test/models/column/colored_test.rb new file mode 100644 index 000000000..d74a850b0 --- /dev/null +++ b/test/models/column/colored_test.rb @@ -0,0 +1,16 @@ +require "test_helper" + +class Column::ColoredTest < ActiveSupport::TestCase + test "creates column with default color when color not provided" do + column = boards(:writebook).columns.create!(name: "New Column") + + assert_equal Column::Colored::DEFAULT_COLOR, column.color + end + + test "update the column color" do + columns(:writebook_triage).update!(color: "oklch(var(--lch-yellow-medium))") + + assert_not_nil columns(:writebook_triage).color + assert_equal Color.for_value("oklch(var(--lch-yellow-medium))"), columns(:writebook_triage).color + end +end diff --git a/test/models/column_test.rb b/test/models/column_test.rb index 6bc9e5210..2b02d022e 100644 --- a/test/models/column_test.rb +++ b/test/models/column_test.rb @@ -1,12 +1,6 @@ require "test_helper" class ColumnTest < ActiveSupport::TestCase - test "creates column with default color when color not provided" do - column = boards(:writebook).columns.create!(name: "New Column") - - assert_equal Card::DEFAULT_COLOR, column.color - end - test "touch all the cards when the name or color changes" do column = columns(:writebook_triage)