Merge pull request 'devel' (#307) from devel into main

Reviewed-on: #307

assets/css/app.css

@@ -47,8 +47,8 @@
       @apply flex md:flex-row lg:flex-col mb-6 lg:mb-0;
     }
 
-    & .menu {
-      @apply flex-1;
+    & ul.menu {
+      @apply m-0;
     }
   }
 

lib/chiya/notes/note.ex

@@ -102,6 +102,16 @@ defmodule Chiya.Notes.Note do
     end
   end
 
+  def note_excerpt(note_content) do
+    if String.contains?(note_content, "<!-- more -->") do
+      note_content
+      |> String.split("<!-- more -->")
+      |> List.first()
+    else
+      String.slice(note_content, 0..150) <> ".."
+    end
+  end
+
   @doc false
   def changeset(note, attrs) do
     # if you need to have a preloaded note here,

lib/chiya_web/components/layouts/root_public.html.heex

@@ -72,30 +72,24 @@
 
     <main id="site-content" class="container print:hidden">
       <aside id="primary-sidebar">
-        <nav class="prose">
-          <div class="menu">
-            <strong>Channels</strong>
+        <nav class="prose max-w-none">
+          <h3>Channels</h3>
+          <ul class="menu">
+            <%= for channel <- @channels do %>
+              <li>
+                <a href={~p"/channel/#{channel.slug}"}>
+                  <%= channel.name %>
+                </a>
+              </li>
+            <% end %>
+          </ul>
 
-            <ul>
-              <%= for channel <- @channels do %>
-                <li>
-                  <a href={~p"/channel/#{channel.slug}"}>
-                    <%= channel.name %>
-                  </a>
-                </li>
-              <% end %>
-            </ul>
-          </div>
-
-          <div class="menu">
-            <strong>Elsewhere</strong>
-
-            <ul>
-              <%= for identity <- @public_identities do %>
-                <li><a href={identity.url}><%= identity.name %></a></li>
-              <% end %>
-            </ul>
-          </div>
+          <h3>Elsewhere</h3>
+          <ul class="menu">
+            <%= for identity <- @public_identities do %>
+              <li><a href={identity.url}><%= identity.name %></a></li>
+            <% end %>
+          </ul>
         </nav>
       </aside>
 

lib/chiya_web/controllers/page_html.ex

@@ -1,6 +1,5 @@
 defmodule ChiyaWeb.PageHTML do
   use ChiyaWeb, :html_public
-  import Phoenix.HTML.Tag, only: [content_tag: 3, content_tag: 2]
   import ChiyaWeb.Format, only: [pretty_datetime: 1, pretty_date: 1, datetime: 1]
 
   embed_templates "page_html/*"
@@ -27,30 +26,11 @@ defmodule ChiyaWeb.PageHTML do
   def tag_list(assigns)
 
   def render_outline(note) do
-    note.content
-    |> ChiyaWeb.Outline.get()
-    |> Enum.map(&do_render_outline/1)
-    |> Enum.map(&safe_to_string/1)
+    ChiyaWeb.OutlineRenderer.render_outline(note.content)
   end
 
   def has_outline?(note) do
-    outline_empty =
-      note.content
-      |> ChiyaWeb.Outline.get()
-      |> Enum.empty?()
-
-    !outline_empty
-  end
-
-  def do_render_outline(%{text: text, children: children, level: _level}) do
-    slug = Slugger.slugify_downcase(text)
-
-    content_tag(:ul, [class: "m-0"],
-      do: [
-        content_tag(:li, do: content_tag(:a, text, href: "##{slug}")),
-        Enum.map(children, &do_render_outline/1)
-      ]
-    )
+    ChiyaWeb.OutlineRenderer.has_outline?(note.content)
   end
 
   def group_tags(notes) do

lib/chiya_web/controllers/page_html/note_list_default.html.heex

@@ -1,28 +1,30 @@
 <section class="note-list default stack">
   <%= for note <- assigns.notes do %>
-    <article>
-      <a href={~p"/note/#{note.slug}"} class="block">
-        <header class="flex flex-row items-center gap-1">
-          <span class="text-theme-primary text-lg font-semibold leading-8 flex-1">
+    <article class="prose max-w-none">
+      <header class="flex flex-row items-center gap-1">
+        <span class="text-theme-primary text-lg font-semibold leading-8 flex-1">
+          <a href={~p"/note/#{note.slug}"}>
             <%= note.name %>
-          </span>
-          <span class="text-theme-base/75 text-sm">
-            <%= pretty_date(note.published_at) %>
-          </span>
-        </header>
+          </a>
+        </span>
+      </header>
 
-        <%= if assigns.show_content do %>
-          <p class="text-theme-base">
-            <%= String.slice(note.content, 0..150) %>
-          </p>
-        <% end %>
+      <%= if assigns.show_content do %>
+        <p class="text-theme-base mb-3">
+          <%= Chiya.Notes.Note.note_excerpt(note.content) %>
+        </p>
+      <% end %>
 
+      <footer class="flex">
+        <span class="text-theme-base/75 flex-1">
+          <%= pretty_date(note.published_at) %>
+        </span>
         <%= if not Enum.empty?(note.tags) do %>
           <span class="inline-block">
             <.tag_list note={note} linked={false} />
           </span>
         <% end %>
-      </a>
+      </footer>
     </article>
   <% end %>
 </section>

lib/chiya_web/outline_renderer.ex

@@ -0,0 +1,38 @@
+defmodule ChiyaWeb.OutlineRenderer do
+  import Phoenix.HTML, only: [safe_to_string: 1]
+  import Phoenix.HTML.Tag, only: [content_tag: 3, content_tag: 2]
+
+  def render_outline(content) do
+    children =
+      content
+      |> ChiyaWeb.Outline.get()
+      |> Enum.map(&do_render_outline/1)
+
+    root = content_tag(:ul, do: children)
+
+    safe_to_string(root)
+  end
+
+  def has_outline?(content) do
+    outline_empty =
+      content
+      |> ChiyaWeb.Outline.get()
+      |> Enum.empty?()
+
+    !outline_empty
+  end
+
+  def do_render_outline(%{text: text, children: children, level: _level}) do
+    slug = Slugger.slugify_downcase(text)
+    list_item = content_tag(:li, do: content_tag(:a, text, href: "##{slug}"))
+
+    if Enum.empty?(children) do
+      [list_item]
+    else
+      [
+        list_item,
+        content_tag(:ul, do: Enum.map(children, &do_render_outline/1))
+      ]
+    end
+  end
+end