feat: add editable meetup start times

gotar · gotar · commit f2e807b177d2 · 2026-03-25T16:35:07.000+01:00
diff --git a/.kamal/hooks/post-deploy b/.kamal/hooks/post-deploy
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eu
+
+bin/kamal app exec --reuse "bin/rails db:migrate"
diff --git a/app/assets/stylesheets/landing.css b/app/assets/stylesheets/landing.css
@@ -221,6 +221,24 @@
   color: var(--color-gray-dark);
 }
 
+.event-card__description {
+  margin: 1.5rem 0;
+  padding: 1rem 1.25rem;
+  border-left: 3px solid rgba(226, 84, 84, 0.35);
+  border-radius: var(--border-radius-sm);
+  background: rgba(226, 84, 84, 0.06);
+  color: var(--color-gray-dark);
+  line-height: 1.7;
+}
+
+.event-card__description p {
+  margin: 0;
+}
+
+.event-card__description p + p {
+  margin-top: 0.75rem;
+}
+
 /* Admin Type Badges
    ========================================================================== */
 .meetup-list-type-badge {
diff --git a/app/controllers/admin/meetups_controller.rb b/app/controllers/admin/meetups_controller.rb
@@ -59,6 +59,6 @@ def destroy
   private
 
   def meetup_params
-    params.require(:meetup).permit(:number, :date, :description, :location, :event_type)
+    params.require(:meetup).permit(:number, :date, :start_time, :description, :location, :event_type)
   end
 end
diff --git a/app/models/meetup.rb b/app/models/meetup.rb
@@ -1,16 +1,21 @@
 class Meetup < ApplicationRecord
+  DEFAULT_START_TIME = "18:00".freeze
+
   has_many :talks, dependent: :destroy
   has_many :attendances, dependent: :destroy
 
   attribute :event_type, :string
+  attribute :start_time, :string, default: DEFAULT_START_TIME
   enum :event_type, { formal: "formal", bar: "bar" }, default: "formal"
 
   validates :number, presence: true, uniqueness: true, if: :formal?
   validates :date, presence: true
+  validates :start_time, presence: true, format: { with: /\A([01]\d|2[0-3]):[0-5]\d\z/ }
 
   validate :cannot_change_to_bar_if_talks_exist, if: -> { bar? && event_type_changed? }
 
   before_validation :clear_number_for_bar_events, if: -> { bar? && number.present? }
+  before_validation :apply_default_start_time
 
   scope :ordered, -> { order(Arel.sql("CASE WHEN event_type = 'bar' THEN 1 ELSE 0 END, date DESC")) }
   scope :upcoming, -> { where("date >= ?", Date.today).order(date: :asc) }
@@ -28,4 +33,8 @@ def cannot_change_to_bar_if_talks_exist
   def clear_number_for_bar_events
     self.number = nil
   end
+
+  def apply_default_start_time
+    self.start_time = DEFAULT_START_TIME if start_time.blank?
+  end
 end
diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb
@@ -91,6 +91,7 @@
               <time datetime="<%= @next_meetup.date.iso8601 %>">
                 <%= l @next_meetup.date, format: :long %>
               </time>
+              o <%= @next_meetup.start_time %>
             </p>
             <p class="next-meetup-talks">
               <%= @next_meetup.talks.size %> <%= polish_pluralize(@next_meetup.talks.size, "prezentacja", "prezentacje", "prezentacji") %>
@@ -127,6 +128,8 @@
                   <span class="meetup-list-meta">
                     <time datetime="<%= meetup.date.iso8601 %>"><%= l meetup.date, format: :long %></time>
                     <span aria-hidden="true">•</span>
+                    <span><%= meetup.start_time %></span>
+                    <span aria-hidden="true">•</span>
                     <span><%= meetup.talks.size %> <%= polish_pluralize(meetup.talks.size, "prezentacja", "prezentacje", "prezentacji") %></span>
                   </span>
                 </div>
diff --git a/app/views/admin/meetups/_form.html.erb b/app/views/admin/meetups/_form.html.erb
@@ -46,6 +46,14 @@
       <%= f.date_field :date, class: "form-input", required: true %>
       <span class="form-hint">Data, kiedy odbędzie się spotkanie</span>
     </div>
+
+    <div class="form-field">
+      <%= f.label :start_time, class: "form-label" do %>
+        Godzina rozpoczęcia <span class="required">*</span>
+      <% end %>
+      <%= f.time_field :start_time, class: "form-input", required: true %>
+      <span class="form-hint">Domyślnie 18:00, ale możesz ją zmienić dla konkretnego spotkania</span>
+    </div>
   </div>
 
   <div class="form-section">
diff --git a/app/views/admin/meetups/index.html.erb b/app/views/admin/meetups/index.html.erb
@@ -70,11 +70,13 @@
                   <span class="meetup-list-type-badge <%= "meetup-list-type--#{meetup.event_type}" %>">
                      <%= meetup.event_type == 'formal' ? 'TRUG' : 'TRUG Bar' %>
                   </span>
-                  <span class="meetup-list-meta">
-                    <time datetime="<%= meetup.date.iso8601 %>"><%= l meetup.date, format: :long %></time>
-                    <% if meetup.date.today? %>
-                      <span class="badge badge-today">Dzisiaj</span>
-                    <% elsif meetup.date.future? %>
+                   <span class="meetup-list-meta">
+                     <time datetime="<%= meetup.date.iso8601 %>"><%= l meetup.date, format: :long %></time>
+                     <span aria-hidden="true">•</span>
+                     <span><%= meetup.start_time %></span>
+                     <% if meetup.date.today? %>
+                       <span class="badge badge-today">Dzisiaj</span>
+                     <% elsif meetup.date.future? %>
                       <span class="badge badge-upcoming">Nadchodzące</span>
                     <% else %>
                       <span class="badge badge-past">Odbyte</span>
diff --git a/app/views/admin/meetups/show.html.erb b/app/views/admin/meetups/show.html.erb
@@ -56,6 +56,12 @@
           <%= @meetup.talks.size %>
         </div>
       </div>
+      <div class="form-field" style="margin-bottom: 0;">
+        <label class="form-label">Godzina rozpoczęcia</label>
+        <div style="padding: 0.75rem; background: var(--color-surface-inset); border-radius: var(--radius-md); font-weight: 500;">
+          <%= @meetup.start_time %>
+        </div>
+      </div>
     </div>
     
     <% if @meetup.description.present? %>
diff --git a/app/views/pages/_event_card.html.erb b/app/views/pages/_event_card.html.erb
@@ -15,7 +15,7 @@
     </svg>
     <div class="info-row__content">
       <div class="info-row__label">Godzina</div>
-      <div class="info-row__value">18:00</div>
+      <div class="info-row__value"><%= meetup.start_time %></div>
     </div>
   </div>
   
@@ -30,6 +30,12 @@
       </div>
     </div>
   </div>
+
+  <% if meetup.description.present? %>
+    <div class="event-card__description">
+      <%= simple_format(meetup.description) %>
+    </div>
+  <% end %>
   
   <% if type == 'formal' && meetup.talks.any? %>
     <div class="talks-section">
diff --git a/db/migrate/20260325163000_add_start_time_to_meetups.rb b/db/migrate/20260325163000_add_start_time_to_meetups.rb
@@ -0,0 +1,9 @@
+class AddStartTimeToMeetups < ActiveRecord::Migration[8.1]
+  def up
+    add_column :meetups, :start_time, :string, default: "18:00", null: false
+  end
+
+  def down
+    remove_column :meetups, :start_time
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/test/controllers/admin/meetups_controller_test.rb b/test/controllers/admin/meetups_controller_test.rb
@@ -24,10 +24,12 @@ class Admin::MeetupsControllerTest < ActionDispatch::IntegrationTest
       post admin_meetups_url, params: {
         meetup: {
           number: meetups(:one).number + 1,
-          date: Date.today + 7.days
+          date: Date.today + 7.days,
+          start_time: "19:30"
         }
       }
     end
     assert_redirected_to admin_meetups_path
+    assert_equal "19:30", Meetup.order(:id).last.start_time
   end
 end
diff --git a/test/fixtures/meetups.yml b/test/fixtures/meetups.yml
@@ -1,9 +1,12 @@
 one:
   number: 115
   date: <%= Date.today + 7.days %>
+  start_time: "18:00"
+  description: "Przynies swoje pytania i pomysly na prezentacje."
   location: "Rejak, Grunwaldzka 5, Gdańsk"
 
 two:
   number: 114
   date: <%= Date.today + 14.days %>
+  start_time: "18:00"
   location: "Rejak, Grunwaldzka 5, Gdańsk"
diff --git a/test/models/meetup_test.rb b/test/models/meetup_test.rb
@@ -19,6 +19,21 @@ class MeetupTest < ActiveSupport::TestCase
     assert bar.valid?
   end
 
+  test "defaults start time to 18:00" do
+    meetup = Meetup.new(event_type: "formal", number: 999, date: Date.today)
+
+    meetup.valid?
+
+    assert_equal "18:00", meetup.start_time
+  end
+
+  test "start time must be valid HH:MM" do
+    meetup = Meetup.new(event_type: "formal", number: 999, date: Date.today, start_time: "25:99")
+
+    assert_not meetup.valid?
+    assert meetup.errors[:start_time].any?
+  end
+
   test "ordered scope returns meetups ordered by event_type and date" do
     result = Meetup.ordered.to_a
     assert_instance_of Array, result
diff --git a/test/system/pages_test.rb b/test/system/pages_test.rb
@@ -9,6 +9,12 @@ class PagesTest < ApplicationSystemTestCase
     assert_text "Użytkowników Ruby"
   end
 
+  test "homepage shows meetup description when present" do
+    visit root_url
+
+    assert_text meetups(:one).description
+  end
+
   test "archive page lists all meetups" do
     visit archive_url
     assert_selector ".archive-meetup"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +#!/bin/sh
 +set -eu
++
 +bin/kamal app exec --reuse "bin/rails db:migrate"