From 2346bc7174ce1a2af748d5ec467bae70edb5df72 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Fri, 16 Sep 2022 16:02:39 +0300 Subject: [PATCH 1/3] CLI: Remove theme logo folders according to theme selection --- .../Templates/App/AppTemplateBase.cs | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 22d33be136..3cf1aadb5e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -204,6 +204,8 @@ public abstract class AppTemplateBase : TemplateInfo steps.Add(new ChangeThemeStyleStep()); } + RemoveThemeLogoFolders(context, steps); + if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value)) { return; @@ -213,6 +215,28 @@ public abstract class AppTemplateBase : TemplateInfo RemoveLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro(), uiFramework: context.BuildArgs.UiFramework); } + private void RemoveThemeLogoFolders(ProjectBuildContext context, List steps) + { + if (context.BuildArgs.Theme is not Theme.Lepton && IsPro()) + { + RemoveThemeFolders(folderPath: "/wwwroot/images/logo/lepton"); + } + + if (context.BuildArgs.Theme is not Theme.LeptonX or Theme.LeptonXLite) + { + RemoveThemeFolders(folderPath: "/wwwroot/images/logo/leptonx"); + } + + void RemoveThemeFolders(string folderPath) + { + var logoPaths = context.Files.Where(x => x.Name.Contains(folderPath) && x.IsDirectory); + foreach (var logoPath in logoPaths) + { + steps.Add(new RemoveFolderStep(logoPath.Name)); + } + } + } + private static bool IsDefaultThemeForTemplate(Theme theme) { var defaultThemesForTemplates = new[] From add53836c624dc0aa770954f6950a6b9211ea3f0 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Fri, 16 Sep 2022 20:13:21 +0300 Subject: [PATCH 2/3] CLI: Add RemoveFoldersStep.cs --- .../Building/Steps/RemoveFoldersStep.cs | 19 +++++++++++++++++++ .../Building/Steps/TemplateCodeDeleteStep.cs | 2 +- .../Templates/App/AppTemplateBase.cs | 13 ++----------- 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs new file mode 100644 index 0000000000..18e2ca482e --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs @@ -0,0 +1,19 @@ +using System; +using System.Linq; + +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; + +public class RemoveFoldersStep : ProjectBuildPipelineStep +{ + private readonly string _folderPath; + + public RemoveFoldersStep(string folderPath) + { + _folderPath = folderPath; + } + + public override void Execute(ProjectBuildContext context) + { + context.Files.RemoveAll(file => file.Name.Contains(_folderPath)); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs index ce61d9775f..124209d559 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs @@ -19,7 +19,7 @@ public class TemplateCodeDeleteStep : ProjectBuildPipelineStep file.Name.EndsWith(".ps1") || file.Name.EndsWith(".html") || file.Name.EndsWith(".ts") || - file.Name.EndsWith(".scss")) + file.Name.EndsWith(".css")) { file.RemoveTemplateCode(context.Symbols); file.RemoveTemplateCodeMarkers(); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 3cf1aadb5e..5fff1ebcdc 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -219,21 +219,12 @@ public abstract class AppTemplateBase : TemplateInfo { if (context.BuildArgs.Theme is not Theme.Lepton && IsPro()) { - RemoveThemeFolders(folderPath: "/wwwroot/images/logo/lepton"); + steps.Add(new RemoveFoldersStep("/wwwroot/images/logo/lepton")); } if (context.BuildArgs.Theme is not Theme.LeptonX or Theme.LeptonXLite) { - RemoveThemeFolders(folderPath: "/wwwroot/images/logo/leptonx"); - } - - void RemoveThemeFolders(string folderPath) - { - var logoPaths = context.Files.Where(x => x.Name.Contains(folderPath) && x.IsDirectory); - foreach (var logoPath in logoPaths) - { - steps.Add(new RemoveFolderStep(logoPath.Name)); - } + steps.Add(new RemoveFoldersStep("/wwwroot/images/logo/leptonx")); } } From c14863a6b7ac22cd94cdc8efd9a0f051041f6529 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Sun, 18 Sep 2022 15:19:45 +0300 Subject: [PATCH 3/3] CLI: Rename RemoveFoldersStep.cs --- .../Building/Steps/RemoveFilesStep.cs | 16 ++++++++++++++++ .../Building/Steps/RemoveFoldersStep.cs | 19 ------------------- .../Templates/App/AppTemplateBase.cs | 4 ++-- 3 files changed, 18 insertions(+), 21 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs new file mode 100644 index 0000000000..4390e02f1d --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFilesStep.cs @@ -0,0 +1,16 @@ +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; + +public class RemoveFilesStep : ProjectBuildPipelineStep +{ + private readonly string _filePath; + + public RemoveFilesStep(string filePath) + { + _filePath = filePath; + } + + public override void Execute(ProjectBuildContext context) + { + context.Files.RemoveAll(file => file.Name.Contains(_filePath)); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs deleted file mode 100644 index 18e2ca482e..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Linq; - -namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; - -public class RemoveFoldersStep : ProjectBuildPipelineStep -{ - private readonly string _folderPath; - - public RemoveFoldersStep(string folderPath) - { - _folderPath = folderPath; - } - - public override void Execute(ProjectBuildContext context) - { - context.Files.RemoveAll(file => file.Name.Contains(_folderPath)); - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 5fff1ebcdc..737f7a2369 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -219,12 +219,12 @@ public abstract class AppTemplateBase : TemplateInfo { if (context.BuildArgs.Theme is not Theme.Lepton && IsPro()) { - steps.Add(new RemoveFoldersStep("/wwwroot/images/logo/lepton")); + steps.Add(new RemoveFilesStep("/wwwroot/images/logo/lepton")); } if (context.BuildArgs.Theme is not Theme.LeptonX or Theme.LeptonXLite) { - steps.Add(new RemoveFoldersStep("/wwwroot/images/logo/leptonx")); + steps.Add(new RemoveFilesStep("/wwwroot/images/logo/leptonx")); } }