update example with static; htmx now uses function to load code easily

filipecabaco · Nov 16, 2023 · c4e8449 · c4e8449
1 parent c317a83
commit c4e8449
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 29 deletions.
diff --git a/example/lib/example.ex b/example/lib/example.ex
@@ -2,34 +2,19 @@ defmodule Example do
   use Francis
   import FrancisHtmx
 
-  htmx("""
-  <style>
-  .smooth { transition: all 1s ease-in; font-size: 8rem;}
-  </style>
-  <div
-    id="color-demo"
-    class="smooth"
-    style="color:red"
-    hx-get="/colors"
-    hx-swap="outerHTML"
-    hx-trigger="every 1s">
-    Color Swap Demo
-  </div>
-  """)
+  htmx(fn _conn -> File.read!("static/root.html") end)
 
   get("/colors", fn _ ->
-    new_color = 3 |> :crypto.strong_rand_bytes() |> Base.encode16() |> then(&"##{&1}")
+    new_color =
+      3
+      |> :crypto.strong_rand_bytes()
+      |> Base.encode16()
+      |> then(&"##{&1}")
+
     """
-    <div
-      id="color-demo"
-      class="smooth"
-      style="color:#{new_color}"
-      hx-get="/colors"
-      hx-swap="outerHTML"
-      hx-trigger="every 1s">
+    <p id="color-demo" class="smooth" style="color:#{new_color}">
       Color Swap Demo
-    </div>
+    </p>
     """
   end)
-
 end
diff --git a/example/mix.exs b/example/mix.exs
@@ -22,7 +22,7 @@ defmodule Example.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:francis_htmx, "~> 0.0.1"}
+      {:francis_htmx, path: "../"}
     ]
   end
 end
diff --git a/example/static/root.html b/example/static/root.html
@@ -0,0 +1,10 @@
+<style>
+  .smooth {
+    transition: all 1s ease-in;
+    font-size: 8rem;
+  }
+</style>
+<div hx-get="/colors" hx-trigger="every 1s">
+  <p id="color-demo" class="smooth">Color Swap Demo</p>
+  <p></p>
+</div>
diff --git a/lib/francis_htmx.ex b/lib/francis_htmx.ex
@@ -4,14 +4,13 @@ defmodule FrancisHtmx do
       unmatched(fn _ -> "not found" end)
     end
   end
-
-  defmacro htmx(content, opts \\ []) do
+  defmacro htmx(content, opts\\[]) do
     quote location: :keep do
-      get("/", fn _conn -> unquote(root(content, opts)) end)
+      get("/", fn conn -> root(unquote(content).(conn), unquote(opts)) end)
     end
   end
 
-  defp root(content, opts) do
+  def root(content, opts) when is_binary(content) do
     title = Keyword.get(opts, :title, "")
 
     """

diff --git a/lib/root.html b/lib/root.html