+
Choose the view in your Google Analytics account that will be imported to the <%= @site.domain %> dashboard.
- <%= label f, :view_id, "Google Analytics view", class: "block text-sm font-medium text-gray-700" %>
- <%= select f, :view_id, view_ids, prompt: "(Choose view)", required: "true", class: "mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md" %>
+ <%= styled_label(f, :view_id, "Google Analytics view") %>
+ <%= styled_select f, :view_id, view_ids, prompt: "(Choose view)", required: "true" %>
<% {:error, error} -> %>
The following error occurred when fetching your Google Analytics view ids.
diff --git a/lib/plausible_web/templates/site/settings_general.html.eex b/lib/plausible_web/templates/site/settings_general.html.eex
index aadc764a1..1d03cdcb4 100644
--- a/lib/plausible_web/templates/site/settings_general.html.eex
+++ b/lib/plausible_web/templates/site/settings_general.html.eex
@@ -98,15 +98,18 @@
<%= button(to: Plausible.Google.Api.authorize_url(@site.id, "import"), class: "inline-flex pr-4 items-center border border-gray-100 shadow rounded-md focus:outline-none focus:ring-1 focus:ring-offset-1 focus:ring-gray-200 mt-8 hover:bg-gray-50") do %>
<%= google_logo() %>
- Continue with Google
+ Continue with Google
<% end %>
<% true -> %>
-
- <%= button(to: Plausible.Google.Api.authorize_url(@site.id, "import"), class: "inline-flex pr-4 items-center border border-gray-100 shadow rounded-md focus:outline-none focus:ring-1 focus:ring-offset-1 focus:ring-gray-200 mt-8 hover:bg-gray-50") do %>
+ <%= if @site.imported_data && @site.imported_data.status == "error" do %>
+
Your latest import has failed. You can try importing again by clicking the button below. If you try multiple times and the import keeps failing, please contact support.
+ <% end %>
+
+ <%= button(to: Plausible.Google.Api.authorize_url(@site.id, "import"), class: "inline-flex pr-4 items-center border border-gray-100 shadow rounded-md focus:outline-none focus:ring-1 focus:ring-offset-1 focus:ring-gray-200 mt-8 hover:bg-gray-50 dark:hover:bg-gray-700") do %>
<%= google_logo() %>
- Continue with Google
+ Continue with Google
<% end %>
diff --git a/lib/plausible_web/views/form_helpers.ex b/lib/plausible_web/views/form_helpers.ex
new file mode 100644
index 000000000..c96375ee0
--- /dev/null
+++ b/lib/plausible_web/views/form_helpers.ex
@@ -0,0 +1,26 @@
+defmodule PlausibleWeb.FormHelpers do
+ @label_opts [class: "block text-sm font-medium text-gray-700 dark:text-gray-100"]
+ def styled_label(form, field, text, opts \\ []) do
+ opts = Keyword.merge(@label_opts, opts)
+ Phoenix.HTML.Form.label(form, field, text, opts)
+ end
+
+ @date_input_opts [
+ class:
+ "mt-1 block w-full px-3 py-2 text-base dark:bg-gray-900 dark:text-gray-300 dark:border-gray-500 border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md"
+ ]
+ def styled_date_input(form, field, opts \\ []) do
+ opts = Keyword.merge(@date_input_opts, opts)
+ Phoenix.HTML.Form.date_input(form, field, opts)
+ end
+
+ @select_opts [
+ class:
+ "mt-1 block w-full pl-3 pr-10 py-2 text-base dark:bg-gray-900 dark:text-gray-100 dark:border-gray-500 border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md"
+ ]
+
+ def styled_select(form, field, options, opts \\ []) do
+ opts = Keyword.merge(@select_opts, opts)
+ Phoenix.HTML.Form.select(form, field, options, opts)
+ end
+end