Fix URL helpers. Add additional URL section for old frontend

magpie-ea · Jul 8, 2023 · e88585a · e88585a
1 parent eff3cd9
commit e88585a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/lib/magpie_web/templates/experiment/edit.html.eex b/lib/magpie_web/templates/experiment/edit.html.eex
@@ -11,6 +11,10 @@ serverUrl: '<%=  get_home_url() %>',
 socketUrl: '<%= get_socket_url() %>',</pre>
 </ul>
 
+<p>
+  (If you're basing your experiment on a frontend version that was before the <code>magpie-base</code> package, please note the full submission URL: <code><%= get_home_url() <> Magpie.Router.Helpers.experiment_path(Magpie.Endpoint, :submit, @experiment.id) %></code>)
+</p>
+
 <%= form_for @changeset, experiment_path(@conn, :update, @experiment), fn f -> %>
   <%= if @changeset.action do %>
     <div class="alert alert-danger" >

diff --git a/lib/magpie_web/views/experiment_view.ex b/lib/magpie_web/views/experiment_view.ex
@@ -107,33 +107,20 @@ defmodule Magpie.ExperimentView do
   end
 
   def get_endpoint_url(type, id) do
-    base_url =
-      Application.get_env(
-        :magpie,
-        :canonical_url,
-        Magpie.Router.Helpers.page_url(Magpie.Endpoint, :index)
-      )
+    base_url = Magpie.Router.Helpers.page_url(Magpie.Endpoint, :index)
 
     path = Magpie.Router.Helpers.experiment_path(Magpie.Endpoint, type, id)
     base_url <> path
   end
 
   def get_home_url() do
-    base_url =
-      Application.get_env(
-        :magpie,
-        :canonical_url,
-        Magpie.Router.Helpers.page_url(Magpie.Endpoint, :index)
-      )
-
-    home_path = Magpie.Router.Helpers.page_path(Magpie.Endpoint, :index)
-    base_url <> home_path
+    Magpie.Endpoint.url()
   end
 
   def get_socket_url() do
     get_home_url()
     |> String.replace_leading("http", "ws")
-    |> Kernel.<>("socket")
+    |> Kernel.<>("/socket")
   end
 
   def format_timestamp(timestamp, timezone) do