diff --git a/lib/plausible/funnels.ex b/lib/plausible/funnels.ex index 9fb5dbc66..1cfd0c840 100644 --- a/lib/plausible/funnels.ex +++ b/lib/plausible/funnels.ex @@ -32,6 +32,7 @@ defmodule Plausible.Funnels do where: f.site_id == ^site_id, select: %{name: f.name, id: f.id} ) + |> IO.inspect(label: :listing_funnels) end def get(%Plausible.Site{id: site_id}, by) do diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 6de9010ec..a0c8ecfe6 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -1,7 +1,7 @@ defmodule PlausibleWeb.SiteController do use PlausibleWeb, :controller use Plausible.Repo - alias Plausible.{Sites, Goals} + alias Plausible.{Sites, Goals, Funnels} plug PlausibleWeb.RequireAccountPlug @@ -236,6 +236,42 @@ defmodule PlausibleWeb.SiteController do ) end + def settings_funnels(conn, _params) do + site = conn.assigns[:site] |> Repo.preload(:custom_domain) + funnels = Funnels.list(site) + goals = Goals.for_site(site) + + conn + |> assign(:skip_plausible_tracking, true) + |> render("settings_funnels.html", + site: site, + funnels: funnels, + goals: goals, + layout: {PlausibleWeb.LayoutView, "site_settings.html"} + ) + end + + def save_funnel(conn, params) do + site = conn.assigns[:site] + IO.inspect(params) + + sanitized_params = + ["step_1", "step_2", "step_3", "step_4", "step_5"] + |> Enum.map(¶ms[&1]) + |> Enum.filter(fn + "" -> false + goal_id -> true + end) + |> Enum.map(fn goal_id -> %{id: String.to_integer(goal_id)} end) + |> IO.inspect(label: :params) + + funnel_name = params["funnel_name"] + + {:ok, funnel} = Plausible.Funnels.create(site, funnel_name, sanitized_params, nil) + + redirect(conn, to: Routes.site_path(conn, :settings_funnels, site.domain)) + end + def settings_search_console(conn, _params) do site = conn.assigns[:site] diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 11a182950..e6255b2c5 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -245,6 +245,10 @@ defmodule PlausibleWeb.Router do get "/:website/settings/people", SiteController, :settings_people get "/:website/settings/visibility", SiteController, :settings_visibility get "/:website/settings/goals", SiteController, :settings_goals + + get "/:website/settings/funnels", SiteController, :settings_funnels + post "/:website/settings/funnels", SiteController, :save_funnel + 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 diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.ex index 1e6e04927..b5ce9ec30 100644 --- a/lib/plausible_web/views/layout_view.ex +++ b/lib/plausible_web/views/layout_view.ex @@ -23,6 +23,7 @@ defmodule PlausibleWeb.LayoutView do [key: "People", value: "people"], [key: "Visibility", value: "visibility"], [key: "Goals", value: "goals"], + [key: "Funnels", value: "funnels"], [key: "Search Console", value: "search-console"], [key: "Email reports", value: "email-reports"], if !is_selfhost() && conn.assigns[:site].custom_domain do diff --git a/test/plausible/funnels_test.exs b/test/plausible/funnels_test.exs index 90a0f92d6..4d89dd14e 100644 --- a/test/plausible/funnels_test.exs +++ b/test/plausible/funnels_test.exs @@ -64,7 +64,6 @@ defmodule Plausible.FunnelsTest do [g1, g1], nil ) - |> IO.inspect(label: :err) end test "funnels can be listed per site", %{site: site, goals: [g1, g2, g3]} do