diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index 93fea5b66..7f5dd1d93 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -6,6 +6,8 @@ defmodule PlausibleWeb.Live.Sites do use Phoenix.LiveView use Phoenix.HTML + import PlausibleWeb.Components.Generic + alias Plausible.Auth alias Plausible.Repo alias Plausible.Site.Memberships.Invitations @@ -37,41 +39,7 @@ defmodule PlausibleWeb.Live.Sites do class="container pt-6" > - <%= if @needs_to_upgrade == {:needs_to_upgrade, :no_active_subscription} do %> -
-
-
- -
-
-

- Payment required -

-
-

- To access the sites you own, you need to subscribe to a monthly or yearly payment plan. <%= link( - "Upgrade now →", - to: "/settings", - class: "text-sm font-medium text-yellow-800" - ) %> -

-
-
-
-
- <% end %> + <.upgrade_nag_screen :if={@needs_to_upgrade == {:needs_to_upgrade, :no_active_subscription}} />

@@ -82,245 +50,281 @@ defmodule PlausibleWeb.Live.Sites do <.search_form filter_text={@filter_text} />
    - <%= if Enum.empty?(@sites.entries ++ @invitations) do %> -

    You don't have any sites yet

    - <% end %> +

    + You don't have any sites yet +

    <%= for invitation <- @invitations do %> -
    -
  • -
    - -
    -

    - <%= invitation.site.domain %> -

    -
    - - - Pending invitation - -
    -
    - - - - <%= PlausibleWeb.StatsView.large_number_format( - Map.get(@visitors, invitation.site.domain, 0) - ) %> - - visitor<%= if Map.get(@visitors, invitation.site.domain, 0) != 1 do %> - s - <% end %> - in last 24h - - -
    -
  • -
    + <.invitation + invitation={invitation} + visitors={Map.get(@visitors, invitation.site.domain, 0)} + /> <% end %> <%= for site <- @sites.entries do %> -
    - <%= link(to: "/" <> URI.encode_www_form(site.domain)) do %> -
  • -
    - <.favicon domain={site.domain} /> -
    -

    - <%= site.domain %> -

    -
    -
    -
    - - - - - <%= PlausibleWeb.StatsView.large_number_format( - Map.get(@visitors, site.domain, 0) - ) %> - - visitor<%= if Map.get(@visitors, site.domain, 0) != 1 do %> - s - <% end %> - in last 24h - - -
    -
  • - <% end %> - <%= if List.first(site.memberships).role != :viewer do %> - <%= link(to: "/" <> URI.encode_www_form(site.domain) <> "/settings", class: "absolute top-0 right-0 p-4 mt-1") do %> - - - - - <% end %> - <% end %> -
    + <.site site={site} visitors={Map.get(@visitors, site.domain, 0)} /> <% end %>
- <%= if Enum.any?(@invitations) do %> + <.invitation_modal :if={not Enum.empty?(@invitations)} user={@user} /> +

+ """ + end + + def upgrade_nag_screen(assigns) do + ~H""" +
+
+
+ +
+
+

+ Payment required +

+
+

+ To access the sites you own, you need to subscribe to a monthly or yearly payment plan. <%= link( + "Upgrade now →", + to: "/settings", + class: "text-sm font-medium text-yellow-800" + ) %> +

+
+
+
+
+ """ + end + + attr :invitation, Plausible.Auth.Invitation, required: true + attr :visitors, :integer, required: true + + def invitation(assigns) do + ~H""" +
+
  • +
    + +
    +

    + <%= @invitation.site.domain %> +

    +
    + + + Pending invitation + +
    +
    + + + + + <%= PlausibleWeb.StatsView.large_number_format(@visitors) %> + + visitors in last 24h + + +
    +
  • +
    + """ + end + + attr :site, Plausible.Site, required: true + attr :visitors, :integer, required: true + + def site(assigns) do + ~H""" +
    + <.unstyled_link href={"/#{URI.encode_www_form(@site.domain)}"}> +
  • +
    + <.favicon domain={@site.domain} /> +
    +

    + <%= @site.domain %> +

    +
    +
    +
    + + + + + <%= PlausibleWeb.StatsView.large_number_format(@visitors) %> + + visitors in last 24h + + +
    +
  • + + <%= if List.first(@site.memberships).role != :viewer do %> + <.unstyled_link + href={"/#{URI.encode_www_form(@site.domain)}/settings"} + class="absolute top-0 right-0 p-4 mt-1" + > + + + <% end %> +
    + """ + end + + attr :user, Plausible.Auth.User, required: true + + def invitation_modal(assigns) do + ~H""" +