drame update

dune-project

@@ -21,5 +21,9 @@
  (tags
   (www TODO TODO TODO TODO))
  (depends
+   leaflet ; TODO pin me
+   lambdasoup
+   omd
+   drame
   (ocaml
-   (>= 4.08))))
+   (>= 5.0))))

src/home.ml

@@ -1,5 +1,5 @@
 open Drame
-open Html
+open Tyxml.Html
 open Lang
 
 let controller request =

src/lang.ml

@@ -24,12 +24,12 @@ let of_request request =
   let lang = Option.bind lang of_string in
   Option.value lang ~default
 
-let txt_anylang = Html.txt
+let txt_anylang = Tyxml.Html.txt
 
 let choose request ~en ~fr =
   match of_request request with English -> en | French -> fr
 
-let txt request ~en ~fr = Html.txt (choose request ~en ~fr)
+let txt request ~en ~fr = Tyxml.Html.txt (choose request ~en ~fr)
 
 let img request ~a ~src ~en ~fr =
   let alt = choose request ~en ~fr in

src/phd.ml

@@ -1,5 +1,6 @@
+(* 🥳🎉 *)
 open Drame
-open Html
+open Tyxml.Html
 open Lang
 
 let controller request =

src/places.ml

@@ -1,5 +1,5 @@
 open Drame
-open Html
+open Tyxml.Html
 open Lang
 
 let controller request =

src/template.ml

@@ -1,6 +1,6 @@
 open Drame
 open Tyxml
-open Html
+open Tyxml.Html
 open Lang
 
 type menu =
@@ -142,4 +142,5 @@ let html ?(styles = []) ?(scripts = []) (request : Request.t) ~title ~body =
   let body = Html.body [ header; main ] in
   let lang = Lang.to_string (Lang.of_request request) in
   let a = [ a_lang lang ] in
-  html ~a head body
+  let doc = html ~a head body in
+  Html_doc.of_tyxml doc

src/www.ml

@@ -13,7 +13,7 @@ end
 module Server = Server.Make (App_id)
 
 let not_found =
-  let open Html in
+  let open Tyxml.Html in
   let title = txt "404 Not Found" in
   let body = [ txt "Ooops :S" ] in
   fun request ->
@@ -38,7 +38,7 @@ let md_page name request =
     with Failure _e -> "zapashcanon"
   in
   let title = txt_anylang title in
-  let body = [ Html.Unsafe.data body ] in
+  let body = [ Tyxml.Html.Unsafe.data body ] in
   let doc = Template.html ~scripts ~styles ~title ~body request in
   Content.Html doc
 

www.opam

@@ -8,7 +8,11 @@ license: "ISC"
 tags: ["www" "TODO" "TODO" "TODO" "TODO"]
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.08"}
+  "leaflet"
+  "lambdasoup"
+  "omd"
+  "drame"
+  "ocaml" {>= "5.0"}
   "odoc" {with-doc}
 ]
 build: [