Compare commits

..

No commits in common. "cd28c26ae72a1fa1d25c0133b0e169f6f9b7d6a0" and "56fe5e48890ec3efd5164200a4ec2db8f6edeb0d" have entirely different histories.

7 changed files with 82 additions and 154 deletions

View file

@ -58,34 +58,10 @@
.thumbnail-cell img
outline: 1px solid $soft-border-color
.actions-cell
button, a.button
.actions-cell button
/* Bootstrap's Purple 600 */
+awesome-button-color(#59359a)
tr[data-item-owned]
color: #aaa
a:not(.button)
color: inherit
.thumbnail-cell
filter: grayscale(1)
opacity: .75
.item-name
font-style: italic
text-decoration: line-through
text-decoration-color: rgba($text-color, 0.35)
.owned-explanation
font-style: italic
font-size: 85%
.actions-cell
button, a.button
+awesome-button-color(#999)
.price-breakdown
text-decoration-line: underline
text-decoration-style: dotted
@ -124,8 +100,3 @@
tr:hover .thumbnail-cell
opacity: 0.85
&[data-group-owned]
thead
button, a.button
+awesome-button-color(#999)

View file

@ -116,7 +116,6 @@ class ItemsController < ApplicationController
item_ids = params[:ids].split(",")
@items = Item.where(id: item_ids).includes(:nc_mall_record).
includes(:dyeworks_base_item).order(:name).limit(50)
assign_closeted!
if @items.empty?
render file: "public/404.html", status: :not_found, layout: nil
@ -156,16 +155,6 @@ class ItemsController < ApplicationController
[color, color.example_pet_type(preferred_species: species)]
end.to_h
# Create a second value that only include the items the user *needs*: that
# is, that they don't already own.
@nc_mall_items_needed = @nc_mall_items.reject(&:owned?)
@buyable_dyeworks_items_needed = @buyable_dyeworks_items.reject(&:owned?)
@np_items_needed = @np_items.reject(&:owned?)
@pb_items_needed = @pb_items.reject(&:owned?)
@other_nc_items_needed = @other_nc_items.reject(&:owned?)
@pb_items_needed_by_color =
@pb_items_by_color.transform_values { |items| items.reject(&:owned?) }
# Finish loading the NC trade values.
trade_values_task.wait

View file

@ -11,7 +11,6 @@ class AltStyle < ApplicationRecord
validates :body_id, presence: true
before_create :infer_series_name
before_create :infer_thumbnail_url
scope :matching_name, ->(series_name, color_name, species_name) {
color = Color.find_by_name!(color_name)
@ -42,6 +41,22 @@ class AltStyle < ApplicationRecord
"#{series_name} #{color.human_name}"
end
THUMBNAIL_URL_TEMPLATE = Addressable::Template.new(
"https://images.neopets.com/items/{series}_{color}_{species}.gif"
)
DEFAULT_THUMBNAIL_URL = "https://images.neopets.com/items/mall_bg_circle.gif"
def thumbnail_url
return DEFAULT_THUMBNAIL_URL unless has_real_series_name?
# HACK: We're assuming this is the format long-term! But if it changes, we
# may need to add it as a database field instead.
THUMBNAIL_URL_TEMPLATE.expand(
series: series_name.gsub(/\s+/, '').downcase,
color: color.name.gsub(/\s+/, '').downcase,
species: species.name.gsub(/\s+/, '').downcase,
).to_s
end
def preview_image_url
swf_asset = swf_assets.first
return nil if swf_asset.nil?
@ -76,26 +91,6 @@ class AltStyle < ApplicationRecord
end
end
# At time of writing, most batches of Alt Styles thumbnails used a simple
# pattern for the item thumbnail URL, but that's not always the case anymore.
# For now, let's keep using this format as the default value when creating a
# new Alt Style, but the database field can be manually overridden as needed!
THUMBNAIL_URL_TEMPLATE = Addressable::Template.new(
"https://images.neopets.com/items/{series}_{color}_{species}.gif"
)
DEFAULT_THUMBNAIL_URL = "https://images.neopets.com/items/mall_bg_circle.gif"
def infer_thumbnail_url
if has_real_series_name?
self.thumbnail_url = THUMBNAIL_URL_TEMPLATE.expand(
series: series_name.gsub(/\s+/, '').downcase,
color: color.name.gsub(/\s+/, '').downcase,
species: species.name.gsub(/\s+/, '').downcase,
).to_s
else
self.thumbnail_url = DEFAULT_THUMBNAIL_URL
end
end
# For convenience in the console!
def self.find_by_name(color_name, species_name)
color = Color.find_by_name(color_name)

View file

@ -4,15 +4,12 @@
- content = yield
- subtitle = yield :subtitle
%tr{"data-item-owned": item.owned?}
%tr
%td.thumbnail-cell
= link_to item_thumbnail_for(item), item, target: "_blank",
tabindex: "-1"
%td.name-cell
= link_to item.name, item, target: "_blank", class: "item-name"
- if item.owned?
%span.owned-explanation
(You own this)
= link_to item.name, item, target: "_blank"
- if subtitle.present?
.subtitle= subtitle
%td.actions-cell= content

View file

@ -16,11 +16,10 @@
%tr
%td
%th
Total: #{nc_total_for @nc_mall_items_needed} NC
(#{pluralize @nc_mall_items_needed.size, "item"})
Total: #{nc_total_for @nc_mall_items} NC
(#{pluralize @nc_mall_items.size, "item"})
%td.actions-cell
- if @nc_mall_items_needed.present?
%button{onclick: "alert('Todo!')"}
= cart_icon alt: ""
Buy all in NC Mall
@ -43,24 +42,22 @@
%table.item-list
%thead
%tr
%td.thumbnail-cell
= image_tag "https://images.neopets.com/items/mall_80x80_cleaning.gif",
alt: "Dyeworks Hue Brew Potion"
%th
Total: #{dyeworks_nc_total_for @buyable_dyeworks_items_needed} NC
Total: #{dyeworks_nc_total_for @buyable_dyeworks_items} NC
= surround "(", ")" do
%span.price-breakdown{
title: "#{dyeworks_items_nc_total_for(@buyable_dyeworks_items_needed)} NC"
title: "#{dyeworks_items_nc_total_for(@buyable_dyeworks_items)} NC"
}<
#{pluralize @buyable_dyeworks_items_needed.size, "item"}
#{pluralize @buyable_dyeworks_items.size, "item"}
+
%span.price-breakdown{
title: dyeworks_potions_nc_summary(@buyable_dyeworks_items_needed.size)
title: dyeworks_potions_nc_summary(@buyable_dyeworks_items.size)
}<
#{pluralize @buyable_dyeworks_items_needed.size, "potion"}
#{pluralize @buyable_dyeworks_items.size, "potion"}
%td.actions-cell
- if @buyable_dyeworks_items_needed.present?
%button{onclick: "alert('Todo!')"}
= cart_icon alt: ""
Buy all in NC Mall
@ -99,10 +96,9 @@
%table.item-list
%thead
%tr
%td
%th{colspan: 2}
Total: #{pluralize @np_items_needed.size, "item"}
Total: #{pluralize @np_items.size, "item"}
%tbody
- @np_items.each do |item|
= render "item_list_row", item: do
@ -120,13 +116,8 @@
"cross-paint" outfits.
- @pb_items_by_color.each do |color, items|
- items_needed = @pb_items_needed_by_color[color]
%table.item-list{
"data-group-type": "bundle",
"data-group-owned": items.all?(&:owned?),
}
%table.item-list{"data-group-type": "bundle"}
%thead
%tr
%td.thumbnail-cell
- if color&.pb_item_thumbnail_url?
= image_tag color.pb_item_thumbnail_url,
@ -143,7 +134,7 @@
#{color.pb_item_name || color.name.humanize}
- else
Basic colors
(#{pluralize items_needed.size, "item"})
(#{pluralize items.size, "item"})
%td.actions-cell
- if color&.pb_item_name?
= button_link_to "Shops",
@ -184,7 +175,7 @@
%thead
%td
%th{colspan: 2}
Total: #{pluralize @other_nc_items_needed.size, "item"}
Total: #{pluralize @other_nc_items.size, "item"}
%tbody
- @other_nc_items.each do |item|
= render "item_list_row", item: do

View file

@ -1,14 +0,0 @@
class AddThumbnailUrlToAltStyles < ActiveRecord::Migration[7.1]
def change
add_column :alt_styles, :thumbnail_url, :string, null: false
reversible do |direction|
direction.up do
AltStyle.find_each do |alt_style|
alt_style.infer_thumbnail_url
alt_style.save!
end
end
end
end
end

View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.1].define(version: 2024_06_16_001002) do
ActiveRecord::Schema[7.1].define(version: 2024_06_08_022149) do
create_table "alt_styles", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.integer "species_id", null: false
t.integer "color_id", null: false
@ -18,7 +18,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_06_16_001002) do
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.string "series_name"
t.string "thumbnail_url", null: false
t.index ["color_id"], name: "index_alt_styles_on_color_id"
t.index ["species_id"], name: "index_alt_styles_on_species_id"
end