diff options
Diffstat (limited to 'bs5/server')
| -rw-r--r-- | bs5/server/dune | 2 | ||||
| -rw-r--r-- | bs5/server/middleware/logs.ml | 14 | ||||
| -rw-r--r-- | bs5/server/pages/Hydrate.re | 2 | ||||
| -rw-r--r-- | bs5/server/pages/Index.re | 2 | ||||
| -rw-r--r-- | bs5/server/pages/RouterRSC.re | 27 | ||||
| -rw-r--r-- | bs5/server/pages/ServerOnlyRSC.re | 4 | ||||
| -rw-r--r-- | bs5/server/pages/SinglePageRSC.re | 2 | ||||
| -rw-r--r-- | bs5/server/server.ml | 9 |
8 files changed, 30 insertions, 32 deletions
diff --git a/bs5/server/dune b/bs5/server/dune index 19ff1eb..d0a8aca 100644 --- a/bs5/server/dune +++ b/bs5/server/dune @@ -1,8 +1,6 @@ ; (include_subdirs qualified) (executable - (enabled_if - (= %{profile} "dev")) (name server) (modules server) (libraries diff --git a/bs5/server/middleware/logs.ml b/bs5/server/middleware/logs.ml index 6925ca4..ea69f89 100644 --- a/bs5/server/middleware/logs.ml +++ b/bs5/server/middleware/logs.ml @@ -1,12 +1,14 @@ let detailed_logger inner_handler request = let method_str = Dream.method_to_string (Dream.method_ request) in let path = Dream.target request in - let user_agent = Dream.header request "User-Agent" |> Option.value ~default:"unknown" in - let client_ip = Dream.client request in - let%lwt () = - Lwt_io.printf "%s %s %s - %s - %s\n" (Ptime_clock.now () |> Ptime.to_rfc3339) method_str path client_ip user_agent - in + (* let user_agent = *) + (* Dream.header request "User-Agent" |> Option.value ~default:"unknown" *) + (* in *) + (* let client_ip = Dream.client request in *) + (* let%lwt () = *) + (* Lwt_io.printf "%s %s %s - %s - %s\n" (Ptime_clock.now () |> Ptime.to_rfc3339) method_str path client_ip user_agent *) + (* in *) let%lwt response = inner_handler request in let status = Dream.status response |> Dream.status_to_int in - let%lwt () = Lwt_io.printf " -> %d\n" status in + let%lwt () = Lwt_io.printf "%s -%s -> %d\n" method_str path status in Lwt.return response diff --git a/bs5/server/pages/Hydrate.re b/bs5/server/pages/Hydrate.re index f887e34..e7cf1dc 100644 --- a/bs5/server/pages/Hydrate.re +++ b/bs5/server/pages/Hydrate.re @@ -1,3 +1,3 @@ -let doc = <Document script="/static/demo/Hydrate.re.js"> <App /> </Document>; +let doc = <Document script="/static/Hydrate.re.js"> <App /> </Document>; let toString = ReactDOM.renderToString(doc); let toStatic = ReactDOM.renderToStaticMarkup(doc); diff --git a/bs5/server/pages/Index.re b/bs5/server/pages/Index.re index 685069a..f6f2f56 100644 --- a/bs5/server/pages/Index.re +++ b/bs5/server/pages/Index.re @@ -226,7 +226,7 @@ module App = { let handler = request => DreamRSC.create_from_request( - ~bootstrap_modules=["/static/demo/SinglePageRSC.re.js"], + ~bootstrap_modules=["/static/SinglePageRSC.re.js"], <App />, request, ); diff --git a/bs5/server/pages/RouterRSC.re b/bs5/server/pages/RouterRSC.re index 390a8db..32ae375 100644 --- a/bs5/server/pages/RouterRSC.re +++ b/bs5/server/pages/RouterRSC.re @@ -92,19 +92,18 @@ module App = { Lwt.return( <html> <head> - - <meta charSet="utf-8" /> - <link rel="stylesheet" href="/output.css" /> - </head> - // <style - // dangerouslySetInnerHTML={ - // "__html": - // markdownStyles( - // ~background=Theme.Color.gray2, - // ~text=Theme.Color.gray12, - // ), - // } - // /> + <meta charSet="utf-8" /> + <link rel="stylesheet" href="/output.css" /> + </head> + // <style + // dangerouslySetInnerHTML={ + // "__html": + // markdownStyles( + // ~background=Theme.Color.gray2, + // ~text=Theme.Color.gray12, + // ), + // } + // /> <body> <div id="root"> <DemoLayout background=Theme.Color.Gray2 mode=FullScreen> @@ -179,7 +178,7 @@ let handler = request => { Dream.query(request, "searchText") |> Option.value(~default=""); Rsc.DreamRSC.create_from_request( - ~bootstrap_modules=["/static/demo/RouterRSC.re.js"], + ~bootstrap_modules=["/static/RouterRSC.re.js"], <App selectedId isEditing searchText />, request, ); diff --git a/bs5/server/pages/ServerOnlyRSC.re b/bs5/server/pages/ServerOnlyRSC.re index 8e166aa..967cfcd 100644 --- a/bs5/server/pages/ServerOnlyRSC.re +++ b/bs5/server/pages/ServerOnlyRSC.re @@ -37,9 +37,7 @@ let handler = request => { } else { Dream.html( ReactDOM.renderToString( - <Document script="/static/demo/ServerOnlyRSC.re.js"> - React.null - </Document>, + <Document script="/static/ServerOnlyRSC.re.js"> React.null </Document>, ), ); }; diff --git a/bs5/server/pages/SinglePageRSC.re b/bs5/server/pages/SinglePageRSC.re index 685069a..f6f2f56 100644 --- a/bs5/server/pages/SinglePageRSC.re +++ b/bs5/server/pages/SinglePageRSC.re @@ -226,7 +226,7 @@ module App = { let handler = request => DreamRSC.create_from_request( - ~bootstrap_modules=["/static/demo/SinglePageRSC.re.js"], + ~bootstrap_modules=["/static/SinglePageRSC.re.js"], <App />, request, ); diff --git a/bs5/server/server.ml b/bs5/server/server.ml index c7c18e9..a58abc5 100644 --- a/bs5/server/server.ml +++ b/bs5/server/server.ml @@ -13,11 +13,12 @@ let router = ([ (* rendering tricks *) Dream.get "/output.css" - (Dream.from_filesystem "./_build/default/demo" "output.css"); - Dream.get "/static/**" (Dream.static "./_build/default/client/app"); + (Dream.from_filesystem "./_build/default" "output.css"); + Dream.get "/static/**" + (Dream.static "./_build/default/client/app/client"); getAndPost Router.demoRenderToString (fun _ -> Dream.html Pages.Hydrate.toString); - getAndPost Router.demoRenderToString (fun _ -> + getAndPost Router.demoRenderToStaticMarkup (fun _ -> Dream.html Pages.Hydrate.toStatic); (* more demos *) getAndPost Router.demoRenderToStream Pages.Comments.handler; @@ -34,7 +35,7 @@ let router = Dream.post "/echo" (fun req -> let%lwt body = Dream.body req in Dream.respond ~headers:[ ("Content-Type", "application/json") ] body); - Dream.get "/" Pages.Index.handler; + Dream.get "/" Pages.Home.handler; ] @ Api.Json.routes @ Api.Stream.streams) |