#2333 Add layouts folder for templates (#2334)

* #2333 Improve templates structure and add global settings

* revert global settings changes

* revert globalSettings changes

src/Backend/FluentCMS.Services/ServiceConstants.cs

@@ -5,6 +5,8 @@ public static class ServiceConstants
     public const string SetupTemplatesFolder = "Templates";
     public const string SetupFilesFolder = "Files";
     public const string SetupPagesFolder = "Pages";
+    public const string SetupBlocksFolder = "Blocks";
+    public const string SetupLayoutsFolder = "Layouts";
     public const string SetupManifestFile = "manifest.json";
     public const string SetupSiteTemplateFile = "site.json";
     public const string DefaultTemplateFolder = "Templates/Default";

src/Backend/FluentCMS.Services/SiteService.cs

@@ -73,15 +73,15 @@ public async Task<Site> Create(SiteTemplate siteTemplate, CancellationToken canc
         // loading layout data from files
         foreach (var layout in siteTemplate.Layouts)
         {
-            var bodyLayoutFilePath = Path.Combine(ServiceConstants.SetupTemplatesFolder, siteTemplate.Template, $"{layout.Name}.body.html");
-            var headLayoutFilePath = Path.Combine(ServiceConstants.SetupTemplatesFolder, siteTemplate.Template, $"{layout.Name}.head.html");
+            var bodyLayoutFilePath = Path.Combine(ServiceConstants.SetupTemplatesFolder, siteTemplate.Template, ServiceConstants.SetupLayoutsFolder, $"{layout.Name}.body.html");
+            var headLayoutFilePath = Path.Combine(ServiceConstants.SetupTemplatesFolder, siteTemplate.Template, ServiceConstants.SetupLayoutsFolder, $"{layout.Name}.head.html");
             layout.Body = await System.IO.File.ReadAllTextAsync(bodyLayoutFilePath, cancellationToken);
             layout.Head = await System.IO.File.ReadAllTextAsync(headLayoutFilePath, cancellationToken);
         }
 
         foreach (var block in siteTemplate.Blocks)
         {
-            var blockContentFilePath = Path.Combine(ServiceConstants.SetupTemplatesFolder, siteTemplate.Template, "Blocks", block.Category, $"{block.Name}.html");
+            var blockContentFilePath = Path.Combine(ServiceConstants.SetupTemplatesFolder, siteTemplate.Template, ServiceConstants.SetupBlocksFolder, block.Category, $"{block.Name}.html");
             block.Content = await System.IO.File.ReadAllTextAsync(blockContentFilePath, cancellationToken);
         }