Performers index and detailed info page.

lib/runosaari_web/controllers/performer_controller.ex

@@ -71,7 +71,7 @@ defmodule RunosaariWeb.PerformerController do
       {:ok, performer} ->
         conn
         |> put_flash(:info, "Esiintyjän tiedot päivitetty.")
-        |> redirect(to: Routes.admin_performer_path(conn, :show, performer))
+        |> redirect(to: Routes.performer_path(conn, :show, performer))
 
       {:error, %Ecto.Changeset{} = changeset} ->
         render(conn, "edit.html", performer: performer, changeset: changeset)

lib/runosaari_web/router.ex

@@ -20,7 +20,7 @@ defmodule RunosaariWeb.Router do
     get "/info", PageController, :info
     get "/covid19", PageController, :covid19
     get "/privacy", PageController, :privacy
-    resources "/performers", PerformerController, only: [:index]
+    resources "/performers", PerformerController, only: [:index, :show]
     resources "/performances", PerformanceController, only: [:index]
     resources "/visitors", VisitorController, only: [:new, :create]
     get "/confirmation", VisitorController, :confirmation
@@ -33,7 +33,7 @@ defmodule RunosaariWeb.Router do
     resources "/index", IndexController, except: [:index]
     get "/performers", PerformerController, :admin
     get "/performances", PerformanceController, :admin
-    resources "/performers", PerformerController, except: [:index]
+    resources "/performers", PerformerController, except: [:index, :show]
     resources "/performances", PerformanceController, except: [:index]
     resources "/visitors", VisitorController, except: [:new, :create]
   end

lib/runosaari_web/templates/performer/admin.html.eex

@@ -17,7 +17,7 @@
           <td><%= performer.seqnum %></td>
 
           <td class="actions">
-            <span><%= link "Lisätietoja", to: Routes.admin_performer_path(@conn, :show, performer) %></span>
+            <span><%= link "Esiintyjäsivu", to: Routes.performer_path(@conn, :show, performer) %></span>
             <span><%= link "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, performer) %></span>
             <span><%= link "Poista", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Haluatko poistaa esiintyjän #{performer.name}?"] %></span>
           </td>

lib/runosaari_web/templates/performer/index.html.eex

@@ -4,8 +4,9 @@
   <%= if length(@performers) == 0 do %>
     <i>Lisätietoja tulossa myöhemmin!</i>
   <% end %>
-  <%= for performer <- @performers do %>
-    <h2><%= performer.name %></h2>
-    <p><%= performer.desc %></p>
-  <% end %>
+  <div class="performers-container">
+    <%= for performer <- @performers do %>
+      <%= link "#{performer.name}", to: Routes.performer_path(@conn, :show, performer), class: "performer-name" %>
+    <% end %>
+  </div>
 </section>

lib/runosaari_web/templates/performer/show.html.eex

@@ -1,30 +1,5 @@
 <section class="main">
-  <h1>Esiintyjän tiedot</h1>
-
-  <ul>
-
-    <li>
-      <strong>Nimi:</strong>
-      <%= @performer.name %>
-    </li>
-
-    <li>
-      <strong>Seloste:</strong>
-      <%= @performer.desc %>
-    </li>
-
-    <li>
-      <strong>Vahvistettu:</strong>
-      <%= @performer.confirmed %>
-    </li>
-
-    <li>
-      <strong>Prioriteetti:</strong>
-      <%= @performer.seqnum %>
-    </li>
-
-  </ul>
-
-  <span><%= link "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, @performer) %></span>
-  <span><%= link "Takaisin", to: Routes.admin_performer_path(@conn, :admin) %></span>
+  <h1><%= @performer.name %></h1>
+  <p><%= @performer.desc %></p>
+  <img src="<%= @performer.photo_path %>" alt="Esiintyjän kuva" class="performer-img" />
 </section>