From b0bd564b560e81592ce33dd3d76c6c3693d8b062 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 16 Nov 2020 15:38:44 +0200 Subject: [PATCH] Create unified template for settings --- assets/js/app.js | 9 +- assets/package-lock.json | 7 +- assets/package.json | 1 + .../controllers/site_controller.ex | 131 +++--- lib/plausible_web/router.ex | 4 + .../templates/billing/change_plan.html.eex | 1 - .../billing/change_plan_preview.html.eex | 1 - .../templates/billing/upgrade.html.eex | 1 - .../templates/layout/_flash.html.eex | 34 ++ .../templates/layout/_footer.html.eex | 2 +- .../{site => layout}/_settings_tab.html.eex | 2 +- .../templates/layout/app.html.eex | 8 +- .../templates/layout/site_settings.html.eex | 41 ++ .../templates/site/settings.html.eex | 395 ------------------ .../site/settings_custom_domain.html.eex | 14 + .../site/settings_email_reports.html.eex | 70 ++++ .../templates/site/settings_general.html.eex | 106 +++++ .../templates/site/settings_goals.html.eex | 48 +-- .../site/settings_search_console.html.eex | 48 +++ .../templates/site/settings_snippet.html.eex | 15 + lib/plausible_web/views/layout_view.ex | 9 + 21 files changed, 457 insertions(+), 490 deletions(-) create mode 100644 lib/plausible_web/templates/layout/_flash.html.eex rename lib/plausible_web/templates/{site => layout}/_settings_tab.html.eex (94%) create mode 100644 lib/plausible_web/templates/layout/site_settings.html.eex delete mode 100644 lib/plausible_web/templates/site/settings.html.eex create mode 100644 lib/plausible_web/templates/site/settings_custom_domain.html.eex create mode 100644 lib/plausible_web/templates/site/settings_email_reports.html.eex create mode 100644 lib/plausible_web/templates/site/settings_general.html.eex create mode 100644 lib/plausible_web/templates/site/settings_search_console.html.eex create mode 100644 lib/plausible_web/templates/site/settings_snippet.html.eex diff --git a/assets/js/app.js b/assets/js/app.js index 4305488da..ea7e58f3c 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -3,6 +3,7 @@ import "flatpickr/dist/flatpickr.min.css" import "./polyfills/closest" import 'abortcontroller-polyfill/dist/polyfill-patch-fetch' import "phoenix_html" +import 'alpinejs' const triggers = document.querySelectorAll('[data-dropdown-trigger]') @@ -33,14 +34,6 @@ if (triggers.length > 0) { }) } -const flash = document.getElementById('flash') - -if (flash) { - setTimeout(function() { - flash.style.display = 'none' - }, 2500) -} - const registerForm = document.getElementById('register-form') if (registerForm) { diff --git a/assets/package-lock.json b/assets/package-lock.json index c82c27075..90b774e30 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -1410,6 +1410,11 @@ "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=" }, + "alpinejs": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-2.7.3.tgz", + "integrity": "sha512-IRXnszk68s+FOGFMA1+K3rjLK44NqLShNpSy8aI6J3Ch9gss56FqlU6NVRP+mJes7LeQFCreH410luScVSkdfg==" + }, "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", @@ -7113,7 +7118,7 @@ }, "pretty-hrtime": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" }, "process": { diff --git a/assets/package.json b/assets/package.json index ec550d909..7632125e4 100644 --- a/assets/package.json +++ b/assets/package.json @@ -12,6 +12,7 @@ "@fullhuman/postcss-purgecss": "^2.3.0", "@tailwindcss/ui": "^0.1.4", "abortcontroller-polyfill": "^1.5.0", + "alpinejs": "^2.7.3", "autoprefixer": "^9.8.6", "babel-loader": "^8.1.0", "chart.js": "^2.9.3", diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index d39ffa937..64690ef7b 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -65,7 +65,7 @@ defmodule PlausibleWeb.SiteController do {:ok, _} -> conn |> put_flash(:success, "Goal created succesfully") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/goals") {:error, :goal, changeset, _} -> conn @@ -83,7 +83,7 @@ defmodule PlausibleWeb.SiteController do conn |> put_flash(:success, "Goal deleted succesfully") - |> redirect(to: "/#{URI.encode_www_form(website)}/settings") + |> redirect(to: "/#{URI.encode_www_form(website)}/settings/goals") end def settings(conn, %{"website" => website}) do @@ -93,44 +93,81 @@ defmodule PlausibleWeb.SiteController do def settings_general(conn, %{"website" => website}) do site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + + shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id) + + conn + |> assign(:skip_plausible_tracking, true) + |> render("settings_general.html", + site: site, + shared_links: shared_links, + changeset: Plausible.Site.changeset(site, %{}), + layout: {PlausibleWeb.LayoutView, "site_settings.html"} + ) + end + + def settings_goals(conn, %{"website" => website}) do + site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + goals = Goals.for_site(site.domain) + + conn + |> assign(:skip_plausible_tracking, true) + |> render("settings_goals.html", + site: site, + goals: goals, + layout: {PlausibleWeb.LayoutView, "site_settings.html"} + ) + end + + def settings_search_console(conn, %{"website" => website}) do + site = Sites.get_for_user!(conn.assigns[:current_user].id, website) |> Repo.preload(:google_auth) - |> Repo.preload(:custom_domain) search_console_domains = if site.google_auth do Plausible.Google.Api.fetch_verified_properties(site.google_auth) end - weekly_report = Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id) - monthly_report = Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id) - shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id) - goals = Goals.for_site(site.domain) - conn |> assign(:skip_plausible_tracking, true) - |> render("settings.html", + |> render("settings_search_console.html", site: site, - weekly_report: weekly_report, - monthly_report: monthly_report, search_console_domains: search_console_domains, - goals: goals, - shared_links: shared_links, - changeset: Plausible.Site.changeset(site, %{}) + layout: {PlausibleWeb.LayoutView, "site_settings.html"} ) end - def settings_goals(conn, %{"website" => website}) do + def settings_email_reports(conn, %{"website" => website}) do site = Sites.get_for_user!(conn.assigns[:current_user].id, website) - goals = Goals.for_site(site.domain) conn |> assign(:skip_plausible_tracking, true) - |> render("settings_goals.html", + |> render("settings_email_reports.html", site: site, - goals: goals + weekly_report: Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id), + monthly_report: Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id), + layout: {PlausibleWeb.LayoutView, "site_settings.html"} ) end + def settings_custom_domain(conn, %{"website" => website}) do + site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + |> Repo.preload(:custom_domain) + + conn + |> assign(:skip_plausible_tracking, true) + |> render("settings_custom_domain.html", site: site, layout: {PlausibleWeb.LayoutView, "site_settings.html"}) + end + + def settings_snippet(conn, %{"website" => website}) do + site = Sites.get_for_user!(conn.assigns[:current_user].id, website) + |> Repo.preload(:custom_domain) + + conn + |> assign(:skip_plausible_tracking, true) + |> render("settings_snippet.html", site: 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) @@ -141,7 +178,7 @@ defmodule PlausibleWeb.SiteController do conn |> put_flash(:success, "Google integration saved succesfully") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#google-auth") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console") end def delete_google_auth(conn, %{"website" => website}) do @@ -152,8 +189,8 @@ defmodule PlausibleWeb.SiteController do Repo.delete!(site.google_auth) conn - |> put_flash(:success, "Google account unlinked succesfully") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#google-auth") + |> put_flash(:success, "Google account unlinked from Plausible") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console") end def update_settings(conn, %{"website" => website, "site" => site_params}) do @@ -167,11 +204,11 @@ defmodule PlausibleWeb.SiteController do conn |> put_session(site_session_key, nil) - |> put_flash(:success, "Site settings saved succesfully") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings") + |> put_flash(:success, "Your site settings have been saved") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general") {:error, changeset} -> - render("settings.html", site: site, changeset: changeset) + render("settings_general.html", site: site, changeset: changeset) end end @@ -181,7 +218,7 @@ defmodule PlausibleWeb.SiteController do conn |> put_flash(:success, "#{site.domain} stats will be reset in a few minutes") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general") end def delete_site(conn, %{"website" => website}) do @@ -210,8 +247,8 @@ defmodule PlausibleWeb.SiteController do |> Repo.update!() conn - |> put_flash(:success, "Congrats! Stats for #{site.domain} are now public.") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings") + |> put_flash(:success, "Stats for #{site.domain} are now public.") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general") end def make_private(conn, %{"website" => website}) do @@ -222,7 +259,7 @@ defmodule PlausibleWeb.SiteController do conn |> put_flash(:success, "Stats for #{site.domain} are now private.") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general") end def enable_weekly_report(conn, %{"website" => website}) do @@ -235,8 +272,8 @@ defmodule PlausibleWeb.SiteController do |> Repo.insert!() conn - |> put_flash(:success, "Success! You will receive an email report every Monday going forward") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#email-reports") + |> put_flash(:success, "You will receive an email report every Monday going forward") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end def disable_weekly_report(conn, %{"website" => website}) do @@ -244,8 +281,8 @@ defmodule PlausibleWeb.SiteController do Repo.delete_all(from wr in Plausible.Site.WeeklyReport, where: wr.site_id == ^site.id) conn - |> put_flash(:success, "Success! You will not receive weekly email reports going forward") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#email-reports") + |> put_flash(:success, "You will not receive weekly email reports going forward") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end def add_weekly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do @@ -256,8 +293,8 @@ defmodule PlausibleWeb.SiteController do |> Repo.update!() conn - |> put_flash(:success, "Succesfully added #{recipient} as a recipient for the weekly report") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#email-reports") + |> put_flash(:success, "Added #{recipient} as a recipient for the weekly report") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end def remove_weekly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do @@ -270,9 +307,9 @@ defmodule PlausibleWeb.SiteController do conn |> put_flash( :success, - "Succesfully removed #{recipient} as a recipient for the weekly report" + "Removed #{recipient} as a recipient for the weekly report" ) - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#email-reports") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end def enable_monthly_report(conn, %{"website" => website}) do @@ -285,8 +322,8 @@ defmodule PlausibleWeb.SiteController do |> Repo.insert!() conn - |> put_flash(:success, "Success! You will receive an email report every month going forward") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#email-reports") + |> put_flash(:success, "You will receive an email report every month going forward") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end def disable_monthly_report(conn, %{"website" => website}) do @@ -294,8 +331,8 @@ defmodule PlausibleWeb.SiteController do Repo.delete_all(from mr in Plausible.Site.MonthlyReport, where: mr.site_id == ^site.id) conn - |> put_flash(:success, "Success! You will not receive monthly email reports going forward") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#email-reports") + |> put_flash(:success, "You will not receive monthly email reports going forward") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end def add_monthly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do @@ -306,8 +343,8 @@ defmodule PlausibleWeb.SiteController do |> Repo.update!() conn - |> put_flash(:success, "Succesfully added #{recipient} as a recipient for the monthly report") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#email-reports") + |> put_flash(:success, "Added #{recipient} as a recipient for the monthly report") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end def remove_monthly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do @@ -320,9 +357,9 @@ defmodule PlausibleWeb.SiteController do conn |> put_flash( :success, - "Succesfully removed #{recipient} as a recipient for the monthly report" + "Removed #{recipient} as a recipient for the monthly report" ) - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings#email-reports") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports") end def new_shared_link(conn, %{"website" => website}) do @@ -352,7 +389,7 @@ defmodule PlausibleWeb.SiteController do case Repo.insert(changes) do {:ok, _created} -> - redirect(conn, to: "/#{URI.encode_www_form(site.domain)}/settings#visibility") + redirect(conn, to: "/#{URI.encode_www_form(site.domain)}/settings/general") {:error, changeset} -> conn @@ -371,7 +408,7 @@ defmodule PlausibleWeb.SiteController do Repo.get_by(Plausible.Site.SharedLink, slug: slug) |> Repo.delete!() - redirect(conn, to: "/#{URI.encode_www_form(site.domain)}/settings#visibility") + redirect(conn, to: "/#{URI.encode_www_form(site.domain)}/settings/general") end def new_custom_domain(conn, %{"website" => website}) do @@ -440,7 +477,7 @@ defmodule PlausibleWeb.SiteController do conn |> put_flash(:success, "Custom domain deleted succesfully") - |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings") + |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/custom-domain") end defp insert_site(user_id, params) do diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 006ffba8c..951e70c3a 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -147,6 +147,10 @@ defmodule PlausibleWeb.Router do get "/:website/settings", SiteController, :settings get "/:website/settings/general", SiteController, :settings_general get "/:website/settings/goals", SiteController, :settings_goals + get "/:website/settings/search-console", SiteController, :settings_search_console + get "/:website/settings/email-reports", SiteController, :settings_email_reports + get "/:website/settings/custom-domain", SiteController, :settings_custom_domain + get "/:website/settings/js-snippet", SiteController, :settings_snippet get "/:website/goals/new", SiteController, :new_goal post "/:website/goals", SiteController, :create_goal delete "/:website/goals/:id", SiteController, :delete_goal diff --git a/lib/plausible_web/templates/billing/change_plan.html.eex b/lib/plausible_web/templates/billing/change_plan.html.eex index 3f9aea4d6..00db4be08 100644 --- a/lib/plausible_web/templates/billing/change_plan.html.eex +++ b/lib/plausible_web/templates/billing/change_plan.html.eex @@ -124,5 +124,4 @@ - diff --git a/lib/plausible_web/templates/billing/change_plan_preview.html.eex b/lib/plausible_web/templates/billing/change_plan_preview.html.eex index 4cab63840..ff2330d04 100644 --- a/lib/plausible_web/templates/billing/change_plan_preview.html.eex +++ b/lib/plausible_web/templates/billing/change_plan_preview.html.eex @@ -82,5 +82,4 @@ - diff --git a/lib/plausible_web/templates/billing/upgrade.html.eex b/lib/plausible_web/templates/billing/upgrade.html.eex index 7a77d4679..d885de67c 100644 --- a/lib/plausible_web/templates/billing/upgrade.html.eex +++ b/lib/plausible_web/templates/billing/upgrade.html.eex @@ -128,5 +128,4 @@ - diff --git a/lib/plausible_web/templates/layout/_flash.html.eex b/lib/plausible_web/templates/layout/_flash.html.eex new file mode 100644 index 000000000..64ad10583 --- /dev/null +++ b/lib/plausible_web/templates/layout/_flash.html.eex @@ -0,0 +1,34 @@ +<%= if get_flash(@conn, :success) do %> +
+
+
+
+
+
+ + + + +
+
+

+ <%= get_flash(@conn, :success_title) || "Success!" %> +

+

+ <%= get_flash(@conn, :success) %> +

+
+
+ +
+
+
+
+
+
+<% end %> diff --git a/lib/plausible_web/templates/layout/_footer.html.eex b/lib/plausible_web/templates/layout/_footer.html.eex index 09cbf1648..8d84b9132 100644 --- a/lib/plausible_web/templates/layout/_footer.html.eex +++ b/lib/plausible_web/templates/layout/_footer.html.eex @@ -1,4 +1,4 @@ -
+
diff --git a/lib/plausible_web/templates/site/_settings_tab.html.eex b/lib/plausible_web/templates/layout/_settings_tab.html.eex similarity index 94% rename from lib/plausible_web/templates/site/_settings_tab.html.eex rename to lib/plausible_web/templates/layout/_settings_tab.html.eex index 896ac8d10..0b9312ab4 100644 --- a/lib/plausible_web/templates/site/_settings_tab.html.eex +++ b/lib/plausible_web/templates/layout/_settings_tab.html.eex @@ -1,4 +1,4 @@ -<%= if @current_tab == @this_tab do %> +<%= if is_current_tab(@conn, @this_tab) do %> "><%= @text %> <% else %> "><%= @text %> diff --git a/lib/plausible_web/templates/layout/app.html.eex b/lib/plausible_web/templates/layout/app.html.eex index ddecb7f22..2266fded9 100644 --- a/lib/plausible_web/templates/layout/app.html.eex +++ b/lib/plausible_web/templates/layout/app.html.eex @@ -80,11 +80,7 @@
- <%= if get_flash(@conn, :success) do %> - - <% end %> + <%= render("_flash.html", assigns) %> <%= if get_flash(@conn, :error) do %>