From c18de65ccb243f05e70d5c25fc7b0483a9c53598 Mon Sep 17 00:00:00 2001 From: Dru Sellers Date: Thu, 18 Aug 2016 18:53:57 -0500 Subject: [PATCH] Adding first template view --- pages2docs/Actions.fs | 12 +++++++++++- pages2docs/pages2docs.fsproj | 11 +++++++++++ pages2docs/templates/hello.liquid | 1 + paket.dependencies | 2 ++ paket.lock | 6 +++++- run.sh | 3 ++- 6 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 pages2docs/templates/hello.liquid diff --git a/pages2docs/Actions.fs b/pages2docs/Actions.fs index cab594c..0a77812 100644 --- a/pages2docs/Actions.fs +++ b/pages2docs/Actions.fs @@ -6,5 +6,15 @@ open Suave.Web // for config open Suave.Filters open Suave.Writers open Suave.Operators +open Suave.DotLiquid +open DotLiquid + +setTemplatesDir "./templates" + +type Model = + { title : string } + +let helloWorld : WebPart = + let o = { title = "Hello" } + page "hello.liquid" o -let helloWorld = OK "

Welcome to Pages2Docs!

\n" diff --git a/pages2docs/pages2docs.fsproj b/pages2docs/pages2docs.fsproj index a9ac017..4732749 100644 --- a/pages2docs/pages2docs.fsproj +++ b/pages2docs/pages2docs.fsproj @@ -65,6 +65,17 @@ ..\packages\Suave\lib\net40\Suave.dll True + + ..\packages\DotLiquid\lib\net45\DotLiquid.dll + True + + + ..\packages\Suave.DotLiquid\lib\net40\Suave.DotLiquid.dll + True + + + Always + diff --git a/pages2docs/templates/hello.liquid b/pages2docs/templates/hello.liquid new file mode 100644 index 0000000..5166725 --- /dev/null +++ b/pages2docs/templates/hello.liquid @@ -0,0 +1 @@ +

Welcome to - Pages2Docs!

diff --git a/paket.dependencies b/paket.dependencies index 9a07a17..a911474 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,9 +1,11 @@ source https://www.nuget.org/api/v2 +nuget DotLiquid nuget FAKE nuget Suave 1.0.0 nuget FSharp.Data 2.2.5 nuget SQLProvider 1.0.0 nuget Npgsql 3.0.7 nuget Dapper 1.42.0 +nuget Suave.DotLiquid nuget xunit 2.1.0 nuget xunit.runner.console 2.0.0 \ No newline at end of file diff --git a/paket.lock b/paket.lock index ecaa1a1..ed1cb05 100644 --- a/paket.lock +++ b/paket.lock @@ -1,7 +1,7 @@ NUGET remote: https://www.nuget.org/api/v2 - specs: Dapper (1.42) + DotLiquid (2.0.26) FAKE (4.26) FSharp.Core (4.0.0.1) FSharp.Data (2.2.5) @@ -10,6 +10,10 @@ NUGET SQLProvider (1.0) Suave (1.0) FSharp.Core (>= 3.1.2.5) + Suave.DotLiquid (1.0) + DotLiquid (>= 1.8) + FSharp.Core (>= 3.1.2.5) + Suave (>= 1.0) System.Collections (4.0.10) - framework: dnxcore50 System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50 System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 diff --git a/run.sh b/run.sh index 1e3b3de..9ac1887 100755 --- a/run.sh +++ b/run.sh @@ -3,5 +3,6 @@ then docker run -t -p 5000:5000 --env-file ./.env pages2docs else source .env - mono ./build/pages2docs.exe + cd ./build/ + mono pages2docs.exe fi