bible270 0.18.3 → 1.0.0

data/app/controllers/bible270/profiles_controller.rb

@@ -8,14 +8,12 @@ module Bible270
 
     def edit
       @names = current_reader.suggested_names
+      load_daily_reminder_state
     end
 
     def update
+      @daily_reminders_available = daily_reminders_available?
       problems = []
-      # A checkbox sends nothing when unticked, so absence means off. Set before
-      # the name check, so the preference is saved even if a name is rejected.
-      current_reader.update_column(:notify_on_mention, params[:notify_on_mention].present?)
-
       problems << 'both a first and last name' unless current_reader.update_names(params[:first_name],
                                                                                   params[:last_name])
       if params[:bible_version].present? && !current_reader.update_bible_version(params[:bible_version])
@@ -27,10 +25,22 @@ module Bible270
         problems << (current_reader.errors[:avatar].first || 'a valid image')
       end
 
+      requested_daily_reminders = params[:daily_reminders] == '1'
+      requested_daily_reminder_time = daily_reminder_time_param
+      if @daily_reminders_available && !Reader.valid_daily_reminder_time?(requested_daily_reminder_time)
+        problems << 'a reminder time in 24-hour HH:MM format'
+      end
+
       if problems.empty?
+        if @daily_reminders_available
+          current_reader.update!(daily_reminders: requested_daily_reminders,
+                                 daily_reminder_time: requested_daily_reminder_time)
+        end
         redirect_to reader_path(current_reader), notice: 'Your profile has been updated.'
       else
         @names = { first_name: params[:first_name], last_name: params[:last_name] }
+        @daily_reminders = requested_daily_reminders
+        @daily_reminder_time = requested_daily_reminder_time
         flash.now[:alert] = "Please give #{problems.to_sentence}."
         render :edit, status: :unprocessable_entity
       end
@@ -43,6 +53,29 @@ module Bible270
 
   private
 
+    def load_daily_reminder_state
+      @daily_reminders_available = daily_reminders_available?
+      if @daily_reminders_available
+        @daily_reminders = current_reader.daily_reminders
+        @daily_reminder_time = current_reader.daily_reminder_time
+      else
+        @daily_reminders = false
+        @daily_reminder_time = '08:00'
+      end
+    end
+
+    def daily_reminders_available?
+      Bible270.config.daily_reminders? && Reader.daily_reminder_columns?
+    end
+
+    def daily_reminder_time_param
+      hour = params[:daily_reminder_hour]
+      minute = params[:daily_reminder_minute]
+      return "#{hour}:#{minute}" if hour.present? || minute.present?
+
+      params[:daily_reminder_time].to_s
+    end
+
     # Unlike checking off a reading, there is nothing sensible to do here for a
     # visitor who isn't signed in, so send them to sign in rather than 404.
     def require_signed_in_reader

data/app/controllers/bible270/readers_controller.rb

@@ -2,13 +2,22 @@
 
 module Bible270
   class ReadersController < ApplicationController
+    MILESTONES = {
+      30 => '30-day milestone',
+      90 => 'one-third complete',
+      135 => 'halfway',
+      180 => 'two-thirds complete',
+      Plan::DAYS => 'plan complete'
+    }.freeze
+
     def index
       @readers = Reader.all.to_a
       counts = Checkoff.group(:reader_id, :day).count
       @days_completed = Hash.new(0)
       counts.each { |(rid, day), n| @days_completed[rid] += 1 if n >= Plan.total_parts(day) }
-      # Progress first, then by name — the same name ordering the admin list uses.
-      @readers.sort_by! { |r| [-@days_completed[r.id], r.sort_name] }
+      # Community is a directory of fellow readers, not a leaderboard. Keep the
+      # order predictable without implying that progress determines standing.
+      @readers.sort_by!(&:sort_name)
     end
 
     # The reader's own progress. Deliberately open to visitors: the panel shows an
@@ -16,8 +25,26 @@ module Bible270
     # from the reader it is given.
     def progress
       @reader = current_reader
-      # An empty relation rather than nil, so the view needs no safe navigation.
+      # Defaults keep the open visitor page simple and make every view input explicit.
       @recent_comments = @reader ? @reader.comments.recent.limit(5) : Comment.none
+      @partial_day_tasks = []
+      @remaining_partial_days = 0
+      @week_days = []
+      @week_completed = 0
+      @next_milestone = nil
+      @days_to_milestone = nil
+      return unless @reader
+
+      partial_days = @reader.partial_days
+      @partial_day_tasks = partial_days.first(5).map do |day|
+        { day: day, remaining: @reader.remaining_parts_for(day) }
+      end
+      @remaining_partial_days = [partial_days.size - @partial_day_tasks.size, 0].max
+      @week_days = @reader.scheduled_days_this_week
+      @week_completed = @week_days.count { |day| @reader.day_complete?(day) }
+      completed = @reader.days_completed
+      @next_milestone = MILESTONES.find { |day, _label| day > completed }
+      @days_to_milestone = @next_milestone&.first.to_i - completed if @next_milestone
     end
 
     def show
@@ -53,5 +80,23 @@ module Bible270
         redirect_to root_path, alert: 'The start date is set for the whole community.'
       end
     end
+
+    def restart_schedule
+      return unless require_reader!
+
+      unless Bible270.config.allow_reader_start_date
+        redirect_to progress_path, alert: 'The start date is set for the whole community.' and return
+      end
+
+      next_day = current_reader.current_day
+      today = current_reader.today_day
+      unless today && next_day < today
+        redirect_to progress_path, notice: 'Your reading schedule is already up to date.' and return
+      end
+
+      current_reader.restart_on!(day: next_day)
+      redirect_to progress_path,
+                  notice: "Day #{next_day} is now today. All your reading progress is unchanged."
+    end
   end
 end

data/app/helpers/bible270/plan_helper.rb

@@ -176,12 +176,26 @@ module Bible270
     # One cell of the 270-day grid. Four views drew this by hand in four slightly
     # different ways; now they all call this.
     #
-    # The title attribute carries the readings, so hovering a square says what is
-    # on that day — no JavaScript, and it works for keyboard focus too.
+    # The title attribute carries the readings for pointer users; aria-label also
+    # includes date, progress, today, and reflection state for assistive technology.
     def b270_day_cell(day, reader: nil, today: nil)
       link_to day, day_path(day),
               class: b270_day_cell_classes(day, reader: reader, today: today),
-              title: b270_day_readings(day)
+              title: b270_day_readings(day),
+              aria: { label: b270_day_cell_label(day, reader: reader, today: today) }
+    end
+
+    def b270_day_cell_label(day, reader: nil, today: nil)
+      parts = ["Day #{day}"]
+      parts << reader.date_for_day(day).strftime('%A, %B %-d, %Y') if reader&.dated?
+      if reader
+        status = { complete: 'complete', partial: 'partially read', none: 'not read' }.fetch(reader.day_status(day))
+        parts << status
+      end
+      parts << 'today' if today == day
+      parts << 'has reflections' if b270_days_with_reflections.include?(day)
+      parts << b270_day_readings(day)
+      parts.join('. ')
     end
 
     # Shared with the admin grid, which is a button_to rather than a link because

data/app/mailers/bible270/notice_mailer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Bible270
-  # Notices to whoever runs the plan, as opposed to mail sent to readers.
+  # Transactional mail for readers and notices for whoever runs the plan.
   class NoticeMailer < ApplicationMailer
     def new_reader(reader_id:, recipients:)
       @reader = Reader.find_by(id: reader_id)
@@ -31,6 +31,23 @@ module Bible270
            subject: "#{@app_name}: #{@author.display_name} mentioned you on day #{@comment.day}"
     end
 
+    def daily_reminder(reader_id:, day:, on: Bible270.today)
+      @reader = Reader.find_by(id: reader_id)
+      return message.perform_deliveries = false unless Bible270.config.daily_reminders?
+      return message.perform_deliveries = false if @reader.nil? || !@reader.daily_reminders? || @reader.email.blank?
+
+      @day = day.to_i
+      @on = Plan.to_date(on)
+      return message.perform_deliveries = false unless Plan.valid_day?(@day) && @on
+
+      @readings = Plan.readings_for(@day).select { |_, reference| reference }
+      @app_name = Bible270.config.app_name
+      @day_url = day_url_for(@day)
+      @profile_url = profile_url
+
+      mail to: @reader.email, subject: "#{@app_name}: day #{@day} reading reminder"
+    end
+
     # A message from whoever runs the plan to one reader. Sent individually rather
     # than as one email with everyone in bcc: a bcc list of a hundred addresses is
     # a spam signal, and it means nobody can be greeted by name or unsubscribe
@@ -69,6 +86,10 @@ module Bible270
       engine_url(:admin_reader_url, reader)
     end
 
+    def profile_url
+      engine_url(:profile_url)
+    end
+
     def engine_url(helper, *)
       host = Bible270.config.mailer_host
       return nil if host.blank?

data/app/models/bible270/comment.rb

@@ -11,6 +11,7 @@ module Bible270
     # the paper background; an outline glyph like U+2661 is drawn by the font
     # rather than the emoji set and needs hand-tuning to match.
     HEART = '❤️'
+    ThreadPage = Struct.new(:threads, :activity_by_id, :page, :pages, :total, keyword_init: true)
 
     self.table_name = 'bible270_comments'
 
@@ -52,6 +53,40 @@ module Bible270
     }
     scope :recent, -> { approved.order(created_at: :desc) }
 
+    # One page of top-level reflections ordered by the newest activity in each
+    # conversation. Loading only IDs and timestamps keeps older archives cheap to
+    # sort, while the displayed page still eager-loads its readers, replies and likes.
+    def self.thread_page(day: nil, reader_id: nil, page: 1, per_page: 10)
+      roots = approved.where(parent_id: nil)
+      roots = roots.where(day: day) if day
+      roots = roots.where(reader_id: reader_id) if reader_id
+
+      root_rows = roots.pluck(:id, :created_at)
+      reply_activity = approved.where.not(parent_id: nil).group(:parent_id).maximum(:created_at)
+      ordered = root_rows.map do |id, created_at|
+        [id, [created_at, reply_activity[id]].compact.max]
+      end
+      ordered.sort_by! { |id, activity_at| [-activity_at.to_f, -id] }
+
+      per_page = per_page.to_i
+      per_page = 10 unless per_page.positive?
+      pages = [(ordered.length.to_f / per_page).ceil, 1].max
+      page = page.to_i.clamp(1, pages)
+      page_rows = ordered.slice((page - 1) * per_page, per_page) || []
+      ids = page_rows.map(&:first)
+      loaded = approved.where(id: ids)
+        .includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
+        .index_by(&:id)
+
+      ThreadPage.new(
+        threads: ids.filter_map { |id| loaded[id] },
+        activity_by_id: page_rows.to_h,
+        page: page,
+        pages: pages,
+        total: ordered.length
+      )
+    end
+
     # Every reflection is visible when written; these are the moderation actions.
     def hide!    = update!(approved: false, moderated_at: Time.current)
     def unhide!  = update!(approved: true,  moderated_at: Time.current)
@@ -79,6 +114,16 @@ module Bible270
       end
     end
 
+    def set_like!(reader, liked:)
+      if liked
+        likes.create_or_find_by!(reader: reader)
+      else
+        likes.where(reader: reader).destroy_all
+      end
+      likes.reload
+      liked
+    end
+
     # A second's grace: created_at and updated_at differ by microseconds on
     # insert, which would mark every reflection as edited.
     def edited? = updated_at - created_at > 1
@@ -108,8 +153,9 @@ module Bible270
       errors.add(:parent, "is on day #{parent.day}, not #{day}")
     end
 
-    # A mention emails the person named. Failures are logged rather than raised:
-    # nobody should lose a reflection because the mail server is down.
+    # A mention always emails the person named. There is no per-reader opt-out;
+    # failures are logged rather than raised so nobody loses a reflection because
+    # the mail server is down.
     def notify_newly_mentioned_readers
       return unless saved_change_to_body?
 
@@ -123,7 +169,6 @@ module Bible270
       Reader.mentioned_in(body).each do |mentioned|
         next if mentioned.id == reader_id
         next if except.include?(mentioned.id)
-        next unless mentioned.wants_mention_notices?
 
         notice = NoticeMailer.mentioned(comment_id: id, reader_id: mentioned.id)
         Bible270.config.registration_notice_deliver_later ? notice.deliver_later : notice.deliver_now

data/app/models/bible270/reader.rb

@@ -27,10 +27,59 @@ module Bible270
 
     PASSAGE_SOURCES = %w[bible_gateway blue_letter_bible].freeze
     DEFAULT_PASSAGE_SOURCE = 'bible_gateway'
+    DAILY_REMINDER_TIME_FORMAT = %r{\A(?:[01]\d|2[0-3]):[0-5]\d\z}
+    DAILY_REMINDER_COLUMNS = %w[daily_reminders daily_reminder_time last_daily_reminder_sent_on].freeze
+    REFLECTIONS_SEEN_COLUMN = 'reflections_seen_at'
 
     validates :display_name, presence: true
     validates :uid, uniqueness: { scope: :provider }, allow_nil: true
     validates :passage_source, inclusion: { in: PASSAGE_SOURCES }
+    validates :daily_reminder_time,
+              format: { with: DAILY_REMINDER_TIME_FORMAT, message: 'must use 24-hour HH:MM format' },
+              if: -> { self.class.daily_reminder_columns? }
+
+    scope :daily_reminder_recipients, ->(on:) {
+      where(daily_reminders: true)
+        .where.not(email: [nil, ''])
+        .where.not(id: where(last_daily_reminder_sent_on: on).select(:id))
+    }
+
+    def self.daily_reminder_columns?
+      (DAILY_REMINDER_COLUMNS - column_names).empty?
+    rescue ActiveRecord::StatementInvalid
+      false
+    end
+
+    def self.valid_daily_reminder_time?(value)
+      value.to_s.match?(DAILY_REMINDER_TIME_FORMAT)
+    end
+
+    def self.reflections_seen_column?
+      column_names.include?(REFLECTIONS_SEEN_COLUMN)
+    rescue ActiveRecord::StatementInvalid
+      false
+    end
+
+    def mark_reflections_seen!(at)
+      return false unless self.class.reflections_seen_column?
+
+      update_column(:reflections_seen_at, at)
+      true
+    rescue ActiveRecord::StatementInvalid
+      false
+    end
+
+    def daily_reminder_due_at?(local_time)
+      return false unless self.class.daily_reminder_columns?
+      return false unless daily_reminders?
+      return false unless self.class.valid_daily_reminder_time?(daily_reminder_time)
+      return false unless local_time.respond_to?(:hour) && local_time.respond_to?(:min)
+
+      hour, minute = daily_reminder_time.split(':').map(&:to_i)
+      (local_time.hour * 60) + local_time.min >= (hour * 60) + minute
+    rescue StandardError
+      false
+    end
 
     # Build/refresh a reader from an OmniAuth auth hash. Tolerant of the various
     # shapes strategies return (OmniAuth::AuthHash, plain Hash, missing info).
@@ -221,13 +270,6 @@ module Bible270
       Mentions.handles_for(first_name, last_name).include?(handle)
     end
 
-    def wants_mention_notices?
-      return false if email.blank?
-      return true unless respond_to?(:notify_on_mention)
-
-      notify_on_mention != false
-    end
-
     # ---- staying signed in -------------------------------------------------
 
     # Generated on first use rather than at sign-up, so readers who never stay
@@ -304,6 +346,18 @@ module Bible270
       done >= Plan.total_parts(day) ? :complete : :partial
     end
 
+    def partial_days
+      checked_counts.keys.select { |day| day_status(day) == :partial }.sort
+    end
+
+    def remaining_parts_for(day)
+      return [] unless Plan.valid_day?(day)
+
+      missing_parts_on(day).map do |track, part|
+        { track: track, part: part, reference: Plan.parts_for(day, track).fetch(part) }
+      end
+    end
+
     def read_tracks_for(day)
       checkoffs.where(day: day).pluck(:track).uniq
     end
@@ -524,6 +578,19 @@ module Bible270
       Plan.end_date_for(effective_start_date)
     end
 
+    def scheduled_days_this_week(on: Bible270.today)
+      return [] unless dated?
+
+      date = Plan.to_date(on)
+      return [] unless date
+
+      week_start = date - ((date.wday + 6) % 7)
+      (week_start..date).filter_map do |scheduled_date|
+        day = Plan.day_for(scheduled_date, effective_start_date, clamp: false)
+        day if Plan.valid_day?(day)
+      end
+    end
+
     def date_for_day(day)
       Plan.date_for(day, effective_start_date)
     end

data/app/views/bible270/checkoffs/toggle.turbo_stream.erb

@@ -2,3 +2,11 @@
   <%= render partial: "bible270/days/reading", locals: {
         track: @track, day: @day, readings: @readings, reader_tracks: @reader_tracks } %>
 <% end %>
+
+<%= turbo_stream.replace "day_progress_#{@day}" do %>
+  <%= render "bible270/days/day_progress", day: @day, reader: @reader %>
+<% end %>
+
+<%= turbo_stream.replace "completers_#{@day}" do %>
+  <%= render "bible270/days/completers", day: @day, completers: @completers %>
+<% end %>

data/app/views/bible270/comments/_edit_fields.html.erb

@@ -6,7 +6,9 @@
   it is not.
 %>
 <%= form_with model: comment, url: comment_path(comment), method: :patch,
-      class: "b270-form b270-editform", data: { turbo_stream: true } do |f| %>
+      class: "b270-form b270-editform",
+      data: { turbo_stream: true, b270_submit: true, b270_pending: "Saving changes…",
+              b270_success: "Changes saved.", b270_failure: "Couldn’t save the changes. Try again." } do |f| %>
   <% if comment.errors.any? %>
     <p class="b270-editerror"><%= comment.errors.full_messages.to_sentence %></p>
   <% end %>

data/app/views/bible270/comments/_form.html.erb

@@ -1,5 +1,13 @@
+<% draft_key = ["bible270", "draft", "v1", Bible270.config.mount_at, current_reader.id,
+                    day, comment.parent_id.presence || "root"].join(":") %>
+<% posting_reply = comment.parent_id.present? %>
 <%= form_with model: comment, url: day_comments_path(day), method: :post,
-      id: "new_comment_form", class: "b270-form", data: { turbo_stream: true } do |f| %>
+      id: "new_comment_form", class: "b270-form",
+      data: { turbo_stream: true, b270_draft: true, b270_draft_key: draft_key,
+              b270_draft_errors: comment.errors.any?, b270_draft_posted: local_assigns.fetch(:posted, false),
+              b270_submit: true, b270_pending: (posting_reply ? "Posting reply…" : "Posting reflection…"),
+              b270_success: (posting_reply ? "Reply posted." : "Reflection posted."),
+              b270_failure: (posting_reply ? "Couldn’t post the reply. Try again." : "Couldn’t post the reflection. Try again.") } do |f| %>
   <% if comment.errors.any? %>
     <p style="color:var(--oxblood);font-size:13px"><%= comment.errors.full_messages.to_sentence %></p>
   <% end %>
@@ -11,6 +19,7 @@
   <% end %>
   <%= f.hidden_field :parent_id %>
   <%= f.text_area :body, placeholder: comment.parent_id.present? ? "Write your reply…" : "Share a reflection on today's reading…" %>
+  <p class="b270-draft-status" data-b270-draft-status aria-live="polite"></p>
   <div class="row">
     <%= f.select :track,
           options_for_select([["The whole day", ""]] + Bible270::Plan::TRACKS.map { |k, v| [v[:label], k] }),

data/app/views/bible270/comments/create.turbo_stream.erb

@@ -12,5 +12,5 @@
 <% end %>
 
 <%= turbo_stream.replace "new_comment_form" do %>
-  <%= render "bible270/comments/form", day: @day, comment: Bible270::Comment.new(day: @day) %>
+  <%= render "bible270/comments/form", day: @day, comment: Bible270::Comment.new(day: @day), posted: true %>
 <% end %>

data/app/views/bible270/comments/index.html.erb

@@ -1,8 +1,11 @@
 <% content_for :title, "Reflections — #{Bible270.config.app_name}" %>
 <% content_for :hide_day_index, true %><%# this page has its own, filtered grid %>
+<% browse_params = { day: @reflection_day, reader_id: @reflection_reader_id,
+                     since: @reflections_since_param }.compact %>
 
 <p class="b270-eyebrow">Reflections</p>
 <h1>Shared gleanings</h1>
+<%= render "bible270/shared/interaction_status" %>
 
 <% if @days_with_reflections.any? %>
   <div class="b270-panel">
@@ -22,19 +25,65 @@
     </div>
   </div>
 
-  <h2 class="b270-section-h">Most recent</h2>
-  <div id="comments">
-    <% @threads.each do |thread| %>
-      <div class="b270-thread">
-        <p class="b270-threadday">
-          <%= link_to "Day #{thread.day}", day_path(thread.day) %>
-          · <%= b270_day_reading_links(thread.day) %>
-        </p>
-        <%= render partial: "bible270/comments/comment", locals: { comment: thread, reply: false } %>
-      </div>
+  <div class="b270-reflection-tools">
+    <div>
+      <h2 class="b270-section-h">Conversations</h2>
+      <p class="b270-reflection-count"><%= pluralize(@reflection_total, "reflection") %></p>
+    </div>
+    <%= form_with url: reflections_path, method: :get, class: "b270-reflection-filters" do %>
+      <%= hidden_field_tag :since, @reflections_since_param %>
+      <label>
+        <span>Day</span>
+        <%= select_tag :day,
+              options_for_select([["All days", ""]] + @days_with_reflections.map { |day| ["Day #{day}", day] },
+                                 @reflection_day) %>
+      </label>
+      <label>
+        <span>Reflection by</span>
+        <%= select_tag :reader_id,
+              options_for_select([["All readers", ""]] + @reflection_readers.map { |reader| [reader.display_name, reader.id] },
+                                 @reflection_reader_id) %>
+      </label>
+      <%= submit_tag "Apply", class: "b270-btn" %>
+      <% if @reflection_day || @reflection_reader_id %>
+        <%= link_to "Clear", reflections_path(since: @reflections_since_param), class: "b270-filter-clear" %>
+      <% end %>
     <% end %>
   </div>
 
+  <% if @threads.any? %>
+    <div id="comments">
+      <% @threads.each do |thread| %>
+        <% is_new = @new_thread_ids.include?(thread.id) %>
+        <div class="b270-thread <%= "b270-thread-new" if is_new %>" id="thread-<%= thread.id %>">
+          <p class="b270-threadday">
+            <%= link_to "Day #{thread.day}", day_path(thread.day) %>
+            · <%= b270_day_reading_links(thread.day) %>
+            <% if is_new %><span class="b270-new-reflection">New since your last visit</span><% end %>
+          </p>
+          <%= render partial: "bible270/comments/comment", locals: { comment: thread, reply: false } %>
+        </div>
+      <% end %>
+    </div>
+
+    <% if @reflection_pages > 1 %>
+      <nav class="b270-pagination" aria-label="Reflection pages">
+        <% if @reflection_page > 1 %>
+          <%= link_to "← Newer", reflections_path(**browse_params, page: @reflection_page - 1) %>
+        <% end %>
+        <span>Page <%= @reflection_page %> of <%= @reflection_pages %></span>
+        <% if @reflection_page < @reflection_pages %>
+          <%= link_to "Older →", reflections_path(**browse_params, page: @reflection_page + 1) %>
+        <% end %>
+      </nav>
+    <% end %>
+  <% else %>
+    <div class="b270-panel b270-filter-empty">
+      <p>No reflections match these filters.</p>
+      <%= link_to "Show all reflections", reflections_path(since: @reflections_since_param) %>
+    </div>
+  <% end %>
+
   <p style="margin-top:18px">
     <%= link_to "Browse the whole plan →", root_path %>
   </p>
@@ -50,3 +99,5 @@
     </p>
   </div>
 <% end %>
+
+<%= render "bible270/shared/interaction_ui" %>

data/app/views/bible270/days/_completers.html.erb

@@ -0,0 +1,12 @@
+<%# locals: (day:, completers:) %>
+<div class="b270-completers" id="completers_<%= day %>">
+  <% if completers.any? %>
+    <span>Finished this day:</span>
+    <% completers.first(12).each do |reader| %>
+      <%= link_to b270_avatar(reader), reader_path(reader), title: reader.display_name %>
+    <% end %>
+    <% if completers.size > 12 %><span><%= completers.size - 12 %> more</span><% end %>
+  <% else %>
+    <span>No one has finished this day yet — be the first.</span>
+  <% end %>
+</div>

data/app/views/bible270/days/_day_progress.html.erb

@@ -0,0 +1,47 @@
+<%# locals: (day:, reader:) %>
+<%
+  previous_day = day > 1 ? day - 1 : nil
+  next_day = day < Bible270::Plan::DAYS ? day + 1 : nil
+  total_parts = Bible270::Plan.total_parts(day)
+  complete = reader&.day_complete?(day)
+%>
+<div id="day_progress_<%= day %>">
+  <div class="b270-daynav">
+    <% if previous_day %>
+      <%= link_to "‹", day_path(previous_day), class: "b270-arrow", "aria-label": "Previous day" %>
+    <% else %>
+      <%= button_tag "‹", type: "button", class: "b270-arrow disabled", disabled: true,
+            "aria-label": "Previous day unavailable" %>
+    <% end %>
+    <div class="b270-dayhead">
+      <div class="k">Day <%= day %><% if complete %><span class="b270-badge" data-b270-compact-hide>Complete</span><% end %></div>
+      <% if reader&.dated? %>
+        <div class="date">
+          <%= reader.date_for_day(day).strftime("%A, %B %-d, %Y") %>
+          <% if reader.today?(day) %><span class="b270-badge" data-b270-compact-hide>Today</span><% end %>
+        </div>
+      <% end %>
+    </div>
+    <% if next_day %>
+      <%= link_to "›", day_path(next_day), class: "b270-arrow", "aria-label": "Next day" %>
+    <% else %>
+      <%= button_tag "›", type: "button", class: "b270-arrow disabled", disabled: true,
+            "aria-label": "Next day unavailable" %>
+    <% end %>
+  </div>
+
+
+  <% if complete %>
+    <div class="b270-day-complete" role="status" aria-live="polite">
+      <div data-b270-compact-hide>
+        <strong>Day <%= day %> complete</strong>
+        <span>All <%= total_parts %> portions are checked off.</span>
+      </div>
+      <% if next_day %>
+        <%= link_to "Continue to Day #{next_day} →", day_path(next_day), class: "b270-btn" %>
+      <% else %>
+        <%= link_to "View My Progress →", progress_path, class: "b270-btn" %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/views/bible270/days/_reading.html.erb

@@ -21,7 +21,11 @@
             <li class="b270-part <%= 'done' if part_done %>">
               <% if signed_in? %>
                 <%= button_to toggle_checkoff_part_path(day, track, index), class: "b270-toggle",
-                      form: { data: { turbo_stream: true } },
+                      params: { checked: part_done ? "0" : "1" },
+                      form: { data: { turbo_stream: true, b270_submit: true,
+                                      b270_pending: "Saving reading…",
+                                      b270_success: (part_done ? "Reading marked unread." : "Reading marked read."),
+                                      b270_failure: "Couldn’t update that reading. Try again." } },
                       aria: { label: (part_done ? "Mark #{part_ref} unread" : "Mark #{part_ref} read") } do %>
                   <span class="b270-check"><svg viewBox="0 0 24 24"><polyline points="20 6 9 17 4 12"/></svg></span>
                 <% end %>
@@ -41,7 +45,11 @@
     <% else %>
       <% if signed_in? %>
         <%= button_to toggle_checkoff_part_path(day, track, 0), class: "b270-toggle",
-              form: { data: { turbo_stream: true } },
+              params: { checked: done ? "0" : "1" },
+              form: { data: { turbo_stream: true, b270_submit: true,
+                              b270_pending: "Saving reading…",
+                              b270_success: (done ? "Reading marked unread." : "Reading marked read."),
+                              b270_failure: "Couldn’t update that reading. Try again." } },
               aria: { label: (done ? "Mark #{t[:label]} unread" : "Mark #{t[:label]} read") } do %>
           <span class="b270-check"><svg viewBox="0 0 24 24"><polyline points="20 6 9 17 4 12"/></svg></span>
         <% end %>