From 6c671132270e830a34b7c6b5222e9251ddb72558 Mon Sep 17 00:00:00 2001 From: Raymonzut <40148684+Raymonzut@users.noreply.github.com> Date: Thu, 1 Oct 2020 20:07:31 +0200 Subject: [PATCH] Rewrite post related pages to be generated --- client/nginx.conf | 4 ++ client/public/.gitignore | 2 + client/public/assets/styling/general.css | 6 ++- client/public/gen/.gitkeep | 0 client/public/gen_posts.ex | 49 +++++++++++++++++++ client/public/posts/.gitkeep | 0 .../{posts.html => templates/index.html} | 13 +++-- client/public/templates/post.html | 36 ++++++++++++++ 8 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 client/public/.gitignore create mode 100644 client/public/gen/.gitkeep create mode 100644 client/public/gen_posts.ex create mode 100644 client/public/posts/.gitkeep rename client/public/{posts.html => templates/index.html} (75%) create mode 100644 client/public/templates/post.html diff --git a/client/nginx.conf b/client/nginx.conf index b626f1e..9bb0238 100644 --- a/client/nginx.conf +++ b/client/nginx.conf @@ -33,6 +33,10 @@ http { alias /app/lib; } + location /posts { + alias /app/gen/; + } + location /api { proxy_pass https://raymon.dev/api; proxy_buffering on; diff --git a/client/public/.gitignore b/client/public/.gitignore new file mode 100644 index 0000000..690991b --- /dev/null +++ b/client/public/.gitignore @@ -0,0 +1,2 @@ +posts/* +gen/* diff --git a/client/public/assets/styling/general.css b/client/public/assets/styling/general.css index c1376ef..6aef140 100644 --- a/client/public/assets/styling/general.css +++ b/client/public/assets/styling/general.css @@ -21,8 +21,12 @@ nav { font-style: italic; } +h1 { + font-size: 2.0em; +} + h2 { - font-size: 0.6em; + font-size: 1.25em; margin: auto 0; } diff --git a/client/public/gen/.gitkeep b/client/public/gen/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/client/public/gen_posts.ex b/client/public/gen_posts.ex new file mode 100644 index 0000000..03d3da6 --- /dev/null +++ b/client/public/gen_posts.ex @@ -0,0 +1,49 @@ +# Templates will be filled by posts +index_template = File.read!("./templates/index.html") +post_template = File.read!("./templates/post.html") + +post_contents = File.ls!("./posts") + |> Enum.reject(fn(x) -> String.starts_with?(x, ".") end) + |> Enum.map(fn f -> File.read!("./posts/" <> f) end) + |> Enum.map(fn c -> String.split(c, "\n") end) + |> Enum.map(fn c -> Enum.reject(c, fn(x) -> x == "" end) end) + |> Enum.map(fn c -> Enum.chunk_every(c, 2) end) + |> Enum.map(fn c -> + Enum.map(c, fn [k, v] -> %{String.to_atom(k) => v} end) + |> Enum.reduce(%{}, fn(x, acc) -> Map.merge(x, acc) end) + end) + +index_file = post_contents + |> Enum.sort_by(fn m -> Map.get(m, :date) end) + |> Enum.reverse() + # Group by month + |> Enum.group_by(fn m -> Map.get(m, :date) |> String.slice(0..6) end) + |> Enum.reverse() + |> Enum.map(fn {month, posts} -> "\n

" <> month <> "

\n" <> (posts |> + Enum.map(fn post -> "

" <> (Map.get(post, :date) |> String.slice(0..9)) <> + " - Map.get(post, :id) <> ".html\">" <> Map.get(post, :title) <> "

" + end) |> Enum.join("\n")) end) + |> (fn template -> Regex.replace(Regex.compile!("{{index}}"), index_template, fn _, __ -> template end) end).() + +File.open!("./gen/index.html", [:write]) + |> IO.binwrite(index_file) + |> File.close() + + +post_contents + |> Enum.each(fn post -> + File.open!("./gen/" <> Map.get(post, :id) <> ".html", [:write]) + |> IO.binwrite( + # Converting handlebars to values + Regex.compile!("{{(.*)}}") |> + Regex.replace(post_template, fn _, key -> if key != "content" do Map.get(post, String.to_atom(key)) else + Map.get(post, String.to_atom(key)) + # Converting \n to paragraphs + |> String.split("\\n") + |> Enum.reject(fn(x) -> x == "" end) + |> Enum.map(fn paragraph -> ("

" <> paragraph <> "

\n") end) + |> Enum.join("") + end + end)) + |> File.close() + end) diff --git a/client/public/posts/.gitkeep b/client/public/posts/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/client/public/posts.html b/client/public/templates/index.html similarity index 75% rename from client/public/posts.html rename to client/public/templates/index.html index 2944fd5..f8b29d8 100644 --- a/client/public/posts.html +++ b/client/public/templates/index.html @@ -14,19 +14,18 @@ media="all" > - -
+
- -

For those using a RSS reader, subscribe here: rss.xml

- -
-
+
+

Post listing

+
+ {{index}} + diff --git a/client/public/templates/post.html b/client/public/templates/post.html new file mode 100644 index 0000000..bb6dd51 --- /dev/null +++ b/client/public/templates/post.html @@ -0,0 +1,36 @@ + + + + + + + Raymon Zutekouw + + + + + +
+ + +
+
+

{{title}}

+

For those using a RSS reader, subscribe here: rss.xml

+
+ + {{content}} +
+
+ +