Who's Here
diff --git a/lib/live_beats_web/live/live_helpers.ex b/lib/live_beats_web/live/live_helpers.ex
new file mode 100644
index 0000000..4b05c29
--- /dev/null
+++ b/lib/live_beats_web/live/live_helpers.ex
@@ -0,0 +1,187 @@
+defmodule LiveBeatsWeb.LiveHelpers do
+ import Phoenix.LiveView
+ import Phoenix.LiveView.Helpers
+ import Phoenix.HTML
+
+ alias Phoenix.LiveView.JS
+
+ def link_patch(assigns) do
+ ~H"""
+ <%= live_patch @text, [
+ to: @to,
+ class: "phx-modal-close"
+ ] ++ assigns_to_attributes(assigns, [:to, :text]) %>
+ """
+ end
+
+ def show_mobile_sidebar(js \\ %JS{}) do
+ js
+ |> JS.show(to: "#mobile-sidebar-container", transition: "fade-in")
+ |> JS.show(
+ to: "#mobile-sidebar",
+ display: "flex",
+ time: 300,
+ transition:
+ {"transition ease-in-out duration-300 transform", "-translate-x-full", "translate-x-0"}
+ )
+ end
+
+ def hide_mobile_sidebar(js \\ %JS{}) do
+ js
+ |> JS.hide(to: "#mobile-sidebar-container", transition: "fade-out")
+ |> JS.hide(
+ to: "#mobile-sidebar",
+ time: 300,
+ transition:
+ {"transition ease-in-out duration-300 transform", "translate-x-0", "-translate-x-full"}
+ )
+ end
+
+ def show_dropdown(to) do
+ JS.show(
+ to: to,
+ transition:
+ {"transition ease-out duration-120", "transform opacity-0 scale-95",
+ "transform opacity-100 scale-100"}
+ )
+ end
+
+ def hide_dropdown(to) do
+ JS.hide(
+ to: to,
+ transition:
+ {"transition ease-in duration-120", "transform opacity-100 scale-100",
+ "transform opacity-0 scale-95"}
+ )
+ end
+
+ def show_modal(js \\ %JS{}, id) do
+ js
+ |> JS.show(
+ to: "##{id}",
+ display: "inline-block",
+ transition: {"ease-out duration-300", "opacity-0", "opacity-100"}
+ )
+ |> JS.show(
+ to: "##{id} .modal-content",
+ display: "inline-block",
+ transition:
+ {"ease-out duration-300", "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95",
+ "opacity-100 translate-y-0 sm:scale-100"}
+ )
+ end
+
+ def hide_modal(js \\ %JS{}, id) do
+ js
+ |> JS.hide(
+ to: "##{id}",
+ transition: {"ease-in duration-200", "opacity-100", "opacity-0"}
+ )
+ |> JS.hide(
+ to: "##{id} .modal-content",
+ transition:
+ {"ease-in duration-200", "opacity-100 translate-y-0 sm:scale-100",
+ "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"}
+ )
+ end
+
+ def modal(assigns) do
+ assigns =
+ assigns
+ |> assign_new(:title, fn -> "" end)
+ |> assign_new(:return_to, fn -> nil end)
+
+ ~H"""
+
+
+
+
+
+
+
+
+
+ <%= render_slot(@title) %>
+
+
+
+ <%= render_slot(@inner_block) %>
+
+
+
+
+
+
+
+
+
+
+
+ """
+ end
+
+ def progress_bar(assigns) do
+ assigns =
+ assigns
+ |> assign_new(:min, fn -> 0 end)
+ |> assign_new(:max, fn -> 100 end)
+ |> assign_new(:value, fn -> assigns[:min] || 0 end)
+
+ ~H"""
+
+ """
+ end
+
+ def title_bar(assigns) do
+ assigns = assign_new(assigns, :action, fn -> [] end)
+
+ ~H"""
+
+
+
+
+ <%= render_slot(@inner_block) %>
+
+
+
+ <%= for action <- @action, rest = assigns_to_attributes(action) do %>
+ <%= if action[:primary] do %>
+
+ <% else %>
+
+ <% end %>
+ <% end %>
+
+
+ """
+ end
+end
diff --git a/lib/live_beats_web/live/player_live.ex b/lib/live_beats_web/live/player_live.ex
index d7eac1d..14fb525 100644
--- a/lib/live_beats_web/live/player_live.ex
+++ b/lib/live_beats_web/live/player_live.ex
@@ -1,6 +1,8 @@
defmodule LiveBeatsWeb.PlayerLive do
use LiveBeatsWeb, :live_view
+ on_mount LiveBeatsWeb.UserAuth
+
def render(assigns) do
~H"""
@@ -17,13 +19,9 @@ defmodule LiveBeatsWeb.PlayerLive do
-
<%= @time %>
<%= @count %>
diff --git a/lib/live_beats_web/router.ex b/lib/live_beats_web/router.ex
index 3351f37..0e14906 100644
--- a/lib/live_beats_web/router.ex
+++ b/lib/live_beats_web/router.ex
@@ -10,6 +10,7 @@ defmodule LiveBeatsWeb.Router do
plug :put_root_layout, {LiveBeatsWeb.LayoutView, :root}
plug :protect_from_forgery
plug :put_secure_browser_headers
+ plug :put_nonce
end
pipeline :api do
@@ -19,10 +20,10 @@ defmodule LiveBeatsWeb.Router do
scope "/", LiveBeatsWeb do
pipe_through :browser
- live_session :default, on_mount: {LiveBeatsWeb.UserAuth, :mount_defaults} do
- live "/test", IndexLive
+ live_session :default, on_mount: LiveBeatsWeb.UserAuth do
live "/", HomeLive, :index
live "/signin", SigninLive, :index
+ delete "/signout", OAuthCallbackController, :sign_out
end
end
@@ -64,4 +65,20 @@ defmodule LiveBeatsWeb.Router do
forward "/mailbox", Plug.Swoosh.MailboxPreview
end
end
+
+ defp put_nonce(conn, _) do
+ nonce = Phoenix.HTML.Tag.csrf_token_value()
+ endpoint = Phoenix.Controller.endpoint_module(conn)
+ url = endpoint.url()
+ uri = endpoint.struct_url()
+ ws_url = %URI{uri | scheme: "ws"}
+ wss_url = %URI{uri | scheme: "wss"}
+
+ conn
+ |> put_session(:nonce, nonce)
+ |> put_resp_header(
+ "content-security-policy",
+ "script-src 'nonce-#{nonce}' #{url} #{ws_url}; connect-src 'self' #{ws_url} #{wss_url}"
+ )
+ end
end
diff --git a/lib/live_beats_web/templates/layout/root.html.heex b/lib/live_beats_web/templates/layout/root.html.heex
index 3a74e5c..86b3b84 100644
--- a/lib/live_beats_web/templates/layout/root.html.heex
+++ b/lib/live_beats_web/templates/layout/root.html.heex
@@ -10,36 +10,20 @@
-