From 064add67a75082bad0df3829f3d2c5bcda0a58d1 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 7 Feb 2023 14:48:53 +0300 Subject: [PATCH 1/5] Cli: Include company name in app.module.ts when adding angular source code --- .../Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs index 74a45ba7e1..b84cdae2c6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs @@ -267,7 +267,7 @@ public class AngularSourceCodeAdder : ITransientDependency var fileContent = File.ReadAllText(filePath); - fileContent = "import { "+moduleName.Split(".").Last()+"ConfigModule } from '@"+moduleName.Split(".").Last().ToKebabCase()+"/config';" + Environment.NewLine + fileContent; + fileContent = "import { "+moduleName.Split(".").Last()+"ConfigModule } from '@"+moduleName.Replace(".", "/") .ToKebabCase()+"/config';" + Environment.NewLine + fileContent; fileContent = Regex.Replace(fileContent, "imports\\s*:\\s*\\[", "imports: ["+ Environment.NewLine + From 97204dfa2772c227d6d9dcc28ffe9f85f2181ada Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 7 Feb 2023 18:00:19 +0300 Subject: [PATCH 2/5] Update AngularSourceCodeAdder.cs --- .../Cli/ProjectModification/AngularSourceCodeAdder.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs index b84cdae2c6..e1798346d2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs @@ -267,7 +267,15 @@ public class AngularSourceCodeAdder : ITransientDependency var fileContent = File.ReadAllText(filePath); - fileContent = "import { "+moduleName.Split(".").Last()+"ConfigModule } from '@"+moduleName.Replace(".", "/") .ToKebabCase()+"/config';" + Environment.NewLine + fileContent; + var moduleNameAsConfigPath = moduleName; + + if (moduleName.Contains(".")) + { + var moduleNameSplited = moduleName.Split("."); + moduleNameAsConfigPath = moduleNameSplited.Take(moduleNameSplited.Length-1).JoinAsString(".") + "/" + moduleNameSplited.Last(); + } + + fileContent = "import { "+moduleName.Split(".").Last()+"ConfigModule } from '@"+moduleNameAsConfigPath.ToKebabCase()+"/config';" + Environment.NewLine + fileContent; fileContent = Regex.Replace(fileContent, "imports\\s*:\\s*\\[", "imports: ["+ Environment.NewLine + From 2869ad526837c99ff3fd460a78453af97a918a77 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 7 Feb 2023 18:06:09 +0300 Subject: [PATCH 3/5] Update AngularSourceCodeAdder.cs --- .../Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs index e1798346d2..4adffb6745 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs @@ -267,15 +267,15 @@ public class AngularSourceCodeAdder : ITransientDependency var fileContent = File.ReadAllText(filePath); - var moduleNameAsConfigPath = moduleName; + var moduleNameAsConfigPath = moduleName.ToKebabCase(); if (moduleName.Contains(".")) { var moduleNameSplited = moduleName.Split("."); - moduleNameAsConfigPath = moduleNameSplited.Take(moduleNameSplited.Length-1).JoinAsString(".") + "/" + moduleNameSplited.Last(); + moduleNameAsConfigPath = moduleNameSplited.Take(moduleNameSplited.Length-1).JoinAsString(".").ToKebabCase() + "/" + moduleNameSplited.Last().ToKebabCase(); } - fileContent = "import { "+moduleName.Split(".").Last()+"ConfigModule } from '@"+moduleNameAsConfigPath.ToKebabCase()+"/config';" + Environment.NewLine + fileContent; + fileContent = "import { "+moduleName.Split(".").Last()+"ConfigModule } from '@"+moduleNameAsConfigPath+"/config';" + Environment.NewLine + fileContent; fileContent = Regex.Replace(fileContent, "imports\\s*:\\s*\\[", "imports: ["+ Environment.NewLine + From 464e5a49c6547548b7ff043a9cb8e4603d098050 Mon Sep 17 00:00:00 2001 From: braim23 <94292623+braim23@users.noreply.github.com> Date: Thu, 9 Feb 2023 15:44:32 +0300 Subject: [PATCH 4/5] Embedded YouTube videos to the Single Layer TodoApp Doc --- docs/en/Tutorials/Todo/Single-Layer/Index.md | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/docs/en/Tutorials/Todo/Single-Layer/Index.md b/docs/en/Tutorials/Todo/Single-Layer/Index.md index b257ebbe01..7dad7f0bd4 100644 --- a/docs/en/Tutorials/Todo/Single-Layer/Index.md +++ b/docs/en/Tutorials/Todo/Single-Layer/Index.md @@ -14,6 +14,32 @@ This is a single-part quick-start tutorial to build a simple todo application wi You can find the source code of the completed application [here](https://github.com/abpframework/abp-samples/tree/master/TodoApp-SingleLayer). +{{if UI=="MVC" && DB =="EF"}} + + + +{{else if UI=="BlazorServer" && DB=="EF"}} + + + +{{else if UI=="NG" && DB=="EF"}} + + + +{{else if UI=="MVC" && DB=="Mongo"}} + + + +{{else if UI=="BlazorServer" && DB=="Mongo"}} + + + +{{else if UI=="NG" && DB=="Mongo"}} + + + +{{end}} + ## Pre-Requirements * An IDE (e.g. [Visual Studio](https://visualstudio.microsoft.com/vs/)) that supports [.NET 6.0+](https://dotnet.microsoft.com/download/dotnet) development. From e9ac721f9897b901cbbdf856bbc3128d28cbc7a4 Mon Sep 17 00:00:00 2001 From: Hamza Albreem <94292623+braim23@users.noreply.github.com> Date: Thu, 9 Feb 2023 16:15:56 +0300 Subject: [PATCH 5/5] Update Index.md --- docs/en/Tutorials/Todo/Single-Layer/Index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/Tutorials/Todo/Single-Layer/Index.md b/docs/en/Tutorials/Todo/Single-Layer/Index.md index 7dad7f0bd4..ce73289605 100644 --- a/docs/en/Tutorials/Todo/Single-Layer/Index.md +++ b/docs/en/Tutorials/Todo/Single-Layer/Index.md @@ -14,6 +14,7 @@ This is a single-part quick-start tutorial to build a simple todo application wi You can find the source code of the completed application [here](https://github.com/abpframework/abp-samples/tree/master/TodoApp-SingleLayer). +This documentation has a video tutorial on **YouTube**!! You can watch it here: {{if UI=="MVC" && DB =="EF"}}