Improve URL page with query vars, more code examples

RoyalIcing · RoyalIcing · commit 4d85626020ab · 2020-11-17T06:54:38.000Z
diff --git a/apps/components_guide_web/lib/components_guide_web/template_engines/markdown_engine.ex b/apps/components_guide_web/lib/components_guide_web/template_engines/markdown_engine.ex
@@ -7,25 +7,35 @@ defmodule ComponentsGuideWeb.TemplateEngines.MarkdownEngine do
 
   def compile(path, name) do
     IO.puts("compile #{path} #{name}")
-    html = path
-    |> File.read!()
-    |> Earmark.as_html!(%Earmark.Options{code_class_prefix: "language-", smartypants: false})
+
+    html =
+      path
+      |> File.read!()
+      |> Earmark.as_html!(%Earmark.Options{code_class_prefix: "language-", smartypants: false})
 
     # regex = ~r{<live-([\w-]+)>(.+)</live-([\w-]+)>}
     regex = ~r{<live-([\w-]+)>([^<]+)</live-([^>]+)>}
     # regex = ~r{<live-([\w-]+)>}
 
     # live? = Regex.match(regex, html)
 
-    html = Regex.replace(regex, html, fn whole, name, content ->
-      case name do
-        "render" ->
-          module = content |> String.trim #|> String.to_existing_atom
-          "<div><%= live_render(@conn, #{module}, session: %{}) %></div>"
-        _ ->
-          "!" <> name <> "!" <> content
-      end
-    end)
+    html =
+      Regex.replace(regex, html, fn whole, name, content ->
+        case name do
+          "render" ->
+            # |> String.to_existing_atom
+            module = content |> String.trim()
+            "<div><%= live_render(@conn, #{module}, session: %{}) %></div>"
+
+          "component" ->
+            # |> String.to_existing_atom
+            module = content |> String.trim()
+            "<div><%= live_component(@conn, #{module}) %></div>"
+
+          _ ->
+            "!" <> name <> "!" <> content
+        end
+      end)
 
     # html = Regex.replace(regex, html, fn whole, name, content -> "!" <> name <> "!" <> content end)
 
diff --git a/apps/components_guide_web/lib/components_guide_web/templates/web_standards/url.html.md b/apps/components_guide_web/lib/components_guide_web/templates/web_standards/url.html.md
@@ -6,8 +6,6 @@
 ComponentsGuideWeb.WebStandards.Live.URL
 </live-render>
 
-## Relative URLs
-
 ## JavaScript’s `URL`
 
 ```js
@@ -35,6 +33,19 @@ const current = new URL(request.url);
 ## Swift’s `URL`
 
 ```swift
-let root = URL(string: "/")
+let url = URL(string: "https://www.example.org/")
+
+```
+
+## Elixir’s `URI`
+
+```elixir
+url = URI.parse("https://www.example.org/")
+
+```
+
+## Go’s `net/url`
 
+```go
+u, err := url.Parse("https://www.example.org/")
 ```
diff --git a/apps/components_guide_web/lib/components_guide_web/templates/web_standards/url_live.ex b/apps/components_guide_web/lib/components_guide_web/templates/web_standards/url_live.ex
@@ -1,5 +1,6 @@
 defmodule ComponentsGuideWeb.WebStandards.Live.URL do
   use ComponentsGuideWeb, :live_view
+
   alias ComponentsGuideWeb.StylingHelpers
 
   defmodule State do
@@ -9,9 +10,17 @@ defmodule ComponentsGuideWeb.WebStandards.Live.URL do
       URI.parse(raw_url)
     end
 
-    def get_field(%State{} = state, field) when field in [:host] do
+    def to_url_string(%State{raw_url: raw_url}) do
+      URI.parse(raw_url) |> URI.to_string()
+    end
+
+    def get_query_vars(%State{} = state) do
       url = state |> to_url()
-      url[field]
+      url.query |> URI.query_decoder()
+    end
+
+    defp change_url(%State{} = state, url) do
+      put_in(state.raw_url, URI.to_string(url))
     end
 
     def change(%State{} = state, :scheme, new_scheme) when is_binary(new_scheme) do
@@ -33,6 +42,24 @@ defmodule ComponentsGuideWeb.WebStandards.Live.URL do
       IO.inspect(url)
       put_in(state.raw_url, url |> URI.to_string())
     end
+
+    def clear_query(%State{} = state) do
+      url = to_url(state)
+      url = put_in(url.query, "")
+      put_in(state.raw_url, url |> URI.to_string())
+    end
+
+    def add_new_query(%State{} = state) do
+      url = to_url(state)
+      url = put_in(url.query, url.query <> "&a=b")
+      put_in(state.raw_url, url |> URI.to_string())
+    end
+
+    def change_query_vars(%State{} = state, query_vars) do
+      url = to_url(state)
+      url = put_in(url.query, URI.encode_query(query_vars))
+      put_in(state.raw_url, url |> URI.to_string())
+    end
   end
 
   def mount(_params, _session, socket) do
@@ -44,23 +71,19 @@ defmodule ComponentsGuideWeb.WebStandards.Live.URL do
     <form phx-change=change>
 
     <pre class="p-4 my-2" style="color: #d6deeb;">
-    <code><%= @state |> State.to_url() |> URI.to_string() %></code>
-    </pre>
-
-    <pre class="p-4 my-2" style="color: #d6deeb;">
-    <code><span class="text-green-400"><%= State.to_url(@state).scheme %></span>://<span class="text-yellow-400"><%= State.to_url(@state).host %></span><span class="text-orange-400"><%= State.to_url(@state).path %></span><span class="text-indigo-400"/songs</span>?first=20&sortBy=releaseDate</code>
+    <code><span class="text-green-400"><%= State.to_url(@state).scheme %></span>://<span class="text-yellow-400"><%= State.to_url(@state).host %></span><span class="text-orange-400"><%= State.to_url(@state).path %></span><span class="text-indigo-400">?<%= State.to_url(@state).query %></span></code>
     </pre>
 
     <div class="flex flex-col space-y-4">
 
     <label>
-    <span class="font-bold text-green-400 mr-2">Scheme</span>
-    <input name=scheme type=text value="https" class="text-black text-green-900 bg-green-100 px-2">
+    <span class="font-bold text-yellow-400 mr-2">Scheme</span>
+    <input name=scheme type=text value="https" class="text-black text-yellow-900 bg-yellow-100 px-2">
     </label>
 
     <label>
-    <span class="font-bold text-yellow-400 mr-2">Host</span>
-    <input name=host type=text value="example.org" class="text-black text-yellow-900 bg-yellow-100 px-2">
+    <span class="font-bold text-green-400 mr-2">Host</span>
+    <input name=host type=text value="example.org" class="text-black text-green-900 bg-green-100 px-2">
     </label>
 
     <label>
@@ -70,38 +93,84 @@ defmodule ComponentsGuideWeb.WebStandards.Live.URL do
 
     <label>
     <span class="font-bold text-orange-400 mr-2">Query</span>
-    <button type=button class="px-2 bg-white text-black rounded">Add query</button>
-    <div>
-      <input name=queryKey type=text value="" class="text-black text-orange-900 bg-orange-100 px-2">
-      <input name=queryValue type=text value="/songs" class="text-black text-orange-900 bg-orange-100 px-2">
+    <button type=button phx-click=add-query class="px-2 bg-white text-black rounded">Add query</button>
+    <button type=button phx-click=clear-query class="px-2 bg-white text-black rounded">Clear query</button>
+
+    <div class="space-y-2 mt-2">
+      <%= for {key, value} <- State.get_query_vars(@state) do %>
+        <div>
+          <input name=query-keys[] type=text value="<%= key %>" class="text-black text-indigo-900 bg-indigo-100 px-2">
+          <input name=query-values[] type=text value="<%= value %>" class="text-black text-indigo-900 bg-indigo-100 px-2">
+        </div>
+      <% end %>
     </div>
+
     </label>
 
     </div>
 
     </form>
-    
+
     <pre class="language-js" phx-hook=PreCode><code>const url = new URL(
       '<%= @state |> State.to_url() |> URI.to_string() %>'
     );
-    url.protocol; // <%= State.to_url(@state).scheme %>:
-    url.host; // <%= State.to_url(@state).host %>:
-    url.path; // <%= State.to_url(@state).path %>:
-    url.search; // <%= State.to_url(@state).query %>:
+    url.protocol; // '<%= State.to_url(@state).scheme %>:'
+    url.host; // '<%= State.to_url(@state).host %>'
+    url.path; // '<%= State.to_url(@state).path %>'
+
+    url.search; // '<%= State.to_url(@state).query %>'
+    const query = new URLSearchParams(url.search);
+    <%= for {key, value} <- State.get_query_vars(@state) do
+      "query.get('#{key}'); // '#{value}'\n"
+    end %>
     </code></pre>
     """
   end
 
   def handle_event(
         "change",
-        %{"scheme" => new_scheme, "host" => new_host, "path" => new_path},
+        changes = %{
+          "scheme" => new_scheme,
+          "host" => new_host,
+          "path" => new_path,
+          "query-keys" => query_keys,
+          "query-values" => query_values
+        },
         socket
       ) do
+    IO.inspect(changes)
+
+    query_pairs = Enum.zip(query_keys, query_values)
+    IO.inspect(query_pairs)
+
     state =
       socket.assigns.state
       |> State.change(:scheme, new_scheme)
       |> State.change(:host, new_host)
       |> State.change(:path, new_path)
+      |> State.change_query_vars(query_pairs)
+
+    {
+      :noreply,
+      socket |> assign(:state, state)
+    }
+  end
+
+  def handle_event("clear-query", _, socket) do
+    state =
+      socket.assigns.state
+      |> State.clear_query()
+
+    {
+      :noreply,
+      socket |> assign(:state, state)
+    }
+  end
+
+  def handle_event("add-query", _, socket) do
+    state =
+      socket.assigns.state
+      |> State.add_new_query()
 
     {
       :noreply,
