Merge branch 'main' into modeling-tests

app/assets/stylesheets/alt_styles/edit.sass

@@ -21,11 +21,11 @@
 			max-width: 100%
 			box-sizing: border-box
 
-	input[type=url]
-		font-size: .85em
+		input[type=url]
+			font-size: .85em
 
-	label
-		font-weight: bold
+		label
+			font-weight: bold
 
 	.thumbnail-field
 		display: flex
@@ -41,3 +41,15 @@
 
 	.field_with_errors
 		display: contents
+
+	.actions
+		display: flex
+		align-items: center
+		gap: 1em
+
+		label
+			display: flex
+			align-items: center
+			gap: .25em
+			font-size: .85em
+			font-style: italic

app/controllers/alt_styles_controller.rb

@@ -54,7 +54,7 @@ class AltStylesController < ApplicationController
 
 		if @alt_style.update(alt_style_params)
 			flash[:notice] = "\"#{@alt_style.full_name}\" successfully saved!"
-			redirect_to alt_styles_path
+			redirect_to destination_after_save
 		else
 			render action: :edit, status: :bad_request
 		end
@@ -79,4 +79,21 @@ class AltStylesController < ApplicationController
 			Species.find_by(name: params[:species])
 		end
 	end
+
+	def destination_after_save
+		if params[:next] == "unlabeled-style"
+			next_unlabeled_style_path
+		else
+			alt_styles_path
+		end
+	end
+
+	def next_unlabeled_style_path
+		unlabeled_style = AltStyle.unlabeled.newest.first
+		if unlabeled_style
+			edit_alt_style_path(unlabeled_style, next: "unlabeled-style")
+		else
+			alt_styles_path
+		end
+	end
 end

app/models/alt_style.rb

@@ -22,6 +22,8 @@ class AltStyle < ApplicationRecord
   scope :by_creation_date, -> {
     order("DATE(created_at) DESC")
   }
+  scope :unlabeled, -> { where(series_name: nil) }
+  scope :newest, -> { order(created_at: :desc) }
 
   def pet_name
     I18n.translate('pet_types.human_name', color_human_name: color.human_name,

app/views/alt_styles/_alt_style.html.haml

@@ -4,3 +4,9 @@
 		.name
 			%span= alt_style.series_name
 			%span= alt_style.pet_name
+		.info
+			%p
+				Added
+				= time_tag alt_style.created_at,
+					title: alt_style.created_at.to_formatted_s(:long_nst) do
+					= time_with_only_month_if_old alt_style.created_at

app/views/alt_styles/edit.html.haml

@@ -28,7 +28,12 @@
 			- if @alt_style.thumbnail_url?
 				= image_tag @alt_style.thumbnail_url
 			= f.url_field :thumbnail_url
-	= f.submit "Save changes"
+	.actions
+		= f.submit "Save changes"
+		%label{title: "If checked, takes you to the next unlabeled pet style, if any. Useful for labeling in bulk!"}
+			= check_box_tag "next", "unlabeled-style",
+				checked: params[:next] == "unlabeled-style"
+			Then: Go to unlabeled style
 
 - content_for :stylesheets do
 	= stylesheet_link_tag "application/breadcrumbs"

app/views/alt_styles/index.html.haml

@@ -17,7 +17,7 @@
 	Only some items fit pets wearing Pet Styles: mostly Backgrounds, Foregrounds,
 	and other items that aren't designed to fit a specific body shape.
 
-	If you have an Pet Style we don't, please model it by entering your pet's
+	If you have a Pet Style we don't, please model it by entering your pet's
 	name on the homepage! Thank you! 💖
 
 	[1]: https://www.neopets.com/mall/stylingstudio/

app/views/pet_types/index.html.haml

@@ -3,7 +3,7 @@
 
 :markdown
 	Welcome, welcome! These are all the colors and species of pet we've seen
-	before. You can also check out our [NC Pet Styles][1] listings, too!
+	before. We have [NC Pet Styles][1], too!
 
 	If you've seen a new kind of pet, you can enter its name on the homepage to
 	show us! Thank you so much 💖