20250610 Staging into Main

Gemfile.lock

@@ -317,7 +317,7 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     racc (1.8.1)
-    rack (3.1.14)
+    rack (3.1.16)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-protection (4.1.1)

app/controllers/profiles_controller.rb

@@ -28,8 +28,6 @@ def new
       Rails.logger.debug { "^^^^^^^^^^^^^^^^ Profile is nil for user: #{current_user.inspect}" }
     else
       authorize @profile
-      @profile.build_home_address
-      @profile.build_campus_address
     end
   end
 
@@ -86,8 +84,6 @@ def profile_params
                                     :major,
                                     :department, :grad_date, :degree, :receiving_financial_aid,
                                     :accepted_financial_aid_notice, :financial_aid_description,
-                                    :hometown_publication, :pen_name,
-                                    home_address_attributes: %i[id address1 address2 city state zip country address_type_id],
-                                    campus_address_attributes: %i[id address1 address2 city state zip country address_type_id])
+                                    :hometown_publication, :pen_name)
   end
 end

app/helpers/containers_helper.rb

@@ -18,8 +18,8 @@ def render_eligibility_rules(description)
     eligibility_plain = description.eligibility_rules.to_plain_text
     if eligibility_plain.length > 100
       content_tag(:div) do
-        truncate(eligibility_plain, length: 100, omission: '') +
-        link_to('...more', '#',
+        truncate(eligibility_plain, length: 60, omission: '') +
+        link_to(' ...more', '#',
           data: {
             action: 'click->modal#open',
             url: eligibility_rules_container_contest_description_path(description.container, description),

app/helpers/contest_descriptions_helper.rb

@@ -6,9 +6,8 @@ def contest_description_summary(description)
     if active_instances.any?
       first_active = active_instances.first
       entry_count = first_active.entries.where(deleted: false).count
-      summary += '<small class="text-nowrap">Active instance</small><br>'
-      summary += link_to(pluralize(entry_count, 'entry'),
-                         container_contest_description_contest_instance_path(description.container, description, first_active), class: 'btn btn-sm btn-primary')
+      summary += link_to("Active: #{pluralize(entry_count, 'entry')}",
+                         container_contest_description_contest_instance_path(description.container, description, first_active), class: 'btn btn-sm btn-primary small')
       summary += '<br>'
     end
     summary += "<small>#{pluralize(total_instances, 'instance')}</small>"

app/javascript/controllers/index.js

@@ -4,9 +4,6 @@
 
 import { application } from "./application"
 
-import AddressCopyController from "./address_copy_controller"
-application.register("address-copy", AddressCopyController)
-
 import CharacterCounterController from "./character_counter_controller"
 application.register("character-counter", CharacterCounterController)
 

app/models/profile.rb

@@ -20,34 +20,28 @@
 #  umid                          :string(255)
 #  created_at                    :datetime         not null
 #  updated_at                    :datetime         not null
-#  campus_address_id             :bigint
 #  campus_id                     :bigint
 #  class_level_id                :bigint
-#  home_address_id               :bigint
 #  school_id                     :bigint
 #  user_id                       :bigint           not null
 #
 # Indexes
 #
-#  campus_id_idx                        (campus_id)
-#  class_level_id_idx                   (class_level_id)
-#  id_unq_idx                           (id) UNIQUE
-#  index_profiles_on_campus_address_id  (campus_address_id)
-#  index_profiles_on_campus_id          (campus_id)
-#  index_profiles_on_class_level_id     (class_level_id)
-#  index_profiles_on_home_address_id    (home_address_id)
-#  index_profiles_on_school_id          (school_id)
-#  index_profiles_on_umid               (umid) UNIQUE
-#  index_profiles_on_user_id            (user_id)
-#  school_id_idx                        (school_id)
-#  user_id_idx                          (user_id)
+#  campus_id_idx                     (campus_id)
+#  class_level_id_idx                (class_level_id)
+#  id_unq_idx                        (id) UNIQUE
+#  index_profiles_on_campus_id       (campus_id)
+#  index_profiles_on_class_level_id  (class_level_id)
+#  index_profiles_on_school_id       (school_id)
+#  index_profiles_on_umid            (umid) UNIQUE
+#  index_profiles_on_user_id         (user_id)
+#  school_id_idx                     (school_id)
+#  user_id_idx                       (user_id)
 #
 # Foreign Keys
 #
-#  fk_rails_...  (campus_address_id => addresses.id)
 #  fk_rails_...  (campus_id => campuses.id)
 #  fk_rails_...  (class_level_id => class_levels.id)
-#  fk_rails_...  (home_address_id => addresses.id)
 #  fk_rails_...  (school_id => schools.id)
 #  fk_rails_...  (user_id => users.id)
 #
@@ -60,17 +54,11 @@ class Profile < ApplicationRecord
   belongs_to :campus, optional: true
   has_many :entries, dependent: :restrict_with_error
 
-  belongs_to :home_address, class_name: 'Address', optional: true
-  belongs_to :campus_address, class_name: 'Address', optional: true
-
-  accepts_nested_attributes_for :home_address, allow_destroy: true
-  accepts_nested_attributes_for :campus_address, allow_destroy: true
-
   validates :preferred_first_name, presence: true, length: { in: 1..255 }
   validates :preferred_last_name, presence: true, length: { in: 1..255 }
-  validates :umid, 
-    presence: true, 
-    uniqueness: true, 
+  validates :umid,
+    presence: true,
+    uniqueness: true,
     length: { is: 8 },
     format: { with: /\A\d{8}\z/, message: "must be exactly 8 digits" }
   validates :grad_date, presence: true
@@ -79,9 +67,6 @@ class Profile < ApplicationRecord
   validates :class_level_id, presence: true
   validates :campus_id, presence: true
   validates :school_id, presence: true
-  validates :home_address, presence: true
-  validates :campus_address, presence: true
-
 
   def display_name
     "#{preferred_first_name} #{preferred_last_name}"