diff --git a/docs/cs/Index.md b/docs/cs/Index.md
index 3a86344660..ac13bcbdb6 100644
--- a/docs/cs/Index.md
+++ b/docs/cs/Index.md
@@ -6,7 +6,7 @@ K procházení dokumentace využijte navigační nabídky vlevo.
## Stav projektu
-ABP je **novou generací** open source frameworku [ASP.NET Boilerplate](https://aspnetboilerplate.com/). V současné době je v ranné fázi a není připraven k ostrému nasazení. Na dokumentaci se stále pracuje a ještě zdaleka není dokončena.
+ABP je **novou generací** open source frameworku [ASP.NET Boilerplate](https://aspnetboilerplate.com/). V současné době je v náhledové fázi a není připraven k ostrému nasazení. Na dokumentaci se stále pracuje a ještě zdaleka není dokončena.
Pro aplikace na krátkodobé a ostré nasazení je doporučeno použít [ASP.NET Boilerplate](https://aspnetboilerplate.com/) framework, který je bohatý na funkce, vyspělý, aktivně udržovaný a aktuální.
@@ -14,7 +14,8 @@ Pro aplikace na krátkodobé a ostré nasazení je doporučeno použít [ASP.NET
Nejsnazší cestou jak začít nový projekt s ABP je užití startovací šablony:
-* [ASP.NET Core MVC Šablona](Getting-Started-AspNetCore-MVC-Template.md)
+* [ASP.NET Core MVC (Razor Pages) UI Šablona](Getting-Started-AspNetCore-MVC-Template.md)
+* [Angular UI Šablona](Getting-Started-Angular-Template.md)
Pokud chcete začít od nuly (s prázdným projektem) tak manuálně nainstalujte ABP Framework s pomocí následujících tutoriálů:
diff --git a/docs/cs/docs-nav.json b/docs/cs/docs-nav.json
index 2d6b8f7ef8..8560190492 100644
--- a/docs/cs/docs-nav.json
+++ b/docs/cs/docs-nav.json
@@ -7,8 +7,12 @@
"text": "Ze startovacích šablon",
"items": [
{
- "text": "ASP.NET Core MVC",
+ "text": "Aplikace s MVC (Razor Pages) UI",
"path": "Getting-Started-AspNetCore-MVC-Template.md"
+ },
+ {
+ "text": "Aplikace s Angular UI",
+ "path": "Getting-Started-Angular-Template.md"
}
]
},
@@ -34,8 +38,12 @@
"text": "Vývoj aplikace",
"items": [
{
- "text": "S ASP.NET Core MVC",
+ "text": "S ASP.NET Core MVC UI",
"path": "Tutorials/AspNetCore-Mvc/Part-I.md"
+ },
+ {
+ "text": "S Angular UI",
+ "path": "Tutorials/Angular/Part-I.md"
}
]
}
@@ -264,6 +272,20 @@
}
]
},
+ {
+ "text": "Startovací šablony",
+ "path": "Startup-Templates/Index.md",
+ "items": [
+ {
+ "text": "Aplikace",
+ "path": "Startup-Templates/Application.md"
+ },
+ {
+ "text": "Modul",
+ "path": "Startup-Templates/Module.md"
+ }
+ ]
+ },
{
"text": "Vzorky",
"items": [
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index 7e20d4db75..6773c81079 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -282,7 +282,7 @@
},
{
"text": "Module",
- "path": "Startup-Templates/Application.md"
+ "path": "Startup-Templates/Module.md"
}
]
},
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
index 53f8c566cd..5a287d11bf 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
@@ -23,6 +23,8 @@ namespace Volo.Abp.Cli.ProjectBuilding
return new AppProTemplate();
case ModuleTemplate.TemplateName:
return new ModuleTemplate();
+ case ModuleProTemplate.TemplateName:
+ return new ModuleProTemplate();
default:
throw new Exception("There is no template found with given name: " + name);
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleProTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleProTemplate.cs
new file mode 100644
index 0000000000..8cfe44c38b
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleProTemplate.cs
@@ -0,0 +1,19 @@
+using Volo.Abp.Cli.ProjectBuilding.Templates.Module;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule
+{
+ public class ModuleProTemplate : ModuleTemplateBase
+ {
+ ///
+ /// "module".
+ ///
+ public const string TemplateName = "module-pro";
+
+ public ModuleProTemplate()
+ : base(TemplateName)
+ {
+ //TODO: uncomment next line after document is ready
+ //DocumentUrl = "https://docs.abp.io/en/commercial/latest/Startup-Templates/Module";
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplate.cs
index b3eab61ac9..e6e2045301 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplate.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplate.cs
@@ -1,10 +1,8 @@
-using System.Collections.Generic;
-using Volo.Abp.Cli.ProjectBuilding.Building;
-using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+using Volo.Abp.Cli.ProjectBuilding.Templates.Module;
namespace Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule
{
- public class ModuleTemplate : TemplateInfo
+ public class ModuleTemplate : ModuleTemplateBase
{
///
/// "module".
@@ -16,52 +14,5 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule
{
DocumentUrl = "https://docs.abp.io/en/abp/latest/Startup-Templates/Module";
}
-
- public override IEnumerable GetCustomSteps(ProjectBuildContext context)
- {
- var steps = new List();
-
- DeleteUnrelatedProjects(context, steps);
- RandomizeSslPorts(context, steps);
- CleanupFolderHierarchy(context, steps);
-
- return steps;
- }
-
- private void DeleteUnrelatedProjects(ProjectBuildContext context, List steps)
- {
- if (context.BuildArgs.ExtraProperties.ContainsKey("no-ui"))
- {
- steps.Add(new RemoveProjectFromSolutionStep(
- "MyCompanyName.MyProjectName.Web"
- ));
-
- steps.Add(new RemoveProjectFromSolutionStep(
- "MyCompanyName.MyProjectName.Web.Host",
- projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host"
- ));
-
- steps.Add(new RemoveProjectFromSolutionStep(
- "MyCompanyName.MyProjectName.Web.Unified",
- projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified"
- ));
- }
- }
-
- private void RandomizeSslPorts(ProjectBuildContext context, List steps)
- {
- steps.Add(new TemplateRandomSslPortStep(new List
- {
- "https://localhost:44300",
- "https://localhost:44301",
- "https://localhost:44302",
- "https://localhost:44303"
- }));
- }
-
- private void CleanupFolderHierarchy(ProjectBuildContext context, List steps)
- {
- steps.Add(new MoveFolderStep("/aspnet-core/", "/"));
- }
}
}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
new file mode 100644
index 0000000000..2d308d9219
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using JetBrains.Annotations;
+using Volo.Abp.Cli.ProjectBuilding.Building;
+using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module
+{
+ public abstract class ModuleTemplateBase : TemplateInfo
+ {
+ protected ModuleTemplateBase([NotNull] string name)
+ : base(name)
+ {
+ }
+
+ public override IEnumerable GetCustomSteps(ProjectBuildContext context)
+ {
+ var steps = new List();
+
+ DeleteUnrelatedProjects(context, steps);
+ RandomizeSslPorts(context, steps);
+ CleanupFolderHierarchy(context, steps);
+
+ return steps;
+ }
+
+ private void DeleteUnrelatedProjects(ProjectBuildContext context, List steps)
+ {
+ if (context.BuildArgs.ExtraProperties.ContainsKey("no-ui"))
+ {
+ steps.Add(new RemoveProjectFromSolutionStep(
+ "MyCompanyName.MyProjectName.Web"
+ ));
+
+ steps.Add(new RemoveProjectFromSolutionStep(
+ "MyCompanyName.MyProjectName.Web.Host",
+ projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host"
+ ));
+
+ steps.Add(new RemoveProjectFromSolutionStep(
+ "MyCompanyName.MyProjectName.Web.Unified",
+ projectFolderPath: "/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified"
+ ));
+ }
+ }
+
+ private void RandomizeSslPorts(ProjectBuildContext context, List steps)
+ {
+ steps.Add(new TemplateRandomSslPortStep(new List
+ {
+ "https://localhost:44300",
+ "https://localhost:44301",
+ "https://localhost:44302",
+ "https://localhost:44303"
+ }));
+ }
+
+ private void CleanupFolderHierarchy(ProjectBuildContext context, List steps)
+ {
+ steps.Add(new MoveFolderStep("/aspnet-core/", "/"));
+ }
+ }
+}
diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/RegisterDto.cs b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/RegisterDto.cs
index 5355d7e332..9a9f3caa4e 100644
--- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/RegisterDto.cs
+++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/RegisterDto.cs
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Auditing;
using Volo.Abp.Identity;
namespace Volo.Abp.Account
@@ -17,6 +18,7 @@ namespace Volo.Abp.Account
[Required]
[StringLength(IdentityUserConsts.MaxPasswordLength)]
[DataType(DataType.Password)]
+ [DisableAuditing]
public string Password { get; set; }
[Required]
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/cs.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/cs.json
index 4c21318fdb..6ca29e5420 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/cs.json
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/cs.json
@@ -14,6 +14,7 @@
"NoProjectWarning": "Zatím zde není žádný projekt!",
"DocumentNotFound": "Ups, vyžádaný dokument neexistuje!",
"NavigationDocumentNotFound": "Tato verze nemá navigační dokument!",
- "DocumentNotFoundInSelectedLanguage": "Tento dokument není dostupný ve vybraném jazyce. Zobrazen dokument ve výchozím jazyce."
+ "DocumentNotFoundInSelectedLanguage": "Tento dokument není dostupný ve vybraném jazyce. Zobrazen dokument ve výchozím jazyce.",
+ "FilterTopics": "Filtrovat témata"
}
}
\ No newline at end of file
diff --git a/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts b/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
index 85968b4dd2..b3b62dd4f5 100644
--- a/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
@@ -40,7 +40,7 @@ export class LoginComponent {
onSubmit() {
if (this.form.invalid) return;
- this.oauthService.setStorage(this.form.value.remember ? localStorage : sessionStorage);
+ // this.oauthService.setStorage(this.form.value.remember ? localStorage : sessionStorage);
this.inProgress = true;
from(