Skip to content

feat: single origin #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spaenleh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: single origin #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e587acb
fix: update for single origin paths
spaenleh Dec 18, 2025
65ae408
fix: paths in tests
spaenleh Dec 18, 2025
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
49 changes: 27 additions & 22 deletions lib/admin_web/components/layouts.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,20 +161,20 @@ defmodule AdminWeb.Layouts do
class="menu menu-sm dropdown-content bg-base-100 rounded-box z-1 mt-3 w-52 p-2 shadow"
>
<li>
<.link navigate={~p"/published_items"}>Publications</.link>
<.link navigate={~p"/admin/published_items"}>Publications</.link>
<ul class="p-2">
<li><.link navigate={~p"/published_items"}>Recent</.link></li>
<li><.link navigate={~p"/published_items/featured"}>Featured</.link></li>
<li><.link navigate={~p"/admin/published_items"}>Recent</.link></li>
<li><.link navigate={~p"/admin/published_items/featured"}>Featured</.link></li>
</ul>
</li>
<li><.link navigate={~p"/publishers"}>Apps</.link></li>
<li><.link navigate={~p"/notifications"}>Mailing</.link></li>
<li><.link navigate={~p"/users"}>Admins</.link></li>
<li><.link navigate={~p"/analytics/graph"}>Analytics</.link></li>
<li><.link navigate={~p"/admin/publishers"}>Apps</.link></li>
<li><.link navigate={~p"/admin/notifications"}>Mailing</.link></li>
<li><.link navigate={~p"/admin/users"}>Admins</.link></li>
<li><.link navigate={~p"/admin/analytics/graph"}>Analytics</.link></li>
<li>
<span>Development</span>
<ul class="p-2">
<li><.link navigate={~p"/oban"}>Job Queues</.link></li>
<li><.link navigate={~p"/admin/oban"}>Job Queues</.link></li>
</ul>
</li>

Expand All @@ -183,20 +183,20 @@ defmodule AdminWeb.Layouts do
<%= if @current_scope do %>
<span>{@current_scope.user.email}</span>

<.link class="btn btn-soft" navigate={~p"/users/settings"}>
<.link class="btn btn-soft" navigate={~p"/admin/users/settings"}>
<.icon name="hero-cog" class="size-5 " /> Settings
</.link>
<.link class="btn btn-soft" href={~p"/users/log-out"} method="delete">
<.link class="btn btn-soft" href={~p"/admin/users/log-out"} method="delete">
<.icon name="hero-arrow-right-on-rectangle" class="size-5 " /> Log out
</.link>
<% else %>
<.link class="btn btn-ghost" href={~p"/users/log-in"}>Log in</.link>
<.link class="btn btn-ghost" href={~p"/admin/users/log-in"}>Log in</.link>
<% end %>
</div>
</ul>
</div>
<% end %>
<.link navigate={~p"/dashboard"} class="btn btn-ghost text-xl">
<.link navigate={~p"/admin/dashboard"} class="btn btn-ghost text-xl">
<img src="/images/logo.svg" width="32" />
<span class="text-sm font-semibold">Admin</span>
</.link>
Expand All @@ -208,22 +208,22 @@ defmodule AdminWeb.Layouts do
<details>
<summary>Publications</summary>
<ul class="p-2">
<li><.link navigate={~p"/published_items"}>Recent</.link></li>
<li><.link navigate={~p"/admin/published_items"}>Recent</.link></li>
<li>
<.link navigate={~p"/published_items/featured"}>Featured</.link>
<.link navigate={~p"/admin/published_items/featured"}>Featured</.link>
</li>
</ul>
</details>
</li>
<li><.link navigate={~p"/publishers"}>Apps</.link></li>
<li><.link navigate={~p"/notifications"}>Mailing</.link></li>
<li><.link navigate={~p"/users"}>Admins</.link></li>
<li><.link navigate={~p"/analytics/graph"}>Analytics</.link></li>
<li><.link navigate={~p"/admin/publishers"}>Apps</.link></li>
<li><.link navigate={~p"/admin/notifications"}>Mailing</.link></li>
<li><.link navigate={~p"/admin/users"}>Admins</.link></li>
<li><.link navigate={~p"/admin/analytics/graph"}>Analytics</.link></li>
<li>
<details>
<summary>Development</summary>
<ul class="p-2">
<li><.link navigate={~p"/oban"}>Job Queues</.link></li>
<li><.link navigate={~p"/admin/oban"}>Job Queues</.link></li>
</ul>
</details>
</li>
Expand All @@ -234,14 +234,19 @@ defmodule AdminWeb.Layouts do
<div class="hidden items-center lg:flex gap-2">
<%= if @current_scope do %>
<span>{@current_scope.user.email}</span>
<.link class="btn btn-circle" navigate={~p"/users/settings"} title="Settings">
<.link class="btn btn-circle" navigate={~p"/admin/users/settings"} title="Settings">
<.icon name="hero-cog" class="size-5 " />
</.link>
<.link class="btn btn-circle" href={~p"/users/log-out"} title="Log out" method="delete">
<.link
class="btn btn-circle"
href={~p"/admin/users/log-out"}
title="Log out"
method="delete"
>
<.icon name="hero-arrow-right-on-rectangle" class="size-5 " />
</.link>
<% else %>
<.link class="btn btn-ghost" href={~p"/users/log-in"}>Log in</.link>
<.link class="btn btn-ghost" href={~p"/admin/users/log-in"}>Log in</.link>
<% end %>
</div>
<.theme_toggle />
Expand Down
18 changes: 9 additions & 9 deletions lib/admin_web/controllers/admin_html/dashboard.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
<div>
<div class="flex items-center justify-between">
<div class="flex flex-col align-start">
<h2><.link href="/maintenance">Planned Maintenance</.link></h2>
<h2><.link navigate={~p"/admin/maintenance"}>Planned Maintenance</.link></h2>
<span class="text-xs text-secondary">
Showing {length(@maintenances)} upcoming events.
<.link class="link" navigate={~p"/maintenance"}>View all</.link>
<.link class="link" navigate={~p"/admin/maintenance"}>View all</.link>
</span>
</div>
<.button navigate={~p"/maintenance/new"}>
<.button navigate={~p"/admin/maintenance/new"}>
<.icon name="hero-plus" /> New
</.button>
</div>
<div class="flex flex-col mt-2 divide-y divide-gray-200 last:border-b-0">
<%= for maintenance <- @maintenances do %>
<AdminWeb.PlannedMaintenanceHTML.planned_maintenance_row
maintenance={maintenance}
row_click={&JS.navigate(~p"/maintenance/#{&1}")}
row_click={&JS.navigate(~p"/admin/maintenance/#{&1}")}
/>
<% end %>
<%= if length(@maintenances) == 0 do %>
Expand All @@ -54,16 +54,16 @@
<h2>Recent Publications</h2>
<span class="text-xs text-secondary">
Showing {length(@publications)} most recent.
<.link class="link" navigate={~p"/published_items"}>View all</.link>
<.link class="link" navigate={~p"/admin/published_items"}>View all</.link>
</span>
</div>
<.button navigate={~p"/published_items"}>View all</.button>
<.button navigate={~p"/admin/published_items"}>View all</.button>
</div>
<div class="flex flex-col mt-2 gap-1">
<%= for publication <- @publications do %>
<AdminWeb.PublishedItemHTML.publication_row publication={publication}>
<:action>
<.button navigate={~p"/published_items/#{publication}"} class="btn btn-soft">
<.button navigate={~p"/admin/published_items/#{publication}"} class="btn btn-soft">
Manage
</.button>
</:action>
Expand All @@ -74,7 +74,7 @@

<Placeholders.mock_section title="My Section">
<:action>
<.button navigate={~p"/"}>View</.button>
<.button navigate={~p"/admin"}>View</.button>
</:action>
<:placeholder />
<:placeholder />
Expand All @@ -83,7 +83,7 @@

<Placeholders.mock_section title="Notifications">
<:action>
<.button navigate={~p"/"}>View</.button>
<.button navigate={~p"/admin"}>View</.button>
</:action>
<:placeholder />
<:placeholder />
Expand Down
4 changes: 2 additions & 2 deletions lib/admin_web/controllers/landing_html/home.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<div class="flex flex-col justify-center items-center gap-2 max-w-md m-auto pt-5">
<%= if @current_scope do %>
<p>You are logged in!</p>
<.link navigate={~p"/dashboard"} class="btn btn-primary">Dashboard</.link>
<.link navigate={~p"/admin/dashboard"} class="btn btn-primary">Dashboard</.link>
<% else %>
<h2 class="text-xl text-center">Admin</h2>
<span class="flex flex-col items-center">
<.link navigate={~p"/users/log-in"} class="btn btn-primary">
<.link navigate={~p"/admin/users/log-in"} class="btn btn-primary">
Log in
</.link>
<p class="text-secondary">
Expand Down
6 changes: 3 additions & 3 deletions lib/admin_web/controllers/planned_maintenance_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ defmodule AdminWeb.PlannedMaintenanceController do
{:ok, planned_maintenance} ->
conn
|> put_flash(:info, "Planned maintenance created successfully.")
|> redirect(to: ~p"/maintenance/#{planned_maintenance}")
|> redirect(to: ~p"/admin/maintenance/#{planned_maintenance}")

{:error, %Ecto.Changeset{} = changeset} ->
render(conn, :new, changeset: changeset)
Expand All @@ -44,7 +44,7 @@ defmodule AdminWeb.PlannedMaintenanceController do
{:ok, planned_maintenance} ->
conn
|> put_flash(:info, "Planned maintenance updated successfully.")
|> redirect(to: ~p"/maintenance/#{planned_maintenance}")
|> redirect(to: ~p"/admin/maintenance/#{planned_maintenance}")

{:error, %Ecto.Changeset{} = changeset} ->
render(conn, :edit, planned_maintenance: planned_maintenance, changeset: changeset)
Expand All @@ -57,6 +57,6 @@ defmodule AdminWeb.PlannedMaintenanceController do

conn
|> put_flash(:info, "Planned maintenance deleted successfully.")
|> redirect(to: ~p"/maintenance")
|> redirect(to: ~p"/admin/maintenance")
end
end
4 changes: 2 additions & 2 deletions lib/admin_web/controllers/planned_maintenance_html/edit.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<.planned_maintenance_form
changeset={@changeset}
action={~p"/maintenance/#{@planned_maintenance}"}
return_to={~p"/maintenance"}
action={~p"/admin/maintenance/#{@planned_maintenance}"}
return_to={~p"/admin/maintenance"}
/>
</Layouts.admin>
14 changes: 9 additions & 5 deletions lib/admin_web/controllers/planned_maintenance_html/index.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,27 @@
<.header>
Listing Maintenances
<:actions>
<.button href={~p"/maintenance/new"}>
<.button href={~p"/admin/maintenance/new"}>
<.icon name="hero-plus" /> New Planned maintenance
</.button>
</:actions>
</.header>

<.table id="maintenance" rows={@maintenance} row_click={&JS.navigate(~p"/maintenance/#{&1}")}>
<.table
id="maintenance"
rows={@maintenance}
row_click={&JS.navigate(~p"/admin/maintenance/#{&1}")}
>
<:col :let={planned_maintenance} label="Slug">{planned_maintenance.slug}</:col>
<:action :let={planned_maintenance}>
<div class="sr-only">
<.link navigate={~p"/maintenance/#{planned_maintenance}"}>Show</.link>
<.link navigate={~p"/admin/maintenance/#{planned_maintenance}"}>Show</.link>
</div>
<.link navigate={~p"/maintenance/#{planned_maintenance}/edit"}>Edit</.link>
<.link navigate={~p"/admin/maintenance/#{planned_maintenance}/edit"}>Edit</.link>
</:action>
<:action :let={planned_maintenance}>
<.link
href={~p"/maintenance/#{planned_maintenance}"}
href={~p"/admin/maintenance/#{planned_maintenance}"}
method="delete"
data-confirm="Are you sure?"
>
Expand Down
4 changes: 2 additions & 2 deletions lib/admin_web/controllers/planned_maintenance_html/new.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<.planned_maintenance_form
changeset={@changeset}
action={~p"/maintenance"}
return_to={~p"/maintenance"}
action={~p"/admin/maintenance"}
return_to={~p"/admin/maintenance"}
/>
</Layouts.admin>
4 changes: 2 additions & 2 deletions lib/admin_web/controllers/planned_maintenance_html/show.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<.header>
Planned maintenance "{@planned_maintenance.slug}"
<:actions>
<.button navigate={~p"/dashboard"}>
<.button navigate={~p"/admin/dashboard"}>
<.icon name="hero-arrow-left" />
</.button>
<.button
variant="primary"
navigate={~p"/maintenance/#{@planned_maintenance}/edit?return_to=show"}
navigate={~p"/admin/maintenance/#{@planned_maintenance}/edit?return_to=show"}
>
<.icon name="hero-pencil-square" /> Edit planned maintenance
</.button>
Expand Down
21 changes: 2 additions & 19 deletions lib/admin_web/controllers/published_item_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ defmodule AdminWeb.PublishedItemController do
{:ok, published_item} ->
conn
|> put_flash(:info, "Published item created successfully.")
|> redirect(to: ~p"/published_items/#{published_item}")
|> redirect(to: ~p"/admin/published_items/#{published_item}")

{:error, %Ecto.Changeset{} = changeset} ->
render(conn, :new, changeset: changeset)
Expand All @@ -43,29 +43,12 @@ defmodule AdminWeb.PublishedItemController do
render(conn, :show, published_item: published_item)
end

# def edit(conn, %{"id" => id}) do
# published_item = Publications.get_published_item!(conn.assigns.current_scope, id)
# changeset = Publications.change_published_item(conn.assigns.current_scope, published_item)
# render(conn, :edit, published_item: published_item, changeset: changeset)
# end

# def delete(conn, %{"id" => id}) do
# published_item = Publications.get_published_item!(conn.assigns.current_scope, id)

# {:ok, _published_item} =
# Publications.delete_published_item(conn.assigns.current_scope, published_item)

# conn
# |> put_flash(:info, "Published item deleted successfully.")
# |> redirect(to: ~p"/published_items")
# end

def search(conn, %{"published_item_search_form" => params}) do
changeset = PublishedItemSearchForm.changeset(%PublishedItemSearchForm{}, params)

if changeset.valid? do
published_item_id = Ecto.Changeset.get_field(changeset, :published_item_id)
redirect(conn, to: ~p"/published_items/#{published_item_id}")
redirect(conn, to: ~p"/admin/published_items/#{published_item_id}")
else
published_items =
Publications.list_published_items()
Expand Down
8 changes: 4 additions & 4 deletions lib/admin_web/controllers/published_item_html/index.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
Published items
<:actions>
<.button
href={~p"/published_items/featured"}
href={~p"/admin/published_items/featured"}
class="btn btn-soft btn-disabled"
>
<.icon name="hero-bolt" /> Featured collections
</.button>
</:actions>
</.header>

<.form :let={f} for={@changeset} action={~p"/published_items/search"} method="post">
<.form :let={f} for={@changeset} action={~p"/admin/published_items/search"} method="post">
<div class="flex flex-row items-center gap-1">
<.input
field={f[:item_id]}
Expand All @@ -27,7 +27,7 @@
<.table
id="published_items"
rows={@published_items}
row_click={&JS.navigate(~p"/published_items/#{&1}")}
row_click={&JS.navigate(~p"/admin/published_items/#{&1}")}
>
<:col :let={published_item}>
<.thumbnail
Expand All @@ -50,7 +50,7 @@
</:col>
<:action :let={published_item}>
<div class="sr-only">
<.link navigate={~p"/published_items/#{published_item}"}>Show</.link>
<.link navigate={~p"/admin/published_items/#{published_item}"}>Show</.link>
</div>
</:action>
</.table>
Expand Down
4 changes: 2 additions & 2 deletions lib/admin_web/controllers/published_item_html/new.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<.published_item_form
changeset={@changeset}
action={~p"/published_items"}
return_to={~p"/published_items"}
action={~p"/admin/published_items"}
return_to={~p"/admin/published_items"}
/>
</Layouts.admin>
4 changes: 2 additions & 2 deletions lib/admin_web/controllers/published_item_html/show.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</:subtitle>

<:actions>
<.button navigate={~p"/published_items"}>
<.button navigate={~p"/admin/published_items"}>
<.icon name="hero-arrow-left" />
</.button>
<%!-- <%= if @current_scope.user.id == @published_item.creator.id do %>
Expand Down Expand Up @@ -57,7 +57,7 @@
</.list>

<.link
href={~p"/published_items/#{@published_item}/unpublish"}
href={~p"/admin/published_items/#{@published_item}/unpublish"}
class="btn btn-primary"
>
Unpublish
Expand Down
2 changes: 1 addition & 1 deletion lib/admin_web/controllers/user_html/show.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<.header>
View {@user.email}
<:actions>
<.button navigate={~p"/users"}><.icon name="hero-arrow-left" /></.button>
<.button navigate={~p"/admin/users"}><.icon name="hero-arrow-left" /></.button>
</:actions>
</.header>
<.list>
Expand Down
Loading
Loading