From 84cc5f07784a2f3522131e554649e5d1da701c8b Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sun, 16 Apr 2023 02:18:11 +0200 Subject: [PATCH] Use FileSystemProject in RazorLight --- Elwig/Documents/Document.cshtml | 4 ++-- Elwig/Documents/Document.cshtml.cs | 3 +++ Elwig/Documents/Html.cs | 2 +- Elwig/Elwig.csproj | 6 ------ Elwig/fetch-resources.bat | 1 + 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Elwig/Documents/Document.cshtml b/Elwig/Documents/Document.cshtml index 4145fb6..dafb188 100644 --- a/Elwig/Documents/Document.cshtml +++ b/Elwig/Documents/Document.cshtml @@ -14,8 +14,8 @@ window.addEventListener("afterprint", () => { location.reload(); }); } - - + +
diff --git a/Elwig/Documents/Document.cshtml.cs b/Elwig/Documents/Document.cshtml.cs index 85ebe65..84602e1 100644 --- a/Elwig/Documents/Document.cshtml.cs +++ b/Elwig/Documents/Document.cshtml.cs @@ -9,6 +9,7 @@ namespace Elwig.Documents { private TempFile? PdfFile = null; public Document(string title) { + DataPath = App.DataPath; Title = title; Header = "

Winzergenossenschaft Matzen

"; Footer = "Winzergenossenschaft für Matzen und Umgebung reg. Gen.m.b.H."; @@ -24,6 +25,8 @@ namespace Elwig.Documents { PdfFile = null; } + public string DataPath { get; set; } + public string Title { get; set; } public string Header { get; set; } diff --git a/Elwig/Documents/Html.cs b/Elwig/Documents/Html.cs index 24c0d57..4292cd8 100644 --- a/Elwig/Documents/Html.cs +++ b/Elwig/Documents/Html.cs @@ -10,7 +10,7 @@ namespace Elwig.Documents { public static async Task Init(Action evtHandler) { var e = new RazorLightEngineBuilder() - .UseEmbeddedResourcesProject(typeof(App).Assembly, "Elwig.Documents") + .UseFileSystemProject(App.DataPath + "resources") .UseMemoryCachingProvider() .Build(); diff --git a/Elwig/Elwig.csproj b/Elwig/Elwig.csproj index 64465d8..a7b50a1 100644 --- a/Elwig/Elwig.csproj +++ b/Elwig/Elwig.csproj @@ -27,12 +27,6 @@ - - - - - - diff --git a/Elwig/fetch-resources.bat b/Elwig/fetch-resources.bat index beb0f8d..072d24a 100644 --- a/Elwig/fetch-resources.bat +++ b/Elwig/fetch-resources.bat @@ -1,3 +1,4 @@ mkdir "C:\ProgramData\Elwig\resources"" curl -s -L "https://unpkg.com/pagedjs/dist/paged.polyfill.js" -o "C:\ProgramData\Elwig\resources\paged.polyfill.js" copy /y "Documents\style.css" "C:\ProgramData\Elwig\resources\style.css" +copy /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"