From e13348c8aef8a97553e505d93c5e86bac34f0c82 Mon Sep 17 00:00:00 2001
From: Rawley Fowler <rawleyfowler@gmail.com>
Date: Wed, 12 Oct 2022 17:04:26 -0600
Subject: [PATCH] move views to views folder

---
 .vscode/settings.json                |  5 +++++
 render/dune                          | 10 ++--------
 render/render.ml                     |  1 +
 render/render.mli                    | 18 ++++++++++++++++++
 static/index.css                     |  4 +---
 {render => views}/blog_index.eml.ml  |  0
 views/dune                           | 12 ++++++++++++
 {render => views}/index.eml.ml       |  0
 {render => views}/layout.eml.ml      |  0
 {render => views}/post_layout.eml.ml |  0
 10 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 render/render.mli
 rename {render => views}/blog_index.eml.ml (100%)
 create mode 100644 views/dune
 rename {render => views}/index.eml.ml (100%)
 rename {render => views}/layout.eml.ml (100%)
 rename {render => views}/post_layout.eml.ml (100%)

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..74ba5ee
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "ocaml.sandbox": {
+    "kind": "global"
+  }
+}
\ No newline at end of file
diff --git a/render/dune b/render/dune
index 3c7235c..5a8976c 100644
--- a/render/dune
+++ b/render/dune
@@ -1,12 +1,6 @@
 (library
 	(name render)
 	(public_name rawleydotxyz.render)
-	(libraries dream lwt database)
+	(libraries dream lwt database views)
 	(preprocess 
-		(pps lwt_ppx)))
-
-(rule
- (targets index.ml layout.ml post_layout.ml blog_index.ml)
- (deps index.eml.ml layout.eml.ml post_layout.eml.ml blog_index.eml.ml)
- (action
-  (run dream_eml %{deps} --workspace %{workspace_root})))
\ No newline at end of file
+		(pps lwt_ppx)))
\ No newline at end of file
diff --git a/render/render.ml b/render/render.ml
index ec76ae2..225b921 100644
--- a/render/render.ml
+++ b/render/render.ml
@@ -1,4 +1,5 @@
 open Lwt
+open Views
 
 module Blog_post = Database.Blog_post
 
diff --git a/render/render.mli b/render/render.mli
new file mode 100644
index 0000000..8468214
--- /dev/null
+++ b/render/render.mli
@@ -0,0 +1,18 @@
+module Blog_post = Database.Blog_post
+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 : Blog_post.t -> string
+val generate_rss_item : Blog_post.t -> string
+val handle_error : [< Caqti_error.t ] -> Dream.response Lwt.t
+val handle_not_found : unit -> Dream.response Lwt.t
+val render_blog_index : unit -> 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_blog_post : slug:string -> Dream.response Lwt.t
+val render_index : unit -> Dream.response Lwt.t
diff --git a/static/index.css b/static/index.css
index 6055445..d2e9cd8 100644
--- a/static/index.css
+++ b/static/index.css
@@ -4,9 +4,7 @@ body {
     color: black;
     margin: auto;
     padding: 2px;
-    font-family: 'Helvetica Neue',
-		 'Arial Nova',
-                 sans-serif;
+    font-family: 'Helvetica Neue', 'Arial Nova', sans-serif;
 }
 
 nav {
diff --git a/render/blog_index.eml.ml b/views/blog_index.eml.ml
similarity index 100%
rename from render/blog_index.eml.ml
rename to views/blog_index.eml.ml
diff --git a/views/dune b/views/dune
new file mode 100644
index 0000000..4087a29
--- /dev/null
+++ b/views/dune
@@ -0,0 +1,12 @@
+(library
+	(name views)
+	(public_name rawleydotxyz.views)
+	(libraries dream lwt database)
+	(preprocess 
+		(pps lwt_ppx)))
+
+(rule
+ (targets index.ml layout.ml post_layout.ml blog_index.ml)
+ (deps index.eml.ml layout.eml.ml post_layout.eml.ml blog_index.eml.ml)
+ (action
+  (run dream_eml %{deps} --workspace %{workspace_root})))
\ No newline at end of file
diff --git a/render/index.eml.ml b/views/index.eml.ml
similarity index 100%
rename from render/index.eml.ml
rename to views/index.eml.ml
diff --git a/render/layout.eml.ml b/views/layout.eml.ml
similarity index 100%
rename from render/layout.eml.ml
rename to views/layout.eml.ml
diff --git a/render/post_layout.eml.ml b/views/post_layout.eml.ml
similarity index 100%
rename from render/post_layout.eml.ml
rename to views/post_layout.eml.ml