From e74ff061b45f966ada92d4e95712c660f8e0a80c Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 18 Apr 2019 17:50:23 +0300 Subject: [PATCH 001/335] Added solution builder code and created command parser --- framework/Volo.Abp.sln | 28 ++-- framework/src/Volo.Abp.Cli/Program.cs | 12 -- .../src/Volo.Abp.Cli/Volo.Abp.Cli.csproj | 12 ++ .../Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs | 13 ++ .../Volo/Abp/Cli/Args/CommandLineArgs.cs | 62 +++++++++ .../Abp/Cli/Args/CommandLineArgumentParser.cs | 104 +++++++++++++++ .../Volo/Abp/Cli/Args/CommandLineOptions.cs | 9 ++ .../Cli/Args/ICommandLineArgumentParser.cs | 7 + .../Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs | 29 ++++ .../Volo/Abp/Cli/Commands/CommandSelector.cs | 20 +++ .../Volo/Abp/Cli/Commands/ICommandSelector.cs | 7 + .../Volo/Abp/Cli/Commands/IConsoleCommand.cs | 9 ++ .../Volo/Abp/Cli/Commands/MainHelpCommand.cs | 23 ++++ .../Abp/Cli/Commands/NewProjectCommand.cs | 21 +++ .../src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs | 24 ++++ .../Building/DatabaseProvider.cs | 9 ++ .../Building/GithubRepositoryInfo.cs | 25 ++++ .../Building/ProjectBuildContext.cs | 29 ++++ .../Building/ProjectBuildContextExtensions.cs | 20 +++ .../Building/ProjectBuildPipeline.cs | 22 +++ .../Building/ProjectBuildPipelineBuilder.cs | 22 +++ .../Building/ProjectBuildPipelineStep.cs | 7 + .../Building/ProjectBuildRequest.cs | 23 ++++ .../Building/ProjectResult.cs | 7 + .../Steps/CreateProjectResultZipStep.cs | 23 ++++ .../Building/Steps/FileEntryListReadStep.cs | 58 ++++++++ .../Building/Steps/GithubDownloadStep.cs | 33 +++++ .../Steps/NugetReferenceReplaceStep.cs | 113 ++++++++++++++++ .../Steps/RemoveProjectFromSolutionStep.cs | 71 ++++++++++ .../Building/Steps/SolutionRenameStep.cs | 116 ++++++++++++++++ .../SwitchEntityFrameworkCoreToMongoDbStep.cs | 80 +++++++++++ .../Building/Steps/TemplateCodeDeleteStep.cs | 19 +++ .../Building/TemplateInfo.cs | 33 +++++ .../Abp/SolutionTemplating/DownloadInfo.cs | 37 +++++ .../Abp/SolutionTemplating/Files/FileEntry.cs | 126 ++++++++++++++++++ .../Files/FileEntryExtensions.cs | 81 +++++++++++ .../SolutionTemplating/Files/FileEntryList.cs | 13 ++ .../Files/FileEntryListExtensions.cs | 24 ++++ .../Github/GithubManager.cs | 94 +++++++++++++ .../Github/GithubRelease.cs | 21 +++ .../SolutionTemplating/SolutionBuildResult.cs | 15 +++ .../Abp/SolutionTemplating/SolutionBuilder.cs | 64 +++++++++ .../Abp/SolutionTemplating/SolutionName.cs | 50 +++++++ .../SolutionTemplating/StandardVersions.cs | 9 ++ .../Zipping/ZipFileExtensions.cs | 57 ++++++++ .../Volo/Abp/AbpApplicationBase.cs | 2 +- .../Volo.Abp.Cli.Tests.csproj | 15 +++ .../Volo/Abp/Cli/AbpCliTestBase.cs | 7 + .../Volo/Abp/Cli/AbpCliTestModule.cs | 13 ++ .../Cli/CommandLineArgumentParser_Tests.cs | 68 ++++++++++ 50 files changed, 1762 insertions(+), 24 deletions(-) delete mode 100644 framework/src/Volo.Abp.Cli/Program.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineOptions.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/DownloadInfo.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntry.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubManager.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuilder.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionName.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/StandardVersions.cs create mode 100644 framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs create mode 100644 framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj create mode 100644 framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestBase.cs create mode 100644 framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestModule.cs create mode 100644 framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index 10be5a757d..d63ef20752 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.156 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.168 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}" EndProject @@ -219,11 +218,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp", "src\Volo.Abp\Vo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Authentication.JwtBearer", "src\Volo.Abp.AspNetCore.Authentication.JwtBearer\Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj", "{46C6336C-A1D8-4858-98CE-6F4C698C5A77}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Cli", "src\Volo.Abp.Cli\Volo.Abp.Cli.csproj", "{69168816-4394-4DDA-BB6B-C21983D37F0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli", "src\Volo.Abp.Cli\Volo.Abp.Cli.csproj", "{69168816-4394-4DDA-BB6B-C21983D37F0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.FluentValidation", "src\Volo.Abp.FluentValidation\Volo.Abp.FluentValidation.csproj", "{43D5FE61-ECBF-4B16-AD95-0043E18EB93A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FluentValidation", "src\Volo.Abp.FluentValidation\Volo.Abp.FluentValidation.csproj", "{43D5FE61-ECBF-4B16-AD95-0043E18EB93A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.FluentValidation.Tests", "test\Volo.Abp.FluentValidation.Tests\Volo.Abp.FluentValidation.Tests.csproj", "{E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FluentValidation.Tests", "test\Volo.Abp.FluentValidation.Tests\Volo.Abp.FluentValidation.Tests.csproj", "{E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Cli.Tests", "test\Volo.Abp.Cli.Tests\Volo.Abp.Cli.Tests.csproj", "{92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -655,6 +656,10 @@ Global {46C6336C-A1D8-4858-98CE-6F4C698C5A77}.Debug|Any CPU.Build.0 = Debug|Any CPU {46C6336C-A1D8-4858-98CE-6F4C698C5A77}.Release|Any CPU.ActiveCfg = Release|Any CPU {46C6336C-A1D8-4858-98CE-6F4C698C5A77}.Release|Any CPU.Build.0 = Release|Any CPU + {69168816-4394-4DDA-BB6B-C21983D37F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69168816-4394-4DDA-BB6B-C21983D37F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69168816-4394-4DDA-BB6B-C21983D37F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69168816-4394-4DDA-BB6B-C21983D37F0B}.Release|Any CPU.Build.0 = Release|Any CPU {43D5FE61-ECBF-4B16-AD95-0043E18EB93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43D5FE61-ECBF-4B16-AD95-0043E18EB93A}.Debug|Any CPU.Build.0 = Debug|Any CPU {43D5FE61-ECBF-4B16-AD95-0043E18EB93A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -663,10 +668,10 @@ Global {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Release|Any CPU.Build.0 = Release|Any CPU - {69168816-4394-4DDA-BB6B-C21983D37F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69168816-4394-4DDA-BB6B-C21983D37F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69168816-4394-4DDA-BB6B-C21983D37F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69168816-4394-4DDA-BB6B-C21983D37F0B}.Release|Any CPU.Build.0 = Release|Any CPU + {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -778,9 +783,10 @@ Global {575BEFA1-19C2-49B1-8D31-B5D4472328DE} = {447C8A77-E5F0-4538-8687-7383196D04EA} {6C161F55-54B6-42A5-B177-3B0ED50323C1} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {46C6336C-A1D8-4858-98CE-6F4C698C5A77} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {69168816-4394-4DDA-BB6B-C21983D37F0B} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {43D5FE61-ECBF-4B16-AD95-0043E18EB93A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A} = {447C8A77-E5F0-4538-8687-7383196D04EA} - {69168816-4394-4DDA-BB6B-C21983D37F0B} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF} = {447C8A77-E5F0-4538-8687-7383196D04EA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.Cli/Program.cs b/framework/src/Volo.Abp.Cli/Program.cs deleted file mode 100644 index 5e9dcd4006..0000000000 --- a/framework/src/Volo.Abp.Cli/Program.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace Volo.Abp.Cli -{ - public class Program - { - private static void Main(string[] args) - { - Console.WriteLine("Welcome to ABP CLI..! This tool is in development. There is no functionality yet. So, bye bye... ;)"); - } - } -} diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj index 29b80cb98a..fb8b3b9e19 100644 --- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj +++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj @@ -7,6 +7,18 @@ netcoreapp2.2 true abp + + + + + + + + + + + + diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs new file mode 100644 index 0000000000..0b891e1299 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.Domain; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Cli +{ + [DependsOn( + typeof(AbpDddDomainModule) + )] + public class AbpCliModule : AbpModule + { + + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs new file mode 100644 index 0000000000..27108a76c4 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs @@ -0,0 +1,62 @@ +using System.Linq; +using System.Text; +using JetBrains.Annotations; +using Volo.Abp.Cli.Args; + +namespace Volo.Abp.Cli +{ + public class CommandLineArgs + { + [CanBeNull] + public string Command { get; } + + [CanBeNull] + public string Target { get; } + + [NotNull] + public CommandLineOptions Options { get; } + + public CommandLineArgs([CanBeNull] string command = null, [CanBeNull] string target = null) + { + Command = command; + Target = target; + Options = new CommandLineOptions(); + } + + public static CommandLineArgs Empty() + { + return new CommandLineArgs(); + } + + public override string ToString() + { + var sb = new StringBuilder(); + + if (Command != null) + { + sb.AppendLine($"Command: {Command}"); + } + + if (Target != null) + { + sb.AppendLine($"Target: {Target}"); + } + + if (Options.Any()) + { + sb.AppendLine("Options:"); + foreach (var option in Options) + { + sb.AppendLine($" - {option.Key} = {option.Value}"); + } + } + + if (sb.Length <= 0) + { + sb.Append(""); + } + + return sb.ToString(); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs new file mode 100644 index 0000000000..7125699546 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli.Args +{ + public class CommandLineArgumentParser : ICommandLineArgumentParser, ITransientDependency + { + public CommandLineArgs Parse(string[] args) + { + if (args.IsNullOrEmpty()) + { + return CommandLineArgs.Empty(); + } + + var argumentList = args.ToList(); + + //Get command + + var command = argumentList[0]; + argumentList.RemoveAt(0); + + if (!argumentList.Any()) + { + return new CommandLineArgs(command); + } + + //Get target + + var target = argumentList[0]; + if (target.StartsWith("-")) + { + target = null; + } + else + { + argumentList.RemoveAt(0); + } + + if (!argumentList.Any()) + { + return new CommandLineArgs(command, target); + } + + //Get options + + var commandLineArgs = new CommandLineArgs(command, target); + + while (argumentList.Any()) + { + var optionName = ParseOptionName(argumentList[0]); + argumentList.RemoveAt(0); + + if (!argumentList.Any()) + { + commandLineArgs.Options[optionName] = null; + break; + } + + if (IsOptionName(argumentList[0])) + { + commandLineArgs.Options[optionName] = null; + continue; + } + + commandLineArgs.Options[optionName] = argumentList[0]; + argumentList.RemoveAt(0); + } + + return commandLineArgs; + } + + private static bool IsOptionName(string argument) + { + return argument.StartsWith("-") || argument.StartsWith("--"); + } + + private static string ParseOptionName(string argument) + { + if (argument.StartsWith("--")) + { + if (argument.Length <= 2) + { + throw new ArgumentException("Should specify an option name after '--' prefix!"); + } + + return argument.RemovePreFix("--"); + } + + if (argument.StartsWith("-")) + { + if (argument.Length <= 1) + { + throw new ArgumentException("Should specify an option name after '--' prefix!"); + } + + return argument.RemovePreFix("-"); + } + + throw new ArgumentException("Option names should start with '-' or '--'."); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineOptions.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineOptions.cs new file mode 100644 index 0000000000..93f23fdd76 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineOptions.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; + +namespace Volo.Abp.Cli.Args +{ + public class CommandLineOptions : Dictionary + { + + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs new file mode 100644 index 0000000000..c467541210 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs @@ -0,0 +1,7 @@ +namespace Volo.Abp.Cli.Args +{ + public interface ICommandLineArgumentParser + { + CommandLineArgs Parse(string[] args); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs new file mode 100644 index 0000000000..6c51b0cd30 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs @@ -0,0 +1,29 @@ +using System; +using System.Threading.Tasks; +using Volo.Abp.Cli.Args; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli +{ + public class CliService : ITransientDependency + { + protected ICommandLineArgumentParser CommandLineArgumentParser { get; } + protected ICommandSelector CommandSelector { get; } + + public CliService( + ICommandLineArgumentParser commandLineArgumentParser, + ICommandSelector commandSelector) + { + CommandLineArgumentParser = commandLineArgumentParser; + CommandSelector = commandSelector; + } + + public async Task RunAsync(string[] args) + { + var commandLineArgs = CommandLineArgumentParser.Parse(args); + var command = CommandSelector.Select(commandLineArgs); + await command.ExecuteAsync(); + Console.WriteLine(commandLineArgs); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs new file mode 100644 index 0000000000..c5d410f400 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs @@ -0,0 +1,20 @@ +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli +{ + public class CommandSelector : ICommandSelector, ITransientDependency + { + public IConsoleCommand Select(CommandLineArgs commandLineArgs) + { + //TODO: Create options to define commands + //TODO: Get from dependency injection instead of new? + + if (commandLineArgs.Command == "new") + { + return new NewProjectCommand(commandLineArgs); + } + + return new MainHelpCommand(commandLineArgs); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs new file mode 100644 index 0000000000..86d2f1d2f0 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs @@ -0,0 +1,7 @@ +namespace Volo.Abp.Cli +{ + public interface ICommandSelector + { + IConsoleCommand Select(CommandLineArgs commandLineArgs); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs new file mode 100644 index 0000000000..a3e822a160 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; + +namespace Volo.Abp.Cli +{ + public interface IConsoleCommand + { + Task ExecuteAsync(); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs new file mode 100644 index 0000000000..5bb1894229 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs @@ -0,0 +1,23 @@ +using System; +using System.Threading.Tasks; + +namespace Volo.Abp.Cli +{ + public class MainHelpCommand : IConsoleCommand + { + public MainHelpCommand(CommandLineArgs commandLineArgs) + { + + } + + public Task ExecuteAsync() + { + Console.WriteLine("*********** ABP CLI ****************"); + Console.WriteLine(); + Console.WriteLine("Usage:"); + Console.WriteLine(); + Console.WriteLine(" abp [options]"); + return Task.CompletedTask; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs new file mode 100644 index 0000000000..5ef068e5ae --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -0,0 +1,21 @@ +using System; +using System.Threading.Tasks; + +namespace Volo.Abp.Cli +{ + public class NewProjectCommand : IConsoleCommand + { + protected CommandLineArgs CommandLineArgs { get; } + + public NewProjectCommand(CommandLineArgs commandLineArgs) + { + CommandLineArgs = commandLineArgs; + } + + public Task ExecuteAsync() + { + Console.WriteLine("TODO: Create new project"); + return Task.CompletedTask; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs new file mode 100644 index 0000000000..c7f321a8e1 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs @@ -0,0 +1,24 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Threading; + +namespace Volo.Abp.Cli +{ + public class Program + { + private static void Main(string[] args) + { + using (var application = AbpApplicationFactory.Create()) + { + application.Initialize(); + + AsyncHelper.RunSync( + () => application.ServiceProvider + .GetRequiredService() + .RunAsync(args) + ); + + application.Shutdown(); + } + } + } +} diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs new file mode 100644 index 0000000000..1e2e4efc00 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs @@ -0,0 +1,9 @@ +namespace Volo.Abp.SolutionTemplating.Building +{ + public enum DatabaseProvider : byte + { + Irrelevant = 0, + EntityFrameworkCore = 1, + MongoDb = 2 + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs new file mode 100644 index 0000000000..f9d8812076 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs @@ -0,0 +1,25 @@ +using System; + +namespace Volo.Abp.SolutionTemplating.Building +{ + public class GithubRepositoryInfo + { + public string RepositoryNameWithOrganization { get; } + + public string RepositoryName { get; } + + public string AccessToken { get; } + + public GithubRepositoryInfo(string repositoryNameWithOrganization, string accessToken) + { + if (!repositoryNameWithOrganization.Contains("/")) + { + throw new ApplicationException($"{nameof(repositoryNameWithOrganization)} '{repositoryNameWithOrganization}' is not valid! It should be formatted as 'organization-name/repository-name'." ); + } + + RepositoryNameWithOrganization = repositoryNameWithOrganization; + RepositoryName = repositoryNameWithOrganization.Split('/')[1]; + AccessToken = accessToken; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs new file mode 100644 index 0000000000..297e7f056f --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs @@ -0,0 +1,29 @@ +using JetBrains.Annotations; +using Volo.Abp.SolutionTemplating.Files; + +namespace Volo.Abp.SolutionTemplating.Building +{ + public class ProjectBuildContext + { + public ProjectBuildRequest Request { get; } + + public string TemplatesFolder { get; } + + public TemplateInfo Template { get; } + + public FileEntryList Files { get; set; } + + public ProjectResult Result { get; set; } + + public ProjectBuildContext( + [NotNull] TemplateInfo template, + ProjectBuildRequest request, + string templatesFolder) + { + Template = Check.NotNull(template, nameof(template)); + Request = request; + TemplatesFolder = templatesFolder; + Result = new ProjectResult(); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs new file mode 100644 index 0000000000..7178a24238 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs @@ -0,0 +1,20 @@ +using System; +using System.Linq; +using Volo.Abp.SolutionTemplating.Files; + +namespace Volo.Abp.SolutionTemplating.Building +{ + public static class ProjectBuildContextExtensions + { + public static FileEntry GetFile(this ProjectBuildContext context, string filePath) + { + var file = context.Files.FirstOrDefault(f => f.Name == filePath); + if (file == null) + { + throw new ApplicationException("Could not find file: " + filePath); + } + + return file; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs new file mode 100644 index 0000000000..3e2e617517 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; + +namespace Volo.Abp.SolutionTemplating.Building +{ + public class ProjectBuildPipeline + { + public List Steps { get; } + + public ProjectBuildPipeline() + { + Steps = new List(); + } + + public void Execute(ProjectBuildContext context) + { + foreach (var step in Steps) + { + step.Execute(context); + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs new file mode 100644 index 0000000000..41d760e4df --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs @@ -0,0 +1,22 @@ +using Volo.Abp.SolutionTemplating.Building.Steps; + +namespace Volo.Abp.SolutionTemplating.Building +{ + public static class ProjectBuildPipelineBuilder + { + public static ProjectBuildPipeline Build(ProjectBuildContext context) + { + var pipeline = new ProjectBuildPipeline(); + + pipeline.Steps.Add(new GithubDownloadStep()); + pipeline.Steps.Add(new FileEntryListReadStep()); + pipeline.Steps.AddRange(context.Template.GetCustomSteps(context)); + pipeline.Steps.Add(new NugetReferenceReplaceStep()); + pipeline.Steps.Add(new TemplateCodeDeleteStep()); + pipeline.Steps.Add(new SolutionRenameStep()); + pipeline.Steps.Add(new CreateProjectResultZipStep()); + + return pipeline; + } + } +} diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs new file mode 100644 index 0000000000..d6ec90325f --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs @@ -0,0 +1,7 @@ +namespace Volo.Abp.SolutionTemplating.Building +{ + public abstract class ProjectBuildPipelineStep + { + public abstract void Execute(ProjectBuildContext context); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs new file mode 100644 index 0000000000..4f4bec11b8 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs @@ -0,0 +1,23 @@ +namespace Volo.Abp.SolutionTemplating.Building +{ + public class ProjectBuildRequest + { + public SolutionName SolutionName { get; } + + public DatabaseProvider DatabaseProvider { get; } + + public string Version { get; } + + public bool ReplaceLocalReferencesToNuget { get; set; } + + public ProjectBuildRequest( + SolutionName solutionName, + DatabaseProvider databaseProvider, + string version) + { + SolutionName = solutionName; + DatabaseProvider = databaseProvider; + Version = version; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs new file mode 100644 index 0000000000..3afc3e1a17 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs @@ -0,0 +1,7 @@ +namespace Volo.Abp.SolutionTemplating.Building +{ + public class ProjectResult + { + public byte[] ZipContent { get; set; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs new file mode 100644 index 0000000000..88f2558e58 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs @@ -0,0 +1,23 @@ +using Ionic.Zip; +using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.SolutionTemplating.Zipping; + +namespace Volo.Abp.SolutionTemplating.Building.Steps +{ + public class CreateProjectResultZipStep : ProjectBuildPipelineStep + { + public override void Execute(ProjectBuildContext context) + { + context.Result.ZipContent = CreateZipFileFromEntries(context.Files); + } + + private static byte[] CreateZipFileFromEntries(FileEntryList entries) + { + using (var resultZipFile = new ZipFile()) + { + entries.CopyToZipFile(resultZipFile); + return resultZipFile.GetBytes(); + } + } + } +} diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs new file mode 100644 index 0000000000..62ec0d9f66 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs @@ -0,0 +1,58 @@ +using System.IO; +using Ionic.Zip; +using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.SolutionTemplating.Zipping; + +namespace Volo.Abp.SolutionTemplating.Building.Steps +{ + public class FileEntryListReadStep : ProjectBuildPipelineStep + { + public override void Execute(ProjectBuildContext context) + { + if (context.Template.RootPathInZipFile == null) + { + context.Files = GetEntriesFromZipFile(context.Template.FilePath); + return; + } + + var entryListCachePath = CreateCachePath(context); + + if (File.Exists(entryListCachePath)) + { + context.Files = GetEntriesFromZipFile(entryListCachePath); + return; + } + + context.Files = GetEntriesFromZipFile( + context.Template.FilePath, + context.Template.RootPathInZipFile); + + SaveCachedEntries(entryListCachePath, context.Files); + } + + private static FileEntryList GetEntriesFromZipFile(string filePath, string rootFolder = null) + { + using (var templateFileStream = File.OpenRead(filePath)) + { + using (var templateZipFile = ZipFile.Read(templateFileStream)) + { + return templateZipFile.ToFileEntryList(rootFolder); + } + } + } + + private static void SaveCachedEntries(string filePath, FileEntryList entries) + { + using (var resultZipFile = new ZipFile()) + { + entries.CopyToZipFile(resultZipFile); + resultZipFile.Save(filePath); + } + } + + private string CreateCachePath(ProjectBuildContext context) + { + return context.Template.FilePath.Replace(".zip", "-filtered.zip"); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs new file mode 100644 index 0000000000..d34c67ec66 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs @@ -0,0 +1,33 @@ +using System; +using System.IO; +using Volo.Abp.SolutionTemplating.Github; + +namespace Volo.Abp.SolutionTemplating.Building.Steps +{ + public class GithubDownloadStep : ProjectBuildPipelineStep + { + public override void Execute(ProjectBuildContext context) + { + var githubManager = new GithubManager(); + + context.Template.Version = githubManager.GetVersion(context); + + context.Template.FilePath = Path.Combine( + context.TemplatesFolder, + $"{context.Template.Name}-{context.Template.Version}.zip" + ); + + context.Template.RootPathInZipFile = context.Template.GithubRepository.RepositoryName + "-" + context.Template.Version.RemovePreFix("v") + context.Template.RootPathInZipFile; + + try + { + githubManager.DownloadIfNotExist(context); + } + catch (Exception e) + { + throw e; //TODO: !!! + //var existingVersion = githubManager.GetExistingVersion(context); + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs new file mode 100644 index 0000000000..7336dbd397 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs @@ -0,0 +1,113 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using HtmlAgilityPack; +using Volo.Abp.SolutionTemplating.Files; + +namespace Volo.Abp.SolutionTemplating.Building.Steps +{ + public class NugetReferenceReplaceStep : ProjectBuildPipelineStep + { + public override void Execute(ProjectBuildContext context) + { + new NugetReferenceReplacer( + context.Files, + "MyCompanyName", + "MyProjectName", + context.Template.Version + ).Run(); + } + + private class NugetReferenceReplacer + { + private readonly List _entries; + private readonly string _companyNamePlaceHolder; + private readonly string _projectNamePlaceHolder; + private readonly string _latestNugetPackageVersion; + + public NugetReferenceReplacer(List entries, string companyNamePlaceHolder, string projectNamePlaceHolder, string latestNugetPackageVersion) + { + _entries = entries; + _companyNamePlaceHolder = companyNamePlaceHolder; + _projectNamePlaceHolder = projectNamePlaceHolder; + _latestNugetPackageVersion = latestNugetPackageVersion; + } + + public void Run() + { + foreach (var fileEntry in _entries) + { + if (fileEntry.Name.EndsWith(".csproj")) + { + fileEntry.SetContent(ProcessFileContent(fileEntry.Content)); + } + } + } + + private string ProcessFileContent(string content) + { + Check.NotNull(content, nameof(content)); + + var doc = new HtmlDocument(); + + doc.Load(GenerateStreamFromString(content)); + + var nodes = doc.DocumentNode.SelectNodes("//projectreference[@include]"); + + if (nodes == null) + { + return content; + } + + return ProcessReferenceNodes(nodes, content); + } + + private string ProcessReferenceNodes(HtmlNodeCollection nodes, string content) + { + Check.NotNull(nodes, nameof(nodes)); + Check.NotNull(content, nameof(content)); + + foreach (var node in nodes) + { + var valueAttr = node.Attributes.FirstOrDefault(a => a.Name.ToLower() == "include"); + + // ReSharper disable once PossibleNullReferenceException : Can not be null because nodes are selected with include attribute filter in previous method + if (valueAttr.Value.Contains($"{_companyNamePlaceHolder}.{_projectNamePlaceHolder}")) + { + continue; + } + + var newValue = ConvertToNugetReference(valueAttr.Value); + + var oldLine = $" file.Name.StartsWith(_projectFolderPath)); + var solutionFile = context.GetFile(_solutionFilePath); + solutionFile.NormalizeLineEndings(); + solutionFile.SetLines(RemoveProject(solutionFile.GetLines().ToList())); + } + + private List RemoveProject(List solutionFileLines) + { + var projectKey = FindProjectKey(solutionFileLines); + var newSolutionFileLines = new List(); + var firstOccurence = true; + + for (var i = 0; i < solutionFileLines.Count; ++i) + { + if (solutionFileLines[i].Contains(projectKey)) + { + if (firstOccurence) + { + firstOccurence = false; + ++i; //Skip "EndProject" line too. + } + + continue; + } + + newSolutionFileLines.Add(solutionFileLines[i]); + } + + return newSolutionFileLines; + } + + private string FindProjectKey(List solutionFileLines) + { + foreach (var solutionFileLine in solutionFileLines) + { + if (solutionFileLine.Contains(_projectName)) + { + var curlyBracketStartIndex = solutionFileLine.LastIndexOf("{", StringComparison.OrdinalIgnoreCase); + var curlyBracketEndIndex = solutionFileLine.LastIndexOf("}", StringComparison.OrdinalIgnoreCase); + return solutionFileLine.Substring(curlyBracketStartIndex + 1, curlyBracketEndIndex - curlyBracketStartIndex - 1); + } + } + + throw new ApplicationException($"The solution file '{_solutionFilePath}' does not contain a project '{_projectName}'"); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs new file mode 100644 index 0000000000..a45fabfd5b --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Volo.Abp.SolutionTemplating.Files; + +namespace Volo.Abp.SolutionTemplating.Building.Steps +{ + public class SolutionRenameStep : ProjectBuildPipelineStep + { + public override void Execute(ProjectBuildContext context) + { + new SolutionRenamer( + context.Files, + "MyCompanyName", + "MyProjectName", + context.Request.SolutionName.CompanyName, + context.Request.SolutionName.ProjectName + ).Run(); + } + + private class SolutionRenamer + { + private readonly List _entries; + private readonly string _companyNamePlaceHolder; + private readonly string _projectNamePlaceHolder; + + private readonly string _companyName; + private readonly string _projectName; + + public SolutionRenamer(List entries, string companyNamePlaceHolder, string projectNamePlaceHolder, string companyName, string projectName) + { + if (string.IsNullOrWhiteSpace(companyName)) + { + companyName = null; + } + + if (companyNamePlaceHolder == null && companyName != null) + { + throw new UserFriendlyException($"Can not set {nameof(companyName)} if {nameof(companyNamePlaceHolder)} is null."); + } + + _entries = entries; + + _companyNamePlaceHolder = companyNamePlaceHolder; + _projectNamePlaceHolder = projectNamePlaceHolder ?? throw new ArgumentNullException(nameof(projectNamePlaceHolder)); + + _companyName = companyName; + _projectName = projectName ?? throw new ArgumentNullException(nameof(projectName)); + } + + public void Run() + { + if (_companyNamePlaceHolder != null && _companyName != null) + { + RenameDirectoryRecursively(_companyNamePlaceHolder, _companyName); + RenameAllFiles(_companyNamePlaceHolder, _companyName); + ReplaceContent(_companyNamePlaceHolder, _companyName); + } + else if (_companyNamePlaceHolder != null) + { + RenameDirectoryRecursively(_companyNamePlaceHolder + "." + _projectNamePlaceHolder, _projectNamePlaceHolder); + RenameAllFiles(_companyNamePlaceHolder + "." + _projectNamePlaceHolder, _projectNamePlaceHolder); + ReplaceContent(_companyNamePlaceHolder + "." + _projectNamePlaceHolder, _projectNamePlaceHolder); + } + + RenameDirectoryRecursively(_projectNamePlaceHolder, _projectName); + RenameAllFiles(_projectNamePlaceHolder, _projectName); + ReplaceContent(_projectNamePlaceHolder, _projectName); + } + + private void RenameDirectoryRecursively(string placeHolder, string name) + { + foreach (var entry in _entries.Where(e => e.IsDirectory)) + { + if (entry.Name.Contains(placeHolder)) + { + entry.SetName(entry.Name.Replace(placeHolder, name)); + } + } + } + + private void RenameAllFiles(string placeHolder, string name) + { + foreach (var entry in _entries.Where(e => !e.IsDirectory)) + { + if (entry.Name.Contains(placeHolder)) + { + entry.SetName(entry.Name.Replace(placeHolder, name)); + } + } + } + + private void ReplaceContent(string placeHolder, string name) + { + foreach (var entry in _entries.Where(e => !e.IsDirectory)) + { + if (entry.Content.Length < placeHolder.Length) + { + continue; + } + + if (entry.IsBinaryFile) + { + continue; + } + + var newContent = entry.Content.Replace(placeHolder, name); + if (newContent != entry.Content) + { + entry.SetContent(newContent); + } + } + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs new file mode 100644 index 0000000000..64e1b44c11 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs @@ -0,0 +1,80 @@ +using System; +using Volo.Abp.SolutionTemplating.Files; + +namespace Volo.Abp.SolutionTemplating.Building.Steps +{ + public class SwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPipelineStep + { + public override void Execute(ProjectBuildContext context) + { + ChangeProjectReference(context); + ChangeWebModuleUsage(context); + ChangeConnectionString(context); + } + + private void ChangeProjectReference(ProjectBuildContext context) + { + var file = context.GetFile("/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj"); + + file.NormalizeLineEndings(); + + var lines = file.GetLines(); + for (var i = 0; i < lines.Length; i++) + { + if (lines[i].Contains("ProjectReference") && lines[i].Contains("MyCompanyName.MyProjectName.EntityFrameworkCore")) + { + lines[i] = lines[i].Replace("EntityFrameworkCore", "MongoDB"); + file.SetLines(lines); + return; + } + } + + throw new ApplicationException("Could not find the EntityFrameworkCore reference in the MyCompanyName.MyProjectName.Web.csproj!"); + } + + private void ChangeWebModuleUsage(ProjectBuildContext context) + { + var file = context.GetFile("/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs"); + + file.NormalizeLineEndings(); + + file.RemoveTemplateCodeIfNot("EntityFrameworkCore"); + + var lines = file.GetLines(); + + for (var i = 0; i < lines.Length; i++) + { + if (lines[i].Contains("using MyCompanyName.MyProjectName.EntityFrameworkCore")) + { + lines[i] = "using MyCompanyName.MyProjectName.MongoDb;"; + } + else if (lines[i].Contains("MyProjectNameEntityFrameworkCoreModule")) + { + lines[i] = lines[i].Replace("MyProjectNameEntityFrameworkCoreModule", "MyProjectNameMongoDbModule"); + } + } + + file.SetLines(lines); + } + + private void ChangeConnectionString(ProjectBuildContext context) + { + var file = context.GetFile("/src/MyCompanyName.MyProjectName.Web/appsettings.json"); + + file.NormalizeLineEndings(); + + var lines = file.GetLines(); + for (var i = 0; i < lines.Length; i++) + { + if (lines[i].Contains("Default") && lines[i].Contains("Database")) + { + lines[i] = " \"Default\": \"mongodb://localhost:27017|MyProjectName\""; + file.SetLines(lines); + return; + } + } + + throw new ApplicationException("Could not find the 'Default' connection string in appsettings.json file!"); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs new file mode 100644 index 0000000000..e35e11d441 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs @@ -0,0 +1,19 @@ +using Volo.Abp.SolutionTemplating.Files; + +namespace Volo.Abp.SolutionTemplating.Building.Steps +{ + public class TemplateCodeDeleteStep : ProjectBuildPipelineStep + { + public override void Execute(ProjectBuildContext context) + { + foreach (var file in context.Files) + { + if (file.Name.EndsWith(".cs")) //TODO: Why only cs! + { + file.RemoveTemplateCode(); + file.RemoveTemplateCodeMarkers(); + } + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs new file mode 100644 index 0000000000..0bdccd3d00 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; + +namespace Volo.Abp.SolutionTemplating.Building +{ + public abstract class TemplateInfo + { + public string Name { get; set; } + + public GithubRepositoryInfo GithubRepository { get; } + + public string FilePath { get; set; } + + public string RootPathInZipFile { get; set; } + + public string Version { get; set; } + + protected TemplateInfo( + string name, + GithubRepositoryInfo githubRepository, + string rootPathInZipFile) + { + Name = name; + GithubRepository = githubRepository; + RootPathInZipFile = rootPathInZipFile; + } + + public virtual IEnumerable GetCustomSteps(ProjectBuildContext context) + { + return Array.Empty(); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/DownloadInfo.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/DownloadInfo.cs new file mode 100644 index 0000000000..0865e1175c --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/DownloadInfo.cs @@ -0,0 +1,37 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.SolutionTemplating.Building; + +namespace Volo.Abp.SolutionTemplating +{ + [Table("Downloads")] + public class DownloadInfo : CreationAuditedAggregateRoot + { + [Required] + [StringLength(128)] + public string ProjectName { get; set; } + + [Required] + [StringLength(42)] + public string TemplateName { get; set; } + + [Required] + public DatabaseProvider DatabaseProvider { get; set; } + + [Required] + [StringLength(20)] + public string Version { get; set; } + + public int CreationDuration { get; set; } + + public DownloadInfo(string projectName, string templateName, DatabaseProvider databaseProvider, string version, int creationDuration) + { + ProjectName = projectName; + TemplateName = templateName; + DatabaseProvider = databaseProvider; + Version = version; + CreationDuration = creationDuration; + } + } +} diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntry.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntry.cs new file mode 100644 index 0000000000..7f808ad4cf --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntry.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Volo.Abp.SolutionTemplating.Files +{ + public class FileEntry + { + private static string[] BinaryFileExtensions = { + ".exe", ".dll", ".bin", + ".suo", ".obj", ".pdb", + ".png", "jpg", "jpeg", ".ico" + ,".woff", ".woff2", ".eot", ".svg", ".ttf" + }; + + public string Name { get; private set; } + + public bool IsDirectory { get; } + + public Encoding Encoding { get; } + + public byte[] Bytes { get; private set; } + + public string Content { get; private set; } + + public bool IsBinaryFile { get; private set; } + + public FileEntry(string name, byte[] bytes, bool isDirectory) + { + Name = name; + Bytes = bytes; + IsDirectory = isDirectory; + + Encoding = CalculateEncoding(); + Content = Encoding.GetString(bytes); + IsBinaryFile = CalculateIsBinaryFile(); + } + + public void SetContent(string fileContent) + { + Content = fileContent; + Bytes = Encoding.GetBytes(fileContent); + } + + public string[] GetLines() + { + return Content.Split(new[] { Environment.NewLine, "\n" }, StringSplitOptions.None); + } + + public void SetLines(IEnumerable lines) + { + SetContent(lines.JoinAsString(Environment.NewLine)); + } + + public void SetName(string fileName) + { + Name = fileName; + IsBinaryFile = CalculateIsBinaryFile(); + } + + public void NormalizeLineEndings() + { + if (Content.IsNullOrEmpty()) + { + return; + } + + SetContent(Content.NormalizeLineEndings()); + } + + public override string ToString() + { + var str = new StringBuilder(Name); + + if (IsDirectory) + { + str.Append(" [DIR]"); + } + + str.Append($" [{Bytes.Length}]"); + + return str.ToString(); + } + + private Encoding CalculateEncoding() + { + if (Bytes.IsNullOrEmpty()) + { + return Encoding.ASCII; + } + + if (Bytes[0] == 0x2b && Bytes[1] == 0x2f && Bytes[2] == 0x76) + { + return Encoding.UTF7; + } + + if (Bytes[0] == 0xef && Bytes[1] == 0xbb && Bytes[2] == 0xbf) + { + return Encoding.UTF8; + } + + if (Bytes[0] == 0xff && Bytes[1] == 0xfe) + { + return Encoding.Unicode; //UTF-16LE + } + + if (Bytes[0] == 0xfe && Bytes[1] == 0xff) + { + return Encoding.BigEndianUnicode; //UTF-16BE + } + + if (Bytes[0] == 0 && Bytes[1] == 0 && Bytes[2] == 0xfe && Bytes[3] == 0xff) + { + return Encoding.UTF32; + } + + return Encoding.UTF8; + } + + private bool CalculateIsBinaryFile() + { + return BinaryFileExtensions.Any(ext => Name.EndsWith(ext)); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs new file mode 100644 index 0000000000..999e8a9353 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs @@ -0,0 +1,81 @@ +using System.Collections.Generic; + +namespace Volo.Abp.SolutionTemplating.Files +{ + public static class FileEntryExtensions + { + public static void RemoveTemplateCode(this FileEntry file) + { + RemoveMarkedTemplateCode(file, ""); + } + + public static void RemoveTemplateCodeIf(this FileEntry file, string condition) + { + RemoveByCondition(file, "IF", condition); + } + + public static void RemoveTemplateCodeIfNot(this FileEntry file, string condition) + { + RemoveByCondition(file, "IF-NOT", condition); + } + + public static void RemoveTemplateCodeMarkers(this FileEntry file) + { + file.NormalizeLineEndings(); + + var lines = file.GetLines(); + var newLines = new List(); + + for (int i = 0; i < lines.Length; i++) + { + if (lines[i].Contains("")) + { + //TODO: What if we use inline like: some-code + //TODO: This logic skips the code in that case. Should handle it + ++i; + } + + if (i < lines.Length) + { + newLines.Add(lines[i]); + } + } + + file.SetLines(newLines); + } + + private static void RemoveByCondition(this FileEntry file, string conditionName, string condition) + { + RemoveMarkedTemplateCode(file, $""); + } + + private static void RemoveMarkedTemplateCode(this FileEntry file, string beginMark) + { + file.NormalizeLineEndings(); + + var lines = file.GetLines(); + var newLines = new List(); + + for (int i = 0; i < lines.Length; i++) + { + if (lines[i].Contains(beginMark)) + { + while (!lines[i].Contains("") && i < lines.Length) + { + ++i; + } + + ++i; + } + + if (i < lines.Length) + { + newLines.Add(lines[i]); + } + } + + file.SetLines(newLines); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs new file mode 100644 index 0000000000..17b7b757ba --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; + +namespace Volo.Abp.SolutionTemplating.Files +{ + public class FileEntryList : List + { + public FileEntryList(IEnumerable entries) + : base(entries) + { + + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs new file mode 100644 index 0000000000..01acdf297b --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs @@ -0,0 +1,24 @@ +using System; +using Ionic.Zip; + +namespace Volo.Abp.SolutionTemplating.Files +{ + public static class FileEntryListExtensions + { + public static void CopyToZipFile(this FileEntryList fileEntryList, ZipFile zipFile) + { + foreach (var entry in fileEntryList) + { + try + { + zipFile.AddEntry(entry.Name, entry.Bytes); + } + catch (Exception e) + { + Console.WriteLine(e); + throw; + } + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubManager.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubManager.cs new file mode 100644 index 0000000000..fbe0801ffd --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubManager.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Newtonsoft.Json; +using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.Threading; + +namespace Volo.Abp.SolutionTemplating.Github +{ + public class GithubManager + { + private static readonly object LockObject = new object(); + + public string GetVersion(ProjectBuildContext context) + { + if (context.Request.Version.StartsWith("Branch:", StringComparison.OrdinalIgnoreCase)) + { + //TODO: Should not cache branch files! + return context.Request.Version.Substring("Branch:".Length); + } + + var url = "https://api.github.com/repos/" + context.Template.GithubRepository.RepositoryNameWithOrganization + "/releases"; + + using (var client = new System.Net.Http.HttpClient()) + { + var credentials = string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}:", context.Template.GithubRepository.AccessToken); + credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(credentials)); + + client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials); + client.Timeout = TimeSpan.FromMinutes(30); + + client.DefaultRequestHeaders.UserAgent.ParseAdd("MyAgent/1.0"); + var releases = JsonConvert.DeserializeObject>(client.GetStringAsync(url).Result); + + if (context.Request.Version == StandardVersions.LatestUnstable) + { + return releases.FirstOrDefault(r => !r.IsPrerelease)?.Name; + } + + return releases.FirstOrDefault()?.Name; + } + } + + public void DownloadIfNotExist(ProjectBuildContext context) + { + using (var client = new System.Net.Http.HttpClient()) + { + if (File.Exists(context.Template.FilePath)) + { + return; + } + + lock (LockObject) + { + if (File.Exists(context.Template.FilePath)) + { + return; + } + + var downloadUrl = "https://github.com/" + context.Template.GithubRepository.RepositoryNameWithOrganization + "/archive/" + context.Template.Version + ".zip"; + + var credentials = string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}:", context.Template.GithubRepository.AccessToken); + credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(credentials)); + + client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials); + client.Timeout = TimeSpan.FromMinutes(30); + + var fileContents = AsyncHelper.RunSync(() => client.GetByteArrayAsync(downloadUrl)); + + File.WriteAllBytes(context.Template.FilePath, fileContents); + } + } + } + + //public string GetExistingVersion(ProjectBuildContext context) + //{ + // var directoryInfo = new DirectoryInfo(templateRootPath); + // var existingFileName = directoryInfo.GetFiles().FirstOrDefault(f => f.Name.StartsWith(repositoryName))?.Name; + // var latestVersion = ""; + + // if (existingFileName != null) + // { + // var pFrom = existingFileName.IndexOf(repositoryName + "-", StringComparison.Ordinal) + (repositoryName + "-").Length; + // var pTo = existingFileName.LastIndexOf(".zip", StringComparison.Ordinal); + + // latestVersion = existingFileName.Substring(pFrom, pTo - pFrom); + // } + + // return latestVersion; + //} + } +} diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs new file mode 100644 index 0000000000..4e5ea612fe --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs @@ -0,0 +1,21 @@ +using System; +using Newtonsoft.Json; + +namespace Volo.Abp.SolutionTemplating.Github +{ + [JsonObject] + public class GithubRelease + { + [JsonProperty("id")] + public int Id { get; set; } + + [JsonProperty("name")] + public string Name { get; set; } + + [JsonProperty("prerelease")] + public bool IsPrerelease { get; set; } + + [JsonProperty("published_at")] + public DateTime PublishTime { get; set; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs new file mode 100644 index 0000000000..77628e9767 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs @@ -0,0 +1,15 @@ +namespace Volo.Abp.SolutionTemplating +{ + public class SolutionBuildResult + { + public byte[] ZipContent { get; } + + public string ProjectName { get; } + + public SolutionBuildResult(byte[] zipContent, string projectName) + { + ZipContent = zipContent; + ProjectName = projectName; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuilder.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuilder.cs new file mode 100644 index 0000000000..736ffad678 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuilder.cs @@ -0,0 +1,64 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.SolutionTemplating.Building; + +namespace Volo.Abp.SolutionTemplating +{ + public class SolutionBuilder : ITransientDependency + { + private readonly IHostingEnvironment _hostingEnvironment; + private readonly IRepository _downloadRepository; + + public SolutionBuilder( + IHostingEnvironment hostingEnvironment, + IRepository downloadRepository) + { + _hostingEnvironment = hostingEnvironment; + _downloadRepository = downloadRepository; + } + + public async Task BuildAsync( + TemplateInfo template, + string companyAndProjectName, + DatabaseProvider databaseProvider, + string version, + bool replaceLocalReferencesToNuget) + { + var stopwatch = Stopwatch.StartNew(); + + var templateRootPath = Path.Combine(_hostingEnvironment.ContentRootPath, "TemplateFiles"); //TODO: To another folder that is not in the deployment folder! + var solutionName = SolutionName.Parse(companyAndProjectName); + + var context = new ProjectBuildContext( + template, + new ProjectBuildRequest( + solutionName, + databaseProvider, + version + ), + templateRootPath + ); + + ProjectBuildPipelineBuilder.Build(context).Execute(context); + + stopwatch.Stop(); + + await _downloadRepository.InsertAsync( + new DownloadInfo( + solutionName.FullName, + template.Name, + databaseProvider, + context.Template.Version, + Convert.ToInt32(stopwatch.Elapsed.TotalMilliseconds) + ) + ); + + return new SolutionBuildResult(context.Result.ZipContent, solutionName.ProjectName); + } + } +} diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionName.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionName.cs new file mode 100644 index 0000000000..63ec52a432 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionName.cs @@ -0,0 +1,50 @@ +using System; + +namespace Volo.Abp.SolutionTemplating +{ + public class SolutionName + { + public string FullName { get; } + + public string CompanyName { get; } + + public string ProjectName { get; } + + private SolutionName(string fullName, string companyName, string projectName) + { + FullName = fullName; + CompanyName = companyName; + ProjectName = projectName; + } + + public static SolutionName Parse(string fullName) + { + if (fullName.Length < 1) + { + throw new UserFriendlyException("Solution name is not valid. It should be 1 character length at minimum."); + } + + string companyName = null; + var projectName = fullName; + + if (fullName.Contains(".")) + { + var lastDotIndex = fullName.LastIndexOf(".", StringComparison.OrdinalIgnoreCase); + companyName = fullName.Substring(0, lastDotIndex); + projectName = fullName.Substring(lastDotIndex + 1); + + if (companyName.Length < 1) + { + throw new UserFriendlyException("Solution name is not valid. Company name should be 1 character length at minimum."); + } + + if (projectName.Length < 1) + { + throw new UserFriendlyException("Solution name is not valid. Project name should be 1 character length at minimum."); + } + } + + return new SolutionName(fullName, companyName, projectName); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/StandardVersions.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/StandardVersions.cs new file mode 100644 index 0000000000..df7b8b2e39 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/StandardVersions.cs @@ -0,0 +1,9 @@ +namespace Volo.Abp.SolutionTemplating +{ + public static class StandardVersions + { + public const string LatestStable = "LatestStable"; + + public const string LatestUnstable = "LatestUnstable"; + } +} diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs new file mode 100644 index 0000000000..e4e5290194 --- /dev/null +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Ionic.Zip; +using Volo.Abp.SolutionTemplating.Files; + +namespace Volo.Abp.SolutionTemplating.Zipping +{ + public static class ZipFileExtensions + { + public static byte[] GetBytes(this ZipFile zipFile) + { + using (var ms = new MemoryStream()) + { + zipFile.Save(ms); + return ms.ToArray(); + } + } + + public static FileEntryList ToFileEntryList(this ZipFile zipFile, string rootFolder = null) + { + var zipEntries = zipFile.Entries; + + if (rootFolder != null) + { + zipEntries = zipEntries.Where(entry => entry.FileName.StartsWith(rootFolder)).ToList(); + } + + var fileEntries = new List(); + + foreach (var zipEntry in zipEntries) + { + using (var entryStream = zipEntry.OpenReader()) + { + var fileName = zipEntry.FileName; + + if (rootFolder != null) + { + fileName = fileName.RemovePreFix(rootFolder); + } + + if (fileName.IsNullOrEmpty()) + { + continue; + } + + fileName = fileName.EnsureStartsWith('/'); + + fileEntries.Add(new FileEntry(fileName, entryStream.GetAllBytes(), zipEntry.IsDirectory)); + } + } + + return new FileEntryList(fileEntries); + } + } +} diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs index a4862789f2..8036760f6a 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs @@ -56,7 +56,7 @@ namespace Volo.Abp public virtual void Dispose() { - + //TODO: Shutdown if not done before? } protected virtual void SetServiceProvider(IServiceProvider serviceProvider) diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj b/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj new file mode 100644 index 0000000000..915cb58607 --- /dev/null +++ b/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj @@ -0,0 +1,15 @@ + + + + netcoreapp2.2 + latest + + + + + + + + + + diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestBase.cs b/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestBase.cs new file mode 100644 index 0000000000..6f6393b7ae --- /dev/null +++ b/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestBase.cs @@ -0,0 +1,7 @@ +namespace Volo.Abp.Cli +{ + public class AbpCliTestBase : AbpIntegratedTest + { + + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestModule.cs b/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestModule.cs new file mode 100644 index 0000000000..8c2101052b --- /dev/null +++ b/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp.Cli +{ + [DependsOn( + typeof(AbpTestBaseModule), + typeof(AbpCliModule) + )] + public class AbpCliTestModule : AbpModule + { + + } +} diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs b/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs new file mode 100644 index 0000000000..c8d31990cf --- /dev/null +++ b/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs @@ -0,0 +1,68 @@ +using Shouldly; +using System.Linq; +using Volo.Abp.Cli.Args; +using Xunit; + +namespace Volo.Abp.Cli +{ + public class CommandLineArgumentParser_Tests : AbpCliTestBase + { + private readonly ICommandLineArgumentParser _commandLineArgumentParser; + + public CommandLineArgumentParser_Tests() + { + _commandLineArgumentParser = GetRequiredService(); + } + + [Theory] + [InlineData(null)] + [InlineData(new object[] { new string[0] })] + public void Should_Parse_Empty_Arguments(string[] args) + { + var commandLineArgs = _commandLineArgumentParser.Parse(args); + commandLineArgs.Command.ShouldBeNull(); + commandLineArgs.Target.ShouldBeNull(); + commandLineArgs.Options.Any().ShouldBeFalse(); + } + + [Fact] + public void Should_Work_With_Only_Command() + { + var commandLineArgs = _commandLineArgumentParser.Parse(new[] { "mycommand" }); + commandLineArgs.Command.ShouldBe("mycommand"); + commandLineArgs.Target.ShouldBeNull(); + commandLineArgs.Options.Any().ShouldBeFalse(); + } + + [Fact] + public void Should_Work_With_Command_And_Target() + { + var commandLineArgs = _commandLineArgumentParser.Parse(new[] { "mycommand", "mytarget" }); + commandLineArgs.Command.ShouldBe("mycommand"); + commandLineArgs.Target.ShouldBe("mytarget"); + commandLineArgs.Options.Any().ShouldBeFalse(); + } + + [Fact] + public void Should_Work_With_Command_And_Target_And_Options() + { + var commandLineArgs = _commandLineArgumentParser.Parse(new[] + { + "mycommand", "mytarget", "-a", "value1", "-b", "--optionC", "value2" + }); + + commandLineArgs.Command.ShouldBe("mycommand"); + commandLineArgs.Target.ShouldBe("mytarget"); + commandLineArgs.Options.Any().ShouldBeTrue(); + + commandLineArgs.Options.ShouldContainKey("a"); + commandLineArgs.Options["a"].ShouldBe("value1"); + + commandLineArgs.Options.ShouldContainKey("b"); + commandLineArgs.Options["b"].ShouldBeNull(); + + commandLineArgs.Options.ShouldContainKey("optionC"); + commandLineArgs.Options["optionC"].ShouldBe("value2"); + } + } +} From 3fa617b092cb14232e6c618a98fef87448f09b6b Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 18 Apr 2019 18:49:32 +0300 Subject: [PATCH 002/335] Fix namespaces --- .../Volo/Abp/Cli/Args/CommandLineArgs.cs | 3 +- .../Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs | 21 ++++++++---- .../Volo/Abp/Cli/Commands/CommandSelector.cs | 12 ++++--- .../Volo/Abp/Cli/Commands/ICommandSelector.cs | 7 ++-- .../Volo/Abp/Cli/Commands/IConsoleCommand.cs | 5 +-- .../Volo/Abp/Cli/Commands/MainHelpCommand.cs | 13 +++---- .../Abp/Cli/Commands/NewProjectCommand.cs | 34 +++++++++++++++---- 7 files changed, 63 insertions(+), 32 deletions(-) diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs index 27108a76c4..624c96afe5 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs @@ -1,9 +1,8 @@ using System.Linq; using System.Text; using JetBrains.Annotations; -using Volo.Abp.Cli.Args; -namespace Volo.Abp.Cli +namespace Volo.Abp.Cli.Args { public class CommandLineArgs { diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs index 6c51b0cd30..d76216b300 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs @@ -1,6 +1,8 @@ -using System; +using Microsoft.Extensions.DependencyInjection; +using System; using System.Threading.Tasks; using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.Commands; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli @@ -9,21 +11,28 @@ namespace Volo.Abp.Cli { protected ICommandLineArgumentParser CommandLineArgumentParser { get; } protected ICommandSelector CommandSelector { get; } + public IHybridServiceScopeFactory ServiceScopeFactory { get; } public CliService( - ICommandLineArgumentParser commandLineArgumentParser, - ICommandSelector commandSelector) + ICommandLineArgumentParser commandLineArgumentParser, + ICommandSelector commandSelector, + IHybridServiceScopeFactory serviceScopeFactory) { CommandLineArgumentParser = commandLineArgumentParser; CommandSelector = commandSelector; + ServiceScopeFactory = serviceScopeFactory; } public async Task RunAsync(string[] args) { var commandLineArgs = CommandLineArgumentParser.Parse(args); - var command = CommandSelector.Select(commandLineArgs); - await command.ExecuteAsync(); - Console.WriteLine(commandLineArgs); + var commandType = CommandSelector.Select(commandLineArgs); + + using (var scope = ServiceScopeFactory.CreateScope()) + { + var command = (IConsoleCommand)scope.ServiceProvider.GetRequiredService(commandType); + await command.ExecuteAsync(commandLineArgs); + } } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs index c5d410f400..32268540a7 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs @@ -1,20 +1,22 @@ -using Volo.Abp.DependencyInjection; +using System; +using Volo.Abp.Cli.Args; +using Volo.Abp.DependencyInjection; -namespace Volo.Abp.Cli +namespace Volo.Abp.Cli.Commands { public class CommandSelector : ICommandSelector, ITransientDependency { - public IConsoleCommand Select(CommandLineArgs commandLineArgs) + public Type Select(CommandLineArgs commandLineArgs) { //TODO: Create options to define commands //TODO: Get from dependency injection instead of new? if (commandLineArgs.Command == "new") { - return new NewProjectCommand(commandLineArgs); + return typeof(NewProjectCommand); } - return new MainHelpCommand(commandLineArgs); + return typeof(MainHelpCommand); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs index 86d2f1d2f0..507f8ab452 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs @@ -1,7 +1,10 @@ -namespace Volo.Abp.Cli +using System; +using Volo.Abp.Cli.Args; + +namespace Volo.Abp.Cli.Commands { public interface ICommandSelector { - IConsoleCommand Select(CommandLineArgs commandLineArgs); + Type Select(CommandLineArgs commandLineArgs); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs index a3e822a160..2b1129aab2 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs @@ -1,9 +1,10 @@ using System.Threading.Tasks; +using Volo.Abp.Cli.Args; -namespace Volo.Abp.Cli +namespace Volo.Abp.Cli.Commands { public interface IConsoleCommand { - Task ExecuteAsync(); + Task ExecuteAsync(CommandLineArgs commandLineArgs); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs index 5bb1894229..d06dcade91 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs @@ -1,16 +1,13 @@ using System; using System.Threading.Tasks; +using Volo.Abp.Cli.Args; +using Volo.Abp.DependencyInjection; -namespace Volo.Abp.Cli +namespace Volo.Abp.Cli.Commands { - public class MainHelpCommand : IConsoleCommand + public class MainHelpCommand : ITransientDependency { - public MainHelpCommand(CommandLineArgs commandLineArgs) - { - - } - - public Task ExecuteAsync() + public Task ExecuteAsync(CommandLineArgs commandLineArgs) { Console.WriteLine("*********** ABP CLI ****************"); Console.WriteLine(); diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs index 5ef068e5ae..92ce6fc6f7 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -1,21 +1,41 @@ using System; using System.Threading.Tasks; +using Volo.Abp.Cli.Args; +using Volo.Abp.DependencyInjection; +using Volo.Abp.SolutionTemplating; +using Volo.Abp.SolutionTemplating.Building; -namespace Volo.Abp.Cli +namespace Volo.Abp.Cli.Commands { - public class NewProjectCommand : IConsoleCommand + public class NewProjectCommand : IConsoleCommand, ITransientDependency { - protected CommandLineArgs CommandLineArgs { get; } + protected SolutionBuilder SolutionBuilder { get; } - public NewProjectCommand(CommandLineArgs commandLineArgs) + public NewProjectCommand(SolutionBuilder solutionBuilder) { - CommandLineArgs = commandLineArgs; + SolutionBuilder = solutionBuilder; } - public Task ExecuteAsync() + public async Task ExecuteAsync(CommandLineArgs commandLineArgs) { + if (commandLineArgs.Target == null) + { + Console.WriteLine("Project name is missing."); + Console.WriteLine("Usage:"); + Console.WriteLine(" abp new "); + Console.WriteLine("Example:"); + Console.WriteLine(" abp new Acme.BookStore"); + } + Console.WriteLine("TODO: Create new project"); - return Task.CompletedTask; + + //await SolutionBuilder.BuildAsync( + // null, + // commandLineArgs.Target, + // DatabaseProvider.EntityFrameworkCore, + // "...", + // true + //); } } } \ No newline at end of file From 8eff57d67ddee7ebe1979b42634ab2c63c4c6842 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 19 Apr 2019 16:29:17 +0300 Subject: [PATCH 003/335] Resolves #958 --- .../SettingManagementMainMenuContributor.cs | 31 +++++++++++++++---- .../ISettingPageContributor.cs | 2 ++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs index 79ed300398..9e7427a221 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using System; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; using System.Linq; @@ -11,17 +12,22 @@ namespace Volo.Abp.SettingManagement.Web.Navigation { public class SettingManagementMainMenuContributor : IMenuContributor { - public Task ConfigureMenuAsync(MenuConfigurationContext context) + public async Task ConfigureMenuAsync(MenuConfigurationContext context) { if (context.Menu.Name != StandardMenus.Main) { - return Task.CompletedTask; + return; } + var settingManagementPageOptions = context.ServiceProvider.GetRequiredService>().Value; - if (!settingManagementPageOptions.Contributors.Any()) + var settingPageCreationContext = new SettingPageCreationContext(context.ServiceProvider); + if ( + !settingManagementPageOptions.Contributors.Any() + || !(await CheckAnyOfPagePermissionsGranted(settingManagementPageOptions, settingPageCreationContext)) + ) { - return Task.CompletedTask; + return; } var l = context.ServiceProvider.GetRequiredService>(); @@ -36,8 +42,21 @@ namespace Volo.Abp.SettingManagement.Web.Navigation icon: "fa fa-cog" ) ); + + } - return Task.CompletedTask; + private async Task CheckAnyOfPagePermissionsGranted( + SettingManagementPageOptions settingManagementPageOptions, + SettingPageCreationContext settingPageCreationContext) + { + foreach (var contributor in settingManagementPageOptions.Contributors) + { + if (await contributor.CheckPermissionsAsync(settingPageCreationContext)) + { + return true; + } + } + return false; } } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs index e641ee2ade..f6260cc816 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/ISettingPageContributor.cs @@ -5,5 +5,7 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement public interface ISettingPageContributor { Task ConfigureAsync(SettingPageCreationContext context); + + Task CheckPermissionsAsync(SettingPageCreationContext context); } } \ No newline at end of file From 6acca095f92c63db228bb30bcb8a93710abd57e0 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 19 Apr 2019 16:30:38 +0300 Subject: [PATCH 004/335] Update SettingManagementMainMenuContributor.cs --- .../Navigation/SettingManagementMainMenuContributor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs index 9e7427a221..4bbb0f0bfd 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs @@ -23,8 +23,8 @@ namespace Volo.Abp.SettingManagement.Web.Navigation var settingManagementPageOptions = context.ServiceProvider.GetRequiredService>().Value; var settingPageCreationContext = new SettingPageCreationContext(context.ServiceProvider); if ( - !settingManagementPageOptions.Contributors.Any() - || !(await CheckAnyOfPagePermissionsGranted(settingManagementPageOptions, settingPageCreationContext)) + !settingManagementPageOptions.Contributors.Any() || + !(await CheckAnyOfPagePermissionsGranted(settingManagementPageOptions, settingPageCreationContext)) ) { return; From 859a001a037ef60df9c1237ae89087adbd3590a0 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 19 Apr 2019 16:30:59 +0300 Subject: [PATCH 005/335] Update NewProjectCommand.cs --- .../Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs index 92ce6fc6f7..b3051ea700 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -20,14 +20,16 @@ namespace Volo.Abp.Cli.Commands { if (commandLineArgs.Target == null) { - Console.WriteLine("Project name is missing."); + Console.WriteLine("Solution name is missing."); Console.WriteLine("Usage:"); Console.WriteLine(" abp new "); Console.WriteLine("Example:"); Console.WriteLine(" abp new Acme.BookStore"); + return; } - Console.WriteLine("TODO: Create new project"); + Console.WriteLine("Creating a new solution"); + Console.WriteLine("Solution name: " + commandLineArgs.Target); //await SolutionBuilder.BuildAsync( // null, From d94b8625ddae53a461b6d3024a4dd3c20faf2be7 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 22 Apr 2019 09:00:26 +0300 Subject: [PATCH 006/335] Resolves #1028 --- .../Services/AsyncCrudAppService.cs | 22 +++++++++---------- .../Application/Services/CrudAppService.cs | 22 +++++++++---------- .../Services/CrudAppServiceBase.cs | 10 ++++----- .../Application/Services/ICrudAppService.cs | 2 +- .../Application/PersonAppService_Tests.cs | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs index 36c4780672..6e3b476b5c 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs @@ -20,8 +20,8 @@ namespace Volo.Abp.Application.Services } } - public abstract class AsyncCrudAppService - : AsyncCrudAppService + public abstract class AsyncCrudAppService + : AsyncCrudAppService where TEntity : class, IEntity where TEntityDto : IEntityDto { @@ -32,8 +32,8 @@ namespace Volo.Abp.Application.Services } } - public abstract class AsyncCrudAppService - : AsyncCrudAppService + public abstract class AsyncCrudAppService + : AsyncCrudAppService where TEntity : class, IEntity where TEntityDto : IEntityDto { @@ -44,9 +44,9 @@ namespace Volo.Abp.Application.Services } } - public abstract class AsyncCrudAppService - : CrudAppServiceBase, - IAsyncCrudAppService + public abstract class AsyncCrudAppService + : CrudAppServiceBase, + IAsyncCrudAppService where TEntity : class, IEntity where TEntityDto : IEntityDto { @@ -66,9 +66,9 @@ namespace Volo.Abp.Application.Services return MapToEntityDto(entity); } - public virtual async Task> GetListAsync(TGetAllInput input) + public virtual async Task> GetListAsync(TGetListInput input) { - await CheckGetAllPolicyAsync(); + await CheckGetListPolicyAsync(); var query = CreateFilteredQuery(input); @@ -128,9 +128,9 @@ namespace Volo.Abp.Application.Services await CheckPolicyAsync(GetPolicyName); } - protected virtual async Task CheckGetAllPolicyAsync() + protected virtual async Task CheckGetListPolicyAsync() { - await CheckPolicyAsync(GetAllPolicyName); + await CheckPolicyAsync(GetListPolicyName); } protected virtual async Task CheckCreatePolicyAsync() diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs index 8127e88f23..1fd6f869ff 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs @@ -17,8 +17,8 @@ namespace Volo.Abp.Application.Services } } - public abstract class CrudAppService - : CrudAppService + public abstract class CrudAppService + : CrudAppService where TEntity : class, IEntity where TEntityDto : IEntityDto { @@ -29,8 +29,8 @@ namespace Volo.Abp.Application.Services } } - public abstract class CrudAppService - : CrudAppService + public abstract class CrudAppService + : CrudAppService where TEntity : class, IEntity where TEntityDto : IEntityDto where TCreateInput : IEntityDto @@ -42,9 +42,9 @@ namespace Volo.Abp.Application.Services } } - public abstract class CrudAppService - : CrudAppServiceBase, - ICrudAppService + public abstract class CrudAppService + : CrudAppServiceBase, + ICrudAppService where TEntity : class, IEntity where TEntityDto : IEntityDto { @@ -62,9 +62,9 @@ namespace Volo.Abp.Application.Services return MapToEntityDto(entity); } - public virtual PagedResultDto GetAll(TGetAllInput input) + public virtual PagedResultDto GetList(TGetListInput input) { - CheckGetAllPolicy(); + CheckGetListPolicy(); var query = CreateFilteredQuery(input); @@ -122,9 +122,9 @@ namespace Volo.Abp.Application.Services CheckPolicy(GetPolicyName); } - protected virtual void CheckGetAllPolicy() + protected virtual void CheckGetListPolicy() { - CheckPolicy(GetAllPolicyName); + CheckPolicy(GetListPolicyName); } protected virtual void CheckCreatePolicy() diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs index eb4c7a200f..4d878ad6c3 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.Application.Services /// This is a common base class for CrudAppService and AsyncCrudAppService classes. /// Inherit either from CrudAppService or AsyncCrudAppService, not from this class. /// - public abstract class CrudAppServiceBase : + public abstract class CrudAppServiceBase : ApplicationService where TEntity : class, IEntity where TEntityDto : IEntityDto @@ -21,7 +21,7 @@ namespace Volo.Abp.Application.Services protected virtual string GetPolicyName { get; set; } - protected virtual string GetAllPolicyName { get; set; } + protected virtual string GetListPolicyName { get; set; } protected virtual string CreatePolicyName { get; set; } @@ -39,7 +39,7 @@ namespace Volo.Abp.Application.Services /// /// The query. /// The input. - protected virtual IQueryable ApplySorting(IQueryable query, TGetAllInput input) + protected virtual IQueryable ApplySorting(IQueryable query, TGetListInput input) { //Try to sort query if available var sortInput = input as ISortedResultRequest; @@ -66,7 +66,7 @@ namespace Volo.Abp.Application.Services /// /// The query. /// The input. - protected virtual IQueryable ApplyPaging(IQueryable query, TGetAllInput input) + protected virtual IQueryable ApplyPaging(IQueryable query, TGetListInput input) { //Try to use paging if available var pagedInput = input as IPagedResultRequest; @@ -93,7 +93,7 @@ namespace Volo.Abp.Application.Services /// methods. /// /// The input. - protected virtual IQueryable CreateFilteredQuery(TGetAllInput input) + protected virtual IQueryable CreateFilteredQuery(TGetListInput input) { return Repository; } diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ICrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ICrudAppService.cs index 9f06c63aea..7e8b96b9f8 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ICrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ICrudAppService.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.Application.Services { TEntityDto Get(TKey id); - PagedResultDto GetAll(TGetListInput input); + PagedResultDto GetList(TGetListInput input); TEntityDto Create(TCreateInput input); diff --git a/framework/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/Application/PersonAppService_Tests.cs b/framework/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/Application/PersonAppService_Tests.cs index 9dbfc8936e..c58b1b5f85 100644 --- a/framework/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/Application/PersonAppService_Tests.cs +++ b/framework/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/Application/PersonAppService_Tests.cs @@ -16,7 +16,7 @@ namespace Volo.Abp.TestApp.Application } [Fact] - public async Task GetAll() + public async Task GetList() { var people = await _peopleAppService.GetListAsync(new PagedAndSortedResultRequestDto()); people.Items.Count.ShouldBeGreaterThan(0); From 370aac6feb1bceb15c32808375835a09ea322b99 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 22 Apr 2019 15:01:24 +0800 Subject: [PATCH 007/335] Microsoft.AspNetCore.App package does not specify version. --- .../app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj | 2 +- .../applications/AuthServer.Host/AuthServer.Host.csproj | 2 +- .../BackendAdminAppGateway.Host.csproj | 2 +- .../gateways/InternalGateway.Host/InternalGateway.Host.csproj | 2 +- .../PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj | 2 +- .../BloggingService.Host/BloggingService.Host.csproj | 2 +- .../IdentityService.Host/IdentityService.Host.csproj | 2 +- .../ProductService.Host/ProductService.Host.csproj | 2 +- .../MyCompanyName.MyProjectName.DemoApp.csproj | 2 +- .../MyCompanyName.MyProjectName.Web.csproj | 2 +- .../MyCompanyName.MyProjectName.Host.csproj | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj index 040cfaf4a8..7b88e297f4 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj @@ -16,7 +16,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj index 0b938960f5..3fb01d55d7 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj index 28bb533c46..3ae6528058 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj index dafa931f24..7aa8f1eab1 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj index c04e6bdfaa..ecc2bcdfe5 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj index 88671a50f4..972fbd9d31 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj index 810c69a198..bc11e9759f 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj index ce42a3f22e..4cfac32df9 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj index 4e019c6d9b..c4456e9e69 100644 --- a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj +++ b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj @@ -5,7 +5,7 @@ - + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 4f44771362..fcbcc3104c 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -21,7 +21,7 @@ - + diff --git a/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index f8b368d460..4e946bfb35 100644 --- a/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/service/host/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -5,7 +5,7 @@ - + From 1e5506866880ee8047a0141f65ffff4d777423bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Tue, 23 Apr 2019 10:10:55 +0800 Subject: [PATCH 008/335] Add Chinese localization texts --- .../Localization/Resources/FeatureManagement/zh-Hans.json | 2 +- .../Resources/AbpPermissionManagement/zh-Hans.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json index 25137f1ee3..765449637e 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json @@ -1,6 +1,6 @@ { "culture": "zh-Hans", "texts": { - + "Features": "特性" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json index 8384078b86..195d3254b6 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json @@ -3,6 +3,8 @@ "texts": { "Permissions": "权限", "OnlyProviderPermissons": "只有这个提供商", - "All": "所有" + "All": "所有", + "SelectAllInAllTabs": "授予所有权限", + "SelectAllInThisTab": "全选" } } \ No newline at end of file From b85946581d3bdc88bde21198a75a77e18d95e55a Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 23 Apr 2019 10:26:42 +0800 Subject: [PATCH 009/335] Update zh-Hans.json --- .../AbpPermissionManagement/zh-Hans.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json index 195d3254b6..11c52c43ed 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Localization/Resources/AbpPermissionManagement/zh-Hans.json @@ -1,10 +1,10 @@ { - "culture": "zh-Hans", - "texts": { - "Permissions": "权限", - "OnlyProviderPermissons": "只有这个提供商", - "All": "所有", - "SelectAllInAllTabs": "授予所有权限", - "SelectAllInThisTab": "全选" - } - } \ No newline at end of file + "culture": "zh-Hans", + "texts": { + "Permissions": "权限", + "OnlyProviderPermissons": "只有这个提供商", + "All": "所有", + "SelectAllInAllTabs": "授予所有权限", + "SelectAllInThisTab": "全选" + } +} From 74d0b9e1c663a6df40e4c7f46eb4bd117765f771 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 23 Apr 2019 10:27:04 +0800 Subject: [PATCH 010/335] Update zh-Hans.json --- .../Resources/FeatureManagement/zh-Hans.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json index 765449637e..e9e1aab620 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Localization/Resources/FeatureManagement/zh-Hans.json @@ -1,6 +1,6 @@ { - "culture": "zh-Hans", - "texts": { - "Features": "特性" - } -} \ No newline at end of file + "culture": "zh-Hans", + "texts": { + "Features": "特性" + } +} From 571dd8f576cfca4e5ed4a096c2a0f2560699abc7 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 23 Apr 2019 15:54:50 +0800 Subject: [PATCH 011/335] fix #1036 Modify the maximum length of DefaultConnectionString. --- .../TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs index a2beeda27d..a4db743263 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs @@ -52,7 +52,7 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants public bool UseSharedDatabase { get; set; } - [StringLength(TenantConnectionStringConsts.MaxNameLength)] + [StringLength(TenantConnectionStringConsts.MaxValueLength)] public string DefaultConnectionString { get; set; } } } From dc036343dc71762779d5bf1e42559b1c7817800f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Tue, 23 Apr 2019 17:11:33 +0800 Subject: [PATCH 012/335] Add Chinese localization resources --- .../Localization/Resources/VoloDocs/Web/zh-Hans.json | 9 +++++++++ modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj | 3 +-- .../Localization/Resources/Docs/Web/en.json | 3 ++- .../Localization/Resources/Docs/Web/zh-Hans.json | 7 ++++--- .../Localization/ApplicationContracts/zh-Hans.json | 1 + 5 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/zh-Hans.json diff --git a/modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/zh-Hans.json b/modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/zh-Hans.json new file mode 100644 index 0000000000..c0a5d398ae --- /dev/null +++ b/modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/zh-Hans.json @@ -0,0 +1,9 @@ +{ + "culture": "zh-Hans", + "texts": { + "WelcomeVoloDocs": "欢迎使用VoloDocs!", + "NoProjectWarning": "当前没有定义的项目！", + "CreateYourFirstProject": "点击这里开始你的第一个项目", + "NoProject": "没有项目！" + } +} \ No newline at end of file diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj index 7870968c45..75f91ed0ad 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj +++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj @@ -9,8 +9,7 @@ - - + diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json index 8f8fdc0191..73747c3cf7 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json +++ b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json @@ -21,6 +21,7 @@ "DisplayName:MainWebsiteUrl": "Main web site URL", "DisplayName:LatestVersionBranchName": "Latest version branch name", "DisplayName:GitHubRootUrl": "GitHub root URL", - "DisplayName:GitHubAccessToken": "GitHub access token" + "DisplayName:GitHubAccessToken": "GitHub access token", + "DisplayName:GitHubUserAgent": "GitHub user agent" } } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/zh-Hans.json b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/zh-Hans.json index 36bc285090..2b2911fad9 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/zh-Hans.json +++ b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/zh-Hans.json @@ -21,6 +21,7 @@ "DisplayName:MainWebsiteUrl": "主网站网址", "DisplayName:LatestVersionBranchName": "最新版本的分支名称", "DisplayName:GitHubRootUrl": "GitHub根网址", - "DisplayName:GitHubAccessToken": "GitHub访问令牌" - } - } \ No newline at end of file + "DisplayName:GitHubAccessToken": "GitHub访问令牌", + "DisplayName:GitHubUserAgent": "GitHub用户代理" + } +} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/zh-Hans.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/zh-Hans.json index e670d9f206..ca1c428755 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/zh-Hans.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/Localization/ApplicationContracts/zh-Hans.json @@ -5,6 +5,7 @@ "Permission:Create": "创建", "Permission:Edit": "编辑", "Permission:Delete": "删除", + "Permission:ManageConnectionStrings": "管理连接字符串", "Permission:ManageFeatures": "管理功能" } } \ No newline at end of file From 31ec9921aa94a35b24dc74540d70e05c010dfc22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Tue, 23 Apr 2019 17:26:30 +0800 Subject: [PATCH 013/335] Fix bugs and add localization languages for docs module --- .../VoloDocsDbContextFactory.cs | 2 +- modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocsDbContextFactory.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocsDbContextFactory.cs index 4daa15555b..927405f2a4 100644 --- a/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocsDbContextFactory.cs +++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocsDbContextFactory.cs @@ -20,7 +20,7 @@ namespace VoloDocs.EntityFrameworkCore private static IConfigurationRoot BuildConfiguration() { var builder = new ConfigurationBuilder() - .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../VoloDocs/")) + .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../VoloDocs.Web/")) .AddJsonFile("appsettings.json", optional: false); return builder.Build(); diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 9520a0e9df..cc018ddcc1 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -29,7 +29,7 @@ using Volo.Docs; using Volo.Docs.Admin; using Volo.Docs.Localization; using VoloDocs.EntityFrameworkCore; -using VoloDocs.Web.Utils; +using Localization.Resources.AbpUi; namespace VoloDocs.Web { @@ -107,14 +107,15 @@ namespace VoloDocs.Web Configure(options => { - options - .Languages - .Add(new LanguageInfo("en", "en", "English")); + + options.Languages.Add(new LanguageInfo("en", "en", "English")); + options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe")); + options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); options.Resources .Get() .AddBaseTypes(typeof(AbpValidationResource)) - .AddBaseTypes(typeof(AbpUiModule)) + .AddBaseTypes(typeof(AbpUiResource)) .AddVirtualJson("/Localization/Resources/VoloDocs/Web"); }); From ac99f470e154b45f6ee240780099d3cc023bed43 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 23 Apr 2019 18:42:50 +0800 Subject: [PATCH 014/335] Fix AddBaseTypes method parameter name spelling mistakes. --- modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs | 5 +++-- modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs index ac7cc9e210..9071dee2d6 100644 --- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs +++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc.RazorPages; +using Localization.Resources.AbpUi; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; @@ -47,7 +48,7 @@ namespace Volo.Blogging options.Resources .Get() .AddBaseTypes(typeof(AbpValidationResource)) - .AddBaseTypes(typeof(AbpUiModule)) + .AddBaseTypes(typeof(AbpUiResource)) .AddVirtualJson("/Localization/Resources/Blogging/Web"); }); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs index dc917328b0..f23cae0436 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.Localization; +using Localization.Resources.AbpUi; +using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.AutoMapper; using Volo.Abp.Localization; @@ -44,7 +45,7 @@ namespace Volo.Docs.Admin options.Resources .Get() .AddBaseTypes(typeof(AbpValidationResource)) - .AddBaseTypes(typeof(AbpUiModule)) + .AddBaseTypes(typeof(AbpUiResource)) .AddVirtualJson("/Localization/Resources/Docs/Web"); }); From 69abc246e60909a41cc885cf3a371042dc98515f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Wed, 24 Apr 2019 15:03:40 +0800 Subject: [PATCH 015/335] Ensure GitHub root url ends with forward slash in docs module If user forgot to put a forward slash at the end of github repo's root url (it's common for urls copied from the web browser's address bar), the code "rawRootUrl + documentName" will return an invalid url path. --- .../Volo/Docs/GitHub/Documents/GithubDocumentStore.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs index 715306ae5c..b6bd194329 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs @@ -206,7 +206,7 @@ namespace Volo.Docs.GitHub.Documents { return rootUrl .Replace("github.com", "raw.githubusercontent.com") - .ReplaceFirst("/tree/", "/"); + .ReplaceFirst("/tree/", "/").EnsureEndsWith('/'); } } } \ No newline at end of file From 2b0f7f2e5341ff99d819c632fa38d22ee0672bab Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 24 Apr 2019 15:16:36 +0800 Subject: [PATCH 016/335] Update GithubDocumentStore.cs --- .../Volo/Docs/GitHub/Documents/GithubDocumentStore.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs index b6bd194329..2d65a17c68 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentStore.cs @@ -206,7 +206,8 @@ namespace Volo.Docs.GitHub.Documents { return rootUrl .Replace("github.com", "raw.githubusercontent.com") - .ReplaceFirst("/tree/", "/").EnsureEndsWith('/'); + .ReplaceFirst("/tree/", "/") + .EnsureEndsWith('/'); } } -} \ No newline at end of file +} From b82ed5a7fa7628e3b7257485a8d56f0b00ca3e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Wed, 24 Apr 2019 15:36:03 +0800 Subject: [PATCH 017/335] Fix incorrect project links on the home page in docs module --- modules/docs/app/VoloDocs.Web/Pages/Index.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml index 6f6c083531..6b3c198eae 100644 --- a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml +++ b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml @@ -41,8 +41,8 @@ {

  • - @project.Name From 1385b0a6dd48ccb95d5f5d2c89d2bfe2be4d6c9e Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 24 Apr 2019 16:15:48 +0800 Subject: [PATCH 018/335] Update Index.cshtml --- modules/docs/app/VoloDocs.Web/Pages/Index.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml index 6b3c198eae..4ac9f376ad 100644 --- a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml +++ b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml @@ -42,7 +42,7 @@

  • @project.Name From f47884485acca9520f2ed8b96d3b85506de9a9a0 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 24 Apr 2019 20:33:04 +0300 Subject: [PATCH 019/335] Render content_toolbar --- .../Themes/Basic/Layouts/Application.cshtml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml index 4864f2dafe..0ad0c76591 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml @@ -29,6 +29,10 @@ @(await Component.InvokeAsync()) +
    + @RenderSection("content_toolbar", false) +
    +
    @(await Component.InvokeAsync()) @RenderBody() From 034ab0b81ce10fae6ac3297f3c3d28a94679fddf Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 24 Apr 2019 20:36:22 +0300 Subject: [PATCH 020/335] Move content_toolbar into the container. --- .../Themes/Basic/Layouts/Application.cshtml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml index 0ad0c76591..5e3b66ffa7 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml @@ -28,13 +28,12 @@ @(await Component.InvokeAsync()) - -
    - @RenderSection("content_toolbar", false) -
    - +
    @(await Component.InvokeAsync()) +
    + @RenderSection("content_toolbar", false) +
    @RenderBody()
    From 4bc6c8619b138afa8ed22e730b1f1cdde9ff0085 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 24 Apr 2019 20:38:43 +0300 Subject: [PATCH 021/335] Add margin --- .../Themes/Basic/Layouts/Application.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml index 5e3b66ffa7..1cd530d021 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml @@ -31,7 +31,7 @@
    @(await Component.InvokeAsync()) -
    +
    @RenderSection("content_toolbar", false)
    @RenderBody() From bbb7046925ee2c3979247d10eb4485d730248275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Thu, 25 Apr 2019 11:01:09 +0800 Subject: [PATCH 022/335] UrlEncode post url within Redirect method in blogging module Error "InvalidOperationException: Invalid non-ASCII or control character in header" when url contains none ASCII characters, see AspNetCore issue [4919](https://github.com/aspnet/AspNetCore/issues/4919) --- .../src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs index 468d46decd..976f78b7d1 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs @@ -54,7 +54,7 @@ namespace Volo.Blogging.Pages.Blog.Posts var postWithDetailsDto = await _postAppService.CreateAsync(ObjectMapper.Map(Post)); //TODO: Try Url.Page(...) - return Redirect(Url.Content($"~/blog/{blog.ShortName}/{postWithDetailsDto.Url}")); + return Redirect(Url.Content($"~/blog/{blog.ShortName}/{WebUtility.UrlEncode(postWithDetailsDto.Url)}")); } public class CreatePostViewModel From 1e2c0d1ee132a483e32855904d6c620f8bfd2158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Thu, 25 Apr 2019 11:19:19 +0800 Subject: [PATCH 023/335] UrlEncode blog short name within Redirect method --- .../src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs index 976f78b7d1..fe0a809d07 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs @@ -54,7 +54,7 @@ namespace Volo.Blogging.Pages.Blog.Posts var postWithDetailsDto = await _postAppService.CreateAsync(ObjectMapper.Map(Post)); //TODO: Try Url.Page(...) - return Redirect(Url.Content($"~/blog/{blog.ShortName}/{WebUtility.UrlEncode(postWithDetailsDto.Url)}")); + return Redirect(Url.Content($"~/blog/{WebUtility.UrlEncode(blog.ShortName)}/{WebUtility.UrlEncode(postWithDetailsDto.Url)}")); } public class CreatePostViewModel From ab413f44cddfdb8cd909e8dc70c65e8b899f39db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Thu, 25 Apr 2019 11:47:54 +0800 Subject: [PATCH 024/335] UrlEncode parameters within Redirect method in post edit page model --- .../src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml.cs index b35d07993d..2ccf8cff8f 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml.cs @@ -1,6 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -61,7 +62,7 @@ namespace Volo.Blogging.Pages.Blog.Posts var editedPost = await _postAppService.UpdateAsync(Post.Id, post); var blog = await _blogAppService.GetAsync(editedPost.BlogId); - return Redirect(Url.Content($"~/blog/{blog.ShortName}/{editedPost.Url}")); + return Redirect(Url.Content($"~/blog/{WebUtility.UrlEncode(blog.ShortName)}/{WebUtility.UrlEncode(editedPost.Url)}")); } } From 41bfc39228b35c1da9474793b2be944b6451b498 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 25 Apr 2019 16:20:25 +0800 Subject: [PATCH 025/335] fix #1049 Make sure the directory exists before writing to the file. --- .../Volo/Blogging/Files/FileAppService.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Files/FileAppService.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Files/FileAppService.cs index d8b9273f0c..b188fe4c3e 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Files/FileAppService.cs +++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Files/FileAppService.cs @@ -23,6 +23,17 @@ namespace Volo.Blogging.Files { Check.NotNullOrWhiteSpace(name, nameof(name)); + if (!Directory.Exists(Options.FileUploadLocalFolder)) + { + Directory.CreateDirectory(Options.FileUploadLocalFolder); + return Task.FromResult( + new RawFileDto + { + Bytes = new byte[0] + } + ); + } + var filePath = Path.Combine(Options.FileUploadLocalFolder, name); return Task.FromResult( @@ -53,6 +64,11 @@ namespace Volo.Blogging.Files var uniqueFileName = GenerateUniqueFileName(Path.GetExtension(input.Name)); var filePath = Path.Combine(Options.FileUploadLocalFolder, uniqueFileName); + if (!Directory.Exists(Options.FileUploadLocalFolder)) + { + Directory.CreateDirectory(Options.FileUploadLocalFolder); + } + File.WriteAllBytes(filePath, input.Bytes); //TODO: Previously was using WriteAllBytesAsync, but it's only in .netcore. return Task.FromResult(new FileUploadOutputDto From 63653df2846b68e8068356fb1996b7bdc8a65ae0 Mon Sep 17 00:00:00 2001 From: CdLian <970433771@qq.com> Date: Thu, 25 Apr 2019 17:24:08 +0800 Subject: [PATCH 026/335] Update Entities.md --- docs/zh-Hans/Best-Practices/Entities.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh-Hans/Best-Practices/Entities.md b/docs/zh-Hans/Best-Practices/Entities.md index 637ecaef6d..fd709ef35f 100644 --- a/docs/zh-Hans/Best-Practices/Entities.md +++ b/docs/zh-Hans/Best-Practices/Entities.md @@ -64,7 +64,7 @@ public class Issue : FullAuditedAggregateRoot //使用Guid作为键/标识 protected Issue() { /* 此构造函数是提供给ORM用来从数据库中获取实体. - * - 无需初始化Lanels集合 + * - 无需初始化Labels集合 因为它会被来自数据库的值覆盖. - It's protected since proxying and deserialization tools 可能不适用于私有构造函数. @@ -150,4 +150,4 @@ public class IssueLabel : Entity ### 参考文献 * Effective Aggregate Design by Vaughn Vernon - http://dddcommunity.org/library/vernon_2011 \ No newline at end of file + http://dddcommunity.org/library/vernon_2011 From eab649325281b1688790128012e64631ed30430a Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 25 Apr 2019 21:01:33 +0800 Subject: [PATCH 027/335] fix #1051 new/edit post jquery validate problem. --- .../Volo.Blogging.Web/Pages/Blog/BloggingPage.cs | 5 +++++ .../src/Volo.Blogging.Web/Pages/Blog/Posts/edit.js | 14 ++++++++++++-- .../src/Volo.Blogging.Web/Pages/Blog/Posts/new.js | 14 +++++++++++--- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs index 03214d1ee3..88133e0e84 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs @@ -55,6 +55,11 @@ namespace Volo.Blogging.Pages.Blog public IHtmlContent RenderMarkdownToHtml(string content) { + if(content.IsNullOrWhiteSpace()) + { + return new HtmlString(""); + } + byte[] bytes = Encoding.Default.GetBytes(content); var utf8Content = Encoding.UTF8.GetString(bytes); diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/edit.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/edit.js index 9fb4929d30..6b0dd9f02b 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/edit.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/edit.js @@ -1,4 +1,4 @@ -(function ($) { +$(function () { var $container = $("#edit-post-container"); var $editorContainer = $container.find(".edit-post-editor"); @@ -72,6 +72,8 @@ load: function () { $editorContainer.find(".loading-cover").remove(); $submitButton.prop("disabled", false); + $form.data("validator").settings.ignore = '.ignore'; + $editorContainer.find(':input').addClass('ignore'); } } }).data(editorDataKey); @@ -82,8 +84,16 @@ var postText = newPostEditor.getMarkdown(); $postTextInput.val(postText); + if (!$form.valid()) { + var validationResult = $form.validate(); + abp.message.warn(validationResult.errorList[0].message); //TODO: errors can be merged into lines. make sweetalert accept HTML. + e.preventDefault(); + return false; //for old browsers + } + $submitButton.buttonBusy(); $(this).off('submit').submit(); }); -})(jQuery); +}); + diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.js index 519d3f41f4..0c3e927264 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.js @@ -1,5 +1,4 @@ -var editor = null; -(function ($) { +$(function () { var $container = $("#qa-new-post-container"); var $editorContainer = $container.find(".new-post-editor"); @@ -72,6 +71,8 @@ load: function () { $editorContainer.find(".loading-cover").remove(); $submitButton.prop("disabled", false); + $form.data("validator").settings.ignore = '.ignore'; + $editorContainer.find(':input').addClass('ignore'); } } }).data(editorDataKey); @@ -82,6 +83,13 @@ var postText = newPostEditor.getMarkdown(); $postTextInput.val(postText); + if (!$form.valid()) { + var validationResult = $form.validate(); + abp.message.warn(validationResult.errorList[0].message); //TODO: errors can be merged into lines. make sweetalert accept HTML. + e.preventDefault(); + return false; //for old browsers + } + $submitButton.buttonBusy(); $(this).off('submit').submit(); }); @@ -113,4 +121,4 @@ } }); -})(jQuery); +}); From 5ad7d4237376e4353a745d6627ccdbc67e76f94d Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 25 Apr 2019 17:28:54 +0300 Subject: [PATCH 028/335] Fix dependency --- .../Volo/Abp/Users/AbpUsersDomainModule.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUsersDomainModule.cs b/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUsersDomainModule.cs index d3d6a01185..962c08c018 100644 --- a/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUsersDomainModule.cs +++ b/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/AbpUsersDomainModule.cs @@ -1,12 +1,12 @@ -using Volo.Abp.Modularity; -using Volo.Abp.Security; +using Volo.Abp.Domain; +using Volo.Abp.Modularity; namespace Volo.Abp.Users { [DependsOn( typeof(AbpUsersDomainSharedModule), typeof(AbpUsersAbstractionModule), - typeof(AbpSecurityModule) + typeof(AbpDddDomainModule) )] public class AbpUsersDomainModule : AbpModule { From d885d4e73b58d7a82b88cf79c7276423bbcf6044 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 26 Apr 2019 11:32:19 +0800 Subject: [PATCH 029/335] fix #1053 Show badge for public & default roles in the role list. --- .../Pages/Identity/Roles/index.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js index 476b484128..1f4c0e0316 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js @@ -57,7 +57,17 @@ } }, { - data: "name" + data: "name", + render: function (data, type, row) { + var name = '' + data + ''; + if (row.isDefault) { + name += 'Default'; + } + if (row.isPublic) { + name += 'Public'; + } + return name; + } } ] })); From dbbbe903050c284b24f7aa2405124c521c9f8881 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 26 Apr 2019 11:38:38 +0800 Subject: [PATCH 030/335] Localized role badge. --- .../src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js index 1f4c0e0316..385b53f257 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js @@ -61,10 +61,10 @@ render: function (data, type, row) { var name = '' + data + ''; if (row.isDefault) { - name += 'Default'; + name += '' + l('DisplayName:IsDefault') + ''; } if (row.isPublic) { - name += 'Public'; + name += '' + l('DisplayName:IsPublic') + ''; } return name; } From cabbb6f72c524f94ddcd028f70306db0af848c34 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 26 Apr 2019 09:08:59 +0300 Subject: [PATCH 031/335] Update README.md --- abp_io/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abp_io/README.md b/abp_io/README.md index 2095b52ef6..813329cbea 100644 --- a/abp_io/README.md +++ b/abp_io/README.md @@ -1,2 +1,2 @@ -## abp.op +## abp.io Source code of the official web site: https://abp.io From 731687036364e1c1a3fb739bfd8d5b4ac3de30dc Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 26 Apr 2019 14:39:24 +0800 Subject: [PATCH 032/335] ReflectionHelper add GetAllConstants method. Get all the constant values in the specified type (including the base type). --- .../Volo/Abp/Reflection/ReflectionHelper.cs | 37 +++++++ .../Abp/Reflection/ReflectionHelper_Tests.cs | 99 ++++++++++++++++++- 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs index 1c4b162b21..27db5ae480 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs @@ -165,5 +165,42 @@ namespace Volo.Abp.Reflection property = currentType.GetProperty(properties.Last()); property.SetValue(obj, value); } + + + /// + /// Get all the constant values in the specified type (including the base type). + /// + /// + /// + public static string[] GetAllConstants(Type type) + { + var constants = new List(); + GetAllConstantsRecursively(constants, type, 1); + return constants.ToArray(); + } + + private static void GetAllConstantsRecursively(List constants, Type type, int currentDepth) + { + const int maxRecursiveParameterValidationDepth = 8; + + if (currentDepth > maxRecursiveParameterValidationDepth) + { + return; + } + + constants.AddRange( + type.GetFields(BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy) + .Where(x => x.IsLiteral && !x.IsInitOnly) + .Select(x => x.GetValue(null).ToString()) + ); + + var nestedTypes = type.GetNestedTypes(BindingFlags.Public); + + foreach (var nestedType in nestedTypes) + { + GetAllConstantsRecursively(constants, nestedType, currentDepth + 1); + } + } + } } diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs index 842940cfaf..cd2ec77b03 100644 --- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs +++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs @@ -1,7 +1,102 @@ -namespace Volo.Abp.Reflection +using System.Linq; +using Shouldly; +using Xunit; + +namespace Volo.Abp.Reflection { public class ReflectionHelper_Tests { //TODO: ... + + + [Fact] + public void GetAllConstants_Test() + { + var constants = ReflectionHelper.GetAllConstants(typeof(BaseRole)); + + constants.ShouldNotBeEmpty(); + constants.Length.ShouldBe(1); + constants.ShouldContain(x => x == "DefaultBaseRoleName"); + } + + [Fact] + public void GetAllConstants_Inherit_Test() + { + var constants = ReflectionHelper.GetAllConstants(typeof(Roles)); + + constants.ShouldNotBeEmpty(); + constants.Length.ShouldBe(2); + constants.ShouldContain(x => x == "DefaultBaseRoleName"); + constants.ShouldContain(x => x == "DefaultRoleName"); + } + + + [Fact] + public void GetAllConstants_NestedTypes_Test() + { + var constants = ReflectionHelper.GetAllConstants(typeof(IdentityPermissions)); + + constants.ShouldNotBeEmpty(); + constants.Except(IdentityPermissions.GetAll()).Count().ShouldBe(0); + } } -} + + + public class BaseRole + { + public const string BaseRoleName = "DefaultBaseRoleName"; + } + + public class Roles : BaseRole + { + public const string RoleName = "DefaultRoleName"; + } + + public static class IdentityPermissions + { + public const string GroupName = "AbpIdentity"; + + public static class Roles + { + public const string Default = GroupName + ".Roles"; + public const string Create = Default + ".Create"; + public const string Update = Default + ".Update"; + public const string Delete = Default + ".Delete"; + public const string ManagePermissions = Default + ".ManagePermissions"; + } + + public static class Users + { + public const string Default = GroupName + ".Users"; + public const string Create = Default + ".Create"; + public const string Update = Default + ".Update"; + public const string Delete = Default + ".Delete"; + public const string ManagePermissions = Default + ".ManagePermissions"; + } + + public static class UserLookup + { + public const string Default = GroupName + ".UserLookup"; + } + + public static string[] GetAll() + { + return new[] + { + GroupName, + Roles.Default, + Roles.Create, + Roles.Update, + Roles.Delete, + Roles.ManagePermissions, + Users.Default, + Users.Create, + Users.Update, + Users.Delete, + Users.ManagePermissions, + UserLookup.Default + }; + } + } + +} \ No newline at end of file From d85857510459365310c3e5b869a407e1c7e8f1ac Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 26 Apr 2019 10:17:07 +0300 Subject: [PATCH 033/335] docs admin moved to administration menu --- .../Volo.Docs.Admin.Web/Navigation/DocsMenuContributor.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Navigation/DocsMenuContributor.cs b/modules/docs/src/Volo.Docs.Admin.Web/Navigation/DocsMenuContributor.cs index aff5fb1254..4097470c60 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Navigation/DocsMenuContributor.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/Navigation/DocsMenuContributor.cs @@ -19,12 +19,15 @@ namespace Volo.Docs.Admin.Navigation private async Task ConfigureMainMenu(MenuConfigurationContext context) { + + var administrationMenu = context.Menu.GetAdministration(); + var authorizationService = context.ServiceProvider.GetRequiredService(); var l = context.ServiceProvider.GetRequiredService>(); var rootMenuItem = new ApplicationMenuItem(DocsMenuNames.GroupName, l["Menu:DocumentManagement"], icon: "fa fa-book"); - context.Menu.AddItem(rootMenuItem); + administrationMenu.AddItem(rootMenuItem); if (await authorizationService.IsGrantedAsync(DocsAdminPermissions.Projects.Default)) { From f43209c6a47794b2b1124e93d2a8916ead2f1cce Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 26 Apr 2019 15:18:41 +0800 Subject: [PATCH 034/335] Rename GetAllConstants to GetPublicConstantsRecursively. --- .../Volo/Abp/Reflection/ReflectionHelper.cs | 39 +++++++++---------- .../Abp/Reflection/ReflectionHelper_Tests.cs | 12 +++--- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs index 27db5ae480..b314ca6b84 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Reflection/ReflectionHelper.cs @@ -172,35 +172,34 @@ namespace Volo.Abp.Reflection /// /// /// - public static string[] GetAllConstants(Type type) - { - var constants = new List(); - GetAllConstantsRecursively(constants, type, 1); - return constants.ToArray(); - } - - private static void GetAllConstantsRecursively(List constants, Type type, int currentDepth) + public static string[] GetPublicConstantsRecursively(Type type) { const int maxRecursiveParameterValidationDepth = 8; - if (currentDepth > maxRecursiveParameterValidationDepth) + var publicConstants = new List(); + + void Recursively(List constants, Type targetType, int currentDepth) { - return; - } + if (currentDepth > maxRecursiveParameterValidationDepth) + { + return; + } - constants.AddRange( - type.GetFields(BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy) + constants.AddRange(targetType.GetFields(BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy) .Where(x => x.IsLiteral && !x.IsInitOnly) - .Select(x => x.GetValue(null).ToString()) - ); + .Select(x => x.GetValue(null).ToString())); - var nestedTypes = type.GetNestedTypes(BindingFlags.Public); + var nestedTypes = targetType.GetNestedTypes(BindingFlags.Public); - foreach (var nestedType in nestedTypes) - { - GetAllConstantsRecursively(constants, nestedType, currentDepth + 1); + foreach (var nestedType in nestedTypes) + { + Recursively(constants, nestedType, currentDepth + 1); + } } - } + Recursively(publicConstants, type, 1); + + return publicConstants.ToArray(); + } } } diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs index cd2ec77b03..333ea2e84a 100644 --- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs +++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Reflection/ReflectionHelper_Tests.cs @@ -10,9 +10,9 @@ namespace Volo.Abp.Reflection [Fact] - public void GetAllConstants_Test() + public void GetPublicConstantsRecursively_Test() { - var constants = ReflectionHelper.GetAllConstants(typeof(BaseRole)); + var constants = ReflectionHelper.GetPublicConstantsRecursively(typeof(BaseRole)); constants.ShouldNotBeEmpty(); constants.Length.ShouldBe(1); @@ -20,9 +20,9 @@ namespace Volo.Abp.Reflection } [Fact] - public void GetAllConstants_Inherit_Test() + public void GetPublicConstantsRecursively_Inherit_Test() { - var constants = ReflectionHelper.GetAllConstants(typeof(Roles)); + var constants = ReflectionHelper.GetPublicConstantsRecursively(typeof(Roles)); constants.ShouldNotBeEmpty(); constants.Length.ShouldBe(2); @@ -32,9 +32,9 @@ namespace Volo.Abp.Reflection [Fact] - public void GetAllConstants_NestedTypes_Test() + public void GetPublicConstantsRecursively_NestedTypes_Test() { - var constants = ReflectionHelper.GetAllConstants(typeof(IdentityPermissions)); + var constants = ReflectionHelper.GetPublicConstantsRecursively(typeof(IdentityPermissions)); constants.ShouldNotBeEmpty(); constants.Except(IdentityPermissions.GetAll()).Count().ShouldBe(0); From 6b5893ff3dad3224a51a22847d392e9ddfd6e12b Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 26 Apr 2019 17:05:39 +0800 Subject: [PATCH 035/335] Lazy resolve services in the base classes. --- .../Mvc/UI/RazorPages/AbpPageModel.cs | 55 +++++++++++++++---- .../Volo/Abp/AspNetCore/Mvc/AbpController.cs | 49 +++++++++++++---- .../Services/ApplicationService.cs | 49 +++++++++++++---- .../Volo/Abp/Domain/Services/DomainService.cs | 28 +++++++++- 4 files changed, 146 insertions(+), 35 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs index 8fd16f5864..62258329ad 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/RazorPages/AbpPageModel.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.ViewFeatures; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; @@ -21,19 +22,43 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.RazorPages { public abstract class AbpPageModel : PageModel { - public IClock Clock { get; set; } + public IServiceProvider ServiceProvider { get; set; } + protected readonly object ServiceProviderLock = new object(); + protected TService LazyGetRequiredService(ref TService reference) + { + if (reference == null) + { + lock (ServiceProviderLock) + { + if (reference == null) + { + reference = ServiceProvider.GetRequiredService(); + } + } + } + + return reference; + } + + public IClock Clock => LazyGetRequiredService(ref _clock); + private IClock _clock; public AlertList Alerts => AlertManager.Alerts; - public IUnitOfWorkManager UnitOfWorkManager { get; set; } + public IUnitOfWorkManager UnitOfWorkManager => LazyGetRequiredService(ref _unitOfWorkManager); + private IUnitOfWorkManager _unitOfWorkManager; - public IObjectMapper ObjectMapper { get; set; } + public IObjectMapper ObjectMapper => LazyGetRequiredService(ref _objectMapper); + private IObjectMapper _objectMapper; - public IGuidGenerator GuidGenerator { get; set; } + public IGuidGenerator GuidGenerator => LazyGetRequiredService(ref _guidGenerator); + private IGuidGenerator _guidGenerator; - public ILoggerFactory LoggerFactory { get; set; } + public ILoggerFactory LoggerFactory => LazyGetRequiredService(ref _loggerFactory); + private ILoggerFactory _loggerFactory; - public IStringLocalizerFactory StringLocalizerFactory { get; set; } + public IStringLocalizerFactory StringLocalizerFactory => LazyGetRequiredService(ref _stringLocalizerFactory); + private IStringLocalizerFactory _stringLocalizerFactory; public IStringLocalizer L { @@ -56,17 +81,23 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.RazorPages protected Type LocalizationResourceType { get; set; } - public ICurrentUser CurrentUser { get; set; } + public ICurrentUser CurrentUser => LazyGetRequiredService(ref _currentUser); + private ICurrentUser _currentUser; - public ICurrentTenant CurrentTenant { get; set; } + public ICurrentTenant CurrentTenant => LazyGetRequiredService(ref _currentTenant); + private ICurrentTenant _currentTenant; - public ISettingProvider SettingProvider { get; set; } + public ISettingProvider SettingProvider => LazyGetRequiredService(ref _settingProvider); + private ISettingProvider _settingProvider; - public IModelStateValidator ModelValidator { get; set; } + public IModelStateValidator ModelValidator => LazyGetRequiredService(ref _modelValidator); + private IModelStateValidator _modelValidator; - public IAuthorizationService AuthorizationService { get; set; } + public IAuthorizationService AuthorizationService => LazyGetRequiredService(ref _authorizationService); + private IAuthorizationService _authorizationService; - public IAlertManager AlertManager { get; set; } + public IAlertManager AlertManager => LazyGetRequiredService(ref _alertManager); + private IAlertManager _alertManager; protected IUnitOfWork CurrentUnitOfWork => UnitOfWorkManager?.Current; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs index a5d206cf55..f0ee490ed1 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Aspects; @@ -18,27 +19,55 @@ namespace Volo.Abp.AspNetCore.Mvc { public abstract class AbpController : Controller, IAvoidDuplicateCrossCuttingConcerns { - public IUnitOfWorkManager UnitOfWorkManager { get; set; } + public IServiceProvider ServiceProvider { get; set; } + protected readonly object ServiceProviderLock = new object(); + protected TService LazyGetRequiredService(ref TService reference) + { + if (reference == null) + { + lock (ServiceProviderLock) + { + if (reference == null) + { + reference = ServiceProvider.GetRequiredService(); + } + } + } + + return reference; + } + + public IUnitOfWorkManager UnitOfWorkManager => LazyGetRequiredService(ref _unitOfWorkManager); + private IUnitOfWorkManager _unitOfWorkManager; - public IObjectMapper ObjectMapper { get; set; } + public IObjectMapper ObjectMapper => LazyGetRequiredService(ref _objectMapper); + private IObjectMapper _objectMapper; - public IGuidGenerator GuidGenerator { get; set; } + public IGuidGenerator GuidGenerator => LazyGetRequiredService(ref _guidGenerator); + private IGuidGenerator _guidGenerator; - public ILoggerFactory LoggerFactory { get; set; } + public ILoggerFactory LoggerFactory => LazyGetRequiredService(ref _loggerFactory); + private ILoggerFactory _loggerFactory; - public ICurrentUser CurrentUser { get; set; } + public ICurrentUser CurrentUser => LazyGetRequiredService(ref _currentUser); + private ICurrentUser _currentUser; - public ICurrentTenant CurrentTenant { get; set; } + public ICurrentTenant CurrentTenant => LazyGetRequiredService(ref _currentTenant); + private ICurrentTenant _currentTenant; - public IAuthorizationService AuthorizationService { get; set; } + public IAuthorizationService AuthorizationService => LazyGetRequiredService(ref _authorizationService); + private IAuthorizationService _authorizationService; protected IUnitOfWork CurrentUnitOfWork => UnitOfWorkManager?.Current; - public IClock Clock { get; set; } + public IClock Clock => LazyGetRequiredService(ref _clock); + private IClock _clock; - public IModelStateValidator ModelValidator { get; set; } + public IModelStateValidator ModelValidator => LazyGetRequiredService(ref _modelValidator); + private IModelStateValidator _modelValidator; - public IFeatureChecker FeatureChecker { get; set; } + public IFeatureChecker FeatureChecker => LazyGetRequiredService(ref _featureChecker); + private IFeatureChecker _featureChecker; public List AppliedCrossCuttingConcerns { get; } = new List(); diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs index 3b2bbc7582..909ad40940 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/ApplicationService.cs @@ -1,5 +1,6 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; @@ -31,31 +32,59 @@ namespace Volo.Abp.Application.Services IAuditingEnabled, ITransientDependency { + public IServiceProvider ServiceProvider { get; set; } + protected readonly object ServiceProviderLock = new object(); + protected TService LazyGetRequiredService(ref TService reference) + { + if (reference == null) + { + lock (ServiceProviderLock) + { + if (reference == null) + { + reference = ServiceProvider.GetRequiredService(); + } + } + } + + return reference; + } + public static string[] CommonPostfixes { get; set; } = { "AppService", "ApplicationService", "Service" }; public List AppliedCrossCuttingConcerns { get; } = new List(); - public IUnitOfWorkManager UnitOfWorkManager { get; set; } + public IUnitOfWorkManager UnitOfWorkManager => LazyGetRequiredService(ref _unitOfWorkManager); + private IUnitOfWorkManager _unitOfWorkManager; - public IObjectMapper ObjectMapper { get; set; } + public IObjectMapper ObjectMapper => LazyGetRequiredService(ref _objectMapper); + private IObjectMapper _objectMapper; public IGuidGenerator GuidGenerator { get; set; } - public ILoggerFactory LoggerFactory { get; set; } + public ILoggerFactory LoggerFactory => LazyGetRequiredService(ref _loggerFactory); + private ILoggerFactory _loggerFactory; - public ICurrentTenant CurrentTenant { get; set; } + public ICurrentTenant CurrentTenant => LazyGetRequiredService(ref _currentTenant); + private ICurrentTenant _currentTenant; - public ICurrentUser CurrentUser { get; set; } + public ICurrentUser CurrentUser => LazyGetRequiredService(ref _currentUser); + private ICurrentUser _currentUser; - public ISettingProvider SettingProvider { get; set; } + public ISettingProvider SettingProvider => LazyGetRequiredService(ref _settingProvider); + private ISettingProvider _settingProvider; - public IClock Clock { get; set; } + public IClock Clock => LazyGetRequiredService(ref _clock); + private IClock _clock; - public IAuthorizationService AuthorizationService { get; set; } + public IAuthorizationService AuthorizationService => LazyGetRequiredService(ref _authorizationService); + private IAuthorizationService _authorizationService; - public IFeatureChecker FeatureChecker { get; set; } + public IFeatureChecker FeatureChecker => LazyGetRequiredService(ref _featureChecker); + private IFeatureChecker _featureChecker; - public IStringLocalizerFactory StringLocalizerFactory { get; set; } + public IStringLocalizerFactory StringLocalizerFactory => LazyGetRequiredService(ref _stringLocalizerFactory); + private IStringLocalizerFactory _stringLocalizerFactory; public IStringLocalizer L => _localizer ?? (_localizer = StringLocalizerFactory.Create(LocalizationResource)); private IStringLocalizer _localizer; diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs index ea94690d61..14e8a64131 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs @@ -1,4 +1,5 @@ using System; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Guids; @@ -9,13 +10,34 @@ namespace Volo.Abp.Domain.Services { public abstract class DomainService : IDomainService { - public IClock Clock { get; set; } + public IServiceProvider ServiceProvider { get; set; } + protected readonly object ServiceProviderLock = new object(); + protected TService LazyGetRequiredService(ref TService reference) + { + if (reference == null) + { + lock (ServiceProviderLock) + { + if (reference == null) + { + reference = ServiceProvider.GetRequiredService(); + } + } + } + + return reference; + } + + public IClock Clock => LazyGetRequiredService(ref _clock); + private IClock _clock; public IGuidGenerator GuidGenerator { get; set; } - public ILoggerFactory LoggerFactory { get; set; } + public ILoggerFactory LoggerFactory => LazyGetRequiredService(ref _loggerFactory); + private ILoggerFactory _loggerFactory; - public ICurrentTenant CurrentTenant { get; set; } + public ICurrentTenant CurrentTenant => LazyGetRequiredService(ref _currentTenant); + private ICurrentTenant _currentTenant; protected ILogger Logger => _lazyLogger.Value; private Lazy _lazyLogger => new Lazy(() => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance, true); From 190886d514fff226f76542c16028f0ac15534217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Fri, 26 Apr 2019 17:15:15 +0800 Subject: [PATCH 036/335] Add languages menu and localization texts for blogging module --- .../Volo.BloggingTestApp/BloggingTestAppModule.cs | 2 +- .../src/Volo.Blogging.Web/BloggingWebModule.cs | 3 +++ .../Localization/Resources/Blogging/Web/en.json | 8 +++++++- .../Localization/Resources/Blogging/Web/pt-BR.json | 8 +++++++- .../Localization/Resources/Blogging/Web/tr.json | 8 +++++++- .../Localization/Resources/Blogging/Web/zh-Hans.json | 12 +++++++++--- 6 files changed, 34 insertions(+), 7 deletions(-) diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index 248d1433cc..84ed5d1910 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -98,7 +98,7 @@ namespace Volo.BloggingTestApp options.CustomSchemaIds(type => type.FullName); }); - var cultures = new List { new CultureInfo("en"), new CultureInfo("tr") }; + var cultures = new List { new CultureInfo("en"), new CultureInfo("tr"),new CultureInfo("zh-Hans") }; Configure(options => { options.DefaultRequestCulture = new RequestCulture("en"); diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs index 9071dee2d6..20678ddc37 100644 --- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs +++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs @@ -45,6 +45,9 @@ namespace Volo.Blogging Configure(options => { + options.Languages.Add(new LanguageInfo("en", "en", "English")); + options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe")); + options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); options.Resources .Get() .AddBaseTypes(typeof(AbpValidationResource)) diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json index 444c3d80af..b84b1f2483 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json +++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json @@ -36,6 +36,12 @@ "CoverImage": "Cover Image", "CreateANewPost": "Create A New Post", "CreateANewBlog": "Create A New Blog", - "WhatIsNew": "What is new?" + "WhatIsNew": "What is new?", + "Name": "Name", + "ShortName": "Short Name", + "CreationTime": "Creation Time", + "Description": "Description", + "Blogs": "Blogs", + "Tags": "Tags" } } \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/pt-BR.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/pt-BR.json index cf98e56b06..62416f49a5 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/pt-BR.json +++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/pt-BR.json @@ -36,6 +36,12 @@ "CoverImage": "Imagem de Capa", "CreateANewPost": "Criar uma nova Postagem", "CreateANewBlog": "Criar um novo Blog", - "WhatIsNew": "O que há de novo?" + "WhatIsNew": "O que há de novo?", + "Name": "Nome", + "ShortName": "Nome Curto", + "CreationTime": "Hora da criação", + "Description": "Descrição", + "Blogs": "Blogs", + "Tags": "Etiquetas" } } \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json index dc5df7f0d0..bb8b23f9d2 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json +++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json @@ -36,6 +36,12 @@ "CoverImage": "Kapak resmi", "CreateANewPost": "Yeni Yazı oluştur", "CreateANewBlog": "Yeni Blog Ekle", - "WhatIsNew": "Yeniler" + "WhatIsNew": "Yeniler", + "Name": "İsim", + "ShortName": "Kısa isim", + "CreationTime": "Yaratma zamanı", + "Description": "Açıklama", + "Blogs": "Bloglar", + "Tags": "Etiketler" } } \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/zh-Hans.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/zh-Hans.json index a67e325497..2ea614b648 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/zh-Hans.json +++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/zh-Hans.json @@ -36,6 +36,12 @@ "CoverImage": "封面图", "CreateANewPost": "创建一个新帖子", "CreateANewBlog": "创建一个新博客", - "WhatIsNew": "最新消息" - } - } \ No newline at end of file + "WhatIsNew": "最新消息", + "Name": "名称", + "ShortName": "简称", + "CreationTime": "创建时间", + "Description": "描述", + "Blogs": "博客", + "Tags": "标签" + } +} \ No newline at end of file From bb8edb70fd038c7a9273fcde61ea690e5424e97c Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 26 Apr 2019 17:43:23 +0800 Subject: [PATCH 037/335] Use GetPublicConstantsRecursively in Permissions.GetAll. --- .../Volo/Blogging/BloggingPermissions.cs | 26 +++---------------- .../Volo/Docs/Admin/DocsAdminPermissions.cs | 13 +++------- .../Volo/Abp/Identity/IdentityPermissions.cs | 20 +++----------- .../TenantManagementPermissions.cs | 15 +++-------- .../Permissions/BookStorePermissions.cs | 3 ++- .../ProductManagementPermissions.cs | 13 +++------- .../MyProjectName/MyProjectNamePermissions.cs | 9 +++---- .../Permissions/MyProjectNamePermissions.cs | 3 ++- .../MyProjectName/MyProjectNamePermissions.cs | 9 +++---- 9 files changed, 32 insertions(+), 79 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissions.cs b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissions.cs index e73dc334da..fae85acf88 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissions.cs +++ b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingPermissions.cs @@ -1,4 +1,6 @@ -namespace Volo.Blogging +using Volo.Abp.Reflection; + +namespace Volo.Blogging { public class BloggingPermissions { @@ -39,27 +41,7 @@ public static string[] GetAll() { - return new[] - { - GroupName, - Blogs.Default, - Blogs.Management, - Blogs.Delete, - Blogs.Update, - Blogs.Create, - Posts.Default, - Posts.Delete, - Posts.Update, - Posts.Create, - Tags.Default, - Tags.Delete, - Tags.Update, - Tags.Create, - Comments.Default, - Comments.Delete, - Comments.Update, - Comments.Create - }; + return ReflectionHelper.GetPublicConstantsRecursively(typeof(BloggingPermissions)); } } } diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs index 565b70c7f5..341f4c5819 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminPermissions.cs @@ -1,4 +1,6 @@ -namespace Volo.Docs.Admin +using Volo.Abp.Reflection; + +namespace Volo.Docs.Admin { public class DocsAdminPermissions { @@ -14,14 +16,7 @@ public static string[] GetAll() { - return new[] - { - GroupName, - Projects.Default, - Projects.Delete, - Projects.Update, - Projects.Create, - }; + return ReflectionHelper.GetPublicConstantsRecursively(typeof(DocsAdminPermissions)); } } } diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissions.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissions.cs index 339122c2a8..e22869295f 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissions.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityPermissions.cs @@ -1,4 +1,6 @@ -namespace Volo.Abp.Identity +using Volo.Abp.Reflection; + +namespace Volo.Abp.Identity { public static class IdentityPermissions { @@ -29,21 +31,7 @@ public static string[] GetAll() { - return new[] - { - GroupName, - Roles.Default, - Roles.Create, - Roles.Update, - Roles.Delete, - Roles.ManagePermissions, - Users.Default, - Users.Create, - Users.Update, - Users.Delete, - Users.ManagePermissions, - UserLookup.Default - }; + return ReflectionHelper.GetPublicConstantsRecursively(typeof(IdentityPermissions)); } } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementPermissions.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementPermissions.cs index 6bc90271bc..49afb47c25 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementPermissions.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementPermissions.cs @@ -1,4 +1,6 @@ -namespace Volo.Abp.TenantManagement +using Volo.Abp.Reflection; + +namespace Volo.Abp.TenantManagement { public static class TenantManagementPermissions { @@ -16,16 +18,7 @@ public static string[] GetAll() { - return new[] - { - GroupName, - Tenants.Default, - Tenants.Create, - Tenants.Update, - Tenants.Delete, - Tenants.ManageFeatures, - Tenants.ManageConnectionStrings - }; + return ReflectionHelper.GetPublicConstantsRecursively(typeof(TenantManagementPermissions)); } } } \ No newline at end of file diff --git a/samples/BookStore/src/Acme.BookStore.Application/Permissions/BookStorePermissions.cs b/samples/BookStore/src/Acme.BookStore.Application/Permissions/BookStorePermissions.cs index b1ec575904..ea8a26d6ef 100644 --- a/samples/BookStore/src/Acme.BookStore.Application/Permissions/BookStorePermissions.cs +++ b/samples/BookStore/src/Acme.BookStore.Application/Permissions/BookStorePermissions.cs @@ -1,4 +1,5 @@ using System; +using Volo.Abp.Reflection; namespace Acme.BookStore.Permissions { @@ -12,7 +13,7 @@ namespace Acme.BookStore.Permissions public static string[] GetAll() { //Return an array of all permissions - return Array.Empty(); + return ReflectionHelper.GetPublicConstantsRecursively(typeof(BookStorePermissions)); } } } \ No newline at end of file diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementPermissions.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementPermissions.cs index b4dd949a73..eebc8cb29c 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementPermissions.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementPermissions.cs @@ -1,4 +1,6 @@ -namespace ProductManagement +using Volo.Abp.Reflection; + +namespace ProductManagement { public class ProductManagementPermissions { @@ -14,14 +16,7 @@ } public static string[] GetAll() { - return new[] - { - GroupName, - Products.Default, - Products.Delete, - Products.Update, - Products.Create - }; + return ReflectionHelper.GetPublicConstantsRecursively(typeof(ProductManagementPermissions)); } } } \ No newline at end of file diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs b/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs index 88e7a3c05b..00d1124498 100644 --- a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs +++ b/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs @@ -1,4 +1,6 @@ -namespace MyCompanyName.MyProjectName +using Volo.Abp.Reflection; + +namespace MyCompanyName.MyProjectName { public class MyProjectNamePermissions { @@ -6,10 +8,7 @@ public static string[] GetAll() { - return new[] - { - GroupName - }; + return ReflectionHelper.GetPublicConstantsRecursively(typeof(MyProjectNamePermissions)); } } } \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs index 4e499ae2ed..0646692500 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs @@ -1,4 +1,5 @@ using System; +using Volo.Abp.Reflection; namespace MyCompanyName.MyProjectName.Permissions { @@ -12,7 +13,7 @@ namespace MyCompanyName.MyProjectName.Permissions public static string[] GetAll() { //Return an array of all permissions - return Array.Empty(); + return ReflectionHelper.GetPublicConstantsRecursively(typeof(MyProjectNamePermissions)); } } } \ No newline at end of file diff --git a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs index 88e7a3c05b..00d1124498 100644 --- a/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs +++ b/templates/service/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs @@ -1,4 +1,6 @@ -namespace MyCompanyName.MyProjectName +using Volo.Abp.Reflection; + +namespace MyCompanyName.MyProjectName { public class MyProjectNamePermissions { @@ -6,10 +8,7 @@ public static string[] GetAll() { - return new[] - { - GroupName - }; + return ReflectionHelper.GetPublicConstantsRecursively(typeof(MyProjectNamePermissions)); } } } \ No newline at end of file From 4206528ff90dea98c80080523d65c7030c4394d4 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 26 Apr 2019 12:44:43 +0300 Subject: [PATCH 038/335] Update tr.json https://github.com/abpframework/abp/pull/1060 --- .../Localization/Resources/Blogging/Web/tr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json index bb8b23f9d2..7747638587 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json +++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json @@ -39,7 +39,7 @@ "WhatIsNew": "Yeniler", "Name": "İsim", "ShortName": "Kısa isim", - "CreationTime": "Yaratma zamanı", + "CreationTime": "Oluşturulma zamanı", "Description": "Açıklama", "Blogs": "Bloglar", "Tags": "Etiketler" From 35fc002c0aaba9ece0b74838cf73e6f8a60e41cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Fri, 26 Apr 2019 18:05:57 +0800 Subject: [PATCH 039/335] Add branding provider and improve localization --- .../BloggingTestAppBrandingProvider.cs | 18 ++++++++++++++++++ .../Volo.Blogging.Web/Pages/Blog/Index.cshtml | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 modules/blogging/app/Volo.BloggingTestApp/Branding/BloggingTestAppBrandingProvider.cs diff --git a/modules/blogging/app/Volo.BloggingTestApp/Branding/BloggingTestAppBrandingProvider.cs b/modules/blogging/app/Volo.BloggingTestApp/Branding/BloggingTestAppBrandingProvider.cs new file mode 100644 index 0000000000..e5a8046ff7 --- /dev/null +++ b/modules/blogging/app/Volo.BloggingTestApp/Branding/BloggingTestAppBrandingProvider.cs @@ -0,0 +1,18 @@ +using Microsoft.AspNetCore.Mvc.Localization; +using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; +using Volo.Abp.DependencyInjection; +using Volo.Blogging.Localization; + +namespace Volo.BloggingTestApp.Branding +{ + [Dependency(ReplaceServices = true)] + public class BloggingTestAppBrandingProvider : DefaultBrandingProvider + { + public IHtmlLocalizer L { get; set; } + public BloggingTestAppBrandingProvider(IHtmlLocalizer localizer) + { + L = localizer; + } + public override string AppName => L["Blogs"].Value; + } +} diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml index fadaaab269..97f06b6dc0 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml @@ -1,12 +1,12 @@ @page @using Volo.Blogging.Pages.Blog -@*inherits BloggingPage*@ +@inherits BloggingPage @model IndexModel @{ ViewBag.PageTitle = "Blog"; }

    - Blogs + @L["Blogs"]

      From e9be89d57c625faca5b4f0b986c2a143d67e3436 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 26 Apr 2019 20:42:46 +0800 Subject: [PATCH 040/335] fix #1058 Perform non-null validation on propertyName(context.Key.Name). --- ...AutoLocalizationMetadataDetailsProvider.cs | 5 ++++ .../Validation/ValidationTestController.cs | 25 ++++++++++++++++++- .../ValidationTestController_Tests.cs | 11 ++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs index 2274f0a9b6..d9de135e7f 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs @@ -39,6 +39,11 @@ namespace Volo.Abp.AspNetCore.Mvc return; } + if (context.Key.Name.IsNullOrWhiteSpace()) + { + return; + } + if (_localizationOptions.Value.Value.DataAnnotationLocalizerProvider == null) { return; diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs index b9d01a86c4..6bb9a5ae94 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController.cs @@ -1,4 +1,5 @@ -using System.ComponentModel.DataAnnotations; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Shouldly; @@ -16,6 +17,14 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation return Task.FromResult(model.Value1); } + [HttpGet] + [Route("object-result-action-with-custom_validate")] + public Task ObjectResultActionWithCustomValidate(CustomValidateModel model) + { + ModelState.IsValid.ShouldBeTrue(); //AbpValidationFilter throws exception otherwise + return Task.FromResult(model.Value1); + } + [HttpGet] [Route("action-result-action")] public IActionResult ActionResultAction(ValidationTest1Model model) @@ -29,5 +38,19 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation [MinLength(2)] public string Value1 { get; set; } } + + public class CustomValidateModel : IValidatableObject + { + public string Value1 { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + if (Value1 != "hello") + { + yield return new ValidationResult("Value1 should be hello"); + } + } + } + } } \ No newline at end of file diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs index 19a4bcd608..5177868843 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Validation/ValidationTestController_Tests.cs @@ -47,5 +47,16 @@ namespace Volo.Abp.AspNetCore.Mvc.Validation var result = await GetResponseAsStringAsync("/api/validation-test/action-result-action"); //Missed the value1 result.ShouldBe("ModelState.IsValid: false"); } + + [Fact] + public async Task Should_Return_Custom_Validate_Errors() + { + var result = await GetResponseAsObjectAsync( + "/api/validation-test/object-result-action-with-custom_validate?value1=abc", HttpStatusCode.BadRequest); //value1 should be hello. + + result.Error.ValidationErrors.Length.ShouldBeGreaterThan(0); + result.Error.ValidationErrors.ShouldContain(x => x.Message == "Value1 should be hello"); + } + } } From fa32c1427b1ff0bfebcaf15f8d8737b560b41413 Mon Sep 17 00:00:00 2001 From: Aaron Chong Date: Sat, 27 Apr 2019 00:38:09 +0800 Subject: [PATCH 041/335] Fix spelling mistakes --- docs/en/Exception-Handling.md | 4 ++-- docs/en/Microservice-Architecture.md | 2 +- docs/en/Tutorials/AspNetCore-Mvc/Part-I.md | 4 ++-- docs/zh-Hans/Exception-Handling.md | 2 +- .../TagHelpers/Form/AbpInputTagHelperService.cs | 8 ++++---- .../TagHelpers/Form/AbpRadioInputTagHelperService.cs | 8 ++++---- .../TagHelpers/Form/AbpSelectTagHelperService.cs | 8 ++++---- .../ExceptionHandling/AbpExceptionHandlingMiddleware.cs | 2 +- .../DependencyInjection/AutofacServiceProviderFactory.cs | 2 +- .../DependencyInjection/ServiceCollectionExtensions.cs | 2 +- .../Volo/Abp/BackgroundJobs/BackgroundJobInfo.cs | 2 +- framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs | 4 ++-- .../Entities/Events/Distributed/EntityToEtoMapper.cs | 2 +- .../Abp/Security/Encryption/StringEncryptionOptions.cs | 2 +- .../Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs | 2 +- .../Versioning/AbpAspNetCoreMvcVersioningTestModule.cs | 2 +- .../Volo/Abp/Auditing/AuditingInterceptor_Tests.cs | 2 +- .../AbpConventionalDependencyInjectionExtensions_Tests.cs | 6 +++--- .../Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs | 2 +- 19 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/en/Exception-Handling.md b/docs/en/Exception-Handling.md index 144c6016dd..93bad2b6ed 100644 --- a/docs/en/Exception-Handling.md +++ b/docs/en/Exception-Handling.md @@ -29,7 +29,7 @@ Error Message is an instance of the `RemoteServiceErrorResponse` class. The simp } ```` -There are **optional fields** those can be filled based upon the exception that has occured. +There are **optional fields** those can be filled based upon the exception that has occurred. ##### Error Code @@ -70,7 +70,7 @@ Error **details** in an optional field of the JSON error message. Thrown `Except "code": "App:010046", "message": "Your request is not valid, please correct and try again!", "validationErrors": [{ - "message": "Username should be minimum lenght of 3.", + "message": "Username should be minimum length of 3.", "members": ["userName"] }, { diff --git a/docs/en/Microservice-Architecture.md b/docs/en/Microservice-Architecture.md index e30c070a01..ff85873ee7 100644 --- a/docs/en/Microservice-Architecture.md +++ b/docs/en/Microservice-Architecture.md @@ -19,7 +19,7 @@ One of the major goals of the ABP framework is to provide a convenient infrastru ## Microservice for New Applications -One common advise to start a new solution is **always to start with a monolith**, keep it modular and split into microservices once the monolith becomes a problem. This makes your progress fast in the beginning especially if your team is small and you don't want to deal with challanges of the microservice architecture. +One common advise to start a new solution is **always to start with a monolith**, keep it modular and split into microservices once the monolith becomes a problem. This makes your progress fast in the beginning especially if your team is small and you don't want to deal with challenges of the microservice architecture. However, developing such a well-modular application can be a problem since it is **hard to keep modules isolated** from each other as you would do it for microservices (see [Stefan Tilkov's article](https://martinfowler.com/articles/dont-start-monolith.html) about that). Microservice architecture naturally forces you to develop well isolated services, but in a modular monolithic application it's easy to tight couple modules to each other and design **weak module boundaries** and API contracts. diff --git a/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md b/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md index a841b6ad65..ecc302c34d 100644 --- a/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md +++ b/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md @@ -151,7 +151,7 @@ namespace Acme.BookStore * **DTO** classes are used to **transfer data** between the *presentation layer* and the *application layer*. See the [Data Transfer Objects document](../../Data-Transfer-Objects.md) for more details. * `BookDto` is used to transfer book data to the presentation layer in order to show the book information on the UI. * `BookDto` is derived from the `AuditedEntityDto` which has audit properties just like the `Book` class defined above. -* `[AutoMapFrom(typeof(Book))]` is used to create AutoMapper mapping from the `Book` class to the `BookDto` class. In this way, you get automatic convertion of `Book` objects to `BookDto` objects (instead of manually copy all properties). +* `[AutoMapFrom(typeof(Book))]` is used to create AutoMapper mapping from the `Book` class to the `BookDto` class. In this way, you get automatic conversion of `Book` objects to `BookDto` objects (instead of manually copy all properties). #### CreateUpdateBookDto @@ -425,7 +425,7 @@ $(function () { ```` * `abp.libs.datatables.createAjax` is a helper function to adapt ABP's dynamic JavaScript API proxies to Datatable's format. -* `abp.libs.datatables.normalizeConfiguration` is another helper function. There's no requirment to use it, but it simplifies the datatables configuration by providing conventional values for missing options. +* `abp.libs.datatables.normalizeConfiguration` is another helper function. There's no requirement to use it, but it simplifies the datatables configuration by providing conventional values for missing options. * `acme.bookStore.book.getList` is the function to get list of books (you have seen it before). * See [Datatable's documentation](https://datatables.net/manual/) for more configuration options. diff --git a/docs/zh-Hans/Exception-Handling.md b/docs/zh-Hans/Exception-Handling.md index ecb4acf5e7..a251c50f61 100644 --- a/docs/zh-Hans/Exception-Handling.md +++ b/docs/zh-Hans/Exception-Handling.md @@ -70,7 +70,7 @@ ABP提供了用于处理Web应用程序异常的标准模型. "code": "App:010046", "message": "Your request is not valid, please correct and try again!", "validationErrors": [{ - "message": "Username should be minimum lenght of 3.", + "message": "Username should be minimum length of 3.", "members": ["userName"] }, { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs index cdf1f30788..dc2f04b623 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs @@ -35,10 +35,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form TagHelper.AspFor.Name, SurroundInnerHtmlAndGet(context, output, innerHtml, isCheckbox), order, - out var surpress + out var suppress ); - if (surpress) + if (suppress) { output.SuppressOutput(); } @@ -389,10 +389,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form return idAttr != null ? "for=\"" + idAttr.Value + "\"" : ""; } - protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool surpress) + protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool suppress) { var list = context.GetValue>(FormGroupContents) ?? new List(); - surpress = list == null; + suppress = list == null; if (list != null && !list.Any(igc => igc.HtmlContent.Contains("id=\"" + propertyName.Replace('.', '_') + "\""))) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs index 6ec2911714..f89d3c1fee 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs @@ -29,9 +29,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form var html = GetHtml(context, output, selectItems); - AddGroupToFormGroupContents(context, TagHelper.AspFor.Name, html, order, out var surpress); + AddGroupToFormGroupContents(context, TagHelper.AspFor.Name, html, order, out var suppress); - if (surpress) + if (suppress) { output.SuppressOutput(); } @@ -157,10 +157,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form return TagHelper.AspFor.ModelExplorer.Model?.ToString(); } - protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool surpress) + protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool suppress) { var list = context.GetValue>(FormGroupContents) ?? new List(); - surpress = list == null; + suppress = list == null; if (list != null && !list.Any(igc => igc.HtmlContent.Contains("id=\"" + propertyName.Replace('.', '_') + "\""))) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs index cd3294d66f..2c7e6ad1cf 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs @@ -33,9 +33,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder(); - AddGroupToFormGroupContents(context, TagHelper.AspFor.Name, SurroundInnerHtmlAndGet(context, output, innerHtml), order, out var surpress); + AddGroupToFormGroupContents(context, TagHelper.AspFor.Name, SurroundInnerHtmlAndGet(context, output, innerHtml), order, out var suppress); - if (surpress) + if (suppress) { output.SuppressOutput(); } @@ -304,10 +304,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form return idAttr != null ? "for=\"" + idAttr.Value + "\"" : ""; } - protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool surpress) + protected virtual void AddGroupToFormGroupContents(TagHelperContext context, string propertyName, string html, int order, out bool suppress) { var list = context.GetValue>(FormGroupContents) ?? new List(); - surpress = list == null; + suppress = list == null; if (list != null && !list.Any(igc => igc.HtmlContent.Contains("id=\"" + propertyName.Replace('.', '_') + "\""))) { diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/AbpExceptionHandlingMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/AbpExceptionHandlingMiddleware.cs index 502fbda5bb..f36a7f4860 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/AbpExceptionHandlingMiddleware.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/AbpExceptionHandlingMiddleware.cs @@ -36,7 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling // We can't do anything if the response has already started, just abort. if (httpContext.Response.HasStarted) { - _logger.LogWarning("An exception occured, but response has already started!"); + _logger.LogWarning("An exception occurred, but response has already started!"); throw; } diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProviderFactory.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProviderFactory.cs index 8e0d4f574d..21a7ca331d 100644 --- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProviderFactory.cs +++ b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProviderFactory.cs @@ -38,7 +38,7 @@ namespace Autofac.Extensions.DependencyInjection /// /// Initializes a new instance of the class. /// - /// Action on a that adds component registrations to the conatiner. + /// Action on a that adds component registrations to the container. public AutofacServiceProviderFactory(Action configurationAction = null) { _configurationAction = configurationAction ?? (builder => { }); diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/ServiceCollectionExtensions.cs index 5552cda7b2..1195cb9fb1 100644 --- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/ServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/ServiceCollectionExtensions.cs @@ -37,7 +37,7 @@ namespace Autofac.Extensions.DependencyInjection /// Adds the to the service collection. /// /// The service collection to add the factory to. - /// Action on a that adds component registrations to the conatiner. + /// Action on a that adds component registrations to the container. /// The service collection. public static IServiceCollection AddAutofac(this IServiceCollection services, Action configurationAction = null) { diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobInfo.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobInfo.cs index 7e1154ec7e..6241bc81f9 100644 --- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobInfo.cs +++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobInfo.cs @@ -42,7 +42,7 @@ namespace Volo.Abp.BackgroundJobs public virtual DateTime? LastTryTime { get; set; } /// - /// This is true if this job is continously failed and will not be executed again. + /// This is true if this job is continuously failed and will not be executed again. /// public virtual bool IsAbandoned { get; set; } diff --git a/framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs b/framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs index a7cf7c763e..31e7f257d4 100644 --- a/framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs +++ b/framework/src/Volo.Abp.Core/System/AbpStringExtensions.cs @@ -84,11 +84,11 @@ namespace System } /// - /// Gets index of nth occurence of a char in a string. + /// Gets index of nth occurrence of a char in a string. /// /// source string to be searched /// Char to search in - /// Count of the occurence + /// Count of the occurrence public static int NthIndexOf(this string str, char c, int n) { Check.NotNull(str, nameof(str)); diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs index 354f72dddc..fd7cab1f4f 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs @@ -39,7 +39,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed return new EntityEto(keys); } - //TODO: Also add KeysAsString property to resulting json for compability with the EntityEto! + //TODO: Also add KeysAsString property to resulting json for compatibility with the EntityEto! return ObjectMapper.Map(entityType, etoType, entityObj); } } diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionOptions.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionOptions.cs index 91768d37e8..67eae167c3 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionOptions.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionOptions.cs @@ -15,7 +15,7 @@ namespace Volo.Abp.Security.Encryption /// /// Default password to encrypt/decrypt texts. - /// It's recommented to set to another value for security. + /// It's recommended to set to another value for security. /// Default value: "gsKnGZ041HLL4IM8" /// public string DefaultPassPhrase { get; set; } diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs index 4218a9693f..df867c2320 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Uow public class UnitOfWorkFailedEventArgs : UnitOfWorkEventArgs { /// - /// Exception that caused failure. This is set only if an error occured during . + /// Exception that caused failure. This is set only if an error occurred during . /// Can be null if there is no exception, but is not called. /// Can be null if another exception occurred during the UOW. /// diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs index 728b119a19..24a76e3766 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning opts.ApiVersions.Add(new ApiVersion(2, 0)); }); - //1.0 Compatability version + //1.0 Compatibility version options.ConventionalControllers.Create(typeof(AbpAspNetCoreMvcVersioningTestModule).Assembly, opts => { opts.TypePredicate = t => t.Namespace == typeof(Volo.Abp.AspNetCore.Mvc.Versioning.App.Compat.TodoAppService).Namespace; diff --git a/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AuditingInterceptor_Tests.cs b/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AuditingInterceptor_Tests.cs index 141bf01688..23eba6c53b 100644 --- a/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AuditingInterceptor_Tests.cs +++ b/framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/AuditingInterceptor_Tests.cs @@ -37,7 +37,7 @@ namespace Volo.Abp.Auditing using (var scope = _auditingManager.BeginScope()) { - await myAuditedObject1.DoItAsync(new InputObject { Value1 = "fourty-two", Value2 = 42 }); + await myAuditedObject1.DoItAsync(new InputObject { Value1 = "forty-two", Value2 = 42 }); await scope.SaveAsync(); } diff --git a/framework/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs index 369ee98cb9..dc02cf4e2d 100644 --- a/framework/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs +++ b/framework/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs @@ -85,7 +85,7 @@ namespace Microsoft.Extensions.DependencyInjection //Assert - //Check descriptons in service collection + //Check descriptions in service collection var descriptions = _services.Where(s => s.ServiceType == typeof(IMyService)).ToList(); descriptions.Count.ShouldBe(2); descriptions[0].ImplementationType.ShouldBe(typeof(FirstImplOfMyService)); @@ -113,7 +113,7 @@ namespace Microsoft.Extensions.DependencyInjection //Assert - //Check descriptons in service collection + //Check descriptions in service collection var descriptions = _services.Where(s => s.ServiceType == typeof(IMyService)).ToList(); descriptions.Count.ShouldBe(1); descriptions[0].ImplementationType.ShouldBe(typeof(FirstImplOfMyService)); @@ -139,7 +139,7 @@ namespace Microsoft.Extensions.DependencyInjection //Assert - //Check descriptons in service collection + //Check descriptions in service collection var descriptions = _services.Where(s => s.ServiceType == typeof(IMyService)).ToList(); descriptions.Count.ShouldBe(1); descriptions[0].ImplementationType.ShouldBe(typeof(MyServiceReplacesIMyService)); diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs index 0c18e9f877..c3684d9cfe 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs @@ -39,7 +39,7 @@ namespace Volo.Abp.BackgroundJobs public virtual DateTime? LastTryTime { get; set; } /// - /// This is true if this job is continously failed and will not be executed again. + /// This is true if this job is continuously failed and will not be executed again. /// public virtual bool IsAbandoned { get; set; } From f655540555712410cccf722f4bda46f465a11e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0smail=20=C3=87AGDA=C5=9E?= Date: Fri, 26 Apr 2019 22:38:48 +0300 Subject: [PATCH 042/335] updated all nuget packages --- .../Volo.AbpWebSite.Domain/Volo.AbpWebSite.Domain.csproj | 2 +- .../Volo.Utils.SolutionTemplating.csproj | 2 +- .../Volo.Abp.AspNetCore.Mvc.csproj | 2 +- .../src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj | 2 +- .../src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj | 2 +- framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj | 2 +- framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj | 6 +++--- .../Volo.Abp.EntityFrameworkCore.SqlServer.csproj | 2 +- .../Volo.Abp.EntityFrameworkCore.csproj | 4 ++-- .../Volo.Abp.FluentValidation.csproj | 2 +- framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj | 2 +- .../Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj | 2 +- framework/src/Volo.Abp.Json/Volo.Abp.Json.csproj | 2 +- .../Volo.Abp.Localization/Volo.Abp.Localization.csproj | 2 +- framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj | 2 +- framework/test/AbpTestBase/AbpTestBase.csproj | 4 ++-- .../Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj | 2 +- .../Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj | 2 +- .../Volo.Abp.AspNetCore.Mvc.Tests.csproj | 2 +- ...Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj | 2 +- .../Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj | 6 +++--- .../Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj | 2 +- .../Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj | 2 +- .../Volo.Abp.AspNetCore.Tests.csproj | 2 +- .../Volo.Abp.Auditing.Tests.csproj | 2 +- .../Volo.Abp.Authorization.Tests.csproj | 2 +- .../Volo.Abp.AutoMapper.Tests.csproj | 2 +- .../Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj | 2 +- .../Volo.Abp.BackgroundJobs.Tests.csproj | 2 +- .../Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj | 2 +- .../Volo.Abp.Castle.Core.Tests.csproj | 2 +- .../test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj | 2 +- .../test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj | 2 +- .../test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj | 2 +- .../Volo.Abp.Emailing.Tests.csproj | 2 +- .../Volo.Abp.EntityFrameworkCore.Tests.csproj | 4 ++-- .../Volo.Abp.EventBus.Tests.csproj | 2 +- .../Volo.Abp.Features.Tests.csproj | 2 +- .../Volo.Abp.FluentValidation.Tests.csproj | 2 +- .../Volo.Abp.Http.Client.Tests.csproj | 2 +- .../Volo.Abp.Localization.Tests.csproj | 2 +- .../Volo.Abp.MemoryDb.Tests.csproj | 2 +- .../Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj | 4 ++-- .../Volo.Abp.MultiTenancy.Tests.csproj | 2 +- .../Volo.Abp.Security.Tests.csproj | 2 +- .../Volo.Abp.Serialization.Tests.csproj | 2 +- .../Volo.Abp.Settings.Tests.csproj | 2 +- .../Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj | 2 +- framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj | 2 +- .../Volo.Abp.UI.Navigation.Tests.csproj | 2 +- .../test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj | 2 +- .../Volo.Abp.Validation.Tests.csproj | 2 +- .../Volo.Abp.VirtualFileSystem.Tests.csproj | 2 +- ...Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj | 2 +- .../Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj | 2 +- .../Volo.Abp.BackgroundJobs.DemoApp.csproj | 5 ++++- .../Volo.Abp.BackgroundJobs.Domain.Tests.csproj | 2 +- ...lo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj | 8 ++++---- .../Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj | 4 ++-- .../Volo.Abp.BackgroundJobs.TestBase.csproj | 4 ++-- .../Volo.Blogging.EntityFrameworkCore.Tests.csproj | 2 +- .../Volo.Docs.EntityFrameworkCore.Tests.csproj | 4 ++-- ...Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj | 4 ++-- .../Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj | 4 ++-- ...lo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj | 2 +- ....PermissionManagement.EntityFrameworkCore.Tests.csproj | 2 +- .../Volo.Abp.PermissionManagement.Tests.csproj | 2 +- ...Abp.SettingManagement.EntityFrameworkCore.Tests.csproj | 2 +- ....Abp.TenantManagement.EntityFrameworkCore.Tests.csproj | 4 ++-- .../Volo.Abp.Users.EntityFrameworkCore.Tests.csproj | 2 +- .../Acme.BookStore.Application.Tests.csproj | 2 +- .../ProductManagement.EntityFrameworkCore.Tests.csproj | 4 ++-- ...anyName.MyProjectName.EntityFrameworkCore.Tests.csproj | 4 ++-- .../MyCompanyName.MyProjectName.Application.Tests.csproj | 2 +- ...anyName.MyProjectName.EntityFrameworkCore.Tests.csproj | 4 ++-- 75 files changed, 98 insertions(+), 95 deletions(-) diff --git a/abp_io/src/Volo.AbpWebSite.Domain/Volo.AbpWebSite.Domain.csproj b/abp_io/src/Volo.AbpWebSite.Domain/Volo.AbpWebSite.Domain.csproj index b0c9926b35..78d1a7ac96 100644 --- a/abp_io/src/Volo.AbpWebSite.Domain/Volo.AbpWebSite.Domain.csproj +++ b/abp_io/src/Volo.AbpWebSite.Domain/Volo.AbpWebSite.Domain.csproj @@ -12,7 +12,7 @@ - + diff --git a/abp_io/src/Volo.Utils.SolutionTemplating/Volo.Utils.SolutionTemplating.csproj b/abp_io/src/Volo.Utils.SolutionTemplating/Volo.Utils.SolutionTemplating.csproj index 254d8b65c5..10004ae55e 100644 --- a/abp_io/src/Volo.Utils.SolutionTemplating/Volo.Utils.SolutionTemplating.csproj +++ b/abp_io/src/Volo.Utils.SolutionTemplating/Volo.Utils.SolutionTemplating.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj index e99572852e..4ee308e591 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj @@ -23,7 +23,7 @@ - + diff --git a/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj b/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj index 37c728f175..fb85cbb3ec 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj +++ b/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj @@ -29,7 +29,7 @@ - + diff --git a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj index ae384414a3..029669c348 100644 --- a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj +++ b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj @@ -18,7 +18,7 @@ - + \ No newline at end of file diff --git a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj index c8737bbfeb..3e68488105 100644 --- a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj +++ b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj index 71d48038e2..e5355a19c1 100644 --- a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj +++ b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj @@ -14,16 +14,16 @@ - + - + - + diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj index 5b33186509..2f5cdfb4fb 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj @@ -18,7 +18,7 @@ - + diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj b/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj index 65dda178a5..bfbf0cdf49 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj b/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj index 12084177a9..fe8a6a4192 100644 --- a/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj +++ b/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj index e418ca03e5..e4b9db1c7b 100644 --- a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj +++ b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj b/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj index d16fac5ba0..fcfff3fcb5 100644 --- a/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj +++ b/framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/src/Volo.Abp.Json/Volo.Abp.Json.csproj b/framework/src/Volo.Abp.Json/Volo.Abp.Json.csproj index 39b92cc428..8964f2f4fe 100644 --- a/framework/src/Volo.Abp.Json/Volo.Abp.Json.csproj +++ b/framework/src/Volo.Abp.Json/Volo.Abp.Json.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/src/Volo.Abp.Localization/Volo.Abp.Localization.csproj b/framework/src/Volo.Abp.Localization/Volo.Abp.Localization.csproj index b429defa2d..65ceed101e 100644 --- a/framework/src/Volo.Abp.Localization/Volo.Abp.Localization.csproj +++ b/framework/src/Volo.Abp.Localization/Volo.Abp.Localization.csproj @@ -18,7 +18,7 @@ - + diff --git a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj index f2f59a9a64..9492e6fbf3 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj +++ b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/AbpTestBase/AbpTestBase.csproj b/framework/test/AbpTestBase/AbpTestBase.csproj index 5e9761d304..4a25e99676 100644 --- a/framework/test/AbpTestBase/AbpTestBase.csproj +++ b/framework/test/AbpTestBase/AbpTestBase.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj index 1ca29422b9..806e426f82 100644 --- a/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj index b7ba4ddd36..b0d3baaad9 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj index 551dfd9f2a..bd0a8c1ca0 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj index 9d5b607bfd..a25b7d7d8f 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj index 3b6d429dd0..dd5e36ed14 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj index 7ee7949c19..74c0285f34 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj index 7ffebd4224..d32284ed87 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj b/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj index 7ade7ea81b..9c7544a2f6 100644 --- a/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj b/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj index 35b66f5bfe..cb099c5168 100644 --- a/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj +++ b/framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj b/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj index 160262de19..88925bb67d 100644 --- a/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj +++ b/framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj b/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj index 1f2757b34e..9eb89d4af9 100644 --- a/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj +++ b/framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj @@ -14,7 +14,7 @@ - + \ No newline at end of file diff --git a/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj b/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj index 26a16f83cc..c92d40f8be 100644 --- a/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj +++ b/framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj b/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj index 8c6a8170b8..7fa0474264 100644 --- a/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj +++ b/framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj b/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj index 49f5d2454a..2b4696092c 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj +++ b/framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj b/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj index c96b26d272..c5a45236c2 100644 --- a/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj +++ b/framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj @@ -14,7 +14,7 @@ - + \ No newline at end of file diff --git a/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj b/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj index f043c10c13..bd58cb0d71 100644 --- a/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj +++ b/framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj b/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj index 1cef1431c2..13c9cb2ef3 100644 --- a/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj +++ b/framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj b/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj index ae203870fe..ad4141f96f 100644 --- a/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj +++ b/framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj b/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj index 5083782360..32b4f25816 100644 --- a/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj +++ b/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj index 4162f8319b..3f32baa6aa 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj @@ -20,8 +20,8 @@ - - + + \ No newline at end of file diff --git a/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj b/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj index dc8ab54f51..e810d5ef76 100644 --- a/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj +++ b/framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj b/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj index 3632aa2bf3..ece1f124d5 100644 --- a/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj +++ b/framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.csproj b/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.csproj index ab2f82eefa..b0bc864896 100644 --- a/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.csproj +++ b/framework/test/Volo.Abp.FluentValidation.Tests/Volo.Abp.FluentValidation.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj b/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj index e0a8ea60de..4997863830 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo.Abp.Http.Client.Tests.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.csproj b/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.csproj index f5b87ab423..98a01e2fc7 100644 --- a/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.csproj +++ b/framework/test/Volo.Abp.Localization.Tests/Volo.Abp.Localization.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.csproj b/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.csproj index 0a61a38420..062cfaf730 100644 --- a/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.csproj +++ b/framework/test/Volo.Abp.MemoryDb.Tests/Volo.Abp.MemoryDb.Tests.csproj @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj b/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj index f2508f81ca..5ca5401bac 100644 --- a/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj +++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo.Abp.MongoDB.Tests.csproj @@ -19,8 +19,8 @@ - - + + \ No newline at end of file diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj index 6b18627f7e..631ad1ed81 100644 --- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj +++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj b/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj index 7fabca78ba..5339246c52 100644 --- a/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj +++ b/framework/test/Volo.Abp.Security.Tests/Volo.Abp.Security.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.csproj b/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.csproj index a9fe791822..99db6083c2 100644 --- a/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.csproj +++ b/framework/test/Volo.Abp.Serialization.Tests/Volo.Abp.Serialization.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj b/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj index 7f83c36c9a..1e9bd3f4a0 100644 --- a/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj +++ b/framework/test/Volo.Abp.Settings.Tests/Volo.Abp.Settings.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj b/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj index e63096f8c4..3985910708 100644 --- a/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj +++ b/framework/test/Volo.Abp.TestApp.Tests/Volo.Abp.TestApp.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj index 243bd70a8c..0cb921f63a 100644 --- a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj +++ b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj @@ -17,7 +17,7 @@ - + diff --git a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj index b308eae3a2..10318fbf90 100644 --- a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj +++ b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj b/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj index 40575e7b1c..f3dede4b21 100644 --- a/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj +++ b/framework/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj b/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj index 5891413963..60308b96ae 100644 --- a/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj +++ b/framework/test/Volo.Abp.Validation.Tests/Volo.Abp.Validation.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj index 7f0be985bf..895b8231ce 100644 --- a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj +++ b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo.Abp.VirtualFileSystem.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj b/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj index 247752f848..32ee40e070 100644 --- a/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj +++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests/Volo.Abp.AuditLogging.EntityFrameworkCore.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj index a080318e11..8134b0c512 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj @@ -6,7 +6,7 @@ - + diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj index c823e9a53a..3540aa8e9c 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj @@ -6,7 +6,10 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.csproj index 07501ec85f..a8ff824305 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.csproj +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo.Abp.BackgroundJobs.Domain.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj index 6fad02af58..722d94f88e 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests.csproj @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj index 00c9d6ffc2..f3fb433d10 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.csproj index 9c9e420c65..1f4db1af41 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.csproj +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo.Abp.BackgroundJobs.TestBase.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.csproj b/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.csproj index feb5448b1e..8f9b464a46 100644 --- a/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.csproj +++ b/modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests/Volo.Blogging.EntityFrameworkCore.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj b/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj index 666c1e813f..71a466828b 100644 --- a/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj +++ b/modules/docs/test/Volo.Docs.EntityFrameworkCore.Tests/Volo.Docs.EntityFrameworkCore.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj index 27d7612baa..5566f756d8 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests/Volo.Abp.FeatureManagement.EntityFrameworkCore.Tests.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj b/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj index 8d4ce0c3fc..7a9219d556 100644 --- a/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj +++ b/modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests/Volo.Abp.Identity.EntityFrameworkCore.Tests.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj b/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj index faa5eb21aa..5a12ee07ed 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.csproj b/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.csproj index ca64ea94f2..8285a006ed 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Tests/Volo.Abp.PermissionManagement.Tests.csproj b/modules/permission-management/test/Volo.Abp.PermissionManagement.Tests/Volo.Abp.PermissionManagement.Tests.csproj index a0ba681b8d..f6846f3678 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.Tests/Volo.Abp.PermissionManagement.Tests.csproj +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.Tests/Volo.Abp.PermissionManagement.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.csproj b/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.csproj index 43e0ceb087..53ff012ea6 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj b/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj index 6a43666860..85d334e610 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests/Volo.Abp.Users.EntityFrameworkCore.Tests.csproj b/modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests/Volo.Abp.Users.EntityFrameworkCore.Tests.csproj index 8571a8bd34..1bbdc59392 100644 --- a/modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests/Volo.Abp.Users.EntityFrameworkCore.Tests.csproj +++ b/modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests/Volo.Abp.Users.EntityFrameworkCore.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/samples/BookStore/test/Acme.BookStore.Application.Tests/Acme.BookStore.Application.Tests.csproj b/samples/BookStore/test/Acme.BookStore.Application.Tests/Acme.BookStore.Application.Tests.csproj index 6813e17ee6..31415fb6c8 100644 --- a/samples/BookStore/test/Acme.BookStore.Application.Tests/Acme.BookStore.Application.Tests.csproj +++ b/samples/BookStore/test/Acme.BookStore.Application.Tests/Acme.BookStore.Application.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/samples/MicroserviceDemo/modules/product/test/ProductManagement.EntityFrameworkCore.Tests/ProductManagement.EntityFrameworkCore.Tests.csproj b/samples/MicroserviceDemo/modules/product/test/ProductManagement.EntityFrameworkCore.Tests/ProductManagement.EntityFrameworkCore.Tests.csproj index d322f0e7b3..a5d1b1b349 100644 --- a/samples/MicroserviceDemo/modules/product/test/ProductManagement.EntityFrameworkCore.Tests/ProductManagement.EntityFrameworkCore.Tests.csproj +++ b/samples/MicroserviceDemo/modules/product/test/ProductManagement.EntityFrameworkCore.Tests/ProductManagement.EntityFrameworkCore.Tests.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index 495c869ba8..07fb1b020e 100644 --- a/templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index 808ee9f1fe..2a05c9b871 100644 --- a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/templates/service/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/service/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index 495c869ba8..07fb1b020e 100644 --- a/templates/service/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/service/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -15,8 +15,8 @@ - - + + From 5ba01578e67548ba4c89673999215d3afcc89a7e Mon Sep 17 00:00:00 2001 From: Dong Guo Date: Sun, 28 Apr 2019 10:51:59 +0800 Subject: [PATCH 043/335] add sqlite support --- framework/Volo.Abp.sln | 18 +++++++---- ...Volo.Abp.EntityFrameworkCore.Sqlite.csproj | 24 ++++++++++++++ ...extConfigurationContextSqliteExtensions.cs | 27 ++++++++++++++++ .../AbpDbContextOptionsSqliteExtensions.cs | 32 +++++++++++++++++++ .../AbpEntityFrameworkCoreSqliteModule.cs | 14 ++++++++ 5 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj create mode 100644 framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs create mode 100644 framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsSqliteExtensions.cs create mode 100644 framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index 10be5a757d..7987604e98 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28803.156 @@ -225,6 +224,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.FluentValidation", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.FluentValidation.Tests", "test\Volo.Abp.FluentValidation.Tests\Volo.Abp.FluentValidation.Tests.csproj", "{E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore.Sqlite", "src\Volo.Abp.EntityFrameworkCore.Sqlite\Volo.Abp.EntityFrameworkCore.Sqlite.csproj", "{58CF8957-5045-4F81-884D-72DF48F721CC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -655,6 +656,10 @@ Global {46C6336C-A1D8-4858-98CE-6F4C698C5A77}.Debug|Any CPU.Build.0 = Debug|Any CPU {46C6336C-A1D8-4858-98CE-6F4C698C5A77}.Release|Any CPU.ActiveCfg = Release|Any CPU {46C6336C-A1D8-4858-98CE-6F4C698C5A77}.Release|Any CPU.Build.0 = Release|Any CPU + {69168816-4394-4DDA-BB6B-C21983D37F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69168816-4394-4DDA-BB6B-C21983D37F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69168816-4394-4DDA-BB6B-C21983D37F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69168816-4394-4DDA-BB6B-C21983D37F0B}.Release|Any CPU.Build.0 = Release|Any CPU {43D5FE61-ECBF-4B16-AD95-0043E18EB93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43D5FE61-ECBF-4B16-AD95-0043E18EB93A}.Debug|Any CPU.Build.0 = Debug|Any CPU {43D5FE61-ECBF-4B16-AD95-0043E18EB93A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -663,10 +668,10 @@ Global {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Release|Any CPU.Build.0 = Release|Any CPU - {69168816-4394-4DDA-BB6B-C21983D37F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69168816-4394-4DDA-BB6B-C21983D37F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69168816-4394-4DDA-BB6B-C21983D37F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69168816-4394-4DDA-BB6B-C21983D37F0B}.Release|Any CPU.Build.0 = Release|Any CPU + {58CF8957-5045-4F81-884D-72DF48F721CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58CF8957-5045-4F81-884D-72DF48F721CC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58CF8957-5045-4F81-884D-72DF48F721CC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58CF8957-5045-4F81-884D-72DF48F721CC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -778,9 +783,10 @@ Global {575BEFA1-19C2-49B1-8D31-B5D4472328DE} = {447C8A77-E5F0-4538-8687-7383196D04EA} {6C161F55-54B6-42A5-B177-3B0ED50323C1} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {46C6336C-A1D8-4858-98CE-6F4C698C5A77} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {69168816-4394-4DDA-BB6B-C21983D37F0B} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {43D5FE61-ECBF-4B16-AD95-0043E18EB93A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A} = {447C8A77-E5F0-4538-8687-7383196D04EA} - {69168816-4394-4DDA-BB6B-C21983D37F0B} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {58CF8957-5045-4F81-884D-72DF48F721CC} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj new file mode 100644 index 0000000000..cf6dad2b43 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj @@ -0,0 +1,24 @@ + + + + + + netstandard2.0 + Volo.Abp.EntityFrameworkCore.Sqlite + Volo.Abp.EntityFrameworkCore.Sqlite + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + + + + + diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs new file mode 100644 index 0000000000..cb531e2a44 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs @@ -0,0 +1,27 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Text; +using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Volo.Abp.EntityFrameworkCore.DependencyInjection; + +namespace Volo.Abp.EntityFrameworkCore +{ + public static class AbpDbContextConfigurationContextSqliteExtensions + { + public static DbContextOptionsBuilder UseSqlite( + [NotNull] this AbpDbContextConfigurationContext context, + [CanBeNull] Action sqliteOptionsAction = null) + { + if (context.ExistingConnection != null) + { + return context.DbContextOptions.UseSqlite(context.ExistingConnection, sqliteOptionsAction); + } + else + { + return context.DbContextOptions.UseSqlite(context.ConnectionString, sqliteOptionsAction); + } + } + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsSqliteExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsSqliteExtensions.cs new file mode 100644 index 0000000000..bf861539e9 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsSqliteExtensions.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Text; +using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore.Infrastructure; + +namespace Volo.Abp.EntityFrameworkCore +{ + public static class AbpDbContextOptionsSqliteExtensions + { + public static void UseSqlite( + [NotNull] this AbpDbContextOptions options, + [CanBeNull] Action sqliteOptionsAction = null) + { + options.Configure(context => + { + context.UseSqlite(sqliteOptionsAction); + }); + } + + public static void UseSqlite( + [NotNull] this AbpDbContextOptions options, + [CanBeNull] Action sqliteOptionsAction = null) + where TDbContext : AbpDbContext + { + options.Configure(context => + { + context.UseSqlite(sqliteOptionsAction); + }); + } + } +} diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs new file mode 100644 index 0000000000..f6d8a0ada1 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Volo.Abp.Modularity; + +namespace Volo.Abp.EntityFrameworkCore.Sqlite +{ + [DependsOn( + typeof(AbpEntityFrameworkCoreModule) + )] + public class AbpEntityFrameworkCoreSqliteModule : AbpModule + { + } +} From 714da91ac6c3a7298f75fa3cdd6a1a50985a6d97 Mon Sep 17 00:00:00 2001 From: maliming Date: Sun, 28 Apr 2019 12:37:00 +0800 Subject: [PATCH 044/335] Beautify the sqlite project code. --- .../AbpDbContextConfigurationContextSqliteExtensions.cs | 4 +--- .../AbpDbContextOptionsSqliteExtensions.cs | 4 +--- .../Sqlite/AbpEntityFrameworkCoreSqliteModule.cs | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs index cb531e2a44..6fd69fa42e 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs @@ -1,8 +1,6 @@ -using Microsoft.EntityFrameworkCore; using System; -using System.Collections.Generic; -using System.Text; using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Volo.Abp.EntityFrameworkCore.DependencyInjection; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsSqliteExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsSqliteExtensions.cs index bf861539e9..68944194d1 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsSqliteExtensions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsSqliteExtensions.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs index f6d8a0ada1..8be6927e79 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/Sqlite/AbpEntityFrameworkCoreSqliteModule.cs @@ -1,14 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Text; using Volo.Abp.Modularity; namespace Volo.Abp.EntityFrameworkCore.Sqlite { [DependsOn( typeof(AbpEntityFrameworkCoreModule) - )] + )] public class AbpEntityFrameworkCoreSqliteModule : AbpModule { + } } From 5984528f0585fdd69439da2ae9212949448e0e22 Mon Sep 17 00:00:00 2001 From: maliming Date: Sun, 28 Apr 2019 12:41:24 +0800 Subject: [PATCH 045/335] Add Sqlite project to common.ps1. --- nupkg/common.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index e83acaa57c..6ebae9a0b5 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -63,6 +63,7 @@ $projects = ( "framework/src/Volo.Abp.EntityFrameworkCore.SqlServer", "framework/src/Volo.Abp.EntityFrameworkCore.MySQL", "framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql", + "framework/src/Volo.Abp.EntityFrameworkCore.Sqlite", "framework/src/Volo.Abp.EventBus", "framework/src/Volo.Abp.EventBus.RabbitMQ", "framework/src/Volo.Abp.Features", From 3d06fa0a1571426fcd09069fbce793700bf9272f Mon Sep 17 00:00:00 2001 From: maliming Date: Sun, 28 Apr 2019 13:14:35 +0800 Subject: [PATCH 046/335] Undo the BookStore code change (0.17 not released) --- .../Permissions/BookStorePermissions.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samples/BookStore/src/Acme.BookStore.Application/Permissions/BookStorePermissions.cs b/samples/BookStore/src/Acme.BookStore.Application/Permissions/BookStorePermissions.cs index ea8a26d6ef..b1ec575904 100644 --- a/samples/BookStore/src/Acme.BookStore.Application/Permissions/BookStorePermissions.cs +++ b/samples/BookStore/src/Acme.BookStore.Application/Permissions/BookStorePermissions.cs @@ -1,5 +1,4 @@ using System; -using Volo.Abp.Reflection; namespace Acme.BookStore.Permissions { @@ -13,7 +12,7 @@ namespace Acme.BookStore.Permissions public static string[] GetAll() { //Return an array of all permissions - return ReflectionHelper.GetPublicConstantsRecursively(typeof(BookStorePermissions)); + return Array.Empty(); } } } \ No newline at end of file From 13b70c1a58fd0eb0e66aabb59066e8c974dc148a Mon Sep 17 00:00:00 2001 From: cuibty Date: Sun, 28 Apr 2019 15:25:26 +0800 Subject: [PATCH 047/335] fix zh-Hans doc sample code --- docs/zh-Hans/Getting-Started-AspNetCore-Application.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/zh-Hans/Getting-Started-AspNetCore-Application.md b/docs/zh-Hans/Getting-Started-AspNetCore-Application.md index d0733bb140..f08af4744f 100644 --- a/docs/zh-Hans/Getting-Started-AspNetCore-Application.md +++ b/docs/zh-Hans/Getting-Started-AspNetCore-Application.md @@ -77,11 +77,11 @@ namespace BasicAspNetCoreApplication { public class Startup { - public IServiceProvider ConfigureServices(ServiceConfigurationContext context) + public IServiceProvider ConfigureServices(IServiceCollection services) { - context.Services.AddApplication(); + services.AddApplication(); - return context.Services.BuildServiceProviderFromFactory(); + return services.BuildServiceProviderFromFactory(); } public void Configure(IApplicationBuilder app) From 438e133f1d4faa6c1d5dd2e70e099a2306bf018d Mon Sep 17 00:00:00 2001 From: CdLian <970433771@qq.com> Date: Sun, 28 Apr 2019 15:55:40 +0800 Subject: [PATCH 048/335] Update Data-Transfer-Objects.md Fix spelling mistake. --- docs/zh-Hans/Best-Practices/Data-Transfer-Objects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-Hans/Best-Practices/Data-Transfer-Objects.md b/docs/zh-Hans/Best-Practices/Data-Transfer-Objects.md index e0db48397e..0c6017e6e7 100644 --- a/docs/zh-Hans/Best-Practices/Data-Transfer-Objects.md +++ b/docs/zh-Hans/Best-Practices/Data-Transfer-Objects.md @@ -5,4 +5,4 @@ * **推荐** 定义 **public getter 和 setter** 的DTO成员 . * **推荐** 使用 **data annotations** **验证** service输入DTO的属性. * **不推荐** 在DTO中添加任何 **逻辑**, 在必要的时候可以实现 `IValidatableObject` 接口. -* **推荐** 为所有的DTO标记 **[Serializable]** Attribute. 因为它们已经是可序列化的, 开人发员可能会希望进行二进制序列化. \ No newline at end of file +* **推荐** 为所有的DTO标记 **[Serializable]** Attribute. 因为它们已经是可序列化的, 开发人员可能会希望进行二进制序列化. From f34a36d2f1b654d2d78626fa2f3faa9c034ee780 Mon Sep 17 00:00:00 2001 From: bbakermmc Date: Mon, 29 Apr 2019 14:48:28 -0400 Subject: [PATCH 049/335] Update abp.resourcemapping.js missing ; --- .../src/MyCompanyName.MyProjectName.Web/abp.resourcemapping.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/abp.resourcemapping.js b/templates/mvc/src/MyCompanyName.MyProjectName.Web/abp.resourcemapping.js index 96f7c92778..122e8e926a 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/abp.resourcemapping.js +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/abp.resourcemapping.js @@ -5,4 +5,4 @@ mappings: { } -} \ No newline at end of file +}; From fc5ab383eec6d00d8168ab40bdefe27aafa16873 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 30 Apr 2019 10:07:00 +0300 Subject: [PATCH 050/335] Resolved #1079: Use static value instead of hard-coded MaxResultCount. --- .../Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs index b3ed6a23cb..0931d090f3 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Dtos/LimitedResultRequestDto.cs @@ -9,7 +9,9 @@ namespace Volo.Abp.Application.Dtos [Serializable] public class LimitedResultRequestDto : ILimitedResultRequest { + public static int DefaultMaxResultCount { get; set; } = 10; + [Range(1, int.MaxValue)] - public virtual int MaxResultCount { get; set; } = 10; + public virtual int MaxResultCount { get; set; } = DefaultMaxResultCount; } } \ No newline at end of file From 6ba0ad6618e89f9f5c50cc4140d3f0b111abdd3a Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 30 Apr 2019 11:06:14 +0300 Subject: [PATCH 051/335] Resolved #1080: Ignore entities on EntityToEtoMapper for those don't implement IEntity. --- .../Entities/Events/Distributed/EntityEto.cs | 5 +- .../Events/Distributed/EntityToEtoMapper.cs | 7 +- .../Events/Distributed/IEntityToEtoMapper.cs | 5 +- .../Events/EntityChangeEventHelper.cs | 66 ++++++++++++++++--- 4 files changed, 68 insertions(+), 15 deletions(-) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs index aa2a6e1c8f..d5f0a7dc2d 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityEto.cs @@ -5,6 +5,8 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed [Serializable] public class EntityEto : EtoBase { + public string EntityType { get; set; } + public string KeysAsString { get; set; } public EntityEto() @@ -12,8 +14,9 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed } - public EntityEto(string keysAsString) + public EntityEto(string entityType, string keysAsString) { + EntityType = entityType; KeysAsString = keysAsString; } } diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs index fd7cab1f4f..5b386599ef 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs @@ -1,6 +1,5 @@ -using System; +using Microsoft.Extensions.Options; using System.Collections.Generic; -using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; using Volo.Abp.DynamicProxy; using Volo.Abp.EventBus.Distributed; @@ -28,7 +27,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed var entity = entityObj as IEntity; if (entity == null) { - throw new ArgumentException($"{nameof(entityObj)} should be an entity and implement the '{typeof(IEntity).AssemblyQualifiedName}' interface!"); + return null; } var entityType = ProxyHelper.UnProxy(entity).GetType(); @@ -36,7 +35,7 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed if (etoType == null) { var keys = entity.GetKeys().JoinAsString(","); - return new EntityEto(keys); + return new EntityEto(entityType.FullName, keys); } //TODO: Also add KeysAsString property to resulting json for compatibility with the EntityEto! diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs index e33e6751e8..ceefb311ef 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/IEntityToEtoMapper.cs @@ -1,7 +1,10 @@ -namespace Volo.Abp.Domain.Entities.Events.Distributed +using JetBrains.Annotations; + +namespace Volo.Abp.Domain.Entities.Events.Distributed { public interface IEntityToEtoMapper { + [CanBeNull] object Map(object entityObj); } } diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs index dc4edea364..06554d451e 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs @@ -48,35 +48,83 @@ namespace Volo.Abp.Domain.Entities.Events public virtual async Task TriggerEntityCreatingEventAsync(object entity) { - await TriggerEventWithEntity(LocalEventBus, typeof(EntityCreatingEventData<>), entity, true); + await TriggerEventWithEntity( + LocalEventBus, + typeof(EntityCreatingEventData<>), + entity, + true + ); } public virtual async Task TriggerEntityCreatedEventOnUowCompletedAsync(object entity) { - await TriggerEventWithEntity(LocalEventBus, typeof(EntityCreatedEventData<>), entity, false); - await TriggerEventWithEntity(DistributedEventBus, typeof(EntityCreatedEto<>), EntityToEtoMapper.Map(entity), false); + await TriggerEventWithEntity( + LocalEventBus, + typeof(EntityCreatedEventData<>), + entity, + false + ); + + await TriggerEventWithEntity( + DistributedEventBus, + typeof(EntityCreatedEto<>), + EntityToEtoMapper.Map(entity), + false + ); } public virtual async Task TriggerEntityUpdatingEventAsync(object entity) { - await TriggerEventWithEntity(LocalEventBus, typeof(EntityUpdatingEventData<>), entity, true); + await TriggerEventWithEntity( + LocalEventBus, + typeof(EntityUpdatingEventData<>), + entity, + true + ); } public virtual async Task TriggerEntityUpdatedEventOnUowCompletedAsync(object entity) { - await TriggerEventWithEntity(LocalEventBus, typeof(EntityUpdatedEventData<>), entity, false); - await TriggerEventWithEntity(DistributedEventBus, typeof(EntityUpdatedEto<>), EntityToEtoMapper.Map(entity), false); + await TriggerEventWithEntity( + LocalEventBus, + typeof(EntityUpdatedEventData<>), + entity, + false + ); + + await TriggerEventWithEntity( + DistributedEventBus, + typeof(EntityUpdatedEto<>), + EntityToEtoMapper.Map(entity), + false + ); } public virtual async Task TriggerEntityDeletingEventAsync(object entity) { - await TriggerEventWithEntity(LocalEventBus, typeof(EntityDeletingEventData<>), entity, true); + await TriggerEventWithEntity( + LocalEventBus, + typeof(EntityDeletingEventData<>), + entity, + true + ); } public virtual async Task TriggerEntityDeletedEventOnUowCompletedAsync(object entity) { - await TriggerEventWithEntity(LocalEventBus, typeof(EntityDeletedEventData<>), entity, false); - await TriggerEventWithEntity(DistributedEventBus, typeof(EntityDeletedEto<>), EntityToEtoMapper.Map(entity), false); + await TriggerEventWithEntity( + LocalEventBus, + typeof(EntityDeletedEventData<>), + entity, + false + ); + + await TriggerEventWithEntity( + DistributedEventBus, + typeof(EntityDeletedEto<>), + EntityToEtoMapper.Map(entity), + false + ); } protected virtual async Task TriggerEventsInternalAsync(EntityChangeReport changeReport) From 230821750b7c54d296652f2f9d962efa63791281 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 30 Apr 2019 11:19:09 +0300 Subject: [PATCH 052/335] Check for null. --- .../Events/EntityChangeEventHelper.cs | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs index 06554d451e..c9219feffc 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs @@ -65,12 +65,16 @@ namespace Volo.Abp.Domain.Entities.Events false ); - await TriggerEventWithEntity( - DistributedEventBus, - typeof(EntityCreatedEto<>), - EntityToEtoMapper.Map(entity), - false - ); + var eto = EntityToEtoMapper.Map(entity); + if (eto != null) + { + await TriggerEventWithEntity( + DistributedEventBus, + typeof(EntityCreatedEto<>), + eto, + false + ); + } } public virtual async Task TriggerEntityUpdatingEventAsync(object entity) @@ -92,12 +96,16 @@ namespace Volo.Abp.Domain.Entities.Events false ); - await TriggerEventWithEntity( - DistributedEventBus, - typeof(EntityUpdatedEto<>), - EntityToEtoMapper.Map(entity), - false - ); + var eto = EntityToEtoMapper.Map(entity); + if (eto != null) + { + await TriggerEventWithEntity( + DistributedEventBus, + typeof(EntityUpdatedEto<>), + eto, + false + ); + } } public virtual async Task TriggerEntityDeletingEventAsync(object entity) @@ -119,12 +127,16 @@ namespace Volo.Abp.Domain.Entities.Events false ); - await TriggerEventWithEntity( - DistributedEventBus, - typeof(EntityDeletedEto<>), - EntityToEtoMapper.Map(entity), - false - ); + var eto = EntityToEtoMapper.Map(entity); + if (eto != null) + { + await TriggerEventWithEntity( + DistributedEventBus, + typeof(EntityDeletedEto<>), + EntityToEtoMapper.Map(entity), + false + ); + } } protected virtual async Task TriggerEventsInternalAsync(EntityChangeReport changeReport) From e45caa5b7fee096a76ad61ac04b8edae67003e21 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 09:11:08 +0300 Subject: [PATCH 053/335] Create Volo.Abp.Cli.Core package. --- framework/Volo.Abp.sln | 9 ++++++- .../Volo.Abp.Cli.Core.csproj | 25 +++++++++++++++++++ .../Volo/Abp/Cli/AbpCliCoreModule.cs | 15 +++++++++++ .../Volo/Abp/Cli/Args/CommandLineArgs.cs | 0 .../Abp/Cli/Args/CommandLineArgumentParser.cs | 0 .../Volo/Abp/Cli/Args/CommandLineOptions.cs | 0 .../Cli/Args/ICommandLineArgumentParser.cs | 0 .../Volo/Abp/Cli/CliService.cs | 1 - .../Volo/Abp/Cli/Commands/CommandSelector.cs | 0 .../Volo/Abp/Cli/Commands/ICommandSelector.cs | 0 .../Volo/Abp/Cli/Commands/IConsoleCommand.cs | 0 .../Volo/Abp/Cli/Commands/MainHelpCommand.cs | 0 .../Abp/Cli/Commands/NewProjectCommand.cs | 0 .../Building/DatabaseProvider.cs | 0 .../Building/GithubRepositoryInfo.cs | 0 .../Building/ProjectBuildContext.cs | 0 .../Building/ProjectBuildContextExtensions.cs | 0 .../Building/ProjectBuildPipeline.cs | 0 .../Building/ProjectBuildPipelineBuilder.cs | 0 .../Building/ProjectBuildPipelineStep.cs | 0 .../Building/ProjectBuildRequest.cs | 0 .../Building/ProjectResult.cs | 0 .../Steps/CreateProjectResultZipStep.cs | 0 .../Building/Steps/FileEntryListReadStep.cs | 0 .../Building/Steps/GithubDownloadStep.cs | 0 .../Steps/NugetReferenceReplaceStep.cs | 0 .../Steps/RemoveProjectFromSolutionStep.cs | 0 .../Building/Steps/SolutionRenameStep.cs | 0 .../SwitchEntityFrameworkCoreToMongoDbStep.cs | 0 .../Building/Steps/TemplateCodeDeleteStep.cs | 0 .../Building/TemplateInfo.cs | 0 .../Abp/SolutionTemplating/DownloadInfo.cs | 0 .../Abp/SolutionTemplating/Files/FileEntry.cs | 0 .../Files/FileEntryExtensions.cs | 0 .../SolutionTemplating/Files/FileEntryList.cs | 0 .../Files/FileEntryListExtensions.cs | 0 .../Github/GithubManager.cs | 0 .../Github/GithubRelease.cs | 0 .../SolutionTemplating/SolutionBuildResult.cs | 0 .../Abp/SolutionTemplating/SolutionBuilder.cs | 0 .../Abp/SolutionTemplating/SolutionName.cs | 0 .../SolutionTemplating/StandardVersions.cs | 0 .../Zipping/ZipFileExtensions.cs | 0 .../src/Volo.Abp.Cli/Volo.Abp.Cli.csproj | 9 +------ .../Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs | 5 ++-- .../Volo.Abp.Cli.Tests.csproj | 2 +- nupkg/common.ps1 | 1 + 47 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Args/CommandLineArgs.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Args/CommandLineOptions.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/CliService.cs (98%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Commands/CommandSelector.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Commands/ICommandSelector.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Commands/IConsoleCommand.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Commands/MainHelpCommand.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/Cli/Commands/NewProjectCommand.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/DownloadInfo.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Files/FileEntry.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Github/GithubManager.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/SolutionBuilder.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/SolutionName.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/StandardVersions.cs (100%) rename framework/src/{Volo.Abp.Cli => Volo.Abp.Cli.Core}/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs (100%) diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index e1af7720f9..41eb7f1aeb 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -224,10 +224,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FluentValidation", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FluentValidation.Tests", "test\Volo.Abp.FluentValidation.Tests\Volo.Abp.FluentValidation.Tests.csproj", "{E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Cli.Tests", "test\Volo.Abp.Cli.Tests\Volo.Abp.Cli.Tests.csproj", "{92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Tests", "test\Volo.Abp.Cli.Tests\Volo.Abp.Cli.Tests.csproj", "{92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore.Sqlite", "src\Volo.Abp.EntityFrameworkCore.Sqlite\Volo.Abp.EntityFrameworkCore.Sqlite.csproj", "{58CF8957-5045-4F81-884D-72DF48F721CC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Cli.Core", "src\Volo.Abp.Cli.Core\Volo.Abp.Cli.Core.csproj", "{3DA9923E-048E-4FE7-9748-3A0194F5D196}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -678,6 +680,10 @@ Global {58CF8957-5045-4F81-884D-72DF48F721CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {58CF8957-5045-4F81-884D-72DF48F721CC}.Release|Any CPU.ActiveCfg = Release|Any CPU {58CF8957-5045-4F81-884D-72DF48F721CC}.Release|Any CPU.Build.0 = Release|Any CPU + {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -794,6 +800,7 @@ Global {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A} = {447C8A77-E5F0-4538-8687-7383196D04EA} {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF} = {447C8A77-E5F0-4538-8687-7383196D04EA} {58CF8957-5045-4F81-884D-72DF48F721CC} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {3DA9923E-048E-4FE7-9748-3A0194F5D196} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj new file mode 100644 index 0000000000..459d95089a --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj @@ -0,0 +1,25 @@ + + + + + + netstandard2.0 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs new file mode 100644 index 0000000000..e56c95ff27 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -0,0 +1,15 @@ +using Volo.Abp.Domain; +using Volo.Abp.Json; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Cli +{ + [DependsOn( + typeof(AbpDddDomainModule), + typeof(AbpJsonModule) + )] + public class AbpCliCoreModule : AbpModule + { + + } +} diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineOptions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs similarity index 98% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index d76216b300..50108567e6 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using System; using System.Threading.Tasks; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Commands; diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ICommandSelector.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ICommandSelector.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/IConsoleCommand.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/IConsoleCommand.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/DownloadInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/DownloadInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntry.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntry.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubManager.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubManager.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubManager.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubManager.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuilder.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuilder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuilder.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionName.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionName.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/StandardVersions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/StandardVersions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs similarity index 100% rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj index fb8b3b9e19..f2f9424512 100644 --- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj +++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj @@ -11,14 +11,7 @@ - - - - - - - - + diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs index 0b891e1299..523dd6c813 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs @@ -1,10 +1,9 @@ -using Volo.Abp.Domain; -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; namespace Volo.Abp.Cli { [DependsOn( - typeof(AbpDddDomainModule) + typeof(AbpCliCoreModule) )] public class AbpCliModule : AbpModule { diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj b/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj index 915cb58607..3f094594d0 100644 --- a/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj +++ b/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index 6ebae9a0b5..100bfe3b89 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -53,6 +53,7 @@ $projects = ( "framework/src/Volo.Abp.BackgroundWorkers", "framework/src/Volo.Abp.Caching", "framework/src/Volo.Abp.Castle.Core", + "framework/src/Volo.Abp.Cli.Core", "framework/src/Volo.Abp.Cli", "framework/src/Volo.Abp.Core", "framework/src/Volo.Abp.Data", From 9cd2f241026fad2634f8db03b90717d550f7af92 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 12:04:24 +0300 Subject: [PATCH 054/335] New project creation for CLI --- .../Volo/Abp/Cli/Args/CommandLineOptions.cs | 28 +++++- .../Abp/Cli/Commands/NewProjectCommand.cs | 68 +++++++++++--- .../Abp/ProjectBuilding/AbpIoTemplateStore.cs | 16 ++++ .../Abp/ProjectBuilding/IProjectBuilder.cs | 10 ++ .../ProjectBuilding/ITemplateInfoProvider.cs | 11 +++ .../Abp/ProjectBuilding/ITemplateStore.cs | 9 ++ .../Abp/ProjectBuilding/ProjectBuildArgs.cs | 27 ++++++ .../Abp/ProjectBuilding/ProjectBuilder.cs | 52 ++++++++++ .../Volo/Abp/ProjectBuilding/TemplateFile.cs | 12 +++ .../ProjectBuilding/TemplateInfoProvider.cs | 48 ++++++++++ .../Templates/MvcApplicationTemplate.cs | 41 ++++++++ .../Templates/MvcModuleTemplate.cs | 9 ++ .../Templates/ServiceTemplate.cs | 9 ++ .../Building/DatabaseProvider.cs | 4 +- .../Building/ProjectBuildContext.cs | 25 +++-- .../Building/ProjectBuildPipelineBuilder.cs | 1 - .../Building/ProjectBuildRequest.cs | 23 ----- .../Building/Steps/FileEntryListReadStep.cs | 34 +------ .../Building/Steps/GithubDownloadStep.cs | 33 ------- .../Steps/NugetReferenceReplaceStep.cs | 2 +- .../Building/Steps/SolutionRenameStep.cs | 4 +- .../Building/TemplateInfo.cs | 18 ---- .../Github/GithubManager.cs | 94 ------------------- ...onBuildResult.cs => ProjectBuildResult.cs} | 4 +- .../Abp/SolutionTemplating/SolutionBuilder.cs | 64 ------------- 25 files changed, 351 insertions(+), 295 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateStore.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateFile.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubManager.cs rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/{SolutionBuildResult.cs => ProjectBuildResult.cs} (68%) delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuilder.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs index 93f23fdd76..3e72d6e434 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs @@ -1,9 +1,35 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using JetBrains.Annotations; namespace Volo.Abp.Cli.Args { public class CommandLineOptions : Dictionary { + [CanBeNull] + public string GetOrNull([NotNull] string name, params string[] alternativeNames) + { + Check.NotNullOrWhiteSpace(name, nameof(name)); + var value = this.GetOrDefault(name); + if (!value.IsNullOrWhiteSpace()) + { + return value; + } + + if (!alternativeNames.IsNullOrEmpty()) + { + foreach (var alternativeName in alternativeNames) + { + value = this.GetOrDefault(alternativeName); + if (!value.IsNullOrWhiteSpace()) + { + return value; + } + } + } + + return null; + } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index b3051ea700..b662bec85b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -1,43 +1,85 @@ using System; +using System.IO; using System.Threading.Tasks; +using Ionic.Zip; using Volo.Abp.Cli.Args; using Volo.Abp.DependencyInjection; +using Volo.Abp.ProjectBuilding; using Volo.Abp.SolutionTemplating; using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.SolutionTemplating.Zipping; namespace Volo.Abp.Cli.Commands { public class NewProjectCommand : IConsoleCommand, ITransientDependency { - protected SolutionBuilder SolutionBuilder { get; } + protected ProjectBuilder ProjectBuilder { get; } - public NewProjectCommand(SolutionBuilder solutionBuilder) + public NewProjectCommand(ProjectBuilder projectBuilder) { - SolutionBuilder = solutionBuilder; + ProjectBuilder = projectBuilder; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) { if (commandLineArgs.Target == null) { - Console.WriteLine("Solution name is missing."); + Console.WriteLine("Project name is missing."); Console.WriteLine("Usage:"); - Console.WriteLine(" abp new "); - Console.WriteLine("Example:"); + Console.WriteLine(" abp new [-t ]"); + Console.WriteLine("Examples:"); Console.WriteLine(" abp new Acme.BookStore"); + Console.WriteLine(" abp new Acme.BookStore mvc"); return; } Console.WriteLine("Creating a new solution"); Console.WriteLine("Solution name: " + commandLineArgs.Target); - //await SolutionBuilder.BuildAsync( - // null, - // commandLineArgs.Target, - // DatabaseProvider.EntityFrameworkCore, - // "...", - // true - //); + var result = await ProjectBuilder.BuildAsync( + new ProjectBuildArgs( + SolutionName.Parse(commandLineArgs.Target), + GetDatabaseProviderOrNull(commandLineArgs), + commandLineArgs.Options.GetOrNull(Options.Template.Short, Options.Template.Long) + ) + ); + + using (var templateFileStream = new MemoryStream(result.ZipContent)) + { + using (var templateZipFile = ZipFile.Read(templateFileStream)) + { + templateZipFile.ExtractAll(Directory.GetCurrentDirectory(), ExtractExistingFileAction.Throw); + } + } + } + + protected virtual DatabaseProvider GetDatabaseProviderOrNull(CommandLineArgs commandLineArgs) + { + var optionValue = commandLineArgs.Options.GetOrNull(Options.DatabaseProvider.Short, Options.DatabaseProvider.Long); + switch (optionValue) + { + case "ef": + return DatabaseProvider.EntityFrameworkCore; + case "mongodb": + return DatabaseProvider.MongoDb; + default: + return DatabaseProvider.NotSpecified; + } + } + + public static class Options + { + public static class Template + { + public const string Short = "t"; + public const string Long = "template"; + } + + public static class DatabaseProvider + { + public const string Short = "d"; + public const string Long = "databaseProvider"; + } } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs new file mode 100644 index 0000000000..c8c36b967d --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs @@ -0,0 +1,16 @@ +using System.IO; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.ProjectBuilding +{ + public class AbpIoTemplateStore : ITemplateStore, ITransientDependency + { + public async Task GetAsync(string templateName, string version) + { + return new TemplateFile( + File.ReadAllBytes("C:\\Temp\\abp-templates\\" + version + "\\" + templateName + ".zip") + ); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs new file mode 100644 index 0000000000..3011516061 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using Volo.Abp.SolutionTemplating; + +namespace Volo.Abp.ProjectBuilding +{ + public interface IProjectBuilder + { + Task BuildAsync(ProjectBuildArgs args); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs new file mode 100644 index 0000000000..ad8dbbe874 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs @@ -0,0 +1,11 @@ +using Volo.Abp.SolutionTemplating.Building; + +namespace Volo.Abp.ProjectBuilding +{ + public interface ITemplateInfoProvider + { + TemplateInfo GetDefault(); + + TemplateInfo Get(string name); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateStore.cs new file mode 100644 index 0000000000..f09faa8603 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateStore.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; + +namespace Volo.Abp.ProjectBuilding +{ + public interface ITemplateStore + { + Task GetAsync(string templateInfoName, string version); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs new file mode 100644 index 0000000000..5ca1a0ad99 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs @@ -0,0 +1,27 @@ +using JetBrains.Annotations; +using Volo.Abp.SolutionTemplating; +using Volo.Abp.SolutionTemplating.Building; + +namespace Volo.Abp.ProjectBuilding +{ + public class ProjectBuildArgs + { + [NotNull] + public SolutionName SolutionName { get; } + + [CanBeNull] + public string TemplateName { get; set; } + + public DatabaseProvider DatabaseProvider { get; } + + public ProjectBuildArgs( + [NotNull] SolutionName solutionName, + DatabaseProvider databaseProvider = DatabaseProvider.NotSpecified, + [CanBeNull] string templateName = null) + { + DatabaseProvider = databaseProvider; + TemplateName = templateName; + SolutionName = Check.NotNull(solutionName, nameof(solutionName)); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs new file mode 100644 index 0000000000..ee13db6e3f --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs @@ -0,0 +1,52 @@ +using System; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.SolutionTemplating; +using Volo.Abp.SolutionTemplating.Building; + +namespace Volo.Abp.ProjectBuilding +{ + public class ProjectBuilder : IProjectBuilder, ITransientDependency + { + protected ITemplateStore TemplateStore { get; } + protected ITemplateInfoProvider TemplateInfoProvider { get; } + + public ProjectBuilder(ITemplateStore templateStore, ITemplateInfoProvider templateInfoProvider) + { + TemplateStore = templateStore; + TemplateInfoProvider = templateInfoProvider; + } + + public async Task BuildAsync(ProjectBuildArgs args) + { + var version = "0.16.0"; //TODO: Should get from somewhere! + + var templateInfo = GetTemplateInfo(args); + + var templateFile = await TemplateStore.GetAsync(args.TemplateName, version); + + var context = new ProjectBuildContext( + templateInfo, + templateFile, + args, + version + ); + + ProjectBuildPipelineBuilder.Build(context).Execute(context); + + return new ProjectBuildResult(context.Result.ZipContent, args.SolutionName.ProjectName); + } + + private TemplateInfo GetTemplateInfo(ProjectBuildArgs args) + { + if (args.TemplateName.IsNullOrWhiteSpace()) + { + return TemplateInfoProvider.GetDefault(); + } + else + { + return TemplateInfoProvider.Get(args.TemplateName); + } + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateFile.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateFile.cs new file mode 100644 index 0000000000..d1f839e27b --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateFile.cs @@ -0,0 +1,12 @@ +namespace Volo.Abp.ProjectBuilding +{ + public class TemplateFile + { + public byte[] FileBytes { get; } + + public TemplateFile(byte[] fileBytes) + { + FileBytes = fileBytes; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs new file mode 100644 index 0000000000..d65937eab2 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs @@ -0,0 +1,48 @@ +using System; +using Volo.Abp.DependencyInjection; +using Volo.Abp.ProjectBuilding.Templates; +using Volo.Abp.SolutionTemplating.Building; + +namespace Volo.Abp.ProjectBuilding +{ + public class TemplateInfoProvider : ITemplateInfoProvider, ITransientDependency + { + public TemplateInfo GetDefault() + { + return Get(TemplateNames.Mvc); + } + + public TemplateInfo Get(string name) + { + switch (name) + { + case TemplateNames.Mvc: + return new MvcApplicationTemplate(); + case TemplateNames.MvcModule: + return new MvcModuleTemplate(); + case TemplateNames.Service: + return new ServiceTemplate(); + default: + throw new Exception("There is no template found with given name: " + name); + } + } + + public static class TemplateNames + { + /// + /// "mvc". + /// + public const string Mvc = "mvc"; + + /// + /// "mvcmodule". + /// + public const string MvcModule = "mvcmodule"; + + /// + /// "service". + /// + public const string Service = "service"; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs new file mode 100644 index 0000000000..7fe2fd7a0a --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs @@ -0,0 +1,41 @@ +using System.Collections.Generic; +using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.SolutionTemplating.Building.Steps; + +namespace Volo.Abp.ProjectBuilding.Templates +{ + public class MvcApplicationTemplate : TemplateInfo + { + public override IEnumerable GetCustomSteps(ProjectBuildContext context) + { + var steps = new List(); + SwitchDatabaseProvider(context, steps); + RemoveOtherDatabaseProviders(context, steps); + return steps; + } + + private static void SwitchDatabaseProvider(ProjectBuildContext context, List steps) + { + if (context.BuildArgs.DatabaseProvider == DatabaseProvider.MongoDb) + { + steps.Add(new SwitchEntityFrameworkCoreToMongoDbStep()); + } + } + + private static void RemoveOtherDatabaseProviders(ProjectBuildContext context, List steps) + { + if (context.BuildArgs.DatabaseProvider != DatabaseProvider.EntityFrameworkCore) + { + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Application.Tests", projectFolderPath: "test/MyCompanyName.MyProjectName.Application.Tests")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Tests", projectFolderPath: "test/MyCompanyName.MyProjectName.Web.Tests")); + } + + if (context.BuildArgs.DatabaseProvider != DatabaseProvider.MongoDb) + { + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB")); + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs new file mode 100644 index 0000000000..6549ce103c --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs @@ -0,0 +1,9 @@ +using Volo.Abp.SolutionTemplating.Building; + +namespace Volo.Abp.ProjectBuilding.Templates +{ + public class MvcModuleTemplate : TemplateInfo + { + + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs new file mode 100644 index 0000000000..7558891d34 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs @@ -0,0 +1,9 @@ +using Volo.Abp.SolutionTemplating.Building; + +namespace Volo.Abp.ProjectBuilding.Templates +{ + public class ServiceTemplate : TemplateInfo + { + + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs index 1e2e4efc00..e0e0f14e0b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs @@ -1,8 +1,8 @@ namespace Volo.Abp.SolutionTemplating.Building { - public enum DatabaseProvider : byte + public enum DatabaseProvider { - Irrelevant = 0, + NotSpecified = 0, EntityFrameworkCore = 1, MongoDb = 2 } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs index 297e7f056f..b620f6dc02 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs @@ -1,28 +1,37 @@ using JetBrains.Annotations; +using Volo.Abp.ProjectBuilding; using Volo.Abp.SolutionTemplating.Files; namespace Volo.Abp.SolutionTemplating.Building { public class ProjectBuildContext { - public ProjectBuildRequest Request { get; } + [NotNull] + public TemplateFile TemplateFile { get; } - public string TemplatesFolder { get; } + [NotNull] + public string Version { get; } + [NotNull] + public ProjectBuildArgs BuildArgs { get; } + + [NotNull] public TemplateInfo Template { get; } public FileEntryList Files { get; set; } public ProjectResult Result { get; set; } - public ProjectBuildContext( - [NotNull] TemplateInfo template, - ProjectBuildRequest request, - string templatesFolder) + public ProjectBuildContext([NotNull] TemplateInfo template, + [NotNull] TemplateFile templateFile, + [NotNull] ProjectBuildArgs buildArgs, + [NotNull] string version) { Template = Check.NotNull(template, nameof(template)); - Request = request; - TemplatesFolder = templatesFolder; + TemplateFile = Check.NotNull(templateFile, nameof(templateFile)); + BuildArgs = Check.NotNull(buildArgs, nameof(buildArgs)); + Version = Check.NotNullOrWhiteSpace(version, nameof(version)); + Result = new ProjectResult(); } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs index 41d760e4df..44062f9cee 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs @@ -8,7 +8,6 @@ namespace Volo.Abp.SolutionTemplating.Building { var pipeline = new ProjectBuildPipeline(); - pipeline.Steps.Add(new GithubDownloadStep()); pipeline.Steps.Add(new FileEntryListReadStep()); pipeline.Steps.AddRange(context.Template.GetCustomSteps(context)); pipeline.Steps.Add(new NugetReferenceReplaceStep()); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs deleted file mode 100644 index 4f4bec11b8..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace Volo.Abp.SolutionTemplating.Building -{ - public class ProjectBuildRequest - { - public SolutionName SolutionName { get; } - - public DatabaseProvider DatabaseProvider { get; } - - public string Version { get; } - - public bool ReplaceLocalReferencesToNuget { get; set; } - - public ProjectBuildRequest( - SolutionName solutionName, - DatabaseProvider databaseProvider, - string version) - { - SolutionName = solutionName; - DatabaseProvider = databaseProvider; - Version = version; - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs index 62ec0d9f66..d1433725ec 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs @@ -9,25 +9,7 @@ namespace Volo.Abp.SolutionTemplating.Building.Steps { public override void Execute(ProjectBuildContext context) { - if (context.Template.RootPathInZipFile == null) - { - context.Files = GetEntriesFromZipFile(context.Template.FilePath); - return; - } - - var entryListCachePath = CreateCachePath(context); - - if (File.Exists(entryListCachePath)) - { - context.Files = GetEntriesFromZipFile(entryListCachePath); - return; - } - - context.Files = GetEntriesFromZipFile( - context.Template.FilePath, - context.Template.RootPathInZipFile); - - SaveCachedEntries(entryListCachePath, context.Files); + context.Files = GetEntriesFromZipFile(context.Template.FilePath); } private static FileEntryList GetEntriesFromZipFile(string filePath, string rootFolder = null) @@ -40,19 +22,5 @@ namespace Volo.Abp.SolutionTemplating.Building.Steps } } } - - private static void SaveCachedEntries(string filePath, FileEntryList entries) - { - using (var resultZipFile = new ZipFile()) - { - entries.CopyToZipFile(resultZipFile); - resultZipFile.Save(filePath); - } - } - - private string CreateCachePath(ProjectBuildContext context) - { - return context.Template.FilePath.Replace(".zip", "-filtered.zip"); - } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs deleted file mode 100644 index d34c67ec66..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.IO; -using Volo.Abp.SolutionTemplating.Github; - -namespace Volo.Abp.SolutionTemplating.Building.Steps -{ - public class GithubDownloadStep : ProjectBuildPipelineStep - { - public override void Execute(ProjectBuildContext context) - { - var githubManager = new GithubManager(); - - context.Template.Version = githubManager.GetVersion(context); - - context.Template.FilePath = Path.Combine( - context.TemplatesFolder, - $"{context.Template.Name}-{context.Template.Version}.zip" - ); - - context.Template.RootPathInZipFile = context.Template.GithubRepository.RepositoryName + "-" + context.Template.Version.RemovePreFix("v") + context.Template.RootPathInZipFile; - - try - { - githubManager.DownloadIfNotExist(context); - } - catch (Exception e) - { - throw e; //TODO: !!! - //var existingVersion = githubManager.GetExistingVersion(context); - } - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs index 7336dbd397..460e174252 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.SolutionTemplating.Building.Steps context.Files, "MyCompanyName", "MyProjectName", - context.Template.Version + context.Version ).Run(); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs index a45fabfd5b..43d7356a32 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs @@ -13,8 +13,8 @@ namespace Volo.Abp.SolutionTemplating.Building.Steps context.Files, "MyCompanyName", "MyProjectName", - context.Request.SolutionName.CompanyName, - context.Request.SolutionName.ProjectName + context.BuildArgs.SolutionName.CompanyName, + context.BuildArgs.SolutionName.ProjectName ).Run(); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs index 0bdccd3d00..1756402664 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs @@ -5,26 +5,8 @@ namespace Volo.Abp.SolutionTemplating.Building { public abstract class TemplateInfo { - public string Name { get; set; } - - public GithubRepositoryInfo GithubRepository { get; } - public string FilePath { get; set; } - public string RootPathInZipFile { get; set; } - - public string Version { get; set; } - - protected TemplateInfo( - string name, - GithubRepositoryInfo githubRepository, - string rootPathInZipFile) - { - Name = name; - GithubRepository = githubRepository; - RootPathInZipFile = rootPathInZipFile; - } - public virtual IEnumerable GetCustomSteps(ProjectBuildContext context) { return Array.Empty(); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubManager.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubManager.cs deleted file mode 100644 index fbe0801ffd..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubManager.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using Newtonsoft.Json; -using Volo.Abp.SolutionTemplating.Building; -using Volo.Abp.Threading; - -namespace Volo.Abp.SolutionTemplating.Github -{ - public class GithubManager - { - private static readonly object LockObject = new object(); - - public string GetVersion(ProjectBuildContext context) - { - if (context.Request.Version.StartsWith("Branch:", StringComparison.OrdinalIgnoreCase)) - { - //TODO: Should not cache branch files! - return context.Request.Version.Substring("Branch:".Length); - } - - var url = "https://api.github.com/repos/" + context.Template.GithubRepository.RepositoryNameWithOrganization + "/releases"; - - using (var client = new System.Net.Http.HttpClient()) - { - var credentials = string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}:", context.Template.GithubRepository.AccessToken); - credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(credentials)); - - client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials); - client.Timeout = TimeSpan.FromMinutes(30); - - client.DefaultRequestHeaders.UserAgent.ParseAdd("MyAgent/1.0"); - var releases = JsonConvert.DeserializeObject>(client.GetStringAsync(url).Result); - - if (context.Request.Version == StandardVersions.LatestUnstable) - { - return releases.FirstOrDefault(r => !r.IsPrerelease)?.Name; - } - - return releases.FirstOrDefault()?.Name; - } - } - - public void DownloadIfNotExist(ProjectBuildContext context) - { - using (var client = new System.Net.Http.HttpClient()) - { - if (File.Exists(context.Template.FilePath)) - { - return; - } - - lock (LockObject) - { - if (File.Exists(context.Template.FilePath)) - { - return; - } - - var downloadUrl = "https://github.com/" + context.Template.GithubRepository.RepositoryNameWithOrganization + "/archive/" + context.Template.Version + ".zip"; - - var credentials = string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}:", context.Template.GithubRepository.AccessToken); - credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(credentials)); - - client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", credentials); - client.Timeout = TimeSpan.FromMinutes(30); - - var fileContents = AsyncHelper.RunSync(() => client.GetByteArrayAsync(downloadUrl)); - - File.WriteAllBytes(context.Template.FilePath, fileContents); - } - } - } - - //public string GetExistingVersion(ProjectBuildContext context) - //{ - // var directoryInfo = new DirectoryInfo(templateRootPath); - // var existingFileName = directoryInfo.GetFiles().FirstOrDefault(f => f.Name.StartsWith(repositoryName))?.Name; - // var latestVersion = ""; - - // if (existingFileName != null) - // { - // var pFrom = existingFileName.IndexOf(repositoryName + "-", StringComparison.Ordinal) + (repositoryName + "-").Length; - // var pTo = existingFileName.LastIndexOf(".zip", StringComparison.Ordinal); - - // latestVersion = existingFileName.Substring(pFrom, pTo - pFrom); - // } - - // return latestVersion; - //} - } -} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs similarity index 68% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs index 77628e9767..dd43e8b63e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs @@ -1,12 +1,12 @@ namespace Volo.Abp.SolutionTemplating { - public class SolutionBuildResult + public class ProjectBuildResult { public byte[] ZipContent { get; } public string ProjectName { get; } - public SolutionBuildResult(byte[] zipContent, string projectName) + public ProjectBuildResult(byte[] zipContent, string projectName) { ZipContent = zipContent; ProjectName = projectName; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuilder.cs deleted file mode 100644 index 736ffad678..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuilder.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.SolutionTemplating.Building; - -namespace Volo.Abp.SolutionTemplating -{ - public class SolutionBuilder : ITransientDependency - { - private readonly IHostingEnvironment _hostingEnvironment; - private readonly IRepository _downloadRepository; - - public SolutionBuilder( - IHostingEnvironment hostingEnvironment, - IRepository downloadRepository) - { - _hostingEnvironment = hostingEnvironment; - _downloadRepository = downloadRepository; - } - - public async Task BuildAsync( - TemplateInfo template, - string companyAndProjectName, - DatabaseProvider databaseProvider, - string version, - bool replaceLocalReferencesToNuget) - { - var stopwatch = Stopwatch.StartNew(); - - var templateRootPath = Path.Combine(_hostingEnvironment.ContentRootPath, "TemplateFiles"); //TODO: To another folder that is not in the deployment folder! - var solutionName = SolutionName.Parse(companyAndProjectName); - - var context = new ProjectBuildContext( - template, - new ProjectBuildRequest( - solutionName, - databaseProvider, - version - ), - templateRootPath - ); - - ProjectBuildPipelineBuilder.Build(context).Execute(context); - - stopwatch.Stop(); - - await _downloadRepository.InsertAsync( - new DownloadInfo( - solutionName.FullName, - template.Name, - databaseProvider, - context.Template.Version, - Convert.ToInt32(stopwatch.Elapsed.TotalMilliseconds) - ) - ); - - return new SolutionBuildResult(context.Result.ZipContent, solutionName.ProjectName); - } - } -} From e53279a6fb628f09552dc5dd7dc1e402581be69d Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 15:21:19 +0300 Subject: [PATCH 055/335] Initial working version of new project creation with temporary code. --- .../Volo.Abp.Cli.Core.csproj | 2 ++ .../Volo/Abp/Cli/AbpCliCoreModule.cs | 8 ++++-- .../Volo/Abp/Cli/Commands/MainHelpCommand.cs | 2 +- .../Abp/Cli/Commands/NewProjectCommand.cs | 1 - .../Abp/ProjectBuilding/ProjectBuildArgs.cs | 2 +- .../Abp/ProjectBuilding/ProjectBuilder.cs | 10 +++++++ .../ProjectBuilding/TemplateInfoProvider.cs | 26 +++---------------- .../Templates/MvcApplicationTemplate.cs | 10 +++++++ .../Templates/MvcModuleTemplate.cs | 11 +++++++- .../Templates/ServiceTemplate.cs | 9 +++++++ .../Building/Steps/FileEntryListReadStep.cs | 10 +++---- .../Building/TemplateInfo.cs | 13 +++++++++- .../src/Volo.Abp.Cli/Volo.Abp.Cli.csproj | 4 +++ 13 files changed, 74 insertions(+), 34 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj index 459d95089a..07a488123c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj +++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj @@ -15,6 +15,8 @@ + + diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index e56c95ff27..555fe14ca4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Domain; +using System.Text; +using Volo.Abp.Domain; using Volo.Abp.Json; using Volo.Abp.Modularity; @@ -10,6 +11,9 @@ namespace Volo.Abp.Cli )] public class AbpCliCoreModule : AbpModule { - + public override void ConfigureServices(ServiceConfigurationContext context) + { + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs index d06dcade91..96f7132934 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs @@ -5,7 +5,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.Commands { - public class MainHelpCommand : ITransientDependency + public class MainHelpCommand : IConsoleCommand, ITransientDependency { public Task ExecuteAsync(CommandLineArgs commandLineArgs) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index b662bec85b..8addefbdde 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -7,7 +7,6 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.ProjectBuilding; using Volo.Abp.SolutionTemplating; using Volo.Abp.SolutionTemplating.Building; -using Volo.Abp.SolutionTemplating.Zipping; namespace Volo.Abp.Cli.Commands { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs index 5ca1a0ad99..34284ffafb 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.ProjectBuilding [CanBeNull] public string TemplateName { get; set; } - public DatabaseProvider DatabaseProvider { get; } + public DatabaseProvider DatabaseProvider { get; set; } public ProjectBuildArgs( [NotNull] SolutionName solutionName, diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs index ee13db6e3f..cc0f91940b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs @@ -23,6 +23,16 @@ namespace Volo.Abp.ProjectBuilding var templateInfo = GetTemplateInfo(args); + args.TemplateName = templateInfo.Name; + + if (args.DatabaseProvider == DatabaseProvider.NotSpecified) + { + if (templateInfo.DefaultDatabaseProvider != DatabaseProvider.NotSpecified) + { + args.DatabaseProvider = templateInfo.DefaultDatabaseProvider; + } + } + var templateFile = await TemplateStore.GetAsync(args.TemplateName, version); var context = new ProjectBuildContext( diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs index d65937eab2..bfc5aec303 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs @@ -9,40 +9,22 @@ namespace Volo.Abp.ProjectBuilding { public TemplateInfo GetDefault() { - return Get(TemplateNames.Mvc); + return Get(MvcApplicationTemplate.TemplateName); } public TemplateInfo Get(string name) { switch (name) { - case TemplateNames.Mvc: + case MvcApplicationTemplate.TemplateName: return new MvcApplicationTemplate(); - case TemplateNames.MvcModule: + case MvcModuleTemplate.TemplateName: return new MvcModuleTemplate(); - case TemplateNames.Service: + case ServiceTemplate.TemplateName: return new ServiceTemplate(); default: throw new Exception("There is no template found with given name: " + name); } } - - public static class TemplateNames - { - /// - /// "mvc". - /// - public const string Mvc = "mvc"; - - /// - /// "mvcmodule". - /// - public const string MvcModule = "mvcmodule"; - - /// - /// "service". - /// - public const string Service = "service"; - } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs index 7fe2fd7a0a..3b8dd55f54 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs @@ -6,6 +6,16 @@ namespace Volo.Abp.ProjectBuilding.Templates { public class MvcApplicationTemplate : TemplateInfo { + /// + /// "mvc". + /// + public const string TemplateName = "mvc"; + + public MvcApplicationTemplate() + : base(TemplateName, DatabaseProvider.EntityFrameworkCore) + { + } + public override IEnumerable GetCustomSteps(ProjectBuildContext context) { var steps = new List(); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs index 6549ce103c..a4f436932b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs @@ -4,6 +4,15 @@ namespace Volo.Abp.ProjectBuilding.Templates { public class MvcModuleTemplate : TemplateInfo { - + /// + /// "mvcmodule". + /// + public const string TemplateName = "mvcmodule"; + + public MvcModuleTemplate() + : base(TemplateName) + { + + } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs index 7558891d34..ebbd9fa90a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs @@ -4,6 +4,15 @@ namespace Volo.Abp.ProjectBuilding.Templates { public class ServiceTemplate : TemplateInfo { + /// + /// "service". + /// + public const string TemplateName = "service"; + public ServiceTemplate() + : base(TemplateName) + { + + } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs index d1433725ec..794f169a26 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs @@ -9,16 +9,16 @@ namespace Volo.Abp.SolutionTemplating.Building.Steps { public override void Execute(ProjectBuildContext context) { - context.Files = GetEntriesFromZipFile(context.Template.FilePath); + context.Files = GetEntriesFromZipFile(context.TemplateFile.FileBytes); } - private static FileEntryList GetEntriesFromZipFile(string filePath, string rootFolder = null) + private static FileEntryList GetEntriesFromZipFile(byte[] fileBytes) { - using (var templateFileStream = File.OpenRead(filePath)) + using (var memoryStream = new MemoryStream(fileBytes)) { - using (var templateZipFile = ZipFile.Read(templateFileStream)) + using (var templateZipFile = ZipFile.Read(memoryStream)) { - return templateZipFile.ToFileEntryList(rootFolder); + return templateZipFile.ToFileEntryList(); } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs index 1756402664..0ef7d26a4f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs @@ -1,11 +1,22 @@ using System; using System.Collections.Generic; +using JetBrains.Annotations; namespace Volo.Abp.SolutionTemplating.Building { public abstract class TemplateInfo { - public string FilePath { get; set; } + public string Name { get; } + + public DatabaseProvider DefaultDatabaseProvider { get; } + + protected TemplateInfo( + [NotNull] string name, + DatabaseProvider defaultDatabaseProvider = DatabaseProvider.NotSpecified) + { + Name = Check.NotNullOrWhiteSpace(name, nameof(name)); + DefaultDatabaseProvider = Check.NotNull(defaultDatabaseProvider, nameof(defaultDatabaseProvider)); + } public virtual IEnumerable GetCustomSteps(ProjectBuildContext context) { diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj index f2f9424512..9cdc913391 100644 --- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj +++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj @@ -10,6 +10,10 @@ + + + + From f5f987189dc1b76d58f75c2693f334ac96268b16 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 15:43:02 +0300 Subject: [PATCH 056/335] Get CLI & template version from the assembly. --- .../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs | 9 ++++++++- .../Volo/Abp/ProjectBuilding/ProjectBuilder.cs | 5 +++-- .../System/Reflection/AbpAssemblyExtensions.cs | 12 ++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 framework/src/Volo.Abp.Core/System/Reflection/AbpAssemblyExtensions.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 50108567e6..1b65577f1d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -1,4 +1,6 @@ -using Microsoft.Extensions.DependencyInjection; +using System; +using System.Reflection; +using Microsoft.Extensions.DependencyInjection; using System.Threading.Tasks; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Commands; @@ -8,6 +10,8 @@ namespace Volo.Abp.Cli { public class CliService : ITransientDependency { + public static string Version => typeof(AbpCliCoreModule).Assembly.GetFileVersion(); + protected ICommandLineArgumentParser CommandLineArgumentParser { get; } protected ICommandSelector CommandSelector { get; } public IHybridServiceScopeFactory ServiceScopeFactory { get; } @@ -24,6 +28,9 @@ namespace Volo.Abp.Cli public async Task RunAsync(string[] args) { + Console.WriteLine("ABP CLI (abp.io)"); + Console.WriteLine("Version: " + Version); + var commandLineArgs = CommandLineArgumentParser.Parse(args); var commandType = CommandSelector.Select(commandLineArgs); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs index cc0f91940b..501d309845 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Volo.Abp.Cli; using Volo.Abp.DependencyInjection; using Volo.Abp.SolutionTemplating; using Volo.Abp.SolutionTemplating.Building; @@ -19,8 +20,6 @@ namespace Volo.Abp.ProjectBuilding public async Task BuildAsync(ProjectBuildArgs args) { - var version = "0.16.0"; //TODO: Should get from somewhere! - var templateInfo = GetTemplateInfo(args); args.TemplateName = templateInfo.Name; @@ -33,6 +32,8 @@ namespace Volo.Abp.ProjectBuilding } } + var version = CliService.Version; + var templateFile = await TemplateStore.GetAsync(args.TemplateName, version); var context = new ProjectBuildContext( diff --git a/framework/src/Volo.Abp.Core/System/Reflection/AbpAssemblyExtensions.cs b/framework/src/Volo.Abp.Core/System/Reflection/AbpAssemblyExtensions.cs new file mode 100644 index 0000000000..0e61770618 --- /dev/null +++ b/framework/src/Volo.Abp.Core/System/Reflection/AbpAssemblyExtensions.cs @@ -0,0 +1,12 @@ +using System.Diagnostics; + +namespace System.Reflection +{ + public static class AbpAssemblyExtensions + { + public static string GetFileVersion(this Assembly assembly) + { + return FileVersionInfo.GetVersionInfo(assembly.Location).FileVersion; + } + } +} From 37ce88c29e093c3b90dcbcdce93aefa7ebe944e1 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 16:22:27 +0300 Subject: [PATCH 057/335] Added logging for CLI --- .../Volo.AbpWebSite.Web/publish-ignore.json | 1 + .../Volo/Abp/Cli/CliService.cs | 11 ++++-- .../Abp/Cli/Commands/NewProjectCommand.cs | 22 +++++++----- .../Abp/ProjectBuilding/AbpIoTemplateStore.cs | 36 ++++++++++++++++--- .../src/Volo.Abp.Cli/Volo.Abp.Cli.csproj | 5 +++ .../Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs | 6 ++-- .../src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs | 17 ++++++++- .../Volo/Abp/Modularity/ModuleManager.cs | 4 +-- 8 files changed, 83 insertions(+), 19 deletions(-) diff --git a/abp_io/src/Volo.AbpWebSite.Web/publish-ignore.json b/abp_io/src/Volo.AbpWebSite.Web/publish-ignore.json index 89e3176a69..c5e2fd7c51 100644 --- a/abp_io/src/Volo.AbpWebSite.Web/publish-ignore.json +++ b/abp_io/src/Volo.AbpWebSite.Web/publish-ignore.json @@ -3,6 +3,7 @@ "TemplateFiles/": {}, "Logs/": {}, "wwwroot/files/": {}, + "wwwroot/downloads/": {}, "appsettings.json": {}, "web.config": {} } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 1b65577f1d..502ab294e6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -2,9 +2,12 @@ using System.Reflection; using Microsoft.Extensions.DependencyInjection; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Commands; using Volo.Abp.DependencyInjection; +using Volo.Abp.ProjectBuilding; namespace Volo.Abp.Cli { @@ -12,6 +15,8 @@ namespace Volo.Abp.Cli { public static string Version => typeof(AbpCliCoreModule).Assembly.GetFileVersion(); + public ILogger Logger { get; set; } + protected ICommandLineArgumentParser CommandLineArgumentParser { get; } protected ICommandSelector CommandSelector { get; } public IHybridServiceScopeFactory ServiceScopeFactory { get; } @@ -24,12 +29,14 @@ namespace Volo.Abp.Cli CommandLineArgumentParser = commandLineArgumentParser; CommandSelector = commandSelector; ServiceScopeFactory = serviceScopeFactory; + + Logger = NullLogger.Instance; } public async Task RunAsync(string[] args) { - Console.WriteLine("ABP CLI (abp.io)"); - Console.WriteLine("Version: " + Version); + Logger.LogInformation("ABP CLI (abp.io)"); + Logger.LogInformation("Version: " + Version); var commandLineArgs = CommandLineArgumentParser.Parse(args); var commandType = CommandSelector.Select(commandLineArgs); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index 8addefbdde..09fd578d85 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -2,6 +2,8 @@ using System.IO; using System.Threading.Tasks; using Ionic.Zip; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.DependencyInjection; using Volo.Abp.ProjectBuilding; @@ -12,28 +14,32 @@ namespace Volo.Abp.Cli.Commands { public class NewProjectCommand : IConsoleCommand, ITransientDependency { + public ILogger Logger { get; set; } + protected ProjectBuilder ProjectBuilder { get; } public NewProjectCommand(ProjectBuilder projectBuilder) { ProjectBuilder = projectBuilder; + + Logger = NullLogger.Instance; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) { if (commandLineArgs.Target == null) { - Console.WriteLine("Project name is missing."); - Console.WriteLine("Usage:"); - Console.WriteLine(" abp new [-t ]"); - Console.WriteLine("Examples:"); - Console.WriteLine(" abp new Acme.BookStore"); - Console.WriteLine(" abp new Acme.BookStore mvc"); + Logger.LogWarning("Project name is missing."); + Logger.LogWarning("Usage:"); + Logger.LogWarning(" abp new [-t ]"); + Logger.LogWarning("Examples:"); + Logger.LogWarning(" abp new Acme.BookStore"); + Logger.LogWarning(" abp new Acme.BookStore mvc"); return; } - Console.WriteLine("Creating a new solution"); - Console.WriteLine("Solution name: " + commandLineArgs.Target); + Logger.LogInformation("Creating a new project..."); + Logger.LogInformation("Project name: " + commandLineArgs.Target); var result = await ProjectBuilder.BuildAsync( new ProjectBuildArgs( diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs index c8c36b967d..e81e7e414b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs @@ -1,16 +1,44 @@ -using System.IO; +using System; +using System.IO; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.DependencyInjection; +using Volo.Abp.IO; namespace Volo.Abp.ProjectBuilding { public class AbpIoTemplateStore : ITemplateStore, ITransientDependency { + public ILogger Logger { get; set; } + + public AbpIoTemplateStore() + { + Logger = NullLogger.Instance; + } + public async Task GetAsync(string templateName, string version) { - return new TemplateFile( - File.ReadAllBytes("C:\\Temp\\abp-templates\\" + version + "\\" + templateName + ".zip") - ); + var localCacheFolder = "C:\\Temp\\abp-template-cache\\" + version; + DirectoryHelper.CreateIfNotExists(localCacheFolder); + + var localCacheFile = Path.Combine(localCacheFolder, templateName + ".zip"); + if (File.Exists(localCacheFile)) + { + Logger.LogInformation("Using cached template: " + templateName + ", version: " + version); + return new TemplateFile(File.ReadAllBytes(localCacheFile)); + } + + Logger.LogInformation("Downloading template: " + templateName + ", version: " + version); + + using (var client = new System.Net.Http.HttpClient()) + { + client.Timeout = TimeSpan.FromMinutes(5); + var downloadUrl = "https://abp.io/downloads/templates/" + version + "/" + templateName + ".zip"; + var fileContents = await client.GetByteArrayAsync(downloadUrl); + File.WriteAllBytes(localCacheFile, fileContents); + return new TemplateFile(fileContents); + } } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj index 9cdc913391..4f0de79850 100644 --- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj +++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj @@ -12,9 +12,14 @@ + + + + + diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs index 523dd6c813..339041ef8a 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs @@ -1,9 +1,11 @@ -using Volo.Abp.Modularity; +using Volo.Abp.Autofac; +using Volo.Abp.Modularity; namespace Volo.Abp.Cli { [DependsOn( - typeof(AbpCliCoreModule) + typeof(AbpCliCoreModule), + typeof(AbpAutofacModule) )] public class AbpCliModule : AbpModule { diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs index c7f321a8e1..706dc91d47 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs @@ -1,4 +1,6 @@ using Microsoft.Extensions.DependencyInjection; +using Serilog; +using Serilog.Events; using Volo.Abp.Threading; namespace Volo.Abp.Cli @@ -7,7 +9,20 @@ namespace Volo.Abp.Cli { private static void Main(string[] args) { - using (var application = AbpApplicationFactory.Create()) + Log.Logger = new LoggerConfiguration() + .MinimumLevel.Information() + .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) + .Enrich.FromLogContext() + //.WriteTo.File("Logs/logs.txt") //TODO: Write logs to a global path + .WriteTo.Console() + .CreateLogger(); + + using (var application = AbpApplicationFactory.Create( + options => + { + options.UseAutofac(); + options.Services.AddLogging(c => c.AddSerilog()); + })) { application.Initialize(); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs index d79ae0b843..934948dc03 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs @@ -42,12 +42,12 @@ namespace Volo.Abp.Modularity } } - _logger.LogInformation("Initialized all modules."); + _logger.LogInformation("Initialized all ABP modules."); } private void LogListOfModules() { - _logger.LogInformation("Loaded modules:"); + _logger.LogInformation("Loaded ABP modules:"); foreach (var module in _moduleContainer.Modules) { From e5579144595a457e06f87ad8540d1b28c387a319 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 16:35:32 +0300 Subject: [PATCH 058/335] Use user data folder for template cache and logging. --- .../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs | 13 +++++++++++++ .../Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs | 3 ++- framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs new file mode 100644 index 0000000000..b0296671b3 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs @@ -0,0 +1,13 @@ +using System; +using System.IO; + +namespace Volo.Abp.Cli +{ + public static class CliPaths + { + public static string TemplateCachePath => Path.Combine(AbpRootPath, "templates"); + public static string CliLogPath => Path.Combine(AbpRootPath, "cli", "logs"); + + private static readonly string AbpRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".abp"); + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs index e81e7e414b..6f3956f604 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs @@ -3,6 +3,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Cli; using Volo.Abp.DependencyInjection; using Volo.Abp.IO; @@ -19,7 +20,7 @@ namespace Volo.Abp.ProjectBuilding public async Task GetAsync(string templateName, string version) { - var localCacheFolder = "C:\\Temp\\abp-template-cache\\" + version; + var localCacheFolder = Path.Combine(CliPaths.TemplateCachePath, version); DirectoryHelper.CreateIfNotExists(localCacheFolder); var localCacheFile = Path.Combine(localCacheFolder, templateName + ".zip"); diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs index 706dc91d47..02759655ff 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Serilog; using Serilog.Events; +using System.IO; using Volo.Abp.Threading; namespace Volo.Abp.Cli @@ -13,7 +14,7 @@ namespace Volo.Abp.Cli .MinimumLevel.Information() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) .Enrich.FromLogContext() - //.WriteTo.File("Logs/logs.txt") //TODO: Write logs to a global path + .WriteTo.File(Path.Combine(CliPaths.CliLogPath, "abp-cli-logs.txt")) .WriteTo.Console() .CreateLogger(); From 379a2e48ad7f78506e6fb80b0694b71bd9439bb4 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 16:39:38 +0300 Subject: [PATCH 059/335] Move to a propert namespace. --- .../Volo/Abp/Cli/Commands/NewProjectCommand.cs | 5 +++-- .../Building/DatabaseProvider.cs | 2 +- .../Building/GithubRepositoryInfo.cs | 2 +- .../Building/ProjectBuildContext.cs | 5 ++--- .../Building/ProjectBuildContextExtensions.cs | 4 ++-- .../Building/ProjectBuildPipeline.cs | 2 +- .../Building/ProjectBuildPipelineBuilder.cs | 4 ++-- .../Building/ProjectBuildPipelineStep.cs | 2 +- .../Building/ProjectResult.cs | 2 +- .../Building/Steps/CreateProjectResultZipStep.cs | 6 +++--- .../Building/Steps/FileEntryListReadStep.cs | 6 +++--- .../Building/Steps/NugetReferenceReplaceStep.cs | 4 ++-- .../Building/Steps/RemoveProjectFromSolutionStep.cs | 2 +- .../Building/Steps/SolutionRenameStep.cs | 4 ++-- .../Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs | 4 ++-- .../Building/Steps/TemplateCodeDeleteStep.cs | 4 ++-- .../Building/TemplateInfo.cs | 2 +- .../DownloadInfo.cs | 4 ++-- .../Files/FileEntry.cs | 2 +- .../Files/FileEntryExtensions.cs | 2 +- .../Files/FileEntryList.cs | 2 +- .../Files/FileEntryListExtensions.cs | 2 +- .../Github/GithubRelease.cs | 2 +- .../Volo/Abp/ProjectBuilding/IProjectBuilder.cs | 1 - .../Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs | 2 +- .../Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs | 3 +-- .../ProjectBuildResult.cs | 2 +- .../Volo/Abp/ProjectBuilding/ProjectBuilder.cs | 3 +-- .../SolutionName.cs | 2 +- .../Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs | 2 +- .../ProjectBuilding/Templates/MvcApplicationTemplate.cs | 4 ++-- .../Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs | 2 +- .../Abp/ProjectBuilding/Templates/ServiceTemplate.cs | 2 +- .../Zipping/ZipFileExtensions.cs | 4 ++-- .../Volo/Abp/SolutionTemplating/StandardVersions.cs | 9 --------- 35 files changed, 49 insertions(+), 61 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/DatabaseProvider.cs (71%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/GithubRepositoryInfo.cs (94%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/ProjectBuildContext.cs (89%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/ProjectBuildContextExtensions.cs (83%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/ProjectBuildPipeline.cs (90%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/ProjectBuildPipelineBuilder.cs (86%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/ProjectBuildPipelineStep.cs (72%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/ProjectResult.cs (64%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/Steps/CreateProjectResultZipStep.cs (80%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/Steps/FileEntryListReadStep.cs (82%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/Steps/NugetReferenceReplaceStep.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/Steps/RemoveProjectFromSolutionStep.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/Steps/SolutionRenameStep.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs (96%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/Steps/TemplateCodeDeleteStep.cs (82%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Building/TemplateInfo.cs (94%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/DownloadInfo.cs (92%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Files/FileEntry.cs (98%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Files/FileEntryExtensions.cs (98%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Files/FileEntryList.cs (83%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Files/FileEntryListExtensions.cs (92%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Github/GithubRelease.cs (90%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/ProjectBuildResult.cs (87%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/SolutionName.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{SolutionTemplating => ProjectBuilding}/Zipping/ZipFileExtensions.cs (94%) delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index 09fd578d85..a1e69d14ca 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -7,8 +7,7 @@ using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.DependencyInjection; using Volo.Abp.ProjectBuilding; -using Volo.Abp.SolutionTemplating; -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.Cli.Commands { @@ -56,6 +55,8 @@ namespace Volo.Abp.Cli.Commands templateZipFile.ExtractAll(Directory.GetCurrentDirectory(), ExtractExistingFileAction.Throw); } } + + Logger.LogInformation($"Successfully created the project '{commandLineArgs.Target}'"); } protected virtual DatabaseProvider GetDatabaseProviderOrNull(CommandLineArgs commandLineArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs similarity index 71% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs index e0e0f14e0b..0352bed89c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public enum DatabaseProvider { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs index f9d8812076..7a7277f8a4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs @@ -1,6 +1,6 @@ using System; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public class GithubRepositoryInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs similarity index 89% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs index b620f6dc02..7e16a377c6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs @@ -1,8 +1,7 @@ using JetBrains.Annotations; -using Volo.Abp.ProjectBuilding; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public class ProjectBuildContext { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs similarity index 83% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs index 7178a24238..b4623e6744 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public static class ProjectBuildContextExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs similarity index 90% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs index 3e2e617517..c4afe2aab6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public class ProjectBuildPipeline { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs similarity index 86% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs index 44062f9cee..35ea1bfe39 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs @@ -1,6 +1,6 @@ -using Volo.Abp.SolutionTemplating.Building.Steps; +using Volo.Abp.ProjectBuilding.Building.Steps; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public static class ProjectBuildPipelineBuilder { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs similarity index 72% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs index d6ec90325f..3080224ed2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public abstract class ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs similarity index 64% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs index 3afc3e1a17..19230adfb5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public class ProjectResult { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs similarity index 80% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs index 88f2558e58..a2b468effd 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs @@ -1,8 +1,8 @@ using Ionic.Zip; -using Volo.Abp.SolutionTemplating.Files; -using Volo.Abp.SolutionTemplating.Zipping; +using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.ProjectBuilding.Zipping; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class CreateProjectResultZipStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs similarity index 82% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs index 794f169a26..22f1d8840f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs @@ -1,9 +1,9 @@ using System.IO; using Ionic.Zip; -using Volo.Abp.SolutionTemplating.Files; -using Volo.Abp.SolutionTemplating.Zipping; +using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.ProjectBuilding.Zipping; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class FileEntryListReadStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs index 460e174252..3d41c682dc 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs @@ -2,9 +2,9 @@ using System.IO; using System.Linq; using HtmlAgilityPack; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class NugetReferenceReplaceStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs index 7130b7ae1e..c956e4b4ab 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class RemoveProjectFromSolutionStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs index 43d7356a32..20f2810633 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class SolutionRenameStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs similarity index 96% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs index 64e1b44c11..6b77808f55 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs @@ -1,7 +1,7 @@ using System; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class SwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs similarity index 82% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs index e35e11d441..aa3990905a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs @@ -1,6 +1,6 @@ -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class TemplateCodeDeleteStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs index 0ef7d26a4f..c85d1d571c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public abstract class TemplateInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs similarity index 92% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs index 0865e1175c..9d07f6e022 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs @@ -1,9 +1,9 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; -namespace Volo.Abp.SolutionTemplating +namespace Volo.Abp.ProjectBuilding { [Table("Downloads")] public class DownloadInfo : CreationAuditedAggregateRoot diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs similarity index 98% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs index 7f808ad4cf..5dd67846d2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace Volo.Abp.SolutionTemplating.Files +namespace Volo.Abp.ProjectBuilding.Files { public class FileEntry { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs similarity index 98% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs index 999e8a9353..19bf75456c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.SolutionTemplating.Files +namespace Volo.Abp.ProjectBuilding.Files { public static class FileEntryExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs similarity index 83% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs index 17b7b757ba..34543e31fa 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.SolutionTemplating.Files +namespace Volo.Abp.ProjectBuilding.Files { public class FileEntryList : List { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs similarity index 92% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs index 01acdf297b..1a1a47c1c6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs @@ -1,7 +1,7 @@ using System; using Ionic.Zip; -namespace Volo.Abp.SolutionTemplating.Files +namespace Volo.Abp.ProjectBuilding.Files { public static class FileEntryListExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs similarity index 90% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs index 4e5ea612fe..449f9a43d5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace Volo.Abp.SolutionTemplating.Github +namespace Volo.Abp.ProjectBuilding.Github { [JsonObject] public class GithubRelease diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs index 3011516061..c037442711 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using Volo.Abp.SolutionTemplating; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs index ad8dbbe874..789e11b341 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs @@ -1,4 +1,4 @@ -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs index 34284ffafb..fffeb87a6c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; -using Volo.Abp.SolutionTemplating; -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs similarity index 87% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs index dd43e8b63e..2acf036ddc 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.SolutionTemplating +namespace Volo.Abp.ProjectBuilding { public class ProjectBuildResult { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs index 501d309845..3a5c7a6b8a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs @@ -2,8 +2,7 @@ using System.Threading.Tasks; using Volo.Abp.Cli; using Volo.Abp.DependencyInjection; -using Volo.Abp.SolutionTemplating; -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs index 63ec52a432..0e274f5ceb 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs @@ -1,6 +1,6 @@ using System; -namespace Volo.Abp.SolutionTemplating +namespace Volo.Abp.ProjectBuilding { public class SolutionName { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs index bfc5aec303..e386bd7ef1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs @@ -1,7 +1,7 @@ using System; using Volo.Abp.DependencyInjection; +using Volo.Abp.ProjectBuilding.Building; using Volo.Abp.ProjectBuilding.Templates; -using Volo.Abp.SolutionTemplating.Building; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs index 3b8dd55f54..581fe9fcb5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using Volo.Abp.SolutionTemplating.Building; -using Volo.Abp.SolutionTemplating.Building.Steps; +using Volo.Abp.ProjectBuilding.Building; +using Volo.Abp.ProjectBuilding.Building.Steps; namespace Volo.Abp.ProjectBuilding.Templates { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs index a4f436932b..d2831d32b0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs @@ -1,4 +1,4 @@ -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding.Templates { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs index ebbd9fa90a..4b547eead0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs @@ -1,4 +1,4 @@ -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding.Templates { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs index e4e5290194..97536bd6ea 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Ionic.Zip; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Zipping +namespace Volo.Abp.ProjectBuilding.Zipping { public static class ZipFileExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs deleted file mode 100644 index df7b8b2e39..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Volo.Abp.SolutionTemplating -{ - public static class StandardVersions - { - public const string LatestStable = "LatestStable"; - - public const string LatestUnstable = "LatestUnstable"; - } -} From 1de4314144a2ac7d2262181a70f343352b38d427 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 16:46:24 +0300 Subject: [PATCH 060/335] Move to 4-numbers versioning. --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 3c6c9bda58..2915474fcc 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.17.0 + 0.17.0.0 $(NoWarn);CS1591 https://abp.io/assets/abp_nupkg.png https://abp.io From 0e75c0df4e2df36d6f509eb1c564b3a400e67a43 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 17:06:59 +0300 Subject: [PATCH 061/335] Revert back to 3-numbers versioning. --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 2915474fcc..3c6c9bda58 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.17.0.0 + 0.17.0 $(NoWarn);CS1591 https://abp.io/assets/abp_nupkg.png https://abp.io From b2e6f6b75995d791bd0d5f5ffc2e8609346d04ef Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 21:22:08 +0300 Subject: [PATCH 062/335] Increment version. --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 3c6c9bda58..1677ac8e8b 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.17.0 + 0.18.0 $(NoWarn);CS1591 https://abp.io/assets/abp_nupkg.png https://abp.io From 16ee8cd6241bcfbff7e0224484aea65dfb4a7194 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 21:32:03 +0300 Subject: [PATCH 063/335] Rename mvc module template folder --- .../Volo/Abp/Cli/Commands/NewProjectCommand.cs | 13 ++++++++----- .../ProjectBuilding/Templates/MvcModuleTemplate.cs | 4 ++-- templates/{module => mvc-module}/.gitattributes | 0 templates/{module => mvc-module}/.gitignore | 2 +- .../MyCompanyName.MyProjectName.sln | 0 .../MyCompanyName.MyProjectName.sln.DotSettings | 0 .../DemoAppDbContext.cs | 0 .../DemoAppDbContextFactory.cs | 0 .../DemoAppModule.cs | 0 .../Migrations/20190410095748_Initial.Designer.cs | 0 .../Migrations/20190410095748_Initial.cs | 0 .../Migrations/DemoAppDbContextModelSnapshot.cs | 0 .../MyCompanyName.MyProjectName.DemoApp.csproj | 0 .../Pages/Index.cshtml | 0 .../Pages/Index.cshtml.cs | 0 .../Pages/_ViewImports.cshtml | 0 .../MyCompanyName.MyProjectName.DemoApp/Program.cs | 0 .../Properties/launchSettings.json | 0 .../MyCompanyName.MyProjectName.DemoApp/Startup.cs | 0 .../abp.resourcemapping.js | 0 .../appsettings.json | 0 .../gulpfile.js | 0 .../package.json | 0 .../wwwroot/libs/abp/core/abp.js | 0 .../wwwroot/libs/abp/jquery/abp.jquery.js | 0 .../wwwroot/libs/bootstrap/css/bootstrap.css | 0 .../wwwroot/libs/bootstrap/js/bootstrap.bundle.js | 0 .../css/dataTables.bootstrap4.css | 0 .../datatables.net-bs4/js/dataTables.bootstrap4.js | 0 .../libs/datatables.net/js/jquery.dataTables.js | 0 .../wwwroot/libs/font-awesome/css/font-awesome.css | 0 .../libs/font-awesome/fonts/FontAwesome.otf | Bin .../font-awesome/fonts/fontawesome-webfont.eot | Bin .../font-awesome/fonts/fontawesome-webfont.svg | 0 .../font-awesome/fonts/fontawesome-webfont.ttf | Bin .../font-awesome/fonts/fontawesome-webfont.woff | Bin .../font-awesome/fonts/fontawesome-webfont.woff2 | Bin .../wwwroot/libs/jquery-form/jquery.form.min.js | 0 .../jquery.validate.unobtrusive.js | 0 .../libs/jquery-validation/jquery.validate.js | 0 .../jquery-validation/localization/messages_ar.js | 0 .../jquery-validation/localization/messages_az.js | 0 .../jquery-validation/localization/messages_bg.js | 0 .../localization/messages_bn_BD.js | 0 .../jquery-validation/localization/messages_ca.js | 0 .../jquery-validation/localization/messages_cs.js | 0 .../jquery-validation/localization/messages_da.js | 0 .../jquery-validation/localization/messages_de.js | 0 .../jquery-validation/localization/messages_el.js | 0 .../jquery-validation/localization/messages_es.js | 0 .../localization/messages_es_AR.js | 0 .../localization/messages_es_PE.js | 0 .../jquery-validation/localization/messages_et.js | 0 .../jquery-validation/localization/messages_eu.js | 0 .../jquery-validation/localization/messages_fa.js | 0 .../jquery-validation/localization/messages_fi.js | 0 .../jquery-validation/localization/messages_fr.js | 0 .../jquery-validation/localization/messages_ge.js | 0 .../jquery-validation/localization/messages_gl.js | 0 .../jquery-validation/localization/messages_he.js | 0 .../jquery-validation/localization/messages_hr.js | 0 .../jquery-validation/localization/messages_hu.js | 0 .../localization/messages_hy_AM.js | 0 .../jquery-validation/localization/messages_id.js | 0 .../jquery-validation/localization/messages_is.js | 0 .../jquery-validation/localization/messages_it.js | 0 .../jquery-validation/localization/messages_ja.js | 0 .../jquery-validation/localization/messages_ka.js | 0 .../jquery-validation/localization/messages_kk.js | 0 .../jquery-validation/localization/messages_ko.js | 0 .../jquery-validation/localization/messages_lt.js | 0 .../jquery-validation/localization/messages_lv.js | 0 .../jquery-validation/localization/messages_mk.js | 0 .../jquery-validation/localization/messages_my.js | 0 .../jquery-validation/localization/messages_nl.js | 0 .../jquery-validation/localization/messages_no.js | 0 .../jquery-validation/localization/messages_pl.js | 0 .../localization/messages_pt_BR.js | 0 .../localization/messages_pt_PT.js | 0 .../jquery-validation/localization/messages_ro.js | 0 .../jquery-validation/localization/messages_ru.js | 0 .../jquery-validation/localization/messages_sd.js | 0 .../jquery-validation/localization/messages_si.js | 0 .../jquery-validation/localization/messages_sk.js | 0 .../jquery-validation/localization/messages_sl.js | 0 .../jquery-validation/localization/messages_sr.js | 0 .../localization/messages_sr_lat.js | 0 .../jquery-validation/localization/messages_sv.js | 0 .../jquery-validation/localization/messages_th.js | 0 .../jquery-validation/localization/messages_tj.js | 0 .../jquery-validation/localization/messages_tr.js | 0 .../jquery-validation/localization/messages_uk.js | 0 .../jquery-validation/localization/messages_ur.js | 0 .../jquery-validation/localization/messages_vi.js | 0 .../jquery-validation/localization/messages_zh.js | 0 .../localization/messages_zh_TW.js | 0 .../jquery-validation/localization/methods_de.js | 0 .../localization/methods_es_CL.js | 0 .../jquery-validation/localization/methods_fi.js | 0 .../jquery-validation/localization/methods_nl.js | 0 .../jquery-validation/localization/methods_pt.js | 0 .../wwwroot/libs/jquery/jquery.js | 0 .../wwwroot/libs/lodash/lodash.min.js | 0 .../wwwroot/libs/select2/css/select2.min.css | 0 .../wwwroot/libs/select2/js/i18n/af.js | 0 .../wwwroot/libs/select2/js/i18n/ar.js | 0 .../wwwroot/libs/select2/js/i18n/az.js | 0 .../wwwroot/libs/select2/js/i18n/bg.js | 0 .../wwwroot/libs/select2/js/i18n/bs.js | 0 .../wwwroot/libs/select2/js/i18n/ca.js | 0 .../wwwroot/libs/select2/js/i18n/cs.js | 0 .../wwwroot/libs/select2/js/i18n/da.js | 0 .../wwwroot/libs/select2/js/i18n/de.js | 0 .../wwwroot/libs/select2/js/i18n/dsb.js | 0 .../wwwroot/libs/select2/js/i18n/el.js | 0 .../wwwroot/libs/select2/js/i18n/en.js | 0 .../wwwroot/libs/select2/js/i18n/es.js | 0 .../wwwroot/libs/select2/js/i18n/et.js | 0 .../wwwroot/libs/select2/js/i18n/eu.js | 0 .../wwwroot/libs/select2/js/i18n/fa.js | 0 .../wwwroot/libs/select2/js/i18n/fi.js | 0 .../wwwroot/libs/select2/js/i18n/fr.js | 0 .../wwwroot/libs/select2/js/i18n/gl.js | 0 .../wwwroot/libs/select2/js/i18n/he.js | 0 .../wwwroot/libs/select2/js/i18n/hi.js | 0 .../wwwroot/libs/select2/js/i18n/hr.js | 0 .../wwwroot/libs/select2/js/i18n/hsb.js | 0 .../wwwroot/libs/select2/js/i18n/hu.js | 0 .../wwwroot/libs/select2/js/i18n/hy.js | 0 .../wwwroot/libs/select2/js/i18n/id.js | 0 .../wwwroot/libs/select2/js/i18n/is.js | 0 .../wwwroot/libs/select2/js/i18n/it.js | 0 .../wwwroot/libs/select2/js/i18n/ja.js | 0 .../wwwroot/libs/select2/js/i18n/km.js | 0 .../wwwroot/libs/select2/js/i18n/ko.js | 0 .../wwwroot/libs/select2/js/i18n/lt.js | 0 .../wwwroot/libs/select2/js/i18n/lv.js | 0 .../wwwroot/libs/select2/js/i18n/mk.js | 0 .../wwwroot/libs/select2/js/i18n/ms.js | 0 .../wwwroot/libs/select2/js/i18n/nb.js | 0 .../wwwroot/libs/select2/js/i18n/nl.js | 0 .../wwwroot/libs/select2/js/i18n/pl.js | 0 .../wwwroot/libs/select2/js/i18n/ps.js | 0 .../wwwroot/libs/select2/js/i18n/pt-BR.js | 0 .../wwwroot/libs/select2/js/i18n/pt.js | 0 .../wwwroot/libs/select2/js/i18n/ro.js | 0 .../wwwroot/libs/select2/js/i18n/ru.js | 0 .../wwwroot/libs/select2/js/i18n/sk.js | 0 .../wwwroot/libs/select2/js/i18n/sl.js | 0 .../wwwroot/libs/select2/js/i18n/sr-Cyrl.js | 0 .../wwwroot/libs/select2/js/i18n/sr.js | 0 .../wwwroot/libs/select2/js/i18n/sv.js | 0 .../wwwroot/libs/select2/js/i18n/th.js | 0 .../wwwroot/libs/select2/js/i18n/tr.js | 0 .../wwwroot/libs/select2/js/i18n/uk.js | 0 .../wwwroot/libs/select2/js/i18n/vi.js | 0 .../wwwroot/libs/select2/js/i18n/zh-CN.js | 0 .../wwwroot/libs/select2/js/i18n/zh-TW.js | 0 .../wwwroot/libs/select2/js/select2.full.min.js | 0 .../wwwroot/libs/select2/js/select2.min.js | 0 .../wwwroot/libs/sweetalert/sweetalert.min.js | 0 .../wwwroot/libs/timeago/jquery.timeago.js | 0 .../wwwroot/libs/timeago/locales/README.md | 0 .../libs/timeago/locales/jquery.timeago.af.js | 0 .../libs/timeago/locales/jquery.timeago.am.js | 0 .../libs/timeago/locales/jquery.timeago.ar.js | 0 .../timeago/locales/jquery.timeago.az-short.js | 0 .../libs/timeago/locales/jquery.timeago.az.js | 0 .../libs/timeago/locales/jquery.timeago.bg.js | 0 .../libs/timeago/locales/jquery.timeago.bs.js | 0 .../libs/timeago/locales/jquery.timeago.ca.js | 0 .../libs/timeago/locales/jquery.timeago.cs.js | 0 .../libs/timeago/locales/jquery.timeago.cy.js | 0 .../libs/timeago/locales/jquery.timeago.da.js | 0 .../timeago/locales/jquery.timeago.de-short.js | 0 .../libs/timeago/locales/jquery.timeago.de.js | 0 .../libs/timeago/locales/jquery.timeago.dv.js | 0 .../libs/timeago/locales/jquery.timeago.el.js | 0 .../timeago/locales/jquery.timeago.en-short.js | 0 .../libs/timeago/locales/jquery.timeago.en.js | 0 .../timeago/locales/jquery.timeago.es-short.js | 0 .../libs/timeago/locales/jquery.timeago.es.js | 0 .../libs/timeago/locales/jquery.timeago.et.js | 0 .../libs/timeago/locales/jquery.timeago.eu.js | 0 .../timeago/locales/jquery.timeago.fa-short.js | 0 .../libs/timeago/locales/jquery.timeago.fa.js | 0 .../libs/timeago/locales/jquery.timeago.fi.js | 0 .../timeago/locales/jquery.timeago.fr-short.js | 0 .../libs/timeago/locales/jquery.timeago.fr.js | 0 .../libs/timeago/locales/jquery.timeago.gl.js | 0 .../libs/timeago/locales/jquery.timeago.he.js | 0 .../libs/timeago/locales/jquery.timeago.hr.js | 0 .../libs/timeago/locales/jquery.timeago.hu.js | 0 .../libs/timeago/locales/jquery.timeago.hy.js | 0 .../libs/timeago/locales/jquery.timeago.id.js | 0 .../libs/timeago/locales/jquery.timeago.is.js | 0 .../timeago/locales/jquery.timeago.it-short.js | 0 .../libs/timeago/locales/jquery.timeago.it.js | 0 .../libs/timeago/locales/jquery.timeago.ja.js | 0 .../libs/timeago/locales/jquery.timeago.jv.js | 0 .../libs/timeago/locales/jquery.timeago.ko.js | 0 .../libs/timeago/locales/jquery.timeago.ky.js | 0 .../libs/timeago/locales/jquery.timeago.lt.js | 0 .../libs/timeago/locales/jquery.timeago.lv.js | 0 .../libs/timeago/locales/jquery.timeago.mk.js | 0 .../libs/timeago/locales/jquery.timeago.nl.js | 0 .../libs/timeago/locales/jquery.timeago.no.js | 0 .../libs/timeago/locales/jquery.timeago.pl.js | 0 .../timeago/locales/jquery.timeago.pt-br-short.js | 0 .../libs/timeago/locales/jquery.timeago.pt-br.js | 0 .../timeago/locales/jquery.timeago.pt-short.js | 0 .../libs/timeago/locales/jquery.timeago.pt.js | 0 .../libs/timeago/locales/jquery.timeago.ro.js | 0 .../libs/timeago/locales/jquery.timeago.rs.js | 0 .../libs/timeago/locales/jquery.timeago.ru.js | 0 .../libs/timeago/locales/jquery.timeago.rw.js | 0 .../libs/timeago/locales/jquery.timeago.si.js | 0 .../libs/timeago/locales/jquery.timeago.sk.js | 0 .../libs/timeago/locales/jquery.timeago.sl.js | 0 .../libs/timeago/locales/jquery.timeago.sq.js | 0 .../libs/timeago/locales/jquery.timeago.sr.js | 0 .../libs/timeago/locales/jquery.timeago.sv.js | 0 .../libs/timeago/locales/jquery.timeago.th.js | 0 .../timeago/locales/jquery.timeago.tr-short.js | 0 .../libs/timeago/locales/jquery.timeago.tr.js | 0 .../libs/timeago/locales/jquery.timeago.uk.js | 0 .../libs/timeago/locales/jquery.timeago.ur.js | 0 .../libs/timeago/locales/jquery.timeago.uz.js | 0 .../libs/timeago/locales/jquery.timeago.vi.js | 0 .../libs/timeago/locales/jquery.timeago.zh-CN.js | 0 .../libs/timeago/locales/jquery.timeago.zh-TW.js | 0 .../wwwroot/libs/toastr/toastr.css | 0 .../wwwroot/libs/toastr/toastr.js.map | 0 .../wwwroot/libs/toastr/toastr.min.css | 0 .../wwwroot/libs/toastr/toastr.min.js | 0 .../MyCompanyName.MyProjectName.DemoApp/yarn.lock | 0 templates/{module => mvc-module}/common.props | 0 ...Name.MyProjectName.Application.Contracts.csproj | 0 .../Localization/ApplicationContracts/en.json | 0 .../Localization/ApplicationContracts/pt-BR.json | 0 .../Localization/ApplicationContracts/zh-Hans.json | 0 .../MyProjectNameApplicationContractsModule.cs | 0 .../MyProjectNamePermissionDefinitionProvider.cs | 0 .../MyProjectName/MyProjectNamePermissions.cs | 0 .../MyCompanyName.MyProjectName.Application.csproj | 0 .../MyProjectNameApplicationAutoMapperProfile.cs | 0 .../MyProjectNameApplicationModule.cs | 0 .../MyProjectNameSettingDefinitionProvider.cs | 0 .../MyProjectName/MyProjectNameSettings.cs | 0 ...yCompanyName.MyProjectName.Domain.Shared.csproj | 0 .../Localization/MyProjectNameResource.cs | 0 .../MyProjectName/MyProjectNameDomainErrorCodes.cs | 0 .../MyProjectNameDomainSharedModule.cs | 0 .../MyCompanyName.MyProjectName.Domain.csproj | 0 .../MyProjectName/Localization/Domain/en.json | 0 .../MyProjectName/Localization/Domain/pt-BR.json | 0 .../MyProjectName/Localization/Domain/zh-Hans.json | 0 .../MyProjectName/MyProjectNameConsts.cs | 0 .../MyProjectName/MyProjectNameDomainModule.cs | 0 ...nyName.MyProjectName.EntityFrameworkCore.csproj | 0 .../EntityFrameworkCore/IMyProjectNameDbContext.cs | 0 .../EntityFrameworkCore/MyProjectNameDbContext.cs | 0 ...yProjectNameDbContextModelCreatingExtensions.cs | 0 .../MyProjectNameEntityFrameworkCoreModule.cs | 0 ...yProjectNameModelBuilderConfigurationOptions.cs | 0 ...CompanyName.MyProjectName.HttpApi.Client.csproj | 0 .../MyProjectNameHttpApiClientModule.cs | 0 .../MyCompanyName.MyProjectName.HttpApi.csproj | 0 .../MyProjectName/MyProjectNameHttpApiModule.cs | 0 .../MyCompanyName.MyProjectName.MongoDB.csproj | 0 .../MongoDB/IMyProjectNameMongoDbContext.cs | 0 .../MongoDB/MyProjectNameMongoDbContext.cs | 0 .../MyProjectNameMongoDbContextExtensions.cs | 0 .../MongoDB/MyProjectNameMongoDbModule.cs | 0 ...ectNameMongoModelBuilderConfigurationOptions.cs | 0 .../Localization/Resources/MyProjectName/en.json | 0 .../Resources/MyProjectName/pt-BR.json | 0 .../Resources/MyProjectName/zh-Hans.json | 0 .../MyCompanyName.MyProjectName.Web.csproj | 0 .../MyProjectNameMenuContributor.cs | 0 .../MyProjectNameWebAutoMapperProfile.cs | 0 .../MyProjectNameWebModule.cs | 0 .../Pages/MyProjectName/_ViewImports.cshtml | 0 .../Properties/launchSettings.json | 0 ...panyName.MyProjectName.Application.Tests.csproj | 0 .../MyProjectNameApplicationTestModule.cs | 0 ...MyCompanyName.MyProjectName.Domain.Tests.csproj | 0 .../MyProjectName/MyProjectNameDomainTestBase.cs | 0 .../MyProjectName/MyProjectNameDomainTestModule.cs | 0 ....MyProjectName.EntityFrameworkCore.Tests.csproj | 0 .../MyEntityRepository_Tests.cs | 0 .../MyProjectNameEntityFrameworkCoreTestModule.cs | 0 ...yCompanyName.MyProjectName.MongoDB.Tests.csproj | 0 .../MongoDB/MyEntityRepository_Tests.cs | 0 .../MongoDB/MyProjectNameMongoDbTestModule.cs | 0 .../MyCompanyName.MyProjectName.TestBase.csproj | 0 .../MyProjectName/MyEntityRepository_Tests.cs | 0 .../MyProjectName/MyProjectNameTestBase.cs | 0 .../MyProjectName/MyProjectNameTestBaseModule.cs | 0 .../MyProjectName/MyProjectNameTestData.cs | 0 .../MyProjectName/MyProjectNameTestDataBuilder.cs | 0 301 files changed, 11 insertions(+), 8 deletions(-) rename templates/{module => mvc-module}/.gitattributes (100%) rename templates/{module => mvc-module}/.gitignore (98%) rename templates/{module => mvc-module}/MyCompanyName.MyProjectName.sln (100%) rename templates/{module => mvc-module}/MyCompanyName.MyProjectName.sln.DotSettings (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContext.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContextFactory.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.Designer.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Migrations/DemoAppDbContextModelSnapshot.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Pages/_ViewImports.cshtml (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Program.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Properties/launchSettings.json (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/Startup.cs (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/abp.resourcemapping.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/appsettings.json (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/gulpfile.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/package.json (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/core/abp.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/jquery/abp.jquery.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/css/bootstrap.css (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/js/bootstrap.bundle.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net/js/jquery.dataTables.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/css/font-awesome.css (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/FontAwesome.otf (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.eot (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.svg (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.ttf (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff2 (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-form/jquery.form.min.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/jquery.validate.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ar.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_az.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bg.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bn_BD.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ca.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_cs.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_da.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_de.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_el.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_AR.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_PE.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_et.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_eu.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fa.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fi.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ge.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_gl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_he.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hu.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hy_AM.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_id.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_is.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_it.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ja.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ka.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_kk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ko.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lt.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lv.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_mk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_my.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_nl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_no.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_BR.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_PT.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ro.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ru.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sd.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_si.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr_lat.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sv.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_th.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tj.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_uk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ur.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_vi.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh_TW.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_de.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_es_CL.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_fi.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_nl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_pt.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery/jquery.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/lodash/lodash.min.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/css/select2.min.css (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/af.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ar.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/az.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bg.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bs.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ca.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/cs.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/da.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/de.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/dsb.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/el.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/en.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/es.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/et.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/eu.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fa.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fi.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/gl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/he.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hi.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hsb.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hu.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hy.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/id.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/is.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/it.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ja.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/km.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ko.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lt.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lv.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/mk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ms.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nb.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ps.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt-BR.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ro.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ru.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr-Cyrl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sv.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/th.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/tr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/uk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/vi.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-CN.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-TW.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.full.min.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.min.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/sweetalert/sweetalert.min.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/jquery.timeago.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/README.md (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.af.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.am.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ar.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bg.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bs.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ca.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cs.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cy.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.da.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.dv.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.el.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.et.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.eu.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fi.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.gl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.he.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hu.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hy.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.id.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.is.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ja.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.jv.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ko.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ky.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lt.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lv.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.mk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.nl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.no.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ro.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rs.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ru.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rw.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.si.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sl.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sq.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sv.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.th.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr-short.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uk.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ur.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uz.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.vi.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-CN.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-TW.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.css (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.js.map (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.css (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.js (100%) rename templates/{module => mvc-module}/app/MyCompanyName.MyProjectName.DemoApp/yarn.lock (100%) rename templates/{module => mvc-module}/common.props (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/en.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/_ViewImports.cshtml (100%) rename templates/{module => mvc-module}/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName/MyProjectName/MyProjectNameApplicationTestModule.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestBase.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestModule.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBase.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBaseModule.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestData.cs (100%) rename templates/{module => mvc-module}/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestDataBuilder.cs (100%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index a1e69d14ca..9f4d20016a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -1,5 +1,4 @@ -using System; -using System.IO; +using System.IO; using System.Threading.Tasks; using Ionic.Zip; using Microsoft.Extensions.Logging; @@ -30,10 +29,14 @@ namespace Volo.Abp.Cli.Commands { Logger.LogWarning("Project name is missing."); Logger.LogWarning("Usage:"); - Logger.LogWarning(" abp new [-t ]"); + Logger.LogWarning(" abp new [-t|--template] [-d|--database-provider]"); + Logger.LogWarning(""); + Logger.LogWarning(""); + Logger.LogWarning(""); Logger.LogWarning("Examples:"); Logger.LogWarning(" abp new Acme.BookStore"); - Logger.LogWarning(" abp new Acme.BookStore mvc"); + Logger.LogWarning(" abp new Acme.BookStore -t mvc-module"); + Logger.LogWarning(" abp new Acme.BookStore -t mvc -d mongodb"); return; } @@ -84,7 +87,7 @@ namespace Volo.Abp.Cli.Commands public static class DatabaseProvider { public const string Short = "d"; - public const string Long = "databaseProvider"; + public const string Long = "database-provider"; } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs index d2831d32b0..f37c967b2f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs @@ -5,9 +5,9 @@ namespace Volo.Abp.ProjectBuilding.Templates public class MvcModuleTemplate : TemplateInfo { /// - /// "mvcmodule". + /// "mvc-module". /// - public const string TemplateName = "mvcmodule"; + public const string TemplateName = "mvc-module"; public MvcModuleTemplate() : base(TemplateName) diff --git a/templates/module/.gitattributes b/templates/mvc-module/.gitattributes similarity index 100% rename from templates/module/.gitattributes rename to templates/mvc-module/.gitattributes diff --git a/templates/module/.gitignore b/templates/mvc-module/.gitignore similarity index 98% rename from templates/module/.gitignore rename to templates/mvc-module/.gitignore index 1114901d9b..91ce692e99 100644 --- a/templates/module/.gitignore +++ b/templates/mvc-module/.gitignore @@ -252,4 +252,4 @@ paket-files/ *.sln.iml # MyProjectName -src/MyCompanyName.MyProjectName.Web/Logs/logs.txt +app/MyCompanyName.MyProjectName.DemoApp/Logs/logs.txt diff --git a/templates/module/MyCompanyName.MyProjectName.sln b/templates/mvc-module/MyCompanyName.MyProjectName.sln similarity index 100% rename from templates/module/MyCompanyName.MyProjectName.sln rename to templates/mvc-module/MyCompanyName.MyProjectName.sln diff --git a/templates/module/MyCompanyName.MyProjectName.sln.DotSettings b/templates/mvc-module/MyCompanyName.MyProjectName.sln.DotSettings similarity index 100% rename from templates/module/MyCompanyName.MyProjectName.sln.DotSettings rename to templates/mvc-module/MyCompanyName.MyProjectName.sln.DotSettings diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContext.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContext.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContext.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContext.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContextFactory.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContextFactory.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContextFactory.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppDbContextFactory.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.Designer.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.Designer.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.Designer.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.Designer.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/20190410095748_Initial.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/DemoAppDbContextModelSnapshot.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/DemoAppDbContextModelSnapshot.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/DemoAppDbContextModelSnapshot.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Migrations/DemoAppDbContextModelSnapshot.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/MyCompanyName.MyProjectName.DemoApp.csproj diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Pages/Index.cshtml.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Pages/_ViewImports.cshtml b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Pages/_ViewImports.cshtml similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Pages/_ViewImports.cshtml rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Pages/_ViewImports.cshtml diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Program.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Program.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Program.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Program.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Properties/launchSettings.json b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Properties/launchSettings.json similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Properties/launchSettings.json rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Properties/launchSettings.json diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/Startup.cs b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Startup.cs similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/Startup.cs rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/Startup.cs diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/abp.resourcemapping.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/abp.resourcemapping.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/abp.resourcemapping.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/abp.resourcemapping.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/appsettings.json b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/appsettings.json similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/appsettings.json rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/appsettings.json diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/gulpfile.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/gulpfile.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/gulpfile.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/gulpfile.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/package.json b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/package.json similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/package.json rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/package.json diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/core/abp.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/core/abp.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/core/abp.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/core/abp.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/jquery/abp.jquery.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/jquery/abp.jquery.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/jquery/abp.jquery.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/abp/jquery/abp.jquery.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/css/bootstrap.css b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/css/bootstrap.css similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/css/bootstrap.css rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/css/bootstrap.css diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/js/bootstrap.bundle.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/js/bootstrap.bundle.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/js/bootstrap.bundle.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/bootstrap/js/bootstrap.bundle.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net/js/jquery.dataTables.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net/js/jquery.dataTables.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net/js/jquery.dataTables.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/datatables.net/js/jquery.dataTables.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/css/font-awesome.css b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/css/font-awesome.css similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/css/font-awesome.css rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/css/font-awesome.css diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/FontAwesome.otf b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/FontAwesome.otf rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/FontAwesome.otf diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.eot b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.eot rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.eot diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.svg b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.svg rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.svg diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.ttf b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.ttf rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff2 b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff2 rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-form/jquery.form.min.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-form/jquery.form.min.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-form/jquery.form.min.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-form/jquery.form.min.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/jquery.validate.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/jquery.validate.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/jquery.validate.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/jquery.validate.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ar.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ar.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ar.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ar.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_az.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_az.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_az.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_az.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bg.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bg.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bg.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bg.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bn_BD.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bn_BD.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bn_BD.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_bn_BD.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ca.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ca.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ca.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ca.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_cs.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_cs.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_cs.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_cs.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_da.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_da.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_da.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_da.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_de.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_de.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_de.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_de.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_el.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_el.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_el.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_el.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_AR.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_AR.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_AR.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_AR.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_PE.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_PE.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_PE.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_es_PE.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_et.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_et.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_et.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_et.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_eu.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_eu.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_eu.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_eu.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fa.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fa.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fa.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fa.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fi.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fi.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fi.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fi.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_fr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ge.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ge.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ge.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ge.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_gl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_gl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_gl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_gl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_he.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_he.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_he.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_he.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hu.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hu.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hu.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hu.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hy_AM.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hy_AM.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hy_AM.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_hy_AM.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_id.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_id.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_id.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_id.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_is.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_is.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_is.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_is.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_it.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_it.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_it.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_it.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ja.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ja.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ja.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ja.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ka.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ka.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ka.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ka.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_kk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_kk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_kk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_kk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ko.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ko.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ko.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ko.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lt.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lt.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lt.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lt.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lv.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lv.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lv.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_lv.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_mk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_mk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_mk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_mk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_my.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_my.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_my.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_my.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_nl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_nl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_nl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_nl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_no.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_no.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_no.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_no.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_BR.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_BR.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_BR.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_BR.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_PT.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_PT.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_PT.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_pt_PT.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ro.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ro.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ro.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ro.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ru.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ru.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ru.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ru.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sd.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sd.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sd.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sd.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_si.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_si.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_si.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_si.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr_lat.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr_lat.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr_lat.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sr_lat.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sv.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sv.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sv.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_sv.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_th.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_th.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_th.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_th.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tj.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tj.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tj.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tj.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_tr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_uk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_uk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_uk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_uk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ur.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ur.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ur.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_ur.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_vi.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_vi.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_vi.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_vi.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh_TW.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh_TW.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh_TW.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/messages_zh_TW.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_de.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_de.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_de.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_de.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_es_CL.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_es_CL.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_es_CL.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_es_CL.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_fi.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_fi.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_fi.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_fi.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_nl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_nl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_nl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_nl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_pt.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_pt.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_pt.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery-validation/localization/methods_pt.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery/jquery.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery/jquery.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery/jquery.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/jquery/jquery.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/lodash/lodash.min.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/lodash/lodash.min.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/lodash/lodash.min.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/lodash/lodash.min.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/css/select2.min.css b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/css/select2.min.css similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/css/select2.min.css rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/css/select2.min.css diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/af.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/af.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/af.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/af.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ar.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ar.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ar.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ar.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/az.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/az.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/az.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/az.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bg.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bg.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bg.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bg.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bs.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bs.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bs.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/bs.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ca.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ca.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ca.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ca.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/cs.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/cs.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/cs.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/cs.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/da.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/da.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/da.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/da.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/de.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/de.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/de.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/de.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/dsb.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/dsb.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/dsb.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/dsb.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/el.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/el.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/el.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/el.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/en.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/en.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/en.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/en.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/es.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/es.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/es.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/es.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/et.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/et.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/et.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/et.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/eu.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/eu.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/eu.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/eu.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fa.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fa.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fa.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fa.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fi.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fi.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fi.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fi.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/fr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/gl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/gl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/gl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/gl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/he.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/he.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/he.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/he.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hi.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hi.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hi.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hi.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hsb.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hsb.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hsb.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hsb.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hu.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hu.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hu.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hu.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hy.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hy.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hy.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/hy.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/id.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/id.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/id.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/id.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/is.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/is.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/is.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/is.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/it.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/it.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/it.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/it.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ja.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ja.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ja.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ja.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/km.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/km.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/km.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/km.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ko.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ko.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ko.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ko.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lt.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lt.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lt.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lt.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lv.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lv.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lv.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/lv.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/mk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/mk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/mk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/mk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ms.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ms.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ms.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ms.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nb.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nb.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nb.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nb.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/nl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ps.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ps.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ps.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ps.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt-BR.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt-BR.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt-BR.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt-BR.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/pt.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ro.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ro.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ro.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ro.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ru.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ru.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ru.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/ru.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr-Cyrl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr-Cyrl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr-Cyrl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr-Cyrl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sv.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sv.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sv.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/sv.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/th.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/th.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/th.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/th.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/tr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/tr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/tr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/tr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/uk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/uk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/uk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/uk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/vi.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/vi.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/vi.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/vi.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-CN.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-CN.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-CN.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-CN.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-TW.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-TW.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-TW.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/i18n/zh-TW.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.full.min.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.full.min.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.full.min.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.full.min.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.min.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.min.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.min.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/select2/js/select2.min.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/sweetalert/sweetalert.min.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/sweetalert/sweetalert.min.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/sweetalert/sweetalert.min.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/sweetalert/sweetalert.min.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/jquery.timeago.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/jquery.timeago.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/jquery.timeago.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/jquery.timeago.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/README.md b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/README.md similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/README.md rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/README.md diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.af.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.af.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.af.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.af.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.am.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.am.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.am.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.am.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ar.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ar.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ar.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ar.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.az.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bg.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bg.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bg.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bg.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bs.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bs.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bs.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.bs.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ca.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ca.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ca.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ca.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cs.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cs.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cs.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cs.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cy.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cy.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cy.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.cy.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.da.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.da.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.da.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.da.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.de.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.dv.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.dv.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.dv.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.dv.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.el.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.el.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.el.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.el.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.en.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.es.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.et.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.et.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.et.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.et.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.eu.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.eu.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.eu.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.eu.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fa.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fi.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fi.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fi.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fi.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.fr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.gl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.gl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.gl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.gl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.he.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.he.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.he.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.he.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hu.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hu.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hu.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hu.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hy.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hy.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hy.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.hy.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.id.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.id.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.id.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.id.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.is.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.is.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.is.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.is.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.it.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ja.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ja.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ja.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ja.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.jv.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.jv.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.jv.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.jv.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ko.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ko.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ko.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ko.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ky.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ky.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ky.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ky.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lt.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lt.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lt.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lt.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lv.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lv.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lv.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.lv.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.mk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.mk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.mk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.mk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.nl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.nl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.nl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.nl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.no.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.no.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.no.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.no.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-br.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.pt.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ro.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ro.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ro.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ro.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rs.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rs.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rs.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rs.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ru.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ru.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ru.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ru.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rw.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rw.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rw.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.rw.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.si.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.si.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.si.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.si.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sl.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sl.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sl.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sl.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sq.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sq.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sq.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sq.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sv.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sv.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sv.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.sv.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.th.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.th.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.th.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.th.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr-short.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr-short.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr-short.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr-short.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.tr.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uk.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uk.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uk.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uk.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ur.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ur.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ur.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.ur.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uz.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uz.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uz.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.uz.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.vi.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.vi.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.vi.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.vi.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-CN.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-CN.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-CN.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-CN.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-TW.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-TW.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-TW.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/timeago/locales/jquery.timeago.zh-TW.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.css b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.css similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.css rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.css diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.js.map b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.js.map similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.js.map rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.js.map diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.css b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.css similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.css rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.css diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.js b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.js similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.js rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/wwwroot/libs/toastr/toastr.min.js diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/yarn.lock b/templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/yarn.lock similarity index 100% rename from templates/module/app/MyCompanyName.MyProjectName.DemoApp/yarn.lock rename to templates/mvc-module/app/MyCompanyName.MyProjectName.DemoApp/yarn.lock diff --git a/templates/module/common.props b/templates/mvc-module/common.props similarity index 100% rename from templates/module/common.props rename to templates/mvc-module/common.props diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/en.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/pt-BR.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/Localization/ApplicationContracts/zh-Hans.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissionDefinitionProvider.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName/MyProjectName/MyProjectNamePermissions.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationAutoMapperProfile.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettingDefinitionProvider.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameSettings.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/Localization/MyProjectNameResource.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainErrorCodes.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName/MyProjectName/MyProjectNameDomainSharedModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/en.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/pt-BR.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/Localization/Domain/zh-Hans.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameConsts.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Domain/MyCompanyName/MyProjectName/MyProjectNameDomainModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/IMyProjectNameDbContext.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContext.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName/MyProjectName/MyProjectNameHttpApiClientModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName/MyProjectName/MyProjectNameHttpApiModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName.MyProjectName.MongoDB.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/IMyProjectNameMongoDbContext.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContext.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbContextExtensions.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.MongoDB/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/en.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/en.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/en.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/en.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/pt-BR.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Localization/Resources/MyProjectName/zh-Hans.json diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/_ViewImports.cshtml b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/_ViewImports.cshtml similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/_ViewImports.cshtml rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/_ViewImports.cshtml diff --git a/templates/module/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json similarity index 100% rename from templates/module/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json diff --git a/templates/module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj rename to templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj diff --git a/templates/module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName/MyProjectName/MyProjectNameApplicationTestModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName/MyProjectName/MyProjectNameApplicationTestModule.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName/MyProjectName/MyProjectNameApplicationTestModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName/MyProjectName/MyProjectNameApplicationTestModule.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj rename to templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj diff --git a/templates/module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestBase.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestBase.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestBase.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestBase.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestModule.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName/MyProjectName/MyProjectNameDomainTestModule.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj rename to templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj diff --git a/templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyEntityRepository_Tests.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName/MyProjectName/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj rename to templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj diff --git a/templates/module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyEntityRepository_Tests.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName/MyProjectName/MongoDB/MyProjectNameMongoDbTestModule.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj diff --git a/templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyEntityRepository_Tests.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBase.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBase.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBase.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBase.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBaseModule.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBaseModule.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBaseModule.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestBaseModule.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestData.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestData.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestData.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestData.cs diff --git a/templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestDataBuilder.cs b/templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestDataBuilder.cs similarity index 100% rename from templates/module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestDataBuilder.cs rename to templates/mvc-module/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName/MyProjectName/MyProjectNameTestDataBuilder.cs From 915dec7bac41062b7c1545a60397e67ff9762d32 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 21:35:13 +0300 Subject: [PATCH 064/335] Enhance help for new command --- .../Volo/Abp/Cli/Commands/NewProjectCommand.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index 9f4d20016a..94a9181eb2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -28,10 +28,13 @@ namespace Volo.Abp.Cli.Commands if (commandLineArgs.Target == null) { Logger.LogWarning("Project name is missing."); + Logger.LogWarning(""); Logger.LogWarning("Usage:"); Logger.LogWarning(" abp new [-t|--template] [-d|--database-provider]"); Logger.LogWarning(""); - Logger.LogWarning(""); + Logger.LogWarning("Options:"); + Logger.LogWarning("-t|--template "); + Logger.LogWarning("-d|--database-provider "); Logger.LogWarning(""); Logger.LogWarning("Examples:"); Logger.LogWarning(" abp new Acme.BookStore"); From 189b97c6dcec5699b4ca8dfb983f46ec49053b27 Mon Sep 17 00:00:00 2001 From: maliming Date: Sun, 5 May 2019 12:07:21 +0800 Subject: [PATCH 065/335] fix #1090 Use the Repository Update method in the Update method of CrudAppService. --- .../Volo/Abp/Application/Services/AsyncCrudAppService.cs | 1 + .../Volo/Abp/Application/Services/CrudAppService.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs index 6e3b476b5c..bf769dc78b 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs @@ -106,6 +106,7 @@ namespace Volo.Abp.Application.Services //TODO: Check if input has id different than given id and normalize if it's default value, throw ex otherwise MapToEntity(input, entity); + await Repository.UpdateAsync(entity); await CurrentUnitOfWork.SaveChangesAsync(); return MapToEntityDto(entity); diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs index 1fd6f869ff..60017e918f 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs @@ -100,6 +100,7 @@ namespace Volo.Abp.Application.Services var entity = GetEntityById(id); MapToEntity(input, entity); + Repository.Update(entity); CurrentUnitOfWork.SaveChanges(); return MapToEntityDto(entity); From b5a58b4ad848e5639c814be19f448d8f2eababf9 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 5 May 2019 21:29:49 +0300 Subject: [PATCH 066/335] Fix mvc module path. --- build-all.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-all.ps1 b/build-all.ps1 index 8393efd9fb..b95051d6ff 100644 --- a/build-all.ps1 +++ b/build-all.ps1 @@ -20,7 +20,7 @@ $solutionPaths = ( "modules/background-jobs", "modules/client-simulation", "abp_io", - "templates/module", + "templates/mvc-module", "templates/service", "templates/mvc", "samples/MicroserviceDemo" From 3fc8f26e352ae2fa663b4e4af61fe256dd38a1ce Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 5 May 2019 21:40:48 +0300 Subject: [PATCH 067/335] Use autoSave option instead of manually calling CurrentUnitOfWork.SaveChanges. --- .../Volo/Abp/Application/Services/AsyncCrudAppService.cs | 9 ++------- .../Volo/Abp/Application/Services/CrudAppService.cs | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs index bf769dc78b..3d633931b3 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs @@ -90,9 +90,7 @@ namespace Volo.Abp.Application.Services await CheckCreatePolicyAsync(); var entity = MapToEntity(input); - - await Repository.InsertAsync(entity); - await CurrentUnitOfWork.SaveChangesAsync(); + await Repository.InsertAsync(entity, autoSave: true); return MapToEntityDto(entity); } @@ -102,12 +100,9 @@ namespace Volo.Abp.Application.Services await CheckUpdatePolicyAsync(); var entity = await GetEntityByIdAsync(id); - //TODO: Check if input has id different than given id and normalize if it's default value, throw ex otherwise - MapToEntity(input, entity); - await Repository.UpdateAsync(entity); - await CurrentUnitOfWork.SaveChangesAsync(); + await Repository.UpdateAsync(entity, autoSave: true); return MapToEntityDto(entity); } diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs index 60017e918f..2750d699a4 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs @@ -86,9 +86,7 @@ namespace Volo.Abp.Application.Services CheckCreatePolicy(); var entity = MapToEntity(input); - - Repository.Insert(entity); - CurrentUnitOfWork.SaveChanges(); + Repository.Insert(entity, autoSave: true); return MapToEntityDto(entity); } @@ -98,10 +96,8 @@ namespace Volo.Abp.Application.Services CheckUpdatePolicy(); var entity = GetEntityById(id); - MapToEntity(input, entity); - Repository.Update(entity); - CurrentUnitOfWork.SaveChanges(); + Repository.Update(entity, autoSave: true); return MapToEntityDto(entity); } From cce3b8e2baca2b9b08295b75025ff9c1620af034 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 6 May 2019 14:13:59 +0800 Subject: [PATCH 068/335] The New command adds the output folder parameters. --- .../Abp/Cli/Commands/NewProjectCommand.cs | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index 94a9181eb2..3f274d69cb 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using System.Threading.Tasks; using Ionic.Zip; using Microsoft.Extensions.Logging; @@ -30,16 +30,18 @@ namespace Volo.Abp.Cli.Commands Logger.LogWarning("Project name is missing."); Logger.LogWarning(""); Logger.LogWarning("Usage:"); - Logger.LogWarning(" abp new [-t|--template] [-d|--database-provider]"); + Logger.LogWarning(" abp new [-t|--template] [-d|--database-provider] [-o|--output-folder]"); Logger.LogWarning(""); Logger.LogWarning("Options:"); Logger.LogWarning("-t|--template "); Logger.LogWarning("-d|--database-provider "); + Logger.LogWarning("-o|--output-folder "); Logger.LogWarning(""); Logger.LogWarning("Examples:"); Logger.LogWarning(" abp new Acme.BookStore"); Logger.LogWarning(" abp new Acme.BookStore -t mvc-module"); Logger.LogWarning(" abp new Acme.BookStore -t mvc -d mongodb"); + Logger.LogWarning(" abp new Acme.BookStore -t mvc -d mongodb -o d:\\project"); return; } @@ -54,15 +56,31 @@ namespace Volo.Abp.Cli.Commands ) ); + var outputFolder = commandLineArgs.Options.GetOrNull(Options.OutputFolder.Short, Options.OutputFolder.Long); + if (outputFolder != null) + { + if (!Directory.Exists(outputFolder)) + { + Directory.CreateDirectory(outputFolder); + } + + outputFolder = Path.GetFullPath(outputFolder); + } + else + { + outputFolder = Directory.GetCurrentDirectory(); + } + using (var templateFileStream = new MemoryStream(result.ZipContent)) { using (var templateZipFile = ZipFile.Read(templateFileStream)) { - templateZipFile.ExtractAll(Directory.GetCurrentDirectory(), ExtractExistingFileAction.Throw); + templateZipFile.ExtractAll(outputFolder, ExtractExistingFileAction.Throw); } } Logger.LogInformation($"Successfully created the project '{commandLineArgs.Target}'"); + Logger.LogInformation($"The output folder is: '{outputFolder}'"); } protected virtual DatabaseProvider GetDatabaseProviderOrNull(CommandLineArgs commandLineArgs) @@ -92,6 +110,12 @@ namespace Volo.Abp.Cli.Commands public const string Short = "d"; public const string Long = "database-provider"; } + + public static class OutputFolder + { + public const string Short = "o"; + public const string Long = "output-folder"; + } } } } \ No newline at end of file From ccc89803a1a1529376c496e277bd07ff6ecd4be5 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 6 May 2019 12:12:28 +0300 Subject: [PATCH 069/335] Added Add module command --- .../Volo/Abp/Cli/Commands/AddCommand.cs | 55 +++++++ .../Volo/Abp/Cli/Commands/AddCommandHelper.cs | 27 ++++ .../Volo/Abp/Cli/Commands/CommandSelector.cs | 10 +- .../{MainHelpCommand.cs => HelpCommand.cs} | 2 +- .../Abp/Cli/Commands/NewProjectCommand.cs | 8 +- .../Abp/ProjectModification/AddModuleArgs.cs | 26 ++++ .../Abp/ProjectModification/ModuleAdder.cs | 137 ++++++++++++++++++ .../ProjectModification/ProjectModuleAdder.cs | 13 ++ .../SolutionModuleAdder.cs | 13 ++ .../Volo/Abp/Modularity/IAbpModule.cs | 4 +- 10 files changed, 284 insertions(+), 11 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommand.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommandHelper.cs rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/{MainHelpCommand.cs => HelpCommand.cs} (87%) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AddModuleArgs.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectModuleAdder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommand.cs new file mode 100644 index 0000000000..e5034725ba --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommand.cs @@ -0,0 +1,55 @@ +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using System.Threading.Tasks; +using Volo.Abp.Cli.Args; +using Volo.Abp.DependencyInjection; +using Volo.Abp.ProjectModification; + +namespace Volo.Abp.Cli.Commands +{ + public class AddCommand : IConsoleCommand, ITransientDependency + { + public ILogger Logger { get; set; } + + protected ModuleAdder ModuleAdder { get; } + + public AddCommand(ModuleAdder moduleAdder) + { + ModuleAdder = moduleAdder; + Logger = NullLogger.Instance; + } + + public async Task ExecuteAsync(CommandLineArgs commandLineArgs) + { + if (commandLineArgs.Target == null) + { + Logger.LogWarning("Module name is missing."); + AddCommandHelper.WriteUsage(Logger); + return; + } + + await ModuleAdder.AddModuleAsync( + new AddModuleArgs( + commandLineArgs.Target, + commandLineArgs.Options.GetOrNull(Options.Solution.Short, Options.Solution.Long), + commandLineArgs.Options.GetOrNull(Options.Project.Short, Options.Project.Long) + ) + ); + } + + public static class Options + { + public static class Solution + { + public const string Short = "s"; + public const string Long = "solution"; + } + + public static class Project + { + public const string Short = "p"; + public const string Long = "project"; + } + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommandHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommandHelper.cs new file mode 100644 index 0000000000..0704ecdbf3 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommandHelper.cs @@ -0,0 +1,27 @@ +using Microsoft.Extensions.Logging; + +namespace Volo.Abp.Cli.Commands +{ + public static class AddCommandHelper + { + public static void WriteUsage(ILogger logger) + { + logger.LogWarning(""); + logger.LogWarning("'add' command is used to add a module to a solution or to a project."); + logger.LogWarning("Use in a solution folder to add a multi-package module to a solution."); + logger.LogWarning("Use in a project folder to add a single-package module to a project."); + logger.LogWarning(""); + logger.LogWarning("Usage:"); + logger.LogWarning(" abp add [-s|--solution] [-p|--project]"); + logger.LogWarning(""); + logger.LogWarning("Options:"); + logger.LogWarning(" -s|--solution Specify solution file explicitly."); + logger.LogWarning(" -p|--project Specify project file explicitly."); + logger.LogWarning(""); + logger.LogWarning("Examples:"); + logger.LogWarning(" abp add Volo.Abp.TenantManagement Adds tenant management module packages to the solution."); + logger.LogWarning(" abp add Volo.Abp.FluentValidation Adds a single module package to the project."); + logger.LogWarning(""); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs index 32268540a7..9bcc5ed859 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs @@ -9,14 +9,18 @@ namespace Volo.Abp.Cli.Commands public Type Select(CommandLineArgs commandLineArgs) { //TODO: Create options to define commands - //TODO: Get from dependency injection instead of new? if (commandLineArgs.Command == "new") { - return typeof(NewProjectCommand); + return typeof(NewCommand); } - return typeof(MainHelpCommand); + if (commandLineArgs.Command == "add") + { + return typeof(AddCommand); + } + + return typeof(HelpCommand); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs similarity index 87% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs index 96f7132934..fdad2a445e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs @@ -5,7 +5,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.Commands { - public class MainHelpCommand : IConsoleCommand, ITransientDependency + public class HelpCommand : IConsoleCommand, ITransientDependency { public Task ExecuteAsync(CommandLineArgs commandLineArgs) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index 3f274d69cb..c4ab4f6216 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -10,17 +10,17 @@ using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.Cli.Commands { - public class NewProjectCommand : IConsoleCommand, ITransientDependency + public class NewCommand : IConsoleCommand, ITransientDependency { - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } protected ProjectBuilder ProjectBuilder { get; } - public NewProjectCommand(ProjectBuilder projectBuilder) + public NewCommand(ProjectBuilder projectBuilder) { ProjectBuilder = projectBuilder; - Logger = NullLogger.Instance; + Logger = NullLogger.Instance; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AddModuleArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AddModuleArgs.cs new file mode 100644 index 0000000000..eba87227f3 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AddModuleArgs.cs @@ -0,0 +1,26 @@ +using JetBrains.Annotations; + +namespace Volo.Abp.ProjectModification +{ + public class AddModuleArgs + { + [NotNull] + public string ModuleName { get; set; } + + [CanBeNull] + public string SolutionFile { get; set; } + + [CanBeNull] + public string ProjectFile { get; set; } + + public AddModuleArgs( + [NotNull] string moduleName, + [CanBeNull] string solutionFile = null, + [CanBeNull] string projectFile = null) + { + ModuleName = Check.NotNullOrWhiteSpace(moduleName, nameof(moduleName)); + SolutionFile = solutionFile; + ProjectFile = projectFile; + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs new file mode 100644 index 0000000000..6b5017f882 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs @@ -0,0 +1,137 @@ +using JetBrains.Annotations; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Volo.Abp.Cli.Commands; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.ProjectModification +{ + public class ModuleAdder : ITransientDependency + { + public ILogger Logger { get; set; } + + protected ProjectModuleAdder ProjectModuleAdder { get; } + protected SolutionModuleAdder SolutionModuleAdder { get; } + + public ModuleAdder(ProjectModuleAdder projectModuleAdder, SolutionModuleAdder solutionModuleAdder) + { + ProjectModuleAdder = projectModuleAdder; + SolutionModuleAdder = solutionModuleAdder; + + Logger = NullLogger.Instance; + } + + public async Task AddModuleAsync(AddModuleArgs args) + { + ValidateArgs(args); + NormalizeArgs(args); + + if (args.ProjectFile.IsNullOrEmpty() && args.SolutionFile.IsNullOrEmpty()) + { + if (!TryToFillProjectOrSolutionName(args)) + { + Logger.LogWarning("Could not find any project (.csproj) or solution (.sln) file in the current directory!"); + AddCommandHelper.WriteUsage(Logger); + return; + } + } + + if (!args.ProjectFile.IsNullOrEmpty()) + { + await ProjectModuleAdder.AddAsync(args.ProjectFile, args.ModuleName); + } + + if (!args.SolutionFile.IsNullOrEmpty()) + { + await SolutionModuleAdder.AddAsync(args.SolutionFile, args.ModuleName); + } + } + + private bool TryToFillProjectOrSolutionName(AddModuleArgs args) + { + var projectFiles = FindFiles(Directory.GetCurrentDirectory(), ".csproj"); + if (projectFiles.Count == 1) + { + args.ProjectFile = projectFiles.First(); + return true; + } + + if (projectFiles.Count > 1) + { + Logger.LogWarning( + "There are multiple project (.csproj) files in the current directory. Please specify one of the files below:"); + foreach (var projectFile in projectFiles) + { + Logger.LogWarning("* " + projectFile); + } + + Logger.LogWarning("Example:"); + Logger.LogWarning($"abp add {args.ModuleName} -p {projectFiles[0]}"); + return false; + } + + var solutionFiles = FindFiles(Directory.GetCurrentDirectory(), ".sln"); + if (solutionFiles.Count == 1) + { + args.SolutionFile = solutionFiles.First(); + return true; + } + + if (solutionFiles.Count > 1) + { + Logger.LogWarning( + "There are multiple solution (.sln) files in the current directory. Please specify one of the files below:"); + foreach (var solutionFile in solutionFiles) + { + Logger.LogWarning("* " + solutionFile); + } + + Logger.LogWarning("Example:"); + Logger.LogWarning($"abp add {args.ModuleName} -s {solutionFiles[0]}"); + } + + return false; + } + + private void ValidateArgs(AddModuleArgs args) + { + if (!args.ProjectFile.IsNullOrEmpty() && + !args.SolutionFile.IsNullOrEmpty()) + { + throw new ArgumentException("Can not specify a solution name and project name together."); + } + } + + private void NormalizeArgs(AddModuleArgs args) + { + args.ProjectFile = NormalizePath(args.ProjectFile); + args.SolutionFile = NormalizePath(args.SolutionFile); + } + + private static string NormalizePath([CanBeNull] string path) + { + if (string.IsNullOrEmpty(path)) + { + return path; + } + + if (Path.IsPathRooted(path)) + { + return path; + } + + return Path.Combine(Directory.GetCurrentDirectory(), path); + } + + + private List FindFiles(string directory, string fileExtension) + { + throw new NotImplementedException(); + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectModuleAdder.cs new file mode 100644 index 0000000000..1960da10a5 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectModuleAdder.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.ProjectModification +{ + public class ProjectModuleAdder : ITransientDependency + { + public async Task AddAsync(string projectFile, string moduleName) + { + + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs new file mode 100644 index 0000000000..c78099210c --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.ProjectModification +{ + public class SolutionModuleAdder : ITransientDependency + { + public async Task AddAsync(string solutionFile, string moduleName) + { + + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs index b58fdc8eed..32c8980c54 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs @@ -1,6 +1,4 @@ -using JetBrains.Annotations; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; +using Volo.Abp.DependencyInjection; namespace Volo.Abp.Modularity { From b74d703c0365bcc28d7a2d6fc846f768b51c971a Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 6 May 2019 12:27:16 +0300 Subject: [PATCH 070/335] Created empty login/logout commands and CliOptions. --- .../Volo.Abp.Cli.Core.csproj | 6 ++++ .../Volo/Abp/Cli/AbpCliCoreModule.cs | 10 ++++++ .../Volo/Abp/Cli/Args/CommandLineArgs.cs | 8 ++++- .../Volo/Abp/Cli/Auth/AuthService.cs | 18 +++++++++++ .../Volo/Abp/Cli/CliOptions.cs | 15 +++++++++ .../Volo/Abp/Cli/Commands/CommandSelector.cs | 24 +++++++------- .../Volo/Abp/Cli/Commands/LoginCommand.cs | 31 +++++++++++++++++++ .../Volo/Abp/Cli/Commands/LogoutCommand.cs | 27 ++++++++++++++++ 8 files changed, 125 insertions(+), 14 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LogoutCommand.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj index 07a488123c..df4d76cce5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj +++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj @@ -24,4 +24,10 @@ + + + C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.SqlXml.dll + + + \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index 555fe14ca4..eaa7aa0175 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -1,4 +1,5 @@ using System.Text; +using Volo.Abp.Cli.Commands; using Volo.Abp.Domain; using Volo.Abp.Json; using Volo.Abp.Modularity; @@ -14,6 +15,15 @@ namespace Volo.Abp.Cli public override void ConfigureServices(ServiceConfigurationContext context) { Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + + Configure(options => + { + options.Commands["help"] = typeof(HelpCommand); + options.Commands["new"] = typeof(NewCommand); + options.Commands["add"] = typeof(AddCommand); + options.Commands["login"] = typeof(LoginCommand); + options.Commands["logout"] = typeof(LogoutCommand); + }); } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs index 624c96afe5..5e1191c385 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using System.Text; using JetBrains.Annotations; @@ -27,6 +28,11 @@ namespace Volo.Abp.Cli.Args return new CommandLineArgs(); } + public bool IsCommand(string command) + { + return string.Equals(Command, command, StringComparison.OrdinalIgnoreCase); + } + public override string ToString() { var sb = new StringBuilder(); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs new file mode 100644 index 0000000000..692e699e75 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs @@ -0,0 +1,18 @@ +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli.Auth +{ + public class AuthService : ITransientDependency + { + public async Task LoginAsync(string userName, string password) + { + + } + + public async Task LogoutAsync() + { + + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs new file mode 100644 index 0000000000..3885314e70 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +namespace Volo.Abp.Cli +{ + public class CliOptions + { + public Dictionary Commands { get; } + + public CliOptions() + { + Commands = new Dictionary(StringComparer.OrdinalIgnoreCase); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs index 9bcc5ed859..d3d3d7c736 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using Microsoft.Extensions.Options; using Volo.Abp.Cli.Args; using Volo.Abp.DependencyInjection; @@ -6,21 +8,17 @@ namespace Volo.Abp.Cli.Commands { public class CommandSelector : ICommandSelector, ITransientDependency { - public Type Select(CommandLineArgs commandLineArgs) - { - //TODO: Create options to define commands + protected CliOptions Options { get; } - if (commandLineArgs.Command == "new") - { - return typeof(NewCommand); - } - - if (commandLineArgs.Command == "add") - { - return typeof(AddCommand); - } + public CommandSelector(IOptions options) + { + Options = options.Value; + } - return typeof(HelpCommand); + public Type Select(CommandLineArgs commandLineArgs) + { + return Options.Commands.GetOrDefault(commandLineArgs.Command) + ?? typeof(HelpCommand); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs new file mode 100644 index 0000000000..e1a215b201 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs @@ -0,0 +1,31 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.Auth; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli.Commands +{ + public class LoginCommand : IConsoleCommand, ITransientDependency + { + public ILogger Logger { get; set; } + + protected AuthService AuthService { get; } + + public LoginCommand(AuthService authService) + { + AuthService = authService; + Logger = NullLogger.Instance; + } + + public async Task ExecuteAsync(CommandLineArgs commandLineArgs) + { + if (commandLineArgs.Target.IsNullOrEmpty()) + { + + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LogoutCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LogoutCommand.cs new file mode 100644 index 0000000000..342e52f529 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LogoutCommand.cs @@ -0,0 +1,27 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.Auth; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli.Commands +{ + public class LogoutCommand : IConsoleCommand, ITransientDependency + { + public ILogger Logger { get; set; } + + protected AuthService AuthService { get; } + + public LogoutCommand(AuthService authService) + { + AuthService = authService; + Logger = NullLogger.Instance; + } + + public Task ExecuteAsync(CommandLineArgs commandLineArgs) + { + return AuthService.LogoutAsync(); + } + } +} \ No newline at end of file From 09298d4d9aec515eac88ca30f56cb56793ad3e0a Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 6 May 2019 15:09:50 +0300 Subject: [PATCH 071/335] Redesign IdentityModelAuthenticationService --- ...delRemoteServiceHttpClientAuthenticator.cs | 9 +-- .../IIdentityModelAuthenticationService.cs | 17 +++++ .../IIdentityModelHttpClientAuthenticator.cs | 9 --- .../IdentityClientConfiguration.cs | 4 ++ ... => IdentityModelAuthenticationService.cs} | 71 +++++++++++-------- ...ntityModelHttpClientAuthenticateContext.cs | 25 ------- ...yModelHttpClientAuthenticatorExtensions.cs | 27 ------- 7 files changed, 67 insertions(+), 95 deletions(-) create mode 100644 framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelAuthenticationService.cs delete mode 100644 framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs rename framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/{IdentityModelRemoteServiceHttpClientAuthenticator.cs => IdentityModelAuthenticationService.cs} (55%) delete mode 100644 framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs delete mode 100644 framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs index e7b41784c7..91d1c4cb9b 100644 --- a/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs +++ b/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs @@ -13,11 +13,12 @@ namespace Volo.Abp.Http.Client.IdentityModel { public IHttpContextAccessor HttpContextAccessor { get; set; } - protected IIdentityModelHttpClientAuthenticator IdentityModelHttpClientAuthenticator { get; } + protected IIdentityModelAuthenticationService IdentityModelAuthenticationService { get; } - public IdentityModelRemoteServiceHttpClientAuthenticator(IIdentityModelHttpClientAuthenticator identityModelHttpClientAuthenticator) + public IdentityModelRemoteServiceHttpClientAuthenticator( + IIdentityModelAuthenticationService identityModelAuthenticationService) { - IdentityModelHttpClientAuthenticator = identityModelHttpClientAuthenticator; + IdentityModelAuthenticationService = identityModelAuthenticationService; } public async Task Authenticate(RemoteServiceHttpClientAuthenticateContext context) @@ -32,7 +33,7 @@ namespace Volo.Abp.Http.Client.IdentityModel } } - await IdentityModelHttpClientAuthenticator.AuthenticateAsync( + await IdentityModelAuthenticationService.TryAuthenticateAsync( context.Client, context.RemoteService.GetIdentityClient() ); diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelAuthenticationService.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelAuthenticationService.cs new file mode 100644 index 0000000000..4acfac2ad7 --- /dev/null +++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelAuthenticationService.cs @@ -0,0 +1,17 @@ +using System.Net.Http; +using System.Threading.Tasks; +using JetBrains.Annotations; + +namespace Volo.Abp.IdentityModel +{ + //TODO: Re-consider this interface! + public interface IIdentityModelAuthenticationService + { + Task TryAuthenticateAsync( + [NotNull] HttpClient client, + string identityClientName = null); + + Task GetAccessTokenAsync( + IdentityClientConfiguration configuration); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs deleted file mode 100644 index 09a16735ff..0000000000 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IIdentityModelHttpClientAuthenticator.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.IdentityModel -{ - public interface IIdentityModelHttpClientAuthenticator - { - Task AuthenticateAsync(IdentityModelHttpClientAuthenticateContext context); - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs index 9e891ccafa..35ca881f7f 100644 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs +++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs @@ -77,12 +77,16 @@ namespace Volo.Abp.IdentityModel } public IdentityClientConfiguration( + string authority, + string scope, string clientId, string clientSecret, string grantType = OidcConstants.GrantTypes.ClientCredentials, string userName = null, string userPassword = null) { + this[nameof(Authority)] = authority; + this[nameof(Scope)] = scope; this[nameof(ClientId)] = clientId; this[nameof(ClientSecret)] = clientSecret; this[nameof(GrantType)] = grantType; diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs similarity index 55% rename from framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs rename to framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs index ad956aee1e..4f316ec357 100644 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs +++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs @@ -1,78 +1,89 @@ -using System; -using System.Collections.Generic; -using System.Net.Http.Headers; -using System.Threading.Tasks; -using IdentityModel; +using IdentityModel; using IdentityModel.Client; +using JetBrains.Annotations; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; +using System; +using System.Collections.Generic; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Threading.Tasks; using Volo.Abp.DependencyInjection; namespace Volo.Abp.IdentityModel { [Dependency(ReplaceServices = true)] - public class IdentityModelHttpClientAuthenticator : IIdentityModelHttpClientAuthenticator, ITransientDependency + public class IdentityModelAuthenticationService : IIdentityModelAuthenticationService, ITransientDependency { - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } protected IdentityClientOptions ClientOptions { get; } - - public IdentityModelHttpClientAuthenticator( + + public IdentityModelAuthenticationService( IOptions options) { ClientOptions = options.Value; - Logger = NullLogger.Instance; + Logger = NullLogger.Instance; } - public async Task AuthenticateAsync(IdentityModelHttpClientAuthenticateContext context) + public async Task TryAuthenticateAsync( + [NotNull] HttpClient client, + string identityClientName = null) { - var accessToken = await GetAccessTokenFromServerOrNullAsync(context); - - if (accessToken != null) + var accessToken = await GetAccessTokenOrNullAsync(identityClientName); + if (accessToken == null) { - //TODO: "Bearer" should be configurable - context.Client.DefaultRequestHeaders.Authorization - = new AuthenticationHeaderValue("Bearer", accessToken); + return false; } - } - protected virtual async Task GetAccessTokenFromServerOrNullAsync(IdentityModelHttpClientAuthenticateContext context) - { - //TODO: Better logging + SetAccessToken(client, accessToken); + return true; - var configuration = GetClientConfiguration(context); + } + protected virtual async Task GetAccessTokenOrNullAsync(string identityClientName) + { + var configuration = GetClientConfiguration(identityClientName); if (configuration == null) { - Logger.LogWarning($"Could not find {nameof(IdentityClientConfiguration)} for {context.IdentityClientName}. Either define a configuration for {context.IdentityClientName} or set a default configuration."); + Logger.LogWarning($"Could not find {nameof(IdentityClientConfiguration)} for {identityClientName}. Either define a configuration for {identityClientName} or set a default configuration."); return null; } + return await GetAccessTokenAsync(configuration); + } + + public virtual async Task GetAccessTokenAsync(IdentityClientConfiguration configuration) + { var discoveryResponse = await GetDiscoveryResponse(configuration); if (discoveryResponse.IsError) { - Logger.LogError($"Could not retrieve the OpenId Connect discovery document! ErrorType: {discoveryResponse.ErrorType}. Error: {discoveryResponse.Error}"); - return null; + throw new AbpException($"Could not retrieve the OpenId Connect discovery document! ErrorType: {discoveryResponse.ErrorType}. Error: {discoveryResponse.Error}"); } var tokenResponse = await GetTokenResponse(discoveryResponse, configuration); if (tokenResponse.IsError) { - Logger.LogError($"Could not get token from the OpenId Connect server! ErrorType: {tokenResponse.ErrorType}. Error: {tokenResponse.Error}. ErrorDescription: {tokenResponse.ErrorDescription}. HttpStatusCode: {tokenResponse.HttpStatusCode}"); - return null; + throw new AbpException($"Could not get token from the OpenId Connect server! ErrorType: {tokenResponse.ErrorType}. Error: {tokenResponse.Error}. ErrorDescription: {tokenResponse.ErrorDescription}. HttpStatusCode: {tokenResponse.HttpStatusCode}"); } return tokenResponse.AccessToken; } - private IdentityClientConfiguration GetClientConfiguration(IdentityModelHttpClientAuthenticateContext context) + protected virtual void SetAccessToken(HttpClient client, string accessToken) + { + //TODO: "Bearer" should be configurable + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken); + } + + private IdentityClientConfiguration GetClientConfiguration(string identityClientName = null) { - if (context.IdentityClientName.IsNullOrEmpty()) + if (identityClientName.IsNullOrEmpty()) { return ClientOptions.IdentityClients.Default; } - return ClientOptions.IdentityClients.GetOrDefault(context.IdentityClientName) ?? + return ClientOptions.IdentityClients.GetOrDefault(identityClientName) ?? ClientOptions.IdentityClients.Default; } diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs deleted file mode 100644 index 441129aee7..0000000000 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticateContext.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Net.Http; -using JetBrains.Annotations; - -namespace Volo.Abp.IdentityModel -{ - public class IdentityModelHttpClientAuthenticateContext - { - public HttpClient Client { get; } - - /// - /// The identity client name configured with the . - /// - public string IdentityClientName { get; } - - /// object to be authenticated - /// The identity client name configured with the . - public IdentityModelHttpClientAuthenticateContext( - [NotNull] HttpClient client, - string identityClientName = null) - { - Client = Check.NotNull(client, nameof(client)); - IdentityClientName = identityClientName; - } - } -} diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs deleted file mode 100644 index c40b0d8398..0000000000 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelHttpClientAuthenticatorExtensions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Net.Http; -using System.Threading.Tasks; -using JetBrains.Annotations; - -namespace Volo.Abp.IdentityModel -{ - public static class IdentityModelHttpClientAuthenticatorExtensions - { - /// Authenticator object - /// object to be authenticated - /// The identity client name configured with the . - public static Task AuthenticateAsync( - [NotNull] this IIdentityModelHttpClientAuthenticator authenticator, - [NotNull] HttpClient client, - string identityClientName = null) - { - Check.NotNull(authenticator, nameof(authenticator)); - - return authenticator.AuthenticateAsync( - new IdentityModelHttpClientAuthenticateContext( - client, - identityClientName - ) - ); - } - } -} From 6d2d52095cbcbb97cddaa26bdd2a902504a1c449 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 6 May 2019 15:10:10 +0300 Subject: [PATCH 072/335] Implemented login --- .../Volo.Abp.Cli.Core.csproj | 1 + .../Volo/Abp/Cli/AbpCliCoreModule.cs | 4 ++- .../Volo/Abp/Cli/Auth/AuthService.cs | 31 ++++++++++++++++-- .../Volo/Abp/Cli/CliPaths.cs | 6 ++-- .../Volo/Abp/Cli/Commands/LoginCommand.cs | 32 +++++++++++++++++-- .../{NewProjectCommand.cs => NewCommand.cs} | 0 .../Volo/Abp/Cli/Utils/ConsoleHelper.cs | 26 +++++++++++++++ .../Abp/ProjectBuilding/AbpIoTemplateStore.cs | 2 +- .../Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs | 5 ++- .../src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs | 2 +- 10 files changed, 97 insertions(+), 12 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/{NewProjectCommand.cs => NewCommand.cs} (100%) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ConsoleHelper.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj index df4d76cce5..41cb647649 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj +++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj @@ -21,6 +21,7 @@ + diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index eaa7aa0175..2dd39cdfce 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -1,6 +1,7 @@ using System.Text; using Volo.Abp.Cli.Commands; using Volo.Abp.Domain; +using Volo.Abp.IdentityModel; using Volo.Abp.Json; using Volo.Abp.Modularity; @@ -8,7 +9,8 @@ namespace Volo.Abp.Cli { [DependsOn( typeof(AbpDddDomainModule), - typeof(AbpJsonModule) + typeof(AbpJsonModule), + typeof(AbpIdentityModelModule) )] public class AbpCliCoreModule : AbpModule { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs index 692e699e75..68dfc52cf9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs @@ -1,18 +1,43 @@ -using System.Threading.Tasks; +using System.IO; +using System.Text; +using System.Threading.Tasks; +using IdentityModel; using Volo.Abp.DependencyInjection; +using Volo.Abp.IdentityModel; +using Volo.Abp.IO; namespace Volo.Abp.Cli.Auth { public class AuthService : ITransientDependency { + protected IIdentityModelAuthenticationService AuthenticationService { get; } + + public AuthService(IIdentityModelAuthenticationService authenticationService) + { + AuthenticationService = authenticationService; + } + public async Task LoginAsync(string userName, string password) { + var accessToken = await AuthenticationService.GetAccessTokenAsync( + new IdentityClientConfiguration( + "https://localhost:44333", //TODO: Configure + "role email abpio_www", + "abp-cli", + "1q2w3e*", + OidcConstants.GrantTypes.Password, + userName, + password + ) + ); + File.WriteAllText(CliPaths.AccessToken, accessToken, Encoding.UTF8); } - public async Task LogoutAsync() + public Task LogoutAsync() { - + FileHelper.DeleteIfExists(CliPaths.AccessToken); + return Task.CompletedTask; } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs index b0296671b3..9c3f5a458c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs @@ -5,8 +5,10 @@ namespace Volo.Abp.Cli { public static class CliPaths { - public static string TemplateCachePath => Path.Combine(AbpRootPath, "templates"); - public static string CliLogPath => Path.Combine(AbpRootPath, "cli", "logs"); + public static string TemplateCache => Path.Combine(AbpRootPath, "templates"); //TODO: Move somewhere else? + public static string Log => Path.Combine(AbpRootPath, "cli", "logs"); + public static string Root => Path.Combine(AbpRootPath, "cli"); + public static string AccessToken => Path.Combine(AbpRootPath, "cli", "access-token.bin"); private static readonly string AbpRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".abp"); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs index e1a215b201..b0c96a7297 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs @@ -1,9 +1,10 @@ -using System; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using System; +using System.Threading.Tasks; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Auth; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.Commands @@ -24,8 +25,33 @@ namespace Volo.Abp.Cli.Commands { if (commandLineArgs.Target.IsNullOrEmpty()) { + Logger.LogWarning("Username is missing."); + LogHelp(); + return; + } + Console.Write("Password: "); + var password = ConsoleHelper.ReadSecret(); + if (password.IsNullOrWhiteSpace()) + { + Logger.LogWarning("Password is missing."); + LogHelp(); + return; } + + await AuthService.LoginAsync(commandLineArgs.Target, password); + + Console.WriteLine($"Successfully logged in as '{commandLineArgs.Target}'"); + } + + private void LogHelp() + { + Logger.LogWarning(""); + Logger.LogWarning("Usage:"); + Logger.LogWarning(" abp login "); + Logger.LogWarning(""); + Logger.LogWarning("Example:"); + Logger.LogWarning(" abp login john"); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs similarity index 100% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ConsoleHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ConsoleHelper.cs new file mode 100644 index 0000000000..6e05e118d1 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ConsoleHelper.cs @@ -0,0 +1,26 @@ +using System; +using System.Text; + +namespace Volo.Abp.Cli.Utils +{ + public static class ConsoleHelper + { + public static string ReadSecret() + { + var sb = new StringBuilder(); + + while (true) + { + var keyInfo = Console.ReadKey(true); + if (keyInfo.Key == ConsoleKey.Enter) + { + break; + } + + sb.Append(keyInfo.KeyChar); + } + + return sb.ToString(); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs index 6f3956f604..4715d3558e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.ProjectBuilding public async Task GetAsync(string templateName, string version) { - var localCacheFolder = Path.Combine(CliPaths.TemplateCachePath, version); + var localCacheFolder = Path.Combine(CliPaths.TemplateCache, version); DirectoryHelper.CreateIfNotExists(localCacheFolder); var localCacheFile = Path.Combine(localCacheFolder, templateName + ".zip"); diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs index 339041ef8a..7a3fbdc2bf 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs @@ -9,6 +9,9 @@ namespace Volo.Abp.Cli )] public class AbpCliModule : AbpModule { - + public override void ConfigureServices(ServiceConfigurationContext context) + { + + } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs index 02759655ff..0bcff277c6 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.Cli .MinimumLevel.Information() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) .Enrich.FromLogContext() - .WriteTo.File(Path.Combine(CliPaths.CliLogPath, "abp-cli-logs.txt")) + .WriteTo.File(Path.Combine(CliPaths.Log, "abp-cli-logs.txt")) .WriteTo.Console() .CreateLogger(); From f41808496a347594d1f0dfc946c902781627d671 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 6 May 2019 18:12:26 +0300 Subject: [PATCH 073/335] Update ModuleAdder.cs --- .../Volo/Abp/ProjectModification/ModuleAdder.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs index 6b5017f882..b0e5f2a353 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs @@ -55,13 +55,13 @@ namespace Volo.Abp.ProjectModification private bool TryToFillProjectOrSolutionName(AddModuleArgs args) { var projectFiles = FindFiles(Directory.GetCurrentDirectory(), ".csproj"); - if (projectFiles.Count == 1) + if (projectFiles.Length == 1) { args.ProjectFile = projectFiles.First(); return true; } - if (projectFiles.Count > 1) + if (projectFiles.Length > 1) { Logger.LogWarning( "There are multiple project (.csproj) files in the current directory. Please specify one of the files below:"); @@ -76,13 +76,13 @@ namespace Volo.Abp.ProjectModification } var solutionFiles = FindFiles(Directory.GetCurrentDirectory(), ".sln"); - if (solutionFiles.Count == 1) + if (solutionFiles.Length == 1) { args.SolutionFile = solutionFiles.First(); return true; } - if (solutionFiles.Count > 1) + if (solutionFiles.Length > 1) { Logger.LogWarning( "There are multiple solution (.sln) files in the current directory. Please specify one of the files below:"); @@ -129,9 +129,9 @@ namespace Volo.Abp.ProjectModification } - private List FindFiles(string directory, string fileExtension) + private string[] FindFiles(string directory, string fileExtension) { - throw new NotImplementedException(); + return Directory.GetFiles(directory, "*" + fileExtension); } } } From de330bb45994d40da15e95ba3246617c5f0c5f53 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 6 May 2019 18:51:42 +0300 Subject: [PATCH 074/335] Add missing Volo.Abp.FluentValidation to nuget packages. --- nupkg/common.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index 100bfe3b89..5f6944b1a6 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -68,6 +68,7 @@ $projects = ( "framework/src/Volo.Abp.EventBus", "framework/src/Volo.Abp.EventBus.RabbitMQ", "framework/src/Volo.Abp.Features", + "framework/src/Volo.Abp.FluentValidation", "framework/src/Volo.Abp.Guids", "framework/src/Volo.Abp.HangFire", "framework/src/Volo.Abp.Http", From af6dcfb1f3019f796b313c8e76b116a036bb5255 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 7 May 2019 09:47:20 +0800 Subject: [PATCH 075/335] Replace IIdentityModelHttpClientAuthenticator with IIdentityModelAuthenticationService. fix #1098 --- .../ConsoleClientDemo/ClientDemoService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs b/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs index 1560c383d1..43a36383fd 100644 --- a/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs +++ b/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs @@ -14,13 +14,13 @@ namespace ConsoleClientDemo { private readonly IIdentityUserAppService _userAppService; private readonly IProductAppService _productAppService; - private readonly IIdentityModelHttpClientAuthenticator _authenticator; + private readonly IIdentityModelAuthenticationService _authenticator; private readonly RemoteServiceOptions _remoteServiceOptions; public ClientDemoService( IIdentityUserAppService userAppService, IProductAppService productAppService, - IIdentityModelHttpClientAuthenticator authenticator, + IIdentityModelAuthenticationService authenticator, IOptions remoteServiceOptions) { _userAppService = userAppService; @@ -38,7 +38,7 @@ namespace ConsoleClientDemo /// /// Shows how to manually create an HttpClient and authenticate using the - /// IIdentityModelHttpClientAuthenticator service. + /// IIdentityModelAuthenticationService service. /// private async Task TestWithHttpClient() { @@ -49,7 +49,7 @@ namespace ConsoleClientDemo { using (var client = new HttpClient()) { - await _authenticator.AuthenticateAsync(client); + await _authenticator.TryAuthenticateAsync(client); var url = GetServerUrl() + "Test/Index"; @@ -75,7 +75,7 @@ namespace ConsoleClientDemo /// /// Shows how to use application service interfaces (IIdentityUserAppService in this sample) /// to call a remote service which is possible by the dynamic http client proxy system. - /// No need to use IIdentityModelHttpClientAuthenticator since the dynamic http client proxy + /// No need to use IIdentityModelAuthenticationService since the dynamic http client proxy /// system internally uses it. You just inject a service (IIdentityUserAppService) /// and call a method (GetListAsync) like a local method. /// @@ -104,7 +104,7 @@ namespace ConsoleClientDemo /// /// Shows how to use application service interfaces (IProductAppService in this sample) /// to call a remote service which is possible by the dynamic http client proxy system. - /// No need to use IIdentityModelHttpClientAuthenticator since the dynamic http client proxy + /// No need to use IIdentityModelAuthenticationService since the dynamic http client proxy /// system internally uses it. You just inject a service (IProductAppService) /// and call a method (GetListAsync) like a local method. /// From 7a175fde1631a357620c20663ad65d9db37f6cc9 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 8 May 2019 12:45:18 +0800 Subject: [PATCH 076/335] Fixes #1099. Stop encoding article summary --- .../src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml index c2aebc7192..6526c79ef1 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml @@ -166,7 +166,7 @@ @post.Title

    - @(GetShortContent(post.Content)) + @Html.Raw(GetShortContent(post.Content))

    From 80eabf81b3d8e50d08473c8ffae193e30aa15cd0 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 8 May 2019 18:22:17 +0800 Subject: [PATCH 077/335] Add Volo.Abp.Specifications project. --- framework/Volo.Abp.sln | 9 ++++++++- .../Volo.Abp.Specifications.csproj | 20 +++++++++++++++++++ .../Volo/Abp/AbpSpecificationsModule.cs | 8 ++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 framework/src/Volo.Abp.Specifications/Volo.Abp.Specifications.csproj create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/AbpSpecificationsModule.cs diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index 41eb7f1aeb..77f0e88840 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -228,7 +228,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Tests", "test\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore.Sqlite", "src\Volo.Abp.EntityFrameworkCore.Sqlite\Volo.Abp.EntityFrameworkCore.Sqlite.csproj", "{58CF8957-5045-4F81-884D-72DF48F721CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Cli.Core", "src\Volo.Abp.Cli.Core\Volo.Abp.Cli.Core.csproj", "{3DA9923E-048E-4FE7-9748-3A0194F5D196}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Core", "src\Volo.Abp.Cli.Core\Volo.Abp.Cli.Core.csproj", "{3DA9923E-048E-4FE7-9748-3A0194F5D196}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Specifications", "src\Volo.Abp.Specifications\Volo.Abp.Specifications.csproj", "{2C621EED-563C-4F81-A75E-50879E173544}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -684,6 +686,10 @@ Global {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Release|Any CPU.ActiveCfg = Release|Any CPU {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Release|Any CPU.Build.0 = Release|Any CPU + {2C621EED-563C-4F81-A75E-50879E173544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C621EED-563C-4F81-A75E-50879E173544}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C621EED-563C-4F81-A75E-50879E173544}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C621EED-563C-4F81-A75E-50879E173544}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -801,6 +807,7 @@ Global {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF} = {447C8A77-E5F0-4538-8687-7383196D04EA} {58CF8957-5045-4F81-884D-72DF48F721CC} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {3DA9923E-048E-4FE7-9748-3A0194F5D196} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {2C621EED-563C-4F81-A75E-50879E173544} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.Specifications/Volo.Abp.Specifications.csproj b/framework/src/Volo.Abp.Specifications/Volo.Abp.Specifications.csproj new file mode 100644 index 0000000000..97c236cfc5 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo.Abp.Specifications.csproj @@ -0,0 +1,20 @@ + + + + + + netstandard2.0 + Volo.Abp.Specifications + Volo.Abp.Specifications + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/AbpSpecificationsModule.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/AbpSpecificationsModule.cs new file mode 100644 index 0000000000..506d3989b8 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/AbpSpecificationsModule.cs @@ -0,0 +1,8 @@ +using Volo.Abp.Modularity; + +namespace Volo.Abp +{ + public class AbpSpecificationsModule : AbpModule + { + } +} \ No newline at end of file From 8e6c12b5ea9d20cf2ab0510185b9b7f8c370fd3d Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 8 May 2019 13:41:44 +0300 Subject: [PATCH 078/335] Update AuthService.cs --- .../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs index 68dfc52cf9..5cf93e7c2d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Auth/AuthService.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.Cli.Auth var accessToken = await AuthenticationService.GetAccessTokenAsync( new IdentityClientConfiguration( "https://localhost:44333", //TODO: Configure - "role email abpio_www", + "role email abpio_www abpio_commercial", "abp-cli", "1q2w3e*", OidcConstants.GrantTypes.Password, From c135d4823f052e4c76e9790231a339f0ffd03d16 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 8 May 2019 19:04:13 +0800 Subject: [PATCH 079/335] Improve the Specifications project code and testing. --- framework/Volo.Abp.sln | 9 +- .../AbpSpecificationsModule.cs | 3 +- .../Abp/Specifications/AndNotSpecification.cs | 36 ++++ .../Abp/Specifications/AndSpecification.cs | 31 +++ .../Abp/Specifications/AnySpecification.cs | 22 ++ .../Specifications/CompositeSpecification.cs | 30 +++ .../Specifications/ExpressionFuncExtender.cs | 55 +++++ .../Specifications/ExpressionSpecification.cs | 34 ++++ .../Specifications/ICompositeSpecification.cs | 19 ++ .../Volo/Abp/Specifications/ISpecification.cs | 28 +++ .../Specifications/ISpecificationParser.cs | 19 ++ .../Abp/Specifications/NoneSpecification.cs | 22 ++ .../Abp/Specifications/NotSpecification.cs | 36 ++++ .../Abp/Specifications/OrSpecification.cs | 31 +++ .../Abp/Specifications/ParameterRebinder.cs | 37 ++++ .../Volo/Abp/Specifications/Specification.cs | 38 ++++ .../Specifications/SpecificationExtensions.cs | 72 +++++++ .../Volo.Abp.Specifications.Tests.csproj | 21 ++ .../Specifications/Specifications_Tests.cs | 191 ++++++++++++++++++ 19 files changed, 732 insertions(+), 2 deletions(-) rename framework/src/Volo.Abp.Specifications/Volo/Abp/{ => Specifications}/AbpSpecificationsModule.cs (73%) create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AndNotSpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AndSpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AnySpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/CompositeSpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ExpressionFuncExtender.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ExpressionSpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ICompositeSpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ISpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ISpecificationParser.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/NoneSpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/NotSpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/OrSpecification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ParameterRebinder.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/Specification.cs create mode 100644 framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/SpecificationExtensions.cs create mode 100644 framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.csproj create mode 100644 framework/test/Volo.Abp.Specifications.Tests/Volo/Abp/Specifications/Specifications_Tests.cs diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index 77f0e88840..b0b7803963 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -230,7 +230,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCor EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Core", "src\Volo.Abp.Cli.Core\Volo.Abp.Cli.Core.csproj", "{3DA9923E-048E-4FE7-9748-3A0194F5D196}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Specifications", "src\Volo.Abp.Specifications\Volo.Abp.Specifications.csproj", "{2C621EED-563C-4F81-A75E-50879E173544}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Specifications", "src\Volo.Abp.Specifications\Volo.Abp.Specifications.csproj", "{2C621EED-563C-4F81-A75E-50879E173544}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Specifications.Tests", "test\Volo.Abp.Specifications.Tests\Volo.Abp.Specifications.Tests.csproj", "{D078553A-C70C-4F56-B3E2-9C5BA6384C72}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -690,6 +692,10 @@ Global {2C621EED-563C-4F81-A75E-50879E173544}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C621EED-563C-4F81-A75E-50879E173544}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C621EED-563C-4F81-A75E-50879E173544}.Release|Any CPU.Build.0 = Release|Any CPU + {D078553A-C70C-4F56-B3E2-9C5BA6384C72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D078553A-C70C-4F56-B3E2-9C5BA6384C72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D078553A-C70C-4F56-B3E2-9C5BA6384C72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D078553A-C70C-4F56-B3E2-9C5BA6384C72}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -808,6 +814,7 @@ Global {58CF8957-5045-4F81-884D-72DF48F721CC} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {3DA9923E-048E-4FE7-9748-3A0194F5D196} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {2C621EED-563C-4F81-A75E-50879E173544} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {D078553A-C70C-4F56-B3E2-9C5BA6384C72} = {447C8A77-E5F0-4538-8687-7383196D04EA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/AbpSpecificationsModule.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AbpSpecificationsModule.cs similarity index 73% rename from framework/src/Volo.Abp.Specifications/Volo/Abp/AbpSpecificationsModule.cs rename to framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AbpSpecificationsModule.cs index 506d3989b8..6f55973be1 100644 --- a/framework/src/Volo.Abp.Specifications/Volo/Abp/AbpSpecificationsModule.cs +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AbpSpecificationsModule.cs @@ -1,8 +1,9 @@ using Volo.Abp.Modularity; -namespace Volo.Abp +namespace Volo.Abp.Specifications { public class AbpSpecificationsModule : AbpModule { + } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AndNotSpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AndNotSpecification.cs new file mode 100644 index 0000000000..e0d51bd5c3 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AndNotSpecification.cs @@ -0,0 +1,36 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the combined specification which indicates that the first specification + /// can be satisifed by the given object whereas the second one cannot. + /// + /// The type of the object to which the specification is applied. + public class AndNotSpecification : CompositeSpecification + { + /// + /// Constructs a new instance of class. + /// + /// The first specification. + /// The second specification. + public AndNotSpecification(ISpecification left, ISpecification right) : base(left, right) + { + } + + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + public override Expression> ToExpression() + { + var rightExpression = Right.ToExpression(); + + var bodyNot = Expression.Not(rightExpression.Body); + var bodyNotExpression = Expression.Lambda>(bodyNot, rightExpression.Parameters); + + return Left.ToExpression().And(bodyNotExpression); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AndSpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AndSpecification.cs new file mode 100644 index 0000000000..621287d634 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AndSpecification.cs @@ -0,0 +1,31 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the combined specification which indicates that both of the given + /// specifications should be satisfied by the given object. + /// + /// The type of the object to which the specification is applied. + public class AndSpecification : CompositeSpecification + { + /// + /// Constructs a new instance of class. + /// + /// The first specification. + /// The second specification. + public AndSpecification(ISpecification left, ISpecification right) : base(left, right) + { + } + + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + public override Expression> ToExpression() + { + return Left.ToExpression().And(Right.ToExpression()); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AnySpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AnySpecification.cs new file mode 100644 index 0000000000..caf6a5f094 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/AnySpecification.cs @@ -0,0 +1,22 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the specification that can be satisfied by the given object + /// in any circumstance. + /// + /// The type of the object to which the specification is applied. + public sealed class AnySpecification : Specification + { + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + public override Expression> ToExpression() + { + return o => true; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/CompositeSpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/CompositeSpecification.cs new file mode 100644 index 0000000000..01c1e46d33 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/CompositeSpecification.cs @@ -0,0 +1,30 @@ +namespace Volo.Abp.Specifications +{ + /// + /// Represents the base class for composite specifications. + /// + /// The type of the object to which the specification is applied. + public abstract class CompositeSpecification : Specification, ICompositeSpecification + { + /// + /// Constructs a new instance of class. + /// + /// The first specification. + /// The second specification. + protected CompositeSpecification(ISpecification left, ISpecification right) + { + Left = left; + Right = right; + } + + /// + /// Gets the first specification. + /// + public ISpecification Left { get; } + + /// + /// Gets the second specification. + /// + public ISpecification Right { get; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ExpressionFuncExtender.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ExpressionFuncExtender.cs new file mode 100644 index 0000000000..dd169d5320 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ExpressionFuncExtender.cs @@ -0,0 +1,55 @@ +using System; +using System.Linq; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the extender for Expression[Func[T, bool]] type. + /// This is part of the solution which solves + /// the expression parameter problem when going to Entity Framework. + /// For more information about this solution please refer to http://blogs.msdn.com/b/meek/archive/2008/05/02/linq-to-entities-combining-predicates.aspx. + /// + public static class ExpressionFuncExtender + { + private static Expression Compose(this Expression first, Expression second, + Func merge) + { + // build parameter map (from parameters of second to parameters of first) + var map = first.Parameters.Select((f, i) => new {f, s = second.Parameters[i]}) + .ToDictionary(p => p.s, p => p.f); + + // replace parameters in the second lambda expression with parameters from the first + var secondBody = ParameterRebinder.ReplaceParameters(map, second.Body); + + // apply composition of lambda expression bodies to parameters from the first expression + return Expression.Lambda(merge(first.Body, secondBody), first.Parameters); + } + + /// + /// Combines two given expressions by using the AND semantics. + /// + /// The type of the object. + /// The first part of the expression. + /// The second part of the expression. + /// The combined expression. + public static Expression> And(this Expression> first, + Expression> second) + { + return first.Compose(second, Expression.AndAlso); + } + + /// + /// Combines two given expressions by using the OR semantics. + /// + /// The type of the object. + /// The first part of the expression. + /// The second part of the expression. + /// The combined expression. + public static Expression> Or(this Expression> first, + Expression> second) + { + return first.Compose(second, Expression.OrElse); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ExpressionSpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ExpressionSpecification.cs new file mode 100644 index 0000000000..14c1bff040 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ExpressionSpecification.cs @@ -0,0 +1,34 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the specification which is represented by the corresponding + /// LINQ expression. + /// + /// The type of the object to which the specification is applied. + public class ExpressionSpecification : Specification + { + private readonly Expression> _expression; + + /// + /// Initializes a new instance of ExpressionSpecification<T> class. + /// + /// The LINQ expression which represents the current + /// specification. + public ExpressionSpecification(Expression> expression) + { + _expression = expression; + } + + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + public override Expression> ToExpression() + { + return _expression; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ICompositeSpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ICompositeSpecification.cs new file mode 100644 index 0000000000..2c73409d34 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ICompositeSpecification.cs @@ -0,0 +1,19 @@ +namespace Volo.Abp.Specifications +{ + /// + /// Represents that the implemented classes are composite specifications. + /// + /// The type of the object to which the specification is applied. + public interface ICompositeSpecification : ISpecification + { + /// + /// Gets the left side of the specification. + /// + ISpecification Left { get; } + + /// + /// Gets the right side of the specification. + /// + ISpecification Right { get; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ISpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ISpecification.cs new file mode 100644 index 0000000000..d19e28347e --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ISpecification.cs @@ -0,0 +1,28 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents that the implemented classes are specifications. For more + /// information about the specification pattern, please refer to + /// http://martinfowler.com/apsupp/spec.pdf. + /// + /// The type of the object to which the specification is applied. + public interface ISpecification + { + /// + /// Returns a value which indicates whether the specification + /// is satisfied by the given object. + /// + /// The object to which the specification is applied. + /// True if the specification is satisfied, otherwise false. + bool IsSatisfiedBy(T obj); + + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + Expression> ToExpression(); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ISpecificationParser.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ISpecificationParser.cs new file mode 100644 index 0000000000..d2c61034e0 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ISpecificationParser.cs @@ -0,0 +1,19 @@ +namespace Volo.Abp.Specifications +{ + /// + /// Represents that the implemented classes are specification parsers that + /// parses the given specification to a domain specific criteria object, such + /// as the ICriteria instance in NHibernate. + /// + /// The type of the domain specific criteria. + public interface ISpecificationParser + { + /// + /// Parses the given specification to a domain specific criteria object. + /// + /// The type of the object to which the specification is applied. + /// The specified specification instance. + /// The instance of the domain specific criteria. + TCriteria Parse(ISpecification specification); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/NoneSpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/NoneSpecification.cs new file mode 100644 index 0000000000..fc2e74fdd6 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/NoneSpecification.cs @@ -0,0 +1,22 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the specification that can be satisfied by the given object + /// in no circumstance. + /// + /// The type of the object to which the specification is applied. + public sealed class NoneSpecification : Specification + { + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + public override Expression> ToExpression() + { + return o => false; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/NotSpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/NotSpecification.cs new file mode 100644 index 0000000000..34658885cb --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/NotSpecification.cs @@ -0,0 +1,36 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the specification which indicates the semantics opposite to the given specification. + /// + /// The type of the object to which the specification is applied. + public class NotSpecification : Specification + { + private readonly ISpecification _specification; + + /// + /// Initializes a new instance of class. + /// + /// The specification to be reversed. + public NotSpecification(ISpecification specification) + { + _specification = specification; + } + + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + public override Expression> ToExpression() + { + var expression = _specification.ToExpression(); + return Expression.Lambda>( + Expression.Not(expression.Body), + expression.Parameters + ); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/OrSpecification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/OrSpecification.cs new file mode 100644 index 0000000000..a6c85f8326 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/OrSpecification.cs @@ -0,0 +1,31 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the combined specification which indicates that either of the given + /// specification should be satisfied by the given object. + /// + /// The type of the object to which the specification is applied. + public class OrSpecification : CompositeSpecification + { + /// + /// Initializes a new instance of class. + /// + /// The first specification. + /// The second specification. + public OrSpecification(ISpecification left, ISpecification right) : base(left, right) + { + } + + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + public override Expression> ToExpression() + { + return Left.ToExpression().Or(Right.ToExpression()); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ParameterRebinder.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ParameterRebinder.cs new file mode 100644 index 0000000000..603e80cf69 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/ParameterRebinder.cs @@ -0,0 +1,37 @@ +using System.Collections.Generic; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the parameter rebinder used for rebinding the parameters + /// for the given expressions. This is part of the solution which solves + /// the expression parameter problem when going to Entity Framework. + /// For more information about this solution please refer to http://blogs.msdn.com/b/meek/archive/2008/05/02/linq-to-entities-combining-predicates.aspx. + /// + internal class ParameterRebinder : ExpressionVisitor + { + private readonly Dictionary _map; + + internal ParameterRebinder(Dictionary map) + { + _map = map ?? new Dictionary(); + } + + internal static Expression ReplaceParameters(Dictionary map, + Expression exp) + { + return new ParameterRebinder(map).Visit(exp); + } + + protected override Expression VisitParameter(ParameterExpression p) + { + if (_map.TryGetValue(p, out var replacement)) + { + p = replacement; + } + + return base.VisitParameter(p); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/Specification.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/Specification.cs new file mode 100644 index 0000000000..b1ab72caea --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/Specification.cs @@ -0,0 +1,38 @@ +using System; +using System.Linq.Expressions; + +namespace Volo.Abp.Specifications +{ + /// + /// Represents the base class for specifications. + /// + /// The type of the object to which the specification is applied. + public abstract class Specification : ISpecification + { + /// + /// Returns a value which indicates whether the specification + /// is satisfied by the given object. + /// + /// The object to which the specification is applied. + /// True if the specification is satisfied, otherwise false. + public virtual bool IsSatisfiedBy(T obj) + { + return ToExpression().Compile()(obj); + } + + /// + /// Gets the LINQ expression which represents the current specification. + /// + /// The LINQ expression. + public abstract Expression> ToExpression(); + + /// + /// Implicitly converts a specification to expression. + /// + /// + public static implicit operator Expression>(Specification specification) + { + return specification.ToExpression(); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/SpecificationExtensions.cs b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/SpecificationExtensions.cs new file mode 100644 index 0000000000..229b3e7a72 --- /dev/null +++ b/framework/src/Volo.Abp.Specifications/Volo/Abp/Specifications/SpecificationExtensions.cs @@ -0,0 +1,72 @@ +using JetBrains.Annotations; + +namespace Volo.Abp.Specifications +{ + public static class SpecificationExtensions + { + /// + /// Combines the current specification instance with another specification instance + /// and returns the combined specification which represents that both the current and + /// the given specification must be satisfied by the given object. + /// + /// The specification + /// The specification instance with which the current specification is combined. + /// The combined specification instance. + public static ISpecification And([NotNull] this ISpecification specification, + [NotNull] ISpecification other) + { + Check.NotNull(specification, nameof(specification)); + Check.NotNull(other, nameof(other)); + + return new AndSpecification(specification, other); + } + + /// + /// Combines the current specification instance with another specification instance + /// and returns the combined specification which represents that either the current or + /// the given specification should be satisfied by the given object. + /// + /// The specification + /// The specification instance with which the current specification + /// is combined. + /// The combined specification instance. + public static ISpecification Or([NotNull] this ISpecification specification, + [NotNull] ISpecification other) + { + Check.NotNull(specification, nameof(specification)); + Check.NotNull(other, nameof(other)); + + return new OrSpecification(specification, other); + } + + /// + /// Combines the current specification instance with another specification instance + /// and returns the combined specification which represents that the current specification + /// should be satisfied by the given object but the specified specification should not. + /// + /// The specification + /// The specification instance with which the current specification + /// is combined. + /// The combined specification instance. + public static ISpecification AndNot([NotNull] this ISpecification specification, + [NotNull] ISpecification other) + { + Check.NotNull(specification, nameof(specification)); + Check.NotNull(other, nameof(other)); + + return new AndNotSpecification(specification, other); + } + + /// + /// Reverses the current specification instance and returns a specification which represents + /// the semantics opposite to the current specification. + /// + /// The reversed specification instance. + public static ISpecification Not([NotNull] this ISpecification specification) + { + Check.NotNull(specification, nameof(specification)); + + return new NotSpecification(specification); + } + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.csproj b/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.csproj new file mode 100644 index 0000000000..6f2cbe09f8 --- /dev/null +++ b/framework/test/Volo.Abp.Specifications.Tests/Volo.Abp.Specifications.Tests.csproj @@ -0,0 +1,21 @@ + + + + netcoreapp2.2 + latest + Volo.Abp.Specifications.Tests + Volo.Abp.Specifications.Tests + true + false + false + false + + + + + + + + + + \ No newline at end of file diff --git a/framework/test/Volo.Abp.Specifications.Tests/Volo/Abp/Specifications/Specifications_Tests.cs b/framework/test/Volo.Abp.Specifications.Tests/Volo/Abp/Specifications/Specifications_Tests.cs new file mode 100644 index 0000000000..dbe4fc6b5d --- /dev/null +++ b/framework/test/Volo.Abp.Specifications.Tests/Volo/Abp/Specifications/Specifications_Tests.cs @@ -0,0 +1,191 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using Shouldly; +using Xunit; + +namespace Volo.Abp.Specifications +{ + public class Specification_Tests + { + private readonly IQueryable _customers; + + public Specification_Tests() + { + _customers = new List + { + new Customer("John", 17, 47000, "England"), + new Customer("Tuana", 2, 500, "Turkey"), + new Customer("Martin", 43, 16000, "USA"), + new Customer("Lee", 32, 24502, "China"), + new Customer("Douglas", 42, 42000, "England"), + new Customer("Abelard", 14, 2332, "German"), + new Customer("Neo", 16, 120000, "USA"), + new Customer("Daan", 39, 6000, "Netherlands"), + new Customer("Alessandro", 22, 8271, "Italy"), + new Customer("Noah", 33, 82192, "Belgium") + }.AsQueryable(); + } + + [Fact] + public void Any_Should_Return_All() + { + _customers + .Where(new AnySpecification()) //Implicitly converted to Expression! + .Count() + .ShouldBe(_customers.Count()); + } + + [Fact] + public void None_Should_Return_Empty() + { + _customers + .Where(new NoneSpecification().ToExpression()) + .Count() + .ShouldBe(0); + } + + [Fact] + public void Not_Should_Return_Reverse_Result() + { + _customers + .Where(new EuropeanCustomerSpecification().Not().ToExpression()) + .Count() + .ShouldBe(3); + } + + [Fact] + public void Should_Support_Native_Expressions_And_Combinations() + { + _customers + .Where(new ExpressionSpecification(c => c.Age >= 18).ToExpression()) + .Count() + .ShouldBe(6); + + _customers + .Where(new EuropeanCustomerSpecification().And(new ExpressionSpecification(c => c.Age >= 18)).ToExpression()) + .Count() + .ShouldBe(4); + } + + [Fact] + public void CustomSpecification_Test() + { + _customers + .Where(new EuropeanCustomerSpecification().ToExpression()) + .Count() + .ShouldBe(7); + + _customers + .Where(new Age18PlusCustomerSpecification().ToExpression()) + .Count() + .ShouldBe(6); + + _customers + .Where(new BalanceCustomerSpecification(10000, 30000).ToExpression()) + .Count() + .ShouldBe(2); + + _customers + .Where(new PremiumCustomerSpecification().ToExpression()) + .Count() + .ShouldBe(3); + } + + [Fact] + public void IsSatisfiedBy_Tests() + { + new PremiumCustomerSpecification().IsSatisfiedBy(new Customer("David", 49, 55000, "USA")).ShouldBeTrue(); + + new PremiumCustomerSpecification().IsSatisfiedBy(new Customer("David", 49, 200, "USA")).ShouldBeFalse(); + new PremiumCustomerSpecification().IsSatisfiedBy(new Customer("David", 12, 55000, "USA")).ShouldBeFalse(); + } + + [Fact] + public void CustomSpecification_Composite_Tests() + { + _customers + .Where(new EuropeanCustomerSpecification().And(new Age18PlusCustomerSpecification()).ToExpression()) + .Count() + .ShouldBe(4); + + _customers + .Where(new EuropeanCustomerSpecification().Not().And(new Age18PlusCustomerSpecification()).ToExpression()) + .Count() + .ShouldBe(2); + + _customers + .Where(new Age18PlusCustomerSpecification().AndNot(new EuropeanCustomerSpecification()).ToExpression()) + .Count() + .ShouldBe(2); + } + + private class Customer + { + public string Name { get; private set; } + + public byte Age { get; private set; } + + public long Balance { get; private set; } + + public string Location { get; private set; } + + public Customer(string name, byte age, long balance, string location) + { + Name = name; + Age = age; + Balance = balance; + Location = location; + } + } + + private class EuropeanCustomerSpecification : Specification + { + public override Expression> ToExpression() + { + return c => c.Location == "England" || + c.Location == "Turkey" || + c.Location == "German" || + c.Location == "Netherlands" || + c.Location == "Italy" || + c.Location == "Belgium"; + } + } + + private class Age18PlusCustomerSpecification : Specification + { + public override Expression> ToExpression() + { + return c => c.Age >= 18; + } + } + + private class BalanceCustomerSpecification : Specification + { + public int MinBalance { get; } + + public int MaxBalance { get; } + + public BalanceCustomerSpecification(int minBalance, int maxBalance) + { + MinBalance = minBalance; + MaxBalance = maxBalance; + } + + public override Expression> ToExpression() + { + return c => c.Balance >= MinBalance && c.Balance <= MaxBalance; + } + } + + private class PremiumCustomerSpecification : AndSpecification + { + public PremiumCustomerSpecification() + : base(new Age18PlusCustomerSpecification(), new BalanceCustomerSpecification(20000, int.MaxValue)) + { + } + } + } +} From fb215c10199114827d7dc38ed5b1bb61b5f84142 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 8 May 2019 16:08:43 +0300 Subject: [PATCH 080/335] Add Volo.Abp.Specifications to nuget package building. --- nupkg/common.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index 5f6944b1a6..59329e6af0 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -88,6 +88,7 @@ $projects = ( "framework/src/Volo.Abp.Serialization", "framework/src/Volo.Abp.Settings", "framework/src/Volo.Abp.Sms", + "framework/src/Volo.Abp.Specifications", "framework/src/Volo.Abp.TestBase", "framework/src/Volo.Abp.Threading", "framework/src/Volo.Abp.Timing", From 69d89ce87cc37afcc6096fa248a3fc193a216738 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 8 May 2019 22:56:03 +0800 Subject: [PATCH 081/335] Add repository specification unit test. --- .../Repository_Specifications_Tests.cs | 8 ++++ .../Repository_Specifications_Tests.cs | 8 ++++ .../Repository_Specifications_Tests.cs | 8 ++++ .../Volo.Abp.TestApp/Volo.Abp.TestApp.csproj | 1 + .../Repository_Specifications_Tests.cs | 40 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/Repository_Specifications_Tests.cs create mode 100644 framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/Repositories/Repository_Specifications_Tests.cs create mode 100644 framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/Repository_Specifications_Tests.cs create mode 100644 framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/Repository_Specifications_Tests.cs diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/Repository_Specifications_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/Repository_Specifications_Tests.cs new file mode 100644 index 0000000000..d9de34f1ce --- /dev/null +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/Repository_Specifications_Tests.cs @@ -0,0 +1,8 @@ +using Volo.Abp.TestApp.Testing; + +namespace Volo.Abp.EntityFrameworkCore.Repositories +{ + public class Repository_Specifications_Tests : Repository_Specifications_Tests + { + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/Repositories/Repository_Specifications_Tests.cs b/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/Repositories/Repository_Specifications_Tests.cs new file mode 100644 index 0000000000..e3183127a0 --- /dev/null +++ b/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/Repositories/Repository_Specifications_Tests.cs @@ -0,0 +1,8 @@ +using Volo.Abp.TestApp.Testing; + +namespace Volo.Abp.MemoryDb.Repositories +{ + public class Repository_Specifications_Tests : Repository_Specifications_Tests + { + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/Repository_Specifications_Tests.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/Repository_Specifications_Tests.cs new file mode 100644 index 0000000000..6529b4c5a9 --- /dev/null +++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Repositories/Repository_Specifications_Tests.cs @@ -0,0 +1,8 @@ +using Volo.Abp.TestApp.Testing; + +namespace Volo.Abp.MongoDB.Repositories +{ + public class Repository_Specifications_Tests : Repository_Specifications_Tests + { + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj index 0cb921f63a..4e7b58ee84 100644 --- a/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj +++ b/framework/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj @@ -16,6 +16,7 @@ + diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/Repository_Specifications_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/Repository_Specifications_Tests.cs new file mode 100644 index 0000000000..a3e7907135 --- /dev/null +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/Repository_Specifications_Tests.cs @@ -0,0 +1,40 @@ +using System; +using System.Linq; +using System.Linq.Expressions; +using Shouldly; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.Modularity; +using Volo.Abp.Specifications; +using Volo.Abp.TestApp.Domain; +using Xunit; + +namespace Volo.Abp.TestApp.Testing +{ + public abstract class Repository_Specifications_Tests : TestAppTestBase + where TStartupModule : IAbpModule + { + protected readonly IRepository CityRepository; + + protected Repository_Specifications_Tests() + { + CityRepository = GetRequiredService>(); + } + + [Fact] + public void SpecificationWithRepository_Test() + { + WithUnitOfWork(() => + { + CityRepository.Count(new CitySpecification().ToExpression()).ShouldBe(1); + }); + } + } + + public class CitySpecification : Specification + { + public override Expression> ToExpression() + { + return city => city.Name == "Istanbul"; + } + } +} \ No newline at end of file From 5b096b34257c25efc33451f84c4c9629831c5397 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 8 May 2019 23:22:59 +0800 Subject: [PATCH 082/335] fix #1104 Replace the correct project reference and namespace. --- .../Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs | 4 ++-- .../Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs | 4 ++-- .../MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/abp_io/src/Volo.Utils.SolutionTemplating/Volo/Utils/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs b/abp_io/src/Volo.Utils.SolutionTemplating/Volo/Utils/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs index 0901d0250b..d8a622fe83 100644 --- a/abp_io/src/Volo.Utils.SolutionTemplating/Volo/Utils/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/abp_io/src/Volo.Utils.SolutionTemplating/Volo/Utils/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs @@ -21,9 +21,9 @@ namespace Volo.Utils.SolutionTemplating.Building.Steps var lines = file.GetLines(); for (var i = 0; i < lines.Length; i++) { - if (lines[i].Contains("ProjectReference") && lines[i].Contains("MyCompanyName.MyProjectName.EntityFrameworkCore")) + if (lines[i].Contains("ProjectReference") && lines[i].Contains("MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations")) { - lines[i] = lines[i].Replace("EntityFrameworkCore", "MongoDB"); + lines[i] = lines[i].Replace("EntityFrameworkCore.DbMigrations", "MongoDB"); file.SetLines(lines); return; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs index 6b77808f55..b1f55b4ba7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs @@ -21,9 +21,9 @@ namespace Volo.Abp.ProjectBuilding.Building.Steps var lines = file.GetLines(); for (var i = 0; i < lines.Length; i++) { - if (lines[i].Contains("ProjectReference") && lines[i].Contains("MyCompanyName.MyProjectName.EntityFrameworkCore")) + if (lines[i].Contains("ProjectReference") && lines[i].Contains("MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations")) { - lines[i] = lines[i].Replace("EntityFrameworkCore", "MongoDB"); + lines[i] = lines[i].Replace("EntityFrameworkCore.DbMigrations", "MongoDB"); file.SetLines(lines); return; } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 330cf78fe2..c06daeed28 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -32,10 +32,9 @@ using Volo.Abp.UI; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; using Volo.Abp.PermissionManagement; +using Volo.Abp.TenantManagement.Web; // using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.TenantManagement.Web; - // namespace MyCompanyName.MyProjectName From c8bf413cfeb3cc5a39719871487bc150a2b60d38 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 8 May 2019 22:24:54 +0300 Subject: [PATCH 083/335] Implemented add-module to project (initial, will be refactored). --- .../Volo.Abp.Cli.Core.csproj | 1 + .../Volo/Abp/Cli/AbpCliCoreModule.cs | 2 +- .../Volo/Abp/Cli/CliService.cs | 5 +- .../{AddCommand.cs => AddModuleCommand.cs} | 8 +- .../ProjectModification/AbpModuleFinder.cs | 71 ++++++++++++++++ .../Abp/ProjectModification/DependsOnAdder.cs | 45 +++++++++++ .../Abp/ProjectModification/ModuleAdder.cs | 8 +- .../Abp/ProjectModification/NpmPackageInfo.cs | 11 +++ .../ProjectModification/NugetPackageInfo.cs | 13 +++ .../ProjectModification/ProjectModuleAdder.cs | 13 --- .../ProjectNpmPackageAdder.cs | 42 ++++++++++ .../ProjectNugetPackageAdder.cs | 81 +++++++++++++++++++ 12 files changed, 277 insertions(+), 23 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/{AddCommand.cs => AddModuleCommand.cs} (85%) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleFinder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/DependsOnAdder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectModuleAdder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj index 41cb647649..46b59109c7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj +++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj @@ -17,6 +17,7 @@ + diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index 2dd39cdfce..101e9134d7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.Cli { options.Commands["help"] = typeof(HelpCommand); options.Commands["new"] = typeof(NewCommand); - options.Commands["add"] = typeof(AddCommand); + options.Commands["add-module"] = typeof(AddModuleCommand); options.Commands["login"] = typeof(LoginCommand); options.Commands["logout"] = typeof(LogoutCommand); }); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 502ab294e6..854eabea96 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -13,7 +13,10 @@ namespace Volo.Abp.Cli { public class CliService : ITransientDependency { - public static string Version => typeof(AbpCliCoreModule).Assembly.GetFileVersion(); + //public static string Version => typeof(AbpCliCoreModule).Assembly + // .GetFileVersion() + // .RemovePostFix(".0"); + public static string Version => "0.17.0.0"; public ILogger Logger { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs similarity index 85% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommand.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index e5034725ba..6c5209c2e4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -7,16 +7,16 @@ using Volo.Abp.ProjectModification; namespace Volo.Abp.Cli.Commands { - public class AddCommand : IConsoleCommand, ITransientDependency + public class AddModuleCommand : IConsoleCommand, ITransientDependency { - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } protected ModuleAdder ModuleAdder { get; } - public AddCommand(ModuleAdder moduleAdder) + public AddModuleCommand(ModuleAdder moduleAdder) { ModuleAdder = moduleAdder; - Logger = NullLogger.Instance; + Logger = NullLogger.Instance; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleFinder.cs new file mode 100644 index 0000000000..ca02137154 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleFinder.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; + +namespace Volo.Abp.ProjectModification +{ + public class AbpModuleFinder + { + public List Find(string csprojFilePath) + { + var modules = new List(); + + var csFiles = GetAllCsFilesUnderDirectory(Path.GetDirectoryName(csprojFilePath), new List()); + + foreach (var csFile in csFiles) + { + try + { + var root = CSharpSyntaxTree.ParseText(File.ReadAllText(csFile)).GetRoot(); + + var namespaceSyntaxs = root.DescendantNodes().OfType(); + + foreach (var namespaceSyntax in namespaceSyntaxs) + { + var classDeclarationSyntaxs = namespaceSyntax.DescendantNodes().OfType(); + var syntaxsArray = classDeclarationSyntaxs as ClassDeclarationSyntax[] ?? classDeclarationSyntaxs.ToArray(); + + foreach (var classDeclaration in syntaxsArray) + { + var classDerivedFromAbpModule = classDeclaration.BaseList?.Types.FirstOrDefault(t => t.ToString().Contains("AbpModule")); + + if (classDerivedFromAbpModule != null) + { + modules.Add(csFile); + } + } + } + } + catch (Exception) + { + //ignored! + } + } + + return modules; + } + + private static List GetAllCsFilesUnderDirectory(string path, List allCsFileList) + { + var directory = new DirectoryInfo(path); + var files = directory.GetFiles("*.cs").Select(f => f.DirectoryName + "\\" + f.Name).ToList(); + + foreach (var s in files) + { + allCsFileList.Add(s); + } + + var directories = directory.GetDirectories().Select(d => path + "\\" + d.Name).ToList(); + + foreach (var subDirectory in directories) + { + allCsFileList = GetAllCsFilesUnderDirectory(subDirectory, allCsFileList); + } + + return allCsFileList; + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/DependsOnAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/DependsOnAdder.cs new file mode 100644 index 0000000000..d1dfd86d0a --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/DependsOnAdder.cs @@ -0,0 +1,45 @@ +using System; +using System.IO; +using System.Linq; + +namespace Volo.Abp.ProjectModification +{ + public class DependsOnAdder + { + public void Add(string path, string module) + { + ParseModuleNameAndNameSpace(module, out var nameSpace, out var moduleName); + + var file = File.ReadAllText(path); + + var indexOfEndingPublicClass = file.IndexOf("public class", StringComparison.Ordinal); + + var dependsOnAttribute = "[DependsOn(" + moduleName + ")]" + Environment.NewLine + " "; + + file = file.Insert(indexOfEndingPublicClass, dependsOnAttribute); + file = file.Insert(0, GetUsingStatement(nameSpace) + Environment.NewLine); //TODO: Add as the last item in the using list! + + File.WriteAllText(path, file); + } + + private void ParseModuleNameAndNameSpace(string module, out string nameSpace, out string moduleName) + { + var words = module?.Split('.'); + + if (words == null || words.Length <= 1) + { + nameSpace = null; + moduleName = module; + return; + } + + moduleName = words[words.Length - 1]; + nameSpace = string.Join(".", words.Take(words.Length - 1)); + } + + private string GetUsingStatement(string nameSpace) + { + return "using " + nameSpace + ";"; + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs index b0e5f2a353..d6da6fea68 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs @@ -15,12 +15,12 @@ namespace Volo.Abp.ProjectModification { public ILogger Logger { get; set; } - protected ProjectModuleAdder ProjectModuleAdder { get; } + protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; } protected SolutionModuleAdder SolutionModuleAdder { get; } - public ModuleAdder(ProjectModuleAdder projectModuleAdder, SolutionModuleAdder solutionModuleAdder) + public ModuleAdder(ProjectNugetPackageAdder projectNugetPackageAdder, SolutionModuleAdder solutionModuleAdder) { - ProjectModuleAdder = projectModuleAdder; + ProjectNugetPackageAdder = projectNugetPackageAdder; SolutionModuleAdder = solutionModuleAdder; Logger = NullLogger.Instance; @@ -43,7 +43,7 @@ namespace Volo.Abp.ProjectModification if (!args.ProjectFile.IsNullOrEmpty()) { - await ProjectModuleAdder.AddAsync(args.ProjectFile, args.ModuleName); + await ProjectNugetPackageAdder.AddAsync(args.ProjectFile, args.ModuleName); } if (!args.SolutionFile.IsNullOrEmpty()) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs new file mode 100644 index 0000000000..09ee9a8042 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs @@ -0,0 +1,11 @@ +namespace Volo.Abp.ProjectModification +{ + public class NpmPackageInfo + { + public string Name { get; set; } + + public int ApplicationType { get; set; } //TODO: Enum? + + public bool IsPro { get; set; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs new file mode 100644 index 0000000000..59974f23d3 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs @@ -0,0 +1,13 @@ +namespace Volo.Abp.ProjectModification +{ + public class NugetPackageInfo + { + public string Name { get; set; } + + public string ModuleClass { get; set; } + + public int Target { get; set; } //TODO: Enum? + + public NpmPackageInfo DependedNpmPackage { get; set; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectModuleAdder.cs deleted file mode 100644 index 1960da10a5..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectModuleAdder.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; - -namespace Volo.Abp.ProjectModification -{ - public class ProjectModuleAdder : ITransientDependency - { - public async Task AddAsync(string projectFile, string moduleName) - { - - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs new file mode 100644 index 0000000000..e6566ce21f --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs @@ -0,0 +1,42 @@ +using System.Diagnostics; +using System.IO; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.ProjectModification +{ + public class ProjectNpmPackageAdder : ITransientDependency + { + public ILogger Logger { get; set; } + + public ProjectNpmPackageAdder() + { + Logger = NullLogger.Instance; + } + + public Task AddAsync(string directory, NpmPackageInfo npmPackage) + { + var packageJsonFilePath = Path.Combine(directory, "package.json"); + if (!File.Exists(packageJsonFilePath)) + { + return Task.CompletedTask; + } + + Logger.LogInformation($"Installing '{npmPackage.Name}' package to the project '{packageJsonFilePath}'..."); + + Logger.LogInformation("yarn add " + npmPackage.Name + "..."); + var procStartInfo = new ProcessStartInfo("cmd.exe", "/C yarn add " + npmPackage.Name); + procStartInfo.WindowStyle = ProcessWindowStyle.Normal; + Process.Start(procStartInfo).WaitForExit(); + + Logger.LogInformation("gulp..."); + procStartInfo = new ProcessStartInfo("cmd.exe", "/C gulp"); + procStartInfo.WindowStyle = ProcessWindowStyle.Normal; + Process.Start(procStartInfo).WaitForExit(); + + return Task.CompletedTask; + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs new file mode 100644 index 0000000000..bf9c0f25f5 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs @@ -0,0 +1,81 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Json; + +namespace Volo.Abp.ProjectModification +{ + public class ProjectNugetPackageAdder : ITransientDependency + { + public ILogger Logger { get; set; } + + protected IJsonSerializer JsonSerializer { get; } + protected ProjectNpmPackageAdder NpmPackageAdder { get; } + + public ProjectNugetPackageAdder( + IJsonSerializer jsonSerializer, + ProjectNpmPackageAdder npmPackageAdder) + { + JsonSerializer = jsonSerializer; + NpmPackageAdder = npmPackageAdder; + Logger = NullLogger.Instance; + } + + public async Task AddAsync(string projectFile, string packageName) + { + var packageInfo = await FindNugetPackageInfoAsync(packageName); + if (packageInfo == null) + { + return; + } + + Logger.LogInformation($"Installing '{packageName}' package to the project '{Path.GetFileNameWithoutExtension(projectFile)}'..."); + var procStartInfo = new ProcessStartInfo("dotnet", "add package " + packageName); + Process.Start(procStartInfo).WaitForExit(); + + var moduleFile = new AbpModuleFinder().Find(projectFile).First(); + new DependsOnAdder().Add(moduleFile, packageInfo.ModuleClass); + + if (packageInfo.DependedNpmPackage != null) + { + await NpmPackageAdder.AddAsync(Path.GetDirectoryName(projectFile), packageInfo.DependedNpmPackage); + } + + Logger.LogInformation("Successfully installed."); + } + + private async Task FindNugetPackageInfoAsync(string moduleName) + { + using (var client = new HttpClient()) + { + var url = "https://localhost:44328/api/app/nugetPackage/byName/?name=" + moduleName; + + var response = await client.GetAsync(url); + + if (!response.IsSuccessStatusCode) + { + if (response.StatusCode == HttpStatusCode.NotFound) + { + Logger.LogError($"ERROR: '{moduleName}' module could not be found."); + } + else + { + Logger.LogError($"ERROR: Remote server returns '{response.StatusCode}'"); + } + + return null; + } + + var responseContent = await response.Content.ReadAsStringAsync(); + return JsonSerializer.Deserialize(responseContent); + } + } + } +} \ No newline at end of file From 350928bb752b66340455b54f9a8606239cca2906 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 9 May 2019 10:22:38 +0300 Subject: [PATCH 084/335] Update BloggingDbContextModelBuilderExtensions.cs --- .../BloggingDbContextModelBuilderExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs index 425fb58575..acc400ef3f 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs @@ -54,7 +54,7 @@ namespace Volo.Blogging.EntityFrameworkCore b.Property(x => x.Url).IsRequired().HasMaxLength(PostConsts.MaxUrlLength).HasColumnName(nameof(Post.Url)); b.Property(x => x.Content).IsRequired(false).HasMaxLength(PostConsts.MaxContentLength).HasColumnName(nameof(Post.Content)); - b.HasMany(question => question.Tags).WithOne().HasForeignKey(qt => qt.PostId); + b.HasMany(p => p.Tags).WithOne().HasForeignKey(qt => qt.PostId); b.HasOne().WithMany().IsRequired().HasForeignKey(p => p.BlogId); }); From 203308a8e8bc52cb0ffa376e132abc7fdfd687ef Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 9 May 2019 10:36:57 +0300 Subject: [PATCH 085/335] Resolves #1101 Tag Helpers: Provide a way to ignore a property --- .../TagHelpers/Form/AbpDynamicformTagHelperService.cs | 5 +++++ .../TagHelpers/Form/DynamicFormIgnore.cs | 9 +++++++++ .../Pages/Components/DynamicForms.cshtml.cs | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DynamicFormIgnore.cs diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs index a9f3bb9c62..c7b20c6a33 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs @@ -205,6 +205,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form protected virtual List ExploreModelsRecursively(List list, ModelExplorer model) { + if (model.GetAttribute() != null) + { + return list; + } + if (IsCsharpClassOrPrimitive(model.ModelType) || IsListOfCsharpClassOrPrimitive(model.ModelType)) { list.Add(ModelExplorerToModelExpressionConverter(model)); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DynamicFormIgnore.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DynamicFormIgnore.cs new file mode 100644 index 0000000000..8726fc89ab --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DynamicFormIgnore.cs @@ -0,0 +1,9 @@ +using System; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form +{ + [AttributeUsage(AttributeTargets.Property)] + public class DynamicFormIgnore : Attribute + { + } +} diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs index c61423c6a6..276f760a27 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs @@ -139,6 +139,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Pages.Components [SelectItems(nameof(CountryList))] [Display(Name = "Neighbor Countries")] public List NeighborCountries { get; set; } + + [DynamicFormIgnore] + public string IgnoredProperty { get; set; } } public enum CarType From be2bb4ba274657e325c71a2d03f69843518c5d08 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 9 May 2019 14:49:05 +0300 Subject: [PATCH 086/335] Split add-package and add-module commands. --- .../Volo/Abp/Cli/AbpCliCoreModule.cs | 1 + .../Abp/Cli/Args/CommandLineArgumentParser.cs | 6 +- .../Volo/Abp/Cli/CliService.cs | 28 ++-- .../Volo/Abp/Cli/CliUsageException.cs | 19 +++ .../Volo/Abp/Cli/Commands/AddCommandHelper.cs | 20 +-- .../Volo/Abp/Cli/Commands/AddModuleCommand.cs | 91 +++++++++--- .../Abp/Cli/Commands/AddPackageCommand.cs | 110 ++++++++++++++ .../Volo/Abp/Cli/Utils/PathHelper.cs | 23 +++ .../Volo/Abp/Cli/Utils/VersionHelper.cs | 15 ++ .../Abp/ProjectBuilding/ProjectBuilder.cs | 3 +- .../Abp/ProjectModification/AddModuleArgs.cs | 26 ---- .../Abp/ProjectModification/ModuleAdder.cs | 137 ------------------ 12 files changed, 264 insertions(+), 215 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUsageException.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/PathHelper.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/VersionHelper.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AddModuleArgs.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index 101e9134d7..c1894b2e6b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -22,6 +22,7 @@ namespace Volo.Abp.Cli { options.Commands["help"] = typeof(HelpCommand); options.Commands["new"] = typeof(NewCommand); + options.Commands["add-package"] = typeof(AddPackageCommand); options.Commands["add-module"] = typeof(AddModuleCommand); options.Commands["login"] = typeof(LoginCommand); options.Commands["logout"] = typeof(LogoutCommand); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs index 7125699546..1dd29e5df7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs @@ -16,7 +16,7 @@ namespace Volo.Abp.Cli.Args var argumentList = args.ToList(); - //Get command + //Command var command = argumentList[0]; argumentList.RemoveAt(0); @@ -26,7 +26,7 @@ namespace Volo.Abp.Cli.Args return new CommandLineArgs(command); } - //Get target + //Target var target = argumentList[0]; if (target.StartsWith("-")) @@ -43,7 +43,7 @@ namespace Volo.Abp.Cli.Args return new CommandLineArgs(command, target); } - //Get options + //Options var commandLineArgs = new CommandLineArgs(command, target); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 854eabea96..40629a17c7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -1,28 +1,22 @@ using System; -using System.Reflection; using Microsoft.Extensions.DependencyInjection; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Commands; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; -using Volo.Abp.ProjectBuilding; namespace Volo.Abp.Cli { public class CliService : ITransientDependency { - //public static string Version => typeof(AbpCliCoreModule).Assembly - // .GetFileVersion() - // .RemovePostFix(".0"); - public static string Version => "0.17.0.0"; - public ILogger Logger { get; set; } protected ICommandLineArgumentParser CommandLineArgumentParser { get; } protected ICommandSelector CommandSelector { get; } - public IHybridServiceScopeFactory ServiceScopeFactory { get; } + protected IHybridServiceScopeFactory ServiceScopeFactory { get; } public CliService( ICommandLineArgumentParser commandLineArgumentParser, @@ -38,8 +32,8 @@ namespace Volo.Abp.Cli public async Task RunAsync(string[] args) { - Logger.LogInformation("ABP CLI (abp.io)"); - Logger.LogInformation("Version: " + Version); + Logger.LogInformation($"ABP CLI, version {VersionHelper.Version}."); + Logger.LogInformation("https://abp.io"); var commandLineArgs = CommandLineArgumentParser.Parse(args); var commandType = CommandSelector.Select(commandLineArgs); @@ -47,7 +41,19 @@ namespace Volo.Abp.Cli using (var scope = ServiceScopeFactory.CreateScope()) { var command = (IConsoleCommand)scope.ServiceProvider.GetRequiredService(commandType); - await command.ExecuteAsync(commandLineArgs); + + try + { + await command.ExecuteAsync(commandLineArgs); + } + catch (CliUsageException usageException) + { + Logger.LogWarning(usageException.Message); + } + catch (Exception ex) + { + Logger.LogException(ex); + } } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUsageException.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUsageException.cs new file mode 100644 index 0000000000..5ce2b7a1b3 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliUsageException.cs @@ -0,0 +1,19 @@ +using System; + +namespace Volo.Abp.Cli +{ + public class CliUsageException : Exception + { + public CliUsageException(string message) + : base(message) + { + + } + + public CliUsageException(string message, Exception innerException) + : base(message, innerException) + { + + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommandHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommandHelper.cs index 0704ecdbf3..d1b5c9d716 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommandHelper.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddCommandHelper.cs @@ -4,24 +4,6 @@ namespace Volo.Abp.Cli.Commands { public static class AddCommandHelper { - public static void WriteUsage(ILogger logger) - { - logger.LogWarning(""); - logger.LogWarning("'add' command is used to add a module to a solution or to a project."); - logger.LogWarning("Use in a solution folder to add a multi-package module to a solution."); - logger.LogWarning("Use in a project folder to add a single-package module to a project."); - logger.LogWarning(""); - logger.LogWarning("Usage:"); - logger.LogWarning(" abp add [-s|--solution] [-p|--project]"); - logger.LogWarning(""); - logger.LogWarning("Options:"); - logger.LogWarning(" -s|--solution Specify solution file explicitly."); - logger.LogWarning(" -p|--project Specify project file explicitly."); - logger.LogWarning(""); - logger.LogWarning("Examples:"); - logger.LogWarning(" abp add Volo.Abp.TenantManagement Adds tenant management module packages to the solution."); - logger.LogWarning(" abp add Volo.Abp.FluentValidation Adds a single module package to the project."); - logger.LogWarning(""); - } + } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index 6c5209c2e4..68204389f1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -1,7 +1,11 @@ -using Microsoft.Extensions.Logging; +using System; +using System.IO; +using System.Text; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using System.Threading.Tasks; using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; using Volo.Abp.ProjectModification; @@ -11,11 +15,11 @@ namespace Volo.Abp.Cli.Commands { public ILogger Logger { get; set; } - protected ModuleAdder ModuleAdder { get; } + protected SolutionModuleAdder SolutionModuleAdder { get; } - public AddModuleCommand(ModuleAdder moduleAdder) + public AddModuleCommand(SolutionModuleAdder solutionModuleAdder) { - ModuleAdder = moduleAdder; + SolutionModuleAdder = solutionModuleAdder; Logger = NullLogger.Instance; } @@ -23,18 +27,75 @@ namespace Volo.Abp.Cli.Commands { if (commandLineArgs.Target == null) { - Logger.LogWarning("Module name is missing."); - AddCommandHelper.WriteUsage(Logger); - return; + throw new CliUsageException("Module name is missing!" + Environment.NewLine + Environment.NewLine + GetUsageInfo()); } - await ModuleAdder.AddModuleAsync( - new AddModuleArgs( - commandLineArgs.Target, - commandLineArgs.Options.GetOrNull(Options.Solution.Short, Options.Solution.Long), - commandLineArgs.Options.GetOrNull(Options.Project.Short, Options.Project.Long) + await SolutionModuleAdder.AddAsync( + GetSolutionFile(commandLineArgs), + commandLineArgs.Target + ); + } + + private string GetSolutionFile(CommandLineArgs commandLineArgs) + { + var providedSolutionFile = PathHelper.NormalizePath( + commandLineArgs.Options.GetOrNull( + AddPackageCommand.Options.Project.Short, + AddPackageCommand.Options.Project.Long ) ); + + if (!providedSolutionFile.IsNullOrWhiteSpace()) + { + return providedSolutionFile; + } + + var foundSolutionFiles = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln"); + if (foundSolutionFiles.Length == 1) + { + return foundSolutionFiles[0]; + } + + if (foundSolutionFiles.Length == 0) + { + throw new CliUsageException("'abp add-module' command should be used inside a folder contaning a .sln file!"); + } + + //foundSolutionFiles.Length > 1 + + var sb = new StringBuilder("There are multiple solution (.sln) files in the current directory. Please specify one of the files below:"); + + foreach (var foundSolutionFile in foundSolutionFiles) + { + sb.AppendLine("* " + foundSolutionFile); + } + + sb.AppendLine("Example:"); + sb.AppendLine($"abp add-module {commandLineArgs.Target} -p {foundSolutionFiles[0]}"); + + throw new CliUsageException(sb.ToString()); + } + + protected virtual string GetUsageInfo() + { + var sb = new StringBuilder(); + + sb.AppendLine(""); + sb.AppendLine("'add-module' command is used to add a multi-package ABP module to a solution."); + sb.AppendLine("It should be used in a folder containing a .sln file."); + sb.AppendLine(""); + sb.AppendLine("Usage:"); + sb.AppendLine(" abp add-module [-s|--solution]"); + sb.AppendLine(""); + sb.AppendLine("Options:"); + sb.AppendLine(" -s|--solution Specify the solution file explicitly."); + sb.AppendLine(""); + sb.AppendLine("Examples:"); + sb.AppendLine(" abp add Volo.Blogging Adds the module to the current soluton."); + sb.AppendLine(" abp add Volo.Blogging -s Acme.BookStore Adds the module to the given soluton."); + sb.AppendLine(""); + + return sb.ToString(); } public static class Options @@ -44,12 +105,6 @@ namespace Volo.Abp.Cli.Commands public const string Short = "s"; public const string Long = "solution"; } - - public static class Project - { - public const string Short = "p"; - public const string Long = "project"; - } } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs new file mode 100644 index 0000000000..842a07fd64 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs @@ -0,0 +1,110 @@ +using System; +using System.IO; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.Utils; +using Volo.Abp.DependencyInjection; +using Volo.Abp.ProjectModification; + +namespace Volo.Abp.Cli.Commands +{ + public class AddPackageCommand : IConsoleCommand, ITransientDependency + { + public ILogger Logger { get; set; } + + protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; } + + public AddPackageCommand(ProjectNugetPackageAdder projectNugetPackageAdder) + { + ProjectNugetPackageAdder = projectNugetPackageAdder; + Logger = NullLogger.Instance; + } + + public virtual async Task ExecuteAsync(CommandLineArgs commandLineArgs) + { + if (commandLineArgs.Target == null) + { + throw new CliUsageException("Package name is missing!" + Environment.NewLine + Environment.NewLine + GetUsageInfo()); + } + + await ProjectNugetPackageAdder.AddAsync( + GetProjectFile(commandLineArgs), + commandLineArgs.Target + ); + } + + protected virtual string GetProjectFile(CommandLineArgs commandLineArgs) + { + var providedProjectFile = PathHelper.NormalizePath( + commandLineArgs.Options.GetOrNull( + Options.Project.Short, + Options.Project.Long + ) + ); + + if (!providedProjectFile.IsNullOrWhiteSpace()) + { + return providedProjectFile; + } + + var foundProjectFiles = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.csproj"); + if (foundProjectFiles.Length == 1) + { + return foundProjectFiles[0]; + } + + if (foundProjectFiles.Length == 0) + { + throw new CliUsageException("'abp add-package' command should be used inside a folder contaning a .csproj file!"); + } + + //foundProjectFiles.Length > 1 + + var sb = new StringBuilder("There are multiple project (.csproj) files in the current directory. Please specify one of the files below:"); + + foreach (var foundProjectFile in foundProjectFiles) + { + sb.AppendLine("* " + foundProjectFile); + } + + sb.AppendLine("Example:"); + sb.AppendLine($"abp add-package {commandLineArgs.Target} -p {foundProjectFiles[0]}"); + + throw new CliUsageException(sb.ToString()); + } + + protected virtual string GetUsageInfo() + { + var sb = new StringBuilder(); + + sb.AppendLine(""); + sb.AppendLine("'add-package' command is used to add an ABP package to a project."); + sb.AppendLine("It should be used in a folder containing a .csproj file."); + sb.AppendLine(""); + sb.AppendLine("Usage:"); + sb.AppendLine(" abp add-package [-p|--project]"); + sb.AppendLine(""); + sb.AppendLine("Options:"); + sb.AppendLine(" -p|--project Specify the project file explicitly."); + sb.AppendLine(""); + sb.AppendLine("Examples:"); + sb.AppendLine(" abp add Volo.Abp.FluentValidation Adds the package to the current project."); + sb.AppendLine(" abp add Volo.Abp.FluentValidation -p Acme.BookStore.Application Adds the package to the given project."); + sb.AppendLine(""); + + return sb.ToString(); + } + + public static class Options + { + public static class Project + { + public const string Short = "p"; + public const string Long = "project"; + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/PathHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/PathHelper.cs new file mode 100644 index 0000000000..eeb1751c84 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/PathHelper.cs @@ -0,0 +1,23 @@ +using System.IO; +using JetBrains.Annotations; + +namespace Volo.Abp.Cli.Utils +{ + public static class PathHelper + { + public static string NormalizePath([CanBeNull] string path) + { + if (string.IsNullOrEmpty(path)) + { + return path; + } + + if (Path.IsPathRooted(path)) + { + return path; + } + + return Path.Combine(Directory.GetCurrentDirectory(), path); + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/VersionHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/VersionHelper.cs new file mode 100644 index 0000000000..c57c447822 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/VersionHelper.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Reflection; +using System.Text; + +namespace Volo.Abp.Cli.Utils +{ + public static class VersionHelper + { + //public static string Version => typeof(AbpCliCoreModule).Assembly + // .GetFileVersion() + // .RemovePostFix(".0"); + public static string Version => "0.17.0.0"; + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs index 3a5c7a6b8a..100ed6a7ff 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using Volo.Abp.Cli; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; using Volo.Abp.ProjectBuilding.Building; @@ -31,7 +32,7 @@ namespace Volo.Abp.ProjectBuilding } } - var version = CliService.Version; + var version = VersionHelper.Version; var templateFile = await TemplateStore.GetAsync(args.TemplateName, version); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AddModuleArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AddModuleArgs.cs deleted file mode 100644 index eba87227f3..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AddModuleArgs.cs +++ /dev/null @@ -1,26 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.ProjectModification -{ - public class AddModuleArgs - { - [NotNull] - public string ModuleName { get; set; } - - [CanBeNull] - public string SolutionFile { get; set; } - - [CanBeNull] - public string ProjectFile { get; set; } - - public AddModuleArgs( - [NotNull] string moduleName, - [CanBeNull] string solutionFile = null, - [CanBeNull] string projectFile = null) - { - ModuleName = Check.NotNullOrWhiteSpace(moduleName, nameof(moduleName)); - SolutionFile = solutionFile; - ProjectFile = projectFile; - } - } -} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs deleted file mode 100644 index d6da6fea68..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleAdder.cs +++ /dev/null @@ -1,137 +0,0 @@ -using JetBrains.Annotations; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Volo.Abp.Cli.Commands; -using Volo.Abp.DependencyInjection; - -namespace Volo.Abp.ProjectModification -{ - public class ModuleAdder : ITransientDependency - { - public ILogger Logger { get; set; } - - protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; } - protected SolutionModuleAdder SolutionModuleAdder { get; } - - public ModuleAdder(ProjectNugetPackageAdder projectNugetPackageAdder, SolutionModuleAdder solutionModuleAdder) - { - ProjectNugetPackageAdder = projectNugetPackageAdder; - SolutionModuleAdder = solutionModuleAdder; - - Logger = NullLogger.Instance; - } - - public async Task AddModuleAsync(AddModuleArgs args) - { - ValidateArgs(args); - NormalizeArgs(args); - - if (args.ProjectFile.IsNullOrEmpty() && args.SolutionFile.IsNullOrEmpty()) - { - if (!TryToFillProjectOrSolutionName(args)) - { - Logger.LogWarning("Could not find any project (.csproj) or solution (.sln) file in the current directory!"); - AddCommandHelper.WriteUsage(Logger); - return; - } - } - - if (!args.ProjectFile.IsNullOrEmpty()) - { - await ProjectNugetPackageAdder.AddAsync(args.ProjectFile, args.ModuleName); - } - - if (!args.SolutionFile.IsNullOrEmpty()) - { - await SolutionModuleAdder.AddAsync(args.SolutionFile, args.ModuleName); - } - } - - private bool TryToFillProjectOrSolutionName(AddModuleArgs args) - { - var projectFiles = FindFiles(Directory.GetCurrentDirectory(), ".csproj"); - if (projectFiles.Length == 1) - { - args.ProjectFile = projectFiles.First(); - return true; - } - - if (projectFiles.Length > 1) - { - Logger.LogWarning( - "There are multiple project (.csproj) files in the current directory. Please specify one of the files below:"); - foreach (var projectFile in projectFiles) - { - Logger.LogWarning("* " + projectFile); - } - - Logger.LogWarning("Example:"); - Logger.LogWarning($"abp add {args.ModuleName} -p {projectFiles[0]}"); - return false; - } - - var solutionFiles = FindFiles(Directory.GetCurrentDirectory(), ".sln"); - if (solutionFiles.Length == 1) - { - args.SolutionFile = solutionFiles.First(); - return true; - } - - if (solutionFiles.Length > 1) - { - Logger.LogWarning( - "There are multiple solution (.sln) files in the current directory. Please specify one of the files below:"); - foreach (var solutionFile in solutionFiles) - { - Logger.LogWarning("* " + solutionFile); - } - - Logger.LogWarning("Example:"); - Logger.LogWarning($"abp add {args.ModuleName} -s {solutionFiles[0]}"); - } - - return false; - } - - private void ValidateArgs(AddModuleArgs args) - { - if (!args.ProjectFile.IsNullOrEmpty() && - !args.SolutionFile.IsNullOrEmpty()) - { - throw new ArgumentException("Can not specify a solution name and project name together."); - } - } - - private void NormalizeArgs(AddModuleArgs args) - { - args.ProjectFile = NormalizePath(args.ProjectFile); - args.SolutionFile = NormalizePath(args.SolutionFile); - } - - private static string NormalizePath([CanBeNull] string path) - { - if (string.IsNullOrEmpty(path)) - { - return path; - } - - if (Path.IsPathRooted(path)) - { - return path; - } - - return Path.Combine(Directory.GetCurrentDirectory(), path); - } - - - private string[] FindFiles(string directory, string fileExtension) - { - return Directory.GetFiles(directory, "*" + fileExtension); - } - } -} From 93345d08194d804eee41a1e8f6c6dd995ad4d434 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 9 May 2019 14:54:55 +0300 Subject: [PATCH 087/335] Refactor CLI --- .../AbpModuleClassFinder.cs | 64 +++++++++++++++++ .../ProjectModification/AbpModuleFinder.cs | 71 ------------------- ...OnAdder.cs => ModuleClassDependcyAdder.cs} | 9 +-- .../ProjectNugetPackageAdder.cs | 13 +++- .../SolutionModuleAdder.cs | 6 +- 5 files changed, 84 insertions(+), 79 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleFinder.cs rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/{DependsOnAdder.cs => ModuleClassDependcyAdder.cs} (76%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs new file mode 100644 index 0000000000..c4e0868659 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs @@ -0,0 +1,64 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Microsoft.CodeAnalysis.CSharp; +using Microsoft.CodeAnalysis.CSharp.Syntax; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.ProjectModification +{ + public class AbpModuleClassFinder : ITransientDependency + { + public virtual List Find(string csprojFilePath) + { + var modules = new List(); + + var csFiles = GetAllCsFilesUnderDirectory(Path.GetDirectoryName(csprojFilePath), new List()); + + foreach (var csFile in csFiles) + { + var root = CSharpSyntaxTree.ParseText(File.ReadAllText(csFile)).GetRoot(); + + var namespaceSyntaxs = root.DescendantNodes().OfType(); + + foreach (var namespaceSyntax in namespaceSyntaxs) + { + var classDeclarationSyntaxs = namespaceSyntax.DescendantNodes().OfType(); + var syntaxsArray = classDeclarationSyntaxs as ClassDeclarationSyntax[] ?? classDeclarationSyntaxs.ToArray(); + + foreach (var classDeclaration in syntaxsArray) + { + var classDerivedFromAbpModule = classDeclaration.BaseList?.Types.FirstOrDefault(t => t.ToString().Contains("AbpModule")); + + if (classDerivedFromAbpModule != null) + { + modules.Add(csFile); + } + } + } + } + + return modules; + } + + protected virtual List GetAllCsFilesUnderDirectory(string path, List allCsFileList) + { + var directory = new DirectoryInfo(path); + var files = directory.GetFiles("*.cs").Select(f => f.DirectoryName + "\\" + f.Name).ToList(); + + foreach (var s in files) + { + allCsFileList.Add(s); + } + + var directories = directory.GetDirectories().Select(d => path + "\\" + d.Name).ToList(); + + foreach (var subDirectory in directories) + { + allCsFileList = GetAllCsFilesUnderDirectory(subDirectory, allCsFileList); + } + + return allCsFileList; + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleFinder.cs deleted file mode 100644 index ca02137154..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleFinder.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.CSharp.Syntax; - -namespace Volo.Abp.ProjectModification -{ - public class AbpModuleFinder - { - public List Find(string csprojFilePath) - { - var modules = new List(); - - var csFiles = GetAllCsFilesUnderDirectory(Path.GetDirectoryName(csprojFilePath), new List()); - - foreach (var csFile in csFiles) - { - try - { - var root = CSharpSyntaxTree.ParseText(File.ReadAllText(csFile)).GetRoot(); - - var namespaceSyntaxs = root.DescendantNodes().OfType(); - - foreach (var namespaceSyntax in namespaceSyntaxs) - { - var classDeclarationSyntaxs = namespaceSyntax.DescendantNodes().OfType(); - var syntaxsArray = classDeclarationSyntaxs as ClassDeclarationSyntax[] ?? classDeclarationSyntaxs.ToArray(); - - foreach (var classDeclaration in syntaxsArray) - { - var classDerivedFromAbpModule = classDeclaration.BaseList?.Types.FirstOrDefault(t => t.ToString().Contains("AbpModule")); - - if (classDerivedFromAbpModule != null) - { - modules.Add(csFile); - } - } - } - } - catch (Exception) - { - //ignored! - } - } - - return modules; - } - - private static List GetAllCsFilesUnderDirectory(string path, List allCsFileList) - { - var directory = new DirectoryInfo(path); - var files = directory.GetFiles("*.cs").Select(f => f.DirectoryName + "\\" + f.Name).ToList(); - - foreach (var s in files) - { - allCsFileList.Add(s); - } - - var directories = directory.GetDirectories().Select(d => path + "\\" + d.Name).ToList(); - - foreach (var subDirectory in directories) - { - allCsFileList = GetAllCsFilesUnderDirectory(subDirectory, allCsFileList); - } - - return allCsFileList; - } - } -} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/DependsOnAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs similarity index 76% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/DependsOnAdder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs index d1dfd86d0a..f9835d239a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/DependsOnAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs @@ -1,12 +1,13 @@ using System; using System.IO; using System.Linq; +using Volo.Abp.DependencyInjection; namespace Volo.Abp.ProjectModification { - public class DependsOnAdder + public class ModuleClassDependcyAdder : ITransientDependency { - public void Add(string path, string module) + public virtual void Add(string path, string module) { ParseModuleNameAndNameSpace(module, out var nameSpace, out var moduleName); @@ -22,7 +23,7 @@ namespace Volo.Abp.ProjectModification File.WriteAllText(path, file); } - private void ParseModuleNameAndNameSpace(string module, out string nameSpace, out string moduleName) + protected virtual void ParseModuleNameAndNameSpace(string module, out string nameSpace, out string moduleName) { var words = module?.Split('.'); @@ -37,7 +38,7 @@ namespace Volo.Abp.ProjectModification nameSpace = string.Join(".", words.Take(words.Length - 1)); } - private string GetUsingStatement(string nameSpace) + protected virtual string GetUsingStatement(string nameSpace) { return "using " + nameSpace + ";"; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs index bf9c0f25f5..b6b7355f6d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs @@ -18,13 +18,19 @@ namespace Volo.Abp.ProjectModification protected IJsonSerializer JsonSerializer { get; } protected ProjectNpmPackageAdder NpmPackageAdder { get; } + protected AbpModuleClassFinder ModuleClassFinder { get; } + protected ModuleClassDependcyAdder ModuleClassDependcyAdder { get; } public ProjectNugetPackageAdder( IJsonSerializer jsonSerializer, - ProjectNpmPackageAdder npmPackageAdder) + ProjectNpmPackageAdder npmPackageAdder, + AbpModuleClassFinder moduleClassFinder, + ModuleClassDependcyAdder moduleClassDependcyAdder) { JsonSerializer = jsonSerializer; NpmPackageAdder = npmPackageAdder; + ModuleClassFinder = moduleClassFinder; + ModuleClassDependcyAdder = moduleClassDependcyAdder; Logger = NullLogger.Instance; } @@ -40,8 +46,9 @@ namespace Volo.Abp.ProjectModification var procStartInfo = new ProcessStartInfo("dotnet", "add package " + packageName); Process.Start(procStartInfo).WaitForExit(); - var moduleFile = new AbpModuleFinder().Find(projectFile).First(); - new DependsOnAdder().Add(moduleFile, packageInfo.ModuleClass); + var moduleFile = ModuleClassFinder.Find(projectFile).First(); + //TODO: Handle multiple module classes! + ModuleClassDependcyAdder.Add(moduleFile, packageInfo.ModuleClass); if (packageInfo.DependedNpmPackage != null) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs index c78099210c..75f957fecf 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs @@ -1,12 +1,16 @@ using System.Threading.Tasks; +using JetBrains.Annotations; using Volo.Abp.DependencyInjection; namespace Volo.Abp.ProjectModification { public class SolutionModuleAdder : ITransientDependency { - public async Task AddAsync(string solutionFile, string moduleName) + public virtual async Task AddAsync([NotNull] string solutionFile, [NotNull] string moduleName) { + Check.NotNull(solutionFile, nameof(solutionFile)); + Check.NotNull(moduleName, nameof(moduleName)); + } } From c4a61242d8cab946f65e39c8a2cf5ad4c0fed280 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 9 May 2019 16:26:35 +0300 Subject: [PATCH 088/335] refactor AbpModuleClassFinder --- .../AbpModuleClassFinder.cs | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs index c4e0868659..c023a4e082 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs @@ -11,34 +11,29 @@ namespace Volo.Abp.ProjectModification { public virtual List Find(string csprojFilePath) { - var modules = new List(); + var moduleFilePaths = new List(); var csFiles = GetAllCsFilesUnderDirectory(Path.GetDirectoryName(csprojFilePath), new List()); foreach (var csFile in csFiles) { - var root = CSharpSyntaxTree.ParseText(File.ReadAllText(csFile)).GetRoot(); - - var namespaceSyntaxs = root.DescendantNodes().OfType(); - - foreach (var namespaceSyntax in namespaceSyntaxs) + if (IsDerivedFromAbpModule(csFile)) { - var classDeclarationSyntaxs = namespaceSyntax.DescendantNodes().OfType(); - var syntaxsArray = classDeclarationSyntaxs as ClassDeclarationSyntax[] ?? classDeclarationSyntaxs.ToArray(); - - foreach (var classDeclaration in syntaxsArray) - { - var classDerivedFromAbpModule = classDeclaration.BaseList?.Types.FirstOrDefault(t => t.ToString().Contains("AbpModule")); - - if (classDerivedFromAbpModule != null) - { - modules.Add(csFile); - } - } + moduleFilePaths.Add(csFile); } } - return modules; + return moduleFilePaths; + } + + private bool IsDerivedFromAbpModule(string csFile) + { + var root = CSharpSyntaxTree.ParseText(File.ReadAllText(csFile)).GetRoot(); + var namespaceSyntax = root.DescendantNodes().OfType().First(); + var classDeclaration = (namespaceSyntax.DescendantNodes().OfType()).First(); + + return classDeclaration.BaseList?.Types + .Any(t => t.ToString().Contains("AbpModule")) ?? false; } protected virtual List GetAllCsFilesUnderDirectory(string path, List allCsFileList) From 9e4764a3957f7e6e7b2aa879f08f32a6baae8859 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 9 May 2019 17:35:19 +0300 Subject: [PATCH 089/335] Implemented SolutionModuleAdder --- .../Volo/Abp/Cli/Commands/AddModuleCommand.cs | 2 +- .../Abp/ProjectModification/ModuleInfo.cs | 15 ++ .../Abp/ProjectModification/NpmPackageInfo.cs | 2 - .../ProjectModification/NugetPackageInfo.cs | 2 +- .../ProjectModification/NugetPackageTarget.cs | 15 ++ .../ProjectNpmPackageAdder.cs | 18 +-- .../ProjectNugetPackageAdder.cs | 65 +++++---- .../SolutionModuleAdder.cs | 134 +++++++++++++++++- .../Volo/Abp/IO/DirectoryHelper.cs | 20 ++- 9 files changed, 233 insertions(+), 40 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleInfo.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageTarget.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index 68204389f1..553f2a76c2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -36,7 +36,7 @@ namespace Volo.Abp.Cli.Commands ); } - private string GetSolutionFile(CommandLineArgs commandLineArgs) + protected virtual string GetSolutionFile(CommandLineArgs commandLineArgs) { var providedSolutionFile = PathHelper.NormalizePath( commandLineArgs.Options.GetOrNull( diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleInfo.cs new file mode 100644 index 0000000000..0221b957e5 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleInfo.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; + +namespace Volo.Abp.ProjectModification +{ + public class ModuleInfo + { + public string Name { get; set; } + + public string DisplayName { get; set; } + + public List NugetPackages { get; set; } + + public List NpmPackages { get; set; } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs index 09ee9a8042..0778a4edce 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs @@ -5,7 +5,5 @@ public string Name { get; set; } public int ApplicationType { get; set; } //TODO: Enum? - - public bool IsPro { get; set; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs index 59974f23d3..b30d447d30 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs @@ -6,7 +6,7 @@ public string ModuleClass { get; set; } - public int Target { get; set; } //TODO: Enum? + public NugetPackageTarget Target { get; set; } public NpmPackageInfo DependedNpmPackage { get; set; } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageTarget.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageTarget.cs new file mode 100644 index 0000000000..93acba204d --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageTarget.cs @@ -0,0 +1,15 @@ +namespace Volo.Abp.ProjectModification +{ + public enum NugetPackageTarget : byte + { + DomainShared = 1, + Domain = 2, + ApplicationContracts = 3, + Application = 4, + HttpApi = 5, + HttpApiClient = 6, + Web = 7, + EntityFrameworkCore = 8, + MongoDB = 9 + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs index e6566ce21f..8b3c5432fa 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.DependencyInjection; +using Volo.Abp.IO; namespace Volo.Abp.ProjectModification { @@ -26,15 +27,16 @@ namespace Volo.Abp.ProjectModification Logger.LogInformation($"Installing '{npmPackage.Name}' package to the project '{packageJsonFilePath}'..."); - Logger.LogInformation("yarn add " + npmPackage.Name + "..."); - var procStartInfo = new ProcessStartInfo("cmd.exe", "/C yarn add " + npmPackage.Name); - procStartInfo.WindowStyle = ProcessWindowStyle.Normal; - Process.Start(procStartInfo).WaitForExit(); + using (DirectoryHelper.ChangeCurrentDirectory(directory)) + { + Logger.LogInformation("yarn add " + npmPackage.Name + "... " + Directory.GetCurrentDirectory()); + var procStartInfo = new ProcessStartInfo("cmd.exe", "/C yarn add " + npmPackage.Name); + Process.Start(procStartInfo).WaitForExit(); - Logger.LogInformation("gulp..."); - procStartInfo = new ProcessStartInfo("cmd.exe", "/C gulp"); - procStartInfo.WindowStyle = ProcessWindowStyle.Normal; - Process.Start(procStartInfo).WaitForExit(); + Logger.LogInformation("gulp... " + Directory.GetCurrentDirectory()); + procStartInfo = new ProcessStartInfo("cmd.exe", "/C gulp"); + Process.Start(procStartInfo).WaitForExit(); + } return Task.CompletedTask; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs index b6b7355f6d..821193676e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs @@ -1,13 +1,16 @@ -using System; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Cli; using Volo.Abp.DependencyInjection; +using Volo.Abp.IO; using Volo.Abp.Json; namespace Volo.Abp.ProjectModification @@ -36,29 +39,45 @@ namespace Volo.Abp.ProjectModification public async Task AddAsync(string projectFile, string packageName) { - var packageInfo = await FindNugetPackageInfoAsync(packageName); - if (packageInfo == null) + await AddAsync( + projectFile, + await FindNugetPackageInfoAsync(packageName) + ); + } + + public async Task AddAsync(string projectFile, NugetPackageInfo package) + { + using (DirectoryHelper.ChangeCurrentDirectory(Path.GetDirectoryName(projectFile))) { - return; - } + Logger.LogInformation($"Installing '{package.Name}' package to the project '{Path.GetFileNameWithoutExtension(projectFile)}'..."); - Logger.LogInformation($"Installing '{packageName}' package to the project '{Path.GetFileNameWithoutExtension(projectFile)}'..."); - var procStartInfo = new ProcessStartInfo("dotnet", "add package " + packageName); - Process.Start(procStartInfo).WaitForExit(); + var procStartInfo = new ProcessStartInfo("dotnet", "add package " + package.Name); + Process.Start(procStartInfo).WaitForExit(); - var moduleFile = ModuleClassFinder.Find(projectFile).First(); - //TODO: Handle multiple module classes! - ModuleClassDependcyAdder.Add(moduleFile, packageInfo.ModuleClass); + var moduleFiles = ModuleClassFinder.Find(projectFile); + if (moduleFiles.Count == 0) + { + throw new CliUsageException($"Could not find a class derived from AbpModule in the project {projectFile}"); + } - if (packageInfo.DependedNpmPackage != null) - { - await NpmPackageAdder.AddAsync(Path.GetDirectoryName(projectFile), packageInfo.DependedNpmPackage); - } + if (moduleFiles.Count > 1) + { + throw new CliUsageException($"There are multiple classes derived from AbpModule in the project {projectFile}: " + moduleFiles.JoinAsString(", ")); + } + + ModuleClassDependcyAdder.Add(moduleFiles.First(), package.ModuleClass); + + if (package.DependedNpmPackage != null) + { + await NpmPackageAdder.AddAsync(Path.GetDirectoryName(projectFile), package.DependedNpmPackage); + } - Logger.LogInformation("Successfully installed."); + Logger.LogInformation("Successfully installed."); + } } - private async Task FindNugetPackageInfoAsync(string moduleName) + + protected virtual async Task FindNugetPackageInfoAsync(string moduleName) { using (var client = new HttpClient()) { @@ -70,14 +89,10 @@ namespace Volo.Abp.ProjectModification { if (response.StatusCode == HttpStatusCode.NotFound) { - Logger.LogError($"ERROR: '{moduleName}' module could not be found."); - } - else - { - Logger.LogError($"ERROR: Remote server returns '{response.StatusCode}'"); + throw new CliUsageException($"'{moduleName}' nuget package could not be found!"); } - return null; + throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'"); } var responseContent = await response.Content.ReadAsStringAsync(); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs index 75f957fecf..70956c911d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs @@ -1,17 +1,147 @@ -using System.Threading.Tasks; +using System; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; using JetBrains.Annotations; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Newtonsoft.Json; +using Volo.Abp.Cli; using Volo.Abp.DependencyInjection; +using Volo.Abp.Json; namespace Volo.Abp.ProjectModification { public class SolutionModuleAdder : ITransientDependency { - public virtual async Task AddAsync([NotNull] string solutionFile, [NotNull] string moduleName) + public ILogger Logger { get; set; } + + protected IJsonSerializer JsonSerializer { get; } + protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; } + + public SolutionModuleAdder( + IJsonSerializer jsonSerializer, + ProjectNugetPackageAdder projectNugetPackageAdder) + { + JsonSerializer = jsonSerializer; + ProjectNugetPackageAdder = projectNugetPackageAdder; + Logger = NullLogger.Instance; + } + + public virtual async Task AddAsync( + [NotNull] string solutionFile, + [NotNull] string moduleName) { Check.NotNull(solutionFile, nameof(solutionFile)); Check.NotNull(moduleName, nameof(moduleName)); + var module = await FindModuleInfoAsync(moduleName); + var projectFiles = GetProjectFiles(solutionFile); + + foreach (var nugetPackage in module.NugetPackages) + { + var targetProjectFile = FindTargetProjectFile(projectFiles, nugetPackage.Target); + if (targetProjectFile == null) + { + continue; + } + + await ProjectNugetPackageAdder.AddAsync(targetProjectFile, nugetPackage); + } + } + + private string FindTargetProjectFile(string[] projectFiles, NugetPackageTarget target) + { + if (!projectFiles.Any()) + { + return null; + } + + var assemblyNames = projectFiles + .Select( + filePath => filePath + .Replace("\\", "/") + .Substring(filePath.LastIndexOf("/", StringComparison.OrdinalIgnoreCase) + 1) + .RemovePostFix(StringComparison.OrdinalIgnoreCase, ".csproj") + ).ToArray(); + + switch (target) + { + case NugetPackageTarget.Web: + return FindProjectEndsWith(assemblyNames, ".Web"); + case NugetPackageTarget.EntityFrameworkCore: + return FindProjectEndsWith(assemblyNames, ".EntityFrameworkCore") ?? + FindProjectEndsWith(assemblyNames, ".Web"); + case NugetPackageTarget.MongoDB: + return FindProjectEndsWith(assemblyNames, ".MongoDB") ?? + FindProjectEndsWith(assemblyNames, ".Web"); + case NugetPackageTarget.Application: + return FindProjectEndsWith(assemblyNames, ".Application") ?? + FindProjectEndsWith(assemblyNames, ".Web"); + case NugetPackageTarget.ApplicationContracts: + return FindProjectEndsWith(assemblyNames, ".Application.Contracts"); + case NugetPackageTarget.Domain: + return FindProjectEndsWith(assemblyNames, ".Domain") ?? + FindProjectEndsWith(assemblyNames, ".Application") ?? + FindProjectEndsWith(assemblyNames, ".Web"); + case NugetPackageTarget.DomainShared: + return FindProjectEndsWith(assemblyNames, ".Domain.Shared"); + case NugetPackageTarget.HttpApi: + return FindProjectEndsWith(assemblyNames, ".HttpApi") ?? + FindProjectEndsWith(assemblyNames, ".Web"); + case NugetPackageTarget.HttpApiClient: + return FindProjectEndsWith(assemblyNames, ".HttpApi.Client"); + default: + throw new ApplicationException($"{nameof(NugetPackageTarget)} has not implemented: {target}"); + } + } + + private static string FindProjectEndsWith(string[] projectAssemblyNames, string postfix) + { + return projectAssemblyNames.FirstOrDefault(p => p.EndsWith(postfix, StringComparison.OrdinalIgnoreCase)); + } + + protected virtual string[] GetProjectFiles(string solutionFile) + { + var baseProjectFolder = GetBaseProjectFolder(solutionFile); + return Directory.GetFiles(baseProjectFolder, "*.csproj", SearchOption.AllDirectories); + } + + protected virtual string GetBaseProjectFolder(string solutionFile) + { + var baseFolder = Path.GetDirectoryName(solutionFile); + var srcFolder = Path.Combine(baseFolder, "src"); + if (Directory.Exists(srcFolder)) + { + baseFolder = srcFolder; + } + + return baseFolder; + } + + protected virtual async Task FindModuleInfoAsync(string moduleName) + { + using (var client = new HttpClient()) + { + var url = "https://localhost:44328/api/app/module/byName/?name=" + moduleName; + + var response = await client.GetAsync(url); + + if (!response.IsSuccessStatusCode) + { + if (response.StatusCode == HttpStatusCode.NotFound) + { + throw new CliUsageException($"ERROR: '{moduleName}' module could not be found!"); + } + + throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'"); + } + var responseContent = await response.Content.ReadAsStringAsync(); + return JsonSerializer.Deserialize(responseContent); + } } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/IO/DirectoryHelper.cs b/framework/src/Volo.Abp.Core/Volo/Abp/IO/DirectoryHelper.cs index c4185cbbed..b864695430 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/IO/DirectoryHelper.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/IO/DirectoryHelper.cs @@ -1,4 +1,5 @@ -using System.IO; +using System; +using System.IO; using JetBrains.Annotations; namespace Volo.Abp.IO @@ -45,5 +46,22 @@ namespace Volo.Abp.IO return IsSubDirectoryOf(parentDirectory, parentOfChild); } + + public static IDisposable ChangeCurrentDirectory(string targetDirectory) + { + var currentDirectory = Directory.GetCurrentDirectory(); + + if (currentDirectory.Equals(targetDirectory, StringComparison.OrdinalIgnoreCase)) + { + return NullDisposable.Instance; + } + + Directory.SetCurrentDirectory(targetDirectory); + + return new DisposeAction(() => + { + Directory.SetCurrentDirectory(currentDirectory); + }); + } } } From 734eb640d90d58b89513de090481262fe495a129 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 9 May 2019 17:36:08 +0300 Subject: [PATCH 090/335] Added todo --- .../Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs index f9835d239a..cf2c8e579f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs @@ -5,6 +5,8 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.ProjectModification { + //TODO: Don't add if added before! + public class ModuleClassDependcyAdder : ITransientDependency { public virtual void Add(string path, string module) From ef758b544325a2694c9b2aff3e0b8240bcb810d2 Mon Sep 17 00:00:00 2001 From: musademir Date: Thu, 9 May 2019 20:04:08 +0300 Subject: [PATCH 091/335] AuditingStore optional HideErrors added --- .../Volo/Abp/Auditing/AbpAuditingOptions.cs | 9 +++++- .../Volo/Abp/AuditLogging/AuditingStore.cs | 28 ++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs index 616190af64..da406fa490 100644 --- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs +++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AbpAuditingOptions.cs @@ -9,6 +9,12 @@ namespace Volo.Abp.Auditing { //TODO: Consider to add an option to disable auditing for application service methods? + /// + /// If this value is true, auditing will not throw an exceptions and it will log it when an error occurred while saving AuditLog. + /// Default: true. + /// + public bool HideErrors { get; set; } + /// /// Default: true. /// @@ -36,11 +42,12 @@ namespace Volo.Abp.Auditing /// Default: false. /// public bool IsEnabledForGetRequests { get; set; } - + public AbpAuditingOptions() { IsEnabled = true; IsEnabledForAnonymousUsers = true; + HideErrors = true; Contributors = new List(); diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditingStore.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditingStore.cs index 59f3ae5431..ecb07300f0 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditingStore.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditingStore.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; using Volo.Abp.Auditing; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; @@ -16,29 +17,42 @@ namespace Volo.Abp.AuditLogging private readonly IAuditLogRepository _auditLogRepository; private readonly IGuidGenerator _guidGenerator; private readonly IUnitOfWorkManager _unitOfWorkManager; + private readonly AbpAuditingOptions Options; public AuditingStore( IAuditLogRepository auditLogRepository, IGuidGenerator guidGenerator, - IUnitOfWorkManager unitOfWorkManager) + IUnitOfWorkManager unitOfWorkManager, + IOptions options) { _auditLogRepository = auditLogRepository; _guidGenerator = guidGenerator; _unitOfWorkManager = unitOfWorkManager; + Options = options.Value; Logger = NullLogger.Instance; } + private async Task SaveLogAsync(AuditLogInfo auditInfo) + { + using (var uow = _unitOfWorkManager.Begin(requiresNew: true)) + { + var auditLog = new AuditLog(_guidGenerator, auditInfo); + await _auditLogRepository.InsertAsync(auditLog); + await uow.SaveChangesAsync(); + } + } public async Task SaveAsync(AuditLogInfo auditInfo) { + if (!Options.HideErrors) + { + await SaveLogAsync(auditInfo); + return; + } + try { - using (var uow = _unitOfWorkManager.Begin(requiresNew: true)) - { - var auditLog = new AuditLog(_guidGenerator, auditInfo); - await _auditLogRepository.InsertAsync(auditLog); - await uow.SaveChangesAsync(); - } + await SaveLogAsync(auditInfo); } catch (Exception ex) { From 0844678cad1ac5f44faac09698c602546d5eb9db Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 10 May 2019 08:41:04 +0300 Subject: [PATCH 092/335] ModuleClassDependcyAdder refactor --- .../ModuleClassDependcyAdder.cs | 80 ++++++++++++++++--- 1 file changed, 68 insertions(+), 12 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs index cf2c8e579f..be41884ff3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs @@ -5,8 +5,6 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.ProjectModification { - //TODO: Don't add if added before! - public class ModuleClassDependcyAdder : ITransientDependency { public virtual void Add(string path, string module) @@ -15,16 +13,79 @@ namespace Volo.Abp.ProjectModification var file = File.ReadAllText(path); - var indexOfEndingPublicClass = file.IndexOf("public class", StringComparison.Ordinal); - - var dependsOnAttribute = "[DependsOn(" + moduleName + ")]" + Environment.NewLine + " "; + if (file.Contains(GetUsingStatement(nameSpace)) && file.Contains(moduleName)) + { + return; + } - file = file.Insert(indexOfEndingPublicClass, dependsOnAttribute); - file = file.Insert(0, GetUsingStatement(nameSpace) + Environment.NewLine); //TODO: Add as the last item in the using list! + file = InsertDependsOnAttribute(file, moduleName); + file = InsertUsingStatement(file, nameSpace); File.WriteAllText(path, file); } + protected virtual string InsertDependsOnAttribute(string file, string moduleName) + { + var indexOfPublicClassDeclaration = GetIndexOfWhereDependsOnWillBeAdded(file); + var dependsOnAttribute = GetDependsOnAttribute(moduleName); + + return file.Insert(indexOfPublicClassDeclaration, dependsOnAttribute); + } + + protected virtual string InsertUsingStatement(string file, string nameSpace) + { + var indexOfTheEndOfTheLastUsingStatement = GetIndexOfTheEndOfTheLastUsingStatement(file); + + return file.Insert(indexOfTheEndOfTheLastUsingStatement, Environment.NewLine + GetUsingStatement(nameSpace)); + } + + protected virtual int GetIndexOfTheEndOfTheLastUsingStatement(string file) + { + var indexOfPublicClassDeclaration = GetIndexOfWhereDependsOnWillBeAdded(file); + file = file.Substring(0, indexOfPublicClassDeclaration); + + var indexOfTheStartOfLastUsingStatement = + file.LastIndexOf("using ", StringComparison.Ordinal); + + if (indexOfTheStartOfLastUsingStatement < 0) + { + return 0; + } + + var indexOfFirstSemiColonAfterLastUsingStatement = + file.Substring(indexOfTheStartOfLastUsingStatement).IndexOf(';'); + + if (indexOfFirstSemiColonAfterLastUsingStatement < 0) + { + return 0; + } + + return indexOfTheStartOfLastUsingStatement + + indexOfFirstSemiColonAfterLastUsingStatement + 1; + } + + protected virtual int GetIndexOfWhereDependsOnWillBeAdded(string file) + { + var indexOfPublicClassDeclaration = file.IndexOf("public class", StringComparison.Ordinal); + + if (indexOfPublicClassDeclaration < 0) + { + throw new Exception("\"public class\" declaration not found!"); + } + + return indexOfPublicClassDeclaration; + } + + protected virtual string GetDependsOnAttribute(string moduleName) + { + return "[DependsOn(" + moduleName + ")]" + Environment.NewLine + " "; + } + + protected virtual string GetUsingStatement(string nameSpace) + { + return "using " + nameSpace + ";"; + } + protected virtual void ParseModuleNameAndNameSpace(string module, out string nameSpace, out string moduleName) { var words = module?.Split('.'); @@ -39,10 +100,5 @@ namespace Volo.Abp.ProjectModification moduleName = words[words.Length - 1]; nameSpace = string.Join(".", words.Take(words.Length - 1)); } - - protected virtual string GetUsingStatement(string nameSpace) - { - return "using " + nameSpace + ";"; - } } } From 63674819292d81b0faab239753526604718b23e9 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 10 May 2019 12:39:10 +0300 Subject: [PATCH 093/335] Bug fixed generation select list from enum dynamicly --- .../TagHelpers/Form/AbpSelectTagHelperService.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs index 2c7e6ad1cf..b07100497e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs @@ -187,8 +187,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form { var localizer = _tagHelperLocalizer.GetLocalizer(explorer); - var selectItems = explorer.Metadata.IsEnum ? explorer.ModelType.GetTypeInfo().GetMembers(BindingFlags.Public | BindingFlags.Static) - .Select((t, i) => new SelectListItem { Value = i.ToString(), Text = GetLocalizedPropertyName(localizer, explorer.ModelType, t.Name) }).ToList() : null; + var selectItems = explorer.ModelType.GetTypeInfo().GetMembers(BindingFlags.Public | BindingFlags.Static) + .Select((t, i) => + new SelectListItem + { + Value = ((int) Enum.Parse(explorer.ModelType, t.Name)).ToString(), + Text = GetLocalizedPropertyName(localizer, explorer.ModelType, t.Name) + }).ToList(); return selectItems; } From 9016bd10681dc8603de38f59de203e75b588a46b Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 10 May 2019 15:25:16 +0300 Subject: [PATCH 094/335] Show help if no command specified --- .../Volo/Abp/Cli/Commands/CommandSelector.cs | 11 ++++++++--- .../Volo/Abp/Cli/Commands/HelpCommand.cs | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs index d3d3d7c736..595917e845 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs @@ -1,6 +1,6 @@ -using System; +using Microsoft.Extensions.Options; +using System; using System.Collections.Generic; -using Microsoft.Extensions.Options; using Volo.Abp.Cli.Args; using Volo.Abp.DependencyInjection; @@ -17,7 +17,12 @@ namespace Volo.Abp.Cli.Commands public Type Select(CommandLineArgs commandLineArgs) { - return Options.Commands.GetOrDefault(commandLineArgs.Command) + if (commandLineArgs.Command.IsNullOrWhiteSpace()) + { + return typeof(HelpCommand); + } + + return Options.Commands.GetOrDefault(commandLineArgs.Command) ?? typeof(HelpCommand); } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs index fdad2a445e..0094783555 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs @@ -9,11 +9,11 @@ namespace Volo.Abp.Cli.Commands { public Task ExecuteAsync(CommandLineArgs commandLineArgs) { - Console.WriteLine("*********** ABP CLI ****************"); Console.WriteLine(); Console.WriteLine("Usage:"); Console.WriteLine(); Console.WriteLine(" abp [options]"); + Console.WriteLine(); return Task.CompletedTask; } } From ae68ae646575a821a3e2c57cea5ccf1d44e07ef3 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 10 May 2019 15:34:11 +0300 Subject: [PATCH 095/335] Override Volo.Abp log level and enhance logging. --- .../Volo/Abp/Cli/Commands/HelpCommand.cs | 23 +++++++++++++------ .../Volo/Abp/Cli/Commands/LoginCommand.cs | 4 +++- .../Volo/Abp/Cli/Commands/NewCommand.cs | 1 + .../src/Volo.Abp.Cli/Volo.Abp.Cli.csproj | 3 +-- .../src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs | 2 ++ 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs index 0094783555..671bf3cbab 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs @@ -1,5 +1,6 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.DependencyInjection; @@ -7,13 +8,21 @@ namespace Volo.Abp.Cli.Commands { public class HelpCommand : IConsoleCommand, ITransientDependency { + public ILogger Logger { get; set; } + + public HelpCommand() + { + Logger = NullLogger.Instance; + } + public Task ExecuteAsync(CommandLineArgs commandLineArgs) { - Console.WriteLine(); - Console.WriteLine("Usage:"); - Console.WriteLine(); - Console.WriteLine(" abp [options]"); - Console.WriteLine(); + Logger.LogInformation(""); + Logger.LogInformation("Usage:"); + Logger.LogInformation(""); + Logger.LogInformation(" abp [options]"); + Logger.LogInformation(""); + return Task.CompletedTask; } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs index b0c96a7297..28bc64afd5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs @@ -25,6 +25,7 @@ namespace Volo.Abp.Cli.Commands { if (commandLineArgs.Target.IsNullOrEmpty()) { + Logger.LogInformation(""); Logger.LogWarning("Username is missing."); LogHelp(); return; @@ -34,6 +35,7 @@ namespace Volo.Abp.Cli.Commands var password = ConsoleHelper.ReadSecret(); if (password.IsNullOrWhiteSpace()) { + Logger.LogInformation(""); Logger.LogWarning("Password is missing."); LogHelp(); return; @@ -41,7 +43,7 @@ namespace Volo.Abp.Cli.Commands await AuthService.LoginAsync(commandLineArgs.Target, password); - Console.WriteLine($"Successfully logged in as '{commandLineArgs.Target}'"); + Logger.LogInformation($"Successfully logged in as '{commandLineArgs.Target}'"); } private void LogHelp() diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index c4ab4f6216..6961dcf21a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -27,6 +27,7 @@ namespace Volo.Abp.Cli.Commands { if (commandLineArgs.Target == null) { + Logger.LogInformation(""); Logger.LogWarning("Project name is missing."); Logger.LogWarning(""); Logger.LogWarning("Usage:"); diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj index 4f0de79850..f28c2554b2 100644 --- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj +++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj @@ -12,10 +12,9 @@ - + - diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs index 0bcff277c6..810be7af6c 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs @@ -13,6 +13,8 @@ namespace Volo.Abp.Cli Log.Logger = new LoggerConfiguration() .MinimumLevel.Information() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) + .MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning) + .MinimumLevel.Override("Volo.Abp.Cli", LogEventLevel.Information) .Enrich.FromLogContext() .WriteTo.File(Path.Combine(CliPaths.Log, "abp-cli-logs.txt")) .WriteTo.Console() From b9bf3b11cd61a01bcac873ff7ee3c8ebddcf01b9 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 10 May 2019 21:42:58 +0300 Subject: [PATCH 096/335] Added extension methods for IFileInfo and Stream. --- .../System/IO/AbpStreamExtensions.cs | 13 ++++++++- .../FileProviders/AbpFileInfoExtensions.cs | 27 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Core/System/IO/AbpStreamExtensions.cs b/framework/src/Volo.Abp.Core/System/IO/AbpStreamExtensions.cs index 88cf61b48e..e87ab67527 100644 --- a/framework/src/Volo.Abp.Core/System/IO/AbpStreamExtensions.cs +++ b/framework/src/Volo.Abp.Core/System/IO/AbpStreamExtensions.cs @@ -1,4 +1,6 @@ -namespace System.IO +using System.Threading.Tasks; + +namespace System.IO { public static class AbpStreamExtensions { @@ -10,5 +12,14 @@ return memoryStream.ToArray(); } } + + public static async Task GetAllBytesAsync(this Stream stream) + { + using (var memoryStream = new MemoryStream()) + { + await stream.CopyToAsync(memoryStream); + return memoryStream.ToArray(); + } + } } } diff --git a/framework/src/Volo.Abp.VirtualFileSystem/Microsoft/Extensions/FileProviders/AbpFileInfoExtensions.cs b/framework/src/Volo.Abp.VirtualFileSystem/Microsoft/Extensions/FileProviders/AbpFileInfoExtensions.cs index b6d60cd848..6217e82805 100644 --- a/framework/src/Volo.Abp.VirtualFileSystem/Microsoft/Extensions/FileProviders/AbpFileInfoExtensions.cs +++ b/framework/src/Volo.Abp.VirtualFileSystem/Microsoft/Extensions/FileProviders/AbpFileInfoExtensions.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using System.IO; using System.Text; +using System.Threading.Tasks; using Volo.Abp; namespace Microsoft.Extensions.FileProviders @@ -30,5 +31,31 @@ namespace Microsoft.Extensions.FileProviders } } } + + /// + /// Reads file content as byte[]. + /// + public static byte[] ReadBytes([NotNull] this IFileInfo fileInfo) + { + Check.NotNull(fileInfo, nameof(fileInfo)); + + using (var stream = fileInfo.CreateReadStream()) + { + return stream.GetAllBytes(); + } + } + + /// + /// Reads file content as byte[]. + /// + public static async Task ReadBytesAsync([NotNull] this IFileInfo fileInfo) + { + Check.NotNull(fileInfo, nameof(fileInfo)); + + using (var stream = fileInfo.CreateReadStream()) + { + return await stream.GetAllBytesAsync(); + } + } } } From f1153b6cfdf7490003b2cd0cfb58863c68d68579 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 10 May 2019 22:19:33 +0300 Subject: [PATCH 097/335] Move to Cli namespace. --- .../Volo.Abp.Cli.Core.csproj | 1 + .../Volo/Abp/Cli/CliOptions.cs | 4 + .../Volo/Abp/Cli/Commands/AddModuleCommand.cs | 2 +- .../Abp/Cli/Commands/AddPackageCommand.cs | 2 +- .../Volo/Abp/Cli/Commands/NewCommand.cs | 4 +- .../Cli/ProjectBuilding/AbpIoTemplateStore.cs | 87 +++++++++++++++++++ .../Building/DatabaseProvider.cs | 2 +- .../Building/GithubRepositoryInfo.cs | 2 +- .../Building/ProjectBuildContext.cs | 4 +- .../Building/ProjectBuildContextExtensions.cs | 4 +- .../Building/ProjectBuildPipeline.cs | 2 +- .../Building/ProjectBuildPipelineBuilder.cs | 4 +- .../Building/ProjectBuildPipelineStep.cs | 2 +- .../ProjectBuilding/Building/ProjectResult.cs | 2 +- .../Steps/CreateProjectResultZipStep.cs | 6 +- .../Building/Steps/FileEntryListReadStep.cs | 6 +- .../Steps/NugetReferenceReplaceStep.cs | 4 +- .../Steps/RemoveProjectFromSolutionStep.cs | 2 +- .../Building/Steps/SolutionRenameStep.cs | 4 +- .../SwitchEntityFrameworkCoreToMongoDbStep.cs | 4 +- .../Building/Steps/TemplateCodeDeleteStep.cs | 4 +- .../ProjectBuilding/Building/TemplateInfo.cs | 2 +- .../{ => Cli}/ProjectBuilding/DownloadInfo.cs | 4 +- .../ProjectBuilding/Files/FileEntry.cs | 2 +- .../Files/FileEntryExtensions.cs | 2 +- .../ProjectBuilding/Files/FileEntryList.cs | 2 +- .../Files/FileEntryListExtensions.cs | 2 +- .../ProjectBuilding/Github/GithubRelease.cs | 2 +- .../ProjectBuilding/IProjectBuilder.cs | 2 +- .../ProjectBuilding/ITemplateInfoProvider.cs | 4 +- .../Abp/Cli/ProjectBuilding/ITemplateStore.cs | 15 ++++ .../ProjectBuilding/ProjectBuildArgs.cs | 4 +- .../ProjectBuilding/ProjectBuildResult.cs | 2 +- .../ProjectBuilding/ProjectBuilder.cs | 12 ++- .../{ => Cli}/ProjectBuilding/SolutionName.cs | 2 +- .../{ => Cli}/ProjectBuilding/TemplateFile.cs | 2 +- .../ProjectBuilding/TemplateInfoProvider.cs | 6 +- .../Templates/MvcApplicationTemplate.cs | 6 +- .../Templates/MvcModuleTemplate.cs | 4 +- .../Templates/ServiceTemplate.cs | 4 +- .../Zipping/ZipFileExtensions.cs | 4 +- .../AbpModuleClassFinder.cs | 2 +- .../ModuleClassDependcyAdder.cs | 2 +- .../ProjectModification/ModuleInfo.cs | 2 +- .../ProjectModification/NpmPackageInfo.cs | 2 +- .../ProjectModification/NugetPackageInfo.cs | 2 +- .../ProjectModification/NugetPackageTarget.cs | 2 +- .../ProjectNpmPackageAdder.cs | 2 +- .../ProjectNugetPackageAdder.cs | 9 +- .../SolutionModuleAdder.cs | 4 +- .../Abp/ProjectBuilding/AbpIoTemplateStore.cs | 45 ---------- .../Abp/ProjectBuilding/ITemplateStore.cs | 9 -- .../Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs | 8 +- 53 files changed, 192 insertions(+), 132 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/DatabaseProvider.cs (70%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/GithubRepositoryInfo.cs (94%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/ProjectBuildContext.cs (91%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/ProjectBuildContextExtensions.cs (83%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/ProjectBuildPipeline.cs (90%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs (86%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/ProjectBuildPipelineStep.cs (71%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/ProjectResult.cs (63%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs (79%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs (82%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/Steps/SolutionRenameStep.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs (96%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs (81%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Building/TemplateInfo.cs (94%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/DownloadInfo.cs (92%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Files/FileEntry.cs (98%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Files/FileEntryExtensions.cs (98%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Files/FileEntryList.cs (82%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Files/FileEntryListExtensions.cs (92%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Github/GithubRelease.cs (89%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/IProjectBuilder.cs (79%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/ITemplateInfoProvider.cs (60%) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/ProjectBuildArgs.cs (88%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/ProjectBuildResult.cs (87%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/ProjectBuilder.cs (85%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/SolutionName.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/TemplateFile.cs (81%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/TemplateInfoProvider.cs (86%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Templates/MvcApplicationTemplate.cs (93%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Templates/MvcModuleTemplate.cs (75%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Templates/ServiceTemplate.cs (73%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectBuilding/Zipping/ZipFileExtensions.cs (94%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/AbpModuleClassFinder.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/ModuleClassDependcyAdder.cs (98%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/ModuleInfo.cs (87%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/NpmPackageInfo.cs (76%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/NugetPackageInfo.cs (84%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/NugetPackageTarget.cs (85%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/ProjectNpmPackageAdder.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/ProjectNugetPackageAdder.cs (97%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/{ => Cli}/ProjectModification/SolutionModuleAdder.cs (98%) delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateStore.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj index 46b59109c7..708c296880 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj +++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj @@ -22,6 +22,7 @@ + diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs index 3885314e70..09cbbe09b7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs @@ -7,6 +7,10 @@ namespace Volo.Abp.Cli { public Dictionary Commands { get; } + public string AbpIoWwwUrlRoot { get; set; } = "https://abp.io/"; + + public string AbpIoAccountUrlRoot { get; set; } = "https://account.abp.io/"; + public CliOptions() { Commands = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index 553f2a76c2..7cee3f1e69 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -5,9 +5,9 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using System.Threading.Tasks; using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.ProjectModification; using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; -using Volo.Abp.ProjectModification; namespace Volo.Abp.Cli.Commands { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs index 842a07fd64..19de9a164a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs @@ -5,9 +5,9 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.ProjectModification; using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; -using Volo.Abp.ProjectModification; namespace Volo.Abp.Cli.Commands { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 6961dcf21a..59790a7c7d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -4,9 +4,9 @@ using Ionic.Zip; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; +using Volo.Abp.Cli.ProjectBuilding; +using Volo.Abp.Cli.ProjectBuilding.Building; using Volo.Abp.DependencyInjection; -using Volo.Abp.ProjectBuilding; -using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.Cli.Commands { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs new file mode 100644 index 0000000000..cc2d0e9e93 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs @@ -0,0 +1,87 @@ +using System; +using System.IO; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; +using Volo.Abp.Cli.ProjectBuilding.Building; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Http; +using Volo.Abp.IO; +using Volo.Abp.Json; +using Volo.Abp.Threading; + +namespace Volo.Abp.Cli.ProjectBuilding +{ + public class AbpIoTemplateStore : ITemplateStore, ITransientDependency + { + public ILogger Logger { get; set; } + + protected CliOptions Options { get; } + protected IJsonSerializer JsonSerializer { get; } + protected ICancellationTokenProvider CancellationTokenProvider { get; } + + public AbpIoTemplateStore( + IOptions options, + IJsonSerializer jsonSerializer, + ICancellationTokenProvider cancellationTokenProvider) + { + JsonSerializer = jsonSerializer; + CancellationTokenProvider = cancellationTokenProvider; + Options = options.Value; + + Logger = NullLogger.Instance; + } + + public async Task GetAsync( + string name, + string version, + DatabaseProvider databaseProvider, + string projectName) + { + var localCacheFolder = Path.Combine(CliPaths.TemplateCache, version); + DirectoryHelper.CreateIfNotExists(localCacheFolder); + + var localCacheFile = Path.Combine(localCacheFolder, name + ".zip"); + if (File.Exists(localCacheFile)) + { + Logger.LogInformation("Using cached template: " + name + ", version: " + version); + return new TemplateFile(File.ReadAllBytes(localCacheFile)); + } + + Logger.LogInformation("Downloading template: " + name + ", version: " + version); + + using (var client = new System.Net.Http.HttpClient()) + { + client.Timeout = TimeSpan.FromMinutes(5); + var downloadUrl = Options.AbpIoWwwUrlRoot + "api/download/template/"; + + var serializedPostDataAsString = JsonSerializer.Serialize(new + { + name = name, + version = version, + databaseProvider = databaseProvider, + projectName = projectName + }); + + var responseMessage = await client.PostAsync( + downloadUrl, + new StringContent(serializedPostDataAsString, Encoding.UTF8, MimeTypes.Application.Json), + CancellationTokenProvider.Token + ); + + if (!responseMessage.IsSuccessStatusCode) + { + throw new Exception("Remote server returns error! HTTP status code: " + responseMessage.StatusCode); + } + + var fileContent = await responseMessage.Content.ReadAsByteArrayAsync(); + + File.WriteAllBytes(localCacheFile, fileContent); + return new TemplateFile(fileContent); + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/DatabaseProvider.cs similarity index 70% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/DatabaseProvider.cs index 0352bed89c..852c63057a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/DatabaseProvider.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public enum DatabaseProvider { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/GithubRepositoryInfo.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/GithubRepositoryInfo.cs index 7a7277f8a4..22c8bbe569 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/GithubRepositoryInfo.cs @@ -1,6 +1,6 @@ using System; -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public class GithubRepositoryInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContext.cs similarity index 91% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContext.cs index 7e16a377c6..256d9ec003 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; -using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Files; -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public class ProjectBuildContext { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContextExtensions.cs similarity index 83% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContextExtensions.cs index b4623e6744..e793c77011 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContextExtensions.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Files; -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public static class ProjectBuildContextExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipeline.cs similarity index 90% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipeline.cs index c4afe2aab6..a6e5e2e56f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipeline.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public class ProjectBuildPipeline { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs similarity index 86% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs index 35ea1bfe39..c4d15d5548 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs @@ -1,6 +1,6 @@ -using Volo.Abp.ProjectBuilding.Building.Steps; +using Volo.Abp.Cli.ProjectBuilding.Building.Steps; -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public static class ProjectBuildPipelineBuilder { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipelineStep.cs similarity index 71% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipelineStep.cs index 3080224ed2..d148cea84a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipelineStep.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public abstract class ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectResult.cs similarity index 63% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectResult.cs index 19230adfb5..206a713413 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectResult.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public class ProjectResult { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs similarity index 79% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs index a2b468effd..53e9415617 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs @@ -1,8 +1,8 @@ using Ionic.Zip; -using Volo.Abp.ProjectBuilding.Files; -using Volo.Abp.ProjectBuilding.Zipping; +using Volo.Abp.Cli.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Zipping; -namespace Volo.Abp.ProjectBuilding.Building.Steps +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps { public class CreateProjectResultZipStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs similarity index 82% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs index 22f1d8840f..3484621df1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs @@ -1,9 +1,9 @@ using System.IO; using Ionic.Zip; -using Volo.Abp.ProjectBuilding.Files; -using Volo.Abp.ProjectBuilding.Zipping; +using Volo.Abp.Cli.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Zipping; -namespace Volo.Abp.ProjectBuilding.Building.Steps +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps { public class FileEntryListReadStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs index 3d41c682dc..7c2c80a48c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs @@ -2,9 +2,9 @@ using System.IO; using System.Linq; using HtmlAgilityPack; -using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Files; -namespace Volo.Abp.ProjectBuilding.Building.Steps +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps { public class NugetReferenceReplaceStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs index c956e4b4ab..f13098f0df 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Volo.Abp.ProjectBuilding.Building.Steps +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps { public class RemoveProjectFromSolutionStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs index 20f2810633..069b05ff3a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SolutionRenameStep.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Files; -namespace Volo.Abp.ProjectBuilding.Building.Steps +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps { public class SolutionRenameStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs similarity index 96% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs index b1f55b4ba7..4a6372f15a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs @@ -1,7 +1,7 @@ using System; -using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Files; -namespace Volo.Abp.ProjectBuilding.Building.Steps +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps { public class SwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs similarity index 81% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs index aa3990905a..e673446d9f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs @@ -1,6 +1,6 @@ -using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Files; -namespace Volo.Abp.ProjectBuilding.Building.Steps +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps { public class TemplateCodeDeleteStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs index c85d1d571c..4041dc8d7a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; -namespace Volo.Abp.ProjectBuilding.Building +namespace Volo.Abp.Cli.ProjectBuilding.Building { public abstract class TemplateInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/DownloadInfo.cs similarity index 92% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/DownloadInfo.cs index 9d07f6e022..e8f51f5958 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/DownloadInfo.cs @@ -1,9 +1,9 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Volo.Abp.Cli.ProjectBuilding.Building; using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.ProjectBuilding.Building; -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { [Table("Downloads")] public class DownloadInfo : CreationAuditedAggregateRoot diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntry.cs similarity index 98% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntry.cs index 5dd67846d2..ffa248c9f2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntry.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace Volo.Abp.ProjectBuilding.Files +namespace Volo.Abp.Cli.ProjectBuilding.Files { public class FileEntry { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs similarity index 98% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs index 19bf75456c..699e77fd2e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.ProjectBuilding.Files +namespace Volo.Abp.Cli.ProjectBuilding.Files { public static class FileEntryExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryList.cs similarity index 82% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryList.cs index 34543e31fa..69c7b89d6f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryList.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.ProjectBuilding.Files +namespace Volo.Abp.Cli.ProjectBuilding.Files { public class FileEntryList : List { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryListExtensions.cs similarity index 92% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryListExtensions.cs index 1a1a47c1c6..d8eff66813 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryListExtensions.cs @@ -1,7 +1,7 @@ using System; using Ionic.Zip; -namespace Volo.Abp.ProjectBuilding.Files +namespace Volo.Abp.Cli.ProjectBuilding.Files { public static class FileEntryListExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Github/GithubRelease.cs similarity index 89% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Github/GithubRelease.cs index 449f9a43d5..9d37befbc2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Github/GithubRelease.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace Volo.Abp.ProjectBuilding.Github +namespace Volo.Abp.Cli.ProjectBuilding.Github { [JsonObject] public class GithubRelease diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/IProjectBuilder.cs similarity index 79% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/IProjectBuilder.cs index c037442711..5f8caa3252 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/IProjectBuilder.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { public interface IProjectBuilder { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateInfoProvider.cs similarity index 60% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateInfoProvider.cs index 789e11b341..5330bc9962 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateInfoProvider.cs @@ -1,6 +1,6 @@ -using Volo.Abp.ProjectBuilding.Building; +using Volo.Abp.Cli.ProjectBuilding.Building; -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { public interface ITemplateInfoProvider { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs new file mode 100644 index 0000000000..d8206b9200 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs @@ -0,0 +1,15 @@ +using System.Threading.Tasks; +using Volo.Abp.Cli.ProjectBuilding.Building; + +namespace Volo.Abp.Cli.ProjectBuilding +{ + public interface ITemplateStore + { + Task GetAsync( + string name, + string version, + DatabaseProvider databaseProvider, + string projectName + ); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs similarity index 88% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs index fffeb87a6c..6767a4e164 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; -using Volo.Abp.ProjectBuilding.Building; +using Volo.Abp.Cli.ProjectBuilding.Building; -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { public class ProjectBuildArgs { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildResult.cs similarity index 87% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildResult.cs index 2acf036ddc..eb5e524f40 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildResult.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { public class ProjectBuildResult { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs similarity index 85% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs index 100ed6a7ff..0d8d96c9d1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs @@ -1,11 +1,10 @@ using System; using System.Threading.Tasks; -using Volo.Abp.Cli; +using Volo.Abp.Cli.ProjectBuilding.Building; using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; -using Volo.Abp.ProjectBuilding.Building; -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { public class ProjectBuilder : IProjectBuilder, ITransientDependency { @@ -34,7 +33,12 @@ namespace Volo.Abp.ProjectBuilding var version = VersionHelper.Version; - var templateFile = await TemplateStore.GetAsync(args.TemplateName, version); + var templateFile = await TemplateStore.GetAsync( + args.TemplateName, + version, + args.DatabaseProvider, + args.SolutionName.FullName + ); var context = new ProjectBuildContext( templateInfo, diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/SolutionName.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/SolutionName.cs index 0e274f5ceb..ba93774fbe 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/SolutionName.cs @@ -1,6 +1,6 @@ using System; -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { public class SolutionName { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateFile.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs similarity index 81% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateFile.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs index d1f839e27b..1abe65044e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateFile.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { public class TemplateFile { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs similarity index 86% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs index e386bd7ef1..1aa9f5b6ef 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs @@ -1,9 +1,9 @@ using System; +using Volo.Abp.Cli.ProjectBuilding.Building; +using Volo.Abp.Cli.ProjectBuilding.Templates; using Volo.Abp.DependencyInjection; -using Volo.Abp.ProjectBuilding.Building; -using Volo.Abp.ProjectBuilding.Templates; -namespace Volo.Abp.ProjectBuilding +namespace Volo.Abp.Cli.ProjectBuilding { public class TemplateInfoProvider : ITemplateInfoProvider, ITransientDependency { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcApplicationTemplate.cs similarity index 93% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcApplicationTemplate.cs index 581fe9fcb5..b40d577285 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcApplicationTemplate.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Volo.Abp.ProjectBuilding.Building; -using Volo.Abp.ProjectBuilding.Building.Steps; +using Volo.Abp.Cli.ProjectBuilding.Building; +using Volo.Abp.Cli.ProjectBuilding.Building.Steps; -namespace Volo.Abp.ProjectBuilding.Templates +namespace Volo.Abp.Cli.ProjectBuilding.Templates { public class MvcApplicationTemplate : TemplateInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModuleTemplate.cs similarity index 75% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModuleTemplate.cs index f37c967b2f..1f1f5b3c39 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModuleTemplate.cs @@ -1,6 +1,6 @@ -using Volo.Abp.ProjectBuilding.Building; +using Volo.Abp.Cli.ProjectBuilding.Building; -namespace Volo.Abp.ProjectBuilding.Templates +namespace Volo.Abp.Cli.ProjectBuilding.Templates { public class MvcModuleTemplate : TemplateInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/ServiceTemplate.cs similarity index 73% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/ServiceTemplate.cs index 4b547eead0..425029982c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/ServiceTemplate.cs @@ -1,6 +1,6 @@ -using Volo.Abp.ProjectBuilding.Building; +using Volo.Abp.Cli.ProjectBuilding.Building; -namespace Volo.Abp.ProjectBuilding.Templates +namespace Volo.Abp.Cli.ProjectBuilding.Templates { public class ServiceTemplate : TemplateInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Zipping/ZipFileExtensions.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Zipping/ZipFileExtensions.cs index 97536bd6ea..0160c8390e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Zipping/ZipFileExtensions.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Ionic.Zip; -using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.Cli.ProjectBuilding.Files; -namespace Volo.Abp.ProjectBuilding.Zipping +namespace Volo.Abp.Cli.ProjectBuilding.Zipping { public static class ZipFileExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs index c023a4e082..09d8bad0b8 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/AbpModuleClassFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs @@ -5,7 +5,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; using Volo.Abp.DependencyInjection; -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public class AbpModuleClassFinder : ITransientDependency { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs similarity index 98% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs index be41884ff3..abb5a0c825 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleClassDependcyAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using Volo.Abp.DependencyInjection; -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public class ModuleClassDependcyAdder : ITransientDependency { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs similarity index 87% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs index 0221b957e5..08c70eeede 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ModuleInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public class ModuleInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs similarity index 76% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs index 0778a4edce..59273b718c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NpmPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public class NpmPackageInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs similarity index 84% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs index b30d447d30..fe4ccf348c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public class NugetPackageInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageTarget.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs similarity index 85% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageTarget.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs index 93acba204d..ec80181f82 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/NugetPackageTarget.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public enum NugetPackageTarget : byte { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs index 8b3c5432fa..cc77ab2554 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNpmPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.DependencyInjection; using Volo.Abp.IO; -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public class ProjectNpmPackageAdder : ITransientDependency { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs index 821193676e..56cf89ca1c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/ProjectNugetPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs @@ -1,6 +1,4 @@ -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -8,12 +6,13 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Volo.Abp.Cli; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.DependencyInjection; using Volo.Abp.IO; using Volo.Abp.Json; -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public class ProjectNugetPackageAdder : ITransientDependency { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs similarity index 98% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 70956c911d..2afa2cd95f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -7,12 +7,10 @@ using System.Threading.Tasks; using JetBrains.Annotations; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Newtonsoft.Json; -using Volo.Abp.Cli; using Volo.Abp.DependencyInjection; using Volo.Abp.Json; -namespace Volo.Abp.ProjectModification +namespace Volo.Abp.Cli.ProjectModification { public class SolutionModuleAdder : ITransientDependency { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs deleted file mode 100644 index 4715d3558e..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.IO; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using Volo.Abp.Cli; -using Volo.Abp.DependencyInjection; -using Volo.Abp.IO; - -namespace Volo.Abp.ProjectBuilding -{ - public class AbpIoTemplateStore : ITemplateStore, ITransientDependency - { - public ILogger Logger { get; set; } - - public AbpIoTemplateStore() - { - Logger = NullLogger.Instance; - } - - public async Task GetAsync(string templateName, string version) - { - var localCacheFolder = Path.Combine(CliPaths.TemplateCache, version); - DirectoryHelper.CreateIfNotExists(localCacheFolder); - - var localCacheFile = Path.Combine(localCacheFolder, templateName + ".zip"); - if (File.Exists(localCacheFile)) - { - Logger.LogInformation("Using cached template: " + templateName + ", version: " + version); - return new TemplateFile(File.ReadAllBytes(localCacheFile)); - } - - Logger.LogInformation("Downloading template: " + templateName + ", version: " + version); - - using (var client = new System.Net.Http.HttpClient()) - { - client.Timeout = TimeSpan.FromMinutes(5); - var downloadUrl = "https://abp.io/downloads/templates/" + version + "/" + templateName + ".zip"; - var fileContents = await client.GetByteArrayAsync(downloadUrl); - File.WriteAllBytes(localCacheFile, fileContents); - return new TemplateFile(fileContents); - } - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateStore.cs deleted file mode 100644 index f09faa8603..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateStore.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.ProjectBuilding -{ - public interface ITemplateStore - { - Task GetAsync(string templateInfoName, string version); - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs index 7a3fbdc2bf..d20db3d6dc 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs @@ -11,7 +11,13 @@ namespace Volo.Abp.Cli { public override void ConfigureServices(ServiceConfigurationContext context) { - +#if DEBUG + Configure(options => + { + options.AbpIoWwwUrlRoot = "https://localhost:44328/"; + options.AbpIoAccountUrlRoot = "https://localhost:44333/"; + }); +#endif } } } \ No newline at end of file From 54c6b2fae121655bbec75b319859cd5340053c51 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 12 May 2019 21:25:43 +0300 Subject: [PATCH 098/335] Send access token if exists. --- .../Cli/ProjectBuilding/AbpIoTemplateStore.cs | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs index cc2d0e9e93..74683197d5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs @@ -1,11 +1,11 @@ -using System; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; +using System; using System.IO; using System.Net.Http; using System.Text; using System.Threading.Tasks; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Options; using Volo.Abp.Cli.ProjectBuilding.Building; using Volo.Abp.DependencyInjection; using Volo.Abp.Http; @@ -36,8 +36,8 @@ namespace Volo.Abp.Cli.ProjectBuilding } public async Task GetAsync( - string name, - string version, + string name, + string version, DatabaseProvider databaseProvider, string projectName) { @@ -55,8 +55,16 @@ namespace Volo.Abp.Cli.ProjectBuilding using (var client = new System.Net.Http.HttpClient()) { - client.Timeout = TimeSpan.FromMinutes(5); - var downloadUrl = Options.AbpIoWwwUrlRoot + "api/download/template/"; + client.Timeout = TimeSpan.FromMinutes(3); + + if (File.Exists(CliPaths.AccessToken)) + { + var accessToken = File.ReadAllText(CliPaths.AccessToken, Encoding.UTF8); + if (!accessToken.IsNullOrEmpty()) + { + client.SetBearerToken(accessToken); + } + } var serializedPostDataAsString = JsonSerializer.Serialize(new { @@ -66,6 +74,7 @@ namespace Volo.Abp.Cli.ProjectBuilding projectName = projectName }); + var downloadUrl = Options.AbpIoWwwUrlRoot + "api/download/template/"; var responseMessage = await client.PostAsync( downloadUrl, new StringContent(serializedPostDataAsString, Encoding.UTF8, MimeTypes.Application.Json), From 5fea28a1aa6ea6e01db0c4242b1d9f14ee199d91 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 12 May 2019 21:25:57 +0300 Subject: [PATCH 099/335] Refactored CLI command running. --- .../ProjectNpmPackageAdder.cs | 14 ++++++-------- .../ProjectNugetPackageAdder.cs | 5 ++--- .../Volo/Abp/Cli/Utils/CmdHelper.cs | 19 +++++++++++++++++++ framework/src/Volo.Abp.Core/Volo/Abp/Check.cs | 2 +- 4 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs index cc77ab2554..63e0eb0393 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNpmPackageAdder.cs @@ -1,8 +1,8 @@ -using System.Diagnostics; -using System.IO; +using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; using Volo.Abp.IO; @@ -29,13 +29,11 @@ namespace Volo.Abp.Cli.ProjectModification using (DirectoryHelper.ChangeCurrentDirectory(directory)) { - Logger.LogInformation("yarn add " + npmPackage.Name + "... " + Directory.GetCurrentDirectory()); - var procStartInfo = new ProcessStartInfo("cmd.exe", "/C yarn add " + npmPackage.Name); - Process.Start(procStartInfo).WaitForExit(); + Logger.LogInformation("yarn add " + npmPackage.Name); + CmdHelper.RunCmd("yarn add " + npmPackage.Name); - Logger.LogInformation("gulp... " + Directory.GetCurrentDirectory()); - procStartInfo = new ProcessStartInfo("cmd.exe", "/C gulp"); - Process.Start(procStartInfo).WaitForExit(); + Logger.LogInformation("gulp"); + CmdHelper.RunCmd("gulp"); } return Task.CompletedTask; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs index 56cf89ca1c..a822bb0dba 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; using System.Net; @@ -8,6 +7,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; using Volo.Abp.IO; using Volo.Abp.Json; @@ -50,8 +50,7 @@ namespace Volo.Abp.Cli.ProjectModification { Logger.LogInformation($"Installing '{package.Name}' package to the project '{Path.GetFileNameWithoutExtension(projectFile)}'..."); - var procStartInfo = new ProcessStartInfo("dotnet", "add package " + package.Name); - Process.Start(procStartInfo).WaitForExit(); + CmdHelper.Run("dotnet", "add package " + package.Name); var moduleFiles = ModuleClassFinder.Find(projectFile); if (moduleFiles.Count == 0) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs new file mode 100644 index 0000000000..01a0f00af0 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs @@ -0,0 +1,19 @@ +using System.Diagnostics; + +namespace Volo.Abp.Cli.Utils +{ + public static class CmdHelper + { + public static void Run(string file, string arguments) + { + var procStartInfo = new ProcessStartInfo(file, arguments); + Process.Start(procStartInfo).WaitForExit(); + } + + public static void RunCmd(string command) + { + var procStartInfo = new ProcessStartInfo("cmd.exe", "/C " + command); + Process.Start(procStartInfo).WaitForExit(); + } + } +} diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Check.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Check.cs index 6d314d0685..f942f44b0f 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Check.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Check.cs @@ -122,7 +122,7 @@ namespace Volo.Abp } public static string Length( - string value, + [CanBeNull] string value, [InvokerParameterName] [NotNull] string parameterName, int maxLength, int minLength = 0) From 04c97ccaba188d57532ee20ad4f1f118bba5beda Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 13 May 2019 11:42:45 +0300 Subject: [PATCH 100/335] Fix help --- .../Volo/Abp/Cli/Commands/AddModuleCommand.cs | 4 ++-- .../Volo/Abp/Cli/Commands/AddPackageCommand.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index 7cee3f1e69..5b07f7f364 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -91,8 +91,8 @@ namespace Volo.Abp.Cli.Commands sb.AppendLine(" -s|--solution Specify the solution file explicitly."); sb.AppendLine(""); sb.AppendLine("Examples:"); - sb.AppendLine(" abp add Volo.Blogging Adds the module to the current soluton."); - sb.AppendLine(" abp add Volo.Blogging -s Acme.BookStore Adds the module to the given soluton."); + sb.AppendLine(" abp add-module Volo.Blogging Adds the module to the current soluton."); + sb.AppendLine(" abp add-module Volo.Blogging -s Acme.BookStore Adds the module to the given soluton."); sb.AppendLine(""); return sb.ToString(); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs index 19de9a164a..d657000b2d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs @@ -91,8 +91,8 @@ namespace Volo.Abp.Cli.Commands sb.AppendLine(" -p|--project Specify the project file explicitly."); sb.AppendLine(""); sb.AppendLine("Examples:"); - sb.AppendLine(" abp add Volo.Abp.FluentValidation Adds the package to the current project."); - sb.AppendLine(" abp add Volo.Abp.FluentValidation -p Acme.BookStore.Application Adds the package to the given project."); + sb.AppendLine(" abp add-package Volo.Abp.FluentValidation Adds the package to the current project."); + sb.AppendLine(" abp add-package Volo.Abp.FluentValidation -p Acme.BookStore.Application Adds the package to the given project."); sb.AppendLine(""); return sb.ToString(); From 4f099029dddfc0c36d6a40cf9784f7b14ef2fe68 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 13 May 2019 12:13:30 +0300 Subject: [PATCH 101/335] Dont use Microsoft.AspNetCore.All with version. Enhance logging and clean. --- .../Program.cs | 33 ++++++++++++++++--- .../Properties/launchSettings.json | 14 ++++---- .../Startup.cs | 1 - ...bp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj | 16 ++------- 4 files changed, 38 insertions(+), 26 deletions(-) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs index e786c24f29..4ee4949d50 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs @@ -1,21 +1,46 @@ -using System.IO; +using System; +using System.IO; using Microsoft.AspNetCore.Hosting; +using Serilog; +using Serilog.Events; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo { public class Program { - public static void Main(string[] args) + public static int Main(string[] args) { - BuildWebHostInternal(args).Run(); + Log.Logger = new LoggerConfiguration() + .MinimumLevel.Debug() //TODO: Should be configurable! + .MinimumLevel.Override("Microsoft", LogEventLevel.Information) + .Enrich.FromLogContext() + .WriteTo.File("Logs/logs.txt") + .CreateLogger(); + + try + { + Log.Information("Starting web host."); + BuildWebHostInternal(args).Run(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } - public static IWebHost BuildWebHostInternal(string[] args) => + internal static IWebHost BuildWebHostInternal(string[] args) => new WebHostBuilder() .UseKestrel() .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() + .UseSerilog() .Build(); } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Properties/launchSettings.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Properties/launchSettings.json index bf3d843c8b..07a310a660 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Properties/launchSettings.json +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Properties/launchSettings.json @@ -1,9 +1,9 @@ { "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, + "windowsAuthentication": false, + "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:49211/", + "applicationUrl": "http://localhost:51339", "sslPort": 0 } }, @@ -15,13 +15,13 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo": { + "Volo.AbpIo.Commercial.Web": { "commandName": "Project", "launchBrowser": true, + "applicationUrl": "http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:49212/" + } } } -} +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs index 52c11d7896..ffd3ca47be 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs @@ -1,5 +1,4 @@ using System; -using Autofac.Extensions.DependencyInjection; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj index dd5e36ed14..c5a4731256 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj @@ -2,24 +2,12 @@ netcoreapp2.2 - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo - true - true - false - false - false - true - true - false - - + - + From a9301c922005edd38a0ba6d1ca680d24c33a6542 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 13 May 2019 12:21:08 +0300 Subject: [PATCH 102/335] Dynamic forms: nullable enum --- .../Form/AbpSelectTagHelperService.cs | 18 ++++++++++++++---- .../Pages/Components/DynamicForms.cshtml.cs | 4 ++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs index b07100497e..46ac3a8e90 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs @@ -187,13 +187,23 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form { var localizer = _tagHelperLocalizer.GetLocalizer(explorer); - var selectItems = explorer.ModelType.GetTypeInfo().GetMembers(BindingFlags.Public | BindingFlags.Static) + var selectItems = new List(); + var isNullableType = Nullable.GetUnderlyingType(explorer.ModelType) != null; + var enumType = explorer.ModelType; + + if (isNullableType) + { + enumType = Nullable.GetUnderlyingType(explorer.ModelType); + selectItems.Add(new SelectListItem()); + } + + selectItems.AddRange(enumType.GetTypeInfo().GetMembers(BindingFlags.Public | BindingFlags.Static) .Select((t, i) => new SelectListItem { - Value = ((int) Enum.Parse(explorer.ModelType, t.Name)).ToString(), - Text = GetLocalizedPropertyName(localizer, explorer.ModelType, t.Name) - }).ToList(); + Value = ((int) Enum.Parse(enumType, t.Name)).ToString(), + Text = GetLocalizedPropertyName(localizer, enumType, t.Name) + }).ToList()); return selectItems; } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs index 276f760a27..adfd91c688 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/DynamicForms.cshtml.cs @@ -123,6 +123,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Pages.Components [Display(Name = "My Car Type")] public CarType MyCarType { get; set; } + [Required] + [Display(Name = "My Car Type Nullable")] + public CarType? MyCarTypeNullable { get; set; } + [Required] [AbpRadioButton(Inline = true)] [Display(Name = "Your Car Type")] From 545390034ff5255c2b27029e3e37a09c0d375d58 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Mon, 13 May 2019 15:30:56 +0300 Subject: [PATCH 103/335] Update Client-Side-Package-Management.md --- .../AspNetCore/Client-Side-Package-Management.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/en/AspNetCore/Client-Side-Package-Management.md b/docs/en/AspNetCore/Client-Side-Package-Management.md index 3c1785daa5..0d98fe1dc5 100644 --- a/docs/en/AspNetCore/Client-Side-Package-Management.md +++ b/docs/en/AspNetCore/Client-Side-Package-Management.md @@ -22,14 +22,14 @@ The benefit of a **standard package** is: Depending on a standard package is easy. Just add it to your **package.json** file like you normally do. Example: - - { - ... - "dependencies": { - "@abp/bootstrap": "^1.0.0" - } - } - +```` +{ + ... + "dependencies": { + "@abp/bootstrap": "^1.0.0" + } +} +```` It's suggested to depend on a standard package instead of directly depending on a third-party package. From 4fdc01a6ca201d2cd7c2e20bc9a452a2d673ae2b Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 13 May 2019 21:45:22 +0300 Subject: [PATCH 104/335] Always download the latest template. --- .../Volo/Abp/Cli/CliPaths.cs | 2 +- .../Volo/Abp/Cli/CliService.cs | 12 +- .../Cli/ProjectBuilding/AbpIoTemplateStore.cs | 117 ++++++++++++++---- .../Building/ProjectBuildContext.cs | 10 +- .../Steps/NugetReferenceReplaceStep.cs | 2 +- .../Abp/Cli/ProjectBuilding/ITemplateStore.cs | 5 +- .../Abp/Cli/ProjectBuilding/ProjectBuilder.cs | 6 +- .../Abp/Cli/ProjectBuilding/TemplateFile.cs | 5 +- .../Volo/Abp/Cli/Utils/VersionHelper.cs | 15 --- 9 files changed, 113 insertions(+), 61 deletions(-) delete mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/VersionHelper.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs index 9c3f5a458c..eb6339b9da 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs @@ -12,4 +12,4 @@ namespace Volo.Abp.Cli private static readonly string AbpRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".abp"); } -} +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 40629a17c7..abcd641d07 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -1,11 +1,11 @@ using System; +using System.Reflection; using Microsoft.Extensions.DependencyInjection; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Commands; -using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli @@ -32,7 +32,7 @@ namespace Volo.Abp.Cli public async Task RunAsync(string[] args) { - Logger.LogInformation($"ABP CLI, version {VersionHelper.Version}."); + Logger.LogInformation($"ABP CLI, version {GetCliVersion()}."); Logger.LogInformation("https://abp.io"); var commandLineArgs = CommandLineArgumentParser.Parse(args); @@ -56,5 +56,13 @@ namespace Volo.Abp.Cli } } } + + private static string GetCliVersion() + { + return typeof(CliService) + .Assembly + .GetFileVersion() + .RemovePostFix(".0"); + } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs index 74683197d5..adfa4e044a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs @@ -37,47 +37,80 @@ namespace Volo.Abp.Cli.ProjectBuilding public async Task GetAsync( string name, - string version, DatabaseProvider databaseProvider, - string projectName) + string projectName, + string version = null) { - var localCacheFolder = Path.Combine(CliPaths.TemplateCache, version); - DirectoryHelper.CreateIfNotExists(localCacheFolder); + if (version == null) + { + version = await GetLatestTemplateVersionAsync(name); + } + + DirectoryHelper.CreateIfNotExists(CliPaths.TemplateCache); - var localCacheFile = Path.Combine(localCacheFolder, name + ".zip"); + var localCacheFile = Path.Combine(CliPaths.TemplateCache, name + "-" + version + ".zip"); if (File.Exists(localCacheFile)) { Logger.LogInformation("Using cached template: " + name + ", version: " + version); - return new TemplateFile(File.ReadAllBytes(localCacheFile)); + return new TemplateFile(File.ReadAllBytes(localCacheFile), version); } Logger.LogInformation("Downloading template: " + name + ", version: " + version); - using (var client = new System.Net.Http.HttpClient()) + var fileContent = await DownloadTemplateFileContentAsync( + new TemplateDownloadInputDto + { + Name = name, + Version = version, + DatabaseProvider = databaseProvider.ToString(), + ProjectName = projectName + } + ); + + File.WriteAllBytes(localCacheFile, fileContent); + + return new TemplateFile(fileContent, version); + } + + private async Task GetLatestTemplateVersionAsync(string name) + { + var postData = JsonSerializer.Serialize(new GetLatestTemplateVersionDto { Name = name }); + + using (var client = new HttpClient()) { - client.Timeout = TimeSpan.FromMinutes(3); + client.Timeout = TimeSpan.FromSeconds(30); - if (File.Exists(CliPaths.AccessToken)) + AddAuthentication(client); + + var responseMessage = await client.PostAsync( + Options.AbpIoWwwUrlRoot + "api/download/template/get-version/", + new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json), + CancellationTokenProvider.Token + ); + + if (!responseMessage.IsSuccessStatusCode) { - var accessToken = File.ReadAllText(CliPaths.AccessToken, Encoding.UTF8); - if (!accessToken.IsNullOrEmpty()) - { - client.SetBearerToken(accessToken); - } + throw new Exception("Remote server returns error! HTTP status code: " + responseMessage.StatusCode); } - var serializedPostDataAsString = JsonSerializer.Serialize(new - { - name = name, - version = version, - databaseProvider = databaseProvider, - projectName = projectName - }); + var result = await responseMessage.Content.ReadAsStringAsync(); + return JsonSerializer.Deserialize(result).Version; + } + } + + private async Task DownloadTemplateFileContentAsync(TemplateDownloadInputDto input) + { + var postData = JsonSerializer.Serialize(input); + + using (var client = new HttpClient()) + { + client.Timeout = TimeSpan.FromMinutes(3); + + AddAuthentication(client); - var downloadUrl = Options.AbpIoWwwUrlRoot + "api/download/template/"; var responseMessage = await client.PostAsync( - downloadUrl, - new StringContent(serializedPostDataAsString, Encoding.UTF8, MimeTypes.Application.Json), + Options.AbpIoWwwUrlRoot + "api/download/template/", + new StringContent(postData, Encoding.UTF8, MimeTypes.Application.Json), CancellationTokenProvider.Token ); @@ -86,11 +119,41 @@ namespace Volo.Abp.Cli.ProjectBuilding throw new Exception("Remote server returns error! HTTP status code: " + responseMessage.StatusCode); } - var fileContent = await responseMessage.Content.ReadAsByteArrayAsync(); + return await responseMessage.Content.ReadAsByteArrayAsync(); + } + } - File.WriteAllBytes(localCacheFile, fileContent); - return new TemplateFile(fileContent); + private static void AddAuthentication(HttpClient client) + { + if (File.Exists(CliPaths.AccessToken)) + { + var accessToken = File.ReadAllText(CliPaths.AccessToken, Encoding.UTF8); + if (!accessToken.IsNullOrEmpty()) + { + client.SetBearerToken(accessToken); + } } } + + public class TemplateDownloadInputDto + { + public string Name { get; set; } + + public string Version { get; set; } + + public string DatabaseProvider { get; set; } + + public string ProjectName { get; set; } + } + + public class GetLatestTemplateVersionDto + { + public string Name { get; set; } + } + + public class GetLatestTemplateVersionResultDto + { + public string Version { get; set; } + } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContext.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContext.cs index 256d9ec003..1ea040022f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContext.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildContext.cs @@ -8,9 +8,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building [NotNull] public TemplateFile TemplateFile { get; } - [NotNull] - public string Version { get; } - [NotNull] public ProjectBuildArgs BuildArgs { get; } @@ -21,15 +18,14 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building public ProjectResult Result { get; set; } - public ProjectBuildContext([NotNull] TemplateInfo template, + public ProjectBuildContext( + [NotNull] TemplateInfo template, [NotNull] TemplateFile templateFile, - [NotNull] ProjectBuildArgs buildArgs, - [NotNull] string version) + [NotNull] ProjectBuildArgs buildArgs) { Template = Check.NotNull(template, nameof(template)); TemplateFile = Check.NotNull(templateFile, nameof(templateFile)); BuildArgs = Check.NotNull(buildArgs, nameof(buildArgs)); - Version = Check.NotNullOrWhiteSpace(version, nameof(version)); Result = new ProjectResult(); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs index 7c2c80a48c..49ccb308c8 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps context.Files, "MyCompanyName", "MyProjectName", - context.Version + context.TemplateFile.Version ).Run(); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs index d8206b9200..064c4eb81b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using JetBrains.Annotations; using Volo.Abp.Cli.ProjectBuilding.Building; namespace Volo.Abp.Cli.ProjectBuilding @@ -7,9 +8,9 @@ namespace Volo.Abp.Cli.ProjectBuilding { Task GetAsync( string name, - string version, DatabaseProvider databaseProvider, - string projectName + string projectName, + [CanBeNull] string version = null ); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs index 0d8d96c9d1..0b66ea375d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs @@ -31,11 +31,8 @@ namespace Volo.Abp.Cli.ProjectBuilding } } - var version = VersionHelper.Version; - var templateFile = await TemplateStore.GetAsync( args.TemplateName, - version, args.DatabaseProvider, args.SolutionName.FullName ); @@ -43,8 +40,7 @@ namespace Volo.Abp.Cli.ProjectBuilding var context = new ProjectBuildContext( templateInfo, templateFile, - args, - version + args ); ProjectBuildPipelineBuilder.Build(context).Execute(context); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs index 1abe65044e..234a7b509a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs @@ -2,11 +2,14 @@ { public class TemplateFile { + public string Version { get; } + public byte[] FileBytes { get; } - public TemplateFile(byte[] fileBytes) + public TemplateFile(byte[] fileBytes, string version) { FileBytes = fileBytes; + Version = version; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/VersionHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/VersionHelper.cs deleted file mode 100644 index c57c447822..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/VersionHelper.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Text; - -namespace Volo.Abp.Cli.Utils -{ - public static class VersionHelper - { - //public static string Version => typeof(AbpCliCoreModule).Assembly - // .GetFileVersion() - // .RemovePostFix(".0"); - public static string Version => "0.17.0.0"; - } -} From da0a03dc437e23bbf57fce624df63050911c0587 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 14 May 2019 15:15:33 +0300 Subject: [PATCH 105/335] Rename Nuget to NuGet --- .../ProjectModification/NugetPackageInfo.cs | 2 +- .../ProjectModification/NugetPackageTarget.cs | 2 +- .../SolutionModuleAdder.cs | 22 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs index fe4ccf348c..ac48e8400a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs @@ -6,7 +6,7 @@ public string ModuleClass { get; set; } - public NugetPackageTarget Target { get; set; } + public NuGetPackageTarget Target { get; set; } public NpmPackageInfo DependedNpmPackage { get; set; } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs index ec80181f82..66467bfa36 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Cli.ProjectModification { - public enum NugetPackageTarget : byte + public enum NuGetPackageTarget : byte { DomainShared = 1, Domain = 2, diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 2afa2cd95f..552ac51480 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -50,7 +50,7 @@ namespace Volo.Abp.Cli.ProjectModification } } - private string FindTargetProjectFile(string[] projectFiles, NugetPackageTarget target) + private string FindTargetProjectFile(string[] projectFiles, NuGetPackageTarget target) { if (!projectFiles.Any()) { @@ -67,32 +67,32 @@ namespace Volo.Abp.Cli.ProjectModification switch (target) { - case NugetPackageTarget.Web: + case NuGetPackageTarget.Web: return FindProjectEndsWith(assemblyNames, ".Web"); - case NugetPackageTarget.EntityFrameworkCore: + case NuGetPackageTarget.EntityFrameworkCore: return FindProjectEndsWith(assemblyNames, ".EntityFrameworkCore") ?? FindProjectEndsWith(assemblyNames, ".Web"); - case NugetPackageTarget.MongoDB: + case NuGetPackageTarget.MongoDB: return FindProjectEndsWith(assemblyNames, ".MongoDB") ?? FindProjectEndsWith(assemblyNames, ".Web"); - case NugetPackageTarget.Application: + case NuGetPackageTarget.Application: return FindProjectEndsWith(assemblyNames, ".Application") ?? FindProjectEndsWith(assemblyNames, ".Web"); - case NugetPackageTarget.ApplicationContracts: + case NuGetPackageTarget.ApplicationContracts: return FindProjectEndsWith(assemblyNames, ".Application.Contracts"); - case NugetPackageTarget.Domain: + case NuGetPackageTarget.Domain: return FindProjectEndsWith(assemblyNames, ".Domain") ?? FindProjectEndsWith(assemblyNames, ".Application") ?? FindProjectEndsWith(assemblyNames, ".Web"); - case NugetPackageTarget.DomainShared: + case NuGetPackageTarget.DomainShared: return FindProjectEndsWith(assemblyNames, ".Domain.Shared"); - case NugetPackageTarget.HttpApi: + case NuGetPackageTarget.HttpApi: return FindProjectEndsWith(assemblyNames, ".HttpApi") ?? FindProjectEndsWith(assemblyNames, ".Web"); - case NugetPackageTarget.HttpApiClient: + case NuGetPackageTarget.HttpApiClient: return FindProjectEndsWith(assemblyNames, ".HttpApi.Client"); default: - throw new ApplicationException($"{nameof(NugetPackageTarget)} has not implemented: {target}"); + throw new ApplicationException($"{nameof(NuGetPackageTarget)} has not implemented: {target}"); } } From 935afc9c96ea68dea7d5f4fe91e0e6c55faa74e4 Mon Sep 17 00:00:00 2001 From: mehmetuken Date: Tue, 14 May 2019 17:22:41 +0300 Subject: [PATCH 106/335] Check Cli has a new version. --- .../Volo/Abp/Cli/CliService.cs | 21 ++++++- .../Volo/Abp/Cli/NuGet/NuGetService.cs | 55 +++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index abcd641d07..e86eccdf2c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Commands; +using Volo.Abp.Cli.NuGet; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli @@ -17,15 +18,18 @@ namespace Volo.Abp.Cli protected ICommandLineArgumentParser CommandLineArgumentParser { get; } protected ICommandSelector CommandSelector { get; } protected IHybridServiceScopeFactory ServiceScopeFactory { get; } + protected NuGetService NuGetService { get; } public CliService( ICommandLineArgumentParser commandLineArgumentParser, ICommandSelector commandSelector, - IHybridServiceScopeFactory serviceScopeFactory) + IHybridServiceScopeFactory serviceScopeFactory, + NuGetService nugetService) { CommandLineArgumentParser = commandLineArgumentParser; CommandSelector = commandSelector; ServiceScopeFactory = serviceScopeFactory; + NuGetService = nugetService; Logger = NullLogger.Instance; } @@ -35,6 +39,8 @@ namespace Volo.Abp.Cli Logger.LogInformation($"ABP CLI, version {GetCliVersion()}."); Logger.LogInformation("https://abp.io"); + await CheckHasNewVersion(); + var commandLineArgs = CommandLineArgumentParser.Parse(args); var commandType = CommandSelector.Select(commandLineArgs); @@ -57,6 +63,19 @@ namespace Volo.Abp.Cli } } + private async Task CheckHasNewVersion() + { + var currentVersion = GetCliVersion(); + var latestVersion = await NuGetService.GetLatestVersionAsync("Volo.Abp.Cli"); + + if (!string.IsNullOrEmpty(latestVersion) && currentVersion != latestVersion) + { + Logger.LogInformation(""); + Logger.LogWarning("Cli has a new version. Please update."); + Logger.LogWarning("Update Command: dotnet tool update -g Volo.Abp.Cli"); + } + } + private static string GetCliVersion() { return typeof(CliService) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs new file mode 100644 index 0000000000..876a3555fa --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Volo.Abp.Json; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Threading; + +namespace Volo.Abp.Cli.NuGet +{ + public class NuGetService : ISingletonDependency + { + protected IJsonSerializer JsonSerializer { get; } + protected ICancellationTokenProvider CancellationTokenProvider { get; } + + + public NuGetService( + IJsonSerializer jsonSerializer, + ICancellationTokenProvider cancellationTokenProvider) + { + JsonSerializer = jsonSerializer; + CancellationTokenProvider = cancellationTokenProvider; + } + + public async Task GetLatestVersionAsync(string packageId) + { + using (var client = new HttpClient()) + { + client.Timeout = TimeSpan.FromSeconds(30); + + var responseMessage = await client.GetAsync( + $"https://api.nuget.org/v3-flatcontainer/${packageId.ToLowerInvariant()}/index.json", + CancellationTokenProvider.Token); + if (!responseMessage.IsSuccessStatusCode) + { + throw new Exception("Remote server returns error! HTTP status code: " + responseMessage.StatusCode); + } + + var result = await responseMessage.Content.ReadAsStringAsync(); + + var versions = JsonSerializer.Deserialize(result).Versions; + + return versions.Count > 0 ? versions.Last() : null; + } + } + + public class NuGetVersionResultDto + { + [JsonProperty("versions")] + public List Versions { get; set; } + } + } +} \ No newline at end of file From 30cf4ee363de693236c065c226ef496ea8d57401 Mon Sep 17 00:00:00 2001 From: mehmetuken Date: Tue, 14 May 2019 17:34:52 +0300 Subject: [PATCH 107/335] Fix bug in request url. --- .../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs index 876a3555fa..951e8947b9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs @@ -31,7 +31,7 @@ namespace Volo.Abp.Cli.NuGet client.Timeout = TimeSpan.FromSeconds(30); var responseMessage = await client.GetAsync( - $"https://api.nuget.org/v3-flatcontainer/${packageId.ToLowerInvariant()}/index.json", + $"https://api.nuget.org/v3-flatcontainer/{packageId.ToLowerInvariant()}/index.json", CancellationTokenProvider.Token); if (!responseMessage.IsSuccessStatusCode) { From f369fc34fd766e147250367990a3c2341a3d3a28 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Tue, 14 May 2019 18:11:33 +0300 Subject: [PATCH 108/335] CLI refactor, test & improvements. --- framework/Volo.Abp.sln | 16 +-- .../AbpModuleClassFinder.cs | 25 +--- .../ModuleClassDependcyAdder.cs | 2 +- .../ProjectModification/NpmApplicationType.cs | 10 ++ .../Cli/ProjectModification/NpmPackageInfo.cs | 2 +- .../ProjectModification/NugetPackageInfo.cs | 2 - .../Cli/ProjectModification/ProjectFinder.cs | 133 ++++++++++++++++++ .../ProjectNugetPackageAdder.cs | 6 - .../SolutionModuleAdder.cs | 110 +++++---------- .../src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs | 4 + .../Volo.Abp.Cli.Core.Tests.csproj} | 2 +- .../Volo/Abp/Cli/AbpCliTestBase.cs | 0 .../Volo/Abp/Cli/AbpCliTestModule.cs | 2 +- .../Cli/CommandLineArgumentParser_Tests.cs | 0 .../Volo/Abp/Cli/ProjectFinder_Tests.cs | 46 ++++++ 15 files changed, 243 insertions(+), 117 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmApplicationType.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs rename framework/test/{Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj => Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj} (80%) rename framework/test/{Volo.Abp.Cli.Tests => Volo.Abp.Cli.Core.Tests}/Volo/Abp/Cli/AbpCliTestBase.cs (100%) rename framework/test/{Volo.Abp.Cli.Tests => Volo.Abp.Cli.Core.Tests}/Volo/Abp/Cli/AbpCliTestModule.cs (84%) rename framework/test/{Volo.Abp.Cli.Tests => Volo.Abp.Cli.Core.Tests}/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs (100%) create mode 100644 framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index b0b7803963..bed907269c 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -224,15 +224,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FluentValidation", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FluentValidation.Tests", "test\Volo.Abp.FluentValidation.Tests\Volo.Abp.FluentValidation.Tests.csproj", "{E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Tests", "test\Volo.Abp.Cli.Tests\Volo.Abp.Cli.Tests.csproj", "{92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore.Sqlite", "src\Volo.Abp.EntityFrameworkCore.Sqlite\Volo.Abp.EntityFrameworkCore.Sqlite.csproj", "{58CF8957-5045-4F81-884D-72DF48F721CC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Core", "src\Volo.Abp.Cli.Core\Volo.Abp.Cli.Core.csproj", "{3DA9923E-048E-4FE7-9748-3A0194F5D196}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Specifications", "src\Volo.Abp.Specifications\Volo.Abp.Specifications.csproj", "{2C621EED-563C-4F81-A75E-50879E173544}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Specifications.Tests", "test\Volo.Abp.Specifications.Tests\Volo.Abp.Specifications.Tests.csproj", "{D078553A-C70C-4F56-B3E2-9C5BA6384C72}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Specifications.Tests", "test\Volo.Abp.Specifications.Tests\Volo.Abp.Specifications.Tests.csproj", "{D078553A-C70C-4F56-B3E2-9C5BA6384C72}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Core.Tests", "test\Volo.Abp.Cli.Core.Tests\Volo.Abp.Cli.Core.Tests.csproj", "{F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -676,10 +676,6 @@ Global {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}.Release|Any CPU.Build.0 = Release|Any CPU - {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}.Release|Any CPU.Build.0 = Release|Any CPU {58CF8957-5045-4F81-884D-72DF48F721CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {58CF8957-5045-4F81-884D-72DF48F721CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {58CF8957-5045-4F81-884D-72DF48F721CC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -696,6 +692,10 @@ Global {D078553A-C70C-4F56-B3E2-9C5BA6384C72}.Debug|Any CPU.Build.0 = Debug|Any CPU {D078553A-C70C-4F56-B3E2-9C5BA6384C72}.Release|Any CPU.ActiveCfg = Release|Any CPU {D078553A-C70C-4F56-B3E2-9C5BA6384C72}.Release|Any CPU.Build.0 = Release|Any CPU + {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -810,11 +810,11 @@ Global {69168816-4394-4DDA-BB6B-C21983D37F0B} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {43D5FE61-ECBF-4B16-AD95-0043E18EB93A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {E9E1714F-7ED2-4BD1-BA4A-BA06E398288A} = {447C8A77-E5F0-4538-8687-7383196D04EA} - {92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF} = {447C8A77-E5F0-4538-8687-7383196D04EA} {58CF8957-5045-4F81-884D-72DF48F721CC} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {3DA9923E-048E-4FE7-9748-3A0194F5D196} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {2C621EED-563C-4F81-A75E-50879E173544} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {D078553A-C70C-4F56-B3E2-9C5BA6384C72} = {447C8A77-E5F0-4538-8687-7383196D04EA} + {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA} = {447C8A77-E5F0-4538-8687-7383196D04EA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs index 09d8bad0b8..e42bd1e16a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs @@ -13,7 +13,10 @@ namespace Volo.Abp.Cli.ProjectModification { var moduleFilePaths = new List(); - var csFiles = GetAllCsFilesUnderDirectory(Path.GetDirectoryName(csprojFilePath), new List()); + var csFiles = new DirectoryInfo(Path.GetDirectoryName(csprojFilePath)) + .GetFiles("*Module.cs", SearchOption.AllDirectories) //TODO: Module assumption is not so good! + .Select(f => f.FullName) + .ToList(); foreach (var csFile in csFiles) { @@ -35,25 +38,5 @@ namespace Volo.Abp.Cli.ProjectModification return classDeclaration.BaseList?.Types .Any(t => t.ToString().Contains("AbpModule")) ?? false; } - - protected virtual List GetAllCsFilesUnderDirectory(string path, List allCsFileList) - { - var directory = new DirectoryInfo(path); - var files = directory.GetFiles("*.cs").Select(f => f.DirectoryName + "\\" + f.Name).ToList(); - - foreach (var s in files) - { - allCsFileList.Add(s); - } - - var directories = directory.GetDirectories().Select(d => path + "\\" + d.Name).ToList(); - - foreach (var subDirectory in directories) - { - allCsFileList = GetAllCsFilesUnderDirectory(subDirectory, allCsFileList); - } - - return allCsFileList; - } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs index abb5a0c825..482037de55 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs @@ -78,7 +78,7 @@ namespace Volo.Abp.Cli.ProjectModification protected virtual string GetDependsOnAttribute(string moduleName) { - return "[DependsOn(" + moduleName + ")]" + Environment.NewLine + " "; + return "[DependsOn(typeof(" + moduleName + "))]" + Environment.NewLine + " "; } protected virtual string GetUsingStatement(string nameSpace) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmApplicationType.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmApplicationType.cs new file mode 100644 index 0000000000..9f58aa52e9 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmApplicationType.cs @@ -0,0 +1,10 @@ +using System; + +namespace Volo.Abp.Cli.ProjectModification +{ + [Flags] + public enum NpmApplicationType + { + Mvc = 1 + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs index 59273b718c..47f0f1092d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackageInfo.cs @@ -4,6 +4,6 @@ { public string Name { get; set; } - public int ApplicationType { get; set; } //TODO: Enum? + public NpmApplicationType ApplicationType { get; set; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs index ac48e8400a..03c5c5493b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs @@ -7,7 +7,5 @@ public string ModuleClass { get; set; } public NuGetPackageTarget Target { get; set; } - - public NpmPackageInfo DependedNpmPackage { get; set; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs new file mode 100644 index 0000000000..548290df5c --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs @@ -0,0 +1,133 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; + +namespace Volo.Abp.Cli.ProjectModification +{ + public static class ProjectFinder + { + public static string FindNuGetTargetProjectFile(string[] projectFiles, NuGetPackageTarget target) + { + if (!projectFiles.Any()) + { + return null; + } + + var assemblyNames = GetAssemblyNames(projectFiles); + + switch (target) + { + case NuGetPackageTarget.Web: + return FindProjectEndsWith(projectFiles, assemblyNames, ".Web"); + case NuGetPackageTarget.EntityFrameworkCore: + return FindProjectEndsWith(projectFiles, assemblyNames, ".EntityFrameworkCore"); + case NuGetPackageTarget.MongoDB: + return FindProjectEndsWith(projectFiles, assemblyNames, ".MongoDB"); + case NuGetPackageTarget.Application: + return FindProjectEndsWith(projectFiles, assemblyNames, ".Application") ?? + FindProjectEndsWith(projectFiles, assemblyNames, ".Web"); + case NuGetPackageTarget.ApplicationContracts: + return FindProjectEndsWith(projectFiles, assemblyNames, ".Application.Contracts"); + case NuGetPackageTarget.Domain: + return FindProjectEndsWith(projectFiles, assemblyNames, ".Domain") ?? + FindProjectEndsWith(projectFiles, assemblyNames, ".Application") ?? + FindProjectEndsWith(projectFiles, assemblyNames, ".Web"); + case NuGetPackageTarget.DomainShared: + return FindProjectEndsWith(projectFiles, assemblyNames, ".Domain.Shared"); + case NuGetPackageTarget.HttpApi: + return FindProjectEndsWith(projectFiles, assemblyNames, ".HttpApi"); + case NuGetPackageTarget.HttpApiClient: + return FindProjectEndsWith(projectFiles, assemblyNames, ".HttpApi.Client"); + default: + throw new ApplicationException($"{nameof(NuGetPackageTarget)}.{target} has not implemented!"); + } + } + + public static string[] FindNpmTargetProjectFile(string[] projectFiles) + { + if (!projectFiles.Any()) + { + return Array.Empty(); + } + + var assemblyNames = GetAssemblyNames(projectFiles); + + var projects = new List(); + + var project = FindProjectEndsWith(projectFiles, assemblyNames, ".Web.Host"); + if (project != null) + { + projects.Add(project); + } + + project = FindProjectEndsWith(projectFiles, assemblyNames, ".Host", ".HttpApi.Host"); + if (project != null) + { + projects.Add(project); + } + + if (projects.Any()) + { + return projects.ToArray(); + } + + project = FindProjectEndsWith(projectFiles, assemblyNames, ".Web"); + if (project != null) + { + projects.Add(project); + } + + return projects.ToArray(); + } + + public static string[] GetProjectFiles(string solutionFile) + { + var baseProjectFolder = GetBaseProjectFolder(solutionFile); + return Directory.GetFiles(baseProjectFolder, "*.csproj", SearchOption.AllDirectories); + } + + public static string[] GetAssemblyNames(string[] projectFiles) + { + return projectFiles.Select(GetAssemblyName).ToArray(); + } + + public static string GetAssemblyName(string projectFile) + { + return projectFile + .Substring(projectFile.LastIndexOf(Path.DirectorySeparatorChar) + 1) + .RemovePostFix(StringComparison.OrdinalIgnoreCase, ".csproj"); + } + + private static string FindProjectEndsWith( + string[] projectFiles, + string[] assemblyNames, + string postfix, + string excludePostfix = null) + { + for (var i = 0; i < assemblyNames.Length; i++) + { + var assemblyName = assemblyNames[i]; + if(assemblyName.EndsWith(postfix, StringComparison.OrdinalIgnoreCase) && + (excludePostfix == null || !assemblyName.EndsWith(excludePostfix))) + { + return projectFiles[i]; + } + } + + return null; + } + + private static string GetBaseProjectFolder(string solutionFile) + { + var baseFolder = Path.GetDirectoryName(solutionFile); + var srcFolder = Path.Combine(baseFolder, "src"); + if (Directory.Exists(srcFolder)) + { + baseFolder = srcFolder; + } + + return baseFolder; + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs index a822bb0dba..33373289ec 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs @@ -65,16 +65,10 @@ namespace Volo.Abp.Cli.ProjectModification ModuleClassDependcyAdder.Add(moduleFiles.First(), package.ModuleClass); - if (package.DependedNpmPackage != null) - { - await NpmPackageAdder.AddAsync(Path.GetDirectoryName(projectFile), package.DependedNpmPackage); - } - Logger.LogInformation("Successfully installed."); } } - protected virtual async Task FindNugetPackageInfoAsync(string moduleName) { using (var client = new HttpClient()) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 552ac51480..917a7bf1a0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -1,12 +1,13 @@ -using System; +using JetBrains.Annotations; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; +using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using JetBrains.Annotations; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.DependencyInjection; using Volo.Abp.Json; @@ -18,107 +19,64 @@ namespace Volo.Abp.Cli.ProjectModification protected IJsonSerializer JsonSerializer { get; } protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; } + protected ProjectNpmPackageAdder ProjectNpmPackageAdder { get; } public SolutionModuleAdder( - IJsonSerializer jsonSerializer, - ProjectNugetPackageAdder projectNugetPackageAdder) + IJsonSerializer jsonSerializer, + ProjectNugetPackageAdder projectNugetPackageAdder, + ProjectNpmPackageAdder projectNpmPackageAdder) { JsonSerializer = jsonSerializer; ProjectNugetPackageAdder = projectNugetPackageAdder; + ProjectNpmPackageAdder = projectNpmPackageAdder; Logger = NullLogger.Instance; } public virtual async Task AddAsync( - [NotNull] string solutionFile, + [NotNull] string solutionFile, [NotNull] string moduleName) { Check.NotNull(solutionFile, nameof(solutionFile)); Check.NotNull(moduleName, nameof(moduleName)); var module = await FindModuleInfoAsync(moduleName); - var projectFiles = GetProjectFiles(solutionFile); + + Logger.LogInformation($"Installing module '{module.Name}' to the solution '{Path.GetFileNameWithoutExtension(solutionFile)}'"); + + var projectFiles = ProjectFinder.GetProjectFiles(solutionFile); foreach (var nugetPackage in module.NugetPackages) { - var targetProjectFile = FindTargetProjectFile(projectFiles, nugetPackage.Target); + var targetProjectFile = ProjectFinder.FindNuGetTargetProjectFile(projectFiles, nugetPackage.Target); if (targetProjectFile == null) { + Logger.LogDebug($"Target project is not available for NuGet package '{nugetPackage.Name}'"); continue; } await ProjectNugetPackageAdder.AddAsync(targetProjectFile, nugetPackage); } - } - - private string FindTargetProjectFile(string[] projectFiles, NuGetPackageTarget target) - { - if (!projectFiles.Any()) - { - return null; - } - - var assemblyNames = projectFiles - .Select( - filePath => filePath - .Replace("\\", "/") - .Substring(filePath.LastIndexOf("/", StringComparison.OrdinalIgnoreCase) + 1) - .RemovePostFix(StringComparison.OrdinalIgnoreCase, ".csproj") - ).ToArray(); - switch (target) + if (!module.NpmPackages.IsNullOrEmpty()) { - case NuGetPackageTarget.Web: - return FindProjectEndsWith(assemblyNames, ".Web"); - case NuGetPackageTarget.EntityFrameworkCore: - return FindProjectEndsWith(assemblyNames, ".EntityFrameworkCore") ?? - FindProjectEndsWith(assemblyNames, ".Web"); - case NuGetPackageTarget.MongoDB: - return FindProjectEndsWith(assemblyNames, ".MongoDB") ?? - FindProjectEndsWith(assemblyNames, ".Web"); - case NuGetPackageTarget.Application: - return FindProjectEndsWith(assemblyNames, ".Application") ?? - FindProjectEndsWith(assemblyNames, ".Web"); - case NuGetPackageTarget.ApplicationContracts: - return FindProjectEndsWith(assemblyNames, ".Application.Contracts"); - case NuGetPackageTarget.Domain: - return FindProjectEndsWith(assemblyNames, ".Domain") ?? - FindProjectEndsWith(assemblyNames, ".Application") ?? - FindProjectEndsWith(assemblyNames, ".Web"); - case NuGetPackageTarget.DomainShared: - return FindProjectEndsWith(assemblyNames, ".Domain.Shared"); - case NuGetPackageTarget.HttpApi: - return FindProjectEndsWith(assemblyNames, ".HttpApi") ?? - FindProjectEndsWith(assemblyNames, ".Web"); - case NuGetPackageTarget.HttpApiClient: - return FindProjectEndsWith(assemblyNames, ".HttpApi.Client"); - default: - throw new ApplicationException($"{nameof(NuGetPackageTarget)} has not implemented: {target}"); - } - } - - private static string FindProjectEndsWith(string[] projectAssemblyNames, string postfix) - { - return projectAssemblyNames.FirstOrDefault(p => p.EndsWith(postfix, StringComparison.OrdinalIgnoreCase)); - } - - protected virtual string[] GetProjectFiles(string solutionFile) - { - var baseProjectFolder = GetBaseProjectFolder(solutionFile); - return Directory.GetFiles(baseProjectFolder, "*.csproj", SearchOption.AllDirectories); - } - - protected virtual string GetBaseProjectFolder(string solutionFile) - { - var baseFolder = Path.GetDirectoryName(solutionFile); - var srcFolder = Path.Combine(baseFolder, "src"); - if (Directory.Exists(srcFolder)) - { - baseFolder = srcFolder; + var targetProjects = ProjectFinder.FindNpmTargetProjectFile(projectFiles); + if (targetProjects.Any()) + { + foreach (var targetProject in targetProjects) + { + foreach (var npmPackage in module.NpmPackages.Where(p => p.ApplicationType.HasFlag(NpmApplicationType.Mvc))) + { + await ProjectNpmPackageAdder.AddAsync(Path.GetDirectoryName(targetProject), npmPackage); + } + } + } + else + { + Logger.LogDebug("Target project is not available for NPM packages."); + } } - - return baseFolder; } - + protected virtual async Task FindModuleInfoAsync(string moduleName) { using (var client = new HttpClient()) diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs index 810be7af6c..8eefc78f9b 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs @@ -14,7 +14,11 @@ namespace Volo.Abp.Cli .MinimumLevel.Information() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) .MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning) +#if DEBUG + .MinimumLevel.Override("Volo.Abp.Cli", LogEventLevel.Debug) +#else .MinimumLevel.Override("Volo.Abp.Cli", LogEventLevel.Information) +#endif .Enrich.FromLogContext() .WriteTo.File(Path.Combine(CliPaths.Log, "abp-cli-logs.txt")) .WriteTo.Console() diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj b/framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj similarity index 80% rename from framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj rename to framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj index 3f094594d0..bb2664cdc1 100644 --- a/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestBase.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/AbpCliTestBase.cs similarity index 100% rename from framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestBase.cs rename to framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/AbpCliTestBase.cs diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestModule.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/AbpCliTestModule.cs similarity index 84% rename from framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestModule.cs rename to framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/AbpCliTestModule.cs index 8c2101052b..3fc7dcd457 100644 --- a/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/AbpCliTestModule.cs +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/AbpCliTestModule.cs @@ -4,7 +4,7 @@ namespace Volo.Abp.Cli { [DependsOn( typeof(AbpTestBaseModule), - typeof(AbpCliModule) + typeof(AbpCliCoreModule) )] public class AbpCliTestModule : AbpModule { diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs similarity index 100% rename from framework/test/Volo.Abp.Cli.Tests/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs rename to framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/CommandLineArgumentParser_Tests.cs diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs new file mode 100644 index 0000000000..5576960dfa --- /dev/null +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectFinder_Tests.cs @@ -0,0 +1,46 @@ +using System.IO; +using Shouldly; +using Volo.Abp.Cli.ProjectModification; +using Xunit; + +namespace Volo.Abp.Cli +{ + public class ProjectFinder_Tests + { + [Fact] + public void FindNpmTargetProjectFile_Tests() + { + var npmTargets = ProjectFinder.FindNpmTargetProjectFile( + new [] + { + GetNormalizedPath(@"c:\temp\project\folder\src\Acme.PhoneBook.Host.csproj"), + GetNormalizedPath(@"c:\temp\project\folder\src\Acme.PhoneBook.Web.Host.csproj"), + GetNormalizedPath(@"c:\temp\project\folder\src\Acme.PhoneBook.HttpApi.Host.csproj"), + GetNormalizedPath(@"c:\temp\project\folder\src\Acme.PhoneBook.Application.Contracts.csproj"), + GetNormalizedPath(@"c:\temp\project\folder\src\Acme.PhoneBook.Application.csproj"), + GetNormalizedPath(@"c:\temp\project\folder\src\Acme.PhoneBook.EntityFrameworkCore.csproj") + } + ); + + npmTargets.ShouldContain(GetNormalizedPath(@"c:\temp\project\folder\src\Acme.PhoneBook.Host.csproj")); + npmTargets.ShouldContain(GetNormalizedPath(@"c:\temp\project\folder\src\Acme.PhoneBook.Web.Host.csproj")); + } + + [Fact] + public void GetAssemblyName_Tests() + { + var assemblyName = ProjectFinder.GetAssemblyName( + GetNormalizedPath( + @"c:\temp\project\folder\src\Acme.PhoneBook.Host.csproj" + ) + ); + + assemblyName.ShouldBe("Acme.PhoneBook.Host"); + } + + private static string GetNormalizedPath(string path) + { + return path.Replace('\\', Path.DirectorySeparatorChar); + } + } +} From c4bc1824225579e0257b66715542c9f16b7f437d Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 15 May 2019 08:32:30 +0300 Subject: [PATCH 109/335] Update ModuleClassDependcyAdder.cs --- .../ProjectModification/ModuleClassDependcyAdder.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs index 482037de55..594c77e5fa 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs @@ -13,13 +13,15 @@ namespace Volo.Abp.Cli.ProjectModification var file = File.ReadAllText(path); - if (file.Contains(GetUsingStatement(nameSpace)) && file.Contains(moduleName)) + if (!file.Contains(GetUsingStatement(nameSpace)) ) { - return; + file = InsertUsingStatement(file, nameSpace); } - file = InsertDependsOnAttribute(file, moduleName); - file = InsertUsingStatement(file, nameSpace); + if (!file.Contains(moduleName) ) + { + file = InsertDependsOnAttribute(file, moduleName); + } File.WriteAllText(path, file); } From 9332acfd5bc6ac02c0f679d4166480bf71c8b4f8 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 15 May 2019 08:35:41 +0300 Subject: [PATCH 110/335] Update AbpModuleClassFinder.cs --- .../Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs index e42bd1e16a..0cdcc89fff 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.Cli.ProjectModification var moduleFilePaths = new List(); var csFiles = new DirectoryInfo(Path.GetDirectoryName(csprojFilePath)) - .GetFiles("*Module.cs", SearchOption.AllDirectories) //TODO: Module assumption is not so good! + .GetFiles("*.cs", SearchOption.AllDirectories) .Select(f => f.FullName) .ToList(); From 607ada4d4462a74daddb987a7c0ca28f6bb79c2a Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 15 May 2019 13:05:39 +0300 Subject: [PATCH 111/335] added DerivedClassFinder and removed AbpModuleClassFinder --- .../{AbpModuleClassFinder.cs => DerivedClassFinder.cs} | 10 +++++----- .../ProjectModification/ProjectNugetPackageAdder.cs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/{AbpModuleClassFinder.cs => DerivedClassFinder.cs} (75%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DerivedClassFinder.cs similarity index 75% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DerivedClassFinder.cs index 0cdcc89fff..bf11e0af65 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DerivedClassFinder.cs @@ -7,9 +7,9 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.ProjectModification { - public class AbpModuleClassFinder : ITransientDependency + public class DerivedClassFinder : ITransientDependency { - public virtual List Find(string csprojFilePath) + public virtual List Find(string csprojFilePath, string baseClass) { var moduleFilePaths = new List(); @@ -20,7 +20,7 @@ namespace Volo.Abp.Cli.ProjectModification foreach (var csFile in csFiles) { - if (IsDerivedFromAbpModule(csFile)) + if (IsDerivedFromAbpModule(csFile, baseClass)) { moduleFilePaths.Add(csFile); } @@ -29,14 +29,14 @@ namespace Volo.Abp.Cli.ProjectModification return moduleFilePaths; } - private bool IsDerivedFromAbpModule(string csFile) + protected bool IsDerivedFromAbpModule(string csFile, string baseClass) { var root = CSharpSyntaxTree.ParseText(File.ReadAllText(csFile)).GetRoot(); var namespaceSyntax = root.DescendantNodes().OfType().First(); var classDeclaration = (namespaceSyntax.DescendantNodes().OfType()).First(); return classDeclaration.BaseList?.Types - .Any(t => t.ToString().Contains("AbpModule")) ?? false; + .Any(t => t.ToString().Equals(baseClass)) ?? false; } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs index 33373289ec..d12e9e2f4c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs @@ -20,13 +20,13 @@ namespace Volo.Abp.Cli.ProjectModification protected IJsonSerializer JsonSerializer { get; } protected ProjectNpmPackageAdder NpmPackageAdder { get; } - protected AbpModuleClassFinder ModuleClassFinder { get; } + protected DerivedClassFinder ModuleClassFinder { get; } protected ModuleClassDependcyAdder ModuleClassDependcyAdder { get; } public ProjectNugetPackageAdder( IJsonSerializer jsonSerializer, ProjectNpmPackageAdder npmPackageAdder, - AbpModuleClassFinder moduleClassFinder, + DerivedClassFinder moduleClassFinder, ModuleClassDependcyAdder moduleClassDependcyAdder) { JsonSerializer = jsonSerializer; @@ -52,7 +52,7 @@ namespace Volo.Abp.Cli.ProjectModification CmdHelper.Run("dotnet", "add package " + package.Name); - var moduleFiles = ModuleClassFinder.Find(projectFile); + var moduleFiles = ModuleClassFinder.Find(projectFile, "AbpModule"); if (moduleFiles.Count == 0) { throw new CliUsageException($"Could not find a class derived from AbpModule in the project {projectFile}"); From e621111e41b84ff13836616acd3c1a23a575f4a0 Mon Sep 17 00:00:00 2001 From: mehmetuken Date: Wed, 15 May 2019 13:43:13 +0300 Subject: [PATCH 112/335] Check versions include previews/beta. --- .../Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs index 951e8947b9..e9130ac8b6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs @@ -24,7 +24,7 @@ namespace Volo.Abp.Cli.NuGet CancellationTokenProvider = cancellationTokenProvider; } - public async Task GetLatestVersionAsync(string packageId) + public async Task GetLatestVersionAsync(string packageId,bool includePreviews = false) { using (var client = new HttpClient()) { @@ -41,6 +41,12 @@ namespace Volo.Abp.Cli.NuGet var result = await responseMessage.Content.ReadAsStringAsync(); var versions = JsonSerializer.Deserialize(result).Versions; + if (!includePreviews) + { + versions = versions + .Where(x => !x.Contains("beta") && !x.Contains("preview") && !x.Contains("alpha") && !x.Contains("rc")) + .ToList(); + } return versions.Count > 0 ? versions.Last() : null; } From 92f5bc65d1032b885ed6abec553301c1cf233a18 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 15 May 2019 14:10:14 +0300 Subject: [PATCH 113/335] Minor refactoring for CLI --- .../Volo/Abp/Cli/CliService.cs | 46 ++++++++++++++----- .../Volo/Abp/Cli/NuGet/NuGetService.cs | 14 +++--- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index e86eccdf2c..e03ba1b9ab 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -39,7 +39,7 @@ namespace Volo.Abp.Cli Logger.LogInformation($"ABP CLI, version {GetCliVersion()}."); Logger.LogInformation("https://abp.io"); - await CheckHasNewVersion(); + await CheckForNewVersion(); var commandLineArgs = CommandLineArgumentParser.Parse(args); var commandType = CommandSelector.Select(commandLineArgs); @@ -63,25 +63,47 @@ namespace Volo.Abp.Cli } } - private async Task CheckHasNewVersion() + private async Task CheckForNewVersion() { - var currentVersion = GetCliVersion(); - var latestVersion = await NuGetService.GetLatestVersionAsync("Volo.Abp.Cli"); - - if (!string.IsNullOrEmpty(latestVersion) && currentVersion != latestVersion) + try + { + var currentVersion = GetCliVersion(); + var latestVersion = await NuGetService.GetLatestVersionOrNullAsync("Volo.Abp.Cli"); + + if (!latestVersion.IsNullOrEmpty() && currentVersion != latestVersion) + { + Logger.LogInformation(""); + Logger.LogWarning("ABP CLI has a newer version. Please update to get the latest features and fixes."); + Logger.LogWarning(""); + Logger.LogWarning("Update Command: "); + Logger.LogWarning(" dotnet tool update -g Volo.Abp.Cli"); + Logger.LogWarning(""); + } + } + catch (Exception e) { - Logger.LogInformation(""); - Logger.LogWarning("Cli has a new version. Please update."); - Logger.LogWarning("Update Command: dotnet tool update -g Volo.Abp.Cli"); + Logger.LogWarning("Could not get the latest version infom from NuGet.org:"); + Logger.LogWarning(e.Message); } } private static string GetCliVersion() { - return typeof(CliService) + var version = typeof(CliService) .Assembly - .GetFileVersion() - .RemovePostFix(".0"); + .GetFileVersion(); + + /* Assembly versions are like "2.4.0.0", but NuGet removes the last "0" here, + * like "2.4.0". + * So, we need to remove it from the assembly version to match to the NuGet version. + */ + + if (version.Split('.').Length == 4) + { + version = version.RemovePostFix(".0"); + } + + return version; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs index e9130ac8b6..115ce41d74 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs @@ -1,11 +1,11 @@ +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using Newtonsoft.Json; -using Volo.Abp.Json; using Volo.Abp.DependencyInjection; +using Volo.Abp.Json; using Volo.Abp.Threading; namespace Volo.Abp.Cli.NuGet @@ -15,7 +15,6 @@ namespace Volo.Abp.Cli.NuGet protected IJsonSerializer JsonSerializer { get; } protected ICancellationTokenProvider CancellationTokenProvider { get; } - public NuGetService( IJsonSerializer jsonSerializer, ICancellationTokenProvider cancellationTokenProvider) @@ -24,15 +23,17 @@ namespace Volo.Abp.Cli.NuGet CancellationTokenProvider = cancellationTokenProvider; } - public async Task GetLatestVersionAsync(string packageId,bool includePreviews = false) + public async Task GetLatestVersionOrNullAsync(string packageId, bool includePreviews = false) { using (var client = new HttpClient()) { client.Timeout = TimeSpan.FromSeconds(30); - + var responseMessage = await client.GetAsync( $"https://api.nuget.org/v3-flatcontainer/{packageId.ToLowerInvariant()}/index.json", - CancellationTokenProvider.Token); + CancellationTokenProvider.Token + ); + if (!responseMessage.IsSuccessStatusCode) { throw new Exception("Remote server returns error! HTTP status code: " + responseMessage.StatusCode); @@ -41,6 +42,7 @@ namespace Volo.Abp.Cli.NuGet var result = await responseMessage.Content.ReadAsStringAsync(); var versions = JsonSerializer.Deserialize(result).Versions; + if (!includePreviews) { versions = versions From a740e4a2a5fca51a7e54baccc9d94edaf1681eb4 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 15 May 2019 15:09:57 +0300 Subject: [PATCH 114/335] MVC template cleanup & refactor. --- templates/mvc/.gitignore | 2 +- .../MyProjectNameApplicationModule.cs | 5 ++++ .../Permissions/MyProjectNamePermissions.cs | 3 +- .../MyCompanyName.MyProjectName.Domain.csproj | 2 +- .../MyProjectNameDomainModule.cs | 12 ++++---- .../MyProjectNameMigrationsDbContext.cs | 2 ++ ....cs => 20190515120718_Initial.Designer.cs} | 30 +++++++++++++++++-- ...4_Initial.cs => 20190515120718_Initial.cs} | 23 ++++++++++++++ ...ectNameMigrationsDbContextModelSnapshot.cs | 28 ++++++++++++++++- ...me.EntityFrameworkCore.DbMigrations.csproj | 4 --- .../MyProjectNameEntityFrameworkCoreModule.cs | 4 ++- .../MongoDb/MyProjectNameMongoDbContext.cs | 4 ++- 12 files changed, 100 insertions(+), 19 deletions(-) rename templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/{20190402131334_Initial.Designer.cs => 20190515120718_Initial.Designer.cs} (96%) rename templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/{20190402131334_Initial.cs => 20190515120718_Initial.cs} (96%) diff --git a/templates/mvc/.gitignore b/templates/mvc/.gitignore index 1114901d9b..d1f0abf49e 100644 --- a/templates/mvc/.gitignore +++ b/templates/mvc/.gitignore @@ -252,4 +252,4 @@ paket-files/ *.sln.iml # MyProjectName -src/MyCompanyName.MyProjectName.Web/Logs/logs.txt +src/MyCompanyName.MyProjectName.Web/Logs/* diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs index 861076f3e8..e819e08e5b 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs @@ -20,6 +20,11 @@ namespace MyCompanyName.MyProjectName { Configure(options => { + /* use `true` for the `validate` parameter if you want to + * validate the profile on application startup. + * See http://docs.automapper.org/en/stable/Configuration-validation.html for more + * about configuration validation. + */ options.AddProfile(); }); } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs index 0646692500..4076366645 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs @@ -1,5 +1,4 @@ -using System; -using Volo.Abp.Reflection; +using Volo.Abp.Reflection; namespace MyCompanyName.MyProjectName.Permissions { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj index c9e416ca66..d86ac81e86 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj @@ -14,7 +14,7 @@ - + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs index 7484a0c94d..296d62033b 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs @@ -1,5 +1,4 @@ using MyCompanyName.MyProjectName.Localization.MyProjectName; -using Volo.Abp.Auditing; using Volo.Abp.AuditLogging; using Volo.Abp.BackgroundJobs; using Volo.Abp.FeatureManagement; @@ -9,19 +8,20 @@ using Volo.Abp.Localization.Resources.AbpValidation; using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement.Identity; +using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; using Volo.Abp.VirtualFileSystem; namespace MyCompanyName.MyProjectName { [DependsOn( + typeof(AbpAuditLoggingDomainModule), + typeof(BackgroundJobsDomainModule), + typeof(AbpFeatureManagementDomainModule), typeof(AbpIdentityDomainModule), typeof(AbpPermissionManagementDomainIdentityModule), - typeof(AbpAuditingModule), - typeof(BackgroundJobsDomainModule), - typeof(AbpAuditLoggingDomainModule), - typeof(AbpTenantManagementDomainModule), - typeof(AbpFeatureManagementDomainModule) + typeof(AbpSettingManagementDomainModule), + typeof(AbpTenantManagementDomainModule) )] public class MyProjectNameDomainModule : AbpModule { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContext.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContext.cs index 446e6b6ba4..0999a3a3f8 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContext.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContext.cs @@ -2,6 +2,7 @@ using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity; using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.PermissionManagement.EntityFrameworkCore; @@ -29,6 +30,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore builder.ConfigureBackgroundJobs(); builder.ConfigureAuditLogging(); builder.ConfigureIdentity(); + builder.ConfigureFeatureManagement(); builder.ConfigureTenantManagement(); /* Configure customizations for entities from the modules included */ diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.Designer.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190515120718_Initial.Designer.cs similarity index 96% rename from templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.Designer.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190515120718_Initial.Designer.cs index 4244444813..eb4daeac8f 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.Designer.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190515120718_Initial.Designer.cs @@ -10,14 +10,14 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(MyProjectNameMigrationsDbContext))] - [Migration("20190402131334_Initial")] + [Migration("20190515120718_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "2.2.0-rtm-35687") + .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); @@ -265,6 +265,32 @@ namespace MyCompanyName.MyProjectName.Migrations b.ToTable("AbpBackgroundJobs"); }); + modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasMaxLength(128); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpFeatureValues"); + }); + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => { b.Property("Id") diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190515120718_Initial.cs similarity index 96% rename from templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190515120718_Initial.cs index dcba749aed..b6be888a8c 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190515120718_Initial.cs @@ -80,6 +80,21 @@ namespace MyCompanyName.MyProjectName.Migrations table.PrimaryKey("PK_AbpClaimTypes", x => x.Id); }); + migrationBuilder.CreateTable( + name: "AbpFeatureValues", + columns: table => new + { + Id = table.Column(nullable: false), + Name = table.Column(maxLength: 128, nullable: false), + Value = table.Column(maxLength: 128, nullable: false), + ProviderName = table.Column(maxLength: 64, nullable: true), + ProviderKey = table.Column(maxLength: 64, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpFeatureValues", x => x.Id); + }); + migrationBuilder.CreateTable( name: "AbpPermissionGrants", columns: table => new @@ -427,6 +442,11 @@ namespace MyCompanyName.MyProjectName.Migrations table: "AbpEntityPropertyChanges", column: "EntityChangeId"); + migrationBuilder.CreateIndex( + name: "IX_AbpFeatureValues_Name_ProviderName_ProviderKey", + table: "AbpFeatureValues", + columns: new[] { "Name", "ProviderName", "ProviderKey" }); + migrationBuilder.CreateIndex( name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey", table: "AbpPermissionGrants", @@ -503,6 +523,9 @@ namespace MyCompanyName.MyProjectName.Migrations migrationBuilder.DropTable( name: "AbpEntityPropertyChanges"); + migrationBuilder.DropTable( + name: "AbpFeatureValues"); + migrationBuilder.DropTable( name: "AbpPermissionGrants"); diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs index f6136bdfbd..93e38fbb06 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs @@ -15,7 +15,7 @@ namespace MyCompanyName.MyProjectName.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "2.2.0-rtm-35687") + .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); @@ -263,6 +263,32 @@ namespace MyCompanyName.MyProjectName.Migrations b.ToTable("AbpBackgroundJobs"); }); + modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasMaxLength(128); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpFeatureValues"); + }); + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => { b.Property("Id") diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj index 773870d3de..b38b78dbd2 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj @@ -7,10 +7,6 @@ MyCompanyName.MyProjectName - - - - diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs index 5f9bd98bcf..c6569579db 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs @@ -28,7 +28,9 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore { context.Services.AddAbpDbContext(options => { - //Remove "includeAllEntities: true" to create default repositories only for aggregate roots + /* Remove "includeAllEntities: true" to create + * default repositories only for aggregate roots + */ options.AddDefaultRepositories(includeAllEntities: true); }); } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbContext.cs b/templates/mvc/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbContext.cs index 95a041809f..b800cd9063 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbContext.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbContext.cs @@ -16,7 +16,9 @@ namespace MyCompanyName.MyProjectName.MongoDb modelBuilder.Entity(b => { - b.CollectionName = "AbpUsers"; //Sharing the same collection "AbpUsers" with the IdentityUser + /* Sharing the same "AbpUsers" collection with the Identity module (IdentityUser entity). + */ + b.CollectionName = "AbpUsers"; }); } } From a67e982d42f277884fa0e114d6856ee79481a969 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 15 May 2019 15:35:55 +0300 Subject: [PATCH 115/335] Update nuget packages, code cleanup for MVC template. --- .../MyProjectNameBrandingProvider.cs | 2 +- .../MyProjectNameWebAutoMapperProfile.cs | 2 +- .../MyProjectNameWebModule.cs | 17 +++---- .../Pages/Index.cshtml | 2 +- .../Program.cs | 6 ++- .../Views/_ViewImports.cshtml | 1 + .../compilerconfig.json | 6 --- .../compilerconfig.json.defaults | 49 ------------------- .../package.json | 4 +- ...ame.MyProjectName.Application.Tests.csproj | 6 +-- ...CompanyName.MyProjectName.Web.Tests.csproj | 2 +- 11 files changed, 23 insertions(+), 74 deletions(-) rename templates/mvc/src/MyCompanyName.MyProjectName.Web/{Branding => }/MyProjectNameBrandingProvider.cs (85%) delete mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json delete mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json.defaults diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Branding/MyProjectNameBrandingProvider.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs similarity index 85% rename from templates/mvc/src/MyCompanyName.MyProjectName.Web/Branding/MyProjectNameBrandingProvider.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs index 70f6dc3b42..aba2d3920e 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Branding/MyProjectNameBrandingProvider.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs @@ -1,7 +1,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; using Volo.Abp.DependencyInjection; -namespace MyCompanyName.MyProjectName.Branding +namespace MyCompanyName.MyProjectName { [Dependency(ReplaceServices = true)] public class MyProjectNameBrandingProvider : DefaultBrandingProvider diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs index 8657675ba5..9969981937 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs @@ -6,7 +6,7 @@ namespace MyCompanyName.MyProjectName { public MyProjectNameWebAutoMapperProfile() { - //Configure your AutoMapper mapping configuration here... + //Define your AutoMapper configuration here... } } } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index c06daeed28..ec67c44f66 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Linq; using Localization.Resources.AbpUi; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -7,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.Localization.MyProjectName; using MyCompanyName.MyProjectName.Menus; -using MyCompanyName.MyProjectName.Permissions; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -17,21 +15,17 @@ using Volo.Abp.AspNetCore.Mvc.UI; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; -using Volo.Abp.Authorization.Permissions; using Volo.Abp.Autofac; using Volo.Abp.AutoMapper; using Volo.Abp.Data; -using Volo.Abp.Identity; using Volo.Abp.Identity.Web; using Volo.Abp.Localization; -using Volo.Abp.Localization.Resources.AbpValidation; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.Web; using Volo.Abp.Threading; using Volo.Abp.UI; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; -using Volo.Abp.PermissionManagement; using Volo.Abp.TenantManagement.Web; // using Volo.Abp.EntityFrameworkCore; @@ -91,6 +85,11 @@ namespace MyCompanyName.MyProjectName { Configure(options => { + /* use `true` for the `validate` parameter if you want to + * validate the profile on application startup. + * See http://docs.automapper.org/en/stable/Configuration-validation.html for more + * about configuration validation. + */ options.AddProfile(); }); } @@ -123,7 +122,6 @@ namespace MyCompanyName.MyProjectName options.Resources .Get() .AddBaseTypes( - typeof(AbpValidationResource), typeof(AbpUiResource) ); @@ -155,10 +153,11 @@ namespace MyCompanyName.MyProjectName services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new Info {Title = "MyProjectName API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); - }); + } + ); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml index e09c95188b..5b350a84de 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml @@ -14,6 +14,6 @@

    @L["Login"]

    }
    -

    abp.io

    +

    abp.io

    \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs index 2b99ef0371..22b560f34f 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs @@ -11,7 +11,11 @@ namespace MyCompanyName.MyProjectName public static int Main(string[] args) { Log.Logger = new LoggerConfiguration() - .MinimumLevel.Debug() //TODO: Should be configurable! +#if DEBUG + .MinimumLevel.Debug() +#else + .MinimumLevel.Information() +#endif .MinimumLevel.Override("Microsoft", LogEventLevel.Information) .Enrich.FromLogContext() .WriteTo.File("Logs/logs.txt") diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Views/_ViewImports.cshtml b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Views/_ViewImports.cshtml index e4d518b1b8..c1da1f5f10 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Views/_ViewImports.cshtml +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Views/_ViewImports.cshtml @@ -1,3 +1,4 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json b/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json deleted file mode 100644 index 0f4f333f15..0000000000 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "outputFile": "wwwroot/pages/index.css", - "inputFile": "wwwroot/pages/index.scss" - } -] \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json.defaults b/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json.defaults deleted file mode 100644 index c75eb7d519..0000000000 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/compilerconfig.json.defaults +++ /dev/null @@ -1,49 +0,0 @@ -{ - "compilers": { - "less": { - "autoPrefix": "", - "cssComb": "none", - "ieCompat": true, - "strictMath": false, - "strictUnits": false, - "relativeUrls": true, - "rootPath": "", - "sourceMapRoot": "", - "sourceMapBasePath": "", - "sourceMap": false - }, - "sass": { - "includePath": "", - "indentType": "space", - "indentWidth": 2, - "outputStyle": "nested", - "Precision": 5, - "relativeUrls": true, - "sourceMapRoot": "", - "sourceMap": false - }, - "stylus": { - "sourceMap": false - }, - "babel": { - "sourceMap": false - }, - "coffeescript": { - "bare": false, - "runtimeMode": "node", - "sourceMap": false - } - }, - "minifiers": { - "css": { - "enabled": true, - "termSemicolons": true, - "gzip": false - }, - "javascript": { - "enabled": true, - "termSemicolons": true, - "gzip": false - } - } -} \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/package.json b/templates/mvc/src/MyCompanyName.MyProjectName.Web/package.json index c6c87ecf2a..ef4fcf2350 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/package.json @@ -1,6 +1,6 @@ { - "version": "0.1.0", - "name": "MyCompanyName.MyProjectName", + "version": "1.0.0", + "name": "my-app", "private": true, "dependencies": { "@abp/aspnetcore.mvc.ui.theme.basic": "^0.4.9" diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index 2a05c9b871..11e5650be0 100644 --- a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -15,13 +15,13 @@     - - + + - + diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj index 177f2da1ec..1f93e615d3 100644 --- a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj +++ b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj @@ -14,7 +14,7 @@ - + From bd775316f551030cf162f7b64e6e41e0c7f87a9b Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 15 May 2019 15:40:16 +0300 Subject: [PATCH 116/335] Upgrade to Swashbuckle.AspNetCore 4.0.1. --- .../MyCompanyName.MyProjectName.Web.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index fcbcc3104c..148fa94c93 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -24,7 +24,7 @@ - + From 8d7b4901270533c3c45b0ce23565e137341b92f5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 15 May 2019 15:42:49 +0300 Subject: [PATCH 117/335] CLI can configure Entity Framework after installing a module Resolves https://github.com/abpframework/abp/issues/1122 --- .../Volo/Abp/Cli/Commands/AddModuleCommand.cs | 8 ++- .../DbContextFileBuilderConfigureAdder.cs | 53 +++++++++++++++++++ .../EfCoreMigrationAdder.cs | 48 +++++++++++++++++ .../Abp/Cli/ProjectModification/ModuleInfo.cs | 2 + .../SolutionModuleAdder.cs | 48 ++++++++++++++++- 5 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index 5b07f7f364..f48e2f4542 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -30,9 +30,13 @@ namespace Volo.Abp.Cli.Commands throw new CliUsageException("Module name is missing!" + Environment.NewLine + Environment.NewLine + GetUsageInfo()); } + var skipDbMigrations = Convert.ToBoolean( + commandLineArgs.Options.GetOrNull(Options.Solution.SkipDbMigrations) ?? "false"); + await SolutionModuleAdder.AddAsync( GetSolutionFile(commandLineArgs), - commandLineArgs.Target + commandLineArgs.Target, + skipDbMigrations ); } @@ -93,6 +97,7 @@ namespace Volo.Abp.Cli.Commands sb.AppendLine("Examples:"); sb.AppendLine(" abp add-module Volo.Blogging Adds the module to the current soluton."); sb.AppendLine(" abp add-module Volo.Blogging -s Acme.BookStore Adds the module to the given soluton."); + sb.AppendLine(" abp add-module Volo.Blogging -s Acme.BookStore --SkipDbMigrations false Adds the module to the given soluton but doesn't add-migration."); sb.AppendLine(""); return sb.ToString(); @@ -104,6 +109,7 @@ namespace Volo.Abp.Cli.Commands { public const string Short = "s"; public const string Long = "solution"; + public const string SkipDbMigrations = "skip-db-migrations"; } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs new file mode 100644 index 0000000000..8f4d48adfa --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli.ProjectModification +{ + public class DbContextFileBuilderConfigureAdder : ITransientDependency + { + public void Add(string path, string moduleConfiguration) + { + var file = File.ReadAllText(path); + + var indexToInsert = FindIndexToInsert(file); + var stringToAdd = GetLineToAdd(moduleConfiguration); + + stringToAdd = " " + stringToAdd + Environment.NewLine; + + file = file.Insert(indexToInsert, stringToAdd); + + File.WriteAllText(path, file); + } + + protected int FindIndexToInsert(string file) + { + var indexOfMethodDeclaration = file.IndexOf("OnModelCreating(", StringComparison.Ordinal); + var indexOfOpeningBracket = indexOfMethodDeclaration + file.Substring(indexOfMethodDeclaration).IndexOf('{'); + + var stack = 1; + var index = indexOfOpeningBracket; + + while (stack > 0 || index < file.Length) + { + index++; + if (file[index] == '{') + { + stack++; + } + else if (file[index] == '}') + { + stack--; + } + } + return index; + } + + protected string GetLineToAdd(string moduleConfiguration) + { + return "builder.Configure" + moduleConfiguration + "();"; + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs new file mode 100644 index 0000000000..f22e6107b4 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Text; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli.ProjectModification +{ + public class EfCoreMigrationAdder : ITransientDependency + { + public void AddMigration(string csprojFile, string module, bool updateDatabase = true) + { + var moduleName = ParseModuleName(module); + var migrationName = "Added_" + moduleName + "_Module" + GetUniquePostFix(); + + var process = Process.Start("CMD.exe", "/C cd \"" + csprojFile + "\" & dotnet ef migrations add " + migrationName); + process.WaitForExit(); + + if (updateDatabase) + { + UpdateDatabase(csprojFile); + } + } + + protected void UpdateDatabase(string csprojFile) + { + var process = Process.Start("CMD.exe", "/C cd \"" + csprojFile + "\" & dotnet ef database update"); + process.WaitForExit(); + } + + protected virtual string ParseModuleName(string fullModuleName) + { + var words = fullModuleName?.Split('.'); + + if (words == null || words.Length <= 1) + { + return ""; + } + + return words[words.Length - 1]; + } + + protected virtual string GetUniquePostFix() + { + return "_" + new Random().Next(1,99999); + } + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs index 08c70eeede..d5e7a4e15a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleInfo.cs @@ -8,6 +8,8 @@ namespace Volo.Abp.Cli.ProjectModification public string DisplayName { get; set; } + public string EfCoreConfigureMethodName { get; set; } + public List NugetPackages { get; set; } public List NpmPackages { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 917a7bf1a0..6048338b10 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -19,22 +19,32 @@ namespace Volo.Abp.Cli.ProjectModification protected IJsonSerializer JsonSerializer { get; } protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; } + protected DbContextFileBuilderConfigureAdder DbContextFileBuilderConfigureAdder { get; } + protected EfCoreMigrationAdder EfCoreMigrationAdder { get; } protected ProjectNpmPackageAdder ProjectNpmPackageAdder { get; } + protected DerivedClassFinder DerivedClassFinder { get; } public SolutionModuleAdder( IJsonSerializer jsonSerializer, ProjectNugetPackageAdder projectNugetPackageAdder, + DbContextFileBuilderConfigureAdder dbContextFileBuilderConfigureAdder, + EfCoreMigrationAdder efCoreMigrationAdder, + DerivedClassFinder derivedClassFinder, ProjectNpmPackageAdder projectNpmPackageAdder) { + EfCoreMigrationAdder = efCoreMigrationAdder; + DerivedClassFinder = derivedClassFinder; JsonSerializer = jsonSerializer; ProjectNugetPackageAdder = projectNugetPackageAdder; + DbContextFileBuilderConfigureAdder = dbContextFileBuilderConfigureAdder; ProjectNpmPackageAdder = projectNpmPackageAdder; Logger = NullLogger.Instance; } public virtual async Task AddAsync( [NotNull] string solutionFile, - [NotNull] string moduleName) + [NotNull] string moduleName, + bool skipDbMigrations = false) { Check.NotNull(solutionFile, nameof(solutionFile)); Check.NotNull(moduleName, nameof(moduleName)); @@ -75,8 +85,42 @@ namespace Volo.Abp.Cli.ProjectModification Logger.LogDebug("Target project is not available for NPM packages."); } } + + ModifyDbContext(projectFiles, module, skipDbMigrations); + } + + protected void ModifyDbContext(string[] projectFiles, ModuleInfo module, bool skipDbMigrations = false) + { + if (string.IsNullOrWhiteSpace(module.EfCoreConfigureMethodName)) + { + return; + } + + var dbMigrationsProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrations.csproj")); + + if (dbMigrationsProject == null) + { + Logger.LogDebug("Solution doesn't have a \".DbMigrations\" project."); + return; + } + + var dbContextFile = DerivedClassFinder.Find(dbMigrationsProject, "AbpDbContext").FirstOrDefault(); + + if (dbContextFile == null) + { + Logger.LogDebug($"{dbMigrationsProject} project doesn't have a class that is derived from \"AbpDbContext\"."); + return; + } + + DbContextFileBuilderConfigureAdder.Add(dbContextFile, module.EfCoreConfigureMethodName); + + + if (!skipDbMigrations) + { + EfCoreMigrationAdder.AddMigration(dbMigrationsProject, module.Name); + } } - + protected virtual async Task FindModuleInfoAsync(string moduleName) { using (var client = new HttpClient()) From 7d764f3595ea0d5d1975351043c9d73dd7570828 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 15 May 2019 18:01:56 +0300 Subject: [PATCH 118/335] Refactor MVC template. --- .../MyProjectNameDomainModule.cs | 24 ++++++++++- .../MyProjectNameEntityFrameworkCoreModule.cs | 6 +++ .../MyProjectNameWebModule.cs | 41 +++---------------- .../MyProjectNameApplicationTestModule.cs | 15 ------- .../MyProjectNameTestDataBuilder.cs | 21 +++------- .../MyProjectNameWebTestModule.cs | 11 +---- .../Pages/Index_Tests.cs | 16 ++++++++ .../Samples/SampleWebTest.cs | 23 ----------- 8 files changed, 57 insertions(+), 100 deletions(-) create mode 100644 templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/Pages/Index_Tests.cs delete mode 100644 templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/Samples/SampleWebTest.cs diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs index 296d62033b..780b6ee10d 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs @@ -1,6 +1,9 @@ -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using Microsoft.Extensions.DependencyInjection; +using MyCompanyName.MyProjectName.Localization.MyProjectName; +using Volo.Abp; using Volo.Abp.AuditLogging; using Volo.Abp.BackgroundJobs; +using Volo.Abp.Data; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; using Volo.Abp.Localization; @@ -10,6 +13,7 @@ using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; +using Volo.Abp.Threading; using Volo.Abp.VirtualFileSystem; namespace MyCompanyName.MyProjectName @@ -45,5 +49,23 @@ namespace MyCompanyName.MyProjectName options.IsEnabled = MyProjectNameConsts.IsMultiTenancyEnabled; }); } + + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + SeedDatabase(context); + } + + private void SeedDatabase(ApplicationInitializationContext context) + { + using (var scope = context.ServiceProvider.CreateScope()) + { + AsyncHelper.RunSync(async () => + { + await scope.ServiceProvider + .GetRequiredService() + .SeedAsync(); + }); + } + } } } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs index c6569579db..bb8997aaa2 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore.SqlServer; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity.EntityFrameworkCore; @@ -33,6 +34,11 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore */ options.AddDefaultRepositories(includeAllEntities: true); }); + + Configure(options => + { + options.UseSqlServer(); + }); } } } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index ec67c44f66..a8fea98514 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -1,5 +1,4 @@ -using System.IO; -using Localization.Resources.AbpUi; +using Localization.Resources.AbpUi; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -7,6 +6,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.Localization.MyProjectName; using MyCompanyName.MyProjectName.Menus; using Swashbuckle.AspNetCore.Swagger; +using System.IO; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Mvc; @@ -17,19 +17,14 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.Autofac; using Volo.Abp.AutoMapper; -using Volo.Abp.Data; using Volo.Abp.Identity.Web; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.Web; -using Volo.Abp.Threading; +using Volo.Abp.TenantManagement.Web; using Volo.Abp.UI; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; -using Volo.Abp.TenantManagement.Web; -// -using Volo.Abp.EntityFrameworkCore; -// namespace MyCompanyName.MyProjectName { @@ -62,7 +57,6 @@ namespace MyCompanyName.MyProjectName var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - ConfigureDatabaseServices(); ConfigureAutoMapper(); ConfigureVirtualFileSystem(hostingEnvironment); ConfigureLocalizationServices(); @@ -71,16 +65,6 @@ namespace MyCompanyName.MyProjectName ConfigureSwaggerServices(context.Services); } - private void ConfigureDatabaseServices() - { - // - Configure(options => - { - options.UseSqlServer(); - }); - // - } - private void ConfigureAutoMapper() { Configure(options => @@ -110,7 +94,7 @@ namespace MyCompanyName.MyProjectName options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar))); - // + // }); } } @@ -153,7 +137,7 @@ namespace MyCompanyName.MyProjectName services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info {Title = "MyProjectName API", Version = "v1"}); + options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -193,21 +177,6 @@ namespace MyCompanyName.MyProjectName app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); - - SeedDatabase(context); - } - - private static void SeedDatabase(ApplicationInitializationContext context) - { - using (var scope = context.ServiceProvider.CreateScope()) - { - AsyncHelper.RunSync(async () => - { - await scope.ServiceProvider - .GetRequiredService() - .SeedAsync(); - }); - } } } } diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs index d44dc0bb5a..e8e31f4f65 100644 --- a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs +++ b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs @@ -38,11 +38,6 @@ namespace MyCompanyName.MyProjectName }); } - public override void OnApplicationInitialization(ApplicationInitializationContext context) - { - SeedTestData(context); - } - public override void OnApplicationShutdown(ApplicationShutdownContext context) { _sqliteConnection.Dispose(); @@ -64,15 +59,5 @@ namespace MyCompanyName.MyProjectName return connection; } - - private static void SeedTestData(ApplicationInitializationContext context) - { - using (var scope = context.ServiceProvider.CreateScope()) - { - scope.ServiceProvider - .GetRequiredService() - .Build(); - } - } } } \ No newline at end of file diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameTestDataBuilder.cs b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameTestDataBuilder.cs index fa3c0be470..8f5ce86a66 100644 --- a/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameTestDataBuilder.cs +++ b/templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameTestDataBuilder.cs @@ -1,28 +1,17 @@ using System.Threading.Tasks; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; -using Volo.Abp.Identity; -using Volo.Abp.Threading; namespace MyCompanyName.MyProjectName { - public class MyProjectNameTestDataBuilder : ITransientDependency + public class MyProjectNameTestDataSeedContributor : IDataSeedContributor, ITransientDependency { - private readonly IDataSeeder _dataSeeder; - - public MyProjectNameTestDataBuilder(IDataSeeder dataSeeder) - { - _dataSeeder = dataSeeder; - } - - public void Build() + public Task SeedAsync(DataSeedContext context) { - AsyncHelper.RunSync(BuildInternalAsync); - } + /* Seed additional test data... + */ - public async Task BuildInternalAsync() - { - await _dataSeeder.SeedAsync(); + return Task.CompletedTask; } } } \ No newline at end of file diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs index 53ece5c3b8..87ced58285 100644 --- a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs +++ b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs @@ -4,17 +4,12 @@ using Localization.Resources.AbpUi; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc.ApplicationParts; -using Microsoft.AspNetCore.Mvc.Internal; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using MyCompanyName.MyProjectName.Localization.MyProjectName; using MyCompanyName.MyProjectName.Menus; using Volo.Abp; -using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; -using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.TestBase; -using Volo.Abp.Identity.Web; using Volo.Abp.Localization; using Volo.Abp.Localization.Resources.AbpValidation; using Volo.Abp.Modularity; @@ -24,10 +19,8 @@ namespace MyCompanyName.MyProjectName { [DependsOn( typeof(AbpAspNetCoreTestBaseModule), - typeof(MyProjectNameApplicationTestModule), - typeof(AbpIdentityWebModule), - typeof(AbpAccountWebModule), - typeof(AbpAspNetCoreMvcUiBasicThemeModule) + typeof(MyProjectNameWebModule), + typeof(MyProjectNameApplicationTestModule) )] public class MyProjectNameWebTestModule : AbpModule { diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/Pages/Index_Tests.cs b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/Pages/Index_Tests.cs new file mode 100644 index 0000000000..b74d22c3f0 --- /dev/null +++ b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/Pages/Index_Tests.cs @@ -0,0 +1,16 @@ +using System.Threading.Tasks; +using Shouldly; +using Xunit; + +namespace MyCompanyName.MyProjectName.Pages +{ + public class Index_Tests : MyProjectNameWebTestBase + { + [Fact] + public async Task Welcome_Page() + { + var response = await GetResponseAsStringAsync("/"); + response.ShouldNotBeNull(); + } + } +} diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/Samples/SampleWebTest.cs b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/Samples/SampleWebTest.cs deleted file mode 100644 index 34b0ce089b..0000000000 --- a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/Samples/SampleWebTest.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Shouldly; -using Xunit; - -namespace MyCompanyName.MyProjectName.Samples -{ - public class SampleWebTest : MyProjectNameWebTestBase - { - [Fact(Skip = "This is disabled since not working")] - public async Task Welcome_Page() - { - var response = await GetResponseAsStringAsync("/"); - response.ShouldNotBeNull(); - } - - [Fact(Skip = "This is disabled since not working")] - public async Task Login_Page() - { - var response = await GetResponseAsStringAsync("/Account/Login/"); - response.ShouldNotBeNull(); - } - } -} From 08f432028234295b99dfc89dbf1de683cc3651b4 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 15 May 2019 18:09:08 +0300 Subject: [PATCH 119/335] added empty css/js files. --- .../Pages/Index.cshtml | 11 +++++++++-- .../MyCompanyName.MyProjectName.Web/Pages/Index.css | 3 +++ .../MyCompanyName.MyProjectName.Web/Pages/Index.js | 3 +++ .../wwwroot/pages/index.css | 1 - .../wwwroot/pages/index.min.css | 1 - .../wwwroot/pages/index.scss | 3 --- 6 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.css create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.js delete mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.css delete mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.min.css delete mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.scss diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml index 5b350a84de..5efecf03a5 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml @@ -3,7 +3,14 @@ @inherits MyProjectNamePageBase @model IndexModel @section styles { - + + + +} +@section scripts { + + + } @L["Welcome"] @@ -13,7 +20,7 @@ {

    @L["Login"]

    } -
    +

    abp.io

     \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.css b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.css new file mode 100644 index 0000000000..3f73b78b9f --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.css @@ -0,0 +1,3 @@ +body { + +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.js b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.js new file mode 100644 index 0000000000..46f089b9c7 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.js @@ -0,0 +1,3 @@ +$(function () { + abp.log.debug('Index.js initialized!'); +}); \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.css b/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.css deleted file mode 100644 index e02abfc9b0..0000000000 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.css +++ /dev/null @@ -1 +0,0 @@ - diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.min.css b/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.min.css deleted file mode 100644 index 5f282702bb..0000000000 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.min.css +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.scss b/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.scss deleted file mode 100644 index b945ade091..0000000000 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/wwwroot/pages/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -body{ - -} From b63929f4924c6077d3b64156eb6af9933f316bd6 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Wed, 15 May 2019 18:32:44 +0300 Subject: [PATCH 120/335] Add project generation step: ChangeLocalhostPortStep --- .../Volo/Abp/Cli/CliService.cs | 2 +- .../Building/Steps/ChangeLocalhostPortStep.cs | 35 +++++++++++++++++++ .../ProjectBuilding/TemplateInfoProvider.cs | 6 ++-- ...cApplicationTemplate.cs => MvcTemplate.cs} | 16 +++++++-- 4 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeLocalhostPortStep.cs rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/{MvcApplicationTemplate.cs => MvcTemplate.cs} (82%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index e03ba1b9ab..50784a8d90 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -73,7 +73,7 @@ namespace Volo.Abp.Cli if (!latestVersion.IsNullOrEmpty() && currentVersion != latestVersion) { Logger.LogInformation(""); - Logger.LogWarning("ABP CLI has a newer version. Please update to get the latest features and fixes."); + Logger.LogWarning("ABP CLI has a newer version (" + latestVersion + "). Please update to get the latest features and fixes."); Logger.LogWarning(""); Logger.LogWarning("Update Command: "); Logger.LogWarning(" dotnet tool update -g Volo.Abp.Cli"); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeLocalhostPortStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeLocalhostPortStep.cs new file mode 100644 index 0000000000..e902e245cf --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeLocalhostPortStep.cs @@ -0,0 +1,35 @@ +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps +{ + public class ChangeLocalhostPortStep : ProjectBuildPipelineStep + { + public string LaunchSettingsFilePath { get; } + public int[] PortNumbers { get; } + + public ChangeLocalhostPortStep( + string launchSettingsFilePath, + params int[] portNumbers) + { + Check.NotNullOrEmpty(portNumbers, nameof(portNumbers)); + + LaunchSettingsFilePath = launchSettingsFilePath; + PortNumbers = portNumbers; + } + + public override void Execute(ProjectBuildContext context) + { + var launchSettings = context.GetFile(LaunchSettingsFilePath); + var randomPort = RandomHelper.GetRandom(50001, 59990); + var newContent = launchSettings.Content; + + for (var i = 0; i < PortNumbers.Length; i++) + { + newContent = newContent.Replace( + PortNumbers[i].ToString(), + (randomPort + i).ToString() + ); + } + + launchSettings.SetContent(newContent); + } + } +} 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 1aa9f5b6ef..e23e0ebe0e 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 @@ -9,15 +9,15 @@ namespace Volo.Abp.Cli.ProjectBuilding { public TemplateInfo GetDefault() { - return Get(MvcApplicationTemplate.TemplateName); + return Get(MvcTemplate.TemplateName); } public TemplateInfo Get(string name) { switch (name) { - case MvcApplicationTemplate.TemplateName: - return new MvcApplicationTemplate(); + case MvcTemplate.TemplateName: + return new MvcTemplate(); case MvcModuleTemplate.TemplateName: return new MvcModuleTemplate(); case ServiceTemplate.TemplateName: diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcApplicationTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcTemplate.cs similarity index 82% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcApplicationTemplate.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcTemplate.cs index b40d577285..0286a484da 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcApplicationTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcTemplate.cs @@ -4,14 +4,14 @@ using Volo.Abp.Cli.ProjectBuilding.Building.Steps; namespace Volo.Abp.Cli.ProjectBuilding.Templates { - public class MvcApplicationTemplate : TemplateInfo + public class MvcTemplate : TemplateInfo { /// /// "mvc". /// public const string TemplateName = "mvc"; - public MvcApplicationTemplate() + public MvcTemplate() : base(TemplateName, DatabaseProvider.EntityFrameworkCore) { } @@ -21,6 +21,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates var steps = new List(); SwitchDatabaseProvider(context, steps); RemoveOtherDatabaseProviders(context, steps); + ChangeLocalhostPort(steps); return steps; } @@ -47,5 +48,16 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB")); } } + + private void ChangeLocalhostPort(List steps) + { + steps.Add( + new ChangeLocalhostPortStep( + "/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json", + 53929, + 53932 + ) + ); + } } } \ No newline at end of file From 7c86f45b48ba38ea7b10beda0c4738ec721ba94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B6=9B?= Date: Thu, 16 May 2019 11:59:48 +0800 Subject: [PATCH 121/335] Fix typos and links in the documentation --- docs/en/AspNetCore/Auto-API-Controllers.md | 4 ++-- docs/en/Best-Practices/Entities.md | 2 +- docs/en/Module-Development-Basics.md | 2 +- docs/en/Modules/Index.md | 2 +- docs/en/Multi-Tenancy.md | 2 +- docs/en/Repositories.md | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/en/AspNetCore/Auto-API-Controllers.md b/docs/en/AspNetCore/Auto-API-Controllers.md index db7fb63642..b81afbcac4 100644 --- a/docs/en/AspNetCore/Auto-API-Controllers.md +++ b/docs/en/AspNetCore/Auto-API-Controllers.md @@ -1,6 +1,6 @@ # Auto API Controllers -Once you create an [application service](Application-Services.md), you generally want to create an API controller to expose this service as an HTTP (REST) API endpoint. A typical API controller does nothing but redirects method calls to the application service and configures the REST API using attributes like [HttpGet], [HttpPost], [Route]... etc. +Once you create an [application service](../Application-Services.md), you generally want to create an API controller to expose this service as an HTTP (REST) API endpoint. A typical API controller does nothing but redirects method calls to the application service and configures the REST API using attributes like [HttpGet], [HttpPost], [Route]... etc. ABP can **automagically** configures your application services as MVC API Controllers by convention. Most of time you don't care about its detailed configuration, but it's possible fully customize it. @@ -106,7 +106,7 @@ public class PersonAppService : ApplicationService ### TypePredicate Option -You can further filter classes to become an API controller by providing the `TypePedicate` option: +You can further filter classes to become an API controller by providing the `TypePredicate` option: ````csharp services.Configure(options => diff --git a/docs/en/Best-Practices/Entities.md b/docs/en/Best-Practices/Entities.md index 03843c5278..1c76469cb7 100644 --- a/docs/en/Best-Practices/Entities.md +++ b/docs/en/Best-Practices/Entities.md @@ -63,7 +63,7 @@ public class Issue : FullAuditedAggregateRoot //Using Guid as the key/iden protected Issue() { - /* This conctructor is for ORMs to be used while getting the entity from database. + /* This constructor is for ORMs to be used while getting the entity from database. * - No need to initialize the Labels collection since it will be overrided from the database. - It's protected since proxying and deserialization tools diff --git a/docs/en/Module-Development-Basics.md b/docs/en/Module-Development-Basics.md index 6a0561a0c5..8149ec2cb1 100644 --- a/docs/en/Module-Development-Basics.md +++ b/docs/en/Module-Development-Basics.md @@ -112,7 +112,7 @@ Lastly, you can override ``OnApplicationShutdown`` method if you want to execute ## Module Dependencies -In a modular application, it's not unusual for one module to depend upon another module(s). An Abp module must declare ``[DependsOn]`` attribute if it does have a dependcy upon another module, as shown below: +In a modular application, it's not unusual for one module to depend upon another module(s). An Abp module must declare ``[DependsOn]`` attribute if it does have a dependency upon another module, as shown below: ````C# [DependsOn(typeof(AbpAspNetCoreMvcModule))] diff --git a/docs/en/Modules/Index.md b/docs/en/Modules/Index.md index 9dc5da7a99..2771c9a8a9 100644 --- a/docs/en/Modules/Index.md +++ b/docs/en/Modules/Index.md @@ -21,6 +21,6 @@ There are some **free and open source** application modules developed and mainta * **Permission Management**: Used to persist permissions. * **Setting Management**: Used to persist settings. * **Tenant Management**: Used to manage tenants for a [multi-tenant](../Multi-Tenancy.md) application. -* **Users**: Used the abstract users, so other modules can depend on this instead of the Identity module. +* **Users**: Used to abstract users, so other modules can depend on this instead of the Identity module. Documenting the modules is in the progress. See [this repository](https://github.com/abpframework/abp/tree/master/modules) for source code of all modules. \ No newline at end of file diff --git a/docs/en/Multi-Tenancy.md b/docs/en/Multi-Tenancy.md index ee0648f483..f5510a82db 100644 --- a/docs/en/Multi-Tenancy.md +++ b/docs/en/Multi-Tenancy.md @@ -56,7 +56,7 @@ namespace MyCompany.MyProject } ```` -IMultiTenant requires to define a **TenantId** property in the implementing entity (See entity documentation (TODO: link) for more about entities). +IMultiTenant requires to define a **TenantId** property in the implementing entity (See [entity documentation](Entities.md) for more about entities). #### Obtain Current Tenant's Id diff --git a/docs/en/Repositories.md b/docs/en/Repositories.md index 3e4a46a4f5..e6b55cb3de 100644 --- a/docs/en/Repositories.md +++ b/docs/en/Repositories.md @@ -48,8 +48,8 @@ In this example; Generic Repositories provides some standard CRUD features out of the box: -* Providers `Insert` method to save a new entity. -* Providers `Update` and `Delete` methods to update or delete an entity by entity object or it's id. +* Provides `Insert` method to save a new entity. +* Provides `Update` and `Delete` methods to update or delete an entity by entity object or it's id. * Provides `Delete` method to delete multiple entities by a filter. * Implements `IQueryable`, so you can use LINQ and extension methods like `FirstOrDefault`, `Where`, `OrderBy`, `ToList` and so on... * Have **sync** and **async** versions for all methods. From aaee2ef41fd3c551898bc3415ee2c26bbc49ab85 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 16 May 2019 10:38:21 +0300 Subject: [PATCH 122/335] CLI can configure Entity Framework after installing a module cont. --- .../DbContextFileBuilderConfigureAdder.cs | 45 +++++++++++-- .../ProjectModification/DerivedClassFinder.cs | 55 ++++++++++++++-- .../ModuleClassDependcyAdder.cs | 44 +++---------- .../SolutionModuleAdder.cs | 2 +- .../UsingStatementAdder.cs | 65 +++++++++++++++++++ 5 files changed, 160 insertions(+), 51 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs index 8f4d48adfa..b8af0ed471 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs @@ -1,23 +1,42 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Text; +using System.Linq; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.ProjectModification { public class DbContextFileBuilderConfigureAdder : ITransientDependency { + protected UsingStatementAdder UsingStatementAdder { get; } + public ILogger Logger { get; set; } + + public DbContextFileBuilderConfigureAdder(UsingStatementAdder usingStatementAdder) + { + UsingStatementAdder = usingStatementAdder; + Logger = NullLogger.Instance; + } + public void Add(string path, string moduleConfiguration) { var file = File.ReadAllText(path); - var indexToInsert = FindIndexToInsert(file); + file = UsingStatementAdder.Add(file, GetNamespace(moduleConfiguration)); + var stringToAdd = GetLineToAdd(moduleConfiguration); + if (!file.Contains(stringToAdd)) + { + var indexToInsert = FindIndexToInsert(file); - stringToAdd = " " + stringToAdd + Environment.NewLine; + if (indexToInsert <= 0 || indexToInsert >= file.Length) + { + Logger.LogWarning($"\"OnModelCreating(ModelBuilder builder)\" method couldn't be found in {path}"); + return; + } + file = file.Insert(indexToInsert, " " + stringToAdd + Environment.NewLine + " "); + } - file = file.Insert(indexToInsert, stringToAdd); File.WriteAllText(path, file); } @@ -30,9 +49,15 @@ namespace Volo.Abp.Cli.ProjectModification var stack = 1; var index = indexOfOpeningBracket; - while (stack > 0 || index < file.Length) + while (stack > 0) { index++; + + if (index >= file.Length) + { + break; + } + if (file[index] == '{') { stack++; @@ -42,12 +67,18 @@ namespace Volo.Abp.Cli.ProjectModification stack--; } } + return index; } protected string GetLineToAdd(string moduleConfiguration) { - return "builder.Configure" + moduleConfiguration + "();"; + return "builder." + moduleConfiguration.Split('.').Last() + "();"; + } + + protected string GetNamespace(string moduleConfiguration) + { + return string.Join(".", moduleConfiguration.Split('.').Reverse().Skip(2)); } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DerivedClassFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DerivedClassFinder.cs index bf11e0af65..db39a660ce 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DerivedClassFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DerivedClassFinder.cs @@ -1,42 +1,83 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; using System.Linq; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.ProjectModification { public class DerivedClassFinder : ITransientDependency { + public ILogger Logger { get; set; } + + public DerivedClassFinder() + { + Logger = NullLogger.Instance; + } + public virtual List Find(string csprojFilePath, string baseClass) { var moduleFilePaths = new List(); + var csprojFileDirectory = Path.GetDirectoryName(csprojFilePath); + var binFile = Path.Combine(csprojFileDirectory, "bin"); + var objFile = Path.Combine(csprojFileDirectory, "obj"); + - var csFiles = new DirectoryInfo(Path.GetDirectoryName(csprojFilePath)) + var csFiles = new DirectoryInfo(csprojFileDirectory) .GetFiles("*.cs", SearchOption.AllDirectories) + .Where(f => !f.DirectoryName.StartsWith(binFile)) + .Where(f => !f.DirectoryName.StartsWith(objFile)) .Select(f => f.FullName) .ToList(); foreach (var csFile in csFiles) { - if (IsDerivedFromAbpModule(csFile, baseClass)) + try { - moduleFilePaths.Add(csFile); + if (IsDerived(csFile, baseClass)) + { + moduleFilePaths.Add(csFile); + } + } + catch (Exception) + { + Logger.LogDebug($"Couldn't parse {csFile}."); } } return moduleFilePaths; } - protected bool IsDerivedFromAbpModule(string csFile, string baseClass) + protected bool IsDerived(string csFile, string baseClass) { + Logger.LogDebug(csFile); var root = CSharpSyntaxTree.ParseText(File.ReadAllText(csFile)).GetRoot(); var namespaceSyntax = root.DescendantNodes().OfType().First(); var classDeclaration = (namespaceSyntax.DescendantNodes().OfType()).First(); + var baseTypeList = classDeclaration.BaseList?.Types.Select(t => t.ToString()).ToList(); + + if (baseTypeList == null) + { + return false; + } + + foreach (var baseType in baseTypeList) + { + if (baseType.Contains('<') && baseType.Substring(0, baseType.IndexOf('<')) == baseClass) + { + return true; + } + if (baseType == baseClass) + { + return true; + } + } - return classDeclaration.BaseList?.Types - .Any(t => t.ToString().Equals(baseClass)) ?? false; + return false; } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs index 594c77e5fa..9388ce42fe 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ModuleClassDependcyAdder.cs @@ -7,16 +7,20 @@ namespace Volo.Abp.Cli.ProjectModification { public class ModuleClassDependcyAdder : ITransientDependency { + protected UsingStatementAdder UsingStatementAdder { get; } + + public ModuleClassDependcyAdder(UsingStatementAdder usingStatementAdder) + { + UsingStatementAdder = usingStatementAdder; + } + public virtual void Add(string path, string module) { ParseModuleNameAndNameSpace(module, out var nameSpace, out var moduleName); var file = File.ReadAllText(path); - if (!file.Contains(GetUsingStatement(nameSpace)) ) - { - file = InsertUsingStatement(file, nameSpace); - } + file = UsingStatementAdder.Add(file, nameSpace); if (!file.Contains(moduleName) ) { @@ -34,38 +38,6 @@ namespace Volo.Abp.Cli.ProjectModification return file.Insert(indexOfPublicClassDeclaration, dependsOnAttribute); } - protected virtual string InsertUsingStatement(string file, string nameSpace) - { - var indexOfTheEndOfTheLastUsingStatement = GetIndexOfTheEndOfTheLastUsingStatement(file); - - return file.Insert(indexOfTheEndOfTheLastUsingStatement, Environment.NewLine + GetUsingStatement(nameSpace)); - } - - protected virtual int GetIndexOfTheEndOfTheLastUsingStatement(string file) - { - var indexOfPublicClassDeclaration = GetIndexOfWhereDependsOnWillBeAdded(file); - file = file.Substring(0, indexOfPublicClassDeclaration); - - var indexOfTheStartOfLastUsingStatement = - file.LastIndexOf("using ", StringComparison.Ordinal); - - if (indexOfTheStartOfLastUsingStatement < 0) - { - return 0; - } - - var indexOfFirstSemiColonAfterLastUsingStatement = - file.Substring(indexOfTheStartOfLastUsingStatement).IndexOf(';'); - - if (indexOfFirstSemiColonAfterLastUsingStatement < 0) - { - return 0; - } - - return indexOfTheStartOfLastUsingStatement - + indexOfFirstSemiColonAfterLastUsingStatement + 1; - } - protected virtual int GetIndexOfWhereDependsOnWillBeAdded(string file) { var indexOfPublicClassDeclaration = file.IndexOf("public class", StringComparison.Ordinal); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index 6048338b10..c62beeacc1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -97,7 +97,7 @@ namespace Volo.Abp.Cli.ProjectModification } var dbMigrationsProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrations.csproj")); - + if (dbMigrationsProject == null) { Logger.LogDebug("Solution doesn't have a \".DbMigrations\" project."); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs new file mode 100644 index 0000000000..fd6a95fb10 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Cli.ProjectModification +{ + public class UsingStatementAdder : ITransientDependency + { + public string Add(string fileContent, string nameSpace) + { + if (fileContent.Contains(nameSpace)) + { + return fileContent; + } + + var index = GetIndexOfTheEndOfTheLastUsingStatement(fileContent); + + if (index < 0 || index >= fileContent.Length) + { + index = 0; + } + + var usingStatement = GetUsingStatement(nameSpace); + + return fileContent.Insert(index, usingStatement); + } + + protected string GetUsingStatement(string nameSpace) + { + return Environment.NewLine + "using " + nameSpace + ";"; + } + + protected virtual int GetIndexOfTheEndOfTheLastUsingStatement(string fileContent) + { + var indexOfNamespaceDeclaration = fileContent.IndexOf("namespace", StringComparison.Ordinal); + + if (indexOfNamespaceDeclaration < 0) + { + return 0; + } + + fileContent = fileContent.Substring(0, indexOfNamespaceDeclaration); + + var indexOfTheStartOfLastUsingStatement = + fileContent.LastIndexOf("using ", StringComparison.Ordinal); + + if (indexOfTheStartOfLastUsingStatement < 0) + { + return 0; + } + + var indexOfFirstSemiColonAfterLastUsingStatement = + fileContent.Substring(indexOfTheStartOfLastUsingStatement).IndexOf(';'); + + if (indexOfFirstSemiColonAfterLastUsingStatement < 0) + { + return 0; + } + + return indexOfTheStartOfLastUsingStatement + + indexOfFirstSemiColonAfterLastUsingStatement + 1; + } + } +} From 469eafed00bfe91b7cbfbd78683669fdba9e8a03 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 16 May 2019 10:39:07 +0300 Subject: [PATCH 123/335] removed redundant code --- .../Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs | 2 -- .../Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs | 2 -- 2 files changed, 4 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs index f22e6107b4..f0ce18a537 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Text; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.ProjectModification diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs index fd6a95fb10..aed44cc512 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/UsingStatementAdder.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.ProjectModification From e21d6e44d2d717c3c02d8bfe0f3163495023fae5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 16 May 2019 11:05:23 +0300 Subject: [PATCH 124/335] Update DbContextFileBuilderConfigureAdder.cs --- .../ProjectModification/DbContextFileBuilderConfigureAdder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs index b8af0ed471..078a8db9b7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs @@ -78,7 +78,7 @@ namespace Volo.Abp.Cli.ProjectModification protected string GetNamespace(string moduleConfiguration) { - return string.Join(".", moduleConfiguration.Split('.').Reverse().Skip(2)); + return string.Join(".", moduleConfiguration.Split('.').Reverse().Skip(2).Reverse()); } } } From 72cb2dc4188fc2d9a511d422e264953648555cc2 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 16 May 2019 11:10:53 +0300 Subject: [PATCH 125/335] Update EfCoreMigrationAdder.cs --- .../Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs index f0ce18a537..d3178adcb3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using System.IO; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.ProjectModification @@ -11,7 +12,7 @@ namespace Volo.Abp.Cli.ProjectModification var moduleName = ParseModuleName(module); var migrationName = "Added_" + moduleName + "_Module" + GetUniquePostFix(); - var process = Process.Start("CMD.exe", "/C cd \"" + csprojFile + "\" & dotnet ef migrations add " + migrationName); + var process = Process.Start("CMD.exe", "/C cd \"" + Path.GetDirectoryName(csprojFile) + "\" & dotnet ef migrations add " + migrationName); process.WaitForExit(); if (updateDatabase) @@ -22,7 +23,7 @@ namespace Volo.Abp.Cli.ProjectModification protected void UpdateDatabase(string csprojFile) { - var process = Process.Start("CMD.exe", "/C cd \"" + csprojFile + "\" & dotnet ef database update"); + var process = Process.Start("CMD.exe", "/C cd \"" + Path.GetDirectoryName(csprojFile) + "\" & dotnet ef database update"); process.WaitForExit(); } From 6edb87bd3f4e57cdd15d2af202bcc98e541c6118 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 16 May 2019 18:32:25 +0800 Subject: [PATCH 126/335] Fix #1127 the problem of PersistedGrantStore's StoreAsync update entity. --- .../Grants/PersistedGrantStore.cs | 7 ++-- .../Clients/PersistentGrant_Tests.cs | 40 +++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs index eb14ebc2ba..ab8bb6ffbd 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs @@ -22,15 +22,16 @@ namespace Volo.Abp.IdentityServer.Grants public virtual async Task StoreAsync(IdentityServer4.Models.PersistedGrant grant) { - var entity = _objectMapper.Map(grant); - var existing = await _persistentGrantRepository.FindByKeyAsync(grant.Key); - if (existing == null) + var entity = await _persistentGrantRepository.FindByKeyAsync(grant.Key); + if (entity == null) { + entity = _objectMapper.Map(grant); entity.Id = _guidGenerator.Create(); await _persistentGrantRepository.InsertAsync(entity); } else { + _objectMapper.Map(grant, entity); await _persistentGrantRepository.UpdateAsync(entity); } } diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Clients/PersistentGrant_Tests.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Clients/PersistentGrant_Tests.cs index 9a87e30d64..4621daa3f4 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Clients/PersistentGrant_Tests.cs +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Clients/PersistentGrant_Tests.cs @@ -78,6 +78,46 @@ namespace Volo.Abp.IdentityServer.Clients persistedGrant.CreationTime.Second.ShouldBe(21); } + + [Fact] + public async Task StoreAsync_Should_Store_PersistedGrant_When_Exists() + { + //Act + await _persistedGrantStore.StoreAsync(new PersistedGrant + { + Key = "PersistedGrantKey1", + ClientId = "TestClientId-PersistedGrantKey1", + Type = "TestType-PersistedGrantKey1", + SubjectId = "TestSubject", + Data = "TestData-PersistedGrantKey1", + Expiration = new DateTime(2018, 1, 6, 21, 22, 23), + CreationTime = new DateTime(2018, 1, 5, 19, 20, 21) + }); + + //Assert + var persistedGrant = await _persistedGrantStore.GetAsync("PersistedGrantKey1"); + persistedGrant.Key.ShouldBe("PersistedGrantKey1"); + persistedGrant.ClientId.ShouldBe("TestClientId-PersistedGrantKey1"); + persistedGrant.Type.ShouldBe("TestType-PersistedGrantKey1"); + persistedGrant.SubjectId.ShouldBe("TestSubject"); + persistedGrant.Data.ShouldBe("TestData-PersistedGrantKey1"); + + persistedGrant.Expiration.HasValue.ShouldBe(true); + persistedGrant.Expiration.Value.Year.ShouldBe(2018); + persistedGrant.Expiration.Value.Month.ShouldBe(1); + persistedGrant.Expiration.Value.Day.ShouldBe(6); + persistedGrant.Expiration.Value.Hour.ShouldBe(21); + persistedGrant.Expiration.Value.Minute.ShouldBe(22); + persistedGrant.Expiration.Value.Second.ShouldBe(23); + + persistedGrant.CreationTime.Year.ShouldBe(2018); + persistedGrant.CreationTime.Month.ShouldBe(1); + persistedGrant.CreationTime.Day.ShouldBe(5); + persistedGrant.CreationTime.Hour.ShouldBe(19); + persistedGrant.CreationTime.Minute.ShouldBe(20); + persistedGrant.CreationTime.Second.ShouldBe(21); + } + [Fact] public async Task GetAllAsync_Should_Get_All_PersistedGrants_For_A_Given_SubjectId() { From bc891edb18e6a059207bd4d3a1b32446e31b7058 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 16 May 2019 14:29:58 +0300 Subject: [PATCH 127/335] refactor --- .../Volo/Abp/Cli/Commands/AddModuleCommand.cs | 11 ++++++++--- .../DbContextFileBuilderConfigureAdder.cs | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index f48e2f4542..7925b82aa6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -31,7 +31,7 @@ namespace Volo.Abp.Cli.Commands } var skipDbMigrations = Convert.ToBoolean( - commandLineArgs.Options.GetOrNull(Options.Solution.SkipDbMigrations) ?? "false"); + commandLineArgs.Options.GetOrNull(Options.DbMigrations.Skip) ?? "false"); await SolutionModuleAdder.AddAsync( GetSolutionFile(commandLineArgs), @@ -93,11 +93,12 @@ namespace Volo.Abp.Cli.Commands sb.AppendLine(""); sb.AppendLine("Options:"); sb.AppendLine(" -s|--solution Specify the solution file explicitly."); + sb.AppendLine(" --skip-db-migrations Specify if a new migration will be added or not."); sb.AppendLine(""); sb.AppendLine("Examples:"); sb.AppendLine(" abp add-module Volo.Blogging Adds the module to the current soluton."); sb.AppendLine(" abp add-module Volo.Blogging -s Acme.BookStore Adds the module to the given soluton."); - sb.AppendLine(" abp add-module Volo.Blogging -s Acme.BookStore --SkipDbMigrations false Adds the module to the given soluton but doesn't add-migration."); + sb.AppendLine(" abp add-module Volo.Blogging -s Acme.BookStore --skip-db-migrations false Adds the module to the given soluton but doesn't add-migration."); sb.AppendLine(""); return sb.ToString(); @@ -109,7 +110,11 @@ namespace Volo.Abp.Cli.Commands { public const string Short = "s"; public const string Long = "solution"; - public const string SkipDbMigrations = "skip-db-migrations"; + } + + public static class DbMigrations + { + public const string Skip = "skip-db-migrations"; } } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs index 078a8db9b7..0211a42243 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/DbContextFileBuilderConfigureAdder.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Linq; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.DependencyInjection; @@ -9,9 +8,10 @@ namespace Volo.Abp.Cli.ProjectModification { public class DbContextFileBuilderConfigureAdder : ITransientDependency { - protected UsingStatementAdder UsingStatementAdder { get; } public ILogger Logger { get; set; } + protected UsingStatementAdder UsingStatementAdder { get; } + public DbContextFileBuilderConfigureAdder(UsingStatementAdder usingStatementAdder) { UsingStatementAdder = usingStatementAdder; @@ -73,12 +73,12 @@ namespace Volo.Abp.Cli.ProjectModification protected string GetLineToAdd(string moduleConfiguration) { - return "builder." + moduleConfiguration.Split('.').Last() + "();"; + return "builder." + moduleConfiguration.Split(':')[1] + "();"; } protected string GetNamespace(string moduleConfiguration) { - return string.Join(".", moduleConfiguration.Split('.').Reverse().Skip(2).Reverse()); + return string.Join(".", moduleConfiguration.Split(':')[0]); } } } From 9b4b41573c797ad4ffd158b17ccd381fbe7fcd2c Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 17 May 2019 11:48:33 +0800 Subject: [PATCH 128/335] Modify the way the mail template is defined as the standard way of the framework. --- .../Volo/Abp/Emailing/AbpEmailingModule.cs | 37 +++++++--- .../Templates/DefaultEmailTemplateProvider.cs | 16 ++++ .../EmailTemplateDefinitionContext.cs | 38 ++++++++++ .../EmailTemplateDefinitionManager.cs | 74 +++++++++++++++++++ .../EmailTemplateDefinitionProvider.cs | 9 +++ .../Templates/EmailTemplateOptions.cs | 9 ++- .../IEmailTemplateDefinitionContext.cs | 9 +++ .../IEmailTemplateDefinitionManager.cs | 15 ++++ .../IEmailTemplateDefinitionProvider.cs | 7 ++ ...ualFileEmailTemplateProviderContributor.cs | 6 +- .../Volo.Abp.Emailing.Tests.csproj | 3 +- .../Abp/Emailing/AbpEmailingTestModule.cs | 14 +--- .../Abp/Emailing/EmailTemplateStore_Tests.cs | 7 +- .../Abp/Emailing/TestEmailTemplateProvider.cs | 14 ++++ 14 files changed, 225 insertions(+), 33 deletions(-) create mode 100644 framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs create mode 100644 framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionContext.cs create mode 100644 framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs create mode 100644 framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionProvider.cs create mode 100644 framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionContext.cs create mode 100644 framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionManager.cs create mode 100644 framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionProvider.cs create mode 100644 framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestEmailTemplateProvider.cs diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs index b861a3898c..035d6de30a 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs @@ -1,6 +1,8 @@ -using Volo.Abp.BackgroundJobs; +using System; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.BackgroundJobs; using Volo.Abp.Emailing.Templates; -using Volo.Abp.Emailing.Templates.Virtual; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.Settings; @@ -16,6 +18,11 @@ namespace Volo.Abp.Emailing )] public class AbpEmailingModule : AbpModule { + public override void PreConfigureServices(ServiceConfigurationContext context) + { + AutoAddDefinitionProviders(context.Services); + } + public override void ConfigureServices(ServiceConfigurationContext context) { Configure(options => @@ -27,18 +34,26 @@ namespace Volo.Abp.Emailing { options.AddJob(); }); + } + + private static void AutoAddDefinitionProviders(IServiceCollection services) + { + var definitionProviders = new List(); - Configure(options => + services.OnRegistred(context => { - options.Templates - .Add( - new EmailTemplateDefinition(StandardEmailTemplates.DefaultLayout, isLayout: true, layout: null) - .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/DefaultLayout.html") - ).Add( - new EmailTemplateDefinition(StandardEmailTemplates.SimpleMessage) - .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/SimpleMessageTemplate.html") - ); + + if (typeof(IEmailTemplateDefinitionProvider).IsAssignableFrom(context.ImplementationType)) + { + definitionProviders.Add(context.ImplementationType); + } + }); + + services.Configure(options => + { + options.DefinitionProviders.AddIfNotContains(definitionProviders); }); } + } } diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs new file mode 100644 index 0000000000..cc7f1ff4ed --- /dev/null +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs @@ -0,0 +1,16 @@ +using Volo.Abp.Emailing.Templates.Virtual; + +namespace Volo.Abp.Emailing.Templates +{ + public class DefaultEmailTemplateProvider : EmailTemplateDefinitionProvider + { + public override void Define(IEmailTemplateDefinitionContext context) + { + context.Add(new EmailTemplateDefinition(StandardEmailTemplates.DefaultLayout, isLayout: true, layout: null) + .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/DefaultLayout.html")); + + context.Add(new EmailTemplateDefinition(StandardEmailTemplates.SimpleMessage) + .SetVirtualFilePath("/Volo/Abp/Emailing/Templates/SimpleMessageTemplate.html")); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionContext.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionContext.cs new file mode 100644 index 0000000000..03a6c95d8b --- /dev/null +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionContext.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using System.Collections.Immutable; + +namespace Volo.Abp.Emailing.Templates +{ + public class EmailTemplateDefinitionContext : IEmailTemplateDefinitionContext + { + protected Dictionary EmailTemplates { get; } + + public EmailTemplateDefinitionContext(Dictionary emailTemplates) + { + EmailTemplates = emailTemplates; + } + + public virtual EmailTemplateDefinition GetOrNull(string name) + { + return EmailTemplates.GetOrDefault(name); + } + + public virtual IReadOnlyList GetAll() + { + return EmailTemplates.Values.ToImmutableList(); + } + + public virtual void Add(params EmailTemplateDefinition[] definitions) + { + if (definitions.IsNullOrEmpty()) + { + return; + } + + foreach (var definition in definitions) + { + EmailTemplates[definition.Name] = definition; + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs new file mode 100644 index 0000000000..a6a58aef27 --- /dev/null +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Linq; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Emailing.Templates +{ + public class EmailTemplateDefinitionManager : IEmailTemplateDefinitionManager, ISingletonDependency + { + protected Lazy> EmailTemplateDefinitions { get; } + + protected EmailTemplateOptions Options { get; } + + protected IServiceProvider ServiceProvider { get; } + + public EmailTemplateDefinitionManager( + IOptions options, + IServiceProvider serviceProvider) + { + ServiceProvider = serviceProvider; + Options = options.Value; + + EmailTemplateDefinitions = + new Lazy>(CreateEmailTemplateDefinitions, true); + } + + public virtual EmailTemplateDefinition Get(string name) + { + Check.NotNull(name, nameof(name)); + + var template = GetOrNull(name); + + if (template == null) + { + throw new AbpException("Undefined template: " + name); + } + + return template; + } + + public virtual IReadOnlyList GetAll() + { + return EmailTemplateDefinitions.Value.Values.ToImmutableList(); + } + + public virtual EmailTemplateDefinition GetOrNull(string name) + { + return EmailTemplateDefinitions.Value.GetOrDefault(name); + } + + protected virtual IDictionary CreateEmailTemplateDefinitions() + { + var templates = new Dictionary(); + + using (var scope = ServiceProvider.CreateScope()) + { + var providers = Options + .DefinitionProviders + .Select(p => scope.ServiceProvider.GetRequiredService(p) as IEmailTemplateDefinitionProvider) + .ToList(); + + foreach (var provider in providers) + { + provider.Define(new EmailTemplateDefinitionContext(templates)); + } + } + + return templates; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionProvider.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionProvider.cs new file mode 100644 index 0000000000..e53505fafc --- /dev/null +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionProvider.cs @@ -0,0 +1,9 @@ +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.Emailing.Templates +{ + public abstract class EmailTemplateDefinitionProvider : IEmailTemplateDefinitionProvider, ITransientDependency + { + public abstract void Define(IEmailTemplateDefinitionContext context); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs index 6d10bd562e..06ab12e8a2 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using Volo.Abp.Collections; using Volo.Abp.Emailing.Templates.Virtual; namespace Volo.Abp.Emailing.Templates @@ -7,10 +8,10 @@ namespace Volo.Abp.Emailing.Templates { public List Providers { get; } - public EmailTemplateDefinitionDictionary Templates { get; } - public string DefaultLayout { get; set; } + public ITypeList DefinitionProviders { get; } + public EmailTemplateOptions() { Providers = new List @@ -18,9 +19,9 @@ namespace Volo.Abp.Emailing.Templates new VirtualFileEmailTemplateProviderContributor() }; - Templates = new EmailTemplateDefinitionDictionary(); - DefaultLayout = StandardEmailTemplates.DefaultLayout; + + DefinitionProviders = new TypeList(); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionContext.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionContext.cs new file mode 100644 index 0000000000..1641562ccf --- /dev/null +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionContext.cs @@ -0,0 +1,9 @@ +namespace Volo.Abp.Emailing.Templates +{ + public interface IEmailTemplateDefinitionContext + { + EmailTemplateDefinition GetOrNull(string name); + + void Add(params EmailTemplateDefinition[] definitions); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionManager.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionManager.cs new file mode 100644 index 0000000000..0936a2fe93 --- /dev/null +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionManager.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using JetBrains.Annotations; + +namespace Volo.Abp.Emailing.Templates +{ + public interface IEmailTemplateDefinitionManager + { + [NotNull] + EmailTemplateDefinition Get([NotNull] string name); + + IReadOnlyList GetAll(); + + EmailTemplateDefinition GetOrNull(string name); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionProvider.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionProvider.cs new file mode 100644 index 0000000000..691d3874d6 --- /dev/null +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/IEmailTemplateDefinitionProvider.cs @@ -0,0 +1,7 @@ +namespace Volo.Abp.Emailing.Templates +{ + public interface IEmailTemplateDefinitionProvider + { + void Define(IEmailTemplateDefinitionContext context); + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Virtual/VirtualFileEmailTemplateProviderContributor.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Virtual/VirtualFileEmailTemplateProviderContributor.cs index d54f4c94cb..3fb7e8d952 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Virtual/VirtualFileEmailTemplateProviderContributor.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Virtual/VirtualFileEmailTemplateProviderContributor.cs @@ -33,10 +33,8 @@ namespace Volo.Abp.Emailing.Templates.Virtual { return contributorContext .ServiceProvider - .GetRequiredService>() - .Value - .Templates - .GetOrDefault(contributorContext.Name); + .GetRequiredService() + .GetOrNull(contributorContext.Name); } protected virtual IFileInfo FindVirtualFileInfo(EmailTemplateProviderContributorContext contributorContext, EmailTemplateDefinition templateDefinition) diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj b/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj index 32b4f25816..fc77dac001 100644 --- a/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj +++ b/framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.2 @@ -17,6 +17,7 @@ + diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs index a36c664e8a..9b290acd74 100644 --- a/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs +++ b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs @@ -1,7 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Emailing.Templates; -using Volo.Abp.Emailing.Templates.Virtual; -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.Emailing @@ -17,13 +14,6 @@ namespace Volo.Abp.Emailing { options.FileSets.AddEmbedded(); }); - - Configure(options => - { - options.Templates["template1"] = - new EmailTemplateDefinition("template1") - .SetVirtualFilePath("/Volo/Abp/Emailing/TestTemplates/template1.html"); - }); } } -} +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/EmailTemplateStore_Tests.cs b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/EmailTemplateStore_Tests.cs index a09fb48ed1..b2fec29371 100644 --- a/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/EmailTemplateStore_Tests.cs +++ b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/EmailTemplateStore_Tests.cs @@ -1,4 +1,4 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using Shouldly; using Volo.Abp.Emailing.Templates; using Xunit; @@ -7,6 +7,11 @@ namespace Volo.Abp.Emailing { public class EmailTemplateStore_Tests : AbpIntegratedTest { + protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options) + { + options.UseAutofac(); + } + private readonly IEmailTemplateProvider _emailTemplateProvider; public EmailTemplateStore_Tests() diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestEmailTemplateProvider.cs b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestEmailTemplateProvider.cs new file mode 100644 index 0000000000..379371c727 --- /dev/null +++ b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestEmailTemplateProvider.cs @@ -0,0 +1,14 @@ +using Volo.Abp.Emailing.Templates; +using Volo.Abp.Emailing.Templates.Virtual; + +namespace Volo.Abp.Emailing +{ + public class TestEmailTemplateProvider : EmailTemplateDefinitionProvider + { + public override void Define(IEmailTemplateDefinitionContext context) + { + context.Add(new EmailTemplateDefinition("template1") + .SetVirtualFilePath("/Volo/Abp/Emailing/TestTemplates/template1.html")); + } + } +} \ No newline at end of file From 8f2e19085700a55e5191254e2ec92abb132d49b7 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 17 May 2019 14:35:03 +0800 Subject: [PATCH 129/335] Rename the file name Nuget to NuGet. --- .../{NugetPackageInfo.cs => NuGetPackageInfo.cs} | 0 .../{NugetPackageTarget.cs => NuGetPackageTarget.cs} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/{NugetPackageInfo.cs => NuGetPackageInfo.cs} (100%) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/{NugetPackageTarget.cs => NuGetPackageTarget.cs} (100%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageInfo.cs similarity index 100% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageInfo.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageTarget.cs similarity index 100% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NugetPackageTarget.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageTarget.cs From 4f46d8fea151f4b0f91982e3bbc0f141e7deac61 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 17 May 2019 11:31:43 +0300 Subject: [PATCH 130/335] Automatically install CLI dependencies if not installed before Resolves #1121 --- .../Volo/Abp/Cli/CliService.cs | 72 ++++++++++++++++++- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 50784a8d90..c87e6818dc 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -1,4 +1,6 @@ using System; +using System.Diagnostics; +using System.IO; using System.Reflection; using Microsoft.Extensions.DependencyInjection; using System.Threading.Tasks; @@ -40,7 +42,9 @@ namespace Volo.Abp.Cli Logger.LogInformation("https://abp.io"); await CheckForNewVersion(); - + + CheckDependencies(); + var commandLineArgs = CommandLineArgumentParser.Parse(args); var commandType = CommandSelector.Select(commandLineArgs); @@ -63,6 +67,68 @@ namespace Volo.Abp.Cli } } + private void CheckDependencies() + { + var installedNpmPackages = GetInstalledNpmPackages(); + + if (!installedNpmPackages.Contains(" yarn@")) + { + InstallYarn(); + } + if (!installedNpmPackages.Contains(" gulp@")) + { + InstallGulp(); + } + } + + private string GetInstalledNpmPackages() + { + var output = ""; + + using (var process = new Process()) + { + process.StartInfo = new ProcessStartInfo("CMD.exe") + { + Arguments = "/C npm list -g --depth 0", + UseShellExecute = false, + CreateNoWindow = true, + RedirectStandardOutput = true, + RedirectStandardError = true + }; + process.Start(); + + using (var stdOut = process.StandardOutput) + { + using (var stdErr = process.StandardError) + { + output = stdOut.ReadToEnd(); + output += stdErr.ReadToEnd(); + + stdErr.Close(); + stdOut.Close(); + } + } + + process.Close(); + } + + return output; + } + + private void InstallYarn() + { + Logger.LogInformation("Installing yarn..."); + var process = Process.Start("CMD.exe", "/C npm install yarn -g"); + process.WaitForExit(); + } + + private void InstallGulp() + { + Logger.LogInformation("Installing gulp..."); + var process = Process.Start("CMD.exe", "/C npm install gulp -g"); + process.WaitForExit(); + } + private async Task CheckForNewVersion() { try @@ -73,7 +139,7 @@ namespace Volo.Abp.Cli if (!latestVersion.IsNullOrEmpty() && currentVersion != latestVersion) { Logger.LogInformation(""); - Logger.LogWarning("ABP CLI has a newer version (" + latestVersion + "). Please update to get the latest features and fixes."); + Logger.LogWarning("ABP CLI has a newer version. Please update to get the latest features and fixes."); Logger.LogWarning(""); Logger.LogWarning("Update Command: "); Logger.LogWarning(" dotnet tool update -g Volo.Abp.Cli"); @@ -86,7 +152,7 @@ namespace Volo.Abp.Cli Logger.LogWarning(e.Message); } } - + private static string GetCliVersion() { var version = typeof(CliService) From 16a62929e920243d9eeab64acf0639f1ad44fae2 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sat, 18 May 2019 23:12:05 +0300 Subject: [PATCH 131/335] Created Domain.Shared --- templates/mvc/MyCompanyName.MyProjectName.sln | 9 +++- .../MyProjectName/MyProjectNameResource.cs | 0 .../Localization/MyProjectName/en.json | 0 .../Localization/MyProjectName/pt-BR.json | 0 .../Localization/MyProjectName/tr.json | 0 .../Localization/MyProjectName/zh-Hans.json | 0 .../MultiTenancy/MultiTenancyConsts.cs | 7 ++++ ...anyName.MyProjectName.Domain.Shared.csproj | 24 +++++++++++ .../MyProjectNameDomainErrorCodes.cs | 7 ++++ .../MyProjectNameDomainSharedModule.cs | 41 +++++++++++++++++++ .../MyCompanyName.MyProjectName.Domain.csproj | 5 +-- .../MyProjectNameConsts.cs | 2 - .../MyProjectNameDomainModule.cs | 24 +++-------- 13 files changed, 94 insertions(+), 25 deletions(-) rename templates/mvc/src/{MyCompanyName.MyProjectName.Domain => MyCompanyName.MyProjectName.Domain.Shared}/Localization/MyProjectName/MyProjectNameResource.cs (100%) rename templates/mvc/src/{MyCompanyName.MyProjectName.Domain => MyCompanyName.MyProjectName.Domain.Shared}/Localization/MyProjectName/en.json (100%) rename templates/mvc/src/{MyCompanyName.MyProjectName.Domain => MyCompanyName.MyProjectName.Domain.Shared}/Localization/MyProjectName/pt-BR.json (100%) rename templates/mvc/src/{MyCompanyName.MyProjectName.Domain => MyCompanyName.MyProjectName.Domain.Shared}/Localization/MyProjectName/tr.json (100%) rename templates/mvc/src/{MyCompanyName.MyProjectName.Domain => MyCompanyName.MyProjectName.Domain.Shared}/Localization/MyProjectName/zh-Hans.json (100%) create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs diff --git a/templates/mvc/MyCompanyName.MyProjectName.sln b/templates/mvc/MyCompanyName.MyProjectName.sln index 0c616dbc3b..371463b0a7 100644 --- a/templates/mvc/MyCompanyName.MyProjectName.sln +++ b/templates/mvc/MyCompanyName.MyProjectName.sln @@ -21,7 +21,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.MongoDB", "src\MyCompanyName.MyProjectName.MongoDB\MyCompanyName.MyProjectName.MongoDB.csproj", "{E3444355-D47E-431E-BDD0-DD3A7113B2AE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations", "src\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations", "src\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain.Shared", "src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -61,6 +63,10 @@ Global {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.Build.0 = Release|Any CPU + {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -74,6 +80,7 @@ Global {5F1B28C6-8D0C-4155-92D0-252F7EA5F674} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {E3444355-D47E-431E-BDD0-DD3A7113B2AE} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/MyProjectNameResource.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/MyProjectNameResource.cs similarity index 100% rename from templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/MyProjectNameResource.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/MyProjectNameResource.cs diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/en.json b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json similarity index 100% rename from templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/en.json rename to templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/pt-BR.json b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pt-BR.json similarity index 100% rename from templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/pt-BR.json rename to templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pt-BR.json diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/tr.json b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/tr.json similarity index 100% rename from templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/tr.json rename to templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/tr.json diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/zh-Hans.json b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json similarity index 100% rename from templates/mvc/src/MyCompanyName.MyProjectName.Domain/Localization/MyProjectName/zh-Hans.json rename to templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs new file mode 100644 index 0000000000..11f7bf6911 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs @@ -0,0 +1,7 @@ +namespace MyCompanyName.MyProjectName.MultiTenancy +{ + public static class MultiTenancyConsts + { + public const bool IsMultiTenancyEnabled = true; + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj new file mode 100644 index 0000000000..975082077b --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -0,0 +1,24 @@ + + + + + + netcoreapp2.2 + MyCompanyName.MyProjectName + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs new file mode 100644 index 0000000000..55a2ed72bc --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs @@ -0,0 +1,7 @@ +namespace MyCompanyName.MyProjectName +{ + public static class MyProjectNameDomainErrorCodes + { + //Add your business exception error codes here... + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs new file mode 100644 index 0000000000..d9969be057 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -0,0 +1,41 @@ +using MyCompanyName.MyProjectName.Localization.MyProjectName; +using Volo.Abp.AuditLogging; +using Volo.Abp.BackgroundJobs; +using Volo.Abp.FeatureManagement; +using Volo.Abp.Identity; +using Volo.Abp.Localization; +using Volo.Abp.Localization.Resources.AbpValidation; +using Volo.Abp.Modularity; +using Volo.Abp.SettingManagement; +using Volo.Abp.TenantManagement; +using Volo.Abp.VirtualFileSystem; + +namespace MyCompanyName.MyProjectName +{ + [DependsOn( + typeof(AbpAuditLoggingDomainSharedModule), + typeof(BackgroundJobsDomainSharedModule), + typeof(AbpFeatureManagementDomainSharedModule), + typeof(AbpIdentityDomainSharedModule), + typeof(AbpSettingManagementDomainSharedModule), + typeof(AbpTenantManagementDomainSharedModule) + )] + public class MyProjectNameDomainSharedModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded("MyCompanyName.MyProjectName"); + }); + + Configure(options => + { + options.Resources + .Add("en") + .AddBaseTypes(typeof(AbpValidationResource)) + .AddVirtualJson("/Localization/MyProjectName"); + }); + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj index d86ac81e86..5c9ef9848f 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj @@ -15,11 +15,8 @@ +     - - - - diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs index 9082f904ce..d939cfca9f 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs @@ -5,7 +5,5 @@ public const string DbTablePrefix = "App"; public const string DbSchema = null; - - public const bool IsMultiTenancyEnabled = true; } } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs index 780b6ee10d..79dff6a651 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs @@ -1,24 +1,22 @@ using Microsoft.Extensions.DependencyInjection; -using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp; using Volo.Abp.AuditLogging; using Volo.Abp.BackgroundJobs; using Volo.Abp.Data; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; -using Volo.Abp.Localization; -using Volo.Abp.Localization.Resources.AbpValidation; using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; using Volo.Abp.Threading; -using Volo.Abp.VirtualFileSystem; namespace MyCompanyName.MyProjectName { [DependsOn( + typeof(MyProjectNameDomainSharedModule), typeof(AbpAuditLoggingDomainModule), typeof(BackgroundJobsDomainModule), typeof(AbpFeatureManagementDomainModule), @@ -31,22 +29,9 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => - { - options.FileSets.AddEmbedded("MyCompanyName.MyProjectName"); - }); - - Configure(options => - { - options.Resources - .Add("en") - .AddBaseTypes(typeof(AbpValidationResource)) - .AddVirtualJson("/Localization/MyProjectName"); - }); - Configure(options => { - options.IsEnabled = MyProjectNameConsts.IsMultiTenancyEnabled; + options.IsEnabled = MultiTenancyConsts.IsMultiTenancyEnabled; }); } @@ -57,6 +42,9 @@ namespace MyCompanyName.MyProjectName private void SeedDatabase(ApplicationInitializationContext context) { + /* Seeding in the application startup can be a problem in a clustered environment. + * See https://github.com/abpframework/abp/issues/1123 + */ using (var scope = context.ServiceProvider.CreateScope()) { AsyncHelper.RunSync(async () => From 800cb403330b390239a52b930ad728aa8920fcbd Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sat, 18 May 2019 23:22:35 +0300 Subject: [PATCH 132/335] Created Application.Contracts module. --- templates/mvc/MyCompanyName.MyProjectName.sln | 7 +++++++ ...MyProjectName.Application.Contracts.csproj | 21 +++++++++++++++++++ ...MyProjectNameApplicationContractsModule.cs | 20 ++++++++++++++++++ ...mpanyName.MyProjectName.Application.csproj | 4 ++++ .../MyProjectNameApplicationModule.cs | 1 + ...anyName.MyProjectName.Domain.Shared.csproj | 3 ++- .../MyProjectNameDomainSharedModule.cs | 2 ++ .../MyCompanyName.MyProjectName.Domain.csproj | 9 +++++--- 8 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs diff --git a/templates/mvc/MyCompanyName.MyProjectName.sln b/templates/mvc/MyCompanyName.MyProjectName.sln index 371463b0a7..ff8632d8dc 100644 --- a/templates/mvc/MyCompanyName.MyProjectName.sln +++ b/templates/mvc/MyCompanyName.MyProjectName.sln @@ -25,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain.Shared", "src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application.Contracts", "src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -67,6 +69,10 @@ Global {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.Build.0 = Release|Any CPU + {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -81,6 +87,7 @@ Global {E3444355-D47E-431E-BDD0-DD3A7113B2AE} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj new file mode 100644 index 0000000000..1f9807b335 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj @@ -0,0 +1,21 @@ + + + + + + netstandard2.0 + MyCompanyName.MyProjectName + + + + + + + + + + + + + + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs new file mode 100644 index 0000000000..6c1f9563bf --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs @@ -0,0 +1,20 @@ +using Volo.Abp.FeatureManagement; +using Volo.Abp.Identity; +using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement; +using Volo.Abp.TenantManagement; + +namespace MyCompanyName.MyProjectName +{ + [DependsOn( + typeof(MyProjectNameDomainSharedModule), + typeof(AbpFeatureManagementApplicationContractsModule), + typeof(AbpIdentityApplicationContractsModule), + typeof(AbpPermissionManagementApplicationContractsModule), + typeof(AbpTenantManagementApplicationContractsModule) + )] + public class MyProjectNameApplicationContractsModule : AbpModule + { + + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj index 24989a390b..ca1b91cb3c 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj @@ -9,6 +9,10 @@ + + + + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs index e819e08e5b..53a134c96b 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs @@ -9,6 +9,7 @@ namespace MyCompanyName.MyProjectName { [DependsOn( typeof(MyProjectNameDomainModule), + typeof(MyProjectNameApplicationContractsModule), typeof(AbpIdentityApplicationModule), typeof(AbpPermissionManagementApplicationModule), typeof(AbpTenantManagementApplicationModule), diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj index 975082077b..06256ce229 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -3,7 +3,7 @@ - netcoreapp2.2 + netstandard2.0 MyCompanyName.MyProjectName @@ -13,6 +13,7 @@ + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index d9969be057..02e6a95ee1 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -6,6 +6,7 @@ using Volo.Abp.Identity; using Volo.Abp.Localization; using Volo.Abp.Localization.Resources.AbpValidation; using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement; using Volo.Abp.SettingManagement; using Volo.Abp.TenantManagement; using Volo.Abp.VirtualFileSystem; @@ -17,6 +18,7 @@ namespace MyCompanyName.MyProjectName typeof(BackgroundJobsDomainSharedModule), typeof(AbpFeatureManagementDomainSharedModule), typeof(AbpIdentityDomainSharedModule), + typeof(AbpPermissionManagementDomainSharedModule), typeof(AbpSettingManagementDomainSharedModule), typeof(AbpTenantManagementDomainSharedModule) )] diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj index 5c9ef9848f..ce82f33ed9 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj @@ -1,13 +1,18 @@  - + netcoreapp2.2 MyCompanyName.MyProjectName + + + + + @@ -15,8 +20,6 @@ - - From 570b604ee6039dbc75df39cf0589a0c5b9d51752 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sat, 18 May 2019 23:29:06 +0300 Subject: [PATCH 133/335] Added comments to MVC template. --- .../MyProjectNameApplicationAutoMapperProfile.cs | 4 +++- .../MyProjectNameApplicationModule.cs | 3 +-- .../Permissions/MyProjectNamePermissions.cs | 10 +--------- .../MultiTenancy/MultiTenancyConsts.cs | 4 ++++ .../MyProjectNameDomainErrorCodes.cs | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs index 343675b9b2..20f646f998 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs @@ -6,7 +6,9 @@ namespace MyCompanyName.MyProjectName { public MyProjectNameApplicationAutoMapperProfile() { - //Configure your AutoMapper mapping configuration here... + /* You can configure your AutoMapper mapping configuration here. + * Alternatively, you can split your mapping configurations + * into multiple profile classes for a better organization. */ } } } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs index 53a134c96b..4b00856bd9 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs @@ -24,8 +24,7 @@ namespace MyCompanyName.MyProjectName /* use `true` for the `validate` parameter if you want to * validate the profile on application startup. * See http://docs.automapper.org/en/stable/Configuration-validation.html for more - * about configuration validation. - */ + * about configuration validation. */ options.AddProfile(); }); } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs index 4076366645..155117c7d3 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/Permissions/MyProjectNamePermissions.cs @@ -1,6 +1,4 @@ -using Volo.Abp.Reflection; - -namespace MyCompanyName.MyProjectName.Permissions +namespace MyCompanyName.MyProjectName.Permissions { public static class MyProjectNamePermissions { @@ -8,11 +6,5 @@ namespace MyCompanyName.MyProjectName.Permissions //Add your own permission names. Example: //public const string MyPermission1 = GroupName + ".MyPermission1"; - - public static string[] GetAll() - { - //Return an array of all permissions - return ReflectionHelper.GetPublicConstantsRecursively(typeof(MyProjectNamePermissions)); - } } } \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs index 11f7bf6911..d1740655c7 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs @@ -2,6 +2,10 @@ { public static class MultiTenancyConsts { + /* Enable/disable multi-tenancy easily in a single point. + * If you will never need to multi-tenancy, you can remove + * related modules and code parts, including this file. + */ public const bool IsMultiTenancyEnabled = true; } } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs index 55a2ed72bc..d2bd62ad79 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs @@ -2,6 +2,6 @@ { public static class MyProjectNameDomainErrorCodes { - //Add your business exception error codes here... + /* You can add your business exception error codes here, as constants */ } } From e2f004d3903b813b81e0e35de5c6452d3b2f0c35 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sat, 18 May 2019 23:46:14 +0300 Subject: [PATCH 134/335] Added comments for EF core layer. --- .../MyProjectNameMigrationsDbContext.cs | 5 +++++ .../MyProjectNameMigrationsDbContextFactory.cs | 2 ++ .../EntityFrameworkCore/MyProjectNameDbContext.cs | 13 +++++++++++++ .../MyProjectNameEntityFrameworkCoreModule.cs | 5 +++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContext.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContext.cs index 0999a3a3f8..df490286d3 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContext.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContext.cs @@ -11,6 +11,11 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.EntityFrameworkCore { + /* This DbContext is only used for database migrations. + * It is not used on runtime. See MyProjectNameDbContext for the runtime DbContext. + * It is a unified model that includes configuration for + * all used modules and your application. + */ public class MyProjectNameMigrationsDbContext : AbpDbContext { public MyProjectNameMigrationsDbContext(DbContextOptions options) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs index d760790fc8..b399f99cda 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs @@ -5,6 +5,8 @@ using Microsoft.Extensions.Configuration; namespace MyCompanyName.MyProjectName.EntityFrameworkCore { + /* This class is needed for EF Core console commands + * (like Add-Migration and Update-Database commands) */ public class MyProjectNameMigrationsDbContextFactory : IDesignTimeDbContextFactory { public MyProjectNameMigrationsDbContext CreateDbContext(string[] args) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs index b96691dcc7..262ed1308a 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs @@ -7,11 +7,24 @@ using Volo.Abp.Users.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.EntityFrameworkCore { + /* This is your actual DbContext used on runtime. + * It includes only your entities. + * It does not include entities of the used modules, because each module has already + * its own DbContext class. If you want to share some database tables with the used modules, + * just create a structure like done for AppUser. + * + * Don't use this DbContext for database migrations since it does not contain tables of the + * used modules (as explained above). See MyProjectNameMigrationsDbContext for migrations. + */ [ConnectionStringName("Default")] public class MyProjectNameDbContext : AbpDbContext { public DbSet Users { get; set; } + /* Add DbSet properties for your Aggregate Roots / Entities here. + * Also map them inside MyProjectNameDbContextModelCreatingExtensions.ConfigureMyProjectName + */ + public MyProjectNameDbContext(DbContextOptions options) : base(options) { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs index bb8997aaa2..e5fb745602 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs @@ -30,13 +30,14 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore context.Services.AddAbpDbContext(options => { /* Remove "includeAllEntities: true" to create - * default repositories only for aggregate roots - */ + * default repositories only for aggregate roots */ options.AddDefaultRepositories(includeAllEntities: true); }); Configure(options => { + /* The main point to change your DBMS. + * See also MyProjectNameMigrationsDbContextFactory for EF Core tooling. */ options.UseSqlServer(); }); } From cce77696b31c79c4fedcb13d0a6d97924e865273 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 19 May 2019 11:18:53 +0300 Subject: [PATCH 135/335] Added notes --- .../MongoDb/MyProjectNameMongoDbContext.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbContext.cs b/templates/mvc/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbContext.cs index b800cd9063..c628be1923 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbContext.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbContext.cs @@ -16,8 +16,8 @@ namespace MyCompanyName.MyProjectName.MongoDb modelBuilder.Entity(b => { - /* Sharing the same "AbpUsers" collection with the Identity module (IdentityUser entity). - */ + /* Sharing the same "AbpUsers" collection + * with the Identity module's IdentityUser class. */ b.CollectionName = "AbpUsers"; }); } From 5e583282ccd7aa00ce218059f23f83e869a6426a Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 19 May 2019 13:30:36 +0300 Subject: [PATCH 136/335] Added MyCompanyName.MyProjectName.HttpApi project --- templates/mvc/MyCompanyName.MyProjectName.sln | 7 +++++++ ...e.MyProjectName.EntityFrameworkCore.csproj | 2 +- ...MyCompanyName.MyProjectName.HttpApi.csproj | 21 +++++++++++++++++++ .../MyProjectNameHttpApiModule.cs | 18 ++++++++++++++++ .../Menus/MyProjectNameMenuContributor.cs | 5 +++-- .../MyCompanyName.MyProjectName.Web.csproj | 1 + .../MyProjectNameWebModule.cs | 4 +++- 7 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs diff --git a/templates/mvc/MyCompanyName.MyProjectName.sln b/templates/mvc/MyCompanyName.MyProjectName.sln index ff8632d8dc..67d3a08ba8 100644 --- a/templates/mvc/MyCompanyName.MyProjectName.sln +++ b/templates/mvc/MyCompanyName.MyProjectName.sln @@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application.Contracts", "src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi", "src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,6 +75,10 @@ Global {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU {520659C8-C734-4298-A3DA-B539DB9DFC0B}.Release|Any CPU.Build.0 = Release|Any CPU + {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -88,6 +94,7 @@ Global {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj index 97abb2f5e4..3a1da52275 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj @@ -9,6 +9,7 @@ + @@ -16,7 +17,6 @@ - diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj new file mode 100644 index 0000000000..58477247da --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj @@ -0,0 +1,21 @@ + + + + + + netcoreapp2.2 + MyCompanyName.MyProjectName + + + + + + + + + + + + + + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs new file mode 100644 index 0000000000..06599f67cf --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs @@ -0,0 +1,18 @@ +using Volo.Abp.FeatureManagement; +using Volo.Abp.Identity; +using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement.HttpApi; + +namespace MyCompanyName.MyProjectName +{ + [DependsOn( + typeof(MyProjectNameApplicationContractsModule), + typeof(AbpIdentityHttpApiModule), + typeof(AbpPermissionManagementHttpApiModule), + typeof(AbpFeatureManagementHttpApiModule) + )] + public class MyProjectNameHttpApiModule : AbpModule + { + + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs index 479618f160..557a657f8d 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using MyCompanyName.MyProjectName.Localization.MyProjectName; +using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp.TenantManagement.Web.Navigation; using Volo.Abp.UI.Navigation; @@ -19,9 +20,9 @@ namespace MyCompanyName.MyProjectName.Menus private async Task ConfigureMainMenuAsync(MenuConfigurationContext context) { - if (!MyProjectNameConsts.IsMultiTenancyEnabled) + if (!MultiTenancyConsts.IsMultiTenancyEnabled) { - ApplicationMenuItem administration = context.Menu.GetAdministration(); + var administration = context.Menu.GetAdministration(); administration.TryRemoveMenuItem(TenantManagementMenuNames.GroupName); } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 148fa94c93..d761d2c98e 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -36,6 +36,7 @@ + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index a8fea98514..fb82af9ed5 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -7,6 +7,7 @@ using MyCompanyName.MyProjectName.Localization.MyProjectName; using MyCompanyName.MyProjectName.Menus; using Swashbuckle.AspNetCore.Swagger; using System.IO; +using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Mvc; @@ -29,6 +30,7 @@ using Volo.Abp.VirtualFileSystem; namespace MyCompanyName.MyProjectName { [DependsOn( + typeof(MyProjectNameHttpApiModule), typeof(MyProjectNameApplicationModule), typeof(MyProjectNameEntityFrameworkCoreModule), typeof(AbpAutofacModule), @@ -161,7 +163,7 @@ namespace MyCompanyName.MyProjectName app.UseVirtualFiles(); app.UseAuthentication(); - if (MyProjectNameConsts.IsMultiTenancyEnabled) + if (MultiTenancyConsts.IsMultiTenancyEnabled) { app.UseMultiTenancy(); } From 5e60655e420c8caceaeaf8dfbc27a766493abb4e Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 19 May 2019 13:38:25 +0300 Subject: [PATCH 137/335] Added MyCompanyName.MyProjectName.HttpApi.Client project. --- templates/mvc/MyCompanyName.MyProjectName.sln | 7 +++++ ...nyName.MyProjectName.HttpApi.Client.csproj | 21 ++++++++++++++ .../MyProjectNameHttpApiClientModule.cs | 29 +++++++++++++++++++ .../MyProjectNameHttpApiModule.cs | 2 ++ 4 files changed, 59 insertions(+) create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs diff --git a/templates/mvc/MyCompanyName.MyProjectName.sln b/templates/mvc/MyCompanyName.MyProjectName.sln index 67d3a08ba8..27cf856510 100644 --- a/templates/mvc/MyCompanyName.MyProjectName.sln +++ b/templates/mvc/MyCompanyName.MyProjectName.sln @@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi", "src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Client", "src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -79,6 +81,10 @@ Global {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Debug|Any CPU.Build.0 = Debug|Any CPU {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Release|Any CPU.ActiveCfg = Release|Any CPU {4164BDF7-F527-4E85-9CE6-E3C2D7426A27}.Release|Any CPU.Build.0 = Release|Any CPU + {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -95,6 +101,7 @@ Global {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj new file mode 100644 index 0000000000..90e5890372 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj @@ -0,0 +1,21 @@ + + + + + + netstandard2.0 + MyCompanyName.MyProjectName + + + + + + + + + + + + + + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs new file mode 100644 index 0000000000..9d4bcd78d5 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs @@ -0,0 +1,29 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.FeatureManagement; +using Volo.Abp.Identity; +using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement; +using Volo.Abp.TenantManagement; + +namespace MyCompanyName.MyProjectName +{ + [DependsOn( + typeof(MyProjectNameApplicationContractsModule), + typeof(AbpIdentityHttpApiClientModule), + typeof(AbpPermissionManagementHttpApiClientModule), + typeof(AbpTenantManagementHttpApiClientModule), + typeof(AbpFeatureManagementHttpApiClientModule) + )] + public class MyProjectNameHttpApiClientModule : AbpModule + { + public const string RemoteServiceName = "Default"; + + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddHttpClientProxies( + typeof(MyProjectNameApplicationContractsModule).Assembly, + RemoteServiceName + ); + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs index 06599f67cf..3e520f495b 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs @@ -2,6 +2,7 @@ using Volo.Abp.Identity; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.HttpApi; +using Volo.Abp.TenantManagement; namespace MyCompanyName.MyProjectName { @@ -9,6 +10,7 @@ namespace MyCompanyName.MyProjectName typeof(MyProjectNameApplicationContractsModule), typeof(AbpIdentityHttpApiModule), typeof(AbpPermissionManagementHttpApiModule), + typeof(AbpTenantManagementHttpApiModule), typeof(AbpFeatureManagementHttpApiModule) )] public class MyProjectNameHttpApiModule : AbpModule From cf4adf98d50532568f1afab3e5dcc6cd04d87bd2 Mon Sep 17 00:00:00 2001 From: mehmetuken Date: Sun, 19 May 2019 17:17:32 +0300 Subject: [PATCH 138/335] CrudAppService/AsynCrudAppService Create methods should care multitenancy. --- .../Services/AsyncCrudAppService.cs | 8 +++++++- .../Abp/Application/Services/CrudAppService.cs | 7 +++++++ .../Application/Services/CrudAppServiceBase.cs | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs index 3d633931b3..4cc9f48630 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs @@ -1,10 +1,10 @@ using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; using Volo.Abp.Linq; +using Volo.Abp.MultiTenancy; namespace Volo.Abp.Application.Services { @@ -90,6 +90,12 @@ namespace Volo.Abp.Application.Services await CheckCreatePolicyAsync(); var entity = MapToEntity(input); + + if(entity is IMultiTenant) + { + TryToSetTenantId(entity); + } + await Repository.InsertAsync(entity, autoSave: true); return MapToEntityDto(entity); diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs index 2750d699a4..744d472de5 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs @@ -2,6 +2,7 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; +using Volo.Abp.MultiTenancy; namespace Volo.Abp.Application.Services { @@ -86,6 +87,12 @@ namespace Volo.Abp.Application.Services CheckCreatePolicy(); var entity = MapToEntity(input); + + if(entity is IMultiTenant) + { + TryToSetTenantId(entity); + } + Repository.Insert(entity, autoSave: true); return MapToEntityDto(entity); diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs index 4d878ad6c3..638375524c 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs @@ -4,6 +4,7 @@ using System.Linq.Dynamic.Core; using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; +using Volo.Abp.MultiTenancy; using Volo.Abp.ObjectMapping; namespace Volo.Abp.Application.Services @@ -150,5 +151,22 @@ namespace Volo.Abp.Application.Services ObjectMapper.Map(updateInput, entity); } + + protected virtual void TryToSetTenantId(TEntity entity) + { + var tenantId = CurrentTenant.Id; + + if (tenantId == null) + { + return; + } + + var propertyInfo = entity.GetType().GetProperty(nameof(IMultiTenant.TenantId)); + + if (propertyInfo != null && propertyInfo.GetSetMethod() != null) + { + propertyInfo.SetValue(entity, tenantId, null); + } + } } } From 567776822add80df93df59d2c6456f7e13f8a839 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 19 May 2019 23:21:34 +0300 Subject: [PATCH 139/335] Added Web.Host, HttpApi.Host and IdentityServer projects. --- templates/mvc/MyCompanyName.MyProjectName.sln | 29 +++++++++++++--- ...panyName.MyProjectName.HttpApi.Host.csproj | 13 +++++++ .../Program.cs | 24 +++++++++++++ .../Properties/launchSettings.json | 27 +++++++++++++++ .../Startup.cs | 34 +++++++++++++++++++ .../appsettings.Development.json | 9 +++++ .../appsettings.json | 8 +++++ ...nyName.MyProjectName.IdentityServer.csproj | 13 +++++++ .../Program.cs | 24 +++++++++++++ .../Properties/launchSettings.json | 27 +++++++++++++++ .../Startup.cs | 34 +++++++++++++++++++ .../appsettings.Development.json | 9 +++++ .../appsettings.json | 8 +++++ ...yCompanyName.MyProjectName.Web.Host.csproj | 17 ++++++++++ .../Program.cs | 24 +++++++++++++ .../Properties/launchSettings.json | 27 +++++++++++++++ .../Startup.cs | 34 +++++++++++++++++++ .../appsettings.Development.json | 9 +++++ .../appsettings.json | 8 +++++ 19 files changed, 374 insertions(+), 4 deletions(-) create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Development.json create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Startup.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.Development.json create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/appsettings.Development.json create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/appsettings.json diff --git a/templates/mvc/MyCompanyName.MyProjectName.sln b/templates/mvc/MyCompanyName.MyProjectName.sln index 27cf856510..de8e4f3c30 100644 --- a/templates/mvc/MyCompanyName.MyProjectName.sln +++ b/templates/mvc/MyCompanyName.MyProjectName.sln @@ -23,13 +23,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations", "src\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain.Shared", "src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Shared", "src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application.Contracts", "src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Contracts", "src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi", "src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi", "src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Client", "src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client", "src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Web.Host", "src\MyCompanyName.MyProjectName.Web.Host\MyCompanyName.MyProjectName.Web.Host.csproj", "{6FE54035-9C11-4702-A5E2-D16F23101468}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Host", "src\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{5A05500D-9F03-4A80-9BFE-3C4FC8F7D599}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.IdentityServer", "src\MyCompanyName.MyProjectName.IdentityServer\MyCompanyName.MyProjectName.IdentityServer.csproj", "{073C361E-B8F4-49F5-93CC-72A3FF49C026}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -85,6 +91,18 @@ Global {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Debug|Any CPU.Build.0 = Debug|Any CPU {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Release|Any CPU.ActiveCfg = Release|Any CPU {3B5A0094-670D-4BB1-BFDD-61B88A8773DC}.Release|Any CPU.Build.0 = Release|Any CPU + {6FE54035-9C11-4702-A5E2-D16F23101468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6FE54035-9C11-4702-A5E2-D16F23101468}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6FE54035-9C11-4702-A5E2-D16F23101468}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6FE54035-9C11-4702-A5E2-D16F23101468}.Release|Any CPU.Build.0 = Release|Any CPU + {5A05500D-9F03-4A80-9BFE-3C4FC8F7D599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A05500D-9F03-4A80-9BFE-3C4FC8F7D599}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A05500D-9F03-4A80-9BFE-3C4FC8F7D599}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A05500D-9F03-4A80-9BFE-3C4FC8F7D599}.Release|Any CPU.Build.0 = Release|Any CPU + {073C361E-B8F4-49F5-93CC-72A3FF49C026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {073C361E-B8F4-49F5-93CC-72A3FF49C026}.Debug|Any CPU.Build.0 = Debug|Any CPU + {073C361E-B8F4-49F5-93CC-72A3FF49C026}.Release|Any CPU.ActiveCfg = Release|Any CPU + {073C361E-B8F4-49F5-93CC-72A3FF49C026}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -102,6 +120,9 @@ Global {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {6FE54035-9C11-4702-A5E2-D16F23101468} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {5A05500D-9F03-4A80-9BFE-3C4FC8F7D599} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {073C361E-B8F4-49F5-93CC-72A3FF49C026} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj new file mode 100644 index 0000000000..423afacffc --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp2.2 + InProcess + + + + + + + + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs new file mode 100644 index 0000000000..e117c9ddb1 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; + +namespace MyCompanyName.MyProjectName.HttpApi.Host +{ + public class Program + { + public static void Main(string[] args) + { + CreateWebHostBuilder(args).Build().Run(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup(); + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json new file mode 100644 index 0000000000..4c904a64fe --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:55977", + "sslPort": 44361 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "MyCompanyName.MyProjectName.HttpApi.Host": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs new file mode 100644 index 0000000000..e88891f5f2 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; + +namespace MyCompanyName.MyProjectName.HttpApi.Host +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.Run(async (context) => + { + await context.Response.WriteAsync("Hello World!"); + }); + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Development.json b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Development.json new file mode 100644 index 0000000000..e203e9407e --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json new file mode 100644 index 0000000000..def9159a7d --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj new file mode 100644 index 0000000000..423afacffc --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp2.2 + InProcess + + + + + + + + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs new file mode 100644 index 0000000000..5bf120eae6 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Program.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; + +namespace MyCompanyName.MyProjectName.IdentityServer +{ + public class Program + { + public static void Main(string[] args) + { + CreateWebHostBuilder(args).Build().Run(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup(); + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json new file mode 100644 index 0000000000..755641f9d7 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:55993", + "sslPort": 44348 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "MyCompanyName.MyProjectName.IdentityServer": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Startup.cs b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Startup.cs new file mode 100644 index 0000000000..f403aace25 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/Startup.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; + +namespace MyCompanyName.MyProjectName.IdentityServer +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.Run(async (context) => + { + await context.Response.WriteAsync("Hello World!"); + }); + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.Development.json b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.Development.json new file mode 100644 index 0000000000..e203e9407e --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json new file mode 100644 index 0000000000..def9159a7d --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj new file mode 100644 index 0000000000..407bd4a7d8 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp2.2 + InProcess + + + + + + + + + + + + diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs new file mode 100644 index 0000000000..54336258cc --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; + +namespace MyCompanyName.MyProjectName.Web.Host +{ + public class Program + { + public static void Main(string[] args) + { + CreateWebHostBuilder(args).Build().Run(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup(); + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json new file mode 100644 index 0000000000..e98debeb65 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:55953", + "sslPort": 44314 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "MyCompanyName.MyProjectName.Web.Host": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs new file mode 100644 index 0000000000..097742f519 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; + +namespace MyCompanyName.MyProjectName.Web.Host +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.Run(async (context) => + { + await context.Response.WriteAsync("Hello World!"); + }); + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/appsettings.Development.json b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/appsettings.Development.json new file mode 100644 index 0000000000..e203e9407e --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/appsettings.Development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/appsettings.json b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/appsettings.json new file mode 100644 index 0000000000..def9159a7d --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/appsettings.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Warning" + } + }, + "AllowedHosts": "*" +} From 0ebc343024b0b80f17cdd1d7a22b5a64301b54f4 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 20 May 2019 08:50:34 +0300 Subject: [PATCH 140/335] Update CliService.cs --- framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index c87e6818dc..a0877af68f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -139,7 +139,7 @@ namespace Volo.Abp.Cli if (!latestVersion.IsNullOrEmpty() && currentVersion != latestVersion) { Logger.LogInformation(""); - Logger.LogWarning("ABP CLI has a newer version. Please update to get the latest features and fixes."); + Logger.LogWarning("ABP CLI has a newer version (" + latestVersion + "). Please update to get the latest features and fixes."); Logger.LogWarning(""); Logger.LogWarning("Update Command: "); Logger.LogWarning(" dotnet tool update -g Volo.Abp.Cli"); From 1103ed2a266416c6640c9a56d5bf3118516af8b7 Mon Sep 17 00:00:00 2001 From: mehmetuken Date: Mon, 20 May 2019 10:38:58 +0300 Subject: [PATCH 141/335] Check entity has a tenant id value. --- .../Volo/Abp/Application/Services/CrudAppServiceBase.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs index 638375524c..0e2efa2dd5 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs @@ -154,9 +154,14 @@ namespace Volo.Abp.Application.Services protected virtual void TryToSetTenantId(TEntity entity) { + if (entity is IMultiTenant tenantEntity && tenantEntity.TenantId.HasValue) + { + return; + } + var tenantId = CurrentTenant.Id; - if (tenantId == null) + if (!tenantId.HasValue) { return; } From cc99ee5205271c6f95d3fbf4c96fb73f965f0c0d Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 20 May 2019 10:58:15 +0300 Subject: [PATCH 142/335] removed redundant disposes --- framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index a0877af68f..46ce98439e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -103,13 +103,8 @@ namespace Volo.Abp.Cli { output = stdOut.ReadToEnd(); output += stdErr.ReadToEnd(); - - stdErr.Close(); - stdOut.Close(); } } - - process.Close(); } return output; From 1bdddc7d63e8e7c157989b5f2cf51c75e635f372 Mon Sep 17 00:00:00 2001 From: mehmetuken Date: Mon, 20 May 2019 11:13:06 +0300 Subject: [PATCH 143/335] Entity has tenant id property. --- .../Abp/Application/Services/AsyncCrudAppService.cs | 2 +- .../Volo/Abp/Application/Services/CrudAppService.cs | 2 +- .../Abp/Application/Services/CrudAppServiceBase.cs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs index 4cc9f48630..151212925a 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/AsyncCrudAppService.cs @@ -91,7 +91,7 @@ namespace Volo.Abp.Application.Services var entity = MapToEntity(input); - if(entity is IMultiTenant) + if(entity is IMultiTenant && !HasTenantIdProperty(entity)) { TryToSetTenantId(entity); } diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs index 744d472de5..2595bc6edd 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs @@ -88,7 +88,7 @@ namespace Volo.Abp.Application.Services var entity = MapToEntity(input); - if(entity is IMultiTenant) + if(entity is IMultiTenant && !HasTenantIdProperty(entity)) { TryToSetTenantId(entity); } diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs index 0e2efa2dd5..b678362c53 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs @@ -154,11 +154,6 @@ namespace Volo.Abp.Application.Services protected virtual void TryToSetTenantId(TEntity entity) { - if (entity is IMultiTenant tenantEntity && tenantEntity.TenantId.HasValue) - { - return; - } - var tenantId = CurrentTenant.Id; if (!tenantId.HasValue) @@ -173,5 +168,10 @@ namespace Volo.Abp.Application.Services propertyInfo.SetValue(entity, tenantId, null); } } + + protected virtual bool HasTenantIdProperty(TEntity entity) + { + return entity.GetType().GetProperty(nameof(IMultiTenant.TenantId)) != null; + } } } From afa01500479aa1955b50ed9146fc53ddba73f09a Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 20 May 2019 12:01:22 +0300 Subject: [PATCH 144/335] Added widgets and dashboards packages. --- framework/Volo.Abp.sln | 14 ++++++++++++++ .../Bundling/AbpAspNetCoreMvcUiBundlingModule.cs | 3 +-- .../Volo.Abp.AspNetCore.Mvc.UI.Dashboards.csproj | 16 ++++++++++++++++ .../AbpAspNetCoreMvcUiDashboardsModule.cs | 13 +++++++++++++ .../Packages/AbpAspNetCoreMvcUiPackagesModule.cs | 3 +-- .../Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj | 16 ++++++++++++++++ .../Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs | 13 +++++++++++++ nupkg/common.ps1 | 2 ++ 8 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo.Abp.AspNetCore.Mvc.UI.Dashboards.csproj create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/AbpAspNetCoreMvcUiDashboardsModule.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index bed907269c..a2a423ff74 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -234,6 +234,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Specifications.Tes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Core.Tests", "test\Volo.Abp.Cli.Core.Tests\Volo.Abp.Cli.Core.Tests.csproj", "{F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Widgets", "src\Volo.Abp.AspNetCore.Mvc.UI.Widgets\Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj", "{EE1AAB08-3FBD-487F-B0B4-BEBA4B69528A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Dashboards", "src\Volo.Abp.AspNetCore.Mvc.UI.Dashboards\Volo.Abp.AspNetCore.Mvc.UI.Dashboards.csproj", "{054D766D-5992-460E-A4D8-936D80BE2C1A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -696,6 +700,14 @@ Global {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}.Debug|Any CPU.Build.0 = Debug|Any CPU {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}.Release|Any CPU.ActiveCfg = Release|Any CPU {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA}.Release|Any CPU.Build.0 = Release|Any CPU + {EE1AAB08-3FBD-487F-B0B4-BEBA4B69528A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EE1AAB08-3FBD-487F-B0B4-BEBA4B69528A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE1AAB08-3FBD-487F-B0B4-BEBA4B69528A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE1AAB08-3FBD-487F-B0B4-BEBA4B69528A}.Release|Any CPU.Build.0 = Release|Any CPU + {054D766D-5992-460E-A4D8-936D80BE2C1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {054D766D-5992-460E-A4D8-936D80BE2C1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {054D766D-5992-460E-A4D8-936D80BE2C1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {054D766D-5992-460E-A4D8-936D80BE2C1A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -815,6 +827,8 @@ Global {2C621EED-563C-4F81-A75E-50879E173544} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {D078553A-C70C-4F56-B3E2-9C5BA6384C72} = {447C8A77-E5F0-4538-8687-7383196D04EA} {F006B0B4-F25D-4511-9FB3-F17AA44BDCEA} = {447C8A77-E5F0-4538-8687-7383196D04EA} + {EE1AAB08-3FBD-487F-B0B4-BEBA4B69528A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {054D766D-5992-460E-A4D8-936D80BE2C1A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs index 714a7aa68b..a0f0e65f1e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs @@ -1,5 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.Modularity; namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo.Abp.AspNetCore.Mvc.UI.Dashboards.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo.Abp.AspNetCore.Mvc.UI.Dashboards.csproj new file mode 100644 index 0000000000..f887ac867a --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo.Abp.AspNetCore.Mvc.UI.Dashboards.csproj @@ -0,0 +1,16 @@ + + + + + + netstandard2.0 + Volo.Abp.AspNetCore.Mvc.UI.Dashboards + Volo.Abp.AspNetCore.Mvc.UI.Dashboards + + + + + + + + diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/AbpAspNetCoreMvcUiDashboardsModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/AbpAspNetCoreMvcUiDashboardsModule.cs new file mode 100644 index 0000000000..5acd00334c --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/AbpAspNetCoreMvcUiDashboardsModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; +using Volo.Abp.Modularity; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Dashboards +{ + [DependsOn( + typeof(AbpAspNetCoreMvcUiWidgetsModule) + )] + public class AbpAspNetCoreMvcUiDashboardsModule : AbpModule + { + + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/AbpAspNetCoreMvcUiPackagesModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/AbpAspNetCoreMvcUiPackagesModule.cs index bab248f669..ec82d4b3d6 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/AbpAspNetCoreMvcUiPackagesModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/AbpAspNetCoreMvcUiPackagesModule.cs @@ -1,5 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.Modularity; namespace Volo.Abp.AspNetCore.Mvc.UI.Packages diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj new file mode 100644 index 0000000000..26634c6270 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj @@ -0,0 +1,16 @@ + + + + + + netstandard2.0 + Volo.Abp.AspNetCore.Mvc.UI.Widgets + Volo.Abp.AspNetCore.Mvc.UI.Widgets + + + + + + + + diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs new file mode 100644 index 0000000000..cdf1db75cd --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.Modularity; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets +{ + [DependsOn( + typeof(AbpAspNetCoreMvcUiBootstrapModule) + )] + public class AbpAspNetCoreMvcUiWidgetsModule : AbpModule + { + + } +} diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index 59329e6af0..e4ecc832fe 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -37,10 +37,12 @@ $projects = ( "framework/src/Volo.Abp.AspNetCore.Mvc.UI", "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling", + "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards", "framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages", "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", + "framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets", "framework/src/Volo.Abp.AspNetCore.TestBase", "framework/src/Volo.Abp.Auditing", "framework/src/Volo.Abp.Authorization", From 6bcd1a7040a3ba4c63d037f63d2e78bbb9b6c159 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Mon, 20 May 2019 12:25:21 +0300 Subject: [PATCH 145/335] remove font-awesome style --- modules/docs/app/VoloDocs.Web/Pages/Index.cshtml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml index 4ac9f376ad..3cc5408311 100644 --- a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml +++ b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml @@ -12,7 +12,6 @@ @section styles { - } From 4d79878f7edf9b9eac3859fbb048fbb568480c81 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 20 May 2019 12:44:23 +0300 Subject: [PATCH 146/335] Added widget renderer --- .../Mvc/UI/Widgets/IWidgetRenderer.cs | 18 +++++++++ .../Mvc/UI/Widgets/WidgetDefinition.cs | 38 +++++++++++++++++++ .../Mvc/UI/Widgets/WidgetOptions.cs | 14 +++++++ 3 files changed, 70 insertions(+) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/IWidgetRenderer.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDefinition.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptions.cs diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/IWidgetRenderer.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/IWidgetRenderer.cs new file mode 100644 index 0000000000..5ef4abadba --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/IWidgetRenderer.cs @@ -0,0 +1,18 @@ +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets +{ + public interface IWidgetRenderer : ITransientDependency + { + Task RenderAsync(string mywidget); + } + + public class WidgetRenderer : IWidgetRenderer + { + public Task RenderAsync(string mywidget) + { + throw new System.NotImplementedException(); + } + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDefinition.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDefinition.cs new file mode 100644 index 0000000000..d164e3a50c --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDefinition.cs @@ -0,0 +1,38 @@ +using System; +using JetBrains.Annotations; +using Volo.Abp.Localization; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets +{ + public class WidgetDefinition + { + /// + /// Unique name of the widget. + /// + [NotNull] + public string Name { get; } + + /// + /// Display name of the widget. + /// + [NotNull] + public ILocalizableString DisplayName + { + get => _displayName; + set => _displayName = Check.NotNull(value, nameof(value)); + } + private ILocalizableString _displayName; + + public Type ViewComponentType { get; set; } + + public WidgetDefinition( + [NotNull] string name, + [NotNull] Type viewComponentType, + [CanBeNull] ILocalizableString displayName) + { + Name = Check.NotNullOrWhiteSpace(name, nameof(name)); + ViewComponentType = Check.NotNull(viewComponentType, nameof(viewComponentType)); + DisplayName = displayName ?? new FixedLocalizableString(name); + } + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptions.cs new file mode 100644 index 0000000000..7a4fa3487f --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptions.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets +{ + public class WidgetOptions + { + public List Widgets { get; } + + public WidgetOptions() + { + Widgets = new List(); + } + } +} From 7f2f24d3c121cf6b95322e3e3ecbf1d690e94dc7 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 20 May 2019 12:58:37 +0300 Subject: [PATCH 147/335] CmdHelper improvements --- .../Volo/Abp/Cli/CliService.cs | 14 +++++----- .../EfCoreMigrationAdder.cs | 7 +++-- .../Volo/Abp/Cli/Utils/CmdHelper.cs | 26 ++++++++++++++++++- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 46ce98439e..3c2a88094f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.IO; using System.Reflection; +using System.Runtime.InteropServices; using Microsoft.Extensions.DependencyInjection; using System.Threading.Tasks; using Microsoft.Extensions.Logging; @@ -9,6 +10,7 @@ using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.NuGet; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli @@ -70,7 +72,7 @@ namespace Volo.Abp.Cli private void CheckDependencies() { var installedNpmPackages = GetInstalledNpmPackages(); - + if (!installedNpmPackages.Contains(" yarn@")) { InstallYarn(); @@ -87,9 +89,9 @@ namespace Volo.Abp.Cli using (var process = new Process()) { - process.StartInfo = new ProcessStartInfo("CMD.exe") + process.StartInfo = new ProcessStartInfo(CmdHelper.GetFileName()) { - Arguments = "/C npm list -g --depth 0", + Arguments = CmdHelper.GetArguments("npm list -g --depth 0"), UseShellExecute = false, CreateNoWindow = true, RedirectStandardOutput = true, @@ -113,15 +115,13 @@ namespace Volo.Abp.Cli private void InstallYarn() { Logger.LogInformation("Installing yarn..."); - var process = Process.Start("CMD.exe", "/C npm install yarn -g"); - process.WaitForExit(); + CmdHelper.RunCmd("npm install yarn -g"); } private void InstallGulp() { Logger.LogInformation("Installing gulp..."); - var process = Process.Start("CMD.exe", "/C npm install gulp -g"); - process.WaitForExit(); + CmdHelper.RunCmd("npm install gulp -g"); } private async Task CheckForNewVersion() diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs index d3178adcb3..d3c324431b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationAdder.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics; using System.IO; +using Volo.Abp.Cli.Utils; using Volo.Abp.DependencyInjection; namespace Volo.Abp.Cli.ProjectModification @@ -12,8 +13,7 @@ namespace Volo.Abp.Cli.ProjectModification var moduleName = ParseModuleName(module); var migrationName = "Added_" + moduleName + "_Module" + GetUniquePostFix(); - var process = Process.Start("CMD.exe", "/C cd \"" + Path.GetDirectoryName(csprojFile) + "\" & dotnet ef migrations add " + migrationName); - process.WaitForExit(); + CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(csprojFile) + "\" & dotnet ef migrations add " + migrationName); if (updateDatabase) { @@ -23,8 +23,7 @@ namespace Volo.Abp.Cli.ProjectModification protected void UpdateDatabase(string csprojFile) { - var process = Process.Start("CMD.exe", "/C cd \"" + Path.GetDirectoryName(csprojFile) + "\" & dotnet ef database update"); - process.WaitForExit(); + CmdHelper.RunCmd("cd \"" + Path.GetDirectoryName(csprojFile) + "\" & dotnet ef database update"); } protected virtual string ParseModuleName(string fullModuleName) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs index 01a0f00af0..c9225b62f0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs @@ -1,4 +1,5 @@ using System.Diagnostics; +using System.Runtime.InteropServices; namespace Volo.Abp.Cli.Utils { @@ -12,8 +13,31 @@ namespace Volo.Abp.Cli.Utils public static void RunCmd(string command) { - var procStartInfo = new ProcessStartInfo("cmd.exe", "/C " + command); + var procStartInfo = new ProcessStartInfo(GetFileName(), GetArguments(command)); Process.Start(procStartInfo).WaitForExit(); } + + public static string GetArguments(string command) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + return "-c \"" + command + "\""; + } + + //Windows default. + return "/C \"" + command + "\""; + } + + public static string GetFileName() + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + //TODO: Test this. it should work for both operaion systems. + return "/bin/bash"; + } + + //Windows default. + return "cmd.exe"; + } } } From 80ddad70389fa83399ba30d95544cf6596fb0282 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Mon, 20 May 2019 13:00:29 +0300 Subject: [PATCH 148/335] Improve dashboard definition --- .../Mvc/UI/Dashboards/DashboardDefinition.cs | 42 +++++++++++++++++++ .../DashboardWidgetConfiguration.cs | 23 ++++++++++ .../Mvc/UI/Dashboards/WidgetOptions.cs | 14 +++++++ .../Mvc/UI/Widgets/WidgetDefinition.cs | 8 +++- .../Mvc/UI/Widgets/WidgetDimensions.cs | 15 +++++++ 5 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardDefinition.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardWidgetConfiguration.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/WidgetOptions.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDimensions.cs diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardDefinition.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardDefinition.cs new file mode 100644 index 0000000000..7006fc6e24 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardDefinition.cs @@ -0,0 +1,42 @@ +using System.Collections.Generic; +using JetBrains.Annotations; +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; +using Volo.Abp.Localization; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Dashboards +{ + public class DashboardDefinition + { + /// + /// Unique name of the dashboard. + /// + [NotNull] + public string Name { get; } + + /// + /// A list of Widgets available for this dashboard. + /// + public List AvailableWidgets { get; } + + /// + /// Display name of the widget. + /// + [NotNull] + public ILocalizableString DisplayName + { + get => _displayName; + set => _displayName = Check.NotNull(value, nameof(value)); + } + private ILocalizableString _displayName; + + public DashboardDefinition( + [NotNull] string name, + [CanBeNull] ILocalizableString displayName) + { + Name = Check.NotNullOrWhiteSpace(name, nameof(name)); + DisplayName = displayName ?? new FixedLocalizableString(name); + + AvailableWidgets = new List(); + } + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardWidgetConfiguration.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardWidgetConfiguration.cs new file mode 100644 index 0000000000..ab6f8d2884 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardWidgetConfiguration.cs @@ -0,0 +1,23 @@ +using JetBrains.Annotations; +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Dashboards +{ + public class DashboardWidgetConfiguration + { + [NotNull] + public string WidgetName { get; } + + [CanBeNull] + public WidgetDimensions Dimensions { get; set; } + + public DashboardWidgetConfiguration( + [NotNull] string widgetName, + [CanBeNull] WidgetDimensions dimensions + ) + { + WidgetName = Check.NotNullOrWhiteSpace(widgetName, nameof(widgetName)); + Dimensions = dimensions; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/WidgetOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/WidgetOptions.cs new file mode 100644 index 0000000000..fc3ca09b74 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/WidgetOptions.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Dashboards +{ + public class DashboardOptions + { + public List Dashboards { get; } + + public DashboardOptions() + { + Dashboards = new List(); + } + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDefinition.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDefinition.cs index d164e3a50c..0b74fa9e07 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDefinition.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDefinition.cs @@ -23,13 +23,19 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets } private ILocalizableString _displayName; + [NotNull] public Type ViewComponentType { get; set; } + [CanBeNull] + public WidgetDimensions DefaultDimensions { get; set; } + public WidgetDefinition( [NotNull] string name, [NotNull] Type viewComponentType, - [CanBeNull] ILocalizableString displayName) + [CanBeNull] ILocalizableString displayName, + [CanBeNull] WidgetDimensions defaultDimensions = null) { + DefaultDimensions = defaultDimensions; Name = Check.NotNullOrWhiteSpace(name, nameof(name)); ViewComponentType = Check.NotNull(viewComponentType, nameof(viewComponentType)); DisplayName = displayName ?? new FixedLocalizableString(name); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDimensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDimensions.cs new file mode 100644 index 0000000000..eb24d208b4 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetDimensions.cs @@ -0,0 +1,15 @@ +namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets +{ + public class WidgetDimensions + { + public int Width { get; } + + public int Height { get; } + + public WidgetDimensions(int width, int height) + { + Width = width; + Height = height; + } + } +} \ No newline at end of file From cd054d2439b765d464e112b174e648b4c8fb8a2e Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 20 May 2019 14:43:51 +0300 Subject: [PATCH 149/335] Added dashboarddemo to samples --- samples/DashboardDemo/.gitattributes | 1 + samples/DashboardDemo/.gitignore | 255 + samples/DashboardDemo/DashboardDemo.sln | 74 + .../DashboardDemo.sln.DotSettings | 7 + samples/DashboardDemo/common.props | 7 + .../DashboardDemo.Application.csproj | 18 + ...shboardDemoApplicationAutoMapperProfile.cs | 12 + .../DashboardDemoApplicationModule.cs | 27 + ...shboardDemoPermissionDefinitionProvider.cs | 22 + .../Permissions/DashboardDemoPermissions.cs | 19 + .../DashboardDemo.Domain.csproj | 25 + .../DashboardDemoConsts.cs | 11 + .../DashboardDemoDomainModule.cs | 49 + .../DashboardDemo/DashboardDemoResource.cs | 10 + .../Localization/DashboardDemo/en.json | 8 + .../Localization/DashboardDemo/pt-BR.json | 8 + .../Localization/DashboardDemo/tr.json | 8 + .../Localization/DashboardDemo/zh-Hans.json | 8 + .../DashboardDemoSettingDefinitionProvider.cs | 13 + .../Settings/DashboardDemoSettings.cs | 10 + .../src/DashboardDemo.Domain/Users/AppUser.cs | 53 + ...mo.EntityFrameworkCore.DbMigrations.csproj | 18 + .../DashboardDemoMigrationsDbContext.cs | 46 + ...DashboardDemoMigrationsDbContextFactory.cs | 29 + .../20190402131334_Initial.Designer.cs | 760 + .../Migrations/20190402131334_Initial.cs | 546 + ...ardDemoMigrationsDbContextModelSnapshot.cs | 758 + .../DashboardDemo.EntityFrameworkCore.csproj | 22 + .../DashboardDemoDbContext.cs | 45 + ...ardDemoDbContextModelCreatingExtensions.cs | 30 + .../DashboardDemoEntityFrameworkCoreModule.cs | 36 + .../Branding/DashboardDemoBrandingProvider.cs | 11 + .../DashboardDemo.Web.csproj | 42 + .../DashboardDemoWebAutoMapperProfile.cs | 12 + .../DashboardDemoWebModule.cs | 203 + .../Menus/DashboardDemoMenuContributor.cs | 33 + .../Pages/DashboardDemoPageBase.cs | 13 + .../Pages/DashboardDemoPageModelBase.cs | 13 + .../src/DashboardDemo.Web/Pages/Index.cshtml | 19 + .../DashboardDemo.Web/Pages/Index.cshtml.cs | 10 + .../Pages/_ViewImports.cshtml | 4 + .../src/DashboardDemo.Web/Program.cs | 46 + .../Properties/launchSettings.json | 27 + .../src/DashboardDemo.Web/Startup.cs | 26 + .../Views/_ViewImports.cshtml | 3 + .../DashboardDemo.Web/abp.resourcemapping.js | 8 + .../src/DashboardDemo.Web/appsettings.json | 5 + .../src/DashboardDemo.Web/compilerconfig.json | 6 + .../compilerconfig.json.defaults | 49 + .../src/DashboardDemo.Web/gulpfile.js | 11 + .../src/DashboardDemo.Web/package-lock.json | 2390 +++ .../src/DashboardDemo.Web/package.json | 8 + .../wwwroot/libs/abp/core/abp.js | 546 + .../wwwroot/libs/abp/jquery/abp.jquery.js | 389 + .../wwwroot/libs/bootstrap/css/bootstrap.css | 8981 +++++++++ .../libs/bootstrap/js/bootstrap.bundle.js | 6444 +++++++ .../css/dataTables.bootstrap4.css | 202 + .../js/dataTables.bootstrap4.js | 184 + .../datatables.net/js/jquery.dataTables.js | 15242 ++++++++++++++++ .../libs/font-awesome/css/font-awesome.css | 2337 +++ .../libs/font-awesome/fonts/FontAwesome.otf | Bin 0 -> 134808 bytes .../fonts/fontawesome-webfont.eot | Bin 0 -> 165742 bytes .../fonts/fontawesome-webfont.svg | 2671 +++ .../fonts/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes .../fonts/fontawesome-webfont.woff | Bin 0 -> 98024 bytes .../fonts/fontawesome-webfont.woff2 | Bin 0 -> 77160 bytes .../libs/jquery-form/jquery.form.min.js | 23 + .../jquery.validate.unobtrusive.js | 431 + .../libs/jquery-validation/jquery.validate.js | 1601 ++ .../localization/messages_ar.js | 35 + .../localization/messages_az.js | 35 + .../localization/messages_bg.js | 35 + .../localization/messages_bn_BD.js | 35 + .../localization/messages_ca.js | 35 + .../localization/messages_cs.js | 35 + .../localization/messages_da.js | 32 + .../localization/messages_de.js | 32 + .../localization/messages_el.js | 35 + .../localization/messages_es.js | 38 + .../localization/messages_es_AR.js | 39 + .../localization/messages_es_PE.js | 39 + .../localization/messages_et.js | 33 + .../localization/messages_eu.js | 35 + .../localization/messages_fa.js | 38 + .../localization/messages_fi.js | 33 + .../localization/messages_fr.js | 63 + .../localization/messages_ge.js | 35 + .../localization/messages_gl.js | 40 + .../localization/messages_he.js | 35 + .../localization/messages_hr.js | 35 + .../localization/messages_hu.js | 35 + .../localization/messages_hy_AM.js | 35 + .../localization/messages_id.js | 34 + .../localization/messages_is.js | 33 + .../localization/messages_it.js | 39 + .../localization/messages_ja.js | 36 + .../localization/messages_ka.js | 35 + .../localization/messages_kk.js | 35 + .../localization/messages_ko.js | 35 + .../localization/messages_lt.js | 35 + .../localization/messages_lv.js | 35 + .../localization/messages_mk.js | 35 + .../localization/messages_my.js | 35 + .../localization/messages_nl.js | 46 + .../localization/messages_no.js | 36 + .../localization/messages_pl.js | 37 + .../localization/messages_pt_BR.js | 88 + .../localization/messages_pt_PT.js | 39 + .../localization/messages_ro.js | 35 + .../localization/messages_ru.js | 35 + .../localization/messages_sd.js | 35 + .../localization/messages_si.js | 35 + .../localization/messages_sk.js | 32 + .../localization/messages_sl.js | 35 + .../localization/messages_sr.js | 35 + .../localization/messages_sr_lat.js | 35 + .../localization/messages_sv.js | 33 + .../localization/messages_th.js | 35 + .../localization/messages_tj.js | 35 + .../localization/messages_tr.js | 36 + .../localization/messages_uk.js | 35 + .../localization/messages_ur.js | 35 + .../localization/messages_vi.js | 35 + .../localization/messages_zh.js | 35 + .../localization/messages_zh_TW.js | 36 + .../localization/methods_de.js | 24 + .../localization/methods_es_CL.js | 24 + .../localization/methods_fi.js | 24 + .../localization/methods_nl.js | 24 + .../localization/methods_pt.js | 21 + .../wwwroot/libs/jquery/jquery.js | 10364 +++++++++++ .../wwwroot/libs/lodash/lodash.min.js | 137 + .../wwwroot/libs/select2/css/select2.min.css | 1 + .../wwwroot/libs/select2/js/i18n/af.js | 3 + .../wwwroot/libs/select2/js/i18n/ar.js | 3 + .../wwwroot/libs/select2/js/i18n/az.js | 3 + .../wwwroot/libs/select2/js/i18n/bg.js | 3 + .../wwwroot/libs/select2/js/i18n/bs.js | 3 + .../wwwroot/libs/select2/js/i18n/ca.js | 3 + .../wwwroot/libs/select2/js/i18n/cs.js | 3 + .../wwwroot/libs/select2/js/i18n/da.js | 3 + .../wwwroot/libs/select2/js/i18n/de.js | 3 + .../wwwroot/libs/select2/js/i18n/dsb.js | 3 + .../wwwroot/libs/select2/js/i18n/el.js | 3 + .../wwwroot/libs/select2/js/i18n/en.js | 3 + .../wwwroot/libs/select2/js/i18n/es.js | 3 + .../wwwroot/libs/select2/js/i18n/et.js | 3 + .../wwwroot/libs/select2/js/i18n/eu.js | 3 + .../wwwroot/libs/select2/js/i18n/fa.js | 3 + .../wwwroot/libs/select2/js/i18n/fi.js | 3 + .../wwwroot/libs/select2/js/i18n/fr.js | 3 + .../wwwroot/libs/select2/js/i18n/gl.js | 3 + .../wwwroot/libs/select2/js/i18n/he.js | 3 + .../wwwroot/libs/select2/js/i18n/hi.js | 3 + .../wwwroot/libs/select2/js/i18n/hr.js | 3 + .../wwwroot/libs/select2/js/i18n/hsb.js | 3 + .../wwwroot/libs/select2/js/i18n/hu.js | 3 + .../wwwroot/libs/select2/js/i18n/hy.js | 3 + .../wwwroot/libs/select2/js/i18n/id.js | 3 + .../wwwroot/libs/select2/js/i18n/is.js | 3 + .../wwwroot/libs/select2/js/i18n/it.js | 3 + .../wwwroot/libs/select2/js/i18n/ja.js | 3 + .../wwwroot/libs/select2/js/i18n/km.js | 3 + .../wwwroot/libs/select2/js/i18n/ko.js | 3 + .../wwwroot/libs/select2/js/i18n/lt.js | 3 + .../wwwroot/libs/select2/js/i18n/lv.js | 3 + .../wwwroot/libs/select2/js/i18n/mk.js | 3 + .../wwwroot/libs/select2/js/i18n/ms.js | 3 + .../wwwroot/libs/select2/js/i18n/nb.js | 3 + .../wwwroot/libs/select2/js/i18n/nl.js | 3 + .../wwwroot/libs/select2/js/i18n/pl.js | 3 + .../wwwroot/libs/select2/js/i18n/ps.js | 3 + .../wwwroot/libs/select2/js/i18n/pt-BR.js | 3 + .../wwwroot/libs/select2/js/i18n/pt.js | 3 + .../wwwroot/libs/select2/js/i18n/ro.js | 3 + .../wwwroot/libs/select2/js/i18n/ru.js | 3 + .../wwwroot/libs/select2/js/i18n/sk.js | 3 + .../wwwroot/libs/select2/js/i18n/sl.js | 3 + .../wwwroot/libs/select2/js/i18n/sr-Cyrl.js | 3 + .../wwwroot/libs/select2/js/i18n/sr.js | 3 + .../wwwroot/libs/select2/js/i18n/sv.js | 3 + .../wwwroot/libs/select2/js/i18n/th.js | 3 + .../wwwroot/libs/select2/js/i18n/tr.js | 3 + .../wwwroot/libs/select2/js/i18n/uk.js | 3 + .../wwwroot/libs/select2/js/i18n/vi.js | 3 + .../wwwroot/libs/select2/js/i18n/zh-CN.js | 3 + .../wwwroot/libs/select2/js/i18n/zh-TW.js | 3 + .../libs/select2/js/select2.full.min.js | 1 + .../wwwroot/libs/select2/js/select2.min.js | 1 + .../wwwroot/libs/sweetalert/sweetalert.min.js | 1 + .../wwwroot/libs/timeago/jquery.timeago.js | 232 + .../wwwroot/libs/timeago/locales/README.md | 27 + .../libs/timeago/locales/jquery.timeago.af.js | 30 + .../libs/timeago/locales/jquery.timeago.am.js | 30 + .../libs/timeago/locales/jquery.timeago.ar.js | 104 + .../locales/jquery.timeago.az-short.js | 30 + .../libs/timeago/locales/jquery.timeago.az.js | 30 + .../libs/timeago/locales/jquery.timeago.bg.js | 28 + .../libs/timeago/locales/jquery.timeago.bs.js | 55 + .../libs/timeago/locales/jquery.timeago.ca.js | 30 + .../libs/timeago/locales/jquery.timeago.cs.js | 34 + .../libs/timeago/locales/jquery.timeago.cy.js | 30 + .../libs/timeago/locales/jquery.timeago.da.js | 28 + .../locales/jquery.timeago.de-short.js | 30 + .../libs/timeago/locales/jquery.timeago.de.js | 28 + .../libs/timeago/locales/jquery.timeago.dv.js | 32 + .../libs/timeago/locales/jquery.timeago.el.js | 28 + .../locales/jquery.timeago.en-short.js | 30 + .../libs/timeago/locales/jquery.timeago.en.js | 30 + .../locales/jquery.timeago.es-short.js | 31 + .../libs/timeago/locales/jquery.timeago.es.js | 29 + .../libs/timeago/locales/jquery.timeago.et.js | 28 + .../libs/timeago/locales/jquery.timeago.eu.js | 28 + .../locales/jquery.timeago.fa-short.js | 30 + .../libs/timeago/locales/jquery.timeago.fa.js | 32 + .../libs/timeago/locales/jquery.timeago.fi.js | 38 + .../locales/jquery.timeago.fr-short.js | 26 + .../libs/timeago/locales/jquery.timeago.fr.js | 27 + .../libs/timeago/locales/jquery.timeago.gl.js | 28 + .../libs/timeago/locales/jquery.timeago.he.js | 26 + .../libs/timeago/locales/jquery.timeago.hr.js | 54 + .../libs/timeago/locales/jquery.timeago.hu.js | 28 + .../libs/timeago/locales/jquery.timeago.hy.js | 28 + .../libs/timeago/locales/jquery.timeago.id.js | 29 + .../libs/timeago/locales/jquery.timeago.is.js | 29 + .../locales/jquery.timeago.it-short.js | 30 + .../libs/timeago/locales/jquery.timeago.it.js | 26 + .../libs/timeago/locales/jquery.timeago.ja.js | 29 + .../libs/timeago/locales/jquery.timeago.jv.js | 28 + .../libs/timeago/locales/jquery.timeago.ko.js | 31 + .../libs/timeago/locales/jquery.timeago.ky.js | 42 + .../libs/timeago/locales/jquery.timeago.lt.js | 30 + .../libs/timeago/locales/jquery.timeago.lv.js | 30 + .../libs/timeago/locales/jquery.timeago.mk.js | 30 + .../libs/timeago/locales/jquery.timeago.nl.js | 30 + .../libs/timeago/locales/jquery.timeago.no.js | 28 + .../libs/timeago/locales/jquery.timeago.pl.js | 39 + .../locales/jquery.timeago.pt-br-short.js | 30 + .../timeago/locales/jquery.timeago.pt-br.js | 28 + .../locales/jquery.timeago.pt-short.js | 30 + .../libs/timeago/locales/jquery.timeago.pt.js | 26 + .../libs/timeago/locales/jquery.timeago.ro.js | 29 + .../libs/timeago/locales/jquery.timeago.rs.js | 54 + .../libs/timeago/locales/jquery.timeago.ru.js | 43 + .../libs/timeago/locales/jquery.timeago.rw.js | 30 + .../libs/timeago/locales/jquery.timeago.si.js | 28 + .../libs/timeago/locales/jquery.timeago.sk.js | 34 + .../libs/timeago/locales/jquery.timeago.sl.js | 46 + .../libs/timeago/locales/jquery.timeago.sq.js | 26 + .../libs/timeago/locales/jquery.timeago.sr.js | 54 + .../libs/timeago/locales/jquery.timeago.sv.js | 28 + .../libs/timeago/locales/jquery.timeago.th.js | 30 + .../locales/jquery.timeago.tr-short.js | 30 + .../libs/timeago/locales/jquery.timeago.tr.js | 26 + .../libs/timeago/locales/jquery.timeago.uk.js | 42 + .../libs/timeago/locales/jquery.timeago.ur.js | 30 + .../libs/timeago/locales/jquery.timeago.uz.js | 29 + .../libs/timeago/locales/jquery.timeago.vi.js | 30 + .../timeago/locales/jquery.timeago.zh-CN.js | 31 + .../timeago/locales/jquery.timeago.zh-TW.js | 30 + .../wwwroot/libs/toastr/toastr.css | 228 + .../wwwroot/libs/toastr/toastr.js.map | 1 + .../wwwroot/libs/toastr/toastr.min.css | 1 + .../wwwroot/libs/toastr/toastr.min.js | 2 + .../DashboardDemo.Web/wwwroot/pages/index.css | 1 + .../wwwroot/pages/index.min.css | 1 + .../wwwroot/pages/index.scss | 3 + .../src/DashboardDemo.Web/yarn.lock | 1660 ++ .../DashboardDemo.Application.Tests.csproj | 28 + .../DashboardDemoApplicationTestBase.cs | 12 + .../DashboardDemoApplicationTestModule.cs | 78 + .../DashboardDemoTestDataBuilder.cs | 28 + .../Samples/SampleTests.cs | 59 + .../DashboardDemo.Web.Tests.csproj | 39 + .../DashboardDemoWebTestBase.cs | 43 + .../DashboardDemoWebTestModule.cs | 92 + .../DashboardDemoWebTestStartup.cs | 26 + .../Samples/SampleWebTest.cs | 23 + .../WebContentDirectoryFinder.cs | 47 + .../DashboardDemo.Web.Tests/xunit.runner.json | 3 + 280 files changed, 62645 insertions(+) create mode 100644 samples/DashboardDemo/.gitattributes create mode 100644 samples/DashboardDemo/.gitignore create mode 100644 samples/DashboardDemo/DashboardDemo.sln create mode 100644 samples/DashboardDemo/DashboardDemo.sln.DotSettings create mode 100644 samples/DashboardDemo/common.props create mode 100644 samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemo.Application.csproj create mode 100644 samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemoApplicationAutoMapperProfile.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemoApplicationModule.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Application/Permissions/DashboardDemoPermissionDefinitionProvider.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Application/Permissions/DashboardDemoPermissions.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemo.Domain.csproj create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoConsts.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/DashboardDemoResource.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/en.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/pt-BR.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/tr.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/zh-Hans.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/Settings/DashboardDemoSettingDefinitionProvider.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/Settings/DashboardDemoSettings.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/DashboardDemo.EntityFrameworkCore.DbMigrations.csproj create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContext.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.Designer.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/DashboardDemoMigrationsDbContextModelSnapshot.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/DashboardDemo.EntityFrameworkCore.csproj create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContextModelCreatingExtensions.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Branding/DashboardDemoBrandingProvider.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebAutoMapperProfile.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Menus/DashboardDemoMenuContributor.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/DashboardDemoPageBase.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/DashboardDemoPageModelBase.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/Index.cshtml create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/Index.cshtml.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/_ViewImports.cshtml create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Program.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Properties/launchSettings.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Views/_ViewImports.cshtml create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/appsettings.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/compilerconfig.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/compilerconfig.json.defaults create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/gulpfile.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/package-lock.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/package.json create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/abp/core/abp.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/abp/jquery/abp.jquery.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/bootstrap/css/bootstrap.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/datatables.net-bs4/css/dataTables.bootstrap4.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/datatables.net-bs4/js/dataTables.bootstrap4.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/datatables.net/js/jquery.dataTables.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/font-awesome/css/font-awesome.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/font-awesome/fonts/FontAwesome.otf create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.eot create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.svg create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.ttf create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/font-awesome/fonts/fontawesome-webfont.woff2 create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-form/jquery.form.min.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/jquery.validate.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ar.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_az.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_bg.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_bn_BD.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ca.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_cs.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_da.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_de.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_el.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_es.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_es_AR.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_es_PE.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_et.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_eu.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_fa.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_fi.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_fr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ge.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_gl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_he.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_hr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_hu.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_hy_AM.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_id.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_is.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_it.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ja.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ka.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_kk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ko.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_lt.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_lv.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_mk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_my.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_nl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_no.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_pl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_pt_BR.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_pt_PT.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ro.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ru.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_sd.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_si.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_sk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_sl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_sr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_sr_lat.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_sv.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_th.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_tj.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_tr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_uk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_ur.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_vi.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_zh.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/messages_zh_TW.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/methods_de.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/methods_es_CL.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/methods_fi.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/methods_nl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery-validation/localization/methods_pt.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/jquery/jquery.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/lodash/lodash.min.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/css/select2.min.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/af.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/ar.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/az.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/bg.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/bs.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/ca.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/cs.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/da.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/de.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/dsb.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/el.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/en.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/es.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/et.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/eu.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/fa.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/fi.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/fr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/gl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/he.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/hi.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/hr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/hsb.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/hu.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/hy.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/id.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/is.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/it.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/ja.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/km.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/ko.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/lt.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/lv.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/mk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/ms.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/nb.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/nl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/pl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/ps.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/pt-BR.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/pt.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/ro.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/ru.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/sk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/sl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/sr-Cyrl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/sr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/sv.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/th.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/tr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/uk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/vi.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/zh-CN.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/i18n/zh-TW.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/select2.full.min.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/select2/js/select2.min.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/sweetalert/sweetalert.min.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/jquery.timeago.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/README.md create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.af.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.am.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.ar.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.az-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.az.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.bg.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.bs.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.ca.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.cs.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.cy.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.da.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.de-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.de.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.dv.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.el.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.en-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.en.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.es-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.es.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.et.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.eu.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.fa-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.fa.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.fi.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.fr-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.fr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.gl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.he.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.hr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.hu.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.hy.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.id.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.is.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.it-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.it.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.ja.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.jv.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.ko.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.ky.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.lt.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.lv.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.mk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.nl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.no.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.pl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.pt-br-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.pt-br.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.pt-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.pt.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.ro.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.rs.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.ru.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.rw.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.si.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.sk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.sl.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.sq.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.sr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.sv.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.th.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.tr-short.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.tr.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.uk.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.ur.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.uz.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.vi.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.zh-CN.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/timeago/locales/jquery.timeago.zh-TW.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/toastr/toastr.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/toastr/toastr.js.map create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/toastr/toastr.min.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/toastr/toastr.min.js create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/pages/index.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/pages/index.min.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/pages/index.scss create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/yarn.lock create mode 100644 samples/DashboardDemo/test/DashboardDemo.Application.Tests/DashboardDemo.Application.Tests.csproj create mode 100644 samples/DashboardDemo/test/DashboardDemo.Application.Tests/DashboardDemoApplicationTestBase.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Application.Tests/DashboardDemoApplicationTestModule.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Application.Tests/DashboardDemoTestDataBuilder.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Application.Tests/Samples/SampleTests.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemo.Web.Tests.csproj create mode 100644 samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Web.Tests/Samples/SampleWebTest.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Web.Tests/WebContentDirectoryFinder.cs create mode 100644 samples/DashboardDemo/test/DashboardDemo.Web.Tests/xunit.runner.json diff --git a/samples/DashboardDemo/.gitattributes b/samples/DashboardDemo/.gitattributes new file mode 100644 index 0000000000..c941e52669 --- /dev/null +++ b/samples/DashboardDemo/.gitattributes @@ -0,0 +1 @@ +**/wwwroot/libs/** linguist-vendored diff --git a/samples/DashboardDemo/.gitignore b/samples/DashboardDemo/.gitignore new file mode 100644 index 0000000000..3c7ee2487b --- /dev/null +++ b/samples/DashboardDemo/.gitignore @@ -0,0 +1,255 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# DashboardDemo +src/DashboardDemo.Web/Logs/logs.txt diff --git a/samples/DashboardDemo/DashboardDemo.sln b/samples/DashboardDemo/DashboardDemo.sln new file mode 100644 index 0000000000..1195ca560e --- /dev/null +++ b/samples/DashboardDemo/DashboardDemo.sln @@ -0,0 +1,74 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardDemo.Domain", "src\DashboardDemo.Domain\DashboardDemo.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardDemo.Application", "src\DashboardDemo.Application\DashboardDemo.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardDemo.EntityFrameworkCore", "src\DashboardDemo.EntityFrameworkCore\DashboardDemo.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardDemo.Web", "src\DashboardDemo.Web\DashboardDemo.Web.csproj", "{068855E8-9240-4F1A-910B-CF825794513B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardDemo.Application.Tests", "test\DashboardDemo.Application.Tests\DashboardDemo.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardDemo.Web.Tests", "test\DashboardDemo.Web.Tests\DashboardDemo.Web.Tests.csproj", "{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DashboardDemo.EntityFrameworkCore.DbMigrations", "src\DashboardDemo.EntityFrameworkCore.DbMigrations\DashboardDemo.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {554AD327-6DBA-4F8F-96F8-81CE7A0C863F}.Release|Any CPU.Build.0 = Release|Any CPU + {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A94A50E-06DC-43C1-80B5-B662820EC3EB}.Release|Any CPU.Build.0 = Release|Any CPU + {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C956DD76-69C8-4A9C-83EA-D17DF83340FD}.Release|Any CPU.Build.0 = Release|Any CPU + {068855E8-9240-4F1A-910B-CF825794513B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {068855E8-9240-4F1A-910B-CF825794513B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {068855E8-9240-4F1A-910B-CF825794513B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {068855E8-9240-4F1A-910B-CF825794513B}.Release|Any CPU.Build.0 = Release|Any CPU + {50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.Build.0 = Release|Any CPU + {5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5F1B28C6-8D0C-4155-92D0-252F7EA5F674}.Release|Any CPU.Build.0 = Release|Any CPU + {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {1A94A50E-06DC-43C1-80B5-B662820EC3EB} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {068855E8-9240-4F1A-910B-CF825794513B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} + {5F1B28C6-8D0C-4155-92D0-252F7EA5F674} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} + {0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} + EndGlobalSection +EndGlobal diff --git a/samples/DashboardDemo/DashboardDemo.sln.DotSettings b/samples/DashboardDemo/DashboardDemo.sln.DotSettings new file mode 100644 index 0000000000..b89df7b544 --- /dev/null +++ b/samples/DashboardDemo/DashboardDemo.sln.DotSettings @@ -0,0 +1,7 @@ + + True + D:\github\abp\common.DotSettings + ..\..\..\common.DotSettings + True + 1 + \ No newline at end of file diff --git a/samples/DashboardDemo/common.props b/samples/DashboardDemo/common.props new file mode 100644 index 0000000000..7585f303ba --- /dev/null +++ b/samples/DashboardDemo/common.props @@ -0,0 +1,7 @@ + + + latest + 1.0.0 + $(NoWarn);CS1591 + + \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemo.Application.csproj b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemo.Application.csproj new file mode 100644 index 0000000000..9bbd573401 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemo.Application.csproj @@ -0,0 +1,18 @@ + + + + + + netcoreapp2.2 + DashboardDemo + + + + + + + + + + + diff --git a/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemoApplicationAutoMapperProfile.cs b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemoApplicationAutoMapperProfile.cs new file mode 100644 index 0000000000..4fcd9fbab3 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemoApplicationAutoMapperProfile.cs @@ -0,0 +1,12 @@ +using AutoMapper; + +namespace DashboardDemo +{ + public class DashboardDemoApplicationAutoMapperProfile : Profile + { + public DashboardDemoApplicationAutoMapperProfile() + { + //Configure your AutoMapper mapping configuration here... + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemoApplicationModule.cs b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemoApplicationModule.cs new file mode 100644 index 0000000000..afb761cce4 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Application/DashboardDemoApplicationModule.cs @@ -0,0 +1,27 @@ +using Volo.Abp.AutoMapper; +using Volo.Abp.FeatureManagement; +using Volo.Abp.Identity; +using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement; +using Volo.Abp.TenantManagement; + +namespace DashboardDemo +{ + [DependsOn( + typeof(DashboardDemoDomainModule), + typeof(AbpIdentityApplicationModule), + typeof(AbpPermissionManagementApplicationModule), + typeof(AbpTenantManagementApplicationModule), + typeof(AbpFeatureManagementApplicationModule) + )] + public class DashboardDemoApplicationModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.AddProfile(); + }); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Application/Permissions/DashboardDemoPermissionDefinitionProvider.cs b/samples/DashboardDemo/src/DashboardDemo.Application/Permissions/DashboardDemoPermissionDefinitionProvider.cs new file mode 100644 index 0000000000..07cb79194a --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Application/Permissions/DashboardDemoPermissionDefinitionProvider.cs @@ -0,0 +1,22 @@ +using DashboardDemo.Localization.DashboardDemo; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Localization; + +namespace DashboardDemo.Permissions +{ + public class DashboardDemoPermissionDefinitionProvider : PermissionDefinitionProvider + { + public override void Define(IPermissionDefinitionContext context) + { + var myGroup = context.AddGroup(DashboardDemoPermissions.GroupName); + + //Define your own permissions here. Examaple: + //myGroup.AddPermission(DashboardDemoPermissions.MyPermission1, L("Permission:MyPermission1")); + } + + private static LocalizableString L(string name) + { + return LocalizableString.Create(name); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Application/Permissions/DashboardDemoPermissions.cs b/samples/DashboardDemo/src/DashboardDemo.Application/Permissions/DashboardDemoPermissions.cs new file mode 100644 index 0000000000..3a09652db2 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Application/Permissions/DashboardDemoPermissions.cs @@ -0,0 +1,19 @@ +using System; +using Volo.Abp.Reflection; + +namespace DashboardDemo.Permissions +{ + public static class DashboardDemoPermissions + { + public const string GroupName = "DashboardDemo"; + + //Add your own permission names. Example: + //public const string MyPermission1 = GroupName + ".MyPermission1"; + + public static string[] GetAll() + { + //Return an array of all permissions + return ReflectionHelper.GetPublicConstantsRecursively(typeof(DashboardDemoPermissions)); + } + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemo.Domain.csproj b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemo.Domain.csproj new file mode 100644 index 0000000000..d036f48de2 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemo.Domain.csproj @@ -0,0 +1,25 @@ + + + + + + netcoreapp2.2 + DashboardDemo + + + + + + + + + + + + + + + + + + diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoConsts.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoConsts.cs new file mode 100644 index 0000000000..25e571159d --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoConsts.cs @@ -0,0 +1,11 @@ +namespace DashboardDemo +{ + public static class DashboardDemoConsts + { + public const string DbTablePrefix = "App"; + + public const string DbSchema = null; + + public const bool IsMultiTenancyEnabled = true; + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs new file mode 100644 index 0000000000..f101211a9a --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs @@ -0,0 +1,49 @@ +using DashboardDemo.Localization.DashboardDemo; +using Volo.Abp.Auditing; +using Volo.Abp.AuditLogging; +using Volo.Abp.BackgroundJobs; +using Volo.Abp.FeatureManagement; +using Volo.Abp.Identity; +using Volo.Abp.Localization; +using Volo.Abp.Localization.Resources.AbpValidation; +using Volo.Abp.Modularity; +using Volo.Abp.MultiTenancy; +using Volo.Abp.PermissionManagement.Identity; +using Volo.Abp.TenantManagement; +using Volo.Abp.VirtualFileSystem; + +namespace DashboardDemo +{ + [DependsOn( + typeof(AbpIdentityDomainModule), + typeof(AbpPermissionManagementDomainIdentityModule), + typeof(AbpAuditingModule), + typeof(BackgroundJobsDomainModule), + typeof(AbpAuditLoggingDomainModule), + typeof(AbpTenantManagementDomainModule), + typeof(AbpFeatureManagementDomainModule) + )] + public class DashboardDemoDomainModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.FileSets.AddEmbedded("DashboardDemo"); + }); + + Configure(options => + { + options.Resources + .Add("en") + .AddBaseTypes(typeof(AbpValidationResource)) + .AddVirtualJson("/Localization/DashboardDemo"); + }); + + Configure(options => + { + options.IsEnabled = DashboardDemoConsts.IsMultiTenancyEnabled; + }); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/DashboardDemoResource.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/DashboardDemoResource.cs new file mode 100644 index 0000000000..52f9f3cc47 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/DashboardDemoResource.cs @@ -0,0 +1,10 @@ +using Volo.Abp.Localization; + +namespace DashboardDemo.Localization.DashboardDemo +{ + [LocalizationResourceName("DashboardDemo")] + public class DashboardDemoResource + { + + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/en.json b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/en.json new file mode 100644 index 0000000000..baa9fe753e --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/en.json @@ -0,0 +1,8 @@ +{ + "culture": "en", + "texts": { + "Menu:Home": "Home", + "Welcome": "Welcome", + "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io." + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/pt-BR.json b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/pt-BR.json new file mode 100644 index 0000000000..8c818a07af --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/pt-BR.json @@ -0,0 +1,8 @@ +{ + "culture": "pt-BR", + "texts": { + "Menu:Home": "Principal", + "Welcome": "Seja bem-vindo!", + "LongWelcomeMessage": "Bem-vindo a esta aplicação. Este é um projeto inicial baseado no ABP framework. Para mais informações, visite abp.io." + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/tr.json b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/tr.json new file mode 100644 index 0000000000..5bf83ee7a8 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/tr.json @@ -0,0 +1,8 @@ +{ + "culture": "tr", + "texts": { + "Menu:Home": "Ana sayfa", + "Welcome": "Hoşgeldiniz", + "LongWelcomeMessage": "Uygulamaya hoşgeldiniz. Bu, ABP framework'ü üzerine bina edilmiş bir başlangıç projesidir. Daha fazla bilgi için abp.io adresini ziyaret edebilirsiniz." + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/zh-Hans.json b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/zh-Hans.json new file mode 100644 index 0000000000..459fc0fefd --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Localization/DashboardDemo/zh-Hans.json @@ -0,0 +1,8 @@ +{ + "culture": "zh-Hans", + "texts": { + "Menu:Home": "首页", + "Welcome": "欢迎", + "LongWelcomeMessage": "欢迎来到该应用程序. 这是一个基于ABP框架的启动项目. 有关更多信息, 请访问 cn.abp.io." + } + } \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Settings/DashboardDemoSettingDefinitionProvider.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/Settings/DashboardDemoSettingDefinitionProvider.cs new file mode 100644 index 0000000000..8ba9abccaa --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Settings/DashboardDemoSettingDefinitionProvider.cs @@ -0,0 +1,13 @@ +using Volo.Abp.Settings; + +namespace DashboardDemo.Settings +{ + public class DashboardDemoSettingDefinitionProvider : SettingDefinitionProvider + { + public override void Define(ISettingDefinitionContext context) + { + //Define your own settings here. Example: + //context.Add(new SettingDefinition(DashboardDemoSettings.MySetting1)); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Settings/DashboardDemoSettings.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/Settings/DashboardDemoSettings.cs new file mode 100644 index 0000000000..eaffcc35c6 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Settings/DashboardDemoSettings.cs @@ -0,0 +1,10 @@ +namespace DashboardDemo.Settings +{ + public static class DashboardDemoSettings + { + private const string Prefix = "DashboardDemo"; + + //Add your own setting names here. Example: + //public const string MySetting1 = Prefix + ".MySetting1"; + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs new file mode 100644 index 0000000000..4706cd08e9 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/Users/AppUser.cs @@ -0,0 +1,53 @@ +using System; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Users; + +namespace DashboardDemo.Users +{ + /* This entity shares the same table/collection ("AbpUsers" by default) with the + * IdentityUser entity of the Identity module. + * + * - You can define your custom properties into this class. + * - You never create or delete this entity, becase it is Identity module's job. + * - You can query users from database with this entity. + * - You can update values of your custom properties. + */ + public class AppUser : FullAuditedAggregateRoot, IUser + { + #region Base properties + + /* These properties are shared with the IdentityUser entity of the Identity module. + * Do not change these properties through this class. Instead, use Identity module + * services (like IdentityUserManager) to change them. + * So, this properties are designed as read only! + */ + + public virtual Guid? TenantId { get; private set; } + + public virtual string UserName { get; private set; } + + public virtual string Name { get; private set; } + + public virtual string Surname { get; private set; } + + public virtual string Email { get; private set; } + + public virtual bool EmailConfirmed { get; private set; } + + public virtual string PhoneNumber { get; private set; } + + public virtual bool PhoneNumberConfirmed { get; private set; } + + #endregion + + /* Add your own properties here. Example: + * + * public virtual string MyProperty { get; set; } + */ + + private AppUser() + { + + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/DashboardDemo.EntityFrameworkCore.DbMigrations.csproj b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/DashboardDemo.EntityFrameworkCore.DbMigrations.csproj new file mode 100644 index 0000000000..8b1fe3f5ee --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/DashboardDemo.EntityFrameworkCore.DbMigrations.csproj @@ -0,0 +1,18 @@ + + + + + + netcoreapp2.2 + DashboardDemo + + + + + + + + + + + diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContext.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContext.cs new file mode 100644 index 0000000000..03ed1a2d3d --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContext.cs @@ -0,0 +1,46 @@ +using Microsoft.EntityFrameworkCore; +using Volo.Abp.AuditLogging.EntityFrameworkCore; +using Volo.Abp.BackgroundJobs.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.Identity; +using Volo.Abp.Identity.EntityFrameworkCore; +using Volo.Abp.PermissionManagement.EntityFrameworkCore; +using Volo.Abp.SettingManagement.EntityFrameworkCore; +using Volo.Abp.TenantManagement.EntityFrameworkCore; + +namespace DashboardDemo.EntityFrameworkCore +{ + public class DashboardDemoMigrationsDbContext : AbpDbContext + { + public DashboardDemoMigrationsDbContext(DbContextOptions options) + : base(options) + { + + } + + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + + /* Include modules to your migration db context */ + + builder.ConfigurePermissionManagement(); + builder.ConfigureSettingManagement(); + builder.ConfigureBackgroundJobs(); + builder.ConfigureAuditLogging(); + builder.ConfigureIdentity(); + builder.ConfigureTenantManagement(); + + /* Configure customizations for entities from the modules included */ + + builder.Entity(b => + { + b.ConfigureCustomUserProperties(); + }); + + /* Configure your own tables/entities inside the ConfigureDashboardDemo method */ + + builder.ConfigureDashboardDemo(); + } + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs new file mode 100644 index 0000000000..b894e405bc --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs @@ -0,0 +1,29 @@ +using System.IO; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; +using Microsoft.Extensions.Configuration; + +namespace DashboardDemo.EntityFrameworkCore +{ + public class DashboardDemoMigrationsDbContextFactory : IDesignTimeDbContextFactory + { + public DashboardDemoMigrationsDbContext CreateDbContext(string[] args) + { + var configuration = BuildConfiguration(); + + var builder = new DbContextOptionsBuilder() + .UseSqlServer(configuration.GetConnectionString("Default")); + + return new DashboardDemoMigrationsDbContext(builder.Options); + } + + private static IConfigurationRoot BuildConfiguration() + { + var builder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", optional: false); + + return builder.Build(); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.Designer.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.Designer.cs new file mode 100644 index 0000000000..8c4848b563 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.Designer.cs @@ -0,0 +1,760 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using DashboardDemo.EntityFrameworkCore; + +namespace DashboardDemo.Migrations +{ + [DbContext(typeof(DashboardDemoMigrationsDbContext))] + [Migration("20190402131334_Initial")] + partial class Initial + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.0-rtm-35687") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ApplicationName") + .HasColumnName("ApplicationName") + .HasMaxLength(96); + + b.Property("BrowserInfo") + .HasColumnName("BrowserInfo") + .HasMaxLength(512); + + b.Property("ClientId") + .HasColumnName("ClientId") + .HasMaxLength(64); + + b.Property("ClientIpAddress") + .HasColumnName("ClientIpAddress") + .HasMaxLength(64); + + b.Property("ClientName") + .HasColumnName("ClientName") + .HasMaxLength(128); + + b.Property("Comments") + .HasColumnName("Comments") + .HasMaxLength(256); + + b.Property("ConcurrencyStamp"); + + b.Property("CorrelationId") + .HasColumnName("CorrelationId") + .HasMaxLength(64); + + b.Property("Exceptions") + .HasColumnName("Exceptions") + .HasMaxLength(4000); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration"); + + b.Property("ExecutionTime"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("HttpMethod") + .HasColumnName("HttpMethod") + .HasMaxLength(16); + + b.Property("HttpStatusCode") + .HasColumnName("HttpStatusCode"); + + b.Property("ImpersonatorTenantId") + .HasColumnName("ImpersonatorTenantId"); + + b.Property("ImpersonatorUserId") + .HasColumnName("ImpersonatorUserId"); + + b.Property("TenantId") + .HasColumnName("TenantId"); + + b.Property("TenantName"); + + b.Property("Url") + .HasColumnName("Url") + .HasMaxLength(256); + + b.Property("UserId") + .HasColumnName("UserId"); + + b.Property("UserName") + .HasColumnName("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "ExecutionTime"); + + b.HasIndex("TenantId", "UserId", "ExecutionTime"); + + b.ToTable("AbpAuditLogs"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId"); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration"); + + b.Property("ExecutionTime") + .HasColumnName("ExecutionTime"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("MethodName") + .HasColumnName("MethodName") + .HasMaxLength(128); + + b.Property("Parameters") + .HasColumnName("Parameters") + .HasMaxLength(2000); + + b.Property("ServiceName") + .HasColumnName("ServiceName") + .HasMaxLength(256); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); + + b.ToTable("AbpAuditLogActions"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId"); + + b.Property("ChangeTime") + .HasColumnName("ChangeTime"); + + b.Property("ChangeType") + .HasColumnName("ChangeType"); + + b.Property("EntityId") + .IsRequired() + .HasColumnName("EntityId") + .HasMaxLength(128); + + b.Property("EntityTenantId"); + + b.Property("EntityTypeFullName") + .IsRequired() + .HasColumnName("EntityTypeFullName") + .HasMaxLength(128); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("TenantId") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); + + b.ToTable("AbpEntityChanges"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("EntityChangeId"); + + b.Property("NewValue") + .HasColumnName("NewValue") + .HasMaxLength(512); + + b.Property("OriginalValue") + .HasColumnName("OriginalValue") + .HasMaxLength(512); + + b.Property("PropertyName") + .IsRequired() + .HasColumnName("PropertyName") + .HasMaxLength(128); + + b.Property("PropertyTypeFullName") + .IsRequired() + .HasColumnName("PropertyTypeFullName") + .HasMaxLength(64); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeId"); + + b.ToTable("AbpEntityPropertyChanges"); + }); + + modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnName("CreationTime"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsAbandoned") + .ValueGeneratedOnAdd() + .HasDefaultValue(false); + + b.Property("JobArgs") + .IsRequired() + .HasMaxLength(1048576); + + b.Property("JobName") + .IsRequired() + .HasMaxLength(128); + + b.Property("LastTryTime"); + + b.Property("NextTryTime"); + + b.Property("Priority") + .ValueGeneratedOnAdd() + .HasDefaultValue((byte)15); + + b.Property("TryCount") + .ValueGeneratedOnAdd() + .HasDefaultValue((short)0); + + b.HasKey("Id"); + + b.HasIndex("IsAbandoned", "NextTryTime"); + + b.ToTable("AbpBackgroundJobs"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("Description") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("Regex") + .HasMaxLength(512); + + b.Property("RegexDescription") + .HasMaxLength(128); + + b.Property("Required"); + + b.Property("ValueType"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDefault") + .HasColumnName("IsDefault"); + + b.Property("IsPublic") + .HasColumnName("IsPublic"); + + b.Property("IsStatic") + .HasColumnName("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(256); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasMaxLength(1024); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnName("AccessFailedCount") + .HasDefaultValue(0); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime"); + + b.Property("Email") + .HasColumnName("Email") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("EmailConfirmed") + .HasDefaultValue(false); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("LockoutEnabled") + .HasDefaultValue(false); + + b.Property("LockoutEnd"); + + b.Property("Name") + .HasColumnName("Name") + .HasMaxLength(64); + + b.Property("NormalizedEmail") + .HasColumnName("NormalizedEmail") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasColumnName("NormalizedUserName") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnName("PasswordHash") + .HasMaxLength(256); + + b.Property("PhoneNumber") + .HasColumnName("PhoneNumber") + .HasMaxLength(16); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("PhoneNumberConfirmed") + .HasDefaultValue(false); + + b.Property("SecurityStamp") + .IsRequired() + .HasColumnName("SecurityStamp") + .HasMaxLength(256); + + b.Property("Surname") + .HasColumnName("Surname") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("TwoFactorEnabled") + .HasDefaultValue(false); + + b.Property("UserName") + .IsRequired() + .HasColumnName("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasMaxLength(1024); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(64); + + b.Property("ProviderDisplayName") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(196); + + b.Property("TenantId"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(64); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("TenantId"); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(64); + + b.Property("ProviderName") + .IsRequired() + .HasMaxLength(64); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpPermissionGrants"); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasMaxLength(2048); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpSettings"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(64); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpTenants"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.Property("TenantId"); + + b.Property("Name") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasMaxLength(1024); + + b.HasKey("TenantId", "Name"); + + b.ToTable("AbpTenantConnectionStrings"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog") + .WithMany("Actions") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog") + .WithMany("EntityChanges") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.EntityChange") + .WithMany("PropertyChanges") + .HasForeignKey("EntityChangeId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole") + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.HasOne("Volo.Abp.TenantManagement.Tenant") + .WithMany("ConnectionStrings") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.cs new file mode 100644 index 0000000000..f6b5519820 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20190402131334_Initial.cs @@ -0,0 +1,546 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace DashboardDemo.Migrations +{ + public partial class Initial : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AbpAuditLogs", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + ApplicationName = table.Column(maxLength: 96, nullable: true), + UserId = table.Column(nullable: true), + UserName = table.Column(maxLength: 256, nullable: true), + TenantId = table.Column(nullable: true), + TenantName = table.Column(nullable: true), + ImpersonatorUserId = table.Column(nullable: true), + ImpersonatorTenantId = table.Column(nullable: true), + ExecutionTime = table.Column(nullable: false), + ExecutionDuration = table.Column(nullable: false), + ClientIpAddress = table.Column(maxLength: 64, nullable: true), + ClientName = table.Column(maxLength: 128, nullable: true), + ClientId = table.Column(maxLength: 64, nullable: true), + CorrelationId = table.Column(maxLength: 64, nullable: true), + BrowserInfo = table.Column(maxLength: 512, nullable: true), + HttpMethod = table.Column(maxLength: 16, nullable: true), + Url = table.Column(maxLength: 256, nullable: true), + Exceptions = table.Column(maxLength: 4000, nullable: true), + Comments = table.Column(maxLength: 256, nullable: true), + HttpStatusCode = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpAuditLogs", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpBackgroundJobs", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + JobName = table.Column(maxLength: 128, nullable: false), + JobArgs = table.Column(maxLength: 1048576, nullable: false), + TryCount = table.Column(nullable: false, defaultValue: (short)0), + CreationTime = table.Column(nullable: false), + NextTryTime = table.Column(nullable: false), + LastTryTime = table.Column(nullable: true), + IsAbandoned = table.Column(nullable: false, defaultValue: false), + Priority = table.Column(nullable: false, defaultValue: (byte)15) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpBackgroundJobs", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpClaimTypes", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(maxLength: 256, nullable: false), + Name = table.Column(maxLength: 256, nullable: false), + Required = table.Column(nullable: false), + IsStatic = table.Column(nullable: false), + Regex = table.Column(maxLength: 512, nullable: true), + RegexDescription = table.Column(maxLength: 128, nullable: true), + Description = table.Column(maxLength: 256, nullable: true), + ValueType = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpClaimTypes", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpPermissionGrants", + columns: table => new + { + Id = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + Name = table.Column(maxLength: 128, nullable: false), + ProviderName = table.Column(maxLength: 64, nullable: false), + ProviderKey = table.Column(maxLength: 64, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpPermissionGrants", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpRoles", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(maxLength: 256, nullable: false), + TenantId = table.Column(nullable: true), + Name = table.Column(maxLength: 256, nullable: false), + NormalizedName = table.Column(maxLength: 256, nullable: false), + IsDefault = table.Column(nullable: false), + IsStatic = table.Column(nullable: false), + IsPublic = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpRoles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpSettings", + columns: table => new + { + Id = table.Column(nullable: false), + Name = table.Column(maxLength: 128, nullable: false), + Value = table.Column(maxLength: 2048, nullable: false), + ProviderName = table.Column(maxLength: 64, nullable: true), + ProviderKey = table.Column(maxLength: 64, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpSettings", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpTenants", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + CreationTime = table.Column(nullable: false), + CreatorId = table.Column(nullable: true), + LastModificationTime = table.Column(nullable: true), + LastModifierId = table.Column(nullable: true), + IsDeleted = table.Column(nullable: false, defaultValue: false), + DeleterId = table.Column(nullable: true), + DeletionTime = table.Column(nullable: true), + Name = table.Column(maxLength: 64, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpTenants", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpUsers", + columns: table => new + { + Id = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true), + ConcurrencyStamp = table.Column(nullable: true), + CreationTime = table.Column(nullable: false), + CreatorId = table.Column(nullable: true), + LastModificationTime = table.Column(nullable: true), + LastModifierId = table.Column(nullable: true), + IsDeleted = table.Column(nullable: false, defaultValue: false), + DeleterId = table.Column(nullable: true), + DeletionTime = table.Column(nullable: true), + TenantId = table.Column(nullable: true), + UserName = table.Column(maxLength: 256, nullable: false), + NormalizedUserName = table.Column(maxLength: 256, nullable: false), + Name = table.Column(maxLength: 64, nullable: true), + Surname = table.Column(maxLength: 64, nullable: true), + Email = table.Column(maxLength: 256, nullable: true), + NormalizedEmail = table.Column(maxLength: 256, nullable: true), + EmailConfirmed = table.Column(nullable: false, defaultValue: false), + PasswordHash = table.Column(maxLength: 256, nullable: true), + SecurityStamp = table.Column(maxLength: 256, nullable: false), + PhoneNumber = table.Column(maxLength: 16, nullable: true), + PhoneNumberConfirmed = table.Column(nullable: false, defaultValue: false), + TwoFactorEnabled = table.Column(nullable: false, defaultValue: false), + LockoutEnd = table.Column(nullable: true), + LockoutEnabled = table.Column(nullable: false, defaultValue: false), + AccessFailedCount = table.Column(nullable: false, defaultValue: 0) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUsers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AbpAuditLogActions", + columns: table => new + { + Id = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + AuditLogId = table.Column(nullable: false), + ServiceName = table.Column(maxLength: 256, nullable: true), + MethodName = table.Column(maxLength: 128, nullable: true), + Parameters = table.Column(maxLength: 2000, nullable: true), + ExecutionTime = table.Column(nullable: false), + ExecutionDuration = table.Column(nullable: false), + ExtraProperties = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpAuditLogActions", x => x.Id); + table.ForeignKey( + name: "FK_AbpAuditLogActions_AbpAuditLogs_AuditLogId", + column: x => x.AuditLogId, + principalTable: "AbpAuditLogs", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpEntityChanges", + columns: table => new + { + Id = table.Column(nullable: false), + AuditLogId = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + ChangeTime = table.Column(nullable: false), + ChangeType = table.Column(nullable: false), + EntityTenantId = table.Column(nullable: true), + EntityId = table.Column(maxLength: 128, nullable: false), + EntityTypeFullName = table.Column(maxLength: 128, nullable: false), + ExtraProperties = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpEntityChanges", x => x.Id); + table.ForeignKey( + name: "FK_AbpEntityChanges_AbpAuditLogs_AuditLogId", + column: x => x.AuditLogId, + principalTable: "AbpAuditLogs", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpRoleClaims", + columns: table => new + { + Id = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + ClaimType = table.Column(maxLength: 256, nullable: false), + ClaimValue = table.Column(maxLength: 1024, nullable: true), + RoleId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpRoleClaims", x => x.Id); + table.ForeignKey( + name: "FK_AbpRoleClaims_AbpRoles_RoleId", + column: x => x.RoleId, + principalTable: "AbpRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpTenantConnectionStrings", + columns: table => new + { + TenantId = table.Column(nullable: false), + Name = table.Column(maxLength: 64, nullable: false), + Value = table.Column(maxLength: 1024, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpTenantConnectionStrings", x => new { x.TenantId, x.Name }); + table.ForeignKey( + name: "FK_AbpTenantConnectionStrings_AbpTenants_TenantId", + column: x => x.TenantId, + principalTable: "AbpTenants", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpUserClaims", + columns: table => new + { + Id = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + ClaimType = table.Column(maxLength: 256, nullable: false), + ClaimValue = table.Column(maxLength: 1024, nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUserClaims", x => x.Id); + table.ForeignKey( + name: "FK_AbpUserClaims_AbpUsers_UserId", + column: x => x.UserId, + principalTable: "AbpUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpUserLogins", + columns: table => new + { + UserId = table.Column(nullable: false), + LoginProvider = table.Column(maxLength: 64, nullable: false), + TenantId = table.Column(nullable: true), + ProviderKey = table.Column(maxLength: 196, nullable: false), + ProviderDisplayName = table.Column(maxLength: 128, nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUserLogins", x => new { x.UserId, x.LoginProvider }); + table.ForeignKey( + name: "FK_AbpUserLogins_AbpUsers_UserId", + column: x => x.UserId, + principalTable: "AbpUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpUserRoles", + columns: table => new + { + UserId = table.Column(nullable: false), + RoleId = table.Column(nullable: false), + TenantId = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUserRoles", x => new { x.UserId, x.RoleId }); + table.ForeignKey( + name: "FK_AbpUserRoles_AbpRoles_RoleId", + column: x => x.RoleId, + principalTable: "AbpRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AbpUserRoles_AbpUsers_UserId", + column: x => x.UserId, + principalTable: "AbpUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpUserTokens", + columns: table => new + { + UserId = table.Column(nullable: false), + LoginProvider = table.Column(maxLength: 64, nullable: false), + Name = table.Column(maxLength: 128, nullable: false), + TenantId = table.Column(nullable: true), + Value = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); + table.ForeignKey( + name: "FK_AbpUserTokens_AbpUsers_UserId", + column: x => x.UserId, + principalTable: "AbpUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AbpEntityPropertyChanges", + columns: table => new + { + Id = table.Column(nullable: false), + TenantId = table.Column(nullable: true), + EntityChangeId = table.Column(nullable: false), + NewValue = table.Column(maxLength: 512, nullable: true), + OriginalValue = table.Column(maxLength: 512, nullable: true), + PropertyName = table.Column(maxLength: 128, nullable: false), + PropertyTypeFullName = table.Column(maxLength: 64, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpEntityPropertyChanges", x => x.Id); + table.ForeignKey( + name: "FK_AbpEntityPropertyChanges_AbpEntityChanges_EntityChangeId", + column: x => x.EntityChangeId, + principalTable: "AbpEntityChanges", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_AbpAuditLogActions_AuditLogId", + table: "AbpAuditLogActions", + column: "AuditLogId"); + + migrationBuilder.CreateIndex( + name: "IX_AbpAuditLogActions_TenantId_ServiceName_MethodName_ExecutionTime", + table: "AbpAuditLogActions", + columns: new[] { "TenantId", "ServiceName", "MethodName", "ExecutionTime" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpAuditLogs_TenantId_ExecutionTime", + table: "AbpAuditLogs", + columns: new[] { "TenantId", "ExecutionTime" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpAuditLogs_TenantId_UserId_ExecutionTime", + table: "AbpAuditLogs", + columns: new[] { "TenantId", "UserId", "ExecutionTime" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpBackgroundJobs_IsAbandoned_NextTryTime", + table: "AbpBackgroundJobs", + columns: new[] { "IsAbandoned", "NextTryTime" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpEntityChanges_AuditLogId", + table: "AbpEntityChanges", + column: "AuditLogId"); + + migrationBuilder.CreateIndex( + name: "IX_AbpEntityChanges_TenantId_EntityTypeFullName_EntityId", + table: "AbpEntityChanges", + columns: new[] { "TenantId", "EntityTypeFullName", "EntityId" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpEntityPropertyChanges_EntityChangeId", + table: "AbpEntityPropertyChanges", + column: "EntityChangeId"); + + migrationBuilder.CreateIndex( + name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey", + table: "AbpPermissionGrants", + columns: new[] { "Name", "ProviderName", "ProviderKey" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpRoleClaims_RoleId", + table: "AbpRoleClaims", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "IX_AbpRoles_NormalizedName", + table: "AbpRoles", + column: "NormalizedName"); + + migrationBuilder.CreateIndex( + name: "IX_AbpSettings_Name_ProviderName_ProviderKey", + table: "AbpSettings", + columns: new[] { "Name", "ProviderName", "ProviderKey" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpTenants_Name", + table: "AbpTenants", + column: "Name", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_AbpUserClaims_UserId", + table: "AbpUserClaims", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AbpUserLogins_LoginProvider_ProviderKey", + table: "AbpUserLogins", + columns: new[] { "LoginProvider", "ProviderKey" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpUserRoles_RoleId_UserId", + table: "AbpUserRoles", + columns: new[] { "RoleId", "UserId" }); + + migrationBuilder.CreateIndex( + name: "IX_AbpUsers_Email", + table: "AbpUsers", + column: "Email"); + + migrationBuilder.CreateIndex( + name: "IX_AbpUsers_NormalizedEmail", + table: "AbpUsers", + column: "NormalizedEmail"); + + migrationBuilder.CreateIndex( + name: "IX_AbpUsers_NormalizedUserName", + table: "AbpUsers", + column: "NormalizedUserName"); + + migrationBuilder.CreateIndex( + name: "IX_AbpUsers_UserName", + table: "AbpUsers", + column: "UserName"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AbpAuditLogActions"); + + migrationBuilder.DropTable( + name: "AbpBackgroundJobs"); + + migrationBuilder.DropTable( + name: "AbpClaimTypes"); + + migrationBuilder.DropTable( + name: "AbpEntityPropertyChanges"); + + migrationBuilder.DropTable( + name: "AbpPermissionGrants"); + + migrationBuilder.DropTable( + name: "AbpRoleClaims"); + + migrationBuilder.DropTable( + name: "AbpSettings"); + + migrationBuilder.DropTable( + name: "AbpTenantConnectionStrings"); + + migrationBuilder.DropTable( + name: "AbpUserClaims"); + + migrationBuilder.DropTable( + name: "AbpUserLogins"); + + migrationBuilder.DropTable( + name: "AbpUserRoles"); + + migrationBuilder.DropTable( + name: "AbpUserTokens"); + + migrationBuilder.DropTable( + name: "AbpEntityChanges"); + + migrationBuilder.DropTable( + name: "AbpTenants"); + + migrationBuilder.DropTable( + name: "AbpRoles"); + + migrationBuilder.DropTable( + name: "AbpUsers"); + + migrationBuilder.DropTable( + name: "AbpAuditLogs"); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/DashboardDemoMigrationsDbContextModelSnapshot.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/DashboardDemoMigrationsDbContextModelSnapshot.cs new file mode 100644 index 0000000000..a178562944 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/DashboardDemoMigrationsDbContextModelSnapshot.cs @@ -0,0 +1,758 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using DashboardDemo.EntityFrameworkCore; + +namespace DashboardDemo.Migrations +{ + [DbContext(typeof(DashboardDemoMigrationsDbContext))] + partial class DashboardDemoMigrationsDbContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.0-rtm-35687") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ApplicationName") + .HasColumnName("ApplicationName") + .HasMaxLength(96); + + b.Property("BrowserInfo") + .HasColumnName("BrowserInfo") + .HasMaxLength(512); + + b.Property("ClientId") + .HasColumnName("ClientId") + .HasMaxLength(64); + + b.Property("ClientIpAddress") + .HasColumnName("ClientIpAddress") + .HasMaxLength(64); + + b.Property("ClientName") + .HasColumnName("ClientName") + .HasMaxLength(128); + + b.Property("Comments") + .HasColumnName("Comments") + .HasMaxLength(256); + + b.Property("ConcurrencyStamp"); + + b.Property("CorrelationId") + .HasColumnName("CorrelationId") + .HasMaxLength(64); + + b.Property("Exceptions") + .HasColumnName("Exceptions") + .HasMaxLength(4000); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration"); + + b.Property("ExecutionTime"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("HttpMethod") + .HasColumnName("HttpMethod") + .HasMaxLength(16); + + b.Property("HttpStatusCode") + .HasColumnName("HttpStatusCode"); + + b.Property("ImpersonatorTenantId") + .HasColumnName("ImpersonatorTenantId"); + + b.Property("ImpersonatorUserId") + .HasColumnName("ImpersonatorUserId"); + + b.Property("TenantId") + .HasColumnName("TenantId"); + + b.Property("TenantName"); + + b.Property("Url") + .HasColumnName("Url") + .HasMaxLength(256); + + b.Property("UserId") + .HasColumnName("UserId"); + + b.Property("UserName") + .HasColumnName("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "ExecutionTime"); + + b.HasIndex("TenantId", "UserId", "ExecutionTime"); + + b.ToTable("AbpAuditLogs"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId"); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration"); + + b.Property("ExecutionTime") + .HasColumnName("ExecutionTime"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("MethodName") + .HasColumnName("MethodName") + .HasMaxLength(128); + + b.Property("Parameters") + .HasColumnName("Parameters") + .HasMaxLength(2000); + + b.Property("ServiceName") + .HasColumnName("ServiceName") + .HasMaxLength(256); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); + + b.ToTable("AbpAuditLogActions"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId"); + + b.Property("ChangeTime") + .HasColumnName("ChangeTime"); + + b.Property("ChangeType") + .HasColumnName("ChangeType"); + + b.Property("EntityId") + .IsRequired() + .HasColumnName("EntityId") + .HasMaxLength(128); + + b.Property("EntityTenantId"); + + b.Property("EntityTypeFullName") + .IsRequired() + .HasColumnName("EntityTypeFullName") + .HasMaxLength(128); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("TenantId") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); + + b.ToTable("AbpEntityChanges"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("EntityChangeId"); + + b.Property("NewValue") + .HasColumnName("NewValue") + .HasMaxLength(512); + + b.Property("OriginalValue") + .HasColumnName("OriginalValue") + .HasMaxLength(512); + + b.Property("PropertyName") + .IsRequired() + .HasColumnName("PropertyName") + .HasMaxLength(128); + + b.Property("PropertyTypeFullName") + .IsRequired() + .HasColumnName("PropertyTypeFullName") + .HasMaxLength(64); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeId"); + + b.ToTable("AbpEntityPropertyChanges"); + }); + + modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnName("CreationTime"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsAbandoned") + .ValueGeneratedOnAdd() + .HasDefaultValue(false); + + b.Property("JobArgs") + .IsRequired() + .HasMaxLength(1048576); + + b.Property("JobName") + .IsRequired() + .HasMaxLength(128); + + b.Property("LastTryTime"); + + b.Property("NextTryTime"); + + b.Property("Priority") + .ValueGeneratedOnAdd() + .HasDefaultValue((byte)15); + + b.Property("TryCount") + .ValueGeneratedOnAdd() + .HasDefaultValue((short)0); + + b.HasKey("Id"); + + b.HasIndex("IsAbandoned", "NextTryTime"); + + b.ToTable("AbpBackgroundJobs"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("Description") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("Regex") + .HasMaxLength(512); + + b.Property("RegexDescription") + .HasMaxLength(128); + + b.Property("Required"); + + b.Property("ValueType"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDefault") + .HasColumnName("IsDefault"); + + b.Property("IsPublic") + .HasColumnName("IsPublic"); + + b.Property("IsStatic") + .HasColumnName("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(256); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasMaxLength(1024); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnName("AccessFailedCount") + .HasDefaultValue(0); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime"); + + b.Property("Email") + .HasColumnName("Email") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("EmailConfirmed") + .HasDefaultValue(false); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("LockoutEnabled") + .HasDefaultValue(false); + + b.Property("LockoutEnd"); + + b.Property("Name") + .HasColumnName("Name") + .HasMaxLength(64); + + b.Property("NormalizedEmail") + .HasColumnName("NormalizedEmail") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasColumnName("NormalizedUserName") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnName("PasswordHash") + .HasMaxLength(256); + + b.Property("PhoneNumber") + .HasColumnName("PhoneNumber") + .HasMaxLength(16); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("PhoneNumberConfirmed") + .HasDefaultValue(false); + + b.Property("SecurityStamp") + .IsRequired() + .HasColumnName("SecurityStamp") + .HasMaxLength(256); + + b.Property("Surname") + .HasColumnName("Surname") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("TwoFactorEnabled") + .HasDefaultValue(false); + + b.Property("UserName") + .IsRequired() + .HasColumnName("UserName") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasMaxLength(1024); + + b.Property("TenantId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(64); + + b.Property("ProviderDisplayName") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(196); + + b.Property("TenantId"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.Property("TenantId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider") + .HasMaxLength(64); + + b.Property("Name") + .HasMaxLength(128); + + b.Property("TenantId"); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(64); + + b.Property("ProviderName") + .IsRequired() + .HasMaxLength(64); + + b.Property("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpPermissionGrants"); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasMaxLength(2048); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpSettings"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(64); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpTenants"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.Property("TenantId"); + + b.Property("Name") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasMaxLength(1024); + + b.HasKey("TenantId", "Name"); + + b.ToTable("AbpTenantConnectionStrings"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog") + .WithMany("Actions") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog") + .WithMany("EntityChanges") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.EntityChange") + .WithMany("PropertyChanges") + .HasForeignKey("EntityChangeId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole") + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser") + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.HasOne("Volo.Abp.TenantManagement.Tenant") + .WithMany("ConnectionStrings") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/DashboardDemo.EntityFrameworkCore.csproj b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/DashboardDemo.EntityFrameworkCore.csproj new file mode 100644 index 0000000000..8d992ddba2 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/DashboardDemo.EntityFrameworkCore.csproj @@ -0,0 +1,22 @@ + + + + + + netcoreapp2.2 + DashboardDemo + + + + + + + + + + + + + + + diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs new file mode 100644 index 0000000000..ad4ef4af33 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContext.cs @@ -0,0 +1,45 @@ +using Microsoft.EntityFrameworkCore; +using DashboardDemo.Users; +using Volo.Abp.Data; +using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore.Modeling; +using Volo.Abp.Users.EntityFrameworkCore; + +namespace DashboardDemo.EntityFrameworkCore +{ + [ConnectionStringName("Default")] + public class DashboardDemoDbContext : AbpDbContext + { + public DbSet Users { get; set; } + + public DashboardDemoDbContext(DbContextOptions options) + : base(options) + { + + } + + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + + /* Configure the shared tables (with included modules) here */ + + builder.Entity(b => + { + b.ToTable("AbpUsers"); //Sharing the same table "AbpUsers" with the IdentityUser + + b.ConfigureFullAudited(); + b.ConfigureExtraProperties(); + b.ConfigureConcurrencyStamp(); + b.ConfigureAbpUser(); + + //Moved customization to a method so we can share it with the DashboardDemoMigrationsDbContext class + b.ConfigureCustomUserProperties(); + }); + + /* Configure your own tables/entities inside the ConfigureDashboardDemo method */ + + builder.ConfigureDashboardDemo(); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContextModelCreatingExtensions.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContextModelCreatingExtensions.cs new file mode 100644 index 0000000000..60dae7c4cf --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoDbContextModelCreatingExtensions.cs @@ -0,0 +1,30 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Volo.Abp; +using Volo.Abp.Users; + +namespace DashboardDemo.EntityFrameworkCore +{ + public static class DashboardDemoDbContextModelCreatingExtensions + { + public static void ConfigureDashboardDemo(this ModelBuilder builder) + { + Check.NotNull(builder, nameof(builder)); + + /* Configure your own tables/entities inside here */ + + //builder.Entity(b => + //{ + // b.ToTable(DashboardDemoConsts.DbTablePrefix + "YourEntities", DashboardDemoConsts.DbSchema); + + // //... + //}); + } + + public static void ConfigureCustomUserProperties(this EntityTypeBuilder b) + where TUser: class, IUser + { + //b.Property(nameof(AppUser.MyProperty))... + } + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs new file mode 100644 index 0000000000..cd7e6f4af8 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs @@ -0,0 +1,36 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AuditLogging.EntityFrameworkCore; +using Volo.Abp.BackgroundJobs.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore.SqlServer; +using Volo.Abp.FeatureManagement.EntityFrameworkCore; +using Volo.Abp.Identity.EntityFrameworkCore; +using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement.EntityFrameworkCore; +using Volo.Abp.SettingManagement.EntityFrameworkCore; +using Volo.Abp.TenantManagement.EntityFrameworkCore; + +namespace DashboardDemo.EntityFrameworkCore +{ + [DependsOn( + typeof(DashboardDemoDomainModule), + typeof(AbpIdentityEntityFrameworkCoreModule), + typeof(AbpPermissionManagementEntityFrameworkCoreModule), + typeof(AbpSettingManagementEntityFrameworkCoreModule), + typeof(AbpEntityFrameworkCoreSqlServerModule), + typeof(BackgroundJobsEntityFrameworkCoreModule), + typeof(AbpAuditLoggingEntityFrameworkCoreModule), + typeof(AbpTenantManagementEntityFrameworkCoreModule), + typeof(AbpFeatureManagementEntityFrameworkCoreModule) + )] + public class DashboardDemoEntityFrameworkCoreModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddAbpDbContext(options => + { + //Remove "includeAllEntities: true" to create default repositories only for aggregate roots + options.AddDefaultRepositories(includeAllEntities: true); + }); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Branding/DashboardDemoBrandingProvider.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Branding/DashboardDemoBrandingProvider.cs new file mode 100644 index 0000000000..78b9c57452 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Branding/DashboardDemoBrandingProvider.cs @@ -0,0 +1,11 @@ +using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; +using Volo.Abp.DependencyInjection; + +namespace DashboardDemo.Branding +{ + [Dependency(ReplaceServices = true)] + public class DashboardDemoBrandingProvider : DefaultBrandingProvider + { + public override string AppName => "DashboardDemo"; + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj new file mode 100644 index 0000000000..3e161e4f5c --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj @@ -0,0 +1,42 @@ + + + + + + netcoreapp2.2 + DashboardDemo + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + true + true + true + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebAutoMapperProfile.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebAutoMapperProfile.cs new file mode 100644 index 0000000000..1d8ed11487 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebAutoMapperProfile.cs @@ -0,0 +1,12 @@ +using AutoMapper; + +namespace DashboardDemo +{ + public class DashboardDemoWebAutoMapperProfile : Profile + { + public DashboardDemoWebAutoMapperProfile() + { + //Configure your AutoMapper mapping configuration here... + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs new file mode 100644 index 0000000000..abf9653cef --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -0,0 +1,203 @@ +using System.IO; +using System.Linq; +using Localization.Resources.AbpUi; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using DashboardDemo.EntityFrameworkCore; +using DashboardDemo.Localization.DashboardDemo; +using DashboardDemo.Menus; +using DashboardDemo.Permissions; +using Swashbuckle.AspNetCore.Swagger; +using Volo.Abp; +using Volo.Abp.Account.Web; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.Localization; +using Volo.Abp.AspNetCore.Mvc.UI; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; +using Volo.Abp.AspNetCore.Mvc.UI.Dashboards; +using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Autofac; +using Volo.Abp.AutoMapper; +using Volo.Abp.Data; +using Volo.Abp.Identity; +using Volo.Abp.Identity.Web; +using Volo.Abp.Localization; +using Volo.Abp.Localization.Resources.AbpValidation; +using Volo.Abp.Modularity; +using Volo.Abp.PermissionManagement.Web; +using Volo.Abp.Threading; +using Volo.Abp.UI; +using Volo.Abp.UI.Navigation; +using Volo.Abp.VirtualFileSystem; +using Volo.Abp.PermissionManagement; +using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.TenantManagement.Web; + + +namespace DashboardDemo +{ + [DependsOn( + typeof(DashboardDemoApplicationModule), + typeof(DashboardDemoEntityFrameworkCoreModule), + typeof(AbpAutofacModule), + typeof(AbpIdentityWebModule), + typeof(AbpAccountWebModule), + typeof(AbpAspNetCoreMvcUiBasicThemeModule), + typeof(AbpAspNetCoreMvcUiDashboardsModule), + typeof(AbpTenantManagementWebModule) + )] + public class DashboardDemoWebModule : AbpModule + { + public override void PreConfigureServices(ServiceConfigurationContext context) + { + context.Services.PreConfigure(options => + { + options.AddAssemblyResource( + typeof(DashboardDemoResource), + typeof(DashboardDemoDomainModule).Assembly, + typeof(DashboardDemoApplicationModule).Assembly, + typeof(DashboardDemoWebModule).Assembly + ); + }); + } + + public override void ConfigureServices(ServiceConfigurationContext context) + { + var hostingEnvironment = context.Services.GetHostingEnvironment(); + var configuration = context.Services.GetConfiguration(); + + ConfigureDatabaseServices(); + ConfigureAutoMapper(); + ConfigureVirtualFileSystem(hostingEnvironment); + ConfigureLocalizationServices(); + ConfigureNavigationServices(); + ConfigureAutoApiControllers(); + ConfigureSwaggerServices(context.Services); + } + + private void ConfigureDatabaseServices() + { + Configure(options => + { + options.UseSqlServer(); + }); + } + + private void ConfigureAutoMapper() + { + Configure(options => + { + options.AddProfile(); + }); + } + + private void ConfigureVirtualFileSystem(IHostingEnvironment hostingEnvironment) + { + if (hostingEnvironment.IsDevelopment()) + { + Configure(options => + { + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}DashboardDemo.Domain", Path.DirectorySeparatorChar))); + }); + } + } + + private void ConfigureLocalizationServices() + { + Configure(options => + { + options.Resources + .Get() + .AddBaseTypes( + typeof(AbpValidationResource), + typeof(AbpUiResource) + ); + + options.Languages.Add(new LanguageInfo("en", "en", "English")); + options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); + options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe")); + options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文")); + }); + } + + private void ConfigureNavigationServices() + { + Configure(options => + { + options.MenuContributors.Add(new DashboardDemoMenuContributor()); + }); + } + + private void ConfigureAutoApiControllers() + { + Configure(options => + { + options.ConventionalControllers.Create(typeof(DashboardDemoApplicationModule).Assembly); + }); + } + + private void ConfigureSwaggerServices(IServiceCollection services) + { + services.AddSwaggerGen( + options => + { + options.SwaggerDoc("v1", new Info { Title = "DashboardDemo API", Version = "v1" }); + options.DocInclusionPredicate((docName, description) => true); + options.CustomSchemaIds(type => type.FullName); + }); + } + + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + var app = context.GetApplicationBuilder(); + var env = context.GetEnvironment(); + + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + else + { + app.UseErrorPage(); + } + + app.UseVirtualFiles(); + app.UseAuthentication(); + + if (DashboardDemoConsts.IsMultiTenancyEnabled) + { + app.UseMultiTenancy(); + } + + app.UseAbpRequestLocalization(); + + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "DashboardDemo API"); + }); + + app.UseAuditing(); + + app.UseMvcWithDefaultRouteAndArea(); + + SeedDatabase(context); + } + + private static void SeedDatabase(ApplicationInitializationContext context) + { + using (var scope = context.ServiceProvider.CreateScope()) + { + AsyncHelper.RunSync(async () => + { + await scope.ServiceProvider + .GetRequiredService() + .SeedAsync(); + }); + } + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Menus/DashboardDemoMenuContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Menus/DashboardDemoMenuContributor.cs new file mode 100644 index 0000000000..d04a04a125 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Menus/DashboardDemoMenuContributor.cs @@ -0,0 +1,33 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; +using DashboardDemo.Localization.DashboardDemo; +using Volo.Abp.TenantManagement.Web.Navigation; +using Volo.Abp.UI.Navigation; + +namespace DashboardDemo.Menus +{ + public class DashboardDemoMenuContributor : IMenuContributor + { + public async Task ConfigureMenuAsync(MenuConfigurationContext context) + { + if (context.Menu.Name == StandardMenus.Main) + { + await ConfigureMainMenuAsync(context); + } + } + + private async Task ConfigureMainMenuAsync(MenuConfigurationContext context) + { + if (!DashboardDemoConsts.IsMultiTenancyEnabled) + { + ApplicationMenuItem administration = context.Menu.GetAdministration(); + administration.TryRemoveMenuItem(TenantManagementMenuNames.GroupName); + } + + var l = context.ServiceProvider.GetRequiredService>(); + + context.Menu.Items.Insert(0, new ApplicationMenuItem("DashboardDemo.Home", l["Menu:Home"], "/")); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/DashboardDemoPageBase.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/DashboardDemoPageBase.cs new file mode 100644 index 0000000000..a31d4762f9 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/DashboardDemoPageBase.cs @@ -0,0 +1,13 @@ +using Microsoft.AspNetCore.Mvc.Localization; +using Microsoft.AspNetCore.Mvc.Razor.Internal; +using DashboardDemo.Localization.DashboardDemo; +using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; + +namespace DashboardDemo.Pages +{ + public abstract class DashboardDemoPageBase : AbpPage + { + [RazorInject] + public IHtmlLocalizer L { get; set; } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/DashboardDemoPageModelBase.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/DashboardDemoPageModelBase.cs new file mode 100644 index 0000000000..5a81bfeb8b --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/DashboardDemoPageModelBase.cs @@ -0,0 +1,13 @@ +using DashboardDemo.Localization.DashboardDemo; +using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; + +namespace DashboardDemo.Pages +{ + public abstract class DashboardDemoPageModelBase : AbpPageModel + { + protected DashboardDemoPageModelBase() + { + LocalizationResourceType = typeof(DashboardDemoResource); + } + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Index.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Index.cshtml new file mode 100644 index 0000000000..625c2b1709 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Index.cshtml @@ -0,0 +1,19 @@ +@page +@using DashboardDemo.Pages +@inherits DashboardDemoPageBase +@model IndexModel +@section styles { + +} + + @L["Welcome"] + +

    @L["LongWelcomeMessage"]

    + @if (!CurrentUser.IsAuthenticated) + { +

    @L["Login"]

    + } +
    +

    abp.io

    +     +     \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Index.cshtml.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Index.cshtml.cs new file mode 100644 index 0000000000..c8f5717baa --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Index.cshtml.cs @@ -0,0 +1,10 @@ +namespace DashboardDemo.Pages +{ + public class IndexModel : DashboardDemoPageModelBase + { + public void OnGet() + { + + } + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/_ViewImports.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/_ViewImports.cshtml new file mode 100644 index 0000000000..c1da1f5f10 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/_ViewImports.cshtml @@ -0,0 +1,4 @@ +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs new file mode 100644 index 0000000000..8a6c828ce1 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs @@ -0,0 +1,46 @@ +using System; +using System.IO; +using Microsoft.AspNetCore.Hosting; +using Serilog; +using Serilog.Events; + +namespace DashboardDemo +{ + public class Program + { + public static int Main(string[] args) + { + Log.Logger = new LoggerConfiguration() + .MinimumLevel.Debug() //TODO: Should be configurable! + .MinimumLevel.Override("Microsoft", LogEventLevel.Information) + .Enrich.FromLogContext() + .WriteTo.File("Logs/logs.txt") + .CreateLogger(); + + try + { + Log.Information("Starting web host."); + BuildWebHostInternal(args).Run(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } + } + + public static IWebHost BuildWebHostInternal(string[] args) => + new WebHostBuilder() + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .UseSerilog() + .Build(); + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Properties/launchSettings.json b/samples/DashboardDemo/src/DashboardDemo.Web/Properties/launchSettings.json new file mode 100644 index 0000000000..05ae81bcc3 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:53929/", + "sslPort": 0 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "DashboardDemo.Web": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:53932/" + } + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs new file mode 100644 index 0000000000..8b8e9f4d7d --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs @@ -0,0 +1,26 @@ +using System; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Volo.Abp; + +namespace DashboardDemo +{ + public class Startup + { + public IServiceProvider ConfigureServices(IServiceCollection services) + { + services.AddApplication(options => + { + options.UseAutofac(); + }); + + return services.BuildServiceProviderFromFactory(); + } + + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) + { + app.InitializeApplication(); + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Views/_ViewImports.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Views/_ViewImports.cshtml new file mode 100644 index 0000000000..e4d518b1b8 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js b/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js new file mode 100644 index 0000000000..122e8e926a --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js @@ -0,0 +1,8 @@ +module.exports = { + aliases: { + + }, + mappings: { + + } +}; diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/appsettings.json b/samples/DashboardDemo/src/DashboardDemo.Web/appsettings.json new file mode 100644 index 0000000000..b33c687822 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/appsettings.json @@ -0,0 +1,5 @@ +{ + "ConnectionStrings": { + "Default": "Server=localhost;Database=DashboardDemo;Trusted_Connection=True;MultipleActiveResultSets=true" + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/compilerconfig.json b/samples/DashboardDemo/src/DashboardDemo.Web/compilerconfig.json new file mode 100644 index 0000000000..0f4f333f15 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/compilerconfig.json @@ -0,0 +1,6 @@ +[ + { + "outputFile": "wwwroot/pages/index.css", + "inputFile": "wwwroot/pages/index.scss" + } +] \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/compilerconfig.json.defaults b/samples/DashboardDemo/src/DashboardDemo.Web/compilerconfig.json.defaults new file mode 100644 index 0000000000..c75eb7d519 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/compilerconfig.json.defaults @@ -0,0 +1,49 @@ +{ + "compilers": { + "less": { + "autoPrefix": "", + "cssComb": "none", + "ieCompat": true, + "strictMath": false, + "strictUnits": false, + "relativeUrls": true, + "rootPath": "", + "sourceMapRoot": "", + "sourceMapBasePath": "", + "sourceMap": false + }, + "sass": { + "includePath": "", + "indentType": "space", + "indentWidth": 2, + "outputStyle": "nested", + "Precision": 5, + "relativeUrls": true, + "sourceMapRoot": "", + "sourceMap": false + }, + "stylus": { + "sourceMap": false + }, + "babel": { + "sourceMap": false + }, + "coffeescript": { + "bare": false, + "runtimeMode": "node", + "sourceMap": false + } + }, + "minifiers": { + "css": { + "enabled": true, + "termSemicolons": true, + "gzip": false + }, + "javascript": { + "enabled": true, + "termSemicolons": true, + "gzip": false + } + } +} \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/gulpfile.js b/samples/DashboardDemo/src/DashboardDemo.Web/gulpfile.js new file mode 100644 index 0000000000..db4c6fd03c --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/gulpfile.js @@ -0,0 +1,11 @@ +"use strict"; + +var gulp = require("gulp"), + path = require('path'), + copyResources = require('./node_modules/@abp/aspnetcore.mvc.ui/gulp/copy-resources.js'); + +copyResources.init(path.resolve('./')); + +gulp.task('default', [copyResources.taskName], function () { + +}); \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/package-lock.json b/samples/DashboardDemo/src/DashboardDemo.Web/package-lock.json new file mode 100644 index 0000000000..b24a100c01 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/package-lock.json @@ -0,0 +1,2390 @@ +{ + "name": "DashboardDemo", + "version": "0.1.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@abp/aspnetcore.mvc.ui": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-0.4.9.tgz", + "integrity": "sha512-AveMEi6WRQmD1tM9yVNLAe6ffcbtoL3ZGQKTPA95Q+dy5xBXVg4Y8jdhxawNPK64KYArhfrVkQDfa4mq3pW5Qw==", + "requires": { + "ansi-colors": "^1.1.0", + "extend-object": "^1.0.0", + "gulp": "^3.9.1", + "merge-stream": "^1.0.1", + "path": "^0.12.7", + "rimraf": "^2.6.2" + } + }, + "@abp/aspnetcore.mvc.ui.theme.basic": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-0.4.9.tgz", + "integrity": "sha512-g3Zby8x8+vWw3oTJsSPasjm4tv7BG4270PEf7jK9w925+lIyKYHn6UxOcFbSU2pi9mJTnaF+Fk/rScIcdxwZZw==", + "requires": { + "@abp/aspnetcore.mvc.ui.theme.shared": "^0.4.9" + } + }, + "@abp/aspnetcore.mvc.ui.theme.shared": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-0.4.9.tgz", + "integrity": "sha512-Fe4UfQ215Pz2V6D5HUYhDJFeJWjKLcv2gsZfOheWLlOBgYh274pdnUIwceoZ4Btpa9aPECLG+LAH4dTbs8vjRg==", + "requires": { + "@abp/aspnetcore.mvc.ui": "^0.4.9", + "@abp/bootstrap": "^0.4.9", + "@abp/datatables.net-bs4": "^0.4.9", + "@abp/font-awesome": "^0.4.9", + "@abp/jquery-form": "^0.4.9", + "@abp/jquery-validation-unobtrusive": "^0.4.9", + "@abp/lodash": "^0.4.9", + "@abp/select2": "^0.4.9", + "@abp/sweetalert": "^0.4.9", + "@abp/timeago": "^0.4.9", + "@abp/toastr": "^0.4.9" + } + }, + "@abp/bootstrap": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/bootstrap/-/bootstrap-0.4.9.tgz", + "integrity": "sha512-A7lDHo43KnqjINo0xWECx/WzNQe3vqvE3GPv6uXq3KDi+gStQLAFBq3bVcVW/kSxiquDQ/tuCLRpE0qlhoobag==", + "requires": { + "@abp/core": "^0.4.9", + "bootstrap": "^4.1.1" + } + }, + "@abp/core": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/core/-/core-0.4.9.tgz", + "integrity": "sha512-JbibIPDz0w/C9YhexNagMD763qbZCclcHLVlTpKEZUcxzp6rZXwPR6ekh/PnvzD0R7wmHOh+bHl0hs5JSdy3oA==" + }, + "@abp/datatables.net": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/datatables.net/-/datatables.net-0.4.9.tgz", + "integrity": "sha512-URimiGMFBusEMo9aAadLFCossbYyrN2R6+6YrQ+heqxdheCPmm2wupsXSFoUBHBhD0tzF4rY+OL//oOg3Wtg4g==", + "requires": { + "@abp/core": "^0.4.9", + "datatables.net": "^1.10.16" + } + }, + "@abp/datatables.net-bs4": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/datatables.net-bs4/-/datatables.net-bs4-0.4.9.tgz", + "integrity": "sha512-Dsz0fy2haBz3dl2MLXWjW2bhDBzp1cpWXSXj8TEEzYazjhyoqBy6AiFlEnRCqO49KZD6Ps1cONSRxx4c4On9Lg==", + "requires": { + "@abp/datatables.net": "^0.4.9", + "datatables.net-bs4": "^1.10.16" + } + }, + "@abp/font-awesome": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/font-awesome/-/font-awesome-0.4.9.tgz", + "integrity": "sha512-H4H/PJeSypoq++jP7eqS3y5jpbPIglUByPymHnho7U84gO06tZBUIoK00zyLACUVLzNztWANhmVqyA6OaHQ6xQ==", + "requires": { + "@abp/core": "^0.4.9", + "font-awesome": "^4.7.0" + } + }, + "@abp/jquery": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/jquery/-/jquery-0.4.9.tgz", + "integrity": "sha512-Lte2rfDhcVXRA18mJMyPs0oFoiX/7x10F9cwMyX4+8e9QulA0dg+MjJZ4HIbxRoKvaYPz0AdE5VZ511folFeTg==", + "requires": { + "@abp/core": "^0.4.9", + "jquery": "^3.3.1" + } + }, + "@abp/jquery-form": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/jquery-form/-/jquery-form-0.4.9.tgz", + "integrity": "sha512-T1LzHNO+L/ATSfsaSu9H5rq9oUGjjBrwcJBVQhWRuGbB/Nsv1t4CdCPZHqbYBsn3ji/6T9C80FMdL+s4iOfy8A==", + "requires": { + "@abp/jquery": "^0.4.9", + "jquery-form": "^4.2.2" + } + }, + "@abp/jquery-validation": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/jquery-validation/-/jquery-validation-0.4.9.tgz", + "integrity": "sha512-8C58G9BTYszW6E0EO6NYqXLEbABXt/yGlOqAFCkPiLVfUcoC6uARqkgIgNVnE99ZUeSmluNsYeCczP0Qb0yNzg==", + "requires": { + "@abp/jquery": "^0.4.9", + "jquery-validation": "^1.17.0" + } + }, + "@abp/jquery-validation-unobtrusive": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-0.4.9.tgz", + "integrity": "sha512-GR62QEPexX4uLcqF3y72V39nlx/70C7ubeaIxS1ZEq+0wGklwAiyq1p19qpB5Cuj2GJL+vFrIig5w+B79P2iAw==", + "requires": { + "@abp/jquery-validation": "^0.4.9", + "jquery-validation-unobtrusive": "^3.2.9" + } + }, + "@abp/lodash": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/lodash/-/lodash-0.4.9.tgz", + "integrity": "sha512-/itYbXQL145WigKIGpnyWgARml7QGie7xqhC1WZG5iUkdqLx+4YBXesdzGFykthDewiQNz8mB2gPk64d376AAw==", + "requires": { + "@abp/core": "^0.4.9", + "lodash": "^4.17.10" + }, + "dependencies": { + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + } + } + }, + "@abp/select2": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/select2/-/select2-0.4.9.tgz", + "integrity": "sha512-AaJHWy9fkP/LqVkruZGfvzgdZXyT96/FpnflUpoNPXjuvVRptkJpd/BQiWjpyjS+qzuZ+m3X9dms0d0lAyFKYA==", + "requires": { + "@abp/core": "^0.4.9", + "select2": "^4.0.5" + } + }, + "@abp/sweetalert": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/sweetalert/-/sweetalert-0.4.9.tgz", + "integrity": "sha512-FaxtELo7Um/uasasbOGi1j1XuBtZ819mUo7+6pMSWj2CSAkg2A/RyT9NhYcX8oyGpv188W5CjZfJ1DM0bRH+pQ==", + "requires": { + "@abp/core": "^0.4.9", + "sweetalert": "^2.1.0" + } + }, + "@abp/timeago": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/timeago/-/timeago-0.4.9.tgz", + "integrity": "sha512-RsAyJCl+rEWQL0q0Nx/ijy+iOBYm5IC5Re6y4SQ1jYF/B4n88GM2PFy6kLrE+HHGl5Z5hkWr5OGXmFem50Y3Wg==", + "requires": { + "@abp/jquery": "^0.4.9", + "timeago": "^1.6.3" + } + }, + "@abp/toastr": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/@abp/toastr/-/toastr-0.4.9.tgz", + "integrity": "sha512-KjnETa1Og5EIMDw/pIxPoKLTABBcsxBN8BqwIG33ya2+BIRfAI7b0lEMoKK+qmwVwI5dkXZlKFGIUmPtb+zVCw==", + "requires": { + "@abp/jquery": "^0.4.9", + "toastr": "^2.1.4" + } + }, + "ansi-colors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", + "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", + "requires": { + "ansi-wrap": "^0.1.0" + } + }, + "ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "requires": { + "ansi-wrap": "0.1.0" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "ansi-wrap": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", + "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=" + }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=" + }, + "array-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", + "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=" + }, + "array-slice": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", + "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" + }, + "atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "requires": { + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" + }, + "bootstrap": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz", + "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "requires": { + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + } + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "requires": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, + "clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "requires": { + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" + } + }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" + }, + "component-emitter": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "datatables.net": { + "version": "1.10.19", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.19.tgz", + "integrity": "sha512-+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA==", + "requires": { + "jquery": ">=1.7" + } + }, + "datatables.net-bs4": { + "version": "1.10.19", + "resolved": "https://registry.npmjs.org/datatables.net-bs4/-/datatables.net-bs4-1.10.19.tgz", + "integrity": "sha512-pgeP17w4aPR7HIxIwuJghfqXULjdg1K6xMUUKDyCERJRSNNK4MRToFfELtIsluLNN555YBK4Kx8nihX5/ZT1Fw==", + "requires": { + "datatables.net": "1.10.19", + "jquery": ">=1.7" + } + }, + "dateformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", + "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "^1.0.2" + } + }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "requires": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, + "deprecated": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", + "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=" + }, + "detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" + }, + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "requires": { + "readable-stream": "~1.1.9" + } + }, + "end-of-stream": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", + "requires": { + "once": "~1.3.0" + } + }, + "es6-object-assign": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", + "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "requires": { + "homedir-polyfill": "^1.0.1" + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extend-object": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/extend-object/-/extend-object-1.0.0.tgz", + "integrity": "sha1-QlFPhAFdE1bK9Rh5ad+yvBvaCCM=" + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "^2.0.4" + } + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, + "fancy-log": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", + "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", + "requires": { + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "parse-node-version": "^1.0.0", + "time-stamp": "^1.0.0" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=" + }, + "findup-sync": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", + "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + } + }, + "fined": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", + "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", + "requires": { + "expand-tilde": "^2.0.2", + "is-plain-object": "^2.0.3", + "object.defaults": "^1.1.0", + "object.pick": "^1.2.0", + "parse-filepath": "^1.0.1" + } + }, + "first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" + }, + "flagged-respawn": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", + "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==" + }, + "font-awesome": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", + "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "requires": { + "for-in": "^1.0.1" + } + }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "requires": { + "map-cache": "^0.2.2" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "gaze": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", + "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", + "requires": { + "globule": "~0.1.0" + } + }, + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + }, + "glob": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^2.0.1", + "once": "^1.3.0" + } + }, + "glob-stream": { + "version": "3.1.18", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", + "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "requires": { + "glob": "^4.3.1", + "glob2base": "^0.0.12", + "minimatch": "^2.0.1", + "ordered-read-streams": "^0.1.0", + "through2": "^0.6.1", + "unique-stream": "^1.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + } + } + }, + "glob-watcher": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", + "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "requires": { + "gaze": "^0.5.1" + } + }, + "glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "requires": { + "find-index": "^0.1.1" + } + }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + }, + "globule": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", + "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "requires": { + "glob": "~3.1.21", + "lodash": "~1.0.1", + "minimatch": "~0.2.11" + }, + "dependencies": { + "glob": { + "version": "3.1.21", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "requires": { + "graceful-fs": "~1.2.0", + "inherits": "1", + "minimatch": "~0.2.11" + } + }, + "graceful-fs": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", + "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=" + }, + "inherits": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", + "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" + }, + "minimatch": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "requires": { + "lru-cache": "2", + "sigmund": "~1.0.0" + } + } + } + }, + "glogg": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", + "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==", + "requires": { + "sparkles": "^1.0.0" + } + }, + "graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "requires": { + "natives": "^1.1.0" + } + }, + "gulp": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", + "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", + "requires": { + "archy": "^1.0.0", + "chalk": "^1.0.0", + "deprecated": "^0.0.1", + "gulp-util": "^3.0.0", + "interpret": "^1.0.0", + "liftoff": "^2.1.0", + "minimist": "^1.1.0", + "orchestrator": "^0.3.0", + "pretty-hrtime": "^1.0.0", + "semver": "^4.1.0", + "tildify": "^1.0.0", + "v8flags": "^2.0.2", + "vinyl-fs": "^0.3.0" + } + }, + "gulp-util": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "requires": { + "array-differ": "^1.0.0", + "array-uniq": "^1.0.2", + "beeper": "^1.0.0", + "chalk": "^1.0.0", + "dateformat": "^2.0.0", + "fancy-log": "^1.1.0", + "gulplog": "^1.0.0", + "has-gulplog": "^0.1.0", + "lodash._reescape": "^3.0.0", + "lodash._reevaluate": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.template": "^3.0.0", + "minimist": "^1.1.0", + "multipipe": "^0.1.2", + "object-assign": "^3.0.0", + "replace-ext": "0.0.1", + "through2": "^2.0.0", + "vinyl": "^0.5.0" + } + }, + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "requires": { + "glogg": "^1.0.0" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "requires": { + "sparkles": "^1.0.0" + } + }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "requires": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "requires": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "dependencies": { + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "homedir-polyfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", + "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", + "requires": { + "parse-passwd": "^1.0.0" + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + }, + "interpret": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==" + }, + "is-absolute": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", + "requires": { + "is-relative": "^1.0.0", + "is-windows": "^1.0.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "^2.1.0" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "^3.0.1" + } + }, + "is-relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", + "requires": { + "is-unc-path": "^1.0.0" + } + }, + "is-unc-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", + "requires": { + "unc-path-regex": "^0.1.2" + } + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "jquery": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" + }, + "jquery-form": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/jquery-form/-/jquery-form-4.2.2.tgz", + "integrity": "sha512-HJTef7DRBSg8ge/RNUw8rUTTtB3l8ozO0OhD16AzDl+eIXp4skgCqRTd9fYPsOzL+pN6+1B9wvbTLGjgikz8Tg==", + "requires": { + "jquery": ">=1.7.2" + } + }, + "jquery-validation": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.0.tgz", + "integrity": "sha512-i1ygcs9K9eI0jqQ8fiOZdT0Ofw941YII1zyPQDUkBS8t2G8SoSWz8UUEVT6gV1KvsaBbovtL8YxjLALACR0syQ==", + "requires": { + "jquery": "^1.7 || ^2.0 || ^3.1" + } + }, + "jquery-validation-unobtrusive": { + "version": "3.2.11", + "resolved": "https://registry.npmjs.org/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.2.11.tgz", + "integrity": "sha512-3FQPllaWdD+Aq55zJLGSW39+eXPDz1HhwAvrSwYi8zHQ8DVcu5IJ1HVeTiCl0BnCnrIBvfFU3zEB/DrGdcoRIQ==", + "requires": { + "jquery": ">=1.8", + "jquery-validation": ">=1.16" + } + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + }, + "liftoff": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", + "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", + "requires": { + "extend": "^3.0.0", + "findup-sync": "^2.0.0", + "fined": "^1.0.1", + "flagged-respawn": "^1.0.0", + "is-plain-object": "^2.0.4", + "object.map": "^1.0.0", + "rechoir": "^0.6.2", + "resolve": "^1.1.7" + } + }, + "lodash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", + "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=" + }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=" + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=" + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=" + }, + "lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=" + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" + }, + "lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" + }, + "lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "requires": { + "lodash._root": "^3.0.0" + } + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "requires": { + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" + } + }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" + }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "requires": { + "lodash._basecopy": "^3.0.0", + "lodash._basetostring": "^3.0.0", + "lodash._basevalues": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0", + "lodash.keys": "^3.0.0", + "lodash.restparam": "^3.0.0", + "lodash.templatesettings": "^3.0.0" + } + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "requires": { + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0" + } + }, + "lru-cache": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", + "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" + }, + "make-iterator": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", + "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", + "requires": { + "kind-of": "^6.0.2" + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + }, + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "requires": { + "object-visit": "^1.0.0" + } + }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "requires": { + "brace-expansion": "^1.0.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "mixin-deep": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "requires": { + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "^2.0.4" + } + } + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + } + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "requires": { + "duplexer2": "0.0.2" + } + }, + "nanomatch": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + } + }, + "natives": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz", + "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==" + }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + }, + "object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "requires": { + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "requires": { + "isobject": "^3.0.0" + } + }, + "object.defaults": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "requires": { + "array-each": "^1.0.1", + "array-slice": "^1.0.0", + "for-own": "^1.0.0", + "isobject": "^3.0.0" + } + }, + "object.map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", + "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", + "requires": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, + "object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "requires": { + "isobject": "^3.0.1" + } + }, + "once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "requires": { + "wrappy": "1" + } + }, + "orchestrator": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", + "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", + "requires": { + "end-of-stream": "~0.1.5", + "sequencify": "~0.0.7", + "stream-consume": "~0.1.0" + } + }, + "ordered-read-streams": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", + "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=" + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "parse-filepath": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", + "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", + "requires": { + "is-absolute": "^1.0.0", + "map-cache": "^0.2.0", + "path-root": "^0.1.1" + } + }, + "parse-node-version": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", + "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==" + }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=" + }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + }, + "path": { + "version": "0.12.7", + "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", + "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", + "requires": { + "process": "^0.11.1", + "util": "^0.10.3" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, + "path-root": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "requires": { + "path-root-regex": "^0.1.0" + } + }, + "path-root-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=" + }, + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" + }, + "pretty-hrtime": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=" + }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + }, + "process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + }, + "promise-polyfill": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "requires": { + "resolve": "^1.1.6" + } + }, + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "requires": { + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" + } + }, + "repeat-element": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + }, + "resolve": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz", + "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==", + "requires": { + "path-parse": "^1.0.6" + } + }, + "resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + } + }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + }, + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "requires": { + "glob": "^7.1.3" + }, + "dependencies": { + "glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + } + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "requires": { + "ret": "~0.1.10" + } + }, + "select2": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.7.tgz", + "integrity": "sha512-t46Z2nkEEYnBYdRpLNw5dj9qqO+YTiTlWKnpJ/B5e1Q3hPND00JRgcLJxYRzqpeLZd+ZkszkHEMagLKIfbTjVA==" + }, + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + }, + "sequencify": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", + "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=" + }, + "set-value": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", + "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" + }, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "requires": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "requires": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "requires": { + "kind-of": "^3.2.0" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "source-map-resolve": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", + "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", + "requires": { + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" + }, + "sparkles": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", + "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==" + }, + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "requires": { + "extend-shallow": "^3.0.0" + } + }, + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "requires": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, + "stream-consume": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz", + "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==" + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-bom": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", + "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", + "requires": { + "first-chunk-stream": "^1.0.0", + "is-utf8": "^0.2.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + }, + "sweetalert": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/sweetalert/-/sweetalert-2.1.2.tgz", + "integrity": "sha512-iWx7X4anRBNDa/a+AdTmvAzQtkN1+s4j/JJRWlHpYE8Qimkohs8/XnFcWeYHH2lMA8LRCa5tj2d244If3S/hzA==", + "requires": { + "es6-object-assign": "^1.1.0", + "promise-polyfill": "^6.0.2" + } + }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, + "tildify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", + "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", + "requires": { + "os-homedir": "^1.0.0" + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=" + }, + "timeago": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/timeago/-/timeago-1.6.7.tgz", + "integrity": "sha512-FikcjN98+ij0siKH4VO4dZ358PR3oDDq4Vdl1+sN9gWz1/+JXGr3uZbUShYH/hL7bMhcTpPbplJU5Tej4b4jbQ==", + "requires": { + "jquery": ">=1.5.0 <4.0" + } + }, + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "requires": { + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + }, + "toastr": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.4.tgz", + "integrity": "sha1-i0O+ZPudDEFIcURvLbjoyk6V8YE=", + "requires": { + "jquery": ">=1.12.0" + } + }, + "unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" + }, + "union-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", + "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "requires": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + }, + "set-value": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", + "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" + } + } + } + }, + "unique-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", + "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=" + }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "requires": { + "has-value": "^0.3.1", + "isobject": "^3.0.0" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "requires": { + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + } + } + }, + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + }, + "use": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" + }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" + }, + "util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "requires": { + "inherits": "2.0.3" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "requires": { + "user-home": "^1.1.1" + } + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "requires": { + "clone": "^1.0.0", + "clone-stats": "^0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-fs": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", + "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "requires": { + "defaults": "^1.0.0", + "glob-stream": "^3.1.5", + "glob-watcher": "^0.0.6", + "graceful-fs": "^3.0.0", + "mkdirp": "^0.5.0", + "strip-bom": "^1.0.0", + "through2": "^0.6.1", + "vinyl": "^0.4.0" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "requires": { + "clone": "^0.2.0", + "clone-stats": "^0.0.1" + } + } + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "requires": { + "isexe": "^2.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/package.json b/samples/DashboardDemo/src/DashboardDemo.Web/package.json new file mode 100644 index 0000000000..517e06b053 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/package.json @@ -0,0 +1,8 @@ +{ + "version": "0.1.0", + "name": "DashboardDemo", + "private": true, + "dependencies": { + "@abp/aspnetcore.mvc.ui.theme.basic": "^0.4.9" + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/abp/core/abp.js b/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/abp/core/abp.js new file mode 100644 index 0000000000..4c87489e22 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/abp/core/abp.js @@ -0,0 +1,546 @@ +var abp = abp || {}; +(function () { + + /* Application paths *****************************************/ + + //Current application root path (including virtual directory if exists). + abp.appPath = abp.appPath || '/'; + + abp.pageLoadTime = new Date(); + + //Converts given path to absolute path using abp.appPath variable. + abp.toAbsAppPath = function (path) { + if (path.indexOf('/') == 0) { + path = path.substring(1); + } + + return abp.appPath + path; + }; + + /* LOGGING ***************************************************/ + //Implements Logging API that provides secure & controlled usage of console.log + + abp.log = abp.log || {}; + + abp.log.levels = { + DEBUG: 1, + INFO: 2, + WARN: 3, + ERROR: 4, + FATAL: 5 + }; + + abp.log.level = abp.log.levels.DEBUG; + + abp.log.log = function (logObject, logLevel) { + if (!window.console || !window.console.log) { + return; + } + + if (logLevel != undefined && logLevel < abp.log.level) { + return; + } + + console.log(logObject); + }; + + abp.log.debug = function (logObject) { + abp.log.log("DEBUG: ", abp.log.levels.DEBUG); + abp.log.log(logObject, abp.log.levels.DEBUG); + }; + + abp.log.info = function (logObject) { + abp.log.log("INFO: ", abp.log.levels.INFO); + abp.log.log(logObject, abp.log.levels.INFO); + }; + + abp.log.warn = function (logObject) { + abp.log.log("WARN: ", abp.log.levels.WARN); + abp.log.log(logObject, abp.log.levels.WARN); + }; + + abp.log.error = function (logObject) { + abp.log.log("ERROR: ", abp.log.levels.ERROR); + abp.log.log(logObject, abp.log.levels.ERROR); + }; + + abp.log.fatal = function (logObject) { + abp.log.log("FATAL: ", abp.log.levels.FATAL); + abp.log.log(logObject, abp.log.levels.FATAL); + }; + + /* LOCALIZATION ***********************************************/ + + abp.localization = abp.localization || {}; + + abp.localization.values = {}; + + abp.localization.localize = function (key, sourceName) { + sourceName = sourceName || abp.localization.defaultResourceName; + + var source = abp.localization.values[sourceName]; + + if (!source) { + abp.log.warn('Could not find localization source: ' + sourceName); + return key; + } + + var value = source[key]; + if (value == undefined) { + return key; + } + + var copiedArguments = Array.prototype.slice.call(arguments, 0); + copiedArguments.splice(1, 1); + copiedArguments[0] = value; + + return abp.utils.formatString.apply(this, copiedArguments); + }; + + abp.localization.getResource = function (name) { + return function () { + var copiedArguments = Array.prototype.slice.call(arguments, 0); + copiedArguments.splice(1, 0, name); + return abp.localization.localize.apply(this, copiedArguments); + }; + }; + + abp.localization.defaultResourceName = undefined; + + /* AUTHORIZATION **********************************************/ + + abp.auth = abp.auth || {}; + + abp.auth.policies = abp.auth.policies || {}; + + abp.auth.grantedPolicies = abp.auth.grantedPolicies || {}; + + abp.auth.isGranted = function (policyName) { + return abp.auth.policies[policyName] != undefined && abp.auth.grantedPolicies[policyName] != undefined; + }; + + abp.auth.isAnyGranted = function () { + if (!arguments || arguments.length <= 0) { + return true; + } + + for (var i = 0; i < arguments.length; i++) { + if (abp.auth.isGranted(arguments[i])) { + return true; + } + } + + return false; + }; + + abp.auth.areAllGranted = function () { + if (!arguments || arguments.length <= 0) { + return true; + } + + for (var i = 0; i < arguments.length; i++) { + if (!abp.auth.isGranted(arguments[i])) { + return false; + } + } + + return true; + }; + + abp.auth.tokenCookieName = 'Abp.AuthToken'; + + abp.auth.setToken = function (authToken, expireDate) { + abp.utils.setCookieValue(abp.auth.tokenCookieName, authToken, expireDate, abp.appPath, abp.domain); + }; + + abp.auth.getToken = function () { + return abp.utils.getCookieValue(abp.auth.tokenCookieName); + } + + abp.auth.clearToken = function () { + abp.auth.setToken(); + } + + /* NOTIFICATION *********************************************/ + //Defines Notification API, not implements it + + abp.notify = abp.notify || {}; + + abp.notify.success = function (message, title, options) { + abp.log.warn('abp.notify.success is not implemented!'); + }; + + abp.notify.info = function (message, title, options) { + abp.log.warn('abp.notify.info is not implemented!'); + }; + + abp.notify.warn = function (message, title, options) { + abp.log.warn('abp.notify.warn is not implemented!'); + }; + + abp.notify.error = function (message, title, options) { + abp.log.warn('abp.notify.error is not implemented!'); + }; + + /* MESSAGE **************************************************/ + //Defines Message API, not implements it + + abp.message = abp.message || {}; + + abp.message._showMessage = function (message, title) { + alert((title || '') + ' ' + message); + }; + + abp.message.info = function (message, title) { + abp.log.warn('abp.message.info is not implemented!'); + return abp.message._showMessage(message, title); + }; + + abp.message.success = function (message, title) { + abp.log.warn('abp.message.success is not implemented!'); + return abp.message._showMessage(message, title); + }; + + abp.message.warn = function (message, title) { + abp.log.warn('abp.message.warn is not implemented!'); + return abp.message._showMessage(message, title); + }; + + abp.message.error = function (message, title) { + abp.log.warn('abp.message.error is not implemented!'); + return abp.message._showMessage(message, title); + }; + + abp.message.confirm = function (message, titleOrCallback, callback) { + abp.log.warn('abp.message.confirm is not properly implemented!'); + + if (titleOrCallback && !(typeof titleOrCallback == 'string')) { + callback = titleOrCallback; + } + + var result = confirm(message); + callback && callback(result); + }; + + /* UI *******************************************************/ + + abp.ui = abp.ui || {}; + + /* UI BLOCK */ + //Defines UI Block API, not implements it + + abp.ui.block = function (elm) { + abp.log.warn('abp.ui.block is not implemented!'); + }; + + abp.ui.unblock = function (elm) { + abp.log.warn('abp.ui.unblock is not implemented!'); + }; + + /* UI BUSY */ + //Defines UI Busy API, not implements it + + abp.ui.setBusy = function (elm, optionsOrPromise) { + abp.log.warn('abp.ui.setBusy is not implemented!'); + }; + + abp.ui.clearBusy = function (elm) { + abp.log.warn('abp.ui.clearBusy is not implemented!'); + }; + + /* SIMPLE EVENT BUS *****************************************/ + + abp.event = (function () { + + var _callbacks = {}; + + var on = function (eventName, callback) { + if (!_callbacks[eventName]) { + _callbacks[eventName] = []; + } + + _callbacks[eventName].push(callback); + }; + + var off = function (eventName, callback) { + var callbacks = _callbacks[eventName]; + if (!callbacks) { + return; + } + + var index = -1; + for (var i = 0; i < callbacks.length; i++) { + if (callbacks[i] === callback) { + index = i; + break; + } + } + + if (index < 0) { + return; + } + + _callbacks[eventName].splice(index, 1); + }; + + var trigger = function (eventName) { + var callbacks = _callbacks[eventName]; + if (!callbacks || !callbacks.length) { + return; + } + + var args = Array.prototype.slice.call(arguments, 1); + for (var i = 0; i < callbacks.length; i++) { + callbacks[i].apply(this, args); + } + }; + + // Public interface /////////////////////////////////////////////////// + + return { + on: on, + off: off, + trigger: trigger + }; + })(); + + + /* UTILS ***************************************************/ + + abp.utils = abp.utils || {}; + + /* Creates a name namespace. + * Example: + * var taskService = abp.utils.createNamespace(abp, 'services.task'); + * taskService will be equal to abp.services.task + * first argument (root) must be defined first + ************************************************************/ + abp.utils.createNamespace = function (root, ns) { + var parts = ns.split('.'); + for (var i = 0; i < parts.length; i++) { + if (typeof root[parts[i]] == 'undefined') { + root[parts[i]] = {}; + } + + root = root[parts[i]]; + } + + return root; + }; + + /* Find and replaces a string (search) to another string (replacement) in + * given string (str). + * Example: + * abp.utils.replaceAll('This is a test string', 'is', 'X') = 'ThX X a test string' + ************************************************************/ + abp.utils.replaceAll = function (str, search, replacement) { + var fix = search.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); + return str.replace(new RegExp(fix, 'g'), replacement); + }; + + /* Formats a string just like string.format in C#. + * Example: + * abp.utils.formatString('Hello {0}','Tuana') = 'Hello Tuana' + ************************************************************/ + abp.utils.formatString = function () { + if (arguments.length < 1) { + return null; + } + + var str = arguments[0]; + + for (var i = 1; i < arguments.length; i++) { + var placeHolder = '{' + (i - 1) + '}'; + str = abp.utils.replaceAll(str, placeHolder, arguments[i]); + } + + return str; + }; + + abp.utils.toPascalCase = function (str) { + if (!str || !str.length) { + return str; + } + + if (str.length === 1) { + return str.charAt(0).toUpperCase(); + } + + return str.charAt(0).toUpperCase() + str.substr(1); + } + + abp.utils.toCamelCase = function (str) { + if (!str || !str.length) { + return str; + } + + if (str.length === 1) { + return str.charAt(0).toLowerCase(); + } + + return str.charAt(0).toLowerCase() + str.substr(1); + } + + abp.utils.truncateString = function (str, maxLength) { + if (!str || !str.length || str.length <= maxLength) { + return str; + } + + return str.substr(0, maxLength); + }; + + abp.utils.truncateStringWithPostfix = function (str, maxLength, postfix) { + postfix = postfix || '...'; + + if (!str || !str.length || str.length <= maxLength) { + return str; + } + + if (maxLength <= postfix.length) { + return postfix.substr(0, maxLength); + } + + return str.substr(0, maxLength - postfix.length) + postfix; + }; + + abp.utils.isFunction = function (obj) { + return !!(obj && obj.constructor && obj.call && obj.apply); + }; + + /** + * parameterInfos should be an array of { name, value } objects + * where name is query string parameter name and value is it's value. + * includeQuestionMark is true by default. + */ + abp.utils.buildQueryString = function (parameterInfos, includeQuestionMark) { + if (includeQuestionMark === undefined) { + includeQuestionMark = true; + } + + var qs = ''; + + function addSeperator() { + if (!qs.length) { + if (includeQuestionMark) { + qs = qs + '?'; + } + } else { + qs = qs + '&'; + } + } + + for (var i = 0; i < parameterInfos.length; ++i) { + var parameterInfo = parameterInfos[i]; + if (parameterInfo.value === undefined) { + continue; + } + + if (parameterInfo.value === null) { + parameterInfo.value = ''; + } + + addSeperator(); + + if (parameterInfo.value.toJSON && typeof parameterInfo.value.toJSON === "function") { + qs = qs + parameterInfo.name + '=' + encodeURIComponent(parameterInfo.value.toJSON()); + } else if (Array.isArray(parameterInfo.value) && parameterInfo.value.length) { + for (var j = 0; j < parameterInfo.value.length; j++) { + if (j > 0) { + addSeperator(); + } + + qs = qs + parameterInfo.name + '[' + j + ']=' + encodeURIComponent(parameterInfo.value[j]); + } + } else { + qs = qs + parameterInfo.name + '=' + encodeURIComponent(parameterInfo.value); + } + } + + return qs; + } + + /** + * Sets a cookie value for given key. + * This is a simple implementation created to be used by ABP. + * Please use a complete cookie library if you need. + * @param {string} key + * @param {string} value + * @param {Date} expireDate (optional). If not specified the cookie will expire at the end of session. + * @param {string} path (optional) + */ + abp.utils.setCookieValue = function (key, value, expireDate, path) { + var cookieValue = encodeURIComponent(key) + '='; + + if (value) { + cookieValue = cookieValue + encodeURIComponent(value); + } + + if (expireDate) { + cookieValue = cookieValue + "; expires=" + expireDate.toUTCString(); + } + + if (path) { + cookieValue = cookieValue + "; path=" + path; + } + + document.cookie = cookieValue; + }; + + /** + * Gets a cookie with given key. + * This is a simple implementation created to be used by ABP. + * Please use a complete cookie library if you need. + * @param {string} key + * @returns {string} Cookie value or null + */ + abp.utils.getCookieValue = function (key) { + var equalities = document.cookie.split('; '); + for (var i = 0; i < equalities.length; i++) { + if (!equalities[i]) { + continue; + } + + var splitted = equalities[i].split('='); + if (splitted.length != 2) { + continue; + } + + if (decodeURIComponent(splitted[0]) === key) { + return decodeURIComponent(splitted[1] || ''); + } + } + + return null; + }; + + /** + * Deletes cookie for given key. + * This is a simple implementation created to be used by ABP. + * Please use a complete cookie library if you need. + * @param {string} key + * @param {string} path (optional) + */ + abp.utils.deleteCookie = function (key, path) { + var cookieValue = encodeURIComponent(key) + '='; + + cookieValue = cookieValue + "; expires=" + (new Date(new Date().getTime() - 86400000)).toUTCString(); + + if (path) { + cookieValue = cookieValue + "; path=" + path; + } + + document.cookie = cookieValue; + } + + /* SECURITY ***************************************/ + abp.security = abp.security || {}; + abp.security.antiForgery = abp.security.antiForgery || {}; + + abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN'; + abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN'; + + abp.security.antiForgery.getToken = function () { + return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName); + }; + +})(); \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/abp/jquery/abp.jquery.js b/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/abp/jquery/abp.jquery.js new file mode 100644 index 0000000000..6a84bfbb61 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/abp/jquery/abp.jquery.js @@ -0,0 +1,389 @@ +var abp = abp || {}; +(function($) { + + if (!$) { + throw "abp/jquery library requires the jquery library included to the page!"; + } + + // ABP CORE OVERRIDES ///////////////////////////////////////////////////// + + abp.message._showMessage = function (message, title) { + alert((title || '') + ' ' + message); + + return $.Deferred(function ($dfd) { + $dfd.resolve(); + }); + }; + + abp.message.confirm = function (message, titleOrCallback, callback) { + if (titleOrCallback && !(typeof titleOrCallback == 'string')) { + callback = titleOrCallback; + } + + var result = confirm(message); + callback && callback(result); + + return $.Deferred(function ($dfd) { + $dfd.resolve(result); + }); + }; + + abp.utils.isFunction = function (obj) { + return $.isFunction(obj); + }; + + // JQUERY EXTENSIONS ////////////////////////////////////////////////////// + + $.fn.findWithSelf = function (selector) { + return this.filter(selector).add(this.find(selector)); + }; + + // DOM //////////////////////////////////////////////////////////////////// + + abp.dom = abp.dom || {}; + + abp.dom.onNodeAdded = function (callback) { + abp.event.on('abp.dom.nodeAdded', callback); + }; + + abp.dom.onNodeRemoved = function (callback) { + abp.event.on('abp.dom.nodeRemoved', callback); + }; + + var mutationObserverCallback = function (mutationsList) { + for (var i = 0; i < mutationsList.length; i++) { + var mutation = mutationsList[i]; + if (mutation.type === 'childList') { + if (mutation.addedNodes && mutation.removedNodes.length) { + for (var k = 0; k < mutation.removedNodes.length; k++) { + abp.event.trigger( + 'abp.dom.nodeRemoved', + { + $el: $(mutation.removedNodes[k]) + } + ); + } + } + + if (mutation.addedNodes && mutation.addedNodes.length) { + for (var j = 0; j < mutation.addedNodes.length; j++) { + abp.event.trigger( + 'abp.dom.nodeAdded', + { + $el: $(mutation.addedNodes[j]) + } + ); + } + } + } + } + }; + + new MutationObserver(mutationObserverCallback).observe( + $('body')[0], + { + subtree: true, + childList: true + } + ); + + // AJAX /////////////////////////////////////////////////////////////////// + + abp.ajax = function (userOptions) { + userOptions = userOptions || {}; + + var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions); + + options.success = undefined; + options.error = undefined; + + return $.Deferred(function ($dfd) { + $.ajax(options) + .done(function (data, textStatus, jqXHR) { + $dfd.resolve(data); + userOptions.success && userOptions.success(data); + }).fail(function (jqXHR) { + if (jqXHR.getResponseHeader('_AbpErrorFormat') === 'true') { + abp.ajax.handleAbpErrorResponse(jqXHR, userOptions, $dfd); + } else { + abp.ajax.handleNonAbpErrorResponse(jqXHR, userOptions, $dfd); + } + }); + }); + }; + + $.extend(abp.ajax, { + defaultOpts: { + dataType: 'json', + type: 'POST', + contentType: 'application/json', + headers: { + 'X-Requested-With': 'XMLHttpRequest' + } + }, + + defaultError: { + message: 'An error has occurred!', + details: 'Error detail not sent by server.' + }, + + defaultError401: { + message: 'You are not authenticated!', + details: 'You should be authenticated (sign in) in order to perform this operation.' + }, + + defaultError403: { + message: 'You are not authorized!', + details: 'You are not allowed to perform this operation.' + }, + + defaultError404: { + message: 'Resource not found!', + details: 'The resource requested could not found on the server.' + }, + + logError: function (error) { + abp.log.error(error); + }, + + showError: function (error) { + if (error.details) { + return abp.message.error(error.details, error.message); + } else { + return abp.message.error(error.message || abp.ajax.defaultError.message); + } + }, + + handleTargetUrl: function (targetUrl) { + if (!targetUrl) { + location.href = abp.appPath; + } else { + location.href = targetUrl; + } + }, + + handleErrorStatusCode: function (status) { + switch (status) { + case 401: + abp.ajax.handleUnAuthorizedRequest( + abp.ajax.showError(abp.ajax.defaultError401), + abp.appPath + ); + break; + case 403: + abp.ajax.showError(abp.ajax.defaultError403); + break; + case 404: + abp.ajax.showError(abp.ajax.defaultError404); + break; + default: + abp.ajax.showError(abp.ajax.defaultError); + break; + } + }, + + handleNonAbpErrorResponse: function (jqXHR, userOptions, $dfd) { + if (userOptions.abpHandleError !== false) { + abp.ajax.handleErrorStatusCode(jqXHR.status); + } + + $dfd.reject.apply(this, arguments); + userOptions.error && userOptions.error.apply(this, arguments); + }, + + handleAbpErrorResponse: function (jqXHR, userOptions, $dfd) { + var messagePromise = null; + + if (userOptions.abpHandleError !== false) { + messagePromise = abp.ajax.showError(jqXHR.responseJSON.error); + } + + abp.ajax.logError(jqXHR.responseJSON.error); + + $dfd && $dfd.reject(jqXHR.responseJSON.error, jqXHR); + userOptions.error && userOptions.error(jqXHR.responseJSON.error, jqXHR); + + if (jqXHR.status === 401 && userOptions.abpHandleError !== false) { + abp.ajax.handleUnAuthorizedRequest(messagePromise); + } + }, + + handleUnAuthorizedRequest: function (messagePromise, targetUrl) { + if (messagePromise) { + messagePromise.done(function () { + abp.ajax.handleTargetUrl(targetUrl); + }); + } else { + abp.ajax.handleTargetUrl(targetUrl); + } + }, + + blockUI: function (options) { + if (options.blockUI) { + if (options.blockUI === true) { //block whole page + abp.ui.setBusy(); + } else { //block an element + abp.ui.setBusy(options.blockUI); + } + } + }, + + unblockUI: function (options) { + if (options.blockUI) { + if (options.blockUI === true) { //unblock whole page + abp.ui.clearBusy(); + } else { //unblock an element + abp.ui.clearBusy(options.blockUI); + } + } + }, + + ajaxSendHandler: function (event, request, settings) { + var token = abp.security.antiForgery.getToken(); + if (!token) { + return; + } + + if (!settings.headers || settings.headers[abp.security.antiForgery.tokenHeaderName] === undefined) { + request.setRequestHeader(abp.security.antiForgery.tokenHeaderName, token); + } + } + }); + + $(document).ajaxSend(function (event, request, settings) { + return abp.ajax.ajaxSendHandler(event, request, settings); + }); + + abp.event.on('abp.configurationInitialized', function () { + var l = abp.localization.getResource('AbpUi'); + + abp.ajax.defaultError.message = l('DefaultErrorMessage'); + abp.ajax.defaultError.details = l('DefaultErrorMessageDetail'); + abp.ajax.defaultError401.message = l('DefaultErrorMessage401'); + abp.ajax.defaultError401.details = l('DefaultErrorMessage401Detail'); + abp.ajax.defaultError403.message = l('DefaultErrorMessage403'); + abp.ajax.defaultError403.details = l('DefaultErrorMessage403Detail'); + abp.ajax.defaultError404.message = l('DefaultErrorMessage404'); + abp.ajax.defaultError404.details = l('DefaultErrorMessage404Detail'); + }); + + // RESOURCE LOADER //////////////////////////////////////////////////////// + + /* UrlStates enum */ + var UrlStates = { + LOADING: 'LOADING', + LOADED: 'LOADED', + FAILED: 'FAILED' + }; + + /* UrlInfo class */ + function UrlInfo(url) { + this.url = url; + this.state = UrlStates.LOADING; + this.loadCallbacks = []; + this.failCallbacks = []; + } + + UrlInfo.prototype.succeed = function () { + this.state = UrlStates.LOADED; + for (var i = 0; i < this.loadCallbacks.length; i++) { + this.loadCallbacks[i](); + } + }; + + UrlInfo.prototype.failed = function () { + this.state = UrlStates.FAILED; + for (var i = 0; i < this.failCallbacks.length; i++) { + this.failCallbacks[i](); + } + }; + + UrlInfo.prototype.handleCallbacks = function (loadCallback, failCallback) { + switch (this.state) { + case UrlStates.LOADED: + loadCallback && loadCallback(); + break; + case UrlStates.FAILED: + failCallback && failCallback(); + break; + case UrlStates.LOADING: + this.addCallbacks(loadCallback, failCallback); + break; + } + }; + + UrlInfo.prototype.addCallbacks = function (loadCallback, failCallback) { + loadCallback && this.loadCallbacks.push(loadCallback); + failCallback && this.failCallbacks.push(failCallback); + }; + + /* ResourceLoader API */ + + abp.ResourceLoader = (function () { + + var _urlInfos = {}; + + function getCacheKey(url) { + return url; + } + + function appendTimeToUrl(url) { + + if (url.indexOf('?') < 0) { + url += '?'; + } else { + url += '&'; + } + + url += '_=' + new Date().getTime(); + + return url; + } + + var _loadFromUrl = function (url, loadCallback, failCallback, serverLoader) { + + var cacheKey = getCacheKey(url); + + var urlInfo = _urlInfos[cacheKey]; + + if (urlInfo) { + urlInfo.handleCallbacks(loadCallback, failCallback); + return; + } + + _urlInfos[cacheKey] = urlInfo = new UrlInfo(url); + urlInfo.addCallbacks(loadCallback, failCallback); + + serverLoader(urlInfo); + }; + + var _loadScript = function (url, loadCallback, failCallback) { + _loadFromUrl(url, loadCallback, failCallback, function (urlInfo) { + $.getScript(url) + .done(function () { + urlInfo.succeed(); + }) + .fail(function () { + urlInfo.failed(); + }); + }); + }; + + var _loadStyle = function (url) { + _loadFromUrl(url, undefined, undefined, function (urlInfo) { + + $('', { + rel: 'stylesheet', + type: 'text/css', + href: appendTimeToUrl(url) + }).appendTo('head'); + }); + }; + + return { + loadScript: _loadScript, + loadStyle: _loadStyle + } + })(); + +})(jQuery); \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/bootstrap/css/bootstrap.css b/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/bootstrap/css/bootstrap.css new file mode 100644 index 0000000000..7d43e1f107 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/bootstrap/css/bootstrap.css @@ -0,0 +1,8981 @@ +/*! + * Bootstrap v4.1.1 (https://getbootstrap.com/) + * Copyright 2011-2018 The Bootstrap Authors + * Copyright 2011-2018 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +:root { + --blue: #007bff; + --indigo: #6610f2; + --purple: #6f42c1; + --pink: #e83e8c; + --red: #dc3545; + --orange: #fd7e14; + --yellow: #ffc107; + --green: #28a745; + --teal: #20c997; + --cyan: #17a2b8; + --white: #fff; + --gray: #6c757d; + --gray-dark: #343a40; + --primary: #007bff; + --secondary: #6c757d; + --success: #28a745; + --info: #17a2b8; + --warning: #ffc107; + --danger: #dc3545; + --light: #f8f9fa; + --dark: #343a40; + --breakpoint-xs: 0; + --breakpoint-sm: 576px; + --breakpoint-md: 768px; + --breakpoint-lg: 992px; + --breakpoint-xl: 1200px; + --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; +} + +*, +*::before, +*::after { + box-sizing: border-box; +} + +html { + font-family: sans-serif; + line-height: 1.15; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; + -ms-overflow-style: scrollbar; + -webkit-tap-highlight-color: transparent; +} + +@-ms-viewport { + width: device-width; +} + +article, aside, figcaption, figure, footer, header, hgroup, main, nav, section { + display: block; +} + +body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-size: 1rem; + font-weight: 400; + line-height: 1.5; + color: #212529; + text-align: left; + background-color: #fff; +} + +[tabindex="-1"]:focus { + outline: 0 !important; +} + +hr { + box-sizing: content-box; + height: 0; + overflow: visible; +} + +h1, h2, h3, h4, h5, h6 { + margin-top: 0; + margin-bottom: 0.5rem; +} + +p { + margin-top: 0; + margin-bottom: 1rem; +} + +abbr[title], +abbr[data-original-title] { + text-decoration: underline; + -webkit-text-decoration: underline dotted; + text-decoration: underline dotted; + cursor: help; + border-bottom: 0; +} + +address { + margin-bottom: 1rem; + font-style: normal; + line-height: inherit; +} + +ol, +ul, +dl { + margin-top: 0; + margin-bottom: 1rem; +} + +ol ol, +ul ul, +ol ul, +ul ol { + margin-bottom: 0; +} + +dt { + font-weight: 700; +} + +dd { + margin-bottom: .5rem; + margin-left: 0; +} + +blockquote { + margin: 0 0 1rem; +} + +dfn { + font-style: italic; +} + +b, +strong { + font-weight: bolder; +} + +small { + font-size: 80%; +} + +sub, +sup { + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; +} + +sub { + bottom: -.25em; +} + +sup { + top: -.5em; +} + +a { + color: #007bff; + text-decoration: none; + background-color: transparent; + -webkit-text-decoration-skip: objects; +} + +a:hover { + color: #0056b3; + text-decoration: underline; +} + +a:not([href]):not([tabindex]) { + color: inherit; + text-decoration: none; +} + +a:not([href]):not([tabindex]):hover, a:not([href]):not([tabindex]):focus { + color: inherit; + text-decoration: none; +} + +a:not([href]):not([tabindex]):focus { + outline: 0; +} + +pre, +code, +kbd, +samp { + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + font-size: 1em; +} + +pre { + margin-top: 0; + margin-bottom: 1rem; + overflow: auto; + -ms-overflow-style: scrollbar; +} + +figure { + margin: 0 0 1rem; +} + +img { + vertical-align: middle; + border-style: none; +} + +svg:not(:root) { + overflow: hidden; +} + +table { + border-collapse: collapse; +} + +caption { + padding-top: 0.75rem; + padding-bottom: 0.75rem; + color: #6c757d; + text-align: left; + caption-side: bottom; +} + +th { + text-align: inherit; +} + +label { + display: inline-block; + margin-bottom: 0.5rem; +} + +button { + border-radius: 0; +} + +button:focus { + outline: 1px dotted; + outline: 5px auto -webkit-focus-ring-color; +} + +input, +button, +select, +optgroup, +textarea { + margin: 0; + font-family: inherit; + font-size: inherit; + line-height: inherit; +} + +button, +input { + overflow: visible; +} + +button, +select { + text-transform: none; +} + +button, +html [type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + padding: 0; + border-style: none; +} + +input[type="radio"], +input[type="checkbox"] { + box-sizing: border-box; + padding: 0; +} + +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { + -webkit-appearance: listbox; +} + +textarea { + overflow: auto; + resize: vertical; +} + +fieldset { + min-width: 0; + padding: 0; + margin: 0; + border: 0; +} + +legend { + display: block; + width: 100%; + max-width: 100%; + padding: 0; + margin-bottom: .5rem; + font-size: 1.5rem; + line-height: inherit; + color: inherit; + white-space: normal; +} + +progress { + vertical-align: baseline; +} + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +[type="search"] { + outline-offset: -2px; + -webkit-appearance: none; +} + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +::-webkit-file-upload-button { + font: inherit; + -webkit-appearance: button; +} + +output { + display: inline-block; +} + +summary { + display: list-item; + cursor: pointer; +} + +template { + display: none; +} + +[hidden] { + display: none !important; +} + +h1, h2, h3, h4, h5, h6, +.h1, .h2, .h3, .h4, .h5, .h6 { + margin-bottom: 0.5rem; + font-family: inherit; + font-weight: 500; + line-height: 1.2; + color: inherit; +} + +h1, .h1 { + font-size: 2.5rem; +} + +h2, .h2 { + font-size: 2rem; +} + +h3, .h3 { + font-size: 1.75rem; +} + +h4, .h4 { + font-size: 1.5rem; +} + +h5, .h5 { + font-size: 1.25rem; +} + +h6, .h6 { + font-size: 1rem; +} + +.lead { + font-size: 1.25rem; + font-weight: 300; +} + +.display-1 { + font-size: 6rem; + font-weight: 300; + line-height: 1.2; +} + +.display-2 { + font-size: 5.5rem; + font-weight: 300; + line-height: 1.2; +} + +.display-3 { + font-size: 4.5rem; + font-weight: 300; + line-height: 1.2; +} + +.display-4 { + font-size: 3.5rem; + font-weight: 300; + line-height: 1.2; +} + +hr { + margin-top: 1rem; + margin-bottom: 1rem; + border: 0; + border-top: 1px solid rgba(0, 0, 0, 0.1); +} + +small, +.small { + font-size: 80%; + font-weight: 400; +} + +mark, +.mark { + padding: 0.2em; + background-color: #fcf8e3; +} + +.list-unstyled { + padding-left: 0; + list-style: none; +} + +.list-inline { + padding-left: 0; + list-style: none; +} + +.list-inline-item { + display: inline-block; +} + +.list-inline-item:not(:last-child) { + margin-right: 0.5rem; +} + +.initialism { + font-size: 90%; + text-transform: uppercase; +} + +.blockquote { + margin-bottom: 1rem; + font-size: 1.25rem; +} + +.blockquote-footer { + display: block; + font-size: 80%; + color: #6c757d; +} + +.blockquote-footer::before { + content: "\2014 \00A0"; +} + +.img-fluid { + max-width: 100%; + height: auto; +} + +.img-thumbnail { + padding: 0.25rem; + background-color: #fff; + border: 1px solid #dee2e6; + border-radius: 0.25rem; + max-width: 100%; + height: auto; +} + +.figure { + display: inline-block; +} + +.figure-img { + margin-bottom: 0.5rem; + line-height: 1; +} + +.figure-caption { + font-size: 90%; + color: #6c757d; +} + +code { + font-size: 87.5%; + color: #e83e8c; + word-break: break-word; +} + +a > code { + color: inherit; +} + +kbd { + padding: 0.2rem 0.4rem; + font-size: 87.5%; + color: #fff; + background-color: #212529; + border-radius: 0.2rem; +} + +kbd kbd { + padding: 0; + font-size: 100%; + font-weight: 700; +} + +pre { + display: block; + font-size: 87.5%; + color: #212529; +} + +pre code { + font-size: inherit; + color: inherit; + word-break: normal; +} + +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} + +.container { + width: 100%; + padding-right: 15px; + padding-left: 15px; + margin-right: auto; + margin-left: auto; +} + +@media (min-width: 576px) { + .container { + max-width: 540px; + } +} + +@media (min-width: 768px) { + .container { + max-width: 720px; + } +} + +@media (min-width: 992px) { + .container { + max-width: 960px; + } +} + +@media (min-width: 1200px) { + .container { + max-width: 1140px; + } +} + +.container-fluid { + width: 100%; + padding-right: 15px; + padding-left: 15px; + margin-right: auto; + margin-left: auto; +} + +.row { + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + margin-right: -15px; + margin-left: -15px; +} + +.no-gutters { + margin-right: 0; + margin-left: 0; +} + +.no-gutters > .col, +.no-gutters > [class*="col-"] { + padding-right: 0; + padding-left: 0; +} + +.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, +.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, +.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, +.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, +.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl, +.col-xl-auto { + position: relative; + width: 100%; + min-height: 1px; + padding-right: 15px; + padding-left: 15px; +} + +.col { + -ms-flex-preferred-size: 0; + flex-basis: 0; + -ms-flex-positive: 1; + flex-grow: 1; + max-width: 100%; +} + +.col-auto { + -ms-flex: 0 0 auto; + flex: 0 0 auto; + width: auto; + max-width: none; +} + +.col-1 { + -ms-flex: 0 0 8.333333%; + flex: 0 0 8.333333%; + max-width: 8.333333%; +} + +.col-2 { + -ms-flex: 0 0 16.666667%; + flex: 0 0 16.666667%; + max-width: 16.666667%; +} + +.col-3 { + -ms-flex: 0 0 25%; + flex: 0 0 25%; + max-width: 25%; +} + +.col-4 { + -ms-flex: 0 0 33.333333%; + flex: 0 0 33.333333%; + max-width: 33.333333%; +} + +.col-5 { + -ms-flex: 0 0 41.666667%; + flex: 0 0 41.666667%; + max-width: 41.666667%; +} + +.col-6 { + -ms-flex: 0 0 50%; + flex: 0 0 50%; + max-width: 50%; +} + +.col-7 { + -ms-flex: 0 0 58.333333%; + flex: 0 0 58.333333%; + max-width: 58.333333%; +} + +.col-8 { + -ms-flex: 0 0 66.666667%; + flex: 0 0 66.666667%; + max-width: 66.666667%; +} + +.col-9 { + -ms-flex: 0 0 75%; + flex: 0 0 75%; + max-width: 75%; +} + +.col-10 { + -ms-flex: 0 0 83.333333%; + flex: 0 0 83.333333%; + max-width: 83.333333%; +} + +.col-11 { + -ms-flex: 0 0 91.666667%; + flex: 0 0 91.666667%; + max-width: 91.666667%; +} + +.col-12 { + -ms-flex: 0 0 100%; + flex: 0 0 100%; + max-width: 100%; +} + +.order-first { + -ms-flex-order: -1; + order: -1; +} + +.order-last { + -ms-flex-order: 13; + order: 13; +} + +.order-0 { + -ms-flex-order: 0; + order: 0; +} + +.order-1 { + -ms-flex-order: 1; + order: 1; +} + +.order-2 { + -ms-flex-order: 2; + order: 2; +} + +.order-3 { + -ms-flex-order: 3; + order: 3; +} + +.order-4 { + -ms-flex-order: 4; + order: 4; +} + +.order-5 { + -ms-flex-order: 5; + order: 5; +} + +.order-6 { + -ms-flex-order: 6; + order: 6; +} + +.order-7 { + -ms-flex-order: 7; + order: 7; +} + +.order-8 { + -ms-flex-order: 8; + order: 8; +} + +.order-9 { + -ms-flex-order: 9; + order: 9; +} + +.order-10 { + -ms-flex-order: 10; + order: 10; +} + +.order-11 { + -ms-flex-order: 11; + order: 11; +} + +.order-12 { + -ms-flex-order: 12; + order: 12; +} + +.offset-1 { + margin-left: 8.333333%; +} + +.offset-2 { + margin-left: 16.666667%; +} + +.offset-3 { + margin-left: 25%; +} + +.offset-4 { + margin-left: 33.333333%; +} + +.offset-5 { + margin-left: 41.666667%; +} + +.offset-6 { + margin-left: 50%; +} + +.offset-7 { + margin-left: 58.333333%; +} + +.offset-8 { + margin-left: 66.666667%; +} + +.offset-9 { + margin-left: 75%; +} + +.offset-10 { + margin-left: 83.333333%; +} + +.offset-11 { + margin-left: 91.666667%; +} + +@media (min-width: 576px) { + .col-sm { + -ms-flex-preferred-size: 0; + flex-basis: 0; + -ms-flex-positive: 1; + flex-grow: 1; + max-width: 100%; + } + .col-sm-auto { + -ms-flex: 0 0 auto; + flex: 0 0 auto; + width: auto; + max-width: none; + } + .col-sm-1 { + -ms-flex: 0 0 8.333333%; + flex: 0 0 8.333333%; + max-width: 8.333333%; + } + .col-sm-2 { + -ms-flex: 0 0 16.666667%; + flex: 0 0 16.666667%; + max-width: 16.666667%; + } + .col-sm-3 { + -ms-flex: 0 0 25%; + flex: 0 0 25%; + max-width: 25%; + } + .col-sm-4 { + -ms-flex: 0 0 33.333333%; + flex: 0 0 33.333333%; + max-width: 33.333333%; + } + .col-sm-5 { + -ms-flex: 0 0 41.666667%; + flex: 0 0 41.666667%; + max-width: 41.666667%; + } + .col-sm-6 { + -ms-flex: 0 0 50%; + flex: 0 0 50%; + max-width: 50%; + } + .col-sm-7 { + -ms-flex: 0 0 58.333333%; + flex: 0 0 58.333333%; + max-width: 58.333333%; + } + .col-sm-8 { + -ms-flex: 0 0 66.666667%; + flex: 0 0 66.666667%; + max-width: 66.666667%; + } + .col-sm-9 { + -ms-flex: 0 0 75%; + flex: 0 0 75%; + max-width: 75%; + } + .col-sm-10 { + -ms-flex: 0 0 83.333333%; + flex: 0 0 83.333333%; + max-width: 83.333333%; + } + .col-sm-11 { + -ms-flex: 0 0 91.666667%; + flex: 0 0 91.666667%; + max-width: 91.666667%; + } + .col-sm-12 { + -ms-flex: 0 0 100%; + flex: 0 0 100%; + max-width: 100%; + } + .order-sm-first { + -ms-flex-order: -1; + order: -1; + } + .order-sm-last { + -ms-flex-order: 13; + order: 13; + } + .order-sm-0 { + -ms-flex-order: 0; + order: 0; + } + .order-sm-1 { + -ms-flex-order: 1; + order: 1; + } + .order-sm-2 { + -ms-flex-order: 2; + order: 2; + } + .order-sm-3 { + -ms-flex-order: 3; + order: 3; + } + .order-sm-4 { + -ms-flex-order: 4; + order: 4; + } + .order-sm-5 { + -ms-flex-order: 5; + order: 5; + } + .order-sm-6 { + -ms-flex-order: 6; + order: 6; + } + .order-sm-7 { + -ms-flex-order: 7; + order: 7; + } + .order-sm-8 { + -ms-flex-order: 8; + order: 8; + } + .order-sm-9 { + -ms-flex-order: 9; + order: 9; + } + .order-sm-10 { + -ms-flex-order: 10; + order: 10; + } + .order-sm-11 { + -ms-flex-order: 11; + order: 11; + } + .order-sm-12 { + -ms-flex-order: 12; + order: 12; + } + .offset-sm-0 { + margin-left: 0; + } + .offset-sm-1 { + margin-left: 8.333333%; + } + .offset-sm-2 { + margin-left: 16.666667%; + } + .offset-sm-3 { + margin-left: 25%; + } + .offset-sm-4 { + margin-left: 33.333333%; + } + .offset-sm-5 { + margin-left: 41.666667%; + } + .offset-sm-6 { + margin-left: 50%; + } + .offset-sm-7 { + margin-left: 58.333333%; + } + .offset-sm-8 { + margin-left: 66.666667%; + } + .offset-sm-9 { + margin-left: 75%; + } + .offset-sm-10 { + margin-left: 83.333333%; + } + .offset-sm-11 { + margin-left: 91.666667%; + } +} + +@media (min-width: 768px) { + .col-md { + -ms-flex-preferred-size: 0; + flex-basis: 0; + -ms-flex-positive: 1; + flex-grow: 1; + max-width: 100%; + } + .col-md-auto { + -ms-flex: 0 0 auto; + flex: 0 0 auto; + width: auto; + max-width: none; + } + .col-md-1 { + -ms-flex: 0 0 8.333333%; + flex: 0 0 8.333333%; + max-width: 8.333333%; + } + .col-md-2 { + -ms-flex: 0 0 16.666667%; + flex: 0 0 16.666667%; + max-width: 16.666667%; + } + .col-md-3 { + -ms-flex: 0 0 25%; + flex: 0 0 25%; + max-width: 25%; + } + .col-md-4 { + -ms-flex: 0 0 33.333333%; + flex: 0 0 33.333333%; + max-width: 33.333333%; + } + .col-md-5 { + -ms-flex: 0 0 41.666667%; + flex: 0 0 41.666667%; + max-width: 41.666667%; + } + .col-md-6 { + -ms-flex: 0 0 50%; + flex: 0 0 50%; + max-width: 50%; + } + .col-md-7 { + -ms-flex: 0 0 58.333333%; + flex: 0 0 58.333333%; + max-width: 58.333333%; + } + .col-md-8 { + -ms-flex: 0 0 66.666667%; + flex: 0 0 66.666667%; + max-width: 66.666667%; + } + .col-md-9 { + -ms-flex: 0 0 75%; + flex: 0 0 75%; + max-width: 75%; + } + .col-md-10 { + -ms-flex: 0 0 83.333333%; + flex: 0 0 83.333333%; + max-width: 83.333333%; + } + .col-md-11 { + -ms-flex: 0 0 91.666667%; + flex: 0 0 91.666667%; + max-width: 91.666667%; + } + .col-md-12 { + -ms-flex: 0 0 100%; + flex: 0 0 100%; + max-width: 100%; + } + .order-md-first { + -ms-flex-order: -1; + order: -1; + } + .order-md-last { + -ms-flex-order: 13; + order: 13; + } + .order-md-0 { + -ms-flex-order: 0; + order: 0; + } + .order-md-1 { + -ms-flex-order: 1; + order: 1; + } + .order-md-2 { + -ms-flex-order: 2; + order: 2; + } + .order-md-3 { + -ms-flex-order: 3; + order: 3; + } + .order-md-4 { + -ms-flex-order: 4; + order: 4; + } + .order-md-5 { + -ms-flex-order: 5; + order: 5; + } + .order-md-6 { + -ms-flex-order: 6; + order: 6; + } + .order-md-7 { + -ms-flex-order: 7; + order: 7; + } + .order-md-8 { + -ms-flex-order: 8; + order: 8; + } + .order-md-9 { + -ms-flex-order: 9; + order: 9; + } + .order-md-10 { + -ms-flex-order: 10; + order: 10; + } + .order-md-11 { + -ms-flex-order: 11; + order: 11; + } + .order-md-12 { + -ms-flex-order: 12; + order: 12; + } + .offset-md-0 { + margin-left: 0; + } + .offset-md-1 { + margin-left: 8.333333%; + } + .offset-md-2 { + margin-left: 16.666667%; + } + .offset-md-3 { + margin-left: 25%; + } + .offset-md-4 { + margin-left: 33.333333%; + } + .offset-md-5 { + margin-left: 41.666667%; + } + .offset-md-6 { + margin-left: 50%; + } + .offset-md-7 { + margin-left: 58.333333%; + } + .offset-md-8 { + margin-left: 66.666667%; + } + .offset-md-9 { + margin-left: 75%; + } + .offset-md-10 { + margin-left: 83.333333%; + } + .offset-md-11 { + margin-left: 91.666667%; + } +} + +@media (min-width: 992px) { + .col-lg { + -ms-flex-preferred-size: 0; + flex-basis: 0; + -ms-flex-positive: 1; + flex-grow: 1; + max-width: 100%; + } + .col-lg-auto { + -ms-flex: 0 0 auto; + flex: 0 0 auto; + width: auto; + max-width: none; + } + .col-lg-1 { + -ms-flex: 0 0 8.333333%; + flex: 0 0 8.333333%; + max-width: 8.333333%; + } + .col-lg-2 { + -ms-flex: 0 0 16.666667%; + flex: 0 0 16.666667%; + max-width: 16.666667%; + } + .col-lg-3 { + -ms-flex: 0 0 25%; + flex: 0 0 25%; + max-width: 25%; + } + .col-lg-4 { + -ms-flex: 0 0 33.333333%; + flex: 0 0 33.333333%; + max-width: 33.333333%; + } + .col-lg-5 { + -ms-flex: 0 0 41.666667%; + flex: 0 0 41.666667%; + max-width: 41.666667%; + } + .col-lg-6 { + -ms-flex: 0 0 50%; + flex: 0 0 50%; + max-width: 50%; + } + .col-lg-7 { + -ms-flex: 0 0 58.333333%; + flex: 0 0 58.333333%; + max-width: 58.333333%; + } + .col-lg-8 { + -ms-flex: 0 0 66.666667%; + flex: 0 0 66.666667%; + max-width: 66.666667%; + } + .col-lg-9 { + -ms-flex: 0 0 75%; + flex: 0 0 75%; + max-width: 75%; + } + .col-lg-10 { + -ms-flex: 0 0 83.333333%; + flex: 0 0 83.333333%; + max-width: 83.333333%; + } + .col-lg-11 { + -ms-flex: 0 0 91.666667%; + flex: 0 0 91.666667%; + max-width: 91.666667%; + } + .col-lg-12 { + -ms-flex: 0 0 100%; + flex: 0 0 100%; + max-width: 100%; + } + .order-lg-first { + -ms-flex-order: -1; + order: -1; + } + .order-lg-last { + -ms-flex-order: 13; + order: 13; + } + .order-lg-0 { + -ms-flex-order: 0; + order: 0; + } + .order-lg-1 { + -ms-flex-order: 1; + order: 1; + } + .order-lg-2 { + -ms-flex-order: 2; + order: 2; + } + .order-lg-3 { + -ms-flex-order: 3; + order: 3; + } + .order-lg-4 { + -ms-flex-order: 4; + order: 4; + } + .order-lg-5 { + -ms-flex-order: 5; + order: 5; + } + .order-lg-6 { + -ms-flex-order: 6; + order: 6; + } + .order-lg-7 { + -ms-flex-order: 7; + order: 7; + } + .order-lg-8 { + -ms-flex-order: 8; + order: 8; + } + .order-lg-9 { + -ms-flex-order: 9; + order: 9; + } + .order-lg-10 { + -ms-flex-order: 10; + order: 10; + } + .order-lg-11 { + -ms-flex-order: 11; + order: 11; + } + .order-lg-12 { + -ms-flex-order: 12; + order: 12; + } + .offset-lg-0 { + margin-left: 0; + } + .offset-lg-1 { + margin-left: 8.333333%; + } + .offset-lg-2 { + margin-left: 16.666667%; + } + .offset-lg-3 { + margin-left: 25%; + } + .offset-lg-4 { + margin-left: 33.333333%; + } + .offset-lg-5 { + margin-left: 41.666667%; + } + .offset-lg-6 { + margin-left: 50%; + } + .offset-lg-7 { + margin-left: 58.333333%; + } + .offset-lg-8 { + margin-left: 66.666667%; + } + .offset-lg-9 { + margin-left: 75%; + } + .offset-lg-10 { + margin-left: 83.333333%; + } + .offset-lg-11 { + margin-left: 91.666667%; + } +} + +@media (min-width: 1200px) { + .col-xl { + -ms-flex-preferred-size: 0; + flex-basis: 0; + -ms-flex-positive: 1; + flex-grow: 1; + max-width: 100%; + } + .col-xl-auto { + -ms-flex: 0 0 auto; + flex: 0 0 auto; + width: auto; + max-width: none; + } + .col-xl-1 { + -ms-flex: 0 0 8.333333%; + flex: 0 0 8.333333%; + max-width: 8.333333%; + } + .col-xl-2 { + -ms-flex: 0 0 16.666667%; + flex: 0 0 16.666667%; + max-width: 16.666667%; + } + .col-xl-3 { + -ms-flex: 0 0 25%; + flex: 0 0 25%; + max-width: 25%; + } + .col-xl-4 { + -ms-flex: 0 0 33.333333%; + flex: 0 0 33.333333%; + max-width: 33.333333%; + } + .col-xl-5 { + -ms-flex: 0 0 41.666667%; + flex: 0 0 41.666667%; + max-width: 41.666667%; + } + .col-xl-6 { + -ms-flex: 0 0 50%; + flex: 0 0 50%; + max-width: 50%; + } + .col-xl-7 { + -ms-flex: 0 0 58.333333%; + flex: 0 0 58.333333%; + max-width: 58.333333%; + } + .col-xl-8 { + -ms-flex: 0 0 66.666667%; + flex: 0 0 66.666667%; + max-width: 66.666667%; + } + .col-xl-9 { + -ms-flex: 0 0 75%; + flex: 0 0 75%; + max-width: 75%; + } + .col-xl-10 { + -ms-flex: 0 0 83.333333%; + flex: 0 0 83.333333%; + max-width: 83.333333%; + } + .col-xl-11 { + -ms-flex: 0 0 91.666667%; + flex: 0 0 91.666667%; + max-width: 91.666667%; + } + .col-xl-12 { + -ms-flex: 0 0 100%; + flex: 0 0 100%; + max-width: 100%; + } + .order-xl-first { + -ms-flex-order: -1; + order: -1; + } + .order-xl-last { + -ms-flex-order: 13; + order: 13; + } + .order-xl-0 { + -ms-flex-order: 0; + order: 0; + } + .order-xl-1 { + -ms-flex-order: 1; + order: 1; + } + .order-xl-2 { + -ms-flex-order: 2; + order: 2; + } + .order-xl-3 { + -ms-flex-order: 3; + order: 3; + } + .order-xl-4 { + -ms-flex-order: 4; + order: 4; + } + .order-xl-5 { + -ms-flex-order: 5; + order: 5; + } + .order-xl-6 { + -ms-flex-order: 6; + order: 6; + } + .order-xl-7 { + -ms-flex-order: 7; + order: 7; + } + .order-xl-8 { + -ms-flex-order: 8; + order: 8; + } + .order-xl-9 { + -ms-flex-order: 9; + order: 9; + } + .order-xl-10 { + -ms-flex-order: 10; + order: 10; + } + .order-xl-11 { + -ms-flex-order: 11; + order: 11; + } + .order-xl-12 { + -ms-flex-order: 12; + order: 12; + } + .offset-xl-0 { + margin-left: 0; + } + .offset-xl-1 { + margin-left: 8.333333%; + } + .offset-xl-2 { + margin-left: 16.666667%; + } + .offset-xl-3 { + margin-left: 25%; + } + .offset-xl-4 { + margin-left: 33.333333%; + } + .offset-xl-5 { + margin-left: 41.666667%; + } + .offset-xl-6 { + margin-left: 50%; + } + .offset-xl-7 { + margin-left: 58.333333%; + } + .offset-xl-8 { + margin-left: 66.666667%; + } + .offset-xl-9 { + margin-left: 75%; + } + .offset-xl-10 { + margin-left: 83.333333%; + } + .offset-xl-11 { + margin-left: 91.666667%; + } +} + +.table { + width: 100%; + max-width: 100%; + margin-bottom: 1rem; + background-color: transparent; +} + +.table th, +.table td { + padding: 0.75rem; + vertical-align: top; + border-top: 1px solid #dee2e6; +} + +.table thead th { + vertical-align: bottom; + border-bottom: 2px solid #dee2e6; +} + +.table tbody + tbody { + border-top: 2px solid #dee2e6; +} + +.table .table { + background-color: #fff; +} + +.table-sm th, +.table-sm td { + padding: 0.3rem; +} + +.table-bordered { + border: 1px solid #dee2e6; +} + +.table-bordered th, +.table-bordered td { + border: 1px solid #dee2e6; +} + +.table-bordered thead th, +.table-bordered thead td { + border-bottom-width: 2px; +} + +.table-borderless th, +.table-borderless td, +.table-borderless thead th, +.table-borderless tbody + tbody { + border: 0; +} + +.table-striped tbody tr:nth-of-type(odd) { + background-color: rgba(0, 0, 0, 0.05); +} + +.table-hover tbody tr:hover { + background-color: rgba(0, 0, 0, 0.075); +} + +.table-primary, +.table-primary > th, +.table-primary > td { + background-color: #b8daff; +} + +.table-hover .table-primary:hover { + background-color: #9fcdff; +} + +.table-hover .table-primary:hover > td, +.table-hover .table-primary:hover > th { + background-color: #9fcdff; +} + +.table-secondary, +.table-secondary > th, +.table-secondary > td { + background-color: #d6d8db; +} + +.table-hover .table-secondary:hover { + background-color: #c8cbcf; +} + +.table-hover .table-secondary:hover > td, +.table-hover .table-secondary:hover > th { + background-color: #c8cbcf; +} + +.table-success, +.table-success > th, +.table-success > td { + background-color: #c3e6cb; +} + +.table-hover .table-success:hover { + background-color: #b1dfbb; +} + +.table-hover .table-success:hover > td, +.table-hover .table-success:hover > th { + background-color: #b1dfbb; +} + +.table-info, +.table-info > th, +.table-info > td { + background-color: #bee5eb; +} + +.table-hover .table-info:hover { + background-color: #abdde5; +} + +.table-hover .table-info:hover > td, +.table-hover .table-info:hover > th { + background-color: #abdde5; +} + +.table-warning, +.table-warning > th, +.table-warning > td { + background-color: #ffeeba; +} + +.table-hover .table-warning:hover { + background-color: #ffe8a1; +} + +.table-hover .table-warning:hover > td, +.table-hover .table-warning:hover > th { + background-color: #ffe8a1; +} + +.table-danger, +.table-danger > th, +.table-danger > td { + background-color: #f5c6cb; +} + +.table-hover .table-danger:hover { + background-color: #f1b0b7; +} + +.table-hover .table-danger:hover > td, +.table-hover .table-danger:hover > th { + background-color: #f1b0b7; +} + +.table-light, +.table-light > th, +.table-light > td { + background-color: #fdfdfe; +} + +.table-hover .table-light:hover { + background-color: #ececf6; +} + +.table-hover .table-light:hover > td, +.table-hover .table-light:hover > th { + background-color: #ececf6; +} + +.table-dark, +.table-dark > th, +.table-dark > td { + background-color: #c6c8ca; +} + +.table-hover .table-dark:hover { + background-color: #b9bbbe; +} + +.table-hover .table-dark:hover > td, +.table-hover .table-dark:hover > th { + background-color: #b9bbbe; +} + +.table-active, +.table-active > th, +.table-active > td { + background-color: rgba(0, 0, 0, 0.075); +} + +.table-hover .table-active:hover { + background-color: rgba(0, 0, 0, 0.075); +} + +.table-hover .table-active:hover > td, +.table-hover .table-active:hover > th { + background-color: rgba(0, 0, 0, 0.075); +} + +.table .thead-dark th { + color: #fff; + background-color: #212529; + border-color: #32383e; +} + +.table .thead-light th { + color: #495057; + background-color: #e9ecef; + border-color: #dee2e6; +} + +.table-dark { + color: #fff; + background-color: #212529; +} + +.table-dark th, +.table-dark td, +.table-dark thead th { + border-color: #32383e; +} + +.table-dark.table-bordered { + border: 0; +} + +.table-dark.table-striped tbody tr:nth-of-type(odd) { + background-color: rgba(255, 255, 255, 0.05); +} + +.table-dark.table-hover tbody tr:hover { + background-color: rgba(255, 255, 255, 0.075); +} + +@media (max-width: 575.98px) { + .table-responsive-sm { + display: block; + width: 100%; + overflow-x: auto; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: -ms-autohiding-scrollbar; + } + .table-responsive-sm > .table-bordered { + border: 0; + } +} + +@media (max-width: 767.98px) { + .table-responsive-md { + display: block; + width: 100%; + overflow-x: auto; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: -ms-autohiding-scrollbar; + } + .table-responsive-md > .table-bordered { + border: 0; + } +} + +@media (max-width: 991.98px) { + .table-responsive-lg { + display: block; + width: 100%; + overflow-x: auto; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: -ms-autohiding-scrollbar; + } + .table-responsive-lg > .table-bordered { + border: 0; + } +} + +@media (max-width: 1199.98px) { + .table-responsive-xl { + display: block; + width: 100%; + overflow-x: auto; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: -ms-autohiding-scrollbar; + } + .table-responsive-xl > .table-bordered { + border: 0; + } +} + +.table-responsive { + display: block; + width: 100%; + overflow-x: auto; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: -ms-autohiding-scrollbar; +} + +.table-responsive > .table-bordered { + border: 0; +} + +.form-control { + display: block; + width: 100%; + padding: 0.375rem 0.75rem; + font-size: 1rem; + line-height: 1.5; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: 0.25rem; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; +} + +@media screen and (prefers-reduced-motion: reduce) { + .form-control { + transition: none; + } +} + +.form-control::-ms-expand { + background-color: transparent; + border: 0; +} + +.form-control:focus { + color: #495057; + background-color: #fff; + border-color: #80bdff; + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +} + +.form-control::-webkit-input-placeholder { + color: #6c757d; + opacity: 1; +} + +.form-control::-moz-placeholder { + color: #6c757d; + opacity: 1; +} + +.form-control:-ms-input-placeholder { + color: #6c757d; + opacity: 1; +} + +.form-control::-ms-input-placeholder { + color: #6c757d; + opacity: 1; +} + +.form-control::placeholder { + color: #6c757d; + opacity: 1; +} + +.form-control:disabled, .form-control[readonly] { + background-color: #e9ecef; + opacity: 1; +} + +select.form-control:not([size]):not([multiple]) { + height: calc(2.25rem + 2px); +} + +select.form-control:focus::-ms-value { + color: #495057; + background-color: #fff; +} + +.form-control-file, +.form-control-range { + display: block; + width: 100%; +} + +.col-form-label { + padding-top: calc(0.375rem + 1px); + padding-bottom: calc(0.375rem + 1px); + margin-bottom: 0; + font-size: inherit; + line-height: 1.5; +} + +.col-form-label-lg { + padding-top: calc(0.5rem + 1px); + padding-bottom: calc(0.5rem + 1px); + font-size: 1.25rem; + line-height: 1.5; +} + +.col-form-label-sm { + padding-top: calc(0.25rem + 1px); + padding-bottom: calc(0.25rem + 1px); + font-size: 0.875rem; + line-height: 1.5; +} + +.form-control-plaintext { + display: block; + width: 100%; + padding-top: 0.375rem; + padding-bottom: 0.375rem; + margin-bottom: 0; + line-height: 1.5; + color: #212529; + background-color: transparent; + border: solid transparent; + border-width: 1px 0; +} + +.form-control-plaintext.form-control-sm, .input-group-sm > .form-control-plaintext.form-control, +.input-group-sm > .input-group-prepend > .form-control-plaintext.input-group-text, +.input-group-sm > .input-group-append > .form-control-plaintext.input-group-text, +.input-group-sm > .input-group-prepend > .form-control-plaintext.btn, +.input-group-sm > .input-group-append > .form-control-plaintext.btn, .form-control-plaintext.form-control-lg, .input-group-lg > .form-control-plaintext.form-control, +.input-group-lg > .input-group-prepend > .form-control-plaintext.input-group-text, +.input-group-lg > .input-group-append > .form-control-plaintext.input-group-text, +.input-group-lg > .input-group-prepend > .form-control-plaintext.btn, +.input-group-lg > .input-group-append > .form-control-plaintext.btn { + padding-right: 0; + padding-left: 0; +} + +.form-control-sm, .input-group-sm > .form-control, +.input-group-sm > .input-group-prepend > .input-group-text, +.input-group-sm > .input-group-append > .input-group-text, +.input-group-sm > .input-group-prepend > .btn, +.input-group-sm > .input-group-append > .btn { + padding: 0.25rem 0.5rem; + font-size: 0.875rem; + line-height: 1.5; + border-radius: 0.2rem; +} + +select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.form-control:not([size]):not([multiple]), +.input-group-sm > .input-group-prepend > select.input-group-text:not([size]):not([multiple]), +.input-group-sm > .input-group-append > select.input-group-text:not([size]):not([multiple]), +.input-group-sm > .input-group-prepend > select.btn:not([size]):not([multiple]), +.input-group-sm > .input-group-append > select.btn:not([size]):not([multiple]) { + height: calc(1.8125rem + 2px); +} + +.form-control-lg, .input-group-lg > .form-control, +.input-group-lg > .input-group-prepend > .input-group-text, +.input-group-lg > .input-group-append > .input-group-text, +.input-group-lg > .input-group-prepend > .btn, +.input-group-lg > .input-group-append > .btn { + padding: 0.5rem 1rem; + font-size: 1.25rem; + line-height: 1.5; + border-radius: 0.3rem; +} + +select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.form-control:not([size]):not([multiple]), +.input-group-lg > .input-group-prepend > select.input-group-text:not([size]):not([multiple]), +.input-group-lg > .input-group-append > select.input-group-text:not([size]):not([multiple]), +.input-group-lg > .input-group-prepend > select.btn:not([size]):not([multiple]), +.input-group-lg > .input-group-append > select.btn:not([size]):not([multiple]) { + height: calc(2.875rem + 2px); +} + +.form-group { + margin-bottom: 1rem; +} + +.form-text { + display: block; + margin-top: 0.25rem; +} + +.form-row { + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + margin-right: -5px; + margin-left: -5px; +} + +.form-row > .col, +.form-row > [class*="col-"] { + padding-right: 5px; + padding-left: 5px; +} + +.form-check { + position: relative; + display: block; + padding-left: 1.25rem; +} + +.form-check-input { + position: absolute; + margin-top: 0.3rem; + margin-left: -1.25rem; +} + +.form-check-input:disabled ~ .form-check-label { + color: #6c757d; +} + +.form-check-label { + margin-bottom: 0; +} + +.form-check-inline { + display: -ms-inline-flexbox; + display: inline-flex; + -ms-flex-align: center; + align-items: center; + padding-left: 0; + margin-right: 0.75rem; +} + +.form-check-inline .form-check-input { + position: static; + margin-top: 0; + margin-right: 0.3125rem; + margin-left: 0; +} + +.valid-feedback { + display: none; + width: 100%; + margin-top: 0.25rem; + font-size: 80%; + color: #28a745; +} + +.valid-tooltip { + position: absolute; + top: 100%; + z-index: 5; + display: none; + max-width: 100%; + padding: .5rem; + margin-top: .1rem; + font-size: .875rem; + line-height: 1; + color: #fff; + background-color: rgba(40, 167, 69, 0.8); + border-radius: .2rem; +} + +.was-validated .form-control:valid, .form-control.is-valid, .was-validated +.custom-select:valid, +.custom-select.is-valid { + border-color: #28a745; +} + +.was-validated .form-control:valid:focus, .form-control.is-valid:focus, .was-validated +.custom-select:valid:focus, +.custom-select.is-valid:focus { + border-color: #28a745; + box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25); +} + +.was-validated .form-control:valid ~ .valid-feedback, +.was-validated .form-control:valid ~ .valid-tooltip, .form-control.is-valid ~ .valid-feedback, +.form-control.is-valid ~ .valid-tooltip, .was-validated +.custom-select:valid ~ .valid-feedback, +.was-validated +.custom-select:valid ~ .valid-tooltip, +.custom-select.is-valid ~ .valid-feedback, +.custom-select.is-valid ~ .valid-tooltip { + display: block; +} + +.was-validated .form-control-file:valid ~ .valid-feedback, +.was-validated .form-control-file:valid ~ .valid-tooltip, .form-control-file.is-valid ~ .valid-feedback, +.form-control-file.is-valid ~ .valid-tooltip { + display: block; +} + +.was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label { + color: #28a745; +} + +.was-validated .form-check-input:valid ~ .valid-feedback, +.was-validated .form-check-input:valid ~ .valid-tooltip, .form-check-input.is-valid ~ .valid-feedback, +.form-check-input.is-valid ~ .valid-tooltip { + display: block; +} + +.was-validated .custom-control-input:valid ~ .custom-control-label, .custom-control-input.is-valid ~ .custom-control-label { + color: #28a745; +} + +.was-validated .custom-control-input:valid ~ .custom-control-label::before, .custom-control-input.is-valid ~ .custom-control-label::before { + background-color: #71dd8a; +} + +.was-validated .custom-control-input:valid ~ .valid-feedback, +.was-validated .custom-control-input:valid ~ .valid-tooltip, .custom-control-input.is-valid ~ .valid-feedback, +.custom-control-input.is-valid ~ .valid-tooltip { + display: block; +} + +.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before { + background-color: #34ce57; +} + +.was-validated .custom-control-input:valid:focus ~ .custom-control-label::before, .custom-control-input.is-valid:focus ~ .custom-control-label::before { + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(40, 167, 69, 0.25); +} + +.was-validated .custom-file-input:valid ~ .custom-file-label, .custom-file-input.is-valid ~ .custom-file-label { + border-color: #28a745; +} + +.was-validated .custom-file-input:valid ~ .custom-file-label::before, .custom-file-input.is-valid ~ .custom-file-label::before { + border-color: inherit; +} + +.was-validated .custom-file-input:valid ~ .valid-feedback, +.was-validated .custom-file-input:valid ~ .valid-tooltip, .custom-file-input.is-valid ~ .valid-feedback, +.custom-file-input.is-valid ~ .valid-tooltip { + display: block; +} + +.was-validated .custom-file-input:valid:focus ~ .custom-file-label, .custom-file-input.is-valid:focus ~ .custom-file-label { + box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25); +} + +.invalid-feedback { + display: none; + width: 100%; + margin-top: 0.25rem; + font-size: 80%; + color: #dc3545; +} + +.invalid-tooltip { + position: absolute; + top: 100%; + z-index: 5; + display: none; + max-width: 100%; + padding: .5rem; + margin-top: .1rem; + font-size: .875rem; + line-height: 1; + color: #fff; + background-color: rgba(220, 53, 69, 0.8); + border-radius: .2rem; +} + +.was-validated .form-control:invalid, .form-control.is-invalid, .was-validated +.custom-select:invalid, +.custom-select.is-invalid { + border-color: #dc3545; +} + +.was-validated .form-control:invalid:focus, .form-control.is-invalid:focus, .was-validated +.custom-select:invalid:focus, +.custom-select.is-invalid:focus { + border-color: #dc3545; + box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25); +} + +.was-validated .form-control:invalid ~ .invalid-feedback, +.was-validated .form-control:invalid ~ .invalid-tooltip, .form-control.is-invalid ~ .invalid-feedback, +.form-control.is-invalid ~ .invalid-tooltip, .was-validated +.custom-select:invalid ~ .invalid-feedback, +.was-validated +.custom-select:invalid ~ .invalid-tooltip, +.custom-select.is-invalid ~ .invalid-feedback, +.custom-select.is-invalid ~ .invalid-tooltip { + display: block; +} + +.was-validated .form-control-file:invalid ~ .invalid-feedback, +.was-validated .form-control-file:invalid ~ .invalid-tooltip, .form-control-file.is-invalid ~ .invalid-feedback, +.form-control-file.is-invalid ~ .invalid-tooltip { + display: block; +} + +.was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label { + color: #dc3545; +} + +.was-validated .form-check-input:invalid ~ .invalid-feedback, +.was-validated .form-check-input:invalid ~ .invalid-tooltip, .form-check-input.is-invalid ~ .invalid-feedback, +.form-check-input.is-invalid ~ .invalid-tooltip { + display: block; +} + +.was-validated .custom-control-input:invalid ~ .custom-control-label, .custom-control-input.is-invalid ~ .custom-control-label { + color: #dc3545; +} + +.was-validated .custom-control-input:invalid ~ .custom-control-label::before, .custom-control-input.is-invalid ~ .custom-control-label::before { + background-color: #efa2a9; +} + +.was-validated .custom-control-input:invalid ~ .invalid-feedback, +.was-validated .custom-control-input:invalid ~ .invalid-tooltip, .custom-control-input.is-invalid ~ .invalid-feedback, +.custom-control-input.is-invalid ~ .invalid-tooltip { + display: block; +} + +.was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before, .custom-control-input.is-invalid:checked ~ .custom-control-label::before { + background-color: #e4606d; +} + +.was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before, .custom-control-input.is-invalid:focus ~ .custom-control-label::before { + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(220, 53, 69, 0.25); +} + +.was-validated .custom-file-input:invalid ~ .custom-file-label, .custom-file-input.is-invalid ~ .custom-file-label { + border-color: #dc3545; +} + +.was-validated .custom-file-input:invalid ~ .custom-file-label::before, .custom-file-input.is-invalid ~ .custom-file-label::before { + border-color: inherit; +} + +.was-validated .custom-file-input:invalid ~ .invalid-feedback, +.was-validated .custom-file-input:invalid ~ .invalid-tooltip, .custom-file-input.is-invalid ~ .invalid-feedback, +.custom-file-input.is-invalid ~ .invalid-tooltip { + display: block; +} + +.was-validated .custom-file-input:invalid:focus ~ .custom-file-label, .custom-file-input.is-invalid:focus ~ .custom-file-label { + box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25); +} + +.form-inline { + display: -ms-flexbox; + display: flex; + -ms-flex-flow: row wrap; + flex-flow: row wrap; + -ms-flex-align: center; + align-items: center; +} + +.form-inline .form-check { + width: 100%; +} + +@media (min-width: 576px) { + .form-inline label { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + -ms-flex-pack: center; + justify-content: center; + margin-bottom: 0; + } + .form-inline .form-group { + display: -ms-flexbox; + display: flex; + -ms-flex: 0 0 auto; + flex: 0 0 auto; + -ms-flex-flow: row wrap; + flex-flow: row wrap; + -ms-flex-align: center; + align-items: center; + margin-bottom: 0; + } + .form-inline .form-control { + display: inline-block; + width: auto; + vertical-align: middle; + } + .form-inline .form-control-plaintext { + display: inline-block; + } + .form-inline .input-group, + .form-inline .custom-select { + width: auto; + } + .form-inline .form-check { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + -ms-flex-pack: center; + justify-content: center; + width: auto; + padding-left: 0; + } + .form-inline .form-check-input { + position: relative; + margin-top: 0; + margin-right: 0.25rem; + margin-left: 0; + } + .form-inline .custom-control { + -ms-flex-align: center; + align-items: center; + -ms-flex-pack: center; + justify-content: center; + } + .form-inline .custom-control-label { + margin-bottom: 0; + } +} + +.btn { + display: inline-block; + font-weight: 400; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + border: 1px solid transparent; + padding: 0.375rem 0.75rem; + font-size: 1rem; + line-height: 1.5; + border-radius: 0.25rem; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; +} + +@media screen and (prefers-reduced-motion: reduce) { + .btn { + transition: none; + } +} + +.btn:hover, .btn:focus { + text-decoration: none; +} + +.btn:focus, .btn.focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +} + +.btn.disabled, .btn:disabled { + opacity: 0.65; +} + +.btn:not(:disabled):not(.disabled) { + cursor: pointer; +} + +.btn:not(:disabled):not(.disabled):active, .btn:not(:disabled):not(.disabled).active { + background-image: none; +} + +a.btn.disabled, +fieldset:disabled a.btn { + pointer-events: none; +} + +.btn-primary { + color: #fff; + background-color: #007bff; + border-color: #007bff; +} + +.btn-primary:hover { + color: #fff; + background-color: #0069d9; + border-color: #0062cc; +} + +.btn-primary:focus, .btn-primary.focus { + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5); +} + +.btn-primary.disabled, .btn-primary:disabled { + color: #fff; + background-color: #007bff; + border-color: #007bff; +} + +.btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active, +.show > .btn-primary.dropdown-toggle { + color: #fff; + background-color: #0062cc; + border-color: #005cbf; +} + +.btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus, +.show > .btn-primary.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5); +} + +.btn-secondary { + color: #fff; + background-color: #6c757d; + border-color: #6c757d; +} + +.btn-secondary:hover { + color: #fff; + background-color: #5a6268; + border-color: #545b62; +} + +.btn-secondary:focus, .btn-secondary.focus { + box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); +} + +.btn-secondary.disabled, .btn-secondary:disabled { + color: #fff; + background-color: #6c757d; + border-color: #6c757d; +} + +.btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, +.show > .btn-secondary.dropdown-toggle { + color: #fff; + background-color: #545b62; + border-color: #4e555b; +} + +.btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, +.show > .btn-secondary.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); +} + +.btn-success { + color: #fff; + background-color: #28a745; + border-color: #28a745; +} + +.btn-success:hover { + color: #fff; + background-color: #218838; + border-color: #1e7e34; +} + +.btn-success:focus, .btn-success.focus { + box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5); +} + +.btn-success.disabled, .btn-success:disabled { + color: #fff; + background-color: #28a745; + border-color: #28a745; +} + +.btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active, +.show > .btn-success.dropdown-toggle { + color: #fff; + background-color: #1e7e34; + border-color: #1c7430; +} + +.btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus, +.show > .btn-success.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5); +} + +.btn-info { + color: #fff; + background-color: #17a2b8; + border-color: #17a2b8; +} + +.btn-info:hover { + color: #fff; + background-color: #138496; + border-color: #117a8b; +} + +.btn-info:focus, .btn-info.focus { + box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5); +} + +.btn-info.disabled, .btn-info:disabled { + color: #fff; + background-color: #17a2b8; + border-color: #17a2b8; +} + +.btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active, +.show > .btn-info.dropdown-toggle { + color: #fff; + background-color: #117a8b; + border-color: #10707f; +} + +.btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus, +.show > .btn-info.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5); +} + +.btn-warning { + color: #212529; + background-color: #ffc107; + border-color: #ffc107; +} + +.btn-warning:hover { + color: #212529; + background-color: #e0a800; + border-color: #d39e00; +} + +.btn-warning:focus, .btn-warning.focus { + box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5); +} + +.btn-warning.disabled, .btn-warning:disabled { + color: #212529; + background-color: #ffc107; + border-color: #ffc107; +} + +.btn-warning:not(:disabled):not(.disabled):active, .btn-warning:not(:disabled):not(.disabled).active, +.show > .btn-warning.dropdown-toggle { + color: #212529; + background-color: #d39e00; + border-color: #c69500; +} + +.btn-warning:not(:disabled):not(.disabled):active:focus, .btn-warning:not(:disabled):not(.disabled).active:focus, +.show > .btn-warning.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5); +} + +.btn-danger { + color: #fff; + background-color: #dc3545; + border-color: #dc3545; +} + +.btn-danger:hover { + color: #fff; + background-color: #c82333; + border-color: #bd2130; +} + +.btn-danger:focus, .btn-danger.focus { + box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5); +} + +.btn-danger.disabled, .btn-danger:disabled { + color: #fff; + background-color: #dc3545; + border-color: #dc3545; +} + +.btn-danger:not(:disabled):not(.disabled):active, .btn-danger:not(:disabled):not(.disabled).active, +.show > .btn-danger.dropdown-toggle { + color: #fff; + background-color: #bd2130; + border-color: #b21f2d; +} + +.btn-danger:not(:disabled):not(.disabled):active:focus, .btn-danger:not(:disabled):not(.disabled).active:focus, +.show > .btn-danger.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5); +} + +.btn-light { + color: #212529; + background-color: #f8f9fa; + border-color: #f8f9fa; +} + +.btn-light:hover { + color: #212529; + background-color: #e2e6ea; + border-color: #dae0e5; +} + +.btn-light:focus, .btn-light.focus { + box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5); +} + +.btn-light.disabled, .btn-light:disabled { + color: #212529; + background-color: #f8f9fa; + border-color: #f8f9fa; +} + +.btn-light:not(:disabled):not(.disabled):active, .btn-light:not(:disabled):not(.disabled).active, +.show > .btn-light.dropdown-toggle { + color: #212529; + background-color: #dae0e5; + border-color: #d3d9df; +} + +.btn-light:not(:disabled):not(.disabled):active:focus, .btn-light:not(:disabled):not(.disabled).active:focus, +.show > .btn-light.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5); +} + +.btn-dark { + color: #fff; + background-color: #343a40; + border-color: #343a40; +} + +.btn-dark:hover { + color: #fff; + background-color: #23272b; + border-color: #1d2124; +} + +.btn-dark:focus, .btn-dark.focus { + box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5); +} + +.btn-dark.disabled, .btn-dark:disabled { + color: #fff; + background-color: #343a40; + border-color: #343a40; +} + +.btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active, +.show > .btn-dark.dropdown-toggle { + color: #fff; + background-color: #1d2124; + border-color: #171a1d; +} + +.btn-dark:not(:disabled):not(.disabled):active:focus, .btn-dark:not(:disabled):not(.disabled).active:focus, +.show > .btn-dark.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5); +} + +.btn-outline-primary { + color: #007bff; + background-color: transparent; + background-image: none; + border-color: #007bff; +} + +.btn-outline-primary:hover { + color: #fff; + background-color: #007bff; + border-color: #007bff; +} + +.btn-outline-primary:focus, .btn-outline-primary.focus { + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5); +} + +.btn-outline-primary.disabled, .btn-outline-primary:disabled { + color: #007bff; + background-color: transparent; +} + +.btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active, +.show > .btn-outline-primary.dropdown-toggle { + color: #fff; + background-color: #007bff; + border-color: #007bff; +} + +.btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus, +.show > .btn-outline-primary.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5); +} + +.btn-outline-secondary { + color: #6c757d; + background-color: transparent; + background-image: none; + border-color: #6c757d; +} + +.btn-outline-secondary:hover { + color: #fff; + background-color: #6c757d; + border-color: #6c757d; +} + +.btn-outline-secondary:focus, .btn-outline-secondary.focus { + box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); +} + +.btn-outline-secondary.disabled, .btn-outline-secondary:disabled { + color: #6c757d; + background-color: transparent; +} + +.btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active, +.show > .btn-outline-secondary.dropdown-toggle { + color: #fff; + background-color: #6c757d; + border-color: #6c757d; +} + +.btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, +.show > .btn-outline-secondary.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); +} + +.btn-outline-success { + color: #28a745; + background-color: transparent; + background-image: none; + border-color: #28a745; +} + +.btn-outline-success:hover { + color: #fff; + background-color: #28a745; + border-color: #28a745; +} + +.btn-outline-success:focus, .btn-outline-success.focus { + box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5); +} + +.btn-outline-success.disabled, .btn-outline-success:disabled { + color: #28a745; + background-color: transparent; +} + +.btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active, +.show > .btn-outline-success.dropdown-toggle { + color: #fff; + background-color: #28a745; + border-color: #28a745; +} + +.btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus, +.show > .btn-outline-success.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5); +} + +.btn-outline-info { + color: #17a2b8; + background-color: transparent; + background-image: none; + border-color: #17a2b8; +} + +.btn-outline-info:hover { + color: #fff; + background-color: #17a2b8; + border-color: #17a2b8; +} + +.btn-outline-info:focus, .btn-outline-info.focus { + box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5); +} + +.btn-outline-info.disabled, .btn-outline-info:disabled { + color: #17a2b8; + background-color: transparent; +} + +.btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active, +.show > .btn-outline-info.dropdown-toggle { + color: #fff; + background-color: #17a2b8; + border-color: #17a2b8; +} + +.btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus, +.show > .btn-outline-info.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5); +} + +.btn-outline-warning { + color: #ffc107; + background-color: transparent; + background-image: none; + border-color: #ffc107; +} + +.btn-outline-warning:hover { + color: #212529; + background-color: #ffc107; + border-color: #ffc107; +} + +.btn-outline-warning:focus, .btn-outline-warning.focus { + box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5); +} + +.btn-outline-warning.disabled, .btn-outline-warning:disabled { + color: #ffc107; + background-color: transparent; +} + +.btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled).active, +.show > .btn-outline-warning.dropdown-toggle { + color: #212529; + background-color: #ffc107; + border-color: #ffc107; +} + +.btn-outline-warning:not(:disabled):not(.disabled):active:focus, .btn-outline-warning:not(:disabled):not(.disabled).active:focus, +.show > .btn-outline-warning.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5); +} + +.btn-outline-danger { + color: #dc3545; + background-color: transparent; + background-image: none; + border-color: #dc3545; +} + +.btn-outline-danger:hover { + color: #fff; + background-color: #dc3545; + border-color: #dc3545; +} + +.btn-outline-danger:focus, .btn-outline-danger.focus { + box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5); +} + +.btn-outline-danger.disabled, .btn-outline-danger:disabled { + color: #dc3545; + background-color: transparent; +} + +.btn-outline-danger:not(:disabled):not(.disabled):active, .btn-outline-danger:not(:disabled):not(.disabled).active, +.show > .btn-outline-danger.dropdown-toggle { + color: #fff; + background-color: #dc3545; + border-color: #dc3545; +} + +.btn-outline-danger:not(:disabled):not(.disabled):active:focus, .btn-outline-danger:not(:disabled):not(.disabled).active:focus, +.show > .btn-outline-danger.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5); +} + +.btn-outline-light { + color: #f8f9fa; + background-color: transparent; + background-image: none; + border-color: #f8f9fa; +} + +.btn-outline-light:hover { + color: #212529; + background-color: #f8f9fa; + border-color: #f8f9fa; +} + +.btn-outline-light:focus, .btn-outline-light.focus { + box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5); +} + +.btn-outline-light.disabled, .btn-outline-light:disabled { + color: #f8f9fa; + background-color: transparent; +} + +.btn-outline-light:not(:disabled):not(.disabled):active, .btn-outline-light:not(:disabled):not(.disabled).active, +.show > .btn-outline-light.dropdown-toggle { + color: #212529; + background-color: #f8f9fa; + border-color: #f8f9fa; +} + +.btn-outline-light:not(:disabled):not(.disabled):active:focus, .btn-outline-light:not(:disabled):not(.disabled).active:focus, +.show > .btn-outline-light.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5); +} + +.btn-outline-dark { + color: #343a40; + background-color: transparent; + background-image: none; + border-color: #343a40; +} + +.btn-outline-dark:hover { + color: #fff; + background-color: #343a40; + border-color: #343a40; +} + +.btn-outline-dark:focus, .btn-outline-dark.focus { + box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5); +} + +.btn-outline-dark.disabled, .btn-outline-dark:disabled { + color: #343a40; + background-color: transparent; +} + +.btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active, +.show > .btn-outline-dark.dropdown-toggle { + color: #fff; + background-color: #343a40; + border-color: #343a40; +} + +.btn-outline-dark:not(:disabled):not(.disabled):active:focus, .btn-outline-dark:not(:disabled):not(.disabled).active:focus, +.show > .btn-outline-dark.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5); +} + +.btn-link { + font-weight: 400; + color: #007bff; + background-color: transparent; +} + +.btn-link:hover { + color: #0056b3; + text-decoration: underline; + background-color: transparent; + border-color: transparent; +} + +.btn-link:focus, .btn-link.focus { + text-decoration: underline; + border-color: transparent; + box-shadow: none; +} + +.btn-link:disabled, .btn-link.disabled { + color: #6c757d; + pointer-events: none; +} + +.btn-lg, .btn-group-lg > .btn { + padding: 0.5rem 1rem; + font-size: 1.25rem; + line-height: 1.5; + border-radius: 0.3rem; +} + +.btn-sm, .btn-group-sm > .btn { + padding: 0.25rem 0.5rem; + font-size: 0.875rem; + line-height: 1.5; + border-radius: 0.2rem; +} + +.btn-block { + display: block; + width: 100%; +} + +.btn-block + .btn-block { + margin-top: 0.5rem; +} + +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width: 100%; +} + +.fade { + transition: opacity 0.15s linear; +} + +@media screen and (prefers-reduced-motion: reduce) { + .fade { + transition: none; + } +} + +.fade:not(.show) { + opacity: 0; +} + +.collapse:not(.show) { + display: none; +} + +.collapsing { + position: relative; + height: 0; + overflow: hidden; + transition: height 0.35s ease; +} + +@media screen and (prefers-reduced-motion: reduce) { + .collapsing { + transition: none; + } +} + +.dropup, +.dropright, +.dropdown, +.dropleft { + position: relative; +} + +.dropdown-toggle::after { + display: inline-block; + width: 0; + height: 0; + margin-left: 0.255em; + vertical-align: 0.255em; + content: ""; + border-top: 0.3em solid; + border-right: 0.3em solid transparent; + border-bottom: 0; + border-left: 0.3em solid transparent; +} + +.dropdown-toggle:empty::after { + margin-left: 0; +} + +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 10rem; + padding: 0.5rem 0; + margin: 0.125rem 0 0; + font-size: 1rem; + color: #212529; + text-align: left; + list-style: none; + background-color: #fff; + background-clip: padding-box; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 0.25rem; +} + +.dropdown-menu-right { + right: 0; + left: auto; +} + +.dropup .dropdown-menu { + top: auto; + bottom: 100%; + margin-top: 0; + margin-bottom: 0.125rem; +} + +.dropup .dropdown-toggle::after { + display: inline-block; + width: 0; + height: 0; + margin-left: 0.255em; + vertical-align: 0.255em; + content: ""; + border-top: 0; + border-right: 0.3em solid transparent; + border-bottom: 0.3em solid; + border-left: 0.3em solid transparent; +} + +.dropup .dropdown-toggle:empty::after { + margin-left: 0; +} + +.dropright .dropdown-menu { + top: 0; + right: auto; + left: 100%; + margin-top: 0; + margin-left: 0.125rem; +} + +.dropright .dropdown-toggle::after { + display: inline-block; + width: 0; + height: 0; + margin-left: 0.255em; + vertical-align: 0.255em; + content: ""; + border-top: 0.3em solid transparent; + border-right: 0; + border-bottom: 0.3em solid transparent; + border-left: 0.3em solid; +} + +.dropright .dropdown-toggle:empty::after { + margin-left: 0; +} + +.dropright .dropdown-toggle::after { + vertical-align: 0; +} + +.dropleft .dropdown-menu { + top: 0; + right: 100%; + left: auto; + margin-top: 0; + margin-right: 0.125rem; +} + +.dropleft .dropdown-toggle::after { + display: inline-block; + width: 0; + height: 0; + margin-left: 0.255em; + vertical-align: 0.255em; + content: ""; +} + +.dropleft .dropdown-toggle::after { + display: none; +} + +.dropleft .dropdown-toggle::before { + display: inline-block; + width: 0; + height: 0; + margin-right: 0.255em; + vertical-align: 0.255em; + content: ""; + border-top: 0.3em solid transparent; + border-right: 0.3em solid; + border-bottom: 0.3em solid transparent; +} + +.dropleft .dropdown-toggle:empty::after { + margin-left: 0; +} + +.dropleft .dropdown-toggle::before { + vertical-align: 0; +} + +.dropdown-menu[x-placement^="top"], .dropdown-menu[x-placement^="right"], .dropdown-menu[x-placement^="bottom"], .dropdown-menu[x-placement^="left"] { + right: auto; + bottom: auto; +} + +.dropdown-divider { + height: 0; + margin: 0.5rem 0; + overflow: hidden; + border-top: 1px solid #e9ecef; +} + +.dropdown-item { + display: block; + width: 100%; + padding: 0.25rem 1.5rem; + clear: both; + font-weight: 400; + color: #212529; + text-align: inherit; + white-space: nowrap; + background-color: transparent; + border: 0; +} + +.dropdown-item:hover, .dropdown-item:focus { + color: #16181b; + text-decoration: none; + background-color: #f8f9fa; +} + +.dropdown-item.active, .dropdown-item:active { + color: #fff; + text-decoration: none; + background-color: #007bff; +} + +.dropdown-item.disabled, .dropdown-item:disabled { + color: #6c757d; + background-color: transparent; +} + +.dropdown-menu.show { + display: block; +} + +.dropdown-header { + display: block; + padding: 0.5rem 1.5rem; + margin-bottom: 0; + font-size: 0.875rem; + color: #6c757d; + white-space: nowrap; +} + +.dropdown-item-text { + display: block; + padding: 0.25rem 1.5rem; + color: #212529; +} + +.btn-group, +.btn-group-vertical { + position: relative; + display: -ms-inline-flexbox; + display: inline-flex; + vertical-align: middle; +} + +.btn-group > .btn, +.btn-group-vertical > .btn { + position: relative; + -ms-flex: 0 1 auto; + flex: 0 1 auto; +} + +.btn-group > .btn:hover, +.btn-group-vertical > .btn:hover { + z-index: 1; +} + +.btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active, +.btn-group-vertical > .btn:focus, +.btn-group-vertical > .btn:active, +.btn-group-vertical > .btn.active { + z-index: 1; +} + +.btn-group .btn + .btn, +.btn-group .btn + .btn-group, +.btn-group .btn-group + .btn, +.btn-group .btn-group + .btn-group, +.btn-group-vertical .btn + .btn, +.btn-group-vertical .btn + .btn-group, +.btn-group-vertical .btn-group + .btn, +.btn-group-vertical .btn-group + .btn-group { + margin-left: -1px; +} + +.btn-toolbar { + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -ms-flex-pack: start; + justify-content: flex-start; +} + +.btn-toolbar .input-group { + width: auto; +} + +.btn-group > .btn:first-child { + margin-left: 0; +} + +.btn-group > .btn:not(:last-child):not(.dropdown-toggle), +.btn-group > .btn-group:not(:last-child) > .btn { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.btn-group > .btn:not(:first-child), +.btn-group > .btn-group:not(:first-child) > .btn { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.dropdown-toggle-split { + padding-right: 0.5625rem; + padding-left: 0.5625rem; +} + +.dropdown-toggle-split::after, +.dropup .dropdown-toggle-split::after, +.dropright .dropdown-toggle-split::after { + margin-left: 0; +} + +.dropleft .dropdown-toggle-split::before { + margin-right: 0; +} + +.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split { + padding-right: 0.375rem; + padding-left: 0.375rem; +} + +.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split { + padding-right: 0.75rem; + padding-left: 0.75rem; +} + +.btn-group-vertical { + -ms-flex-direction: column; + flex-direction: column; + -ms-flex-align: start; + align-items: flex-start; + -ms-flex-pack: center; + justify-content: center; +} + +.btn-group-vertical .btn, +.btn-group-vertical .btn-group { + width: 100%; +} + +.btn-group-vertical > .btn + .btn, +.btn-group-vertical > .btn + .btn-group, +.btn-group-vertical > .btn-group + .btn, +.btn-group-vertical > .btn-group + .btn-group { + margin-top: -1px; + margin-left: 0; +} + +.btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle), +.btn-group-vertical > .btn-group:not(:last-child) > .btn { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.btn-group-vertical > .btn:not(:first-child), +.btn-group-vertical > .btn-group:not(:first-child) > .btn { + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +.btn-group-toggle > .btn, +.btn-group-toggle > .btn-group > .btn { + margin-bottom: 0; +} + +.btn-group-toggle > .btn input[type="radio"], +.btn-group-toggle > .btn input[type="checkbox"], +.btn-group-toggle > .btn-group > .btn input[type="radio"], +.btn-group-toggle > .btn-group > .btn input[type="checkbox"] { + position: absolute; + clip: rect(0, 0, 0, 0); + pointer-events: none; +} + +.input-group { + position: relative; + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -ms-flex-align: stretch; + align-items: stretch; + width: 100%; +} + +.input-group > .form-control, +.input-group > .custom-select, +.input-group > .custom-file { + position: relative; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + width: 1%; + margin-bottom: 0; +} + +.input-group > .form-control:focus, +.input-group > .custom-select:focus, +.input-group > .custom-file:focus { + z-index: 3; +} + +.input-group > .form-control + .form-control, +.input-group > .form-control + .custom-select, +.input-group > .form-control + .custom-file, +.input-group > .custom-select + .form-control, +.input-group > .custom-select + .custom-select, +.input-group > .custom-select + .custom-file, +.input-group > .custom-file + .form-control, +.input-group > .custom-file + .custom-select, +.input-group > .custom-file + .custom-file { + margin-left: -1px; +} + +.input-group > .form-control:not(:last-child), +.input-group > .custom-select:not(:last-child) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.input-group > .form-control:not(:first-child), +.input-group > .custom-select:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.input-group > .custom-file { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; +} + +.input-group > .custom-file:not(:last-child) .custom-file-label, +.input-group > .custom-file:not(:last-child) .custom-file-label::after { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.input-group > .custom-file:not(:first-child) .custom-file-label { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.input-group-prepend, +.input-group-append { + display: -ms-flexbox; + display: flex; +} + +.input-group-prepend .btn, +.input-group-append .btn { + position: relative; + z-index: 2; +} + +.input-group-prepend .btn + .btn, +.input-group-prepend .btn + .input-group-text, +.input-group-prepend .input-group-text + .input-group-text, +.input-group-prepend .input-group-text + .btn, +.input-group-append .btn + .btn, +.input-group-append .btn + .input-group-text, +.input-group-append .input-group-text + .input-group-text, +.input-group-append .input-group-text + .btn { + margin-left: -1px; +} + +.input-group-prepend { + margin-right: -1px; +} + +.input-group-append { + margin-left: -1px; +} + +.input-group-text { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + padding: 0.375rem 0.75rem; + margin-bottom: 0; + font-size: 1rem; + font-weight: 400; + line-height: 1.5; + color: #495057; + text-align: center; + white-space: nowrap; + background-color: #e9ecef; + border: 1px solid #ced4da; + border-radius: 0.25rem; +} + +.input-group-text input[type="radio"], +.input-group-text input[type="checkbox"] { + margin-top: 0; +} + +.input-group > .input-group-prepend > .btn, +.input-group > .input-group-prepend > .input-group-text, +.input-group > .input-group-append:not(:last-child) > .btn, +.input-group > .input-group-append:not(:last-child) > .input-group-text, +.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle), +.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.input-group > .input-group-append > .btn, +.input-group > .input-group-append > .input-group-text, +.input-group > .input-group-prepend:not(:first-child) > .btn, +.input-group > .input-group-prepend:not(:first-child) > .input-group-text, +.input-group > .input-group-prepend:first-child > .btn:not(:first-child), +.input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.custom-control { + position: relative; + display: block; + min-height: 1.5rem; + padding-left: 1.5rem; +} + +.custom-control-inline { + display: -ms-inline-flexbox; + display: inline-flex; + margin-right: 1rem; +} + +.custom-control-input { + position: absolute; + z-index: -1; + opacity: 0; +} + +.custom-control-input:checked ~ .custom-control-label::before { + color: #fff; + background-color: #007bff; +} + +.custom-control-input:focus ~ .custom-control-label::before { + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +} + +.custom-control-input:active ~ .custom-control-label::before { + color: #fff; + background-color: #b3d7ff; +} + +.custom-control-input:disabled ~ .custom-control-label { + color: #6c757d; +} + +.custom-control-input:disabled ~ .custom-control-label::before { + background-color: #e9ecef; +} + +.custom-control-label { + position: relative; + margin-bottom: 0; +} + +.custom-control-label::before { + position: absolute; + top: 0.25rem; + left: -1.5rem; + display: block; + width: 1rem; + height: 1rem; + pointer-events: none; + content: ""; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + background-color: #dee2e6; +} + +.custom-control-label::after { + position: absolute; + top: 0.25rem; + left: -1.5rem; + display: block; + width: 1rem; + height: 1rem; + content: ""; + background-repeat: no-repeat; + background-position: center center; + background-size: 50% 50%; +} + +.custom-checkbox .custom-control-label::before { + border-radius: 0.25rem; +} + +.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before { + background-color: #007bff; +} + +.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"); +} + +.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before { + background-color: #007bff; +} + +.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E"); +} + +.custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before { + background-color: rgba(0, 123, 255, 0.5); +} + +.custom-checkbox .custom-control-input:disabled:indeterminate ~ .custom-control-label::before { + background-color: rgba(0, 123, 255, 0.5); +} + +.custom-radio .custom-control-label::before { + border-radius: 50%; +} + +.custom-radio .custom-control-input:checked ~ .custom-control-label::before { + background-color: #007bff; +} + +.custom-radio .custom-control-input:checked ~ .custom-control-label::after { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E"); +} + +.custom-radio .custom-control-input:disabled:checked ~ .custom-control-label::before { + background-color: rgba(0, 123, 255, 0.5); +} + +.custom-select { + display: inline-block; + width: 100%; + height: calc(2.25rem + 2px); + padding: 0.375rem 1.75rem 0.375rem 0.75rem; + line-height: 1.5; + color: #495057; + vertical-align: middle; + background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right 0.75rem center; + background-size: 8px 10px; + border: 1px solid #ced4da; + border-radius: 0.25rem; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} + +.custom-select:focus { + border-color: #80bdff; + outline: 0; + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(128, 189, 255, 0.5); +} + +.custom-select:focus::-ms-value { + color: #495057; + background-color: #fff; +} + +.custom-select[multiple], .custom-select[size]:not([size="1"]) { + height: auto; + padding-right: 0.75rem; + background-image: none; +} + +.custom-select:disabled { + color: #6c757d; + background-color: #e9ecef; +} + +.custom-select::-ms-expand { + opacity: 0; +} + +.custom-select-sm { + height: calc(1.8125rem + 2px); + padding-top: 0.375rem; + padding-bottom: 0.375rem; + font-size: 75%; +} + +.custom-select-lg { + height: calc(2.875rem + 2px); + padding-top: 0.375rem; + padding-bottom: 0.375rem; + font-size: 125%; +} + +.custom-file { + position: relative; + display: inline-block; + width: 100%; + height: calc(2.25rem + 2px); + margin-bottom: 0; +} + +.custom-file-input { + position: relative; + z-index: 2; + width: 100%; + height: calc(2.25rem + 2px); + margin: 0; + opacity: 0; +} + +.custom-file-input:focus ~ .custom-file-label { + border-color: #80bdff; + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +} + +.custom-file-input:focus ~ .custom-file-label::after { + border-color: #80bdff; +} + +.custom-file-input:lang(en) ~ .custom-file-label::after { + content: "Browse"; +} + +.custom-file-label { + position: absolute; + top: 0; + right: 0; + left: 0; + z-index: 1; + height: calc(2.25rem + 2px); + padding: 0.375rem 0.75rem; + line-height: 1.5; + color: #495057; + background-color: #fff; + border: 1px solid #ced4da; + border-radius: 0.25rem; +} + +.custom-file-label::after { + position: absolute; + top: 0; + right: 0; + bottom: 0; + z-index: 3; + display: block; + height: 2.25rem; + padding: 0.375rem 0.75rem; + line-height: 1.5; + color: #495057; + content: "Browse"; + background-color: #e9ecef; + border-left: 1px solid #ced4da; + border-radius: 0 0.25rem 0.25rem 0; +} + +.custom-range { + width: 100%; + padding-left: 0; + background-color: transparent; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} + +.custom-range:focus { + outline: none; +} + +.custom-range::-moz-focus-outer { + border: 0; +} + +.custom-range::-webkit-slider-thumb { + width: 1rem; + height: 1rem; + margin-top: -0.25rem; + background-color: #007bff; + border: 0; + border-radius: 1rem; + -webkit-appearance: none; + appearance: none; +} + +.custom-range::-webkit-slider-thumb:focus { + outline: none; + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +} + +.custom-range::-webkit-slider-thumb:active { + background-color: #b3d7ff; +} + +.custom-range::-webkit-slider-runnable-track { + width: 100%; + height: 0.5rem; + color: transparent; + cursor: pointer; + background-color: #dee2e6; + border-color: transparent; + border-radius: 1rem; +} + +.custom-range::-moz-range-thumb { + width: 1rem; + height: 1rem; + background-color: #007bff; + border: 0; + border-radius: 1rem; + -moz-appearance: none; + appearance: none; +} + +.custom-range::-moz-range-thumb:focus { + outline: none; + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +} + +.custom-range::-moz-range-thumb:active { + background-color: #b3d7ff; +} + +.custom-range::-moz-range-track { + width: 100%; + height: 0.5rem; + color: transparent; + cursor: pointer; + background-color: #dee2e6; + border-color: transparent; + border-radius: 1rem; +} + +.custom-range::-ms-thumb { + width: 1rem; + height: 1rem; + background-color: #007bff; + border: 0; + border-radius: 1rem; + appearance: none; +} + +.custom-range::-ms-thumb:focus { + outline: none; + box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +} + +.custom-range::-ms-thumb:active { + background-color: #b3d7ff; +} + +.custom-range::-ms-track { + width: 100%; + height: 0.5rem; + color: transparent; + cursor: pointer; + background-color: transparent; + border-color: transparent; + border-width: 0.5rem; +} + +.custom-range::-ms-fill-lower { + background-color: #dee2e6; + border-radius: 1rem; +} + +.custom-range::-ms-fill-upper { + margin-right: 15px; + background-color: #dee2e6; + border-radius: 1rem; +} + +.nav { + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + padding-left: 0; + margin-bottom: 0; + list-style: none; +} + +.nav-link { + display: block; + padding: 0.5rem 1rem; +} + +.nav-link:hover, .nav-link:focus { + text-decoration: none; +} + +.nav-link.disabled { + color: #6c757d; +} + +.nav-tabs { + border-bottom: 1px solid #dee2e6; +} + +.nav-tabs .nav-item { + margin-bottom: -1px; +} + +.nav-tabs .nav-link { + border: 1px solid transparent; + border-top-left-radius: 0.25rem; + border-top-right-radius: 0.25rem; +} + +.nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus { + border-color: #e9ecef #e9ecef #dee2e6; +} + +.nav-tabs .nav-link.disabled { + color: #6c757d; + background-color: transparent; + border-color: transparent; +} + +.nav-tabs .nav-link.active, +.nav-tabs .nav-item.show .nav-link { + color: #495057; + background-color: #fff; + border-color: #dee2e6 #dee2e6 #fff; +} + +.nav-tabs .dropdown-menu { + margin-top: -1px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +.nav-pills .nav-link { + border-radius: 0.25rem; +} + +.nav-pills .nav-link.active, +.nav-pills .show > .nav-link { + color: #fff; + background-color: #007bff; +} + +.nav-fill .nav-item { + -ms-flex: 1 1 auto; + flex: 1 1 auto; + text-align: center; +} + +.nav-justified .nav-item { + -ms-flex-preferred-size: 0; + flex-basis: 0; + -ms-flex-positive: 1; + flex-grow: 1; + text-align: center; +} + +.tab-content > .tab-pane { + display: none; +} + +.tab-content > .active { + display: block; +} + +.navbar { + position: relative; + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -ms-flex-align: center; + align-items: center; + -ms-flex-pack: justify; + justify-content: space-between; + padding: 0.5rem 1rem; +} + +.navbar > .container, +.navbar > .container-fluid { + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -ms-flex-align: center; + align-items: center; + -ms-flex-pack: justify; + justify-content: space-between; +} + +.navbar-brand { + display: inline-block; + padding-top: 0.3125rem; + padding-bottom: 0.3125rem; + margin-right: 1rem; + font-size: 1.25rem; + line-height: inherit; + white-space: nowrap; +} + +.navbar-brand:hover, .navbar-brand:focus { + text-decoration: none; +} + +.navbar-nav { + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + padding-left: 0; + margin-bottom: 0; + list-style: none; +} + +.navbar-nav .nav-link { + padding-right: 0; + padding-left: 0; +} + +.navbar-nav .dropdown-menu { + position: static; + float: none; +} + +.navbar-text { + display: inline-block; + padding-top: 0.5rem; + padding-bottom: 0.5rem; +} + +.navbar-collapse { + -ms-flex-preferred-size: 100%; + flex-basis: 100%; + -ms-flex-positive: 1; + flex-grow: 1; + -ms-flex-align: center; + align-items: center; +} + +.navbar-toggler { + padding: 0.25rem 0.75rem; + font-size: 1.25rem; + line-height: 1; + background-color: transparent; + border: 1px solid transparent; + border-radius: 0.25rem; +} + +.navbar-toggler:hover, .navbar-toggler:focus { + text-decoration: none; +} + +.navbar-toggler:not(:disabled):not(.disabled) { + cursor: pointer; +} + +.navbar-toggler-icon { + display: inline-block; + width: 1.5em; + height: 1.5em; + vertical-align: middle; + content: ""; + background: no-repeat center center; + background-size: 100% 100%; +} + +@media (max-width: 575.98px) { + .navbar-expand-sm > .container, + .navbar-expand-sm > .container-fluid { + padding-right: 0; + padding-left: 0; + } +} + +@media (min-width: 576px) { + .navbar-expand-sm { + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -ms-flex-pack: start; + justify-content: flex-start; + } + .navbar-expand-sm .navbar-nav { + -ms-flex-direction: row; + flex-direction: row; + } + .navbar-expand-sm .navbar-nav .dropdown-menu { + position: absolute; + } + .navbar-expand-sm .navbar-nav .nav-link { + padding-right: 0.5rem; + padding-left: 0.5rem; + } + .navbar-expand-sm > .container, + .navbar-expand-sm > .container-fluid { + -ms-flex-wrap: nowrap; + flex-wrap: nowrap; + } + .navbar-expand-sm .navbar-collapse { + display: -ms-flexbox !important; + display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; + } + .navbar-expand-sm .navbar-toggler { + display: none; + } +} + +@media (max-width: 767.98px) { + .navbar-expand-md > .container, + .navbar-expand-md > .container-fluid { + padding-right: 0; + padding-left: 0; + } +} + +@media (min-width: 768px) { + .navbar-expand-md { + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -ms-flex-pack: start; + justify-content: flex-start; + } + .navbar-expand-md .navbar-nav { + -ms-flex-direction: row; + flex-direction: row; + } + .navbar-expand-md .navbar-nav .dropdown-menu { + position: absolute; + } + .navbar-expand-md .navbar-nav .nav-link { + padding-right: 0.5rem; + padding-left: 0.5rem; + } + .navbar-expand-md > .container, + .navbar-expand-md > .container-fluid { + -ms-flex-wrap: nowrap; + flex-wrap: nowrap; + } + .navbar-expand-md .navbar-collapse { + display: -ms-flexbox !important; + display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; + } + .navbar-expand-md .navbar-toggler { + display: none; + } +} + +@media (max-width: 991.98px) { + .navbar-expand-lg > .container, + .navbar-expand-lg > .container-fluid { + padding-right: 0; + padding-left: 0; + } +} + +@media (min-width: 992px) { + .navbar-expand-lg { + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -ms-flex-pack: start; + justify-content: flex-start; + } + .navbar-expand-lg .navbar-nav { + -ms-flex-direction: row; + flex-direction: row; + } + .navbar-expand-lg .navbar-nav .dropdown-menu { + position: absolute; + } + .navbar-expand-lg .navbar-nav .nav-link { + padding-right: 0.5rem; + padding-left: 0.5rem; + } + .navbar-expand-lg > .container, + .navbar-expand-lg > .container-fluid { + -ms-flex-wrap: nowrap; + flex-wrap: nowrap; + } + .navbar-expand-lg .navbar-collapse { + display: -ms-flexbox !important; + display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; + } + .navbar-expand-lg .navbar-toggler { + display: none; + } +} + +@media (max-width: 1199.98px) { + .navbar-expand-xl > .container, + .navbar-expand-xl > .container-fluid { + padding-right: 0; + padding-left: 0; + } +} + +@media (min-width: 1200px) { + .navbar-expand-xl { + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -ms-flex-pack: start; + justify-content: flex-start; + } + .navbar-expand-xl .navbar-nav { + -ms-flex-direction: row; + flex-direction: row; + } + .navbar-expand-xl .navbar-nav .dropdown-menu { + position: absolute; + } + .navbar-expand-xl .navbar-nav .nav-link { + padding-right: 0.5rem; + padding-left: 0.5rem; + } + .navbar-expand-xl > .container, + .navbar-expand-xl > .container-fluid { + -ms-flex-wrap: nowrap; + flex-wrap: nowrap; + } + .navbar-expand-xl .navbar-collapse { + display: -ms-flexbox !important; + display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; + } + .navbar-expand-xl .navbar-toggler { + display: none; + } +} + +.navbar-expand { + -ms-flex-flow: row nowrap; + flex-flow: row nowrap; + -ms-flex-pack: start; + justify-content: flex-start; +} + +.navbar-expand > .container, +.navbar-expand > .container-fluid { + padding-right: 0; + padding-left: 0; +} + +.navbar-expand .navbar-nav { + -ms-flex-direction: row; + flex-direction: row; +} + +.navbar-expand .navbar-nav .dropdown-menu { + position: absolute; +} + +.navbar-expand .navbar-nav .nav-link { + padding-right: 0.5rem; + padding-left: 0.5rem; +} + +.navbar-expand > .container, +.navbar-expand > .container-fluid { + -ms-flex-wrap: nowrap; + flex-wrap: nowrap; +} + +.navbar-expand .navbar-collapse { + display: -ms-flexbox !important; + display: flex !important; + -ms-flex-preferred-size: auto; + flex-basis: auto; +} + +.navbar-expand .navbar-toggler { + display: none; +} + +.navbar-light .navbar-brand { + color: rgba(0, 0, 0, 0.9); +} + +.navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus { + color: rgba(0, 0, 0, 0.9); +} + +.navbar-light .navbar-nav .nav-link { + color: rgba(0, 0, 0, 0.5); +} + +.navbar-light .navbar-nav .nav-link:hover, .navbar-light .navbar-nav .nav-link:focus { + color: rgba(0, 0, 0, 0.7); +} + +.navbar-light .navbar-nav .nav-link.disabled { + color: rgba(0, 0, 0, 0.3); +} + +.navbar-light .navbar-nav .show > .nav-link, +.navbar-light .navbar-nav .active > .nav-link, +.navbar-light .navbar-nav .nav-link.show, +.navbar-light .navbar-nav .nav-link.active { + color: rgba(0, 0, 0, 0.9); +} + +.navbar-light .navbar-toggler { + color: rgba(0, 0, 0, 0.5); + border-color: rgba(0, 0, 0, 0.1); +} + +.navbar-light .navbar-toggler-icon { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"); +} + +.navbar-light .navbar-text { + color: rgba(0, 0, 0, 0.5); +} + +.navbar-light .navbar-text a { + color: rgba(0, 0, 0, 0.9); +} + +.navbar-light .navbar-text a:hover, .navbar-light .navbar-text a:focus { + color: rgba(0, 0, 0, 0.9); +} + +.navbar-dark .navbar-brand { + color: #fff; +} + +.navbar-dark .navbar-brand:hover, .navbar-dark .navbar-brand:focus { + color: #fff; +} + +.navbar-dark .navbar-nav .nav-link { + color: rgba(255, 255, 255, 0.5); +} + +.navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus { + color: rgba(255, 255, 255, 0.75); +} + +.navbar-dark .navbar-nav .nav-link.disabled { + color: rgba(255, 255, 255, 0.25); +} + +.navbar-dark .navbar-nav .show > .nav-link, +.navbar-dark .navbar-nav .active > .nav-link, +.navbar-dark .navbar-nav .nav-link.show, +.navbar-dark .navbar-nav .nav-link.active { + color: #fff; +} + +.navbar-dark .navbar-toggler { + color: rgba(255, 255, 255, 0.5); + border-color: rgba(255, 255, 255, 0.1); +} + +.navbar-dark .navbar-toggler-icon { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"); +} + +.navbar-dark .navbar-text { + color: rgba(255, 255, 255, 0.5); +} + +.navbar-dark .navbar-text a { + color: #fff; +} + +.navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { + color: #fff; +} + +.card { + position: relative; + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + min-width: 0; + word-wrap: break-word; + background-color: #fff; + background-clip: border-box; + border: 1px solid rgba(0, 0, 0, 0.125); + border-radius: 0.25rem; +} + +.card > hr { + margin-right: 0; + margin-left: 0; +} + +.card > .list-group:first-child .list-group-item:first-child { + border-top-left-radius: 0.25rem; + border-top-right-radius: 0.25rem; +} + +.card > .list-group:last-child .list-group-item:last-child { + border-bottom-right-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; +} + +.card-body { + -ms-flex: 1 1 auto; + flex: 1 1 auto; + padding: 1.25rem; +} + +.card-title { + margin-bottom: 0.75rem; +} + +.card-subtitle { + margin-top: -0.375rem; + margin-bottom: 0; +} + +.card-text:last-child { + margin-bottom: 0; +} + +.card-link:hover { + text-decoration: none; +} + +.card-link + .card-link { + margin-left: 1.25rem; +} + +.card-header { + padding: 0.75rem 1.25rem; + margin-bottom: 0; + background-color: rgba(0, 0, 0, 0.03); + border-bottom: 1px solid rgba(0, 0, 0, 0.125); +} + +.card-header:first-child { + border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0; +} + +.card-header + .list-group .list-group-item:first-child { + border-top: 0; +} + +.card-footer { + padding: 0.75rem 1.25rem; + background-color: rgba(0, 0, 0, 0.03); + border-top: 1px solid rgba(0, 0, 0, 0.125); +} + +.card-footer:last-child { + border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px); +} + +.card-header-tabs { + margin-right: -0.625rem; + margin-bottom: -0.75rem; + margin-left: -0.625rem; + border-bottom: 0; +} + +.card-header-pills { + margin-right: -0.625rem; + margin-left: -0.625rem; +} + +.card-img-overlay { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + padding: 1.25rem; +} + +.card-img { + width: 100%; + border-radius: calc(0.25rem - 1px); +} + +.card-img-top { + width: 100%; + border-top-left-radius: calc(0.25rem - 1px); + border-top-right-radius: calc(0.25rem - 1px); +} + +.card-img-bottom { + width: 100%; + border-bottom-right-radius: calc(0.25rem - 1px); + border-bottom-left-radius: calc(0.25rem - 1px); +} + +.card-deck { + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; +} + +.card-deck .card { + margin-bottom: 15px; +} + +@media (min-width: 576px) { + .card-deck { + -ms-flex-flow: row wrap; + flex-flow: row wrap; + margin-right: -15px; + margin-left: -15px; + } + .card-deck .card { + display: -ms-flexbox; + display: flex; + -ms-flex: 1 0 0%; + flex: 1 0 0%; + -ms-flex-direction: column; + flex-direction: column; + margin-right: 15px; + margin-bottom: 0; + margin-left: 15px; + } +} + +.card-group { + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; +} + +.card-group > .card { + margin-bottom: 15px; +} + +@media (min-width: 576px) { + .card-group { + -ms-flex-flow: row wrap; + flex-flow: row wrap; + } + .card-group > .card { + -ms-flex: 1 0 0%; + flex: 1 0 0%; + margin-bottom: 0; + } + .card-group > .card + .card { + margin-left: 0; + border-left: 0; + } + .card-group > .card:first-child { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + .card-group > .card:first-child .card-img-top, + .card-group > .card:first-child .card-header { + border-top-right-radius: 0; + } + .card-group > .card:first-child .card-img-bottom, + .card-group > .card:first-child .card-footer { + border-bottom-right-radius: 0; + } + .card-group > .card:last-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + .card-group > .card:last-child .card-img-top, + .card-group > .card:last-child .card-header { + border-top-left-radius: 0; + } + .card-group > .card:last-child .card-img-bottom, + .card-group > .card:last-child .card-footer { + border-bottom-left-radius: 0; + } + .card-group > .card:only-child { + border-radius: 0.25rem; + } + .card-group > .card:only-child .card-img-top, + .card-group > .card:only-child .card-header { + border-top-left-radius: 0.25rem; + border-top-right-radius: 0.25rem; + } + .card-group > .card:only-child .card-img-bottom, + .card-group > .card:only-child .card-footer { + border-bottom-right-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; + } + .card-group > .card:not(:first-child):not(:last-child):not(:only-child) { + border-radius: 0; + } + .card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-img-top, + .card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom, + .card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-header, + .card-group > .card:not(:first-child):not(:last-child):not(:only-child) .card-footer { + border-radius: 0; + } +} + +.card-columns .card { + margin-bottom: 0.75rem; +} + +@media (min-width: 576px) { + .card-columns { + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; + -webkit-column-gap: 1.25rem; + -moz-column-gap: 1.25rem; + column-gap: 1.25rem; + orphans: 1; + widows: 1; + } + .card-columns .card { + display: inline-block; + width: 100%; + } +} + +.accordion .card:not(:first-of-type):not(:last-of-type) { + border-bottom: 0; + border-radius: 0; +} + +.accordion .card:not(:first-of-type) .card-header:first-child { + border-radius: 0; +} + +.accordion .card:first-of-type { + border-bottom: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.accordion .card:last-of-type { + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +.breadcrumb { + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + padding: 0.75rem 1rem; + margin-bottom: 1rem; + list-style: none; + background-color: #e9ecef; + border-radius: 0.25rem; +} + +.breadcrumb-item + .breadcrumb-item { + padding-left: 0.5rem; +} + +.breadcrumb-item + .breadcrumb-item::before { + display: inline-block; + padding-right: 0.5rem; + color: #6c757d; + content: "/"; +} + +.breadcrumb-item + .breadcrumb-item:hover::before { + text-decoration: underline; +} + +.breadcrumb-item + .breadcrumb-item:hover::before { + text-decoration: none; +} + +.breadcrumb-item.active { + color: #6c757d; +} + +.pagination { + display: -ms-flexbox; + display: flex; + padding-left: 0; + list-style: none; + border-radius: 0.25rem; +} + +.page-link { + position: relative; + display: block; + padding: 0.5rem 0.75rem; + margin-left: -1px; + line-height: 1.25; + color: #007bff; + background-color: #fff; + border: 1px solid #dee2e6; +} + +.page-link:hover { + z-index: 2; + color: #0056b3; + text-decoration: none; + background-color: #e9ecef; + border-color: #dee2e6; +} + +.page-link:focus { + z-index: 2; + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +} + +.page-link:not(:disabled):not(.disabled) { + cursor: pointer; +} + +.page-item:first-child .page-link { + margin-left: 0; + border-top-left-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; +} + +.page-item:last-child .page-link { + border-top-right-radius: 0.25rem; + border-bottom-right-radius: 0.25rem; +} + +.page-item.active .page-link { + z-index: 1; + color: #fff; + background-color: #007bff; + border-color: #007bff; +} + +.page-item.disabled .page-link { + color: #6c757d; + pointer-events: none; + cursor: auto; + background-color: #fff; + border-color: #dee2e6; +} + +.pagination-lg .page-link { + padding: 0.75rem 1.5rem; + font-size: 1.25rem; + line-height: 1.5; +} + +.pagination-lg .page-item:first-child .page-link { + border-top-left-radius: 0.3rem; + border-bottom-left-radius: 0.3rem; +} + +.pagination-lg .page-item:last-child .page-link { + border-top-right-radius: 0.3rem; + border-bottom-right-radius: 0.3rem; +} + +.pagination-sm .page-link { + padding: 0.25rem 0.5rem; + font-size: 0.875rem; + line-height: 1.5; +} + +.pagination-sm .page-item:first-child .page-link { + border-top-left-radius: 0.2rem; + border-bottom-left-radius: 0.2rem; +} + +.pagination-sm .page-item:last-child .page-link { + border-top-right-radius: 0.2rem; + border-bottom-right-radius: 0.2rem; +} + +.badge { + display: inline-block; + padding: 0.25em 0.4em; + font-size: 75%; + font-weight: 700; + line-height: 1; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: 0.25rem; +} + +.badge:empty { + display: none; +} + +.btn .badge { + position: relative; + top: -1px; +} + +.badge-pill { + padding-right: 0.6em; + padding-left: 0.6em; + border-radius: 10rem; +} + +.badge-primary { + color: #fff; + background-color: #007bff; +} + +.badge-primary[href]:hover, .badge-primary[href]:focus { + color: #fff; + text-decoration: none; + background-color: #0062cc; +} + +.badge-secondary { + color: #fff; + background-color: #6c757d; +} + +.badge-secondary[href]:hover, .badge-secondary[href]:focus { + color: #fff; + text-decoration: none; + background-color: #545b62; +} + +.badge-success { + color: #fff; + background-color: #28a745; +} + +.badge-success[href]:hover, .badge-success[href]:focus { + color: #fff; + text-decoration: none; + background-color: #1e7e34; +} + +.badge-info { + color: #fff; + background-color: #17a2b8; +} + +.badge-info[href]:hover, .badge-info[href]:focus { + color: #fff; + text-decoration: none; + background-color: #117a8b; +} + +.badge-warning { + color: #212529; + background-color: #ffc107; +} + +.badge-warning[href]:hover, .badge-warning[href]:focus { + color: #212529; + text-decoration: none; + background-color: #d39e00; +} + +.badge-danger { + color: #fff; + background-color: #dc3545; +} + +.badge-danger[href]:hover, .badge-danger[href]:focus { + color: #fff; + text-decoration: none; + background-color: #bd2130; +} + +.badge-light { + color: #212529; + background-color: #f8f9fa; +} + +.badge-light[href]:hover, .badge-light[href]:focus { + color: #212529; + text-decoration: none; + background-color: #dae0e5; +} + +.badge-dark { + color: #fff; + background-color: #343a40; +} + +.badge-dark[href]:hover, .badge-dark[href]:focus { + color: #fff; + text-decoration: none; + background-color: #1d2124; +} + +.jumbotron { + padding: 2rem 1rem; + margin-bottom: 2rem; + background-color: #e9ecef; + border-radius: 0.3rem; +} + +@media (min-width: 576px) { + .jumbotron { + padding: 4rem 2rem; + } +} + +.jumbotron-fluid { + padding-right: 0; + padding-left: 0; + border-radius: 0; +} + +.alert { + position: relative; + padding: 0.75rem 1.25rem; + margin-bottom: 1rem; + border: 1px solid transparent; + border-radius: 0.25rem; +} + +.alert-heading { + color: inherit; +} + +.alert-link { + font-weight: 700; +} + +.alert-dismissible { + padding-right: 4rem; +} + +.alert-dismissible .close { + position: absolute; + top: 0; + right: 0; + padding: 0.75rem 1.25rem; + color: inherit; +} + +.alert-primary { + color: #004085; + background-color: #cce5ff; + border-color: #b8daff; +} + +.alert-primary hr { + border-top-color: #9fcdff; +} + +.alert-primary .alert-link { + color: #002752; +} + +.alert-secondary { + color: #383d41; + background-color: #e2e3e5; + border-color: #d6d8db; +} + +.alert-secondary hr { + border-top-color: #c8cbcf; +} + +.alert-secondary .alert-link { + color: #202326; +} + +.alert-success { + color: #155724; + background-color: #d4edda; + border-color: #c3e6cb; +} + +.alert-success hr { + border-top-color: #b1dfbb; +} + +.alert-success .alert-link { + color: #0b2e13; +} + +.alert-info { + color: #0c5460; + background-color: #d1ecf1; + border-color: #bee5eb; +} + +.alert-info hr { + border-top-color: #abdde5; +} + +.alert-info .alert-link { + color: #062c33; +} + +.alert-warning { + color: #856404; + background-color: #fff3cd; + border-color: #ffeeba; +} + +.alert-warning hr { + border-top-color: #ffe8a1; +} + +.alert-warning .alert-link { + color: #533f03; +} + +.alert-danger { + color: #721c24; + background-color: #f8d7da; + border-color: #f5c6cb; +} + +.alert-danger hr { + border-top-color: #f1b0b7; +} + +.alert-danger .alert-link { + color: #491217; +} + +.alert-light { + color: #818182; + background-color: #fefefe; + border-color: #fdfdfe; +} + +.alert-light hr { + border-top-color: #ececf6; +} + +.alert-light .alert-link { + color: #686868; +} + +.alert-dark { + color: #1b1e21; + background-color: #d6d8d9; + border-color: #c6c8ca; +} + +.alert-dark hr { + border-top-color: #b9bbbe; +} + +.alert-dark .alert-link { + color: #040505; +} + +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 1rem 0; + } + to { + background-position: 0 0; + } +} + +@keyframes progress-bar-stripes { + from { + background-position: 1rem 0; + } + to { + background-position: 0 0; + } +} + +.progress { + display: -ms-flexbox; + display: flex; + height: 1rem; + overflow: hidden; + font-size: 0.75rem; + background-color: #e9ecef; + border-radius: 0.25rem; +} + +.progress-bar { + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + -ms-flex-pack: center; + justify-content: center; + color: #fff; + text-align: center; + white-space: nowrap; + background-color: #007bff; + transition: width 0.6s ease; +} + +@media screen and (prefers-reduced-motion: reduce) { + .progress-bar { + transition: none; + } +} + +.progress-bar-striped { + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-size: 1rem 1rem; +} + +.progress-bar-animated { + -webkit-animation: progress-bar-stripes 1s linear infinite; + animation: progress-bar-stripes 1s linear infinite; +} + +.media { + display: -ms-flexbox; + display: flex; + -ms-flex-align: start; + align-items: flex-start; +} + +.media-body { + -ms-flex: 1; + flex: 1; +} + +.list-group { + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + padding-left: 0; + margin-bottom: 0; +} + +.list-group-item-action { + width: 100%; + color: #495057; + text-align: inherit; +} + +.list-group-item-action:hover, .list-group-item-action:focus { + color: #495057; + text-decoration: none; + background-color: #f8f9fa; +} + +.list-group-item-action:active { + color: #212529; + background-color: #e9ecef; +} + +.list-group-item { + position: relative; + display: block; + padding: 0.75rem 1.25rem; + margin-bottom: -1px; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.125); +} + +.list-group-item:first-child { + border-top-left-radius: 0.25rem; + border-top-right-radius: 0.25rem; +} + +.list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; +} + +.list-group-item:hover, .list-group-item:focus { + z-index: 1; + text-decoration: none; +} + +.list-group-item.disabled, .list-group-item:disabled { + color: #6c757d; + background-color: #fff; +} + +.list-group-item.active { + z-index: 2; + color: #fff; + background-color: #007bff; + border-color: #007bff; +} + +.list-group-flush .list-group-item { + border-right: 0; + border-left: 0; + border-radius: 0; +} + +.list-group-flush:first-child .list-group-item:first-child { + border-top: 0; +} + +.list-group-flush:last-child .list-group-item:last-child { + border-bottom: 0; +} + +.list-group-item-primary { + color: #004085; + background-color: #b8daff; +} + +.list-group-item-primary.list-group-item-action:hover, .list-group-item-primary.list-group-item-action:focus { + color: #004085; + background-color: #9fcdff; +} + +.list-group-item-primary.list-group-item-action.active { + color: #fff; + background-color: #004085; + border-color: #004085; +} + +.list-group-item-secondary { + color: #383d41; + background-color: #d6d8db; +} + +.list-group-item-secondary.list-group-item-action:hover, .list-group-item-secondary.list-group-item-action:focus { + color: #383d41; + background-color: #c8cbcf; +} + +.list-group-item-secondary.list-group-item-action.active { + color: #fff; + background-color: #383d41; + border-color: #383d41; +} + +.list-group-item-success { + color: #155724; + background-color: #c3e6cb; +} + +.list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus { + color: #155724; + background-color: #b1dfbb; +} + +.list-group-item-success.list-group-item-action.active { + color: #fff; + background-color: #155724; + border-color: #155724; +} + +.list-group-item-info { + color: #0c5460; + background-color: #bee5eb; +} + +.list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus { + color: #0c5460; + background-color: #abdde5; +} + +.list-group-item-info.list-group-item-action.active { + color: #fff; + background-color: #0c5460; + border-color: #0c5460; +} + +.list-group-item-warning { + color: #856404; + background-color: #ffeeba; +} + +.list-group-item-warning.list-group-item-action:hover, .list-group-item-warning.list-group-item-action:focus { + color: #856404; + background-color: #ffe8a1; +} + +.list-group-item-warning.list-group-item-action.active { + color: #fff; + background-color: #856404; + border-color: #856404; +} + +.list-group-item-danger { + color: #721c24; + background-color: #f5c6cb; +} + +.list-group-item-danger.list-group-item-action:hover, .list-group-item-danger.list-group-item-action:focus { + color: #721c24; + background-color: #f1b0b7; +} + +.list-group-item-danger.list-group-item-action.active { + color: #fff; + background-color: #721c24; + border-color: #721c24; +} + +.list-group-item-light { + color: #818182; + background-color: #fdfdfe; +} + +.list-group-item-light.list-group-item-action:hover, .list-group-item-light.list-group-item-action:focus { + color: #818182; + background-color: #ececf6; +} + +.list-group-item-light.list-group-item-action.active { + color: #fff; + background-color: #818182; + border-color: #818182; +} + +.list-group-item-dark { + color: #1b1e21; + background-color: #c6c8ca; +} + +.list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus { + color: #1b1e21; + background-color: #b9bbbe; +} + +.list-group-item-dark.list-group-item-action.active { + color: #fff; + background-color: #1b1e21; + border-color: #1b1e21; +} + +.close { + float: right; + font-size: 1.5rem; + font-weight: 700; + line-height: 1; + color: #000; + text-shadow: 0 1px 0 #fff; + opacity: .5; +} + +.close:hover, .close:focus { + color: #000; + text-decoration: none; + opacity: .75; +} + +.close:not(:disabled):not(.disabled) { + cursor: pointer; +} + +button.close { + padding: 0; + background-color: transparent; + border: 0; + -webkit-appearance: none; +} + +.modal-open { + overflow: hidden; +} + +.modal { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1050; + display: none; + overflow: hidden; + outline: 0; +} + +.modal-open .modal { + overflow-x: hidden; + overflow-y: auto; +} + +.modal-dialog { + position: relative; + width: auto; + margin: 0.5rem; + pointer-events: none; +} + +.modal.fade .modal-dialog { + transition: -webkit-transform 0.3s ease-out; + transition: transform 0.3s ease-out; + transition: transform 0.3s ease-out, -webkit-transform 0.3s ease-out; + -webkit-transform: translate(0, -25%); + transform: translate(0, -25%); +} + +@media screen and (prefers-reduced-motion: reduce) { + .modal.fade .modal-dialog { + transition: none; + } +} + +.modal.show .modal-dialog { + -webkit-transform: translate(0, 0); + transform: translate(0, 0); +} + +.modal-dialog-centered { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + min-height: calc(100% - (0.5rem * 2)); +} + +.modal-content { + position: relative; + display: -ms-flexbox; + display: flex; + -ms-flex-direction: column; + flex-direction: column; + width: 100%; + pointer-events: auto; + background-color: #fff; + background-clip: padding-box; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 0.3rem; + outline: 0; +} + +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + background-color: #000; +} + +.modal-backdrop.fade { + opacity: 0; +} + +.modal-backdrop.show { + opacity: 0.5; +} + +.modal-header { + display: -ms-flexbox; + display: flex; + -ms-flex-align: start; + align-items: flex-start; + -ms-flex-pack: justify; + justify-content: space-between; + padding: 1rem; + border-bottom: 1px solid #e9ecef; + border-top-left-radius: 0.3rem; + border-top-right-radius: 0.3rem; +} + +.modal-header .close { + padding: 1rem; + margin: -1rem -1rem -1rem auto; +} + +.modal-title { + margin-bottom: 0; + line-height: 1.5; +} + +.modal-body { + position: relative; + -ms-flex: 1 1 auto; + flex: 1 1 auto; + padding: 1rem; +} + +.modal-footer { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + -ms-flex-pack: end; + justify-content: flex-end; + padding: 1rem; + border-top: 1px solid #e9ecef; +} + +.modal-footer > :not(:first-child) { + margin-left: .25rem; +} + +.modal-footer > :not(:last-child) { + margin-right: .25rem; +} + +.modal-scrollbar-measure { + position: absolute; + top: -9999px; + width: 50px; + height: 50px; + overflow: scroll; +} + +@media (min-width: 576px) { + .modal-dialog { + max-width: 500px; + margin: 1.75rem auto; + } + .modal-dialog-centered { + min-height: calc(100% - (1.75rem * 2)); + } + .modal-sm { + max-width: 300px; + } +} + +@media (min-width: 992px) { + .modal-lg { + max-width: 800px; + } +} + +.tooltip { + position: absolute; + z-index: 1070; + display: block; + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-style: normal; + font-weight: 400; + line-height: 1.5; + text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + letter-spacing: normal; + word-break: normal; + word-spacing: normal; + white-space: normal; + line-break: auto; + font-size: 0.875rem; + word-wrap: break-word; + opacity: 0; +} + +.tooltip.show { + opacity: 0.9; +} + +.tooltip .arrow { + position: absolute; + display: block; + width: 0.8rem; + height: 0.4rem; +} + +.tooltip .arrow::before { + position: absolute; + content: ""; + border-color: transparent; + border-style: solid; +} + +.bs-tooltip-top, .bs-tooltip-auto[x-placement^="top"] { + padding: 0.4rem 0; +} + +.bs-tooltip-top .arrow, .bs-tooltip-auto[x-placement^="top"] .arrow { + bottom: 0; +} + +.bs-tooltip-top .arrow::before, .bs-tooltip-auto[x-placement^="top"] .arrow::before { + top: 0; + border-width: 0.4rem 0.4rem 0; + border-top-color: #000; +} + +.bs-tooltip-right, .bs-tooltip-auto[x-placement^="right"] { + padding: 0 0.4rem; +} + +.bs-tooltip-right .arrow, .bs-tooltip-auto[x-placement^="right"] .arrow { + left: 0; + width: 0.4rem; + height: 0.8rem; +} + +.bs-tooltip-right .arrow::before, .bs-tooltip-auto[x-placement^="right"] .arrow::before { + right: 0; + border-width: 0.4rem 0.4rem 0.4rem 0; + border-right-color: #000; +} + +.bs-tooltip-bottom, .bs-tooltip-auto[x-placement^="bottom"] { + padding: 0.4rem 0; +} + +.bs-tooltip-bottom .arrow, .bs-tooltip-auto[x-placement^="bottom"] .arrow { + top: 0; +} + +.bs-tooltip-bottom .arrow::before, .bs-tooltip-auto[x-placement^="bottom"] .arrow::before { + bottom: 0; + border-width: 0 0.4rem 0.4rem; + border-bottom-color: #000; +} + +.bs-tooltip-left, .bs-tooltip-auto[x-placement^="left"] { + padding: 0 0.4rem; +} + +.bs-tooltip-left .arrow, .bs-tooltip-auto[x-placement^="left"] .arrow { + right: 0; + width: 0.4rem; + height: 0.8rem; +} + +.bs-tooltip-left .arrow::before, .bs-tooltip-auto[x-placement^="left"] .arrow::before { + left: 0; + border-width: 0.4rem 0 0.4rem 0.4rem; + border-left-color: #000; +} + +.tooltip-inner { + max-width: 200px; + padding: 0.25rem 0.5rem; + color: #fff; + text-align: center; + background-color: #000; + border-radius: 0.25rem; +} + +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1060; + display: block; + max-width: 276px; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-style: normal; + font-weight: 400; + line-height: 1.5; + text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + letter-spacing: normal; + word-break: normal; + word-spacing: normal; + white-space: normal; + line-break: auto; + font-size: 0.875rem; + word-wrap: break-word; + background-color: #fff; + background-clip: padding-box; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 0.3rem; +} + +.popover .arrow { + position: absolute; + display: block; + width: 1rem; + height: 0.5rem; + margin: 0 0.3rem; +} + +.popover .arrow::before, .popover .arrow::after { + position: absolute; + display: block; + content: ""; + border-color: transparent; + border-style: solid; +} + +.bs-popover-top, .bs-popover-auto[x-placement^="top"] { + margin-bottom: 0.5rem; +} + +.bs-popover-top .arrow, .bs-popover-auto[x-placement^="top"] .arrow { + bottom: calc((0.5rem + 1px) * -1); +} + +.bs-popover-top .arrow::before, .bs-popover-auto[x-placement^="top"] .arrow::before, +.bs-popover-top .arrow::after, +.bs-popover-auto[x-placement^="top"] .arrow::after { + border-width: 0.5rem 0.5rem 0; +} + +.bs-popover-top .arrow::before, .bs-popover-auto[x-placement^="top"] .arrow::before { + bottom: 0; + border-top-color: rgba(0, 0, 0, 0.25); +} + + +.bs-popover-top .arrow::after, +.bs-popover-auto[x-placement^="top"] .arrow::after { + bottom: 1px; + border-top-color: #fff; +} + +.bs-popover-right, .bs-popover-auto[x-placement^="right"] { + margin-left: 0.5rem; +} + +.bs-popover-right .arrow, .bs-popover-auto[x-placement^="right"] .arrow { + left: calc((0.5rem + 1px) * -1); + width: 0.5rem; + height: 1rem; + margin: 0.3rem 0; +} + +.bs-popover-right .arrow::before, .bs-popover-auto[x-placement^="right"] .arrow::before, +.bs-popover-right .arrow::after, +.bs-popover-auto[x-placement^="right"] .arrow::after { + border-width: 0.5rem 0.5rem 0.5rem 0; +} + +.bs-popover-right .arrow::before, .bs-popover-auto[x-placement^="right"] .arrow::before { + left: 0; + border-right-color: rgba(0, 0, 0, 0.25); +} + + +.bs-popover-right .arrow::after, +.bs-popover-auto[x-placement^="right"] .arrow::after { + left: 1px; + border-right-color: #fff; +} + +.bs-popover-bottom, .bs-popover-auto[x-placement^="bottom"] { + margin-top: 0.5rem; +} + +.bs-popover-bottom .arrow, .bs-popover-auto[x-placement^="bottom"] .arrow { + top: calc((0.5rem + 1px) * -1); +} + +.bs-popover-bottom .arrow::before, .bs-popover-auto[x-placement^="bottom"] .arrow::before, +.bs-popover-bottom .arrow::after, +.bs-popover-auto[x-placement^="bottom"] .arrow::after { + border-width: 0 0.5rem 0.5rem 0.5rem; +} + +.bs-popover-bottom .arrow::before, .bs-popover-auto[x-placement^="bottom"] .arrow::before { + top: 0; + border-bottom-color: rgba(0, 0, 0, 0.25); +} + + +.bs-popover-bottom .arrow::after, +.bs-popover-auto[x-placement^="bottom"] .arrow::after { + top: 1px; + border-bottom-color: #fff; +} + +.bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^="bottom"] .popover-header::before { + position: absolute; + top: 0; + left: 50%; + display: block; + width: 1rem; + margin-left: -0.5rem; + content: ""; + border-bottom: 1px solid #f7f7f7; +} + +.bs-popover-left, .bs-popover-auto[x-placement^="left"] { + margin-right: 0.5rem; +} + +.bs-popover-left .arrow, .bs-popover-auto[x-placement^="left"] .arrow { + right: calc((0.5rem + 1px) * -1); + width: 0.5rem; + height: 1rem; + margin: 0.3rem 0; +} + +.bs-popover-left .arrow::before, .bs-popover-auto[x-placement^="left"] .arrow::before, +.bs-popover-left .arrow::after, +.bs-popover-auto[x-placement^="left"] .arrow::after { + border-width: 0.5rem 0 0.5rem 0.5rem; +} + +.bs-popover-left .arrow::before, .bs-popover-auto[x-placement^="left"] .arrow::before { + right: 0; + border-left-color: rgba(0, 0, 0, 0.25); +} + + +.bs-popover-left .arrow::after, +.bs-popover-auto[x-placement^="left"] .arrow::after { + right: 1px; + border-left-color: #fff; +} + +.popover-header { + padding: 0.5rem 0.75rem; + margin-bottom: 0; + font-size: 1rem; + color: inherit; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + border-top-left-radius: calc(0.3rem - 1px); + border-top-right-radius: calc(0.3rem - 1px); +} + +.popover-header:empty { + display: none; +} + +.popover-body { + padding: 0.5rem 0.75rem; + color: #212529; +} + +.carousel { + position: relative; +} + +.carousel-inner { + position: relative; + width: 100%; + overflow: hidden; +} + +.carousel-item { + position: relative; + display: none; + -ms-flex-align: center; + align-items: center; + width: 100%; + transition: -webkit-transform 0.6s ease; + transition: transform 0.6s ease; + transition: transform 0.6s ease, -webkit-transform 0.6s ease; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + -webkit-perspective: 1000px; + perspective: 1000px; +} + +@media screen and (prefers-reduced-motion: reduce) { + .carousel-item { + transition: none; + } +} + +.carousel-item.active, +.carousel-item-next, +.carousel-item-prev { + display: block; +} + +.carousel-item-next, +.carousel-item-prev { + position: absolute; + top: 0; +} + +.carousel-item-next.carousel-item-left, +.carousel-item-prev.carousel-item-right { + -webkit-transform: translateX(0); + transform: translateX(0); +} + +@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) { + .carousel-item-next.carousel-item-left, + .carousel-item-prev.carousel-item-right { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.carousel-item-next, +.active.carousel-item-right { + -webkit-transform: translateX(100%); + transform: translateX(100%); +} + +@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) { + .carousel-item-next, + .active.carousel-item-right { + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } +} + +.carousel-item-prev, +.active.carousel-item-left { + -webkit-transform: translateX(-100%); + transform: translateX(-100%); +} + +@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) { + .carousel-item-prev, + .active.carousel-item-left { + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + } +} + +.carousel-fade .carousel-item { + opacity: 0; + transition-duration: .6s; + transition-property: opacity; +} + +.carousel-fade .carousel-item.active, +.carousel-fade .carousel-item-next.carousel-item-left, +.carousel-fade .carousel-item-prev.carousel-item-right { + opacity: 1; +} + +.carousel-fade .active.carousel-item-left, +.carousel-fade .active.carousel-item-right { + opacity: 0; +} + +.carousel-fade .carousel-item-next, +.carousel-fade .carousel-item-prev, +.carousel-fade .carousel-item.active, +.carousel-fade .active.carousel-item-left, +.carousel-fade .active.carousel-item-prev { + -webkit-transform: translateX(0); + transform: translateX(0); +} + +@supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) { + .carousel-fade .carousel-item-next, + .carousel-fade .carousel-item-prev, + .carousel-fade .carousel-item.active, + .carousel-fade .active.carousel-item-left, + .carousel-fade .active.carousel-item-prev { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} + +.carousel-control-prev, +.carousel-control-next { + position: absolute; + top: 0; + bottom: 0; + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + -ms-flex-pack: center; + justify-content: center; + width: 15%; + color: #fff; + text-align: center; + opacity: 0.5; +} + +.carousel-control-prev:hover, .carousel-control-prev:focus, +.carousel-control-next:hover, +.carousel-control-next:focus { + color: #fff; + text-decoration: none; + outline: 0; + opacity: .9; +} + +.carousel-control-prev { + left: 0; +} + +.carousel-control-next { + right: 0; +} + +.carousel-control-prev-icon, +.carousel-control-next-icon { + display: inline-block; + width: 20px; + height: 20px; + background: transparent no-repeat center center; + background-size: 100% 100%; +} + +.carousel-control-prev-icon { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E"); +} + +.carousel-control-next-icon { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E"); +} + +.carousel-indicators { + position: absolute; + right: 0; + bottom: 10px; + left: 0; + z-index: 15; + display: -ms-flexbox; + display: flex; + -ms-flex-pack: center; + justify-content: center; + padding-left: 0; + margin-right: 15%; + margin-left: 15%; + list-style: none; +} + +.carousel-indicators li { + position: relative; + -ms-flex: 0 1 auto; + flex: 0 1 auto; + width: 30px; + height: 3px; + margin-right: 3px; + margin-left: 3px; + text-indent: -999px; + cursor: pointer; + background-color: rgba(255, 255, 255, 0.5); +} + +.carousel-indicators li::before { + position: absolute; + top: -10px; + left: 0; + display: inline-block; + width: 100%; + height: 10px; + content: ""; +} + +.carousel-indicators li::after { + position: absolute; + bottom: -10px; + left: 0; + display: inline-block; + width: 100%; + height: 10px; + content: ""; +} + +.carousel-indicators .active { + background-color: #fff; +} + +.carousel-caption { + position: absolute; + right: 15%; + bottom: 20px; + left: 15%; + z-index: 10; + padding-top: 20px; + padding-bottom: 20px; + color: #fff; + text-align: center; +} + +.align-baseline { + vertical-align: baseline !important; +} + +.align-top { + vertical-align: top !important; +} + +.align-middle { + vertical-align: middle !important; +} + +.align-bottom { + vertical-align: bottom !important; +} + +.align-text-bottom { + vertical-align: text-bottom !important; +} + +.align-text-top { + vertical-align: text-top !important; +} + +.bg-primary { + background-color: #007bff !important; +} + +a.bg-primary:hover, a.bg-primary:focus, +button.bg-primary:hover, +button.bg-primary:focus { + background-color: #0062cc !important; +} + +.bg-secondary { + background-color: #6c757d !important; +} + +a.bg-secondary:hover, a.bg-secondary:focus, +button.bg-secondary:hover, +button.bg-secondary:focus { + background-color: #545b62 !important; +} + +.bg-success { + background-color: #28a745 !important; +} + +a.bg-success:hover, a.bg-success:focus, +button.bg-success:hover, +button.bg-success:focus { + background-color: #1e7e34 !important; +} + +.bg-info { + background-color: #17a2b8 !important; +} + +a.bg-info:hover, a.bg-info:focus, +button.bg-info:hover, +button.bg-info:focus { + background-color: #117a8b !important; +} + +.bg-warning { + background-color: #ffc107 !important; +} + +a.bg-warning:hover, a.bg-warning:focus, +button.bg-warning:hover, +button.bg-warning:focus { + background-color: #d39e00 !important; +} + +.bg-danger { + background-color: #dc3545 !important; +} + +a.bg-danger:hover, a.bg-danger:focus, +button.bg-danger:hover, +button.bg-danger:focus { + background-color: #bd2130 !important; +} + +.bg-light { + background-color: #f8f9fa !important; +} + +a.bg-light:hover, a.bg-light:focus, +button.bg-light:hover, +button.bg-light:focus { + background-color: #dae0e5 !important; +} + +.bg-dark { + background-color: #343a40 !important; +} + +a.bg-dark:hover, a.bg-dark:focus, +button.bg-dark:hover, +button.bg-dark:focus { + background-color: #1d2124 !important; +} + +.bg-white { + background-color: #fff !important; +} + +.bg-transparent { + background-color: transparent !important; +} + +.border { + border: 1px solid #dee2e6 !important; +} + +.border-top { + border-top: 1px solid #dee2e6 !important; +} + +.border-right { + border-right: 1px solid #dee2e6 !important; +} + +.border-bottom { + border-bottom: 1px solid #dee2e6 !important; +} + +.border-left { + border-left: 1px solid #dee2e6 !important; +} + +.border-0 { + border: 0 !important; +} + +.border-top-0 { + border-top: 0 !important; +} + +.border-right-0 { + border-right: 0 !important; +} + +.border-bottom-0 { + border-bottom: 0 !important; +} + +.border-left-0 { + border-left: 0 !important; +} + +.border-primary { + border-color: #007bff !important; +} + +.border-secondary { + border-color: #6c757d !important; +} + +.border-success { + border-color: #28a745 !important; +} + +.border-info { + border-color: #17a2b8 !important; +} + +.border-warning { + border-color: #ffc107 !important; +} + +.border-danger { + border-color: #dc3545 !important; +} + +.border-light { + border-color: #f8f9fa !important; +} + +.border-dark { + border-color: #343a40 !important; +} + +.border-white { + border-color: #fff !important; +} + +.rounded { + border-radius: 0.25rem !important; +} + +.rounded-top { + border-top-left-radius: 0.25rem !important; + border-top-right-radius: 0.25rem !important; +} + +.rounded-right { + border-top-right-radius: 0.25rem !important; + border-bottom-right-radius: 0.25rem !important; +} + +.rounded-bottom { + border-bottom-right-radius: 0.25rem !important; + border-bottom-left-radius: 0.25rem !important; +} + +.rounded-left { + border-top-left-radius: 0.25rem !important; + border-bottom-left-radius: 0.25rem !important; +} + +.rounded-circle { + border-radius: 50% !important; +} + +.rounded-0 { + border-radius: 0 !important; +} + +.clearfix::after { + display: block; + clear: both; + content: ""; +} + +.d-none { + display: none !important; +} + +.d-inline { + display: inline !important; +} + +.d-inline-block { + display: inline-block !important; +} + +.d-block { + display: block !important; +} + +.d-table { + display: table !important; +} + +.d-table-row { + display: table-row !important; +} + +.d-table-cell { + display: table-cell !important; +} + +.d-flex { + display: -ms-flexbox !important; + display: flex !important; +} + +.d-inline-flex { + display: -ms-inline-flexbox !important; + display: inline-flex !important; +} + +@media (min-width: 576px) { + .d-sm-none { + display: none !important; + } + .d-sm-inline { + display: inline !important; + } + .d-sm-inline-block { + display: inline-block !important; + } + .d-sm-block { + display: block !important; + } + .d-sm-table { + display: table !important; + } + .d-sm-table-row { + display: table-row !important; + } + .d-sm-table-cell { + display: table-cell !important; + } + .d-sm-flex { + display: -ms-flexbox !important; + display: flex !important; + } + .d-sm-inline-flex { + display: -ms-inline-flexbox !important; + display: inline-flex !important; + } +} + +@media (min-width: 768px) { + .d-md-none { + display: none !important; + } + .d-md-inline { + display: inline !important; + } + .d-md-inline-block { + display: inline-block !important; + } + .d-md-block { + display: block !important; + } + .d-md-table { + display: table !important; + } + .d-md-table-row { + display: table-row !important; + } + .d-md-table-cell { + display: table-cell !important; + } + .d-md-flex { + display: -ms-flexbox !important; + display: flex !important; + } + .d-md-inline-flex { + display: -ms-inline-flexbox !important; + display: inline-flex !important; + } +} + +@media (min-width: 992px) { + .d-lg-none { + display: none !important; + } + .d-lg-inline { + display: inline !important; + } + .d-lg-inline-block { + display: inline-block !important; + } + .d-lg-block { + display: block !important; + } + .d-lg-table { + display: table !important; + } + .d-lg-table-row { + display: table-row !important; + } + .d-lg-table-cell { + display: table-cell !important; + } + .d-lg-flex { + display: -ms-flexbox !important; + display: flex !important; + } + .d-lg-inline-flex { + display: -ms-inline-flexbox !important; + display: inline-flex !important; + } +} + +@media (min-width: 1200px) { + .d-xl-none { + display: none !important; + } + .d-xl-inline { + display: inline !important; + } + .d-xl-inline-block { + display: inline-block !important; + } + .d-xl-block { + display: block !important; + } + .d-xl-table { + display: table !important; + } + .d-xl-table-row { + display: table-row !important; + } + .d-xl-table-cell { + display: table-cell !important; + } + .d-xl-flex { + display: -ms-flexbox !important; + display: flex !important; + } + .d-xl-inline-flex { + display: -ms-inline-flexbox !important; + display: inline-flex !important; + } +} + +@media print { + .d-print-none { + display: none !important; + } + .d-print-inline { + display: inline !important; + } + .d-print-inline-block { + display: inline-block !important; + } + .d-print-block { + display: block !important; + } + .d-print-table { + display: table !important; + } + .d-print-table-row { + display: table-row !important; + } + .d-print-table-cell { + display: table-cell !important; + } + .d-print-flex { + display: -ms-flexbox !important; + display: flex !important; + } + .d-print-inline-flex { + display: -ms-inline-flexbox !important; + display: inline-flex !important; + } +} + +.embed-responsive { + position: relative; + display: block; + width: 100%; + padding: 0; + overflow: hidden; +} + +.embed-responsive::before { + display: block; + content: ""; +} + +.embed-responsive .embed-responsive-item, +.embed-responsive iframe, +.embed-responsive embed, +.embed-responsive object, +.embed-responsive video { + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 100%; + height: 100%; + border: 0; +} + +.embed-responsive-21by9::before { + padding-top: 42.857143%; +} + +.embed-responsive-16by9::before { + padding-top: 56.25%; +} + +.embed-responsive-4by3::before { + padding-top: 75%; +} + +.embed-responsive-1by1::before { + padding-top: 100%; +} + +.flex-row { + -ms-flex-direction: row !important; + flex-direction: row !important; +} + +.flex-column { + -ms-flex-direction: column !important; + flex-direction: column !important; +} + +.flex-row-reverse { + -ms-flex-direction: row-reverse !important; + flex-direction: row-reverse !important; +} + +.flex-column-reverse { + -ms-flex-direction: column-reverse !important; + flex-direction: column-reverse !important; +} + +.flex-wrap { + -ms-flex-wrap: wrap !important; + flex-wrap: wrap !important; +} + +.flex-nowrap { + -ms-flex-wrap: nowrap !important; + flex-wrap: nowrap !important; +} + +.flex-wrap-reverse { + -ms-flex-wrap: wrap-reverse !important; + flex-wrap: wrap-reverse !important; +} + +.flex-fill { + -ms-flex: 1 1 auto !important; + flex: 1 1 auto !important; +} + +.flex-grow-0 { + -ms-flex-positive: 0 !important; + flex-grow: 0 !important; +} + +.flex-grow-1 { + -ms-flex-positive: 1 !important; + flex-grow: 1 !important; +} + +.flex-shrink-0 { + -ms-flex-negative: 0 !important; + flex-shrink: 0 !important; +} + +.flex-shrink-1 { + -ms-flex-negative: 1 !important; + flex-shrink: 1 !important; +} + +.justify-content-start { + -ms-flex-pack: start !important; + justify-content: flex-start !important; +} + +.justify-content-end { + -ms-flex-pack: end !important; + justify-content: flex-end !important; +} + +.justify-content-center { + -ms-flex-pack: center !important; + justify-content: center !important; +} + +.justify-content-between { + -ms-flex-pack: justify !important; + justify-content: space-between !important; +} + +.justify-content-around { + -ms-flex-pack: distribute !important; + justify-content: space-around !important; +} + +.align-items-start { + -ms-flex-align: start !important; + align-items: flex-start !important; +} + +.align-items-end { + -ms-flex-align: end !important; + align-items: flex-end !important; +} + +.align-items-center { + -ms-flex-align: center !important; + align-items: center !important; +} + +.align-items-baseline { + -ms-flex-align: baseline !important; + align-items: baseline !important; +} + +.align-items-stretch { + -ms-flex-align: stretch !important; + align-items: stretch !important; +} + +.align-content-start { + -ms-flex-line-pack: start !important; + align-content: flex-start !important; +} + +.align-content-end { + -ms-flex-line-pack: end !important; + align-content: flex-end !important; +} + +.align-content-center { + -ms-flex-line-pack: center !important; + align-content: center !important; +} + +.align-content-between { + -ms-flex-line-pack: justify !important; + align-content: space-between !important; +} + +.align-content-around { + -ms-flex-line-pack: distribute !important; + align-content: space-around !important; +} + +.align-content-stretch { + -ms-flex-line-pack: stretch !important; + align-content: stretch !important; +} + +.align-self-auto { + -ms-flex-item-align: auto !important; + align-self: auto !important; +} + +.align-self-start { + -ms-flex-item-align: start !important; + align-self: flex-start !important; +} + +.align-self-end { + -ms-flex-item-align: end !important; + align-self: flex-end !important; +} + +.align-self-center { + -ms-flex-item-align: center !important; + align-self: center !important; +} + +.align-self-baseline { + -ms-flex-item-align: baseline !important; + align-self: baseline !important; +} + +.align-self-stretch { + -ms-flex-item-align: stretch !important; + align-self: stretch !important; +} + +@media (min-width: 576px) { + .flex-sm-row { + -ms-flex-direction: row !important; + flex-direction: row !important; + } + .flex-sm-column { + -ms-flex-direction: column !important; + flex-direction: column !important; + } + .flex-sm-row-reverse { + -ms-flex-direction: row-reverse !important; + flex-direction: row-reverse !important; + } + .flex-sm-column-reverse { + -ms-flex-direction: column-reverse !important; + flex-direction: column-reverse !important; + } + .flex-sm-wrap { + -ms-flex-wrap: wrap !important; + flex-wrap: wrap !important; + } + .flex-sm-nowrap { + -ms-flex-wrap: nowrap !important; + flex-wrap: nowrap !important; + } + .flex-sm-wrap-reverse { + -ms-flex-wrap: wrap-reverse !important; + flex-wrap: wrap-reverse !important; + } + .flex-sm-fill { + -ms-flex: 1 1 auto !important; + flex: 1 1 auto !important; + } + .flex-sm-grow-0 { + -ms-flex-positive: 0 !important; + flex-grow: 0 !important; + } + .flex-sm-grow-1 { + -ms-flex-positive: 1 !important; + flex-grow: 1 !important; + } + .flex-sm-shrink-0 { + -ms-flex-negative: 0 !important; + flex-shrink: 0 !important; + } + .flex-sm-shrink-1 { + -ms-flex-negative: 1 !important; + flex-shrink: 1 !important; + } + .justify-content-sm-start { + -ms-flex-pack: start !important; + justify-content: flex-start !important; + } + .justify-content-sm-end { + -ms-flex-pack: end !important; + justify-content: flex-end !important; + } + .justify-content-sm-center { + -ms-flex-pack: center !important; + justify-content: center !important; + } + .justify-content-sm-between { + -ms-flex-pack: justify !important; + justify-content: space-between !important; + } + .justify-content-sm-around { + -ms-flex-pack: distribute !important; + justify-content: space-around !important; + } + .align-items-sm-start { + -ms-flex-align: start !important; + align-items: flex-start !important; + } + .align-items-sm-end { + -ms-flex-align: end !important; + align-items: flex-end !important; + } + .align-items-sm-center { + -ms-flex-align: center !important; + align-items: center !important; + } + .align-items-sm-baseline { + -ms-flex-align: baseline !important; + align-items: baseline !important; + } + .align-items-sm-stretch { + -ms-flex-align: stretch !important; + align-items: stretch !important; + } + .align-content-sm-start { + -ms-flex-line-pack: start !important; + align-content: flex-start !important; + } + .align-content-sm-end { + -ms-flex-line-pack: end !important; + align-content: flex-end !important; + } + .align-content-sm-center { + -ms-flex-line-pack: center !important; + align-content: center !important; + } + .align-content-sm-between { + -ms-flex-line-pack: justify !important; + align-content: space-between !important; + } + .align-content-sm-around { + -ms-flex-line-pack: distribute !important; + align-content: space-around !important; + } + .align-content-sm-stretch { + -ms-flex-line-pack: stretch !important; + align-content: stretch !important; + } + .align-self-sm-auto { + -ms-flex-item-align: auto !important; + align-self: auto !important; + } + .align-self-sm-start { + -ms-flex-item-align: start !important; + align-self: flex-start !important; + } + .align-self-sm-end { + -ms-flex-item-align: end !important; + align-self: flex-end !important; + } + .align-self-sm-center { + -ms-flex-item-align: center !important; + align-self: center !important; + } + .align-self-sm-baseline { + -ms-flex-item-align: baseline !important; + align-self: baseline !important; + } + .align-self-sm-stretch { + -ms-flex-item-align: stretch !important; + align-self: stretch !important; + } +} + +@media (min-width: 768px) { + .flex-md-row { + -ms-flex-direction: row !important; + flex-direction: row !important; + } + .flex-md-column { + -ms-flex-direction: column !important; + flex-direction: column !important; + } + .flex-md-row-reverse { + -ms-flex-direction: row-reverse !important; + flex-direction: row-reverse !important; + } + .flex-md-column-reverse { + -ms-flex-direction: column-reverse !important; + flex-direction: column-reverse !important; + } + .flex-md-wrap { + -ms-flex-wrap: wrap !important; + flex-wrap: wrap !important; + } + .flex-md-nowrap { + -ms-flex-wrap: nowrap !important; + flex-wrap: nowrap !important; + } + .flex-md-wrap-reverse { + -ms-flex-wrap: wrap-reverse !important; + flex-wrap: wrap-reverse !important; + } + .flex-md-fill { + -ms-flex: 1 1 auto !important; + flex: 1 1 auto !important; + } + .flex-md-grow-0 { + -ms-flex-positive: 0 !important; + flex-grow: 0 !important; + } + .flex-md-grow-1 { + -ms-flex-positive: 1 !important; + flex-grow: 1 !important; + } + .flex-md-shrink-0 { + -ms-flex-negative: 0 !important; + flex-shrink: 0 !important; + } + .flex-md-shrink-1 { + -ms-flex-negative: 1 !important; + flex-shrink: 1 !important; + } + .justify-content-md-start { + -ms-flex-pack: start !important; + justify-content: flex-start !important; + } + .justify-content-md-end { + -ms-flex-pack: end !important; + justify-content: flex-end !important; + } + .justify-content-md-center { + -ms-flex-pack: center !important; + justify-content: center !important; + } + .justify-content-md-between { + -ms-flex-pack: justify !important; + justify-content: space-between !important; + } + .justify-content-md-around { + -ms-flex-pack: distribute !important; + justify-content: space-around !important; + } + .align-items-md-start { + -ms-flex-align: start !important; + align-items: flex-start !important; + } + .align-items-md-end { + -ms-flex-align: end !important; + align-items: flex-end !important; + } + .align-items-md-center { + -ms-flex-align: center !important; + align-items: center !important; + } + .align-items-md-baseline { + -ms-flex-align: baseline !important; + align-items: baseline !important; + } + .align-items-md-stretch { + -ms-flex-align: stretch !important; + align-items: stretch !important; + } + .align-content-md-start { + -ms-flex-line-pack: start !important; + align-content: flex-start !important; + } + .align-content-md-end { + -ms-flex-line-pack: end !important; + align-content: flex-end !important; + } + .align-content-md-center { + -ms-flex-line-pack: center !important; + align-content: center !important; + } + .align-content-md-between { + -ms-flex-line-pack: justify !important; + align-content: space-between !important; + } + .align-content-md-around { + -ms-flex-line-pack: distribute !important; + align-content: space-around !important; + } + .align-content-md-stretch { + -ms-flex-line-pack: stretch !important; + align-content: stretch !important; + } + .align-self-md-auto { + -ms-flex-item-align: auto !important; + align-self: auto !important; + } + .align-self-md-start { + -ms-flex-item-align: start !important; + align-self: flex-start !important; + } + .align-self-md-end { + -ms-flex-item-align: end !important; + align-self: flex-end !important; + } + .align-self-md-center { + -ms-flex-item-align: center !important; + align-self: center !important; + } + .align-self-md-baseline { + -ms-flex-item-align: baseline !important; + align-self: baseline !important; + } + .align-self-md-stretch { + -ms-flex-item-align: stretch !important; + align-self: stretch !important; + } +} + +@media (min-width: 992px) { + .flex-lg-row { + -ms-flex-direction: row !important; + flex-direction: row !important; + } + .flex-lg-column { + -ms-flex-direction: column !important; + flex-direction: column !important; + } + .flex-lg-row-reverse { + -ms-flex-direction: row-reverse !important; + flex-direction: row-reverse !important; + } + .flex-lg-column-reverse { + -ms-flex-direction: column-reverse !important; + flex-direction: column-reverse !important; + } + .flex-lg-wrap { + -ms-flex-wrap: wrap !important; + flex-wrap: wrap !important; + } + .flex-lg-nowrap { + -ms-flex-wrap: nowrap !important; + flex-wrap: nowrap !important; + } + .flex-lg-wrap-reverse { + -ms-flex-wrap: wrap-reverse !important; + flex-wrap: wrap-reverse !important; + } + .flex-lg-fill { + -ms-flex: 1 1 auto !important; + flex: 1 1 auto !important; + } + .flex-lg-grow-0 { + -ms-flex-positive: 0 !important; + flex-grow: 0 !important; + } + .flex-lg-grow-1 { + -ms-flex-positive: 1 !important; + flex-grow: 1 !important; + } + .flex-lg-shrink-0 { + -ms-flex-negative: 0 !important; + flex-shrink: 0 !important; + } + .flex-lg-shrink-1 { + -ms-flex-negative: 1 !important; + flex-shrink: 1 !important; + } + .justify-content-lg-start { + -ms-flex-pack: start !important; + justify-content: flex-start !important; + } + .justify-content-lg-end { + -ms-flex-pack: end !important; + justify-content: flex-end !important; + } + .justify-content-lg-center { + -ms-flex-pack: center !important; + justify-content: center !important; + } + .justify-content-lg-between { + -ms-flex-pack: justify !important; + justify-content: space-between !important; + } + .justify-content-lg-around { + -ms-flex-pack: distribute !important; + justify-content: space-around !important; + } + .align-items-lg-start { + -ms-flex-align: start !important; + align-items: flex-start !important; + } + .align-items-lg-end { + -ms-flex-align: end !important; + align-items: flex-end !important; + } + .align-items-lg-center { + -ms-flex-align: center !important; + align-items: center !important; + } + .align-items-lg-baseline { + -ms-flex-align: baseline !important; + align-items: baseline !important; + } + .align-items-lg-stretch { + -ms-flex-align: stretch !important; + align-items: stretch !important; + } + .align-content-lg-start { + -ms-flex-line-pack: start !important; + align-content: flex-start !important; + } + .align-content-lg-end { + -ms-flex-line-pack: end !important; + align-content: flex-end !important; + } + .align-content-lg-center { + -ms-flex-line-pack: center !important; + align-content: center !important; + } + .align-content-lg-between { + -ms-flex-line-pack: justify !important; + align-content: space-between !important; + } + .align-content-lg-around { + -ms-flex-line-pack: distribute !important; + align-content: space-around !important; + } + .align-content-lg-stretch { + -ms-flex-line-pack: stretch !important; + align-content: stretch !important; + } + .align-self-lg-auto { + -ms-flex-item-align: auto !important; + align-self: auto !important; + } + .align-self-lg-start { + -ms-flex-item-align: start !important; + align-self: flex-start !important; + } + .align-self-lg-end { + -ms-flex-item-align: end !important; + align-self: flex-end !important; + } + .align-self-lg-center { + -ms-flex-item-align: center !important; + align-self: center !important; + } + .align-self-lg-baseline { + -ms-flex-item-align: baseline !important; + align-self: baseline !important; + } + .align-self-lg-stretch { + -ms-flex-item-align: stretch !important; + align-self: stretch !important; + } +} + +@media (min-width: 1200px) { + .flex-xl-row { + -ms-flex-direction: row !important; + flex-direction: row !important; + } + .flex-xl-column { + -ms-flex-direction: column !important; + flex-direction: column !important; + } + .flex-xl-row-reverse { + -ms-flex-direction: row-reverse !important; + flex-direction: row-reverse !important; + } + .flex-xl-column-reverse { + -ms-flex-direction: column-reverse !important; + flex-direction: column-reverse !important; + } + .flex-xl-wrap { + -ms-flex-wrap: wrap !important; + flex-wrap: wrap !important; + } + .flex-xl-nowrap { + -ms-flex-wrap: nowrap !important; + flex-wrap: nowrap !important; + } + .flex-xl-wrap-reverse { + -ms-flex-wrap: wrap-reverse !important; + flex-wrap: wrap-reverse !important; + } + .flex-xl-fill { + -ms-flex: 1 1 auto !important; + flex: 1 1 auto !important; + } + .flex-xl-grow-0 { + -ms-flex-positive: 0 !important; + flex-grow: 0 !important; + } + .flex-xl-grow-1 { + -ms-flex-positive: 1 !important; + flex-grow: 1 !important; + } + .flex-xl-shrink-0 { + -ms-flex-negative: 0 !important; + flex-shrink: 0 !important; + } + .flex-xl-shrink-1 { + -ms-flex-negative: 1 !important; + flex-shrink: 1 !important; + } + .justify-content-xl-start { + -ms-flex-pack: start !important; + justify-content: flex-start !important; + } + .justify-content-xl-end { + -ms-flex-pack: end !important; + justify-content: flex-end !important; + } + .justify-content-xl-center { + -ms-flex-pack: center !important; + justify-content: center !important; + } + .justify-content-xl-between { + -ms-flex-pack: justify !important; + justify-content: space-between !important; + } + .justify-content-xl-around { + -ms-flex-pack: distribute !important; + justify-content: space-around !important; + } + .align-items-xl-start { + -ms-flex-align: start !important; + align-items: flex-start !important; + } + .align-items-xl-end { + -ms-flex-align: end !important; + align-items: flex-end !important; + } + .align-items-xl-center { + -ms-flex-align: center !important; + align-items: center !important; + } + .align-items-xl-baseline { + -ms-flex-align: baseline !important; + align-items: baseline !important; + } + .align-items-xl-stretch { + -ms-flex-align: stretch !important; + align-items: stretch !important; + } + .align-content-xl-start { + -ms-flex-line-pack: start !important; + align-content: flex-start !important; + } + .align-content-xl-end { + -ms-flex-line-pack: end !important; + align-content: flex-end !important; + } + .align-content-xl-center { + -ms-flex-line-pack: center !important; + align-content: center !important; + } + .align-content-xl-between { + -ms-flex-line-pack: justify !important; + align-content: space-between !important; + } + .align-content-xl-around { + -ms-flex-line-pack: distribute !important; + align-content: space-around !important; + } + .align-content-xl-stretch { + -ms-flex-line-pack: stretch !important; + align-content: stretch !important; + } + .align-self-xl-auto { + -ms-flex-item-align: auto !important; + align-self: auto !important; + } + .align-self-xl-start { + -ms-flex-item-align: start !important; + align-self: flex-start !important; + } + .align-self-xl-end { + -ms-flex-item-align: end !important; + align-self: flex-end !important; + } + .align-self-xl-center { + -ms-flex-item-align: center !important; + align-self: center !important; + } + .align-self-xl-baseline { + -ms-flex-item-align: baseline !important; + align-self: baseline !important; + } + .align-self-xl-stretch { + -ms-flex-item-align: stretch !important; + align-self: stretch !important; + } +} + +.float-left { + float: left !important; +} + +.float-right { + float: right !important; +} + +.float-none { + float: none !important; +} + +@media (min-width: 576px) { + .float-sm-left { + float: left !important; + } + .float-sm-right { + float: right !important; + } + .float-sm-none { + float: none !important; + } +} + +@media (min-width: 768px) { + .float-md-left { + float: left !important; + } + .float-md-right { + float: right !important; + } + .float-md-none { + float: none !important; + } +} + +@media (min-width: 992px) { + .float-lg-left { + float: left !important; + } + .float-lg-right { + float: right !important; + } + .float-lg-none { + float: none !important; + } +} + +@media (min-width: 1200px) { + .float-xl-left { + float: left !important; + } + .float-xl-right { + float: right !important; + } + .float-xl-none { + float: none !important; + } +} + +.position-static { + position: static !important; +} + +.position-relative { + position: relative !important; +} + +.position-absolute { + position: absolute !important; +} + +.position-fixed { + position: fixed !important; +} + +.position-sticky { + position: -webkit-sticky !important; + position: sticky !important; +} + +.fixed-top { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: 1030; +} + +.fixed-bottom { + position: fixed; + right: 0; + bottom: 0; + left: 0; + z-index: 1030; +} + +@supports ((position: -webkit-sticky) or (position: sticky)) { + .sticky-top { + position: -webkit-sticky; + position: sticky; + top: 0; + z-index: 1020; + } +} + +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border: 0; +} + +.sr-only-focusable:active, .sr-only-focusable:focus { + position: static; + width: auto; + height: auto; + overflow: visible; + clip: auto; + white-space: normal; +} + +.shadow-sm { + box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important; +} + +.shadow { + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important; +} + +.shadow-lg { + box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important; +} + +.shadow-none { + box-shadow: none !important; +} + +.w-25 { + width: 25% !important; +} + +.w-50 { + width: 50% !important; +} + +.w-75 { + width: 75% !important; +} + +.w-100 { + width: 100% !important; +} + +.w-auto { + width: auto !important; +} + +.h-25 { + height: 25% !important; +} + +.h-50 { + height: 50% !important; +} + +.h-75 { + height: 75% !important; +} + +.h-100 { + height: 100% !important; +} + +.h-auto { + height: auto !important; +} + +.mw-100 { + max-width: 100% !important; +} + +.mh-100 { + max-height: 100% !important; +} + +.m-0 { + margin: 0 !important; +} + +.mt-0, +.my-0 { + margin-top: 0 !important; +} + +.mr-0, +.mx-0 { + margin-right: 0 !important; +} + +.mb-0, +.my-0 { + margin-bottom: 0 !important; +} + +.ml-0, +.mx-0 { + margin-left: 0 !important; +} + +.m-1 { + margin: 0.25rem !important; +} + +.mt-1, +.my-1 { + margin-top: 0.25rem !important; +} + +.mr-1, +.mx-1 { + margin-right: 0.25rem !important; +} + +.mb-1, +.my-1 { + margin-bottom: 0.25rem !important; +} + +.ml-1, +.mx-1 { + margin-left: 0.25rem !important; +} + +.m-2 { + margin: 0.5rem !important; +} + +.mt-2, +.my-2 { + margin-top: 0.5rem !important; +} + +.mr-2, +.mx-2 { + margin-right: 0.5rem !important; +} + +.mb-2, +.my-2 { + margin-bottom: 0.5rem !important; +} + +.ml-2, +.mx-2 { + margin-left: 0.5rem !important; +} + +.m-3 { + margin: 1rem !important; +} + +.mt-3, +.my-3 { + margin-top: 1rem !important; +} + +.mr-3, +.mx-3 { + margin-right: 1rem !important; +} + +.mb-3, +.my-3 { + margin-bottom: 1rem !important; +} + +.ml-3, +.mx-3 { + margin-left: 1rem !important; +} + +.m-4 { + margin: 1.5rem !important; +} + +.mt-4, +.my-4 { + margin-top: 1.5rem !important; +} + +.mr-4, +.mx-4 { + margin-right: 1.5rem !important; +} + +.mb-4, +.my-4 { + margin-bottom: 1.5rem !important; +} + +.ml-4, +.mx-4 { + margin-left: 1.5rem !important; +} + +.m-5 { + margin: 3rem !important; +} + +.mt-5, +.my-5 { + margin-top: 3rem !important; +} + +.mr-5, +.mx-5 { + margin-right: 3rem !important; +} + +.mb-5, +.my-5 { + margin-bottom: 3rem !important; +} + +.ml-5, +.mx-5 { + margin-left: 3rem !important; +} + +.p-0 { + padding: 0 !important; +} + +.pt-0, +.py-0 { + padding-top: 0 !important; +} + +.pr-0, +.px-0 { + padding-right: 0 !important; +} + +.pb-0, +.py-0 { + padding-bottom: 0 !important; +} + +.pl-0, +.px-0 { + padding-left: 0 !important; +} + +.p-1 { + padding: 0.25rem !important; +} + +.pt-1, +.py-1 { + padding-top: 0.25rem !important; +} + +.pr-1, +.px-1 { + padding-right: 0.25rem !important; +} + +.pb-1, +.py-1 { + padding-bottom: 0.25rem !important; +} + +.pl-1, +.px-1 { + padding-left: 0.25rem !important; +} + +.p-2 { + padding: 0.5rem !important; +} + +.pt-2, +.py-2 { + padding-top: 0.5rem !important; +} + +.pr-2, +.px-2 { + padding-right: 0.5rem !important; +} + +.pb-2, +.py-2 { + padding-bottom: 0.5rem !important; +} + +.pl-2, +.px-2 { + padding-left: 0.5rem !important; +} + +.p-3 { + padding: 1rem !important; +} + +.pt-3, +.py-3 { + padding-top: 1rem !important; +} + +.pr-3, +.px-3 { + padding-right: 1rem !important; +} + +.pb-3, +.py-3 { + padding-bottom: 1rem !important; +} + +.pl-3, +.px-3 { + padding-left: 1rem !important; +} + +.p-4 { + padding: 1.5rem !important; +} + +.pt-4, +.py-4 { + padding-top: 1.5rem !important; +} + +.pr-4, +.px-4 { + padding-right: 1.5rem !important; +} + +.pb-4, +.py-4 { + padding-bottom: 1.5rem !important; +} + +.pl-4, +.px-4 { + padding-left: 1.5rem !important; +} + +.p-5 { + padding: 3rem !important; +} + +.pt-5, +.py-5 { + padding-top: 3rem !important; +} + +.pr-5, +.px-5 { + padding-right: 3rem !important; +} + +.pb-5, +.py-5 { + padding-bottom: 3rem !important; +} + +.pl-5, +.px-5 { + padding-left: 3rem !important; +} + +.m-auto { + margin: auto !important; +} + +.mt-auto, +.my-auto { + margin-top: auto !important; +} + +.mr-auto, +.mx-auto { + margin-right: auto !important; +} + +.mb-auto, +.my-auto { + margin-bottom: auto !important; +} + +.ml-auto, +.mx-auto { + margin-left: auto !important; +} + +@media (min-width: 576px) { + .m-sm-0 { + margin: 0 !important; + } + .mt-sm-0, + .my-sm-0 { + margin-top: 0 !important; + } + .mr-sm-0, + .mx-sm-0 { + margin-right: 0 !important; + } + .mb-sm-0, + .my-sm-0 { + margin-bottom: 0 !important; + } + .ml-sm-0, + .mx-sm-0 { + margin-left: 0 !important; + } + .m-sm-1 { + margin: 0.25rem !important; + } + .mt-sm-1, + .my-sm-1 { + margin-top: 0.25rem !important; + } + .mr-sm-1, + .mx-sm-1 { + margin-right: 0.25rem !important; + } + .mb-sm-1, + .my-sm-1 { + margin-bottom: 0.25rem !important; + } + .ml-sm-1, + .mx-sm-1 { + margin-left: 0.25rem !important; + } + .m-sm-2 { + margin: 0.5rem !important; + } + .mt-sm-2, + .my-sm-2 { + margin-top: 0.5rem !important; + } + .mr-sm-2, + .mx-sm-2 { + margin-right: 0.5rem !important; + } + .mb-sm-2, + .my-sm-2 { + margin-bottom: 0.5rem !important; + } + .ml-sm-2, + .mx-sm-2 { + margin-left: 0.5rem !important; + } + .m-sm-3 { + margin: 1rem !important; + } + .mt-sm-3, + .my-sm-3 { + margin-top: 1rem !important; + } + .mr-sm-3, + .mx-sm-3 { + margin-right: 1rem !important; + } + .mb-sm-3, + .my-sm-3 { + margin-bottom: 1rem !important; + } + .ml-sm-3, + .mx-sm-3 { + margin-left: 1rem !important; + } + .m-sm-4 { + margin: 1.5rem !important; + } + .mt-sm-4, + .my-sm-4 { + margin-top: 1.5rem !important; + } + .mr-sm-4, + .mx-sm-4 { + margin-right: 1.5rem !important; + } + .mb-sm-4, + .my-sm-4 { + margin-bottom: 1.5rem !important; + } + .ml-sm-4, + .mx-sm-4 { + margin-left: 1.5rem !important; + } + .m-sm-5 { + margin: 3rem !important; + } + .mt-sm-5, + .my-sm-5 { + margin-top: 3rem !important; + } + .mr-sm-5, + .mx-sm-5 { + margin-right: 3rem !important; + } + .mb-sm-5, + .my-sm-5 { + margin-bottom: 3rem !important; + } + .ml-sm-5, + .mx-sm-5 { + margin-left: 3rem !important; + } + .p-sm-0 { + padding: 0 !important; + } + .pt-sm-0, + .py-sm-0 { + padding-top: 0 !important; + } + .pr-sm-0, + .px-sm-0 { + padding-right: 0 !important; + } + .pb-sm-0, + .py-sm-0 { + padding-bottom: 0 !important; + } + .pl-sm-0, + .px-sm-0 { + padding-left: 0 !important; + } + .p-sm-1 { + padding: 0.25rem !important; + } + .pt-sm-1, + .py-sm-1 { + padding-top: 0.25rem !important; + } + .pr-sm-1, + .px-sm-1 { + padding-right: 0.25rem !important; + } + .pb-sm-1, + .py-sm-1 { + padding-bottom: 0.25rem !important; + } + .pl-sm-1, + .px-sm-1 { + padding-left: 0.25rem !important; + } + .p-sm-2 { + padding: 0.5rem !important; + } + .pt-sm-2, + .py-sm-2 { + padding-top: 0.5rem !important; + } + .pr-sm-2, + .px-sm-2 { + padding-right: 0.5rem !important; + } + .pb-sm-2, + .py-sm-2 { + padding-bottom: 0.5rem !important; + } + .pl-sm-2, + .px-sm-2 { + padding-left: 0.5rem !important; + } + .p-sm-3 { + padding: 1rem !important; + } + .pt-sm-3, + .py-sm-3 { + padding-top: 1rem !important; + } + .pr-sm-3, + .px-sm-3 { + padding-right: 1rem !important; + } + .pb-sm-3, + .py-sm-3 { + padding-bottom: 1rem !important; + } + .pl-sm-3, + .px-sm-3 { + padding-left: 1rem !important; + } + .p-sm-4 { + padding: 1.5rem !important; + } + .pt-sm-4, + .py-sm-4 { + padding-top: 1.5rem !important; + } + .pr-sm-4, + .px-sm-4 { + padding-right: 1.5rem !important; + } + .pb-sm-4, + .py-sm-4 { + padding-bottom: 1.5rem !important; + } + .pl-sm-4, + .px-sm-4 { + padding-left: 1.5rem !important; + } + .p-sm-5 { + padding: 3rem !important; + } + .pt-sm-5, + .py-sm-5 { + padding-top: 3rem !important; + } + .pr-sm-5, + .px-sm-5 { + padding-right: 3rem !important; + } + .pb-sm-5, + .py-sm-5 { + padding-bottom: 3rem !important; + } + .pl-sm-5, + .px-sm-5 { + padding-left: 3rem !important; + } + .m-sm-auto { + margin: auto !important; + } + .mt-sm-auto, + .my-sm-auto { + margin-top: auto !important; + } + .mr-sm-auto, + .mx-sm-auto { + margin-right: auto !important; + } + .mb-sm-auto, + .my-sm-auto { + margin-bottom: auto !important; + } + .ml-sm-auto, + .mx-sm-auto { + margin-left: auto !important; + } +} + +@media (min-width: 768px) { + .m-md-0 { + margin: 0 !important; + } + .mt-md-0, + .my-md-0 { + margin-top: 0 !important; + } + .mr-md-0, + .mx-md-0 { + margin-right: 0 !important; + } + .mb-md-0, + .my-md-0 { + margin-bottom: 0 !important; + } + .ml-md-0, + .mx-md-0 { + margin-left: 0 !important; + } + .m-md-1 { + margin: 0.25rem !important; + } + .mt-md-1, + .my-md-1 { + margin-top: 0.25rem !important; + } + .mr-md-1, + .mx-md-1 { + margin-right: 0.25rem !important; + } + .mb-md-1, + .my-md-1 { + margin-bottom: 0.25rem !important; + } + .ml-md-1, + .mx-md-1 { + margin-left: 0.25rem !important; + } + .m-md-2 { + margin: 0.5rem !important; + } + .mt-md-2, + .my-md-2 { + margin-top: 0.5rem !important; + } + .mr-md-2, + .mx-md-2 { + margin-right: 0.5rem !important; + } + .mb-md-2, + .my-md-2 { + margin-bottom: 0.5rem !important; + } + .ml-md-2, + .mx-md-2 { + margin-left: 0.5rem !important; + } + .m-md-3 { + margin: 1rem !important; + } + .mt-md-3, + .my-md-3 { + margin-top: 1rem !important; + } + .mr-md-3, + .mx-md-3 { + margin-right: 1rem !important; + } + .mb-md-3, + .my-md-3 { + margin-bottom: 1rem !important; + } + .ml-md-3, + .mx-md-3 { + margin-left: 1rem !important; + } + .m-md-4 { + margin: 1.5rem !important; + } + .mt-md-4, + .my-md-4 { + margin-top: 1.5rem !important; + } + .mr-md-4, + .mx-md-4 { + margin-right: 1.5rem !important; + } + .mb-md-4, + .my-md-4 { + margin-bottom: 1.5rem !important; + } + .ml-md-4, + .mx-md-4 { + margin-left: 1.5rem !important; + } + .m-md-5 { + margin: 3rem !important; + } + .mt-md-5, + .my-md-5 { + margin-top: 3rem !important; + } + .mr-md-5, + .mx-md-5 { + margin-right: 3rem !important; + } + .mb-md-5, + .my-md-5 { + margin-bottom: 3rem !important; + } + .ml-md-5, + .mx-md-5 { + margin-left: 3rem !important; + } + .p-md-0 { + padding: 0 !important; + } + .pt-md-0, + .py-md-0 { + padding-top: 0 !important; + } + .pr-md-0, + .px-md-0 { + padding-right: 0 !important; + } + .pb-md-0, + .py-md-0 { + padding-bottom: 0 !important; + } + .pl-md-0, + .px-md-0 { + padding-left: 0 !important; + } + .p-md-1 { + padding: 0.25rem !important; + } + .pt-md-1, + .py-md-1 { + padding-top: 0.25rem !important; + } + .pr-md-1, + .px-md-1 { + padding-right: 0.25rem !important; + } + .pb-md-1, + .py-md-1 { + padding-bottom: 0.25rem !important; + } + .pl-md-1, + .px-md-1 { + padding-left: 0.25rem !important; + } + .p-md-2 { + padding: 0.5rem !important; + } + .pt-md-2, + .py-md-2 { + padding-top: 0.5rem !important; + } + .pr-md-2, + .px-md-2 { + padding-right: 0.5rem !important; + } + .pb-md-2, + .py-md-2 { + padding-bottom: 0.5rem !important; + } + .pl-md-2, + .px-md-2 { + padding-left: 0.5rem !important; + } + .p-md-3 { + padding: 1rem !important; + } + .pt-md-3, + .py-md-3 { + padding-top: 1rem !important; + } + .pr-md-3, + .px-md-3 { + padding-right: 1rem !important; + } + .pb-md-3, + .py-md-3 { + padding-bottom: 1rem !important; + } + .pl-md-3, + .px-md-3 { + padding-left: 1rem !important; + } + .p-md-4 { + padding: 1.5rem !important; + } + .pt-md-4, + .py-md-4 { + padding-top: 1.5rem !important; + } + .pr-md-4, + .px-md-4 { + padding-right: 1.5rem !important; + } + .pb-md-4, + .py-md-4 { + padding-bottom: 1.5rem !important; + } + .pl-md-4, + .px-md-4 { + padding-left: 1.5rem !important; + } + .p-md-5 { + padding: 3rem !important; + } + .pt-md-5, + .py-md-5 { + padding-top: 3rem !important; + } + .pr-md-5, + .px-md-5 { + padding-right: 3rem !important; + } + .pb-md-5, + .py-md-5 { + padding-bottom: 3rem !important; + } + .pl-md-5, + .px-md-5 { + padding-left: 3rem !important; + } + .m-md-auto { + margin: auto !important; + } + .mt-md-auto, + .my-md-auto { + margin-top: auto !important; + } + .mr-md-auto, + .mx-md-auto { + margin-right: auto !important; + } + .mb-md-auto, + .my-md-auto { + margin-bottom: auto !important; + } + .ml-md-auto, + .mx-md-auto { + margin-left: auto !important; + } +} + +@media (min-width: 992px) { + .m-lg-0 { + margin: 0 !important; + } + .mt-lg-0, + .my-lg-0 { + margin-top: 0 !important; + } + .mr-lg-0, + .mx-lg-0 { + margin-right: 0 !important; + } + .mb-lg-0, + .my-lg-0 { + margin-bottom: 0 !important; + } + .ml-lg-0, + .mx-lg-0 { + margin-left: 0 !important; + } + .m-lg-1 { + margin: 0.25rem !important; + } + .mt-lg-1, + .my-lg-1 { + margin-top: 0.25rem !important; + } + .mr-lg-1, + .mx-lg-1 { + margin-right: 0.25rem !important; + } + .mb-lg-1, + .my-lg-1 { + margin-bottom: 0.25rem !important; + } + .ml-lg-1, + .mx-lg-1 { + margin-left: 0.25rem !important; + } + .m-lg-2 { + margin: 0.5rem !important; + } + .mt-lg-2, + .my-lg-2 { + margin-top: 0.5rem !important; + } + .mr-lg-2, + .mx-lg-2 { + margin-right: 0.5rem !important; + } + .mb-lg-2, + .my-lg-2 { + margin-bottom: 0.5rem !important; + } + .ml-lg-2, + .mx-lg-2 { + margin-left: 0.5rem !important; + } + .m-lg-3 { + margin: 1rem !important; + } + .mt-lg-3, + .my-lg-3 { + margin-top: 1rem !important; + } + .mr-lg-3, + .mx-lg-3 { + margin-right: 1rem !important; + } + .mb-lg-3, + .my-lg-3 { + margin-bottom: 1rem !important; + } + .ml-lg-3, + .mx-lg-3 { + margin-left: 1rem !important; + } + .m-lg-4 { + margin: 1.5rem !important; + } + .mt-lg-4, + .my-lg-4 { + margin-top: 1.5rem !important; + } + .mr-lg-4, + .mx-lg-4 { + margin-right: 1.5rem !important; + } + .mb-lg-4, + .my-lg-4 { + margin-bottom: 1.5rem !important; + } + .ml-lg-4, + .mx-lg-4 { + margin-left: 1.5rem !important; + } + .m-lg-5 { + margin: 3rem !important; + } + .mt-lg-5, + .my-lg-5 { + margin-top: 3rem !important; + } + .mr-lg-5, + .mx-lg-5 { + margin-right: 3rem !important; + } + .mb-lg-5, + .my-lg-5 { + margin-bottom: 3rem !important; + } + .ml-lg-5, + .mx-lg-5 { + margin-left: 3rem !important; + } + .p-lg-0 { + padding: 0 !important; + } + .pt-lg-0, + .py-lg-0 { + padding-top: 0 !important; + } + .pr-lg-0, + .px-lg-0 { + padding-right: 0 !important; + } + .pb-lg-0, + .py-lg-0 { + padding-bottom: 0 !important; + } + .pl-lg-0, + .px-lg-0 { + padding-left: 0 !important; + } + .p-lg-1 { + padding: 0.25rem !important; + } + .pt-lg-1, + .py-lg-1 { + padding-top: 0.25rem !important; + } + .pr-lg-1, + .px-lg-1 { + padding-right: 0.25rem !important; + } + .pb-lg-1, + .py-lg-1 { + padding-bottom: 0.25rem !important; + } + .pl-lg-1, + .px-lg-1 { + padding-left: 0.25rem !important; + } + .p-lg-2 { + padding: 0.5rem !important; + } + .pt-lg-2, + .py-lg-2 { + padding-top: 0.5rem !important; + } + .pr-lg-2, + .px-lg-2 { + padding-right: 0.5rem !important; + } + .pb-lg-2, + .py-lg-2 { + padding-bottom: 0.5rem !important; + } + .pl-lg-2, + .px-lg-2 { + padding-left: 0.5rem !important; + } + .p-lg-3 { + padding: 1rem !important; + } + .pt-lg-3, + .py-lg-3 { + padding-top: 1rem !important; + } + .pr-lg-3, + .px-lg-3 { + padding-right: 1rem !important; + } + .pb-lg-3, + .py-lg-3 { + padding-bottom: 1rem !important; + } + .pl-lg-3, + .px-lg-3 { + padding-left: 1rem !important; + } + .p-lg-4 { + padding: 1.5rem !important; + } + .pt-lg-4, + .py-lg-4 { + padding-top: 1.5rem !important; + } + .pr-lg-4, + .px-lg-4 { + padding-right: 1.5rem !important; + } + .pb-lg-4, + .py-lg-4 { + padding-bottom: 1.5rem !important; + } + .pl-lg-4, + .px-lg-4 { + padding-left: 1.5rem !important; + } + .p-lg-5 { + padding: 3rem !important; + } + .pt-lg-5, + .py-lg-5 { + padding-top: 3rem !important; + } + .pr-lg-5, + .px-lg-5 { + padding-right: 3rem !important; + } + .pb-lg-5, + .py-lg-5 { + padding-bottom: 3rem !important; + } + .pl-lg-5, + .px-lg-5 { + padding-left: 3rem !important; + } + .m-lg-auto { + margin: auto !important; + } + .mt-lg-auto, + .my-lg-auto { + margin-top: auto !important; + } + .mr-lg-auto, + .mx-lg-auto { + margin-right: auto !important; + } + .mb-lg-auto, + .my-lg-auto { + margin-bottom: auto !important; + } + .ml-lg-auto, + .mx-lg-auto { + margin-left: auto !important; + } +} + +@media (min-width: 1200px) { + .m-xl-0 { + margin: 0 !important; + } + .mt-xl-0, + .my-xl-0 { + margin-top: 0 !important; + } + .mr-xl-0, + .mx-xl-0 { + margin-right: 0 !important; + } + .mb-xl-0, + .my-xl-0 { + margin-bottom: 0 !important; + } + .ml-xl-0, + .mx-xl-0 { + margin-left: 0 !important; + } + .m-xl-1 { + margin: 0.25rem !important; + } + .mt-xl-1, + .my-xl-1 { + margin-top: 0.25rem !important; + } + .mr-xl-1, + .mx-xl-1 { + margin-right: 0.25rem !important; + } + .mb-xl-1, + .my-xl-1 { + margin-bottom: 0.25rem !important; + } + .ml-xl-1, + .mx-xl-1 { + margin-left: 0.25rem !important; + } + .m-xl-2 { + margin: 0.5rem !important; + } + .mt-xl-2, + .my-xl-2 { + margin-top: 0.5rem !important; + } + .mr-xl-2, + .mx-xl-2 { + margin-right: 0.5rem !important; + } + .mb-xl-2, + .my-xl-2 { + margin-bottom: 0.5rem !important; + } + .ml-xl-2, + .mx-xl-2 { + margin-left: 0.5rem !important; + } + .m-xl-3 { + margin: 1rem !important; + } + .mt-xl-3, + .my-xl-3 { + margin-top: 1rem !important; + } + .mr-xl-3, + .mx-xl-3 { + margin-right: 1rem !important; + } + .mb-xl-3, + .my-xl-3 { + margin-bottom: 1rem !important; + } + .ml-xl-3, + .mx-xl-3 { + margin-left: 1rem !important; + } + .m-xl-4 { + margin: 1.5rem !important; + } + .mt-xl-4, + .my-xl-4 { + margin-top: 1.5rem !important; + } + .mr-xl-4, + .mx-xl-4 { + margin-right: 1.5rem !important; + } + .mb-xl-4, + .my-xl-4 { + margin-bottom: 1.5rem !important; + } + .ml-xl-4, + .mx-xl-4 { + margin-left: 1.5rem !important; + } + .m-xl-5 { + margin: 3rem !important; + } + .mt-xl-5, + .my-xl-5 { + margin-top: 3rem !important; + } + .mr-xl-5, + .mx-xl-5 { + margin-right: 3rem !important; + } + .mb-xl-5, + .my-xl-5 { + margin-bottom: 3rem !important; + } + .ml-xl-5, + .mx-xl-5 { + margin-left: 3rem !important; + } + .p-xl-0 { + padding: 0 !important; + } + .pt-xl-0, + .py-xl-0 { + padding-top: 0 !important; + } + .pr-xl-0, + .px-xl-0 { + padding-right: 0 !important; + } + .pb-xl-0, + .py-xl-0 { + padding-bottom: 0 !important; + } + .pl-xl-0, + .px-xl-0 { + padding-left: 0 !important; + } + .p-xl-1 { + padding: 0.25rem !important; + } + .pt-xl-1, + .py-xl-1 { + padding-top: 0.25rem !important; + } + .pr-xl-1, + .px-xl-1 { + padding-right: 0.25rem !important; + } + .pb-xl-1, + .py-xl-1 { + padding-bottom: 0.25rem !important; + } + .pl-xl-1, + .px-xl-1 { + padding-left: 0.25rem !important; + } + .p-xl-2 { + padding: 0.5rem !important; + } + .pt-xl-2, + .py-xl-2 { + padding-top: 0.5rem !important; + } + .pr-xl-2, + .px-xl-2 { + padding-right: 0.5rem !important; + } + .pb-xl-2, + .py-xl-2 { + padding-bottom: 0.5rem !important; + } + .pl-xl-2, + .px-xl-2 { + padding-left: 0.5rem !important; + } + .p-xl-3 { + padding: 1rem !important; + } + .pt-xl-3, + .py-xl-3 { + padding-top: 1rem !important; + } + .pr-xl-3, + .px-xl-3 { + padding-right: 1rem !important; + } + .pb-xl-3, + .py-xl-3 { + padding-bottom: 1rem !important; + } + .pl-xl-3, + .px-xl-3 { + padding-left: 1rem !important; + } + .p-xl-4 { + padding: 1.5rem !important; + } + .pt-xl-4, + .py-xl-4 { + padding-top: 1.5rem !important; + } + .pr-xl-4, + .px-xl-4 { + padding-right: 1.5rem !important; + } + .pb-xl-4, + .py-xl-4 { + padding-bottom: 1.5rem !important; + } + .pl-xl-4, + .px-xl-4 { + padding-left: 1.5rem !important; + } + .p-xl-5 { + padding: 3rem !important; + } + .pt-xl-5, + .py-xl-5 { + padding-top: 3rem !important; + } + .pr-xl-5, + .px-xl-5 { + padding-right: 3rem !important; + } + .pb-xl-5, + .py-xl-5 { + padding-bottom: 3rem !important; + } + .pl-xl-5, + .px-xl-5 { + padding-left: 3rem !important; + } + .m-xl-auto { + margin: auto !important; + } + .mt-xl-auto, + .my-xl-auto { + margin-top: auto !important; + } + .mr-xl-auto, + .mx-xl-auto { + margin-right: auto !important; + } + .mb-xl-auto, + .my-xl-auto { + margin-bottom: auto !important; + } + .ml-xl-auto, + .mx-xl-auto { + margin-left: auto !important; + } +} + +.text-monospace { + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; +} + +.text-justify { + text-align: justify !important; +} + +.text-nowrap { + white-space: nowrap !important; +} + +.text-truncate { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.text-left { + text-align: left !important; +} + +.text-right { + text-align: right !important; +} + +.text-center { + text-align: center !important; +} + +@media (min-width: 576px) { + .text-sm-left { + text-align: left !important; + } + .text-sm-right { + text-align: right !important; + } + .text-sm-center { + text-align: center !important; + } +} + +@media (min-width: 768px) { + .text-md-left { + text-align: left !important; + } + .text-md-right { + text-align: right !important; + } + .text-md-center { + text-align: center !important; + } +} + +@media (min-width: 992px) { + .text-lg-left { + text-align: left !important; + } + .text-lg-right { + text-align: right !important; + } + .text-lg-center { + text-align: center !important; + } +} + +@media (min-width: 1200px) { + .text-xl-left { + text-align: left !important; + } + .text-xl-right { + text-align: right !important; + } + .text-xl-center { + text-align: center !important; + } +} + +.text-lowercase { + text-transform: lowercase !important; +} + +.text-uppercase { + text-transform: uppercase !important; +} + +.text-capitalize { + text-transform: capitalize !important; +} + +.font-weight-light { + font-weight: 300 !important; +} + +.font-weight-normal { + font-weight: 400 !important; +} + +.font-weight-bold { + font-weight: 700 !important; +} + +.font-italic { + font-style: italic !important; +} + +.text-white { + color: #fff !important; +} + +.text-primary { + color: #007bff !important; +} + +a.text-primary:hover, a.text-primary:focus { + color: #0062cc !important; +} + +.text-secondary { + color: #6c757d !important; +} + +a.text-secondary:hover, a.text-secondary:focus { + color: #545b62 !important; +} + +.text-success { + color: #28a745 !important; +} + +a.text-success:hover, a.text-success:focus { + color: #1e7e34 !important; +} + +.text-info { + color: #17a2b8 !important; +} + +a.text-info:hover, a.text-info:focus { + color: #117a8b !important; +} + +.text-warning { + color: #ffc107 !important; +} + +a.text-warning:hover, a.text-warning:focus { + color: #d39e00 !important; +} + +.text-danger { + color: #dc3545 !important; +} + +a.text-danger:hover, a.text-danger:focus { + color: #bd2130 !important; +} + +.text-light { + color: #f8f9fa !important; +} + +a.text-light:hover, a.text-light:focus { + color: #dae0e5 !important; +} + +.text-dark { + color: #343a40 !important; +} + +a.text-dark:hover, a.text-dark:focus { + color: #1d2124 !important; +} + +.text-body { + color: #212529 !important; +} + +.text-muted { + color: #6c757d !important; +} + +.text-black-50 { + color: rgba(0, 0, 0, 0.5) !important; +} + +.text-white-50 { + color: rgba(255, 255, 255, 0.5) !important; +} + +.text-hide { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} + +.visible { + visibility: visible !important; +} + +.invisible { + visibility: hidden !important; +} + +@media print { + *, + *::before, + *::after { + text-shadow: none !important; + box-shadow: none !important; + } + a:not(.btn) { + text-decoration: underline; + } + abbr[title]::after { + content: " (" attr(title) ")"; + } + pre { + white-space: pre-wrap !important; + } + pre, + blockquote { + border: 1px solid #adb5bd; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } + @page { + size: a3; + } + body { + min-width: 992px !important; + } + .container { + min-width: 992px !important; + } + .navbar { + display: none; + } + .badge { + border: 1px solid #000; + } + .table { + border-collapse: collapse !important; + } + .table td, + .table th { + background-color: #fff !important; + } + .table-bordered th, + .table-bordered td { + border: 1px solid #dee2e6 !important; + } + .table-dark { + color: inherit; + } + .table-dark th, + .table-dark td, + .table-dark thead th, + .table-dark tbody + tbody { + border-color: #dee2e6; + } + .table .thead-dark th { + color: inherit; + border-color: #dee2e6; + } +} +/*# sourceMappingURL=bootstrap.css.map */ \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js b/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js new file mode 100644 index 0000000000..adb3400738 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js @@ -0,0 +1,6444 @@ +/*! + * Bootstrap v4.1.1 (https://getbootstrap.com/) + * Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('jquery')) : + typeof define === 'function' && define.amd ? define(['exports', 'jquery'], factory) : + (factory((global.bootstrap = {}),global.jQuery)); +}(this, (function (exports,$) { 'use strict'; + + $ = $ && $.hasOwnProperty('default') ? $['default'] : $; + + function _defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + Object.defineProperty(target, descriptor.key, descriptor); + } + } + + function _createClass(Constructor, protoProps, staticProps) { + if (protoProps) _defineProperties(Constructor.prototype, protoProps); + if (staticProps) _defineProperties(Constructor, staticProps); + return Constructor; + } + + function _defineProperty(obj, key, value) { + if (key in obj) { + Object.defineProperty(obj, key, { + value: value, + enumerable: true, + configurable: true, + writable: true + }); + } else { + obj[key] = value; + } + + return obj; + } + + function _objectSpread(target) { + for (var i = 1; i < arguments.length; i++) { + var source = arguments[i] != null ? arguments[i] : {}; + var ownKeys = Object.keys(source); + + if (typeof Object.getOwnPropertySymbols === 'function') { + ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { + return Object.getOwnPropertyDescriptor(source, sym).enumerable; + })); + } + + ownKeys.forEach(function (key) { + _defineProperty(target, key, source[key]); + }); + } + + return target; + } + + function _inheritsLoose(subClass, superClass) { + subClass.prototype = Object.create(superClass.prototype); + subClass.prototype.constructor = subClass; + subClass.__proto__ = superClass; + } + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): util.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Util = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Private TransitionEnd Helpers + * ------------------------------------------------------------------------ + */ + var TRANSITION_END = 'transitionend'; + var MAX_UID = 1000000; + var MILLISECONDS_MULTIPLIER = 1000; // Shoutout AngusCroll (https://goo.gl/pxwQGp) + + function toType(obj) { + return {}.toString.call(obj).match(/\s([a-z]+)/i)[1].toLowerCase(); + } + + function getSpecialTransitionEndEvent() { + return { + bindType: TRANSITION_END, + delegateType: TRANSITION_END, + handle: function handle(event) { + if ($$$1(event.target).is(this)) { + return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params + } + + return undefined; // eslint-disable-line no-undefined + } + }; + } + + function transitionEndEmulator(duration) { + var _this = this; + + var called = false; + $$$1(this).one(Util.TRANSITION_END, function () { + called = true; + }); + setTimeout(function () { + if (!called) { + Util.triggerTransitionEnd(_this); + } + }, duration); + return this; + } + + function setTransitionEndSupport() { + $$$1.fn.emulateTransitionEnd = transitionEndEmulator; + $$$1.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent(); + } + /** + * -------------------------------------------------------------------------- + * Public Util Api + * -------------------------------------------------------------------------- + */ + + + var Util = { + TRANSITION_END: 'bsTransitionEnd', + getUID: function getUID(prefix) { + do { + // eslint-disable-next-line no-bitwise + prefix += ~~(Math.random() * MAX_UID); // "~~" acts like a faster Math.floor() here + } while (document.getElementById(prefix)); + + return prefix; + }, + getSelectorFromElement: function getSelectorFromElement(element) { + var selector = element.getAttribute('data-target'); + + if (!selector || selector === '#') { + selector = element.getAttribute('href') || ''; + } + + try { + var $selector = $$$1(document).find(selector); + return $selector.length > 0 ? selector : null; + } catch (err) { + return null; + } + }, + getTransitionDurationFromElement: function getTransitionDurationFromElement(element) { + if (!element) { + return 0; + } // Get transition-duration of the element + + + var transitionDuration = $$$1(element).css('transition-duration'); + var floatTransitionDuration = parseFloat(transitionDuration); // Return 0 if element or transition duration is not found + + if (!floatTransitionDuration) { + return 0; + } // If multiple durations are defined, take the first + + + transitionDuration = transitionDuration.split(',')[0]; + return parseFloat(transitionDuration) * MILLISECONDS_MULTIPLIER; + }, + reflow: function reflow(element) { + return element.offsetHeight; + }, + triggerTransitionEnd: function triggerTransitionEnd(element) { + $$$1(element).trigger(TRANSITION_END); + }, + // TODO: Remove in v5 + supportsTransitionEnd: function supportsTransitionEnd() { + return Boolean(TRANSITION_END); + }, + isElement: function isElement(obj) { + return (obj[0] || obj).nodeType; + }, + typeCheckConfig: function typeCheckConfig(componentName, config, configTypes) { + for (var property in configTypes) { + if (Object.prototype.hasOwnProperty.call(configTypes, property)) { + var expectedTypes = configTypes[property]; + var value = config[property]; + var valueType = value && Util.isElement(value) ? 'element' : toType(value); + + if (!new RegExp(expectedTypes).test(valueType)) { + throw new Error(componentName.toUpperCase() + ": " + ("Option \"" + property + "\" provided type \"" + valueType + "\" ") + ("but expected type \"" + expectedTypes + "\".")); + } + } + } + } + }; + setTransitionEndSupport(); + return Util; + }($); + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): alert.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Alert = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'alert'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.alert'; + var EVENT_KEY = "." + DATA_KEY; + var DATA_API_KEY = '.data-api'; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var Selector = { + DISMISS: '[data-dismiss="alert"]' + }; + var Event = { + CLOSE: "close" + EVENT_KEY, + CLOSED: "closed" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY + }; + var ClassName = { + ALERT: 'alert', + FADE: 'fade', + SHOW: 'show' + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var Alert = + /*#__PURE__*/ + function () { + function Alert(element) { + this._element = element; + } // Getters + + + var _proto = Alert.prototype; + + // Public + _proto.close = function close(element) { + var rootElement = this._element; + + if (element) { + rootElement = this._getRootElement(element); + } + + var customEvent = this._triggerCloseEvent(rootElement); + + if (customEvent.isDefaultPrevented()) { + return; + } + + this._removeElement(rootElement); + }; + + _proto.dispose = function dispose() { + $$$1.removeData(this._element, DATA_KEY); + this._element = null; + }; // Private + + + _proto._getRootElement = function _getRootElement(element) { + var selector = Util.getSelectorFromElement(element); + var parent = false; + + if (selector) { + parent = $$$1(selector)[0]; + } + + if (!parent) { + parent = $$$1(element).closest("." + ClassName.ALERT)[0]; + } + + return parent; + }; + + _proto._triggerCloseEvent = function _triggerCloseEvent(element) { + var closeEvent = $$$1.Event(Event.CLOSE); + $$$1(element).trigger(closeEvent); + return closeEvent; + }; + + _proto._removeElement = function _removeElement(element) { + var _this = this; + + $$$1(element).removeClass(ClassName.SHOW); + + if (!$$$1(element).hasClass(ClassName.FADE)) { + this._destroyElement(element); + + return; + } + + var transitionDuration = Util.getTransitionDurationFromElement(element); + $$$1(element).one(Util.TRANSITION_END, function (event) { + return _this._destroyElement(element, event); + }).emulateTransitionEnd(transitionDuration); + }; + + _proto._destroyElement = function _destroyElement(element) { + $$$1(element).detach().trigger(Event.CLOSED).remove(); + }; // Static + + + Alert._jQueryInterface = function _jQueryInterface(config) { + return this.each(function () { + var $element = $$$1(this); + var data = $element.data(DATA_KEY); + + if (!data) { + data = new Alert(this); + $element.data(DATA_KEY, data); + } + + if (config === 'close') { + data[config](this); + } + }); + }; + + Alert._handleDismiss = function _handleDismiss(alertInstance) { + return function (event) { + if (event) { + event.preventDefault(); + } + + alertInstance.close(this); + }; + }; + + _createClass(Alert, null, [{ + key: "VERSION", + get: function get() { + return VERSION; + } + }]); + + return Alert; + }(); + /** + * ------------------------------------------------------------------------ + * Data Api implementation + * ------------------------------------------------------------------------ + */ + + + $$$1(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert())); + /** + * ------------------------------------------------------------------------ + * jQuery + * ------------------------------------------------------------------------ + */ + + $$$1.fn[NAME] = Alert._jQueryInterface; + $$$1.fn[NAME].Constructor = Alert; + + $$$1.fn[NAME].noConflict = function () { + $$$1.fn[NAME] = JQUERY_NO_CONFLICT; + return Alert._jQueryInterface; + }; + + return Alert; + }($); + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): button.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Button = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'button'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.button'; + var EVENT_KEY = "." + DATA_KEY; + var DATA_API_KEY = '.data-api'; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var ClassName = { + ACTIVE: 'active', + BUTTON: 'btn', + FOCUS: 'focus' + }; + var Selector = { + DATA_TOGGLE_CARROT: '[data-toggle^="button"]', + DATA_TOGGLE: '[data-toggle="buttons"]', + INPUT: 'input', + ACTIVE: '.active', + BUTTON: '.btn' + }; + var Event = { + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY, + FOCUS_BLUR_DATA_API: "focus" + EVENT_KEY + DATA_API_KEY + " " + ("blur" + EVENT_KEY + DATA_API_KEY) + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var Button = + /*#__PURE__*/ + function () { + function Button(element) { + this._element = element; + } // Getters + + + var _proto = Button.prototype; + + // Public + _proto.toggle = function toggle() { + var triggerChangeEvent = true; + var addAriaPressed = true; + var rootElement = $$$1(this._element).closest(Selector.DATA_TOGGLE)[0]; + + if (rootElement) { + var input = $$$1(this._element).find(Selector.INPUT)[0]; + + if (input) { + if (input.type === 'radio') { + if (input.checked && $$$1(this._element).hasClass(ClassName.ACTIVE)) { + triggerChangeEvent = false; + } else { + var activeElement = $$$1(rootElement).find(Selector.ACTIVE)[0]; + + if (activeElement) { + $$$1(activeElement).removeClass(ClassName.ACTIVE); + } + } + } + + if (triggerChangeEvent) { + if (input.hasAttribute('disabled') || rootElement.hasAttribute('disabled') || input.classList.contains('disabled') || rootElement.classList.contains('disabled')) { + return; + } + + input.checked = !$$$1(this._element).hasClass(ClassName.ACTIVE); + $$$1(input).trigger('change'); + } + + input.focus(); + addAriaPressed = false; + } + } + + if (addAriaPressed) { + this._element.setAttribute('aria-pressed', !$$$1(this._element).hasClass(ClassName.ACTIVE)); + } + + if (triggerChangeEvent) { + $$$1(this._element).toggleClass(ClassName.ACTIVE); + } + }; + + _proto.dispose = function dispose() { + $$$1.removeData(this._element, DATA_KEY); + this._element = null; + }; // Static + + + Button._jQueryInterface = function _jQueryInterface(config) { + return this.each(function () { + var data = $$$1(this).data(DATA_KEY); + + if (!data) { + data = new Button(this); + $$$1(this).data(DATA_KEY, data); + } + + if (config === 'toggle') { + data[config](); + } + }); + }; + + _createClass(Button, null, [{ + key: "VERSION", + get: function get() { + return VERSION; + } + }]); + + return Button; + }(); + /** + * ------------------------------------------------------------------------ + * Data Api implementation + * ------------------------------------------------------------------------ + */ + + + $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { + event.preventDefault(); + var button = event.target; + + if (!$$$1(button).hasClass(ClassName.BUTTON)) { + button = $$$1(button).closest(Selector.BUTTON); + } + + Button._jQueryInterface.call($$$1(button), 'toggle'); + }).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { + var button = $$$1(event.target).closest(Selector.BUTTON)[0]; + $$$1(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)); + }); + /** + * ------------------------------------------------------------------------ + * jQuery + * ------------------------------------------------------------------------ + */ + + $$$1.fn[NAME] = Button._jQueryInterface; + $$$1.fn[NAME].Constructor = Button; + + $$$1.fn[NAME].noConflict = function () { + $$$1.fn[NAME] = JQUERY_NO_CONFLICT; + return Button._jQueryInterface; + }; + + return Button; + }($); + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): carousel.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Carousel = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'carousel'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.carousel'; + var EVENT_KEY = "." + DATA_KEY; + var DATA_API_KEY = '.data-api'; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key + + var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key + + var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch + + var Default = { + interval: 5000, + keyboard: true, + slide: false, + pause: 'hover', + wrap: true + }; + var DefaultType = { + interval: '(number|boolean)', + keyboard: 'boolean', + slide: '(boolean|string)', + pause: '(string|boolean)', + wrap: 'boolean' + }; + var Direction = { + NEXT: 'next', + PREV: 'prev', + LEFT: 'left', + RIGHT: 'right' + }; + var Event = { + SLIDE: "slide" + EVENT_KEY, + SLID: "slid" + EVENT_KEY, + KEYDOWN: "keydown" + EVENT_KEY, + MOUSEENTER: "mouseenter" + EVENT_KEY, + MOUSELEAVE: "mouseleave" + EVENT_KEY, + TOUCHEND: "touchend" + EVENT_KEY, + LOAD_DATA_API: "load" + EVENT_KEY + DATA_API_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY + }; + var ClassName = { + CAROUSEL: 'carousel', + ACTIVE: 'active', + SLIDE: 'slide', + RIGHT: 'carousel-item-right', + LEFT: 'carousel-item-left', + NEXT: 'carousel-item-next', + PREV: 'carousel-item-prev', + ITEM: 'carousel-item' + }; + var Selector = { + ACTIVE: '.active', + ACTIVE_ITEM: '.active.carousel-item', + ITEM: '.carousel-item', + NEXT_PREV: '.carousel-item-next, .carousel-item-prev', + INDICATORS: '.carousel-indicators', + DATA_SLIDE: '[data-slide], [data-slide-to]', + DATA_RIDE: '[data-ride="carousel"]' + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var Carousel = + /*#__PURE__*/ + function () { + function Carousel(element, config) { + this._items = null; + this._interval = null; + this._activeElement = null; + this._isPaused = false; + this._isSliding = false; + this.touchTimeout = null; + this._config = this._getConfig(config); + this._element = $$$1(element)[0]; + this._indicatorsElement = $$$1(this._element).find(Selector.INDICATORS)[0]; + + this._addEventListeners(); + } // Getters + + + var _proto = Carousel.prototype; + + // Public + _proto.next = function next() { + if (!this._isSliding) { + this._slide(Direction.NEXT); + } + }; + + _proto.nextWhenVisible = function nextWhenVisible() { + // Don't call next when the page isn't visible + // or the carousel or its parent isn't visible + if (!document.hidden && $$$1(this._element).is(':visible') && $$$1(this._element).css('visibility') !== 'hidden') { + this.next(); + } + }; + + _proto.prev = function prev() { + if (!this._isSliding) { + this._slide(Direction.PREV); + } + }; + + _proto.pause = function pause(event) { + if (!event) { + this._isPaused = true; + } + + if ($$$1(this._element).find(Selector.NEXT_PREV)[0]) { + Util.triggerTransitionEnd(this._element); + this.cycle(true); + } + + clearInterval(this._interval); + this._interval = null; + }; + + _proto.cycle = function cycle(event) { + if (!event) { + this._isPaused = false; + } + + if (this._interval) { + clearInterval(this._interval); + this._interval = null; + } + + if (this._config.interval && !this._isPaused) { + this._interval = setInterval((document.visibilityState ? this.nextWhenVisible : this.next).bind(this), this._config.interval); + } + }; + + _proto.to = function to(index) { + var _this = this; + + this._activeElement = $$$1(this._element).find(Selector.ACTIVE_ITEM)[0]; + + var activeIndex = this._getItemIndex(this._activeElement); + + if (index > this._items.length - 1 || index < 0) { + return; + } + + if (this._isSliding) { + $$$1(this._element).one(Event.SLID, function () { + return _this.to(index); + }); + return; + } + + if (activeIndex === index) { + this.pause(); + this.cycle(); + return; + } + + var direction = index > activeIndex ? Direction.NEXT : Direction.PREV; + + this._slide(direction, this._items[index]); + }; + + _proto.dispose = function dispose() { + $$$1(this._element).off(EVENT_KEY); + $$$1.removeData(this._element, DATA_KEY); + this._items = null; + this._config = null; + this._element = null; + this._interval = null; + this._isPaused = null; + this._isSliding = null; + this._activeElement = null; + this._indicatorsElement = null; + }; // Private + + + _proto._getConfig = function _getConfig(config) { + config = _objectSpread({}, Default, config); + Util.typeCheckConfig(NAME, config, DefaultType); + return config; + }; + + _proto._addEventListeners = function _addEventListeners() { + var _this2 = this; + + if (this._config.keyboard) { + $$$1(this._element).on(Event.KEYDOWN, function (event) { + return _this2._keydown(event); + }); + } + + if (this._config.pause === 'hover') { + $$$1(this._element).on(Event.MOUSEENTER, function (event) { + return _this2.pause(event); + }).on(Event.MOUSELEAVE, function (event) { + return _this2.cycle(event); + }); + + if ('ontouchstart' in document.documentElement) { + // If it's a touch-enabled device, mouseenter/leave are fired as + // part of the mouse compatibility events on first tap - the carousel + // would stop cycling until user tapped out of it; + // here, we listen for touchend, explicitly pause the carousel + // (as if it's the second time we tap on it, mouseenter compat event + // is NOT fired) and after a timeout (to allow for mouse compatibility + // events to fire) we explicitly restart cycling + $$$1(this._element).on(Event.TOUCHEND, function () { + _this2.pause(); + + if (_this2.touchTimeout) { + clearTimeout(_this2.touchTimeout); + } + + _this2.touchTimeout = setTimeout(function (event) { + return _this2.cycle(event); + }, TOUCHEVENT_COMPAT_WAIT + _this2._config.interval); + }); + } + } + }; + + _proto._keydown = function _keydown(event) { + if (/input|textarea/i.test(event.target.tagName)) { + return; + } + + switch (event.which) { + case ARROW_LEFT_KEYCODE: + event.preventDefault(); + this.prev(); + break; + + case ARROW_RIGHT_KEYCODE: + event.preventDefault(); + this.next(); + break; + + default: + } + }; + + _proto._getItemIndex = function _getItemIndex(element) { + this._items = $$$1.makeArray($$$1(element).parent().find(Selector.ITEM)); + return this._items.indexOf(element); + }; + + _proto._getItemByDirection = function _getItemByDirection(direction, activeElement) { + var isNextDirection = direction === Direction.NEXT; + var isPrevDirection = direction === Direction.PREV; + + var activeIndex = this._getItemIndex(activeElement); + + var lastItemIndex = this._items.length - 1; + var isGoingToWrap = isPrevDirection && activeIndex === 0 || isNextDirection && activeIndex === lastItemIndex; + + if (isGoingToWrap && !this._config.wrap) { + return activeElement; + } + + var delta = direction === Direction.PREV ? -1 : 1; + var itemIndex = (activeIndex + delta) % this._items.length; + return itemIndex === -1 ? this._items[this._items.length - 1] : this._items[itemIndex]; + }; + + _proto._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) { + var targetIndex = this._getItemIndex(relatedTarget); + + var fromIndex = this._getItemIndex($$$1(this._element).find(Selector.ACTIVE_ITEM)[0]); + + var slideEvent = $$$1.Event(Event.SLIDE, { + relatedTarget: relatedTarget, + direction: eventDirectionName, + from: fromIndex, + to: targetIndex + }); + $$$1(this._element).trigger(slideEvent); + return slideEvent; + }; + + _proto._setActiveIndicatorElement = function _setActiveIndicatorElement(element) { + if (this._indicatorsElement) { + $$$1(this._indicatorsElement).find(Selector.ACTIVE).removeClass(ClassName.ACTIVE); + + var nextIndicator = this._indicatorsElement.children[this._getItemIndex(element)]; + + if (nextIndicator) { + $$$1(nextIndicator).addClass(ClassName.ACTIVE); + } + } + }; + + _proto._slide = function _slide(direction, element) { + var _this3 = this; + + var activeElement = $$$1(this._element).find(Selector.ACTIVE_ITEM)[0]; + + var activeElementIndex = this._getItemIndex(activeElement); + + var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement); + + var nextElementIndex = this._getItemIndex(nextElement); + + var isCycling = Boolean(this._interval); + var directionalClassName; + var orderClassName; + var eventDirectionName; + + if (direction === Direction.NEXT) { + directionalClassName = ClassName.LEFT; + orderClassName = ClassName.NEXT; + eventDirectionName = Direction.LEFT; + } else { + directionalClassName = ClassName.RIGHT; + orderClassName = ClassName.PREV; + eventDirectionName = Direction.RIGHT; + } + + if (nextElement && $$$1(nextElement).hasClass(ClassName.ACTIVE)) { + this._isSliding = false; + return; + } + + var slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName); + + if (slideEvent.isDefaultPrevented()) { + return; + } + + if (!activeElement || !nextElement) { + // Some weirdness is happening, so we bail + return; + } + + this._isSliding = true; + + if (isCycling) { + this.pause(); + } + + this._setActiveIndicatorElement(nextElement); + + var slidEvent = $$$1.Event(Event.SLID, { + relatedTarget: nextElement, + direction: eventDirectionName, + from: activeElementIndex, + to: nextElementIndex + }); + + if ($$$1(this._element).hasClass(ClassName.SLIDE)) { + $$$1(nextElement).addClass(orderClassName); + Util.reflow(nextElement); + $$$1(activeElement).addClass(directionalClassName); + $$$1(nextElement).addClass(directionalClassName); + var transitionDuration = Util.getTransitionDurationFromElement(activeElement); + $$$1(activeElement).one(Util.TRANSITION_END, function () { + $$$1(nextElement).removeClass(directionalClassName + " " + orderClassName).addClass(ClassName.ACTIVE); + $$$1(activeElement).removeClass(ClassName.ACTIVE + " " + orderClassName + " " + directionalClassName); + _this3._isSliding = false; + setTimeout(function () { + return $$$1(_this3._element).trigger(slidEvent); + }, 0); + }).emulateTransitionEnd(transitionDuration); + } else { + $$$1(activeElement).removeClass(ClassName.ACTIVE); + $$$1(nextElement).addClass(ClassName.ACTIVE); + this._isSliding = false; + $$$1(this._element).trigger(slidEvent); + } + + if (isCycling) { + this.cycle(); + } + }; // Static + + + Carousel._jQueryInterface = function _jQueryInterface(config) { + return this.each(function () { + var data = $$$1(this).data(DATA_KEY); + + var _config = _objectSpread({}, Default, $$$1(this).data()); + + if (typeof config === 'object') { + _config = _objectSpread({}, _config, config); + } + + var action = typeof config === 'string' ? config : _config.slide; + + if (!data) { + data = new Carousel(this, _config); + $$$1(this).data(DATA_KEY, data); + } + + if (typeof config === 'number') { + data.to(config); + } else if (typeof action === 'string') { + if (typeof data[action] === 'undefined') { + throw new TypeError("No method named \"" + action + "\""); + } + + data[action](); + } else if (_config.interval) { + data.pause(); + data.cycle(); + } + }); + }; + + Carousel._dataApiClickHandler = function _dataApiClickHandler(event) { + var selector = Util.getSelectorFromElement(this); + + if (!selector) { + return; + } + + var target = $$$1(selector)[0]; + + if (!target || !$$$1(target).hasClass(ClassName.CAROUSEL)) { + return; + } + + var config = _objectSpread({}, $$$1(target).data(), $$$1(this).data()); + + var slideIndex = this.getAttribute('data-slide-to'); + + if (slideIndex) { + config.interval = false; + } + + Carousel._jQueryInterface.call($$$1(target), config); + + if (slideIndex) { + $$$1(target).data(DATA_KEY).to(slideIndex); + } + + event.preventDefault(); + }; + + _createClass(Carousel, null, [{ + key: "VERSION", + get: function get() { + return VERSION; + } + }, { + key: "Default", + get: function get() { + return Default; + } + }]); + + return Carousel; + }(); + /** + * ------------------------------------------------------------------------ + * Data Api implementation + * ------------------------------------------------------------------------ + */ + + + $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler); + $$$1(window).on(Event.LOAD_DATA_API, function () { + $$$1(Selector.DATA_RIDE).each(function () { + var $carousel = $$$1(this); + + Carousel._jQueryInterface.call($carousel, $carousel.data()); + }); + }); + /** + * ------------------------------------------------------------------------ + * jQuery + * ------------------------------------------------------------------------ + */ + + $$$1.fn[NAME] = Carousel._jQueryInterface; + $$$1.fn[NAME].Constructor = Carousel; + + $$$1.fn[NAME].noConflict = function () { + $$$1.fn[NAME] = JQUERY_NO_CONFLICT; + return Carousel._jQueryInterface; + }; + + return Carousel; + }($); + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): collapse.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Collapse = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'collapse'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.collapse'; + var EVENT_KEY = "." + DATA_KEY; + var DATA_API_KEY = '.data-api'; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var Default = { + toggle: true, + parent: '' + }; + var DefaultType = { + toggle: 'boolean', + parent: '(string|element)' + }; + var Event = { + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY + }; + var ClassName = { + SHOW: 'show', + COLLAPSE: 'collapse', + COLLAPSING: 'collapsing', + COLLAPSED: 'collapsed' + }; + var Dimension = { + WIDTH: 'width', + HEIGHT: 'height' + }; + var Selector = { + ACTIVES: '.show, .collapsing', + DATA_TOGGLE: '[data-toggle="collapse"]' + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var Collapse = + /*#__PURE__*/ + function () { + function Collapse(element, config) { + this._isTransitioning = false; + this._element = element; + this._config = this._getConfig(config); + this._triggerArray = $$$1.makeArray($$$1("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]"))); + var tabToggles = $$$1(Selector.DATA_TOGGLE); + + for (var i = 0; i < tabToggles.length; i++) { + var elem = tabToggles[i]; + var selector = Util.getSelectorFromElement(elem); + + if (selector !== null && $$$1(selector).filter(element).length > 0) { + this._selector = selector; + + this._triggerArray.push(elem); + } + } + + this._parent = this._config.parent ? this._getParent() : null; + + if (!this._config.parent) { + this._addAriaAndCollapsedClass(this._element, this._triggerArray); + } + + if (this._config.toggle) { + this.toggle(); + } + } // Getters + + + var _proto = Collapse.prototype; + + // Public + _proto.toggle = function toggle() { + if ($$$1(this._element).hasClass(ClassName.SHOW)) { + this.hide(); + } else { + this.show(); + } + }; + + _proto.show = function show() { + var _this = this; + + if (this._isTransitioning || $$$1(this._element).hasClass(ClassName.SHOW)) { + return; + } + + var actives; + var activesData; + + if (this._parent) { + actives = $$$1.makeArray($$$1(this._parent).find(Selector.ACTIVES).filter("[data-parent=\"" + this._config.parent + "\"]")); + + if (actives.length === 0) { + actives = null; + } + } + + if (actives) { + activesData = $$$1(actives).not(this._selector).data(DATA_KEY); + + if (activesData && activesData._isTransitioning) { + return; + } + } + + var startEvent = $$$1.Event(Event.SHOW); + $$$1(this._element).trigger(startEvent); + + if (startEvent.isDefaultPrevented()) { + return; + } + + if (actives) { + Collapse._jQueryInterface.call($$$1(actives).not(this._selector), 'hide'); + + if (!activesData) { + $$$1(actives).data(DATA_KEY, null); + } + } + + var dimension = this._getDimension(); + + $$$1(this._element).removeClass(ClassName.COLLAPSE).addClass(ClassName.COLLAPSING); + this._element.style[dimension] = 0; + + if (this._triggerArray.length > 0) { + $$$1(this._triggerArray).removeClass(ClassName.COLLAPSED).attr('aria-expanded', true); + } + + this.setTransitioning(true); + + var complete = function complete() { + $$$1(_this._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.SHOW); + _this._element.style[dimension] = ''; + + _this.setTransitioning(false); + + $$$1(_this._element).trigger(Event.SHOWN); + }; + + var capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1); + var scrollSize = "scroll" + capitalizedDimension; + var transitionDuration = Util.getTransitionDurationFromElement(this._element); + $$$1(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration); + this._element.style[dimension] = this._element[scrollSize] + "px"; + }; + + _proto.hide = function hide() { + var _this2 = this; + + if (this._isTransitioning || !$$$1(this._element).hasClass(ClassName.SHOW)) { + return; + } + + var startEvent = $$$1.Event(Event.HIDE); + $$$1(this._element).trigger(startEvent); + + if (startEvent.isDefaultPrevented()) { + return; + } + + var dimension = this._getDimension(); + + this._element.style[dimension] = this._element.getBoundingClientRect()[dimension] + "px"; + Util.reflow(this._element); + $$$1(this._element).addClass(ClassName.COLLAPSING).removeClass(ClassName.COLLAPSE).removeClass(ClassName.SHOW); + + if (this._triggerArray.length > 0) { + for (var i = 0; i < this._triggerArray.length; i++) { + var trigger = this._triggerArray[i]; + var selector = Util.getSelectorFromElement(trigger); + + if (selector !== null) { + var $elem = $$$1(selector); + + if (!$elem.hasClass(ClassName.SHOW)) { + $$$1(trigger).addClass(ClassName.COLLAPSED).attr('aria-expanded', false); + } + } + } + } + + this.setTransitioning(true); + + var complete = function complete() { + _this2.setTransitioning(false); + + $$$1(_this2._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).trigger(Event.HIDDEN); + }; + + this._element.style[dimension] = ''; + var transitionDuration = Util.getTransitionDurationFromElement(this._element); + $$$1(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration); + }; + + _proto.setTransitioning = function setTransitioning(isTransitioning) { + this._isTransitioning = isTransitioning; + }; + + _proto.dispose = function dispose() { + $$$1.removeData(this._element, DATA_KEY); + this._config = null; + this._parent = null; + this._element = null; + this._triggerArray = null; + this._isTransitioning = null; + }; // Private + + + _proto._getConfig = function _getConfig(config) { + config = _objectSpread({}, Default, config); + config.toggle = Boolean(config.toggle); // Coerce string values + + Util.typeCheckConfig(NAME, config, DefaultType); + return config; + }; + + _proto._getDimension = function _getDimension() { + var hasWidth = $$$1(this._element).hasClass(Dimension.WIDTH); + return hasWidth ? Dimension.WIDTH : Dimension.HEIGHT; + }; + + _proto._getParent = function _getParent() { + var _this3 = this; + + var parent = null; + + if (Util.isElement(this._config.parent)) { + parent = this._config.parent; // It's a jQuery object + + if (typeof this._config.parent.jquery !== 'undefined') { + parent = this._config.parent[0]; + } + } else { + parent = $$$1(this._config.parent)[0]; + } + + var selector = "[data-toggle=\"collapse\"][data-parent=\"" + this._config.parent + "\"]"; + $$$1(parent).find(selector).each(function (i, element) { + _this3._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]); + }); + return parent; + }; + + _proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) { + if (element) { + var isOpen = $$$1(element).hasClass(ClassName.SHOW); + + if (triggerArray.length > 0) { + $$$1(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen); + } + } + }; // Static + + + Collapse._getTargetFromElement = function _getTargetFromElement(element) { + var selector = Util.getSelectorFromElement(element); + return selector ? $$$1(selector)[0] : null; + }; + + Collapse._jQueryInterface = function _jQueryInterface(config) { + return this.each(function () { + var $this = $$$1(this); + var data = $this.data(DATA_KEY); + + var _config = _objectSpread({}, Default, $this.data(), typeof config === 'object' && config ? config : {}); + + if (!data && _config.toggle && /show|hide/.test(config)) { + _config.toggle = false; + } + + if (!data) { + data = new Collapse(this, _config); + $this.data(DATA_KEY, data); + } + + if (typeof config === 'string') { + if (typeof data[config] === 'undefined') { + throw new TypeError("No method named \"" + config + "\""); + } + + data[config](); + } + }); + }; + + _createClass(Collapse, null, [{ + key: "VERSION", + get: function get() { + return VERSION; + } + }, { + key: "Default", + get: function get() { + return Default; + } + }]); + + return Collapse; + }(); + /** + * ------------------------------------------------------------------------ + * Data Api implementation + * ------------------------------------------------------------------------ + */ + + + $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { + // preventDefault only for elements (which change the URL) not inside the collapsible element + if (event.currentTarget.tagName === 'A') { + event.preventDefault(); + } + + var $trigger = $$$1(this); + var selector = Util.getSelectorFromElement(this); + $$$1(selector).each(function () { + var $target = $$$1(this); + var data = $target.data(DATA_KEY); + var config = data ? 'toggle' : $trigger.data(); + + Collapse._jQueryInterface.call($target, config); + }); + }); + /** + * ------------------------------------------------------------------------ + * jQuery + * ------------------------------------------------------------------------ + */ + + $$$1.fn[NAME] = Collapse._jQueryInterface; + $$$1.fn[NAME].Constructor = Collapse; + + $$$1.fn[NAME].noConflict = function () { + $$$1.fn[NAME] = JQUERY_NO_CONFLICT; + return Collapse._jQueryInterface; + }; + + return Collapse; + }($); + + /**! + * @fileOverview Kickass library to create and place poppers near their reference elements. + * @version 1.14.3 + * @license + * Copyright (c) 2016 Federico Zivolo and contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + var isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined'; + + var longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox']; + var timeoutDuration = 0; + for (var i = 0; i < longerTimeoutBrowsers.length; i += 1) { + if (isBrowser && navigator.userAgent.indexOf(longerTimeoutBrowsers[i]) >= 0) { + timeoutDuration = 1; + break; + } + } + + function microtaskDebounce(fn) { + var called = false; + return function () { + if (called) { + return; + } + called = true; + window.Promise.resolve().then(function () { + called = false; + fn(); + }); + }; + } + + function taskDebounce(fn) { + var scheduled = false; + return function () { + if (!scheduled) { + scheduled = true; + setTimeout(function () { + scheduled = false; + fn(); + }, timeoutDuration); + } + }; + } + + var supportsMicroTasks = isBrowser && window.Promise; + + /** + * Create a debounced version of a method, that's asynchronously deferred + * but called in the minimum time possible. + * + * @method + * @memberof Popper.Utils + * @argument {Function} fn + * @returns {Function} + */ + var debounce = supportsMicroTasks ? microtaskDebounce : taskDebounce; + + /** + * Check if the given variable is a function + * @method + * @memberof Popper.Utils + * @argument {Any} functionToCheck - variable to check + * @returns {Boolean} answer to: is a function? + */ + function isFunction(functionToCheck) { + var getType = {}; + return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]'; + } + + /** + * Get CSS computed property of the given element + * @method + * @memberof Popper.Utils + * @argument {Eement} element + * @argument {String} property + */ + function getStyleComputedProperty(element, property) { + if (element.nodeType !== 1) { + return []; + } + // NOTE: 1 DOM access here + var css = getComputedStyle(element, null); + return property ? css[property] : css; + } + + /** + * Returns the parentNode or the host of the element + * @method + * @memberof Popper.Utils + * @argument {Element} element + * @returns {Element} parent + */ + function getParentNode(element) { + if (element.nodeName === 'HTML') { + return element; + } + return element.parentNode || element.host; + } + + /** + * Returns the scrolling parent of the given element + * @method + * @memberof Popper.Utils + * @argument {Element} element + * @returns {Element} scroll parent + */ + function getScrollParent(element) { + // Return body, `getScroll` will take care to get the correct `scrollTop` from it + if (!element) { + return document.body; + } + + switch (element.nodeName) { + case 'HTML': + case 'BODY': + return element.ownerDocument.body; + case '#document': + return element.body; + } + + // Firefox want us to check `-x` and `-y` variations as well + + var _getStyleComputedProp = getStyleComputedProperty(element), + overflow = _getStyleComputedProp.overflow, + overflowX = _getStyleComputedProp.overflowX, + overflowY = _getStyleComputedProp.overflowY; + + if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) { + return element; + } + + return getScrollParent(getParentNode(element)); + } + + var isIE11 = isBrowser && !!(window.MSInputMethodContext && document.documentMode); + var isIE10 = isBrowser && /MSIE 10/.test(navigator.userAgent); + + /** + * Determines if the browser is Internet Explorer + * @method + * @memberof Popper.Utils + * @param {Number} version to check + * @returns {Boolean} isIE + */ + function isIE(version) { + if (version === 11) { + return isIE11; + } + if (version === 10) { + return isIE10; + } + return isIE11 || isIE10; + } + + /** + * Returns the offset parent of the given element + * @method + * @memberof Popper.Utils + * @argument {Element} element + * @returns {Element} offset parent + */ + function getOffsetParent(element) { + if (!element) { + return document.documentElement; + } + + var noOffsetParent = isIE(10) ? document.body : null; + + // NOTE: 1 DOM access here + var offsetParent = element.offsetParent; + // Skip hidden elements which don't have an offsetParent + while (offsetParent === noOffsetParent && element.nextElementSibling) { + offsetParent = (element = element.nextElementSibling).offsetParent; + } + + var nodeName = offsetParent && offsetParent.nodeName; + + if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') { + return element ? element.ownerDocument.documentElement : document.documentElement; + } + + // .offsetParent will return the closest TD or TABLE in case + // no offsetParent is present, I hate this job... + if (['TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 && getStyleComputedProperty(offsetParent, 'position') === 'static') { + return getOffsetParent(offsetParent); + } + + return offsetParent; + } + + function isOffsetContainer(element) { + var nodeName = element.nodeName; + + if (nodeName === 'BODY') { + return false; + } + return nodeName === 'HTML' || getOffsetParent(element.firstElementChild) === element; + } + + /** + * Finds the root node (document, shadowDOM root) of the given element + * @method + * @memberof Popper.Utils + * @argument {Element} node + * @returns {Element} root node + */ + function getRoot(node) { + if (node.parentNode !== null) { + return getRoot(node.parentNode); + } + + return node; + } + + /** + * Finds the offset parent common to the two provided nodes + * @method + * @memberof Popper.Utils + * @argument {Element} element1 + * @argument {Element} element2 + * @returns {Element} common offset parent + */ + function findCommonOffsetParent(element1, element2) { + // This check is needed to avoid errors in case one of the elements isn't defined for any reason + if (!element1 || !element1.nodeType || !element2 || !element2.nodeType) { + return document.documentElement; + } + + // Here we make sure to give as "start" the element that comes first in the DOM + var order = element1.compareDocumentPosition(element2) & Node.DOCUMENT_POSITION_FOLLOWING; + var start = order ? element1 : element2; + var end = order ? element2 : element1; + + // Get common ancestor container + var range = document.createRange(); + range.setStart(start, 0); + range.setEnd(end, 0); + var commonAncestorContainer = range.commonAncestorContainer; + + // Both nodes are inside #document + + if (element1 !== commonAncestorContainer && element2 !== commonAncestorContainer || start.contains(end)) { + if (isOffsetContainer(commonAncestorContainer)) { + return commonAncestorContainer; + } + + return getOffsetParent(commonAncestorContainer); + } + + // one of the nodes is inside shadowDOM, find which one + var element1root = getRoot(element1); + if (element1root.host) { + return findCommonOffsetParent(element1root.host, element2); + } else { + return findCommonOffsetParent(element1, getRoot(element2).host); + } + } + + /** + * Gets the scroll value of the given element in the given side (top and left) + * @method + * @memberof Popper.Utils + * @argument {Element} element + * @argument {String} side `top` or `left` + * @returns {number} amount of scrolled pixels + */ + function getScroll(element) { + var side = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'top'; + + var upperSide = side === 'top' ? 'scrollTop' : 'scrollLeft'; + var nodeName = element.nodeName; + + if (nodeName === 'BODY' || nodeName === 'HTML') { + var html = element.ownerDocument.documentElement; + var scrollingElement = element.ownerDocument.scrollingElement || html; + return scrollingElement[upperSide]; + } + + return element[upperSide]; + } + + /* + * Sum or subtract the element scroll values (left and top) from a given rect object + * @method + * @memberof Popper.Utils + * @param {Object} rect - Rect object you want to change + * @param {HTMLElement} element - The element from the function reads the scroll values + * @param {Boolean} subtract - set to true if you want to subtract the scroll values + * @return {Object} rect - The modifier rect object + */ + function includeScroll(rect, element) { + var subtract = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false; + + var scrollTop = getScroll(element, 'top'); + var scrollLeft = getScroll(element, 'left'); + var modifier = subtract ? -1 : 1; + rect.top += scrollTop * modifier; + rect.bottom += scrollTop * modifier; + rect.left += scrollLeft * modifier; + rect.right += scrollLeft * modifier; + return rect; + } + + /* + * Helper to detect borders of a given element + * @method + * @memberof Popper.Utils + * @param {CSSStyleDeclaration} styles + * Result of `getStyleComputedProperty` on the given element + * @param {String} axis - `x` or `y` + * @return {number} borders - The borders size of the given axis + */ + + function getBordersSize(styles, axis) { + var sideA = axis === 'x' ? 'Left' : 'Top'; + var sideB = sideA === 'Left' ? 'Right' : 'Bottom'; + + return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10); + } + + function getSize(axis, body, html, computedStyle) { + return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0); + } + + function getWindowSizes() { + var body = document.body; + var html = document.documentElement; + var computedStyle = isIE(10) && getComputedStyle(html); + + return { + height: getSize('Height', body, html, computedStyle), + width: getSize('Width', body, html, computedStyle) + }; + } + + var classCallCheck = function (instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError("Cannot call a class as a function"); + } + }; + + var createClass = function () { + function defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + Object.defineProperty(target, descriptor.key, descriptor); + } + } + + return function (Constructor, protoProps, staticProps) { + if (protoProps) defineProperties(Constructor.prototype, protoProps); + if (staticProps) defineProperties(Constructor, staticProps); + return Constructor; + }; + }(); + + + + + + var defineProperty = function (obj, key, value) { + if (key in obj) { + Object.defineProperty(obj, key, { + value: value, + enumerable: true, + configurable: true, + writable: true + }); + } else { + obj[key] = value; + } + + return obj; + }; + + var _extends = Object.assign || function (target) { + for (var i = 1; i < arguments.length; i++) { + var source = arguments[i]; + + for (var key in source) { + if (Object.prototype.hasOwnProperty.call(source, key)) { + target[key] = source[key]; + } + } + } + + return target; + }; + + /** + * Given element offsets, generate an output similar to getBoundingClientRect + * @method + * @memberof Popper.Utils + * @argument {Object} offsets + * @returns {Object} ClientRect like output + */ + function getClientRect(offsets) { + return _extends({}, offsets, { + right: offsets.left + offsets.width, + bottom: offsets.top + offsets.height + }); + } + + /** + * Get bounding client rect of given element + * @method + * @memberof Popper.Utils + * @param {HTMLElement} element + * @return {Object} client rect + */ + function getBoundingClientRect(element) { + var rect = {}; + + // IE10 10 FIX: Please, don't ask, the element isn't + // considered in DOM in some circumstances... + // This isn't reproducible in IE10 compatibility mode of IE11 + try { + if (isIE(10)) { + rect = element.getBoundingClientRect(); + var scrollTop = getScroll(element, 'top'); + var scrollLeft = getScroll(element, 'left'); + rect.top += scrollTop; + rect.left += scrollLeft; + rect.bottom += scrollTop; + rect.right += scrollLeft; + } else { + rect = element.getBoundingClientRect(); + } + } catch (e) {} + + var result = { + left: rect.left, + top: rect.top, + width: rect.right - rect.left, + height: rect.bottom - rect.top + }; + + // subtract scrollbar size from sizes + var sizes = element.nodeName === 'HTML' ? getWindowSizes() : {}; + var width = sizes.width || element.clientWidth || result.right - result.left; + var height = sizes.height || element.clientHeight || result.bottom - result.top; + + var horizScrollbar = element.offsetWidth - width; + var vertScrollbar = element.offsetHeight - height; + + // if an hypothetical scrollbar is detected, we must be sure it's not a `border` + // we make this check conditional for performance reasons + if (horizScrollbar || vertScrollbar) { + var styles = getStyleComputedProperty(element); + horizScrollbar -= getBordersSize(styles, 'x'); + vertScrollbar -= getBordersSize(styles, 'y'); + + result.width -= horizScrollbar; + result.height -= vertScrollbar; + } + + return getClientRect(result); + } + + function getOffsetRectRelativeToArbitraryNode(children, parent) { + var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false; + + var isIE10 = isIE(10); + var isHTML = parent.nodeName === 'HTML'; + var childrenRect = getBoundingClientRect(children); + var parentRect = getBoundingClientRect(parent); + var scrollParent = getScrollParent(children); + + var styles = getStyleComputedProperty(parent); + var borderTopWidth = parseFloat(styles.borderTopWidth, 10); + var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10); + + // In cases where the parent is fixed, we must ignore negative scroll in offset calc + if (fixedPosition && parent.nodeName === 'HTML') { + parentRect.top = Math.max(parentRect.top, 0); + parentRect.left = Math.max(parentRect.left, 0); + } + var offsets = getClientRect({ + top: childrenRect.top - parentRect.top - borderTopWidth, + left: childrenRect.left - parentRect.left - borderLeftWidth, + width: childrenRect.width, + height: childrenRect.height + }); + offsets.marginTop = 0; + offsets.marginLeft = 0; + + // Subtract margins of documentElement in case it's being used as parent + // we do this only on HTML because it's the only element that behaves + // differently when margins are applied to it. The margins are included in + // the box of the documentElement, in the other cases not. + if (!isIE10 && isHTML) { + var marginTop = parseFloat(styles.marginTop, 10); + var marginLeft = parseFloat(styles.marginLeft, 10); + + offsets.top -= borderTopWidth - marginTop; + offsets.bottom -= borderTopWidth - marginTop; + offsets.left -= borderLeftWidth - marginLeft; + offsets.right -= borderLeftWidth - marginLeft; + + // Attach marginTop and marginLeft because in some circumstances we may need them + offsets.marginTop = marginTop; + offsets.marginLeft = marginLeft; + } + + if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') { + offsets = includeScroll(offsets, parent); + } + + return offsets; + } + + function getViewportOffsetRectRelativeToArtbitraryNode(element) { + var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false; + + var html = element.ownerDocument.documentElement; + var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html); + var width = Math.max(html.clientWidth, window.innerWidth || 0); + var height = Math.max(html.clientHeight, window.innerHeight || 0); + + var scrollTop = !excludeScroll ? getScroll(html) : 0; + var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0; + + var offset = { + top: scrollTop - relativeOffset.top + relativeOffset.marginTop, + left: scrollLeft - relativeOffset.left + relativeOffset.marginLeft, + width: width, + height: height + }; + + return getClientRect(offset); + } + + /** + * Check if the given element is fixed or is inside a fixed parent + * @method + * @memberof Popper.Utils + * @argument {Element} element + * @argument {Element} customContainer + * @returns {Boolean} answer to "isFixed?" + */ + function isFixed(element) { + var nodeName = element.nodeName; + if (nodeName === 'BODY' || nodeName === 'HTML') { + return false; + } + if (getStyleComputedProperty(element, 'position') === 'fixed') { + return true; + } + return isFixed(getParentNode(element)); + } + + /** + * Finds the first parent of an element that has a transformed property defined + * @method + * @memberof Popper.Utils + * @argument {Element} element + * @returns {Element} first transformed parent or documentElement + */ + + function getFixedPositionOffsetParent(element) { + // This check is needed to avoid errors in case one of the elements isn't defined for any reason + if (!element || !element.parentElement || isIE()) { + return document.documentElement; + } + var el = element.parentElement; + while (el && getStyleComputedProperty(el, 'transform') === 'none') { + el = el.parentElement; + } + return el || document.documentElement; + } + + /** + * Computed the boundaries limits and return them + * @method + * @memberof Popper.Utils + * @param {HTMLElement} popper + * @param {HTMLElement} reference + * @param {number} padding + * @param {HTMLElement} boundariesElement - Element used to define the boundaries + * @param {Boolean} fixedPosition - Is in fixed position mode + * @returns {Object} Coordinates of the boundaries + */ + function getBoundaries(popper, reference, padding, boundariesElement) { + var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false; + + // NOTE: 1 DOM access here + + var boundaries = { top: 0, left: 0 }; + var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference); + + // Handle viewport case + if (boundariesElement === 'viewport') { + boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition); + } else { + // Handle other cases based on DOM element used as boundaries + var boundariesNode = void 0; + if (boundariesElement === 'scrollParent') { + boundariesNode = getScrollParent(getParentNode(reference)); + if (boundariesNode.nodeName === 'BODY') { + boundariesNode = popper.ownerDocument.documentElement; + } + } else if (boundariesElement === 'window') { + boundariesNode = popper.ownerDocument.documentElement; + } else { + boundariesNode = boundariesElement; + } + + var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition); + + // In case of HTML, we need a different computation + if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) { + var _getWindowSizes = getWindowSizes(), + height = _getWindowSizes.height, + width = _getWindowSizes.width; + + boundaries.top += offsets.top - offsets.marginTop; + boundaries.bottom = height + offsets.top; + boundaries.left += offsets.left - offsets.marginLeft; + boundaries.right = width + offsets.left; + } else { + // for all the other DOM elements, this one is good + boundaries = offsets; + } + } + + // Add paddings + boundaries.left += padding; + boundaries.top += padding; + boundaries.right -= padding; + boundaries.bottom -= padding; + + return boundaries; + } + + function getArea(_ref) { + var width = _ref.width, + height = _ref.height; + + return width * height; + } + + /** + * Utility used to transform the `auto` placement to the placement with more + * available space. + * @method + * @memberof Popper.Utils + * @argument {Object} data - The data object generated by update method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function computeAutoPlacement(placement, refRect, popper, reference, boundariesElement) { + var padding = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0; + + if (placement.indexOf('auto') === -1) { + return placement; + } + + var boundaries = getBoundaries(popper, reference, padding, boundariesElement); + + var rects = { + top: { + width: boundaries.width, + height: refRect.top - boundaries.top + }, + right: { + width: boundaries.right - refRect.right, + height: boundaries.height + }, + bottom: { + width: boundaries.width, + height: boundaries.bottom - refRect.bottom + }, + left: { + width: refRect.left - boundaries.left, + height: boundaries.height + } + }; + + var sortedAreas = Object.keys(rects).map(function (key) { + return _extends({ + key: key + }, rects[key], { + area: getArea(rects[key]) + }); + }).sort(function (a, b) { + return b.area - a.area; + }); + + var filteredAreas = sortedAreas.filter(function (_ref2) { + var width = _ref2.width, + height = _ref2.height; + return width >= popper.clientWidth && height >= popper.clientHeight; + }); + + var computedPlacement = filteredAreas.length > 0 ? filteredAreas[0].key : sortedAreas[0].key; + + var variation = placement.split('-')[1]; + + return computedPlacement + (variation ? '-' + variation : ''); + } + + /** + * Get offsets to the reference element + * @method + * @memberof Popper.Utils + * @param {Object} state + * @param {Element} popper - the popper element + * @param {Element} reference - the reference element (the popper will be relative to this) + * @param {Element} fixedPosition - is in fixed position mode + * @returns {Object} An object containing the offsets which will be applied to the popper + */ + function getReferenceOffsets(state, popper, reference) { + var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null; + + var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference); + return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition); + } + + /** + * Get the outer sizes of the given element (offset size + margins) + * @method + * @memberof Popper.Utils + * @argument {Element} element + * @returns {Object} object containing width and height properties + */ + function getOuterSizes(element) { + var styles = getComputedStyle(element); + var x = parseFloat(styles.marginTop) + parseFloat(styles.marginBottom); + var y = parseFloat(styles.marginLeft) + parseFloat(styles.marginRight); + var result = { + width: element.offsetWidth + y, + height: element.offsetHeight + x + }; + return result; + } + + /** + * Get the opposite placement of the given one + * @method + * @memberof Popper.Utils + * @argument {String} placement + * @returns {String} flipped placement + */ + function getOppositePlacement(placement) { + var hash = { left: 'right', right: 'left', bottom: 'top', top: 'bottom' }; + return placement.replace(/left|right|bottom|top/g, function (matched) { + return hash[matched]; + }); + } + + /** + * Get offsets to the popper + * @method + * @memberof Popper.Utils + * @param {Object} position - CSS position the Popper will get applied + * @param {HTMLElement} popper - the popper element + * @param {Object} referenceOffsets - the reference offsets (the popper will be relative to this) + * @param {String} placement - one of the valid placement options + * @returns {Object} popperOffsets - An object containing the offsets which will be applied to the popper + */ + function getPopperOffsets(popper, referenceOffsets, placement) { + placement = placement.split('-')[0]; + + // Get popper node sizes + var popperRect = getOuterSizes(popper); + + // Add position, width and height to our offsets object + var popperOffsets = { + width: popperRect.width, + height: popperRect.height + }; + + // depending by the popper placement we have to compute its offsets slightly differently + var isHoriz = ['right', 'left'].indexOf(placement) !== -1; + var mainSide = isHoriz ? 'top' : 'left'; + var secondarySide = isHoriz ? 'left' : 'top'; + var measurement = isHoriz ? 'height' : 'width'; + var secondaryMeasurement = !isHoriz ? 'height' : 'width'; + + popperOffsets[mainSide] = referenceOffsets[mainSide] + referenceOffsets[measurement] / 2 - popperRect[measurement] / 2; + if (placement === secondarySide) { + popperOffsets[secondarySide] = referenceOffsets[secondarySide] - popperRect[secondaryMeasurement]; + } else { + popperOffsets[secondarySide] = referenceOffsets[getOppositePlacement(secondarySide)]; + } + + return popperOffsets; + } + + /** + * Mimics the `find` method of Array + * @method + * @memberof Popper.Utils + * @argument {Array} arr + * @argument prop + * @argument value + * @returns index or -1 + */ + function find(arr, check) { + // use native find if supported + if (Array.prototype.find) { + return arr.find(check); + } + + // use `filter` to obtain the same behavior of `find` + return arr.filter(check)[0]; + } + + /** + * Return the index of the matching object + * @method + * @memberof Popper.Utils + * @argument {Array} arr + * @argument prop + * @argument value + * @returns index or -1 + */ + function findIndex(arr, prop, value) { + // use native findIndex if supported + if (Array.prototype.findIndex) { + return arr.findIndex(function (cur) { + return cur[prop] === value; + }); + } + + // use `find` + `indexOf` if `findIndex` isn't supported + var match = find(arr, function (obj) { + return obj[prop] === value; + }); + return arr.indexOf(match); + } + + /** + * Loop trough the list of modifiers and run them in order, + * each of them will then edit the data object. + * @method + * @memberof Popper.Utils + * @param {dataObject} data + * @param {Array} modifiers + * @param {String} ends - Optional modifier name used as stopper + * @returns {dataObject} + */ + function runModifiers(modifiers, data, ends) { + var modifiersToRun = ends === undefined ? modifiers : modifiers.slice(0, findIndex(modifiers, 'name', ends)); + + modifiersToRun.forEach(function (modifier) { + if (modifier['function']) { + // eslint-disable-line dot-notation + console.warn('`modifier.function` is deprecated, use `modifier.fn`!'); + } + var fn = modifier['function'] || modifier.fn; // eslint-disable-line dot-notation + if (modifier.enabled && isFunction(fn)) { + // Add properties to offsets to make them a complete clientRect object + // we do this before each modifier to make sure the previous one doesn't + // mess with these values + data.offsets.popper = getClientRect(data.offsets.popper); + data.offsets.reference = getClientRect(data.offsets.reference); + + data = fn(data, modifier); + } + }); + + return data; + } + + /** + * Updates the position of the popper, computing the new offsets and applying + * the new style.
    + * Prefer `scheduleUpdate` over `update` because of performance reasons. + * @method + * @memberof Popper + */ + function update() { + // if popper is destroyed, don't perform any further update + if (this.state.isDestroyed) { + return; + } + + var data = { + instance: this, + styles: {}, + arrowStyles: {}, + attributes: {}, + flipped: false, + offsets: {} + }; + + // compute reference element offsets + data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference, this.options.positionFixed); + + // compute auto placement, store placement inside the data object, + // modifiers will be able to edit `placement` if needed + // and refer to originalPlacement to know the original value + data.placement = computeAutoPlacement(this.options.placement, data.offsets.reference, this.popper, this.reference, this.options.modifiers.flip.boundariesElement, this.options.modifiers.flip.padding); + + // store the computed placement inside `originalPlacement` + data.originalPlacement = data.placement; + + data.positionFixed = this.options.positionFixed; + + // compute the popper offsets + data.offsets.popper = getPopperOffsets(this.popper, data.offsets.reference, data.placement); + + data.offsets.popper.position = this.options.positionFixed ? 'fixed' : 'absolute'; + + // run the modifiers + data = runModifiers(this.modifiers, data); + + // the first `update` will call `onCreate` callback + // the other ones will call `onUpdate` callback + if (!this.state.isCreated) { + this.state.isCreated = true; + this.options.onCreate(data); + } else { + this.options.onUpdate(data); + } + } + + /** + * Helper used to know if the given modifier is enabled. + * @method + * @memberof Popper.Utils + * @returns {Boolean} + */ + function isModifierEnabled(modifiers, modifierName) { + return modifiers.some(function (_ref) { + var name = _ref.name, + enabled = _ref.enabled; + return enabled && name === modifierName; + }); + } + + /** + * Get the prefixed supported property name + * @method + * @memberof Popper.Utils + * @argument {String} property (camelCase) + * @returns {String} prefixed property (camelCase or PascalCase, depending on the vendor prefix) + */ + function getSupportedPropertyName(property) { + var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O']; + var upperProp = property.charAt(0).toUpperCase() + property.slice(1); + + for (var i = 0; i < prefixes.length; i++) { + var prefix = prefixes[i]; + var toCheck = prefix ? '' + prefix + upperProp : property; + if (typeof document.body.style[toCheck] !== 'undefined') { + return toCheck; + } + } + return null; + } + + /** + * Destroy the popper + * @method + * @memberof Popper + */ + function destroy() { + this.state.isDestroyed = true; + + // touch DOM only if `applyStyle` modifier is enabled + if (isModifierEnabled(this.modifiers, 'applyStyle')) { + this.popper.removeAttribute('x-placement'); + this.popper.style.position = ''; + this.popper.style.top = ''; + this.popper.style.left = ''; + this.popper.style.right = ''; + this.popper.style.bottom = ''; + this.popper.style.willChange = ''; + this.popper.style[getSupportedPropertyName('transform')] = ''; + } + + this.disableEventListeners(); + + // remove the popper if user explicity asked for the deletion on destroy + // do not use `remove` because IE11 doesn't support it + if (this.options.removeOnDestroy) { + this.popper.parentNode.removeChild(this.popper); + } + return this; + } + + /** + * Get the window associated with the element + * @argument {Element} element + * @returns {Window} + */ + function getWindow(element) { + var ownerDocument = element.ownerDocument; + return ownerDocument ? ownerDocument.defaultView : window; + } + + function attachToScrollParents(scrollParent, event, callback, scrollParents) { + var isBody = scrollParent.nodeName === 'BODY'; + var target = isBody ? scrollParent.ownerDocument.defaultView : scrollParent; + target.addEventListener(event, callback, { passive: true }); + + if (!isBody) { + attachToScrollParents(getScrollParent(target.parentNode), event, callback, scrollParents); + } + scrollParents.push(target); + } + + /** + * Setup needed event listeners used to update the popper position + * @method + * @memberof Popper.Utils + * @private + */ + function setupEventListeners(reference, options, state, updateBound) { + // Resize event listener on window + state.updateBound = updateBound; + getWindow(reference).addEventListener('resize', state.updateBound, { passive: true }); + + // Scroll event listener on scroll parents + var scrollElement = getScrollParent(reference); + attachToScrollParents(scrollElement, 'scroll', state.updateBound, state.scrollParents); + state.scrollElement = scrollElement; + state.eventsEnabled = true; + + return state; + } + + /** + * It will add resize/scroll events and start recalculating + * position of the popper element when they are triggered. + * @method + * @memberof Popper + */ + function enableEventListeners() { + if (!this.state.eventsEnabled) { + this.state = setupEventListeners(this.reference, this.options, this.state, this.scheduleUpdate); + } + } + + /** + * Remove event listeners used to update the popper position + * @method + * @memberof Popper.Utils + * @private + */ + function removeEventListeners(reference, state) { + // Remove resize event listener on window + getWindow(reference).removeEventListener('resize', state.updateBound); + + // Remove scroll event listener on scroll parents + state.scrollParents.forEach(function (target) { + target.removeEventListener('scroll', state.updateBound); + }); + + // Reset state + state.updateBound = null; + state.scrollParents = []; + state.scrollElement = null; + state.eventsEnabled = false; + return state; + } + + /** + * It will remove resize/scroll events and won't recalculate popper position + * when they are triggered. It also won't trigger onUpdate callback anymore, + * unless you call `update` method manually. + * @method + * @memberof Popper + */ + function disableEventListeners() { + if (this.state.eventsEnabled) { + cancelAnimationFrame(this.scheduleUpdate); + this.state = removeEventListeners(this.reference, this.state); + } + } + + /** + * Tells if a given input is a number + * @method + * @memberof Popper.Utils + * @param {*} input to check + * @return {Boolean} + */ + function isNumeric(n) { + return n !== '' && !isNaN(parseFloat(n)) && isFinite(n); + } + + /** + * Set the style to the given popper + * @method + * @memberof Popper.Utils + * @argument {Element} element - Element to apply the style to + * @argument {Object} styles + * Object with a list of properties and values which will be applied to the element + */ + function setStyles(element, styles) { + Object.keys(styles).forEach(function (prop) { + var unit = ''; + // add unit if the value is numeric and is one of the following + if (['width', 'height', 'top', 'right', 'bottom', 'left'].indexOf(prop) !== -1 && isNumeric(styles[prop])) { + unit = 'px'; + } + element.style[prop] = styles[prop] + unit; + }); + } + + /** + * Set the attributes to the given popper + * @method + * @memberof Popper.Utils + * @argument {Element} element - Element to apply the attributes to + * @argument {Object} styles + * Object with a list of properties and values which will be applied to the element + */ + function setAttributes(element, attributes) { + Object.keys(attributes).forEach(function (prop) { + var value = attributes[prop]; + if (value !== false) { + element.setAttribute(prop, attributes[prop]); + } else { + element.removeAttribute(prop); + } + }); + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by `update` method + * @argument {Object} data.styles - List of style properties - values to apply to popper element + * @argument {Object} data.attributes - List of attribute properties - values to apply to popper element + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The same data object + */ + function applyStyle(data) { + // any property present in `data.styles` will be applied to the popper, + // in this way we can make the 3rd party modifiers add custom styles to it + // Be aware, modifiers could override the properties defined in the previous + // lines of this modifier! + setStyles(data.instance.popper, data.styles); + + // any property present in `data.attributes` will be applied to the popper, + // they will be set as HTML attributes of the element + setAttributes(data.instance.popper, data.attributes); + + // if arrowElement is defined and arrowStyles has some properties + if (data.arrowElement && Object.keys(data.arrowStyles).length) { + setStyles(data.arrowElement, data.arrowStyles); + } + + return data; + } + + /** + * Set the x-placement attribute before everything else because it could be used + * to add margins to the popper margins needs to be calculated to get the + * correct popper offsets. + * @method + * @memberof Popper.modifiers + * @param {HTMLElement} reference - The reference element used to position the popper + * @param {HTMLElement} popper - The HTML element used as popper + * @param {Object} options - Popper.js options + */ + function applyStyleOnLoad(reference, popper, options, modifierOptions, state) { + // compute reference element offsets + var referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed); + + // compute auto placement, store placement inside the data object, + // modifiers will be able to edit `placement` if needed + // and refer to originalPlacement to know the original value + var placement = computeAutoPlacement(options.placement, referenceOffsets, popper, reference, options.modifiers.flip.boundariesElement, options.modifiers.flip.padding); + + popper.setAttribute('x-placement', placement); + + // Apply `position` to popper before anything else because + // without the position applied we can't guarantee correct computations + setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' }); + + return options; + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by `update` method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function computeStyle(data, options) { + var x = options.x, + y = options.y; + var popper = data.offsets.popper; + + // Remove this legacy support in Popper.js v2 + + var legacyGpuAccelerationOption = find(data.instance.modifiers, function (modifier) { + return modifier.name === 'applyStyle'; + }).gpuAcceleration; + if (legacyGpuAccelerationOption !== undefined) { + console.warn('WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!'); + } + var gpuAcceleration = legacyGpuAccelerationOption !== undefined ? legacyGpuAccelerationOption : options.gpuAcceleration; + + var offsetParent = getOffsetParent(data.instance.popper); + var offsetParentRect = getBoundingClientRect(offsetParent); + + // Styles + var styles = { + position: popper.position + }; + + // Avoid blurry text by using full pixel integers. + // For pixel-perfect positioning, top/bottom prefers rounded + // values, while left/right prefers floored values. + var offsets = { + left: Math.floor(popper.left), + top: Math.round(popper.top), + bottom: Math.round(popper.bottom), + right: Math.floor(popper.right) + }; + + var sideA = x === 'bottom' ? 'top' : 'bottom'; + var sideB = y === 'right' ? 'left' : 'right'; + + // if gpuAcceleration is set to `true` and transform is supported, + // we use `translate3d` to apply the position to the popper we + // automatically use the supported prefixed version if needed + var prefixedProperty = getSupportedPropertyName('transform'); + + // now, let's make a step back and look at this code closely (wtf?) + // If the content of the popper grows once it's been positioned, it + // may happen that the popper gets misplaced because of the new content + // overflowing its reference element + // To avoid this problem, we provide two options (x and y), which allow + // the consumer to define the offset origin. + // If we position a popper on top of a reference element, we can set + // `x` to `top` to make the popper grow towards its top instead of + // its bottom. + var left = void 0, + top = void 0; + if (sideA === 'bottom') { + top = -offsetParentRect.height + offsets.bottom; + } else { + top = offsets.top; + } + if (sideB === 'right') { + left = -offsetParentRect.width + offsets.right; + } else { + left = offsets.left; + } + if (gpuAcceleration && prefixedProperty) { + styles[prefixedProperty] = 'translate3d(' + left + 'px, ' + top + 'px, 0)'; + styles[sideA] = 0; + styles[sideB] = 0; + styles.willChange = 'transform'; + } else { + // othwerise, we use the standard `top`, `left`, `bottom` and `right` properties + var invertTop = sideA === 'bottom' ? -1 : 1; + var invertLeft = sideB === 'right' ? -1 : 1; + styles[sideA] = top * invertTop; + styles[sideB] = left * invertLeft; + styles.willChange = sideA + ', ' + sideB; + } + + // Attributes + var attributes = { + 'x-placement': data.placement + }; + + // Update `data` attributes, styles and arrowStyles + data.attributes = _extends({}, attributes, data.attributes); + data.styles = _extends({}, styles, data.styles); + data.arrowStyles = _extends({}, data.offsets.arrow, data.arrowStyles); + + return data; + } + + /** + * Helper used to know if the given modifier depends from another one.
    + * It checks if the needed modifier is listed and enabled. + * @method + * @memberof Popper.Utils + * @param {Array} modifiers - list of modifiers + * @param {String} requestingName - name of requesting modifier + * @param {String} requestedName - name of requested modifier + * @returns {Boolean} + */ + function isModifierRequired(modifiers, requestingName, requestedName) { + var requesting = find(modifiers, function (_ref) { + var name = _ref.name; + return name === requestingName; + }); + + var isRequired = !!requesting && modifiers.some(function (modifier) { + return modifier.name === requestedName && modifier.enabled && modifier.order < requesting.order; + }); + + if (!isRequired) { + var _requesting = '`' + requestingName + '`'; + var requested = '`' + requestedName + '`'; + console.warn(requested + ' modifier is required by ' + _requesting + ' modifier in order to work, be sure to include it before ' + _requesting + '!'); + } + return isRequired; + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by update method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function arrow(data, options) { + var _data$offsets$arrow; + + // arrow depends on keepTogether in order to work + if (!isModifierRequired(data.instance.modifiers, 'arrow', 'keepTogether')) { + return data; + } + + var arrowElement = options.element; + + // if arrowElement is a string, suppose it's a CSS selector + if (typeof arrowElement === 'string') { + arrowElement = data.instance.popper.querySelector(arrowElement); + + // if arrowElement is not found, don't run the modifier + if (!arrowElement) { + return data; + } + } else { + // if the arrowElement isn't a query selector we must check that the + // provided DOM node is child of its popper node + if (!data.instance.popper.contains(arrowElement)) { + console.warn('WARNING: `arrow.element` must be child of its popper element!'); + return data; + } + } + + var placement = data.placement.split('-')[0]; + var _data$offsets = data.offsets, + popper = _data$offsets.popper, + reference = _data$offsets.reference; + + var isVertical = ['left', 'right'].indexOf(placement) !== -1; + + var len = isVertical ? 'height' : 'width'; + var sideCapitalized = isVertical ? 'Top' : 'Left'; + var side = sideCapitalized.toLowerCase(); + var altSide = isVertical ? 'left' : 'top'; + var opSide = isVertical ? 'bottom' : 'right'; + var arrowElementSize = getOuterSizes(arrowElement)[len]; + + // + // extends keepTogether behavior making sure the popper and its + // reference have enough pixels in conjuction + // + + // top/left side + if (reference[opSide] - arrowElementSize < popper[side]) { + data.offsets.popper[side] -= popper[side] - (reference[opSide] - arrowElementSize); + } + // bottom/right side + if (reference[side] + arrowElementSize > popper[opSide]) { + data.offsets.popper[side] += reference[side] + arrowElementSize - popper[opSide]; + } + data.offsets.popper = getClientRect(data.offsets.popper); + + // compute center of the popper + var center = reference[side] + reference[len] / 2 - arrowElementSize / 2; + + // Compute the sideValue using the updated popper offsets + // take popper margin in account because we don't have this info available + var css = getStyleComputedProperty(data.instance.popper); + var popperMarginSide = parseFloat(css['margin' + sideCapitalized], 10); + var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width'], 10); + var sideValue = center - data.offsets.popper[side] - popperMarginSide - popperBorderSide; + + // prevent arrowElement from being placed not contiguously to its popper + sideValue = Math.max(Math.min(popper[len] - arrowElementSize, sideValue), 0); + + data.arrowElement = arrowElement; + data.offsets.arrow = (_data$offsets$arrow = {}, defineProperty(_data$offsets$arrow, side, Math.round(sideValue)), defineProperty(_data$offsets$arrow, altSide, ''), _data$offsets$arrow); + + return data; + } + + /** + * Get the opposite placement variation of the given one + * @method + * @memberof Popper.Utils + * @argument {String} placement variation + * @returns {String} flipped placement variation + */ + function getOppositeVariation(variation) { + if (variation === 'end') { + return 'start'; + } else if (variation === 'start') { + return 'end'; + } + return variation; + } + + /** + * List of accepted placements to use as values of the `placement` option.
    + * Valid placements are: + * - `auto` + * - `top` + * - `right` + * - `bottom` + * - `left` + * + * Each placement can have a variation from this list: + * - `-start` + * - `-end` + * + * Variations are interpreted easily if you think of them as the left to right + * written languages. Horizontally (`top` and `bottom`), `start` is left and `end` + * is right.
    + * Vertically (`left` and `right`), `start` is top and `end` is bottom. + * + * Some valid examples are: + * - `top-end` (on top of reference, right aligned) + * - `right-start` (on right of reference, top aligned) + * - `bottom` (on bottom, centered) + * - `auto-right` (on the side with more space available, alignment depends by placement) + * + * @static + * @type {Array} + * @enum {String} + * @readonly + * @method placements + * @memberof Popper + */ + var placements = ['auto-start', 'auto', 'auto-end', 'top-start', 'top', 'top-end', 'right-start', 'right', 'right-end', 'bottom-end', 'bottom', 'bottom-start', 'left-end', 'left', 'left-start']; + + // Get rid of `auto` `auto-start` and `auto-end` + var validPlacements = placements.slice(3); + + /** + * Given an initial placement, returns all the subsequent placements + * clockwise (or counter-clockwise). + * + * @method + * @memberof Popper.Utils + * @argument {String} placement - A valid placement (it accepts variations) + * @argument {Boolean} counter - Set to true to walk the placements counterclockwise + * @returns {Array} placements including their variations + */ + function clockwise(placement) { + var counter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false; + + var index = validPlacements.indexOf(placement); + var arr = validPlacements.slice(index + 1).concat(validPlacements.slice(0, index)); + return counter ? arr.reverse() : arr; + } + + var BEHAVIORS = { + FLIP: 'flip', + CLOCKWISE: 'clockwise', + COUNTERCLOCKWISE: 'counterclockwise' + }; + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by update method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function flip(data, options) { + // if `inner` modifier is enabled, we can't use the `flip` modifier + if (isModifierEnabled(data.instance.modifiers, 'inner')) { + return data; + } + + if (data.flipped && data.placement === data.originalPlacement) { + // seems like flip is trying to loop, probably there's not enough space on any of the flippable sides + return data; + } + + var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement, data.positionFixed); + + var placement = data.placement.split('-')[0]; + var placementOpposite = getOppositePlacement(placement); + var variation = data.placement.split('-')[1] || ''; + + var flipOrder = []; + + switch (options.behavior) { + case BEHAVIORS.FLIP: + flipOrder = [placement, placementOpposite]; + break; + case BEHAVIORS.CLOCKWISE: + flipOrder = clockwise(placement); + break; + case BEHAVIORS.COUNTERCLOCKWISE: + flipOrder = clockwise(placement, true); + break; + default: + flipOrder = options.behavior; + } + + flipOrder.forEach(function (step, index) { + if (placement !== step || flipOrder.length === index + 1) { + return data; + } + + placement = data.placement.split('-')[0]; + placementOpposite = getOppositePlacement(placement); + + var popperOffsets = data.offsets.popper; + var refOffsets = data.offsets.reference; + + // using floor because the reference offsets may contain decimals we are not going to consider here + var floor = Math.floor; + var overlapsRef = placement === 'left' && floor(popperOffsets.right) > floor(refOffsets.left) || placement === 'right' && floor(popperOffsets.left) < floor(refOffsets.right) || placement === 'top' && floor(popperOffsets.bottom) > floor(refOffsets.top) || placement === 'bottom' && floor(popperOffsets.top) < floor(refOffsets.bottom); + + var overflowsLeft = floor(popperOffsets.left) < floor(boundaries.left); + var overflowsRight = floor(popperOffsets.right) > floor(boundaries.right); + var overflowsTop = floor(popperOffsets.top) < floor(boundaries.top); + var overflowsBottom = floor(popperOffsets.bottom) > floor(boundaries.bottom); + + var overflowsBoundaries = placement === 'left' && overflowsLeft || placement === 'right' && overflowsRight || placement === 'top' && overflowsTop || placement === 'bottom' && overflowsBottom; + + // flip the variation if required + var isVertical = ['top', 'bottom'].indexOf(placement) !== -1; + var flippedVariation = !!options.flipVariations && (isVertical && variation === 'start' && overflowsLeft || isVertical && variation === 'end' && overflowsRight || !isVertical && variation === 'start' && overflowsTop || !isVertical && variation === 'end' && overflowsBottom); + + if (overlapsRef || overflowsBoundaries || flippedVariation) { + // this boolean to detect any flip loop + data.flipped = true; + + if (overlapsRef || overflowsBoundaries) { + placement = flipOrder[index + 1]; + } + + if (flippedVariation) { + variation = getOppositeVariation(variation); + } + + data.placement = placement + (variation ? '-' + variation : ''); + + // this object contains `position`, we want to preserve it along with + // any additional property we may add in the future + data.offsets.popper = _extends({}, data.offsets.popper, getPopperOffsets(data.instance.popper, data.offsets.reference, data.placement)); + + data = runModifiers(data.instance.modifiers, data, 'flip'); + } + }); + return data; + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by update method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function keepTogether(data) { + var _data$offsets = data.offsets, + popper = _data$offsets.popper, + reference = _data$offsets.reference; + + var placement = data.placement.split('-')[0]; + var floor = Math.floor; + var isVertical = ['top', 'bottom'].indexOf(placement) !== -1; + var side = isVertical ? 'right' : 'bottom'; + var opSide = isVertical ? 'left' : 'top'; + var measurement = isVertical ? 'width' : 'height'; + + if (popper[side] < floor(reference[opSide])) { + data.offsets.popper[opSide] = floor(reference[opSide]) - popper[measurement]; + } + if (popper[opSide] > floor(reference[side])) { + data.offsets.popper[opSide] = floor(reference[side]); + } + + return data; + } + + /** + * Converts a string containing value + unit into a px value number + * @function + * @memberof {modifiers~offset} + * @private + * @argument {String} str - Value + unit string + * @argument {String} measurement - `height` or `width` + * @argument {Object} popperOffsets + * @argument {Object} referenceOffsets + * @returns {Number|String} + * Value in pixels, or original string if no values were extracted + */ + function toValue(str, measurement, popperOffsets, referenceOffsets) { + // separate value from unit + var split = str.match(/((?:\-|\+)?\d*\.?\d*)(.*)/); + var value = +split[1]; + var unit = split[2]; + + // If it's not a number it's an operator, I guess + if (!value) { + return str; + } + + if (unit.indexOf('%') === 0) { + var element = void 0; + switch (unit) { + case '%p': + element = popperOffsets; + break; + case '%': + case '%r': + default: + element = referenceOffsets; + } + + var rect = getClientRect(element); + return rect[measurement] / 100 * value; + } else if (unit === 'vh' || unit === 'vw') { + // if is a vh or vw, we calculate the size based on the viewport + var size = void 0; + if (unit === 'vh') { + size = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); + } else { + size = Math.max(document.documentElement.clientWidth, window.innerWidth || 0); + } + return size / 100 * value; + } else { + // if is an explicit pixel unit, we get rid of the unit and keep the value + // if is an implicit unit, it's px, and we return just the value + return value; + } + } + + /** + * Parse an `offset` string to extrapolate `x` and `y` numeric offsets. + * @function + * @memberof {modifiers~offset} + * @private + * @argument {String} offset + * @argument {Object} popperOffsets + * @argument {Object} referenceOffsets + * @argument {String} basePlacement + * @returns {Array} a two cells array with x and y offsets in numbers + */ + function parseOffset(offset, popperOffsets, referenceOffsets, basePlacement) { + var offsets = [0, 0]; + + // Use height if placement is left or right and index is 0 otherwise use width + // in this way the first offset will use an axis and the second one + // will use the other one + var useHeight = ['right', 'left'].indexOf(basePlacement) !== -1; + + // Split the offset string to obtain a list of values and operands + // The regex addresses values with the plus or minus sign in front (+10, -20, etc) + var fragments = offset.split(/(\+|\-)/).map(function (frag) { + return frag.trim(); + }); + + // Detect if the offset string contains a pair of values or a single one + // they could be separated by comma or space + var divider = fragments.indexOf(find(fragments, function (frag) { + return frag.search(/,|\s/) !== -1; + })); + + if (fragments[divider] && fragments[divider].indexOf(',') === -1) { + console.warn('Offsets separated by white space(s) are deprecated, use a comma (,) instead.'); + } + + // If divider is found, we divide the list of values and operands to divide + // them by ofset X and Y. + var splitRegex = /\s*,\s*|\s+/; + var ops = divider !== -1 ? [fragments.slice(0, divider).concat([fragments[divider].split(splitRegex)[0]]), [fragments[divider].split(splitRegex)[1]].concat(fragments.slice(divider + 1))] : [fragments]; + + // Convert the values with units to absolute pixels to allow our computations + ops = ops.map(function (op, index) { + // Most of the units rely on the orientation of the popper + var measurement = (index === 1 ? !useHeight : useHeight) ? 'height' : 'width'; + var mergeWithPrevious = false; + return op + // This aggregates any `+` or `-` sign that aren't considered operators + // e.g.: 10 + +5 => [10, +, +5] + .reduce(function (a, b) { + if (a[a.length - 1] === '' && ['+', '-'].indexOf(b) !== -1) { + a[a.length - 1] = b; + mergeWithPrevious = true; + return a; + } else if (mergeWithPrevious) { + a[a.length - 1] += b; + mergeWithPrevious = false; + return a; + } else { + return a.concat(b); + } + }, []) + // Here we convert the string values into number values (in px) + .map(function (str) { + return toValue(str, measurement, popperOffsets, referenceOffsets); + }); + }); + + // Loop trough the offsets arrays and execute the operations + ops.forEach(function (op, index) { + op.forEach(function (frag, index2) { + if (isNumeric(frag)) { + offsets[index] += frag * (op[index2 - 1] === '-' ? -1 : 1); + } + }); + }); + return offsets; + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by update method + * @argument {Object} options - Modifiers configuration and options + * @argument {Number|String} options.offset=0 + * The offset value as described in the modifier description + * @returns {Object} The data object, properly modified + */ + function offset(data, _ref) { + var offset = _ref.offset; + var placement = data.placement, + _data$offsets = data.offsets, + popper = _data$offsets.popper, + reference = _data$offsets.reference; + + var basePlacement = placement.split('-')[0]; + + var offsets = void 0; + if (isNumeric(+offset)) { + offsets = [+offset, 0]; + } else { + offsets = parseOffset(offset, popper, reference, basePlacement); + } + + if (basePlacement === 'left') { + popper.top += offsets[0]; + popper.left -= offsets[1]; + } else if (basePlacement === 'right') { + popper.top += offsets[0]; + popper.left += offsets[1]; + } else if (basePlacement === 'top') { + popper.left += offsets[0]; + popper.top -= offsets[1]; + } else if (basePlacement === 'bottom') { + popper.left += offsets[0]; + popper.top += offsets[1]; + } + + data.popper = popper; + return data; + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by `update` method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function preventOverflow(data, options) { + var boundariesElement = options.boundariesElement || getOffsetParent(data.instance.popper); + + // If offsetParent is the reference element, we really want to + // go one step up and use the next offsetParent as reference to + // avoid to make this modifier completely useless and look like broken + if (data.instance.reference === boundariesElement) { + boundariesElement = getOffsetParent(boundariesElement); + } + + // NOTE: DOM access here + // resets the popper's position so that the document size can be calculated excluding + // the size of the popper element itself + var transformProp = getSupportedPropertyName('transform'); + var popperStyles = data.instance.popper.style; // assignment to help minification + var top = popperStyles.top, + left = popperStyles.left, + transform = popperStyles[transformProp]; + + popperStyles.top = ''; + popperStyles.left = ''; + popperStyles[transformProp] = ''; + + var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement, data.positionFixed); + + // NOTE: DOM access here + // restores the original style properties after the offsets have been computed + popperStyles.top = top; + popperStyles.left = left; + popperStyles[transformProp] = transform; + + options.boundaries = boundaries; + + var order = options.priority; + var popper = data.offsets.popper; + + var check = { + primary: function primary(placement) { + var value = popper[placement]; + if (popper[placement] < boundaries[placement] && !options.escapeWithReference) { + value = Math.max(popper[placement], boundaries[placement]); + } + return defineProperty({}, placement, value); + }, + secondary: function secondary(placement) { + var mainSide = placement === 'right' ? 'left' : 'top'; + var value = popper[mainSide]; + if (popper[placement] > boundaries[placement] && !options.escapeWithReference) { + value = Math.min(popper[mainSide], boundaries[placement] - (placement === 'right' ? popper.width : popper.height)); + } + return defineProperty({}, mainSide, value); + } + }; + + order.forEach(function (placement) { + var side = ['left', 'top'].indexOf(placement) !== -1 ? 'primary' : 'secondary'; + popper = _extends({}, popper, check[side](placement)); + }); + + data.offsets.popper = popper; + + return data; + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by `update` method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function shift(data) { + var placement = data.placement; + var basePlacement = placement.split('-')[0]; + var shiftvariation = placement.split('-')[1]; + + // if shift shiftvariation is specified, run the modifier + if (shiftvariation) { + var _data$offsets = data.offsets, + reference = _data$offsets.reference, + popper = _data$offsets.popper; + + var isVertical = ['bottom', 'top'].indexOf(basePlacement) !== -1; + var side = isVertical ? 'left' : 'top'; + var measurement = isVertical ? 'width' : 'height'; + + var shiftOffsets = { + start: defineProperty({}, side, reference[side]), + end: defineProperty({}, side, reference[side] + reference[measurement] - popper[measurement]) + }; + + data.offsets.popper = _extends({}, popper, shiftOffsets[shiftvariation]); + } + + return data; + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by update method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function hide(data) { + if (!isModifierRequired(data.instance.modifiers, 'hide', 'preventOverflow')) { + return data; + } + + var refRect = data.offsets.reference; + var bound = find(data.instance.modifiers, function (modifier) { + return modifier.name === 'preventOverflow'; + }).boundaries; + + if (refRect.bottom < bound.top || refRect.left > bound.right || refRect.top > bound.bottom || refRect.right < bound.left) { + // Avoid unnecessary DOM access if visibility hasn't changed + if (data.hide === true) { + return data; + } + + data.hide = true; + data.attributes['x-out-of-boundaries'] = ''; + } else { + // Avoid unnecessary DOM access if visibility hasn't changed + if (data.hide === false) { + return data; + } + + data.hide = false; + data.attributes['x-out-of-boundaries'] = false; + } + + return data; + } + + /** + * @function + * @memberof Modifiers + * @argument {Object} data - The data object generated by `update` method + * @argument {Object} options - Modifiers configuration and options + * @returns {Object} The data object, properly modified + */ + function inner(data) { + var placement = data.placement; + var basePlacement = placement.split('-')[0]; + var _data$offsets = data.offsets, + popper = _data$offsets.popper, + reference = _data$offsets.reference; + + var isHoriz = ['left', 'right'].indexOf(basePlacement) !== -1; + + var subtractLength = ['top', 'left'].indexOf(basePlacement) === -1; + + popper[isHoriz ? 'left' : 'top'] = reference[basePlacement] - (subtractLength ? popper[isHoriz ? 'width' : 'height'] : 0); + + data.placement = getOppositePlacement(placement); + data.offsets.popper = getClientRect(popper); + + return data; + } + + /** + * Modifier function, each modifier can have a function of this type assigned + * to its `fn` property.
    + * These functions will be called on each update, this means that you must + * make sure they are performant enough to avoid performance bottlenecks. + * + * @function ModifierFn + * @argument {dataObject} data - The data object generated by `update` method + * @argument {Object} options - Modifiers configuration and options + * @returns {dataObject} The data object, properly modified + */ + + /** + * Modifiers are plugins used to alter the behavior of your poppers.
    + * Popper.js uses a set of 9 modifiers to provide all the basic functionalities + * needed by the library. + * + * Usually you don't want to override the `order`, `fn` and `onLoad` props. + * All the other properties are configurations that could be tweaked. + * @namespace modifiers + */ + var modifiers = { + /** + * Modifier used to shift the popper on the start or end of its reference + * element.
    + * It will read the variation of the `placement` property.
    + * It can be one either `-end` or `-start`. + * @memberof modifiers + * @inner + */ + shift: { + /** @prop {number} order=100 - Index used to define the order of execution */ + order: 100, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: shift + }, + + /** + * The `offset` modifier can shift your popper on both its axis. + * + * It accepts the following units: + * - `px` or unitless, interpreted as pixels + * - `%` or `%r`, percentage relative to the length of the reference element + * - `%p`, percentage relative to the length of the popper element + * - `vw`, CSS viewport width unit + * - `vh`, CSS viewport height unit + * + * For length is intended the main axis relative to the placement of the popper.
    + * This means that if the placement is `top` or `bottom`, the length will be the + * `width`. In case of `left` or `right`, it will be the height. + * + * You can provide a single value (as `Number` or `String`), or a pair of values + * as `String` divided by a comma or one (or more) white spaces.
    + * The latter is a deprecated method because it leads to confusion and will be + * removed in v2.
    + * Additionally, it accepts additions and subtractions between different units. + * Note that multiplications and divisions aren't supported. + * + * Valid examples are: + * ``` + * 10 + * '10%' + * '10, 10' + * '10%, 10' + * '10 + 10%' + * '10 - 5vh + 3%' + * '-10px + 5vh, 5px - 6%' + * ``` + * > **NB**: If you desire to apply offsets to your poppers in a way that may make them overlap + * > with their reference element, unfortunately, you will have to disable the `flip` modifier. + * > More on this [reading this issue](https://github.com/FezVrasta/popper.js/issues/373) + * + * @memberof modifiers + * @inner + */ + offset: { + /** @prop {number} order=200 - Index used to define the order of execution */ + order: 200, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: offset, + /** @prop {Number|String} offset=0 + * The offset value as described in the modifier description + */ + offset: 0 + }, + + /** + * Modifier used to prevent the popper from being positioned outside the boundary. + * + * An scenario exists where the reference itself is not within the boundaries.
    + * We can say it has "escaped the boundaries" — or just "escaped".
    + * In this case we need to decide whether the popper should either: + * + * - detach from the reference and remain "trapped" in the boundaries, or + * - if it should ignore the boundary and "escape with its reference" + * + * When `escapeWithReference` is set to`true` and reference is completely + * outside its boundaries, the popper will overflow (or completely leave) + * the boundaries in order to remain attached to the edge of the reference. + * + * @memberof modifiers + * @inner + */ + preventOverflow: { + /** @prop {number} order=300 - Index used to define the order of execution */ + order: 300, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: preventOverflow, + /** + * @prop {Array} [priority=['left','right','top','bottom']] + * Popper will try to prevent overflow following these priorities by default, + * then, it could overflow on the left and on top of the `boundariesElement` + */ + priority: ['left', 'right', 'top', 'bottom'], + /** + * @prop {number} padding=5 + * Amount of pixel used to define a minimum distance between the boundaries + * and the popper this makes sure the popper has always a little padding + * between the edges of its container + */ + padding: 5, + /** + * @prop {String|HTMLElement} boundariesElement='scrollParent' + * Boundaries used by the modifier, can be `scrollParent`, `window`, + * `viewport` or any DOM element. + */ + boundariesElement: 'scrollParent' + }, + + /** + * Modifier used to make sure the reference and its popper stay near eachothers + * without leaving any gap between the two. Expecially useful when the arrow is + * enabled and you want to assure it to point to its reference element. + * It cares only about the first axis, you can still have poppers with margin + * between the popper and its reference element. + * @memberof modifiers + * @inner + */ + keepTogether: { + /** @prop {number} order=400 - Index used to define the order of execution */ + order: 400, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: keepTogether + }, + + /** + * This modifier is used to move the `arrowElement` of the popper to make + * sure it is positioned between the reference element and its popper element. + * It will read the outer size of the `arrowElement` node to detect how many + * pixels of conjuction are needed. + * + * It has no effect if no `arrowElement` is provided. + * @memberof modifiers + * @inner + */ + arrow: { + /** @prop {number} order=500 - Index used to define the order of execution */ + order: 500, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: arrow, + /** @prop {String|HTMLElement} element='[x-arrow]' - Selector or node used as arrow */ + element: '[x-arrow]' + }, + + /** + * Modifier used to flip the popper's placement when it starts to overlap its + * reference element. + * + * Requires the `preventOverflow` modifier before it in order to work. + * + * **NOTE:** this modifier will interrupt the current update cycle and will + * restart it if it detects the need to flip the placement. + * @memberof modifiers + * @inner + */ + flip: { + /** @prop {number} order=600 - Index used to define the order of execution */ + order: 600, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: flip, + /** + * @prop {String|Array} behavior='flip' + * The behavior used to change the popper's placement. It can be one of + * `flip`, `clockwise`, `counterclockwise` or an array with a list of valid + * placements (with optional variations). + */ + behavior: 'flip', + /** + * @prop {number} padding=5 + * The popper will flip if it hits the edges of the `boundariesElement` + */ + padding: 5, + /** + * @prop {String|HTMLElement} boundariesElement='viewport' + * The element which will define the boundaries of the popper position, + * the popper will never be placed outside of the defined boundaries + * (except if keepTogether is enabled) + */ + boundariesElement: 'viewport' + }, + + /** + * Modifier used to make the popper flow toward the inner of the reference element. + * By default, when this modifier is disabled, the popper will be placed outside + * the reference element. + * @memberof modifiers + * @inner + */ + inner: { + /** @prop {number} order=700 - Index used to define the order of execution */ + order: 700, + /** @prop {Boolean} enabled=false - Whether the modifier is enabled or not */ + enabled: false, + /** @prop {ModifierFn} */ + fn: inner + }, + + /** + * Modifier used to hide the popper when its reference element is outside of the + * popper boundaries. It will set a `x-out-of-boundaries` attribute which can + * be used to hide with a CSS selector the popper when its reference is + * out of boundaries. + * + * Requires the `preventOverflow` modifier before it in order to work. + * @memberof modifiers + * @inner + */ + hide: { + /** @prop {number} order=800 - Index used to define the order of execution */ + order: 800, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: hide + }, + + /** + * Computes the style that will be applied to the popper element to gets + * properly positioned. + * + * Note that this modifier will not touch the DOM, it just prepares the styles + * so that `applyStyle` modifier can apply it. This separation is useful + * in case you need to replace `applyStyle` with a custom implementation. + * + * This modifier has `850` as `order` value to maintain backward compatibility + * with previous versions of Popper.js. Expect the modifiers ordering method + * to change in future major versions of the library. + * + * @memberof modifiers + * @inner + */ + computeStyle: { + /** @prop {number} order=850 - Index used to define the order of execution */ + order: 850, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: computeStyle, + /** + * @prop {Boolean} gpuAcceleration=true + * If true, it uses the CSS 3d transformation to position the popper. + * Otherwise, it will use the `top` and `left` properties. + */ + gpuAcceleration: true, + /** + * @prop {string} [x='bottom'] + * Where to anchor the X axis (`bottom` or `top`). AKA X offset origin. + * Change this if your popper should grow in a direction different from `bottom` + */ + x: 'bottom', + /** + * @prop {string} [x='left'] + * Where to anchor the Y axis (`left` or `right`). AKA Y offset origin. + * Change this if your popper should grow in a direction different from `right` + */ + y: 'right' + }, + + /** + * Applies the computed styles to the popper element. + * + * All the DOM manipulations are limited to this modifier. This is useful in case + * you want to integrate Popper.js inside a framework or view library and you + * want to delegate all the DOM manipulations to it. + * + * Note that if you disable this modifier, you must make sure the popper element + * has its position set to `absolute` before Popper.js can do its work! + * + * Just disable this modifier and define you own to achieve the desired effect. + * + * @memberof modifiers + * @inner + */ + applyStyle: { + /** @prop {number} order=900 - Index used to define the order of execution */ + order: 900, + /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */ + enabled: true, + /** @prop {ModifierFn} */ + fn: applyStyle, + /** @prop {Function} */ + onLoad: applyStyleOnLoad, + /** + * @deprecated since version 1.10.0, the property moved to `computeStyle` modifier + * @prop {Boolean} gpuAcceleration=true + * If true, it uses the CSS 3d transformation to position the popper. + * Otherwise, it will use the `top` and `left` properties. + */ + gpuAcceleration: undefined + } + }; + + /** + * The `dataObject` is an object containing all the informations used by Popper.js + * this object get passed to modifiers and to the `onCreate` and `onUpdate` callbacks. + * @name dataObject + * @property {Object} data.instance The Popper.js instance + * @property {String} data.placement Placement applied to popper + * @property {String} data.originalPlacement Placement originally defined on init + * @property {Boolean} data.flipped True if popper has been flipped by flip modifier + * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper. + * @property {HTMLElement} data.arrowElement Node used as arrow by arrow modifier + * @property {Object} data.styles Any CSS property defined here will be applied to the popper, it expects the JavaScript nomenclature (eg. `marginBottom`) + * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow, it expects the JavaScript nomenclature (eg. `marginBottom`) + * @property {Object} data.boundaries Offsets of the popper boundaries + * @property {Object} data.offsets The measurements of popper, reference and arrow elements. + * @property {Object} data.offsets.popper `top`, `left`, `width`, `height` values + * @property {Object} data.offsets.reference `top`, `left`, `width`, `height` values + * @property {Object} data.offsets.arrow] `top` and `left` offsets, only one of them will be different from 0 + */ + + /** + * Default options provided to Popper.js constructor.
    + * These can be overriden using the `options` argument of Popper.js.
    + * To override an option, simply pass as 3rd argument an object with the same + * structure of this object, example: + * ``` + * new Popper(ref, pop, { + * modifiers: { + * preventOverflow: { enabled: false } + * } + * }) + * ``` + * @type {Object} + * @static + * @memberof Popper + */ + var Defaults = { + /** + * Popper's placement + * @prop {Popper.placements} placement='bottom' + */ + placement: 'bottom', + + /** + * Set this to true if you want popper to position it self in 'fixed' mode + * @prop {Boolean} positionFixed=false + */ + positionFixed: false, + + /** + * Whether events (resize, scroll) are initially enabled + * @prop {Boolean} eventsEnabled=true + */ + eventsEnabled: true, + + /** + * Set to true if you want to automatically remove the popper when + * you call the `destroy` method. + * @prop {Boolean} removeOnDestroy=false + */ + removeOnDestroy: false, + + /** + * Callback called when the popper is created.
    + * By default, is set to no-op.
    + * Access Popper.js instance with `data.instance`. + * @prop {onCreate} + */ + onCreate: function onCreate() {}, + + /** + * Callback called when the popper is updated, this callback is not called + * on the initialization/creation of the popper, but only on subsequent + * updates.
    + * By default, is set to no-op.
    + * Access Popper.js instance with `data.instance`. + * @prop {onUpdate} + */ + onUpdate: function onUpdate() {}, + + /** + * List of modifiers used to modify the offsets before they are applied to the popper. + * They provide most of the functionalities of Popper.js + * @prop {modifiers} + */ + modifiers: modifiers + }; + + /** + * @callback onCreate + * @param {dataObject} data + */ + + /** + * @callback onUpdate + * @param {dataObject} data + */ + + // Utils + // Methods + var Popper = function () { + /** + * Create a new Popper.js instance + * @class Popper + * @param {HTMLElement|referenceObject} reference - The reference element used to position the popper + * @param {HTMLElement} popper - The HTML element used as popper. + * @param {Object} options - Your custom options to override the ones defined in [Defaults](#defaults) + * @return {Object} instance - The generated Popper.js instance + */ + function Popper(reference, popper) { + var _this = this; + + var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}; + classCallCheck(this, Popper); + + this.scheduleUpdate = function () { + return requestAnimationFrame(_this.update); + }; + + // make update() debounced, so that it only runs at most once-per-tick + this.update = debounce(this.update.bind(this)); + + // with {} we create a new object with the options inside it + this.options = _extends({}, Popper.Defaults, options); + + // init state + this.state = { + isDestroyed: false, + isCreated: false, + scrollParents: [] + }; + + // get reference and popper elements (allow jQuery wrappers) + this.reference = reference && reference.jquery ? reference[0] : reference; + this.popper = popper && popper.jquery ? popper[0] : popper; + + // Deep merge modifiers options + this.options.modifiers = {}; + Object.keys(_extends({}, Popper.Defaults.modifiers, options.modifiers)).forEach(function (name) { + _this.options.modifiers[name] = _extends({}, Popper.Defaults.modifiers[name] || {}, options.modifiers ? options.modifiers[name] : {}); + }); + + // Refactoring modifiers' list (Object => Array) + this.modifiers = Object.keys(this.options.modifiers).map(function (name) { + return _extends({ + name: name + }, _this.options.modifiers[name]); + }) + // sort the modifiers by order + .sort(function (a, b) { + return a.order - b.order; + }); + + // modifiers have the ability to execute arbitrary code when Popper.js get inited + // such code is executed in the same order of its modifier + // they could add new properties to their options configuration + // BE AWARE: don't add options to `options.modifiers.name` but to `modifierOptions`! + this.modifiers.forEach(function (modifierOptions) { + if (modifierOptions.enabled && isFunction(modifierOptions.onLoad)) { + modifierOptions.onLoad(_this.reference, _this.popper, _this.options, modifierOptions, _this.state); + } + }); + + // fire the first update to position the popper in the right place + this.update(); + + var eventsEnabled = this.options.eventsEnabled; + if (eventsEnabled) { + // setup event listeners, they will take care of update the position in specific situations + this.enableEventListeners(); + } + + this.state.eventsEnabled = eventsEnabled; + } + + // We can't use class properties because they don't get listed in the + // class prototype and break stuff like Sinon stubs + + + createClass(Popper, [{ + key: 'update', + value: function update$$1() { + return update.call(this); + } + }, { + key: 'destroy', + value: function destroy$$1() { + return destroy.call(this); + } + }, { + key: 'enableEventListeners', + value: function enableEventListeners$$1() { + return enableEventListeners.call(this); + } + }, { + key: 'disableEventListeners', + value: function disableEventListeners$$1() { + return disableEventListeners.call(this); + } + + /** + * Schedule an update, it will run on the next UI update available + * @method scheduleUpdate + * @memberof Popper + */ + + + /** + * Collection of utilities useful when writing custom modifiers. + * Starting from version 1.7, this method is available only if you + * include `popper-utils.js` before `popper.js`. + * + * **DEPRECATION**: This way to access PopperUtils is deprecated + * and will be removed in v2! Use the PopperUtils module directly instead. + * Due to the high instability of the methods contained in Utils, we can't + * guarantee them to follow semver. Use them at your own risk! + * @static + * @private + * @type {Object} + * @deprecated since version 1.8 + * @member Utils + * @memberof Popper + */ + + }]); + return Popper; + }(); + + /** + * The `referenceObject` is an object that provides an interface compatible with Popper.js + * and lets you use it as replacement of a real DOM node.
    + * You can use this method to position a popper relatively to a set of coordinates + * in case you don't have a DOM node to use as reference. + * + * ``` + * new Popper(referenceObject, popperNode); + * ``` + * + * NB: This feature isn't supported in Internet Explorer 10 + * @name referenceObject + * @property {Function} data.getBoundingClientRect + * A function that returns a set of coordinates compatible with the native `getBoundingClientRect` method. + * @property {number} data.clientWidth + * An ES6 getter that will return the width of the virtual reference element. + * @property {number} data.clientHeight + * An ES6 getter that will return the height of the virtual reference element. + */ + + + Popper.Utils = (typeof window !== 'undefined' ? window : global).PopperUtils; + Popper.placements = placements; + Popper.Defaults = Defaults; + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): dropdown.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Dropdown = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'dropdown'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.dropdown'; + var EVENT_KEY = "." + DATA_KEY; + var DATA_API_KEY = '.data-api'; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key + + var SPACE_KEYCODE = 32; // KeyboardEvent.which value for space key + + var TAB_KEYCODE = 9; // KeyboardEvent.which value for tab key + + var ARROW_UP_KEYCODE = 38; // KeyboardEvent.which value for up arrow key + + var ARROW_DOWN_KEYCODE = 40; // KeyboardEvent.which value for down arrow key + + var RIGHT_MOUSE_BUTTON_WHICH = 3; // MouseEvent.which value for the right button (assuming a right-handed mouse) + + var REGEXP_KEYDOWN = new RegExp(ARROW_UP_KEYCODE + "|" + ARROW_DOWN_KEYCODE + "|" + ESCAPE_KEYCODE); + var Event = { + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + CLICK: "click" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY, + KEYDOWN_DATA_API: "keydown" + EVENT_KEY + DATA_API_KEY, + KEYUP_DATA_API: "keyup" + EVENT_KEY + DATA_API_KEY + }; + var ClassName = { + DISABLED: 'disabled', + SHOW: 'show', + DROPUP: 'dropup', + DROPRIGHT: 'dropright', + DROPLEFT: 'dropleft', + MENURIGHT: 'dropdown-menu-right', + MENULEFT: 'dropdown-menu-left', + POSITION_STATIC: 'position-static' + }; + var Selector = { + DATA_TOGGLE: '[data-toggle="dropdown"]', + FORM_CHILD: '.dropdown form', + MENU: '.dropdown-menu', + NAVBAR_NAV: '.navbar-nav', + VISIBLE_ITEMS: '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)' + }; + var AttachmentMap = { + TOP: 'top-start', + TOPEND: 'top-end', + BOTTOM: 'bottom-start', + BOTTOMEND: 'bottom-end', + RIGHT: 'right-start', + RIGHTEND: 'right-end', + LEFT: 'left-start', + LEFTEND: 'left-end' + }; + var Default = { + offset: 0, + flip: true, + boundary: 'scrollParent', + reference: 'toggle', + display: 'dynamic' + }; + var DefaultType = { + offset: '(number|string|function)', + flip: 'boolean', + boundary: '(string|element)', + reference: '(string|element)', + display: 'string' + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var Dropdown = + /*#__PURE__*/ + function () { + function Dropdown(element, config) { + this._element = element; + this._popper = null; + this._config = this._getConfig(config); + this._menu = this._getMenuElement(); + this._inNavbar = this._detectNavbar(); + + this._addEventListeners(); + } // Getters + + + var _proto = Dropdown.prototype; + + // Public + _proto.toggle = function toggle() { + if (this._element.disabled || $$$1(this._element).hasClass(ClassName.DISABLED)) { + return; + } + + var parent = Dropdown._getParentFromElement(this._element); + + var isActive = $$$1(this._menu).hasClass(ClassName.SHOW); + + Dropdown._clearMenus(); + + if (isActive) { + return; + } + + var relatedTarget = { + relatedTarget: this._element + }; + var showEvent = $$$1.Event(Event.SHOW, relatedTarget); + $$$1(parent).trigger(showEvent); + + if (showEvent.isDefaultPrevented()) { + return; + } // Disable totally Popper.js for Dropdown in Navbar + + + if (!this._inNavbar) { + /** + * Check for Popper dependency + * Popper - https://popper.js.org + */ + if (typeof Popper === 'undefined') { + throw new TypeError('Bootstrap dropdown require Popper.js (https://popper.js.org)'); + } + + var referenceElement = this._element; + + if (this._config.reference === 'parent') { + referenceElement = parent; + } else if (Util.isElement(this._config.reference)) { + referenceElement = this._config.reference; // Check if it's jQuery element + + if (typeof this._config.reference.jquery !== 'undefined') { + referenceElement = this._config.reference[0]; + } + } // If boundary is not `scrollParent`, then set position to `static` + // to allow the menu to "escape" the scroll parent's boundaries + // https://github.com/twbs/bootstrap/issues/24251 + + + if (this._config.boundary !== 'scrollParent') { + $$$1(parent).addClass(ClassName.POSITION_STATIC); + } + + this._popper = new Popper(referenceElement, this._menu, this._getPopperConfig()); + } // If this is a touch-enabled device we add extra + // empty mouseover listeners to the body's immediate children; + // only needed because of broken event delegation on iOS + // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html + + + if ('ontouchstart' in document.documentElement && $$$1(parent).closest(Selector.NAVBAR_NAV).length === 0) { + $$$1(document.body).children().on('mouseover', null, $$$1.noop); + } + + this._element.focus(); + + this._element.setAttribute('aria-expanded', true); + + $$$1(this._menu).toggleClass(ClassName.SHOW); + $$$1(parent).toggleClass(ClassName.SHOW).trigger($$$1.Event(Event.SHOWN, relatedTarget)); + }; + + _proto.dispose = function dispose() { + $$$1.removeData(this._element, DATA_KEY); + $$$1(this._element).off(EVENT_KEY); + this._element = null; + this._menu = null; + + if (this._popper !== null) { + this._popper.destroy(); + + this._popper = null; + } + }; + + _proto.update = function update() { + this._inNavbar = this._detectNavbar(); + + if (this._popper !== null) { + this._popper.scheduleUpdate(); + } + }; // Private + + + _proto._addEventListeners = function _addEventListeners() { + var _this = this; + + $$$1(this._element).on(Event.CLICK, function (event) { + event.preventDefault(); + event.stopPropagation(); + + _this.toggle(); + }); + }; + + _proto._getConfig = function _getConfig(config) { + config = _objectSpread({}, this.constructor.Default, $$$1(this._element).data(), config); + Util.typeCheckConfig(NAME, config, this.constructor.DefaultType); + return config; + }; + + _proto._getMenuElement = function _getMenuElement() { + if (!this._menu) { + var parent = Dropdown._getParentFromElement(this._element); + + this._menu = $$$1(parent).find(Selector.MENU)[0]; + } + + return this._menu; + }; + + _proto._getPlacement = function _getPlacement() { + var $parentDropdown = $$$1(this._element).parent(); + var placement = AttachmentMap.BOTTOM; // Handle dropup + + if ($parentDropdown.hasClass(ClassName.DROPUP)) { + placement = AttachmentMap.TOP; + + if ($$$1(this._menu).hasClass(ClassName.MENURIGHT)) { + placement = AttachmentMap.TOPEND; + } + } else if ($parentDropdown.hasClass(ClassName.DROPRIGHT)) { + placement = AttachmentMap.RIGHT; + } else if ($parentDropdown.hasClass(ClassName.DROPLEFT)) { + placement = AttachmentMap.LEFT; + } else if ($$$1(this._menu).hasClass(ClassName.MENURIGHT)) { + placement = AttachmentMap.BOTTOMEND; + } + + return placement; + }; + + _proto._detectNavbar = function _detectNavbar() { + return $$$1(this._element).closest('.navbar').length > 0; + }; + + _proto._getPopperConfig = function _getPopperConfig() { + var _this2 = this; + + var offsetConf = {}; + + if (typeof this._config.offset === 'function') { + offsetConf.fn = function (data) { + data.offsets = _objectSpread({}, data.offsets, _this2._config.offset(data.offsets) || {}); + return data; + }; + } else { + offsetConf.offset = this._config.offset; + } + + var popperConfig = { + placement: this._getPlacement(), + modifiers: { + offset: offsetConf, + flip: { + enabled: this._config.flip + }, + preventOverflow: { + boundariesElement: this._config.boundary + } + } // Disable Popper.js if we have a static display + + }; + + if (this._config.display === 'static') { + popperConfig.modifiers.applyStyle = { + enabled: false + }; + } + + return popperConfig; + }; // Static + + + Dropdown._jQueryInterface = function _jQueryInterface(config) { + return this.each(function () { + var data = $$$1(this).data(DATA_KEY); + + var _config = typeof config === 'object' ? config : null; + + if (!data) { + data = new Dropdown(this, _config); + $$$1(this).data(DATA_KEY, data); + } + + if (typeof config === 'string') { + if (typeof data[config] === 'undefined') { + throw new TypeError("No method named \"" + config + "\""); + } + + data[config](); + } + }); + }; + + Dropdown._clearMenus = function _clearMenus(event) { + if (event && (event.which === RIGHT_MOUSE_BUTTON_WHICH || event.type === 'keyup' && event.which !== TAB_KEYCODE)) { + return; + } + + var toggles = $$$1.makeArray($$$1(Selector.DATA_TOGGLE)); + + for (var i = 0; i < toggles.length; i++) { + var parent = Dropdown._getParentFromElement(toggles[i]); + + var context = $$$1(toggles[i]).data(DATA_KEY); + var relatedTarget = { + relatedTarget: toggles[i] + }; + + if (!context) { + continue; + } + + var dropdownMenu = context._menu; + + if (!$$$1(parent).hasClass(ClassName.SHOW)) { + continue; + } + + if (event && (event.type === 'click' && /input|textarea/i.test(event.target.tagName) || event.type === 'keyup' && event.which === TAB_KEYCODE) && $$$1.contains(parent, event.target)) { + continue; + } + + var hideEvent = $$$1.Event(Event.HIDE, relatedTarget); + $$$1(parent).trigger(hideEvent); + + if (hideEvent.isDefaultPrevented()) { + continue; + } // If this is a touch-enabled device we remove the extra + // empty mouseover listeners we added for iOS support + + + if ('ontouchstart' in document.documentElement) { + $$$1(document.body).children().off('mouseover', null, $$$1.noop); + } + + toggles[i].setAttribute('aria-expanded', 'false'); + $$$1(dropdownMenu).removeClass(ClassName.SHOW); + $$$1(parent).removeClass(ClassName.SHOW).trigger($$$1.Event(Event.HIDDEN, relatedTarget)); + } + }; + + Dropdown._getParentFromElement = function _getParentFromElement(element) { + var parent; + var selector = Util.getSelectorFromElement(element); + + if (selector) { + parent = $$$1(selector)[0]; + } + + return parent || element.parentNode; + }; // eslint-disable-next-line complexity + + + Dropdown._dataApiKeydownHandler = function _dataApiKeydownHandler(event) { + // If not input/textarea: + // - And not a key in REGEXP_KEYDOWN => not a dropdown command + // If input/textarea: + // - If space key => not a dropdown command + // - If key is other than escape + // - If key is not up or down => not a dropdown command + // - If trigger inside the menu => not a dropdown command + if (/input|textarea/i.test(event.target.tagName) ? event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE && (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE || $$$1(event.target).closest(Selector.MENU).length) : !REGEXP_KEYDOWN.test(event.which)) { + return; + } + + event.preventDefault(); + event.stopPropagation(); + + if (this.disabled || $$$1(this).hasClass(ClassName.DISABLED)) { + return; + } + + var parent = Dropdown._getParentFromElement(this); + + var isActive = $$$1(parent).hasClass(ClassName.SHOW); + + if (!isActive && (event.which !== ESCAPE_KEYCODE || event.which !== SPACE_KEYCODE) || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) { + if (event.which === ESCAPE_KEYCODE) { + var toggle = $$$1(parent).find(Selector.DATA_TOGGLE)[0]; + $$$1(toggle).trigger('focus'); + } + + $$$1(this).trigger('click'); + return; + } + + var items = $$$1(parent).find(Selector.VISIBLE_ITEMS).get(); + + if (items.length === 0) { + return; + } + + var index = items.indexOf(event.target); + + if (event.which === ARROW_UP_KEYCODE && index > 0) { + // Up + index--; + } + + if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) { + // Down + index++; + } + + if (index < 0) { + index = 0; + } + + items[index].focus(); + }; + + _createClass(Dropdown, null, [{ + key: "VERSION", + get: function get() { + return VERSION; + } + }, { + key: "Default", + get: function get() { + return Default; + } + }, { + key: "DefaultType", + get: function get() { + return DefaultType; + } + }]); + + return Dropdown; + }(); + /** + * ------------------------------------------------------------------------ + * Data Api implementation + * ------------------------------------------------------------------------ + */ + + + $$$1(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API + " " + Event.KEYUP_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { + event.preventDefault(); + event.stopPropagation(); + + Dropdown._jQueryInterface.call($$$1(this), 'toggle'); + }).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { + e.stopPropagation(); + }); + /** + * ------------------------------------------------------------------------ + * jQuery + * ------------------------------------------------------------------------ + */ + + $$$1.fn[NAME] = Dropdown._jQueryInterface; + $$$1.fn[NAME].Constructor = Dropdown; + + $$$1.fn[NAME].noConflict = function () { + $$$1.fn[NAME] = JQUERY_NO_CONFLICT; + return Dropdown._jQueryInterface; + }; + + return Dropdown; + }($, Popper); + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): modal.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Modal = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'modal'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.modal'; + var EVENT_KEY = "." + DATA_KEY; + var DATA_API_KEY = '.data-api'; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key + + var Default = { + backdrop: true, + keyboard: true, + focus: true, + show: true + }; + var DefaultType = { + backdrop: '(boolean|string)', + keyboard: 'boolean', + focus: 'boolean', + show: 'boolean' + }; + var Event = { + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + FOCUSIN: "focusin" + EVENT_KEY, + RESIZE: "resize" + EVENT_KEY, + CLICK_DISMISS: "click.dismiss" + EVENT_KEY, + KEYDOWN_DISMISS: "keydown.dismiss" + EVENT_KEY, + MOUSEUP_DISMISS: "mouseup.dismiss" + EVENT_KEY, + MOUSEDOWN_DISMISS: "mousedown.dismiss" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY + }; + var ClassName = { + SCROLLBAR_MEASURER: 'modal-scrollbar-measure', + BACKDROP: 'modal-backdrop', + OPEN: 'modal-open', + FADE: 'fade', + SHOW: 'show' + }; + var Selector = { + DIALOG: '.modal-dialog', + DATA_TOGGLE: '[data-toggle="modal"]', + DATA_DISMISS: '[data-dismiss="modal"]', + FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top', + STICKY_CONTENT: '.sticky-top', + NAVBAR_TOGGLER: '.navbar-toggler' + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var Modal = + /*#__PURE__*/ + function () { + function Modal(element, config) { + this._config = this._getConfig(config); + this._element = element; + this._dialog = $$$1(element).find(Selector.DIALOG)[0]; + this._backdrop = null; + this._isShown = false; + this._isBodyOverflowing = false; + this._ignoreBackdropClick = false; + this._scrollbarWidth = 0; + } // Getters + + + var _proto = Modal.prototype; + + // Public + _proto.toggle = function toggle(relatedTarget) { + return this._isShown ? this.hide() : this.show(relatedTarget); + }; + + _proto.show = function show(relatedTarget) { + var _this = this; + + if (this._isTransitioning || this._isShown) { + return; + } + + if ($$$1(this._element).hasClass(ClassName.FADE)) { + this._isTransitioning = true; + } + + var showEvent = $$$1.Event(Event.SHOW, { + relatedTarget: relatedTarget + }); + $$$1(this._element).trigger(showEvent); + + if (this._isShown || showEvent.isDefaultPrevented()) { + return; + } + + this._isShown = true; + + this._checkScrollbar(); + + this._setScrollbar(); + + this._adjustDialog(); + + $$$1(document.body).addClass(ClassName.OPEN); + + this._setEscapeEvent(); + + this._setResizeEvent(); + + $$$1(this._element).on(Event.CLICK_DISMISS, Selector.DATA_DISMISS, function (event) { + return _this.hide(event); + }); + $$$1(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () { + $$$1(_this._element).one(Event.MOUSEUP_DISMISS, function (event) { + if ($$$1(event.target).is(_this._element)) { + _this._ignoreBackdropClick = true; + } + }); + }); + + this._showBackdrop(function () { + return _this._showElement(relatedTarget); + }); + }; + + _proto.hide = function hide(event) { + var _this2 = this; + + if (event) { + event.preventDefault(); + } + + if (this._isTransitioning || !this._isShown) { + return; + } + + var hideEvent = $$$1.Event(Event.HIDE); + $$$1(this._element).trigger(hideEvent); + + if (!this._isShown || hideEvent.isDefaultPrevented()) { + return; + } + + this._isShown = false; + var transition = $$$1(this._element).hasClass(ClassName.FADE); + + if (transition) { + this._isTransitioning = true; + } + + this._setEscapeEvent(); + + this._setResizeEvent(); + + $$$1(document).off(Event.FOCUSIN); + $$$1(this._element).removeClass(ClassName.SHOW); + $$$1(this._element).off(Event.CLICK_DISMISS); + $$$1(this._dialog).off(Event.MOUSEDOWN_DISMISS); + + if (transition) { + var transitionDuration = Util.getTransitionDurationFromElement(this._element); + $$$1(this._element).one(Util.TRANSITION_END, function (event) { + return _this2._hideModal(event); + }).emulateTransitionEnd(transitionDuration); + } else { + this._hideModal(); + } + }; + + _proto.dispose = function dispose() { + $$$1.removeData(this._element, DATA_KEY); + $$$1(window, document, this._element, this._backdrop).off(EVENT_KEY); + this._config = null; + this._element = null; + this._dialog = null; + this._backdrop = null; + this._isShown = null; + this._isBodyOverflowing = null; + this._ignoreBackdropClick = null; + this._scrollbarWidth = null; + }; + + _proto.handleUpdate = function handleUpdate() { + this._adjustDialog(); + }; // Private + + + _proto._getConfig = function _getConfig(config) { + config = _objectSpread({}, Default, config); + Util.typeCheckConfig(NAME, config, DefaultType); + return config; + }; + + _proto._showElement = function _showElement(relatedTarget) { + var _this3 = this; + + var transition = $$$1(this._element).hasClass(ClassName.FADE); + + if (!this._element.parentNode || this._element.parentNode.nodeType !== Node.ELEMENT_NODE) { + // Don't move modal's DOM position + document.body.appendChild(this._element); + } + + this._element.style.display = 'block'; + + this._element.removeAttribute('aria-hidden'); + + this._element.scrollTop = 0; + + if (transition) { + Util.reflow(this._element); + } + + $$$1(this._element).addClass(ClassName.SHOW); + + if (this._config.focus) { + this._enforceFocus(); + } + + var shownEvent = $$$1.Event(Event.SHOWN, { + relatedTarget: relatedTarget + }); + + var transitionComplete = function transitionComplete() { + if (_this3._config.focus) { + _this3._element.focus(); + } + + _this3._isTransitioning = false; + $$$1(_this3._element).trigger(shownEvent); + }; + + if (transition) { + var transitionDuration = Util.getTransitionDurationFromElement(this._element); + $$$1(this._dialog).one(Util.TRANSITION_END, transitionComplete).emulateTransitionEnd(transitionDuration); + } else { + transitionComplete(); + } + }; + + _proto._enforceFocus = function _enforceFocus() { + var _this4 = this; + + $$$1(document).off(Event.FOCUSIN) // Guard against infinite focus loop + .on(Event.FOCUSIN, function (event) { + if (document !== event.target && _this4._element !== event.target && $$$1(_this4._element).has(event.target).length === 0) { + _this4._element.focus(); + } + }); + }; + + _proto._setEscapeEvent = function _setEscapeEvent() { + var _this5 = this; + + if (this._isShown && this._config.keyboard) { + $$$1(this._element).on(Event.KEYDOWN_DISMISS, function (event) { + if (event.which === ESCAPE_KEYCODE) { + event.preventDefault(); + + _this5.hide(); + } + }); + } else if (!this._isShown) { + $$$1(this._element).off(Event.KEYDOWN_DISMISS); + } + }; + + _proto._setResizeEvent = function _setResizeEvent() { + var _this6 = this; + + if (this._isShown) { + $$$1(window).on(Event.RESIZE, function (event) { + return _this6.handleUpdate(event); + }); + } else { + $$$1(window).off(Event.RESIZE); + } + }; + + _proto._hideModal = function _hideModal() { + var _this7 = this; + + this._element.style.display = 'none'; + + this._element.setAttribute('aria-hidden', true); + + this._isTransitioning = false; + + this._showBackdrop(function () { + $$$1(document.body).removeClass(ClassName.OPEN); + + _this7._resetAdjustments(); + + _this7._resetScrollbar(); + + $$$1(_this7._element).trigger(Event.HIDDEN); + }); + }; + + _proto._removeBackdrop = function _removeBackdrop() { + if (this._backdrop) { + $$$1(this._backdrop).remove(); + this._backdrop = null; + } + }; + + _proto._showBackdrop = function _showBackdrop(callback) { + var _this8 = this; + + var animate = $$$1(this._element).hasClass(ClassName.FADE) ? ClassName.FADE : ''; + + if (this._isShown && this._config.backdrop) { + this._backdrop = document.createElement('div'); + this._backdrop.className = ClassName.BACKDROP; + + if (animate) { + $$$1(this._backdrop).addClass(animate); + } + + $$$1(this._backdrop).appendTo(document.body); + $$$1(this._element).on(Event.CLICK_DISMISS, function (event) { + if (_this8._ignoreBackdropClick) { + _this8._ignoreBackdropClick = false; + return; + } + + if (event.target !== event.currentTarget) { + return; + } + + if (_this8._config.backdrop === 'static') { + _this8._element.focus(); + } else { + _this8.hide(); + } + }); + + if (animate) { + Util.reflow(this._backdrop); + } + + $$$1(this._backdrop).addClass(ClassName.SHOW); + + if (!callback) { + return; + } + + if (!animate) { + callback(); + return; + } + + var backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop); + $$$1(this._backdrop).one(Util.TRANSITION_END, callback).emulateTransitionEnd(backdropTransitionDuration); + } else if (!this._isShown && this._backdrop) { + $$$1(this._backdrop).removeClass(ClassName.SHOW); + + var callbackRemove = function callbackRemove() { + _this8._removeBackdrop(); + + if (callback) { + callback(); + } + }; + + if ($$$1(this._element).hasClass(ClassName.FADE)) { + var _backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop); + + $$$1(this._backdrop).one(Util.TRANSITION_END, callbackRemove).emulateTransitionEnd(_backdropTransitionDuration); + } else { + callbackRemove(); + } + } else if (callback) { + callback(); + } + }; // ---------------------------------------------------------------------- + // the following methods are used to handle overflowing modals + // todo (fat): these should probably be refactored out of modal.js + // ---------------------------------------------------------------------- + + + _proto._adjustDialog = function _adjustDialog() { + var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight; + + if (!this._isBodyOverflowing && isModalOverflowing) { + this._element.style.paddingLeft = this._scrollbarWidth + "px"; + } + + if (this._isBodyOverflowing && !isModalOverflowing) { + this._element.style.paddingRight = this._scrollbarWidth + "px"; + } + }; + + _proto._resetAdjustments = function _resetAdjustments() { + this._element.style.paddingLeft = ''; + this._element.style.paddingRight = ''; + }; + + _proto._checkScrollbar = function _checkScrollbar() { + var rect = document.body.getBoundingClientRect(); + this._isBodyOverflowing = rect.left + rect.right < window.innerWidth; + this._scrollbarWidth = this._getScrollbarWidth(); + }; + + _proto._setScrollbar = function _setScrollbar() { + var _this9 = this; + + if (this._isBodyOverflowing) { + // Note: DOMNode.style.paddingRight returns the actual value or '' if not set + // while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set + // Adjust fixed content padding + $$$1(Selector.FIXED_CONTENT).each(function (index, element) { + var actualPadding = $$$1(element)[0].style.paddingRight; + var calculatedPadding = $$$1(element).css('padding-right'); + $$$1(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this9._scrollbarWidth + "px"); + }); // Adjust sticky content margin + + $$$1(Selector.STICKY_CONTENT).each(function (index, element) { + var actualMargin = $$$1(element)[0].style.marginRight; + var calculatedMargin = $$$1(element).css('margin-right'); + $$$1(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this9._scrollbarWidth + "px"); + }); // Adjust navbar-toggler margin + + $$$1(Selector.NAVBAR_TOGGLER).each(function (index, element) { + var actualMargin = $$$1(element)[0].style.marginRight; + var calculatedMargin = $$$1(element).css('margin-right'); + $$$1(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) + _this9._scrollbarWidth + "px"); + }); // Adjust body padding + + var actualPadding = document.body.style.paddingRight; + var calculatedPadding = $$$1(document.body).css('padding-right'); + $$$1(document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px"); + } + }; + + _proto._resetScrollbar = function _resetScrollbar() { + // Restore fixed content padding + $$$1(Selector.FIXED_CONTENT).each(function (index, element) { + var padding = $$$1(element).data('padding-right'); + + if (typeof padding !== 'undefined') { + $$$1(element).css('padding-right', padding).removeData('padding-right'); + } + }); // Restore sticky content and navbar-toggler margin + + $$$1(Selector.STICKY_CONTENT + ", " + Selector.NAVBAR_TOGGLER).each(function (index, element) { + var margin = $$$1(element).data('margin-right'); + + if (typeof margin !== 'undefined') { + $$$1(element).css('margin-right', margin).removeData('margin-right'); + } + }); // Restore body padding + + var padding = $$$1(document.body).data('padding-right'); + + if (typeof padding !== 'undefined') { + $$$1(document.body).css('padding-right', padding).removeData('padding-right'); + } + }; + + _proto._getScrollbarWidth = function _getScrollbarWidth() { + // thx d.walsh + var scrollDiv = document.createElement('div'); + scrollDiv.className = ClassName.SCROLLBAR_MEASURER; + document.body.appendChild(scrollDiv); + var scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth; + document.body.removeChild(scrollDiv); + return scrollbarWidth; + }; // Static + + + Modal._jQueryInterface = function _jQueryInterface(config, relatedTarget) { + return this.each(function () { + var data = $$$1(this).data(DATA_KEY); + + var _config = _objectSpread({}, Default, $$$1(this).data(), typeof config === 'object' && config ? config : {}); + + if (!data) { + data = new Modal(this, _config); + $$$1(this).data(DATA_KEY, data); + } + + if (typeof config === 'string') { + if (typeof data[config] === 'undefined') { + throw new TypeError("No method named \"" + config + "\""); + } + + data[config](relatedTarget); + } else if (_config.show) { + data.show(relatedTarget); + } + }); + }; + + _createClass(Modal, null, [{ + key: "VERSION", + get: function get() { + return VERSION; + } + }, { + key: "Default", + get: function get() { + return Default; + } + }]); + + return Modal; + }(); + /** + * ------------------------------------------------------------------------ + * Data Api implementation + * ------------------------------------------------------------------------ + */ + + + $$$1(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { + var _this10 = this; + + var target; + var selector = Util.getSelectorFromElement(this); + + if (selector) { + target = $$$1(selector)[0]; + } + + var config = $$$1(target).data(DATA_KEY) ? 'toggle' : _objectSpread({}, $$$1(target).data(), $$$1(this).data()); + + if (this.tagName === 'A' || this.tagName === 'AREA') { + event.preventDefault(); + } + + var $target = $$$1(target).one(Event.SHOW, function (showEvent) { + if (showEvent.isDefaultPrevented()) { + // Only register focus restorer if modal will actually get shown + return; + } + + $target.one(Event.HIDDEN, function () { + if ($$$1(_this10).is(':visible')) { + _this10.focus(); + } + }); + }); + + Modal._jQueryInterface.call($$$1(target), config, this); + }); + /** + * ------------------------------------------------------------------------ + * jQuery + * ------------------------------------------------------------------------ + */ + + $$$1.fn[NAME] = Modal._jQueryInterface; + $$$1.fn[NAME].Constructor = Modal; + + $$$1.fn[NAME].noConflict = function () { + $$$1.fn[NAME] = JQUERY_NO_CONFLICT; + return Modal._jQueryInterface; + }; + + return Modal; + }($); + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): tooltip.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Tooltip = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'tooltip'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.tooltip'; + var EVENT_KEY = "." + DATA_KEY; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var CLASS_PREFIX = 'bs-tooltip'; + var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g'); + var DefaultType = { + animation: 'boolean', + template: 'string', + title: '(string|element|function)', + trigger: 'string', + delay: '(number|object)', + html: 'boolean', + selector: '(string|boolean)', + placement: '(string|function)', + offset: '(number|string)', + container: '(string|element|boolean)', + fallbackPlacement: '(string|array)', + boundary: '(string|element)' + }; + var AttachmentMap = { + AUTO: 'auto', + TOP: 'top', + RIGHT: 'right', + BOTTOM: 'bottom', + LEFT: 'left' + }; + var Default = { + animation: true, + template: '', + trigger: 'hover focus', + title: '', + delay: 0, + html: false, + selector: false, + placement: 'top', + offset: 0, + container: false, + fallbackPlacement: 'flip', + boundary: 'scrollParent' + }; + var HoverState = { + SHOW: 'show', + OUT: 'out' + }; + var Event = { + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + INSERTED: "inserted" + EVENT_KEY, + CLICK: "click" + EVENT_KEY, + FOCUSIN: "focusin" + EVENT_KEY, + FOCUSOUT: "focusout" + EVENT_KEY, + MOUSEENTER: "mouseenter" + EVENT_KEY, + MOUSELEAVE: "mouseleave" + EVENT_KEY + }; + var ClassName = { + FADE: 'fade', + SHOW: 'show' + }; + var Selector = { + TOOLTIP: '.tooltip', + TOOLTIP_INNER: '.tooltip-inner', + ARROW: '.arrow' + }; + var Trigger = { + HOVER: 'hover', + FOCUS: 'focus', + CLICK: 'click', + MANUAL: 'manual' + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var Tooltip = + /*#__PURE__*/ + function () { + function Tooltip(element, config) { + /** + * Check for Popper dependency + * Popper - https://popper.js.org + */ + if (typeof Popper === 'undefined') { + throw new TypeError('Bootstrap tooltips require Popper.js (https://popper.js.org)'); + } // private + + + this._isEnabled = true; + this._timeout = 0; + this._hoverState = ''; + this._activeTrigger = {}; + this._popper = null; // Protected + + this.element = element; + this.config = this._getConfig(config); + this.tip = null; + + this._setListeners(); + } // Getters + + + var _proto = Tooltip.prototype; + + // Public + _proto.enable = function enable() { + this._isEnabled = true; + }; + + _proto.disable = function disable() { + this._isEnabled = false; + }; + + _proto.toggleEnabled = function toggleEnabled() { + this._isEnabled = !this._isEnabled; + }; + + _proto.toggle = function toggle(event) { + if (!this._isEnabled) { + return; + } + + if (event) { + var dataKey = this.constructor.DATA_KEY; + var context = $$$1(event.currentTarget).data(dataKey); + + if (!context) { + context = new this.constructor(event.currentTarget, this._getDelegateConfig()); + $$$1(event.currentTarget).data(dataKey, context); + } + + context._activeTrigger.click = !context._activeTrigger.click; + + if (context._isWithActiveTrigger()) { + context._enter(null, context); + } else { + context._leave(null, context); + } + } else { + if ($$$1(this.getTipElement()).hasClass(ClassName.SHOW)) { + this._leave(null, this); + + return; + } + + this._enter(null, this); + } + }; + + _proto.dispose = function dispose() { + clearTimeout(this._timeout); + $$$1.removeData(this.element, this.constructor.DATA_KEY); + $$$1(this.element).off(this.constructor.EVENT_KEY); + $$$1(this.element).closest('.modal').off('hide.bs.modal'); + + if (this.tip) { + $$$1(this.tip).remove(); + } + + this._isEnabled = null; + this._timeout = null; + this._hoverState = null; + this._activeTrigger = null; + + if (this._popper !== null) { + this._popper.destroy(); + } + + this._popper = null; + this.element = null; + this.config = null; + this.tip = null; + }; + + _proto.show = function show() { + var _this = this; + + if ($$$1(this.element).css('display') === 'none') { + throw new Error('Please use show on visible elements'); + } + + var showEvent = $$$1.Event(this.constructor.Event.SHOW); + + if (this.isWithContent() && this._isEnabled) { + $$$1(this.element).trigger(showEvent); + var isInTheDom = $$$1.contains(this.element.ownerDocument.documentElement, this.element); + + if (showEvent.isDefaultPrevented() || !isInTheDom) { + return; + } + + var tip = this.getTipElement(); + var tipId = Util.getUID(this.constructor.NAME); + tip.setAttribute('id', tipId); + this.element.setAttribute('aria-describedby', tipId); + this.setContent(); + + if (this.config.animation) { + $$$1(tip).addClass(ClassName.FADE); + } + + var placement = typeof this.config.placement === 'function' ? this.config.placement.call(this, tip, this.element) : this.config.placement; + + var attachment = this._getAttachment(placement); + + this.addAttachmentClass(attachment); + var container = this.config.container === false ? document.body : $$$1(this.config.container); + $$$1(tip).data(this.constructor.DATA_KEY, this); + + if (!$$$1.contains(this.element.ownerDocument.documentElement, this.tip)) { + $$$1(tip).appendTo(container); + } + + $$$1(this.element).trigger(this.constructor.Event.INSERTED); + this._popper = new Popper(this.element, tip, { + placement: attachment, + modifiers: { + offset: { + offset: this.config.offset + }, + flip: { + behavior: this.config.fallbackPlacement + }, + arrow: { + element: Selector.ARROW + }, + preventOverflow: { + boundariesElement: this.config.boundary + } + }, + onCreate: function onCreate(data) { + if (data.originalPlacement !== data.placement) { + _this._handlePopperPlacementChange(data); + } + }, + onUpdate: function onUpdate(data) { + _this._handlePopperPlacementChange(data); + } + }); + $$$1(tip).addClass(ClassName.SHOW); // If this is a touch-enabled device we add extra + // empty mouseover listeners to the body's immediate children; + // only needed because of broken event delegation on iOS + // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html + + if ('ontouchstart' in document.documentElement) { + $$$1(document.body).children().on('mouseover', null, $$$1.noop); + } + + var complete = function complete() { + if (_this.config.animation) { + _this._fixTransition(); + } + + var prevHoverState = _this._hoverState; + _this._hoverState = null; + $$$1(_this.element).trigger(_this.constructor.Event.SHOWN); + + if (prevHoverState === HoverState.OUT) { + _this._leave(null, _this); + } + }; + + if ($$$1(this.tip).hasClass(ClassName.FADE)) { + var transitionDuration = Util.getTransitionDurationFromElement(this.tip); + $$$1(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration); + } else { + complete(); + } + } + }; + + _proto.hide = function hide(callback) { + var _this2 = this; + + var tip = this.getTipElement(); + var hideEvent = $$$1.Event(this.constructor.Event.HIDE); + + var complete = function complete() { + if (_this2._hoverState !== HoverState.SHOW && tip.parentNode) { + tip.parentNode.removeChild(tip); + } + + _this2._cleanTipClass(); + + _this2.element.removeAttribute('aria-describedby'); + + $$$1(_this2.element).trigger(_this2.constructor.Event.HIDDEN); + + if (_this2._popper !== null) { + _this2._popper.destroy(); + } + + if (callback) { + callback(); + } + }; + + $$$1(this.element).trigger(hideEvent); + + if (hideEvent.isDefaultPrevented()) { + return; + } + + $$$1(tip).removeClass(ClassName.SHOW); // If this is a touch-enabled device we remove the extra + // empty mouseover listeners we added for iOS support + + if ('ontouchstart' in document.documentElement) { + $$$1(document.body).children().off('mouseover', null, $$$1.noop); + } + + this._activeTrigger[Trigger.CLICK] = false; + this._activeTrigger[Trigger.FOCUS] = false; + this._activeTrigger[Trigger.HOVER] = false; + + if ($$$1(this.tip).hasClass(ClassName.FADE)) { + var transitionDuration = Util.getTransitionDurationFromElement(tip); + $$$1(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(transitionDuration); + } else { + complete(); + } + + this._hoverState = ''; + }; + + _proto.update = function update() { + if (this._popper !== null) { + this._popper.scheduleUpdate(); + } + }; // Protected + + + _proto.isWithContent = function isWithContent() { + return Boolean(this.getTitle()); + }; + + _proto.addAttachmentClass = function addAttachmentClass(attachment) { + $$$1(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment); + }; + + _proto.getTipElement = function getTipElement() { + this.tip = this.tip || $$$1(this.config.template)[0]; + return this.tip; + }; + + _proto.setContent = function setContent() { + var $tip = $$$1(this.getTipElement()); + this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()); + $tip.removeClass(ClassName.FADE + " " + ClassName.SHOW); + }; + + _proto.setElementContent = function setElementContent($element, content) { + var html = this.config.html; + + if (typeof content === 'object' && (content.nodeType || content.jquery)) { + // Content is a DOM node or a jQuery + if (html) { + if (!$$$1(content).parent().is($element)) { + $element.empty().append(content); + } + } else { + $element.text($$$1(content).text()); + } + } else { + $element[html ? 'html' : 'text'](content); + } + }; + + _proto.getTitle = function getTitle() { + var title = this.element.getAttribute('data-original-title'); + + if (!title) { + title = typeof this.config.title === 'function' ? this.config.title.call(this.element) : this.config.title; + } + + return title; + }; // Private + + + _proto._getAttachment = function _getAttachment(placement) { + return AttachmentMap[placement.toUpperCase()]; + }; + + _proto._setListeners = function _setListeners() { + var _this3 = this; + + var triggers = this.config.trigger.split(' '); + triggers.forEach(function (trigger) { + if (trigger === 'click') { + $$$1(_this3.element).on(_this3.constructor.Event.CLICK, _this3.config.selector, function (event) { + return _this3.toggle(event); + }); + } else if (trigger !== Trigger.MANUAL) { + var eventIn = trigger === Trigger.HOVER ? _this3.constructor.Event.MOUSEENTER : _this3.constructor.Event.FOCUSIN; + var eventOut = trigger === Trigger.HOVER ? _this3.constructor.Event.MOUSELEAVE : _this3.constructor.Event.FOCUSOUT; + $$$1(_this3.element).on(eventIn, _this3.config.selector, function (event) { + return _this3._enter(event); + }).on(eventOut, _this3.config.selector, function (event) { + return _this3._leave(event); + }); + } + + $$$1(_this3.element).closest('.modal').on('hide.bs.modal', function () { + return _this3.hide(); + }); + }); + + if (this.config.selector) { + this.config = _objectSpread({}, this.config, { + trigger: 'manual', + selector: '' + }); + } else { + this._fixTitle(); + } + }; + + _proto._fixTitle = function _fixTitle() { + var titleType = typeof this.element.getAttribute('data-original-title'); + + if (this.element.getAttribute('title') || titleType !== 'string') { + this.element.setAttribute('data-original-title', this.element.getAttribute('title') || ''); + this.element.setAttribute('title', ''); + } + }; + + _proto._enter = function _enter(event, context) { + var dataKey = this.constructor.DATA_KEY; + context = context || $$$1(event.currentTarget).data(dataKey); + + if (!context) { + context = new this.constructor(event.currentTarget, this._getDelegateConfig()); + $$$1(event.currentTarget).data(dataKey, context); + } + + if (event) { + context._activeTrigger[event.type === 'focusin' ? Trigger.FOCUS : Trigger.HOVER] = true; + } + + if ($$$1(context.getTipElement()).hasClass(ClassName.SHOW) || context._hoverState === HoverState.SHOW) { + context._hoverState = HoverState.SHOW; + return; + } + + clearTimeout(context._timeout); + context._hoverState = HoverState.SHOW; + + if (!context.config.delay || !context.config.delay.show) { + context.show(); + return; + } + + context._timeout = setTimeout(function () { + if (context._hoverState === HoverState.SHOW) { + context.show(); + } + }, context.config.delay.show); + }; + + _proto._leave = function _leave(event, context) { + var dataKey = this.constructor.DATA_KEY; + context = context || $$$1(event.currentTarget).data(dataKey); + + if (!context) { + context = new this.constructor(event.currentTarget, this._getDelegateConfig()); + $$$1(event.currentTarget).data(dataKey, context); + } + + if (event) { + context._activeTrigger[event.type === 'focusout' ? Trigger.FOCUS : Trigger.HOVER] = false; + } + + if (context._isWithActiveTrigger()) { + return; + } + + clearTimeout(context._timeout); + context._hoverState = HoverState.OUT; + + if (!context.config.delay || !context.config.delay.hide) { + context.hide(); + return; + } + + context._timeout = setTimeout(function () { + if (context._hoverState === HoverState.OUT) { + context.hide(); + } + }, context.config.delay.hide); + }; + + _proto._isWithActiveTrigger = function _isWithActiveTrigger() { + for (var trigger in this._activeTrigger) { + if (this._activeTrigger[trigger]) { + return true; + } + } + + return false; + }; + + _proto._getConfig = function _getConfig(config) { + config = _objectSpread({}, this.constructor.Default, $$$1(this.element).data(), typeof config === 'object' && config ? config : {}); + + if (typeof config.delay === 'number') { + config.delay = { + show: config.delay, + hide: config.delay + }; + } + + if (typeof config.title === 'number') { + config.title = config.title.toString(); + } + + if (typeof config.content === 'number') { + config.content = config.content.toString(); + } + + Util.typeCheckConfig(NAME, config, this.constructor.DefaultType); + return config; + }; + + _proto._getDelegateConfig = function _getDelegateConfig() { + var config = {}; + + if (this.config) { + for (var key in this.config) { + if (this.constructor.Default[key] !== this.config[key]) { + config[key] = this.config[key]; + } + } + } + + return config; + }; + + _proto._cleanTipClass = function _cleanTipClass() { + var $tip = $$$1(this.getTipElement()); + var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX); + + if (tabClass !== null && tabClass.length > 0) { + $tip.removeClass(tabClass.join('')); + } + }; + + _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(data) { + this._cleanTipClass(); + + this.addAttachmentClass(this._getAttachment(data.placement)); + }; + + _proto._fixTransition = function _fixTransition() { + var tip = this.getTipElement(); + var initConfigAnimation = this.config.animation; + + if (tip.getAttribute('x-placement') !== null) { + return; + } + + $$$1(tip).removeClass(ClassName.FADE); + this.config.animation = false; + this.hide(); + this.show(); + this.config.animation = initConfigAnimation; + }; // Static + + + Tooltip._jQueryInterface = function _jQueryInterface(config) { + return this.each(function () { + var data = $$$1(this).data(DATA_KEY); + + var _config = typeof config === 'object' && config; + + if (!data && /dispose|hide/.test(config)) { + return; + } + + if (!data) { + data = new Tooltip(this, _config); + $$$1(this).data(DATA_KEY, data); + } + + if (typeof config === 'string') { + if (typeof data[config] === 'undefined') { + throw new TypeError("No method named \"" + config + "\""); + } + + data[config](); + } + }); + }; + + _createClass(Tooltip, null, [{ + key: "VERSION", + get: function get() { + return VERSION; + } + }, { + key: "Default", + get: function get() { + return Default; + } + }, { + key: "NAME", + get: function get() { + return NAME; + } + }, { + key: "DATA_KEY", + get: function get() { + return DATA_KEY; + } + }, { + key: "Event", + get: function get() { + return Event; + } + }, { + key: "EVENT_KEY", + get: function get() { + return EVENT_KEY; + } + }, { + key: "DefaultType", + get: function get() { + return DefaultType; + } + }]); + + return Tooltip; + }(); + /** + * ------------------------------------------------------------------------ + * jQuery + * ------------------------------------------------------------------------ + */ + + + $$$1.fn[NAME] = Tooltip._jQueryInterface; + $$$1.fn[NAME].Constructor = Tooltip; + + $$$1.fn[NAME].noConflict = function () { + $$$1.fn[NAME] = JQUERY_NO_CONFLICT; + return Tooltip._jQueryInterface; + }; + + return Tooltip; + }($, Popper); + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): popover.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var Popover = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'popover'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.popover'; + var EVENT_KEY = "." + DATA_KEY; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var CLASS_PREFIX = 'bs-popover'; + var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g'); + + var Default = _objectSpread({}, Tooltip.Default, { + placement: 'right', + trigger: 'click', + content: '', + template: '' + }); + + var DefaultType = _objectSpread({}, Tooltip.DefaultType, { + content: '(string|element|function)' + }); + + var ClassName = { + FADE: 'fade', + SHOW: 'show' + }; + var Selector = { + TITLE: '.popover-header', + CONTENT: '.popover-body' + }; + var Event = { + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + INSERTED: "inserted" + EVENT_KEY, + CLICK: "click" + EVENT_KEY, + FOCUSIN: "focusin" + EVENT_KEY, + FOCUSOUT: "focusout" + EVENT_KEY, + MOUSEENTER: "mouseenter" + EVENT_KEY, + MOUSELEAVE: "mouseleave" + EVENT_KEY + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var Popover = + /*#__PURE__*/ + function (_Tooltip) { + _inheritsLoose(Popover, _Tooltip); + + function Popover() { + return _Tooltip.apply(this, arguments) || this; + } + + var _proto = Popover.prototype; + + // Overrides + _proto.isWithContent = function isWithContent() { + return this.getTitle() || this._getContent(); + }; + + _proto.addAttachmentClass = function addAttachmentClass(attachment) { + $$$1(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment); + }; + + _proto.getTipElement = function getTipElement() { + this.tip = this.tip || $$$1(this.config.template)[0]; + return this.tip; + }; + + _proto.setContent = function setContent() { + var $tip = $$$1(this.getTipElement()); // We use append for html objects to maintain js events + + this.setElementContent($tip.find(Selector.TITLE), this.getTitle()); + + var content = this._getContent(); + + if (typeof content === 'function') { + content = content.call(this.element); + } + + this.setElementContent($tip.find(Selector.CONTENT), content); + $tip.removeClass(ClassName.FADE + " " + ClassName.SHOW); + }; // Private + + + _proto._getContent = function _getContent() { + return this.element.getAttribute('data-content') || this.config.content; + }; + + _proto._cleanTipClass = function _cleanTipClass() { + var $tip = $$$1(this.getTipElement()); + var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX); + + if (tabClass !== null && tabClass.length > 0) { + $tip.removeClass(tabClass.join('')); + } + }; // Static + + + Popover._jQueryInterface = function _jQueryInterface(config) { + return this.each(function () { + var data = $$$1(this).data(DATA_KEY); + + var _config = typeof config === 'object' ? config : null; + + if (!data && /destroy|hide/.test(config)) { + return; + } + + if (!data) { + data = new Popover(this, _config); + $$$1(this).data(DATA_KEY, data); + } + + if (typeof config === 'string') { + if (typeof data[config] === 'undefined') { + throw new TypeError("No method named \"" + config + "\""); + } + + data[config](); + } + }); + }; + + _createClass(Popover, null, [{ + key: "VERSION", + // Getters + get: function get() { + return VERSION; + } + }, { + key: "Default", + get: function get() { + return Default; + } + }, { + key: "NAME", + get: function get() { + return NAME; + } + }, { + key: "DATA_KEY", + get: function get() { + return DATA_KEY; + } + }, { + key: "Event", + get: function get() { + return Event; + } + }, { + key: "EVENT_KEY", + get: function get() { + return EVENT_KEY; + } + }, { + key: "DefaultType", + get: function get() { + return DefaultType; + } + }]); + + return Popover; + }(Tooltip); + /** + * ------------------------------------------------------------------------ + * jQuery + * ------------------------------------------------------------------------ + */ + + + $$$1.fn[NAME] = Popover._jQueryInterface; + $$$1.fn[NAME].Constructor = Popover; + + $$$1.fn[NAME].noConflict = function () { + $$$1.fn[NAME] = JQUERY_NO_CONFLICT; + return Popover._jQueryInterface; + }; + + return Popover; + }($); + + /** + * -------------------------------------------------------------------------- + * Bootstrap (v4.1.1): scrollspy.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + + var ScrollSpy = function ($$$1) { + /** + * ------------------------------------------------------------------------ + * Constants + * ------------------------------------------------------------------------ + */ + var NAME = 'scrollspy'; + var VERSION = '4.1.1'; + var DATA_KEY = 'bs.scrollspy'; + var EVENT_KEY = "." + DATA_KEY; + var DATA_API_KEY = '.data-api'; + var JQUERY_NO_CONFLICT = $$$1.fn[NAME]; + var Default = { + offset: 10, + method: 'auto', + target: '' + }; + var DefaultType = { + offset: 'number', + method: 'string', + target: '(string|element)' + }; + var Event = { + ACTIVATE: "activate" + EVENT_KEY, + SCROLL: "scroll" + EVENT_KEY, + LOAD_DATA_API: "load" + EVENT_KEY + DATA_API_KEY + }; + var ClassName = { + DROPDOWN_ITEM: 'dropdown-item', + DROPDOWN_MENU: 'dropdown-menu', + ACTIVE: 'active' + }; + var Selector = { + DATA_SPY: '[data-spy="scroll"]', + ACTIVE: '.active', + NAV_LIST_GROUP: '.nav, .list-group', + NAV_LINKS: '.nav-link', + NAV_ITEMS: '.nav-item', + LIST_ITEMS: '.list-group-item', + DROPDOWN: '.dropdown', + DROPDOWN_ITEMS: '.dropdown-item', + DROPDOWN_TOGGLE: '.dropdown-toggle' + }; + var OffsetMethod = { + OFFSET: 'offset', + POSITION: 'position' + /** + * ------------------------------------------------------------------------ + * Class Definition + * ------------------------------------------------------------------------ + */ + + }; + + var ScrollSpy = + /*#__PURE__*/ + function () { + function ScrollSpy(element, config) { + var _this = this; + + this._element = element; + this._scrollElement = element.tagName === 'BODY' ? window : element; + this._config = this._getConfig(config); + this._selector = this._config.target + " " + Selector.NAV_LINKS + "," + (this._config.target + " " + Selector.LIST_ITEMS + ",") + (this._config.target + " " + Selector.DROPDOWN_ITEMS); + this._offsets = []; + this._targets = []; + this._activeTarget = null; + this._scrollHeight = 0; + $$$1(this._scrollElement).on(Event.SCROLL, function (event) { + return _this._process(event); + }); + this.refresh(); + + this._process(); + } // Getters + + + var _proto = ScrollSpy.prototype; + + // Public + _proto.refresh = function refresh() { + var _this2 = this; + + var autoMethod = this._scrollElement === this._scrollElement.window ? OffsetMethod.OFFSET : OffsetMethod.POSITION; + var offsetMethod = this._config.method === 'auto' ? autoMethod : this._config.method; + var offsetBase = offsetMethod === OffsetMethod.POSITION ? this._getScrollTop() : 0; + this._offsets = []; + this._targets = []; + this._scrollHeight = this._getScrollHeight(); + var targets = $$$1.makeArray($$$1(this._selector)); + targets.map(function (element) { + var target; + var targetSelector = Util.getSelectorFromElement(element); + + if (targetSelector) { + target = $$$1(targetSelector)[0]; + } + + if (target) { + var targetBCR = target.getBoundingClientRect(); + + if (targetBCR.width || targetBCR.height) { + // TODO (fat): remove sketch reliance on jQuery position/offset + return [$$$1(target)[offsetMethod]().top + offsetBase, targetSelector]; + } + } + + return null; + }).filter(function (item) { + return item; + }).sort(function (a, b) { + return a[0] - b[0]; + }).forEach(function (item) { + _this2._offsets.push(item[0]); + + _this2._targets.push(item[1]); + }); + }; + + _proto.dispose = function dispose() { + $$$1.removeData(this._element, DATA_KEY); + $$$1(this._scrollElement).off(EVENT_KEY); + this._element = null; + this._scrollElement = null; + this._config = null; + this._selector = null; + this._offsets = null; + this._targets = null; + this._activeTarget = null; + this._scrollHeight = null; + }; // Private + + + _proto._getConfig = function _getConfig(config) { + config = _objectSpread({}, Default, typeof config === 'object' && config ? config : {}); + + if (typeof config.target !== 'string') { + var id = $$$1(config.target).attr('id'); + + if (!id) { + id = Util.getUID(NAME); + $$$1(config.target).attr('id', id); + } + + config.target = "#" + id; + } + + Util.typeCheckConfig(NAME, config, DefaultType); + return config; + }; + + _proto._getScrollTop = function _getScrollTop() { + return this._scrollElement === window ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop; + }; + + _proto._getScrollHeight = function _getScrollHeight() { + return this._scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight); + }; + + _proto._getOffsetHeight = function _getOffsetHeight() { + return this._scrollElement === window ? window.innerHeight : this._scrollElement.getBoundingClientRect().height; + }; + + _proto._process = function _process() { + var scrollTop = this._getScrollTop() + this._config.offset; + + var scrollHeight = this._getScrollHeight(); + + var maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight(); + + if (this._scrollHeight !== scrollHeight) { + this.refresh(); + } + + if (scrollTop >= maxScroll) { + var target = this._targets[this._targets.length - 1]; + + if (this._activeTarget !== target) { + this._activate(target); + } + + return; + } + + if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) { + this._activeTarget = null; + + this._clear(); + + return; + } + + for (var i = this._offsets.length; i--;) { + var isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && (typeof this._offsets[i + 1] === 'undefined' || scrollTop < this._offsets[i + 1]); + + if (isActiveTarget) { + this._activate(this._targets[i]); + } + } + }; + + _proto._activate = function _activate(target) { + this._activeTarget = target; + + this._clear(); + + var queries = this._selector.split(','); // eslint-disable-next-line arrow-body-style + + + queries = queries.map(function (selector) { + return selector + "[data-target=\"" + target + "\"]," + (selector + "[href=\"" + target + "\"]"); + }); + var $link = $$$1(queries.join(',')); + + if ($link.hasClass(ClassName.DROPDOWN_ITEM)) { + $link.closest(Selector.DROPDOWN).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE); + $link.addClass(ClassName.ACTIVE); + } else { + // Set triggered link as active + $link.addClass(ClassName.ACTIVE); // Set triggered links parents as active + // With both