tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

use basebundlecontributer to avoid code duplication

pull/6034/head
Ilkay Ilknur 6 years ago
parent
59b5613ef1
commit
60ed3f7a65
6 changed files with 64 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BundleContributer.cs
  2. 16
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/BundleContributer.cs
  3. 18
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/BundleContributer.cs
  4. 33
      framework/src/Volo.Abp.BlazoriseUI/BundleContributer.cs
  5. 38
      framework/src/Volo.Abp.Core/Volo/Abp/Bundling/BaseBundleContributer.cs
  6. 19
      framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/BundleContributer.cs

19
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BundleContributer.cs
View File

@ -1,26 +1,15 @@
using System.Collections.Generic;
using Volo.Abp.Bundling;
using Volo.Abp.Bundling;
namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
{
public class BundleContributer : IBundleContributer
public class BundleContributer : BaseBundleContributer
{
public void AddScripts(List<BundleDefinition> scriptDefinitions)
public override string[] GetStyles()
{
}
public void AddStyles(List<BundleDefinition> styleDefinitions)
{
var styles = new string[]
return new string[]
{
"_content/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/libs/abp/css/theme.css",
};
foreach (var style in styles)
{
styleDefinitions.AddIfNotContains((item) => item.Source == style, () => new BundleDefinition(style));
}
}
}
}

16
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/BundleContributer.cs
View File

@ -3,26 +3,16 @@ using Volo.Abp.Bundling;
namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
{
public class BundleContributer : IBundleContributer
public class BundleContributer : BaseBundleContributer
{
public void AddScripts(List<BundleDefinition> scriptDefinitions)
public override string[] GetStyles()
{
}
public void AddStyles(List<BundleDefinition> styleDefinitions)
{
var styles = new string[]
return new string[]
{
"_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/bootstrap/css/bootstrap.min.css",
"_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/fontawesome/css/all.css",
"_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/flag-icon/css/flag-icon.css"
};
foreach (var style in styles)
{
styleDefinitions.AddIfNotContains((item) => item.Source == style, () => new BundleDefinition(style));
}
}
}
}

18
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/BundleContributer.cs
View File

@ -1,25 +1,15 @@
using System.Collections.Generic;
using Volo.Abp.Bundling;
using Volo.Abp.Bundling;
namespace Volo.Abp.AspNetCore.Components.WebAssembly
{
public class BundleContributer : IBundleContributer
public class BundleContributer : BaseBundleContributer
{
public void AddScripts(List<BundleDefinition> scriptDefinitions)
public override string[] GetScripts()
{
var scripts = new string[]
return new string[]
{
"_content/Volo.Abp.AspNetCore.Components.WebAssembly/libs/abp/js/abp.js",
};
foreach (var script in scripts)
{
scriptDefinitions.AddIfNotContains((item) => item.Source == script, () => new BundleDefinition(script));
}
}
public void AddStyles(List<BundleDefinition> styleDefinitions)
{
}
}
}

33
framework/src/Volo.Abp.BlazoriseUI/BundleContributer.cs
View File

@ -1,37 +1,26 @@
using System.Collections.Generic;
using Volo.Abp.Bundling;
using Volo.Abp.Bundling;
namespace Volo.Abp.BlazoriseUI
{
public class BundleContributer : IBundleContributer
public class BundleContributer : BaseBundleContributer
{
public void AddScripts(List<BundleDefinition> scriptDefinitions)
public override string[] GetStyles()
{
var scripts = new string[]
{
"_content/Blazorise/blazorise.js",
"_content/Blazorise.Bootstrap/blazorise.bootstrap.js"
};
foreach (var script in scripts)
{
scriptDefinitions.AddIfNotContains((item) => item.Source == script, () => new BundleDefinition(script));
}
}
public void AddStyles(List<BundleDefinition> styleDefinitions)
{
var styles = new string[]
return new string[]
{
"_content/Blazorise/blazorise.css",
"_content/Blazorise.Bootstrap/blazorise.bootstrap.css",
"_content/Blazorise.Snackbar/blazorise.snackbar.css"
};
}
foreach (var style in styles)
public override string[] GetScripts()
{
return new string[]
{
styleDefinitions.AddIfNotContains((item) => item.Source == style, () => new BundleDefinition(style));
}
"_content/Blazorise/blazorise.js",
"_content/Blazorise.Bootstrap/blazorise.bootstrap.js"
};
}
}
}

38
framework/src/Volo.Abp.Core/Volo/Abp/Bundling/BaseBundleContributer.cs
View File

@ -0,0 +1,38 @@
using System;
using System.Collections.Generic;
namespace Volo.Abp.Bundling
{
public class BaseBundleContributer : IBundleContributer
{
public virtual void AddScripts(List<BundleDefinition> scriptDefinitions)
{
var scripts = GetScripts();
foreach (var script in scripts)
{
scriptDefinitions.AddIfNotContains((item) => item.Source == script, () => new BundleDefinition(script));
}
}
public virtual void AddStyles(List<BundleDefinition> styleDefinitions)
{
var styles = GetStyles();
foreach (var style in styles)
{
styleDefinitions.AddIfNotContains((item) => item.Source == style, () => new BundleDefinition(style));
}
}
public virtual string[] GetStyles()
{
return Array.Empty<string>();
}
public virtual string[] GetScripts()
{
return Array.Empty<string>();
}
}
}

19
framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/BundleContributer.cs
View File

@ -1,26 +1,15 @@
using System.Collections.Generic;
using Volo.Abp.Bundling;
using Volo.Abp.Bundling;
namespace Volo.Abp.Http.Client.IdentityModel.WebAssembly
{
public class BundleContributer : IBundleContributer
public class BundleContributer : BaseBundleContributer
{
public void AddScripts(List<BundleDefinition> scriptDefinitions)
public override string[] GetScripts()
{
var scripts = new string[]
return new string[]
{
"_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js",
};
foreach (var script in scripts)
{
scriptDefinitions.AddIfNotContains((item) => item.Source == script, () => new BundleDefinition(script));
}
}
public void AddStyles(List<BundleDefinition> styleDefinitions)
{
}
}
}

Write Preview
Loading…
Cancel
Save