ivan/site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use templates for posts

Browse Source
This commit is contained in:
Rawley Fowler
2022-10-12 15:24:11 -06:00
parent ca63b3f967
commit 610da9079e
8 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -7,5 +7,4 @@ esy.lock/
*~ *~
posts/*.blog posts/*.blog
posts/*.post posts/*.post
#* \#*

2
rawleydotxyz.ml
View File

@@ -21,7 +21,7 @@ let () =
Dream.get "/blog" Render.render_blog_index; Dream.get "/blog" Render.render_blog_index;
Dream.scope "/blog" [] [ Dream.scope "/blog" [] [
Dream.get "/rss.xml" Render.render_rss_feed; Dream.get "/rss.xml" Render.render_rss_feed;
Dream.get "/:post" Render.render_blog_post Dream.get "/:post" (fun request -> Render.render_blog_post ~slug:(Dream.param request "post"))
]; ];
Dream.get "/**" (fun _ -> Render.handle_not_found ()) Dream.get "/**" (fun _ -> Render.handle_not_found ())
] ]

0
render/blog_index.eml.ml Normal file
View File

8
render/dune
View File

@@ -1,10 +1,12 @@
(library (library
(name render) (name render)
(public_name rawleydotxyz.render) (public_name rawleydotxyz.render)
(libraries dream lwt database)) (libraries dream lwt database)
(preprocess
(pps lwt_ppx)))
(rule (rule
(targets index.ml layout.ml) (targets index.ml layout.ml post_layout.ml blog_index.ml)
(deps index.eml.ml layout.eml.ml) (deps index.eml.ml layout.eml.ml post_layout.eml.ml blog_index.eml.ml)
(action (action
(run dream_eml %{deps} --workspace %{workspace_root}))) (run dream_eml %{deps} --workspace %{workspace_root})))

48
render/post_layout.eml.ml Normal file
View File

@@ -0,0 +1,48 @@
let render ~title ~tags ~body =
let combine_tags lst =
List.fold_left (fun t a -> t ^ " " ^ a) "" lst
in
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="<%s combine_tags tags %>">
<title><%s title %></title>
<link href="/static/index.css" rel="stylesheet">
</head>
<body>
<header>
<h1>
<a href="/">/home/rawley.xyz</a>
</h1>
<nav>
<li>
<a href="/blog">blog</a>
</li>
<li>
<a href="/resume">resume</a>
</li>
<li>
<a href="/philosophy">philosophy</a>
</li>
<li>
<a href="/web-ring">web ring</a>
</li>
</nav>
</header>
<main>
<h2><%s title %></h2>
<%s! body %>
</main>
<footer>
<hr>
<p>
Copyright &copy; Rawley Fowler 2022
</p>
<p>
<b>Disclaimer</b>: All opinions on this site, are that of my own. They do not reflect the opinions of
any of my employers; past, present, or future.
</p>
</footer>
</body>
</html>

26
render/render.ml
View File

@@ -105,20 +105,6 @@ let handle_error e =
let handle_not_found () = let handle_not_found () =
Dream.html ?code:(Some 404) not_found_template Dream.html ?code:(Some 404) not_found_template
let render_blog_post request =
let slug = Dream.param request "post" in
let post_t = Database.get_blog_post_by_slug slug in
post_t >>= fun post ->
match post with
| Error e -> handle_error e
| Ok p_opt ->
match p_opt with
| None -> handle_not_found ()
| Some p ->
Printf.sprintf "<h2>%s</h2>\r\n%s" p.title p.content
|> render_page
|> Dream.html
let render_blog_index (_ : Dream.request) = let render_blog_index (_ : Dream.request) =
let buff = Buffer.create 512 in let buff = Buffer.create 512 in
let () = Buffer.add_string buff "<h3>Blog</h3> I have an <a href=\"/blog/rss.xml\">rss feed</a> too." in let () = Buffer.add_string buff "<h3>Blog</h3> I have an <a href=\"/blog/rss.xml\">rss feed</a> too." in
@@ -168,5 +154,17 @@ let render_rss_feed (_ : Dream.request) =
let render_simple (module R : SimpleRender) = let render_simple (module R : SimpleRender) =
R.render () |> Layout.render |> Dream.html R.render () |> Layout.render |> Dream.html
let render_blog_post ~slug =
let%lwt post = Database.get_blog_post_by_slug slug in
match post with
| Ok p_opt ->
begin match p_opt with
| None -> handle_not_found ()
| Some p ->
Dream.html @@ Post_layout.render ~title:p.title ~body:p.content ~tags:[p.title]
end
| Error e -> handle_error e
let render_index () = let render_index () =
render_simple (module Index) render_simple (module Index)

18
render/render.mli
View File

@@ -1,18 +0,0 @@
module BlogPost = Database.BlogPost
module type SimpleRender = sig val render : unit -> string end
val header_template : string
val footer_template : string
val replace_sequence : string -> string -> string -> string
val html_unescape : string -> string
val not_found_template : string
val error_template : string
val render_page : string -> string
val generate_link : BlogPost.t -> string
val generate_rss_item : BlogPost.t -> string
val handle_error : [< Caqti_error.t ] -> Dream.response Lwt.t
val handle_not_found : unit -> Dream.response Lwt.t
val render_blog_post : Dream.request -> Dream.response Lwt.t
val render_blog_index : Dream.request -> Dream.response Lwt.t
val render_rss_feed : Dream.request -> Dream.response Lwt.t
val render_simple : (module SimpleRender) -> Dream.response Lwt.t
val render_index : unit -> Dream.response Lwt.t