Add editable "No events found" message

Add a content block for the "nothing found" message that can be modified in the CMS.
HHS · Apr 8, 2022 · ae49584 · ae49584
1 parent 69883d0
commit ae49584
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 42 deletions.
diff --git a/_blocks/no-events-found/block.md b/_blocks/no-events-found/block.md
@@ -0,0 +1,6 @@
+---
+name: No events found
+---
+## No events found
+
+No events matched your criteria.
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -34,6 +34,12 @@ def index
     rescue Page::NotFound
       nil
     end
+
+    @not_found = begin
+      ContentBlock.find_by_path "no-events-found/block"
+    rescue ContentBlock::NotFound
+      nil
+    end
   end
 
   def show

diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
@@ -52,54 +52,60 @@
   </aside>
   <div class="grid-col-12 desktop:grid-col-8">
 
-    <ul class="usa-collection oite-events">
-      <% @events.each do |event| %>
-        <li class="usa-collection__item oite-event">
-          <div class="usa-collection__calendar-date">
-            <time datetime="<%= event.date %>">
-              <span class="usa-collection__calendar-date-month"><%= event.date.strftime("%b").upcase %></span>
-              <span class="usa-collection__calendar-date-day"><%= event.date.strftime("%d") %></span>
-            </time>
-          </div>
-          <div class="usa-collection__body">
-            <div class="usa-collection__heading">
-              <h3 class="margin-0">
-                <%= link_to event.title, event_path(event), class: "usa-link" %>
-              </h3>
-              <div class="oite-event__time text-italic">
-                <time datetime="<%= event.start.strftime("%F") %>"><%= event.start.strftime("%A, %B %-d, %Y %l:%M %p") %></time>
-                –
-                <time datetime="<%= event.end.strftime("%F") %>"><%= event.end.strftime("%l:%M %p") %></time>
-              </div>
+    <% if !@events.empty? %>
+      <ul class="usa-collection oite-events">
+        <% @events.each do |event| %>
+          <li class="usa-collection__item oite-event">
+            <div class="usa-collection__calendar-date">
+              <time datetime="<%= event.date %>">
+                <span class="usa-collection__calendar-date-month"><%= event.date.strftime("%b").upcase %></span>
+                <span class="usa-collection__calendar-date-day"><%= event.date.strftime("%d") %></span>
+              </time>
             </div>
-            <div class="usa-collection__description">
-              <% unless event.speaker_names.empty? %>
-                <div class="oite-event__speakers margin-y-1">
-                  <h4 class="margin-0">Speakers</h4>
-                  <ul class="usa-list">
-                    <% event.speaker_names.each do |speaker| %>
-                    <li>
-                      <%= speaker%>
-                    </li>
-                    <% end %>
-                  </ul>
+            <div class="usa-collection__body">
+              <div class="usa-collection__heading">
+                <h3 class="margin-0">
+                  <%= link_to event.title, event_path(event), class: "usa-link" %>
+                </h3>
+                <div class="oite-event__time text-italic">
+                  <time datetime="<%= event.start.strftime("%F") %>"><%= event.start.strftime("%A, %B %-d, %Y %l:%M %p") %></time>
+                  –
+                  <time datetime="<%= event.end.strftime("%F") %>"><%= event.end.strftime("%l:%M %p") %></time>
                 </div>
-              <% end %>
-              <div class="usa-prose p-summary">
-                <%= event.rendered_content%>
               </div>
-              <div class="oite-event__tags margin-y-1">
-                <% event.audience.each do |audience| %>
-                  <%= link_to audience, events_path(audience: [audience]), class: "usa-button usa-button--accent-cool text-bold text-uppercase font-ui-3xs margin-1" %>
-                <% end %>
-                <% event.topic.each do |topic| %>
-                  <%= link_to topic, events_path(topic: [topic]), class: "usa-button usa-button--accent-cool text-bold text-uppercase font-ui-3xs margin-1" %>
+              <div class="usa-collection__description">
+                <% unless event.speaker_names.empty? %>
+                  <div class="oite-event__speakers margin-y-1">
+                    <h4 class="margin-0">Speakers</h4>
+                    <ul class="usa-list">
+                      <% event.speaker_names.each do |speaker| %>
+                      <li>
+                        <%= speaker%>
+                      </li>
+                      <% end %>
+                    </ul>
+                  </div>
                 <% end %>
+                <div class="usa-prose p-summary">
+                  <%= event.rendered_content%>
+                </div>
+                <div class="oite-event__tags margin-y-1">
+                  <% event.audience.each do |audience| %>
+                    <%= link_to audience, events_path(audience: [audience]), class: "usa-button usa-button--accent-cool text-bold text-uppercase font-ui-3xs margin-1" %>
+                  <% end %>
+                  <% event.topic.each do |topic| %>
+                    <%= link_to topic, events_path(topic: [topic]), class: "usa-button usa-button--accent-cool text-bold text-uppercase font-ui-3xs margin-1" %>
+                  <% end %>
+                </div>
               </div>
             </div>
-          </div>
-        </li>
+          </li>
+        <% end %>
+      </ul>
+    <% else %>
+      <% if @not_found %>
+        <%= @not_found.rendered_content %>
       <% end %>
-    </ul>
+    <% end %>
   </div>
 </div>