Well shit, fix some merge nonsense.

This commit is contained in:
Jessica Canady 2024-07-30 11:51:18 -04:00
parent fc1b264f1b
commit 6772cd4c6b
Signed by: phoenix
SSH key fingerprint: SHA256:aaLOzOrLi+0n4eDZNQKH97PehwRt6KSE5fYJc+ZRKCQ

View file

@ -1,18 +1,16 @@
defmodule JOL.Blog do defmodule JOL.Blog do
<<<<<<< HEAD
alias JOL.Blog.Post alias JOL.Blog.Post
alias JOL.Blog.Parser alias JOL.Blog.Parser
=======
defmodule NotFoundError do defmodule NotFoundError do
defexception [:message, plug_status: 404] defexception [:message, plug_status: 404]
end end
>>>>>>> 77c7828 (Add controllers/templates to show blog posts.)
use NimblePublisher, use NimblePublisher,
build: JOL.Blog.Post, build: JOL.Blog.Post,
from: Application.app_dir(:jol, "priv/posts/**/*.md"), from: Application.app_dir(:jol, "priv/posts/**/*.md"),
parser: Parser, parser: Parser,
as: :posts, as: :posts
@posts Enum.sort_by(@posts, & &1.date, {:desc, Date}) @posts Enum.sort_by(@posts, & &1.date, {:desc, Date})
@tags @posts |> Enum.flat_map(& &1.tags) |> Enum.uniq() |> Enum.sort() @tags @posts |> Enum.flat_map(& &1.tags) |> Enum.uniq() |> Enum.sort()