+ <.link navigate={~p"/sources"}>
+ <.icon name="hero-arrow-left" class="w-10 h-10 hover:dark:text-white" />
+
+
Edit Source
+
-<.source_form
- changeset={@changeset}
- media_profiles={@media_profiles}
- action={~p"/media_sources/sources/#{@source}"}
-/>
-
-<.back navigate={~p"/media_sources/sources"}>Back to sources
+
- <.link navigate={~p"/media_sources/sources/#{source}"}>Show
+
+
+
+ <.table rows={@sources} table_class="text-black dark:text-white">
+ <:col :let={source} label="Name">
+ <%= source.friendly_name || source.collection_name %>
+
+ <:col :let={source} label="Type"><%= source.collection_type %>
+ <:col :let={source} label="Should Download?">
+ <.icon name={if source.download_media, do: "hero-check", else: "hero-x-mark"} />
+
+ <:col :let={source} label="Media Profile">
+ <.link
+ navigate={~p"/media_profiles/#{source.media_profile_id}"}
+ class="hover:text-secondary duration-200 ease-in-out"
+ >
+ <%= source.media_profile.name %>
+
+
+ <:col :let={source} label="" class="flex place-content-evenly">
+ <.link
+ navigate={~p"/sources/#{source.id}"}
+ class="hover:text-secondary duration-200 ease-in-out mx-0.5"
+ >
+ <.icon name="hero-eye" />
+
+ <.link
+ navigate={~p"/sources/#{source.id}/edit"}
+ class="hover:text-secondary duration-200 ease-in-out mx-0.5"
+ >
+ <.icon name="hero-pencil-square" />
+
+
+
- <.link navigate={~p"/media_sources/sources/#{source}/edit"}>Edit
-
- <:action :let={source}>
- <.link href={~p"/media_sources/sources/#{source}"} method="delete" data-confirm="Are you sure?">
- Delete
-
-
-
+
+
diff --git a/lib/pinchflat_web/controllers/media_sources/source_html/new.html.heex b/lib/pinchflat_web/controllers/media_sources/source_html/new.html.heex
index f2d092c..6bd86c1 100644
--- a/lib/pinchflat_web/controllers/media_sources/source_html/new.html.heex
+++ b/lib/pinchflat_web/controllers/media_sources/source_html/new.html.heex
@@ -1,12 +1,14 @@
-<.old_header>
- New Source
- <:subtitle>Use this form to manage source records in your database.
-
+
+ <.link navigate={~p"/sources"}>
+ <.icon name="hero-arrow-left" class="w-10 h-10 hover:dark:text-white" />
+
+
New Source
+
-<.source_form
- changeset={@changeset}
- media_profiles={@media_profiles}
- action={~p"/media_sources/sources"}
-/>
-
-<.back navigate={~p"/media_sources/sources"}>Back to sources
+
+
+
+ <.source_form changeset={@changeset} media_profiles={@media_profiles} action={~p"/sources"} />
+
+
+
diff --git a/lib/pinchflat_web/controllers/media_sources/source_html/show.html.heex b/lib/pinchflat_web/controllers/media_sources/source_html/show.html.heex
index ae6db73..1d947d5 100644
--- a/lib/pinchflat_web/controllers/media_sources/source_html/show.html.heex
+++ b/lib/pinchflat_web/controllers/media_sources/source_html/show.html.heex
@@ -1,23 +1,38 @@
-<.old_header>
- Source <%= @source.id %>
- <:subtitle>This is a source record from your database.
- <:actions>
- <.link href={~p"/media_sources/sources/#{@source}/edit"}>
- <.button>Edit source
+
+
+ <.link navigate={~p"/sources"}>
+ <.icon name="hero-arrow-left" class="w-10 h-10 hover:dark:text-white" />
-
-
+
+ Source #<%= @source.id %>
+
+
-
Relationships
-<.list>
- <:item title="media_profile">
- <.link href={~p"/media_profiles/#{@source.media_profile}"}>
- <%= @source.media_profile.name %>
+
+
+
+
+
+
Relationships
+ <.list>
+ <:item title="media_profile">
+ <.link
+ navigate={~p"/media_profiles/#{@source.media_profile_id}"}
+ class="hover:text-secondary duration-200 ease-in-out"
+ >
+ <%= @source.media_profile.name %>
+
+
+
-Attributes
-<.list_items_from_map map={Map.from_struct(@source)} />
-
-<.back navigate={~p"/media_sources/sources"}>Back to sources
+ Attributes
+ <.list_items_from_map map={Map.from_struct(@source)} />
+
+
+
diff --git a/lib/pinchflat_web/controllers/media_sources/source_html/source_form.html.heex b/lib/pinchflat_web/controllers/media_sources/source_html/source_form.html.heex
index a070a84..4cc1499 100644
--- a/lib/pinchflat_web/controllers/media_sources/source_html/source_form.html.heex
+++ b/lib/pinchflat_web/controllers/media_sources/source_html/source_form.html.heex
@@ -3,6 +3,13 @@
Oops, something went wrong! Please check the errors below.
+ <.input
+ field={f[:original_url]}
+ type="text"
+ label="Source URL"
+ help="URL of a channel or playlist (required)"
+ />
+
<.input field={f[:friendly_name]} type="text" label="Friendly Name" />
<.input
@@ -16,21 +23,25 @@
field={f[:collection_type]}
options={friendly_collection_types()}
type="select"
- label="Collection Type"
+ label="Source Type"
/>
- <.input field={f[:original_url]} type="text" label="Source URL" />
-
<.input
field={f[:index_frequency_minutes]}
options={friendly_index_frequencies()}
type="select"
label="Index Frequency"
+ help="Roughly how often to check for media to download"
/>
- <.input field={f[:download_media]} type="checkbox" label="Download Media?" />
+ <.input
+ field={f[:download_media]}
+ type="toggle"
+ label="Download Media?"
+ help="Unchecking still indexes media but it won't be downloaded"
+ />
<:actions>
- <.button>Save Source
+ <.button class="mt-15 mb-5 sm:mb-7.5">Save Source
diff --git a/lib/pinchflat_web/router.ex b/lib/pinchflat_web/router.ex
index fd06da3..3610003 100644
--- a/lib/pinchflat_web/router.ex
+++ b/lib/pinchflat_web/router.ex
@@ -20,10 +20,7 @@ defmodule PinchflatWeb.Router do
get "/", PageController, :home
resources "/media_profiles", MediaProfiles.MediaProfileController
-
- scope "/media_sources", MediaSources do
- resources "/sources", SourceController
- end
+ resources "/sources", MediaSources.SourceController
end
# Other scopes may use custom stacks.
diff --git a/test/pinchflat_web/controllers/source_controller_test.exs b/test/pinchflat_web/controllers/source_controller_test.exs
index 39cb9d8..9f3e2bd 100644
--- a/test/pinchflat_web/controllers/source_controller_test.exs
+++ b/test/pinchflat_web/controllers/source_controller_test.exs
@@ -28,14 +28,14 @@ defmodule PinchflatWeb.SourceControllerTest do
describe "index" do
test "lists all sources", %{conn: conn} do
- conn = get(conn, ~p"/media_sources/sources")
- assert html_response(conn, 200) =~ "Listing Sources"
+ conn = get(conn, ~p"/sources")
+ assert html_response(conn, 200) =~ "All Sources"
end
end
describe "new source" do
test "renders form", %{conn: conn} do
- conn = get(conn, ~p"/media_sources/sources/new")
+ conn = get(conn, ~p"/sources/new")
assert html_response(conn, 200) =~ "New Source"
end
end
@@ -43,17 +43,17 @@ defmodule PinchflatWeb.SourceControllerTest do
describe "create source" do
test "redirects to show when data is valid", %{conn: conn, create_attrs: create_attrs} do
expect(YtDlpRunnerMock, :run, 1, &runner_function_mock/3)
- conn = post(conn, ~p"/media_sources/sources", source: create_attrs)
+ conn = post(conn, ~p"/sources", source: create_attrs)
assert %{id: id} = redirected_params(conn)
- assert redirected_to(conn) == ~p"/media_sources/sources/#{id}"
+ assert redirected_to(conn) == ~p"/sources/#{id}"
- conn = get(conn, ~p"/media_sources/sources/#{id}")
- assert html_response(conn, 200) =~ "Source #{id}"
+ conn = get(conn, ~p"/sources/#{id}")
+ assert html_response(conn, 200) =~ "Source ##{id}"
end
test "renders errors when data is invalid", %{conn: conn, invalid_attrs: invalid_attrs} do
- conn = post(conn, ~p"/media_sources/sources", source: invalid_attrs)
+ conn = post(conn, ~p"/sources", source: invalid_attrs)
assert html_response(conn, 200) =~ "New Source"
end
end
@@ -62,7 +62,7 @@ defmodule PinchflatWeb.SourceControllerTest do
setup [:create_source]
test "renders form for editing chosen source", %{conn: conn, source: source} do
- conn = get(conn, ~p"/media_sources/sources/#{source}/edit")
+ conn = get(conn, ~p"/sources/#{source}/edit")
assert html_response(conn, 200) =~ "Edit Source"
end
end
@@ -73,10 +73,10 @@ defmodule PinchflatWeb.SourceControllerTest do
test "redirects when data is valid", %{conn: conn, source: source, update_attrs: update_attrs} do
expect(YtDlpRunnerMock, :run, 1, &runner_function_mock/3)
- conn = put(conn, ~p"/media_sources/sources/#{source}", source: update_attrs)
- assert redirected_to(conn) == ~p"/media_sources/sources/#{source}"
+ conn = put(conn, ~p"/sources/#{source}", source: update_attrs)
+ assert redirected_to(conn) == ~p"/sources/#{source}"
- conn = get(conn, ~p"/media_sources/sources/#{source}")
+ conn = get(conn, ~p"/sources/#{source}")
assert html_response(conn, 200) =~ "https://www.youtube.com/source/321xyz"
end
@@ -85,7 +85,7 @@ defmodule PinchflatWeb.SourceControllerTest do
source: source,
invalid_attrs: invalid_attrs
} do
- conn = put(conn, ~p"/media_sources/sources/#{source}", source: invalid_attrs)
+ conn = put(conn, ~p"/sources/#{source}", source: invalid_attrs)
assert html_response(conn, 200) =~ "Edit Source"
end
end
@@ -94,11 +94,11 @@ defmodule PinchflatWeb.SourceControllerTest do
setup [:create_source]
test "deletes chosen source", %{conn: conn, source: source} do
- conn = delete(conn, ~p"/media_sources/sources/#{source}")
- assert redirected_to(conn) == ~p"/media_sources/sources"
+ conn = delete(conn, ~p"/sources/#{source}")
+ assert redirected_to(conn) == ~p"/sources"
assert_error_sent 404, fn ->
- get(conn, ~p"/media_sources/sources/#{source}")
+ get(conn, ~p"/sources/#{source}")
end
end
end