Skip to content

Commit 210a782

Browse files
committed
Made the navbar responsive down to 350px
1 parent 2a9496f commit 210a782

File tree

5 files changed

+64
-31
lines changed

5 files changed

+64
-31
lines changed

lib/karaokium/events.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ defmodule Karaokium.Events do
164164
karaoke
165165
|> Karaoke.reset_pin_changeset()
166166
|> Repo.update()
167-
|> broadcast(:update)
167+
|> broadcast(:updated)
168168
end
169169

170170
@doc """

lib/karaokium_web/live/admin/performance_live/show.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ defmodule KaraokiumWeb.Admin.PerformanceLive.Show do
1717
|> assign(:page_title, page_title(socket.assigns.live_action))
1818
|> assign(:karaoke_id, karaoke_id)
1919
|> assign(:id, id)
20-
|> assign(:performancelive, Events.get_karaoke!(karaoke_id).performing_id)
20+
|> assign(:karaoke_performance_id, Events.get_karaoke!(karaoke_id).performing_id)
2121
|> reload()}
2222
end
2323

lib/karaokium_web/live/admin/performance_live/show.html.heex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
</div>
4646

4747
<div class="text-center">
48-
<%= if @performance.id == @performancelive do %>
49-
<% else %>
48+
<%= unless @performance.id == @karaoke_performance_id do %>
5049
<span>
5150
<%= live_patch("Edit",
5251
to: Routes.admin_performance_edit_path(@socket, :edit, @karaoke_id, @performance.id),

lib/karaokium_web/templates/layout/_header.html.heex

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,51 @@
44
<img
55
alt="Phoenix Framework Logo"
66
src={Routes.static_path(@conn, "/karaokium/images/logos/cesium-DARK.svg")}
7-
height="50"
7+
height="45"
88
style="margin: 0;"
99
/>
1010
<% end %>
11-
<ul>
12-
<%= for entry <- menu(@conn) do %>
13-
<li>
14-
<a href={entry.url}><%= entry.title %></a>
15-
<%= unless Enum.empty?(entry.submenu) do %>
16-
<ul>
17-
<%= for subentry <- entry.submenu do %>
18-
<li><a href={subentry.url}><%= subentry.title %></a></li>
11+
<div>
12+
<div id="goToDiv">
13+
<button style="min-width: 50px; padding: 5px 10px;" onclick="clickedbutton();">
14+
Go To
15+
</button>
16+
</div>
17+
<div id="menu" class="hidden block">
18+
<ul>
19+
<%= for entry <- menu(@conn) do %>
20+
<li>
21+
<button style="min-width: 50px; padding: 5px 10px;" onclick="clickedbutton();">
22+
Go To
23+
</button>
24+
<%= unless Enum.empty?(entry.submenu) do %>
25+
<ul class="block">
26+
<%= for subentry <- entry.submenu do %>
27+
<li>
28+
<a href={subentry.url}><%= subentry.title %></a>
29+
</li>
30+
<% end %>
31+
</ul>
1932
<% end %>
20-
</ul>
33+
</li>
2134
<% end %>
22-
</li>
23-
<% end %>
24-
</ul>
35+
</ul>
36+
</div>
37+
<script>
38+
var isClicked = false
39+
function clickedbutton() {
40+
isClicked = !isClicked
41+
if(isClicked){
42+
document.getElementById("goToDiv").className = "hidden"
43+
document.getElementById("menu").className = ""
44+
}
45+
else{
46+
document.getElementById("goToDiv").className = ""
47+
document.getElementById("menu").className = "hidden"
48+
}
49+
}
50+
</script>
51+
</div>
2552
<%= render("_user_menu.html", assigns) %>
2653
</nav>
2754
</header>

lib/karaokium_web/views/layout_view.ex

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ defmodule KaraokiumWeb.LayoutView do
77

88
def menu(conn) when is_logged_in(conn) do
99
base_menu(conn) ++
10-
Enum.reduce(Enum.sort(conn.assigns.current_user.permissions), [], fn role, acc ->
10+
Enum.reduce(Enum.sort(conn.assigns.current_user.permissions), [], fn role, _ ->
1111
case role do
1212
:admin ->
13-
acc ++ admin_menu(conn)
13+
admin_menu(conn)
1414

1515
:sysadmin ->
16-
acc ++ sysadmin_menu(conn)
16+
sysadmin_menu(conn)
1717
end
1818
end)
1919
end
@@ -29,30 +29,37 @@ defmodule KaraokiumWeb.LayoutView do
2929
defp admin_menu(conn) do
3030
[
3131
%{
32-
title: "Events",
32+
title: "Options",
3333
url: "#",
3434
submenu: [
3535
%{title: "Karaokes", url: Routes.admin_karaoke_index_path(conn, :index)},
36-
%{title: "Locations", url: Routes.admin_location_index_path(conn, :index)}
37-
]
38-
},
39-
%{title: "Teams", url: Routes.admin_team_index_path(conn, :index), submenu: []},
40-
%{
41-
title: "Repertoire",
42-
url: "#",
43-
submenu: [
36+
%{title: "Locations", url: Routes.admin_location_index_path(conn, :index)},
4437
%{title: "Search Songs", url: Routes.admin_song_search_path(conn, :new)},
4538
%{title: "Songs", url: Routes.admin_song_index_path(conn, :index)},
4639
%{title: "Artists", url: Routes.admin_artist_index_path(conn, :index)},
47-
%{title: "Albums", url: Routes.admin_album_index_path(conn, :index)}
40+
%{title: "Albums", url: Routes.admin_album_index_path(conn, :index)},
41+
%{title: "Teams", url: Routes.admin_team_index_path(conn, :index)}
4842
]
4943
}
5044
]
5145
end
5246

5347
defp sysadmin_menu(conn) do
5448
[
55-
%{title: "LiveDashboard", url: Routes.live_dashboard_path(conn, :home), submenu: []}
49+
%{
50+
title: "Options",
51+
url: "#",
52+
submenu: [
53+
%{title: "Karaokes", url: Routes.admin_karaoke_index_path(conn, :index)},
54+
%{title: "Locations", url: Routes.admin_location_index_path(conn, :index)},
55+
%{title: "Search Songs", url: Routes.admin_song_search_path(conn, :new)},
56+
%{title: "Songs", url: Routes.admin_song_index_path(conn, :index)},
57+
%{title: "Artists", url: Routes.admin_artist_index_path(conn, :index)},
58+
%{title: "Albums", url: Routes.admin_album_index_path(conn, :index)},
59+
%{title: "Teams", url: Routes.admin_team_index_path(conn, :index)},
60+
%{title: "LiveDashboard", url: Routes.live_dashboard_path(conn, :home), submenu: []}
61+
]
62+
}
5663
]
5764
end
5865

0 commit comments

Comments
 (0)