User Routes to create links

pixelunion · Jul 24, 2019 · d7dc4c7 · d7dc4c7
1 parent 4bcc6e4
commit d7dc4c7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/lib/smoke_web/controllers/metrics_controller.ex b/lib/smoke_web/controllers/metrics_controller.ex
@@ -25,7 +25,7 @@ defmodule SmokeWeb.MetricsController do
   end
 
   def metrics(conn, %{"event_name" => event_name, "measurement" => measurement}) do
-    metrics = ["counter", "sum", "last_value", "statistics", "distribution"]
+    metrics = [:counter, :sum, :last_value, :statistics, :distribution]
 
     render(conn, "metrics.html",
       event_name: event_name,

diff --git a/lib/smoke_web/templates/metrics/index.html.eex b/lib/smoke_web/templates/metrics/index.html.eex
@@ -5,8 +5,8 @@
   <ul>
     <%= for event_name <- @event_names do %>
       <li>
-        <%= link(event_name, to: "/events/#{event_name}", class: "btn") %>
+        <%= link(event_name, to: Routes.metrics_path(@conn, :measurements, event_name), class: "btn") %>
       </li>
-    <% end %> 
+    <% end %>
   </ul>
 </div>
diff --git a/lib/smoke_web/templates/metrics/measurements.html.eex b/lib/smoke_web/templates/metrics/measurements.html.eex
@@ -7,7 +7,7 @@
   <ul>
     <%= for measurement <- @measurements do %>
       <li>
-        <%= link(measurement, to: "/events/#{@event_name}/#{measurement}", class: "btn") %>
+        <%= link(measurement, to: Routes.metrics_path(@conn, :metrics, @event_name, measurement), class: "btn") %>
       </li>
     <% end %> 
   </ul>

diff --git a/lib/smoke_web/templates/metrics/metrics.html.eex b/lib/smoke_web/templates/metrics/metrics.html.eex
@@ -6,7 +6,7 @@
   <ul>
     <%= for metric <- @metrics do %>
       <li>        
-        <%= link(metric, to: "/events/#{@event_name}/#{@measurement}/#{metric}", class: "btn") %>
+        <%= link(metric, to: Routes.metrics_path(@conn, metric, @event_name, @measurement), class: "btn") %>
       </li>
     <% end %> 
   </ul>

diff --git a/mix.exs b/mix.exs
@@ -46,7 +46,7 @@ defmodule Smoke.Mixfile do
       {:phoenix, ">= 1.4.9"},
       {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_html, "~> 2.11"},
-      {:phoenix_live_reload, "~> 1.0", only: [:dev, :test]},
+      {:phoenix_live_reload, "~> 1.2", only: [:dev]},
       {:jason, "~> 1.0"},
       {:plug_cowboy, "~> 1.0"},
       {:statistics, "~> 0.5.0"},

diff --git a/mix.lock b/mix.lock
@@ -18,7 +18,7 @@
   "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"},
   "phoenix": {:hex, :phoenix, "1.4.9", "746d098e10741c334d88143d3c94cab1756435f94387a63441792e66ec0ee974", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
   "phoenix_html": {:hex, :phoenix_html, "2.13.3", "850e292ff6e204257f5f9c4c54a8cb1f6fbc16ed53d360c2b780a3d0ba333867", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
-  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.1.7", "425fff579085f7eacaf009e71940be07338c8d8b78d16e307c50c7d82a381497", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.0 or ~> 1.2 or ~> 1.3 or ~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm"},
+  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.1", "274a4b07c4adbdd7785d45a8b0bb57634d0b4f45b18d2c508b26c0344bd59b8f", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm"},
   "plug": {:hex, :plug, "1.8.2", "0bcce1daa420f189a6491f3940cc77ea7fb1919761175c9c3b59800d897440fc", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"},
   "plug_cowboy": {:hex, :plug_cowboy, "1.0.0", "2e2a7d3409746d335f451218b8bb0858301c3de6d668c3052716c909936eb57a", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},