Browse Source

projectbuilding: change environments folder location in angular

resolves https://github.com/abpframework/abp/issues/4458
pull/4459/head
Yunus Emre Kalkan 6 years ago
parent
commit
25ffc28157
  1. 12
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs
  2. 6
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AngularEnvironmentFilePortChangeForSeparatedIdentityServersStep.cs

12
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs

@ -51,7 +51,7 @@ namespace Volo.Abp.Cli.Commands
var apiUrl = commandLineArgs.Options.GetOrNull(Options.ApiUrl.Short, Options.ApiUrl.Long); var apiUrl = commandLineArgs.Options.GetOrNull(Options.ApiUrl.Short, Options.ApiUrl.Long);
if (string.IsNullOrWhiteSpace(apiUrl)) if (string.IsNullOrWhiteSpace(apiUrl))
{ {
var environmentJson = File.ReadAllText("src/environments/environment.ts").Split("export const environment = ")[1].Replace(";", " "); var environmentJson = File.ReadAllText("projects/dev-app/src/environments/environment.ts").Split("export const environment = ")[1].Replace(";", " ");
var environment = JObject.Parse(environmentJson); var environment = JObject.Parse(environmentJson);
apiUrl = environment["apis"]["default"]["url"].ToString(); apiUrl = environment["apis"]["default"]["url"].ToString();
} }
@ -61,7 +61,7 @@ namespace Volo.Abp.Cli.Commands
output = commandLineArgs.Options.GetOrNull(Options.Output.Short, Options.Output.Long); output = commandLineArgs.Options.GetOrNull(Options.Output.Short, Options.Output.Long);
if (!string.IsNullOrWhiteSpace(output) && !(output.EndsWith("/") || output.EndsWith("\\"))) if (!string.IsNullOrWhiteSpace(output) && !(output.EndsWith("/") || output.EndsWith("\\")))
{ {
output += "/"; output += "/";
} }
@ -110,7 +110,7 @@ namespace Volo.Abp.Cli.Commands
if (rootPath != "app") if (rootPath != "app")
{ {
Logger.LogInformation($"{rootPath} directory is creating"); Logger.LogInformation($"{rootPath} directory is creating");
} }
if (rootPath == "app") if (rootPath == "app")
{ {
@ -536,7 +536,7 @@ namespace Volo.Abp.Cli.Commands
modelFileText.AppendLine(Environment.NewLine); modelFileText.AppendLine(Environment.NewLine);
modelFileText.AppendLine($"import {{ {baseTypeName} }} from '{baseTypeKebabCase}';"); modelFileText.AppendLine($"import {{ {baseTypeName} }} from '{baseTypeKebabCase}';");
extends = "extends " + (!string.IsNullOrWhiteSpace(customBaseTypeName) ? customBaseTypeName : baseTypeName); extends = "extends " + (!string.IsNullOrWhiteSpace(customBaseTypeName) ? customBaseTypeName : baseTypeName);
var modelIndex = CreateType(data, baseType, rootPath, modelIndexList, controllerPathName); var modelIndex = CreateType(data, baseType, rootPath, modelIndexList, controllerPathName);
@ -628,7 +628,7 @@ namespace Volo.Abp.Cli.Commands
{ {
from = "./" + propertyTypeKebabCase; from = "./" + propertyTypeKebabCase;
} }
modelFileText.Insert(0, $"import {{ {propertyType} }} from '{from}';"); modelFileText.Insert(0, $"import {{ {propertyType} }} from '{from}';");
modelFileText.Insert(0, Environment.NewLine); modelFileText.Insert(0, Environment.NewLine);
modelIndexList.Add(modelIndex); modelIndexList.Add(modelIndex);
@ -816,4 +816,4 @@ namespace Volo.Abp.Cli.Commands
public bool IsOptional { get; set; } public bool IsOptional { get; set; }
public string BindingSourceId { get; set; } public string BindingSourceId { get; set; }
} }
} }

6
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AngularEnvironmentFilePortChangeForSeparatedIdentityServersStep.cs

@ -10,9 +10,9 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
{ {
var fileEntries = context.Files.Where(x => var fileEntries = context.Files.Where(x =>
!x.IsDirectory && !x.IsDirectory &&
(x.Name.EndsWith("angular/src/environments/environment.ts", StringComparison.InvariantCultureIgnoreCase) || (x.Name.EndsWith("angular/projects/dev-app/src/environments/environment.ts", StringComparison.InvariantCultureIgnoreCase) ||
x.Name.EndsWith("angular/src/environments/environment.hmr.ts", StringComparison.InvariantCultureIgnoreCase) || x.Name.EndsWith("angular/projects/dev-app/src/environments/environment.hmr.ts", StringComparison.InvariantCultureIgnoreCase) ||
x.Name.EndsWith("angular/src/environments/environment.prod.ts", StringComparison.InvariantCultureIgnoreCase)) x.Name.EndsWith("angular/projects/dev-app/src/environments/environment.prod.ts", StringComparison.InvariantCultureIgnoreCase))
) )
.ToList(); .ToList();

Loading…
Cancel
Save