Skip to content

Commit

Permalink
Move some stuff around, add Admin event show view (#54)
Browse files Browse the repository at this point in the history
* Move some stuff around, add Admin event show view
* Add test for show view render
  • Loading branch information
crespire authored Oct 8, 2024
1 parent 4b11c61 commit 0a1ab15
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 8 deletions.
7 changes: 6 additions & 1 deletion app/views/admin/events/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
<% @events.each do |event| %>
<li class="flex gap-2 justify-between mb-2 w-72">
<span class="flex-grow">
<%= event.name %>
<%= link_to event.name, admin_event_path(event) %>
</span>
<%= link_to "Edit", edit_admin_event_path(event), class: "text-underline" %>
<%= button_to "Delete", admin_event_path(event), method: :delete, class: "rounded bg-red-600 px-2 py-1 text-xs font-semibold text-white shadow-sm hover:bg-red-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-600", data: {turbo_confirm: "Are you sure?"} %>
</li>
<% end %>
</ul>
</div>

<% content_for :page_title do %>
Admin Home
<% end %>

6 changes: 6 additions & 0 deletions app/views/admin/events/show.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<%= content_for :event_content do %>
<%= link_to "Edit this event", edit_admin_event_path(@event) %>
<%= render partial: "events/event", locals: { event: @event } %>
<% end %>

<%= render partial: "layouts/event_layout" %>
2 changes: 1 addition & 1 deletion app/views/events/_event.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<h3>Sponsor</h3>
<div class="flex justify-center items-center">
<%= link_to event.sponsor_link do %>
<% if event.sponsor_logo %>
<% if event.sponsor_logo.present? %>
<%= image_tag "sponsors/#{event.sponsor_logo}", class: 'max-h-20' %>
<% else %>
<%= event.sponsor.titleize %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/events/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Home
Toronto Ruby is about building a community for Ruby users in the GTA and providing a positive space for everyone to connect, learn and grow. We're looking forward to seeing you!
<% end %>

<%= render partial: "events/layout" %>
<%= render partial: "layouts/event_layout" %>
9 changes: 7 additions & 2 deletions app/views/events/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<% content_for :page_title do %>
<%= @event.name %>
<% end %>


<%= content_for :event_content do %>
<%= render partial: "event", locals: { event: @event } %>
<%= render partial: "events/event", locals: { event: @event } %>
<% end %>

<%= render partial: "events/layout" %>
<%= render partial: "layouts/event_layout" %>
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<%= yield(:event_content) %>
</div>
<div class="mx-auto w-4/5 md:w-2/3">
<%= render 'newsletter_form' %>
<%= render 'layouts/newsletter_form' %>
</div>
<%= render 'supporting_companies' %>
<%= render 'layouts/supporting_companies' %>
</div>
</main>
File renamed without changes.
15 changes: 14 additions & 1 deletion test/controllers/admin/events_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def setup
assert_response :success
end

test 'should show draft events' do
test 'index should show draft events' do
Event.update_all(status: :draft)

get admin_events_path,
Expand All @@ -47,6 +47,19 @@ def setup
assert response.body.include?(Event.last.name)
end

test 'should show a single event' do
get admin_event_path(Event.first.slug),
headers: {
Authorization:
ActionController::HttpAuthentication::Basic.encode_credentials(
'admin', 'admin'
)
}

assert_response :ok
assert response.body.include?(Event.first.name)
end

test 'should redirect to events page if event is not found' do
get admin_event_path('nonexistent-event'),
headers: {
Expand Down

0 comments on commit 0a1ab15

Please sign in to comment.