Update components (BeaconCMS#513)

ddink · Jun 6, 2024 · 5dff82f · 5dff82f
1 parent 7073e58
commit 5dff82f
Show file tree

Hide file tree

Showing 28 changed files with 790 additions and 856 deletions.
diff --git a/.credo.exs b/.credo.exs
@@ -125,7 +125,7 @@
           {Credo.Check.Refactor.MapJoin, []},
           {Credo.Check.Refactor.NegatedConditionsInUnless, []},
           {Credo.Check.Refactor.NegatedConditionsWithElse, []},
-          {Credo.Check.Refactor.Nesting, []},
+          {Credo.Check.Refactor.Nesting, [max_nesting: 3]},
           {Credo.Check.Refactor.UnlessWithElse, []},
           {Credo.Check.Refactor.WithClauses, []},
           {Credo.Check.Refactor.FilterFilter, []},

diff --git a/dev.exs b/dev.exs
@@ -152,7 +152,8 @@ dev_seeds = fn ->
     <li>
       <%= @val %>
     </li>
-    """
+    """,
+    example: "<.sample_component val={1} />"
   })
 
   Beacon.Content.create_snippet_helper!(%{
@@ -256,7 +257,7 @@ dev_seeds = fn ->
         </div>
 
         <div>
-          <BeaconWeb.Components.image_set asset={@img1} sources={["480w"]} width="200px" />
+          <%!--  <BeaconWeb.Components.image_set asset={@img1} sources={["480w"]} width="200px" /> --%>
         </div>
 
         <div>
@@ -433,7 +434,8 @@ dy_seeds = fn ->
       </div>
       </nav>
     </header>
-    """
+    """,
+    example: "<.header />"
   })
 
   Beacon.Content.create_component!(%{
@@ -717,7 +719,8 @@ dy_seeds = fn ->
         </div>
       </div>
     </footer>
-    """
+    """,
+    example: "<.footer />"
   })
 
   layout =

diff --git a/guides/your-first-site.md b/guides/your-first-site.md
@@ -188,7 +188,7 @@ Edit the template to replace with this content:
           </span>
         </div>
         <div class="flex items-center justify-center">
-          <BeaconWeb.Components.image
+          <.image
             name="image.webp"
             alt="My Page Image"
             width="600"
@@ -334,7 +334,7 @@ Now let's upload an image on the Media Library to finish our home page. Go to ht
 Once it's uploaded, note the image will be converted to a webp format for performance reasons, for example uploading a file logo.jpg it will be converted to logo.webp and we must use the new name on our template. Take note of the file name you just uploaded and edit the home page template, look for the image component `BeaconWeb.Components.image` in the template and update the name attribute:
 
 ```heex
-<BeaconWeb.Components.image
+<.image
   name="my_image.webp"
   ...
 ```

diff --git a/lib/beacon/beacon.ex b/lib/beacon/beacon.ex
@@ -122,8 +122,10 @@ defmodule Beacon do
   """
   @spec boot(Beacon.Types.Site.t()) :: :ok
   def boot(site) do
-    Beacon.Boot.do_init(Config.fetch!(site))
-    Beacon.Config.update_value(site, :skip_boot?, false)
+    site
+    |> Config.fetch!()
+    |> Beacon.Boot.do_init()
+
     :ok
   end
 

diff --git a/lib/beacon/boot.ex b/lib/beacon/boot.ex
@@ -25,7 +25,7 @@ defmodule Beacon.Boot do
   def do_init(config) do
     Logger.info("Beacon.Boot booting site #{config.site}")
 
-    task_supervisor = task_supervisor(config.site)
+    task_supervisor = Beacon.Registry.via({config.site, TaskSupervisor})
 
     # Layouts and pages depend on the components module so we need to load it first
     Beacon.Loader.populate_default_components(config.site)
@@ -57,13 +57,11 @@ defmodule Beacon.Boot do
     # TODO: revisit this timeout after we upgrade to Tailwind v4
     Task.await_many(assets, :timer.minutes(5))
 
+    Beacon.Config.update_value(config.site, :skip_boot?, false)
+
     # TODO: add telemetry to measure booting time
     Logger.info("Beacon.Boot finished booting site #{config.site}")
 
     :ignore
   end
-
-  defp task_supervisor(site) do
-    Beacon.Registry.via({site, TaskSupervisor})
-  end
 end