From dfc602a94c8b5738d831c24999494ab46f3f1e94 Mon Sep 17 00:00:00 2001 From: JoseBambora Date: Mon, 18 Jul 2022 20:45:45 +0100 Subject: [PATCH 1/7] Made the navbar responsive down to 350px --- lib/karaokium/events.ex | 2 +- .../live/admin/performance_live/show.ex | 2 +- .../admin/performance_live/show.html.heex | 3 +- .../templates/layout/_header.html.heex | 53 ++++++++++++++----- lib/karaokium_web/views/layout_view.ex | 35 +++++++----- 5 files changed, 64 insertions(+), 31 deletions(-) diff --git a/lib/karaokium/events.ex b/lib/karaokium/events.ex index 2c45eef..9673378 100644 --- a/lib/karaokium/events.ex +++ b/lib/karaokium/events.ex @@ -164,7 +164,7 @@ defmodule Karaokium.Events do karaoke |> Karaoke.reset_pin_changeset() |> Repo.update() - |> broadcast(:update) + |> broadcast(:updated) end @doc """ diff --git a/lib/karaokium_web/live/admin/performance_live/show.ex b/lib/karaokium_web/live/admin/performance_live/show.ex index 9be1ab0..f108fac 100644 --- a/lib/karaokium_web/live/admin/performance_live/show.ex +++ b/lib/karaokium_web/live/admin/performance_live/show.ex @@ -17,7 +17,7 @@ defmodule KaraokiumWeb.Admin.PerformanceLive.Show do |> assign(:page_title, page_title(socket.assigns.live_action)) |> assign(:karaoke_id, karaoke_id) |> assign(:id, id) - |> assign(:performancelive, Events.get_karaoke!(karaoke_id).performing_id) + |> assign(:karaoke_performance_id, Events.get_karaoke!(karaoke_id).performing_id) |> reload()} end diff --git a/lib/karaokium_web/live/admin/performance_live/show.html.heex b/lib/karaokium_web/live/admin/performance_live/show.html.heex index 9f806cc..63c2776 100644 --- a/lib/karaokium_web/live/admin/performance_live/show.html.heex +++ b/lib/karaokium_web/live/admin/performance_live/show.html.heex @@ -45,8 +45,7 @@
- <%= if @performance.id == @performancelive do %> - <% else %> + <%= unless @performance.id == @karaoke_performance_id do %> <%= live_patch("Edit", to: Routes.admin_performance_edit_path(@socket, :edit, @karaoke_id, @performance.id), diff --git a/lib/karaokium_web/templates/layout/_header.html.heex b/lib/karaokium_web/templates/layout/_header.html.heex index c4c48f2..0b4a560 100644 --- a/lib/karaokium_web/templates/layout/_header.html.heex +++ b/lib/karaokium_web/templates/layout/_header.html.heex @@ -4,24 +4,51 @@ Phoenix Framework Logo <% end %> -
    - <%= for entry <- menu(@conn) do %> -
  • - <%= entry.title %> - <%= unless Enum.empty?(entry.submenu) do %> -
      - <%= for subentry <- entry.submenu do %> -
    • <%= subentry.title %>
      • +
      +
      + +
      +
    +
+
+ + <%= render("_user_menu.html", assigns) %> diff --git a/lib/karaokium_web/views/layout_view.ex b/lib/karaokium_web/views/layout_view.ex index f9dce61..2d8ace8 100644 --- a/lib/karaokium_web/views/layout_view.ex +++ b/lib/karaokium_web/views/layout_view.ex @@ -7,13 +7,13 @@ defmodule KaraokiumWeb.LayoutView do def menu(conn) when is_logged_in(conn) do base_menu(conn) ++ - Enum.reduce(Enum.sort(conn.assigns.current_user.permissions), [], fn role, acc -> + Enum.reduce(Enum.sort(conn.assigns.current_user.permissions), [], fn role, _ -> case role do :admin -> - acc ++ admin_menu(conn) + admin_menu(conn) :sysadmin -> - acc ++ sysadmin_menu(conn) + sysadmin_menu(conn) end end) end @@ -29,22 +29,16 @@ defmodule KaraokiumWeb.LayoutView do defp admin_menu(conn) do [ %{ - title: "Events", + title: "Options", url: "#", submenu: [ %{title: "Karaokes", url: Routes.admin_karaoke_index_path(conn, :index)}, - %{title: "Locations", url: Routes.admin_location_index_path(conn, :index)} - ] - }, - %{title: "Teams", url: Routes.admin_team_index_path(conn, :index), submenu: []}, - %{ - title: "Repertoire", - url: "#", - submenu: [ + %{title: "Locations", url: Routes.admin_location_index_path(conn, :index)}, %{title: "Search Songs", url: Routes.admin_song_search_path(conn, :new)}, %{title: "Songs", url: Routes.admin_song_index_path(conn, :index)}, %{title: "Artists", url: Routes.admin_artist_index_path(conn, :index)}, - %{title: "Albums", url: Routes.admin_album_index_path(conn, :index)} + %{title: "Albums", url: Routes.admin_album_index_path(conn, :index)}, + %{title: "Teams", url: Routes.admin_team_index_path(conn, :index)} ] } ] @@ -52,7 +46,20 @@ defmodule KaraokiumWeb.LayoutView do defp sysadmin_menu(conn) do [ - %{title: "LiveDashboard", url: Routes.live_dashboard_path(conn, :home), submenu: []} + %{ + title: "Options", + url: "#", + submenu: [ + %{title: "Karaokes", url: Routes.admin_karaoke_index_path(conn, :index)}, + %{title: "Locations", url: Routes.admin_location_index_path(conn, :index)}, + %{title: "Search Songs", url: Routes.admin_song_search_path(conn, :new)}, + %{title: "Songs", url: Routes.admin_song_index_path(conn, :index)}, + %{title: "Artists", url: Routes.admin_artist_index_path(conn, :index)}, + %{title: "Albums", url: Routes.admin_album_index_path(conn, :index)}, + %{title: "Teams", url: Routes.admin_team_index_path(conn, :index)}, + %{title: "LiveDashboard", url: Routes.live_dashboard_path(conn, :home), submenu: []} + ] + } ] end From 8d085d5cceadab7d5758465d2ba21f2f8bb00389 Mon Sep 17 00:00:00 2001 From: JoseBambora Date: Tue, 19 Jul 2022 16:25:26 +0100 Subject: [PATCH 2/7] Updated the header layout. --- .../templates/layout/_header.html.heex | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/lib/karaokium_web/templates/layout/_header.html.heex b/lib/karaokium_web/templates/layout/_header.html.heex index 0b4a560..fa01129 100644 --- a/lib/karaokium_web/templates/layout/_header.html.heex +++ b/lib/karaokium_web/templates/layout/_header.html.heex @@ -9,41 +9,34 @@ /> <% end %>
-
- -
- + <% end %> +
+
+ <%= live_patch to: Routes.page_path(@conn, :index) do %> + Phoenix Framework Logo + <% end %> +
<%= render("_user_menu.html", assigns) %> + + + + diff --git a/lib/karaokium_web/templates/layout/app.html.heex b/lib/karaokium_web/templates/layout/app.html.heex index 4371f2f..4147053 100644 --- a/lib/karaokium_web/templates/layout/app.html.heex +++ b/lib/karaokium_web/templates/layout/app.html.heex @@ -1,4 +1,4 @@ -
+
<%= if get_flash(@conn, :info) do %> <% end %> diff --git a/lib/karaokium_web/templates/layout/live.html.heex b/lib/karaokium_web/templates/layout/live.html.heex index a4f1f04..bd4cddd 100644 --- a/lib/karaokium_web/templates/layout/live.html.heex +++ b/lib/karaokium_web/templates/layout/live.html.heex @@ -1,4 +1,4 @@ -
+
<%= if live_flash(@flash, :info) do %>
- - diff --git a/lib/karaokium_web/views/layout_view.ex b/lib/karaokium_web/views/layout_view.ex index 2d8ace8..f9dce61 100644 --- a/lib/karaokium_web/views/layout_view.ex +++ b/lib/karaokium_web/views/layout_view.ex @@ -7,13 +7,13 @@ defmodule KaraokiumWeb.LayoutView do def menu(conn) when is_logged_in(conn) do base_menu(conn) ++ - Enum.reduce(Enum.sort(conn.assigns.current_user.permissions), [], fn role, _ -> + Enum.reduce(Enum.sort(conn.assigns.current_user.permissions), [], fn role, acc -> case role do :admin -> - admin_menu(conn) + acc ++ admin_menu(conn) :sysadmin -> - sysadmin_menu(conn) + acc ++ sysadmin_menu(conn) end end) end @@ -29,16 +29,22 @@ defmodule KaraokiumWeb.LayoutView do defp admin_menu(conn) do [ %{ - title: "Options", + title: "Events", url: "#", submenu: [ %{title: "Karaokes", url: Routes.admin_karaoke_index_path(conn, :index)}, - %{title: "Locations", url: Routes.admin_location_index_path(conn, :index)}, + %{title: "Locations", url: Routes.admin_location_index_path(conn, :index)} + ] + }, + %{title: "Teams", url: Routes.admin_team_index_path(conn, :index), submenu: []}, + %{ + title: "Repertoire", + url: "#", + submenu: [ %{title: "Search Songs", url: Routes.admin_song_search_path(conn, :new)}, %{title: "Songs", url: Routes.admin_song_index_path(conn, :index)}, %{title: "Artists", url: Routes.admin_artist_index_path(conn, :index)}, - %{title: "Albums", url: Routes.admin_album_index_path(conn, :index)}, - %{title: "Teams", url: Routes.admin_team_index_path(conn, :index)} + %{title: "Albums", url: Routes.admin_album_index_path(conn, :index)} ] } ] @@ -46,20 +52,7 @@ defmodule KaraokiumWeb.LayoutView do defp sysadmin_menu(conn) do [ - %{ - title: "Options", - url: "#", - submenu: [ - %{title: "Karaokes", url: Routes.admin_karaoke_index_path(conn, :index)}, - %{title: "Locations", url: Routes.admin_location_index_path(conn, :index)}, - %{title: "Search Songs", url: Routes.admin_song_search_path(conn, :new)}, - %{title: "Songs", url: Routes.admin_song_index_path(conn, :index)}, - %{title: "Artists", url: Routes.admin_artist_index_path(conn, :index)}, - %{title: "Albums", url: Routes.admin_album_index_path(conn, :index)}, - %{title: "Teams", url: Routes.admin_team_index_path(conn, :index)}, - %{title: "LiveDashboard", url: Routes.live_dashboard_path(conn, :home), submenu: []} - ] - } + %{title: "LiveDashboard", url: Routes.live_dashboard_path(conn, :home), submenu: []} ] end