fix: add more page titles

lib/haj_web/live/applications_live/index.ex

@@ -29,7 +29,7 @@ defmodule HajWeb.ApplicationsLive.Index do
 
     {:ok,
      socket
-     |> assign(:title, "Ansökningar #{current_spex.year.year}")
+     |> assign(:page_title, "Ansökningar")
      |> assign(:show, current_spex)
      |> assign(:applications, applications)
      |> assign(:stats, stats)

lib/haj_web/live/applications_live/show.ex

@@ -16,6 +16,13 @@ defmodule HajWeb.ApplicationsLive.Show do
     {:ok, assign(socket, application: application, show: show)}
   end
 
+  def handle_params(params, _url, socket) do
+    {:noreply, apply_action(socket, socket.assigns.live_action, params)}
+  end
+
+  defp apply_action(socket, :show, _params), do: assign(socket, :page_title, "Ansökan")
+  defp apply_action(socket, :approve, _params), do: assign(socket, :page_title, "Antag")
+
   attr :large, :boolean, default: false
   attr :name, :string
   slot :inner_block

lib/haj_web/live/applications_live/show.html.heex

@@ -71,7 +71,7 @@
 </div>
 
 <.modal
-  :if={@live_action in [:confirm]}
+  :if={@live_action in [:approve]}
   id="app-confirm-modal"
   show
   on_cancel={JS.navigate(~p"/applications/#{@application}")}

lib/haj_web/live/responsibility_live/history.ex

@@ -13,7 +13,12 @@ defmodule HajWeb.ResponsibilityLive.History do
     {current, prev} =
       Enum.split_with(responsibilities, fn %{show_id: id} -> id == current_show.id end)
 
-    {:ok, assign(socket, current_responsibilities: current, prev_responsibilities: prev)}
+    {:ok,
+     assign(socket,
+       page_title: "Dina ansvar",
+       current_responsibilities: current,
+       prev_responsibilities: prev
+     )}
   end
 
   attr :navigate, :any, required: true

lib/haj_web/live/responsibility_live/index.ex

@@ -18,19 +18,19 @@ defmodule HajWeb.ResponsibilityLive.Index do
 
   defp apply_action(socket, :edit, %{"id" => id}) do
     socket
-    |> assign(:page_title, "Edit Responsibility")
+    |> assign(:page_title, "Redigera ansvar")
     |> assign(:responsibility, Responsibilities.get_responsibility!(id))
   end
 
   defp apply_action(socket, :new, _params) do
     socket
-    |> assign(:page_title, "New Responsibility")
+    |> assign(:page_title, "Nytt ansvar")
     |> assign(:responsibility, %Responsibility{})
   end
 
   defp apply_action(socket, :index, _params) do
     socket
-    |> assign(:page_title, "Listing Responsibilities")
+    |> assign(:page_title, "Ansvar")
     |> assign(:responsibility, nil)
   end
 

lib/haj_web/live/responsibility_live/show.ex

@@ -16,16 +16,16 @@ defmodule HajWeb.ResponsibilityLive.Show do
   def handle_params(%{"id" => id} = params, _, socket) do
     responsibility = Responsibilities.get_responsibility!(id)
 
-    socket =
-      socket
-      |> assign(:responsibility, responsibility)
-
-    {:noreply, socket |> apply_action(socket.assigns.live_action, params)}
+    {:noreply,
+     socket
+     |> assign(:responsibility, responsibility)
+     |> apply_action(socket.assigns.live_action, params)}
   end
 
   defp apply_action(socket, :show, %{"id" => _id}) do
-    socket
-    |> assign(page_title: "Ansvar")
+    %{responsibility: responsibility} = socket.assigns
+
+    assign(socket, page_title: responsibility.name)
   end
 
   defp apply_action(socket, :edit, %{"id" => _id}) do
@@ -85,7 +85,7 @@ defmodule HajWeb.ResponsibilityLive.Show do
     authorized = Policy.authorize?(:responsibility_comment_create, user, responsibility)
 
     socket
-    |> assign(page_title: "Testamenten")
+    |> assign(page_title: "#{responsibility.name} · Testamenten")
     |> assign(show: show)
     |> assign(comments: Responsibilities.get_comments_for_show(responsibility, show.id))
     |> assign(authorized: authorized)
@@ -97,8 +97,10 @@ defmodule HajWeb.ResponsibilityLive.Show do
   end
 
   defp apply_action(socket, :history, _params) do
+    %{responsibility: responsibility} = socket.assigns
+
     socket
-    |> assign(page_title: "Historik")
+    |> assign(page_title: "#{responsibility.name} · Historik")
     |> assign(
       :responsible_users,
       Responsibilities.get_users_for_responsibility_grouped(socket.assigns.responsibility.id)

lib/haj_web/live/song_live/index.ex

@@ -14,7 +14,8 @@ defmodule HajWeb.SongLive.Index do
         [key: "#{year.year}: #{title}", value: id]
       end)
 
-    {:ok, assign(socket, songs: songs, show: show, show_options: show_options)}
+    {:ok,
+     assign(socket, page_title: "Sånger", songs: songs, show: show, show_options: show_options)}
   end
 
   def handle_event("select_show", %{"show" => show_id}, socket) do

lib/haj_web/live/song_live/show.ex

@@ -15,7 +15,14 @@ defmodule HajWeb.SongLive.Show do
 
     lyrics = parse_lyrics(song.text)
 
-    {:noreply, assign(socket, song: song, lyrics: lyrics, player: false, loaded: false)}
+    {:noreply,
+     assign(socket,
+       page_title: song.name,
+       song: song,
+       lyrics: lyrics,
+       player: false,
+       loaded: false
+     )}
   end
 
   def handle_event("play_pause", _params, socket) do

lib/haj_web/router.ex

@@ -90,7 +90,7 @@ defmodule HajWeb.Router do
       ## Applications
       live "/applications", ApplicationsLive.Index, :index
       live "/applications/:id", ApplicationsLive.Show, :show
-      live "/applications/:id/confirm", ApplicationsLive.Show, :confirm
+      live "/applications/:id/confirm", ApplicationsLive.Show, :approve
 
       ## Songs
       live "/songs", SongLive.Index, :index