diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css index 59cb99900..27b096f29 100644 --- a/app/assets/stylesheets/card-perma.css +++ b/app/assets/stylesheets/card-perma.css @@ -41,6 +41,17 @@ max-inline-size: 32ch; } + .collection-picker__button { + --btn-border-size: 0; + + font-size: 0.5em; + margin-inline-start: 1ch; + + + .panel { + --panel-size: 18ch; + } + } + @media (max-width: 800px) { --padding-inline: 3cqmin; diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 53315b8a6..2ad8423e6 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -82,7 +82,6 @@ color: var(--color-ink-inverted); font-weight: 800; padding: var(--block-space-half) var(--inline-space) var(--block-space-half) var(--inline-space-double); - text-transform: uppercase; .cards--considering & { background-color: var(--color-canvas); @@ -107,6 +106,7 @@ display: inline-flex; margin-inline-start: var(--inline-space-half); padding-inline-start: calc(var(--inline-space) * 0.75); + text-transform: uppercase; .cards--considering & { border-inline-start: 1px solid color-mix(in srgb, var(--color-ink) 33%, var(--color-canvas)); diff --git a/app/controllers/cards_controller.rb b/app/controllers/cards_controller.rb index d535f26d9..8993fdb2c 100644 --- a/app/controllers/cards_controller.rb +++ b/app/controllers/cards_controller.rb @@ -28,7 +28,9 @@ class CardsController < ApplicationController def update @card.update! card_params - if @card.published? + if params[:card][:collection_id].present? + redirect_to collection_card_path(@card.collection, @card) + elsif @card.published? render_card_replacement else redirect_to @card @@ -54,7 +56,7 @@ class CardsController < ApplicationController end def card_params - params.expect(card: [ :status, :title, :description, :image, tag_ids: [] ]) + params.expect(card: [ :collection_id, :status, :title, :description, :image, tag_ids: [] ]) end def render_card_replacement diff --git a/app/views/cards/_container.html.erb b/app/views/cards/_container.html.erb index 83242589a..9d326af6a 100644 --- a/app/views/cards/_container.html.erb +++ b/app/views/cards/_container.html.erb @@ -10,12 +10,7 @@
<%= card_article_tag card, class: "card" do %>
- - <%= card.id %> - <%= link_to card.collection.name, cards_path(collection_ids: [ card.collection ]), - class: "card__collection-name overflow-ellipsis" %> - - + <%= render "cards/display/perma/collection", card: card %> <%= render "cards/display/perma/tags", card: card %>
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb index 4bdccb6bb..bc27a29f9 100644 --- a/app/views/cards/display/_preview.html.erb +++ b/app/views/cards/display/_preview.html.erb @@ -3,11 +3,7 @@
- - <%= card.id %> - <%= link_to card.collection.name, cards_path(collection_ids: [ card.collection ]), - class: "card__collection-name txt-uppercase overflow-ellipsis" %> - + <%= render "cards/display/preview/collection", card: card %> <%= render "cards/display/preview/tags", card: card %>
diff --git a/app/views/cards/display/common/_collection.html.erb b/app/views/cards/display/common/_collection.html.erb new file mode 100644 index 000000000..aacabb869 --- /dev/null +++ b/app/views/cards/display/common/_collection.html.erb @@ -0,0 +1,6 @@ +
+ <%= card.id %> + <%= link_to card.collection.name, cards_path(collection_ids: [ card.collection ]), + class: "card__collection-name overflow-ellipsis" %> + <%= yield %> +
\ No newline at end of file diff --git a/app/views/cards/display/perma/_collection.html.erb b/app/views/cards/display/perma/_collection.html.erb new file mode 100644 index 000000000..01da2c473 --- /dev/null +++ b/app/views/cards/display/perma/_collection.html.erb @@ -0,0 +1,38 @@ +<%= render "cards/display/common/collection", card: card do %> +
> + + + + <%= tag.div class: "max-width full-width", data: { + controller: "filter", + dialog_target: "dialog", + filter_active_class: "filter--active", + filter_selected_class: "selected"} do %> + Put this card in… + + <% if Current.user.collections.count > 20 %> + + <% end %> + + <%= form_with(model: card, url: collection_card_path(card.collection, card), method: :patch, class: "full-width", data: { controller: "form" }) do |form| %> + + <% end %> + <% end %> + +
+<% end %> \ No newline at end of file diff --git a/app/views/cards/display/preview/_collection.html.erb b/app/views/cards/display/preview/_collection.html.erb new file mode 100644 index 000000000..ffbb7c3f7 --- /dev/null +++ b/app/views/cards/display/preview/_collection.html.erb @@ -0,0 +1 @@ +<%= render "cards/display/common/collection", card: card %> \ No newline at end of file