From 35e34a21b95ee2709fdd6dfdf2bcdea039563ba3 Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Wed, 16 Apr 2025 16:18:03 +0100 Subject: [PATCH 1/4] #7 styling rss feed --- .../Controllers/CultureRssController.cs | 4 +- .../Controllers/FolderRssController.cs | 4 +- .../cloudscribe.Core.SimpleContent.csproj | 14 ++++- ...oudscribe.SimpleContent.Syndication.csproj | 19 +++++- src/sourceDev.WebApp/wwwroot/rss-style.xsl | 46 +++++++++++++++ src/sourceDev.WebApp/wwwroot/rss.css | 59 +++++++++++++++++++ 6 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 src/sourceDev.WebApp/wwwroot/rss-style.xsl create mode 100644 src/sourceDev.WebApp/wwwroot/rss.css diff --git a/src/cloudscribe.Core.SimpleContent/Controllers/CultureRssController.cs b/src/cloudscribe.Core.SimpleContent/Controllers/CultureRssController.cs index d828e61f2..e7429c7b2 100644 --- a/src/cloudscribe.Core.SimpleContent/Controllers/CultureRssController.cs +++ b/src/cloudscribe.Core.SimpleContent/Controllers/CultureRssController.cs @@ -1,5 +1,6 @@ using cloudscribe.Syndication.Models.Rss; using cloudscribe.Syndication.Web.Controllers; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System.Collections.Generic; @@ -11,10 +12,11 @@ public class CultureRssController : RssController { public CultureRssController( ILogger logger, + IWebHostEnvironment env, IEnumerable channelProviders = null, IChannelProviderResolver channelResolver = null, IXmlFormatter xmlFormatter = null - ) : base(logger, channelProviders, channelResolver, xmlFormatter) + ) : base(logger, env, channelProviders, channelResolver, xmlFormatter) { } diff --git a/src/cloudscribe.Core.SimpleContent/Controllers/FolderRssController.cs b/src/cloudscribe.Core.SimpleContent/Controllers/FolderRssController.cs index 12fba12b4..5d6df9df1 100644 --- a/src/cloudscribe.Core.SimpleContent/Controllers/FolderRssController.cs +++ b/src/cloudscribe.Core.SimpleContent/Controllers/FolderRssController.cs @@ -1,5 +1,6 @@ using cloudscribe.Syndication.Models.Rss; using cloudscribe.Syndication.Web.Controllers; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System.Collections.Generic; @@ -11,10 +12,11 @@ public class FolderRssController : RssController { public FolderRssController( ILogger logger, + IWebHostEnvironment env, IEnumerable channelProviders = null, IChannelProviderResolver channelResolver = null, IXmlFormatter xmlFormatter = null - ):base(logger, channelProviders, channelResolver, xmlFormatter) + ):base(logger, env, channelProviders, channelResolver, xmlFormatter) { } diff --git a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj index 94a65a132..a54dba9b4 100644 --- a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj +++ b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj @@ -33,7 +33,7 @@ - + @@ -42,4 +42,16 @@ + diff --git a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj index dfeb913af..5c1d904c2 100644 --- a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj +++ b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj @@ -27,9 +27,26 @@ - + + + + PreserveNewest + + + PreserveNewest + + + + + <_RootFolder>..\wwwroot + <_RootFolder Condition="Exists('..\sourceDev.WebApp')">..\sourceDev.WebApp\wwwroot + + + + + diff --git a/src/sourceDev.WebApp/wwwroot/rss-style.xsl b/src/sourceDev.WebApp/wwwroot/rss-style.xsl new file mode 100644 index 000000000..51cd5e1cd --- /dev/null +++ b/src/sourceDev.WebApp/wwwroot/rss-style.xsl @@ -0,0 +1,46 @@ + + + + + + + + <xsl:value-of select="/rss/channel/title"/> + + + + + + +
+

+ +

+

+ +

+
+
+ + + +
+ + + + \ No newline at end of file diff --git a/src/sourceDev.WebApp/wwwroot/rss.css b/src/sourceDev.WebApp/wwwroot/rss.css new file mode 100644 index 000000000..ecb197d9d --- /dev/null +++ b/src/sourceDev.WebApp/wwwroot/rss.css @@ -0,0 +1,59 @@ +* { + box-sizing: border-box; + font-family: sans-serif; + line-height: 1.4; + margin: 0; + padding: 0; +} + +html { + background: #FFFFFF; + color: #212529; +} + +body { + padding: 1.5rem; +} + +a { + color: #337ab7; +} + +a:hover { + color: #296292; +} + +main, header { + margin-block-end: 3rem; + margin-inline: auto; + max-inline-size: 80ch; +} + +article { + margin-block-end: 3rem; +} + +h1 { + font-size: 2.5rem; + line-height: 1.2; + margin-block: 1rem; +} + +h2 { + font-size: 2rem; + margin-block: 2rem; +} + +h3 { + font-size: 1.75rem; + margin-block: 1rem; +} + +p { + font-size: 1.25rem; + margin-block-end: 1rem; +} + +small { + font-size: 1rem; +} From 4e705af6c5471b23e2ea5d62f470fb201f5e3bf5 Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Wed, 16 Apr 2025 16:22:26 +0100 Subject: [PATCH 2/4] #7 removing unused webhost --- .../Controllers/CultureRssController.cs | 4 +--- .../Controllers/FolderRssController.cs | 4 +--- .../cloudscribe.Core.SimpleContent.csproj | 12 ------------ 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/cloudscribe.Core.SimpleContent/Controllers/CultureRssController.cs b/src/cloudscribe.Core.SimpleContent/Controllers/CultureRssController.cs index e7429c7b2..d828e61f2 100644 --- a/src/cloudscribe.Core.SimpleContent/Controllers/CultureRssController.cs +++ b/src/cloudscribe.Core.SimpleContent/Controllers/CultureRssController.cs @@ -1,6 +1,5 @@ using cloudscribe.Syndication.Models.Rss; using cloudscribe.Syndication.Web.Controllers; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System.Collections.Generic; @@ -12,11 +11,10 @@ public class CultureRssController : RssController { public CultureRssController( ILogger logger, - IWebHostEnvironment env, IEnumerable channelProviders = null, IChannelProviderResolver channelResolver = null, IXmlFormatter xmlFormatter = null - ) : base(logger, env, channelProviders, channelResolver, xmlFormatter) + ) : base(logger, channelProviders, channelResolver, xmlFormatter) { } diff --git a/src/cloudscribe.Core.SimpleContent/Controllers/FolderRssController.cs b/src/cloudscribe.Core.SimpleContent/Controllers/FolderRssController.cs index 5d6df9df1..12fba12b4 100644 --- a/src/cloudscribe.Core.SimpleContent/Controllers/FolderRssController.cs +++ b/src/cloudscribe.Core.SimpleContent/Controllers/FolderRssController.cs @@ -1,6 +1,5 @@ using cloudscribe.Syndication.Models.Rss; using cloudscribe.Syndication.Web.Controllers; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System.Collections.Generic; @@ -12,11 +11,10 @@ public class FolderRssController : RssController { public FolderRssController( ILogger logger, - IWebHostEnvironment env, IEnumerable channelProviders = null, IChannelProviderResolver channelResolver = null, IXmlFormatter xmlFormatter = null - ):base(logger, env, channelProviders, channelResolver, xmlFormatter) + ):base(logger, channelProviders, channelResolver, xmlFormatter) { } diff --git a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj index a54dba9b4..e9882997c 100644 --- a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj +++ b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj @@ -42,16 +42,4 @@ - From 2451aa7ab232541e9ce2404537e1f9c2bf5a498d Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Wed, 16 Apr 2025 16:23:29 +0100 Subject: [PATCH 3/4] #7 resetting imports --- .../cloudscribe.Core.SimpleContent.csproj | 2 +- .../cloudscribe.SimpleContent.Syndication.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj index e9882997c..94a65a132 100644 --- a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj +++ b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj index 5c1d904c2..4a67ce960 100644 --- a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj +++ b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj @@ -27,7 +27,7 @@ - + From d601d55fbe0b3b7a1856f9bb8507e72b21047790 Mon Sep 17 00:00:00 2001 From: Mark Appleton Date: Tue, 22 Apr 2025 13:51:53 +0100 Subject: [PATCH 4/4] changes for the syndication changes --- ...oudscribe.SimpleContent.Syndication.csproj | 18 ------ src/sourceDev.WebApp/wwwroot/rss-style.xsl | 46 --------------- src/sourceDev.WebApp/wwwroot/rss.css | 59 ------------------- 3 files changed, 123 deletions(-) delete mode 100644 src/sourceDev.WebApp/wwwroot/rss-style.xsl delete mode 100644 src/sourceDev.WebApp/wwwroot/rss.css diff --git a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj index 4a67ce960..040fa6c6b 100644 --- a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj +++ b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj @@ -31,22 +31,4 @@ - - - - PreserveNewest - - - PreserveNewest - - - - - <_RootFolder>..\wwwroot - <_RootFolder Condition="Exists('..\sourceDev.WebApp')">..\sourceDev.WebApp\wwwroot - - - - - diff --git a/src/sourceDev.WebApp/wwwroot/rss-style.xsl b/src/sourceDev.WebApp/wwwroot/rss-style.xsl deleted file mode 100644 index 51cd5e1cd..000000000 --- a/src/sourceDev.WebApp/wwwroot/rss-style.xsl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - <xsl:value-of select="/rss/channel/title"/> - - - - - - -
-

- -

-

- -

-
-
- - - -
- - - - \ No newline at end of file diff --git a/src/sourceDev.WebApp/wwwroot/rss.css b/src/sourceDev.WebApp/wwwroot/rss.css deleted file mode 100644 index ecb197d9d..000000000 --- a/src/sourceDev.WebApp/wwwroot/rss.css +++ /dev/null @@ -1,59 +0,0 @@ -* { - box-sizing: border-box; - font-family: sans-serif; - line-height: 1.4; - margin: 0; - padding: 0; -} - -html { - background: #FFFFFF; - color: #212529; -} - -body { - padding: 1.5rem; -} - -a { - color: #337ab7; -} - -a:hover { - color: #296292; -} - -main, header { - margin-block-end: 3rem; - margin-inline: auto; - max-inline-size: 80ch; -} - -article { - margin-block-end: 3rem; -} - -h1 { - font-size: 2.5rem; - line-height: 1.2; - margin-block: 1rem; -} - -h2 { - font-size: 2rem; - margin-block: 2rem; -} - -h3 { - font-size: 1.75rem; - margin-block: 1rem; -} - -p { - font-size: 1.25rem; - margin-block-end: 1rem; -} - -small { - font-size: 1rem; -}