From b14ceaad4c804c440da1d3e580350959aef7ca4a Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Tue, 24 Oct 2023 12:46:17 +0200 Subject: [PATCH] Implement complete basics of LV sites --- lib/plausible/sites.ex | 18 +++ .../controllers/site_controller.ex | 43 +++++++- lib/plausible_web/live/sites.ex | 104 ++++++++++++++++++ lib/plausible_web/router.ex | 11 ++ 4 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 lib/plausible_web/live/sites.ex diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 18cf00e28..a4be806cc 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -10,6 +10,24 @@ defmodule Plausible.Sites do Repo.get_by!(Site, domain: domain) end + @spec list(User.t(), map(), [non_neg_integer()]) :: %{entries: [Site.t()], pagination: map()} + def list(user, pagination_params, exclude_ids \\ []) do + {sites, pagination} = + Repo.paginate( + from(s in Plausible.Site, + join: sm in Plausible.Site.Membership, + on: sm.site_id == s.id, + where: sm.user_id == ^user.id, + where: s.id not in ^exclude_ids, + order_by: s.domain, + preload: [memberships: sm] + ), + pagination_params + ) + + %{entries: sites, pagination: pagination} + end + def create(user, params) do site_changeset = Site.changeset(%Site{}, params) diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 88fba62ea..f61613c77 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -6,7 +6,7 @@ defmodule PlausibleWeb.SiteController do plug PlausibleWeb.RequireAccountPlug plug PlausibleWeb.AuthorizeSiteAccess, - [:owner, :admin, :super_admin] when action not in [:index, :new, :create_site] + [:owner, :admin, :super_admin] when action not in [:index, :index_new, :new, :create_site] def index(conn, params) do user = conn.assigns[:current_user] @@ -49,6 +49,47 @@ defmodule PlausibleWeb.SiteController do ) end + def index_new(conn, params) do + user = conn.assigns[:current_user] + + invitations = + Repo.all( + from i in Plausible.Auth.Invitation, + where: i.email == ^user.email + ) + |> Repo.preload(:site) + + invitation_site_ids = Enum.map(invitations, & &1.site.id) + + {sites, pagination} = + Repo.paginate( + from(s in Plausible.Site, + join: sm in Plausible.Site.Membership, + on: sm.site_id == s.id, + where: sm.user_id == ^user.id, + where: s.id not in ^invitation_site_ids, + order_by: s.domain, + preload: [memberships: sm] + ), + params + ) + + user_owns_sites = + Enum.any?(sites, fn site -> List.first(site.memberships).role == :owner end) || + Plausible.Auth.user_owns_sites?(user) + + visitors = + Plausible.Stats.Clickhouse.last_24h_visitors(sites ++ Enum.map(invitations, & &1.site)) + + render(conn, "index.html", + invitations: invitations, + sites: sites, + visitors: visitors, + pagination: pagination, + needs_to_upgrade: user_owns_sites && Plausible.Billing.check_needs_to_upgrade(user) + ) + end + def new(conn, _params) do current_user = conn.assigns[:current_user] diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex new file mode 100644 index 000000000..30f87135c --- /dev/null +++ b/lib/plausible_web/live/sites.ex @@ -0,0 +1,104 @@ +defmodule PlausibleWeb.Live.Sites do + @moduledoc """ + LiveView for sites index. + """ + + use Phoenix.LiveView + use Phoenix.HTML + + alias Plausible.Auth + alias Plausible.Repo + alias Plausible.Sites + + def mount(params, %{"current_user_id" => user_id}, socket) do + socket = + socket + |> assign_new(:user, fn -> Repo.get!(Auth.User, user_id) end) + |> assign_new(:sites, fn %{user: user} -> Sites.list(user, params) end) + |> assign_new(:visitors, fn %{sites: sites} -> + Plausible.Stats.Clickhouse.last_24h_visitors(sites.entries) + end) + + {:ok, socket} + end + + def render(assigns) do + ~H""" +
+
+

+ My Sites +

+ + Add Website +
+ + +
+ """ + end + + def favicon(assigns) do + src = "/favicon/sources/#{assigns.domain}" + assigns = assign(assigns, :src, src) + + ~H""" + + """ + end +end diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 9305f84a6..367ad1daf 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -29,6 +29,10 @@ defmodule PlausibleWeb.Router do plug :put_root_layout, html: {PlausibleWeb.LayoutView, :focus} end + pipeline :app_layout do + plug :put_root_layout, html: {PlausibleWeb.LayoutView, :app} + end + pipeline :api do plug :accepts, ["json"] plug :fetch_session @@ -211,6 +215,13 @@ defmodule PlausibleWeb.Router do get "/billing/subscription/ping", BillingController, :ping_subscription get "/sites", SiteController, :index + + scope alias: Live, assigns: %{connect_live_socket: true} do + pipe_through [:app_layout] + + live "/sites_new", Sites, :index_new, as: :site + end + get "/sites/new", SiteController, :new post "/sites", SiteController, :create_site get "/sites/:website/change-domain", SiteController, :change_domain