diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/OwlCarousel/OwlCarouselScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/OwlCarousel/OwlCarouselScriptContributor.cs deleted file mode 100644 index 41172a9539..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/OwlCarousel/OwlCarouselScriptContributor.cs +++ /dev/null @@ -1,15 +0,0 @@ -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.OwlCarousel; - -[DependsOn(typeof(JQueryScriptContributor))] -public class OwlCarouselScriptContributor : BundleContributor -{ - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.AddIfNotContains("/libs/owl.carousel/owl.carousel.min.js"); - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/OwlCarousel/OwlCarouselStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/OwlCarousel/OwlCarouselStyleContributor.cs deleted file mode 100644 index b0a5ce8014..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/OwlCarousel/OwlCarouselStyleContributor.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.OwlCarousel; - -public class OwlCarouselStyleContributor : BundleContributor -{ - public override void ConfigureBundle(BundleConfigurationContext context) - { - //TODO: Theming! - context.Files.AddIfNotContains("/libs/owl.carousel/assets/owl.carousel.min.css"); - context.Files.AddIfNotContains("/libs/owl.carousel/assets/owl.theme.default.min.css"); - context.Files.AddIfNotContains("/libs/owl.carousel/assets/owl.theme.green.min.css"); - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Swiper/SwiperScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Swiper/SwiperScriptContributor.cs new file mode 100644 index 0000000000..2ead1c6ced --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Swiper/SwiperScriptContributor.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Swiper; + +public class SwiperScriptContributor : BundleContributor +{ + public override void ConfigureBundle(BundleConfigurationContext context) + { + context.Files.AddIfNotContains("/libs/swiper/swiper-bundle.min.js"); + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Swiper/SwiperStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Swiper/SwiperStyleContributor.cs new file mode 100644 index 0000000000..6fd744dcb7 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Swiper/SwiperStyleContributor.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Swiper; + +public class SwiperStyleContributor : BundleContributor +{ + public override void ConfigureBundle(BundleConfigurationContext context) + { + context.Files.AddIfNotContains("/libs/swiper/swiper-bundle.min.css"); + } +} diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml index a0ca2d81e3..4278e807ad 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml @@ -1,7 +1,6 @@ @page @using Microsoft.AspNetCore.Authorization @using Volo.Blogging.Areas.Blog.Helpers.TagHelpers -@using Volo.Abp.AspNetCore.Mvc.UI.Packages.OwlCarousel @using Volo.Blogging @inject IAuthorizationService Authorization @model IndexModel @@ -19,13 +18,11 @@ @section scripts { - } @section styles { - } diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js index ca0b21d203..6b1851dc02 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js @@ -18,36 +18,8 @@ //} } - function handleOwlCarousel() { - $('.hero-section .owl-carousel').owlCarousel({ - loop: true, - margin: 0, - nav: false, - dots: false, - //center: true, - autoplay: true, - autoHeight: true, - autoplaySpeed: 1000, - items: 1, - }); - $('.card-article-container .owl-carousel').owlCarousel({ - loop: true, - margin: 0, - nav: false, - dots: false, - autoplay: true, - autoplaySpeed: 1000, - responsive: { - 0: { - items: 1, - }, - }, - }); - } - $(function () { handleImages(); - handleOwlCarousel(); $('.nav-link').on('click', function () { $(this).parent().parent(); diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 1136c72ab4..992a6ef7c2 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -6,7 +6,6 @@ }, "dependencies": { "@abp/aspnetcore.mvc.ui.theme.shared": "~10.7.0-rc.2", - "@abp/owl.carousel": "~10.7.0-rc.2", "@abp/prismjs": "~10.7.0-rc.2", "@abp/tui-editor": "~10.7.0-rc.2" }, diff --git a/npm/packs/owl.carousel/abp.resourcemapping.js b/npm/packs/owl.carousel/abp.resourcemapping.js deleted file mode 100644 index 3f540f8a28..0000000000 --- a/npm/packs/owl.carousel/abp.resourcemapping.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - mappings: { - "@node_modules/owl.carousel/dist/**/*.*": "@libs/owl.carousel/" - } -} \ No newline at end of file diff --git a/npm/packs/owl.carousel/README.md b/npm/packs/swiper/README.md similarity index 100% rename from npm/packs/owl.carousel/README.md rename to npm/packs/swiper/README.md diff --git a/npm/packs/swiper/abp.resourcemapping.js b/npm/packs/swiper/abp.resourcemapping.js new file mode 100644 index 0000000000..9917ce0bee --- /dev/null +++ b/npm/packs/swiper/abp.resourcemapping.js @@ -0,0 +1,6 @@ +module.exports = { + mappings: { + "@node_modules/swiper/swiper-bundle.min.js*": "@libs/swiper/", + "@node_modules/swiper/swiper-bundle.min.css": "@libs/swiper/" + } +} diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/swiper/package.json similarity index 84% rename from npm/packs/owl.carousel/package.json rename to npm/packs/swiper/package.json index 897e9ddb9f..23fec9f8a1 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/swiper/package.json @@ -1,12 +1,11 @@ { "version": "10.7.0-rc.2", - "name": "@abp/owl.carousel", + "name": "@abp/swiper", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~10.7.0-rc.2", - "owl.carousel": "^2.3.4" + "swiper": "^14.1.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io",