Update to rm deprecated from test client

nfdi4plants · Jul 8, 2022 · 6aec175 · 6aec175
1 parent 9e56047
commit 6aec175
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -6,9 +6,7 @@ This fornax template implements the existing [nfdi-web-components](https://githu
 
 You can find the loader and generator functions on nuget: 
 
-```
-wip
-```
+Best use this repo as implemented in [web-components-docs](https://github.com/nfdi4plants/web-components)
 
 ## usage
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,9 @@
+### 0.4.0+9e56047 (Released 2022-7-8)
+* Additions:
+    * latest commit #9e56047
+    * [[#9e56047](https://github.com/Freymaurer/Nfdi4Plants.Fornax/commit/9e56047125b584ad5fcf34487858f822a7f592bc)] Deprecate DocsData :boom: 
+    * Implement `Docs` type with optional BasePath.
+
 ### 0.3.0+e40d9be (Released 2022-7-8)
 * Additions:
     * latest commit #e40d9be

diff --git a/client/generators/docs.fsx b/client/generators/docs.fsx
@@ -7,7 +7,7 @@ open Docsloader
 
 let generate' (ctx : SiteContents) (page: string) =
     let doc =
-        ctx.TryGetValues<Nfdi4Plants.DocsData> ()
+        ctx.TryGetValues<Nfdi4Plants.Docs> ()
         |> Option.defaultValue Seq.empty
         |> Seq.findBack (fun n -> n.file = page)
 

diff --git a/client/generators/index.fsx b/client/generators/index.fsx
@@ -6,7 +6,7 @@ open Fornax
 open Docsloader
 
 let generate' (ctx : SiteContents) (_: string) =
-    let docs0 = ctx.TryGetValues<Nfdi4Plants.DocsData> () |> Option.defaultValue Seq.empty
+    let docs0 = ctx.TryGetValues<Nfdi4Plants.Docs> () |> Option.defaultValue Seq.empty
     printfn "GENERATOR: %i" <| Seq.length docs0
 
     let landingPage = docs0 |> Seq.tryFind(fun x -> x.title = "Index" || x.title = "Home")

diff --git a/client/generators/layout.fsx b/client/generators/layout.fsx
@@ -97,20 +97,20 @@ let layout (ctx : SiteContents) (activePageTitle: string) bodyCnt =
         custom "nfdi-footer" [] []
     ]
 
-open Fornax.Nfdi4Plants
 open Docsloader
+open Fornax
 
 let render (ctx : SiteContents) cnt =
     let disableLiveRefresh = ctx.TryGetValue<DocsConfig> () |> Option.map (fun n -> n.disableLiveRefresh) |> Option.defaultValue false
     cnt
     |> HtmlElement.ToString
     |> fun n -> if disableLiveRefresh then n else injectWebsocketCode n
 
-let docsLayout (docs: DocsData) =
+let docsLayout (docs: Nfdi4Plants.Docs) =
     // just an example url
-    Components.docsLayout "https://github.com/nfdi4plants/nfdi4plants.github.io/tree/main/src/" docs
+    Nfdi4Plants.Components.docsLayout("https://github.com/nfdi4plants/nfdi4plants.github.io/tree/main/src/", docs)
 
-let docsMinimalLayout (docs: DocsData) =
+let docsMinimalLayout (docs: Nfdi4Plants.Docs) =
     div [Class "tile is-4 is-parent"] [
         div [Class "tile is-child box"] [
         p [Class "title"] [ a [Href docs.link] [!! docs.title] ]

diff --git a/client/loaders/docsloader.fsx b/client/loaders/docsloader.fsx
@@ -1,11 +1,10 @@
 #r "../_lib/Fornax.Core.dll"
 #r "../_lib/Markdig.dll"
 // This can be used to access local .nupkg, thanks to the nuget.config file.
-#r "nuget: Nfdi4Plants.Fornax, 0.2.2"
+#r "nuget: Nfdi4Plants.Fornax, 0.4.0"
 
 open System.IO
 open Fornax
-open Fornax.Nfdi4Plants
 
 let contentDir = "docs"
 
@@ -19,12 +18,13 @@ let loader (projectRoot: string) (siteContent: SiteContents) =
         Directory.GetFiles(docsPath, "*")
         |> Array.filter (fun n -> n.EndsWith ".md")
         |> Array.filter (fun n -> n.Contains "README.md" |> not)
+    let loadDocs (filePath:string) = Nfdi4Plants.Docs.loadFile(projectRoot, contentDir, filePath)
     let docs = 
         files 
-        |> Array.map (Docs.loadFile projectRoot contentDir)
+        |> Array.map loadDocs
 
     let doc =
-        siteContent.TryGetValues<Nfdi4Plants.DocsData> ()
+        siteContent.TryGetValues<Nfdi4Plants.Docs> ()
         |> Option.defaultValue Seq.empty
 
     printfn "LOADER CURRENT DOCS: %i" <| Seq.length doc
@@ -37,7 +37,7 @@ let loader (projectRoot: string) (siteContent: SiteContents) =
     |> Array.iter siteContent.Add
 
     let doc2 =
-        siteContent.TryGetValues<Nfdi4Plants.DocsData> ()
+        siteContent.TryGetValues<Nfdi4Plants.Docs> ()
         |> Option.defaultValue Seq.empty
 
     printfn "LOADER NEXT DOCS: %i" <| Seq.length doc2

diff --git a/src/Nfdi4Plants.Fornax/Components.fs b/src/Nfdi4Plants.Fornax/Components.fs
@@ -100,4 +100,4 @@ type Components = class end
                     HtmlProperties.Style [MarginLeft "auto"; Display "block"; CSSProperties.Width "130px"]
                 ] [!! "✏️ Edit this page"]
             ]
-        ]
+        ]