From 5c86b0dd96855dcb457d4d7082d0742d172011c2 Mon Sep 17 00:00:00 2001 From: Ru Singh Date: Wed, 16 Jun 2021 16:39:35 +0530 Subject: [PATCH 01/22] Update CHANGELOG.md (#1130) For #1113, the changelog wasn't updated. This simply adds a relevant entry to the CHANGELOG.md file. :) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd770b4f5..19315b573 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file. - Make sure embedded dashboards can run when user has blocked third-party cookies plausible/analytics#971 - Sites listing page will paginate if the user has a lot of sites plausible/analytics#994 - Crash when changing theme on a loaded dashboard plausible/analytics#1123 +- UI fix for details button overlapping content on mobile plausible/analytics#1114 ### Removed - Removes AppSignal monitoring package From e71de6dc1f0c9a70a743d633dc7b254a7f4f1958 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 16 Jun 2021 15:00:07 +0300 Subject: [PATCH 02/22] Invitations (#1122) * Invite existing user to a site * Add invitation flow for non-existing users * Accept and reject invitations * Use invitation flow for existing users * Locking mechanism for sites * Authorization for site settings * Show usage based on site ownership * Add ability to remove members from a site * Do not show settings link to viewer roles * Ability to remove invitations * Remove `Plausible.Sites.count_for/1` * Fix tests * Do not show the trial banner after the trial * Correct trial emails * Transfer ownership * Send invitation email to existing user * Add invitation email flows * Add plug for role-based authorization * Rename AuthorizeStatsPlug -> AuthorizeSiteAccess * Add email flow for ownership transfer * Fix URLs in emails * Fix small copy issues * Make 'People' its own section in site settings * Notify user via email if their access has been removed * Check site lock status when invitation is accepted * Check lock status when user subscribes * Make sure only admins and owners can create shared links * Changelog * Add LockSites to daily cron * Clean invitations after 48 hours * Add notices about expiry * Add invitation expired page * Add doc link --- CHANGELOG.md | 1 + assets/js/dashboard/historical.js | 2 +- assets/js/dashboard/index.js | 4 +- assets/js/dashboard/mount.js | 3 +- assets/js/dashboard/router.js | 4 +- assets/js/dashboard/site-switcher.js | 26 ++- .../dashboard/stats/sources/search-terms.js | 4 +- assets/tailwind.config.js | 3 +- config/runtime.exs | 16 +- lib/plausible/auth/auth.ex | 17 +- lib/plausible/auth/invitation.ex | 23 ++ lib/plausible/auth/user.ex | 4 +- lib/plausible/billing/billing.ex | 31 ++- lib/plausible/billing/site_locker.ex | 29 +++ lib/plausible/site/membership.ex | 7 +- lib/plausible/site/schema.ex | 3 + lib/plausible/sites.ex | 56 +++-- .../api/external_sites_controller.ex | 3 +- .../controllers/api/stats_controller.ex | 4 +- .../controllers/auth_controller.ex | 75 +++++- .../controllers/invitation_controller.ex | 108 +++++++++ .../controllers/site/membership_controller.ex | 149 ++++++++++++ .../controllers/site_controller.ex | 219 ++++++++++-------- .../controllers/stats_controller.ex | 52 +++-- lib/plausible_web/email.ex | 97 ++++++++ .../plugs/authorize_site_access.ex | 43 ++++ .../plugs/authorize_stats_api.ex | 4 +- .../plugs/authorize_stats_plug.ex | 33 --- .../plugs/upgrade_billing_plug.ex | 21 -- lib/plausible_web/router.ex | 18 +- .../templates/auth/activate.html.eex | 8 +- .../auth/invitation_expired.html.eex | 12 + .../register_from_invitation_form.html.eex | 61 +++++ .../email/existing_user_invitation.html.eex | 10 + .../email/invitation_accepted.html.eex | 9 + .../email/invitation_rejected.html.eex | 9 + .../email/new_user_invitation.html.eex | 11 + .../ownership_transfer_accepted.html.eex | 10 + .../ownership_transfer_rejected.html.eex | 9 + .../email/ownership_transfer_request.html.eex | 15 ++ .../email/site_member_removed.html.eex | 10 + .../templates/layout/_header.html.eex | 7 +- .../templates/layout/site_settings.html.eex | 4 +- .../templates/site/index.html.eex | 131 ++++++++++- .../membership/invite_member_form.html.eex | 63 +++++ .../transfer_ownership_form.html.eex | 30 +++ .../templates/site/settings_general.html.eex | 7 +- .../templates/site/settings_people.html.eex | 149 ++++++++++++ .../templates/stats/site_locked.html.eex | 32 +++ .../templates/stats/stats.html.eex | 2 +- lib/plausible_web/views/layout_view.ex | 12 +- .../views/site/membership_view.ex | 3 + lib/plausible_web/views/site_view.ex | 20 ++ lib/workers/clean_invitations.ex | 14 ++ lib/workers/lock_sites.ex | 15 ++ lib/workers/send_check_stats_emails.ex | 2 +- lib/workers/send_email_report.ex | 2 +- lib/workers/send_site_setup_emails.ex | 14 +- lib/workers/send_trial_notifications.ex | 8 +- ...531080158_add_role_to_site_memberships.exs | 13 ++ .../20210601090924_add_invitations.exs | 18 ++ .../20210604085943_add_locked_to_sites.exs | 9 + test/plausible/auth/auth_test.exs | 19 +- test/plausible/billing/billing_test.exs | 76 +++++- test/plausible/billing/site_locker_test.exs | 110 +++++++++ test/plausible/sites_test.exs | 10 +- .../api/external_sites_controller_test.exs | 23 ++ .../invitation_controller_test.exs | 158 +++++++++++++ .../site/membership_controller_test.exs | 204 ++++++++++++++++ test/support/factory.ex | 12 + test/workers/clean_invitations_test.exs | 28 +++ test/workers/lock_sites_test.exs | 96 ++++++++ .../workers/send_trial_notifications_test.exs | 34 ++- 73 files changed, 2261 insertions(+), 287 deletions(-) create mode 100644 lib/plausible/auth/invitation.ex create mode 100644 lib/plausible/billing/site_locker.ex create mode 100644 lib/plausible_web/controllers/invitation_controller.ex create mode 100644 lib/plausible_web/controllers/site/membership_controller.ex create mode 100644 lib/plausible_web/plugs/authorize_site_access.ex delete mode 100644 lib/plausible_web/plugs/authorize_stats_plug.ex delete mode 100644 lib/plausible_web/plugs/upgrade_billing_plug.ex create mode 100644 lib/plausible_web/templates/auth/invitation_expired.html.eex create mode 100644 lib/plausible_web/templates/auth/register_from_invitation_form.html.eex create mode 100644 lib/plausible_web/templates/email/existing_user_invitation.html.eex create mode 100644 lib/plausible_web/templates/email/invitation_accepted.html.eex create mode 100644 lib/plausible_web/templates/email/invitation_rejected.html.eex create mode 100644 lib/plausible_web/templates/email/new_user_invitation.html.eex create mode 100644 lib/plausible_web/templates/email/ownership_transfer_accepted.html.eex create mode 100644 lib/plausible_web/templates/email/ownership_transfer_rejected.html.eex create mode 100644 lib/plausible_web/templates/email/ownership_transfer_request.html.eex create mode 100644 lib/plausible_web/templates/email/site_member_removed.html.eex create mode 100644 lib/plausible_web/templates/site/membership/invite_member_form.html.eex create mode 100644 lib/plausible_web/templates/site/membership/transfer_ownership_form.html.eex create mode 100644 lib/plausible_web/templates/site/settings_people.html.eex create mode 100644 lib/plausible_web/templates/stats/site_locked.html.eex create mode 100644 lib/plausible_web/views/site/membership_view.ex create mode 100644 lib/workers/clean_invitations.ex create mode 100644 lib/workers/lock_sites.ex create mode 100644 priv/repo/migrations/20210531080158_add_role_to_site_memberships.exs create mode 100644 priv/repo/migrations/20210601090924_add_invitations.exs create mode 100644 priv/repo/migrations/20210604085943_add_locked_to_sites.exs create mode 100644 test/plausible/billing/site_locker_test.exs create mode 100644 test/plausible_web/controllers/invitation_controller_test.exs create mode 100644 test/plausible_web/controllers/site/membership_controller_test.exs create mode 100644 test/workers/clean_invitations_test.exs create mode 100644 test/workers/lock_sites_test.exs diff --git a/CHANGELOG.md b/CHANGELOG.md index 19315b573..bf92042c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. `DATABASE_SOCKET_DIR` & `DATABASE_NAME` were added. - Time on Page metric available in detailed Top Pages report plausible/analytics#1007 - Added `CLICKHOUSE_FLUSH_INTERVAL_MS` and `CLICKHOUSE_MAX_BUFFER_SIZE` configuration parameters +- Ability to invite users to sites with different roles plausible/analytics#1122 ### Fixed - Fix weekly report time range plausible/analytics#951 diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.js index f2380ac54..9266cefb4 100644 --- a/assets/js/dashboard/historical.js +++ b/assets/js/dashboard/historical.js @@ -32,7 +32,7 @@ class Historical extends React.Component {
- +
diff --git a/assets/js/dashboard/index.js b/assets/js/dashboard/index.js index d5143d90f..42fa42d19 100644 --- a/assets/js/dashboard/index.js +++ b/assets/js/dashboard/index.js @@ -44,9 +44,9 @@ class Dashboard extends React.Component { render() { if (this.state.query.period === 'realtime') { - return + return } else { - return + return } } } diff --git a/assets/js/dashboard/mount.js b/assets/js/dashboard/mount.js index db86a5b18..635d2e5c4 100644 --- a/assets/js/dashboard/mount.js +++ b/assets/js/dashboard/mount.js @@ -20,6 +20,7 @@ if (container) { } const loggedIn = container.dataset.loggedIn === 'true' + const currentUserRole = container.dataset.currentUserRole const sharedLinkAuth = container.dataset.sharedLinkAuth if (sharedLinkAuth) { api.setSharedLinkAuth(sharedLinkAuth) @@ -27,7 +28,7 @@ if (container) { const app = ( - + ) diff --git a/assets/js/dashboard/router.js b/assets/js/dashboard/router.js index 23d223ba6..9183513ca 100644 --- a/assets/js/dashboard/router.js +++ b/assets/js/dashboard/router.js @@ -22,12 +22,12 @@ function ScrollToTop() { return null; } -export default function Router({site, loggedIn}) { +export default function Router({site, loggedIn, currentUserRole}) { return ( - + diff --git a/assets/js/dashboard/site-switcher.js b/assets/js/dashboard/site-switcher.js index 3269f2f64..33beb26a5 100644 --- a/assets/js/dashboard/site-switcher.js +++ b/assets/js/dashboard/site-switcher.js @@ -76,13 +76,29 @@ export default class SiteSwitcher extends React.Component { {e.target.onerror = null; e.target.src="https://icons.duckduckgo.com/ip3/placeholder.ico"}} className="inline w-4 mr-2 align-middle" /> - {domain} + {domain} {index < 9 && {index+1}} ) } + renderSettingsLink() { + if (['owner', 'admin'].includes(this.props.currentUserRole)) { + return ( + + +
+
+ ) + } + } + renderDropdown() { if (this.state.loading) { return
@@ -91,13 +107,7 @@ export default class SiteSwitcher extends React.Component { } else { return ( - -
+ { this.renderSettingsLink() }
{ this.state.sites.map(this.renderSiteLink.bind(this)) }
diff --git a/assets/js/dashboard/stats/sources/search-terms.js b/assets/js/dashboard/stats/sources/search-terms.js index 65018f8cd..77252269e 100644 --- a/assets/js/dashboard/stats/sources/search-terms.js +++ b/assets/js/dashboard/stats/sources/search-terms.js @@ -29,7 +29,7 @@ export default class SearchTerms extends React.Component { loading: false, searchTerms: res.search_terms || [], notConfigured: res.not_configured, - isOwner: res.is_owner + isAdmin: res.is_admin })) } @@ -65,7 +65,7 @@ export default class SearchTerms extends React.Component {
The site is not connected to Google Search Keywords
Cannot show search terms
- {this.state.isOwner && Connect with Google } + {this.state.isAdmin && Connect with Google }
) } else if (this.state.searchTerms.length > 0) { diff --git a/assets/tailwind.config.js b/assets/tailwind.config.js index a56552449..1e781ce1b 100644 --- a/assets/tailwind.config.js +++ b/assets/tailwind.config.js @@ -44,7 +44,8 @@ module.exports = { backgroundOpacity: ['dark'], display: ['dark'], cursor: ['hover'], - justifyContent: ['responsive'] + justifyContent: ['responsive'], + backgroundColor: ['odd', 'even'], } }, plugins: [ diff --git a/config/runtime.exs b/config/runtime.exs index b03608247..01d802527 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -272,7 +272,9 @@ if config_env() == :prod && !disable_cron do # Every 15 minutes {"*/15 * * * *", Plausible.Workers.SpikeNotifier}, # Every day at midnight - {"0 0 * * *", Plausible.Workers.CleanEmailVerificationCodes} + {"0 0 * * *", Plausible.Workers.CleanEmailVerificationCodes}, + # Every day at 1am + {"0 1 * * *", Plausible.Workers.CleanInvitations} ] extra_cron = [ @@ -283,7 +285,9 @@ if config_env() == :prod && !disable_cron do # Daily at 15 {"0 15 * * *", Plausible.Workers.NotifyAnnualRenewal}, # Every 10 minutes - {"*/10 * * * *", Plausible.Workers.ProvisionSslCertificates} + {"*/10 * * * *", Plausible.Workers.ProvisionSslCertificates}, + # Every midnight + {"0 0 * * *", Plausible.Workers.LockSites} ] base_queues = [ @@ -292,16 +296,18 @@ if config_env() == :prod && !disable_cron do send_email_reports: 1, spike_notifications: 1, fetch_tweets: 1, - clean_email_verification_codes: 1, check_stats_emails: 1, - site_setup_emails: 1 + site_setup_emails: 1, + clean_email_verification_codes: 1, + clean_invitations: 1 ] extra_queues = [ provision_ssl_certificates: 1, trial_notification_emails: 1, check_usage: 1, - notify_annual_renewal: 1 + notify_annual_renewal: 1, + lock_sites: 1 ] # Keep 30 days history diff --git a/lib/plausible/auth/auth.ex b/lib/plausible/auth/auth.ex index ecd4f5357..ac3c78643 100644 --- a/lib/plausible/auth/auth.ex +++ b/lib/plausible/auth/auth.ex @@ -59,8 +59,7 @@ defmodule Plausible.Auth do end def create_user(name, email, pwd) do - %Auth.User{} - |> Auth.User.new(%{name: name, email: email, password: pwd, password_confirmation: pwd}) + Auth.User.new(%{name: name, email: email, password: pwd, password_confirmation: pwd}) |> Repo.insert() end @@ -68,13 +67,14 @@ defmodule Plausible.Auth do Repo.get_by(Auth.User, opts) end - def user_completed_setup?(user) do + def has_active_sites?(user, roles \\ [:owner, :admin, :viewer]) do domains = Repo.all( from u in Plausible.Auth.User, where: u.id == ^user.id, join: sm in Plausible.Site.Membership, on: sm.user_id == u.id, + where: sm.role in ^roles, join: s in Plausible.Site, on: s.id == sm.site_id, select: s.domain @@ -82,4 +82,15 @@ defmodule Plausible.Auth do Stats.has_pageviews?(domains) end + + def user_owns_sites?(user) do + Repo.exists?( + from(s in Plausible.Site, + join: sm in Plausible.Site.Membership, + on: sm.site_id == s.id, + where: sm.user_id == ^user.id, + where: sm.role == :owner + ) + ) + end end diff --git a/lib/plausible/auth/invitation.ex b/lib/plausible/auth/invitation.ex new file mode 100644 index 000000000..189255732 --- /dev/null +++ b/lib/plausible/auth/invitation.ex @@ -0,0 +1,23 @@ +defmodule Plausible.Auth.Invitation do + use Ecto.Schema + import Ecto.Changeset + + @derive {Jason.Encoder, only: [:invitation_id, :role, :site]} + @required [:email, :role, :site_id, :inviter_id] + schema "invitations" do + field :invitation_id, :string + field :email, :string + field :role, Ecto.Enum, values: [:owner, :admin, :viewer] + + belongs_to :inviter, Plausible.Auth.User + belongs_to :site, Plausible.Site + + timestamps() + end + + def new(attrs \\ %{}) do + %__MODULE__{invitation_id: Nanoid.generate()} + |> cast(attrs, @required) + |> validate_required(@required) + end +end diff --git a/lib/plausible/auth/user.ex b/lib/plausible/auth/user.ex index aff7c1b3b..1c163fe5f 100644 --- a/lib/plausible/auth/user.ex +++ b/lib/plausible/auth/user.ex @@ -29,8 +29,8 @@ defmodule Plausible.Auth.User do timestamps() end - def new(user, attrs \\ %{}) do - user + def new(attrs \\ %{}) do + %Plausible.Auth.User{} |> cast(attrs, @required) |> validate_required(@required) |> validate_length(:password, min: 6, message: "has to be at least 6 characters") diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex index 4e0768649..af6b927a8 100644 --- a/lib/plausible/billing/billing.ex +++ b/lib/plausible/billing/billing.ex @@ -18,7 +18,7 @@ defmodule Plausible.Billing do changeset = Subscription.changeset(%Subscription{}, format_subscription(params)) - Repo.insert(changeset) + Repo.insert(changeset) |> check_lock_status end def subscription_updated(params) do @@ -119,10 +119,10 @@ defmodule Plausible.Billing do subscription.next_bill_date && !Timex.before?(subscription.next_bill_date, Timex.today()) end - defp subscription_is_active?(_), do: false + defp subscription_is_active?(%Subscription{}), do: false + defp subscription_is_active?(nil), do: false def on_trial?(user) do - user = Repo.preload(user, :subscription) !subscription_is_active?(user.subscription) && trial_days_left(user) >= 0 end @@ -135,8 +135,8 @@ defmodule Plausible.Billing do pageviews + custom_events end - defp get_usage_for_billing_cycle(user, cycle) do - domains = Enum.map(user.sites, & &1.domain) + defp get_usage_for_billing_cycle(sites, cycle) do + domains = Enum.map(sites, & &1.domain) ClickhouseRepo.one( from e in "events", @@ -149,11 +149,11 @@ defmodule Plausible.Billing do def last_two_billing_months_usage(user, today \\ Timex.today()) do {first, second} = last_two_billing_cycles(user, today) - user = Repo.preload(user, :sites) + sites = Plausible.Sites.owned_by(user) { - get_usage_for_billing_cycle(user, first), - get_usage_for_billing_cycle(user, second) + get_usage_for_billing_cycle(sites, first), + get_usage_for_billing_cycle(sites, second) } end @@ -178,9 +178,9 @@ defmodule Plausible.Billing do end def usage_breakdown(user) do - user = Repo.preload(user, :sites) + sites = Plausible.Sites.owned_by(user) - Enum.reduce(user.sites, {0, 0}, fn site, {pageviews, custom_events} -> + Enum.reduce(sites, {0, 0}, fn site, {pageviews, custom_events} -> usage = Plausible.Stats.Clickhouse.usage(site) {pageviews + Map.get(usage, "pageviews", 0), @@ -221,5 +221,16 @@ defmodule Plausible.Billing do defp present?(nil), do: false defp present?(_), do: true + defp check_lock_status({:ok, subscription}) do + user = + Repo.get(Plausible.Auth.User, subscription.user_id) + |> Map.put(:subscription, subscription) + + Plausible.Billing.SiteLocker.check_sites_for(user) + {:ok, subscription} + end + + defp check_lock_status(err), do: err + defp paddle_api(), do: Application.fetch_env!(:plausible, :paddle_api) end diff --git a/lib/plausible/billing/site_locker.ex b/lib/plausible/billing/site_locker.ex new file mode 100644 index 000000000..e7cbedb65 --- /dev/null +++ b/lib/plausible/billing/site_locker.ex @@ -0,0 +1,29 @@ +defmodule Plausible.Billing.SiteLocker do + use Plausible.Repo + + def check_sites_for(user) do + if Plausible.Billing.needs_to_upgrade?(user) do + set_lock_status_for(user, true) + else + set_lock_status_for(user, false) + end + end + + defp set_lock_status_for(user, status) do + site_ids = + Repo.all( + from s in Plausible.Site.Membership, + where: s.user_id == ^user.id, + where: s.role == :owner, + select: s.site_id + ) + + site_q = + from( + s in Plausible.Site, + where: s.id in ^site_ids + ) + + Repo.update_all(site_q, set: [locked: status]) + end +end diff --git a/lib/plausible/site/membership.ex b/lib/plausible/site/membership.ex index 2732dd8cd..52e7c94e8 100644 --- a/lib/plausible/site/membership.ex +++ b/lib/plausible/site/membership.ex @@ -3,15 +3,16 @@ defmodule Plausible.Site.Membership do import Ecto.Changeset schema "site_memberships" do + field :role, Ecto.Enum, values: [:owner, :admin, :viewer] belongs_to :site, Plausible.Site belongs_to :user, Plausible.Auth.User timestamps() end - def changeset(user, attrs) do - user - |> cast(attrs, [:user_id, :site_id]) + def changeset(schema, attrs) do + schema + |> cast(attrs, [:user_id, :site_id, :role]) |> validate_required([:user_id, :site_id]) end end diff --git a/lib/plausible/site/schema.ex b/lib/plausible/site/schema.ex index b0f907160..ade0ffc2c 100644 --- a/lib/plausible/site/schema.ex +++ b/lib/plausible/site/schema.ex @@ -9,8 +9,11 @@ defmodule Plausible.Site do field :domain, :string field :timezone, :string, default: "Etc/UTC" field :public, :boolean + field :locked, :boolean many_to_many :members, User, join_through: Plausible.Site.Membership + has_many :memberships, Plausible.Site.Membership + has_many :invitations, Plausible.Auth.Invitation has_one :google_auth, GoogleAuth has_one :weekly_report, Plausible.Site.WeeklyReport has_one :monthly_report, Plausible.Site.MonthlyReport diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 353d8e33c..f50f034dc 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -3,7 +3,7 @@ defmodule Plausible.Sites do alias Plausible.Site.{CustomDomain, SharedLink} def create(user, params) do - count = count_for(user) + count = Enum.count(owned_by(user)) limit = Plausible.Billing.sites_limit(user) if count >= limit do @@ -45,28 +45,23 @@ defmodule Plausible.Sites do base <> domain <> "?auth=" <> link.slug end - def get_for_user!(user_id, domain), do: Repo.one!(get_for_user_q(user_id, domain)) - def get_for_user(user_id, domain), do: Repo.one(get_for_user_q(user_id, domain)) + def get_for_user!(user_id, domain, roles \\ [:owner, :admin, :viewer]), + do: Repo.one!(get_for_user_q(user_id, domain, roles)) - def get_for_user_q(user_id, domain) do + def get_for_user(user_id, domain, roles \\ [:owner, :admin, :viewer]), + do: Repo.one(get_for_user_q(user_id, domain, roles)) + + defp get_for_user_q(user_id, domain, roles) do from(s in Plausible.Site, join: sm in Plausible.Site.Membership, on: sm.site_id == s.id, where: sm.user_id == ^user_id, + where: sm.role in ^roles, where: s.domain == ^domain, select: s ) end - def count_for(user) do - Repo.aggregate( - from(sm in Plausible.Site.Membership, - where: sm.user_id == ^user.id - ), - :count - ) - end - def has_goals?(site) do Repo.exists?( from g in Plausible.Goal, @@ -74,10 +69,39 @@ defmodule Plausible.Sites do ) end - def is_owner?(user_id, site) do - Repo.exists?( + def is_member?(user_id, site) do + role(user_id, site) !== nil + end + + def has_admin_access?(user_id, site) do + role(user_id, site) in [:admin, :owner] + end + + def role(user_id, site) do + Repo.one( from sm in Plausible.Site.Membership, - where: sm.user_id == ^user_id and sm.site_id == ^site.id + where: sm.user_id == ^user_id and sm.site_id == ^site.id, + select: sm.role + ) + end + + def owned_by(user) do + Repo.all( + from s in Plausible.Site, + join: sm in Plausible.Site.Membership, + on: sm.site_id == s.id, + where: sm.role == :owner, + where: sm.user_id == ^user.id + ) + end + + def owner_for(site) do + Repo.one( + from u in Plausible.Auth.User, + join: sm in Plausible.Site.Membership, + on: sm.user_id == u.id, + where: sm.site_id == ^site.id, + where: sm.role == :owner ) end diff --git a/lib/plausible_web/controllers/api/external_sites_controller.ex b/lib/plausible_web/controllers/api/external_sites_controller.ex index 444477707..bfff82719 100644 --- a/lib/plausible_web/controllers/api/external_sites_controller.ex +++ b/lib/plausible_web/controllers/api/external_sites_controller.ex @@ -37,7 +37,8 @@ defmodule PlausibleWeb.Api.ExternalSitesController do def find_or_create_shared_link(conn, params) do with {:ok, site_id} <- expect_param_key(params, "site_id"), {:ok, link_name} <- expect_param_key(params, "name"), - site when not is_nil(site) <- Sites.get_for_user(conn.assigns[:current_user].id, site_id) do + site when not is_nil(site) <- + Sites.get_for_user(conn.assigns[:current_user].id, site_id, [:owner, :admin]) do shared_link = Repo.get_by(Plausible.Site.SharedLink, site_id: site.id, name: link_name) shared_link = diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 33d7f510f..6f3806fdd 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -233,8 +233,8 @@ defmodule PlausibleWeb.Api.StatsController do nil -> {_, total_visitors} = Stats.pageviews_and_visitors(site, query) user_id = get_session(conn, :current_user_id) - is_owner = user_id && Plausible.Sites.is_owner?(user_id, site) - json(conn, %{not_configured: true, is_owner: is_owner, total_visitors: total_visitors}) + is_admin = user_id && Plausible.Sites.has_admin_access?(user_id, site) + json(conn, %{not_configured: true, is_admin: is_admin, total_visitors: total_visitors}) {:ok, terms} -> {_, total_visitors} = Stats.pageviews_and_visitors(site, query) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index be5540077..dfb878709 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -36,7 +36,7 @@ defmodule PlausibleWeb.AuthController do conn |> redirect(to: "/login") else - user = Plausible.Auth.User.new(%Plausible.Auth.User{}, params["user"]) + user = Plausible.Auth.User.new(params["user"]) if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do case Repo.insert(user) do @@ -70,8 +70,71 @@ defmodule PlausibleWeb.AuthController do end end + def register_from_invitation_form(conn, %{"invitation_id" => invitation_id}) do + if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do + conn + |> redirect(to: "/login") + else + invitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id) + changeset = Plausible.Auth.User.changeset(%Plausible.Auth.User{}) + + if invitation do + render(conn, "register_from_invitation_form.html", + changeset: changeset, + invitation: invitation, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) + else + render(conn, "invitation_expired.html", layout: {PlausibleWeb.LayoutView, "focus.html"}) + end + end + end + + def register_from_invitation(conn, %{"invitation_id" => invitation_id} = params) do + if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do + conn + |> redirect(to: "/login") + else + invitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id) + user = Plausible.Auth.User.new(params["user"]) + + if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do + case Repo.insert(user) do + {:ok, user} -> + code = Auth.issue_email_verification(user) + Logger.info("VERIFICATION CODE: #{code}") + email_template = PlausibleWeb.Email.activation_email(user, code) + Plausible.Mailer.send_email(email_template) + + conn + |> put_session(:current_user_id, user.id) + |> put_resp_cookie("logged_in", "true", + http_only: false, + max_age: 60 * 60 * 24 * 365 * 5000 + ) + |> redirect(to: "/activate") + + {:error, changeset} -> + render(conn, "register_from_invitation_form.html", + invitation: invitation, + changeset: changeset, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) + end + else + render(conn, "register_from_invitation_form.html", + invitation: invitation, + changeset: user, + captcha_error: "Please complete the captcha to register", + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) + end + end + end + def activate_form(conn, _params) do user = conn.assigns[:current_user] + invitation = Repo.get_by(Plausible.Auth.Invitation, email: user.email) has_code = Repo.exists?( @@ -81,22 +144,29 @@ defmodule PlausibleWeb.AuthController do render(conn, "activate.html", has_pin: has_code, + invitation: invitation, layout: {PlausibleWeb.LayoutView, "focus.html"} ) end def activate(conn, %{"code" => code}) do user = conn.assigns[:current_user] + invitation = Repo.get_by(Plausible.Auth.Invitation, email: user.email) {code, ""} = Integer.parse(code) case Auth.verify_email(user, code) do :ok -> - redirect(conn, to: "/sites/new") + if invitation do + redirect(conn, to: "/sites") + else + redirect(conn, to: "/sites/new") + end {:error, :incorrect} -> render(conn, "activate.html", error: "Incorrect activation code", has_pin: true, + invitation: invitation, layout: {PlausibleWeb.LayoutView, "focus.html"} ) @@ -104,6 +174,7 @@ defmodule PlausibleWeb.AuthController do render(conn, "activate.html", error: "Code is expired, please request another one", has_pin: false, + invitation: invitation, layout: {PlausibleWeb.LayoutView, "focus.html"} ) end diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.ex new file mode 100644 index 000000000..db1020ab2 --- /dev/null +++ b/lib/plausible_web/controllers/invitation_controller.ex @@ -0,0 +1,108 @@ +defmodule PlausibleWeb.InvitationController do + use PlausibleWeb, :controller + use Plausible.Repo + alias Ecto.Multi + alias Plausible.Auth.Invitation + alias Plausible.Site.Membership + + plug PlausibleWeb.RequireAccountPlug + + def accept_invitation(conn, %{"invitation_id" => invitation_id}) do + invitation = + Repo.get_by!(Invitation, invitation_id: invitation_id) + |> Repo.preload([:site, :inviter]) + + user = conn.assigns[:current_user] + existing_membership = Repo.get_by(Membership, user_id: user.id, site_id: invitation.site.id) + + multi = + if invitation.role == :owner do + downgrade_previous_owner(Multi.new(), invitation.site) + else + Multi.new() + end + + membership_changeset = + Membership.changeset(existing_membership || %Membership{}, %{ + user_id: user.id, + site_id: invitation.site.id, + role: invitation.role + }) + + multi = + multi + |> Multi.insert_or_update(:membership, membership_changeset) + |> Multi.delete(:invitation, invitation) + + case Repo.transaction(multi) do + {:ok, _} -> + notify_invitation_accepted(invitation) + Plausible.Billing.SiteLocker.check_sites_for(user) + + conn + |> put_flash(:success, "You now have access to #{invitation.site.domain}") + |> redirect(to: "/#{URI.encode_www_form(invitation.site.domain)}") + + {:error, _} -> + conn + |> put_flash(:error, "Something went wrong, please try again") + |> redirect(to: "/sites") + end + end + + defp downgrade_previous_owner(multi, site) do + prev_owner = + from( + sm in Plausible.Site.Membership, + where: sm.site_id == ^site.id, + where: sm.role == :owner + ) + + Multi.update_all(multi, :prev_owner, prev_owner, set: [role: :admin]) + end + + def reject_invitation(conn, %{"invitation_id" => invitation_id}) do + invitation = + Repo.get_by!(Invitation, invitation_id: invitation_id) + |> Repo.preload([:site, :inviter]) + + Repo.delete!(invitation) + notify_invitation_rejected(invitation) + + conn + |> put_flash(:success, "You have rejected the invitation to #{invitation.site.domain}") + |> redirect(to: "/sites") + end + + defp notify_invitation_accepted(%Invitation{role: :owner} = invitation) do + PlausibleWeb.Email.ownership_transfer_accepted(invitation) + |> Plausible.Mailer.send_email() + end + + defp notify_invitation_accepted(invitation) do + PlausibleWeb.Email.invitation_accepted(invitation) + |> Plausible.Mailer.send_email() + end + + defp notify_invitation_rejected(%Invitation{role: :owner} = invitation) do + PlausibleWeb.Email.ownership_transfer_rejected(invitation) + |> Plausible.Mailer.send_email() + end + + defp notify_invitation_rejected(invitation) do + PlausibleWeb.Email.invitation_rejected(invitation) + |> Plausible.Mailer.send_email() + end + + def remove_invitation(conn, %{"invitation_id" => invitation_id}) do + invitation = + Repo.get_by!(Invitation, invitation_id: invitation_id) + |> Repo.preload(:site) + + Repo.delete!(invitation) + + conn + |> put_flash(:success, "You have removed the invitation for #{invitation.email}") + |> redirect(to: Routes.site_path(conn, :settings_general, invitation.site.domain)) + end +end diff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.ex new file mode 100644 index 000000000..c8bb3f677 --- /dev/null +++ b/lib/plausible_web/controllers/site/membership_controller.ex @@ -0,0 +1,149 @@ +defmodule PlausibleWeb.Site.MembershipController do + use PlausibleWeb, :controller + use Plausible.Repo + alias Plausible.Sites + alias Plausible.Site.Membership + alias Plausible.Auth.Invitation + + @only_owner_is_allowed_to [:transfer_ownership_form, :transfer_ownership] + + plug PlausibleWeb.RequireAccountPlug + plug PlausibleWeb.AuthorizeSiteAccess, [:owner] when action in @only_owner_is_allowed_to + + plug PlausibleWeb.AuthorizeSiteAccess, + [:owner, :admin] when action not in @only_owner_is_allowed_to + + def invite_member_form(conn, %{"website" => site_domain}) do + site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain) + + render( + conn, + "invite_member_form.html", + site: site, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) + end + + def invite_member(conn, %{"website" => site_domain, "email" => email, "role" => role}) do + site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain) + user = Plausible.Auth.find_user_by(email: email) + + if user && Sites.is_member?(user.id, site) do + msg = "Cannot send invite because #{user.email} is already a member of #{site.domain}" + + render(conn, "invite_member_form.html", + error: msg, + site: site, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) + else + invitation = + Invitation.new(%{ + email: email, + role: role, + site_id: site.id, + inviter_id: conn.assigns[:current_user].id + }) + |> Repo.insert!() + |> Repo.preload([:site, :inviter]) + + email_template = + if user do + PlausibleWeb.Email.existing_user_invitation(invitation) + else + PlausibleWeb.Email.new_user_invitation(invitation) + end + + Plausible.Mailer.send_email(email_template) + + conn + |> put_flash( + :success, + "#{email} has been invited to #{site_domain} as #{ + PlausibleWeb.SiteView.with_indefinite_article(role) + }" + ) + |> redirect(to: Routes.site_path(conn, :settings_people, site.domain)) + end + end + + def transfer_ownership_form(conn, %{"website" => site_domain}) do + site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain) + + render( + conn, + "transfer_ownership_form.html", + site: site, + layout: {PlausibleWeb.LayoutView, "focus.html"} + ) + end + + def transfer_ownership(conn, %{"website" => site_domain, "email" => email}) do + site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain) + user = Plausible.Auth.find_user_by(email: email) + + invitation = + Invitation.new(%{ + email: email, + role: :owner, + site_id: site.id, + inviter_id: conn.assigns[:current_user].id + }) + |> Repo.insert!() + |> Repo.preload([:site, :inviter]) + + PlausibleWeb.Email.ownership_transfer_request(invitation, user) + |> Plausible.Mailer.send_email() + + conn + |> put_flash(:success, "Site transfer request has been sent to #{email}") + |> redirect(to: Routes.site_path(conn, :settings_people, site.domain)) + end + + def update_role(conn, %{"id" => id, "new_role" => new_role}) do + membership = + Repo.get!(Membership, id) + |> Repo.preload([:site, :user]) + |> Membership.changeset(%{role: new_role}) + |> Repo.update!() + + redirect_target = + if membership.user.id == conn.assigns[:current_user].id && new_role == "viewer" do + "/#{URI.encode_www_form(membership.site.domain)}" + else + Routes.site_path(conn, :settings_people, membership.site.domain) + end + + conn + |> put_flash( + :success, + "#{membership.user.name} is now #{PlausibleWeb.SiteView.with_indefinite_article(new_role)}" + ) + |> redirect(to: redirect_target) + end + + def remove_member(conn, %{"id" => id}) do + membership = + Repo.get!(Membership, id) + |> Repo.preload([:user, :site]) + + Repo.delete!(membership) + + PlausibleWeb.Email.site_member_removed(membership) + |> Plausible.Mailer.send_email() + + redirect_target = + if membership.user.id == conn.assigns[:current_user].id do + "/#{URI.encode_www_form(membership.site.domain)}" + else + Routes.site_path(conn, :settings_people, membership.site.domain) + end + + conn + |> put_flash( + :success, + "#{membership.user.name} has been removed from #{membership.site.domain}" + ) + |> redirect(to: redirect_target) + end +end diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 0599ed929..4f1b572c8 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -5,27 +5,53 @@ defmodule PlausibleWeb.SiteController do plug PlausibleWeb.RequireAccountPlug + plug PlausibleWeb.AuthorizeSiteAccess, + [:owner, :admin] when action not in [:index, :new, :create_site] + def index(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, - order_by: s.domain + where: s.id not in ^invitation_site_ids, + order_by: s.domain, + preload: [memberships: sm] ), params ) - visitors = Plausible.Stats.Clickhouse.last_24h_visitors(sites) - render(conn, "index.html", sites: sites, visitors: visitors, pagination: pagination) + 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.needs_to_upgrade?(user) + ) end def new(conn, _params) do current_user = conn.assigns[:current_user] - site_count = Plausible.Sites.count_for(current_user) + site_count = Enum.count(Plausible.Sites.owned_by(current_user)) site_limit = Plausible.Billing.sites_limit(current_user) is_at_limit = site_limit && site_count >= site_limit is_first_site = site_count == 0 @@ -43,7 +69,7 @@ defmodule PlausibleWeb.SiteController do def create_site(conn, %{"site" => site_params}) do user = conn.assigns[:current_user] - site_count = Plausible.Sites.count_for(user) + site_count = Enum.count(Plausible.Sites.owned_by(user)) is_first_site = site_count == 0 case Sites.create(user, site_params) do @@ -72,12 +98,9 @@ defmodule PlausibleWeb.SiteController do end end - def add_snippet(conn, %{"website" => website}) do + def add_snippet(conn, _params) do user = conn.assigns[:current_user] - - site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) - |> Repo.preload(:custom_domain) + site = conn.assigns[:site] |> Repo.preload(:custom_domain) is_first_site = !Repo.exists?( @@ -96,8 +119,8 @@ defmodule PlausibleWeb.SiteController do ) end - def new_goal(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def new_goal(conn, _params) do + site = conn.assigns[:site] changeset = Plausible.Goal.changeset(%Plausible.Goal{}) conn @@ -109,8 +132,8 @@ defmodule PlausibleWeb.SiteController do ) end - def create_goal(conn, %{"website" => website, "goal" => goal}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def create_goal(conn, %{"goal" => goal}) do + site = conn.assigns[:site] case Plausible.Goals.create(site, goal) do {:ok, _} -> @@ -141,9 +164,9 @@ defmodule PlausibleWeb.SiteController do redirect(conn, to: "/#{URI.encode_www_form(website)}/settings/general") end - def settings_general(conn, %{"website" => website}) do + def settings_general(conn, _params) do site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) + conn.assigns[:site] |> Repo.preload(:custom_domain) conn @@ -155,8 +178,22 @@ defmodule PlausibleWeb.SiteController do ) end - def settings_visibility(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def settings_people(conn, _params) do + site = + conn.assigns[:site] + |> Repo.preload(memberships: :user) + |> Repo.preload(:invitations) + + conn + |> assign(:skip_plausible_tracking, true) + |> render("settings_people.html", + site: site, + layout: {PlausibleWeb.LayoutView, "site_settings.html"} + ) + end + + def settings_visibility(conn, _params) do + site = conn.assigns[:site] shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id) conn @@ -168,8 +205,8 @@ defmodule PlausibleWeb.SiteController do ) end - def settings_goals(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def settings_goals(conn, _params) do + site = conn.assigns[:site] goals = Goals.for_site(site.domain) conn @@ -181,9 +218,9 @@ defmodule PlausibleWeb.SiteController do ) end - def settings_search_console(conn, %{"website" => website}) do + def settings_search_console(conn, _params) do site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) + conn.assigns[:site] |> Repo.preload(:google_auth) search_console_domains = @@ -200,8 +237,8 @@ defmodule PlausibleWeb.SiteController do ) end - def settings_email_reports(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def settings_email_reports(conn, _params) do + site = conn.assigns[:site] conn |> assign(:skip_plausible_tracking, true) @@ -214,9 +251,9 @@ defmodule PlausibleWeb.SiteController do ) end - def settings_custom_domain(conn, %{"website" => website}) do + def settings_custom_domain(conn, _params) do site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) + conn.assigns[:site] |> Repo.preload(:custom_domain) conn @@ -227,21 +264,17 @@ defmodule PlausibleWeb.SiteController do ) end - def settings_danger_zone(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) - + def settings_danger_zone(conn, _params) do conn |> assign(:skip_plausible_tracking, true) |> render("settings_danger_zone.html", - site: site, + site: conn.assigns[:site], layout: {PlausibleWeb.LayoutView, "site_settings.html"} ) end - def update_google_auth(conn, %{"website" => website, "google_auth" => attrs}) do - site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) - |> Repo.preload(:google_auth) + def update_google_auth(conn, %{"google_auth" => attrs}) do + site = conn.assigns[:site] |> Repo.preload(:google_auth) Plausible.Site.GoogleAuth.set_property(site.google_auth, attrs) |> Repo.update!() @@ -251,9 +284,9 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console") end - def delete_google_auth(conn, %{"website" => website}) do + def delete_google_auth(conn, _params) do site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) + conn.assigns[:site] |> Repo.preload(:google_auth) Repo.delete!(site.google_auth) @@ -263,8 +296,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console") end - def update_settings(conn, %{"website" => website, "site" => site_params}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def update_settings(conn, %{"site" => site_params}) do + site = conn.assigns[:site] changeset = site |> Plausible.Site.changeset(site_params) res = changeset |> Repo.update() @@ -282,8 +315,8 @@ defmodule PlausibleWeb.SiteController do end end - def reset_stats(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def reset_stats(conn, _params) do + site = conn.assigns[:site] Plausible.ClickhouseRepo.clear_stats_for(site.domain) conn @@ -291,8 +324,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/danger-zone") end - def delete_site(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def delete_site(conn, _params) do + site = conn.assigns[:site] Repo.delete!(site) Plausible.ClickhouseRepo.clear_stats_for(site.domain) @@ -302,9 +335,9 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/sites") end - def make_public(conn, %{"website" => website}) do + def make_public(conn, _params) do site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) + conn.assigns[:site] |> Plausible.Site.make_public() |> Repo.update!() @@ -313,9 +346,9 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility") end - def make_private(conn, %{"website" => website}) do + def make_private(conn, _params) do site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) + conn.assigns[:site] |> Plausible.Site.make_private() |> Repo.update!() @@ -324,8 +357,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility") end - def enable_weekly_report(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def enable_weekly_report(conn, _params) do + site = conn.assigns[:site] Plausible.Site.WeeklyReport.changeset(%Plausible.Site.WeeklyReport{}, %{ site_id: site.id, @@ -338,8 +371,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def disable_weekly_report(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def disable_weekly_report(conn, _params) do + site = conn.assigns[:site] Repo.delete_all(from wr in Plausible.Site.WeeklyReport, where: wr.site_id == ^site.id) conn @@ -347,8 +380,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def add_weekly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def add_weekly_report_recipient(conn, %{"recipient" => recipient}) do + site = conn.assigns[:site] Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id) |> Plausible.Site.WeeklyReport.add_recipient(recipient) @@ -359,8 +392,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def remove_weekly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def remove_weekly_report_recipient(conn, %{"recipient" => recipient}) do + site = conn.assigns[:site] Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id) |> Plausible.Site.WeeklyReport.remove_recipient(recipient) @@ -374,8 +407,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def enable_monthly_report(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def enable_monthly_report(conn, _params) do + site = conn.assigns[:site] Plausible.Site.MonthlyReport.changeset(%Plausible.Site.MonthlyReport{}, %{ site_id: site.id, @@ -388,8 +421,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def disable_monthly_report(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def disable_monthly_report(conn, _params) do + site = conn.assigns[:site] Repo.delete_all(from mr in Plausible.Site.MonthlyReport, where: mr.site_id == ^site.id) conn @@ -397,8 +430,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def add_monthly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def add_monthly_report_recipient(conn, %{"recipient" => recipient}) do + site = conn.assigns[:site] Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id) |> Plausible.Site.MonthlyReport.add_recipient(recipient) @@ -409,8 +442,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def remove_monthly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def remove_monthly_report_recipient(conn, %{"recipient" => recipient}) do + site = conn.assigns[:site] Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id) |> Plausible.Site.MonthlyReport.remove_recipient(recipient) @@ -424,8 +457,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def enable_spike_notification(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def enable_spike_notification(conn, _params) do + site = conn.assigns[:site] res = Plausible.Site.SpikeNotification.changeset(%Plausible.Site.SpikeNotification{}, %{ @@ -448,8 +481,8 @@ defmodule PlausibleWeb.SiteController do end end - def disable_spike_notification(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def disable_spike_notification(conn, _params) do + site = conn.assigns[:site] Repo.delete_all(from mr in Plausible.Site.SpikeNotification, where: mr.site_id == ^site.id) conn @@ -457,8 +490,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def update_spike_notification(conn, %{"website" => website, "spike_notification" => params}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def update_spike_notification(conn, %{"spike_notification" => params}) do + site = conn.assigns[:site] notification = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id) Plausible.Site.SpikeNotification.changeset(notification, params) @@ -469,8 +502,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def add_spike_notification_recipient(conn, %{"website" => website, "recipient" => recipient}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def add_spike_notification_recipient(conn, %{"recipient" => recipient}) do + site = conn.assigns[:site] Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id) |> Plausible.Site.SpikeNotification.add_recipient(recipient) @@ -481,8 +514,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def remove_spike_notification_recipient(conn, %{"website" => website, "recipient" => recipient}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def remove_spike_notification_recipient(conn, %{"recipient" => recipient}) do + site = conn.assigns[:site] Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id) |> Plausible.Site.SpikeNotification.remove_recipient(recipient) @@ -496,8 +529,8 @@ defmodule PlausibleWeb.SiteController do |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end - def new_shared_link(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def new_shared_link(conn, _params) do + site = conn.assigns[:site] changeset = Plausible.Site.SharedLink.changeset(%Plausible.Site.SharedLink{}, %{}) conn @@ -509,8 +542,8 @@ defmodule PlausibleWeb.SiteController do ) end - def create_shared_link(conn, %{"website" => website, "shared_link" => link}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def create_shared_link(conn, %{"shared_link" => link}) do + site = conn.assigns[:site] case Sites.create_shared_link(site, link["name"], link["password"]) do {:ok, _created} -> @@ -527,8 +560,8 @@ defmodule PlausibleWeb.SiteController do end end - def edit_shared_link(conn, %{"website" => website, "slug" => slug}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def edit_shared_link(conn, %{"slug" => slug}) do + site = conn.assigns[:site] shared_link = Repo.get_by(Plausible.Site.SharedLink, slug: slug) changeset = Plausible.Site.SharedLink.changeset(shared_link, %{}) @@ -541,8 +574,8 @@ defmodule PlausibleWeb.SiteController do ) end - def update_shared_link(conn, %{"website" => website, "slug" => slug, "shared_link" => params}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def update_shared_link(conn, %{"slug" => slug, "shared_link" => params}) do + site = conn.assigns[:site] shared_link = Repo.get_by(Plausible.Site.SharedLink, slug: slug) changeset = Plausible.Site.SharedLink.changeset(shared_link, params) @@ -561,8 +594,8 @@ defmodule PlausibleWeb.SiteController do end end - def delete_shared_link(conn, %{"website" => website, "slug" => slug}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def delete_shared_link(conn, %{"slug" => slug}) do + site = conn.assigns[:site] Repo.get_by(Plausible.Site.SharedLink, slug: slug) |> Repo.delete!() @@ -570,8 +603,8 @@ defmodule PlausibleWeb.SiteController do redirect(conn, to: "/#{URI.encode_www_form(site.domain)}/settings/visibility") end - def new_custom_domain(conn, %{"website" => website}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def new_custom_domain(conn, _params) do + site = conn.assigns[:site] changeset = Plausible.Site.CustomDomain.changeset(%Plausible.Site.CustomDomain{}, %{}) conn @@ -583,10 +616,8 @@ defmodule PlausibleWeb.SiteController do ) end - def custom_domain_dns_setup(conn, %{"website" => website}) do - site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) - |> Repo.preload(:custom_domain) + def custom_domain_dns_setup(conn, _params) do + site = conn.assigns[:site] |> Repo.preload(:custom_domain) conn |> assign(:skip_plausible_tracking, true) @@ -596,9 +627,9 @@ defmodule PlausibleWeb.SiteController do ) end - def custom_domain_snippet(conn, %{"website" => website}) do + def custom_domain_snippet(conn, _params) do site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) + conn.assigns[:site] |> Repo.preload(:custom_domain) conn @@ -609,8 +640,8 @@ defmodule PlausibleWeb.SiteController do ) end - def add_custom_domain(conn, %{"website" => website, "custom_domain" => domain}) do - site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + def add_custom_domain(conn, %{"custom_domain" => domain}) do + site = conn.assigns[:site] case Sites.add_custom_domain(site, domain["domain"]) do {:ok, _custom_domain} -> @@ -627,9 +658,9 @@ defmodule PlausibleWeb.SiteController do end end - def delete_custom_domain(conn, %{"website" => website}) do + def delete_custom_domain(conn, _params) do site = - Sites.get_for_user!(conn.assigns[:current_user].id, website) + conn.assigns[:site] |> Repo.preload(:custom_domain) Repo.delete!(site.custom_domain) diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index 7becf8aa4..cdd2023f4 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -4,33 +4,37 @@ defmodule PlausibleWeb.StatsController do alias Plausible.Stats.Clickhouse, as: Stats alias Plausible.Stats.Query - plug PlausibleWeb.AuthorizeStatsPlug when action in [:stats, :csv_export] - plug PlausibleWeb.UpgradeBillingPlug when action in [:stats] - - def base_domain() do - PlausibleWeb.Endpoint.host() - end + plug PlausibleWeb.AuthorizeSiteAccess when action in [:stats, :csv_export] def stats(%{assigns: %{site: site}} = conn, _params) do - if Stats.has_pageviews?(site) do - demo = site.domain == base_domain() - offer_email_report = get_session(conn, site.domain <> "_offer_email_report") + has_pageviews = Stats.has_pageviews?(site) - conn - |> assign(:skip_plausible_tracking, !demo) - |> remove_email_report_banner(site) - |> put_resp_header("x-robots-tag", "noindex") - |> render("stats.html", - site: site, - has_goals: Plausible.Sites.has_goals?(site), - title: "Plausible · " <> site.domain, - offer_email_report: offer_email_report, - demo: demo - ) - else - conn - |> assign(:skip_plausible_tracking, true) - |> render("waiting_first_pageview.html", site: site) + cond do + !site.locked && has_pageviews -> + demo = site.domain == PlausibleWeb.Endpoint.host() + offer_email_report = get_session(conn, site.domain <> "_offer_email_report") + + conn + |> assign(:skip_plausible_tracking, !demo) + |> remove_email_report_banner(site) + |> put_resp_header("x-robots-tag", "noindex") + |> render("stats.html", + site: site, + has_goals: Plausible.Sites.has_goals?(site), + title: "Plausible · " <> site.domain, + offer_email_report: offer_email_report, + demo: demo + ) + + !site.locked && !has_pageviews -> + conn + |> assign(:skip_plausible_tracking, true) + |> render("waiting_first_pageview.html", site: site) + + site.locked -> + conn + |> assign(:skip_plausible_tracking, true) + |> render("site_locked.html", site: site) end end diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.ex index ab2eef03b..c63782f87 100644 --- a/lib/plausible_web/email.ex +++ b/lib/plausible_web/email.ex @@ -164,6 +164,103 @@ defmodule PlausibleWeb.Email do |> render("cancellation_email.html", name: user.name) end + def new_user_invitation(invitation) do + base_email() + |> to(invitation.email) + |> tag("new-user-invitation") + |> subject("[Plausible Analytics] You've been invited to #{invitation.site.domain}") + |> render("new_user_invitation.html", + invitation: invitation + ) + end + + def existing_user_invitation(invitation) do + base_email() + |> to(invitation.email) + |> tag("existing-user-invitation") + |> subject("[Plausible Analytics] You've been invited to #{invitation.site.domain}") + |> render("existing_user_invitation.html", + invitation: invitation + ) + end + + def ownership_transfer_request(invitation, new_owner_account) do + base_email() + |> to(invitation.email) + |> tag("ownership-transfer-request") + |> subject("[Plausible Analytics] Request to transfer ownership of #{invitation.site.domain}") + |> render("ownership_transfer_request.html", + invitation: invitation, + new_owner_account: new_owner_account + ) + end + + def invitation_accepted(invitation) do + base_email() + |> to(invitation.inviter.email) + |> tag("invitation-accepted") + |> subject( + "[Plausible Analytics] #{invitation.email} accepted your invitation to #{ + invitation.site.domain + }" + ) + |> render("invitation_accepted.html", + invitation: invitation + ) + end + + def invitation_rejected(invitation) do + base_email() + |> to(invitation.inviter.email) + |> tag("invitation-rejected") + |> subject( + "[Plausible Analytics] #{invitation.email} rejected your invitation to #{ + invitation.site.domain + }" + ) + |> render("invitation_rejected.html", + invitation: invitation + ) + end + + def ownership_transfer_accepted(invitation) do + base_email() + |> to(invitation.inviter.email) + |> tag("ownership-transfer-accepted") + |> subject( + "[Plausible Analytics] #{invitation.email} accepted the ownership transfer of #{ + invitation.site.domain + }" + ) + |> render("ownership_transfer_accepted.html", + invitation: invitation + ) + end + + def ownership_transfer_rejected(invitation) do + base_email() + |> to(invitation.inviter.email) + |> tag("ownership-transfer-rejected") + |> subject( + "[Plausible Analytics] #{invitation.email} rejected the ownership transfer of #{ + invitation.site.domain + }" + ) + |> render("ownership_transfer_rejected.html", + invitation: invitation + ) + end + + def site_member_removed(membership) do + base_email() + |> to(membership.user.email) + |> tag("site-member-removed") + |> subject("[Plausible Analytics] Your access to #{membership.site.domain} has been revoked") + |> render("site_member_removed.html", + membership: membership + ) + end + defp base_email() do mailer_from = Application.get_env(:plausible, :mailer_email) diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.ex new file mode 100644 index 000000000..754820b91 --- /dev/null +++ b/lib/plausible_web/plugs/authorize_site_access.ex @@ -0,0 +1,43 @@ +defmodule PlausibleWeb.AuthorizeSiteAccess do + import Plug.Conn + use Plausible.Repo + + def init([]), do: [:public, :viewer, :admin, :owner] + def init(allowed_roles), do: allowed_roles + + def call(conn, allowed_roles) do + site = Repo.get_by(Plausible.Site, domain: conn.params["domain"] || conn.params["website"]) + shared_link_auth = conn.params["auth"] + + shared_link_record = + shared_link_auth && Repo.get_by(Plausible.Site.SharedLink, slug: shared_link_auth) + + if !site do + PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt + else + user_id = get_session(conn, :current_user_id) + membership_role = user_id && Plausible.Sites.role(user_id, site) + + role = + cond do + user_id && membership_role -> + membership_role + + site.public -> + :public + + shared_link_record && shared_link_record.site_id == site.id -> + :public + + true -> + nil + end + + if role in allowed_roles do + merge_assigns(conn, site: site, current_user_role: role) + else + PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt + end + end + end +end diff --git a/lib/plausible_web/plugs/authorize_stats_api.ex b/lib/plausible_web/plugs/authorize_stats_api.ex index 6b76ec2e2..e16ce6437 100644 --- a/lib/plausible_web/plugs/authorize_stats_api.ex +++ b/lib/plausible_web/plugs/authorize_stats_api.ex @@ -45,10 +45,10 @@ defmodule PlausibleWeb.AuthorizeStatsApiPlug do defp verify_access(api_key, site_id) do site = Repo.get_by(Plausible.Site, domain: site_id) - is_owner = site && Plausible.Sites.is_owner?(api_key.user_id, site) + is_member = site && Plausible.Sites.is_member?(api_key.user_id, site) cond do - site && is_owner -> {:ok, site} + site && is_member -> {:ok, site} true -> {:error, :invalid_api_key} end end diff --git a/lib/plausible_web/plugs/authorize_stats_plug.ex b/lib/plausible_web/plugs/authorize_stats_plug.ex deleted file mode 100644 index 37076c092..000000000 --- a/lib/plausible_web/plugs/authorize_stats_plug.ex +++ /dev/null @@ -1,33 +0,0 @@ -defmodule PlausibleWeb.AuthorizeStatsPlug do - import Plug.Conn - use Plausible.Repo - - def init(options) do - options - end - - def call(conn, _opts) do - site = Repo.get_by(Plausible.Site, domain: conn.params["domain"]) - shared_link_auth = conn.params["auth"] - - shared_link_record = - shared_link_auth && Repo.get_by(Plausible.Site.SharedLink, slug: shared_link_auth) - - if !site do - PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt - else - user_id = get_session(conn, :current_user_id) - - can_access = - site.public || - (user_id && Plausible.Sites.is_owner?(user_id, site)) || - (shared_link_auth && shared_link_record && shared_link_record.site_id == site.id) - - if !can_access do - PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt - else - assign(conn, :site, site) - end - end - end -end diff --git a/lib/plausible_web/plugs/upgrade_billing_plug.ex b/lib/plausible_web/plugs/upgrade_billing_plug.ex deleted file mode 100644 index 7cef0b9f3..000000000 --- a/lib/plausible_web/plugs/upgrade_billing_plug.ex +++ /dev/null @@ -1,21 +0,0 @@ -defmodule PlausibleWeb.UpgradeBillingPlug do - import Phoenix.Controller - import Plug.Conn - use Plausible.Repo - - def init(options) do - options - end - - def call(conn, _opts) do - user = conn.assigns[:current_user] - - if user && Plausible.Billing.needs_to_upgrade?(conn.assigns[:current_user]) do - conn - |> redirect(to: "/settings") - |> halt - else - conn - end - end -end diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index c7cbf68f4..b8778693d 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -33,7 +33,7 @@ defmodule PlausibleWeb.Router do plug :accepts, ["json"] plug PlausibleWeb.Firewall plug :fetch_session - plug PlausibleWeb.AuthorizeStatsPlug + plug PlausibleWeb.AuthorizeSiteAccess end pipeline :public_api do @@ -105,6 +105,8 @@ defmodule PlausibleWeb.Router do get "/register", AuthController, :register_form post "/register", AuthController, :register + get "/register/invitation/:invitation_id", AuthController, :register_from_invitation_form + post "/register/invitation/:invitation_id", AuthController, :register_from_invitation get "/activate", AuthController, :activate_form post "/activate/request-code", AuthController, :request_activation_code post "/activate", AuthController, :activate @@ -195,12 +197,26 @@ defmodule PlausibleWeb.Router do post "/sites/:website/custom-domains", SiteController, :add_custom_domain delete "/sites/:website/custom-domains/:id", SiteController, :delete_custom_domain + get "/sites/:website/memberships/invite", Site.MembershipController, :invite_member_form + post "/sites/:website/memberships/invite", Site.MembershipController, :invite_member + + post "/sites//invitations/:invitation_id/accept", InvitationController, :accept_invitation + post "/sites//invitations/:invitation_id/reject", InvitationController, :reject_invitation + delete "/sites//invitations/:invitation_id", InvitationController, :remove_invitation + + get "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership_form + post "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership + + put "/sites/:website/memberships/:id/role/:new_role", Site.MembershipController, :update_role + delete "/sites/:website/memberships/:id", Site.MembershipController, :remove_member + get "/sites/:website/weekly-report/unsubscribe", UnsubscribeController, :weekly_report get "/sites/:website/monthly-report/unsubscribe", UnsubscribeController, :monthly_report get "/:website/snippet", SiteController, :add_snippet get "/:website/settings", SiteController, :settings get "/:website/settings/general", SiteController, :settings_general + get "/:website/settings/people", SiteController, :settings_people get "/:website/settings/visibility", SiteController, :settings_visibility get "/:website/settings/goals", SiteController, :settings_goals get "/:website/settings/search-console", SiteController, :settings_search_console diff --git a/lib/plausible_web/templates/auth/activate.html.eex b/lib/plausible_web/templates/auth/activate.html.eex index 34e7a9246..d009f67f5 100644 --- a/lib/plausible_web/templates/auth/activate.html.eex +++ b/lib/plausible_web/templates/auth/activate.html.eex @@ -47,7 +47,9 @@
<% end %> - + <%= if !@invitation do %> + + <% end %> diff --git a/lib/plausible_web/templates/auth/invitation_expired.html.eex b/lib/plausible_web/templates/auth/invitation_expired.html.eex new file mode 100644 index 000000000..2158a4c2c --- /dev/null +++ b/lib/plausible_web/templates/auth/invitation_expired.html.eex @@ -0,0 +1,12 @@ +
+

Plausible Analytics

+
Lightweight and privacy-friendly web analytics
+
+ +
+

Invitation expired

+ +

+ Your invitation has expired. Please request fresh one or you can <%= link("sign up", class: "text-indigo-600 hover:text-indigo-900", to: Routes.auth_path(@conn, :register)) %> for a 30-day unlimited free trial without an invitation. +

+
diff --git a/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex b/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex new file mode 100644 index 000000000..1cc9e94c1 --- /dev/null +++ b/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex @@ -0,0 +1,61 @@ +
+

Register your Plausible Analytics account

+
Set up privacy-friendly analytics with just a few clicks
+
+ +<%= form_for @changeset, Routes.auth_path(@conn, :register_from_invitation_form, @invitation.invitation_id), [class: "w-full max-w-md mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 mb-4 mt-8", id: "register-form"], fn f -> %> +

Enter your details

+
+
+ <%= label f, :email, class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %> +

No spam, guaranteed.

+
+
+ <%= email_input f, :email, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300", placeholder: "example@email.com", value: @invitation.email, readonly: "readonly" %> +
+ <%= error_tag f, :email %> +
+ +
+ <%= label f, :name, "Full name", class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %> +
+ <%= text_input f, :name, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300", placeholder: "Jane Doe" %> +
+ <%= error_tag f, :name %> +
+ +
+
+ <%= label f, :password, class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %> +

Min 6 characters

+
+
+ <%= password_input f, :password, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300" %> +
+ <%= error_tag f, :password %> +
+ +
+ <%= label f, :password_confirmation, class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %> +
+ <%= password_input f, :password_confirmation, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300" %> +
+ <%= error_tag f, :password_confirmation %> +
+ + <%= if PlausibleWeb.Captcha.enabled?() do %> +
+
+ <%= if assigns[:captcha_error] do %> +
<%= @captcha_error %>
+ <% end %> + +
+ <% end %> + + <%= submit "Create my account →", class: "button mt-4 w-full" %> + +

+ Already have an account? <%= link("Log in", to: "/login", class: "underline text-gray-800 dark:text-gray-50") %> instead. +

+<% end %> diff --git a/lib/plausible_web/templates/email/existing_user_invitation.html.eex b/lib/plausible_web/templates/email/existing_user_invitation.html.eex new file mode 100644 index 000000000..c1bc0354b --- /dev/null +++ b/lib/plausible_web/templates/email/existing_user_invitation.html.eex @@ -0,0 +1,10 @@ +Hey, +

+<%= @invitation.inviter.email %> has invited you to the <%= @invitation.site.domain %> site on Plausible Analytics. +<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view and respond to the invitation. The invitation +will expire 48 hours after this email is sent. +

+Thanks,
+Uku and Marko
+--
+<%= plausible_url() %>
diff --git a/lib/plausible_web/templates/email/invitation_accepted.html.eex b/lib/plausible_web/templates/email/invitation_accepted.html.eex new file mode 100644 index 000000000..f437183d2 --- /dev/null +++ b/lib/plausible_web/templates/email/invitation_accepted.html.eex @@ -0,0 +1,9 @@ +Hey <%= user_salutation(@invitation.inviter) %>, +

+<%= @invitation.email %> has accepted your invitation to <%= @invitation.site.domain %>. +<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings. +

+Thanks,
+Uku and Marko
+--
+<%= plausible_url() %>
diff --git a/lib/plausible_web/templates/email/invitation_rejected.html.eex b/lib/plausible_web/templates/email/invitation_rejected.html.eex new file mode 100644 index 000000000..ef40174ba --- /dev/null +++ b/lib/plausible_web/templates/email/invitation_rejected.html.eex @@ -0,0 +1,9 @@ +Hey <%= user_salutation(@invitation.inviter) %>, +

+<%= @invitation.email %> has rejected your invitation to <%= @invitation.site.domain %>. +<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings. +

+Thanks,
+Uku and Marko
+--
+<%= plausible_url() %>
diff --git a/lib/plausible_web/templates/email/new_user_invitation.html.eex b/lib/plausible_web/templates/email/new_user_invitation.html.eex new file mode 100644 index 000000000..8e8ab7552 --- /dev/null +++ b/lib/plausible_web/templates/email/new_user_invitation.html.eex @@ -0,0 +1,11 @@ +Hey, +

+<%= @invitation.inviter.email %> has invited you to join the <%= @invitation.site.domain %> site on Plausible Analytics. +<%= link("Click here", to: Routes.auth_url(PlausibleWeb.Endpoint, :register_form), invitation: @invitation.invitation_id) %> to create your account. The link is valid for 48 hours after this email is sent. +

+Plausible is a lightweight and open-source website analytics tool. We hope you like our simple and ethical approach to tracking website visitors. +

+Thanks,
+Uku and Marko
+--
+<%= plausible_url() %>
diff --git a/lib/plausible_web/templates/email/ownership_transfer_accepted.html.eex b/lib/plausible_web/templates/email/ownership_transfer_accepted.html.eex new file mode 100644 index 000000000..1d8dcf53c --- /dev/null +++ b/lib/plausible_web/templates/email/ownership_transfer_accepted.html.eex @@ -0,0 +1,10 @@ +Hey <%= user_salutation(@invitation.inviter) %>, +

+<%= @invitation.email %> has accepted the ownership transfer of <%= @invitation.site.domain %>. They will be responsible for billing of it going +forward and your role has been changed to admin. +<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings. +

+Thanks,
+Uku and Marko
+--
+<%= plausible_url() %>
diff --git a/lib/plausible_web/templates/email/ownership_transfer_rejected.html.eex b/lib/plausible_web/templates/email/ownership_transfer_rejected.html.eex new file mode 100644 index 000000000..b67ca63e0 --- /dev/null +++ b/lib/plausible_web/templates/email/ownership_transfer_rejected.html.eex @@ -0,0 +1,9 @@ +Hey <%= user_salutation(@invitation.inviter) %>, +

+<%= @invitation.email %> has rejected the ownership transfer of <%= @invitation.site.domain %>. +<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings. +

+Thanks,
+Uku and Marko
+--
+<%= plausible_url() %>
diff --git a/lib/plausible_web/templates/email/ownership_transfer_request.html.eex b/lib/plausible_web/templates/email/ownership_transfer_request.html.eex new file mode 100644 index 000000000..4d48468f1 --- /dev/null +++ b/lib/plausible_web/templates/email/ownership_transfer_request.html.eex @@ -0,0 +1,15 @@ +Hey, +

+<%= @invitation.inviter.email %> has request to transfer the ownership of <%= @invitation.site.domain %> site on Plausible Analytics to you. +<%= if @new_owner_account do %> + <%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view and respond to the invitation. +<% else %> + <%= link("Click here", to: Routes.auth_url(PlausibleWeb.Endpoint, :register_form), invitation: @invitation.invitation_id) %> to create your account. +

+ Plausible is a lightweight and open-source website analytics tool. We hope you like our simple and ethical approach to tracking website visitors. +<% end %> +

+Thanks,
+Uku and Marko
+--
+<%= plausible_url() %>
diff --git a/lib/plausible_web/templates/email/site_member_removed.html.eex b/lib/plausible_web/templates/email/site_member_removed.html.eex new file mode 100644 index 000000000..1634b7dcf --- /dev/null +++ b/lib/plausible_web/templates/email/site_member_removed.html.eex @@ -0,0 +1,10 @@ +Hey <%= user_salutation(@membership.user) %>, +

+An administrator of <%= @membership.site.domain %> has removed you as a member. You won't be able to see the stats anymore. +

+<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view your sites. +

+Thanks,
+Uku and Marko
+--
+<%= plausible_url() %>
diff --git a/lib/plausible_web/templates/layout/_header.html.eex b/lib/plausible_web/templates/layout/_header.html.eex index 6a989a777..f694df450 100644 --- a/lib/plausible_web/templates/layout/_header.html.eex +++ b/lib/plausible_web/templates/layout/_header.html.eex @@ -21,11 +21,12 @@ <% end %> <% end %> - <%= if !Application.get_env(:plausible, :is_selfhost) && @conn.assigns[:current_user].subscription == nil do %> + <%= if Plausible.Billing.on_trial?(@conn.assigns[:current_user]) do %> - <% else %> + <% end %> + <%= if !Application.get_env(:plausible, :is_selfhost) do %> diff --git a/lib/plausible_web/templates/layout/site_settings.html.eex b/lib/plausible_web/templates/layout/site_settings.html.eex index 1199fb503..91e78cc64 100644 --- a/lib/plausible_web/templates/layout/site_settings.html.eex +++ b/lib/plausible_web/templates/layout/site_settings.html.eex @@ -9,10 +9,10 @@
<%= form_for @conn, "/sites/#{URI.encode_www_form(@site.domain)}/monthly-report/recipients", [class: "lg:hidden"], fn f -> %> - <%= select f, :tab, settings_tabs(), class: "dark:bg-gray-800 mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-500 outline-none focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:text-gray-100", onchange: "location.href = location.href.replace(/[^\/\/]*$/, event.target.value)", selected: List.last(@conn.path_info) %> + <%= select f, :tab, settings_tabs(@conn), class: "dark:bg-gray-800 mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-500 outline-none focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:text-gray-100", onchange: "location.href = location.href.replace(/[^\/\/]*$/, event.target.value)", selected: List.last(@conn.path_info) %> <% end %> diff --git a/lib/plausible_web/templates/site/index.html.eex b/lib/plausible_web/templates/site/index.html.eex index dc5e9367c..abb29e6d8 100644 --- a/lib/plausible_web/templates/site/index.html.eex +++ b/lib/plausible_web/templates/site/index.html.eex @@ -1,5 +1,29 @@ -
-
+
+ + <%= if @needs_to_upgrade 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 %> + +

My sites

@@ -7,10 +31,34 @@
    - <%= if Enum.empty?(@sites) do %> + <%= if Enum.empty?(@sites ++ @invitations) do %>

    You don't have any sites yet

    <% end %> + <%= 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 + + +
    +
  • +
    + <% end %> + <%= for site <- @sites do %>
    <%= link(to: "/" <> URI.encode_www_form(site.domain)) do %> @@ -30,9 +78,10 @@
    <% end %> - - <%= link(to: "/" <> URI.encode_www_form(site.domain) <> "/settings", class: "absolute top-0 right-0 p-4 mt-1") do %> - + <%= 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 %>
<% end %> @@ -58,4 +107,74 @@ <% end %> <% end %> + <%= if Enum.any?(@invitations) do %> + + <% end %>
diff --git a/lib/plausible_web/templates/site/membership/invite_member_form.html.eex b/lib/plausible_web/templates/site/membership/invite_member_form.html.eex new file mode 100644 index 000000000..c358b1412 --- /dev/null +++ b/lib/plausible_web/templates/site/membership/invite_member_form.html.eex @@ -0,0 +1,63 @@ +<%= form_for @conn, Routes.membership_path(@conn, :invite_member, @site.domain), [class: "max-w-lg w-full mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 pt-6 pb-8 mb-4 mt-8"], fn f -> %> +

Invite member to <%= @site.domain %>

+ +

+ Enter the email address and role of the person you want to invite. We will contact them over email to offer them access to + <%= @site.domain %> analytics. +

+ +

+ The invitation will expire in 48 hours +

+ + <%= if @conn.assigns[:error] do %> +
<%= @conn.assigns[:error] %>
+ <% end %> + +
+ <%= label f, :email, "Email address", class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %> +
+
+ +
+ <%= email_input(f, :email, class: "focus:ring-indigo-500 focus:border-indigo-500 block w-full rounded-md pl-10 sm:text-sm border-gray-300", placeholder: "john.doe@example.com", required: "true") %> +
+ <%= error_tag f, :email %> +
+ +
+ <%= label f, :role, class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %> +
+ + + +
+
+ +
+ <%= submit(class: "button w-full") do %> + + Invite + <% end %> +
+<% end %> diff --git a/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.eex b/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.eex new file mode 100644 index 000000000..0c8499a19 --- /dev/null +++ b/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.eex @@ -0,0 +1,30 @@ +<%= form_for @conn, Routes.membership_path(@conn, :transfer_ownership, @site.domain), [class: "max-w-lg w-full mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 pt-6 pb-8 mb-4 mt-8"], fn f -> %> +

Transfer ownership of <%= @site.domain %>

+ +

+ Enter the email address of the new owner. We will contact them over email to offer them the ownership of <%= @site.domain %>. +

+

+ If they accept the transfer request, the new owner will be responsible for billing. Your access will be downgraded to admin and + any other member roles will stay the same. +

+ + <%= if @conn.assigns[:error] do %> +
<%= @conn.assigns[:error] %>
+ <% end %> + +
+ <%= label f, :email, "Email address", class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %> +
+
+ +
+ <%= email_input(f, :email, class: "focus:ring-indigo-500 focus:border-indigo-500 block w-full rounded-md pl-10 sm:text-sm border-gray-300", placeholder: "john.doe@example.com", required: "true") %> +
+ <%= error_tag f, :email %> +
+ +
+ <%= submit("Request transfer", class: "button w-full") %> +
+<% end %> diff --git a/lib/plausible_web/templates/site/settings_general.html.eex b/lib/plausible_web/templates/site/settings_general.html.eex index 758ab8b71..5f3ee4a0f 100644 --- a/lib/plausible_web/templates/site/settings_general.html.eex +++ b/lib/plausible_web/templates/site/settings_general.html.eex @@ -4,14 +4,13 @@

General information

Update your reporting timezone.

- <%= link(to: "https://docs.plausible.io/general/", target: "_blank") do %> + <%= link(to: "https://plausible.io/docs/general/", target: "_blank") do %> <% end %>
-
<%= label f, :domain, class: "block text-sm font-medium leading-5 text-gray-700 dark:text-gray-300" %> - <%= text_input f, :domain, class: "dark:bg-gray-900 mt-1 block w-full shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:max-w-xs sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-100", disabled: "disabled" %> +
<%= label f, :domain, class: "block text-sm font-medium leading-5 text-gray-700 dark:text-gray-300" %> <%= text_input f, :domain, class: "dark:bg-gray-900 mt-1 block w-full shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:max-w-xs sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-100", disabled: "disabled" %>
@@ -33,7 +32,7 @@

Javascript snippet

Include this snippet in the <head> of your website.

- <%= link(to: "https://docs.plausible.io/plausible-script", target: "_blank") do %> + <%= link(to: "https://plausible.io/docs/plausible-script", target: "_blank") do %> <% end %> diff --git a/lib/plausible_web/templates/site/settings_people.html.eex b/lib/plausible_web/templates/site/settings_people.html.eex new file mode 100644 index 000000000..5918bd428 --- /dev/null +++ b/lib/plausible_web/templates/site/settings_people.html.eex @@ -0,0 +1,149 @@ +
+
+

People

+

Invite your friend or coworkers

+ <%= link(to: "https://plausible.io/docs/users-roles", target: "_blank") do %> + + <% end %> +
+
+
    + <%= for membership <- @site.memberships do %> +
  • +
    +
    + <%= gravatar(membership.user.email, class: "h-8 w-8 rounded-full") %> +
    +
    +

    + <%= membership.user.name %> +

    +

    + <%= membership.user.email %> +

    +
    + +
    + +
      + <%= if membership.role == :owner do %> +
    • +
      +

      Owner

      +

      Site owner cannot be assigned to any other role

      +
      + + + + +
    • + <%= if @conn.assigns[:current_user_role] == :owner do %> +
    • + <%= link("Transfer ownership →", to: Routes.membership_path(@conn, :transfer_ownership_form, @site.domain), class: "inline-block w-full p-4 text-sm text-red-600 font-medium") %> +
    • + <% end %> + <% else %> + <%= link(to: Routes.membership_path(@conn, :update_role, @site.domain, membership.id, "admin"), method: :put, class: "p-4 flex justify-between text-sm group hover:bg-indigo-500") do %> +
      +

      Admin

      +

      View stats and edit site settings

      +
      + + <%= if membership.role == :admin do %> + + + + <% end %> + <% end %> + <%= link(to: Routes.membership_path(@conn, :update_role, @site.domain, membership.id, "viewer"), method: :put, class: "p-4 flex justify-between text-sm group hover:bg-indigo-500") do %> +
      +

      Viewer

      +

      View stats only

      +
      + + <%= if membership.role == :viewer do %> + + + + <% end %> + <% end %> + + <%= link(to: Routes.membership_path(@conn, :remove_member, @site.domain, membership.id), method: :delete, class: "p-4 flex hover:bg-gray-100 text-red-600") do %> +

      Remove member

      + <% end %> + <% end %> +
    +
    +
    +
  • + <% end %> +
+ + <%= if Enum.count(@site.invitations) > 0 do %> +
+

Pending invitations

+
+
+
+
+
+ + + + + + + + + + <%= for invitation <- @site.invitations do %> + + + + + + <% end %> + +
+ Email + + Role + + Edit +
+ <%= invitation.email %> + + <%= invitation.role |> Atom.to_string |> String.capitalize %> + + <%= link("Remove", to: "/sites/invitations/#{invitation.invitation_id}", method: :delete, class: "text-red-600 hover:text-red-900") %> +
+
+
+
+
+ <% end %> +
+ +
+ <%= link(to: Routes.membership_path(@conn, :invite_member_form, @site.domain), class: "button") do %> + + Invite + <% end %> +
+
+ diff --git a/lib/plausible_web/templates/stats/site_locked.html.eex b/lib/plausible_web/templates/stats/site_locked.html.eex new file mode 100644 index 000000000..bf70cb986 --- /dev/null +++ b/lib/plausible_web/templates/stats/site_locked.html.eex @@ -0,0 +1,32 @@ +
+
+
+
+ +
+

+ Site locked +

+ + <%= if @conn.assigns[:current_user_role] == :owner do %> +
+

+ This site is locked because you don't have an active subscription. We are still counting stats in the background but your access to the dashboard is restricted. Subscribe with the link below to access your stats again. +

+
+
+ <%= link("Manage my subscription", to: "/settings", class: "inline-flex items-center px-4 py-2 border border-transparent shadow-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:text-sm") %> +
+ <% else %> +
+

+ This site is currently locked and cannot be accessed. You can check back later or contact the site owner to unlock it. +

+
+
+ <%= link("Back to my sites", to: "/sites", class: "inline-flex items-center px-4 py-2 border border-transparent shadow-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:text-sm") %> +
+ <% end %> +
+
+
diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex index f6a9212f1..40d71e6d5 100644 --- a/lib/plausible_web/templates/stats/stats.html.eex +++ b/lib/plausible_web/templates/stats/stats.html.eex @@ -5,7 +5,7 @@
<% end %>
-
+
<%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %>
diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.ex index 1ecfca2fb..c1a8bf401 100644 --- a/lib/plausible_web/views/layout_view.ex +++ b/lib/plausible_web/views/layout_view.ex @@ -21,9 +21,10 @@ defmodule PlausibleWeb.LayoutView do end end - def settings_tabs() do + def settings_tabs(conn) do [ [key: "General", value: "general"], + [key: "People", value: "people"], [key: "Visibility", value: "visibility"], [key: "Goals", value: "goals"], [key: "Search Console", value: "search-console"], @@ -33,7 +34,11 @@ defmodule PlausibleWeb.LayoutView do else nil end, - [key: "Danger zone", value: "danger-zone"] + if conn.assigns[:current_user_role] == :owner do + [key: "Danger zone", value: "danger-zone"] + else + nil + end ] end @@ -47,9 +52,6 @@ defmodule PlausibleWeb.LayoutView do days when days == 0 -> "Trial ends today" - - days when days < 0 -> - "Trial over, upgrade now" end end diff --git a/lib/plausible_web/views/site/membership_view.ex b/lib/plausible_web/views/site/membership_view.ex new file mode 100644 index 000000000..20af528c3 --- /dev/null +++ b/lib/plausible_web/views/site/membership_view.ex @@ -0,0 +1,3 @@ +defmodule PlausibleWeb.Site.MembershipView do + use PlausibleWeb, :view +end diff --git a/lib/plausible_web/views/site_view.ex b/lib/plausible_web/views/site_view.ex index 458ba08a1..91e817dd0 100644 --- a/lib/plausible_web/views/site_view.ex +++ b/lib/plausible_web/views/site_view.ex @@ -26,6 +26,18 @@ defmodule PlausibleWeb.SiteView do Plausible.Sites.shared_link_url(site, link) end + def gravatar(email, opts) do + hash = + email + |> String.trim() + |> String.downcase() + |> :erlang.md5() + |> Base.encode16(case: :lower) + + img = "https://www.gravatar.com/avatar/#{hash}?s=150&d=identicon" + img_tag(img, opts) + end + def snippet(site) do tracker = if site.custom_domain do @@ -38,4 +50,12 @@ defmodule PlausibleWeb.SiteView do """ end + + def with_indefinite_article(word) do + if String.starts_with?(word, ["a", "e", "i", "o", "u"]) do + "an " <> word + else + "a " <> word + end + end end diff --git a/lib/workers/clean_invitations.ex b/lib/workers/clean_invitations.ex new file mode 100644 index 000000000..17cf841d0 --- /dev/null +++ b/lib/workers/clean_invitations.ex @@ -0,0 +1,14 @@ +defmodule Plausible.Workers.CleanInvitations do + use Plausible.Repo + use Oban.Worker, queue: :clean_invitations + + @impl Oban.Worker + def perform(_job) do + Repo.delete_all( + from i in Plausible.Auth.Invitation, + where: i.inserted_at < fragment("now() - INTERVAL '48 hours'") + ) + + :ok + end +end diff --git a/lib/workers/lock_sites.ex b/lib/workers/lock_sites.ex new file mode 100644 index 000000000..2c85da14e --- /dev/null +++ b/lib/workers/lock_sites.ex @@ -0,0 +1,15 @@ +defmodule Plausible.Workers.LockSites do + use Plausible.Repo + use Oban.Worker, queue: :lock_sites + + @impl Oban.Worker + def perform(_job) do + users = Repo.all(from u in Plausible.Auth.User, preload: :subscription) + + for user <- users do + Plausible.Billing.SiteLocker.check_sites_for(user) + end + + :ok + end +end diff --git a/lib/workers/send_check_stats_emails.ex b/lib/workers/send_check_stats_emails.ex index e01ef45ee..ee158580d 100644 --- a/lib/workers/send_check_stats_emails.ex +++ b/lib/workers/send_check_stats_emails.ex @@ -19,7 +19,7 @@ defmodule Plausible.Workers.SendCheckStatsEmails do for user <- Repo.all(q) do enabled_report = Enum.any?(user.sites, fn site -> site.weekly_report end) - if Plausible.Auth.user_completed_setup?(user) && !enabled_report do + if Plausible.Auth.has_active_sites?(user) && !enabled_report do send_check_stats_email(user) end end diff --git a/lib/workers/send_email_report.ex b/lib/workers/send_email_report.ex index 8b63ab0c2..ca4f15cbb 100644 --- a/lib/workers/send_email_report.ex +++ b/lib/workers/send_email_report.ex @@ -60,7 +60,7 @@ defmodule Plausible.Workers.SendEmailReport do referrers = Stats.top_sources(site, query, 5, 1, []) pages = Stats.top_pages(site, query, 5, 1, []) user = Plausible.Auth.find_user_by(email: email) - login_link = user && Plausible.Sites.is_owner?(user.id, site) + login_link = user && Plausible.Sites.is_member?(user.id, site) template = PlausibleWeb.Email.weekly_report(email, site, diff --git a/lib/workers/send_site_setup_emails.ex b/lib/workers/send_site_setup_emails.ex index 92e5f00c0..74c95546c 100644 --- a/lib/workers/send_site_setup_emails.ex +++ b/lib/workers/send_site_setup_emails.ex @@ -38,12 +38,13 @@ defmodule Plausible.Workers.SendSiteSetupEmails do left_join: se in "setup_help_emails", on: se.site_id == s.id, where: is_nil(se.id), - where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval"), - preload: :members + where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval") ) for site <- Repo.all(q) do - owner = List.first(site.members) + owner = + Plausible.Sites.owner_for(site) + |> Repo.preload(:subscription) setup_completed = Stats.has_pageviews?(site) hours_passed = Timex.diff(Timex.now(), site.inserted_at, :hours) @@ -60,12 +61,13 @@ defmodule Plausible.Workers.SendSiteSetupEmails do left_join: se in "setup_success_emails", on: se.site_id == s.id, where: is_nil(se.id), - where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval"), - preload: :members + where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval") ) for site <- Repo.all(q) do - owner = List.first(site.members) + owner = + Plausible.Sites.owner_for(site) + |> Repo.preload(:subscription) if Stats.has_pageviews?(site) do send_setup_success_email(owner, site) diff --git a/lib/workers/send_trial_notifications.ex b/lib/workers/send_trial_notifications.ex index ab2e140f4..8eb318ad8 100644 --- a/lib/workers/send_trial_notifications.ex +++ b/lib/workers/send_trial_notifications.ex @@ -21,22 +21,22 @@ defmodule Plausible.Workers.SendTrialNotifications do for user <- users do case Timex.diff(user.trial_expiry_date, Timex.today(), :days) do 7 -> - if Plausible.Auth.user_completed_setup?(user) do + if Plausible.Auth.has_active_sites?(user, [:owner]) do send_one_week_reminder(user) end 1 -> - if Plausible.Auth.user_completed_setup?(user) do + if Plausible.Auth.has_active_sites?(user, [:owner]) do send_tomorrow_reminder(user) end 0 -> - if Plausible.Auth.user_completed_setup?(user) do + if Plausible.Auth.has_active_sites?(user, [:owner]) do send_today_reminder(user) end -1 -> - if Plausible.Auth.user_completed_setup?(user) do + if Plausible.Auth.has_active_sites?(user, [:owner]) do send_over_reminder(user) end diff --git a/priv/repo/migrations/20210531080158_add_role_to_site_memberships.exs b/priv/repo/migrations/20210531080158_add_role_to_site_memberships.exs new file mode 100644 index 000000000..a5b8c3b79 --- /dev/null +++ b/priv/repo/migrations/20210531080158_add_role_to_site_memberships.exs @@ -0,0 +1,13 @@ +defmodule Plausible.Repo.Migrations.AddRoleToSiteMemberships do + use Ecto.Migration + + def change do + create_query = "CREATE TYPE site_membership_role AS ENUM ('owner', 'admin', 'viewer')" + drop_query = "DROP TYPE site_membership_role" + execute(create_query, drop_query) + + alter table(:site_memberships) do + add :role, :site_membership_role, null: false, default: "owner" + end + end +end diff --git a/priv/repo/migrations/20210601090924_add_invitations.exs b/priv/repo/migrations/20210601090924_add_invitations.exs new file mode 100644 index 000000000..b13cc4b8c --- /dev/null +++ b/priv/repo/migrations/20210601090924_add_invitations.exs @@ -0,0 +1,18 @@ +defmodule Plausible.Repo.Migrations.AddInvitations do + use Ecto.Migration + + def change do + create table(:invitations) do + add :email, :string, null: false + add :site_id, references(:sites), null: false + add :inviter_id, references(:users), null: false + add :role, :site_membership_role, null: false + add :invitation_id, :string + + timestamps() + end + + create unique_index(:invitations, [:site_id, :email]) + create unique_index(:invitations, :invitation_id) + end +end diff --git a/priv/repo/migrations/20210604085943_add_locked_to_sites.exs b/priv/repo/migrations/20210604085943_add_locked_to_sites.exs new file mode 100644 index 000000000..7764d9668 --- /dev/null +++ b/priv/repo/migrations/20210604085943_add_locked_to_sites.exs @@ -0,0 +1,9 @@ +defmodule Plausible.Repo.Migrations.AddLockedToSites do + use Ecto.Migration + + def change do + alter table(:sites) do + add :locked, :boolean, null: false, default: false + end + end +end diff --git a/test/plausible/auth/auth_test.exs b/test/plausible/auth/auth_test.exs index 365bf5fb7..d76417bb5 100644 --- a/test/plausible/auth/auth_test.exs +++ b/test/plausible/auth/auth_test.exs @@ -6,21 +6,34 @@ defmodule Plausible.AuthTest do test "is false if user does not have any sites" do user = insert(:user) - refute Auth.user_completed_setup?(user) + refute Auth.has_active_sites?(user) end test "is false if user does not have any events" do user = insert(:user) insert(:site, members: [user]) - refute Auth.user_completed_setup?(user) + refute Auth.has_active_sites?(user) end test "is true if user does have events" do user = insert(:user) insert(:site, members: [user], domain: "test-site.com") - assert Auth.user_completed_setup?(user) + assert Auth.has_active_sites?(user) + end + + test "can specify which roles we're looking for" do + user = insert(:user) + + insert(:site, + domain: "test-site.com", + memberships: [ + build(:site_membership, user: user, role: :admin) + ] + ) + + refute Auth.has_active_sites?(user, [:owner]) end end end diff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exs index f20a6e796..c0e082b3b 100644 --- a/test/plausible/billing/billing_test.exs +++ b/test/plausible/billing/billing_test.exs @@ -17,6 +17,26 @@ defmodule Plausible.BillingTest do assert Billing.usage(user) == 3 end + + test "only counts usage from sites where the user is the owner" do + user = insert(:user) + + insert(:site, + domain: "site-with-no-views.com", + memberships: [ + build(:site_membership, user: user, role: :owner) + ] + ) + + insert(:site, + domain: "test-site.com", + memberships: [ + build(:site_membership, user: user, role: :admin) + ] + ) + + assert Billing.usage(user) == 0 + end end describe "last_two_billing_cycles" do @@ -66,6 +86,36 @@ defmodule Plausible.BillingTest do assert Billing.last_two_billing_months_usage(user, today) == {1, 1} end + test "only considers sites that the user owns" do + last_bill_date = ~D[2021-01-01] + today = ~D[2021-01-02] + + user = insert(:user, subscription: build(:subscription, last_bill_date: last_bill_date)) + + owner_site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :owner) + ] + ) + + admin_site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :admin) + ] + ) + + create_pageviews([ + %{domain: owner_site.domain, timestamp: ~N[2020-12-31 00:00:00]}, + %{domain: admin_site.domain, timestamp: ~N[2020-12-31 00:00:00]}, + %{domain: owner_site.domain, timestamp: ~N[2020-11-01 00:00:00]}, + %{domain: admin_site.domain, timestamp: ~N[2020-11-01 00:00:00]} + ]) + + assert Billing.last_two_billing_months_usage(user, today) == {1, 1} + end + test "gets event count from last month and this one" do user = insert(:user, @@ -93,13 +143,15 @@ defmodule Plausible.BillingTest do describe "on_trial?" do test "is true with >= 0 trial days left" do - user = insert(:user) + user = insert(:user) |> Repo.preload(:subscription) assert Billing.on_trial?(user) end test "is false with < 0 trial days left" do - user = insert(:user, trial_expiry_date: Timex.shift(Timex.now(), days: -1)) + user = + insert(:user, trial_expiry_date: Timex.shift(Timex.now(), days: -1)) + |> Repo.preload(:subscription) refute Billing.on_trial?(user) end @@ -214,6 +266,26 @@ defmodule Plausible.BillingTest do assert subscription.next_bill_date == ~D[2019-06-01] assert subscription.next_bill_amount == "6.00" end + + test "unlocks sites if user has any locked sites" do + user = insert(:user) + site = insert(:site, locked: true, members: [user]) + + Billing.subscription_created(%{ + "alert_name" => "subscription_created", + "subscription_id" => @subscription_id, + "subscription_plan_id" => @plan_id, + "update_url" => "update_url.com", + "cancel_url" => "cancel_url.com", + "passthrough" => user.id, + "status" => "active", + "next_bill_date" => "2019-06-01", + "unit_price" => "6.00", + "currency" => "EUR" + }) + + refute Repo.reload!(site).locked + end end describe "subscription_updated" do diff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exs new file mode 100644 index 000000000..b61812f4b --- /dev/null +++ b/test/plausible/billing/site_locker_test.exs @@ -0,0 +1,110 @@ +defmodule Plausible.Billing.SiteLockerTest do + use Plausible.DataCase + use Bamboo.Test, shared: true + alias Plausible.Billing.SiteLocker + + describe "check_sites_for/1" do + test "does not lock sites if user is on trial" do + user = + insert(:user, trial_expiry_date: Timex.today()) + |> Repo.preload(:subscription) + + site = insert(:site, locked: true, members: [user]) + + SiteLocker.check_sites_for(user) + + refute Repo.reload!(site).locked + end + + test "does not lock if user has an active subscription" do + user = insert(:user) + insert(:subscription, status: "active", user: user) + user = Repo.preload(user, :subscription) + site = insert(:site, locked: true, members: [user]) + + SiteLocker.check_sites_for(user) + + refute Repo.reload!(site).locked + end + + test "does not lock user who is past due" do + user = insert(:user) + insert(:subscription, status: "past_due", user: user) + user = Repo.preload(user, :subscription) + site = insert(:site, members: [user]) + + SiteLocker.check_sites_for(user) + + refute Repo.reload!(site).locked + end + + test "does not lock user who cancelled subscription but it hasn't expired yet" do + user = insert(:user) + insert(:subscription, status: "deleted", user: user) + user = Repo.preload(user, :subscription) + site = insert(:site, members: [user]) + + SiteLocker.check_sites_for(user) + + refute Repo.reload!(site).locked + end + + test "locks user who cancelled subscription and the cancelled subscription has expired" do + user = insert(:user) + + insert(:subscription, + status: "deleted", + next_bill_date: Timex.today() |> Timex.shift(days: -1), + user: user + ) + + site = insert(:site, members: [user]) + + user = Repo.preload(user, :subscription) + + SiteLocker.check_sites_for(user) + + refute Repo.reload!(site).locked + end + + test "locks all sites if user has no trial or active subscription" do + user = + insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1)) + |> Repo.preload(:subscription) + + site = insert(:site, locked: true, members: [user]) + + SiteLocker.check_sites_for(user) + + assert Repo.reload!(site).locked + end + + test "only locks sites that the user owns" do + user = + insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1)) + |> Repo.preload(:subscription) + + owner_site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :owner) + ] + ) + + viewer_site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :viewer) + ] + ) + + SiteLocker.check_sites_for(user) + + owner_site = Repo.reload!(owner_site) + viewer_site = Repo.reload!(viewer_site) + + assert owner_site.locked + refute viewer_site.locked + end + end +end diff --git a/test/plausible/sites_test.exs b/test/plausible/sites_test.exs index b95a0e1fe..b4f4be59d 100644 --- a/test/plausible/sites_test.exs +++ b/test/plausible/sites_test.exs @@ -2,19 +2,19 @@ defmodule Plausible.SitesTest do use Plausible.DataCase alias Plausible.Sites - describe "is_owner?" do - test "is true if user is the owner of the site" do + describe "is_member?" do + test "is true if user is a member of the site" do user = insert(:user) site = insert(:site, members: [user]) - assert Sites.is_owner?(user.id, site) + assert Sites.is_member?(user.id, site) end - test "is false if user is not the owner" do + test "is false if user is not a member" do user = insert(:user) site = insert(:site) - refute Sites.is_owner?(user.id, site) + refute Sites.is_member?(user.id, site) end end end diff --git a/test/plausible_web/controllers/api/external_sites_controller_test.exs b/test/plausible_web/controllers/api/external_sites_controller_test.exs index 9dc48d5c9..2f05fceb9 100644 --- a/test/plausible_web/controllers/api/external_sites_controller_test.exs +++ b/test/plausible_web/controllers/api/external_sites_controller_test.exs @@ -1,5 +1,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do use PlausibleWeb.ConnCase + use Plausible.Repo import Plausible.TestUtils setup %{conn: conn} do @@ -129,5 +130,27 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do res = json_response(conn, 404) assert res["error"] == "Site could not be found" end + + test "returns 404 when api key owner does not have permissions to create a shared link", %{ + conn: conn, + site: site, + user: user + } do + Repo.update_all( + from(sm in Plausible.Site.Membership, + where: sm.site_id == ^site.id and sm.user_id == ^user.id + ), + set: [role: :viewer] + ) + + conn = + put(conn, "/api/v1/sites/shared-links", %{ + site_id: site.domain, + name: "Wordpress" + }) + + res = json_response(conn, 404) + assert res["error"] == "Site could not be found" + end end end diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exs new file mode 100644 index 000000000..4e9671a5d --- /dev/null +++ b/test/plausible_web/controllers/invitation_controller_test.exs @@ -0,0 +1,158 @@ +defmodule PlausibleWeb.Site.InvitationControllerTest do + use PlausibleWeb.ConnCase + use Plausible.Repo + use Bamboo.Test + import Plausible.TestUtils + + setup [:create_user, :log_in] + + describe "POST /sites/invitations/:invitation_id/accept" do + test "converts the invitation into a membership", %{conn: conn, user: user} do + site = insert(:site) + + invitation = + insert(:invitation, + site_id: site.id, + inviter: build(:user), + email: user.email, + role: :admin + ) + + post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + + refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email)) + + membership = Repo.get_by(Plausible.Site.Membership, user_id: user.id, site_id: site.id) + assert membership.role == :admin + end + + test "notifies the original inviter", %{conn: conn, user: user} do + inviter = insert(:user) + site = insert(:site) + + invitation = + insert(:invitation, site_id: site.id, inviter: inviter, email: user.email, role: :admin) + + post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + + assert_email_delivered_with( + to: [nil: inviter.email], + subject: "[Plausible Analytics] #{user.email} accepted your invitation to #{site.domain}" + ) + end + + test "ownership transfer - notifies the original inviter with a different email", %{ + conn: conn, + user: user + } do + inviter = insert(:user) + site = insert(:site) + + invitation = + insert(:invitation, site_id: site.id, inviter: inviter, email: user.email, role: :owner) + + post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + + assert_email_delivered_with( + to: [nil: inviter.email], + subject: + "[Plausible Analytics] #{user.email} accepted the ownership transfer of #{site.domain}" + ) + end + + test "ownership transfer - downgrades previous owner to admin", %{conn: conn, user: user} do + old_owner = insert(:user) + site = insert(:site, members: [old_owner]) + + invitation = + insert(:invitation, site_id: site.id, inviter: old_owner, email: user.email, role: :owner) + + post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + + refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email)) + + old_owner_membership = + Repo.get_by(Plausible.Site.Membership, user_id: old_owner.id, site_id: site.id) + + assert old_owner_membership.role == :admin + + new_owner_membership = + Repo.get_by(Plausible.Site.Membership, user_id: user.id, site_id: site.id) + + assert new_owner_membership.role == :owner + end + + test "ownership transfer - will lock the site if new owner does not have an active subscription or trial", + %{ + conn: conn, + user: user + } do + Repo.update_all(from(u in Plausible.Auth.User, where: u.id == ^user.id), + set: [trial_expiry_date: Timex.today() |> Timex.shift(days: -1)] + ) + + inviter = insert(:user) + site = insert(:site, locked: false) + + invitation = + insert(:invitation, site_id: site.id, inviter: inviter, email: user.email, role: :owner) + + post(conn, "/sites/invitations/#{invitation.invitation_id}/accept") + + assert Repo.reload!(site).locked + end + end + + describe "POST /sites/invitations/:invitation_id/reject" do + test "deletes the invitation", %{conn: conn, user: user} do + site = insert(:site) + + invitation = + insert(:invitation, + site_id: site.id, + inviter: build(:user), + email: user.email, + role: :admin + ) + + post(conn, "/sites/invitations/#{invitation.invitation_id}/reject") + + refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email)) + end + + test "notifies the original inviter", %{conn: conn, user: user} do + inviter = insert(:user) + site = insert(:site) + + invitation = + insert(:invitation, site_id: site.id, inviter: inviter, email: user.email, role: :admin) + + post(conn, "/sites/invitations/#{invitation.invitation_id}/reject") + + assert_email_delivered_with( + to: [nil: inviter.email], + subject: "[Plausible Analytics] #{user.email} rejected your invitation to #{site.domain}" + ) + end + end + + describe "DELETE /sites/invitations/:invitation_id" do + test "removes the invitation", %{conn: conn} do + site = insert(:site) + + invitation = + insert(:invitation, + site_id: site.id, + inviter: build(:user), + email: "jane@example.com", + role: :admin + ) + + delete(conn, "/sites/invitations/#{invitation.invitation_id}") + + refute Repo.exists?( + from i in Plausible.Auth.Invitation, where: i.email == "jane@example.com" + ) + end + end +end diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exs new file mode 100644 index 000000000..81c7587c9 --- /dev/null +++ b/test/plausible_web/controllers/site/membership_controller_test.exs @@ -0,0 +1,204 @@ +defmodule PlausibleWeb.Site.MembershipControllerTest do + use PlausibleWeb.ConnCase + use Plausible.Repo + use Bamboo.Test + import Plausible.TestUtils + + setup [:create_user, :log_in] + + describe "GET /sites/:website/memberships/invite" do + test "shows invite form", %{conn: conn, user: user} do + site = insert(:site, members: [user]) + + conn = get(conn, "/sites/#{site.domain}/memberships/invite") + + assert html_response(conn, 200) =~ "Invite member to" + end + end + + describe "POST /sites/:website/memberships/invite" do + test "creates invitation", %{conn: conn, user: user} do + site = insert(:site, members: [user]) + + conn = + post(conn, "/sites/#{site.domain}/memberships/invite", %{ + email: "john.doe@example.com", + role: "admin" + }) + + invitation = Repo.get_by(Plausible.Auth.Invitation, email: "john.doe@example.com") + + assert invitation.role == :admin + assert redirected_to(conn) == "/#{site.domain}/settings/people" + end + + test "sends invitation email for new user", %{conn: conn, user: user} do + site = insert(:site, members: [user]) + + post(conn, "/sites/#{site.domain}/memberships/invite", %{ + email: "john.doe@example.com", + role: "admin" + }) + + assert_email_delivered_with( + to: [nil: "john.doe@example.com"], + subject: "[Plausible Analytics] You've been invited to #{site.domain}" + ) + end + + test "sends invitation email for existing user", %{conn: conn, user: user} do + existing_user = insert(:user) + site = insert(:site, members: [user]) + + post(conn, "/sites/#{site.domain}/memberships/invite", %{ + email: existing_user.email, + role: "admin" + }) + + assert_email_delivered_with( + to: [nil: existing_user.email], + subject: "[Plausible Analytics] You've been invited to #{site.domain}" + ) + end + + test "renders form with error if the invitee is already a member", %{conn: conn, user: user} do + second_member = insert(:user) + site = insert(:site, members: [user, second_member]) + + conn = + post(conn, "/sites/#{site.domain}/memberships/invite", %{ + email: second_member.email, + role: "admin" + }) + + assert html_response(conn, 200) =~ + "#{second_member.email} is already a member of #{site.domain}" + end + end + + describe "GET /sites/:website/transfer-ownership" do + test "shows ownership transfer form", %{conn: conn, user: user} do + site = insert(:site, members: [user]) + + conn = get(conn, "/sites/#{site.domain}/transfer-ownership") + + assert html_response(conn, 200) =~ "Transfer ownership of" + end + end + + describe "POST /sites/:website/transfer-ownership" do + test "creates invitation with :owner role", %{conn: conn, user: user} do + site = insert(:site, members: [user]) + + conn = + post(conn, "/sites/#{site.domain}/transfer-ownership", %{email: "john.doe@example.com"}) + + invitation = Repo.get_by(Plausible.Auth.Invitation, email: "john.doe@example.com") + + assert invitation.role == :owner + assert redirected_to(conn) == "/#{site.domain}/settings/people" + end + + test "sends ownership transfer email for new user", %{conn: conn, user: user} do + site = insert(:site, members: [user]) + + post(conn, "/sites/#{site.domain}/transfer-ownership", %{email: "john.doe@example.com"}) + + assert_email_delivered_with( + to: [nil: "john.doe@example.com"], + subject: "[Plausible Analytics] Request to transfer ownership of #{site.domain}" + ) + end + + test "sends invitation email for existing user", %{conn: conn, user: user} do + existing_user = insert(:user) + site = insert(:site, members: [user]) + + post(conn, "/sites/#{site.domain}/transfer-ownership", %{email: existing_user.email}) + + assert_email_delivered_with( + to: [nil: existing_user.email], + subject: "[Plausible Analytics] Request to transfer ownership of #{site.domain}" + ) + end + end + + describe "PUT /sites/memberships/:id/role/:new_role" do + test "updates a site member's role", %{conn: conn, user: user} do + admin = insert(:user) + + site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :owner), + build(:site_membership, user: admin, role: :admin) + ] + ) + + membership = Repo.get_by(Plausible.Site.Membership, user_id: admin.id) + + put(conn, "/sites/#{site.domain}/memberships/#{membership.id}/role/viewer") + + membership = Repo.reload!(membership) + + assert membership.role == :viewer + end + + test "can downgrade yourself from admin to viewer, redirects to stats instead", %{ + conn: conn, + user: user + } do + site = insert(:site, memberships: [build(:site_membership, user: user, role: :admin)]) + + membership = Repo.get_by(Plausible.Site.Membership, user_id: user.id) + + conn = put(conn, "/sites/#{site.domain}/memberships/#{membership.id}/role/viewer") + + membership = Repo.reload!(membership) + + assert membership.role == :viewer + assert redirected_to(conn) == "/#{site.domain}" + end + end + + describe "DELETE /sites/memberships/:id" do + test "removes a member from a site", %{conn: conn, user: user} do + admin = insert(:user) + + site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :owner), + build(:site_membership, user: admin, role: :admin) + ] + ) + + membership = Enum.find(site.memberships, &(&1.role == :admin)) + + delete(conn, "/sites/#{site.domain}/memberships/#{membership.id}") + + refute Repo.exists?(from sm in Plausible.Site.Membership, where: sm.user_id == ^admin.id) + end + + test "notifies the user who has been removed via email", %{conn: conn, user: user} do + admin = insert(:user) + + site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :owner), + build(:site_membership, user: admin, role: :admin) + ] + ) + + membership = Enum.find(site.memberships, &(&1.role == :admin)) + + delete(conn, "/sites/#{site.domain}/memberships/#{membership.id}") + + assert_email_delivered_with( + to: [nil: admin.email], + subject: "[Plausible Analytics] Your access to #{site.domain} has been revoked" + ) + end + end +end diff --git a/test/support/factory.ex b/test/support/factory.ex index 34407d336..05fa273ab 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -30,6 +30,10 @@ defmodule Plausible.Factory do } end + def site_membership_factory do + %Plausible.Site.Membership{} + end + def ch_session_factory do hostname = sequence(:domain, &"example-#{&1}.com") @@ -153,6 +157,14 @@ defmodule Plausible.Factory do } end + def invitation_factory do + %Plausible.Auth.Invitation{ + invitation_id: Nanoid.generate(), + email: sequence(:email, &"email-#{&1}@example.com"), + role: :admin + } + end + def api_key_factory do key = :crypto.strong_rand_bytes(64) |> Base.url_encode64() |> binary_part(0, 64) diff --git a/test/workers/clean_invitations_test.exs b/test/workers/clean_invitations_test.exs new file mode 100644 index 000000000..5d6d872f6 --- /dev/null +++ b/test/workers/clean_invitations_test.exs @@ -0,0 +1,28 @@ +defmodule Plausible.Workers.CleanInvitationsTest do + use Plausible.DataCase + alias Plausible.Workers.CleanInvitations + + test "cleans invitation that is more than 48h old" do + insert(:invitation, + inserted_at: Timex.shift(Timex.now(), hours: -49), + site: build(:site), + inviter: build(:user) + ) + + CleanInvitations.perform(nil) + + refute Repo.exists?(Plausible.Auth.Invitation) + end + + test "does not clean invitation that is less than 48h old" do + insert(:invitation, + inserted_at: Timex.shift(Timex.now(), hours: -47), + site: build(:site), + inviter: build(:user) + ) + + CleanInvitations.perform(nil) + + assert Repo.exists?(Plausible.Auth.Invitation) + end +end diff --git a/test/workers/lock_sites_test.exs b/test/workers/lock_sites_test.exs new file mode 100644 index 000000000..27ecc7fdf --- /dev/null +++ b/test/workers/lock_sites_test.exs @@ -0,0 +1,96 @@ +defmodule Plausible.Workers.LockSitesTest do + use Plausible.DataCase + alias Plausible.Workers.LockSites + + test "does not lock trial user's site" do + user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: 1)) + site = insert(:site, members: [user]) + + LockSites.perform(nil) + + refute Repo.reload!(site).locked + end + + test "locks site for user whose trial has expired" do + user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1)) + site = insert(:site, members: [user]) + + LockSites.perform(nil) + + assert Repo.reload!(site).locked + end + + test "does not lock active subsriber's sites" do + user = insert(:user) + insert(:subscription, status: "active", user: user) + site = insert(:site, members: [user]) + + LockSites.perform(nil) + + refute Repo.reload!(site).locked + end + + test "does not lock user who is past due" do + user = insert(:user) + insert(:subscription, status: "past_due", user: user) + site = insert(:site, members: [user]) + + LockSites.perform(nil) + + refute Repo.reload!(site).locked + end + + test "does not lock user who cancelled subscription but it hasn't expired yet" do + user = insert(:user) + insert(:subscription, status: "deleted", user: user) + site = insert(:site, members: [user]) + + LockSites.perform(nil) + + refute Repo.reload!(site).locked + end + + test "locks user who cancelled subscription and the cancelled subscription has expired" do + user = insert(:user) + + insert(:subscription, + status: "deleted", + next_bill_date: Timex.today() |> Timex.shift(days: -1), + user: user + ) + + site = insert(:site, members: [user]) + + LockSites.perform(nil) + + refute Repo.reload!(site).locked + end + + describe "locking" do + test "only locks sites that the user owns" do + user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1)) + + owner_site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :owner) + ] + ) + + viewer_site = + insert(:site, + memberships: [ + build(:site_membership, user: user, role: :viewer) + ] + ) + + LockSites.perform(nil) + + owner_site = Repo.reload!(owner_site) + viewer_site = Repo.reload!(viewer_site) + + assert owner_site.locked + refute viewer_site.locked + end + end +end diff --git a/test/workers/send_trial_notifications_test.exs b/test/workers/send_trial_notifications_test.exs index b014264ac..aaef84038 100644 --- a/test/workers/send_trial_notifications_test.exs +++ b/test/workers/send_trial_notifications_test.exs @@ -4,11 +4,35 @@ defmodule Plausible.Workers.SendTrialNotificationsTest do use Oban.Testing, repo: Plausible.Repo alias Plausible.Workers.SendTrialNotifications - test "does not send a notification if user didn't set up their site" do - insert(:user, inserted_at: Timex.now() |> Timex.shift(days: -14)) - insert(:user, inserted_at: Timex.now() |> Timex.shift(days: -29)) - insert(:user, inserted_at: Timex.now() |> Timex.shift(days: -30)) - insert(:user, inserted_at: Timex.now() |> Timex.shift(days: -31)) + test "does not send a notification if user didn't create a site" do + insert(:user, trial_expiry_date: Timex.now() |> Timex.shift(days: 7)) + insert(:user, trial_expiry_date: Timex.now() |> Timex.shift(days: 1)) + insert(:user, trial_expiry_date: Timex.now() |> Timex.shift(days: 0)) + insert(:user, trial_expiry_date: Timex.now() |> Timex.shift(days: -1)) + + perform_job(SendTrialNotifications, %{}) + + assert_no_emails_delivered() + end + + test "does not send a notification if user created a site but there are no pageviews" do + user = insert(:user, trial_expiry_date: Timex.now() |> Timex.shift(days: 7)) + insert(:site, domain: "some-nonexistent-site.com", members: [user]) + + perform_job(SendTrialNotifications, %{}) + + assert_no_emails_delivered() + end + + test "does not send a notification if user is a collaborator on sites but not an owner" do + user = insert(:user, trial_expiry_date: Timex.now()) + + insert(:site, + domain: "test-site.com", + memberships: [ + build(:site_membership, user: user, role: :admin) + ] + ) perform_job(SendTrialNotifications, %{}) From 62dfb43f101b8bae588a329c98aa40c113d7e861 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 16 Jun 2021 15:18:25 +0300 Subject: [PATCH 03/22] Admin access --- lib/plausible_web/plugs/authorize_site_access.ex | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.ex index 754820b91..a180bde6e 100644 --- a/lib/plausible_web/plugs/authorize_site_access.ex +++ b/lib/plausible_web/plugs/authorize_site_access.ex @@ -15,12 +15,12 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do if !site do PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt else - user_id = get_session(conn, :current_user_id) - membership_role = user_id && Plausible.Sites.role(user_id, site) + user = conn.assigns[:current_user] + membership_role = user && Plausible.Sites.role(user.id, site) role = cond do - user_id && membership_role -> + user && membership_role -> membership_role site.public -> @@ -29,6 +29,9 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do shared_link_record && shared_link_record.site_id == site.id -> :public + user.email in admin_emails() -> + :admin + true -> nil end @@ -40,4 +43,8 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do end end end + + defp admin_emails() do + Application.get_env(:plausible, :admin_emails) + end end From 18ddf9dd9d0d9f97f6f53a0df4360fbf8da6370d Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 16 Jun 2021 15:33:37 +0300 Subject: [PATCH 04/22] Admin access --- config/runtime.exs | 7 ++++--- lib/plausible_web/plugs/authorize_site_access.ex | 12 ++++++------ lib/plausible_web/plugs/crm_auth_plug.ex | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/config/runtime.exs b/config/runtime.exs index 01d802527..04804df3f 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -49,9 +49,10 @@ db_socket_dir = get_var_from_path_or_env(config_dir, "DATABASE_SOCKET_DIR") admin_user = get_var_from_path_or_env(config_dir, "ADMIN_USER_NAME") admin_email = get_var_from_path_or_env(config_dir, "ADMIN_USER_EMAIL") -admin_emails = - get_var_from_path_or_env(config_dir, "ADMIN_EMAILS", "") +admin_user_ids = + get_var_from_path_or_env(config_dir, "ADMIN_USER_IDS", "") |> String.split(",") + |> Enum.map(fn id -> Integer.parse(id) |> elem(0) end) admin_pwd = get_var_from_path_or_env(config_dir, "ADMIN_USER_PWD") env = get_var_from_path_or_env(config_dir, "ENVIRONMENT", "prod") @@ -162,7 +163,7 @@ config :plausible, admin_pwd: admin_pwd, environment: env, mailer_email: mailer_email, - admin_emails: admin_emails, + admin_user_ids: admin_user_ids, site_limit: site_limit, site_limit_exempt: site_limit_exempt, is_selfhost: is_selfhost diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.ex index a180bde6e..2b1ccd7e0 100644 --- a/lib/plausible_web/plugs/authorize_site_access.ex +++ b/lib/plausible_web/plugs/authorize_site_access.ex @@ -15,12 +15,12 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do if !site do PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt else - user = conn.assigns[:current_user] - membership_role = user && Plausible.Sites.role(user.id, site) + user_id = get_session(conn, :current_user_id) + membership_role = user_id && Plausible.Sites.role(user_id, site) role = cond do - user && membership_role -> + user_id && membership_role -> membership_role site.public -> @@ -29,7 +29,7 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do shared_link_record && shared_link_record.site_id == site.id -> :public - user.email in admin_emails() -> + user_id in admin_user_ids() -> :admin true -> @@ -44,7 +44,7 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do end end - defp admin_emails() do - Application.get_env(:plausible, :admin_emails) + defp admin_user_ids() do + Application.get_env(:plausible, :admin_user_ids) end end diff --git a/lib/plausible_web/plugs/crm_auth_plug.ex b/lib/plausible_web/plugs/crm_auth_plug.ex index bfffad092..2c42600e8 100644 --- a/lib/plausible_web/plugs/crm_auth_plug.ex +++ b/lib/plausible_web/plugs/crm_auth_plug.ex @@ -14,7 +14,7 @@ defmodule PlausibleWeb.CRMAuthPlug do id -> user = Repo.get_by(Plausible.Auth.User, id: id) - if user && user.email in admin_emails() do + if user && user.id in admin_user_ids() do assign(conn, :current_user, user) else conn |> send_resp(403, "Not allowed") |> halt @@ -22,5 +22,5 @@ defmodule PlausibleWeb.CRMAuthPlug do end end - defp admin_emails(), do: Application.get_env(:plausible, :admin_emails) + defp admin_user_ids(), do: Application.get_env(:plausible, :admin_user_ids) end From 0ef0fd2048e34a62299757be0f54da24479b9d99 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 16 Jun 2021 15:43:26 +0300 Subject: [PATCH 05/22] Fix config option in test --- config/.env.dev | 1 + config/runtime.exs | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/.env.dev b/config/.env.dev index 104e77284..f8a7e3640 100644 --- a/config/.env.dev +++ b/config/.env.dev @@ -7,3 +7,4 @@ MAILER_ADAPTER=Bamboo.LocalAdapter LOG_LEVEL=debug SELFHOST=false DISABLE_CRON=true +ADMIN_USER_IDS=wat,1,23 diff --git a/config/runtime.exs b/config/runtime.exs index 04804df3f..da73e0ff2 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -52,7 +52,12 @@ admin_email = get_var_from_path_or_env(config_dir, "ADMIN_USER_EMAIL") admin_user_ids = get_var_from_path_or_env(config_dir, "ADMIN_USER_IDS", "") |> String.split(",") - |> Enum.map(fn id -> Integer.parse(id) |> elem(0) end) + |> Enum.map(fn id -> Integer.parse(id) end) + |> Enum.map(fn + {int, ""} -> int + _ -> nil + end) + |> Enum.filter(& &1) admin_pwd = get_var_from_path_or_env(config_dir, "ADMIN_USER_PWD") env = get_var_from_path_or_env(config_dir, "ENVIRONMENT", "prod") From 27f99da8ad0f656479252d3ad6eee80555a913a4 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 10:20:54 +0300 Subject: [PATCH 06/22] Do not send email reports for locked sites --- lib/workers/schedule_email_reports.ex | 2 ++ lib/workers/spike_notifier.ex | 5 ++++- test/workers/schedule_email_reports_test.exs | 19 +++++++++++++++++++ test/workers/spike_notifier_test.exs | 18 ++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/lib/workers/schedule_email_reports.ex b/lib/workers/schedule_email_reports.ex index 5c87daec4..3a9ebe483 100644 --- a/lib/workers/schedule_email_reports.ex +++ b/lib/workers/schedule_email_reports.ex @@ -34,6 +34,7 @@ defmodule Plausible.Workers.ScheduleEmailReports do fragment("(? -> 'site_id')::int", job.args) == s.id and job.state not in ["completed", "discarded"], where: is_nil(job), + where: not s.locked, preload: [weekly_report: wr] ) @@ -73,6 +74,7 @@ defmodule Plausible.Workers.ScheduleEmailReports do fragment("(? -> 'site_id')::int", job.args) == s.id and job.state not in ["completed", "discarded"], where: is_nil(job), + where: not s.locked, preload: [monthly_report: mr] ) diff --git a/lib/workers/spike_notifier.ex b/lib/workers/spike_notifier.ex index a588b29a0..bac715adf 100644 --- a/lib/workers/spike_notifier.ex +++ b/lib/workers/spike_notifier.ex @@ -12,7 +12,10 @@ defmodule Plausible.Workers.SpikeNotifier do from sn in SpikeNotification, where: is_nil(sn.last_sent), or_where: sn.last_sent < fragment("now() - INTERVAL ?", @at_most_every), - preload: :site + join: s in Plausible.Site, + on: sn.site_id == s.id, + where: not s.locked, + preload: [site: s] ) for notification <- notifications do diff --git a/test/workers/schedule_email_reports_test.exs b/test/workers/schedule_email_reports_test.exs index 3a0543044..489b29f70 100644 --- a/test/workers/schedule_email_reports_test.exs +++ b/test/workers/schedule_email_reports_test.exs @@ -27,6 +27,15 @@ defmodule Plausible.Workers.ScheduleEmailReportsTest do assert Enum.count(all_enqueued(worker: SendEmailReport)) == 1 end + test "does not schedule a weekly report for locked site" do + site = insert(:site, locked: true, domain: "test-site.com", timezone: "US/Eastern") + insert(:weekly_report, site: site, recipients: ["user@email.com"]) + + perform_job(ScheduleEmailReports, %{}) + + assert Enum.empty?(all_enqueued(worker: SendEmailReport)) + end + test "schedules a new report as soon as a previous one is completed" do site = insert(:site, domain: "test-site.com", timezone: "US/Eastern") insert(:weekly_report, site: site, recipients: ["user@email.com"]) @@ -57,11 +66,21 @@ defmodule Plausible.Workers.ScheduleEmailReportsTest do site = insert(:site, domain: "test-site.com", timezone: "US/Eastern") insert(:monthly_report, site: site, recipients: ["user@email.com"]) + perform_job(ScheduleEmailReports, %{}) perform_job(ScheduleEmailReports, %{}) assert Enum.count(all_enqueued(worker: SendEmailReport)) == 1 end + test "does not schedule a monthly report for locked site" do + site = insert(:site, locked: true, domain: "test-site.com", timezone: "US/Eastern") + insert(:monthly_report, site: site, recipients: ["user@email.com"]) + + perform_job(ScheduleEmailReports, %{}) + + assert Enum.empty?(all_enqueued(worker: SendEmailReport)) + end + test "schedules a new report as soon as a previous one is completed" do site = insert(:site, domain: "test-site.com", timezone: "US/Eastern") insert(:monthly_report, site: site, recipients: ["user@email.com"]) diff --git a/test/workers/spike_notifier_test.exs b/test/workers/spike_notifier_test.exs index 4deb9b295..055cffe6f 100644 --- a/test/workers/spike_notifier_test.exs +++ b/test/workers/spike_notifier_test.exs @@ -48,6 +48,24 @@ defmodule Plausible.Workers.SpikeNotifierTest do ) end + test "does not check site if it is locked" do + site = insert(:site, locked: true) + + insert(:spike_notification, + site: site, + threshold: 10, + recipients: ["uku@example.com"] + ) + + clickhouse_stub = + stub(Plausible.Stats.Clickhouse, :current_visitors, fn _site, _query -> 10 end) + |> stub(:top_sources, fn _site, _query, _limit, _page, _show_noref -> [] end) + + SpikeNotifier.perform(nil, clickhouse_stub) + + assert_no_emails_delivered() + end + test "does not notify anyone if a notification already went out in the last 12 hours" do site = insert(:site) insert(:spike_notification, site: site, threshold: 10, recipients: ["uku@example.com"]) From 0c22b833f85ffb8ea33fe1813a35e5c449c083a6 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 10:32:34 +0300 Subject: [PATCH 07/22] Add note about ownership transfer request expiring --- .../templates/site/membership/transfer_ownership_form.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.eex b/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.eex index 0c8499a19..5a35d7080 100644 --- a/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.eex +++ b/lib/plausible_web/templates/site/membership/transfer_ownership_form.html.eex @@ -6,7 +6,7 @@

If they accept the transfer request, the new owner will be responsible for billing. Your access will be downgraded to admin and - any other member roles will stay the same. + any other member roles will stay the same. If they don't respond in 48 hours, the request will expire automatically.

<%= if @conn.assigns[:error] do %> From cf6583ce1ef73975090443ac752b94275bc96e0d Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 10:34:09 +0300 Subject: [PATCH 08/22] Clarify copy in invitation_expired.html --- lib/plausible_web/templates/auth/invitation_expired.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plausible_web/templates/auth/invitation_expired.html.eex b/lib/plausible_web/templates/auth/invitation_expired.html.eex index 2158a4c2c..b3a7b11cb 100644 --- a/lib/plausible_web/templates/auth/invitation_expired.html.eex +++ b/lib/plausible_web/templates/auth/invitation_expired.html.eex @@ -7,6 +7,6 @@

Invitation expired

- Your invitation has expired. Please request fresh one or you can <%= link("sign up", class: "text-indigo-600 hover:text-indigo-900", to: Routes.auth_path(@conn, :register)) %> for a 30-day unlimited free trial without an invitation. + Your invitation has expired or been revoked. Please request fresh one or you can <%= link("sign up", class: "text-indigo-600 hover:text-indigo-900", to: Routes.auth_path(@conn, :register)) %> for a 30-day unlimited free trial without an invitation.

From 7bee3827dd819e8569393f5b9e1d52779b33638e Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 10:42:08 +0300 Subject: [PATCH 09/22] Remove download link from realtime dashboard --- assets/js/dashboard/stats/visitor-graph.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js index 40ae56550..94b3700cf 100644 --- a/assets/js/dashboard/stats/visitor-graph.js +++ b/assets/js/dashboard/stats/visitor-graph.js @@ -290,13 +290,15 @@ class LineGraph extends React.Component { } downloadLink() { - const endpoint = `/${encodeURIComponent(this.props.site.domain)}/visitors.csv${api.serializeQuery(this.props.query)}` + if (this.props.query.period !== 'realtime') { + const endpoint = `/${encodeURIComponent(this.props.site.domain)}/visitors.csv${api.serializeQuery(this.props.query)}` - return ( - - - - ) + return ( + + + + ) + } } samplingNotice() { From 5c886cc004115db0280694f0ffe74823208bf2f5 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 10:51:58 +0300 Subject: [PATCH 10/22] Remove custom domain link if site does not have a custom domain --- .../controllers/site_controller.ex | 17 +++++++++-------- lib/plausible_web/views/layout_view.ex | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 4f1b572c8..7a981aa72 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -181,8 +181,7 @@ defmodule PlausibleWeb.SiteController do def settings_people(conn, _params) do site = conn.assigns[:site] - |> Repo.preload(memberships: :user) - |> Repo.preload(:invitations) + |> Repo.preload(memberships: :user, invitations: [], custom_domain: []) conn |> assign(:skip_plausible_tracking, true) @@ -193,7 +192,7 @@ defmodule PlausibleWeb.SiteController do end def settings_visibility(conn, _params) do - site = conn.assigns[:site] + site = conn.assigns[:site] |> Repo.preload(:custom_domain) shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id) conn @@ -206,7 +205,7 @@ defmodule PlausibleWeb.SiteController do end def settings_goals(conn, _params) do - site = conn.assigns[:site] + site = conn.assigns[:site] |> Repo.preload(:custom_domain) goals = Goals.for_site(site.domain) conn @@ -221,7 +220,7 @@ defmodule PlausibleWeb.SiteController do def settings_search_console(conn, _params) do site = conn.assigns[:site] - |> Repo.preload(:google_auth) + |> Repo.preload([:google_auth, :custom_domain]) search_console_domains = if site.google_auth do @@ -238,7 +237,7 @@ defmodule PlausibleWeb.SiteController do end def settings_email_reports(conn, _params) do - site = conn.assigns[:site] + site = conn.assigns[:site] |> Repo.preload(:custom_domain) conn |> assign(:skip_plausible_tracking, true) @@ -265,10 +264,12 @@ defmodule PlausibleWeb.SiteController do end def settings_danger_zone(conn, _params) do + site = conn.assigns[:site] |> Repo.preload(:custom_domain) + conn |> assign(:skip_plausible_tracking, true) |> render("settings_danger_zone.html", - site: conn.assigns[:site], + site: site, layout: {PlausibleWeb.LayoutView, "site_settings.html"} ) end @@ -667,6 +668,6 @@ defmodule PlausibleWeb.SiteController do conn |> put_flash(:success, "Custom domain deleted successfully") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/custom-domain") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general") end end diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.ex index c1a8bf401..6cad0c241 100644 --- a/lib/plausible_web/views/layout_view.ex +++ b/lib/plausible_web/views/layout_view.ex @@ -29,7 +29,7 @@ defmodule PlausibleWeb.LayoutView do [key: "Goals", value: "goals"], [key: "Search Console", value: "search-console"], [key: "Email reports", value: "email-reports"], - if !is_selfhost() do + if !is_selfhost() && conn.assigns[:site].custom_domain do [key: "Custom domain", value: "custom-domain"] else nil From a378935aacdd7c57105c3d9b9178347bc6704ee2 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 10:55:45 +0300 Subject: [PATCH 11/22] Add IE11 compatibility mode --- lib/plausible_web/plugs/tracker.ex | 2 +- priv/tracker/js/plausible.compat.exclusions.hash.js | 1 + .../js/plausible.compat.exclusions.hash.outbound-links.js | 1 + priv/tracker/js/plausible.compat.exclusions.js | 1 + priv/tracker/js/plausible.compat.exclusions.outbound-links.js | 1 + priv/tracker/js/plausible.compat.hash.js | 1 + priv/tracker/js/plausible.compat.hash.outbound-links.js | 1 + priv/tracker/js/plausible.compat.js | 1 + priv/tracker/js/plausible.compat.outbound-links.js | 1 + tracker/compile.js | 2 +- tracker/src/plausible.js | 4 ++++ 11 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 priv/tracker/js/plausible.compat.exclusions.hash.js create mode 100644 priv/tracker/js/plausible.compat.exclusions.hash.outbound-links.js create mode 100644 priv/tracker/js/plausible.compat.exclusions.js create mode 100644 priv/tracker/js/plausible.compat.exclusions.outbound-links.js create mode 100644 priv/tracker/js/plausible.compat.hash.js create mode 100644 priv/tracker/js/plausible.compat.hash.outbound-links.js create mode 100644 priv/tracker/js/plausible.compat.js create mode 100644 priv/tracker/js/plausible.compat.outbound-links.js diff --git a/lib/plausible_web/plugs/tracker.ex b/lib/plausible_web/plugs/tracker.ex index ee399fa01..61a808e20 100644 --- a/lib/plausible_web/plugs/tracker.ex +++ b/lib/plausible_web/plugs/tracker.ex @@ -2,7 +2,7 @@ defmodule PlausibleWeb.Tracker do import Plug.Conn use Agent - base_variants = ["hash", "outbound-links", "exclusions"] + base_variants = ["hash", "outbound-links", "exclusions", "compat"] # Generates Power Set of all variants variants = diff --git a/priv/tracker/js/plausible.compat.exclusions.hash.js b/priv/tracker/js/plausible.compat.exclusions.hash.js new file mode 100644 index 000000000..d685b93ee --- /dev/null +++ b/priv/tracker/js/plausible.compat.exclusions.hash.js @@ -0,0 +1 @@ +!function(){"use strict";var e,r=window.location,o=window.document,l=o.getElementById("plausible"),s=l.getAttribute("data-api")||new URL(l.src).origin+"/api/event",w=window.localStorage.plausible_ignore,d=l&&l.getAttribute("data-exclude").split(",");function p(e){console.warn("Ignoring Event: "+e)}function t(e,t){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(r.hostname)||"file:"===r.protocol)return p("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==w)return p("localStorage flag");if(d)for(var i=0;i a.length > 0).map(a => a.sort()); compilefile(relPath('src/plausible.js'), relPath('../priv/tracker/js/plausible.js')) diff --git a/tracker/src/plausible.js b/tracker/src/plausible.js index 2209c6b8b..6511f5750 100644 --- a/tracker/src/plausible.js +++ b/tracker/src/plausible.js @@ -4,7 +4,11 @@ var location = window.location var document = window.document + {{#if compat}} + var scriptEl = document.getElementById('plausible'); + {{else}} var scriptEl = document.currentScript; + {{/if}} var endpoint = scriptEl.getAttribute('data-api') || new URL(scriptEl.src).origin + '/api/event' var plausible_ignore = window.localStorage.plausible_ignore; {{#if exclusions}} From f4813f02fdd6a4e069d34e7f498d7295f7839794 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 11:06:34 +0300 Subject: [PATCH 12/22] Add link to the troubleshooting guide --- config/.env.dev | 2 +- .../templates/stats/waiting_first_pageview.html.eex | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/.env.dev b/config/.env.dev index f8a7e3640..4149f265d 100644 --- a/config/.env.dev +++ b/config/.env.dev @@ -7,4 +7,4 @@ MAILER_ADAPTER=Bamboo.LocalAdapter LOG_LEVEL=debug SELFHOST=false DISABLE_CRON=true -ADMIN_USER_IDS=wat,1,23 +ADMIN_USER_IDS=1 diff --git a/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex b/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex index 87a9b8735..7429dc7e7 100644 --- a/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex +++ b/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex @@ -20,8 +20,11 @@

- Need to see the snippet again? <%= link("Click here", to: "/#{URI.encode_www_form(@site.domain)}/snippet")%>
- Not working? Contact support@plausible.io to get set up + Need to see the snippet again? <%= link("Click here", to: "/#{URI.encode_www_form(@site.domain)}/snippet", class: "text-indigo-600 text-underline")%>
+ Not working? <%= link("Troubleshoot the integration", to: "https://plausible.io/docs/troubleshoot-integration#keep-seeing-a-blinking-green-dot", class: "text-indigo-600 text-underline") %> with our guide first
+ <%= if !Application.get_env(:plausible, :is_selfhost) do %> + Still not working? <%= link("Contact us", to: "https://plausible.io/contact", class: "text-indigo-600 text-underline" ) %> and we will help you with your setup + <% end %>

From 1f4f054e2428be17572418e800c1846d51c15be1 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 11:09:13 +0300 Subject: [PATCH 13/22] Copy changes for self-hosted --- .../templates/stats/waiting_first_pageview.html.eex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex b/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex index 7429dc7e7..b262ca0b7 100644 --- a/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex +++ b/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex @@ -21,9 +21,9 @@

Need to see the snippet again? <%= link("Click here", to: "/#{URI.encode_www_form(@site.domain)}/snippet", class: "text-indigo-600 text-underline")%>
- Not working? <%= link("Troubleshoot the integration", to: "https://plausible.io/docs/troubleshoot-integration#keep-seeing-a-blinking-green-dot", class: "text-indigo-600 text-underline") %> with our guide first
+ Not working? <%= link("Troubleshoot the integration", to: "https://plausible.io/docs/troubleshoot-integration#keep-seeing-a-blinking-green-dot", class: "text-indigo-600 text-underline") %> with our guide <%= if !Application.get_env(:plausible, :is_selfhost) do %> - Still not working? <%= link("Contact us", to: "https://plausible.io/contact", class: "text-indigo-600 text-underline" ) %> and we will help you with your setup + first
Still not working? <%= link("Contact us", to: "https://plausible.io/contact", class: "text-indigo-600 text-underline" ) %> and we will help you with your setup <% end %>

From de158d22e491a4fcd0f34c814e45a60055188b67 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 11:49:11 +0300 Subject: [PATCH 14/22] Remove Signup tracking from invitation form --- .../templates/auth/register_from_invitation_form.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex b/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex index 1cc9e94c1..bd11a1c22 100644 --- a/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex +++ b/lib/plausible_web/templates/auth/register_from_invitation_form.html.eex @@ -3,7 +3,7 @@
Set up privacy-friendly analytics with just a few clicks
-<%= form_for @changeset, Routes.auth_path(@conn, :register_from_invitation_form, @invitation.invitation_id), [class: "w-full max-w-md mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 mb-4 mt-8", id: "register-form"], fn f -> %> +<%= form_for @changeset, Routes.auth_path(@conn, :register_from_invitation_form, @invitation.invitation_id), [class: "w-full max-w-md mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 mb-4 mt-8"], fn f -> %>

Enter your details

From 7c9ca12a3e793fa9d553f3b66a8f5933fa7d77f9 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 17 Jun 2021 15:58:54 +0300 Subject: [PATCH 15/22] Don't use URL in compat mode --- .../templates/layout/_tracking.html.eex | 2 +- .../tracker/js/plausible.compat.exclusions.hash.js | 2 +- ...usible.compat.exclusions.hash.outbound-links.js | 2 +- priv/tracker/js/plausible.compat.exclusions.js | 2 +- .../plausible.compat.exclusions.outbound-links.js | 2 +- priv/tracker/js/plausible.compat.hash.js | 2 +- .../js/plausible.compat.hash.outbound-links.js | 2 +- priv/tracker/js/plausible.compat.js | 2 +- priv/tracker/js/plausible.compat.outbound-links.js | 2 +- tracker/src/plausible.js | 14 +++++++++++++- 10 files changed, 22 insertions(+), 10 deletions(-) diff --git a/lib/plausible_web/templates/layout/_tracking.html.eex b/lib/plausible_web/templates/layout/_tracking.html.eex index e4bd69cd1..e46d32836 100644 --- a/lib/plausible_web/templates/layout/_tracking.html.eex +++ b/lib/plausible_web/templates/layout/_tracking.html.eex @@ -1,5 +1,5 @@ <%= if !Application.get_env(:plausible, :is_selfhost) && !@conn.assigns[:skip_plausible_tracking] do %> - + <% end %> diff --git a/priv/tracker/js/plausible.compat.exclusions.hash.js b/priv/tracker/js/plausible.compat.exclusions.hash.js index d685b93ee..126404042 100644 --- a/priv/tracker/js/plausible.compat.exclusions.hash.js +++ b/priv/tracker/js/plausible.compat.exclusions.hash.js @@ -1 +1 @@ -!function(){"use strict";var e,r=window.location,o=window.document,l=o.getElementById("plausible"),s=l.getAttribute("data-api")||new URL(l.src).origin+"/api/event",w=window.localStorage.plausible_ignore,d=l&&l.getAttribute("data-exclude").split(",");function p(e){console.warn("Ignoring Event: "+e)}function t(e,t){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(r.hostname)||"file:"===r.protocol)return p("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==w)return p("localStorage flag");if(d)for(var i=0;i Date: Fri, 18 Jun 2021 11:13:54 +0300 Subject: [PATCH 16/22] Make sure the latest subscription is always used --- lib/plausible/auth/user_admin.ex | 3 ++- lib/workers/lock_sites.ex | 3 ++- test/workers/lock_sites_test.exs | 21 ++++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.ex index 0ecb75903..ec4db077e 100644 --- a/lib/plausible/auth/user_admin.ex +++ b/lib/plausible/auth/user_admin.ex @@ -2,7 +2,8 @@ defmodule Plausible.Auth.UserAdmin do use Plausible.Repo def custom_index_query(_conn, _schema, query) do - from(r in query, preload: [:subscription]) + subscripton_q = from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at]) + from(r in query, preload: [subscription: ^subscripton_q]) end def form_fields(_) do diff --git a/lib/workers/lock_sites.ex b/lib/workers/lock_sites.ex index 2c85da14e..69356d6cd 100644 --- a/lib/workers/lock_sites.ex +++ b/lib/workers/lock_sites.ex @@ -4,7 +4,8 @@ defmodule Plausible.Workers.LockSites do @impl Oban.Worker def perform(_job) do - users = Repo.all(from u in Plausible.Auth.User, preload: :subscription) + subscription_q = from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at]) + users = Repo.all(from u in Plausible.Auth.User, preload: [subscription: ^subscription_q]) for user <- users do Plausible.Billing.SiteLocker.check_sites_for(user) diff --git a/test/workers/lock_sites_test.exs b/test/workers/lock_sites_test.exs index 27ecc7fdf..935c85bef 100644 --- a/test/workers/lock_sites_test.exs +++ b/test/workers/lock_sites_test.exs @@ -51,7 +51,7 @@ defmodule Plausible.Workers.LockSitesTest do end test "locks user who cancelled subscription and the cancelled subscription has expired" do - user = insert(:user) + user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1)) insert(:subscription, status: "deleted", @@ -63,6 +63,25 @@ defmodule Plausible.Workers.LockSitesTest do LockSites.perform(nil) + assert Repo.reload!(site).locked + end + + test "does not lock if user has an old cancelled subscription and a new active subscription" do + user = insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1)) + + insert(:subscription, + status: "deleted", + next_bill_date: Timex.today() |> Timex.shift(days: -1), + user: user, + inserted_at: Timex.now() |> Timex.shift(days: -1) + ) + + insert(:subscription, status: "active", user: user) + + site = insert(:site, members: [user]) + + LockSites.perform(nil) + refute Repo.reload!(site).locked end From 30ac9011418d80c66474634a98d95e7e8388ec0a Mon Sep 17 00:00:00 2001 From: Vignesh Joglekar Date: Mon, 21 Jun 2021 06:42:16 -0500 Subject: [PATCH 17/22] Adds manual, editable, auto-suggested filters, and negated&globbed path-based filters (#1121) * Adds manual-filters + friends commit 308192044d726e9a6f7406e333048ab3407aa260 Merge: 39287ab a299fab Author: Vignesh Joglekar Date: Fri Jun 11 03:40:55 2021 -0500 Merge branch 'manual-filters' into manual-filters-2 commit a299fab1fbe98ec04ea3dfbfbd175a2af5e73804 Author: Vignesh Joglekar Date: Fri Jun 11 02:20:26 2021 -0500 Changes to split and pattern matched function for time_on_page commit 10f10c933af56a3482747f818bd580a8a1903ae2 Author: Vignesh Joglekar Date: Fri Jun 11 01:53:18 2021 -0500 Fixes a couple of minor UX issues commit f2e5ce8eb33460cb2d1dc9ac0bd0d4ad0a20aa31 Author: Vignesh Joglekar Date: Fri Jun 11 01:49:10 2021 -0500 Fixes time on page for globbed and negated page paths commit bb18af6526068860e4090dc91d02455e515f1238 Author: Vignesh Joglekar Date: Thu Jun 10 05:24:05 2021 -0500 Close to finalized version of updated version Just needs some additional testing + potentially code cleanup commit d0b7bfe3dacb4c611e6857bed308b5954aa2cc1e Author: Vignesh Joglekar Date: Fri May 28 04:21:21 2021 -0500 Real Dialyzer Fix commit 296a76af34ff7e16c83e5b5bf62f0547dc30ece9 Author: Vignesh Joglekar Date: Fri May 28 03:44:29 2021 -0500 Dialyzer fix commit 91f3b44017afb3838bbb4de8ec9f3ba4d39709bc Author: Vignesh Joglekar Date: Thu May 27 17:11:24 2021 -0500 Changelog commit e041f75745ab57b0d3c00d4a9ff7f8a490b27c17 Author: Vignesh Joglekar Date: Thu May 27 17:09:52 2021 -0500 Formatting commit f689642204b02f6544dc072b95c9c22e180b9e87 Merge: e00929b 4ff25f6 Author: Vignesh Joglekar Date: Thu May 27 17:08:47 2021 -0500 Merge branch 'master' into manual-filters commit e00929b1c51411fe4bf939266d3aeb6f67dcb2ab Merge: 83887c4 806975e Author: Vignesh Joglekar Date: Thu May 27 17:01:48 2021 -0500 Merge branch 'manual-filters' of github.com:Vigasaurus/plausible-analytics into manual-filters commit 83887c49ccc7fbc50ba1766bfa74c77994ef1900 Author: Vignesh Joglekar Date: Thu May 27 16:59:32 2021 -0500 Adds tests for suggestions, formats goals suggestion query commit 1cb7732a08a50eddb81166fb796bf5731a0c5aba Author: Vignesh Joglekar Date: Thu May 27 16:36:31 2021 -0500 Adds goals as auto-complete capable filter commit 4ca39cc406777794bab7586116115031c6d8a82a Author: Vignesh Joglekar Date: Thu May 27 16:08:22 2021 -0500 95% completed auto-complete setup Still needs: - tests - goals added as filter commit 22d38c4cd83dd1d72ec435e1b8cf6fc3eb70d957 Author: Vignesh Joglekar Date: Thu May 27 03:47:19 2021 -0500 80% of auto-complete filters progress Still needs - countries and screen into new format - re-style dropdown and background - drop debounce time - tests commit 806975ede9ebcbaa03ce888c41f20da866413697 Merge: 81c5e05 1a93542 Author: Vignesh Joglekar Date: Tue May 25 15:28:21 2021 -0500 Merge branch 'master' into manual-filters commit 81c5e05760bf7f5d6fc05290e662ab61f9a4b73b Author: Vignesh Joglekar Date: Tue May 25 15:21:03 2021 -0500 Makes colorings on top bar elements consistent commit fa7f6c22680f5f00b89c7ea99032b409a5f8bbd2 Author: Vignesh Joglekar Date: Tue May 25 14:58:25 2021 -0500 Makes requested changes, adds different version of filter button commit 7dc65b9b7a5a9678499a7c404109e710ae7da36d Author: Vignesh Joglekar Date: Sat May 22 04:29:01 2021 -0500 Changelog commit c684f1c76a2599324c19ca32de10b2f2849fd5e9 Author: Vignesh Joglekar Date: Sat May 22 04:26:14 2021 -0500 Various UI Improvements - Makes edit buttons full-length & properly sized - Adds remove filter button in edit menu commit a632e7a8eea4a9897052cb08d3f7605403c227f7 Author: Vignesh Joglekar Date: Sat May 22 03:11:50 2021 -0500 Adds tests for exclusions and wildcards commit eb91a7942b662d412511a4c47501a9b6d7f2d625 Author: Vignesh Joglekar Date: Sat May 22 03:02:23 2021 -0500 Fixes editing UX on list view commit 6209d72aeede6aa8ce4f8e009d2ea168bb8f77a7 Author: Vignesh Joglekar Date: Fri May 21 04:01:17 2021 -0500 Bugfix in realtime view, formatting commit 007d44df38dba254154b3450aacec9dd253ccd95 Author: Vignesh Joglekar Date: Fri May 21 03:23:16 2021 -0500 Second pass - mostly everything user-facing is done Still needs: - Tests - Potentially negating other filters - Potentially some code cleanup commit cb7b5b9fbd83f618cf4ebbe6582a9202b4989033 Author: Vignesh Joglekar Date: Fri May 21 01:49:52 2021 -0500 First pass on manual filter & path regex/negated filters Still needs: - Form structure on filter modal - Edit filter button - Filter dropdown UI improvement - Filter modal mount data collection - Tests - Potentially negating other filters * Fixes an issue between the updated React version and Flatpickr not showing up Reverting to v16 was the simplest fix without diving into the issue upstream with Flatpickr * Resolves comments on UI and code style Co-authored-by: Uku Taht --- CHANGELOG.md | 5 +- assets/css/modal.css | 1 - assets/css/react-select.css | 97 + assets/js/app.js | 3 +- assets/js/dashboard/datepicker.js | 8 +- assets/js/dashboard/filters.js | 108 +- assets/js/dashboard/historical.js | 2 +- assets/js/dashboard/query.js | 19 + assets/js/dashboard/realtime.js | 2 +- assets/js/dashboard/router.js | 4 + assets/js/dashboard/stats/modals/filter.js | 234 ++ assets/js/dashboard/stats/modals/modal.js | 2 +- assets/package-lock.json | 2264 ++++++++++------- assets/package.json | 2 + assets/tailwind.config.js | 3 +- lib/plausible/stats/clickhouse.ex | 383 ++- .../controllers/api/stats_controller.ex | 17 +- lib/plausible_web/router.ex | 1 + .../api/stats_controller/suggestions_test.exs | 133 + 19 files changed, 2235 insertions(+), 1053 deletions(-) create mode 100644 assets/css/react-select.css create mode 100644 assets/js/dashboard/stats/modals/filter.js create mode 100644 test/plausible_web/controllers/api/stats_controller/suggestions_test.exs diff --git a/CHANGELOG.md b/CHANGELOG.md index bf92042c5..717bb5fbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,10 @@ All notable changes to this project will be documented in this file. - To authenticate against a local postgresql via socket authentication, the environment-variables `DATABASE_SOCKET_DIR` & `DATABASE_NAME` were added. - Time on Page metric available in detailed Top Pages report plausible/analytics#1007 -- Added `CLICKHOUSE_FLUSH_INTERVAL_MS` and `CLICKHOUSE_MAX_BUFFER_SIZE` configuration parameters +- Wildcard based page, entry page and exit page filters plausible/analytics#1067 +- Exclusion filters for page, entry page and exit page filters plausible/analytics#1067 +- Menu (with auto-complete) to add new and edit existing filters directly plausible/analytics#1089 +- Added `CLICKHOUSE_FLUSH_INTERVAL_MS` and `CLICKHOUSE_MAX_BUFFER_SIZE` configuration parameters plausible/analytics#1073 - Ability to invite users to sites with different roles plausible/analytics#1122 ### Fixed diff --git a/assets/css/modal.css b/assets/css/modal.css index 10028c9ea..2a36314ef 100644 --- a/assets/css/modal.css +++ b/assets/css/modal.css @@ -38,7 +38,6 @@ .modal__container { background-color: #fff; padding: 1rem 2rem; - max-width: 860px; border-radius: 4px; margin: 50px auto; box-sizing: border-box; diff --git a/assets/css/react-select.css b/assets/css/react-select.css new file mode 100644 index 000000000..27a598d61 --- /dev/null +++ b/assets/css/react-select.css @@ -0,0 +1,97 @@ +.filter-list-text:hover ~ .filter-list-edit { + display: flex; +} + +.filter-list-text:hover ~ .filter-list-remove { + display: none; +} + +.filter-select__control:focus-within { + box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px, rgb(99, 102, 241) 0px 0px 0px 1px, rgba(0, 0, 0, 0) 0px 0px 0px 0px; /* indigo-500 */ +} + +.filter-select__value-container { + padding-left: 1rem !important; +} + +.filter-select__control { + @apply dark:bg-gray-900 border-gray-300 dark:border-gray-700 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 pr-8; + border-radius: 0.375rem !important; + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e"); + background-position: right 0.5rem center; + background-repeat: no-repeat; + background-size: 1.35rem 1.35rem; +} + +.filter-select__control:hover { + @apply cursor-pointer; + border-color: rgb(156, 163, 175) !important; /* gray-400 */ +} + +.filter-select__indicator-separator { + @apply hidden; +} + +.filter-select__dropdown-indicator { + display: none !important; +} + +.filter-select__input { + @apply w-full text-base sm:text-sm; + margin: 0 !important; +} + +.filter-select__input input { + width: 100% !important; + box-shadow: none !important; +} + +.dark .filter-select__input input { + color: rgb(209, 213, 219) !important; /* gray-300 */ +} + +.filter-select__value-container > :not(.filter-select__single-value) { + @apply w-full; + padding-top: 0 !important; +} + +.filter-select__loading-indicator { + color: rgb(79, 70, 229) !important; /* indigo-600 */ +} + +.filter-select__loading-indicator > span { + height: 1.5em; + width: 1.5em; +} + +.filter-select__single-value { + @apply dark:text-gray-400 text-base sm:text-sm; +} + +.filter-select__menu-list { + @apply dark:bg-gray-900; +} + +.filter-select__option { + @apply dark:text-gray-300; + font-size: 1rem !important; + line-height: 1.5rem !important; + cursor: pointer !important; +} + +@media (min-width: 640px) { + .filter-select__option { + font-size: 0.875rem !important; + line-height: 1.25rem !important; + } +} + +.filter-select__option--is-focused { + background-color: rgb(99, 102, 241) !important; /* indigo-500 */ + color: white !important; +} + +.dark .filter-select__option--is-focused { + background-color: rgb(79, 70, 229) !important; /* indigo-600 */ +} + diff --git a/assets/js/app.js b/assets/js/app.js index 2c0a9ad64..81e2debee 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -1,4 +1,5 @@ -import css from "../css/app.css" +import "../css/app.css" +import "../css/react-select.css" import "flatpickr/dist/flatpickr.min.css" import "./polyfills/closest" import 'abortcontroller-polyfill/dist/polyfill-patch-fetch' diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js index 6fa47e770..d3aee1791 100644 --- a/assets/js/dashboard/datepicker.js +++ b/assets/js/dashboard/datepicker.js @@ -161,10 +161,10 @@ class DatePicker extends React.Component { const leftClasses = `flex items-center px-2 border-r border-gray-300 rounded-l dark:border-gray-500 dark:text-gray-100 ${ - disabledLeft ? "bg-gray-200 dark:bg-gray-900" : "" + disabledLeft ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900" }`; const rightClasses = `flex items-center px-2 rounded-r dark:text-gray-100 ${ - disabledRight ? "bg-gray-200 dark:bg-gray-900" : "" + disabledRight ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900" }`; return (
@@ -242,7 +242,7 @@ class DatePicker extends React.Component { onKeyPress={this.open} className="flex items-center justify-between rounded bg-white dark:bg-gray-800 shadow px-4 pr-3 py-2 leading-tight cursor-pointer text-sm font-medium text-gray-800 - dark:text-gray-200 h-full" + dark:text-gray-200 h-full hover:bg-gray-200 dark:hover:bg-gray-900" tabIndex="0" role="button" aria-haspopup="true" @@ -312,7 +312,7 @@ class DatePicker extends React.Component { to={{from: false, to: false, period, ...opts}} onClick={this.close.bind(this)} query={this.props.query} - className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-100 + className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-200 dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100 flex items-center justify-between`} > {text} diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index 48e4e082a..9ae721d31 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -1,6 +1,6 @@ import React from 'react'; -import { withRouter } from 'react-router-dom' -import { countFilters, navigateToQuery, removeQueryParam } from './query' +import { withRouter, Link } from 'react-router-dom' +import { countFilters, formattedFilters, navigateToQuery, removeQueryParam } from './query' import Datamap from 'datamaps' import Transition from "../transition.js"; @@ -60,7 +60,7 @@ class Filters extends React.Component { } handleKeyup(e) { - const {query, history} = this.props + const { query, history } = this.props if (e.ctrlKey || e.metaKey || e.altKey) return @@ -70,7 +70,7 @@ class Filters extends React.Component { } handleResize() { - this.setState({ viewport: window.innerWidth || 639}); + this.setState({ viewport: window.innerWidth || 639 }); } handleClick(e) { @@ -102,6 +102,9 @@ class Filters extends React.Component { }; filterText(key, value, query) { + const negated = value[0] == '!' && ['page', 'entry_page', 'exit_page'].includes(key) + value = negated ? value.slice(1) : value + if (key === "goal") { return Completed goal {value} } @@ -111,50 +114,50 @@ class Filters extends React.Component { return {eventName}.{metaKey} is {metaValue} } if (key === "source") { - return Source: {value} + return Source is {value} } if (key === "utm_medium") { - return UTM medium: {value} + return UTM medium is {value} } if (key === "utm_source") { - return UTM source: {value} + return UTM source is {value} } if (key === "utm_campaign") { - return UTM campaign: {value} + return UTM campaign is {value} } if (key === "referrer") { - return Referrer: {value} + return Referrer is {value} } if (key === "screen") { - return Screen size: {value} + return Screen size is {value} } if (key === "browser") { - return Browser: {value} + return Browser is {value} } if (key === "browser_version") { const browserName = query.filters["browser"] ? query.filters["browser"] : 'Browser' - return {browserName}.Version: {value} + return {browserName} Version is {value} } if (key === "os") { - return Operating System: {value} + return Operating System is {value} } if (key === "os_version") { const osName = query.filters["os"] ? query.filters["os"] : 'OS' - return {osName}.Version: {value} + return {osName} Version is {value} } if (key === "country") { const allCountries = Datamap.prototype.worldTopo.objects.world.geometries; - const selectedCountry = allCountries.find((c) => c.id === value) || {properties: {name: value}}; - return Country: {selectedCountry.properties.name} + const selectedCountry = allCountries.find((c) => c.id === value) || { properties: { name: value } }; + return Country is {selectedCountry.properties.name} } if (key === "page") { - return Page: {value} + return Page is{negated ? ' not' : ''} {value} } if (key === "entry_page") { - return Entry Page: {value} + return Entry Page is{negated ? ' not' : ''} {value} } if (key === "exit_page") { - return Exit Page: {value} + return Exit Page is{negated ? ' not' : ''} {value} } } @@ -171,18 +174,50 @@ class Filters extends React.Component { } renderDropdownFilter(history, [key, value], query) { + if ('props' == key) { + return ( +
+ {this.filterText(key, value, query)} + this.removeFilter(key, history, query)}>✕ +
+ ) + } + return ( -
- {this.filterText(key, value, query)} - this.removeFilter(key, history, query)}>✕ +
+ + {this.filterText(key, value, query)} + + + this.removeFilter(key, history, query)}>✕
) } renderListFilter(history, [key, value], query) { return ( - - {this.filterText(key, value, query)} this.removeFilter(key, history, query)}>✕ + + {'props' == key ? ( + + {this.filterText(key, value, query)} + + ) : ( + <> + + {this.filterText(key, value, query)} + + + + + + )} + this.removeFilter(key, history, query)}> + + ) } @@ -198,11 +233,15 @@ class Filters extends React.Component { renderDropDownContent() { const { viewport } = this.state; - const { history, query } = this.props; + const { history, query, site } = this.props; return (
this.dropDownNode = node}>
+ + + Add Filter + {this.appliedFilters.map((filter) => this.renderDropdownFilter(history, filter, query))}
this.clearAllFilters(history, query)}> Clear All Filters @@ -239,11 +278,16 @@ class Filters extends React.Component { } renderFilterList() { - const { history, query } = this.props; + const { history, query, site } = this.props; + const { viewport } = this.state; return ( -
+
{(this.appliedFilters.map((filter) => this.renderListFilter(history, filter, query)))} + + + {viewport <= 768 ? "Filter" : "Add Filter"} +
); } @@ -251,15 +295,11 @@ class Filters extends React.Component { render() { const { wrapped, viewport } = this.state; - if (this.appliedFilters.length > 0) { - if (wrapped === 2 || viewport <= 768) { - return this.renderDropDown(); - } - - return this.renderFilterList(); + if (this.appliedFilters.length > 0 && (wrapped === 2 || viewport <= 768)) { + return this.renderDropDown(); } - return null; + return this.renderFilterList(); } } diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.js index 9266cefb4..42afd9f36 100644 --- a/assets/js/dashboard/historical.js +++ b/assets/js/dashboard/historical.js @@ -34,7 +34,7 @@ class Historical extends React.Component {
- +
diff --git a/assets/js/dashboard/query.js b/assets/js/dashboard/query.js index 1fa3c8fdb..71bddf47b 100644 --- a/assets/js/dashboard/query.js +++ b/assets/js/dashboard/query.js @@ -159,3 +159,22 @@ export function eventName(query) { } return 'pageviews' } + +export const formattedFilters = { + 'goal': 'Goal', + 'props': 'Goal properties', + 'source': 'Source', + 'utm_medium': 'UTM Medium', + 'utm_source': 'UTM Source', + 'utm_campaign': 'UTM Campaign', + 'referrer': 'Referrer URL', + 'screen': 'Screen size', + 'browser': 'Browser', + 'browser_version': 'Browser Version', + 'os': 'Operating System', + 'os_version': 'Operating System Version', + 'country': 'Country', + 'page': 'Page', + 'entry_page': 'Entry Page', + 'exit_page': 'Exit Page' +} diff --git a/assets/js/dashboard/realtime.js b/assets/js/dashboard/realtime.js index 1a05c8d66..33ce0dbad 100644 --- a/assets/js/dashboard/realtime.js +++ b/assets/js/dashboard/realtime.js @@ -33,7 +33,7 @@ class Realtime extends React.Component {
- +
diff --git a/assets/js/dashboard/router.js b/assets/js/dashboard/router.js index 9183513ca..65acf670c 100644 --- a/assets/js/dashboard/router.js +++ b/assets/js/dashboard/router.js @@ -7,6 +7,7 @@ import PagesModal from './stats/modals/pages' import EntryPagesModal from './stats/modals/entry-pages' import ExitPagesModal from './stats/modals/exit-pages' import CountriesModal from './stats/modals/countries' +import FilterModal from './stats/modals/filter' import {BrowserRouter, Switch, Route, useLocation} from "react-router-dom"; @@ -50,6 +51,9 @@ export default function Router({site, loggedIn, currentUserRole}) { + + + diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js new file mode 100644 index 000000000..da362424c --- /dev/null +++ b/assets/js/dashboard/stats/modals/filter.js @@ -0,0 +1,234 @@ +import React from "react"; +import { withRouter, Redirect } from 'react-router-dom' + +import Datamap from 'datamaps' +import AsyncSelect from 'react-select/async' +import debounce from 'lodash.debounce' +import Modal from './modal' +import { parseQuery, formattedFilters, navigateToQuery } from '../../query' +import Transition from "../../../transition"; +import * as api from '../../api' + +class FilterModal extends React.Component { + constructor(props) { + super(props) + this.state = { + query: parseQuery(props.location.search, props.site), + selectedFilter: "", + negated: false, + updatedValue: "", + inputValue: "", + forceReloadSuggestions: 0, + defaultOptions: [] + } + + this.editableGoals = Object.keys(this.state.query.filters).filter(filter => !['props'].includes(filter)) + this.renderSelector = this.renderSelector.bind(this) + this.fetchSuggestions = this.fetchSuggestions.bind(this) + this.handleKeydown = this.handleKeydown.bind(this) + this.handleSubmit = this.handleSubmit.bind(this) + this.fieldSelectRef = React.createRef() + this.debouncedFetchSuggestions = debounce((q, callback) => this.fetchSuggestions(q, callback), 150) + } + + componentDidMount() { + this.setState({ selectedFilter: this.props.match.params.field }) + this.fieldSelectRef.current.focus() + document.addEventListener("keydown", this.handleKeydown) + } + + componentDidUpdate(prevProps, prevState) { + const { query, selectedFilter, updatedValue, forceReloadSuggestions } = this.state + + if (prevState.selectedFilter !== selectedFilter) { + const negated = !!query.filters[selectedFilter] && query.filters[selectedFilter][0] == '!' && this.negationSupported(selectedFilter) + let updatedValue = negated ? query.filters[selectedFilter].slice(1) : (query.filters[selectedFilter] || "") + + if (selectedFilter == 'country') { + const allCountries = Datamap.prototype.worldTopo.objects.world.geometries; + const selectedCountry = allCountries.find((c) => c.id === updatedValue) || { properties: { name: updatedValue } }; + updatedValue = selectedCountry.properties.name + } + + if (selectedFilter) this.fetchSuggestions('', (defaultOptions) => this.setState({ defaultOptions })) + this.setState({ updatedValue, inputValue: updatedValue, negated, forceReloadSuggestions: forceReloadSuggestions + 1 }) + } + } + + componentWillUnmount() { + document.removeEventListener("keydown", this.handleKeydown); + } + + handleKeydown(e) { + if (e.ctrlKey || e.metaKey || e.shiftKey || e.altKey || e.isComposing || e.keyCode === 229) return + + if (e.target.tagName == 'BODY' && e.key == 'Enter') { + this.handleSubmit() + } + } + + negationSupported(filter) { + return ['page', 'entry_page', 'exit_page'].includes(filter) + } + + fetchSuggestions(searchQuery = "", callback) { + const { query, selectedFilter } = this.state + const updatedQuery = { ...query, filters: { ...query.filters, [selectedFilter]: null } } + + if (selectedFilter == 'country') { + const matchedCountries = Datamap.prototype.worldTopo.objects.world.geometries.filter(c => c.properties.name.includes(searchQuery.trim())) + const matches = matchedCountries.map(c => c.id) + + api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/suggestions/country`, updatedQuery, { q: matches }) + .then((res) => { + const result = res.map(code => matchedCountries.filter(c => c.id == code)[0].properties.name).map(r => ({ label: r, value: r })) + callback(result) + }) + } else { + api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/suggestions/${selectedFilter}`, updatedQuery, { q: searchQuery.trim() }) + .then((res) => { + const result = res.map(r => ({ label: r, value: r })) + callback(result) + }) + } + } + + renderSelector(filter) { + const { updatedValue, selectedFilter, inputValue, forceReloadSuggestions, defaultOptions } = this.state; + + if (!filter) return null + + return ( + this.debouncedFetchSuggestions(q, callback)} + placeholder='Filter value' + maxMenuHeight={250} + tabSelectsValue={false} + classNamePrefix='filter-select' + blurInputOnSelect + noOptionsMessage={() => ( + + + No results found in current dashboard, try removing some filters, checking your input and ensuring this {formattedFilters[selectedFilter].toLowerCase()} exists + + )} + loadingMessage={() => ( + + Loading filter suggestions + + )} + value={inputValue == '' ? { label: 'Enter a filter value', value: '' } : { label: updatedValue, value: `${updatedValue } ` }} + onChange={({ value }, a) => { + this.setState({ updatedValue: value, inputValue: value, forceReloadSuggestions: forceReloadSuggestions + 1 }) + }} + onInputChange={(value, { action }) => { + if (action == 'input-change') this.setState({ inputValue: value }) + if (action == 'menu-close' || action == 'input-blur') this.setState(({inputValue}) => ({ updatedValue: inputValue })) + }} + inputValue={inputValue} + onBlur={() => this.setState({ forceReloadSuggestions: forceReloadSuggestions + 1 })} + />) + } + + handleSubmit() { + const { selectedFilter, negated, updatedValue } = this.state; + const validFilter = this.editableGoals.includes(selectedFilter) && updatedValue.trim() + + let finalFilterValue = (this.negationSupported(selectedFilter) && negated ? '!' : '') + updatedValue.trim() + if (selectedFilter == 'country') { + const allCountries = Datamap.prototype.worldTopo.objects.world.geometries; + const selectedCountry = allCountries.find((c) => c.properties.name === finalFilterValue) || { id: finalFilterValue }; + finalFilterValue = selectedCountry.id + } + const finalizedQuery = new URLSearchParams(window.location.search) + finalizedQuery.set(selectedFilter, finalFilterValue) + + if (validFilter) { + this.setState({ finalizedQuery }) + } + } + + renderBody() { + const { selectedFilter, negated, updatedValue, query } = this.state; + const validFilter = this.editableGoals.includes(selectedFilter) && updatedValue.trim() + + return ( + <> +

{query.filters[selectedFilter] ? 'Edit' : 'Add'} Filter

+ +
+
+
+ + + {this.negationSupported(selectedFilter) && ( +
+ +
+ )} + + {this.renderSelector(selectedFilter)} + + + + {query.filters[selectedFilter] && ( + + )} +
+
+ + ) + } + + render() { + const { finalizedQuery } = this.state; + + if (finalizedQuery) + return + + return ( + + { this.renderBody()} + + ) + } +} + +export default withRouter(FilterModal) diff --git a/assets/js/dashboard/stats/modals/modal.js b/assets/js/dashboard/stats/modals/modal.js index 292b2d110..cd6603baa 100644 --- a/assets/js/dashboard/stats/modals/modal.js +++ b/assets/js/dashboard/stats/modals/modal.js @@ -47,7 +47,7 @@ class Modal extends React.Component {
-
+
{this.props.children}
diff --git a/assets/package-lock.json b/assets/package-lock.json index 3620925f1..55f333d7d 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -22,6 +22,7 @@ "css-minimizer-webpack-plugin": "^3.0.0", "datamaps": "^0.5.9", "iframe-resizer": "^4.3.2", + "lodash.debounce": "^4.0.8", "mini-css-extract-plugin": "^1.6.0", "phoenix": "file:../deps/phoenix", "phoenix_html": "file:../deps/phoenix_html", @@ -32,6 +33,7 @@ "react-flatpickr": "3.10.5", "react-flip-move": "^3.0.4", "react-router-dom": "^5.2.0", + "react-select": "^4.3.1", "react-transition-group": "^4.4.2", "tailwindcss": "^2.1.2", "terser-webpack-plugin": "^5.1.2", @@ -69,22 +71,25 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.14.4", - "license": "MIT" + "version": "7.14.5", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } }, "node_modules/@babel/core": { - "version": "7.14.3", - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.3", - "@babel/helper-compilation-targets": "^7.13.16", - "@babel/helper-module-transforms": "^7.14.2", - "@babel/helpers": "^7.14.0", - "@babel/parser": "^7.14.3", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.2", + "version": "7.14.5", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.14.5", + "@babel/helper-compilation-targets": "^7.14.5", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helpers": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -108,38 +113,50 @@ } }, "node_modules/@babel/generator": { - "version": "7.14.3", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.14.2", + "@babel/types": "^7.14.5", "jsesc": "^2.5.1", "source-map": "^0.5.0" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-explode-assignable-expression": "^7.12.13", - "@babel/types": "^7.12.13" + "@babel/helper-explode-assignable-expression": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.14.4", - "@babel/helper-validator-option": "^7.12.17", + "@babel/compat-data": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", "browserslist": "^4.16.6", "semver": "^6.3.0" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0" } @@ -152,27 +169,33 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-function-name": "^7.14.2", - "@babel/helper-member-expression-to-functions": "^7.13.12", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-replace-supers": "^7.14.4", - "@babel/helper-split-export-declaration": "^7.12.13" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.14.3", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", + "@babel/helper-annotate-as-pure": "^7.14.5", "regexpu-core": "^4.7.1" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0" } @@ -202,153 +225,209 @@ } }, "node_modules/@babel/helper-explode-assignable-expression": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.13.0" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-get-function-arity": "^7.12.13", - "@babel/template": "^7.12.13", - "@babel/types": "^7.14.2" + "@babel/helper-get-function-arity": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-get-function-arity": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.13.16", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/traverse": "^7.13.15", - "@babel/types": "^7.13.16" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.13.12", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.13.12" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.13.12", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.13.12" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-replace-supers": "^7.13.12", - "@babel/helper-simple-access": "^7.13.12", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/helper-validator-identifier": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.2" + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-simple-access": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.13.0", - "license": "MIT" + "version": "7.14.5", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-wrap-function": "^7.13.0", - "@babel/types": "^7.13.0" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-wrap-function": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.13.12", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.4" + "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.13.12", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.13.12" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.12.1", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.14.0", - "license": "MIT" + "version": "7.14.5", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } }, "node_modules/@babel/helper-validator-option": { - "version": "7.12.17", - "license": "MIT" + "version": "7.14.5", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-function-name": "^7.12.13", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.13.0", - "@babel/types": "^7.13.0" + "@babel/helper-function-name": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.14.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.14.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.14.0", + "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "bin": { "parser": "bin/babel-parser.js" @@ -358,185 +437,230 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.13.12", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", - "@babel/plugin-proposal-optional-chaining": "^7.13.12" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", + "@babel/plugin-proposal-optional-chaining": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.13.0" } }, "node_modules/@babel/plugin-proposal-async-generator-functions": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-remap-async-to-generator": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.14.5", "@babel/plugin-syntax-async-generators": "^7.8.4" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.14.3", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.14.3", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-class-static-block": "^7.12.13" + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.12.0" } }, "node_modules/@babel/plugin-proposal-dynamic-import": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-export-namespace-from": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-json-strings": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-json-strings": "^7.8.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-numeric-separator": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-numeric-separator": "^7.10.4" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.14.4", - "@babel/helper-compilation-targets": "^7.14.4", - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/compat-data": "^7.14.5", + "@babel/helper-compilation-targets": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.14.2" + "@babel/plugin-transform-parameters": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-optional-catch-binding": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-optional-chaining": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", "@babel/plugin-syntax-optional-chaining": "^7.8.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-private-methods": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.14.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-create-class-features-plugin": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-private-property-in-object": "^7.14.0" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-proposal-unicode-property-regex": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { "node": ">=4" @@ -566,10 +690,13 @@ } }, "node_modules/@babel/plugin-syntax-class-static-block": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" @@ -606,10 +733,13 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" @@ -676,441 +806,555 @@ } }, "node_modules/@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-remap-async-to-generator": "^7.13.0" + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-function-name": "^7.14.2", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-replace-supers": "^7.14.4", - "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", "globals": "^11.1.0" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.14.2", - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", "babel-plugin-dynamic-import-node": "^2.3.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.14.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-simple-access": "^7.13.12", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-simple-access": "^7.14.5", "babel-plugin-dynamic-import-node": "^2.3.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.13.8", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-hoist-variables": "^7.13.0", - "@babel/helper-module-transforms": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-validator-identifier": "^7.12.11", + "@babel/helper-hoist-variables": "^7.14.5", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.5", "babel-plugin-dynamic-import-node": "^2.3.3" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.14.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13" + "@babel/helper-create-regexp-features-plugin": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13", - "@babel/helper-replace-supers": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-react-display-name": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-react-jsx": { - "version": "7.14.3", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-jsx": "^7.12.13", - "@babel/types": "^7.14.2" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-jsx": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-react-jsx-development": { - "version": "7.12.17", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/plugin-transform-react-jsx": "^7.12.17" + "@babel/plugin-transform-react-jsx": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-react-pure-annotations": { - "version": "7.12.1", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.13.15", + "version": "7.14.5", "license": "MIT", "dependencies": { "regenerator-transform": "^0.14.2" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.13.0", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/preset-env": { - "version": "7.14.4", - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.14.4", - "@babel/helper-compilation-targets": "^7.14.4", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-validator-option": "^7.12.17", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12", - "@babel/plugin-proposal-async-generator-functions": "^7.14.2", - "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-class-static-block": "^7.14.3", - "@babel/plugin-proposal-dynamic-import": "^7.14.2", - "@babel/plugin-proposal-export-namespace-from": "^7.14.2", - "@babel/plugin-proposal-json-strings": "^7.14.2", - "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2", - "@babel/plugin-proposal-numeric-separator": "^7.14.2", - "@babel/plugin-proposal-object-rest-spread": "^7.14.4", - "@babel/plugin-proposal-optional-catch-binding": "^7.14.2", - "@babel/plugin-proposal-optional-chaining": "^7.14.2", - "@babel/plugin-proposal-private-methods": "^7.13.0", - "@babel/plugin-proposal-private-property-in-object": "^7.14.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.12.13", + "version": "7.14.5", + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.14.5", + "@babel/helper-compilation-targets": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5", + "@babel/plugin-proposal-async-generator-functions": "^7.14.5", + "@babel/plugin-proposal-class-properties": "^7.14.5", + "@babel/plugin-proposal-class-static-block": "^7.14.5", + "@babel/plugin-proposal-dynamic-import": "^7.14.5", + "@babel/plugin-proposal-export-namespace-from": "^7.14.5", + "@babel/plugin-proposal-json-strings": "^7.14.5", + "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", + "@babel/plugin-proposal-numeric-separator": "^7.14.5", + "@babel/plugin-proposal-object-rest-spread": "^7.14.5", + "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", + "@babel/plugin-proposal-optional-chaining": "^7.14.5", + "@babel/plugin-proposal-private-methods": "^7.14.5", + "@babel/plugin-proposal-private-property-in-object": "^7.14.5", + "@babel/plugin-proposal-unicode-property-regex": "^7.14.5", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", "@babel/plugin-syntax-json-strings": "^7.8.3", @@ -1120,48 +1364,51 @@ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.0", - "@babel/plugin-syntax-top-level-await": "^7.12.13", - "@babel/plugin-transform-arrow-functions": "^7.13.0", - "@babel/plugin-transform-async-to-generator": "^7.13.0", - "@babel/plugin-transform-block-scoped-functions": "^7.12.13", - "@babel/plugin-transform-block-scoping": "^7.14.4", - "@babel/plugin-transform-classes": "^7.14.4", - "@babel/plugin-transform-computed-properties": "^7.13.0", - "@babel/plugin-transform-destructuring": "^7.14.4", - "@babel/plugin-transform-dotall-regex": "^7.12.13", - "@babel/plugin-transform-duplicate-keys": "^7.12.13", - "@babel/plugin-transform-exponentiation-operator": "^7.12.13", - "@babel/plugin-transform-for-of": "^7.13.0", - "@babel/plugin-transform-function-name": "^7.12.13", - "@babel/plugin-transform-literals": "^7.12.13", - "@babel/plugin-transform-member-expression-literals": "^7.12.13", - "@babel/plugin-transform-modules-amd": "^7.14.2", - "@babel/plugin-transform-modules-commonjs": "^7.14.0", - "@babel/plugin-transform-modules-systemjs": "^7.13.8", - "@babel/plugin-transform-modules-umd": "^7.14.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13", - "@babel/plugin-transform-new-target": "^7.12.13", - "@babel/plugin-transform-object-super": "^7.12.13", - "@babel/plugin-transform-parameters": "^7.14.2", - "@babel/plugin-transform-property-literals": "^7.12.13", - "@babel/plugin-transform-regenerator": "^7.13.15", - "@babel/plugin-transform-reserved-words": "^7.12.13", - "@babel/plugin-transform-shorthand-properties": "^7.12.13", - "@babel/plugin-transform-spread": "^7.13.0", - "@babel/plugin-transform-sticky-regex": "^7.12.13", - "@babel/plugin-transform-template-literals": "^7.13.0", - "@babel/plugin-transform-typeof-symbol": "^7.12.13", - "@babel/plugin-transform-unicode-escapes": "^7.12.13", - "@babel/plugin-transform-unicode-regex": "^7.12.13", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-transform-arrow-functions": "^7.14.5", + "@babel/plugin-transform-async-to-generator": "^7.14.5", + "@babel/plugin-transform-block-scoped-functions": "^7.14.5", + "@babel/plugin-transform-block-scoping": "^7.14.5", + "@babel/plugin-transform-classes": "^7.14.5", + "@babel/plugin-transform-computed-properties": "^7.14.5", + "@babel/plugin-transform-destructuring": "^7.14.5", + "@babel/plugin-transform-dotall-regex": "^7.14.5", + "@babel/plugin-transform-duplicate-keys": "^7.14.5", + "@babel/plugin-transform-exponentiation-operator": "^7.14.5", + "@babel/plugin-transform-for-of": "^7.14.5", + "@babel/plugin-transform-function-name": "^7.14.5", + "@babel/plugin-transform-literals": "^7.14.5", + "@babel/plugin-transform-member-expression-literals": "^7.14.5", + "@babel/plugin-transform-modules-amd": "^7.14.5", + "@babel/plugin-transform-modules-commonjs": "^7.14.5", + "@babel/plugin-transform-modules-systemjs": "^7.14.5", + "@babel/plugin-transform-modules-umd": "^7.14.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.5", + "@babel/plugin-transform-new-target": "^7.14.5", + "@babel/plugin-transform-object-super": "^7.14.5", + "@babel/plugin-transform-parameters": "^7.14.5", + "@babel/plugin-transform-property-literals": "^7.14.5", + "@babel/plugin-transform-regenerator": "^7.14.5", + "@babel/plugin-transform-reserved-words": "^7.14.5", + "@babel/plugin-transform-shorthand-properties": "^7.14.5", + "@babel/plugin-transform-spread": "^7.14.5", + "@babel/plugin-transform-sticky-regex": "^7.14.5", + "@babel/plugin-transform-template-literals": "^7.14.5", + "@babel/plugin-transform-typeof-symbol": "^7.14.5", + "@babel/plugin-transform-unicode-escapes": "^7.14.5", + "@babel/plugin-transform-unicode-regex": "^7.14.5", "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.14.4", - "babel-plugin-polyfill-corejs2": "^0.2.0", - "babel-plugin-polyfill-corejs3": "^0.2.0", - "babel-plugin-polyfill-regenerator": "^0.2.0", - "core-js-compat": "^3.9.0", + "@babel/types": "^7.14.5", + "babel-plugin-polyfill-corejs2": "^0.2.2", + "babel-plugin-polyfill-corejs3": "^0.2.2", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "core-js-compat": "^3.14.0", "semver": "^6.3.0" }, + "engines": { + "node": ">=6.9.0" + }, "peerDependencies": { "@babel/core": "^7.0.0-0" } @@ -1188,22 +1435,25 @@ } }, "node_modules/@babel/preset-react": { - "version": "7.13.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-validator-option": "^7.12.17", - "@babel/plugin-transform-react-display-name": "^7.12.13", - "@babel/plugin-transform-react-jsx": "^7.13.12", - "@babel/plugin-transform-react-jsx-development": "^7.12.17", - "@babel/plugin-transform-react-pure-annotations": "^7.12.1" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-transform-react-display-name": "^7.14.5", + "@babel/plugin-transform-react-jsx": "^7.14.5", + "@babel/plugin-transform-react-jsx-development": "^7.14.5", + "@babel/plugin-transform-react-pure-annotations": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "node_modules/@babel/runtime": { - "version": "7.12.5", + "version": "7.14.0", "license": "MIT", "dependencies": { "regenerator-runtime": "^0.13.4" @@ -1219,34 +1469,44 @@ } }, "node_modules/@babel/template": { - "version": "7.12.13", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/parser": "^7.12.13", - "@babel/types": "^7.12.13" + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/types": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.14.2", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.2", - "@babel/helper-function-name": "^7.14.2", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.14.2", - "@babel/types": "^7.14.2", + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.14.5", + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-hoist-variables": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/types": "^7.14.5", "debug": "^4.1.0", "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/types": { - "version": "7.14.4", + "version": "7.14.5", "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.14.0", + "@babel/helper-validator-identifier": "^7.14.5", "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@discoveryjs/json-ext": { @@ -1256,6 +1516,86 @@ "node": ">=10.0.0" } }, + "node_modules/@emotion/cache": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz", + "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==", + "dependencies": { + "@emotion/memoize": "^0.7.4", + "@emotion/sheet": "^1.0.0", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "stylis": "^4.0.3" + } + }, + "node_modules/@emotion/hash": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + }, + "node_modules/@emotion/memoize": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz", + "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" + }, + "node_modules/@emotion/react": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.0.tgz", + "integrity": "sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg==", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@emotion/cache": "^11.4.0", + "@emotion/serialize": "^1.0.2", + "@emotion/sheet": "^1.0.1", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "hoist-non-react-statics": "^3.3.1" + }, + "peerDependencies": { + "@babel/core": "^7.0.0", + "react": ">=16.8.0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@types/react": { + "optional": true + } + } + }, + "node_modules/@emotion/serialize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz", + "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==", + "dependencies": { + "@emotion/hash": "^0.8.0", + "@emotion/memoize": "^0.7.4", + "@emotion/unitless": "^0.7.5", + "@emotion/utils": "^1.0.0", + "csstype": "^3.0.2" + } + }, + "node_modules/@emotion/sheet": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz", + "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==" + }, + "node_modules/@emotion/unitless": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", + "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" + }, + "node_modules/@emotion/utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz", + "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==" + }, + "node_modules/@emotion/weak-memoize": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", + "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" + }, "node_modules/@eslint/eslintrc": { "version": "0.2.2", "dev": true, @@ -1356,9 +1696,8 @@ }, "node_modules/@polka/url": { "version": "1.0.0-next.15", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz", - "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@stylelint/postcss-css-in-js": { "version": "0.37.2", @@ -1393,7 +1732,7 @@ } }, "node_modules/@tailwindcss/forms": { - "version": "0.3.2", + "version": "0.3.3", "license": "MIT", "dependencies": { "mini-svg-data-uri": "^1.2.3" @@ -1415,19 +1754,12 @@ "tailwindcss": ">=2.0.0" } }, - "node_modules/@trysound/sax": { - "version": "0.1.1", - "license": "ISC", - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/@types/d3": { "version": "3.5.38", "license": "MIT" }, "node_modules/@types/eslint": { - "version": "7.2.12", + "version": "7.2.13", "license": "MIT", "dependencies": { "@types/estree": "*", @@ -1603,7 +1935,7 @@ } }, "node_modules/@webpack-cli/configtest": { - "version": "1.0.3", + "version": "1.0.4", "license": "MIT", "peerDependencies": { "webpack": "4.x.x || 5.x.x", @@ -1611,7 +1943,7 @@ } }, "node_modules/@webpack-cli/info": { - "version": "1.2.4", + "version": "1.3.0", "license": "MIT", "dependencies": { "envinfo": "^7.7.3" @@ -1621,7 +1953,7 @@ } }, "node_modules/@webpack-cli/serve": { - "version": "1.4.0", + "version": "1.5.1", "license": "MIT", "peerDependencies": { "webpack-cli": "4.x.x" @@ -1718,11 +2050,11 @@ } }, "node_modules/ansi-regex": { - "version": "4.1.0", + "version": "5.0.0", "dev": true, "license": "MIT", "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/ansi-styles": { @@ -1748,7 +2080,6 @@ }, "node_modules/argparse": { "version": "1.0.10", - "dev": true, "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" @@ -1937,11 +2268,11 @@ "license": "ISC" }, "node_modules/astral-regex": { - "version": "1.0.0", + "version": "2.0.0", "dev": true, "license": "MIT", "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/at-least-node": { @@ -2248,7 +2579,7 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001230", + "version": "1.0.30001236", "license": "CC-BY-4.0", "funding": { "type": "opencollective", @@ -2296,8 +2627,7 @@ }, "node_modules/chart.js": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz", - "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA==" + "license": "MIT" }, "node_modules/chokidar": { "version": "3.5.1", @@ -2398,8 +2728,11 @@ "license": "MIT" }, "node_modules/commander": { - "version": "2.20.0", - "license": "MIT" + "version": "6.2.1", + "license": "MIT", + "engines": { + "node": ">= 6" + } }, "node_modules/commondir": { "version": "1.0.1", @@ -2479,7 +2812,7 @@ } }, "node_modules/core-js-compat": { - "version": "3.13.1", + "version": "3.14.0", "license": "MIT", "dependencies": { "browserslist": "^4.16.6", @@ -2662,11 +2995,11 @@ "license": "ISC" }, "node_modules/css-minimizer-webpack-plugin": { - "version": "3.0.0", + "version": "3.0.1", "license": "MIT", "dependencies": { "cssnano": "^5.0.0", - "jest-worker": "^26.3.0", + "jest-worker": "^27.0.2", "p-limit": "^3.0.2", "postcss": "^8.2.9", "schema-utils": "^3.0.0", @@ -3078,9 +3411,8 @@ }, "node_modules/duplexer": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/duplexer2": { "version": "0.1.4", @@ -3094,7 +3426,7 @@ "license": "ISC" }, "node_modules/emoji-regex": { - "version": "7.0.3", + "version": "8.0.0", "dev": true, "license": "MIT" }, @@ -3150,7 +3482,6 @@ }, "node_modules/es-abstract": { "version": "1.17.5", - "dev": true, "license": "MIT", "dependencies": { "es-to-primitive": "^1.2.1", @@ -3174,7 +3505,6 @@ }, "node_modules/es-abstract/node_modules/object-inspect": { "version": "1.7.0", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3186,7 +3516,6 @@ }, "node_modules/es-to-primitive": { "version": "1.2.1", - "dev": true, "license": "MIT", "dependencies": { "is-callable": "^1.1.4", @@ -3255,28 +3584,30 @@ } }, "node_modules/eslint": { - "version": "7.15.0", + "version": "7.28.0", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.0.0", - "@eslint/eslintrc": "^0.2.2", + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.0.1", "doctrine": "^3.0.0", "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", "eslint-visitor-keys": "^2.0.0", "espree": "^7.3.1", - "esquery": "^1.2.0", + "esquery": "^1.4.0", "esutils": "^2.0.2", - "file-entry-cache": "^6.0.0", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^12.1.0", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -3284,7 +3615,7 @@ "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", - "lodash": "^4.17.19", + "lodash.merge": "^4.6.2", "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", @@ -3293,7 +3624,7 @@ "semver": "^7.2.1", "strip-ansi": "^6.0.0", "strip-json-comments": "^3.1.0", - "table": "^5.2.3", + "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, @@ -3675,7 +4006,7 @@ } }, "node_modules/eslint/node_modules/chalk": { - "version": "4.1.0", + "version": "4.1.1", "dev": true, "license": "MIT", "dependencies": { @@ -3706,7 +4037,7 @@ "license": "MIT" }, "node_modules/eslint/node_modules/glob-parent": { - "version": "5.1.1", + "version": "5.1.2", "dev": true, "license": "ISC", "dependencies": { @@ -3717,11 +4048,11 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "12.4.0", + "version": "13.9.0", "dev": true, "license": "MIT", "dependencies": { - "type-fest": "^0.8.1" + "type-fest": "^0.20.2" }, "engines": { "node": ">=8" @@ -3747,7 +4078,7 @@ } }, "node_modules/eslint/node_modules/import-fresh": { - "version": "3.2.2", + "version": "3.3.0", "dev": true, "license": "MIT", "dependencies": { @@ -3756,6 +4087,9 @@ }, "engines": { "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint/node_modules/levn": { @@ -3814,7 +4148,7 @@ } }, "node_modules/eslint/node_modules/semver": { - "version": "7.3.4", + "version": "7.3.5", "dev": true, "license": "ISC", "dependencies": { @@ -3974,7 +4308,7 @@ } }, "node_modules/execa": { - "version": "5.0.0", + "version": "5.1.1", "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", @@ -4092,7 +4426,7 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.0", + "version": "6.0.1", "dev": true, "license": "MIT", "dependencies": { @@ -4410,9 +4744,8 @@ }, "node_modules/gzip-size": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", - "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", "dev": true, + "license": "MIT", "dependencies": { "duplexer": "^0.1.2" }, @@ -4694,7 +5027,6 @@ }, "node_modules/is-callable": { "version": "1.2.2", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4734,7 +5066,6 @@ }, "node_modules/is-date-object": { "version": "1.0.2", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4831,7 +5162,6 @@ }, "node_modules/is-regex": { "version": "1.1.1", - "dev": true, "license": "MIT", "dependencies": { "has-symbols": "^1.0.1" @@ -4875,7 +5205,6 @@ }, "node_modules/is-symbol": { "version": "1.0.3", - "dev": true, "license": "MIT", "dependencies": { "has-symbols": "^1.0.1" @@ -4908,12 +5237,12 @@ } }, "node_modules/jest-worker": { - "version": "26.6.2", + "version": "27.0.2", "license": "MIT", "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" + "supports-color": "^8.0.0" }, "engines": { "node": ">= 10.13.0" @@ -4927,13 +5256,16 @@ } }, "node_modules/jest-worker/node_modules/supports-color": { - "version": "7.2.0", + "version": "8.1.1", "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, "node_modules/js-tokens": { @@ -4942,7 +5274,6 @@ }, "node_modules/js-yaml": { "version": "3.13.1", - "dev": true, "license": "MIT", "dependencies": { "argparse": "^1.0.7", @@ -5344,6 +5675,11 @@ "version": "2.0.14", "license": "CC0-1.0" }, + "node_modules/memoize-one": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", + "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" + }, "node_modules/meow": { "version": "8.0.0", "dev": true, @@ -5568,9 +5904,8 @@ }, "node_modules/mime": { "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", "dev": true, + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -5579,17 +5914,17 @@ } }, "node_modules/mime-db": { - "version": "1.47.0", + "version": "1.48.0", "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.30", + "version": "2.1.31", "license": "MIT", "dependencies": { - "mime-db": "1.47.0" + "mime-db": "1.48.0" }, "engines": { "node": ">= 0.6" @@ -5747,10 +6082,13 @@ "license": "MIT" }, "node_modules/normalize-url": { - "version": "4.5.1", + "version": "6.0.1", "license": "MIT", "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/npm-run-path": { @@ -5918,7 +6256,6 @@ }, "node_modules/object.values": { "version": "1.1.1", - "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -5955,9 +6292,8 @@ }, "node_modules/opener": { "version": "1.5.2", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", - "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", "dev": true, + "license": "(WTFPL OR MIT)", "bin": { "opener": "bin/opener-bin.js" } @@ -6148,7 +6484,7 @@ } }, "node_modules/postcss": { - "version": "8.3.0", + "version": "8.3.2", "license": "MIT", "dependencies": { "colorette": "^1.2.2", @@ -6323,7 +6659,7 @@ } }, "node_modules/postcss-less/node_modules/postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "license": "MIT", "dependencies": { @@ -6808,7 +7144,7 @@ } }, "node_modules/postcss-safe-parser/node_modules/postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "license": "MIT", "dependencies": { @@ -6853,7 +7189,7 @@ } }, "node_modules/postcss-sass/node_modules/postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "license": "MIT", "dependencies": { @@ -6900,7 +7236,7 @@ } }, "node_modules/postcss-scss/node_modules/postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "license": "MIT", "dependencies": { @@ -7103,8 +7439,9 @@ } }, "node_modules/react": { - "version": "16.13.1", - "license": "MIT", + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", + "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -7115,8 +7452,9 @@ } }, "node_modules/react-dom": { - "version": "16.13.1", - "license": "MIT", + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", + "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -7124,12 +7462,13 @@ "scheduler": "^0.19.1" }, "peerDependencies": { - "react": "^16.13.1" + "react": "^16.14.0" } }, "node_modules/react-flatpickr": { "version": "3.10.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-flatpickr/-/react-flatpickr-3.10.5.tgz", + "integrity": "sha512-MZlBN9Ml4FLFoR5tS61T9BjJRIrwF0mKDqC+ni5ZgdtIbWVebp6emx9jpg8QuXv5hSr1W1by3Tqv3ebZXU7rhg==", "dependencies": { "flatpickr": "^4.6.2", "prop-types": "^15.5.10" @@ -7143,6 +7482,17 @@ "react-dom": ">=16.3.x" } }, + "node_modules/react-input-autosize": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz", + "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==", + "dependencies": { + "prop-types": "^15.5.8" + }, + "peerDependencies": { + "react": "^16.3.0 || ^17.0.0" + } + }, "node_modules/react-is": { "version": "16.11.0", "license": "MIT" @@ -7182,6 +7532,24 @@ "react": ">=15" } }, + "node_modules/react-select": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-4.3.1.tgz", + "integrity": "sha512-HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q==", + "dependencies": { + "@babel/runtime": "^7.12.0", + "@emotion/cache": "^11.4.0", + "@emotion/react": "^11.1.1", + "memoize-one": "^5.0.0", + "prop-types": "^15.6.0", + "react-input-autosize": "^3.0.0", + "react-transition-group": "^4.3.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0", + "react-dom": "^16.8.0 || ^17.0.0" + } + }, "node_modules/react-transition-group": { "version": "4.4.2", "license": "BSD-3-Clause", @@ -7540,7 +7908,8 @@ }, "node_modules/scheduler": { "version": "0.19.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -7688,9 +8057,8 @@ }, "node_modules/sirv": { "version": "1.0.12", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz", - "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==", "dev": true, + "license": "MIT", "dependencies": { "@polka/url": "^1.0.0-next.15", "mime": "^2.3.1", @@ -7791,7 +8159,6 @@ }, "node_modules/sprintf-js": { "version": "1.0.3", - "dev": true, "license": "BSD-3-Clause" }, "node_modules/stable": { @@ -7926,7 +8293,6 @@ }, "node_modules/string.prototype.trimend": { "version": "1.0.1", - "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -7938,7 +8304,6 @@ }, "node_modules/string.prototype.trimleft": { "version": "2.1.2", - "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -7954,7 +8319,6 @@ }, "node_modules/string.prototype.trimright": { "version": "2.1.2", - "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -7970,7 +8334,6 @@ }, "node_modules/string.prototype.trimstart": { "version": "1.0.1", - "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -7981,14 +8344,14 @@ } }, "node_modules/strip-ansi": { - "version": "5.2.0", + "version": "6.0.0", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" }, "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/strip-bom": { @@ -8263,7 +8626,7 @@ } }, "node_modules/stylelint/node_modules/postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "license": "MIT", "dependencies": { @@ -8432,6 +8795,11 @@ "node": ">=10.0.0" } }, + "node_modules/stylis": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz", + "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==" + }, "node_modules/sugarss": { "version": "2.0.0", "dev": true, @@ -8441,7 +8809,7 @@ } }, "node_modules/sugarss/node_modules/postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "license": "MIT", "dependencies": { @@ -8491,22 +8859,28 @@ "dev": true }, "node_modules/svgo": { - "version": "2.3.0", + "version": "1.3.2", "license": "MIT", "dependencies": { - "@trysound/sax": "0.1.1", - "chalk": "^4.1.0", - "commander": "^7.1.0", - "css-select": "^3.1.2", - "css-tree": "^1.1.2", - "csso": "^4.2.0", - "stable": "^0.1.8" + "chalk": "^2.4.1", + "coa": "^2.0.2", + "css-select": "^2.0.0", + "css-select-base-adapter": "^0.1.1", + "css-tree": "1.0.0-alpha.37", + "csso": "^4.0.2", + "js-yaml": "^3.13.1", + "mkdirp": "~0.5.1", + "object.values": "^1.1.0", + "sax": "~1.2.4", + "stable": "^0.1.8", + "unquote": "~1.1.1", + "util.promisify": "~1.0.0" }, "bin": { "svgo": "bin/svgo" }, "engines": { - "node": ">=10.13.0" + "node": ">=4.0.0" } }, "node_modules/svgo/node_modules/ansi-styles": { @@ -8550,13 +8924,6 @@ "version": "1.1.4", "license": "MIT" }, - "node_modules/svgo/node_modules/commander": { - "version": "7.2.0", - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, "node_modules/svgo/node_modules/has-flag": { "version": "4.0.0", "license": "MIT", @@ -8589,7 +8956,7 @@ } }, "node_modules/tailwindcss": { - "version": "2.1.2", + "version": "2.1.4", "license": "MIT", "dependencies": { "@fullhuman/postcss-purgecss": "^3.1.3", @@ -8727,10 +9094,10 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.1.2", + "version": "5.1.3", "license": "MIT", "dependencies": { - "jest-worker": "^26.6.2", + "jest-worker": "^27.0.2", "p-limit": "^3.1.0", "schema-utils": "^3.0.0", "serialize-javascript": "^5.0.1", @@ -8838,9 +9205,8 @@ }, "node_modules/totalist": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz", - "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -9192,9 +9558,8 @@ }, "node_modules/webpack-bundle-analyzer": { "version": "4.4.2", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz", - "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==", "dev": true, + "license": "MIT", "dependencies": { "acorn": "^8.0.4", "acorn-walk": "^8.0.0", @@ -9215,9 +9580,8 @@ }, "node_modules/webpack-bundle-analyzer/node_modules/acorn": { "version": "8.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz", - "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -9227,18 +9591,16 @@ }, "node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz", - "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.4.0" } }, "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -9251,9 +9613,8 @@ }, "node_modules/webpack-bundle-analyzer/node_modules/chalk": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -9267,9 +9628,8 @@ }, "node_modules/webpack-bundle-analyzer/node_modules/color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -9279,33 +9639,29 @@ }, "node_modules/webpack-bundle-analyzer/node_modules/color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/webpack-bundle-analyzer/node_modules/commander": { "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } }, "node_modules/webpack-bundle-analyzer/node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/webpack-bundle-analyzer/node_modules/supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -9314,13 +9670,13 @@ } }, "node_modules/webpack-cli": { - "version": "4.7.0", + "version": "4.7.2", "license": "MIT", "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.0.3", - "@webpack-cli/info": "^1.2.4", - "@webpack-cli/serve": "^1.4.0", + "@webpack-cli/configtest": "^1.0.4", + "@webpack-cli/info": "^1.3.0", + "@webpack-cli/serve": "^1.5.1", "colorette": "^1.2.1", "commander": "^7.0.0", "execa": "^5.0.0", @@ -9363,7 +9719,7 @@ } }, "node_modules/webpack-merge": { - "version": "5.7.3", + "version": "5.8.0", "license": "MIT", "dependencies": { "clone-deep": "^4.0.1", @@ -9389,7 +9745,7 @@ } }, "node_modules/webpack/node_modules/acorn": { - "version": "8.2.4", + "version": "8.3.0", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -9462,9 +9818,8 @@ }, "node_modules/ws": { "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.3.0" }, @@ -9523,20 +9878,20 @@ } }, "@babel/compat-data": { - "version": "7.14.4" + "version": "7.14.5" }, "@babel/core": { - "version": "7.14.3", - "requires": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.3", - "@babel/helper-compilation-targets": "^7.13.16", - "@babel/helper-module-transforms": "^7.14.2", - "@babel/helpers": "^7.14.0", - "@babel/parser": "^7.14.3", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.2", + "version": "7.14.5", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.14.5", + "@babel/helper-compilation-targets": "^7.14.5", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helpers": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -9551,31 +9906,31 @@ } }, "@babel/generator": { - "version": "7.14.3", + "version": "7.14.5", "requires": { - "@babel/types": "^7.14.2", + "@babel/types": "^7.14.5", "jsesc": "^2.5.1", "source-map": "^0.5.0" } }, "@babel/helper-annotate-as-pure": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-explode-assignable-expression": "^7.12.13", - "@babel/types": "^7.12.13" + "@babel/helper-explode-assignable-expression": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-compilation-targets": { - "version": "7.14.4", + "version": "7.14.5", "requires": { - "@babel/compat-data": "^7.14.4", - "@babel/helper-validator-option": "^7.12.17", + "@babel/compat-data": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", "browserslist": "^4.16.6", "semver": "^6.3.0" }, @@ -9586,20 +9941,20 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.14.4", + "version": "7.14.5", "requires": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-function-name": "^7.14.2", - "@babel/helper-member-expression-to-functions": "^7.13.12", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-replace-supers": "^7.14.4", - "@babel/helper-split-export-declaration": "^7.12.13" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.14.3", + "version": "7.14.5", "requires": { - "@babel/helper-annotate-as-pure": "^7.12.13", + "@babel/helper-annotate-as-pure": "^7.14.5", "regexpu-core": "^4.7.1" } }, @@ -9622,254 +9977,253 @@ } }, "@babel/helper-explode-assignable-expression": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/types": "^7.13.0" + "@babel/types": "^7.14.5" } }, "@babel/helper-function-name": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-get-function-arity": "^7.12.13", - "@babel/template": "^7.12.13", - "@babel/types": "^7.14.2" + "@babel/helper-get-function-arity": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-get-function-arity": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" } }, "@babel/helper-hoist-variables": { - "version": "7.13.16", + "version": "7.14.5", "requires": { - "@babel/traverse": "^7.13.15", - "@babel/types": "^7.13.16" + "@babel/types": "^7.14.5" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.13.12", + "version": "7.14.5", "requires": { - "@babel/types": "^7.13.12" + "@babel/types": "^7.14.5" } }, "@babel/helper-module-imports": { - "version": "7.13.12", + "version": "7.14.5", "requires": { - "@babel/types": "^7.13.12" + "@babel/types": "^7.14.5" } }, "@babel/helper-module-transforms": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-replace-supers": "^7.13.12", - "@babel/helper-simple-access": "^7.13.12", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/helper-validator-identifier": "^7.14.0", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.2" + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-simple-access": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-optimise-call-expression": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" } }, "@babel/helper-plugin-utils": { - "version": "7.13.0" + "version": "7.14.5" }, "@babel/helper-remap-async-to-generator": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-wrap-function": "^7.13.0", - "@babel/types": "^7.13.0" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-wrap-function": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-replace-supers": { - "version": "7.14.4", + "version": "7.14.5", "requires": { - "@babel/helper-member-expression-to-functions": "^7.13.12", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.4" + "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-simple-access": { - "version": "7.13.12", + "version": "7.14.5", "requires": { - "@babel/types": "^7.13.12" + "@babel/types": "^7.14.5" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.12.1", + "version": "7.14.5", "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.14.5" } }, "@babel/helper-split-export-declaration": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/types": "^7.12.13" + "@babel/types": "^7.14.5" } }, "@babel/helper-validator-identifier": { - "version": "7.14.0" + "version": "7.14.5" }, "@babel/helper-validator-option": { - "version": "7.12.17" + "version": "7.14.5" }, "@babel/helper-wrap-function": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-function-name": "^7.12.13", - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.13.0", - "@babel/types": "^7.13.0" + "@babel/helper-function-name": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helpers": { - "version": "7.14.0", + "version": "7.14.5", "requires": { - "@babel/template": "^7.12.13", - "@babel/traverse": "^7.14.0", - "@babel/types": "^7.14.0" + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/highlight": { - "version": "7.14.0", + "version": "7.14.5", "requires": { - "@babel/helper-validator-identifier": "^7.14.0", + "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.14.4" + "version": "7.14.5" }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.13.12", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", - "@babel/plugin-proposal-optional-chaining": "^7.13.12" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", + "@babel/plugin-proposal-optional-chaining": "^7.14.5" } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-remap-async-to-generator": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.14.5", "@babel/plugin-syntax-async-generators": "^7.8.4" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-create-class-features-plugin": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-proposal-class-static-block": { - "version": "7.14.3", + "version": "7.14.5", "requires": { - "@babel/helper-create-class-features-plugin": "^7.14.3", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-class-static-block": "^7.12.13" + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3" } }, "@babel/plugin-proposal-export-namespace-from": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-json-strings": "^7.8.3" } }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-numeric-separator": "^7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.14.4", + "version": "7.14.5", "requires": { - "@babel/compat-data": "^7.14.4", - "@babel/helper-compilation-targets": "^7.14.4", - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/compat-data": "^7.14.5", + "@babel/helper-compilation-targets": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.14.2" + "@babel/plugin-transform-parameters": "^7.14.5" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", "@babel/plugin-syntax-optional-chaining": "^7.8.3" } }, "@babel/plugin-proposal-private-methods": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-create-class-features-plugin": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-proposal-private-property-in-object": { - "version": "7.14.0", + "version": "7.14.5", "requires": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-create-class-features-plugin": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-private-property-in-object": "^7.14.0" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-syntax-async-generators": { @@ -9885,9 +10239,9 @@ } }, "@babel/plugin-syntax-class-static-block": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-syntax-dynamic-import": { @@ -9909,9 +10263,9 @@ } }, "@babel/plugin-syntax-jsx": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-syntax-logical-assignment-operators": { @@ -9951,288 +10305,288 @@ } }, "@babel/plugin-syntax-private-property-in-object": { - "version": "7.14.0", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-module-imports": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-remap-async-to-generator": "^7.13.0" + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.14.5" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.14.4", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-classes": { - "version": "7.14.4", - "requires": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-function-name": "^7.14.2", - "@babel/helper-optimise-call-expression": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-replace-supers": "^7.14.4", - "@babel/helper-split-export-declaration": "^7.12.13", + "version": "7.14.5", + "requires": { + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-destructuring": { - "version": "7.14.4", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-for-of": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-function-name": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-literals": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-module-transforms": "^7.14.2", - "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.14.0", + "version": "7.14.5", "requires": { - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-simple-access": "^7.13.12", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-simple-access": "^7.14.5", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.13.8", + "version": "7.14.5", "requires": { - "@babel/helper-hoist-variables": "^7.13.0", - "@babel/helper-module-transforms": "^7.13.0", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-validator-identifier": "^7.12.11", + "@babel/helper-hoist-variables": "^7.14.5", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.5", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.14.0", + "version": "7.14.5", "requires": { - "@babel/helper-module-transforms": "^7.14.0", - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13" + "@babel/helper-create-regexp-features-plugin": "^7.14.5" } }, "@babel/plugin-transform-new-target": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-object-super": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13", - "@babel/helper-replace-supers": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5" } }, "@babel/plugin-transform-parameters": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-property-literals": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-react-display-name": { - "version": "7.14.2", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-react-jsx": { - "version": "7.14.3", + "version": "7.14.5", "requires": { - "@babel/helper-annotate-as-pure": "^7.12.13", - "@babel/helper-module-imports": "^7.13.12", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/plugin-syntax-jsx": "^7.12.13", - "@babel/types": "^7.14.2" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-jsx": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/plugin-transform-react-jsx-development": { - "version": "7.12.17", + "version": "7.14.5", "requires": { - "@babel/plugin-transform-react-jsx": "^7.12.17" + "@babel/plugin-transform-react-jsx": "^7.14.5" } }, "@babel/plugin-transform-react-pure-annotations": { - "version": "7.12.1", + "version": "7.14.5", "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-regenerator": { - "version": "7.13.15", + "version": "7.14.5", "requires": { "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-spread": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-template-literals": { - "version": "7.13.0", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.13", - "@babel/helper-plugin-utils": "^7.12.13" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/preset-env": { - "version": "7.14.4", - "requires": { - "@babel/compat-data": "^7.14.4", - "@babel/helper-compilation-targets": "^7.14.4", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-validator-option": "^7.12.17", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12", - "@babel/plugin-proposal-async-generator-functions": "^7.14.2", - "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-class-static-block": "^7.14.3", - "@babel/plugin-proposal-dynamic-import": "^7.14.2", - "@babel/plugin-proposal-export-namespace-from": "^7.14.2", - "@babel/plugin-proposal-json-strings": "^7.14.2", - "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2", - "@babel/plugin-proposal-numeric-separator": "^7.14.2", - "@babel/plugin-proposal-object-rest-spread": "^7.14.4", - "@babel/plugin-proposal-optional-catch-binding": "^7.14.2", - "@babel/plugin-proposal-optional-chaining": "^7.14.2", - "@babel/plugin-proposal-private-methods": "^7.13.0", - "@babel/plugin-proposal-private-property-in-object": "^7.14.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.12.13", + "version": "7.14.5", + "requires": { + "@babel/compat-data": "^7.14.5", + "@babel/helper-compilation-targets": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5", + "@babel/plugin-proposal-async-generator-functions": "^7.14.5", + "@babel/plugin-proposal-class-properties": "^7.14.5", + "@babel/plugin-proposal-class-static-block": "^7.14.5", + "@babel/plugin-proposal-dynamic-import": "^7.14.5", + "@babel/plugin-proposal-export-namespace-from": "^7.14.5", + "@babel/plugin-proposal-json-strings": "^7.14.5", + "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", + "@babel/plugin-proposal-numeric-separator": "^7.14.5", + "@babel/plugin-proposal-object-rest-spread": "^7.14.5", + "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", + "@babel/plugin-proposal-optional-chaining": "^7.14.5", + "@babel/plugin-proposal-private-methods": "^7.14.5", + "@babel/plugin-proposal-private-property-in-object": "^7.14.5", + "@babel/plugin-proposal-unicode-property-regex": "^7.14.5", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-class-static-block": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", "@babel/plugin-syntax-json-strings": "^7.8.3", @@ -10242,46 +10596,46 @@ "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-private-property-in-object": "^7.14.0", - "@babel/plugin-syntax-top-level-await": "^7.12.13", - "@babel/plugin-transform-arrow-functions": "^7.13.0", - "@babel/plugin-transform-async-to-generator": "^7.13.0", - "@babel/plugin-transform-block-scoped-functions": "^7.12.13", - "@babel/plugin-transform-block-scoping": "^7.14.4", - "@babel/plugin-transform-classes": "^7.14.4", - "@babel/plugin-transform-computed-properties": "^7.13.0", - "@babel/plugin-transform-destructuring": "^7.14.4", - "@babel/plugin-transform-dotall-regex": "^7.12.13", - "@babel/plugin-transform-duplicate-keys": "^7.12.13", - "@babel/plugin-transform-exponentiation-operator": "^7.12.13", - "@babel/plugin-transform-for-of": "^7.13.0", - "@babel/plugin-transform-function-name": "^7.12.13", - "@babel/plugin-transform-literals": "^7.12.13", - "@babel/plugin-transform-member-expression-literals": "^7.12.13", - "@babel/plugin-transform-modules-amd": "^7.14.2", - "@babel/plugin-transform-modules-commonjs": "^7.14.0", - "@babel/plugin-transform-modules-systemjs": "^7.13.8", - "@babel/plugin-transform-modules-umd": "^7.14.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13", - "@babel/plugin-transform-new-target": "^7.12.13", - "@babel/plugin-transform-object-super": "^7.12.13", - "@babel/plugin-transform-parameters": "^7.14.2", - "@babel/plugin-transform-property-literals": "^7.12.13", - "@babel/plugin-transform-regenerator": "^7.13.15", - "@babel/plugin-transform-reserved-words": "^7.12.13", - "@babel/plugin-transform-shorthand-properties": "^7.12.13", - "@babel/plugin-transform-spread": "^7.13.0", - "@babel/plugin-transform-sticky-regex": "^7.12.13", - "@babel/plugin-transform-template-literals": "^7.13.0", - "@babel/plugin-transform-typeof-symbol": "^7.12.13", - "@babel/plugin-transform-unicode-escapes": "^7.12.13", - "@babel/plugin-transform-unicode-regex": "^7.12.13", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-transform-arrow-functions": "^7.14.5", + "@babel/plugin-transform-async-to-generator": "^7.14.5", + "@babel/plugin-transform-block-scoped-functions": "^7.14.5", + "@babel/plugin-transform-block-scoping": "^7.14.5", + "@babel/plugin-transform-classes": "^7.14.5", + "@babel/plugin-transform-computed-properties": "^7.14.5", + "@babel/plugin-transform-destructuring": "^7.14.5", + "@babel/plugin-transform-dotall-regex": "^7.14.5", + "@babel/plugin-transform-duplicate-keys": "^7.14.5", + "@babel/plugin-transform-exponentiation-operator": "^7.14.5", + "@babel/plugin-transform-for-of": "^7.14.5", + "@babel/plugin-transform-function-name": "^7.14.5", + "@babel/plugin-transform-literals": "^7.14.5", + "@babel/plugin-transform-member-expression-literals": "^7.14.5", + "@babel/plugin-transform-modules-amd": "^7.14.5", + "@babel/plugin-transform-modules-commonjs": "^7.14.5", + "@babel/plugin-transform-modules-systemjs": "^7.14.5", + "@babel/plugin-transform-modules-umd": "^7.14.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.5", + "@babel/plugin-transform-new-target": "^7.14.5", + "@babel/plugin-transform-object-super": "^7.14.5", + "@babel/plugin-transform-parameters": "^7.14.5", + "@babel/plugin-transform-property-literals": "^7.14.5", + "@babel/plugin-transform-regenerator": "^7.14.5", + "@babel/plugin-transform-reserved-words": "^7.14.5", + "@babel/plugin-transform-shorthand-properties": "^7.14.5", + "@babel/plugin-transform-spread": "^7.14.5", + "@babel/plugin-transform-sticky-regex": "^7.14.5", + "@babel/plugin-transform-template-literals": "^7.14.5", + "@babel/plugin-transform-typeof-symbol": "^7.14.5", + "@babel/plugin-transform-unicode-escapes": "^7.14.5", + "@babel/plugin-transform-unicode-regex": "^7.14.5", "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.14.4", - "babel-plugin-polyfill-corejs2": "^0.2.0", - "babel-plugin-polyfill-corejs3": "^0.2.0", - "babel-plugin-polyfill-regenerator": "^0.2.0", - "core-js-compat": "^3.9.0", + "@babel/types": "^7.14.5", + "babel-plugin-polyfill-corejs2": "^0.2.2", + "babel-plugin-polyfill-corejs3": "^0.2.2", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "core-js-compat": "^3.14.0", "semver": "^6.3.0" }, "dependencies": { @@ -10301,18 +10655,18 @@ } }, "@babel/preset-react": { - "version": "7.13.13", + "version": "7.14.5", "requires": { - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/helper-validator-option": "^7.12.17", - "@babel/plugin-transform-react-display-name": "^7.12.13", - "@babel/plugin-transform-react-jsx": "^7.13.12", - "@babel/plugin-transform-react-jsx-development": "^7.12.17", - "@babel/plugin-transform-react-pure-annotations": "^7.12.1" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-transform-react-display-name": "^7.14.5", + "@babel/plugin-transform-react-jsx": "^7.14.5", + "@babel/plugin-transform-react-jsx-development": "^7.14.5", + "@babel/plugin-transform-react-pure-annotations": "^7.14.5" } }, "@babel/runtime": { - "version": "7.12.5", + "version": "7.14.0", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10326,36 +10680,105 @@ } }, "@babel/template": { - "version": "7.12.13", + "version": "7.14.5", "requires": { - "@babel/code-frame": "^7.12.13", - "@babel/parser": "^7.12.13", - "@babel/types": "^7.12.13" + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/traverse": { - "version": "7.14.2", - "requires": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.14.2", - "@babel/helper-function-name": "^7.14.2", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.14.2", - "@babel/types": "^7.14.2", + "version": "7.14.5", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.14.5", + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-hoist-variables": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/types": "^7.14.5", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.14.4", + "version": "7.14.5", "requires": { - "@babel/helper-validator-identifier": "^7.14.0", + "@babel/helper-validator-identifier": "^7.14.5", "to-fast-properties": "^2.0.0" } }, "@discoveryjs/json-ext": { "version": "0.5.3" }, + "@emotion/cache": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz", + "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==", + "requires": { + "@emotion/memoize": "^0.7.4", + "@emotion/sheet": "^1.0.0", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "stylis": "^4.0.3" + } + }, + "@emotion/hash": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + }, + "@emotion/memoize": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz", + "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" + }, + "@emotion/react": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.0.tgz", + "integrity": "sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg==", + "requires": { + "@babel/runtime": "^7.13.10", + "@emotion/cache": "^11.4.0", + "@emotion/serialize": "^1.0.2", + "@emotion/sheet": "^1.0.1", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "hoist-non-react-statics": "^3.3.1" + } + }, + "@emotion/serialize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz", + "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==", + "requires": { + "@emotion/hash": "^0.8.0", + "@emotion/memoize": "^0.7.4", + "@emotion/unitless": "^0.7.5", + "@emotion/utils": "^1.0.0", + "csstype": "^3.0.2" + } + }, + "@emotion/sheet": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz", + "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==" + }, + "@emotion/unitless": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", + "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" + }, + "@emotion/utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz", + "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==" + }, + "@emotion/weak-memoize": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", + "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" + }, "@eslint/eslintrc": { "version": "0.2.2", "dev": true, @@ -10422,8 +10845,6 @@ }, "@polka/url": { "version": "1.0.0-next.15", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz", - "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==", "dev": true }, "@stylelint/postcss-css-in-js": { @@ -10446,7 +10867,7 @@ "requires": {} }, "@tailwindcss/forms": { - "version": "0.3.2", + "version": "0.3.3", "requires": { "mini-svg-data-uri": "^1.2.3" } @@ -10460,14 +10881,11 @@ "lodash.uniq": "^4.5.0" } }, - "@trysound/sax": { - "version": "0.1.1" - }, "@types/d3": { "version": "3.5.38" }, "@types/eslint": { - "version": "7.2.12", + "version": "7.2.13", "requires": { "@types/estree": "*", "@types/json-schema": "*" @@ -10617,17 +11035,17 @@ } }, "@webpack-cli/configtest": { - "version": "1.0.3", + "version": "1.0.4", "requires": {} }, "@webpack-cli/info": { - "version": "1.2.4", + "version": "1.3.0", "requires": { "envinfo": "^7.7.3" } }, "@webpack-cli/serve": { - "version": "1.4.0", + "version": "1.5.1", "requires": {} }, "@xtuc/ieee754": { @@ -10682,7 +11100,7 @@ "dev": true }, "ansi-regex": { - "version": "4.1.0", + "version": "5.0.0", "dev": true }, "ansi-styles": { @@ -10700,7 +11118,6 @@ }, "argparse": { "version": "1.0.10", - "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -10827,7 +11244,7 @@ "dev": true }, "astral-regex": { - "version": "1.0.0", + "version": "2.0.0", "dev": true }, "at-least-node": { @@ -11011,7 +11428,7 @@ } }, "caniuse-lite": { - "version": "1.0.30001230" + "version": "1.0.30001236" }, "chalk": { "version": "2.4.2", @@ -11034,9 +11451,7 @@ "dev": true }, "chart.js": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz", - "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA==" + "version": "3.3.2" }, "chokidar": { "version": "3.5.1", @@ -11110,7 +11525,7 @@ "version": "1.2.2" }, "commander": { - "version": "2.20.0" + "version": "6.2.1" }, "commondir": { "version": "1.0.1" @@ -11162,7 +11577,7 @@ } }, "core-js-compat": { - "version": "3.13.1", + "version": "3.14.0", "requires": { "browserslist": "^4.16.6", "semver": "7.0.0" @@ -11272,10 +11687,10 @@ } }, "css-minimizer-webpack-plugin": { - "version": "3.0.0", + "version": "3.0.1", "requires": { "cssnano": "^5.0.0", - "jest-worker": "^26.3.0", + "jest-worker": "^27.0.2", "p-limit": "^3.0.2", "postcss": "^8.2.9", "schema-utils": "^3.0.0", @@ -11536,8 +11951,6 @@ }, "duplexer": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", "dev": true }, "duplexer2": { @@ -11550,7 +11963,7 @@ "version": "1.3.742" }, "emoji-regex": { - "version": "7.0.3", + "version": "8.0.0", "dev": true }, "emojis-list": { @@ -11584,7 +11997,6 @@ }, "es-abstract": { "version": "1.17.5", - "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -11600,8 +12012,7 @@ }, "dependencies": { "object-inspect": { - "version": "1.7.0", - "dev": true + "version": "1.7.0" } } }, @@ -11610,7 +12021,6 @@ }, "es-to-primitive": { "version": "1.2.1", - "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -11643,27 +12053,29 @@ } }, "eslint": { - "version": "7.15.0", + "version": "7.28.0", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@eslint/eslintrc": "^0.2.2", + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.0.1", "doctrine": "^3.0.0", "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", "eslint-visitor-keys": "^2.0.0", "espree": "^7.3.1", - "esquery": "^1.2.0", + "esquery": "^1.4.0", "esutils": "^2.0.2", - "file-entry-cache": "^6.0.0", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^12.1.0", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -11671,7 +12083,7 @@ "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", - "lodash": "^4.17.19", + "lodash.merge": "^4.6.2", "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", @@ -11680,7 +12092,7 @@ "semver": "^7.2.1", "strip-ansi": "^6.0.0", "strip-json-comments": "^3.1.0", - "table": "^5.2.3", + "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, @@ -11697,7 +12109,7 @@ } }, "chalk": { - "version": "4.1.0", + "version": "4.1.1", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -11716,17 +12128,17 @@ "dev": true }, "glob-parent": { - "version": "5.1.1", + "version": "5.1.2", "dev": true, "requires": { "is-glob": "^4.0.1" } }, "globals": { - "version": "12.4.0", + "version": "13.9.0", "dev": true, "requires": { - "type-fest": "^0.8.1" + "type-fest": "^0.20.2" } }, "has-flag": { @@ -11738,7 +12150,7 @@ "dev": true }, "import-fresh": { - "version": "3.2.2", + "version": "3.3.0", "dev": true, "requires": { "parent-module": "^1.0.0", @@ -11781,7 +12193,7 @@ "dev": true }, "semver": { - "version": "7.3.4", + "version": "7.3.5", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -12105,7 +12517,7 @@ "version": "3.3.0" }, "execa": { - "version": "5.0.0", + "version": "5.1.1", "requires": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -12192,7 +12604,7 @@ } }, "file-entry-cache": { - "version": "6.0.0", + "version": "6.0.1", "dev": true, "requires": { "flat-cache": "^3.0.4" @@ -12387,8 +12799,6 @@ }, "gzip-size": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", - "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", "dev": true, "requires": { "duplexer": "^0.1.2" @@ -12556,8 +12966,7 @@ } }, "is-callable": { - "version": "1.2.2", - "dev": true + "version": "1.2.2" }, "is-color-stop": { "version": "1.1.0", @@ -12582,8 +12991,7 @@ } }, "is-date-object": { - "version": "1.0.2", - "dev": true + "version": "1.0.2" }, "is-decimal": { "version": "1.0.4", @@ -12628,7 +13036,6 @@ }, "is-regex": { "version": "1.1.1", - "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -12649,7 +13056,6 @@ }, "is-symbol": { "version": "1.0.3", - "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -12668,18 +13074,18 @@ "version": "3.0.1" }, "jest-worker": { - "version": "26.6.2", + "version": "27.0.2", "requires": { "@types/node": "*", "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" + "supports-color": "^8.0.0" }, "dependencies": { "has-flag": { "version": "4.0.0" }, "supports-color": { - "version": "7.2.0", + "version": "8.1.1", "requires": { "has-flag": "^4.0.0" } @@ -12691,7 +13097,6 @@ }, "js-yaml": { "version": "3.13.1", - "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -12943,6 +13348,11 @@ "mdn-data": { "version": "2.0.14" }, + "memoize-one": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", + "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" + }, "meow": { "version": "8.0.0", "dev": true, @@ -13086,17 +13496,15 @@ }, "mime": { "version": "2.5.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", - "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", "dev": true }, "mime-db": { - "version": "1.47.0" + "version": "1.48.0" }, "mime-types": { - "version": "2.1.30", + "version": "2.1.31", "requires": { - "mime-db": "1.47.0" + "mime-db": "1.48.0" } }, "mimic-fn": { @@ -13188,7 +13596,7 @@ "dev": true }, "normalize-url": { - "version": "4.5.1" + "version": "6.0.1" }, "npm-run-path": { "version": "4.0.1", @@ -13297,7 +13705,6 @@ }, "object.values": { "version": "1.1.1", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.0-next.1", @@ -13319,8 +13726,6 @@ }, "opener": { "version": "1.5.2", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", - "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", "dev": true }, "optimist": { @@ -13441,7 +13846,7 @@ } }, "postcss": { - "version": "8.3.0", + "version": "8.3.2", "requires": { "colorette": "^1.2.2", "nanoid": "^3.1.23", @@ -13545,7 +13950,7 @@ }, "dependencies": { "postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "requires": { "chalk": "^2.4.2", @@ -13840,7 +14245,7 @@ }, "dependencies": { "postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "requires": { "chalk": "^2.4.2", @@ -13870,7 +14275,7 @@ }, "dependencies": { "postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "requires": { "chalk": "^2.4.2", @@ -13899,7 +14304,7 @@ }, "dependencies": { "postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "requires": { "chalk": "^2.4.2", @@ -14024,7 +14429,9 @@ } }, "react": { - "version": "16.13.1", + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", + "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -14032,7 +14439,9 @@ } }, "react-dom": { - "version": "16.13.1", + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", + "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -14042,6 +14451,8 @@ }, "react-flatpickr": { "version": "3.10.5", + "resolved": "https://registry.npmjs.org/react-flatpickr/-/react-flatpickr-3.10.5.tgz", + "integrity": "sha512-MZlBN9Ml4FLFoR5tS61T9BjJRIrwF0mKDqC+ni5ZgdtIbWVebp6emx9jpg8QuXv5hSr1W1by3Tqv3ebZXU7rhg==", "requires": { "flatpickr": "^4.6.2", "prop-types": "^15.5.10" @@ -14051,6 +14462,14 @@ "version": "3.0.4", "requires": {} }, + "react-input-autosize": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz", + "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==", + "requires": { + "prop-types": "^15.5.8" + } + }, "react-is": { "version": "16.11.0" }, @@ -14081,6 +14500,20 @@ "tiny-warning": "^1.0.0" } }, + "react-select": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-4.3.1.tgz", + "integrity": "sha512-HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q==", + "requires": { + "@babel/runtime": "^7.12.0", + "@emotion/cache": "^11.4.0", + "@emotion/react": "^11.1.1", + "memoize-one": "^5.0.0", + "prop-types": "^15.6.0", + "react-input-autosize": "^3.0.0", + "react-transition-group": "^4.3.0" + } + }, "react-transition-group": { "version": "4.4.2", "requires": { @@ -14317,6 +14750,8 @@ }, "scheduler": { "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -14419,8 +14854,6 @@ }, "sirv": { "version": "1.0.12", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz", - "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==", "dev": true, "requires": { "@polka/url": "^1.0.0-next.15", @@ -14490,8 +14923,7 @@ "dev": true }, "sprintf-js": { - "version": "1.0.3", - "dev": true + "version": "1.0.3" }, "stable": { "version": "0.1.8" @@ -14591,7 +15023,6 @@ }, "string.prototype.trimend": { "version": "1.0.1", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -14599,7 +15030,6 @@ }, "string.prototype.trimleft": { "version": "2.1.2", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -14608,7 +15038,6 @@ }, "string.prototype.trimright": { "version": "2.1.2", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -14617,17 +15046,16 @@ }, "string.prototype.trimstart": { "version": "1.0.1", - "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" } }, "strip-ansi": { - "version": "5.2.0", + "version": "6.0.0", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } }, "strip-bom": { @@ -14781,7 +15209,7 @@ } }, "postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "requires": { "chalk": "^2.4.2", @@ -14911,6 +15339,11 @@ "stylelint-config-recommended": "^3.0.0" } }, + "stylis": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz", + "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==" + }, "sugarss": { "version": "2.0.0", "dev": true, @@ -14919,7 +15352,7 @@ }, "dependencies": { "postcss": { - "version": "7.0.35", + "version": "7.0.36", "dev": true, "requires": { "chalk": "^2.4.2", @@ -14951,15 +15384,21 @@ "dev": true }, "svgo": { - "version": "2.3.0", + "version": "1.3.2", "requires": { - "@trysound/sax": "0.1.1", - "chalk": "^4.1.0", - "commander": "^7.1.0", - "css-select": "^3.1.2", - "css-tree": "^1.1.2", - "csso": "^4.2.0", - "stable": "^0.1.8" + "chalk": "^2.4.1", + "coa": "^2.0.2", + "css-select": "^2.0.0", + "css-select-base-adapter": "^0.1.1", + "css-tree": "1.0.0-alpha.37", + "csso": "^4.0.2", + "js-yaml": "^3.13.1", + "mkdirp": "~0.5.1", + "object.values": "^1.1.0", + "sax": "~1.2.4", + "stable": "^0.1.8", + "unquote": "~1.1.1", + "util.promisify": "~1.0.0" }, "dependencies": { "ansi-styles": { @@ -14984,9 +15423,6 @@ "color-name": { "version": "1.1.4" }, - "commander": { - "version": "7.2.0" - }, "has-flag": { "version": "4.0.0" }, @@ -15009,7 +15445,7 @@ } }, "tailwindcss": { - "version": "2.1.2", + "version": "2.1.4", "requires": { "@fullhuman/postcss-purgecss": "^3.1.3", "bytes": "^3.0.0", @@ -15096,9 +15532,9 @@ } }, "terser-webpack-plugin": { - "version": "5.1.2", + "version": "5.1.3", "requires": { - "jest-worker": "^26.6.2", + "jest-worker": "^27.0.2", "p-limit": "^3.1.0", "schema-utils": "^3.0.0", "serialize-javascript": "^5.0.1", @@ -15159,8 +15595,6 @@ }, "totalist": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz", - "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==", "dev": true }, "trim-newlines": { @@ -15367,7 +15801,7 @@ }, "dependencies": { "acorn": { - "version": "8.2.4" + "version": "8.3.0" }, "source-map": { "version": "0.6.1" @@ -15383,8 +15817,6 @@ }, "webpack-bundle-analyzer": { "version": "4.4.2", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz", - "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==", "dev": true, "requires": { "acorn": "^8.0.4", @@ -15400,20 +15832,14 @@ "dependencies": { "acorn": { "version": "8.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz", - "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==", "dev": true }, "acorn-walk": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz", - "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==", "dev": true }, "ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { "color-convert": "^2.0.1" @@ -15421,8 +15847,6 @@ }, "chalk": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -15431,8 +15855,6 @@ }, "color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { "color-name": "~1.1.4" @@ -15440,26 +15862,18 @@ }, "color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "commander": { "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "dev": true }, "has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -15468,12 +15882,12 @@ } }, "webpack-cli": { - "version": "4.7.0", + "version": "4.7.2", "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.0.3", - "@webpack-cli/info": "^1.2.4", - "@webpack-cli/serve": "^1.4.0", + "@webpack-cli/configtest": "^1.0.4", + "@webpack-cli/info": "^1.3.0", + "@webpack-cli/serve": "^1.5.1", "colorette": "^1.2.1", "commander": "^7.0.0", "execa": "^5.0.0", @@ -15491,7 +15905,7 @@ } }, "webpack-merge": { - "version": "5.7.3", + "version": "5.8.0", "requires": { "clone-deep": "^4.0.1", "wildcard": "^2.0.0" @@ -15540,8 +15954,6 @@ }, "ws": { "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true, "requires": {} }, diff --git a/assets/package.json b/assets/package.json index 33ed60ec4..6dcb46816 100644 --- a/assets/package.json +++ b/assets/package.json @@ -22,6 +22,7 @@ "css-minimizer-webpack-plugin": "^3.0.0", "datamaps": "^0.5.9", "iframe-resizer": "^4.3.2", + "lodash.debounce": "^4.0.8", "mini-css-extract-plugin": "^1.6.0", "phoenix": "file:../deps/phoenix", "phoenix_html": "file:../deps/phoenix_html", @@ -32,6 +33,7 @@ "react-flatpickr": "3.10.5", "react-flip-move": "^3.0.4", "react-router-dom": "^5.2.0", + "react-select": "^4.3.1", "react-transition-group": "^4.4.2", "tailwindcss": "^2.1.2", "terser-webpack-plugin": "^5.1.2", diff --git a/assets/tailwind.config.js b/assets/tailwind.config.js index 1e781ce1b..f36c7b823 100644 --- a/assets/tailwind.config.js +++ b/assets/tailwind.config.js @@ -14,6 +14,7 @@ module.exports = { extend: { colors: { orange: colors.orange, + 'gray-950': 'rgb(13, 18, 30)', 'gray-850': 'rgb(26, 32, 44)', 'gray-825': 'rgb(37, 47, 63)' }, @@ -30,7 +31,7 @@ module.exports = { '9': 9, }, maxWidth: { - '2xs': '16rem', + '2xs': '15rem', '3xs': '12rem', } }, diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex index c16a4ec47..60607f6a8 100644 --- a/lib/plausible/stats/clickhouse.ex +++ b/lib/plausible/stats/clickhouse.ex @@ -257,13 +257,7 @@ defmodule Plausible.Stats.Clickhouse do from(s in referrers, where: s.referrer_source != "") end - referrers = - if query.filters["page"] do - page = query.filters["page"] - from(s in referrers, where: s.entry_page == ^page) - else - referrers - end + referrers = apply_page_as_entry_page(referrers, site, query) referrers = if include_details do @@ -326,13 +320,7 @@ defmodule Plausible.Stats.Clickhouse do end defp apply_page_as_entry_page(db_query, _site, query) do - page = query.filters["page"] - - if is_binary(page) do - from(s in db_query, where: s.entry_page == ^page) - else - db_query - end + include_path_filter_entry(db_query, query.filters["page"]) end def utm_mediums(site, query, limit \\ 9, page \\ 1, show_noref \\ false) do @@ -691,6 +679,55 @@ defmodule Plausible.Stats.Clickhouse do |> Enum.into(%{}) end + def page_times_by_page_url(site, query, page_list \\ nil) + + def page_times_by_page_url(site, query, _page_list = nil) do + {negated, updated_page_selection} = query.filters["page"] |> check_negated_filter() + {_, page_regex} = updated_page_selection |> convert_path_regex() + + q = + from( + e in base_query_w_sessions(site, %Query{ + query + | filters: Map.delete(query.filters, "page") + }), + select: { + fragment("? as p", e.pathname), + fragment("? as t", e.timestamp), + fragment("? as s", e.session_id) + }, + order_by: [e.session_id, e.timestamp] + ) + + {base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q) + + time_query = " + SELECT + avg(ifNotFinite(avgTime, null)) + FROM + (SELECT + p, + sum(td)/count(case when p2 != p then 1 end) as avgTime + FROM + (SELECT + p, + p2, + sum(t2-t) as td + FROM + (SELECT + *, + neighbor(t, 1) as t2, + neighbor(p, 1) as p2, + neighbor(s, 1) as s2 + FROM (#{base_query_raw})) + WHERE s=s2 AND + #{if negated, do: "not(match(p, ?))", else: "match(p, ?)"} + GROUP BY p,p2,s) + GROUP BY p)" + + time_query |> ClickhouseRepo.query(base_query_raw_params ++ [page_regex]) + end + def page_times_by_page_url(site, query, page_list) do q = from( @@ -708,24 +745,27 @@ defmodule Plausible.Stats.Clickhouse do {base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q) - "SELECT - p, - sum(td)/count(case when p2 != p then 1 end) as avgTime - FROM - (SELECT + time_query = " + SELECT p, - p2, - sum(t2-t) as td + sum(td)/count(case when p2 != p then 1 end) as avgTime FROM (SELECT - *, - neighbor(t, 1) as t2, - neighbor(p, 1) as p2, - neighbor(s, 1) as s2 - FROM (#{base_query_raw})) - WHERE s=s2 AND p IN tuple(?) - GROUP BY p,p2,s) - GROUP BY p" + p, + p2, + sum(t2-t) as td + FROM + (SELECT + *, + neighbor(t, 1) as t2, + neighbor(p, 1) as p2, + neighbor(s, 1) as s2 + FROM (#{base_query_raw})) + WHERE s=s2 AND p IN tuple(?) + GROUP BY p,p2,s) + GROUP BY p" + + time_query |> ClickhouseRepo.query( base_query_raw_params ++ [(Enum.count(page_list) > 0 && page_list) || ["/"]] ) @@ -1156,21 +1196,9 @@ defmodule Plausible.Stats.Clickhouse do sessions_q end - sessions_q = - if query.filters["entry_page"] do - entry_page = query.filters["entry_page"] - from(s in sessions_q, where: s.entry_page == ^entry_page) - else - sessions_q - end + sessions_q = include_path_filter_entry(sessions_q, query.filters["entry_page"]) - sessions_q = - if query.filters["exit_page"] do - exit_page = query.filters["exit_page"] - from(s in sessions_q, where: s.exit_page == ^exit_page) - else - sessions_q - end + sessions_q = include_path_filter_exit(sessions_q, query.filters["exit_page"]) q = from(e in "events", @@ -1194,13 +1222,7 @@ defmodule Plausible.Stats.Clickhouse do q end - q = - if query.filters["page"] do - page = query.filters["page"] - from(e in q, where: e.pathname == ^page) - else - q - end + q = include_path_filter(q, query.filters["page"]) if query.filters["props"] do [{key, val}] = query.filters["props"] |> Enum.into([]) @@ -1350,21 +1372,9 @@ defmodule Plausible.Stats.Clickhouse do q end - q = - if query.filters["entry_page"] do - entry_page = query.filters["entry_page"] - from(s in q, where: s.entry_page == ^entry_page) - else - q - end + q = include_path_filter_entry(q, query.filters["entry_page"]) - q = - if query.filters["exit_page"] do - exit_page = query.filters["exit_page"] - from(s in q, where: s.exit_page == ^exit_page) - else - q - end + q = include_path_filter_exit(q, query.filters["exit_page"]) if query.filters["referrer"] do ref = query.filters["referrer"] @@ -1464,13 +1474,7 @@ defmodule Plausible.Stats.Clickhouse do q end - q = - if query.filters["page"] do - page = query.filters["page"] - from(e in q, where: e.pathname == ^page) - else - q - end + q = include_path_filter(q, query.filters["page"]) if query.filters["props"] do [{key, val}] = query.filters["props"] |> Enum.into([]) @@ -1550,12 +1554,9 @@ defmodule Plausible.Stats.Clickhouse do end if path do - if String.match?(path, ~r/\*/) do - path_regex = - "^#{path}\/?$" - |> String.replace(~r/\*\*/, ".*") - |> String.replace(~r/(? String.replace(~r/\*\*/, ".*") + |> String.replace(~r/(? Enum.map(fn c -> Plausible.Stats.CountryName.to_alpha2(c) end) + + q = + from( + e in base_session_query(site, query), + group_by: e.country_code, + order_by: [desc: fragment("count(*)")], + select: {e.country_code} + ) + + ClickhouseRepo.all(q) + |> Enum.map(fn {x} -> x end) + |> Enum.filter(fn c -> Enum.find(filter_search, false, fn x -> x == c end) end) + |> Enum.map(fn c -> Plausible.Stats.CountryName.to_alpha3(c) end) + |> Enum.slice(0..24) + end + + def make_suggestions(site, _query, "goal", filter_search) do + Repo.all(from g in Plausible.Goal, where: g.domain == ^site.domain) + |> Enum.map(fn x -> if x.event_name, do: x.event_name, else: "Visit #{x.page_path}" end) + |> Enum.filter(fn goal -> + String.contains?( + String.downcase(goal), + String.downcase(filter_search) + ) + end) + end + + def make_suggestions(site, query, filter_name, filter_search) do + filter_search = if filter_search == nil, do: "", else: filter_search + + filter_query = + if Enum.member?(["entry_page", "page", "exit_page"], filter_name), + do: "%#{String.replace(filter_search, "*", "")}%", + else: "%#{filter_search}%" + + filter_name = + case filter_name do + "page" -> "pathname" + "source" -> "referrer_source" + "os" -> "operating_system" + "os_version" -> "operating_system_version" + "screen" -> "screen_size" + _ -> filter_name + end + + q = + if(filter_name == "pathname", + do: base_query(site, query), + else: base_session_query(site, query) + ) + |> from( + group_by: ^String.to_atom(filter_name), + order_by: [desc: fragment("count(*)")], + limit: 25 + ) + + q = + case filter_name do + "pathname" -> + from(e in q, + select: {e.pathname}, + where: fragment("? ilike ?", e.pathname, ^filter_query) + ) + + "entry_page" -> + from(e in q, + select: {e.entry_page}, + where: fragment("? ilike ?", e.entry_page, ^filter_query) + ) + + "exit_page" -> + from(e in q, + select: {e.exit_page}, + where: fragment("? ilike ?", e.exit_page, ^filter_query) + ) + + "referrer_source" -> + from(e in q, + select: {e.referrer_source}, + where: fragment("? ilike ?", e.referrer_source, ^filter_query) + ) + + "utm_medium" -> + from(e in q, + select: {e.utm_medium}, + where: fragment("? ilike ?", e.utm_medium, ^filter_query) + ) + + "utm_source" -> + from(e in q, + select: {e.utm_source}, + where: fragment("? ilike ?", e.utm_source, ^filter_query) + ) + + "utm_campaign" -> + from(e in q, + select: {e.utm_campaign}, + where: fragment("? ilike ?", e.utm_campaign, ^filter_query) + ) + + "referrer" -> + from(e in q, + select: {e.referrer}, + where: fragment("? ilike ?", e.referrer, ^filter_query) + ) + + "browser" -> + from(e in q, select: {e.browser}, where: fragment("? ilike ?", e.browser, ^filter_query)) + + "browser_version" -> + from(e in q, + select: {e.browser_version}, + where: fragment("? ilike ?", e.browser_version, ^filter_query) + ) + + "operating_system" -> + from(e in q, + select: {e.operating_system}, + where: fragment("? ilike ?", e.operating_system, ^filter_query) + ) + + "operating_system_version" -> + from(e in q, + select: {e.operating_system_version}, + where: fragment("? ilike ?", e.operating_system_version, ^filter_query) + ) + + "screen_size" -> + from(e in q, + select: {e.screen_size}, + where: fragment("? ilike ?", e.screen_size, ^filter_query) + ) + end + + ClickhouseRepo.all(q) + |> Enum.map(fn {suggestion} -> suggestion end) + |> Enum.filter(fn suggestion -> suggestion != "" end) + end end diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index 6f3806fdd..afaa9e0bb 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -110,14 +110,12 @@ defmodule PlausibleWeb.Api.StatsController do Task.yield_many( [ Task.async(fn -> - {:ok, page_times} = - Stats.page_times_by_page_url(site, query, [query.filters["page"]]) + {:ok, page_times} = Stats.page_times_by_page_url(site, query) page_times end), Task.async(fn -> - {:ok, page_times} = - Stats.page_times_by_page_url(site, prev_query, [query.filters["page"]]) + {:ok, page_times} = Stats.page_times_by_page_url(site, prev_query) page_times end) @@ -132,8 +130,8 @@ defmodule PlausibleWeb.Api.StatsController do {:ok, page_times} -> result = Enum.at(page_times.rows, 0) - result = if result, do: Enum.at(result, 1), else: nil - if result, do: {:ok, round(result)}, else: {:ok, 0} + result = if result, do: Enum.at(result, 0), else: nil + if result, do: {:ok, round(result)}, else: {nil, nil} _ -> response @@ -386,4 +384,11 @@ defmodule PlausibleWeb.Api.StatsController do def handle_errors(conn, %{kind: kind, reason: reason}) do json(conn, %{error: Exception.format_banner(kind, reason)}) end + + def filter_suggestions(conn, params) do + site = conn.assigns[:site] + query = Query.from(site.timezone, params) + + json(conn, Stats.make_suggestions(site, query, params["filter_name"], params["q"])) + end end diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index b8778693d..ab5f7ee87 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -69,6 +69,7 @@ defmodule PlausibleWeb.Router do get "/:domain/screen-sizes", StatsController, :screen_sizes get "/:domain/conversions", StatsController, :conversions get "/:domain/property/:prop_name", StatsController, :prop_breakdown + get "/:domain/suggestions/:filter_name", StatsController, :filter_suggestions end scope "/api/v1/stats", PlausibleWeb.Api do diff --git a/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs b/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs new file mode 100644 index 000000000..48f009a1f --- /dev/null +++ b/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs @@ -0,0 +1,133 @@ +defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do + use PlausibleWeb.ConnCase + import Plausible.TestUtils + + describe "GET /api/stats/:domain/suggestions/:filter_name" do + setup [:create_user, :log_in, :create_site] + + test "returns suggestions for pages without a query", %{conn: conn, site: site} do + conn = get(conn, "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01") + + assert json_response(conn, 200) == ["/", "/register", "/contact", "/irrelevant"] + end + + test "returns suggestions for pages with a query", %{conn: conn, site: site} do + conn = + get(conn, "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01&q=re") + + assert json_response(conn, 200) == ["/register", "/irrelevant"] + end + + test "returns suggestions for pages without any suggestions", %{conn: conn, site: site} do + conn = + get( + conn, + "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01&q=/123" + ) + + assert json_response(conn, 200) == [] + end + + test "returns suggestions for goals", %{conn: conn, site: site} do + conn = get(conn, "/api/stats/#{site.domain}/suggestions/goal?period=month&date=2019-01-01") + + assert json_response(conn, 200) == [] + end + + test "returns suggestions for sources", %{conn: conn, site: site} do + conn = + get(conn, "/api/stats/#{site.domain}/suggestions/source?period=month&date=2019-01-01") + + assert json_response(conn, 200) == ["10words", "Bing"] + end + + test "returns suggestions for countries", %{conn: conn, site: site} do + conn = + get( + conn, + "/api/stats/#{site.domain}/suggestions/country?period=month&date=2019-01-01&q=GBR,UKR,URY,USA" + ) + + assert json_response(conn, 200) == ["USA"] + end + + test "returns suggestions for countries without country in search", %{conn: conn, site: site} do + conn = + get( + conn, + "/api/stats/#{site.domain}/suggestions/country?period=month&date=2019-01-01&q=GBR,UKR,URY" + ) + + assert json_response(conn, 200) == [] + end + + test "returns suggestions for screen sizes", %{conn: conn, site: site} do + conn = + get(conn, "/api/stats/#{site.domain}/suggestions/screen?period=month&date=2019-01-01") + + assert json_response(conn, 200) == ["Desktop"] + end + + test "returns suggestions for browsers", %{conn: conn, site: site} do + conn = + get(conn, "/api/stats/#{site.domain}/suggestions/browser?period=month&date=2019-01-01") + + assert json_response(conn, 200) == ["Chrome"] + end + + test "returns suggestions for browser versions", %{conn: conn, site: site} do + filters = Jason.encode!(%{browser: "Chrome"}) + + conn = + get( + conn, + "/api/stats/#{site.domain}/suggestions/browser_version?period=month&date=2019-01-01&filters=#{ + filters + }" + ) + + assert json_response(conn, 200) == ["78.0"] + end + + test "returns suggestions for OS", %{conn: conn, site: site} do + conn = get(conn, "/api/stats/#{site.domain}/suggestions/os?period=month&date=2019-01-01") + + assert json_response(conn, 200) == ["Mac"] + end + + test "returns suggestions for OS versions", %{conn: conn, site: site} do + filters = Jason.encode!(%{os: "Mac"}) + + conn = + get( + conn, + "/api/stats/#{site.domain}/suggestions/os_version?period=month&date=2019-01-01&filters=#{ + filters + }" + ) + + assert json_response(conn, 200) == ["10.15"] + end + + test "returns suggestions for OS versions with search", %{conn: conn, site: site} do + filters = Jason.encode!(%{os: "Mac"}) + + conn = + get( + conn, + "/api/stats/#{site.domain}/suggestions/os_version?period=month&date=2019-01-01&filters=#{ + filters + }&q=11" + ) + + assert json_response(conn, 200) == [] + end + + test "returns suggestions for referrers", %{conn: conn, site: site} do + conn = + get(conn, "/api/stats/#{site.domain}/suggestions/referrer?period=month&date=2019-01-01") + + assert json_response(conn, 200) == ["10words.com/page1"] + end + end +end From 46f6942be1b1ff3ec1fcd9afe1894232551e145e Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 21 Jun 2021 16:14:06 +0300 Subject: [PATCH 18/22] Update JS deps --- assets/package-lock.json | 162 +++++++++++++++++++++++---------------- assets/package.json | 2 +- 2 files changed, 96 insertions(+), 68 deletions(-) diff --git a/assets/package-lock.json b/assets/package-lock.json index 55f333d7d..ecbb20a27 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -19,7 +19,7 @@ "chart.js": "^3.3.2", "copy-webpack-plugin": "^9.0.0", "css-loader": "^5.2.6", - "css-minimizer-webpack-plugin": "^3.0.0", + "css-minimizer-webpack-plugin": "^3.0.1", "datamaps": "^0.5.9", "iframe-resizer": "^4.3.2", "lodash.debounce": "^4.0.8", @@ -1754,6 +1754,14 @@ "tailwindcss": ">=2.0.0" } }, + "node_modules/@trysound/sax": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz", + "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==", + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/@types/d3": { "version": "3.5.38", "license": "MIT" @@ -2080,6 +2088,7 @@ }, "node_modules/argparse": { "version": "1.0.10", + "dev": true, "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" @@ -2728,10 +2737,11 @@ "license": "MIT" }, "node_modules/commander": { - "version": "6.2.1", - "license": "MIT", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "engines": { - "node": ">= 6" + "node": ">= 10" } }, "node_modules/commondir": { @@ -3482,6 +3492,7 @@ }, "node_modules/es-abstract": { "version": "1.17.5", + "dev": true, "license": "MIT", "dependencies": { "es-to-primitive": "^1.2.1", @@ -3505,6 +3516,7 @@ }, "node_modules/es-abstract/node_modules/object-inspect": { "version": "1.7.0", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3516,6 +3528,7 @@ }, "node_modules/es-to-primitive": { "version": "1.2.1", + "dev": true, "license": "MIT", "dependencies": { "is-callable": "^1.1.4", @@ -5027,6 +5040,7 @@ }, "node_modules/is-callable": { "version": "1.2.2", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -5066,6 +5080,7 @@ }, "node_modules/is-date-object": { "version": "1.0.2", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -5162,6 +5177,7 @@ }, "node_modules/is-regex": { "version": "1.1.1", + "dev": true, "license": "MIT", "dependencies": { "has-symbols": "^1.0.1" @@ -5205,6 +5221,7 @@ }, "node_modules/is-symbol": { "version": "1.0.3", + "dev": true, "license": "MIT", "dependencies": { "has-symbols": "^1.0.1" @@ -5274,6 +5291,7 @@ }, "node_modules/js-yaml": { "version": "3.13.1", + "dev": true, "license": "MIT", "dependencies": { "argparse": "^1.0.7", @@ -6081,16 +6099,6 @@ "dev": true, "license": "MIT" }, - "node_modules/normalize-url": { - "version": "6.0.1", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/npm-run-path": { "version": "4.0.1", "license": "MIT", @@ -6256,6 +6264,7 @@ }, "node_modules/object.values": { "version": "1.1.1", + "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -6484,8 +6493,9 @@ } }, "node_modules/postcss": { - "version": "8.3.2", - "license": "MIT", + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz", + "integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==", "dependencies": { "colorette": "^1.2.2", "nanoid": "^3.1.23", @@ -7056,6 +7066,14 @@ "postcss": "^8.2.15" } }, + "node_modules/postcss-normalize-url/node_modules/normalize-url": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", + "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", + "engines": { + "node": ">=8" + } + }, "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": { "version": "4.1.0", "license": "MIT" @@ -8159,6 +8177,7 @@ }, "node_modules/sprintf-js": { "version": "1.0.3", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/stable": { @@ -8293,6 +8312,7 @@ }, "node_modules/string.prototype.trimend": { "version": "1.0.1", + "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -8304,6 +8324,7 @@ }, "node_modules/string.prototype.trimleft": { "version": "2.1.2", + "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -8319,6 +8340,7 @@ }, "node_modules/string.prototype.trimright": { "version": "2.1.2", + "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -8334,6 +8356,7 @@ }, "node_modules/string.prototype.trimstart": { "version": "1.0.1", + "dev": true, "license": "MIT", "dependencies": { "define-properties": "^1.1.3", @@ -8859,28 +8882,23 @@ "dev": true }, "node_modules/svgo": { - "version": "1.3.2", - "license": "MIT", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.0.tgz", + "integrity": "sha512-fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q==", "dependencies": { - "chalk": "^2.4.1", - "coa": "^2.0.2", - "css-select": "^2.0.0", - "css-select-base-adapter": "^0.1.1", - "css-tree": "1.0.0-alpha.37", - "csso": "^4.0.2", - "js-yaml": "^3.13.1", - "mkdirp": "~0.5.1", - "object.values": "^1.1.0", - "sax": "~1.2.4", - "stable": "^0.1.8", - "unquote": "~1.1.1", - "util.promisify": "~1.0.0" + "@trysound/sax": "0.1.1", + "chalk": "^4.1.0", + "commander": "^7.1.0", + "css-select": "^3.1.2", + "css-tree": "^1.1.2", + "csso": "^4.2.0", + "stable": "^0.1.8" }, "bin": { "svgo": "bin/svgo" }, "engines": { - "node": ">=4.0.0" + "node": ">=10.13.0" } }, "node_modules/svgo/node_modules/ansi-styles": { @@ -9711,13 +9729,6 @@ } } }, - "node_modules/webpack-cli/node_modules/commander": { - "version": "7.2.0", - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, "node_modules/webpack-merge": { "version": "5.8.0", "license": "MIT", @@ -10881,6 +10892,11 @@ "lodash.uniq": "^4.5.0" } }, + "@trysound/sax": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz", + "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==" + }, "@types/d3": { "version": "3.5.38" }, @@ -11118,6 +11134,7 @@ }, "argparse": { "version": "1.0.10", + "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -11525,7 +11542,9 @@ "version": "1.2.2" }, "commander": { - "version": "6.2.1" + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" }, "commondir": { "version": "1.0.1" @@ -11997,6 +12016,7 @@ }, "es-abstract": { "version": "1.17.5", + "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -12012,7 +12032,8 @@ }, "dependencies": { "object-inspect": { - "version": "1.7.0" + "version": "1.7.0", + "dev": true } } }, @@ -12021,6 +12042,7 @@ }, "es-to-primitive": { "version": "1.2.1", + "dev": true, "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -12966,7 +12988,8 @@ } }, "is-callable": { - "version": "1.2.2" + "version": "1.2.2", + "dev": true }, "is-color-stop": { "version": "1.1.0", @@ -12991,7 +13014,8 @@ } }, "is-date-object": { - "version": "1.0.2" + "version": "1.0.2", + "dev": true }, "is-decimal": { "version": "1.0.4", @@ -13036,6 +13060,7 @@ }, "is-regex": { "version": "1.1.1", + "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -13056,6 +13081,7 @@ }, "is-symbol": { "version": "1.0.3", + "dev": true, "requires": { "has-symbols": "^1.0.1" } @@ -13097,6 +13123,7 @@ }, "js-yaml": { "version": "3.13.1", + "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -13595,9 +13622,6 @@ "version": "0.2.0", "dev": true }, - "normalize-url": { - "version": "6.0.1" - }, "npm-run-path": { "version": "4.0.1", "requires": { @@ -13705,6 +13729,7 @@ }, "object.values": { "version": "1.1.1", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.0-next.1", @@ -13846,7 +13871,9 @@ } }, "postcss": { - "version": "8.3.2", + "version": "8.3.5", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz", + "integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==", "requires": { "colorette": "^1.2.2", "nanoid": "^3.1.23", @@ -14186,6 +14213,11 @@ "postcss-value-parser": "^4.1.0" }, "dependencies": { + "normalize-url": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", + "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==" + }, "postcss-value-parser": { "version": "4.1.0" } @@ -14923,7 +14955,8 @@ "dev": true }, "sprintf-js": { - "version": "1.0.3" + "version": "1.0.3", + "dev": true }, "stable": { "version": "0.1.8" @@ -15023,6 +15056,7 @@ }, "string.prototype.trimend": { "version": "1.0.1", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -15030,6 +15064,7 @@ }, "string.prototype.trimleft": { "version": "2.1.2", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -15038,6 +15073,7 @@ }, "string.prototype.trimright": { "version": "2.1.2", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5", @@ -15046,6 +15082,7 @@ }, "string.prototype.trimstart": { "version": "1.0.1", + "dev": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -15384,21 +15421,17 @@ "dev": true }, "svgo": { - "version": "1.3.2", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.0.tgz", + "integrity": "sha512-fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q==", "requires": { - "chalk": "^2.4.1", - "coa": "^2.0.2", - "css-select": "^2.0.0", - "css-select-base-adapter": "^0.1.1", - "css-tree": "1.0.0-alpha.37", - "csso": "^4.0.2", - "js-yaml": "^3.13.1", - "mkdirp": "~0.5.1", - "object.values": "^1.1.0", - "sax": "~1.2.4", - "stable": "^0.1.8", - "unquote": "~1.1.1", - "util.promisify": "~1.0.0" + "@trysound/sax": "0.1.1", + "chalk": "^4.1.0", + "commander": "^7.1.0", + "css-select": "^3.1.2", + "css-tree": "^1.1.2", + "csso": "^4.2.0", + "stable": "^0.1.8" }, "dependencies": { "ansi-styles": { @@ -15897,11 +15930,6 @@ "rechoir": "^0.7.0", "v8-compile-cache": "^2.2.0", "webpack-merge": "^5.7.3" - }, - "dependencies": { - "commander": { - "version": "7.2.0" - } } }, "webpack-merge": { diff --git a/assets/package.json b/assets/package.json index 6dcb46816..28fb50eea 100644 --- a/assets/package.json +++ b/assets/package.json @@ -19,7 +19,7 @@ "chart.js": "^3.3.2", "copy-webpack-plugin": "^9.0.0", "css-loader": "^5.2.6", - "css-minimizer-webpack-plugin": "^3.0.0", + "css-minimizer-webpack-plugin": "^3.0.1", "datamaps": "^0.5.9", "iframe-resizer": "^4.3.2", "lodash.debounce": "^4.0.8", From 388fc39d5e85b9bbb5d69ca4bc22ee8c6e1f6132 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 25 Jun 2021 11:33:00 +0300 Subject: [PATCH 19/22] Fix error with multiple invitations The /activate page would error out when the user had more than 1 invitation. Will work as expected now. Fixes #1147 --- lib/plausible_web/controllers/auth_controller.ex | 8 ++++++-- lib/plausible_web/templates/auth/activate.html.eex | 2 +- lib/plausible_web/templates/site/settings_people.html.eex | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index dfb878709..8849792a2 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -134,7 +134,11 @@ defmodule PlausibleWeb.AuthController do def activate_form(conn, _params) do user = conn.assigns[:current_user] - invitation = Repo.get_by(Plausible.Auth.Invitation, email: user.email) + + has_invitation = Repo.exists?( + from i in Plausible.Auth.Invitation, + where: i.email == ^user.email + ) has_code = Repo.exists?( @@ -144,7 +148,7 @@ defmodule PlausibleWeb.AuthController do render(conn, "activate.html", has_pin: has_code, - invitation: invitation, + has_invitation: has_invitation, layout: {PlausibleWeb.LayoutView, "focus.html"} ) end diff --git a/lib/plausible_web/templates/auth/activate.html.eex b/lib/plausible_web/templates/auth/activate.html.eex index d009f67f5..723b77ea8 100644 --- a/lib/plausible_web/templates/auth/activate.html.eex +++ b/lib/plausible_web/templates/auth/activate.html.eex @@ -47,7 +47,7 @@
<% end %> - <%= if !@invitation do %> + <%= if !@has_invitation do %> diff --git a/lib/plausible_web/templates/site/settings_people.html.eex b/lib/plausible_web/templates/site/settings_people.html.eex index 5918bd428..a67cfd9e4 100644 --- a/lib/plausible_web/templates/site/settings_people.html.eex +++ b/lib/plausible_web/templates/site/settings_people.html.eex @@ -7,7 +7,7 @@ <% end %>
-
    +
      <%= for membership <- @site.memberships do %>
    • @@ -15,7 +15,7 @@ <%= gravatar(membership.user.email, class: "h-8 w-8 rounded-full") %>
      -

      +

      <%= membership.user.name %>

      From cfc81bc785c2475fd3491b7a75fd92c16a3b5f31 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 25 Jun 2021 11:37:57 +0300 Subject: [PATCH 20/22] mix format --- lib/plausible_web/controllers/auth_controller.ex | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index 8849792a2..de2b5d57b 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -135,10 +135,11 @@ defmodule PlausibleWeb.AuthController do def activate_form(conn, _params) do user = conn.assigns[:current_user] - has_invitation = Repo.exists?( - from i in Plausible.Auth.Invitation, - where: i.email == ^user.email - ) + has_invitation = + Repo.exists?( + from i in Plausible.Auth.Invitation, + where: i.email == ^user.email + ) has_code = Repo.exists?( From d5e79a208349588eda8e745d3e2e56d3a4df98c8 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 25 Jun 2021 12:00:15 +0300 Subject: [PATCH 21/22] fix assign --- lib/plausible_web/controllers/auth_controller.ex | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index de2b5d57b..56e7c1e97 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -156,12 +156,16 @@ defmodule PlausibleWeb.AuthController do def activate(conn, %{"code" => code}) do user = conn.assigns[:current_user] - invitation = Repo.get_by(Plausible.Auth.Invitation, email: user.email) + has_invitation = + Repo.exists?( + from i in Plausible.Auth.Invitation, + where: i.email == ^user.email + ) {code, ""} = Integer.parse(code) case Auth.verify_email(user, code) do :ok -> - if invitation do + if has_invitation do redirect(conn, to: "/sites") else redirect(conn, to: "/sites/new") @@ -171,7 +175,7 @@ defmodule PlausibleWeb.AuthController do render(conn, "activate.html", error: "Incorrect activation code", has_pin: true, - invitation: invitation, + has_invitation: has_invitation, layout: {PlausibleWeb.LayoutView, "focus.html"} ) @@ -179,7 +183,7 @@ defmodule PlausibleWeb.AuthController do render(conn, "activate.html", error: "Code is expired, please request another one", has_pin: false, - invitation: invitation, + has_invitation: has_invitation, layout: {PlausibleWeb.LayoutView, "focus.html"} ) end From b7dcbb5e5478e1bca3fa53e6a96f47ff58d41625 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 25 Jun 2021 12:10:20 +0300 Subject: [PATCH 22/22] format --- lib/plausible_web/controllers/auth_controller.ex | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index 56e7c1e97..1a9556bcc 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -156,11 +156,13 @@ defmodule PlausibleWeb.AuthController do def activate(conn, %{"code" => code}) do user = conn.assigns[:current_user] + has_invitation = Repo.exists?( from i in Plausible.Auth.Invitation, where: i.email == ^user.email ) + {code, ""} = Integer.parse(code) case Auth.verify_email(user, code) do