Browse Source

Merge branch 'cotur/star-rating-svg' into EngincanV/cmskit-rating

pull/5216/head
Ahmet Çotur 6 years ago
parent
commit
b403e9f0be
  1. 16
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/StarRatingSvg/StarRatingSvgScriptContributor.cs
  2. 13
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/StarRatingSvg/StarRatingSvgStyleContributor.cs
  3. 3
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
  4. 6
      npm/packs/star-rating-svg/abp.resourcemapping.js
  5. 12
      npm/packs/star-rating-svg/package.json
  6. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml

16
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/StarRatingSvg/StarRatingSvgScriptContributor.cs

@ -0,0 +1,16 @@
using System.Collections.Generic;
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery;
using Volo.Abp.Modularity;
namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.StarRatingSvg
{
[DependsOn(typeof(JQueryScriptContributor))]
public class StarRatingSvgScriptContributor : BundleContributor
{
public override void ConfigureBundle(BundleConfigurationContext context)
{
context.Files.AddIfNotContains("/libs/star-rating-svg/js/jquery.star-rating-svg.min.js");
}
}
}

13
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/StarRatingSvg/StarRatingSvgStyleContributor.cs

@ -0,0 +1,13 @@
using System.Collections.Generic;
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.StarRatingSvg
{
public class StarRatingSvgStyleContributor : BundleContributor
{
public override void ConfigureBundle(BundleConfigurationContext context)
{
context.Files.AddIfNotContains("/libs/star-rating-svg/css/star-rating-svg.css");
}
}
}

3
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs

@ -86,8 +86,7 @@ namespace Volo.Abp.Cli.NuGet
versions = versions.Where(x => !x.IsPrerelease).ToList(); versions = versions.Where(x => !x.IsPrerelease).ToList();
} }
var semanticVersions = versions.ToList(); return versions.Any() ? versions.Max() : null;
return semanticVersions.Any() ? semanticVersions.Max() : null;
} }
} }

6
npm/packs/star-rating-svg/abp.resourcemapping.js

@ -0,0 +1,6 @@
module.exports = {
mappings: {
"@node_modules/star-rating-svg/dist/*.min.js": "@libs/star-rating-svg/js/",
"@node_modules/star-rating-svg/src/css/*.css": "@libs/star-rating-svg/css/",
},
};

12
npm/packs/star-rating-svg/package.json

@ -0,0 +1,12 @@
{
"version": "3.1.0-rc.2",
"name": "@abp/star-rating-svg",
"publishConfig": {
"access": "public"
},
"dependencies": {
"@abp/jquery": "~3.1.0-rc.2",
"star-rating-svg": "^3.5.0"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
}

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml

@ -21,9 +21,7 @@
<p>@L["LongWelcomeMessage"]</p> <p>@L["LongWelcomeMessage"]</p>
@if (!CurrentUser.IsAuthenticated) @if (!CurrentUser.IsAuthenticated)
{ {
<form method="POST"> <a abp-button="Primary" href="~/Account/Login" class="px-4"><i class="fa fa-sign-in"></i> @L["Login"]</a>
<input type="submit" asp-page-handler="Login" value="LOGIN" class="btn btn-login" />
</form>
} }
<hr /> <hr />
<p class="text-right"><a href="https://abp.io?ref=tmpl" target="_blank">abp.io</a></p> <p class="text-right"><a href="https://abp.io?ref=tmpl" target="_blank">abp.io</a></p>

Loading…
Cancel
Save