mix format

lib/chiya/channels.ex

@@ -9,9 +9,13 @@ defmodule Chiya.Channels do
   alias Chiya.Notes.Note
 
   @preloads [:notes]
-  @public_preloads [notes: (from n in Note, 
+  @public_preloads [
-    where: not is_nil(n.published_at),
+    notes:
-    order_by: [desc: n.published_at])]
+      from(n in Note,
+        where: not is_nil(n.published_at),
+        order_by: [desc: n.published_at]
+      )
+  ]
 
   @doc """
   Returns the list of channels.
@@ -56,7 +60,7 @@ defmodule Chiya.Channels do
   Gets a single channel by its slug with all associated entities preloaded.
   """
   def get_channel_by_slug!(slug), do: Repo.get_by!(Channel, slug: slug)
-  
+
   @doc """
   Creates a channel.
 

lib/chiya/channels/channel.ex

@@ -12,7 +12,7 @@ defmodule Chiya.Channels.Channel do
     many_to_many :notes, Chiya.Notes.Note,
       join_through: "channels_notes",
       join_keys: [channel: :id, note: :id]
-    
+
     timestamps()
   end
 

lib/chiya/notes.ex

@@ -21,7 +21,7 @@ defmodule Chiya.Notes do
   """
   def list_notes do
     Note
-    |> order_by([n], [desc: n.updated_at, desc: n.published_at])
+    |> order_by([n], desc: n.updated_at, desc: n.published_at)
     |> Repo.all()
     |> Repo.preload(@preloads)
   end
@@ -67,9 +67,8 @@ defmodule Chiya.Notes do
 
   """
   def get_note_preloaded!(id), do: Repo.get!(Note, id) |> preload_note()
-  
-  def get_note_by_slug_preloaded!(slug), do: Repo.get_by!(Note, slug: slug) |> preload_note()
 
+  def get_note_by_slug_preloaded!(slug), do: Repo.get_by!(Note, slug: slug) |> preload_note()
 
   @doc """
   Creates a note.

lib/chiya_web.ex

@@ -17,7 +17,8 @@ defmodule ChiyaWeb do
   those modules here.
   """
 
-  def static_paths, do: ~w(assets fonts images favicon favicon.ico robots.txt browserconfig.xml site.webmanifest)
+  def static_paths,
+    do: ~w(assets fonts images favicon favicon.ico robots.txt browserconfig.xml site.webmanifest)
 
   def router do
     quote do

lib/chiya_web/components/admin_components.ex

@@ -139,4 +139,4 @@ defmodule ChiyaWeb.AdminComponents do
   defp upload_error_to_string(:too_large), do: "Too large"
   defp upload_error_to_string(:too_many_files), do: "You have selected too many files"
   defp upload_error_to_string(:not_accepted), do: "You have selected an unacceptable file type"
-end
+end

lib/chiya_web/components/core_components.ex

@@ -9,6 +9,7 @@ defmodule ChiyaWeb.CoreComponents do
   Icons are provided by [heroicons](https://heroicons.com). See `icon/1` for usage.
   """
   use Phoenix.Component
+
   use Phoenix.VerifiedRoutes,
     endpoint: ChiyaWeb.Endpoint,
     router: ChiyaWeb.Router,
@@ -19,23 +20,13 @@ defmodule ChiyaWeb.CoreComponents do
 
   def favicon(assigns) do
     ~H"""
-    <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png" />
-    <link rel="manifest" href="/favicon/site.webmanifest">
+    <link rel="manifest" href="/favicon/site.webmanifest" />
-    <link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#5bbad5">
+    <link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#5bbad5" />
-    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="msapplication-TileColor" content="#da532c" />
-    <meta name="theme-color" content="#ffffff">
+    <meta name="theme-color" content="#ffffff" />
-    """
-  end
-  
-  
-  @doc """
-  Renders a horizontal line
-  """
-  def line(assigns) do
-    ~H"""
-    <hr class="my-6 dark:border-gray-700" />
     """
   end
 
@@ -176,8 +167,10 @@ defmodule ChiyaWeb.CoreComponents do
       role="alert"
       class={[
         "fixed hidden top-2 right-2 w-80 sm:w-96 z-50 rounded-lg p-3 shadow-md shadow-gray-900/5 ring-1",
-        @kind == :info && "bg-emerald-50 text-emerald-800 ring-emerald-500 fill-cyan-900 dark:bg-emerald-900 dark:text-emerald-200 hover:opacity-40",
+        @kind == :info &&
-        @kind == :error && "bg-rose-50 p-3 text-rose-900 shadow-md ring-rose-500 fill-rose-900 dark:bg-rose-900 dark:text-rose-200 hover:opacity-40"
+          "bg-emerald-50 text-emerald-800 ring-emerald-500 fill-cyan-900 dark:bg-emerald-900 dark:text-emerald-200 hover:opacity-40",
+        @kind == :error &&
+          "bg-rose-50 p-3 text-rose-900 shadow-md ring-rose-500 fill-rose-900 dark:bg-rose-900 dark:text-rose-200 hover:opacity-40"
       ]}
       {@rest}
     >
@@ -526,7 +519,11 @@ defmodule ChiyaWeb.CoreComponents do
           phx-update={match?(%Phoenix.LiveView.LiveStream{}, @rows) && "stream"}
           class="relative divide-y divide-gray-100 border-t border-gray-200 text-sm leading-6 text-gray-700 dark:text-gray-200 dark:border-gray-700 dark:divide-gray-800"
         >
-          <tr :for={row <- @rows} id={@row_id && @row_id.(row)} class="group hover:bg-gray-50 dark:hover:bg-gray-800">
+          <tr
+            :for={row <- @rows}
+            id={@row_id && @row_id.(row)}
+            class="group hover:bg-gray-50 dark:hover:bg-gray-800"
+          >
             <td
               :for={{col, i} <- Enum.with_index(@col)}
               phx-click={@row_click && @row_click.(row)}
@@ -576,7 +573,9 @@ defmodule ChiyaWeb.CoreComponents do
     <div class="mt-14">
       <dl class="-my-4 divide-y divide-gray-100 dark:divide-gray-800">
         <div :for={item <- @item} class="flex gap-4 py-4 sm:gap-8">
-          <dt class="w-1/4 flex-none text-[0.8125rem] leading-6 text-gray-500 dark:text-gray-300"><%= item.title %></dt>
+          <dt class="w-1/4 flex-none text-[0.8125rem] leading-6 text-gray-500 dark:text-gray-300">
+            <%= item.title %>
+          </dt>
           <dd class="text-sm leading-6 text-gray-700 dark:text-gray-400"><%= render_slot(item) %></dd>
         </div>
       </dl>

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

@@ -2,12 +2,12 @@
   <div class="flex items-center justify-end border-b border-theme-dim/50 py-3">
     <div class="flex items-center gap-4">
       <%= for channel <- @channels do %>
-      <.link
+        <.link
-        href={~p"/#{channel.slug}"}
+          href={~p"/#{channel.slug}"}
-        class="text-xs font-semibold leading-6 text-theme-base hover:text-theme-base/75"
+          class="text-xs font-semibold leading-6 text-theme-base hover:text-theme-base/75"
-      >
+        >
-        <%= channel.name %>
+          <%= channel.name %>
-      </.link>
+        </.link>
       <% end %>
     </div>
   </div>

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

@@ -7,7 +7,7 @@
     <.live_title suffix={" · #{@settings.title}"}>
       <%= assigns[:page_title] || "Admin" %>
     </.live_title>
-    
+
     <.favicon />
 
     <link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />

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

@@ -7,7 +7,7 @@
     <.live_title suffix={" · #{@settings.title}"}>
       <%= assigns[:page_title] || "Home" %>
     </.live_title>
-    
+
     <.favicon />
 
     <link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />
@@ -20,12 +20,14 @@
         delete document.documentElement.dataset["mode"]
       }
     </script>
-    <style><%= @settings.custom_css %></style>
+    <style>
+      <%= @settings.custom_css %>
+    </style>
   </head>
   <body class="bg-theme-background antialiased">
     <.admin_bar current_user={@current_user} />
     <%= @inner_content %>
 
-    <%= raw @settings.custom_html %>
+    <%= raw(@settings.custom_html) %>
   </body>
-</html>
+</html>

lib/chiya_web/controllers/api_controller.ex

@@ -1,8 +1,8 @@
 defmodule ChiyaWeb.ApiController do
-	use ChiyaWeb, :controller
+  use ChiyaWeb, :controller
 
   def notes(conn, _params) do
     notes = Chiya.Notes.list_notes()
     json(conn, %{notes: notes})
   end
-end
+end

lib/chiya_web/controllers/identity_html/index.html.heex

@@ -8,7 +8,7 @@
 </.header>
 
 <.table id="identities" rows={@identities} row_click={&JS.navigate(~p"/admin/identities/#{&1}")}>
-  <:col :let={identity} label="Icon"><%= raw identity.icon %></:col>
+  <:col :let={identity} label="Icon"><%= raw(identity.icon) %></:col>
   <:col :let={identity} label="Name"><%= identity.name %></:col>
   <:col :let={identity} label="Rel"><%= identity.rel %></:col>
   <:col :let={identity} label="Url"><%= identity.url %></:col>

lib/chiya_web/controllers/page_controller.ex

@@ -4,12 +4,17 @@ defmodule ChiyaWeb.PageController do
   def home(conn, _params) do
     settings = conn.assigns.settings
 
-    channel = case settings.home_channel_id do
+    channel =
-      nil -> nil
+      case settings.home_channel_id do
-      id -> Chiya.Channels.get_channel!(id) |> Chiya.Channels.preload_channel_public()
+        nil -> nil
-    end
+        id -> Chiya.Channels.get_channel!(id) |> Chiya.Channels.preload_channel_public()
+      end
 
-    render(conn, :home, layout: {ChiyaWeb.Layouts, "public.html"}, channel: channel, page_title: "Home")
+    render(conn, :home,
+      layout: {ChiyaWeb.Layouts, "public.html"},
+      channel: channel,
+      page_title: "Home"
+    )
   end
 
   def channel(conn, %{"slug" => channel_slug}) do
@@ -17,7 +22,11 @@ defmodule ChiyaWeb.PageController do
       Chiya.Channels.get_channel_by_slug!(channel_slug)
       |> Chiya.Channels.preload_channel_public()
 
-    render(conn, :channel, layout: {ChiyaWeb.Layouts, "public.html"}, channel: channel, page_title: channel.name)
+    render(conn, :channel,
+      layout: {ChiyaWeb.Layouts, "public.html"},
+      channel: channel,
+      page_title: channel.name
+    )
   end
 
   def note(conn, %{"slug" => note_slug}) do
@@ -25,8 +34,12 @@ defmodule ChiyaWeb.PageController do
 
     if is_nil(note.published_at) do
       render_error(conn, :not_found)
-    else 
+    else
-      render(conn, :note, layout: {ChiyaWeb.Layouts, "public.html"}, note: note, page_title: note.name)
+      render(conn, :note,
+        layout: {ChiyaWeb.Layouts, "public.html"},
+        note: note,
+        page_title: note.name
+      )
     end
   end
 end

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

@@ -9,11 +9,14 @@
 
     <div class="w-full mt-6 sm:w-auto flex flex-col gap-1.5">
       <%= for note <- @channel.notes do %>
-        <a href={~p"/n/#{note.slug}"} class="rounded -mx-2 -my-0.5 px-2 py-0.5 hover:bg-theme-primary/10 transition">
+        <a
+          href={~p"/n/#{note.slug}"}
+          class="rounded -mx-2 -my-0.5 px-2 py-0.5 hover:bg-theme-primary/10 transition"
+        >
           <span class="text-theme-heading text-lg font-semibold leading-8"><%= note.name %></span>
           <span class="text-theme-base text-sm"><%= pretty_date(note.published_at) %></span>
         </a>
       <% end %>
     </div>
-  </div> 
+  </div>
 </div>

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

@@ -16,7 +16,7 @@
               href={identity.url}
               class="group -mx-2 -my-0.5 inline-flex items-center gap-3 rounded-lg px-2 py-0.5 hover:bg-theme-primary/10 transition"
             >
-              <%= raw identity.icon %>
+              <%= raw(identity.icon) %>
               <%= identity.name %>
             </a>
           </div>
@@ -26,8 +26,13 @@
     <%= if @channel do %>
       <div class="w-full mt-6 sm:w-auto flex flex-col gap-1.5">
         <%= for note <- @channel.notes do %>
-          <a href={~p"/n/#{note.slug}"} class="rounded -mx-2 -my-0.5 px-2 py-0.5 hover:bg-theme-primary/10 transition">
+          <a
-            <span class="text-theme-heading text-lg font-semibold leading-8"><%= note.name %></span>
+            href={~p"/n/#{note.slug}"}
+            class="rounded -mx-2 -my-0.5 px-2 py-0.5 hover:bg-theme-primary/10 transition"
+          >
+            <span class="text-theme-heading text-lg font-semibold leading-8">
+              <%= note.name %>
+            </span>
             <span class="text-theme-base text-sm"><%= pretty_date(note.published_at) %></span>
           </a>
         <% end %>

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

@@ -1,35 +1,37 @@
-<header>
+<div class="px-4 py-10 sm:py-28 sm:px-6 lg:px-8 xl:py-32 xl:px-28">
-  <h1 class="text-3xl font-semibold leading-8 text-theme-heading font-serif underline underline-offset-2 decoration-theme-primary">
+  <div class="mx-auto max-w-xl lg:mx-0">
-    <%= @note.name %>
+    <header>
-  </h1>
+      <h1 class="text-3xl font-semibold leading-8 text-theme-heading font-serif underline underline-offset-2 decoration-theme-primary">
-  <p class="mt-2 text-sm leading-6 text-theme-base font-semibold">
+        <%= @note.name %>
-    <%= pretty_date(@note.published_at) %>
+      </h1>
-  </p>
+      <p class="mt-2 text-sm leading-6 text-theme-base font-semibold">
-</header>
+        <%= pretty_date(@note.published_at) %>
+      </p>
+    </header>
 
+    <section class="prose mt-8">
+      <%= Markdown.render(@note.content) |> raw %>
+    </section>
 
-<section class="prose mt-8">
+    <%= if !Enum.empty?(@note.images) do %>
-	<%= Markdown.render(@note.content) |> raw %>
+      <.line />
-</section>
 
-<%= if !Enum.empty?(@note.images) do %>
+      <div class="flex flex-wrap gap-3" id="images">
-	<.line />
+        <%= for image <- @note.images do %>
-	
+          <article>
-  <div class="flex flex-wrap gap-3" id="images">
+            <a href={"#image-#{image.id}"}>
-    <%= for image <- @note.images do %>
+              <img
-      <article>
+                class="rounded-lg w-28 border"
-        <a href={"#image-#{image.id}"}>
+                src={ChiyaWeb.Uploaders.NoteImage.url({image.path, image}, :thumb_dithered)}
-          <img
+              />
-            class="rounded-lg w-28 border"
+            </a>
-            src={ChiyaWeb.Uploaders.NoteImage.url({image.path, image}, :thumb_dithered)}
+            <a href="#images" class="lightbox" id={"image-#{image.id}"}>
-          />
+              <span style={"background-image: url('#{ChiyaWeb.Uploaders.NoteImage.url({image.path, image}, :full_dithered)}')"}>
-        </a>
+              </span>
-        <a href="#images" class="lightbox" id={"image-#{image.id}"}>
+            </a>
-          <span style={"background-image: url('#{ChiyaWeb.Uploaders.NoteImage.url({image.path, image}, :full_dithered)}')"}>
+          </article>
-          </span>
+        <% end %>
-        </a>
+      </div>
-      </article>
     <% end %>
   </div>
-<% end %>
+</div>
-

lib/chiya_web/error.ex

@@ -1,11 +1,11 @@
 defmodule ChiyaWeb.Error do
-	import Plug.Conn, only: [put_status: 2]
+  import Plug.Conn, only: [put_status: 2]
-	import Phoenix.Controller, only: [put_view: 2, render: 3]
+  import Phoenix.Controller, only: [put_view: 2, render: 3]
 
-	def render_error(conn, :not_found, assigns \\ []) do
+  def render_error(conn, :not_found, assigns \\ []) do
-		conn
+    conn
-		|> put_status(:not_found)
+    |> put_status(:not_found)
-		|> put_view(ChiyaWeb.ErrorHTML)
+    |> put_view(ChiyaWeb.ErrorHTML)
-		|> render("404.html", assigns)
+    |> render("404.html", assigns)
-	end
+  end
-end
+end

lib/chiya_web/format.ex

@@ -30,5 +30,6 @@ defmodule ChiyaWeb.Format do
   def pretty_date(%NaiveDateTime{} = date) do
     Calendar.strftime(date, "%d.%m.%Y")
   end
+
   def pretty_date(_), do: ""
 end

lib/chiya_web/markdown.ex

@@ -1,14 +1,12 @@
 defmodule ChiyaWeb.Markdown do
+  @options [
+    footnotes: true,
+    breaks: true,
+    escape: true
+  ]
 
-	@options [
+  def render(markdown) do
-		footnotes: true,
+    markdown
-		breaks: true,
+    |> Earmark.as_html!(@options)
-		escape: true
+  end
-	]
-
-	def render(markdown) do
-		markdown
-		|> Earmark.as_html!(@options)
-	end
-
 end

mix.exs

@@ -71,7 +71,11 @@ defmodule Chiya.MixProject do
       test: ["ecto.create --quiet", "ecto.migrate --quiet", "test"],
       "assets.setup": ["tailwind.install --if-missing", "cmd --cd assets npm install"],
       "assets.build": ["tailwind default", "cmd --cd assets node build.js"],
-      "assets.deploy": ["tailwind default --minify", "cmd --cd assets node build.js --deploy", "phx.digest"]
+      "assets.deploy": [
+        "tailwind default --minify",
+        "cmd --cd assets node build.js --deploy",
+        "phx.digest"
+      ]
     ]
   end
 end

priv/repo/migrations/20230308191004_create_note_images.exs

@@ -12,4 +12,4 @@ defmodule Chiya.Repo.Migrations.CreateNoteImages do
 
     create index(:note_images, [:note_id])
   end
-end
+end

test/chiya/identities_test.exs

@@ -26,7 +26,7 @@ defmodule Chiya.IdentitiesTest do
         name: "some name",
         public: true,
         rel: "some rel",
-        url: "some url", 
+        url: "some url",
         icon: "some icon"
       }
 

test/chiya_web/controllers/identity_controller_test.exs

@@ -3,7 +3,14 @@ defmodule ChiyaWeb.IdentityControllerTest do
 
   import Chiya.IdentitiesFixtures
 
-  @create_attrs %{active: true, name: "some name", public: true, rel: "some rel", url: "some url", icon: "some icon"}
+  @create_attrs %{
+    active: true,
+    name: "some name",
+    public: true,
+    rel: "some rel",
+    url: "some url",
+    icon: "some icon"
+  }
   @update_attrs %{
     active: false,
     name: "some updated name",