Changes stomped because of a wreckless force push (#78)

* Changes stomped because of a wreckless force push

* Fix HTML ent Admin Show

app/views/admin/events/show.html.erb

@@ -6,5 +6,5 @@
 <%= render partial: "layouts/event_layout" %>
 
 <% content_for :page_title do %>
- <%= @event.name %>
+  <%== @event.name %>
 <% end %>

app/views/events/_event.html.erb

@@ -9,30 +9,16 @@
       <div class="flex flex-col gap-3">
         <p class="mb-2"><%= event.start_time %></p>
         <%= event.location %>
-        <p>Food and drinks provided by our sponsor.</p>
       </div>
     </div>
 
     <div class="w-full md:w-1/2 my-8 pl-1">
       <h2 class="mb-2">Agenda</h2>
-
-      <p class="mb-0"><em>6pm</em></p>
-      <p class="ml-4">
-        Arrive, chat, and get pizza
-      </p>
-
-      <p class="mb-0"><em>7pm</em></p>
       <div class="ml-4">
         <div class="w-4/5 mt-2">
           <%= event.description %>
         </div>
       </div>
-
-      <p class="mb-0"><em>remainder of time until 9pm</em></p>
-      <p class="ml-4">
-        Networking and drinks
-      </p>
-
     </div>
   </div>
   <div class="mx-auto text-center">

app/views/events/index.html.erb

@@ -1,9 +1,3 @@
-<%= content_for :event_content do %>
-  <%= render partial: "event2", collection: @events %>
-
-  <h2 class="hidden only:block">We're planning our next outing, stay tuned!</h2>
-<% end %>
-
 <% content_for :page_title do %>
   Home
 <% end %>
@@ -14,4 +8,10 @@
   looking forward to seeing you!
 <% end %>
 
+<%= content_for :event_content do %>
+  <%= render partial: "event", collection: @events %>
+
+  <h2 class="hidden only:block">We're planning our next outing, stay tuned!</h2>
+<% end %>
+
 <%= render partial: "layouts/event_layout" %>

app/views/events/show.html.erb

@@ -1,9 +1,9 @@
 <% content_for :page_title do %>
-  <%= @event.name %>
+  <%== @event.name %>
 <% end %>
 
 <%= content_for :event_content do %>
-  <%= render partial: "events/event2", locals: { event2: @event } %>
+  <%= render partial: "events/event", locals: { event: @event } %>
 <% end %>
 
 <%= render partial: "layouts/event_layout" %>

config/routes.rb

@@ -1,13 +1,6 @@
 Rails.application.routes.draw do
-  resources :events, only: %i[index show], param: :slug do
-    collection do
-      get 'past', to: 'events#past'
-      get 'all', to: 'events#all', as: :all
-      get 'next', to: 'events#next'
-    end
-  end
-
   namespace :admin do
+    root to: redirect('/admin/events')
     resources :events
   end
 
@@ -27,4 +20,12 @@
   get 'about', to: 'static#about'
   get 'calendar', to: 'static#calendar'
   get 'code-of-conduct', to: 'static#coc'
+
+  resources :events, only: %i[index show], param: :slug do
+    collection do
+      get 'past', to: 'events#past'
+      get 'all', to: 'events#all', as: :all
+      get 'next', to: 'events#next'
+    end
+  end
 end