Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/karaokium/events.ex
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ defmodule Karaokium.Events do
karaoke
|> Karaoke.reset_pin_changeset()
|> Repo.update()
|> broadcast(:update)
|> broadcast(:updated)
end

@doc """
Expand Down
2 changes: 1 addition & 1 deletion lib/karaokium_web/live/admin/performance_live/show.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions lib/karaokium_web/live/admin/performance_live/show.html.heex
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
</div>

<div class="text-center">
<%= if @performance.id == @performancelive do %>
<% else %>
<%= unless @performance.id == @karaoke_performance_id do %>
<span>
<%= live_patch("Edit",
to: Routes.admin_performance_edit_path(@socket, :edit, @karaoke_id, @performance.id),
Expand Down
104 changes: 84 additions & 20 deletions lib/karaokium_web/templates/layout/_header.html.heex
Original file line number Diff line number Diff line change
@@ -1,27 +1,91 @@
<header>
<nav>
<%= live_patch to: Routes.page_path(@conn, :index) do %>
<img
alt="Phoenix Framework Logo"
src={Routes.static_path(@conn, "/karaokium/images/logos/cesium-DARK.svg")}
height="50"
style="margin: 0;"
/>
<%= if @current_user do %>
<div>
<button class="text-center" style="padding: 1px 5px;" onclick="clickedbutton();">
<svg
xmlns="http://www.w3.org/2000/svg"
class="h-6 w-6"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
stroke-width="2"
>
<path stroke-linecap="round" stroke-linejoin="round" d="M4 6h16M4 12h16M4 18h16" />
</svg>
</button>
<script>
var isClicked = false
function pixeis(){
var result = false
if(window.innerWidth < 700)
result = true
return result
}
function scene1()
{
document.getElementById("menu").className = "text-center"
document.getElementById("content").className = "hidden"
}
function scene2()
{
document.getElementById("menu").className = "text-center"
document.getElementById("content").className = "container"
}
function clickedbutton() {
isClicked = !isClicked
if(isClicked){
if(pixeis())
scene1();
else
scene2();
}
else{
document.getElementById("menu").className = "hidden"
document.getElementById("menu2").className = "hidden"
document.getElementById("content").className = "container"
}
}
function resized()
{
if(isClicked)
if(pixeis())
scene1()
else
scene2()
}
window.onresize = resized;
</script>
</div>
<% end %>
<ul>
<%= for entry <- menu(@conn) do %>
<li>
<a href={entry.url}><%= entry.title %></a>
<%= unless Enum.empty?(entry.submenu) do %>
<ul>
<%= for subentry <- entry.submenu do %>
<li><a href={subentry.url}><%= subentry.title %></a></li>
<% end %>
</ul>
<% end %>
</li>
<div class="text-center">
<%= live_patch to: Routes.page_path(@conn, :index) do %>
<img
alt="Phoenix Framework Logo"
src={Routes.static_path(@conn, "/karaokium/images/logos/cesium-DARK.svg")}
height="45"
style="margin: 0;"
/>
<% end %>
</ul>
</div>
<%= render("_user_menu.html", assigns) %>
</nav>
</header>

<div id="menu" class="hidden">
<ul class="px-0">
<%= for entry <- menu(@conn) do %>
<li class="list-none">
<%= unless Enum.empty?(entry.submenu) do %>
<ul class="px-0">
<%= for subentry <- entry.submenu do %>
<li class="list-none"><a href={subentry.url}><%= subentry.title %></a></li>
<% end %>
</ul>
<% else %>
<a href={entry.url}><%= entry.title %></a>
<% end %>
</li>
<% end %>
</ul>
</div>
2 changes: 1 addition & 1 deletion lib/karaokium_web/templates/layout/app.html.heex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<main class="container">
<main class="container" id="content">
<%= if get_flash(@conn, :info) do %>
<p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion lib/karaokium_web/templates/layout/live.html.heex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<main class="container">
<main class="container" id="content">
<%= if live_flash(@flash, :info) do %>
<p class="alert alert-info" role="alert" phx-click="lv:clear-flash" phx-value-key="info">
<%= live_flash(@flash, :info) %>
Expand Down