Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Refactoring Template Handling - Implementing Plugin-like Mechanism #453
Krzysztof Pajak633da424ba3f
diff --git a/GrandNode.sln b/GrandNode.slnindex 797760512..e232deef3 100644--- a/GrandNode.sln+++ b/GrandNode.sln@@ -133,6 +133,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{BF4543EndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.SharedUIResources", "src\Web\Grand.SharedUIResources\Grand.SharedUIResources.csproj", "{09958AAA-44BC-42DE-86D1-0E39EF3C0C68}"EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Theme.Modern", "src\Plugins\Theme.Modern\Theme.Modern.csproj", "{9DAAD56A-8DB7-4A41-BAF3-9486D617AB05}"+EndProjectGlobalGlobalSection(SolutionConfigurationPlatforms) = preSolutionDebug|Any CPU = Debug|Any CPU@@ -350,6 +352,10 @@ Global{09958AAA-44BC-42DE-86D1-0E39EF3C0C68}.Debug|Any CPU.Build.0 = Debug|Any CPU{09958AAA-44BC-42DE-86D1-0E39EF3C0C68}.Release|Any CPU.ActiveCfg = Release|Any CPU{09958AAA-44BC-42DE-86D1-0E39EF3C0C68}.Release|Any CPU.Build.0 = Release|Any CPU+ {9DAAD56A-8DB7-4A41-BAF3-9486D617AB05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {9DAAD56A-8DB7-4A41-BAF3-9486D617AB05}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {9DAAD56A-8DB7-4A41-BAF3-9486D617AB05}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {9DAAD56A-8DB7-4A41-BAF3-9486D617AB05}.Release|Any CPU.Build.0 = Release|Any CPUEndGlobalSectionGlobalSection(SolutionProperties) = preSolutionHideSolutionNode = FALSE@@ -408,6 +414,7 @@ Global{BF4543A8-0731-4FDD-BB6B-0ADB9561F981} = {38ECA068-176F-463C-A1D7-044341D4CACB}{1A6A0104-F610-4DD3-88BE-C4029034E5DA} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981}{09958AAA-44BC-42DE-86D1-0E39EF3C0C68} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981}+ {9DAAD56A-8DB7-4A41-BAF3-9486D617AB05} = {F6F48227-B3C5-4A51-B33F-FF9AD96352DB}EndGlobalSectionGlobalSection(ExtensibilityGlobals) = postSolutionSolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}diff --git a/src/Core/Grand.Domain/Customers/SystemCustomerFieldNames.cs b/src/Core/Grand.Domain/Customers/SystemCustomerFieldNames.csindex a63bf55fc..cf7f16fbc 100644--- a/src/Core/Grand.Domain/Customers/SystemCustomerFieldNames.cs+++ b/src/Core/Grand.Domain/Customers/SystemCustomerFieldNames.cs@@ -49,8 +49,6 @@ namespace Grand.Domain.Customerspublic static string ShippingOptionAttributeDescription { get { return "ShippingOptionAttributeDescription"; } }public static string ShippingOptionAttribute { get { return "ShippingOptionAttribute"; } }public static string LastContinueShoppingPage { get { return "LastContinueShoppingPage"; } }- public static string WorkingThemeName { get { return "WorkingThemeName"; } }- public static string AdminThemeName { get { return "AdminThemeName"; } }public static string TaxDisplayTypeId { get { return "TaxDisplayTypeId"; } }public static string UseLoyaltyPointsDuringCheckout { get { return "UseLoyaltyPointsDuringCheckout"; } }public static string CookieAccepted { get { return "Cookie.Accepted"; } }diff --git a/src/Core/Grand.Domain/Vendors/VendorSettings.cs b/src/Core/Grand.Domain/Vendors/VendorSettings.csindex 6e692d72b..5b05f4ffc 100644--- a/src/Core/Grand.Domain/Vendors/VendorSettings.cs+++ b/src/Core/Grand.Domain/Vendors/VendorSettings.cs@@ -90,11 +90,6 @@ namespace Grand.Domain.Vendors/// </summary>public int NumberOfReview { get; set; } = 10;- /// <summary>- /// Gets or sets the identifier of the default admin theme for the vendors- /// </summary>- public string DefaultAdminTheme { get; set; }-#region Address settings/// <summary>diff --git a/src/Core/Grand.Infrastructure/Plugins/ThemeInfo.cs b/src/Core/Grand.Infrastructure/Plugins/ThemeInfo.csdeleted file mode 100644index dccffa4fc..000000000--- a/src/Core/Grand.Infrastructure/Plugins/ThemeInfo.cs+++ /dev/null@@ -1,38 +0,0 @@-namespace Grand.Infrastructure.Plugins-{- /// <summary>- /// Represents a theme information- /// </summary>- public class ThemeInfo- {- /// <summary>- /// Gets or sets the theme system name- /// </summary>- public string SystemName { get; set; }-- /// <summary>- /// Gets or sets the theme friendly name- /// </summary>- public string FriendlyName { get; set; }-- /// <summary>- /// Gets or sets the theme system name- /// </summary>- public string Version { get; set; }-- /// <summary>- /// Gets or sets a value indicating whether the theme supports RTL (right-to-left)- /// </summary>- public bool SupportRtl { get; set; }-- /// <summary>- /// Gets or sets the path to the preview image of the theme- /// </summary>- public string PreviewImageUrl { get; set; }-- /// <summary>- /// Gets or sets the preview text of the theme- /// </summary>- public string PreviewText { get; set; }- }-}\ No newline at end of filediff --git a/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs b/src/Core/Grand.SharedKernel/Extensions/CommonPath.csindex 002ab940d..8bf7a21af 100644--- a/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs+++ b/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs@@ -43,18 +43,6 @@}}- /// <summary>- /// Maps a theme path to a physical disk path.- /// </summary>- /// <returns>The physical path.</returns>- public static string ThemePath- {- get- {- return Path.Combine(BaseDirectory, "Themes");- }- }-/// <summary>/// Maps a theme path to a physical disk path./// </summary>diff --git a/src/Plugins/Theme.Modern/Content/css/blog-news/blog-news.css b/src/Plugins/Theme.Modern/Content/css/blog-news/blog-news.cssnew file mode 100644index 000000000..0d5a58075--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/blog-news/blog-news.css@@ -0,0 +1,140 @@+.card.post-news,+.post-news .card-header,+.post-news .card-footer {+ border: 0;+ border-radius: 0;+ background-color: transparent;+}+.card.post-news {+ height: 100%;+ padding: 0;+ border: 0;+}+.card.post-news .card-header {+ padding: 0;+}+.card.post-news .card-body,+.card.post-news .card-footer {+ color: #555;+ padding: 10px 0;+}+.card.post-news .card-footer {+ padding: 10px 0 0 0;+}+.card.post-news .img-container {+ position: relative;+ display: flex;+ align-items: center;+}+.card.post-news img {+ max-width: 100%;+}+.card.post-news .category {+ display: table;+ margin: 10px 0 0 0;+ font-size: 14px;+ font-weight: 500;+ line-height: 1;+ color: #555;+ text-align: center;+}+.card.post-news .title {+ margin: 5px 0;+}+.card.post-news .title a {+ font-size: 16px;+ font-weight: 700;+}+.card.post-news .date {+ display: inline-flex;+ align-items: center;+ justify-content: center;+}+.card.post-news .date {+ color: #25b232;+ font-size: 14px;+ font-weight: 500;+}+.card.post-news .date .part:not(:last-child) {+ margin: 0 3px 0 0;+}+.card.post-news .date .month {+ text-transform: capitalize;+}+.card.post-news .date .month::after {+ content: ",";+ position: relative;+}+.card.post-news .post-date {+ position: absolute;+ top: 10px;+ left: 10px;+ display: flex;+ flex-direction: column;+ justify-content: c;+ align-items: center;+ padding: 10px;+ border-left: 1px solid #d6d6d6;+ border-bottom: 1px solid #d6d6d6;+ background-color: #fff;+ line-height: 1;+}+.card.post-news .post-date .day {+ color: #000;+ font-size: 24px;+ font-weight: 700;+}+.card.post-news .post-date .month {+ margin: 0 0 2px 5px;+ color: #4faacd;+ font-size: 16px;+ font-weight: 400;+}+.card.post-news .short {+ color: #777;+ font-size: 16px;+ font-weight: 400;+ line-height: 22px;+}+.card.post-news .short {+ color: #555;+ font-size: 14px;+ font-weight: 400;+ line-height: 22px;+}+.post-col {+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}++@media (min-width: 1200px) {+ .generalLeftSide.show + .generalSideRight .post-col {+ -ms-flex: 0 0 50%;+ flex: 0 0 50%;+ max-width: 50%;+ }+}+@media (max-width: 575px) {+ .post-news, .post-news .card-header, .post-news .card-footer {+ text-align: center;+ }+}++.post-news-page.card {+ display: block;+ background-color: transparent;+ border: 0;+}+.post-news-page .card-header {+ position: relative;+ background-color: transparent;+ border: 0;+ float: left;+ padding: 0;+ margin: 0 15px 15px 0;+ min-width: 320px;+ min-height: 100px;+}+.post-news-page .card-body {+ padding: 0;+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/css/cart/cart.css b/src/Plugins/Theme.Modern/Content/css/cart/cart.cssnew file mode 100644index 000000000..24747946d--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/cart/cart.css@@ -0,0 +1,323 @@+/* commons */++.cart-view .sidebar-cart.cart-only {+ pointer-events: none;+}++/* shopping cart */++.shopping-cart {+ margin: 0 0 15px 0;+ color: #1c1b1b;+}+.shopping-cart.table thead th {+ color: #1c1b1b;+ font-size: 16px;+ font-weight: 700;+ text-transform: uppercase;+ border: 1px solid rgba(0,0,0,.1);+}+.shopping-cart.table td {+ text-align: center;+ vertical-align: middle;+ border: 1px solid rgba(0,0,0,.1);+}+.shopping-cart.table td img {+ background-color: #eaf0fa;+}+.shopping-cart.table .product-name {+ font-size: 14px;+ font-weight: 400;+}+.shopping-cart.table .attributes {+ color: #888;+}+.shopping-cart.table .product-unit-price,+.shopping-cart .prod-total {+ font-size: 18px;+ font-weight: 700;+ color: #1c1b1b;+}+.shopping-cart .prod-total {+ color: #25b232;+}+.shopping-cart .qty-input {+ max-width: 75px;+ min-width: 60px;+ margin: 0 auto;+}+.shopping-cart .sku-number {+ width: 100%;+ display: flex;+ justify-content: center;+}+.shopping-cart-page .totals-inner {+ position: -webkit-sticky;+ position: sticky;+ top: 15px;+ padding: 15px;+ margin: 0 0 15px 0;+ border: 2px solid #000;+ border-radius: 0;+}+.totals-inner table, .totals-inner .table-hover tbody tr:hover {+ color: #1c1b1b;+}+.checkout-buttons {+ display: inline-flex;+ flex-wrap: nowrap;+ width: 100%;+}+.checkout-buttons .btn {+ width: 100%;+}+.coupon-button {+ display: inline-flex;+ align-items: center;+ justify-content: space-between;+}+.coupon-button::after {+ display: inline-block;+ margin-left: .255em;+ vertical-align: .255em;+ content: "";+ border-top: .4em solid;+ border-right: .4em solid transparent;+ border-bottom: 0;+ border-left: .4em solid transparent;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.coupon-button.not-collapsed::after {+ -webkit-transform: rotate(180deg);+ transform: rotate(180deg);+}++/* checkout */++.opc-header {+ display: inline-flex;+ align-items: center;+ flex-wrap: wrap;+ margin: 0 0 15px 0;+ pointer-events: none;+}+.opc-header .card-header {+ border: 0;+ padding: 0;+ margin: 0 22px 8px 0;+ background-color: transparent;+}+.opc-header .card-header .btn-info {+ position: relative;+ background-color: transparent;+ border: 0;+ padding: 0;+ font-size: 14px;+ font-weight: 700;+ color: #1c1b1b;+}+[dark-theme="true"] .opc-header .card-header .btn-info {+ color: #fff;+}+.opc-header .card-header .btn-info.not-collapsed {+ color:#25b232;+ font-size: 16px;+ font-weight: 700;+}+.opc-header .card-header .btn-info::before,+.opc-header .card-header .btn-info::after {+ content: "";+ position: absolute;+ top: 9px;+ right: -14px;+ width: 6px;+ height: 1px;+ background: #aaa;+ transform: rotate(45deg);+}+.opc-header .card-header .btn-info::after {+ top: 13px;+ transform: rotate(-45deg);+}+[dark-theme="true"] .opc-header .card-header .btn-info::before,+[dark-theme="true"] .opc-header .card-header .btn-info::after {+ background: #fff;+}+[dark-theme="true"] .opc-header .card-header .btn-info.not-collapsed::before,+[dark-theme="true"] .opc-header .card-header .btn-info.not-collapsed::after,+.opc-header .card-header .btn-info.not-collapsed::before,+.opc-header .card-header .btn-info.not-collapsed::after {+ background:#25b232;+}+.opc-header .card-header:last-child .btn-info::before,+.opc-header .card-header:last-child .btn-info::after {+ display: none;+}+.opc .card, [dark-theme="true"] .opc .card {+ background-color: #eaf0fa;+ border: 0;+ border-radius: 0;+}+.opc .card-body {+ border: 1px solid rgba(0,0,0,.125);+}+[dark-theme="true"] .opc .card-body {+ background-color: #2d3133;+}+.opc .card-header .btn:not(.allow) {+ pointer-events: none;+ color: #aaa;+}+.opc .card.active ~ .card:not(.active),+.opc .card.active ~ .card:not(.active) .btn.allow {+ pointer-events: none !important;+ opacity: 0.5 !important;+}+.opc-totals, .checkout-page .col-more .order-summary-content .cart-footer {+ top: 0;+ position: -webkit-sticky !important;+ position: sticky !important;+ padding: 15px 0;+ margin: 0 0 15px 0;+ border: 2px solid#25b232;+ border-radius: 0.25rem;+}+[dark-theme="true"] .opc-totals, [dark-theme="true"] .checkout-page .col-more .order-summary-content .cart-footer {+ background-color: #2d3133;+}+.checkout-page .totals .table-responsive {+ margin: 0;+}+.totals .table td {+ padding: 5px;+ border-top: 0;+}+.cart-total-left {+ font-size: 14px;+ font-weight: 700;+}+.cart-total-right {+ font-size: 16px;+ font-weight: 700;+}+.checkout-page .shopping-cart .qty-input {+ padding: 0;+}+.opc-totals .order-summary-content {+ margin: 0 !important;+}+.opc-totals .shopping-cart th.unit-price,+.opc-totals .shopping-cart td.unit-price,+.opc-totals .card-group {+ display: none;+}+.opc-totals .qty-opc {+ display: flex;+ align-items: center;+ justify-content: center;+ margin: 0 auto;+ font-size: 16px;+ font-weight: 500;+ color: #fff;+ background:#25b232;+ width: 30px;+ height: 30px;+ border-radius: 100%;+}+.opc-totals .shopping-cart.table td {+ vertical-align: top;+}+.checkout-page .totals,+.opc-totals .order-summary-content .selected-checkout-attributes,+.opc-totals .cart-out-container {+ flex: 0 0 100%;+ max-width: 100%;+}+@media (min-width: 576px) {+ .card-group > .card + .card .card-body {+ border-left: 0+ }+}+@media (min-width: 1200px) {+ .checkout-page .col-more .order-summary-content .cart-footer {+ margin: 0 0 0 auto;+ max-width: 50%;+ }+ .opc-totals .shopping-cart-container {+ max-height: 400px;+ overflow-x: hidden;+ overflow-y: auto;+ }+}+@media (max-width: 1199px) {+ .shopping-cart.table .attributes {+ font-size: 10px;+ }+ .opc .order-summary .cart-footer {+ visibility: visible;+ opacity: 1;+ height: auto;+ }+ .checkout-page .col-more .order-summary-content .cart-footer {+ margin: 0;+ max-width: 100%;+ }+}+@media (max-width: 991px) {+ .shopping-cart {+ border-bottom: 0;+ }+ .shopping-cart thead {+ display: none;+ }+ .shopping-cart tbody {+ display: inline-flex;+ flex-wrap: wrap;+ width: 100%;+ }+ .shopping-cart.table tr {+ display: flex;+ flex-direction: column;+ align-items: center;+ width: calc(33.3333% - 5px);+ margin: 0 5px 5px 0;+ }+ .shopping-cart.table td {+ width: 100%;+ display: flex;+ align-items: center;+ justify-content: center;+ flex-direction: column;+ text-align: center;+ border: 1px solid #ddd;+ border-left: 2px solid #000;+ border-right: 2px solid #000;+ border-top: 0;+ }+ .shopping-cart.table td:first-child {+ border-top: 2px solid #000;+ }+ .shopping-cart.table td:last-child {+ border-bottom: 2px solid #000;+ }+}+@media (max-width: 767px) {+ .shopping-cart.table tr {+ width: calc(50% - 5px);+ }+}+@media (max-width: 575px) {+ .shopping-cart.table tr {+ width: 100%;+ }+ .order-completed-page .jumbotron .display-3 {+ font-size: 56px;+ }+}++@media (max-width: 991px) {+ [dark-theme="true"] .shopping-cart.table td, [dark-theme="true"] .shopping-cart.table td:first-child, [dark-theme="true"] .shopping-cart.table td:last-child {+ border-color: #fff;+ }+}diff --git a/src/Plugins/Theme.Modern/Content/css/catalog/catalog.css b/src/Plugins/Theme.Modern/Content/css/catalog/catalog.cssnew file mode 100644index 000000000..e91306c6a--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/catalog/catalog.css@@ -0,0 +1,865 @@+/* breadcrumb */++.breadcrumb {+ margin: 0;+ padding: 15px 0 0 0;+}++/* category list */++.catalog-page .generalTitle {+ margin: 0 0 15px 0;+}+.catalog-page .generalTitle span {+ font-size: 20px;+}+.categoryGrid {+ margin: 0 0 15px 0;+ padding: 0 0 15px 0;+}+.category-item {+ display: block;+}+.category-item img {+ max-width: 100%;+ width: auto;+ height: auto;+}+.category-item .title {+ font-size: 22px;+ font-weight: 400;+ color: #000;+ font-family: 'Poppins', sans-serif;+ margin: 5px 0 0 0;+ white-space: pre-wrap;+ overflow: hidden;+ text-overflow: ellipsis;+}++/* catalog left side */++#TwoColumns {+ position: relative;+ height: calc(100% - 57px);+}+.generalLeftSide:not(.show) {+ opacity: 0;+ visibility: hidden;+ -webkit-transform: translateX(-100%);+ transform: translateX(-100%);+}+.generalSideRight {+ margin: 0 0 0 25%;+ padding: 0 15px;+ min-height: 500px;+ z-index: 3;+ transition: all .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+}+.generalSideRight .product-container,+.swiper-slide {+ -webkit-transition: all .4s ease-in-out;+ transition: all .4s ease-in-out;+}+.generalLeftSide:not(.show) + .generalSideRight {+ -ms-flex: 0 0 100%;+ flex: 0 0 100%;+ max-width: 100%;+ margin: 0;+}+.generalLeftSide::-webkit-scrollbar-track {+ -webkit-box-shadow: inset 0 0 4px rgba(0,0,0,0.3);+ border-radius: 4px;+ background-color: #232323;+}+.generalLeftSide::-webkit-scrollbar {+ position: absolute;+ width: 8px;+ background-color: #232323;+}+.generalLeftSide::-webkit-scrollbar-thumb {+ border-radius: 4px;+ -webkit-box-shadow: inset 0 0 4px rgba(0,0,0,.3);+ background-color: #111;+}+.generalLeftSide {+ position: absolute;+ top: 0;+ bottom: 0;+ left: 0;+ overflow-x: hidden;+ overflow-y: auto;+ max-height: calc(100% - 54px);+ background-color: #fff;+ margin: 15px 0 0 0;+ border: 1px solid rgba(0,0,0,.1);+ padding: 0 15px 15px 15px;+ opacity: 1;+ visibility: visible;+ direction: rtl;+ z-index: 4;+ --webkit-transition: all .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+ transition: all .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+}+.generalLeftSide * {+ direction: ltr;+}+.generalLeftSide .modal-close,+.generalLeftSide .modal-close:focus,+.generalLeftSide .modal-close:hover,+.generalLeftSide .modal-close:active,+.generalLeftSide .modal-close:not(:disabled):not(.disabled):active {+ top: -1px;+ right: -1px;+ display: flex;+ justify-content: center;+ align-items: center;+ border: 1px solid rgba(0,0,0,.2);+ border-radius: 0;+ outline: none;+}+.generalLeftSide .modal-close::before {+ content: "";+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+ border: 1px solid transparent;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+ z-index: 2;+}+.generalLeftSide .modal-close:focus::before,+.generalLeftSide .modal-close:hover::before,+.generalLeftSide .modal-close:active::before {+ border-color: #1c1b1b;+}+.generalLeftSide .viewBox {+ margin: 15px 0;+}+.generalLeftSide .block {+ font-family: 'Poppins', sans-serif;+}+.generalLeftSide .product-spec-filter .btn-secondary,+.generalLeftSide .product-spec-filter li a {+ font-size: 14px;+}+.generalLeftSide .available-items {+ margin: 0 0 15px 0;+ padding: 10px;+ border: 0;+ background: #eaf0fa;+ border-radius: .25rem;+}+.generalLeftSide .available-items ul {+ margin: 0 0 5px 0;+}+.generalLeftSide .available-items ul .title h6 {+ font-size: 14px;+ font-weight: 700;+ text-transform: uppercase;+}+.generalLeftSide .available-items ul .btn {+ color: #1c1b1b;+ font-size: 14px;+ font-weight: 700;+ background-color: #fff;+}+.generalLeftSide .available-items ul .btn.color-container {+ background-color: transparent;+}+.generalLeftSide .block h2.h5 {+ margin: 15px 0;+}+.generalLeftSide .block h2.h5 strong {+ font-size: 16px;+ font-weight: 900;+ text-transform: uppercase;+}+.generalLeftSide .block ul {+ flex-direction: row;+ justify-content: center;+ flex-wrap: wrap;+ padding-left: 0;+ list-style-type: none;+}+.generalLeftSide .viewBox > .list > li.active {+ position: relative;+}+.generalLeftSide .viewBox ul.sublist {+ padding-left: 15px;+}+.generalLeftSide li a {+ position: relative;+ color: #1c1b1b;+ text-decoration: none;+ font-size: 14px;+ font-weight: 400;+ display: flex;+ padding-bottom: 10px;+}+.generalLeftSide li a:hover {+ color: #25b232;+}+.generalLeftSide .block-category-navigation li.active > .sublist > li a {+ color: #555;+ font-weight: 400;+}+.generalLeftSide li.active.last > a {+ color: #25b232;+ font-weight: 700;+}+.generalLeftSide li a .total {+ position: relative;+ right: -5px;+ font-size: 12px;+ font-weight: 400;+ opacity: .8;+}+.generalLeftSide .block-category-navigation li.active .sublist > li.last > a {+ color: #25b232;+ font-weight: 500;+}+.generalLeftSide li {+ position: relative;+}+.generalLeftSide li.active.last > a .total, .generalLeftSide li a:hover .total {+ opacity: 1;+}+.generalLeftSide .block-category-navigation li.active > .sublist > li::before, .generalLeftSide .block-category-navigation li.active > .sublist > li::after {+ content: "";+ position: absolute;+ top: 0;+ left: -15px;+ width: 10px;+ height: 105%;+ border-left: 1px solid #1c1b1b;+}+.generalLeftSide .block-category-navigation li.active > .sublist > li::before {+ height: 105%;+}+.generalLeftSide .block-category-navigation li.active > .sublist > li:last-child::before {+ display: none;+}+.generalLeftSide .block-category-navigation li.active > .sublist > li::after {+ height: 10px;+ border-bottom: 1px solid #1c1b1b;+}+.generalLeftSide .btn.color-container {+ margin: 0 5px 5px 0;+}+.generalLeftSide .btn.color-container:focus, .generalLeftSide .btn.color-container:active {+ box-shadow: none;+ border-radius: 100%;+}+.generalLeftSide .btn.color-container .color {+ width: 32px;+ height: 32px;+}+.b-sidebar-body .generalLeftSide {+ padding: 0;+}+a.left-side-toggler {+ display: inline-flex;+ align-items: flex-end;+ padding: 10px;+ margin: 0 15px 0 0;+ color: #fff;+ border: 1px solid #333;+ background-color: #1c1b1b;+ cursor: pointer;+ z-index: 3;+}+a.left-side-toggler:active,+a.left-side-toggler:focus,+a.left-side-toggler:hover {+ color: #fff;+}+.left-side-toggler .inner {+ display: flex;+ flex-direction: column;+ justify-content: space-between;+ align-items: flex-end;+ width: 36px;+ height: 17px;+}+.left-side-toggler .inner span {+ height: 3px;+ background: #25b232;+ -webkit-transition: width .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+ transition: width .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+}+.left-side-toggler .inner span:first-child {+ width: 100%;+}+.left-side-toggler .inner span:nth-child(2) {+ width: 75%;+}+.left-side-toggler .inner span:last-child {+ width: 50%;+}+.left-side-toggler:hover .inner span {+ width: 100%;+}+.left-side-toggler .text {+ margin: 0 0 0 5px;+ font-size: 18px;+ font-weight: 700;+ text-transform: uppercase;+ line-height: 1;+}++/* parallax banner */++.parallax-banner {+ position: relative;+ width: calc(100% + 30px);+ margin: 0 -15px;+ height: 300px;+ display: inline-flex;+ align-items: center;+ justify-content: space-between;+ padding: 5%;+ background: #eaf0fa;+ overflow: hidden;+}+.parallax-banner .content {+ justify-content: center;+ align-items: center;+ max-width: 37%;+}+.parallax-banner::before {+ content: "";+ position: absolute;+ top: -50%;+ left: -10%;+ width: 50%;+ height: 200%;+ border: 15px solid #000;+ background: #fff;+ border-radius: 50%;+ z-index: -1;+}+.parallax-banner .content, .parallax-banner .content .title {+ display: flex;+ flex-direction: column;+}+.parallax-banner .content .title {+ margin: 0 0 15px 0;+}+.parallax-banner .content .title .up {+ font-size: 50px;+ font-weight: 900;+ line-height: 1;+}+.parallax-banner .content .title .down {+ color: #25b232;+ font-size: 20px;+ font-weight: 700;+}+.parallax-banner .content .promo {+ display: inline-flex;+ align-items: center;+ font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";+}+.parallax-banner .content .promo .number {+ margin: 0 5px 0 0;+ font-size: 80px;+ font-weight: 700;+ line-height: 1;+ letter-spacing: -4px;+}+.parallax-banner .content .promo .off {+ display: flex;+ flex-direction: column;+ line-height: 1;+}+.parallax-banner .content .promo .off div:first-child {+ font-size: 31px;+ font-weight: 700;+ line-height: 1;+}+.parallax-banner .content .promo .off div:last-child {+ font-size: 36px;+ font-weight: 300;+}+.parallax-banner img {+ position: absolute;+ right: 0;+ left: unset !important;+ top: unset !important;+ bottom: unset;+ max-width: 400px;+}+.parallax-banner .img-container {+ position: absolute;+ top: 0;+ right: 0;+ display: flex;+ align-items: center;+ height: 300px;+ -webkit-transition: all 1s ease-in-out;+ transition: all 1s ease-in-out;+}+.parallax-banner:hover .img-container {+ -webkit-transform: scale(1.1);+ transform: scale(1.1);+}+.parallax-banner a.btn,+.parallax-banner .content .title,+.parallax-banner .content .promo {+ -webkit-transition: all .4s ease-in-out;+ transition: all .4s ease-in-out+}+.generalLeftSide.show + .generalSideRight .parallax-banner .content .title,+.generalLeftSide.show + .generalSideRight .parallax-banner .content .promo,+.generalLeftSide.show + .generalSideRight .parallax-banner a.btn {+ -webkit-transform: scale(.9);+ transform: scale(.9);+}+.generalLeftSide.show + .generalSideRight .parallax-banner::before {+ width: 55%;+}++/* filter button */++.filter-button {+ background-color: transparent;+ border: 0;+ padding: 0;+ margin-right: auto;+ font-weight: 700;+ order: 1;+}+.filter-button span {+ margin: 0 5px 0 0;+}++/* vendor tabs */++.vendor-page .nav-tabs {+ position: relative;+ justify-content: center;+ border: 0;+}+.vendor-page .nav-tabs li:first-child::before {+ content: "";+ position: absolute;+ bottom: 0;+ left: 0;+ width: 50%;+ height: 1px;+ background: rgba(0,0,0,.1);+ z-index: 0;+}+.vendor-page .nav-tabs li:first-child::after {+ content: "";+ position: absolute;+ bottom: 0;+ right: 0;+ width: 50%;+ height: 1px;+ background: rgba(0,0,0,.1);+ z-index: 0;+}+.vendor-page .nav-tabs .nav-link {+ position: relative;+ margin: 0 -1px 2px 0;+ padding: 16px 26px;+ font-size: 14px;+ text-transform: uppercase;+ font-weight: 700;+ font-family: Poppins, sans-serif;+ color: #000;+ background-color: transparent;+ border: 1px solid rgba(0,0,0,.1);+ border-bottom: 0;+ outline: none;+ border-radius: 0;+ -webkit-transition: all .2s ease;+ transition: all .2s ease;+}+.vendor-page .nav-tabs .nav-link.active {+ color: #fff;+ background-color: #25b232;+}+.vendor-page .nav-tabs .nav-link:hover:not(.active) {+ color: #fff;+ background-color: #000;+}+.vendor-page .nav-tabs .nav-link::before {+ content: "";+ position: absolute;+ bottom: 0px;+ left: 50%;+ right: 50%;+ width: 0;+ height: 100%;+ background: #333;+ -webkit-transition: all 0.2s ease-out;+ transition: all 0.2s ease-out;+ z-index: -1;+}+.vendor-page .nav-tabs .nav-link:hover::before {+ left: 0;+ right: 0;+ width: 100%;+}+.vendor-page .nav-tabs .nav-link.active::before {+ background: #25b232;+ left: 0;+ right: 0;+ width: 100%;+}++/* catalog right side */++.sort-container {+ position: relative;+ display: inline-flex;+ align-items: flex-end;+ margin: 0 0 5px 0;+}+.sort-container.column {+ flex-direction: column;+ align-items: flex-start;+}+.sort-container:not(:last-child) {+ margin: 0 3px 0 0;+}+.sort-container .col-form-label {+ position: absolute;+ top: -10px;+ left: 4px;+ padding: 0 4px;+ background-color: #eaf0fa;+ font-size: 12px;+ font-weight: 400;+ white-space: nowrap;+}+.item-statistics {+ display: flex;+ align-items: flex-end;+ font-size: 16px;+ font-weight: 500;+}+.item-statistics .items-per-page span,+.item-statistics .items-separator {+ margin: 0 5px 0 0;+}+.search-page .change-view {+ display: none !important;+}+.b-avatar .b-avatar-img img {+ max-width: 100%;+ width: auto;+ height: auto;+ border-radius: 0;+}++/* category container */++.category-item {+ position: relative;+}+.category-item .content {+ bottom: 0;+ left: 0;+ right: 0;+ display: flex;+ flex-direction: column;+ align-items: flex-start;+ padding: 10px 0;+}+.category-item .content .title {+ font-size: 16px;+ font-weight: 700;+ letter-spacing: 1px;+}+.category-item .content span {+ color: #aaa;+ font-size: 16px;+ font-weight: 400;+}++/* selectors */++.catalog-selectors {+ background: #eaf0fa;+ padding: 10px;+}+.grid-icon {+ display: flex;+ align-items: center;+ justify-content: space-between;+ position: relative;+}+.grid-icon.cols-2 {+ width: 16px;+}+.grid-icon.cols-3 {+ width: 25px;+}+.grid-icon.cols-4 {+ width: 34px;+}+.grid-icon.cols-5 {+ width: 43px;+}+.grid-icon.cols-6 {+ width: 52px;+}+.grid-icon span::before {+ content: '';+ position: relative;+ top: 0;+ left: 0;+ width: 7px;+ display: flex;+ height: 7px;+ background: #aaa;+}+.grid-icon span::after {+ content: '';+ position: relative;+ top: 0;+ left: 0;+ width: 7px;+ display: flex;+ height: 7px;+ margin: 2px 0 0 0;+ background: #aaa;+}+.list-icon {+ display: flex;+ flex-direction: column;+ justify-content: space-between;+ width: 25px;+ height: 17px;+}+.list-icon span {+ display: flex;+ width: 100%;+ height: 3px;+ background: #aaa;+}+.viewmode-icon.selected .grid-icon span::before,+.viewmode-icon.selected .grid-icon span::after,+.viewmode-icon.selected .list-icon span {+ background: #25b232;+}+.viewmode-icon:hover .grid-icon span::before,+.viewmode-icon:hover .grid-icon span::after,+.viewmode-icon:hover .list-icon span {+ background: #25b232;+}++/* pagintaion */++.vue-pager {+ display: inline-flex;+ align-items: center;+ flex-wrap: wrap;+ margin: 0 0 10px 0;+}+.vue-pager div {+ color: #fff;+ font-size: 16px;+ font-weight: 700;+ margin: 0 5px 5px 0;+ padding: 8px 16px;+ border: 1px solid #1c1b1b;+ background-color: #1c1b1b;+ cursor: pointer;+}+.vue-pager div.current {+ color: #fff;+ background-color: #25b232;+ border-color: #25b232;+ cursor: not-allowed;+ pointer-events: none;+}++/* block-recently-viewed-products */++.block-recently-viewed-products .card a.picture {+ display: block;+ position: relative;+ height: 100%;+ overflow: hidden;+ background-color: #eaf0fa;+}+.block-recently-viewed-products .card a.picture::before {+ content: "";+ display: block;+ padding-top: 100%;+}+.block-recently-viewed-products .card a.picture img {+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+ max-width: 100%;+ margin: auto;+ background-color: #eaf0fa;+}++/* new cols */++.new-col-2 {+ -ms-flex: 0 0 50%;+ flex: 0 0 50%;+ max-width: 50%;+}+@media (min-width: 768px) {+ .new-col-3 {+ -ms-flex: 0 0 33.333333%;+ flex: 0 0 33.333333%;+ max-width: 33.333333%;+ }+ .viewmode-icon[data-cols='3'] {+ display: flex;+ }+}+@media (min-width: 768px) and (max-width: 1199px) {+ .generalLeftSide + .generalSideRight .viewmode-icon[data-cols='6'].selected ~ .viewmode-icon[data-cols='3'] .grid-icon span::before, .generalLeftSide + .generalSideRight .viewmode-icon[data-cols='6'].selected ~ .viewmode-icon[data-cols='3'] .grid-icon span::after {+ background: #25b232;+ }+}+@media (min-width: 1200px) {+ .new-col-4 {+ -ms-flex: 0 0 25%;+ flex: 0 0 25%;+ max-width: 25%;+ }+ .viewmode-icon[data-cols='4'] {+ display: flex;+ }+ .generalLeftSide:not(.show) + .generalSideRight .product-box.list .card-body {+ flex: 4;+ }+}+@media (min-width: 1260px) {+ .new-col-6, .new-col-5 {+ -ms-flex: 0 0 20%;+ flex: 0 0 20%;+ max-width: 20%;+ }+ .generalLeftSide.show + .generalSideRight .new-col-6, .generalLeftSide.show + .generalSideRight .new-col-5 {+ -ms-flex: 0 0 25%;+ flex: 0 0 25%;+ max-width: 25%;+ }+}+@media (min-width: 1400px) {+ .new-col-5 {+ -ms-flex: 0 0 20%;+ flex: 0 0 20%;+ max-width: 20%;+ }+ .generalLeftSide.show + .generalSideRight .new-col-5 {+ -ms-flex: 0 0 25%;+ flex: 0 0 25%;+ max-width: 25%;+ }+}+@media (min-width: 1680px) {+ .new-col-6 {+ -ms-flex: 0 0 16.666667%;+ flex: 0 0 16.666667%;+ max-width: 16.666667%;+ }+ .generalLeftSide.show + .generalSideRight .new-col-6 {+ -ms-flex: 0 0 25%;+ flex: 0 0 25%;+ max-width: 25%;+ }+ .generalLeftSide.show + .generalSideRight .col-for-5-xl {+ -ms-flex: 0 0 20%;+ flex: 0 0 20%;+ max-width: 20%;+ }+}+@media (min-width: 1920px) {+ .generalLeftSide.show + .generalSideRight .new-col-5, .generalLeftSide.show + .generalSideRight .new-col-6 {+ -ms-flex: 0 0 20%;+ flex: 0 0 20%;+ max-width: 20%;+ }+}+@media (max-width: 1600px) {+ .parallax-banner .content .title .up {+ font-size: 42px;+ }+ .parallax-banner .content .title .down {+ font-size: 18px;+ }+ .parallax-banner .content {+ max-width: 300px;+ }+}+@media (max-width: 1199px) {+ .generalSideRight {+ max-width: 100%;+ flex: 0 0 100%;+ margin: 0;+ }+ .parallax-banner {+ display: none;+ }+}+@media (max-width: 991px) {+ .catalog-page .generalTitle span {+ font-size: 16px;+ }+ .sort-container .custom-select {+ max-width: 135px;+ }+ .categoryGrid > .item-row {+ flex-wrap: nowrap;+ overflow-x: auto;+ overflow-y: hidden;+ }+ .generalLeftSide {+ position: fixed;+ top: 101px;+ left: 0;+ max-height: calc(100% - 185px);+ }+ .generalSideRight {+ position: static;+ margin: 0;+ overflow: visible;+ }+}+@media (max-width: 575px) {+ .sort-container, .sort-container:not(:last-child) {+ width: 100%;+ margin: 10px 0;+ }+ .sort-container .custom-select {+ max-width: 100%;+ }+ .sort-container.change-view {+ margin: 0;+ justify-content: flex-end;+ align-items: center;+ }+ .category-item .content .title {+ font-size: 14px;+ }+ .category-item .content span {+ font-size: 12px;+ }+}+@media (max-width: 420px) {+ .page:not(.account-page) .left-side-toggler .text {+ display: none;+ }+}+@media (max-width: 370px) {+ .sort-container:not(:last-child), a.left-side-toggler {+ margin: 5px 0;+ }+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/css/common/common.css b/src/Plugins/Theme.Modern/Content/css/common/common.cssnew file mode 100644index 000000000..d2c9429f9--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/common/common.css@@ -0,0 +1,3884 @@+.store-selector-container {+ position: sticky;+ position: -webkit-sticky;+ width: 100%;+ height: 88px;+ padding: 15px;+ background: #000;+ border-bottom: 1px solid #333;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+ z-index: 1037;+}+.store-selector-container:hover {+ z-index: 1041;+}+.store-selector-container.hide {+ transform: translateY(-100%);+ margin: -88px 0 0 0;+}+.store-selector-container .inside-container {+ display: flex;+ justify-content: space-between;+ align-items: center;+ width: 100%;+ max-width: 1270px;+ margin: 0 auto;+}+.store-selector-container .inside-container .btn-secondary.dropdown-toggle,+.store-selector-container .inside-container .btn-secondary.dropdown-toggle:hover,+.store-selector-container .inside-container .btn-secondary.dropdown-toggle:focus {+ color: #000;+ font-size: 16px;+ font-weight: 700;+ padding: 1rem 2rem;+ background-color: #fff;+ border-color: #fff;+ border-radius: .25rem;+}+.store-selector-container .inside-container .dropdown-toggle span {+ margin: 0 5px 0 0;+}+.store-selector-container .inside-container .close-add {+ cursor: pointer;+}+.store-selector-container .inside-container .close-add .text {+ color: #fff;+ font-size: 16px;+ font-weight: 700;+ margin: 0 10px 0 0;+ text-transform: uppercase;+}+.store-selector-container .inside-container .close-add .icon {+ position: relative;+ width: 38px;+ height: 38px;+}+.store-selector-container .inside-container .close-add .icon::before,+.store-selector-container .inside-container .close-add .icon::after {+ content: "";+ position: absolute;+ top: 9px;+ left: 0;+ width: 28px;+ height: 2px;+ background: #fff;+}+.store-selector-container .inside-container .close-add .icon::before {+ transform: rotate(45deg);+}+.store-selector-container .inside-container .close-add .icon::after {+ transform: rotate(-45deg);+}++/* devanagari */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 300;+ font-display: swap;+ src: url(../fonts/Poppins-Light.ttf) format('truetype');+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;+}+/* latin-ext */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 300;+ font-display: swap;+ src: url(../fonts/Poppins-Light.ttf) format('truetype');+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;+}+/* latin */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 300;+ font-display: swap;+ src: url(../fonts/Poppins-Light.ttf) format('truetype');+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;+}+/* devanagari */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 400;+ font-display: swap;+ src: url(../fonts/Poppins-Regular.ttf) format('truetype');+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;+}+/* latin-ext */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 400;+ font-display: swap;+ src: url(../fonts/Poppins-Regular.ttf) format('truetype');+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;+}+/* latin */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 400;+ font-display: swap;+ src: url(../fonts/Poppins-Regular.ttf) format('truetype');+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;+}+/* devanagari */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 500;+ font-display: swap;+ src: url(../fonts/Poppins-Medium.ttf) format('truetype');+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;+}+/* latin-ext */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 500;+ font-display: swap;+ src: url(../fonts/Poppins-Medium.ttf) format('truetype');+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;+}+/* latin */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 500;+ font-display: swap;+ src: url(../fonts/Poppins-Medium.ttf) format('truetype');+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;+}+/* devanagari */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 600;+ font-display: swap;+ src: url(../fonts/Poppins-SemiBold.ttf) format('truetype');+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;+}+/* latin-ext */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 600;+ font-display: swap;+ src: url(../fonts/Poppins-SemiBold.ttf) format('truetype');+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;+}+/* latin */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 600;+ font-display: swap;+ src: url(../fonts/Poppins-SemiBold.ttf) format('truetype');+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;+}+/* devanagari */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 700;+ font-display: swap;+ src: url(https://fonts.gstatic.com/s/poppins/v15/pxiByp8kv8JHgFVrLCz7Z11lFc-K.woff2) format('woff2');+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;+}+/* latin-ext */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 700;+ font-display: swap;+ src: url(../fonts/Poppins-Bold.ttf) format('truetype');+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;+}+/* latin */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 700;+ font-display: swap;+ src: url(../fonts/Poppins-Bold.ttf) format('truetype');+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;+}+/* devanagari */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 900;+ font-display: swap;+ src: url(../fonts/Poppins-ExtraBold.ttf) format('truetype');+ unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;+}+/* latin-ext */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 900;+ font-display: swap;+ src: url(../fonts/Poppins-ExtraBold.ttf) format('truetype');+ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;+}+/* latin */+@font-face {+ font-family: 'Poppins';+ font-style: normal;+ font-weight: 900;+ font-display: swap;+ src: url(../fonts/Poppins-ExtraBold.ttf) format('truetype');+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;+}++/* c-picker */++.picker-container .toggle-button {+ position: fixed;+ bottom: 135px;+ right: 15px;+ display: flex;+ justify-content: center;+ align-items: center;+ width: 70px;+ height: 70px;+ font-size: 32px;+ color: #fff;+ background: #4faacd;+ border: 5px solid #fff;+ border-radius: 100%;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+ cursor: pointer;+ z-index: 1041;+}+.picker-container .toggle-button:hover {+ -webkit-transform: scale(1.1);+ transform: scale(1.1);+}+.picker-container .toggle-button::before {+ content: '';+ position: absolute;+ top: -5px;+ right: -5px;+ bottom: -5px;+ left: -5px;+ border: 1px solid #d7d7d7;+ border-radius: 100%;+}+.c-picker {+ position: fixed;+ bottom: 15px;+ right: 15px;+ -webkit-transform: translateX(0);+ transform: translateX(0);+ -webkit-transition: all .3s ease-in-out;+ transition: all .3s ease-in-out;+ z-index: 1039;+}+.c-picker.hide {+ -webkit-transform: translateX(calc(100% + 15px));+ transform: translateX(calc(100% + 15px));+ right: 0;+}+.c-picker .content {+ display: flex;+ flex-direction: column;+ margin: 15px 0 0 0;+ padding: 15px;+ background-color: #fff;+ border-radius: 4px;+ box-shadow: 0 14px 28px rgba(0, 0, 0, .25), 0 10px 10px rgba(0, 0, 0, .22);+}+.c-picker .content input {+ color: #000;+ font-size: 16px;+ font-weight: 500;+ margin: 0 0 15px 0;+ padding: 5px;+ border: 1px solid #d7d7d7;+}+.c-picker .content .buttons {+ display: inline-flex;+ align-items: center;+ justify-content: space-between;+}+.c-picker .content .buttons .accept-button {+ display: flex;+ justify-content: center;+ align-items: center;+ text-align: center;+ color: #fff;+ background-color: #b57e10;+ border-radius: 4px;+ font-size: 18px;+ font-weight: 700;+ padding: 12px 18px;+ cursor: pointer;+}+.c-picker .content .buttons .circle {+ position: relative;+ display: flex;+ justify-content: center;+ align-items: center;+ width: calc(100% - 130px);+ height: 51px;+ border-radius: 4px;+ overflow: hidden;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.c-picker .content .buttons .circle span {+ opacity: 0;+ visibility: hidden;+ font-size: 32px;+ color: #fff;+ -webkit-transition: opacity .2s ease-in-out;+ transition: opacity .2s ease-in-out;+}+.c-picker .content .buttons .circle span.show {+ opacity: 1;+ visibility: visible;+}++/* 404 */++.page-not-found {+ display: flex;+ justify-content: center;+ align-items: center;+ flex-direction: column;+ min-height: 550px;+}+.not-found-container {+ display: flex;+ flex-direction: column;+ justify-content: center;+ align-items: center;+ margin: 30px 0;+}+.not-found-container h1 {+ margin: 0;+ font-size: 120px;+ font-weight: 900;+ line-height: 0.7;+}+.not-found-container .bottom {+ color: #25b232;+ margin: 0 0 0 auto;+ font-size: 23px;+ font-weight: 700;+ text-transform: uppercase;+}+.not-found-container .content {+ font-size: 28px;+ font-weight: 300;+ text-transform: uppercase;+}+.page-not-found ul {+ margin: 0;+ padding: 0;+}++/* backdrop menu */++.backdrop-menu {+ display: none;+ background: rgba(0,0,0,.5);+ position: fixed;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ z-index: 1000;+}+.backdrop-menu.show {+ display: block;+ animation: fadeBD .4s ease-in-out+}+.backdrop-menu.hide {+ display: none;+ animation: fadeOutBD .4s ease-in-out+}+@keyframes fadeBD {+ from {+ display: none;+ opacity: 0;+ visibility: hidden;+ }+ to {+ display: block;+ opacity: 1;+ visibility: visible;+ }+}+@keyframes fadeOutBD {+ from {+ display: block;+ opacity: 1;+ visibility: visible;+ }+ to {+ display: none;+ opacity: 0;+ visibility: hidden;+ }+}++/* commons */++a {+ color: #000;+}+a:hover {+ color: #25b232;+ text-decoration: none;+}+.date-text {+ color: #4C5357;+}+.dropdown-menu {+ min-width: unset;+}+.required:not(.form-control) {+ color: #dc3545;+ position: absolute;+}+.col-form-label {+ /*position: relative;+ top: 10px;+ left: 6px;*/+ padding: 0 4px;+ font-size: 12px;+ font-weight: 400;+ background-color: #fff;+ z-index: 1;+}+.field-validation-error {+ color: #dc3545;+ font-weight: 500;+}+.message-error ul {+ padding: 0;+ margin-bottom: 5px;+ color: #dc3545;+ font-weight: 500;+}+.custom-control {+ cursor: pointer;+}+.disabled {+ pointer-events: none;+}+.navbar-brand {+ margin: 0;+ padding: 0 15px 0 0;+ text-align: center;+}+.navbar-brand img {+ width: auto;+ height: auto;+ max-width: 150px;+ max-height: 50px;+ backface-visibility: hidden;+}+.cookie-bar-notification {+ position: fixed;+ bottom: 0;+ left: 0;+ right: 0;+ z-index: 1050;+}+body {+ font-family: 'Poppins', sans-serif;+}+body:not(.modal-open) {+ overflow-x: hidden;+}+.form-group {+ min-height: 38px;+}+.badge {+ font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";+}+.modal {+ -webkit-transition: none;+ transition: none;+}+.modal + .modal-backdrop {+ opacity: 0;+ -webkit-transition: opacity .15s linear;+ transition: opacity .15s linear;+}+.modal.fade + .modal-backdrop {+ opacity: .5;+}+[v-cloak] .page-loader-container::before {+ content: '';+ position: fixed;+ top: 0;+ left: 0;+ width: 100%;+ height: 100%;+ background: #fff;+ overflow: hidden;+ z-index: 1041;+}+[v-cloak] .page-loader,+[v-cloak] .page-loader:before,+[v-cloak] .page-loader:after {+ border-radius: 50%;+}+[v-cloak] .page-loader {+ color: #25b232;+ margin: 22.5px auto;+ position: fixed;+ top: calc(50% - 22.5px);+ left: calc(50% - 22.5px);+ width: 53px;+ height: 53px;+ box-shadow: inset 0 0 0 5px;+ -webkit-transform: translateZ(0);+ -ms-transform: translateZ(0);+ transform: translateZ(0);+ z-index: 1041;+}+[v-cloak] .page-loader:before,+[v-cloak] .page-loader:after {+ position: absolute;+ content: '';+}+[v-cloak] .page-loader:before {+ width: 27.5px;+ height: 55px;+ background: #25b232;+ background-color: #fff;+ border-radius: 55px 0 0 55px;+ top: -1px;+ left: -1px;+ -webkit-transform-origin: 27.5px 27.5px;+ transform-origin: 27.5px 27.5px;+ -webkit-animation: load2 2s infinite ease 1.5s;+ animation: load2 2s infinite ease 1.5s;+}+[v-cloak] .page-loader:after {+ width: 27.5px;+ height: 55px;+ background: #25b232;+ background-color: #fff;+ border-radius: 0 27.5px 27.5px 0;+ top: -1px;+ left: 27.5px;+ -webkit-transform-origin: -1px 27.5px;+ transform-origin: -1px 27.5px;+ -webkit-animation: load2 2s infinite ease;+ animation: load2 2s infinite ease;+}+@-webkit-keyframes load2 {+ 0% {+ -webkit-transform: rotate(0deg);+ transform: rotate(0deg);+ }+ 100% {+ -webkit-transform: rotate(360deg);+ transform: rotate(360deg);+ }+}+@keyframes load2 {+ 0% {+ -webkit-transform: rotate(0deg);+ transform: rotate(0deg);+ }++ 100% {+ -webkit-transform: rotate(360deg);+ transform: rotate(360deg);+ }+}+.up-btn {+ position: fixed;+ right: 15px;+ bottom: 15px;+ display: flex;+ align-items: center;+ justify-content: center;+ width: 46px;+ height: 46px;+ font-size: 24px;+ background: #25b232;+ border-radius: 4px;+ z-index: 1039;+ cursor: pointer;+ transition: all .2s ease;+ -webkit-transition: all .2s ease;+}+.up-btn.up-btn__hide {+ width: 0;+ height: 0;+ transform: translateX(calc(100% + 15px));+}+.up-btn:not(.up-btn__hide) div {+ position: relative;+ display: flex;+ justify-content: center;+ align-items: center;+ width: 100%;+ height: 100%;+ overflow: hidden;+}+.up-btn:not(.up-btn__hide) div::before {+ content: "";+ position: absolute;+ left: 20px;+ width: 15px;+ height: 2px;+ background: #fff;+ transform: rotate(45deg);+}+.up-btn:not(.up-btn__hide) div::after {+ content: "";+ position: absolute;+ right: 20px;+ width: 15px;+ height: 2px;+ background: #fff;+ transform: rotate(-45deg);+}+.item-row {+ display: -ms-flexbox;+ display: flex;+ -ms-flex-wrap: wrap;+ flex-wrap: wrap;+ margin-right: -7.5px;+ margin-left: -7.5px;+}+.item-row>.col, .item-row>[class*=col-] {+ padding-right: 0;+ padding-left: 0;+}++/* checkbox & radio */++.custom-control-input:checked ~ .custom-control-label::before {+ border-color: #25b232;+ background-color: #25b232;+}++/* modal */++.modal-content {+ border: 0;+ border-radius: 0;+}+button.close {+ color: #fff;+ text-shadow: none;+ opacity: 1;+}+button.close:hover {+ color: #25b232;+}++/* quickview */++#ModalQuickView .modal-body {+ padding: 30px;+}+.qv-title {+ margin: 0;+ font-size: 28px;+ font-weight: 700;+}+.quick-view .accordion {+ margin: 15px 0 0 0;+}+.quick-view .review-count {+ margin: 0 0 0 5px;+ color: #777;+ font-size: 12px;+ font-weight: 400;+}+.quick-view-overview .prices {+ margin: 0 0 15px 0;+}+.quick-view-overview .actual-price {+ color: #000;+ font-size: 28px;+ font-weight: 900;+ line-height: 1;+}+.quick-view-overview .bid {+ color: #000;+ font-size: 22px;+}+.quick-view-overview .old-price {+ color: #999;+ font-size: 18px;+ font-weight: 400;+ text-decoration: line-through;+ line-height: 1;+}+.quick-view-overview .qty-input,+.quick-view-overview .qty-dropdown {+ max-width: 65px;+ min-width: 65px;+ height: 60px;+ border: 1px solid #bebebe;+}+.quick-view-overview .bid-input {+ height: 45px;+}+.quick-view .add-to-cart-button {+ font-size: 20px;+ font-weight: 500;+ height: 45px;+ justify-content: center;+ align-items: center;+ background-color: #25b232;+ border: 1px solid #25b232;+}+.quick-view .spec-container tr {+ /* width: 100%;+ border-bottom: 1px solid #dee2e6;*/+}+.quick-view .spec-container tr td {+ /*display: inline-flex;*/+ /*border: 0;+ color: #000;*/+}+.quick-view .spec-container .spec-name {+ font-size: 16px;+ font-weight: 500;+}+.quick-view .attributes {+ margin: 0 0 15px 0;+ padding: 15px;+ border: 2px solid #333;+ border-radius: .25rem;+}+.quick-view .attributes table {+ margin: 0;+ border: 0;+}+.quick-view .attributes table tr:first-child td {+ border-top: 0;+}+.quick-view .attributes .attribute-name {+ font-size: 16px;+ font-weight: 500;+}+.quick-view .attributes .text-prompt {+ color: #555;+ font-size: 14px;+ font-weight: 400;+ width: 100%;+ display: flex;+}+.modal-open .image-square-tooltip {+ display: flex;+ align-items: flex-start;+ justify-content: center;+ flex-direction: column;+}+.modal-open .image-square-tooltip img {+ max-width: 165px;+}+.quick-view-overview .accordion .btn.collapse-button {+ display: inline-flex;+ justify-content: space-between;+ align-items: center;+ width: 100%;+ margin: 0 0 8px 0;+ padding: 8px 12px;+ font-size: 18px;+ font-weight: 700;+ border: 0;+ background-color: #fff;+ border: 2px solid #25b232;+ color: #000;+}+.quick-view-overview .accordion .btn.collapse-button .b-icon {+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.quick-view-overview .accordion .btn.collapse-button.not-collapsed .b-icon {+ -webkit-transform: rotate( 180deg );+ transform: rotate( 180deg );+}+.quick-view-overview .collapse-panel {+ padding: 7px 0 15px 0;+}+.quick-view .product-gallery img {+ max-width: 100%;+ background-color: #eaf0fa;+ border: 1px solid #ddd;+}+.quick-view .product-gallery {+ display: flex;+ flex-direction: column;+ align-items: flex-start;+ justify-content: center;+ flex-wrap: wrap;+ margin: 0 0 10px 0;+}+.quick-view .product-gallery .swiper-container {+ width: 100%;+}+.quick-view .product-gallery .thumbs {+ margin: 10px 0 0 0;+}+.quick-view .product-gallery .thumbs .swiper-slide {+ border: 2px solid transparent;+ cursor: pointer;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.quick-view .thumbs .swiper-slide-active, .quick-view .thumbs .swiper-slide:hover {+ border: 2px solid #000;+}+.quick-view .linked-product-grid {+ border-top: 1px solid #ddd;+ margin: 7.5px 0;+ padding: 7.5px 0;+}+.quick-view .qty-controls {+ display: flex;+ flex-direction: column;+ align-items: center;+ justify-content: center;+ height: 60px;+ background: #fff;+}+.quick-view .qty-controls div {+ display: flex;+ justify-content: center;+ align-items: center;+ position: relative;+ width: 30px;+ height: 30px;+ border: 1px solid #bebebe;+ border-right: 0;+ cursor: pointer;+}+.quick-view .qty-controls div.plus::before, .quick-view .qty-controls div.plus::after, .quick-view .qty-controls div.minus::before {+ content: "";+ position: absolute;+ top: 13px;+ left: 9px;+ width: 12px;+ height: 2px;+ display: flex;+ justify-content: center;+ background: #000;+}+.quick-view .qty-controls div.plus:hover::before, .quick-view .qty-controls div.plus:hover::after, .quick-view .qty-controls div.minus:hover::before {+ background: #111;+}+.quick-view .qty-controls div.plus::after {+ transform: rotate( 90deg );+ -webkit-transform: rotate( 90deg );+}+.quick-view .qty-controls div:last-child {+ border-top: 0;+}++/* ModalBanner */++#ModalBanner .modal-dialog {+ max-width: 800px;+}+#ModalBanner .modal-dialog .modal-body {+ padding: 0;+}+#ModalBanner .modal-content {+ background-color: #000;+ border: 1px solid #25b232;+}+#ModalBanner img {+ max-width: 100%;+}+#ModalBanner .content {+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+ display: flex;+ flex-direction: column;+ justify-content: center;+ align-items: flex-start;+ padding: 30px;+}+#ModalBanner .content .title .top {+ font-size: 38px;+ font-weight: 700;+}+#ModalBanner .content .title .bottom {+ font-size: 18px;+ font-weight: 300;+}+#ModalBanner .content input.form-control {+ margin: 10px 0;+ max-width: 40%;+ background-color: rgba(255,255,255,.05);+ border-color: #efefef;+ z-index: 1;+}+#ModalBanner .input-placeholder {+ display: block;+ position: relative;+ width: 100%;+ height: 0;+ -webkit-transition: all .1s ease-in-out;+ transition: all .1s ease-in-out;+}+#ModalBanner .content input.form-control:focus + .input-placeholder {+ opacity: 0;+ visibility: hidden;+}+#ModalBanner .input-placeholder::before {+ content: "Leave us your email...";+ position: absolute;+ top: -39px;+ bottom: 0;+ left: 12px;+ display: flex;+ justify-content: flex-start;+ color: #aaa;+ font-size: 14px;+ font-weight: 300;+ z-index: 0;+}+#ModalBanner .content #send-interactive-form.btn-success {+ background-color: transparent;+ border: 1px solid #25b232;+ font-weight: 700;+ text-transform: uppercase;+}+#ModalBanner .flying-content {+ position: absolute;+ bottom: 30px;+ left: 30px;+}+#ModalBanner .flying-content ul {+ display: inline-flex;+ margin: 0;+ padding: 0;+}+#ModalBanner .flying-content ul li {+ margin: 0 12px 0 0;+}+#ModalBanner .flying-content ul li img {+ width: 22px;+ height: 22px;+ filter: invert(1);+}++/* Parallax Banner */++.wrapper {+ position: relative;+ display: flex;+ overflow: hidden;+ text-align: left;+ align-items: center;+ flex-direction: column;+ justify-content: center;+ margin: 0 -15px 30px -15px;+ min-height: 400px;+ z-index: 1;+}+.wrapper img {+ position: absolute;+ top: 0;+ left: 0;+ width: 100%;+ height: calc(100% + 11rem);+ object-fit: cover;+ pointer-events: none;+ z-index: 10;+}+.wrapper .content {+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+ display: flex;+ flex-direction: column;+ align-items: center;+ justify-content: center;+ background-image: linear-gradient(to right, rgba(0,0,0,.9), rgba(0,0,0,.2)50%, rgba(0,0,0,.9) 100%);+ padding: 30px;+ text-align: center;+ z-index: 10;+}+.wrapper .content .gold-title {+ color: #25b232;+ font-size: 22px;+ font-weight: 700;+}+.wrapper .content .top-title {+ font-size: 46px;+ font-weight: 700;+ margin: 0 0 15px 0;+ line-height: 1;+}+.wrapper .content .bottom-title {+ font-size: 22px;+ font-weight: 300;+ margin: 0 0 30px 0;+ line-height: 1;+}+.wrapper .content .button .btn {+ background-color: rgba(0,0,0,.2);+ border: 2px solid #fff;+}+.wrapper .content .button .btn:hover {+ background-color: #000;+ border-color: #25b232;+}++/* toast */++.b-toast-info .toast, .b-toast-info .toast .toast-header {+ color: #fff;+ background-color: rgba(28, 27, 27, .9);+ border-color: #25b232;+ border-radius: 4px;+}+.b-toast-info .toast {+ color: #ccc;+ background-color: rgba(28, 27, 27, .9);+}+.b-toast-info.b-toast-solid .toast {+ background-color: rgba(28, 27, 27, .9);+}+.b-toast-info .toast .toast-header {+ border-bottom-left-radius: 0;+ border-bottom-right-radius: 0;+}+.b-toaster.b-toaster-top-right {+ top: 62px;+ right: 15px;+}+.b-toast-info .toast a {+ color: #fff;+}+/* card */+.card {+ background-color: #fff;+ border: 1px solid rgba(0,0,0,.1);+}+.card-header {+ font-size: 18px;+ font-weight: 700;+ background-color: #eaf0fa;+ border-bottom: 1px solid rgba(0,0,0,.1);+}++/* forms */++.form-control {+ color: #1c1b1b;+ background-color: #fff;+ border: 1px solid rgba(0,0,0,.2);+ border-radius: 0;+}+.form-control:focus,+.form-control:hover {+ border-color: #25b232;+ box-shadow: none;+}+.form-control:disabled, .form-control[readonly], .form-control:hover:disabled, .form-control[readonly]:hover {+ color: #aaa;+ background-color: #fff;+ border-color: #333;+}+.input-group-append .btn, .input-group-prepend .btn {+ height: 100%;+ padding: .375rem .75rem;+}+.custom-select {+ font-size: 14px;+ font-weight: 500;+ color: #1c1b1b;+ min-width: 75px;+ min-height: 40px;+ background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23000' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px;+ border: 2px solid #1c1b1b;+}++/* page */++.page {+ min-height: 450px;+ margin: 15px 0 0 0;+}++/* no data */++.no-data.alert.alert-info {+ display: table;+ margin: 0 auto;+}++/* backgrounds */++.bg-black, .flag-label .black {+ background-color: #1c1b1b;+}+.bg-dark {+ background-color: #1c1b1b !important;+}+.bg-brown, .flag-label .brown {+ background: #795548;+}+.bg-pink, .flag-label .pink {+ background: #E91E63;+}+.bg-red, .flag-label .red, .flag-label .danger {+ background: #F44336;+}+.bg-blue, .flag-label .blue {+ background: var(--light-blue);+}+.bg-cyan, .flag-label .cyan {+ background: Cyan;+}+.bg-teal, .flag-label .teal {+ background: #009688;+}+.bg-lime, .flag-label .lime {+ background: #CDDC39;+}+.bg-orange, .flag-label .orange {+ background: #FF5722;+}+.bg-green, .flag-label .green {+ background: #4CAF50;+}+.bg-purple, .flag-label .purple {+ background: #673AB7;+}+.bg-gray, .flag-label .gray {+ background: #777;+}++/* texts */++.text-gold {+ color: #25b232;+}++/* shadows */++.bottom-shadow {+ box-shadow: 0px 15px 10px -10px #1c1b1b;+}++/* dropdowns */++.btn.dropdown-toggle {+ padding: 2px 14px;+ color: #efefef;+}+.btn.dropdown-toggle + .dropdown-menu {+ background-color: #242424;+ border: 1px solid #333;+ border-radius: 0;+}+.btn.dropdown-toggle + .dropdown-menu .dropdown-item {+ padding: 3px 10px;+ color: #aaa;+ background-color: transparent;+}+.btn.dropdown-toggle + .dropdown-menu li.active .dropdown-item {+ color: #efefef;+}++/* auctions */++.countdown-box.alert-info {+ color: #25b232;+ font-weight: 500;+ background-color: transparent;+ border: 2px solid #333;+}++/* sitemap */++.sitemap-page .list-group-item {+ color: #fff;+ background-color: #1c1b1b;+ border: 1px solid #333;+}++/* preloader */++.preloader {+ position: absolute;+ width: 4rem;+ height: 4rem;+ border: 0.2rem solid #25b232;+ border-radius: 100%;+}+.preloader:before,+.preloader:after {+ content: '';+ position: absolute;+ top: 50%;+ left: 50%;+ margin: -0.1rem 0 0 -0.1rem;+ border-bottom: 0.2rem solid #25b232;+ border-radius: 0.3rem;+ -webkit-transform-origin: 0.1rem center;+}+.preloader:before {+ width: 30%;+ -webkit-animation: rotate 10s linear infinite;+}+.preloader:after {+ width: 40%;+ background-color: #25b232;+ -webkit-animation: rotate 1s linear infinite;+}+@-webkit-keyframes rotate {+ 100% {+ -webkit-transform: rotate(360deg);+ }+}+.preloader {+ top: 0;+ bottom: 0;+ left: 0;+ right: 0;+ margin: auto;+}++/* swiper customs */++.swiper-container {+ position: relative;+ overflow: hidden;+}+.swiper-button-next, .swiper-button-prev {+ display: flex;+ justify-content: center;+ align-items: center;+ width: 50px;+ height: 80px;+ opacity: 0;+ -webkit-transition: all.4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+ transition: all .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+}+.swiper-button-prev, .swiper-container-rtl .swiper-button-next {+ left: -1px;+ -webkit-transform: translateX(-100%);+ transform: translateX(-100%);+}+.swiper-button-next, .swiper-container-rtl .swiper-button-prev {+ right: -1px;+ -webkit-transform: translateX(100%);+ transform: translateX(100%);+}+.swiper-container:hover .swiper-button-prev, .swiper-container:hover .swiper-button-next {+ -webkit-transform: translateX(0);+ transform: translateX(0);+ opacity: 1;+}+.swiper-button-next:after, .swiper-button-prev:after {+ display: flex;+ align-items: center;+ justify-content: center;+ width: 100%;+ height: 100%;+ color: #fff;+ font-size: 24px;+ background: #1c1b1b;+ border: 1px solid #333;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.swiper-button-next:hover:after, .swiper-button-prev:hover:after {+ background-color: #25b232;+}+.swiper-container-horizontal > .swiper-pagination-bullets, .swiper-pagination-custom, .swiper-pagination-fraction {+ display: inline-flex;+ justify-content: center;+ align-items: center;+ height: 22px;+ bottom: 5%;+}+.swiper-pagination-bullet {+ background: #000;+ width: 25px;+ height: 10px;+ border-radius: 0;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.swiper-pagination-bullet:not(.swiper-pagination-bullet-active):hover {+ opacity: 1;+ background: #25b232;+ width: 40px;+}+.swiper-pagination-bullet-active {+ background: #1c1b1b;+ width: 40px;+ height: 10px;+}+.swiper-container-horizontal > .swiper-scrollbar {+ bottom: unset;+ bottom: 0;+ left: 0;+ width: 100%;+}+.swiper-scrollbar.progressAnimation .swiper-scrollbar-drag {+ animation-name: mymove;+ animation-timing-function: linear;+}+.swiper-scrollbar-drag {+ height: 100%;+ width: 100% !important;+ transform: none !important;+ position: relative;+ background: #25b232;+ border-radius: 0;+ left: 0;+ top: 0;+}+.swiper-lazy {+ transition: all .2s ease-in-out;+ -webkit-transition: all .2s ease-in-out;+}+.swiper-lazy-loading, .swiper-lazy {+ opacity: 0;+ visibility: hidden;+}+.swiper-lazy-loaded.swiper-lazy {+ opacity: 1;+ visibility: visible;+}+.swiper-container.o-visible {+ overflow: visible;+}+@-webkit-keyframes mymove {+ from {+ transform: scaleX(0);+ }+ to {+ transform: scaleX(1);+ }+}++/* aniamtion delays */++.animate__delay-05s {+ animation-delay: .5s;+}+.animate__delay-15s {+ animation-delay: 1.5s;+}+.animate__delay-25s {+ animation-delay: 2.5s;+}+.animate__delay-35s {+ animation-delay: 3.5s;+}++/* left side container */++.left-side-container {+ position: -webkit-sticky;+ position: sticky;+ top: 0;+ display: flex;+ justify-content: flex-end;+ flex-direction: column;+ width: 100%;+ height: 195px;+ margin: 0 0 15px 0;+ padding: 15px 0 0 0;+ background-color: #fff;+ border-bottom: 1px solid rgba(0,0,0,.1);+ direction: rtl;+ z-index: 1034;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.left-side-container * {+ direction: ltr;+}+.left-side-container::-webkit-scrollbar-track {+ -webkit-box-shadow: inset 0 0 4px rgba(0,0,0,0.3);+ border-radius: 4px;+ background-color: #232323;+}+.left-side-container::-webkit-scrollbar {+ width: 8px;+ background-color: #232323;+}+.left-side-container::-webkit-scrollbar-thumb {+ border-radius: 4px;+ -webkit-box-shadow: inset 0 0 4px rgba(0,0,0,.3);+ background-color: #5C5959;+}++/* sidebar common */++.b-sidebar {+ height: 100vh;+ min-height: 100vh;+}++/* Menu */++ .Menu {+ display: none;+ position: relative;+}+/* Three basic menu layouts */+/* This also enforces that menu is a ul, and that * layout modifier is specified */+ul.Menu.-vertical {+ position: relative;+ display: flex;+ flex-direction: column;+ width: 100%;+ height: 100%;+ margin: 20px 0 0 0;+ padding: 0;+}+ ul.Menu.-floating {+ display: block;+ position: absolute;+}+/* Menu and menu-item layout */+ .Menu, .Menu li, .Menu li > ul {+ list-style: none;+ padding: 0px;+ margin: 0px;+}+ .Menu li {+ position: relative;+ word-break: break-word;+ cursor: pointer;+ min-width: 100%;+}+ .Menu > li {+ padding: 0 15px 0 15px;+ }+ .Menu > li.category > a {+ color: #000;+ font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";+ font-size: 14px;+ font-weight: 700;+ text-transform: uppercase;+ padding: 12px 5px;+ margin: 0 0 5px 0;+ line-height: 1;+ }+ .Menu li.category img {+ margin: 0 0 10px 0;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+ }+ .Menu > li.other-links:first-of-type {+ margin: 15px 0 0 0;+ }+ .Menu li .badge {+ position: absolute;+ top: -8px;+ left: 5px;+ padding: 4px 5px;+ font-size: 10px;+ font-weight: 500;+}+ .Menu li.sub-cat-name-container a {+ font-weight: 500;+}+ .Menu li .back {+ display: flex;+ align-items: center;+ width: 100%;+ padding: 10px;+ font-weight: 500;+}+ .Menu li .back .b-icon.bi {+ font-size: 16px;+ margin: 0 15px 0 0;+}+ .Menu li > * {+ display: block;+ position: relative;+}+ .Menu li.home-link {+ width: calc(100% - 20px);+ margin: 0 0 10px 0;+ padding: 0 0 10px 0;+ border-bottom: 1px solid rgba(0,0,0,.2);+ }+ .Menu li > ul {+ position: absolute;+ min-width: 200px;+ top: 0;+ left: 100%;+ display: none;+ padding: 20px;+ opacity: 0;+ -webkit-transform: rotateX(90deg);+ transform: rotateX(90deg);+ visibility: hidden;+ border: 1px solid rgba(0,0,0,.1);+ -webkit-transition: transform .4s cubic-bezier(.19,1,.22,1);+ transition: transform .4s cubic-bezier(.19,1,.22,1);+}+ .Menu li.other-links > ul {+ display: block;+ max-width: calc(100% - 20px);+ min-width: calc(100% - 20px);+ position: static;+ opacity: 1;+ visibility: visible;+ padding: 10px 0 0 0;+ margin: 10px 0 20px 0;+ border: 0;+ border-top: 1px solid rgba(0,0,0,.2);+ }+ .Menu li > ul.gallery > li {+ display: flex;+ flex-wrap: wrap;+ min-width: unset;+ height: 100%;+ margin: 0 10px 0 0;+ }+ .Menu li > ul.gallery > li.-hasSubmenu > .next-level {+ display: flex;+ flex-direction: column;+ position: static;+ width: 100%;+ background-color: transparent;+ -webkit-transform: none;+ transform: none;+ padding: 0 0 15px 0;+ border: 0;+ opacity: 1;+ visibility: visible;+ }+ .Menu li.-hasSubmenu > ul.gallery > li.category > a {+ color: #000;+ font-size: 16px;+ font-weight: 900;+ text-transform: uppercase;+ padding: 0 0 10px 0;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+ }+ .Menu li > ul.gallery > li.-hasSubmenu > a:after {+ display: none;+ }+ .Menu li ul.-visible {+ animation: fadeInMenu .3s ease-in-out;+ }+ @keyframes fadeInMenu {+ from {+ display: none;+ opacity: 0;+ -webkit-transform: rotateX(25deg);+ transform: rotateX(25deg);+ visibility: hidden;+ }+ to {+ opacity: 1;+ visibility: visible;+ -webkit-transform: rotateX(0);+ transform: rotateX(0);+ display: flex;+ }+ }+ @keyframes fadeOutMenu {+ from {+ opacity: 1;+ visibility: visible;+ -webkit-transform: rotateX(0);+ transform: rotateX(0);+ display: flex;+ }+ to {+ display: none;+ opacity: 0;+ -webkit-transform: rotateX(25deg);+ transform: rotateX(25deg);+ visibility: hidden;+ }+ }+/* Menu behaviour */+ .Menu li > ul.-visible, ul.Menu.-floating.-visible {+ display: flex;+ flex-direction: column;+ opacity: 1;+ visibility: visible;+ transform: rotateX(0);+ z-index: 2;+}+ .Menu li > ul.-visible.-animating {+ animation: fadeOutMenu .3s ease-out;+ }+ .Menu li > ul.-visible.gallery {+ flex-direction: row;+ flex-wrap: wrap;+ justify-content: flex-start;+ overflow-x: hidden;+ overflow-y: auto;+ max-height: calc(100vh - 200px);+ }+.Menu li.-hasSubmenu > .go-forward {+ display: none;+}+/* Menu animation */+.Menu li > ul, .Menu.-floating {+ opacity: 1;+ transform: scale(1) translateY(0px);+ transform-origin: left top;+}+ .Menu.-alignRight li > ul, .Menu.-floating.-alignRight {+ transform-origin: right top;+}+/* Menu item icons */+ .Menu *[data-icon]:before {+ position: absolute;+ left: 0px;+ top: 0px;+ bottom: 0px;+ margin: auto 0px;+}+ .Menu .Icon, .Menu *[data-icon]:before {+ line-height: inherit;+}+ .Menu .Icon {+ padding: 0px;+}+ .Menu *:empty[data-icon] {+ padding-left: 0px !important;+ padding-right: 0px !important;+}+/* Submenu chevrons */+ .Menu li.-hasSubmenu > a:after, .Menu li.-hasSubmenu > div:after {+ display: block;+ position: absolute;+ width: 8px;+ height: 8px;+ right: 8px;+ bottom: 0px;+ top: 0px;+ margin: auto 0px;+ transform: rotate(45deg);+ border-width: 1px;+ border-color: black;+ border-style: solid solid none none;+ content: "";+}+ .Menu li.-hasSubmenu.-noChevron > a:after, .Menu li.-hasSubmenu.-noChevron > div:after {+ display: none;+}+.Menu {+ font-family: 'Poppins', sans-serif;+ line-height: 28px;+}+ .Menu *[data-icon]:before, .Menu .Icon {+ width: 40px;+ height: 40px;+}+ .Menu *[data-icon] {+ min-width: 40px;+ min-height: 40px;+ padding-left: 40px;+}+/* Default font settings for menu */+ .Menu {+ font-size: 16px;+}+/* Icon font sizes */+ .Menu *[data-icon]:before, .Menu .Icon {+ font-size: 24px;+}+/* For submenus */+.Menu > li ul .Icon, .Menu.-floating .Icon, .Menu > li ul *[data-icon]:before, .Menu.-floating *[data-icon]:before {+ font-size: 18px;+}+/* Colouring of menus */+/* Foreground */+ .Menu, .Menu li.-hasSubmenu > a:after, .Menu li.-hasSubmenu > div:after {+ color: #aaa;+ border-color: #aaa;+ /* chevron colour */+}+/* Background */+ .Menu ul, .Menu.-floating {+ background-color: #fff;+}+ .Menu ul.opacity {+ background-color: rgba(28, 27, 27, .95);+ }+/* Padding for each menu item */+ .Menu li > * {+ padding: 0px 12px;+}+/* Indent of chevron */+ .Menu li li.-hasSubmenu > a:after, .Menu > li.-hasSubmenu > a:after {+ right: 0;+}+ .Menu li li.-hasSubmenu > a {+ padding-right: 28px;+}+/* Minimum width of dropdown menus */+ .Menu.-floating {+ min-width: 200px;+}+/* Styling of hyperlink text */+ .Menu li > a, .Menu li > div {+ display: flex;+ align-items: center;+ width: 100%;+ padding: 5px 10px;+ font-size: 14px;+ font-weight: 400;+ text-decoration: none;+ color: #fff;+}+ .Menu > li > a {+ /* text-transform: uppercase; */+ }+ .Menu li .category-icon {+ margin: 0 6px 0 0;+ }+ .Menu li .category-icon.bi-blank {+ display: none;+ }+ .Menu li.-hasSubmenu ul li a {+ color: #000;+ font-size: 14px;+ font-weight: 400;+ display: flex;+ flex-direction: column;+ flex-wrap: wrap;+ align-items: flex-start;+ padding: 0;+ }+/* Animation speed of :hover shading */+ .Menu li > a:first-child {+ transition: background-color 0.2s;+}+/* Colour of :hover shading */+ .Menu li > a:hover,+ .Menu li > ul.gallery > li.-hasSubmenu > a:hover,+ .Menu li.-hasSubmenu .next-level > li > a:hover,+ .Menu li.-hasSubmenu > ul.gallery > li > a:hover, .Menu li.-hasSubmenu ul:not(.gallery) > li a:hover {+ color: #25b232;+}+ .Menu li > ul.gallery > li.-hasSubmenu.category > a:hover img,+ .Menu li.-hasSubmenu .next-level > li.category > a:hover img,+ .Menu li.-hasSubmenu > ul.gallery > li.category > a:hover img {+ border-color: #25b232;+}++/* bootstrap slider */++#GrandCarousel .link {+ cursor: pointer;+}++/* buttons */++.btn {+ padding: .8rem 2.5rem;+ font-size: 14px;+ font-weight: 700;+ border-radius: 0;+}+.btn-sm {+ padding: .5rem 1rem;+}+.btn-secondary {+ background-color: #1c1b1b;+ border-color: #1c1b1b;+}+.btn-secondary:hover, .btn-secondary.focus, .btn-secondary:focus, .btn-secondary:not(:disabled):not(.disabled).active, .btn-secondary:not(:disabled):not(.disabled):active, .show>.btn-secondary.dropdown-toggle {+ background-color: #353030;+ border-color: #353030;+ box-shadow: none;+}+.btn-outline-secondary {+ color: #1c1b1b;+ border-color: rgba(0,0,0,.2);+}+.btn-outline-secondary:hover {+ background-color: #111;+ border-color: #aaa;+}+.btn.disabled, .btn:disabled {+ opacity: 0.85;+}+.btn-outline-info {+ color: #000;+ background-color: #fff;+ border-color: #25b232;+}+.btn-outline-info:hover, .btn-outline-info .focus, .btn-outline-info :focus, .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: #25b232;+ border-color: #25b232;+}+.btn-info {+ color: #fff;+ background-color: #25b232;+ border-color: #25b232;+}+.btn-info:hover, .btn-info .focus, .btn-info:focus, .btn-info:not(:disabled):not(.disabled).active, .btn-info:not(:disabled):not(.disabled):active, .show > .btn-info .dropdown-toggle, .btn-info:not(:disabled):not(.disabled).active, .btn-info:not(:disabled):not(.disabled):active, .show > .btn-info.dropdown-toggle {+ color: #fff;+ background-color: #000;+ border-color: #000;+}++/* headings */++.generalTitle, .page-page .page-title > h1 {+ position: relative;+ font-family: 'Poppins', sans-serif;+ background-color: #fff;+ display: table;+ font-size: 38px;+ font-weight: 700;+ text-transform: uppercase;+ text-align: left;+ margin: 10px auto;+ line-height: 1;+}++h5.generalTitle {+ position: relative;+ font-family: 'Poppins', sans-serif;+ background-color: #fff;+ display: table;+ font-size: 22px;+ font-weight: 700;+ text-transform: uppercase;+ text-align: left;+ margin: 10px auto;+ line-height: 1;+}++.generalTitle > span {+ background-color: #fff;+ display: table;+ font-size: 27px;+ font-weight: 700;+ text-transform: uppercase;+ text-align: left;+ margin: 0 auto 0 0;+}+.generalTitle > span::before {+ content: "";+ position: absolute;+ top: 50%;+ right: 0;+ width: 100%;+ height: 1px;+ background: linear-gradient(to right, rgba(0,0,0,.2), transparent);+ z-index: -1;+}+.generalTitle div {+ padding: 0 10px 0 0;+ background-color: #fff;+ display: table;+ font-size: 38px;+ font-weight: 700;+ text-transform: uppercase;+ text-align: left;+ margin: 30px auto;+ position: relative;+ line-height: 1;+}+.generalTitle div::before {+ content: "";+ position: absolute;+ bottom: 5px;+ right: 0px;+ width: 8px;+ height: 8px;+ background: #25b232;+}+.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {+ line-height: 1.3;+}+dl, ol, ul {+ list-style-type: none;+}++/* utilities */++.generalMarginSupporter {+ margin: 15px 0;+}+.share-info {+ overflow-wrap: break-word;+ word-wrap: break-word;+ -ms-word-break: break-all;+ word-break: break-all;+ word-break: break-word;+ -ms-hyphens: auto;+ -moz-hyphens: auto;+ -webkit-hyphens: auto;+ hyphens: auto;+}++/* modals */++.modal-close {+ position: absolute;+ top: 4px;+ right: 4px;+ display: flex;+ align-items: center;+ justify-content: center;+ width: 45px;+ height: 45px;+ padding: 0;+ background-color: #1c1b1b;+ border: 1px solid #333;+ border-radius: 0;+ color: #fff;+ font-size: 28px;+ cursor: pointer;+ z-index: 3;+}+.modal-close:hover, .modal-close:focus, .modal-close:not(:disabled):not(.disabled):active {+ color: #fff;+ background-color: #1c1b1b;+ border-color: #aaa;+ box-shadow: none !important;+}+.modal-place .b-overlay-wrap {+ position: fixed !important;+ width: 100%;+ height: 100%;+ z-index: 1050;+}+#ModalAddToCart img {+ background-color: #eaf0fa;+}+#ModalAddToCart .card {+ border: 1px solid #25b232;+}++/* color squares */++.color-squares input {+ position: absolute;+ visibility: hidden;+}+input ~ .color-container .color {+ position: relative;+ cursor: pointer;+}+input:checked ~ .color-container .color::before {+ content: "";+ position: absolute;+ top: -8px;+ left: 12px;+ width: 18px;+ height: 18px;+ display: flex;+ color: #fff;+ 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");+ background-size: 50% 50%;+ background-repeat: no-repeat;+ background-position: center center;+ border-radius: 100%;+ background-color: #25b232;+ z-index: 5;+}++/* voice navigator */++.voice-page-button {+ position: fixed;+ bottom: 70px;+ right: 15px;+ display: flex;+ justify-content: center;+ align-items: center;+ width: 45px;+ height: 45px;+ font-size: 22px;+ background-color: #fff;+ border: 1px solid rgba(0,0,0,.2);+ border-radius: 100%;+ box-shadow: 0px 12px 28px rgba(0,123,255,.25), 0 -4px 14px rgba(0,123,255,.25);+ transition: all .2s ease-in-out;+ -webkit-transition: all .2s ease-in-out;+ z-index: 1033;+}+.voice-page-button.focus, .voice-page-button:focus {+ box-shadow: 0px 12px 28px rgba(0,123,255,.25), 0 -4px 14px rgba(0,123,255,.25);+}+.voice-page-button.focus {+ animation: boxShadow 2s infinite;+}+.voice-alert {+ -webkit-user-select: none;+ -moz-user-select: none;+ user-select: none;+ pointer-events: none;+ z-index: 1035;+}+.recording-aniamtion {+ animation: fadeInOut 2s infinite;+}+.recording-window {+ display: inline-flex;+ align-items: center;+ flex-wrap: nowrap;+ width: 100%;+}+.recording-window .b-icon {+ font-size: 28px;+}+.recording-window input.form-control {+ width: 100%;+ background-color: transparent;+ border: 0;+ box-shadow: none;+ color: #212529;+ font-size: 28px;+ font-weight: 500;+ text-overflow: ellipsis;+}++@keyframes boxShadow {+ 0% {+ box-shadow: 0px 12px 28px #2196F3, 0 -4px 14px #2196F3;+ }+ 25% {+ box-shadow: 0px 12px 28px #4A148C, 0 -4px 14px #4A148C;+ }+ 50% {+ box-shadow: 0px 12px 28px #9C27B0, 0 -4px 14px #9C27B0;+ }+ 75% {+ box-shadow: 0px 12px 28px #4A148C, 0 -4px 14px #4A148C;+ }+ 100% {+ box-shadow: 0px 12px 28px #2196F3, 0 -4px 14px #2196F3;+ }+}+@keyframes fadeInOut {+ 0% {+ opacity: 0;+ }+ 50% {+ opacity: 1;+ }+ 100% {+ opacity: 0;+ }+}++/* search box */++#voiceSearchButton {+ position: relative;+ color: #1c1b1b;+ margin: 0 3px;+ border-radius: 0;+ box-shadow: none;+ transition: all .2s ease-in-out;+ -webkit-transition: all .2s ease-in-out;+ z-index: 4;+}+#voiceSearchButton.focus {+ animation: boxShadow 2s infinite;+}+@keyframes boxShadow {+ 0% {+ box-shadow: 0px 12px 28px #2196F3, 0 -4px 14px #2196F3;+ }+ 25% {+ box-shadow: 0px 12px 28px #4A148C, 0 -4px 14px #4A148C;+ }+ 50% {+ box-shadow: 0px 12px 28px #9C27B0, 0 -4px 14px #9C27B0;+ }+ 75% {+ box-shadow: 0px 12px 28px #4A148C, 0 -4px 14px #4A148C;+ }+ 100% {+ box-shadow: 0px 12px 28px #2196F3, 0 -4px 14px #2196F3;+ }+}+.annotation {+ padding: 15px;+ position: absolute;+ min-height: 58px;+ bottom: calc(-100% - 29px);+ left: 0;+ background-color: #1c1b1b;+ border: 1px solid #333;+}+.search-item {+ position: relative;+ padding: 0;+ margin: 0;+ width: 100%;+}+#small-searchterms {+ margin: 0 -1px 0 0;+ height: 50px;+ color: #000;+ background-color: #fff;+ border: 2px solid #d7d7d7d7;+}+#small-searchterms:hover, #small-searchterms:hover + .input-group-append .btn, #small-searchterms + .input-group-append .btn:hover {+ border-color: #25b232;+}+#small-searchterms::placeholder {+ color: #777;+ font-size: 14px;+ font-weight: 400;+}+#small-searchterms + .input-group-append .btn {+ padding: 0 20px;+ font-size: 22px;+ border: 2px solid #d7d7d7;+ color: #000;+ background-color: #fff;+}+.search-box-select {+ max-width: 100px;+ height: 50px;+ background-color: #fff;+ border: 2px solid #d7d7d7d7;+}+.search-box-select + .input-group-append {+ margin-left: -2px;+ background-color: #fff;+}+.search-button {+ border: 2px solid #d7d7d7d7;+}+.advanced-search-results {+ position: absolute;+ top: 100%;+ left: 0;+ width: 100%;+ max-height: 100vh;+ overflow-x: hidden;+ overflow-y: auto;+ padding: 15px;+ background: #fff;+ border: 1px solid rgba(0,0,0,.1);+ border-top: 0;+ z-index: 3;+}+.advanced-search-results .title {+ color: #000;+ font-size: 16px;+ font-weight: 700;+}+.advanced-search-results .list h6 a {+ color: #000;+ font-size: 14px;+ font-weight: 500;+}+.advanced-search-results .title:first-child {+ margin: 0 0 10px 0;+ line-height: 1;+}+.advanced-search-results .title:not(:first-child) {+ margin: 10px 0 10px 0;+ padding: 10px 0 0 0;+ border-top: 1px solid rgba(0,0,0,.1);+ line-height: 1;+}+.advanced-search-results .alert {+ font-size: 14px;+ font-weight: 400;+}+.advanced-search-results .list {+ margin: 0 0 10px 0;+}+.advanced-search-results .products .list .media .media-aside {+ background-color: #eaf0fa;+}+.advanced-search-results .products .list .media:not(:last-child) {+ margin: 0 0 10px 0;+ padding: 0 0 10px 0;+ border-bottom: 1px solid rgba(0,0,0,.1);+}+.advanced-search-results p {+ color: #555;+ font-size: 14px;+ font-weight: 400;+ max-height: 45px;+ overflow: hidden;+}+.advanced-search-results .price {+ width: 100%;+ color: #000;+ font-size: 16px;+ font-weight: 700;+ line-height: 1;+}+.advanced-search-results .b-rating {+ margin: 0 0 10px 0;+ height: 20px;+ background-color: transparent;+}+.advanced-search-results .b-rating .b-rating-value {+ font-size: 12px;+ color: #efefef;+}+.advanced-search-results .b-rating .b-rating-star {+ padding: 0 3px 0 0;+}+.header-nav .advanced-search-results .b-rating .b-rating-star .b-icon.bi {+ font-size: 14px;+}++/* rating */++.b-rating {+ background-color: transparent;+}++/* product box */++.product-box {+ padding: 7.5px;+ border: 0;+ text-align: left;+ background-color: #fff;+}+.product-box .attr-container {+ position: absolute;+ bottom: 50px;+ left: 0;+ right: 55px;+ text-align: left;+ opacity: 0;+ visibility: hidden;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.product-box:hover .attr-container {+ opacity: 1;+ visibility: visible;+}+.attr-container .image-container img,+.attr-container .image-container {+ width: auto;+ height: auto;+ padding: 0;+ background-color: #fff;+ border: 0;+}+.attr-container .image-container {+ border: 1px solid #333;+}+.attr-container .image-container:hover {+ border-color: #fff;+}+.product-box:hover {+ z-index: 4;+}+.product-box *,+.product-box .card-footer * {+ z-index: 2;+}+.product-box::before {+ content: "";+ position: absolute;+ top: -1px;+ right: -1px;+ bottom: 0;+ left: 0;+ visibility: hidden;+ opacity: 0;+ background: #fff;+ border: 1px solid transparent;+ border-bottom: 0;+ border-radius: 0;+ border-bottom-left-radius: 0;+ border-bottom-right-radius: 0;+ -webkit-transition: all .3s ease-in-out;+ transition: all .3s ease-in-out;+}+.product-box:hover::before {+ border-color: rgba(0,0,0,.1);+ visibility: visible;+ opacity: 1;+}+.product-box .sale-label,+.product-box .flag-label,+.product-details-page .product-label {+ position: absolute;+ top: 11px;+ right: 11px;+ width: 28px;+ writing-mode: vertical-lr;+ z-index: 3;+}+.product-box .sale-label + .flag-label {+ right: 46px;+}+.product-box .sale-label span,+.product-box .flag-label span,+.product-details-page .product-label span {+ position: relative;+ width: 100%;+ height: 100%;+ padding: 8px 0;+ display: flex;+ align-items: center;+ justify-content: center;+ background: #25b232;+ color: #fff;+ font-size: 14px;+ font-weight: 500;+ border-radius: 0;+}+.product-box .sale-label span::after,+.product-box .flag-label span::after,+.product-details-page .product-label span::after {+ content: "";+ position: absolute;+ top: 100%;+ right: 0;+ border-top: 0;+ border-left: 14px solid #25b232;+ border-right: 14px solid #25b232;+ border-bottom: 8px solid transparent;+}+.product-box .flag-label span.danger,+.product-box .flag-label span.bg-danger,+.product-box-slide .flag-label span.danger,+.product-box-slide .flag-label span.bg-danger,+.product-details-page .product-label span.danger {+ background: #dc3545;+}+.product-box .flag-label span.red,+.product-box .flag-label span.bg-red,+.product-box-slide .flag-label span.red,+.product-box-slide .flag-label span.bg-red,+.product-details-page .product-label span.red {+ background: #F44336;+}+.product-box .flag-label span.pink,+.product-box .flag-label span.bg-pink,+.product-box-slide .flag-label span.pink,+.product-box-slide .flag-label span.bg-pink,+.product-details-page .product-label span.pink {+ background: #E91E63;+}+.product-box .flag-label span.indigo,+.product-box-slide .flag-label span.indigo,+.product-box-slide .flag-label span.bg-indigo,+.product-box .flag-label span.bg-indigo,+.product-details-page .product-label span.indigo {+ background: #3F51B5;+}+.product-box .flag-label span.blue,+.product-box-slide .flag-label span.blue,+.product-box .flag-label span.bg-blue,+.product-box-slide .flag-label span.bg-blue,+.product-details-page .product-label span.blue {+ background: #2196F3;+}+.product-box .flag-label span.cyan,+.product-box-slide .flag-label span.cyan,+.product-box-slide .flag-label span.bg-cyan,+.product-box .flag-label span.bg-cyan,+.product-details-page .product-label span.cyan {+ background: #00BCD4;+}+.product-box .flag-label span.teal,+.product-box-slide .flag-label span.teal,+.product-box-slide .flag-label span.bg-teal,+.product-box .flag-label span.bg-teal,+.product-details-page .product-label span.teal {+ background: #009688;+}+.product-box .flag-label span.lime,+.product-box-slide .flag-label span.lime,+.product-box .flag-label span.bg-lime,+.product-box-slide .flag-label span.bg-lime,+.product-details-page .product-label span.lime {+ background: #CDDC39;+}+.product-box .flag-label span.orange,+.product-box-slide .flag-label span.orange,+.product-box-slide .flag-label span.bg-orange,+.product-box .flag-label span.bg-orange,+.product-details-page .product-label span.orange {+ background: #FF9800;+}+.product-box .flag-label span.brown,+.product-box-slide .flag-label span.brown,+.product-box-slide .flag-label span.bg-brown,+.product-box .flag-label span.bg-brown,+.product-details-page .product-label span.brown {+ background: #795548;+}+.product-box .flag-label span.success,+.product-box-slide .flag-label span.success,+.product-box-slide .flag-label span.bg-success,+.product-box .flag-label span.bg-success,+.product-details-page .product-label span.success {+ background: rgb(169, 204, 0);+}+.product-box .flag-label span.green,+.product-box-slide .flag-label span.green,+.product-box .flag-label span.bg-green,+.product-box-slide .flag-label span.bg-green,+.product-details-page .product-label span.green {+ background: #8BC34A;+}+.product-box .flag-label span.purple,+.product-box-slide .flag-label span.purple,+.product-box-slide .flag-label span.bg-purple,+.product-box .flag-label span.bg-purple,+.product-details-page .product-label span.purple {+ background: #673AB7;+}+.product-box .flag-label span.warning,+.product-box-slide .flag-label span.warning,+.product-box-slide .flag-label span.bg-warning,+.product-box .flag-label span.bg-warning,+.product-details-page .product-label span.warning {+ color: #212529;+ background: #ffc107;+}+.product-box .flag-label span.dark,+.product-box-slide .flag-label span.dark,+.product-box-slide .flag-label span.bg-dark,+.product-box .flag-label span.bg-dark,+.product-details-page .product-label span.dark {+ background: #212529;+}+.product-box .sale-label span::after,+.product-box .flag-label span::after,+.product-details-page .product-label span::after {+ content: "";+ position: absolute;+ top: 100%;+ right: 0;+ border-top: 0;+ border-left: 14px solid #25b232;+ border-right: 14px solid #25b232;+ border-bottom: 8px solid transparent;+}+.product-box .flag-label span.brown::after,+.product-box-slide .flag-label span.brown::after,+.product-box-slide .flag-label span.bg-brown::after,+.product-box .flag-label span.bg-brown::after,+.product-details-page .product-label span.brown::after {+ border-left-color: #795548;+ border-right-color: #795548;+}+.product-box .flag-label span.pink::after,+.product-box-slide .flag-label span.pink::after,+.product-box-slide .flag-label span.bg-pink::after,+.product-box .flag-label span.bg-pink::after,+.product-details-page .product-label span.pink::after {+ border-left-color: #E91E63;+ border-right-color: #E91E63;+}+.product-box .flag-label span.red::after,+.product-box-slide .flag-label span.red::after,+.product-box-slide .flag-label span.bg-red::after,+.product-box .flag-label span.bg-red::after,+.product-details-page .product-label span.red::after {+ border-left-color: #F44336;+ border-right-color: #F44336;+}+.product-box .flag-label span.orange::after,+.product-box-slide .flag-label span.orange::after,+.product-box-slide .flag-label span.bg-orange::after,+.product-box .flag-label span.bg-orange::after,+.product-details-page .product-label span.orange::after {+ border-left-color: #FF9800;+ border-right-color: #FF9800;+}+.product-box .flag-label span.lime::after,+.product-box-slide .flag-label span.lime::after,+.product-box .flag-label span.bg-lime::after,+.product-box-slide .flag-label span.bg-lime::after,+.product-details-page .product-label span.lime::after {+ border-left-color: #CDDC39;+ border-right-color: #CDDC39;+}+.product-box .flag-label span.cyan::after,+.product-box-slide .flag-label span.cyan::after,+.product-box-slide .flag-label span.bg-cyan::after,+.product-box .flag-label span.bg-cyan::after,+.product-details-page .product-label span.cyan::after {+ border-left-color: #00BCD4;+ border-right-color: #00BCD4;+}+.product-box .flag-label span.blue::after,+.product-box-slide .flag-label span.blue::after,+.product-box-slide .flag-label span.bg-blue::after,+.product-box .flag-label span.bg-blue::after,+.product-details-page .product-label span.blue::after {+ border-left-color: #2196F3;+ border-right-color: #2196F3;+}+.product-box .flag-label span.indigo::after,+.product-box-slide .flag-label span.indigo::after,+.product-box-slide .flag-label span.bg-indigo::after,+.product-box .flag-label span.bg-indigo::after,+.product-details-page .product-label span.indigo::after {+ border-left-color: #3F51B5;+ border-right-color: #3F51B5;+}+.product-box .flag-label span.danger::after,+.product-box-slide .flag-label span.danger::after,+.product-box-slide .flag-label span.bg-danger::after,+.product-box .flag-label span.bg-danger::after,+.product-details-page .product-label span.danger::after {+ border-left-color: #dc3545;+ border-right-color: #dc3545;+}+.product-box .flag-label span.purple::after,+.product-box-slide .flag-label span.purple::after,+.product-box-slide .flag-label span.bg-purple::after,+.product-box .flag-label span.bg-purple::after,+.product-details-page .product-label span.purple::after {+ border-left-color: #673AB7;+ border-right-color: #673AB7;+}+.product-box .flag-label span.green::after,+.product-box-slide .flag-label span.green::after,+.product-box-slide .flag-label span.bg-green::after,+.product-box .flag-label span.bg-green::after,+.product-details-page .product-label span.green::after {+ border-left-color: #8BC34A;+ border-right-color: #8BC34A;+}+.product-box .flag-label span.warning::after,+.product-box-slide .flag-label span.warning::after,+.product-box-slide .flag-label span.bg-warning::after,+.product-box .flag-label span.bg-warning::after,+.product-details-page .product-label span.warning::after {+ border-left-color: #ffc107;+ border-right-color: #ffc107;+}+.product-box .flag-label span.success::after,+.product-box-slide .flag-label span.success::after,+.product-box-slide .flag-label span.bg-success::after,+.product-box .flag-label span.bg-success::after,+.product-details-page .product-label span.success::after {+ border-left-color: rgb(169, 204, 0);+ border-right-color: rgb(169, 204, 0);+}+.product-box .flag-label span.dark::after,+.product-box-slide .flag-label span.dark::after,+.product-box-slide .flag-label span.bg-dark::after,+.product-box .flag-label span.bg-dark::after,+.product-details-page .product-label span.dark::after {+ border-left-color: #212529;+ border-right-color: #212529;+}+.product-box .picture-container {+ position: relative;+ overflow: hidden;+ background-color: #eaf0fa;+}+.product-box .picture-container .img-container {+ display: block;+ position: relative;+ height: 100%;+}+.product-box .picture-container .img-container::before {+ content: "";+ display: block;+ padding-top: 125%;+}+.product-box .picture-container .img-container img {+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+ max-width: 100%;+ width: auto;+ height: auto;+ margin: auto;+ background-color: #eaf0fa;+ -webkit-transition: all .4s ease-in-out;+ transition: all .4s ease-in-out;+}+.product-box .picture-container .img-container:hover img {+ transform: scale(1.1) rotate(5deg);+ -webkit-transform: scale(1.1) rotate(5deg);+}+.product-box .hover-img {+ position: absolute;+ top: 0;+ right: 0;+ opacity: 0;+ visibility: hidden;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.product-box .picture-container .img-container:hover .hover-img {+ opacity: 1;+ visibility: visible;+}+.product-box .hover-img.img-second {+ opacity: 1;+ visibility: visible;+ z-index: 2;+}+.product-box .card-body {+ padding: 15px 0 5px 0;+}+.product-box .qvb-container {+ position: absolute;+ bottom: 0;+ left: 0;+ right: 0;+ width: 100%;+ -webkit-transform: translateY(100%);+ transform: translateY(100%);+ -webkit-transition: all .3s ease-in-out;+ transition: all .3s ease-in-out;+}+.product-box:hover .qvb-container {+ -webkit-transform: translateY(0);+ transform: translateY(0);+}+.product-box .qvb-container .btn {+ display: flex;+ align-items: center;+ justify-content: center;+ background-color: rgba(38,34,34,.85);+ border: 0;+ font-size: 16px;+ text-transform: uppercase;+ font-weight: 500;+ opacity: 0;+ visibility: hidden;+ -webkit-transition: all .3s ease-in-out;+ transition: all .3s ease-in-out;+}+.product-box .qvb-container .btn:hover {+ background-color: rgba(0,0,0,.85);+}+.product-box .qvb-container .btn .icons {+ margin: 0 5px 0 0;+}+.product-box:hover .qvb-container .btn {+ opacity: 1;+ visibility: visible;+}+.product-box .other-buttons {+ position: absolute;+ top: 10px;+ left: 10px;+ display: flex;+ flex-direction: row;+ -webkit-transform: translateX(calc(-100% - 10px));+ transform: translateX(calc(-100% - 10px));+ -webkit-transition: transform .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+ transition: transform .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+}+.product-box:hover .other-buttons {+ -webkit-transform: translateX(0);+ transform: translateX(0);+}+.product-box .other-buttons .btn.btn-outline-secondary:not(:last-child) {+ margin: 0 5px 0 0;+}+.product-box .other-buttons .btn.btn-outline-secondary {+ display: flex;+ align-items: center;+ justify-content: center;+ width: 38px;+ height: 38px;+ border: 1px solid #ccc;+ border-radius: 100%;+ padding: 0;+ color: #000;+ background-color: #fff;+}+.product-box .other-buttons .btn.btn-outline-secondary .icons, .product-box .qvb-container .btn .icons {+ font-size: 16px;+}+.product-box .other-buttons .btn.btn-outline-secondary:hover {+ border-color: #25b232;+}+.product-box .card-title {+ position: relative;+ line-height: 16px;+ margin: 0;+}+.product-box .card-title a {+ position: relative;+ display: flex;+ justify-content: flex-start;+ width: 100%;+ color: #1c1b1b;+ margin: 0;+ font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";+ font-size: 15px;+ font-weight: 500;+}+.product-box .prices::before {+ /* content: ""; */+ position: absolute;+ top: -10px;+ left: 0;+ width: 50%;+ height: 1px;+ background: linear-gradient(to right, transparent, #555);+}+.product-box .prices::after {+ /* content: ""; */+ position: absolute;+ top: -10px;+ right: 0;+ width: 50%;+ height: 1px;+ background: linear-gradient(to right, #555, transparent);+}+.product-box .rating {+ display: inline-flex;+ align-items: center;+ justify-content: flex-start;+ white-space: nowrap;+ width: 100%;+ margin: 0;+}+.product-box .b-rating .b-rating-star {+ padding: 0 2px;+}+.product-box .b-rating .b-rating-star.b-rating-star-full, .product-box .b-rating .b-rating-star.b-rating-star-half {+ color: #ffb300;+}+.product-box .b-rating .b-rating-star.b-rating-star-empty {+ color: #cbd7ed;+}+.product-box .rating .b-rating {+ background-color: transparent;+}+.product-box .rating .b-rating + a::before {+ content: "/";+ margin: 0 3px;+}+.product-box .prices {+ display: inline-flex;+ align-items: flex-end;+ flex-wrap: wrap;+ position: relative;+ margin: 0;+ padding: 0;+ width: 100%;+ justify-content: flex-start;+}+.product-box .actual-price {+ margin: 0 5px 0 0;+ color: #1c1b1b;+ font-size: 20px;+ font-weight: 700;+ line-height: 1;+}+.product-box .old-price {+ color: #999;+ font-size: 14px;+ font-weight: 400;+ line-height: 1;+ text-decoration: line-through;+}+.product-box .card-footer {+ position: absolute;+ bottom: 10px;+ left: 0;+ right: 0;+ opacity: 0;+ visibility: hidden;+ transform: translateY(100%);+ -webkit-transform: translateY(100%);+ transition: all .3s ease-in-out;+ -webkit-transition: all .3s ease-in-out;+ background-color: #232323;+ border: 0;+ padding: 0 10px 10px 10px;+ z-index: -1;+}+.product-box:hover .card-footer {+ opacity: 1;+ visibility: visible;+ z-index: 2;+}+.product-box .card-footer::before {+ content: "";+ position: absolute;+ top: -1px;+ right: -1px;+ bottom: 0;+ left: 0;+ background-color: #fff;+ border: 1px solid transparent;+ border-top: 0;+ border-radius: 0;+ transition: all .3s ease-in-out;+ -webkit-transition: all .3s ease-in-out;+ z-index: -1;+}+.product-box:hover .card-footer::before {+ border-color: rgba(0,0,0,.1);+}+.product-box .attr-name {+ color: #000;+ font-size: 14px;+ font-weight: 700;+ padding: 5px;+}+.product-box .attr-value {+ margin: 0 0 0 5px;+}+.product-box .attr-container table, .product-box .attr-container {+ width: 100%;+}+.product-box .attr-container table td {+ vertical-align: top;+}+.product-box .attr-value .btn {+ margin: 0 3px 3px 0;+ padding: 3px 6px;+ font-size: 13px;+ font-weight: 500;+ border-radius: 4px;+}+.product-box .attr-value .btn.color-container {+ padding: 0;+}+.product-box .attr-value .btn img {+ max-width: 30px;+}+.product-box .desc {+ position: relative;+ color: #777;+ font-size: 14px;+ max-height: 85px;+ margin: 5px 0 0 0;+ overflow: hidden;+}+.product-box .add-to-cart-button.btn.btn-outline-secondary {+ display: flex;+ align-items: center;+ justify-content: center;+ margin: 10px 0 0 0;+ padding: 12px 14px;+ width: 100%;+ color: #fff;+ border-color: #1c1b1b;+ background-color: #1c1b1b;+ text-transform: uppercase;+}+.product-box .add-to-cart-button.btn.btn-outline-secondary:hover {+ border-color: #25b232;+ background-color: #25b232;+}+.product-box .catalog-quantity {+ max-width: 60px;+}+.product-box .spec-container {+ /* margin: 10px 0 0 0; */+}+.product-box .spec-container table,+.product-box.grid-box .spec-container table td {+ width: 100%;+}+.product-box .spec-container table td {+ padding: 0 0 5px 0;+}+.product-box.grid-box .spec-container table td:nth-child(2) {+ display: inline-flex;+ justify-content: flex-end;+}+.product-box .spec {+ display: inline-flex;+ width: 100%;+ line-height: 1;+}+.product-box .spec:not(:last-child) {+ border-bottom: 1px dashed #dfdfdf;+}+.product-box .spec-container table {+ min-width: 100%;+}+.product-box .spec-container table tr {+ display: flex;+ flex-wrap: wrap;+ width: 100%;+}+.product-box .spec-container table tr td {+ padding: 5px;+ border: 1px dashed #333;+}+.product-box .spec-container table tr td .spec-name {+ color: #aaa;+ font-size: 14px;+ font-weight: 300;+}+.product-box .spec-container table tr td .spec-value {+ color: #ddd;+ font-size: 14px;+ font-weight: 500;+}+.product-box .countdown-box.alert {+ padding: 5px;+}++/* product box list */++.product-box.list {+ flex-direction: row;+ width: 100%;+ text-align: left;+ border-radius: 0;+}+.product-box.list .picture-container {+ flex: 1+}+.product-box.list .card-body {+ flex: 3;+ padding: 0 0 0 10px;+ display: flex;+ flex-direction: column;+}+.product-box.list .card-title a {+ display: inline;+}+.product-box.list .rating, .product-box.list .prices {+ justify-content: flex-start;+}+.product-box.list .prices {+ width: auto;+}+.product-box.list::before {+ border: 1px solid rgba(0,0,0,.1);+ opacity: 1;+ visibility: visible;+}+.product-box.list .attr-container {+ position: static;+ margin: 10px 0;+ visibility: visible;+ opacity: 1;+}+.product-box.list .attr-value {+ margin: 0;+}+.product-box.mobile::before {+ display: none;+}+.product-box.list .list-button-container {+ display: inline-flex;+ align-items: flex-end;+ height: 100%;+}+.product-box.list .add-to-cart-button.btn.btn-outline-secondary, .product-box.list .other-buttons .btn.btn-outline-secondary:not(:last-child) {+ margin: 0 5px 0 0;+}+.product-box.list .add-to-cart-button.btn.btn-outline-secondary, .product-box .other-buttons .btn.btn-outline-secondary {+ height: 38px;+}+.product-box.list .other-buttons {+ position: static;+ -webkit-transform: none;+ transform: none;+ flex-direction: row;+ align-items: flex-end;+}+.product-box.mobile:hover .card-footer {+ opacity: 0;+ visibility: hidden;+}+.product-box.list .spec-container table {+ width: auto;+ max-width: unset;+}+.countdown-box .col-form-label {+ position: static;+}+.countdown-box > span {+ display: inline-flex;+ align-items: center;+}+.countdown-box > span span:not(:last-child)::after {+ content: ":";+ position: relative;+ margin: 0 3px;+}++/* category grid */++.categoryGrid a {+ color: #333;+ text-decoration: none;+}+.categoryGrid .card-img {+ border-bottom-left-radius: 0;+ border-bottom-right-radius: 0;+}++/* rating commons */++.rating .b-rating + a {+ display: none;+ color: #000;+ position: relative;+ font-size: 12px;+ font-weight: 500;+}+.b-rating .b-rating-value {+ color: #000;+ font-size: 12px;+ display: none;+}++/* container wide */++.main-container {+ min-height: 350px;+}++/* color container */++.btn.color-container {+ margin: 0 3px 3px 0;+ padding: 0;+ border: 0;+ background-color: transparent;+ border-radius: 100%;+}+.color-container .color {+ display: flex;+ width: 25px;+ height: 25px;+ box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22);+ border-radius: 100%;+}++/* autocomplete */++.vbt-autcomplete-list[data-v-48792d67] {+ max-height: 350px;+ overflow-y: auto;+ padding-top: 5px;+ position: absolute;+ z-index: 999+}++/* breadcrumb */++.breadcrumb {+ padding: 15px 0;+ font-size: 14px;+ background-color: transparent;+}+.breadcrumb-item.active {+ color: #000;+}++/* newsletter */+.newsletter {+ margin: 0 0 30px 0;+ padding: 10px 20px 0 0;+}+.newsletter .newsletter-title {+ color: #fff;+ text-transform: uppercase;+ font-size: 16px;+ font-weight: 700;+}+.newsletter .newsletter-desc {+ margin: 0 0 15px 0;+ color: #888;+ font-size: 16px;+ font-weight: 300;+}+.newsletter-email {+ border: 1px solid #333;+ background-color: transparent;+ color: #fff;+ margin: 0 5px 0 0;+ padding: 12px 16px;+ height: auto;+}+.newsletter-email::placeholder {+ color: #aaa;+ font-size: 14px;+}+.newsletter-email-button {+ padding: 0 10px;+ border: 1px solid #333;+ background-color: transparent;+ color: #fff;+}+.newsletter-result, .newsletter-validation {+ position: relative;+}+.newsletter-result .alert, .newsletter-validation .please-wait {+ position: absolute;+ top: 7px;+ margin: 0;+}++/* footer */++.footer {+ background-color: #1c1b1b;+ color: #aaa;+ font-size: 16px;+ font-weight: 400;+ border-top: 1px solid #333+}+.footer .section {+ padding: 50px 0;+}+.footer a {+ color: #888;+ font-size: 16px;+ font-weight: 300;+}+.footer a:hover,+.footer ul.social-icons li .icons:hover {+ color: #25b232;+}+.footer .block {+ display: flex;+ flex-direction: column;+ align-items: flex-start;+}+.footer ul{+ padding: 0;+ margin: 0;+}+.footer li {+ margin: 0 0 10px 0;+}+.footer ul.social-icons {+ display: inline-flex;+ align-items: center;+ margin: 0 0 30px 0;+}+.footer ul.social-icons li {+ filter: invert(1);+}+.footer ul.social-icons li:not(:last-child) {+ margin: 0 15px 0 0;+}+.footer ul.social-icons li:last-child {+ margin: 0;+}+.footer ul li .bi {+ margin: 0 5px 0 0;+}+.footer .about-us .logo img {+ max-height: 35px;+}+.footer .inside-section {+ margin: 0 0 30px 0;+}+.footer .title {+ color: #fff;+ font-size: 16px;+ font-weight: 700;+ text-transform: uppercase;+ margin: 0 0 30px 0;+}+.footer .footer-bottom {+ border-top: 1px solid #333;+}++/* forum */++.quote {+ margin: 5px 0;+ padding: 10px;+ border: 1px dashed #ddd;+}++/* key frames */++@keyframes galleryBar {+ from {+ width: 0;+ }+ to {+ width: 100%;+ }+}+@keyframes showMenu {+ from {+ display: none;+ opacity: 0;+ visibility: hidden;+ transform: scale(.9);+ }+ to {+ display: flex;+ opacity: 1;+ visibility: visible;+ transform: scale(1);+ }+}++/* media */++@media (min-width: 992px) and (max-width: 1399px) {+ .contact-header .content .number, .contact-header .content .title {+ font-size: 12px;+ }+ .product-box .countdown-box.alert-info {+ font-size: 14px;+ }+}+@media (min-width: 992px) {+ .Menu li.-hasSubmenu ul:not(.gallery) > li a {+ font-size: 14px;+ font-weight: 400;+ }+ .Menu li.-hasSubmenu ul.gallery > li a {+ font-size: 14px;+ font-weight: 400;+ }+ .h-lg-100 {+ height: 100% !important;+ }+ .Menu li > ul.gallery.columns- > li.menuBg {+ position: absolute;+ bottom: 0;+ right: 0;+ display: block;+ width: 300px;+ height: 100%;+ background-size: contain;+ background-position: bottom;+ background-repeat: no-repeat;+ }+ body.scroll-down:not(.onTop) .left-side-container {+ -webkit-transform: translateY(-100%);+ transform: translateY(-100%);+ box-shadow: none;+ }+ body.scroll-down:not(.onTop) .b-sidebar, body.scroll-down:not(.onTop) .b-sidebar-backdrop {+ top: 100%;+ }+ body.scroll-down:not(.onTop) .top-menu-container ul.Menu.-vertical, body.scroll-down:not(.onTop) .top-menu-container .menu-button.show + ul.Menu.-vertical {+ display: none;+ }+ body.scroll-up .header-nav-container, body.onTop .left-side-container {+ -webkit-transform: translateY(0);+ transform: translateY(0);+ }+ .other-links {+ display: flex;+ align-items: center;+ height: 100%;+ }+ .other-links ul {+ display: inline-flex;+ align-items: center;+ padding: 0 15px;+ }+ .other-links ul li {+ margin: 0 20px 0 0;+ }+ .other-links ul li a {+ font-size: 14px;+ font-weight: 700;+ text-transform: uppercase;+ }+ .Menu li > ul.gallery {+ min-width: calc(960px - 100%);+ max-width: calc(960px - 100%);+ }+ .Menu li > ul.gallery::before {+ content: "";+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ width: 0;+ height: 3px;+ background: #25b232;+ animation: galleryBar .8s cubic-bezier(0.645, 0.045, 0.355, 1.000);+ }+ .Menu li > ul.gallery.-visible::before {+ width: 100%;+ }+ .top-menu-container .menu-button {+ position: relative;+ height: 50px;+ width: 25%;+ padding: 0 15px;+ display: flex;+ align-items: center;+ justify-content: flex-start;+ border: 1px solid rgba(0,0,0,.1);+ border-bottom: 1px solid transparent;+ cursor: pointer;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+ }+ .top-menu-container .menu-button.show {+ margin: 0;+ }+ .top-menu-container .menu-button::before, .top-menu-container .menu-button::after {+ content: "";+ position: absolute;+ top: 22px;+ right: 10px;+ width: 10px;+ height: 2px;+ background: #000;+ transform: rotate(-45deg);+ transition: all .2s ease-in-out;+ -webkit-transition: all .2s ease-in-out;+ }+ .top-menu-container .menu-button::after {+ transform: rotate(-135deg);+ right: 16px;+ }+ .top-menu-container .menu-button:not(.show):before {++transform: rotate(45deg);++}+ .top-menu-container .menu-button:not(.show):after {++transform: rotate(+-45deg+);++}+ .top-menu-container .menu-button span.icon {+ display: flex;+ flex-direction: column;+ justify-content: space-between;+ width: 30px;+ height: 15px;+ margin: 0 15px 0 0;+ }+ .top-menu-container .menu-button span.icon span {+ width: 100%;+ height: 3px;+ background: #000;+ }+ .top-menu-container .menu-button span.title {+ font-size: 16px;+ font-weight: 900;+ line-height: 1;+ }+ .top-menu-container {+ position: relative;+ display: flex;+ flex-wrap: nowrap;+ width: 100%;+ margin: 15px 0 0 0;+ }+ .top-menu-container ul.Menu.-vertical {+ display: none;+ position: absolute;+ top: 100%;+ left: 0;+ width: 25%;+ height: auto;+ margin: 0;+ padding: 15px 0;+ background-color: #fff;+ border: 1px solid rgba(0,0,0,.1);+ }+ .top-menu-container .menu-button.show + ul.Menu.-vertical {+ display: flex;+ animation: showMenu .4s ease-in-out;+ }+ .Menu li > ul.gallery.columns-5 > li {+ width: calc(20% - 10px);+ }+ .Menu li > ul.gallery.columns-4 > li {+ width: calc(25% - 10px);+ }+ .Menu li > ul.gallery.columns-3 > li {+ width: calc(33.3333333% - 10px);+ }+ .Menu li > ul.gallery.columns-2 > li {+ width: calc(50% - 10px);+ }+ .Menu li > ul.gallery.columns- > li {+ width: calc(33.3333333% - 10px);+ }+ .Menu li > ul {+ overflow-x: hidden;+ overflow-y: auto;+ }+ .Menu li > ul:not(.gallery) {+ overflow: visible;+ }+ .Menu li:hover > ul.next-level {+ display: flex;+ top: -1px;+ left: calc(100% - 20px);+ visibility: visible+ }+}+@media (min-width: 1200px) {+ .Menu li > ul.gallery {+ min-width: calc(1140px - 100%);+ max-width: calc(1140px - 100%);+ }+}+@media (min-width: 1260px) {+ .col-for-5-xl {+ -ms-flex: 0 0 25%;+ flex: 0 0 25%;+ max-width: 25%;+ }+}+@media (min-width: 1399px) {+ .Menu li > ul.gallery {+ min-width: calc(1340px - 100%);+ max-width: calc(1340px - 100%);+ }+ .container, .container-lg, .container-md, .container-sm, .container-xl {+ max-width: 1340px;+ }+}+@media (min-width: 1680px) {+ .Menu li > ul.gallery {+ min-width: calc(1440px - 100%);+ max-width: calc(1440px - 100%);+ }+ .container, .container-lg, .container-md, .container-sm, .container-xl {+ max-width: 1440px;+ }+ .col-for-5-xl {+ -ms-flex: 0 0 16.666667%;+ flex: 0 0 16.666667%;+ max-width: 16.666667%;+ }+ .modal-content .col-for-5-xl {+ -ms-flex: 0 0 25%;+ flex: 0 0 25%;+ max-width: 25%;+ }+ .product-box.list .card-body {+ flex: 4;+ }+ .Menu li > ul.gallery.columns- > li {+ width: calc(25% - 10px);+ }+}+@media (max-width: 1399px) {+ .product-box .qvb-container .btn {+ font-size: 14px;+ }+ .left-side-container {+ padding: 10px 0 10px 10px;+ }+ .Menu li.home-link {+ width: calc(100% - 10px);+ }+ .Menu li.other-links > ul {+ max-width: calc(100% - 10px);+ min-width: calc(100% - 10px);+ }+ .navbar-brand {+ margin: 0 10px 0 0;+ }+ .product-box .rating .b-rating + a {+ display: none;+ }+}+@media (max-width: 1199px) {+ .parallax-banner {+ display: none !important;+ }+ .container, .container-lg, .container-md, .container-sm {+ max-width: 100%;+ }+}+@media (max-width: 991px) {+ .picker-container .toggle-button {+ bottom: 180px;+ }+ .store-selector-container {+ display: none;+ }+ .Menu li > ul.gallery.columns- > li.menuBg {+ display: none;+ }+ .generalTitle div {+ font-size: 22px;+ }+ .main-container {+ margin: 108px 0 0 0;+ }+ .product-box .qvb-container .btn {+ display: none;+ }+ .search-item {+ position: fixed;+ top: 68px;+ padding: 0;+ left: 0;+ right: 0;+ background-color: #fff;+ }+ .generalTitle span {+ padding: 0 15px 0 0;+ font-size: 26px;+ }+ .footer {+ margin: 15px 0 0 0;+ }+ .footer .title {+ margin: 15px 0;+ }+ .footer .block {+ align-items: center;+ }+ .footer ul, .footer .title, footer .section {+ text-align: center;+ }+ .navbar-nav.selectors {+ width: 100%;+ flex-wrap: wrap;+ }+ .advanced-search-results {+ top: 50px;+ max-height: calc(100vh - 196px);+ }+ .Menu li.category img {+ display: none;+ }+ .Menu li.other-links > ul {+ max-width: 100%;+ min-width: 100%;+ }+ .Menu li.-hasSubmenu > .go-forward {+ display: flex;+ }+ .Menu li.-hasSubmenu > .go-back.-visible + .go-forward {+ display: none;+ }+ .Menu li.-hasSubmenu > .go-back {+ display: none;+ position: relative;+ }+ .Menu li.-hasSubmenu > .go-back::before {+ position: absolute;+ width: 14px;+ height: 2px;+ right: 17px;+ bottom: 0px;+ top: 0px;+ margin: auto 0px;+ transform: rotate(0);+ background: #000;+ content: "";+ }+ .Menu li.-hasSubmenu > .go-back.-visible {+ display: flex;+ }+ .Menu li.-hasSubmenu > ul.gallery > li > .go-forward::after, .Menu li.-hasSubmenu > ul.gallery > li > .go-forward::before {+ display: none;+ }+ .footer .footer-bottom {+ padding: 0 0 115px 0;+ }+ .header-nav .search-item {+ position: absolute;+ top: -48px;+ width: calc(100% + 20px);+ left: -10px;+ box-shadow: 0px -10px 9px rgba(0, 0, 0, .2);+ }+ .footer .section {+ padding: 30px;+ }+ .navbar-brand {+ margin: 0 auto;+ padding: 0 0 0 30px;+ }+ .product-box .sale-label, .product-box .flag-label {+ left: 11px;+ right: unset;+ }+ .product-box .sale-label + .flag-label {+ left: 46px;+ right: unset;+ }+ .product-box .add-to-cart-button.btn.btn-outline-secondary {+ padding: 0 12px;+ font-size: 12px;+ }+ .product-box .other-buttons .btn.btn-outline-secondary.quick-view-button {+ display: none;+ }+ .product-box .other-buttons .btn.btn-outline-secondary {+ width: 32px;+ height: 32px;+ }+ .menu-toggler {+ position: absolute;+ top: calc(50% - 11px);+ left: 30px;+ flex-direction: column;+ justify-content: space-between;+ align-items: center;+ width: 30px;+ height: 19px;+ cursor: pointer;+ }+ .menu-toggler span {+ position: relative;+ width: 100%;+ height: 3px;+ background: #000;+ transition: all .2s ease-in-out;+ }+ .menu-toggler.show span:first-child {+ transform: rotate(45deg);+ bottom: -6px;+ }+ .menu-toggler.show span:last-child {+ position: relative;+ bottom: 10px;+ transform: rotate(-45deg);+ }+ .menu-toggler.show span:nth-child(2) {+ opacity: 0;+ visibility: hidden;+ }+ .Menu li.-hasSubmenu > .go-forward,+ .Menu li.-hasSubmenu > .go-back {+ position: absolute;+ top: 0;+ right: 20px;+ width: 38px;+ height: 38px;+ z-index: 2;+ }+ .Menu li.-hasSubmenu > .go-forward::before {+ display: block;+ position: absolute;+ width: 14px;+ height: 2px;+ right: 17px;+ bottom: 0px;+ top: 0px;+ margin: auto 0px;+ transform: rotate( 0deg);+ background: #000;+ content: "";+ }+ .Menu li.-hasSubmenu > .go-forward::after {+ display: block;+ position: absolute;+ width: 14px;+ height: 2px;+ right: 17px;+ bottom: 0px;+ top: 0px;+ margin: auto 0;+ transform: rotate( 90deg );+ background: #000;+ content: "";+ }+ .Menu li.home-link {+ width: 100%;+ padding: 10px 0;+ }+ .Menu li > ul.gallery > li {+ width: 100%;+ }+ .Menu li > ul {+ position: absolute;+ top: 34px;+ left: 0;+ width: 100%;+ border-left: 0;+ border-right: 0;+ z-index: 2;+ }+ .Menu li.-hasSubmenu ul li a {+ font-size: 14px;+ }+ .Menu li.-hasSubmenu > ul.gallery > li > a {+ font-size: 16px;+ }+ .Menu li > ul.-visible, ul.Menu.-floating.-visible {+ z-index: 3;+ }+ .newsletter, .Menu li.-hasSubmenu > a:after {+ display: none;+ }+ ul.Menu.-vertical {+ position: absolute;+ top: 100%;+ overflow-x: hidden;+ overflow-y: auto;+ height: calc(100vh - 145px);+ left: 0;+ margin: 1px 0 0 0;+ padding: 15px 10px;+ background-color: #fff;+ -webkit-transform: translateX(-100%);+ transform: translateX(-100%);+ -webkit-transition: transform .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+ transition: transform .4s cubic-bezier(0.645, 0.045, 0.355, 1.000);+ }+ ul.Menu.-vertical.show {+ -webkit-transform: translateX(0);+ transform: translateX(0);+ }+ .left-side-container {+ position: fixed;+ top: 0;+ left: 0;+ width: 100%;+ padding: 15px;+ height: 70px;+ justify-content: center;+ overflow: visible;+ border: 0;+ border-bottom: 1px solid #333;+ }+ footer .list-group-item:not(.list-group-item-action) {+ display: inline-flex;+ justify-content: space-between;+ width: 100%;+ text-align: right;+ }+ .up-btn {+ bottom: 125px;+ }+ .Menu .other-links li > a {+ color: #000;+ font-weight: 700;+ }+}+@media (max-width: 768px) {+ .swiper-info .top-header-info {+ font-size: 10px;+ }+ #ModalBanner .modal-dialog {+ max-width: 95%;+ }+ #ModalBanner .content .title .top {+ font-size: 30px;+ }+ #ModalBanner .content .title .bottom {+ font-size: 16px;+ }+ #ModalBanner .content input.form-control {+ font-size: 14px;+ }+ .product-box.list .picture-container {+ flex: 2;+ }+ .categoryGrid .card .card-body {+ padding: 12px 10px;+ }+ .categoryGrid .card .card-body h5 {+ font-size: 18px;+ margin: 0;+ }+}+@media (max-width: 575px) {++ .generalTitle span {+ font-size: 16px;+ text-align: center;+ }+ .navbar-nav.selectors .btn.dropdown-toggle {+ font-size: 12px;+ }+ #ModalBanner .content .title .top {+ font-size: 26px;+ }+ #ModalBanner .content {+ padding: 15px;+ }+ #ModalBanner .flying-content {+ top: unset;+ left: unset;+ right: 15px;+ bottom: 15px;+ }+ .product-box .countdown-box .col-form-label {+ width: 100%;+ display: flex;+ justify-content: center;+ padding: 0;+ line-height: 1;+ }+ .breadcrumb {+ padding: 10px 0;+ font-size: 12px;+ font-weight: 300;+ }+ .breadcrumb-item + .breadcrumb-item {+ padding-left: 2px;+ }+ .breadcrumb-item+.breadcrumb-item::before {+ padding-right: 2px;+ }+ .swiper-container.s2, .swiper-container.s3 {+ max-width: 100%;+ overflow: hidden;+ }+ .product-box .rating .b-rating-value,+ .product-box .rating output + span {+ display: none;+ }+ .product-box .quick-view-button {+ font-size: 14px;+ }+ .b-sidebar > .b-sidebar-header {+ font-size: 16px;+ }+ .product-box .rating .b-rating + a,+ .product-box .desc,+ .product-box:not(.list) .attr-container,+ .product-box:not(.list) .other-buttons {+ display: none;+ }+}+@media (max-width: 420px) {+ .menu-toggler {+ left: 15px;+ }+ #ModalBanner .content .title .top {+ font-size: 20px;+ }+ #ModalBanner .content .title .bottom {+ font-size: 12px;+ }+ #ModalBanner .content input.form-control {+ max-width: 55%;+ font-size: 12px;+ }+ #ModalBanner .content #send-interactive-form.btn-success {+ padding: 8px 16px;+ }+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/css/customer/customer.css b/src/Plugins/Theme.Modern/Content/css/customer/customer.cssnew file mode 100644index 000000000..9b7974836--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/customer/customer.css@@ -0,0 +1,153 @@+.block-account-navigation ul li a {+ display: inline-flex;+ align-items: center;+ width: 100%;+ padding: 10px;+ border: 1px solid #ddd;+ border-radius: .25rem;+ margin: 0 0 5px 0;+}+.block-account-navigation ul li a.active, .block-account-navigation ul li a:hover {+ color: #25b232;+ border-color: #25b232;+}+.block-account-navigation ul li svg {+ font-size: 28px;+ margin: 0 10px 0 0;+}+.block-account-navigation ul li span {+ font-size: 16px;+}+.return-request-page .result .btn {+ display: table;+ margin: 0 auto;+ width: auto !important;+}++/* merchandise table */++.merchandise-table {+ display: flex;+ flex-direction: column;+ padding: 0 0 25px 0;+ position: relative;+}+.merchandise-table thead tr {+ display: flex;+ width: 100%;+ padding: 0 0 0 50px;+ border: 0;+}+.merchandise-table thead th {+ flex-basis: 0;+ flex-grow: 1;+ max-width: 100%;+ min-width: 125px;+ display: flex;+ align-items: center;+ border-bottom: 0;+ border-top: 0;+}+.merchandise-table thead th:first-child {+ display: flex;+ align-items: center;+}+.merchandise-table tbody {+ display: inline-flex;+ flex-direction: row;+ flex-wrap: nowrap;+ width: 100%;+ min-width: 100%;+}+.merchandise-table tbody tr:nth-child(1) {+ display: flex;+ flex-direction: column;+ min-width: 50px;+}+.merchandise-table tbody tr:nth-child(1) td {+ height: 100%;+ padding: 0;+ border: 0;+}+.merchandise-table tbody tr:nth-child(1) td > div {+ height: 100%;+ min-height: 100%;+ display: flex;+ flex-direction: column;+}+.merchandise-table tbody tr:nth-child(1) td > div > div {+ min-height: 110px;+ display: flex;+ justify-content: center;+ align-items: center;+}+.merchandise-table tbody tr:nth-child(2) {+ width: calc(100% - 50px);+}+.merchandise-table tbody tr:nth-child(2) td {+ display: inline-flex;+ width: 100%;+ padding: .75rem 0;+ height: 110px;+}+.merchandise-table tbody tr:nth-child(2) td > div {+ flex-basis: 0;+ flex-grow: 1;+ max-width: 100%;+ padding: 0 0.75rem;+ display: flex;+ flex-direction: column;+ justify-content: center;+ min-width: 125px;+}+.merchandise-table .product a {+ white-space: nowrap;+ text-overflow: ellipsis;+ overflow: hidden;+}+.merchandise-table .field-validation-error {+ position: absolute;+ bottom: 0;+ left: 0;+ right: 0;+ margin: 0;+}++@media (max-width: 768px) {+ .merchandise-table tbody tr:nth-child(2) td > div {+ max-width: 125px;+ }+ .merchandise-table {+ padding: 0 0 45px 0;+ }+ .merchandise-table .field-validation-error {+ font-size: 14px;+ }+}++/* status */++table .status.badge {+ font-size: 16px;+ padding: 6px 8px;+}+table .status.pending {+ background-color: #d1ecf1;+}+table .status.processing {+ background-color: #fff3cd;+}+table .status.complete {+ background-color: #d4edda;+}+table .status.cancelled {+ background-color: #f8d7da;+}++/* pagination */++.pagination .current-page.page-item .page-link {+ color: #fff;+ background-color: #0E606C;+ border-color: #0E606C;+}diff --git a/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Bold.ttf b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Bold.ttfnew file mode 100644index 000000000..b94d47f3aBinary files /dev/null and b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Bold.ttf differdiff --git a/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-ExtraBold.ttf b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-ExtraBold.ttfnew file mode 100644index 000000000..8f008c368Binary files /dev/null and b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-ExtraBold.ttf differdiff --git a/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Light.ttf b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Light.ttfnew file mode 100644index 000000000..2ab022196Binary files /dev/null and b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Light.ttf differdiff --git a/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Medium.ttf b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Medium.ttfnew file mode 100644index 000000000..e90e87ed6Binary files /dev/null and b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Medium.ttf differdiff --git a/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Regular.ttf b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Regular.ttfnew file mode 100644index 000000000..be06e7fdcBinary files /dev/null and b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-Regular.ttf differdiff --git a/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-SemiBold.ttf b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-SemiBold.ttfnew file mode 100644index 000000000..dabf7c242Binary files /dev/null and b/src/Plugins/Theme.Modern/Content/css/fonts/Poppins-SemiBold.ttf differdiff --git a/src/Plugins/Theme.Modern/Content/css/fonts/Simple-Line-Icons.ttf b/src/Plugins/Theme.Modern/Content/css/fonts/Simple-Line-Icons.ttfnew file mode 100644index 000000000..6ecb68683Binary files /dev/null and b/src/Plugins/Theme.Modern/Content/css/fonts/Simple-Line-Icons.ttf differdiff --git a/src/Plugins/Theme.Modern/Content/css/fonts/simple-line-icons.min.css b/src/Plugins/Theme.Modern/Content/css/fonts/simple-line-icons.min.cssnew file mode 100644index 000000000..abd402a26--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/fonts/simple-line-icons.min.css@@ -0,0 +1 @@+@font-face{font-family:simple-line-icons;src:url(../fonts/Simple-Line-Icons.ttf) format('truetype');font-display:swap;font-weight:400;font-style:normal}.icon-action-redo,.icon-action-undo,.icon-anchor,.icon-arrow-down,.icon-arrow-down-circle,.icon-arrow-left,.icon-arrow-left-circle,.icon-arrow-right,.icon-arrow-right-circle,.icon-arrow-up,.icon-arrow-up-circle,.icon-badge,.icon-bag,.icon-ban,.icon-basket,.icon-basket-loaded,.icon-bell,.icon-book-open,.icon-briefcase,.icon-bubble,.icon-bubbles,.icon-bulb,.icon-calculator,.icon-calendar,.icon-call-end,.icon-call-in,.icon-call-out,.icon-camera,.icon-camrecorder,.icon-chart,.icon-check,.icon-chemistry,.icon-clock,.icon-close,.icon-cloud-download,.icon-cloud-upload,.icon-compass,.icon-control-end,.icon-control-forward,.icon-control-pause,.icon-control-play,.icon-control-rewind,.icon-control-start,.icon-credit-card,.icon-crop,.icon-cup,.icon-cursor,.icon-cursor-move,.icon-diamond,.icon-direction,.icon-directions,.icon-disc,.icon-dislike,.icon-doc,.icon-docs,.icon-drawer,.icon-drop,.icon-earphones,.icon-earphones-alt,.icon-emotsmile,.icon-energy,.icon-envelope,.icon-envelope-letter,.icon-envelope-open,.icon-equalizer,.icon-event,.icon-exclamation,.icon-eye,.icon-eyeglass,.icon-feed,.icon-film,.icon-fire,.icon-flag,.icon-folder,.icon-folder-alt,.icon-frame,.icon-game-controller,.icon-ghost,.icon-globe,.icon-globe-alt,.icon-graduation,.icon-graph,.icon-grid,.icon-handbag,.icon-heart,.icon-home,.icon-hourglass,.icon-info,.icon-key,.icon-layers,.icon-like,.icon-link,.icon-list,.icon-location-pin,.icon-lock,.icon-lock-open,.icon-login,.icon-logout,.icon-loop,.icon-magic-wand,.icon-magnet,.icon-magnifier,.icon-magnifier-add,.icon-magnifier-remove,.icon-map,.icon-menu,.icon-microphone,.icon-minus,.icon-mouse,.icon-music-tone,.icon-music-tone-alt,.icon-mustache,.icon-note,.icon-notebook,.icon-options,.icon-options-vertical,.icon-organization,.icon-paper-clip,.icon-paper-plane,.icon-paypal,.icon-pencil,.icon-people,.icon-phone,.icon-picture,.icon-pie-chart,.icon-pin,.icon-plane,.icon-playlist,.icon-plus,.icon-power,.icon-present,.icon-printer,.icon-puzzle,.icon-question,.icon-refresh,.icon-reload,.icon-rocket,.icon-screen-desktop,.icon-screen-smartphone,.icon-screen-tablet,.icon-settings,.icon-share,.icon-share-alt,.icon-shield,.icon-shuffle,.icon-size-actual,.icon-size-fullscreen,.icon-social-behance,.icon-social-dribbble,.icon-social-dropbox,.icon-social-facebook,.icon-social-foursqare,.icon-social-github,.icon-social-google,.icon-social-instagram,.icon-social-linkedin,.icon-social-pinterest,.icon-social-reddit,.icon-social-skype,.icon-social-soundcloud,.icon-social-spotify,.icon-social-steam,.icon-social-stumbleupon,.icon-social-tumblr,.icon-social-twitter,.icon-social-vkontakte,.icon-social-youtube,.icon-speech,.icon-speedometer,.icon-star,.icon-support,.icon-symbol-female,.icon-symbol-male,.icon-tag,.icon-target,.icon-trash,.icon-trophy,.icon-umbrella,.icon-user,.icon-user-female,.icon-user-follow,.icon-user-following,.icon-user-unfollow,.icon-vector,.icon-volume-1,.icon-volume-2,.icon-volume-off,.icon-wallet,.icon-wrench{font-family:simple-line-icons;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-user:before{content:"\e005"}.icon-people:before{content:"\e001"}.icon-user-female:before{content:"\e000"}.icon-user-follow:before{content:"\e002"}.icon-user-following:before{content:"\e003"}.icon-user-unfollow:before{content:"\e004"}.icon-login:before{content:"\e066"}.icon-logout:before{content:"\e065"}.icon-emotsmile:before{content:"\e021"}.icon-phone:before{content:"\e600"}.icon-call-end:before{content:"\e048"}.icon-call-in:before{content:"\e047"}.icon-call-out:before{content:"\e046"}.icon-map:before{content:"\e033"}.icon-location-pin:before{content:"\e096"}.icon-direction:before{content:"\e042"}.icon-directions:before{content:"\e041"}.icon-compass:before{content:"\e045"}.icon-layers:before{content:"\e034"}.icon-menu:before{content:"\e601"}.icon-list:before{content:"\e067"}.icon-options-vertical:before{content:"\e602"}.icon-options:before{content:"\e603"}.icon-arrow-down:before{content:"\e604"}.icon-arrow-left:before{content:"\e605"}.icon-arrow-right:before{content:"\e606"}.icon-arrow-up:before{content:"\e607"}.icon-arrow-up-circle:before{content:"\e078"}.icon-arrow-left-circle:before{content:"\e07a"}.icon-arrow-right-circle:before{content:"\e079"}.icon-arrow-down-circle:before{content:"\e07b"}.icon-check:before{content:"\e080"}.icon-clock:before{content:"\e081"}.icon-plus:before{content:"\e095"}.icon-minus:before{content:"\e615"}.icon-close:before{content:"\e082"}.icon-event:before{content:"\e619"}.icon-exclamation:before{content:"\e617"}.icon-organization:before{content:"\e616"}.icon-trophy:before{content:"\e006"}.icon-screen-smartphone:before{content:"\e010"}.icon-screen-desktop:before{content:"\e011"}.icon-plane:before{content:"\e012"}.icon-notebook:before{content:"\e013"}.icon-mustache:before{content:"\e014"}.icon-mouse:before{content:"\e015"}.icon-magnet:before{content:"\e016"}.icon-energy:before{content:"\e020"}.icon-disc:before{content:"\e022"}.icon-cursor:before{content:"\e06e"}.icon-cursor-move:before{content:"\e023"}.icon-crop:before{content:"\e024"}.icon-chemistry:before{content:"\e026"}.icon-speedometer:before{content:"\e007"}.icon-shield:before{content:"\e00e"}.icon-screen-tablet:before{content:"\e00f"}.icon-magic-wand:before{content:"\e017"}.icon-hourglass:before{content:"\e018"}.icon-graduation:before{content:"\e019"}.icon-ghost:before{content:"\e01a"}.icon-game-controller:before{content:"\e01b"}.icon-fire:before{content:"\e01c"}.icon-eyeglass:before{content:"\e01d"}.icon-envelope-open:before{content:"\e01e"}.icon-envelope-letter:before{content:"\e01f"}.icon-bell:before{content:"\e027"}.icon-badge:before{content:"\e028"}.icon-anchor:before{content:"\e029"}.icon-wallet:before{content:"\e02a"}.icon-vector:before{content:"\e02b"}.icon-speech:before{content:"\e02c"}.icon-puzzle:before{content:"\e02d"}.icon-printer:before{content:"\e02e"}.icon-present:before{content:"\e02f"}.icon-playlist:before{content:"\e030"}.icon-pin:before{content:"\e031"}.icon-picture:before{content:"\e032"}.icon-handbag:before{content:"\e035"}.icon-globe-alt:before{content:"\e036"}.icon-globe:before{content:"\e037"}.icon-folder-alt:before{content:"\e039"}.icon-folder:before{content:"\e089"}.icon-film:before{content:"\e03a"}.icon-feed:before{content:"\e03b"}.icon-drop:before{content:"\e03e"}.icon-drawer:before{content:"\e03f"}.icon-docs:before{content:"\e040"}.icon-doc:before{content:"\e085"}.icon-diamond:before{content:"\e043"}.icon-cup:before{content:"\e044"}.icon-calculator:before{content:"\e049"}.icon-bubbles:before{content:"\e04a"}.icon-briefcase:before{content:"\e04b"}.icon-book-open:before{content:"\e04c"}.icon-basket-loaded:before{content:"\e04d"}.icon-basket:before{content:"\e04e"}.icon-bag:before{content:"\e04f"}.icon-action-undo:before{content:"\e050"}.icon-action-redo:before{content:"\e051"}.icon-wrench:before{content:"\e052"}.icon-umbrella:before{content:"\e053"}.icon-trash:before{content:"\e054"}.icon-tag:before{content:"\e055"}.icon-support:before{content:"\e056"}.icon-frame:before{content:"\e038"}.icon-size-fullscreen:before{content:"\e057"}.icon-size-actual:before{content:"\e058"}.icon-shuffle:before{content:"\e059"}.icon-share-alt:before{content:"\e05a"}.icon-share:before{content:"\e05b"}.icon-rocket:before{content:"\e05c"}.icon-question:before{content:"\e05d"}.icon-pie-chart:before{content:"\e05e"}.icon-pencil:before{content:"\e05f"}.icon-note:before{content:"\e060"}.icon-loop:before{content:"\e064"}.icon-home:before{content:"\e069"}.icon-grid:before{content:"\e06a"}.icon-graph:before{content:"\e06b"}.icon-microphone:before{content:"\e063"}.icon-music-tone-alt:before{content:"\e061"}.icon-music-tone:before{content:"\e062"}.icon-earphones-alt:before{content:"\e03c"}.icon-earphones:before{content:"\e03d"}.icon-equalizer:before{content:"\e06c"}.icon-like:before{content:"\e068"}.icon-dislike:before{content:"\e06d"}.icon-control-start:before{content:"\e06f"}.icon-control-rewind:before{content:"\e070"}.icon-control-play:before{content:"\e071"}.icon-control-pause:before{content:"\e072"}.icon-control-forward:before{content:"\e073"}.icon-control-end:before{content:"\e074"}.icon-volume-1:before{content:"\e09f"}.icon-volume-2:before{content:"\e0a0"}.icon-volume-off:before{content:"\e0a1"}.icon-calendar:before{content:"\e075"}.icon-bulb:before{content:"\e076"}.icon-chart:before{content:"\e077"}.icon-ban:before{content:"\e07c"}.icon-bubble:before{content:"\e07d"}.icon-camrecorder:before{content:"\e07e"}.icon-camera:before{content:"\e07f"}.icon-cloud-download:before{content:"\e083"}.icon-cloud-upload:before{content:"\e084"}.icon-envelope:before{content:"\e086"}.icon-eye:before{content:"\e087"}.icon-flag:before{content:"\e088"}.icon-heart:before{content:"\e08a"}.icon-info:before{content:"\e08b"}.icon-key:before{content:"\e08c"}.icon-link:before{content:"\e08d"}.icon-lock:before{content:"\e08e"}.icon-lock-open:before{content:"\e08f"}.icon-magnifier:before{content:"\e090"}.icon-magnifier-add:before{content:"\e091"}.icon-magnifier-remove:before{content:"\e092"}.icon-paper-clip:before{content:"\e093"}.icon-paper-plane:before{content:"\e094"}.icon-power:before{content:"\e097"}.icon-refresh:before{content:"\e098"}.icon-reload:before{content:"\e099"}.icon-settings:before{content:"\e09a"}.icon-star:before{content:"\e09b"}.icon-symbol-female:before{content:"\e09c"}.icon-symbol-male:before{content:"\e09d"}.icon-target:before{content:"\e09e"}.icon-credit-card:before{content:"\e025"}.icon-paypal:before{content:"\e608"}.icon-social-tumblr:before{content:"\e00a"}.icon-social-twitter:before{content:"\e009"}.icon-social-facebook:before{content:"\e00b"}.icon-social-instagram:before{content:"\e609"}.icon-social-linkedin:before{content:"\e60a"}.icon-social-pinterest:before{content:"\e60b"}.icon-social-github:before{content:"\e60c"}.icon-social-google:before{content:"\e60d"}.icon-social-reddit:before{content:"\e60e"}.icon-social-skype:before{content:"\e60f"}.icon-social-dribbble:before{content:"\e00d"}.icon-social-behance:before{content:"\e610"}.icon-social-foursqare:before{content:"\e611"}.icon-social-soundcloud:before{content:"\e612"}.icon-social-spotify:before{content:"\e613"}.icon-social-stumbleupon:before{content:"\e614"}.icon-social-youtube:before{content:"\e008"}.icon-social-dropbox:before{content:"\e00c"}.icon-social-vkontakte:before{content:"\e618"}.icon-social-steam:before{content:"\e620"}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/css/header/header.css b/src/Plugins/Theme.Modern/Content/css/header/header.cssnew file mode 100644index 000000000..3958dfd0c--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/header/header.css@@ -0,0 +1,373 @@+.b-icon {+ outline: none;+}+.header-nav {+ padding: 0 20px 0 0;+ width: 100%;+ background-color: #fff;+ z-index: 1040;+}+.header-nav-container::before {+ content: "";+ position: relative;+ margin-bottom: 57px;+}+.header-nav .navbar {+ padding: 0;+}+.header-nav .b-icon.bi {+ font-size: 20px;+}+.dropdown-toggle::after {+ display: none;+}+.navbar-nav {+ align-items: center;+}+.navbar-nav.top-header-items .nav-link {+ position: relative;+ display: flex;+ justify-content: center;+ align-items: center;+ color: #000;+ cursor: pointer;+}+.navbar-nav.top-header-items .nav-link:hover {+ color: #25b232;+}+.navbar-nav.top-header-items .nav-link {+ position: relative;+ display: flex;+ justify-content: center;+ align-items: center;+ color: #000;+ cursor: pointer;+ height: 56px;+ padding: 0 15px 0 0;+ font-size: 28px;+ border-right: 0;+}+.qty-indicator {+ position: absolute;+ top: 0px;+ right: 0;+ display: flex;+ justify-content: center;+ align-items: center;+ margin: 0;+ width: 24px;+ height: 24px;+ color: #fff;+ font-size: 12px;+ font-weight: 500;+ background: #25b232;+ border-radius: 100%;+}+.shopping-item .subtotal {+ position: relative;+ display: inline-flex;+ align-items: center;+ color: #fff;+ font-size: 16px;+ font-weight: 700;+}+.shopping-item .subtotal::before {+ content: "";+ display: flex;+ width: 1px;+ height: 20px;+ margin: 0 6px;+ background: #333;+}+.navbar-nav.top-header-items .search-item .nav-link {+ position: static;+}+.b-sidebar > .b-sidebar-header {+ font-size: 16px;+ text-align: right;+ background: #1c1b1b;+ color: #fff;+}+.b-sidebar-header strong {+ font-weight: 300;+}+.b-sidebar-header strong a {+ color: #fff;+ font-weight: 500;+}+.b-sidebar.slide {+ -webkit-transition: transform 1s cubic-bezier(.19,1,.22,1);+ transition: transform 1s cubic-bezier(.19,1,.22,1);+}+.b-sidebar-body {+ padding: 15px;+}+.b-sidebar-body::-webkit-scrollbar-track {+ -webkit-box-shadow: inset 0 0 4px rgba(0,0,0,0.3);+ border-radius: 4px;+ background-color: #232323;+}+.b-sidebar-body::-webkit-scrollbar {+ position: absolute;+ width: 8px;+ background-color: #232323;+}+.b-sidebar-body::-webkit-scrollbar-thumb {+ border-radius: 4px;+ -webkit-box-shadow: inset 0 0 4px rgba(0,0,0,.3);+ background-color: #111;+}+.b-sidebar>.b-sidebar-footer {+ border-top: 1px solid rgba(0,0,0,.2);+ background: #1c1b1b;+ color: #fff;+}++/* top header info */++.swiper-info {+ width: calc(100% - 200px);+}+.swiper-info .top-header-info {+ width: 100%;+ padding: 5px 20px;+ text-align: center;+}+.swiper-info .swiper-slide {+ width: 100%;+}+.swiper-info .top-header-info strong {+ color: #000;+}+.swiper-info .top-header-info span {+ color: #25b232;+ font-weight: 500;+}++/* header-nav-bottom */++.header-nav-bottom {+ display: inline-flex;+ align-items: center;+ width: 100%;+ margin: 10px 0;+ justify-content: flex-end;+}++/* selectors */++.navbar-nav.selectors {+ flex-wrap: nowrap;+}+.navbar-nav.selectors .btn.dropdown-toggle {+ margin: 0 0 3px 0;+ padding: 3px 6px;+ background-color: #fff;+ color: #000;+ border: 1px solid rgba(0,0,0,.2);+ font-size: 12px;+ font-weight: 400;+}++/* sidebar-cart */++.sidebar-cart {+ padding-left: 0;+}++.sidebar-cart .item {+ position: relative;+ width: 100%;+ margin: 0 0 10px 0;+ padding: 10px;+ border: 1px solid rgba(0,0,0,.1);+ background-color: #fff;+}+.sidebar-cart .item img {+ background-color: #eaf0fa;+}+.sidebar-cart .item:last-child,+.sidebar-cart .item:last-child:first-child {+ margin: 0;+}+.sidebar-cart .item .attributes {+ font-size: 12px;+ color: #000;+ background: #eaf0fa;+ display: table;+ margin: 5px 0;+}+.sidebar-cart .item .deletecartitem {+ position: absolute;+ top: 5px;+ right: 5px;+ cursor: pointer;+}+.sidebar-cart .item .col a {+ color: #000;+ font-family: Poppins, sans-serif;+ font-size: 14px;+ font-weight: 400;+ text-decoration: none;+}+.sidebar-cart .item .col .price, .sidebar-cart .item .col .quantity {+ font-size: 14px;+ font-weight: 500;+}+.sidebar-cart .item .col .price strong, .sidebar-cart .item .col .quantity strong {+ margin: 0 0 0 5px;+ font-size: 18px;+ font-weight: 700;+}+.sidebar-cart .b-sidebar-footer .h5 {+ font-weight: 300;+}+.sidebar-cart .b-sidebar-footer .h4 {+ font-weight: 700;+}+.sidebar-cart .sub-tot-top {+ font-weight: 300;+}+.sidebar-cart .sub-tot-bottom {+ font-family: 'Poppins', sans-serif;+}+.header-nav .bi-cart-check {+ width: 40px;+ margin: 6px 0 0 0;+}+.sidebar-cart .cart-button.btn-secondary {+ padding: 12px;+ font-size: 16px;+ font-weight: 700;+ background-color: #111;+ border-color: #111;+ border-width: 2px;+}+.sidebar-cart .cart-button.btn-secondary:hover {+ background-color: #000;+}+.sidebar-cart .no-items-icon {+ font-size: 80px;+}++/* header promo */++.header-promo {+ margin: 0 auto;+}+.header-promo li a {+ font-size: 16px;+ font-weight: 700;+ padding: 6px 20px;+ border-bottom: 1px solid rgba(0,0,0,.2);+}++/* menu toogler */++#sidebar-menu .b-sidebar-body {+ padding: 0;+}+@media (min-width: 992px) and (max-width: 1399px) {+ .contact-header .content .number, .contact-header .content .title {+ font-size: 12px;+ }+}+@media (min-width: 768px) {+ .top-header-items {+ display: inline-flex;+ flex-direction: row;+ margin-left: 15px;+ }+}+@media (min-width: 576px) {+ .b-sidebar {+ width: 530px;+ }+}+@media (max-width: 1399px) {+ .contact-header {+ max-width: calc(100% - 10px);+ }+}+@media (max-width: 1199px) {+ .header-nav {+ width: 75%;+ }+}+@media (max-width: 991px) {+ .swiper-info {+ display: none;+ }+ .navbar-nav {+ flex-direction: row;+ }+ .Menu li > div.contact-header {+ width: auto;+ margin: 10px;+ }+ .header-nav-container {+ border-bottom: 1px solid #333;+ }+ .header-nav-container .header-bottom {+ border-bottom: 0;+ }+ .header-nav {+ position: fixed;+ top: unset;+ bottom: 0;+ left: 0;+ right: 0;+ width: 100%;+ padding: 10px;+ display: inline-flex;+ justify-content: space-around;+ box-shadow: 0 -3px 6px rgba(0,0,0,.16), 0 -3px 6px rgba(0,0,0,.23);+ z-index: 1034;+ }+ .header-nav > .navbar {+ width: 100%;+ height: 58px;+ }+ .navbar-brand img {+ max-width: 85px;+ max-height: 45px;+ }+ .header-nav-container::before {+ margin-bottom: 70px;+ }+}+@media (max-width: 575px) {+ .navbar-nav.top-header-items .nav-link {+ font-size: 22px;+ }+ .sidebar-cart .item img {+ max-width: 75px;+ }+ .sidebar-cart .item .col a {+ display: table;+ max-width: calc(100% - 15px);+ font-size: 14px;+ line-height: 1;+ }+ .sidebar-cart .item .price,+ .sidebar-cart .item .quantity {+ font-size: 14px;+ }+ .sidebar-cart .item .attributes {+ font-size: 12px;+ }+ .sidebar-cart .b-sidebar-footer .h4 {+ font-size: 20px;+ }+ .sidebar-cart .b-sidebar-footer .h5 {+ font-size: 16px;+ }+ .shopping-item .subtotal {+ display: none;+ }+}+@media (max-width: 380px) {+ .header-nav .navbar-brand img {+ max-width: 120px;+ }+}diff --git a/src/Plugins/Theme.Modern/Content/css/home/home.css b/src/Plugins/Theme.Modern/Content/css/home/home.cssnew file mode 100644index 000000000..646ce7adb--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/home/home.css@@ -0,0 +1,858 @@+/* home sections */++.generalTitle {+ margin: 15px 0;+}+[v-cloak] .products-tabs {+ display: none;+}+.home-page .home-page-section {+ margin: 30px 0;+}++/* slide product */++.main-slider.row {+ position: relative;+ height: calc(100vh - 195px);+ min-height: 550px;+ background-color: #eaf0fa;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.main-slider.row .swiper-container {+ height: 100%;+}+.main-slider .swiper-slide.swiper-slide-active {+ z-index: 2;+}+.slider-background {+ position: absolute;+ top: 0;+ right: 0;+ left: 0;+ bottom: 0;+ background-size: contain;+ background-repeat: no-repeat;+ opacity: 0.05;+}+.product-box-slide {+ display: inline-flex;+ align-items: center;+ justify-content: space-between;+ flex-wrap: nowrap;+ width: 100%;+ height: 100%;+ padding: 0 5%;+ -webkit-transition: all .4s ease-in-out;+ transition: all .4s ease-in-out;+}+.product-box-slide .content {+ display: flex;+ flex-direction: column;+ align-items: flex-start;+ justify-content: center;+ height: 100%;+ position: relative;+}+.product-box-slide .attr-container tr {+ display: flex;+ flex-wrap: wrap;+ justify-content: flex-start;+}+.product-box-slide .attr-container tr td .attr-name {+ color: #aaa;+ font-size: 16px;+ font-weight: 300;+}+.product-box-slide .attr-container tr td:first-child {+ width: 100%;+ margin: 0 0 5px 0;+}+.product-box-slide .attr-container tr td .btn-light.btn {+ border: 1px solid #eee;+ color: #000;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.product-box-slide .attr-container tr td .btn-light.btn:hover {+ -webkit-transform: scale(1.1);+ transform: scale(1.1);+}+.product-box-slide .sale-label, .product-box-slide .flag-label {+ position: absolute;+ top: 0;+ left: 0;+ width: 34px;+ writing-mode: vertical-lr;+ z-index: 3;+}+.product-box-slide .sale-label + .flag-label {+ left: 45px;+}+.product-box-slide .sale-label span, .product-box-slide .flag-label span {+ position: relative;+ width: 100%;+ height: 100%;+ padding: 15px 0;+ display: flex;+ align-items: center;+ justify-content: center;+ background: #25b232;+ color: #fff;+ font-size: 22px;+ font-weight: 300;+}+.product-box-slide .sale-label span::after, .product-box-slide .flag-label span::after {+ content: "";+ position: absolute;+ top: 100%;+ right: 0;+ border-top: 0;+ border-left: 17px solid #25b232;+ border-right: 17px solid #25b232;+ border-bottom: 8px solid transparent;+}+.product-box-slide .flag-label span.danger {+ background: #dc3545;+}+.product-box-slide .flag-label span.danger::after {+ border-left-color: #dc3545;+ border-right-color: #dc3545;+}+.product-box-slide .flag-label span.purple {+ background: #563d7c;+}+.product-box-slide .flag-label span.purple::after {+ border-left-color: #563d7c;+ border-right-color: #563d7c;+}+.product-box-slide .content .title {+ z-index: 3;+}+.product-box-slide .content .title a {+ color: #1c1b1b;+ font-size: 48px;+ line-height: 1;+ font-weight: 900;+}+.product-box-slide .content .desc {+ color: #555;+ font-size: 14px;+ font-weight: 400;+ letter-spacing: 1px;+ margin: 15px 0 15px 0;+ max-height: 60px;+ overflow: hidden;+}+.product-box-slide .spec-container table {+ min-width: 220px;+}+.product-box-slide .spec-container table tr td {+ padding: 10px;+ border: 1px dashed #333;+}+.product-box-slide .spec-container table tr td .spec-name {+ color: #aaa;+ font-size: 16px;+ font-weight: 300;+}+.product-box-slide .spec-container table tr td .spec-value {+ color: #ddd;+ font-size: 16px;+ font-weight: 500;+}+.product-box-slide .color-container .color {+ width: 32px;+ height: 32px;+}+.product-box-slide .prices {+ display: inline-flex;+ align-items: flex-end;+ flex-wrap: wrap;+ margin: 30px 0;+ font-family: 'Poppins', sans-serif;+}+.product-box-slide .prices .actual-price {+ color: #25b232;+ font-size: 48px;+ font-weight: 700;+ line-height: 1;+}+.product-box-slide .prices .old-price {+ color: #999;+ font-size: 20px;+ text-decoration: line-through;+}+.product-box-slide .button .add-to-cart-button.btn.btn-outline-secondary {+ padding: 15px 35px;+ border-width: 2px;+ text-transform: uppercase;+ font-weight: 700;+ color: #fff;+ background-color: #1c1b1b;+ border-color: #1c1b1b;+}+.product-box-slide .button .add-to-cart-button.btn.btn-outline-secondary:hover {+ background-color: #25b232;+ border: 2px solid #25b232;+}+.product-box-slide .picture-outer {+ position: relative;+ height: 100%;+ display: flex;+ align-items: center;+ justify-content: center;+}+.product-box-slide .picture-outer img {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ margin: auto;+ width: auto;+ height: auto;+ max-width: 100%;+ background-color: transparent;+ visibility: visible;+ opacity: 1;+ -webkit-transition: all .3s ease-in-out;+ transition: all .3s ease-in-out;+}+.product-box-slide .picture-outer .hover-img {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ margin: auto;+ opacity: 0;+ visibility: hidden;+}+.product-box-slide .picture-outer:hover .hover-img {+ opacity: 1;+ visibility: visible;+}+.product-box-slide .picture-outer:hover .hover-img + .main-product-img {+ opacity: 0;+ visibility: hidden;+}+.product-box-slide .img-bg {+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+ background-size: cover;+ background-repeat: no-repeat;+ background-position: center center;+ /* opacity: .2; */+ z-index: -1;+}+.product-box-slide .more-circle-container {+ position: absolute;+ bottom: 5%;+ right: 30px;+ z-index: 3;+}+.product-box-slide .more-circle {+ position: absolute;+ bottom: 0;+ right: 0;+ display: flex;+ justify-content: center;+ align-items: center;+ width: 90px;+ height: 90px;+ background-color: #25b232;+ border-radius: 100%;+}+.product-box-slide .more-circle::before {+ content: "";+ position: absolute;+ top: -3px;+ left: -3px;+ right: -3px;+ bottom: -3px;+ box-shadow: 0 0 0 3px #000;+ border-radius: 100%;+ z-index: -1;+ -webkit-transition: all .3s ease-in-out;+ transition: all .3s ease-in-out;+}+.product-box-slide .more-circle:hover::before {+ box-shadow: 0 0 0 8px #000;+}+.product-box-slide .more-circle a {+ display: flex;+ flex-direction: column;+ justify-content: center;+ align-items: center;+ width: 100%;+ height: 100%;+ color: #fff;+ backface-visibility: hidden;+ line-height: 1;+}+.product-box-slide .more-circle a span:first-child {+ font-size: 22px;+ font-weight: 700;+}+.product-box-slide .more-circle a span:last-child {+ font-size: 16px;+ font-weight: 300;+}++/* products tabs */++.products-tabs .nav-tabs {+ position: relative;+ justify-content: flex-start;+ border: 0;+}+.products-tabs .nav-tabs li:first-child::before {+ content: "";+ position: absolute;+ bottom: 0;+ left: 0;+ width: 100%;+ height: 1px;+ background: rgba(0,0,0,.1);+ z-index: -1;+}+.products-tabs .nav-tabs li:first-child::after {+ /* content: ""; */+ position: absolute;+ bottom: 0;+ right: 0px;+ width: 50%;+ height: 1px;+ background: linear-gradient(to right, #555, transparent);+ z-index: -1;+}+.products-tabs .nav-tabs .nav-link {+ position: relative;+ margin: 0 -1px 1px 0;+ padding: 16px 26px;+ font-family: 'Poppins', sans-serif;+ color: #000;+ background-color: transparent;+ font-size: 14px;+ font-weight: 700;+ text-transform: uppercase;+ border: 1px solid rgba(0,0,0,.1);+ border-radius: 0;+ border-bottom: 0;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.products-tabs .nav-tabs .nav-link.active {+ color: #fff;+ background-color: transparent;+ border-color: #25b232;+}+.products-tabs .nav-tabs .nav-link::after {+ content: "";+ position: absolute;+ bottom: 0;+ left: -1px;+ width: calc(100% + 2px);+ height: 100%;+ -webkit-transition: transform .3s cubic-bezier(.8,0,.2,1);+ transition: transform .3s cubic-bezier(.8,0,.2,1);+ -webkit-transform: scale3d(0,1,1);+ transform: scale3d(0,1,1);+ transform-origin: 100% 50%;+ border-top: 0;+ background-color: #25b232;+ z-index: -1;+}+.products-tabs .nav-tabs .nav-link.active::after {+ -webkit-transform: scale3d(1,1,1);+ transform: scale3d(1,1,1);+ transform-origin: 0% 50%;+}+.products-tabs-content {+ margin: 15px 0;+}+.products-tabs-content .section {+ padding: 0;+}++/* brands */++ .brands-container {+ padding: 0 10%;+ margin: 0 -15px;+ background-color: #fff;+}+ .brands-container .swiper-wrapper {+ align-items: center;+ padding: 0 15%;+}+ .brands-container .swiper-slide {+ padding: 30px;+ text-align: center;+}+ .brands-container .swiper-slide a img {+ width: auto;+ height: auto;+ max-width: 100%;+ backface-visibility: hidden;+ filter: opacity(0.5);+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+ .brands-container .swiper-slide a:hover img {+ filter: opacity(1);+}++/* parallax banner */++.parallax-banner {+ position: relative;+ width: calc(100% + 30px);+ margin: 30px -15px;+ height: 400px;+ display: inline-flex;+ align-items: center;+ justify-content: space-between;+ padding: 10%;+ background: #eaf0fa;+ overflow: hidden;+}+.parallax-banner .content {+ justify-content: center;+ align-items: center;+}+.parallax-banner::before {+ content: "";+ position: absolute;+ top: -50%;+ left: -10%;+ width: 50%;+ height: 200%;+ border: 15px solid #000;+ background: #fff;+ border-radius: 50%;+ z-index: -1;+}+.parallax-banner .content, .parallax-banner .content .title {+ display: flex;+ flex-direction: column;+}+.parallax-banner .content .title {+ margin: 0 0 15px 0;+}+.parallax-banner .content .title .up {+ font-size: 60px;+ font-weight: 900;+ line-height: 1;+}+.parallax-banner .content .title .down {+ color: #25b232;+ font-size: 20px;+ font-weight: 700;+}+.parallax-banner .content .promo {+ display: inline-flex;+ align-items: center;+ font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";+}+.parallax-banner .content .promo .number {+ font-size: 80px;+ font-weight: 700;+ line-height: 1;+}+.parallax-banner .content .promo .off {+ display: flex;+ flex-direction: column;+ line-height: 1;+}+.parallax-banner .content .promo .off div:first-child {+ font-size: 31px;+ font-weight: 700;+ line-height: 1;+}+.parallax-banner .content .promo .off div:last-child {+ font-size: 36px;+ font-weight: 300;+}+.parallax-banner img {+ position: absolute;+ right: 0;+ left: unset !important;+ top: unset !important;+ bottom: unset;+ max-width: 600px;+}+.parallax-banner .img-container {+ position: absolute;+ top: 0;+ right: 0;+ display: flex;+ align-items: center;+ height: 400px;+ -webkit-transition: all 1s ease-in-out;+ transition: all 1s ease-in-out;+}+.parallax-banner:hover .img-container {+ -webkit-transform: scale(1.1);+ transform: scale(1.1);+}++/* banners */++.home-page-banner {+ position: relative;+ top: -118px;+ padding: 15px 7.5px;+ background: #fff;+ z-index: 15;+}+.home-page-banner + * {+ margin-top: -118px;+}+.banner-col {+ padding: 0 7.5px;+}+.banner-content {+ display: flex;+ position: relative;+ cursor: pointer;+}+.banner-content .text {+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+ display: flex;+ flex-direction: column;+ justify-content: center;+ align-items: flex-start;+ padding: 20px;+ transition: 0.5s;+ -webkit-transition: 0.5s;+}+.banner-content .text .title {+ font-size: 18px;+ font-weight: 500;+ line-height: 20px;+ margin: 0 0 5px 0;+}+.banner-content .text .content {+ color: #a2a2a2;+ font-size: 14px;+ font-weight: 500;+}+.banner-content img {+ max-width: 100%;+ width: auto;+ height: auto;+}+.banner-content .text::before, .banner-content .text::after {+ width: calc(100% - 20px);+ height: calc(100% - 20px);+ z-index: 3;+ content: '';+ position: absolute;+ top: 10px;+ left: 10px;+ box-sizing: border-box;+ -webkit-transform: scale(0);+ transition: 0.5s;+ -webkit-transition: 0.5s;+}+.banner-content .text::before {+ border-bottom: 2px solid #ddd;+ border-left: 2px solid #ddd;+ -webkit-transform-origin: 0 100%;+}+.banner-content .text::after {+ border-top: 2px solid #ddd;+ border-right: 2px solid #ddd;+ -webkit-transform-origin: 100% 0%;+}+.banner-content .text:hover::after, .banner-content .text:hover::before {+ -webkit-transform: scale(1);+ transform: scale(1);+}++/* home page section */++.home-page-section:first-of-type {+ margin: 30px 0 30px 0;+}+.home-page-section .b-skeleton {+ border-radius: 4px;+}++/* home page categories */++.cat-gallery {+ display: grid;+ grid-template-columns: 40% 30% 30%;+ grid-gap: 10px;+ width: 100%;+ overflow: hidden;+}+.cat-gallery .gallery-img {+ width: 100%;+ height: 100%;+ object-fit: cover;+ display: block;+}+.cat-gallery .gallery-item {+ position: relative;+}+.cat-gallery .gallery-item h3 {+ position: absolute;+ bottom: 10px;+ left: 10px;+ margin: 0;+ z-index: 2;+}+.cat-gallery .gallery-item:nth-child(4n-3) {+ grid-column: 1;+ grid-row: 1/3;+}+.cat-gallery .gallery-item:nth-child(4n-2) {+ grid-column: 2;+ grid-row: 1;+}+.cat-gallery .gallery-item:nth-child(4n-1) {+ grid-column: 2;+ grid-row: 2;+}+.cat-gallery .gallery-item:nth-child(4n) {+ grid-column: 3;+ grid-row: 1/3;+}++/* category item */++.category-item .title {+ display: block;+ position: relative;+ height: 100%;+ margin: 10px 0 0 0;+ font-size: 16px;+ font-weight: 700;+ text-transform: uppercase;+ letter-spacing: 0.5px;+}+.category-item::before {+ content: "";+ display: block;+ padding-top: 70%;+}+.category-item img {+ position: absolute;+ top: 0;+ right: 0;+ bottom: 0;+ left: 0;+ max-width: 100%;+ margin: auto 0 40px 0;+}+++/* category manufacturer featured products */++.featured-product-grid {+ position: relative;+}+@media (min-width: 992px) {+ .main-slider.row {+ margin-top: -15px;+ margin-left: calc((-100vw + 950px) / 2);+ margin-right: calc((-100vw + 950px) / 2);+ }+ .product-box-slide {+ padding-left: calc((100% - 950px) / 2 + 237.5px);+ padding-right: 0;+ }+ .home-page.toggled .product-box-slide {+ padding-left: calc((100% - 985px) / 2);+ padding-right: calc((100% - 985px) / 2);+ }+}+@media (min-width: 1200px) {+ .main-slider.row {+ margin-top: -15px;+ margin-left: calc((-100vw + 1130px) / 2);+ margin-right: calc((-100vw + 1130px) / 2);+ }+ .product-box-slide {+ padding-left: calc((100% - 1130px) / 2 + 282.5px);+ padding-right: 0;+ }+ .home-page.toggled .product-box-slide {+ padding-left: calc((100% - 1165x) / 2);+ padding-right: calc((100% - 1165px) / 2);+ }+}+@media (min-width: 1399px) {+ .main-slider.row {+ margin-top: -15px;+ margin-left: calc((-100vw + 1330px) / 2);+ margin-right: calc((-100vw + 1330px) / 2);+ }+ .product-box-slide {+ padding-left: calc((100% - 1330px) / 2 + 332.5px);+ padding-right: 0;+ }+ .home-page.toggled .product-box-slide {+ padding-left: calc((100% - 1365px) / 2);+ padding-right: calc((100% - 1365px) / 2);+ }+}+@media (min-width: 1680px) {+ .main-slider.row {+ margin-top: -15px;+ margin-left: calc((-100vw + 1430px) / 2);+ margin-right: calc((-100vw + 1430px) / 2);+ }+ .product-box-slide {+ padding-left: calc((100% - 1430px) / 2 + 357.5px);+ padding-right: 0;+ }+ .home-page.toggled .product-box-slide {+ padding-left: calc((100% - 1465px) / 2);+ padding-right: calc((100% - 1465px) / 2);+ }+}+@media (max-width: 1399px) {+ .product-box-slide .spec-container table tr td {+ padding: 5px;+ }+ .product-box-slide .content .title a {+ font-size: 36px;+ }+ .product-box-slide .content .desc {+ max-height: 50px;+ }+ .product-box-slide .prices {+ margin: 15px 0;+ }+ .product-box-slide .prices .actual-price {+ font-size: 34px;+ }+}+@media (max-width: 991px) {+ .home-page-section {+ overflow: hidden;+ }+ .category-container:nth-child(odd) .category-image {+ order: 1;+ margin: 0 0 15px 0;+ }+ .category-container:nth-child(odd) .category-product {+ order: 2+ }+ .home-page-banner + * {+ margin-top: 0;+ }+ #GrandCarousel .carousel-indicators {+ bottom: 0;+ }+ .section {+ padding: 15px 0;+ }+ .gallery-item h3 {+ font-size: 20px;+ }+}+@media (max-width: 575px) {+ .home-page .home-page-section {+ margin: 15px 0;+ }+ .main-slider .animate__animated {+ animation: none;+ }+ #GrandCarousel .h1 {+ font-size: 24px;+ }+ #GrandCarousel .h5 {+ font-size: 16px;+ }+ #GrandCarousel .btn {+ padding: 5px 10px;+ font-size: 14px;+ }+ .cat-gallery {+ display: inline-flex;+ overflow-x: auto;+ overflow-y: hidden;+ }+ .cat-gallery .gallery-item {+ -ms-flex: 0 0 50%;+ flex: 0 0 50%;+ max-width: 50%;+ }+ .featured-product-grid .category-container .category-product {+ order: 2;+ }+ .featured-product-grid .category-container .category-image {+ order: 1;+ margin: 0 0 15px 0;+ }+ .products-tabs .nav-tabs {+ justify-content: center;+ width: 100%;+ flex-wrap: wrap;+ white-space: nowrap;+ }+ .products-tabs .nav-tabs .nav-link {+ padding: 10px 14px;+ font-size: 16px;+ }+ .generalTitle span::before {+ top: 18px;+ }+ .product-box-slide {+ padding: 0;+ }+ .product-box-slide .picture-outer {+ height: 300px;+ text-align: center;+ }+ .product-box-slide .picture-outer img {+ max-height: unset;+ max-width: 300px;+ }+ .product-box-slide .content {+ padding: 0 0 15px 0;+ align-items: center;+ }+ .product-box-slide .sale-label, .product-box-slide .flag-label {+ position: fixed;+ top: 15px;+ left: 15px;+ }+ .product-box-slide .sale-label + .flag-label {+ left: 55px;+ }+ .product-box-slide .content .sale-label + .flag-label + .title {+ width: 100%;+ justify-content: center;+ text-align: center;+ }+ .product-box-slide .content .title a {+ font-size: 26px;+ }+ .product-box-slide .content .desc {+ display: none;+ }+ .product-box-slide .prices {+ margin: 25px 0 15px 0;+ }+ .main-slider.row .swiper-container-horizontal > .swiper-pagination-bullets {+ bottom: 15px;+ }+ .product-box-slide .button .add-to-cart-button.btn.btn-outline-secondary {+ margin: 0 0 40px 0;+ }+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/css/product/product.css b/src/Plugins/Theme.Modern/Content/css/product/product.cssnew file mode 100644index 000000000..e94221e74--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/css/product/product.css@@ -0,0 +1,442 @@+/* product gallery */++.gallery {+ position: sticky;+ position: -webkit-sticky;+ top: 15px;+}+.gallery-slider {+ display: inline-flex;+ flex-wrap: nowrap;+ width: 100%;+ height: 600px;+}+.gallery-slider img {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ bottom: 0;+ max-width: 100%;+ max-height: 100%;+ margin: auto;+ pointer-events: none;+}+.gallery-top {+ height: 100%;+ width: 75%;+ background-color: #eaf0fa;+}+.gallery-thumbs {+ width: 25%;+ height: 100%;+ padding: 0 15px 0 0;+ box-sizing: border-box;+}+.gallery-thumbs .swiper-slide {+ width: 100%;+ height: 25%;+ opacity: 0.4;+ background-color: #eaf0fa;+ border: 1px solid rgba(0,0,0,.1);+ box-shadow: none;+ cursor: pointer;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}++.gallery-thumbs .swiper-slide-active, .gallery-thumbs .swiper-slide:hover {+ opacity: 1;+ border-color: #25b232;+ box-shadow: 0 6px 10px rgba(0,0,0,.3), 0 15px 12px rgba(0,0,0,.22);+}+.gallery-top .swiper-button-prev::after {+ border-left: 0;+}+.gallery-top .swiper-button-next::after {+ border-right: 0;+}++/* gallery zoom */++.medium-zoom-overlay {+ z-index: 1100;+}+.medium-zoom-image--opened {+ z-index: 1101;+}+.medium-zoom-image {+ background-color: #eaf0fa;+}+.zoom-button {+ position: absolute;+ top: 15px;+ left: 15px;+ width: 50px;+ height: 50px;+ background: #232323;+ border: 1px solid #333;+ border-radius: .25rem;+ display: flex;+ justify-content: center;+ align-items: center;+ color: #fff;+ font-size: 32px;+ opacity: 0;+ visibility: hidden;+ cursor: pointer;+ -webkit-transition: all .2s ease-in-out;+ transition: all .2s ease-in-out;+}+.zoom-button:hover {+ border-color: #25b232;+}+.swiper-slide:hover .zoom-button {+ opacity: 1;+ visibility: visible;+}++/* product overview */++.product-details-page .product-label {+ position: absolute;+ top: 0;+ right: 0;+ z-index: 1033;+}+.product-details-page .generalTitle {+ margin: 0;+ font-size: 32px;+ font-weight: 900;+}+.product-details-page .product-label + .generalTitle {+ max-width: calc(100% - 43px)+}+.product-details-page .product-label .badge {+ padding: 6px 8px;+}+.product-details-page .overview .short-description {+ color: #777;+ font-size: 14px;+}+.product-details-page .overview .label {+ color: #000;+ font-size: 14px;+ font-weight: 500;+}+.product-details-page .overview .value {+ margin: 0 0 0 5px;+ color: #25b232;+ font-size: 16px;+ font-weight: 700;+}++/* spec */++.spec-container .spec-name {+ color: #000;+ font-size: 16px;+ font-weight: 700;+}+.spec-container .spec-value {+ color: #000;+ font-size: 16px;+ font-weight: 500;+}++/* product attributes */++.attributes {+ margin: 0 0 15px 0;+ padding: 15px;+ border: 0;+ background-color: #eaf0fa;+ border-radius: .25rem;+}+.attributes table {+ margin: 0;+ border: 0;+}+.attributes table td {+ border-top: 0;+}+.attributes table tr:first-child td {+ border-top: 0;+ vertical-align: middle;+ padding: 10px;+}+.attributes .text-prompt {+ color: #000;+ font-size: 16px;+ font-weight: 700;+}+.attributes .custom-control-description {+ color: #000;+ font-size: 14px;+ font-weight: 400;+}+.image-square-tooltip {+ display: flex;+ align-items: flex-start;+ justify-content: center;+ flex-direction: column;+}+.image-square-tooltip img {+ max-width: 165px;+}+.attributes .color-container .color {+ width: 32px;+ height: 32px;+}+.attributes input:checked ~ .color-container .color::before {+ left: 19px;+}+.attributes .option-list {+ display: inline-flex;+ align-items: center;+ flex-wrap: wrap;+}+.attributes .option-list li {+ margin: 0 10px 3px 0;+}++/* product price */++.product-details-page .overview .actual-price {+ color: #25b232;+ font-family: 'Poppins', sans-serif;+ font-size: 36px;+ font-weight: 700;+ line-height: 1;+}+.product-details-page .overview .actual-price label {+ color: #aaa;+ font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";+ font-size: 16px;+ font-weight: 500;+}+.product-details-page .overview .old-price {+ padding: 0 0 11px 0;+ color: #999;+ font-family: 'Poppins', sans-serif;+ font-size: 18px;+ font-weight: 400;+ line-height: 1;+ text-decoration: line-through;+}++/* product add to cart */++.product-details-page .qty-controls {+ display: flex;+ flex-direction: column;+ align-items: center;+ justify-content: center;+ height: 60px;+ background: #eaf0fa;+}+.product-details-page .qty-controls div {+ display: flex;+ justify-content: center;+ align-items: center;+ position: relative;+ width: 30px;+ height: 30px;+ border: 1px solid rgba(0,0,0,.2);+ border-right: 0;+ cursor: pointer;+}+.product-details-page .qty-controls div.plus::before, .product-details-page .qty-controls div.plus::after, .product-details-page .qty-controls div.minus::before {+ content: "";+ position: absolute;+ top: 13px;+ left: 9px;+ width: 12px;+ height: 2px;+ display: flex;+ justify-content: center;+ background: #000;+}+.product-details-page .qty-controls div.plus:hover::before, .product-details-page .qty-controls div.plus:hover::after, .product-details-page .qty-controls div.minus:hover::before {+ background: #25b232;+}+.product-details-page .qty-controls div.plus::after {+ transform: rotate( 90deg );+ -webkit-transform: rotate( 90deg );+}+.product-details-page .qty-controls div:last-child {+ border-top: 0;+}+.product-add-to-cart .qty-input, .product-add-to-cart .qty-dropdown {+ max-width: 65px;+ height: 60px;+ color: #000;+ font-size: 18px;+ font-weight: 700;+ background-color: #eaf0fa;+ border-color: rgba(0,0,0,.2);+}+.product-details-page .add-to-cart-button.btn-info {+ display: flex;+ align-items: center;+ justify-content: center;+ font-family: 'Poppins', sans-serif;+ font-size: 16px;+ font-weight: 700;+ text-transform: uppercase;+ background-color: #25b232;+ border: 0;+}+.product-details-page .add-to-cart-button.btn-info:focus, .product-details-page .add-to-cart-button.btn-info:active, .product-details-page .add-to-cart-button.btn-info:not(:disabled):not(.disabled):active:focus {+ background-color: #dda128;+ box-shadow: 0 0 0 0.2rem rgba(181, 126, 16, .5);+}+.product-other-buttons {+ display: flex;+ flex-direction: column;+ flex-wrap: wrap;+ align-items: flex-start;+ margin: 15px 0;+}+.product-other-buttons .btn.btn-outline-secondary,+.product-other-buttons .btn.btn-outline-secondary:active,+.product-other-buttons .btn.btn-outline-secondary:active:focus {+ display: flex;+ align-items: center;+ padding: 5px 0;+ font-family: Poppins, sans-serif;+ border: 0;+ background-color: transparent;+ color: #aaa;+ box-shadow: none;+}+.product-other-buttons .btn.btn-outline-secondary:hover {+ color: #25b232;+}+.product-other-buttons .btn.btn-outline-secondary .text {+ margin: 0 0 0 10px;+ font-size: 16px;+ font-weight: 400;+ line-height: 1;+}++/* product tabs */++.product-details-page .nav-tabs {+ position: relative;+ justify-content: center;+ border: 0;+}+.product-details-page .nav-tabs li:first-child::before {+ content: "";+ position: absolute;+ bottom: 0;+ left: 0;+ width: 50%;+ height: 1px;+ background: rgba(0,0,0,.1);+ z-index: 0;+}+.product-details-page .nav-tabs li:first-child::after {+ content: "";+ position: absolute;+ bottom: 0;+ right: 0;+ width: 50%;+ height: 1px;+ background: rgba(0,0,0,.1);+ z-index: 0;+}+.product-details-page .nav-tabs .nav-link {+ position: relative;+ margin: 0 -1px 2px 0;+ padding: 16px 26px;+ font-size: 14px;+ text-transform: uppercase;+ font-weight: 700;+ font-family: Poppins, sans-serif;+ color: #000;+ background-color: transparent;+ border: 1px solid rgba(0,0,0,.1);+ border-bottom: 0;+ outline: none;+ border-radius: 0;+ -webkit-transition: all .2s ease;+ transition: all .2s ease;+}+.product-details-page .nav-tabs .nav-link.active {+ color: #fff;+ background-color: #25b232;+}+.product-details-page .nav-tabs .nav-link:hover:not(.active) {+ color: #fff;+ background-color: #000;+}+.product-details-page .nav-tabs .nav-link::before {+ content: "";+ position: absolute;+ bottom: 0px;+ left: 50%;+ right: 50%;+ width: 0;+ height: 100%;+ background: #333;+ -webkit-transition: all 0.2s ease-out;+ transition: all 0.2s ease-out;+ z-index: -1;+}+.product-details-page .nav-tabs .nav-link:hover::before {+ left: 0;+ right: 0;+ width: 100%;+}+.product-details-page .nav-tabs .nav-link.active::before {+ background: #25b232;+ left: 0;+ right: 0;+ width: 100%;+}++/* product collateral */++.product-collateral .add-to-cart-button {+ max-width: 160px;+}+.product-collateral .add-to-wishlist-button {+ width: 235px;+}++/* quick view */++.modal-content .gallery-top {+ width: 100%;+}++@media (max-width: 767px) {+ .product-details-page .gallery {+ margin: 0 0 15px 0;+ }+ .product-details-page .generalTitle {+ font-size: 28px;+ }+}+@media (max-width: 575px) {+ .product-details-page .gallery-slider {+ height: 400px;+ }+ .product-details-page .generalTitle {+ font-size: 24px;+ }+}+@media (max-width: 380px) {+ .product-details-page .generalTitle {+ font-size: 22px;+ margin: 0 0 10px 0;+ }+ .product-details-page .overview .short-description {+ font-size: 14px;+ }+ .product-details-page .gallery-slider {+ height: 320px;+ }+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/images/facebook.svg b/src/Plugins/Theme.Modern/Content/images/facebook.svgnew file mode 100644index 000000000..d775b2897--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/images/facebook.svg@@ -0,0 +1 @@+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Facebook icon</title><path d="M23.9981 11.9991C23.9981 5.37216 18.626 0 11.9991 0C5.37216 0 0 5.37216 0 11.9991C0 17.9882 4.38789 22.9522 10.1242 23.8524V15.4676H7.07758V11.9991H10.1242V9.35553C10.1242 6.34826 11.9156 4.68714 14.6564 4.68714C15.9692 4.68714 17.3424 4.92149 17.3424 4.92149V7.87439H15.8294C14.3388 7.87439 13.8739 8.79933 13.8739 9.74824V11.9991H17.2018L16.6698 15.4676H13.8739V23.8524C19.6103 22.9522 23.9981 17.9882 23.9981 11.9991Z"/></svg>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/images/instagram.svg b/src/Plugins/Theme.Modern/Content/images/instagram.svgnew file mode 100644index 000000000..e0b8ffd7e--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/images/instagram.svg@@ -0,0 +1 @@+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Instagram icon</title><path d="M12 0C8.74 0 8.333.015 7.053.072 5.775.132 4.905.333 4.14.63c-.789.306-1.459.717-2.126 1.384S.935 3.35.63 4.14C.333 4.905.131 5.775.072 7.053.012 8.333 0 8.74 0 12s.015 3.667.072 4.947c.06 1.277.261 2.148.558 2.913.306.788.717 1.459 1.384 2.126.667.666 1.336 1.079 2.126 1.384.766.296 1.636.499 2.913.558C8.333 23.988 8.74 24 12 24s3.667-.015 4.947-.072c1.277-.06 2.148-.262 2.913-.558.788-.306 1.459-.718 2.126-1.384.666-.667 1.079-1.335 1.384-2.126.296-.765.499-1.636.558-2.913.06-1.28.072-1.687.072-4.947s-.015-3.667-.072-4.947c-.06-1.277-.262-2.149-.558-2.913-.306-.789-.718-1.459-1.384-2.126C21.319 1.347 20.651.935 19.86.63c-.765-.297-1.636-.499-2.913-.558C15.667.012 15.26 0 12 0zm0 2.16c3.203 0 3.585.016 4.85.071 1.17.055 1.805.249 2.227.415.562.217.96.477 1.382.896.419.42.679.819.896 1.381.164.422.36 1.057.413 2.227.057 1.266.07 1.646.07 4.85s-.015 3.585-.074 4.85c-.061 1.17-.256 1.805-.421 2.227-.224.562-.479.96-.899 1.382-.419.419-.824.679-1.38.896-.42.164-1.065.36-2.235.413-1.274.057-1.649.07-4.859.07-3.211 0-3.586-.015-4.859-.074-1.171-.061-1.816-.256-2.236-.421-.569-.224-.96-.479-1.379-.899-.421-.419-.69-.824-.9-1.38-.165-.42-.359-1.065-.42-2.235-.045-1.26-.061-1.649-.061-4.844 0-3.196.016-3.586.061-4.861.061-1.17.255-1.814.42-2.234.21-.57.479-.96.9-1.381.419-.419.81-.689 1.379-.898.42-.166 1.051-.361 2.221-.421 1.275-.045 1.65-.06 4.859-.06l.045.03zm0 3.678c-3.405 0-6.162 2.76-6.162 6.162 0 3.405 2.76 6.162 6.162 6.162 3.405 0 6.162-2.76 6.162-6.162 0-3.405-2.76-6.162-6.162-6.162zM12 16c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm7.846-10.405c0 .795-.646 1.44-1.44 1.44-.795 0-1.44-.646-1.44-1.44 0-.794.646-1.439 1.44-1.439.793-.001 1.44.645 1.44 1.439z"/></svg>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/images/linkedin.svg b/src/Plugins/Theme.Modern/Content/images/linkedin.svgnew file mode 100644index 000000000..3dc9f68a5--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/images/linkedin.svg@@ -0,0 +1 @@+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>LinkedIn icon</title><path d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z"/></svg>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/images/pinterest.svg b/src/Plugins/Theme.Modern/Content/images/pinterest.svgnew file mode 100644index 000000000..ad07407de--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/images/pinterest.svg@@ -0,0 +1 @@+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Pinterest icon</title><path d="M12.017 0C5.396 0 .029 5.367.029 11.987c0 5.079 3.158 9.417 7.618 11.162-.105-.949-.199-2.403.041-3.439.219-.937 1.406-5.957 1.406-5.957s-.359-.72-.359-1.781c0-1.663.967-2.911 2.168-2.911 1.024 0 1.518.769 1.518 1.688 0 1.029-.653 2.567-.992 3.992-.285 1.193.6 2.165 1.775 2.165 2.128 0 3.768-2.245 3.768-5.487 0-2.861-2.063-4.869-5.008-4.869-3.41 0-5.409 2.562-5.409 5.199 0 1.033.394 2.143.889 2.741.099.12.112.225.085.345-.09.375-.293 1.199-.334 1.363-.053.225-.172.271-.401.165-1.495-.69-2.433-2.878-2.433-4.646 0-3.776 2.748-7.252 7.92-7.252 4.158 0 7.392 2.967 7.392 6.923 0 4.135-2.607 7.462-6.233 7.462-1.214 0-2.354-.629-2.758-1.379l-.749 2.848c-.269 1.045-1.004 2.352-1.498 3.146 1.123.345 2.306.535 3.55.535 6.607 0 11.985-5.365 11.985-11.987C23.97 5.39 18.592.026 11.985.026L12.017 0z"/></svg>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/images/rss.svg b/src/Plugins/Theme.Modern/Content/images/rss.svgnew file mode 100644index 000000000..1428e1a16--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/images/rss.svg@@ -0,0 +1 @@+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>RSS icon</title><path d="M19.199 24C19.199 13.467 10.533 4.8 0 4.8V0c13.165 0 24 10.835 24 24h-4.801zM3.291 17.415c1.814 0 3.293 1.479 3.293 3.295 0 1.813-1.485 3.29-3.301 3.29C1.47 24 0 22.526 0 20.71s1.475-3.294 3.291-3.295zM15.909 24h-4.665c0-6.169-5.075-11.245-11.244-11.245V8.09c8.727 0 15.909 7.184 15.909 15.91z"/></svg>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/images/twitter.svg b/src/Plugins/Theme.Modern/Content/images/twitter.svgnew file mode 100644index 000000000..af5b7c341--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/images/twitter.svg@@ -0,0 +1 @@+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Twitter icon</title><path d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z"/></svg>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/images/youtube.svg b/src/Plugins/Theme.Modern/Content/images/youtube.svgnew file mode 100644index 000000000..6aca43ca5--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/images/youtube.svg@@ -0,0 +1 @@+<svg role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>YouTube icon</title><path d="M23.495 6.205a3.007 3.007 0 0 0-2.088-2.088c-1.87-.501-9.396-.501-9.396-.501s-7.507-.01-9.396.501A3.007 3.007 0 0 0 .527 6.205a31.247 31.247 0 0 0-.522 5.805 31.247 31.247 0 0 0 .522 5.783 3.007 3.007 0 0 0 2.088 2.088c1.868.502 9.396.502 9.396.502s7.506 0 9.396-.502a3.007 3.007 0 0 0 2.088-2.088 31.247 31.247 0 0 0 .5-5.783 31.247 31.247 0 0 0-.5-5.805zM9.609 15.601V8.408l6.264 3.602z"/></svg>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/script/app.js b/src/Plugins/Theme.Modern/Content/script/app.jsnew file mode 100644index 000000000..553b71458--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/script/app.js@@ -0,0 +1,686 @@+"use strict";++Vue.use(VueAwesomeSwiper)+var vm = new Vue({+ el: '#app',+ data: function () {+ return {+ show: false,+ fluid: false,+ hover: false,+ darkMode: false,+ active: false,+ NextDropdownVisible: false,+ value: 5,+ searchitems: null,+ searchcategories: null,+ searchbrands: null,+ searchblog: null,+ searchproducts: null,+ flycartfirstload: true,+ PopupAddToCartVueModal: null,+ PopupQuickViewVueModal: null,+ menuToggled: false,+ index: null,+ RelatedProducts: null,+ compareproducts: null,+ compareProductsQty: 0,+ loader: false,+ flyMenuContainer: false,+ topHeaderInfo: {+ swiperOptions: {+ slidesPerView: 1,+ autoplay: {+ delay: '3000'+ },+ effect: 'flip',+ flipEffect: {+ slideShadows: false,+ },+ loop: true,+ spaceBetween: 10,+ }+ },+ QuickViewSlider: {+ swiperOptions: {+ slidesPerView: 1,+ spaceBetween: 10,+ navigation: {+ nextEl: '#ModalQuickView .swiper-button-next',+ prevEl: '#ModalQuickView .swiper-button-prev'+ }+ },+ },+ QuickViewSliderThumbs: {+ swiperOptions: {+ spaceBetween: 10,+ slidesPerView: 5,+ watchSlidesVisibility: true,+ watchSlidesProgress: true,+ slideToClickedSlide: true,+ },+ },+ }+ },+ props: {+ flycart: null,+ flycartitems: null,+ flycartindicator: undefined,+ flywish: null,+ wishlistitems: null,+ wishindicator: undefined,+ UpdatedShoppingCartItemId: null,+ },+ mounted: function () {+ if (localStorage.fluid == "true") this.fluid = "fluid";+ if (localStorage.fluid == "fluid") this.fluid = "fluid";+ if (localStorage.fluid == "") this.fluid = "false";+ if (localStorage.darkMode == "true") this.darkMode = true;+ this.TopScroll();+ //this.wishindicator = parseInt(this.$refs.wishlistQty.innerText);+ this.updateCompareProductsQty();+ this.backToTop();+ if (991 < window.innerWidth) {+ this.linksContainer();+ }+ window.addEventListener('DOMContentLoaded', () => {+ vm.$forceUpdate();+ });+ },+ created: function () {+ if (location.pathname !== "/") {+ this.menuToggled = false;+ }+ },+ watch: {+ fluid: function (newName) {+ localStorage.fluid = newName;+ },+ darkMode: function (newValue) {+ localStorage.darkMode = newValue;+ },+ PopupQuickViewVueModal: function () {+ vm.getLinkedProductsQV(vm.PopupQuickViewVueModal.Id);+ }+ },+ methods: {+ openMenu(el, mainMenu) {+ var menu = document.getElementById(mainMenu);+ if (menu.classList.contains('show')) {+ menu.classList.remove('show');+ el.classList.remove('show');+ } else {+ menu.classList.add('show');+ el.classList.add('show');+ }+ },+ linksContainer() {+ var ol = document.querySelector('#mainMenu .other-links');+ var lc = document.getElementById('links-container');+ if (ol !== null) {+ lc.prepend(ol)+ }+ },+ menuButton: function () {+ this.menuToggled = !this.menuToggled;+ },+ productImageSlide: function (event) {+ var Imagesrc = event.target.parentElement.getAttribute('data-href');+ function collectionHas(a, b) {+ for (var i = 0, len = a.length; i < len; i++) {+ if (a[i] == b) return true;+ }+ return false;+ }+ function findParentBySelector(elm, selector) {+ var all = document.querySelectorAll(selector);+ var cur = elm.parentNode;+ while (cur && !collectionHas(all, cur)) {+ cur = cur.parentNode;+ }+ return cur;+ }++ var yourElm = event.target+ var selector = ".product-box-slide";+ var parent = findParentBySelector(yourElm, selector);+ var Image = parent.querySelectorAll(".main-product-img")[0];+ Image.setAttribute('src', Imagesrc);+ },+ slideTo: function (e) {+ vm.$refs.QuickViewSlider.$swiper.slideTo(e.dataset.index);+ },+ TopScroll: function () {+ var body = document.body;+ var scrollUp = "scroll-up";+ var scrollDown = "scroll-down";+ var onTop = "onTop";+ let lastScroll = 0;++ var currentScrollWindow = window.pageYOffset;+ if (currentScrollWindow == 0) {+ body.classList.add(onTop);+ }++ window.addEventListener("scroll", function () {+ var currentScroll = window.pageYOffset;+ if (window.pageYOffset <= 10) {+ body.classList.add(onTop);+ } else {+ body.classList.remove(onTop);+ }+ if (currentScroll > lastScroll && !body.classList.contains(scrollDown)) {+ // down+ body.classList.remove(scrollUp);+ if (lastScroll != 0) {+ body.classList.add(scrollDown);+ return;+ } else {+ body.classList.remove(scrollDown);+ }+ } else if (currentScroll < lastScroll && body.classList.contains(scrollDown)) {+ // up+ body.classList.remove(scrollDown);+ body.classList.add(scrollUp);+ }+ lastScroll = currentScroll;+ });+ },+ toogleMenu: function () {+ if (this.flyMenuContainer) {+ this.flyMenuContainer = false;+ } else {+ this.flyMenuContainer = true;+ }+ },+ backToTop() {+ if (!document.querySelector('.up-btn')) {+ const upBtn = document.createElement('div');+ const upBtnContent = document.createElement('div');++ upBtn.classList.add('up-btn', 'up-btn__hide');++ function showBtn(num) {+ if (document.documentElement.scrollTop >= num) {+ upBtn.classList.remove('up-btn__hide');+ } else {+ upBtn.classList.add('up-btn__hide');+ }+ }++ document.body.append(upBtn);+ upBtn.append(upBtnContent)+ window.addEventListener('scroll', () => {+ showBtn(400);+ });++ upBtn.addEventListener('click', () => {+ window.scrollTo({+ top: 0,+ behavior: "smooth"+ });+ });+ }+ },+ newsletterBox(AllowToUnsubscribe, url) {+ let subscribe;+ if (AllowToUnsubscribe) {+ subscribe = this.$refs.newsletterSubscribe.checked+ } else {+ subscribe = true+ }+ var postData = {+ subscribe: subscribe,+ email: document.getElementById("newsletter-email").value+ };+ axios({+ url: url,+ params: postData,+ method: 'post',+ }).then(function (response) {+ let result = response.data.Result;+ let resultCategory = response.data.ResultCategory;+ let showCategories = response.data.Showcategories;+ let success = response.data.Success;+ let variant;++ if (success) {+ variant = "info";+ } else {+ variant = "danger";+ }++ vm.$bvToast.toast(result, {+ variant: variant,+ autoHideDelay: 3500,+ solid: true,+ });++ if (showCategories) {+ vm.displayPopup(resultCategory, 'ModalNewsletterCategory');+ }++ });+ },+ newsletterSubscribeCategory(url) {+ let form = document.getElementById('newsletter-category-method-form');+ let data = new FormData(form);+ axios({+ url: url,+ method: 'post',+ data: data,+ }).then(function (response) {+ if (!response.data.Success) {+ alert(response.data.Message);+ }+ }).catch(function (error) {+ alert(error);+ })+ },+ getPrivacyPreference(href) {+ axios({+ url: href,+ method: 'get',+ }).then(function (response) {+ vm.displayPopup(response.data.html, 'ModalPrivacyPreference')+ }).catch(function (error) {+ alert(error);+ });+ },+ savePrivacyPreference(href) {+ let form = document.getElementById('frmPrivacyPreference');+ let data = new FormData(form);+ axios({+ url: href,+ method: 'post',+ data: data+ }).catch(function (error) {+ alert(error);+ });+ },+ displayPopup(html, el) {+ new Vue({+ el: '#' + el,+ data: {+ template: null,+ },+ render: function (createElement) {+ if (!this.template) {+ return createElement('b-overlay', {+ attrs: {+ show: 'true'+ }+ });+ } else {+ return this.template();+ }+ },+ methods: {+ showModal: function () {+ this.$refs[el].show()+ }+ },+ mounted: function () {+ var self = this;+ self.template = Vue.compile(html).render;+ this.darkMode = vm.darkMode;+ },+ updated: function () {+ this.showModal();+ }+ });+ },+ displayBarNotification(message, url, messagetype, timeout) {+ var variant;++ if (messagetype == 'error') {+ variant = "danger";+ } else {+ variant = "info";+ }++ this.$bvToast.toast(message, {+ title: messagetype,+ variant: variant,+ href: url,+ autoHideDelay: timeout,+ solid: true+ })+ },+ deletecartitem: function (href) {+ axios({+ method: "post",+ baseURL: href+ }).then(function (response) {+ const newfly = response.data.sidebarshoppingcartmodel;+ vm.flycart = newfly;+ vm.flycartitems = newfly.Items;+ vm.flycartindicator = newfly.TotalProducts;+ }).catch(function (error) {+ alert(error);+ });+ return false;+ },+ updateCompareProductsQty: function () {+ const cookie = AxiosCart.getCookie('Grand.CompareProduct');+ if (cookie !== '') {+ const qty = cookie.split('|').filter(Boolean).length;+ this.compareProductsQty = qty;+ } else {+ this.compareProductsQty = 0;+ }+ },+ updateSidebarShoppingCart: function (url) {+ axios({+ baseURL: url,+ method: 'get',+ data: null,+ headers: {+ 'Accept': 'application/json',+ 'Content-Type': 'application/json',+ 'X-Response-View': 'Json'+ }+ }).then(response => (+ this.flycart = response.data,+ this.flycartitems = response.data.Items,+ this.flycartindicator = response.data.TotalProducts,+ this.flycartfirstload = false+ ))+ },+ updateWishlist: function (url) {+ axios({+ baseURL: url,+ method: 'get',+ data: null,+ headers: {+ 'Accept': 'application/json',+ 'Content-Type': 'application/json',+ 'X-Response-View': 'Json'+ }+ }).then(response => (+ this.loader = false,+ this.flywish = response.data,+ this.wishlistitems = response.data.Items,+ this.wishindicator = response.data.Items.length+ ))+ },+ getCompareList: function (url) {+ this.loader = true;+ axios({+ baseURL: url,+ method: 'get',+ params: {+ t: new Date().getTime()+ },+ data: null,+ headers: {+ 'Accept': 'application/json',+ 'Content-Type': 'application/json',+ 'X-Response-View': 'Json'+ }+ }).then(response => {+ this.loader = false;+ this.compareproducts = response.data+ })+ },+ removeFromCompareList: function (product, index) {+ if (product !== undefined) {+ const compareList = AxiosCart.getCookie('Grand.CompareProduct');+ const newCompareList = compareList.replace(product, '');+ AxiosCart.setCookie('Grand.CompareProduct', newCompareList);+ vm.compareproducts.Products.splice(index, 1);+ } else {+ AxiosCart.setCookie('Grand.CompareProduct', '');+ vm.compareproducts.Products.splice(0);+ }+ this.updateCompareProductsQty();+ },+ showModalOutOfStock: function () {+ this.$refs['out-of-stock'].show()+ },+ productImage: function (event) {+ var Imagesrc = event.target.parentElement.getAttribute('data-href');+ function collectionHas(a, b) {+ for (var i = 0, len = a.length; i < len; i++) {+ if (a[i] == b) return true;+ }+ return false;+ }+ function findParentBySelector(elm, selector) {+ var all = document.querySelectorAll(selector);+ var cur = elm.parentNode;+ while (cur && !collectionHas(all, cur)) {+ cur = cur.parentNode;+ }+ return cur;+ }++ var yourElm = event.target+ var selector = ".product-box";+ var parent = findParentBySelector(yourElm, selector);+ var Image = parent.querySelectorAll(".main-product-img")[0];+ Image.setAttribute('src', Imagesrc);+ },+ formSubmit() {+ vm.$refs.form.submit();+ },+ formSubmitParam(e, observer) {+ if (e && observer) {+ observer.validate().then(success => {+ if (!success) {+ return+ } else {+ var submitter = e.target.querySelector('[type="submit"]');+ eval(submitter.dataset.form)+ }+ });+ }+ },+ isMobile: function () {+ return (typeof window.orientation !== "undefined") || (navigator.userAgent.indexOf('IEMobile') !== -1);+ },+ attrchange: function (productId, loadPicture) {+ var form = document.getElementById('product-details-form');+ var data = new FormData(form);+ var pId;++ if (vm.PopupQuickViewVueModal.ProductBundleModels.length > 0) {+ pId = vm.PopupQuickViewVueModal.Id;+ } else {+ pId = productId;+ }++ axios({+ url: '/product/productdetails_attributechange?productId=' + pId + '&loadPicture=' + loadPicture,+ data: data,+ method: 'post',+ params: { product: pId },+ }).then(function (response) {+ if (vm.PopupQuickViewVueModal.ProductBundleModels.length > 0) {+ if (response.data.price) {+ if (vm.PopupQuickViewVueModal.ProductPrice.PriceWithDiscount != null)+ vm.PopupQuickViewVueModal.ProductPrice.PriceWithDiscount = response.data.price;+ else+ vm.PopupQuickViewVueModal.ProductPrice.Price = response.data.price;+ }+ } else {+ if (response.data.price) {+ if (vm.PopupQuickViewVueModal.ProductType == 0) {+ if (vm.PopupQuickViewVueModal.ProductPrice.PriceWithDiscount != null)+ vm.PopupQuickViewVueModal.ProductPrice.PriceWithDiscount = response.data.price;+ else+ vm.PopupQuickViewVueModal.ProductPrice.Price = response.data.price;+ } else {+ vm.PopupQuickViewVueModal.AssociatedProducts.find(x => x.Id === pId).ProductPrice.Price = response.data.price;+ }+ }+ if (response.data.sku) {+ vm.PopupQuickViewVueModal.Sku = response.data.sku;+ }+ if (response.data.mpn) {+ vm.PopupQuickViewVueModal.Mpn = response.data.mpn;+ }+ if (response.data.gtin) {+ vm.PopupQuickViewVueModal.Gtin = response.data.gtin;+ }+ if (response.data.stockAvailability) {+ vm.PopupQuickViewVueModal.StockAvailability = response.data.stockAvailability;+ }+ if (response.data.enabledattributemappingids) {+ for (var i = 0; i < response.data.enabledattributemappingids.length; i++) {+ document.querySelector('#product_attribute_label_' + response.data.enabledattributemappingids[i]).style.display = "table-cell";+ document.querySelector('#product_attribute_input_' + response.data.enabledattributemappingids[i]).style.display = "table-cell";+ }+ }+ if (response.data.disabledattributemappingids) {+ for (var i = 0; i < response.data.disabledattributemappingids.length; i++) {+ document.querySelector('#product_attribute_label_' + response.data.disabledattributemappingids[i]).style.display = "none";+ document.querySelector('#product_attribute_input_' + response.data.disabledattributemappingids[i]).style.display = "none";+ }+ }+ /*if (response.data.notAvailableAttributeMappingids) {+ document.querySelectorAll('[data-disable]').forEach((element) => element.disabled = false);+ for (var i = 0; i < response.data.notAvailableAttributeMappingids.length; i++) {+ if (document.querySelectorAll("[data-disable='" + response.data.notAvailableAttributeMappingids[i] + "']").length > 0) {+ document.querySelectorAll("[data-disable='" + response.data.notAvailableAttributeMappingids[i] + "']")[0].disabled = true;+ }+ }+ }*/+ if (response.data.pictureDefaultSizeUrl !== null) {+ if (vm.PopupQuickViewVueModal.PictureModels.length > 1) {+ const active_img_src = vm.$refs.QuickViewSlider.$swiper.slides[vm.$refs.QuickViewSlider.$swiper.activeIndex].querySelector("img").dataset.srcs;+ if (!(active_img_src == response.data.pictureDefaultSizeUrl)) {+ vm.$refs.QuickViewSlider.$swiper.slides.forEach(function (element, index) {+ const img_src = element.querySelector('img').dataset.srcs;+ if (img_src == response.data.pictureDefaultSizeUrl) {+ vm.$refs.QuickViewSlider.$swiper.slideTo(index, 1000, false)+ }+ })+ }+ } else {+ vm.PopupQuickViewVueModal.DefaultPictureModel.ImageUrl = response.data.pictureDefaultSizeUrl;+ }+ }+ }+ });+ },+ uploadFile: function (e) {+ var formData = new FormData();+ var imagefile = e;+ var url = imagefile.getAttribute('data-url');+ formData.append("image", qqfile.files[0]);+ axios.post(url, formData, {+ headers: {+ 'Content-Type': 'multipart/form-data'+ }+ }).then(function (response) {+ if (response.data.success) {+ var message = response.data.message;+ var downloadGuid = response.data.downloadGuid;+ var downloadUrl = response.data.downloadUrl;+ var downloadBtn = document.querySelector('.download-file');+ var messageContainer = document.getElementById('download-message');++ e.setAttribute('qq-button-id', downloadGuid);+ document.querySelector('.hidden-upload-input').value = downloadGuid;++ messageContainer.style.display = "block";+ messageContainer.classList.remove('alert-danger');+ messageContainer.classList.add('alert-info');+ messageContainer.innerText = message;++ downloadBtn.style.display = "block";+ downloadBtn.children[0].setAttribute('href', downloadUrl);++ } else {+ var message = response.data.message;+ var messageContainer = document.getElementById('download-message');+ messageContainer.style.display = "block";+ messageContainer.classList.remove('alert-info');+ messageContainer.classList.add('alert-danger');+ messageContainer.innerText = message;+ }+ })+ },+ initReservationQV: function () {+ if (vm.PopupQuickViewVueModal !== null && vm.PopupQuickViewVueModal.ProductType == 20) {+ var productId = vm.PopupQuickViewVueModal.Id;+ var fullDate = vm.PopupQuickViewVueModal.ReservationFullDate;+ var year = vm.PopupQuickViewVueModal.ReservationYear;+ var month = vm.PopupQuickViewVueModal.ReservationMonth;+ Reservation.init(fullDate, year, month, "No available reservations", "/Product/GetDatesForMonth", productId, "/product/productdetails_attributechange?productId=" + productId);+ }+ },+ getLinkedProductsQV: function (id) {+ axios({+ url: '/Product/RelatedProducts',+ method: 'get',+ params: { "productId": id },+ headers: {+ 'Accept': 'application/json',+ 'Content-Type': 'application/json',+ 'X-Response-View': 'Json'+ }+ }).then(function (response) {+ vm.RelatedProducts = response.data;+ });+ },+ warehouse_change_handler(id, url) {+ var data = new FormData();+ data.append('warehouseId', document.getElementById('WarehouseId').value);+ data.append('productId', id);+ axios({+ url: url,+ data: data,+ method: 'post'+ }).then(function (response) {+ if (response.data.stockAvailability) {+ vm.PopupQuickViewVueModal.StockAvailability = response.data.stockAvailability;+ }+ })+ },+ formatDate(date) {+ var d = new Date(date),+ month = '' + (d.getMonth() + 1),+ day = '' + d.getDate(),+ year = d.getFullYear();++ if (month.length < 2)+ month = '0' + month;+ if (day.length < 2)+ day = '0' + day;++ return [month, day, year].join('/');+ },+ QuickViewShown: function () {+ if (vm.PopupQuickViewVueModal.ProductAttributes.length > 0) {+ vm.attrchange(vm.PopupQuickViewVueModal.Id, true)+ } else {+ var bundleProducts = vm.PopupQuickViewVueModal.ProductBundleModels;+ if (bundleProducts.length > 0) {+ vm.attrchange(vm.PopupQuickViewVueModal.Id, true)+ }+ }+ if (vm.PopupQuickViewVueModal.ProductType == 20) {+ var StartDate;+ var EndDate;+ if (vm.PopupQuickViewVueModal.IntervalUnit == 10) {+ if (vm.PopupQuickViewVueModal.RentalStartDateUtc !== null) {+ StartDate = this.formatDate(vm.PopupQuickViewVueModal.RentalStartDateUtc);+ vm.PopupQuickViewVueModal.RentalStartDateUtc = StartDate;+ }+ if (vm.PopupQuickViewVueModal.RentalEndDateUtc !== null) {+ EndDate = this.formatDate(vm.PopupQuickViewVueModal.RentalEndDateUtc);+ vm.PopupQuickViewVueModal.RentalEndDateUtc = EndDate;+ }+ } else {+ if (vm.PopupQuickViewVueModal.RentalStartDateUtc !== null) {+ vm.PopupQuickViewVueModal.RentalStartDateUtc = this.formatDate(vm.PopupQuickViewVueModal.RentalStartDateUtc);+ } else {+ vm.PopupQuickViewVueModal.RentalStartDateUtc = null;+ }+ }+ }+ },+ },+});diff --git a/src/Plugins/Theme.Modern/Content/script/catalog.js b/src/Plugins/Theme.Modern/Content/script/catalog.jsnew file mode 100644index 000000000..fe05192b8--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/script/catalog.js@@ -0,0 +1,75 @@+Vue.use(VueAwesomeSwiper)+var subcatslider = new Vue({+ data() {+ return {+ swiperOptions: {+ effect: 'slide',+ lazy: {+ preloaderClass: 'preloader'+ },+ autoplay: {+ delay: 5000,+ },+ slidesPerView: 2,+ spaceBetween: 15,+ breakpoints: {+ 320: {+ slidesPerView: 2,+ },+ 576: {+ slidesPerView: 2,+ },+ 768: {+ slidesPerView: 3,+ },+ 992: {+ slidesPerView: 3,+ },+ 1200: {+ slidesPerView: 3,+ }+ },++ }+ }+ },+});+function sideToggle() {+ var leftSide = document.querySelector(".generalLeftSide");+ if (leftSide.classList.contains('show')) {+ leftSide.classList.remove('show');+ localStorage.setItem('leftSideOpen', 'false');+ } else {+ leftSide.classList.add('show');+ localStorage.setItem('leftSideOpen', 'true');+ }+ setTimeout(function () {+ if (vm.$refs.SubCategories) {+ vm.$refs.SubCategories.$swiper.update();+ }+ }, 400);+}+document.addEventListener("DOMContentLoaded", function () {+ document.querySelectorAll(".viewmode-icon").forEach(function (element) {+ element.addEventListener("click", function (e) {+ document.querySelectorAll('.viewmode-icon').forEach(function (el) {+ el.classList.remove('selected');+ });+ element.classList.add('selected');+ });+ });+});++function closeLeftSide() {+ var leftSide = document.querySelector(".generalLeftSide");+ if (leftSide.classList.contains('show')) {+ leftSide.classList.remove('show');+ localStorage.setItem('leftSideOpen', 'false');+ }+ setTimeout(function () {+ if (vm.$refs.SubCategories) {+ vm.$refs.SubCategories.$swiper.update();+ }+ }, 400);+}+diff --git a/src/Plugins/Theme.Modern/Content/script/home.js b/src/Plugins/Theme.Modern/Content/script/home.jsnew file mode 100644index 000000000..4075d31ef--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/script/home.js@@ -0,0 +1,394 @@+Vue.use(VueAwesomeSwiper)+var hpi = new Vue({+ props: {+ HomePageItems: {+ type: Array,+ default: () => [+ {+ HomePageCategories: {+ items: [],+ swiperOptions: {+ lazy: true,+ freeMode: true,+ autoplay: {+ delay: 5000,+ },+ spaceBetween: 10,+ breakpoints: {+ 320: {+ slidesPerView: 1,+ },+ 576: {+ slidesPerView: 2,+ },+ 768: {+ slidesPerView: 3,+ },+ 992: {+ slidesPerView: 3,+ },+ 1200: {+ slidesPerView: 3,+ }+ },+ },+ loading: true,+ },+ HomePageBrands: {+ items: [],+ loading: true,+ swiperOptions: {+ loop: true,+ autoplay: {+ delay: 5000,+ },+ breakpoints: {+ 320: {+ slidesPerView: 2,+ },+ 576: {+ slidesPerView: 2,+ },+ 768: {+ slidesPerView: 4,+ },+ 992: {+ slidesPerView: 4,+ },+ 1200: {+ slidesPerView: 5,+ },+ 1400: {+ slidesPerView: 6,+ }+ },+ },+ },+ HomePageProducts: {+ items: [],+ loading: true,+ ProductsToShow: null,+ NumberOfProducts: null,+ },+ CategoryFeaturedProducts: {+ items: [],+ swiperOptions: {+ loop: true,+ lazy: true,+ watchOverflow: true,+ autoplay: {+ delay: 5000,+ },+ slidesPerView: 1,+ slidesPerColumn: 3,+ slidesPerColumnFill: 'row',+ breakpoints: {+ 320: {+ slidesPerView: 2,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 575: {+ slidesPerView: 2,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 768: {+ slidesPerView: 3,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 992: {+ slidesPerView: 4,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 1399: {+ slidesPerView: 5,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 1600: {+ slidesPerView: 6,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ },+ spaceBetween: 0,+ lazy: {+ preloaderClass: 'preloader',+ }+ },+ loading: true,+ },+ CollectionFeaturedProducts: {+ items: [],+ swiperOptions: {+ loop: true,+ lazy: true,+ watchOverflow: true,+ autoplay: {+ delay: 5000,+ },+ slidesPerView: 1,+ slidesPerColumn: 3,+ slidesPerColumnFill: 'row',+ breakpoints: {+ 320: {+ slidesPerView: 2,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 575: {+ slidesPerView: 2,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 768: {+ slidesPerView: 3,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 992: {+ slidesPerView: 4,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 1399: {+ slidesPerView: 5,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ 1600: {+ slidesPerView: 6,+ slidesPerColumn: 2,+ slidesPerColumnFill: 'row',+ },+ },+ spaceBetween: 0,+ lazy: {+ preloaderClass: 'preloader',+ },+ navigation: {+ nextEl: '#HomePageBestSellers .swiper-button-next',+ prevEl: '#HomePageBestSellers .swiper-button-prev'+ }+ },+ loading: true,+ },+ HomePageBestSellers: {+ items: [],+ loading: true,+ ProductsToShow: null,+ NumberOfProducts: null,+ },+ CustomerRecommendedProducts: {+ items: [],+ loading: true,+ ProductsToShow: null,+ NumberOfProducts: null,+ },+ PersonalizedProducts: {+ items: [],+ loading: true,+ ProductsToShow: null,+ NumberOfProducts: null,+ },+ SuggestedProducts: {+ items: [],+ loading: true,+ ProductsToShow: null,+ NumberOfProducts: null,+ },+ HomePageNews: {+ items: [],+ swiperOptions: {+ lazy: {+ preloaderClass: 'preloader'+ },+ autoplay: {+ delay: 5000,+ },+ fadeEffect: {+ crossFade: true+ },+ slidesPerView: 1,+ spaceBetween: 15,+ navigation: {+ nextEl: '#HomePageNews .swiper-button-next',+ prevEl: '#HomePageNews .swiper-button-prev'+ },+ breakpoints: {+ 320: {+ slidesPerView: 1+ },+ 575: {+ slidesPerView: 2,+ },+ 992: {+ slidesPerView: 3,+ }+ }+ },+ loading: true,+ },+ HomePageBlog: {+ items: [],+ swiperOptions: {+ lazy: {+ preloaderClass: 'preloader'+ },+ loop: true,+ autoplay: {+ delay: 5000,+ },+ slidesPerView: 1,+ spaceBetween: 15,+ navigation: {+ nextEl: '#HomePageBlog .swiper-button-next',+ prevEl: '#HomePageBlog .swiper-button-prev'+ },+ pagination: {+ el: '#HomePageBlog .swiper-pagination',+ type: 'bullets',+ clickable: true,+ },+ breakpoints: {+ 320: {+ slidesPerView: 1,+ },+ 575: {+ slidesPerView: 2,+ },+ 768: {+ slidesPerView: 3,+ },+ 992: {+ slidesPerView: 2,+ },+ 1250: {+ slidesPerView: 3,+ },+ 1540: {+ slidesPerView: 3,+ },+ 1680: {+ slidesPerView: 3,+ },+ 1920: {+ slidesPerView: 3,+ },+ },+ },+ loading: true,+ },+ }+ ]+ }+ },+ methods: {+ loadMore(event, NumberProducts, Products) {+ var SectionName = event.target.closest(".section");+ var LoadedProducts = SectionName.querySelectorAll(".product-box").length;++ if (LoadedProducts >= NumberProducts) {+ event.target.classList.add('disabled');+ event.target.innerText = event.target.getAttribute("data-nomore");+ } else {+ if ((NumberProducts - LoadedProducts) >= 6) {+ var showed = Products.ProductsToShow;+ Products.ProductsToShow = showed + 6;+ } else {+ Products.ProductsToShow = Products.ProductsToShow + (NumberProducts - LoadedProducts);+ event.target.classList.add('disabled');+ event.target.innerText = event.target.getAttribute("data-nomore");+ }+ }+ },+ groupBy(xs, key) {+ return xs.reduce(function (rv, x) {+ (rv[x[key]] = rv[x[key]] || []).push(x);+ return rv;+ }, {});+ }+ }+})++function LoadStandard(section) {+ axios({+ baseURL: '/Component/Form?Name=' + section + '',+ method: 'get',+ data: null,+ headers: {+ 'Accept': 'application/json',+ 'Content-Type': 'application/json',+ 'X-Response-View': 'Json'+ }+ }).then(response => {+ if (response.data != "") {+ hpi.HomePageItems[0][section].items = response.data;+ }+ }).then(function () {+ hpi.HomePageItems[0][section].loading = false;+ })+}+function LoadMore(section) {+ axios({+ baseURL: '/Component/Form?Name=' + section + '',+ method: 'get',+ data: null,+ headers: {+ 'Accept': 'asplication/json',+ 'Content-Type': 'asplication/json',+ 'X-Response-View': 'Json'+ }+ }).then(response => {+ if (response.data != "") {+ hpi.HomePageItems[0][section].items = response.data;+ hpi.HomePageItems[0][section].NumberOfProducts = response.data.length;+ if (response.data.length < 6) {+ hpi.HomePageItems[0][section].ProductsToShow = hpi.HomePageItems[0][section].NumberOfProducts;+ } else {+ hpi.HomePageItems[0][section].ProductsToShow = 6;+ }+ }+ }).then(function () {+ hpi.HomePageItems[0][section].loading = false;+ }).then(function () {+ hpi.HomePageItems[0][section].items.forEach(function (element) {+ element.SpecificationAttributeModels = hpi.groupBy(element.SpecificationAttributeModels, 'SpecificationAttributeName')+ })+ });+}++function LazyLoad() {+ var hp_section = document.querySelectorAll('.home-page-section');+ var viewLine = window.scrollY + window.innerHeight;+ for (var i = 0; i < hp_section.length; i++) {+ var section_loaded = hp_section[i].dataset.isloaded;+ if (hp_section[i].offsetTop - viewLine < 0 && section_loaded !== 'true') {+ var hpsectionid = hp_section[i].dataset.id;+ if (hp_section[i].dataset.load === 'standard') {+ LoadStandard(hpsectionid)+ } else {+ LoadMore(hpsectionid)+ }+ hp_section[i].dataset.isloaded = 'true';+ }+ }+}++window.onload = function () {+ LazyLoad();+};+document.addEventListener("DOMContentLoaded", function () {+ window.addEventListener('scroll', LazyLoad);++ document.querySelectorAll('.parallax-banner').forEach(function (element) {+ var scene = element;+ var parallaxInstance = new Parallax(scene, {+ relativeInput: true,+ hoverOnly: true,+ });+ })+});\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/script/medium-zoom.min.js b/src/Plugins/Theme.Modern/Content/script/medium-zoom.min.jsnew file mode 100644index 000000000..0f94570b4--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/script/medium-zoom.min.js@@ -0,0 +1,2 @@+/*! medium-zoom 1.0.6 | MIT License | https://github.com/francoischalifour/medium-zoom */+!function (e, t) { "object" == typeof exports && "undefined" != typeof module ? module.exports = t() : "function" == typeof define && define.amd ? define(t) : (e = e || self).mediumZoom = t() }(this, (function () { "use strict"; var e = Object.assign || function (e) { for (var t = 1; t < arguments.length; t++) { var o = arguments[t]; for (var n in o) Object.prototype.hasOwnProperty.call(o, n) && (e[n] = o[n]) } return e }, t = function (e) { return "IMG" === e.tagName }, o = function (e) { return e && 1 === e.nodeType }, n = function (e) { return ".svg" === (e.currentSrc || e.src).substr(-4).toLowerCase() }, i = function (e) { try { return Array.isArray(e) ? e.filter(t) : function (e) { return NodeList.prototype.isPrototypeOf(e) }(e) ? [].slice.call(e).filter(t) : o(e) ? [e].filter(t) : "string" == typeof e ? [].slice.call(document.querySelectorAll(e)).filter(t) : [] } catch (e) { throw new TypeError("The provided selector is invalid.\nExpects a CSS selector, a Node element, a NodeList or an array.\nSee: https://github.com/francoischalifour/medium-zoom") } }, r = function (e) { var t = document.createElement("div"); return t.classList.add("medium-zoom-overlay"), t.style.background = e, t }, d = function (e) { var t = e.getBoundingClientRect(), o = t.top, n = t.left, i = t.width, r = t.height, d = e.cloneNode(), m = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0, a = window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0; return d.removeAttribute("id"), d.style.position = "absolute", d.style.top = o + m + "px", d.style.left = n + a + "px", d.style.width = i + "px", d.style.height = r + "px", d.style.transform = "", d }, m = function (t, o) { var n = e({ bubbles: !1, cancelable: !1, detail: void 0 }, o); if ("function" == typeof window.CustomEvent) return new CustomEvent(t, n); var i = document.createEvent("CustomEvent"); return i.initCustomEvent(t, n.bubbles, n.cancelable, n.detail), i }; return function (e, t) { void 0 === t && (t = {}); var o = t.insertAt; if (e && "undefined" != typeof document) { var n = document.head || document.getElementsByTagName("head")[0], i = document.createElement("style"); i.type = "text/css", "top" === o && n.firstChild ? n.insertBefore(i, n.firstChild) : n.appendChild(i), i.styleSheet ? i.styleSheet.cssText = e : i.appendChild(document.createTextNode(e)) } }(".medium-zoom-overlay{position:fixed;top:0;right:0;bottom:0;left:0;opacity:0;transition:opacity .3s;will-change:opacity}.medium-zoom--opened .medium-zoom-overlay{cursor:pointer;cursor:zoom-out;opacity:1}.medium-zoom-image{cursor:pointer;cursor:zoom-in;transition:transform .3s cubic-bezier(.2,0,.2,1)!important}.medium-zoom-image--hidden{visibility:hidden}.medium-zoom-image--opened{position:relative;cursor:pointer;cursor:zoom-out;will-change:transform}"), function t(a) { var l = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {}, c = window.Promise || function (e) { function t() { } e(t, t) }, u = function (e) { var t = e.target; t !== N ? -1 !== O.indexOf(t) && w({ target: t }) : E() }, s = function () { if (!A && T.original) { var e = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0; Math.abs(k - e) > S.scrollOffset && setTimeout(E, 150) } }, f = function (e) { var t = e.key || e.keyCode; "Escape" !== t && "Esc" !== t && 27 !== t || E() }, p = function () { var t = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, n = t; if (t.background && (N.style.background = t.background), t.container && t.container instanceof Object && (n.container = e({}, S.container, t.container)), t.template) { var i = o(t.template) ? t.template : document.querySelector(t.template); n.template = i } return S = e({}, S, n), O.forEach((function (e) { e.dispatchEvent(m("medium-zoom:update", { detail: { zoom: j } })) })), j }, g = function () { var o = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}; return t(e({}, S, o)) }, v = function () { for (var e = arguments.length, t = Array(e), o = 0; o < e; o++)t[o] = arguments[o]; var n = t.reduce((function (e, t) { return [].concat(e, i(t)) }), []); return n.filter((function (e) { return -1 === O.indexOf(e) })).forEach((function (e) { O.push(e), e.classList.add("medium-zoom-image") })), x.forEach((function (e) { var t = e.type, o = e.listener, i = e.options; n.forEach((function (e) { e.addEventListener(t, o, i) })) })), j }, h = function () { for (var e = arguments.length, t = Array(e), o = 0; o < e; o++)t[o] = arguments[o]; T.zoomed && E(); var n = t.length > 0 ? t.reduce((function (e, t) { return [].concat(e, i(t)) }), []) : O; return n.forEach((function (e) { e.classList.remove("medium-zoom-image"), e.dispatchEvent(m("medium-zoom:detach", { detail: { zoom: j } })) })), O = O.filter((function (e) { return -1 === n.indexOf(e) })), j }, z = function (e, t) { var o = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {}; return O.forEach((function (n) { n.addEventListener("medium-zoom:" + e, t, o) })), x.push({ type: "medium-zoom:" + e, listener: t, options: o }), j }, y = function (e, t) { var o = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {}; return O.forEach((function (n) { n.removeEventListener("medium-zoom:" + e, t, o) })), x = x.filter((function (o) { return !(o.type === "medium-zoom:" + e && o.listener.toString() === t.toString()) })), j }, b = function () { var t = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, i = t.target, r = function () { var t = { width: document.documentElement.clientWidth, height: document.documentElement.clientHeight, left: 0, top: 0, right: 0, bottom: 0 }, i = void 0, r = void 0; if (S.container) if (S.container instanceof Object) i = (t = e({}, t, S.container)).width - t.left - t.right - 2 * S.margin, r = t.height - t.top - t.bottom - 2 * S.margin; else { var d = (o(S.container) ? S.container : document.querySelector(S.container)).getBoundingClientRect(), m = d.width, a = d.height, l = d.left, c = d.top; t = e({}, t, { width: m, height: a, left: l, top: c }) } i = i || t.width - 2 * S.margin, r = r || t.height - 2 * S.margin; var u = T.zoomedHd || T.original, s = n(u) ? i : u.naturalWidth || i, f = n(u) ? r : u.naturalHeight || r, p = u.getBoundingClientRect(), g = p.top, v = p.left, h = p.width, z = p.height, y = Math.min(s, i) / h, b = Math.min(f, r) / z, E = Math.min(y, b), w = "scale(" + E + ") translate3d(" + ((i - h) / 2 - v + S.margin + t.left) / E + "px, " + ((r - z) / 2 - g + S.margin + t.top) / E + "px, 0)"; T.zoomed.style.transform = w, T.zoomedHd && (T.zoomedHd.style.transform = w) }; return new c((function (e) { if (i && -1 === O.indexOf(i)) e(j); else { if (T.zoomed) e(j); else { if (i) T.original = i; else { if (!(O.length > 0)) return void e(j); var t = O; T.original = t[0] } if (T.original.dispatchEvent(m("medium-zoom:open", { detail: { zoom: j } })), k = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0, A = !0, T.zoomed = d(T.original), document.body.appendChild(N), S.template) { var n = o(S.template) ? S.template : document.querySelector(S.template); T.template = document.createElement("div"), T.template.appendChild(n.content.cloneNode(!0)), document.body.appendChild(T.template) } if (document.body.appendChild(T.zoomed), window.requestAnimationFrame((function () { document.body.classList.add("medium-zoom--opened") })), T.original.classList.add("medium-zoom-image--hidden"), T.zoomed.classList.add("medium-zoom-image--opened"), T.zoomed.addEventListener("click", E), T.zoomed.addEventListener("transitionend", (function t() { A = !1, T.zoomed.removeEventListener("transitionend", t), T.original.dispatchEvent(m("medium-zoom:opened", { detail: { zoom: j } })), e(j) })), T.original.getAttribute("data-zoom-src")) { T.zoomedHd = T.zoomed.cloneNode(), T.zoomedHd.removeAttribute("srcset"), T.zoomedHd.removeAttribute("sizes"), T.zoomedHd.src = T.zoomed.getAttribute("data-zoom-src"), T.zoomedHd.onerror = function () { clearInterval(a), console.warn("Unable to reach the zoom image target " + T.zoomedHd.src), T.zoomedHd = null, r() }; var a = setInterval((function () { T.zoomedHd.complete && (clearInterval(a), T.zoomedHd.classList.add("medium-zoom-image--opened"), T.zoomedHd.addEventListener("click", E), document.body.appendChild(T.zoomedHd), r()) }), 10) } else if (T.original.hasAttribute("srcset")) { T.zoomedHd = T.zoomed.cloneNode(), T.zoomedHd.removeAttribute("sizes"), T.zoomedHd.removeAttribute("loading"); var l = T.zoomedHd.addEventListener("load", (function () { T.zoomedHd.removeEventListener("load", l), T.zoomedHd.classList.add("medium-zoom-image--opened"), T.zoomedHd.addEventListener("click", E), document.body.appendChild(T.zoomedHd), r() })) } else r() } } })) }, E = function () { return new c((function (e) { if (!A && T.original) { A = !0, document.body.classList.remove("medium-zoom--opened"), T.zoomed.style.transform = "", T.zoomedHd && (T.zoomedHd.style.transform = ""), T.template && (T.template.style.transition = "opacity 150ms", T.template.style.opacity = 0), T.original.dispatchEvent(m("medium-zoom:close", { detail: { zoom: j } })), T.zoomed.addEventListener("transitionend", (function t() { T.original.classList.remove("medium-zoom-image--hidden"), document.body.removeChild(T.zoomed), T.zoomedHd && document.body.removeChild(T.zoomedHd), document.body.removeChild(N), T.zoomed.classList.remove("medium-zoom-image--opened"), T.template && document.body.removeChild(T.template), A = !1, T.zoomed.removeEventListener("transitionend", t), T.original.dispatchEvent(m("medium-zoom:closed", { detail: { zoom: j } })), T.original = null, T.zoomed = null, T.zoomedHd = null, T.template = null, e(j) })) } else e(j) })) }, w = function () { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {}, t = e.target; return T.original ? E() : b({ target: t }) }, L = function () { return S }, H = function () { return O }, C = function () { return T.original }, O = [], x = [], A = !1, k = 0, S = l, T = { original: null, zoomed: null, zoomedHd: null, template: null }; "[object Object]" === Object.prototype.toString.call(a) ? S = a : (a || "string" == typeof a) && v(a), S = e({ margin: 0, background: "#fff", scrollOffset: 40, container: null, template: null }, S); var N = r(S.background); document.addEventListener("click", u), document.addEventListener("keyup", f), document.addEventListener("scroll", s), window.addEventListener("resize", E); var j = { open: b, close: E, toggle: w, update: p, clone: g, attach: v, detach: h, on: z, off: y, getOptions: L, getImages: H, getZoomedImage: C }; return j } }));\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/script/menu.js b/src/Plugins/Theme.Modern/Content/script/menu.jsnew file mode 100644index 000000000..ecc1d4f37--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/script/menu.js@@ -0,0 +1,158 @@+(function () {+ function $(selector, context) {+ context = context || document;+ return context["querySelectorAll"](selector);+ }++ function forEach(collection, iterator) {+ for (var key in Object.keys(collection)) {+ iterator(collection[key]);+ }+ }++ function showMenu(menu) {++ if (menu.target.classList.contains('hasGallery')) {+ checkPosition(menu.target);+ }++ if (this.tagName == "a") {+ var menuli = this;+ } else {+ var menuli = menu.target;+ }+ var ul = $("ul", menuli)[0];++ if (!ul || ul.classList.contains("-visible")) return;++ ul.classList.add("-visible");+ if (menu.target.previousElementSibling !== null) {+ menu.target.previousElementSibling.classList.add("-visible")+ }+ document.getElementById("backdrop-menu").classList.remove("hide");+ document.getElementById("backdrop-menu").classList.add("show");+ }++ function hideMenu(menu) {+ var menu = this;+ var ul = $("ul", menu)[0];++ if (!ul || !ul.classList.contains("-visible")) return;++ menu.classList.remove("-active");+ ul.classList.add("-animating");+ setTimeout(function () {+ ul.classList.remove("-visible");+ ul.classList.remove("-animating");+ }, 200);+ document.getElementById("backdrop-menu").classList.remove("show");+ document.getElementById("backdrop-menu").classList.add("hide");+ }+ function showMenuMobile(menu) {+ document.querySelectorAll(".-visible").forEach(function (element) {+ element.classList.remove("-visible");+ });+ if (this.tagName == "a") {+ var menuli = this;+ } else {+ var menuli = this.parentElement;+ }+ var ul = $("ul", menuli)[0];++ if (!ul || ul.classList.contains("-visible")) return;++ ul.classList.add("-visible");+ menu.target.previousElementSibling.classList.add("-visible")+ }+ function hideMenuMobile(menu) {+ menu.target.classList.remove("-visible");+ var menu = this.parentElement;+ var ul = $("ul", menu)[0];++ menu.classList.remove("-active");+ ul.classList.add("-animating");+ setTimeout(function () {+ ul.classList.remove("-visible");+ ul.classList.remove("-animating");+ }, 200);+ }++ function checkPosition(li) {+ var positions = li.getBoundingClientRect();+ var containerH = document.querySelector(".left-side-container").clientHeight;+ var menuH = document.querySelector(".Menu.-vertical").clientHeight;+ var Top = positions.top;++ if (document.body.classList.contains('.onTop')) {+ li.querySelectorAll("li > ul")[0].style.top = containerH - Top + 15 + "px";+ } else {+ li.querySelectorAll("li > ul")[0].style.top = containerH - Top + "px";+ }+ li.querySelectorAll("li > ul")[0].style.minHeight = menuH + 2 + "px";+ }++ function topMenuScroll() {++ var body = document.body;+ var scrollUp = "scroll-up";+ var scrollDown = "scroll-down";+ var onTop = "onTop";+ let lastScroll = 0;++ var currentScrollWindow = window.pageYOffset;+ if (currentScrollWindow == 0) {+ body.classList.add(onTop);+ }++ window.addEventListener("scroll", function () {+ var currentScroll = window.pageYOffset;+ if (window.pageYOffset <= 120) {+ body.classList.add(onTop);+ } else {+ body.classList.remove(onTop);+ }+ if (currentScroll > lastScroll && !body.classList.contains(scrollDown)) {+ // down+ body.classList.remove(scrollUp);+ if (lastScroll != 0) {+ body.classList.add(scrollDown);+ return;+ } else {+ body.classList.remove(scrollDown);+ }+ } else if (currentScroll < lastScroll && body.classList.contains(scrollDown)) {+ // up+ body.classList.remove(scrollDown);+ body.classList.add(scrollUp);+ }+ lastScroll = currentScroll;+ });+ }++ document.addEventListener("DOMContentLoaded", function () {+ if (991 < window.innerWidth) {+ topMenuScroll();+ forEach($(".Menu > li.-hasSubmenu.hasGallery"), function (e) {+ checkPosition(e);+ });+ forEach($(".Menu > li.-hasSubmenu"), function (e) {+ e.addEventListener("mouseenter", showMenu);+ });+ forEach($(".Menu > li"), function (e) {+ e.addEventListener("mouseleave", hideMenu);+ });+ } else {+ forEach($(".Menu > li.-hasSubmenu > .go-forward"), function (e) {+ e.addEventListener("click", showMenuMobile);+ });+ forEach($(".Menu > li.-hasSubmenu > .go-back"), function (e) {+ e.addEventListener("click", hideMenuMobile);+ });+ }++ //forEach($(".Menu li .back"), function(e){+ // e.addEventListener("click", hideMenu);+ //});++ });+})();diff --git a/src/Plugins/Theme.Modern/Content/script/npslider-home.js b/src/Plugins/Theme.Modern/Content/script/npslider-home.jsnew file mode 100644index 000000000..63f8dd5f9--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/script/npslider-home.js@@ -0,0 +1,112 @@+Vue.use(VueAwesomeSwiper)+var hpnslider = new Vue({+ data() {+ return {+ Model: null,+ swiperOptions: {+ effect: 'fade',+ lazy: {+ preloaderClass: 'preloader'+ },+ autoplay: {+ delay: 5000,+ },+ fadeEffect: {+ crossFade: true+ },+ pagination: {+ el: '#hpnslider .swiper-pagination',+ clickable: true+ },+ navigation: {+ nextEl: '#hpnslider .swiper-button-next',+ prevEl: '#hpnslider .swiper-button-prev'+ },+ scrollbar: {+ el: '#hpnslider .swiper-scrollbar',+ draggable: true,+ hide: false+ },+ slidesPerView: 1,+ on: {+ init: function () {+ hpnslider.progressBarIn(this);+ hpnslider.animateIn(this);+ },+ slideChangeTransitionStart: function () {+ hpnslider.progressBarIn(this);+ hpnslider.animateIn(this);+ },+ activeIndexChange: function () {+ hpnslider.progressBarOut(this);+ hpnslider.animateOut(this);+ },+ }+ }+ }+ },+ methods: {+ animateIn(slider) {+ if (typeof (hpnslider.Model) == 'object') {+ if (slider.slides.length > 0) {+ var active = slider.slides[slider.activeIndex];+ active.querySelectorAll('.animate__animated').forEach(function (element) {+ var delay = element.dataset.delay;+ var animation = element.dataset.animation;+ element.classList.add(delay);+ element.classList.add(animation);+ });+ }+ }+ },+ animateOut(slider) {+ if (typeof (hpnslider.Model) == 'object') {+ var prev = slider.slides[slider.previousIndex];+ prev.querySelectorAll('.animate__animated').forEach(function (element) {+ var delay = element.dataset.delay;+ var animation = element.dataset.animation;+ element.classList.remove(delay);+ element.classList.remove(animation);+ });+ }+ },+ progressBarIn(slider) {+ slider.scrollbar.init();+ void slider.el.querySelector('#hpnslider .swiper-scrollbar').offsetWidth;+ slider.el.querySelector('#hpnslider .swiper-scrollbar').classList.add('progressAnimation');+ slider.scrollbar.dragEl.style.animationDuration = "5s";+ },+ progressBarOut(slider) {+ slider.scrollbar.init();+ void slider.el.querySelector('#hpnslider .swiper-scrollbar').offsetWidth;+ slider.el.querySelector('#hpnslider .swiper-scrollbar').classList.remove('progressAnimation');+ slider.scrollbar.dragEl.style.animationDuration = "0s";+ },+ groupBy(xs, key) {+ return xs.reduce(function (rv, x) {+ (rv[x[key]] = rv[x[key]] || []).push(x);+ return rv;+ }, {});+ }+ },+ created() {+ axios({+ baseURL: '/Component/Index?Name=HomePageNewProducts',+ method: 'get',+ data: null,+ headers: {+ 'Accept': 'application/json',+ 'Content-Type': 'application/json',+ 'X-Response-View': 'Json'+ }+ }).then(response => {+ this.Model = response.data;+ }).then(function () {+ if (hpnslider.Model.length > 0) {+ hpnslider.Model.forEach(function (element) {+ element.SpecificationAttributeModels = hpnslider.groupBy(element.SpecificationAttributeModels, 'SpecificationAttributeName')+ })+ }+ });+ }+});\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/script/parallax.min.js b/src/Plugins/Theme.Modern/Content/script/parallax.min.jsnew file mode 100644index 000000000..c47b90084--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/script/parallax.min.js@@ -0,0 +1 @@+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).Parallax=t()}}(function(){return function t(e,i,n){function o(r,a){if(!i[r]){if(!e[r]){var l="function"==typeof require&&require;if(!a&&l)return l(r,!0);if(s)return s(r,!0);var h=new Error("Cannot find module '"+r+"'");throw h.code="MODULE_NOT_FOUND",h}var u=i[r]={exports:{}};e[r][0].call(u.exports,function(t){var i=e[r][1][t];return o(i||t)},u,u.exports,t,e,i,n)}return i[r].exports}for(var s="function"==typeof require&&require,r=0;r<n.length;r++)o(n[r]);return o}({1:[function(t,e,i){"use strict";function n(t){if(null===t||void 0===t)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(t)}var o=Object.getOwnPropertySymbols,s=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var t=new String("abc");if(t[5]="de","5"===Object.getOwnPropertyNames(t)[0])return!1;for(var e={},i=0;i<10;i++)e["_"+String.fromCharCode(i)]=i;if("0123456789"!==Object.getOwnPropertyNames(e).map(function(t){return e[t]}).join(""))return!1;var n={};return"abcdefghijklmnopqrst".split("").forEach(function(t){n[t]=t}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},n)).join("")}catch(t){return!1}}()?Object.assign:function(t,e){for(var i,a,l=n(t),h=1;h<arguments.length;h++){i=Object(arguments[h]);for(var u in i)s.call(i,u)&&(l[u]=i[u]);if(o){a=o(i);for(var c=0;c<a.length;c++)r.call(i,a[c])&&(l[a[c]]=i[a[c]])}}return l}},{}],2:[function(t,e,i){(function(t){(function(){var i,n,o,s,r,a;"undefined"!=typeof performance&&null!==performance&&performance.now?e.exports=function(){return performance.now()}:void 0!==t&&null!==t&&t.hrtime?(e.exports=function(){return(i()-r)/1e6},n=t.hrtime,s=(i=function(){var t;return 1e9*(t=n())[0]+t[1]})(),a=1e9*t.uptime(),r=s-a):Date.now?(e.exports=function(){return Date.now()-o},o=Date.now()):(e.exports=function(){return(new Date).getTime()-o},o=(new Date).getTime())}).call(this)}).call(this,t("_process"))},{_process:3}],3:[function(t,e,i){function n(){throw new Error("setTimeout has not been defined")}function o(){throw new Error("clearTimeout has not been defined")}function s(t){if(c===setTimeout)return setTimeout(t,0);if((c===n||!c)&&setTimeout)return c=setTimeout,setTimeout(t,0);try{return c(t,0)}catch(e){try{return c.call(null,t,0)}catch(e){return c.call(this,t,0)}}}function r(t){if(d===clearTimeout)return clearTimeout(t);if((d===o||!d)&&clearTimeout)return d=clearTimeout,clearTimeout(t);try{return d(t)}catch(e){try{return d.call(null,t)}catch(e){return d.call(this,t)}}}function a(){v&&p&&(v=!1,p.length?f=p.concat(f):y=-1,f.length&&l())}function l(){if(!v){var t=s(a);v=!0;for(var e=f.length;e;){for(p=f,f=[];++y<e;)p&&p[y].run();y=-1,e=f.length}p=null,v=!1,r(t)}}function h(t,e){this.fun=t,this.array=e}function u(){}var c,d,m=e.exports={};!function(){try{c="function"==typeof setTimeout?setTimeout:n}catch(t){c=n}try{d="function"==typeof clearTimeout?clearTimeout:o}catch(t){d=o}}();var p,f=[],v=!1,y=-1;m.nextTick=function(t){var e=new Array(arguments.length-1);if(arguments.length>1)for(var i=1;i<arguments.length;i++)e[i-1]=arguments[i];f.push(new h(t,e)),1!==f.length||v||s(l)},h.prototype.run=function(){this.fun.apply(null,this.array)},m.title="browser",m.browser=!0,m.env={},m.argv=[],m.version="",m.versions={},m.on=u,m.addListener=u,m.once=u,m.off=u,m.removeListener=u,m.removeAllListeners=u,m.emit=u,m.prependListener=u,m.prependOnceListener=u,m.listeners=function(t){return[]},m.binding=function(t){throw new Error("process.binding is not supported")},m.cwd=function(){return"/"},m.chdir=function(t){throw new Error("process.chdir is not supported")},m.umask=function(){return 0}},{}],4:[function(t,e,i){(function(i){for(var n=t("performance-now"),o="undefined"==typeof window?i:window,s=["moz","webkit"],r="AnimationFrame",a=o["request"+r],l=o["cancel"+r]||o["cancelRequest"+r],h=0;!a&&h<s.length;h++)a=o[s[h]+"Request"+r],l=o[s[h]+"Cancel"+r]||o[s[h]+"CancelRequest"+r];if(!a||!l){var u=0,c=0,d=[];a=function(t){if(0===d.length){var e=n(),i=Math.max(0,1e3/60-(e-u));u=i+e,setTimeout(function(){var t=d.slice(0);d.length=0;for(var e=0;e<t.length;e++)if(!t[e].cancelled)try{t[e].callback(u)}catch(t){setTimeout(function(){throw t},0)}},Math.round(i))}return d.push({handle:++c,callback:t,cancelled:!1}),c},l=function(t){for(var e=0;e<d.length;e++)d[e].handle===t&&(d[e].cancelled=!0)}}e.exports=function(t){return a.call(o,t)},e.exports.cancel=function(){l.apply(o,arguments)},e.exports.polyfill=function(){o.requestAnimationFrame=a,o.cancelAnimationFrame=l}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"performance-now":2}],5:[function(t,e,i){"use strict";function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var o=function(){function t(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}return function(e,i,n){return i&&t(e.prototype,i),n&&t(e,n),e}}(),s=t("raf"),r=t("object-assign"),a={propertyCache:{},vendors:[null,["-webkit-","webkit"],["-moz-","Moz"],["-o-","O"],["-ms-","ms"]],clamp:function(t,e,i){return e<i?t<e?e:t>i?i:t:t<i?i:t>e?e:t},data:function(t,e){return a.deserialize(t.getAttribute("data-"+e))},deserialize:function(t){return"true"===t||"false"!==t&&("null"===t?null:!isNaN(parseFloat(t))&&isFinite(t)?parseFloat(t):t)},camelCase:function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},accelerate:function(t){a.css(t,"transform","translate3d(0,0,0) rotate(0.0001deg)"),a.css(t,"transform-style","preserve-3d"),a.css(t,"backface-visibility","hidden")},transformSupport:function(t){for(var e=document.createElement("div"),i=!1,n=null,o=!1,s=null,r=null,l=0,h=a.vendors.length;l<h;l++)if(null!==a.vendors[l]?(s=a.vendors[l][0]+"transform",r=a.vendors[l][1]+"Transform"):(s="transform",r="transform"),void 0!==e.style[r]){i=!0;break}switch(t){case"2D":o=i;break;case"3D":if(i){var u=document.body||document.createElement("body"),c=document.documentElement,d=c.style.overflow,m=!1;document.body||(m=!0,c.style.overflow="hidden",c.appendChild(u),u.style.overflow="hidden",u.style.background=""),u.appendChild(e),e.style[r]="translate3d(1px,1px,1px)",o=void 0!==(n=window.getComputedStyle(e).getPropertyValue(s))&&n.length>0&&"none"!==n,c.style.overflow=d,u.removeChild(e),m&&(u.removeAttribute("style"),u.parentNode.removeChild(u))}}return o},css:function(t,e,i){var n=a.propertyCache[e];if(!n)for(var o=0,s=a.vendors.length;o<s;o++)if(n=null!==a.vendors[o]?a.camelCase(a.vendors[o][1]+"-"+e):e,void 0!==t.style[n]){a.propertyCache[e]=n;break}t.style[n]=i}},l={relativeInput:!1,clipRelativeInput:!1,inputElement:null,hoverOnly:!1,calibrationThreshold:100,calibrationDelay:500,supportDelay:500,calibrateX:!1,calibrateY:!0,invertX:!0,invertY:!0,limitX:!1,limitY:!1,scalarX:10,scalarY:10,frictionX:.1,frictionY:.1,originX:.5,originY:.5,pointerEvents:!1,precision:1,onReady:null,selector:null},h=function(){function t(e,i){n(this,t),this.element=e;var o={calibrateX:a.data(this.element,"calibrate-x"),calibrateY:a.data(this.element,"calibrate-y"),invertX:a.data(this.element,"invert-x"),invertY:a.data(this.element,"invert-y"),limitX:a.data(this.element,"limit-x"),limitY:a.data(this.element,"limit-y"),scalarX:a.data(this.element,"scalar-x"),scalarY:a.data(this.element,"scalar-y"),frictionX:a.data(this.element,"friction-x"),frictionY:a.data(this.element,"friction-y"),originX:a.data(this.element,"origin-x"),originY:a.data(this.element,"origin-y"),pointerEvents:a.data(this.element,"pointer-events"),precision:a.data(this.element,"precision"),relativeInput:a.data(this.element,"relative-input"),clipRelativeInput:a.data(this.element,"clip-relative-input"),hoverOnly:a.data(this.element,"hover-only"),inputElement:document.querySelector(a.data(this.element,"input-element")),selector:a.data(this.element,"selector")};for(var s in o)null===o[s]&&delete o[s];r(this,l,o,i),this.inputElement||(this.inputElement=this.element),this.calibrationTimer=null,this.calibrationFlag=!0,this.enabled=!1,this.depthsX=[],this.depthsY=[],this.raf=null,this.bounds=null,this.elementPositionX=0,this.elementPositionY=0,this.elementWidth=0,this.elementHeight=0,this.elementCenterX=0,this.elementCenterY=0,this.elementRangeX=0,this.elementRangeY=0,this.calibrationX=0,this.calibrationY=0,this.inputX=0,this.inputY=0,this.motionX=0,this.motionY=0,this.velocityX=0,this.velocityY=0,this.onMouseMove=this.onMouseMove.bind(this),this.onDeviceOrientation=this.onDeviceOrientation.bind(this),this.onDeviceMotion=this.onDeviceMotion.bind(this),this.onOrientationTimer=this.onOrientationTimer.bind(this),this.onMotionTimer=this.onMotionTimer.bind(this),this.onCalibrationTimer=this.onCalibrationTimer.bind(this),this.onAnimationFrame=this.onAnimationFrame.bind(this),this.onWindowResize=this.onWindowResize.bind(this),this.windowWidth=null,this.windowHeight=null,this.windowCenterX=null,this.windowCenterY=null,this.windowRadiusX=null,this.windowRadiusY=null,this.portrait=!1,this.desktop=!navigator.userAgent.match(/(iPhone|iPod|iPad|Android|BlackBerry|BB10|mobi|tablet|opera mini|nexus 7)/i),this.motionSupport=!!window.DeviceMotionEvent&&!this.desktop,this.orientationSupport=!!window.DeviceOrientationEvent&&!this.desktop,this.orientationStatus=0,this.motionStatus=0,this.initialise()}return o(t,[{key:"initialise",value:function(){void 0===this.transform2DSupport&&(this.transform2DSupport=a.transformSupport("2D"),this.transform3DSupport=a.transformSupport("3D")),this.transform3DSupport&&a.accelerate(this.element),"static"===window.getComputedStyle(this.element).getPropertyValue("position")&&(this.element.style.position="relative"),this.pointerEvents||(this.element.style.pointerEvents="none"),this.updateLayers(),this.updateDimensions(),this.enable(),this.queueCalibration(this.calibrationDelay)}},{key:"doReadyCallback",value:function(){this.onReady&&this.onReady()}},{key:"updateLayers",value:function(){this.selector?this.layers=this.element.querySelectorAll(this.selector):this.layers=this.element.children,this.layers.length||console.warn("ParallaxJS: Your scene does not have any layers."),this.depthsX=[],this.depthsY=[];for(var t=0;t<this.layers.length;t++){var e=this.layers[t];this.transform3DSupport&&a.accelerate(e),e.style.position=t?"absolute":"relative",e.style.display="block",e.style.left=0,e.style.top=0;var i=a.data(e,"depth")||0;this.depthsX.push(a.data(e,"depth-x")||i),this.depthsY.push(a.data(e,"depth-y")||i)}}},{key:"updateDimensions",value:function(){this.windowWidth=window.innerWidth,this.windowHeight=window.innerHeight,this.windowCenterX=this.windowWidth*this.originX,this.windowCenterY=this.windowHeight*this.originY,this.windowRadiusX=Math.max(this.windowCenterX,this.windowWidth-this.windowCenterX),this.windowRadiusY=Math.max(this.windowCenterY,this.windowHeight-this.windowCenterY)}},{key:"updateBounds",value:function(){this.bounds=this.inputElement.getBoundingClientRect(),this.elementPositionX=this.bounds.left,this.elementPositionY=this.bounds.top,this.elementWidth=this.bounds.width,this.elementHeight=this.bounds.height,this.elementCenterX=this.elementWidth*this.originX,this.elementCenterY=this.elementHeight*this.originY,this.elementRangeX=Math.max(this.elementCenterX,this.elementWidth-this.elementCenterX),this.elementRangeY=Math.max(this.elementCenterY,this.elementHeight-this.elementCenterY)}},{key:"queueCalibration",value:function(t){clearTimeout(this.calibrationTimer),this.calibrationTimer=setTimeout(this.onCalibrationTimer,t)}},{key:"enable",value:function(){this.enabled||(this.enabled=!0,this.orientationSupport?(this.portrait=!1,window.addEventListener("deviceorientation",this.onDeviceOrientation),this.detectionTimer=setTimeout(this.onOrientationTimer,this.supportDelay)):this.motionSupport?(this.portrait=!1,window.addEventListener("devicemotion",this.onDeviceMotion),this.detectionTimer=setTimeout(this.onMotionTimer,this.supportDelay)):(this.calibrationX=0,this.calibrationY=0,this.portrait=!1,window.addEventListener("mousemove",this.onMouseMove),this.doReadyCallback()),window.addEventListener("resize",this.onWindowResize),this.raf=s(this.onAnimationFrame))}},{key:"disable",value:function(){this.enabled&&(this.enabled=!1,this.orientationSupport?window.removeEventListener("deviceorientation",this.onDeviceOrientation):this.motionSupport?window.removeEventListener("devicemotion",this.onDeviceMotion):window.removeEventListener("mousemove",this.onMouseMove),window.removeEventListener("resize",this.onWindowResize),s.cancel(this.raf))}},{key:"calibrate",value:function(t,e){this.calibrateX=void 0===t?this.calibrateX:t,this.calibrateY=void 0===e?this.calibrateY:e}},{key:"invert",value:function(t,e){this.invertX=void 0===t?this.invertX:t,this.invertY=void 0===e?this.invertY:e}},{key:"friction",value:function(t,e){this.frictionX=void 0===t?this.frictionX:t,this.frictionY=void 0===e?this.frictionY:e}},{key:"scalar",value:function(t,e){this.scalarX=void 0===t?this.scalarX:t,this.scalarY=void 0===e?this.scalarY:e}},{key:"limit",value:function(t,e){this.limitX=void 0===t?this.limitX:t,this.limitY=void 0===e?this.limitY:e}},{key:"origin",value:function(t,e){this.originX=void 0===t?this.originX:t,this.originY=void 0===e?this.originY:e}},{key:"setInputElement",value:function(t){this.inputElement=t,this.updateDimensions()}},{key:"setPosition",value:function(t,e,i){e=e.toFixed(this.precision)+"px",i=i.toFixed(this.precision)+"px",this.transform3DSupport?a.css(t,"transform","translate3d("+e+","+i+",0)"):this.transform2DSupport?a.css(t,"transform","translate("+e+","+i+")"):(t.style.left=e,t.style.top=i)}},{key:"onOrientationTimer",value:function(){this.orientationSupport&&0===this.orientationStatus?(this.disable(),this.orientationSupport=!1,this.enable()):this.doReadyCallback()}},{key:"onMotionTimer",value:function(){this.motionSupport&&0===this.motionStatus?(this.disable(),this.motionSupport=!1,this.enable()):this.doReadyCallback()}},{key:"onCalibrationTimer",value:function(){this.calibrationFlag=!0}},{key:"onWindowResize",value:function(){this.updateDimensions()}},{key:"onAnimationFrame",value:function(){this.updateBounds();var t=this.inputX-this.calibrationX,e=this.inputY-this.calibrationY;(Math.abs(t)>this.calibrationThreshold||Math.abs(e)>this.calibrationThreshold)&&this.queueCalibration(0),this.portrait?(this.motionX=this.calibrateX?e:this.inputY,this.motionY=this.calibrateY?t:this.inputX):(this.motionX=this.calibrateX?t:this.inputX,this.motionY=this.calibrateY?e:this.inputY),this.motionX*=this.elementWidth*(this.scalarX/100),this.motionY*=this.elementHeight*(this.scalarY/100),isNaN(parseFloat(this.limitX))||(this.motionX=a.clamp(this.motionX,-this.limitX,this.limitX)),isNaN(parseFloat(this.limitY))||(this.motionY=a.clamp(this.motionY,-this.limitY,this.limitY)),this.velocityX+=(this.motionX-this.velocityX)*this.frictionX,this.velocityY+=(this.motionY-this.velocityY)*this.frictionY;for(var i=0;i<this.layers.length;i++){var n=this.layers[i],o=this.depthsX[i],r=this.depthsY[i],l=this.velocityX*(o*(this.invertX?-1:1)),h=this.velocityY*(r*(this.invertY?-1:1));this.setPosition(n,l,h)}this.raf=s(this.onAnimationFrame)}},{key:"rotate",value:function(t,e){var i=(t||0)/30,n=(e||0)/30,o=this.windowHeight>this.windowWidth;this.portrait!==o&&(this.portrait=o,this.calibrationFlag=!0),this.calibrationFlag&&(this.calibrationFlag=!1,this.calibrationX=i,this.calibrationY=n),this.inputX=i,this.inputY=n}},{key:"onDeviceOrientation",value:function(t){var e=t.beta,i=t.gamma;null!==e&&null!==i&&(this.orientationStatus=1,this.rotate(e,i))}},{key:"onDeviceMotion",value:function(t){var e=t.rotationRate.beta,i=t.rotationRate.gamma;null!==e&&null!==i&&(this.motionStatus=1,this.rotate(e,i))}},{key:"onMouseMove",value:function(t){var e=t.clientX,i=t.clientY;if(this.hoverOnly&&(e<this.elementPositionX||e>this.elementPositionX+this.elementWidth||i<this.elementPositionY||i>this.elementPositionY+this.elementHeight))return this.inputX=0,void(this.inputY=0);this.relativeInput?(this.clipRelativeInput&&(e=Math.max(e,this.elementPositionX),e=Math.min(e,this.elementPositionX+this.elementWidth),i=Math.max(i,this.elementPositionY),i=Math.min(i,this.elementPositionY+this.elementHeight)),this.elementRangeX&&this.elementRangeY&&(this.inputX=(e-this.elementPositionX-this.elementCenterX)/this.elementRangeX,this.inputY=(i-this.elementPositionY-this.elementCenterY)/this.elementRangeY)):this.windowRadiusX&&this.windowRadiusY&&(this.inputX=(e-this.windowCenterX)/this.windowRadiusX,this.inputY=(i-this.windowCenterY)/this.windowRadiusY)}},{key:"destroy",value:function(){this.disable(),clearTimeout(this.calibrationTimer),clearTimeout(this.detectionTimer),this.element.removeAttribute("style");for(var t=0;t<this.layers.length;t++)this.layers[t].removeAttribute("style");delete this.element,delete this.layers}},{key:"version",value:function(){return"3.1.0"}}]),t}();e.exports=h},{"object-assign":1,raf:4}]},{},[5])(5)});\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/script/rellax.min.js b/src/Plugins/Theme.Modern/Content/script/rellax.min.jsnew file mode 100644index 000000000..cb0e0ea19--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/script/rellax.min.js@@ -0,0 +1,9 @@+(function(n,h){"function"===typeof define&&define.amd?define([],h):"object"===typeof module&&module.exports?module.exports=h():n.Rellax=h()})("undefined"!==typeof window?window:global,function(){var n=function(h,p){var a=Object.create(n.prototype),l=0,r=0,k=0,t=0,c=[],u=!0,B=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame||function(a){return setTimeout(a,1E3/60)},q=null,C=window.cancelAnimationFrame||+window.mozCancelAnimationFrame||clearTimeout,D=window.transformProp||function(){var a=document.createElement("div");if(null===a.style.transform){var b=["Webkit","Moz","ms"],e;for(e in b)if(void 0!==a.style[b[e]+"Transform"])return b[e]+"Transform"}return"transform"}();a.options={speed:-2,center:!1,wrapper:null,relativeToWrapper:!1,round:!0,vertical:!0,horizontal:!1,callback:function(){}};p&&Object.keys(p).forEach(function(d){a.options[d]=p[d]});h||(h=".rellax");var m="string"===typeof h?document.querySelectorAll(h):+[h];if(0<m.length){a.elems=m;if(a.options.wrapper&&!a.options.wrapper.nodeType)if(m=document.querySelector(a.options.wrapper))a.options.wrapper=m;else{console.warn("Rellax: The wrapper you're trying to use doesn't exist.");return}var w=function(){for(var d=0;d<c.length;d++)a.elems[d].style.cssText=c[d].style;c=[];r=window.innerHeight;t=window.innerWidth;x();for(d=0;d<a.elems.length;d++){var b=a.elems[d],e=b.getAttribute("data-rellax-percentage"),g=b.getAttribute("data-rellax-speed"),h=b.getAttribute("data-rellax-zindex")||+0,l=b.getAttribute("data-rellax-min"),n=b.getAttribute("data-rellax-max"),v=a.options.wrapper?a.options.wrapper.scrollTop:window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop;a.options.relativeToWrapper&&(v=(window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop)-a.options.wrapper.offsetTop);var f=a.options.vertical?e||a.options.center?v:0:0,k=a.options.horizontal?e||a.options.center?a.options.wrapper?a.options.wrapper.scrollLeft:window.pageXOffset||+document.documentElement.scrollLeft||document.body.scrollLeft:0:0;v=f+b.getBoundingClientRect().top;var m=b.clientHeight||b.offsetHeight||b.scrollHeight,p=k+b.getBoundingClientRect().left,q=b.clientWidth||b.offsetWidth||b.scrollWidth;f=e?e:(f-v+r)/(m+r);e=e?e:(k-p+t)/(q+t);a.options.center&&(f=e=.5);g=g?g:a.options.speed;e=y(e,f,g);b=b.style.cssText;f="";0<=b.indexOf("transform")&&(f=b.indexOf("transform"),f=b.slice(f),f=(k=f.indexOf(";"))?" "+f.slice(11,k).replace(/\s/g,""):" "+f.slice(11).replace(/\s/g,+""));c.push({baseX:e.x,baseY:e.y,top:v,left:p,height:m,width:q,speed:g,style:b,transform:f,zindex:h,min:l,max:n})}u&&(window.addEventListener("resize",w),u=!1);z()},x=function(){var d=l,b=k;l=a.options.wrapper?a.options.wrapper.scrollTop:(document.documentElement||document.body.parentNode||document.body).scrollTop||window.pageYOffset;k=a.options.wrapper?a.options.wrapper.scrollLeft:(document.documentElement||document.body.parentNode||document.body).scrollLeft||window.pageXOffset;a.options.relativeToWrapper&&+(l=((document.documentElement||document.body.parentNode||document.body).scrollTop||window.pageYOffset)-a.options.wrapper.offsetTop);return d!=l&&a.options.vertical||b!=k&&a.options.horizontal?!0:!1},y=function(d,b,e){var c={};d=100*e*(1-d);b=100*e*(1-b);c.x=a.options.round?Math.round(d):Math.round(100*d)/100;c.y=a.options.round?Math.round(b):Math.round(100*b)/100;return c},A=function(){x()&&!1===u&&z();q=B(A)},z=function(){for(var d,b=0;b<a.elems.length;b++){d=y((k-c[b].left+t)/(c[b].width+t),(l-+c[b].top+r)/(c[b].height+r),c[b].speed);var e=d.y-c[b].baseY,g=d.x-c[b].baseX;null!==c[b].min&&(a.options.vertical&&!a.options.horizontal&&(e=e<=c[b].min?c[b].min:e),a.options.horizontal&&!a.options.vertical&&(g=g<=c[b].min?c[b].min:g));null!==c[b].max&&(a.options.vertical&&!a.options.horizontal&&(e=e>=c[b].max?c[b].max:e),a.options.horizontal&&!a.options.vertical&&(g=g>=c[b].max?c[b].max:g));a.elems[b].style[D]="translate3d("+(a.options.horizontal?g:"0")+"px,"+(a.options.vertical?e:"0")+"px,"+c[b].zindex++"px) "+c[b].transform}a.options.callback(d)};a.destroy=function(){for(var d=0;d<a.elems.length;d++)a.elems[d].style.cssText=c[d].style;u||(window.removeEventListener("resize",w),u=!0);C(q);q=null};w();A();a.refresh=w;return a}console.warn("Rellax: The elements you're trying to select don't exist.")};return n});\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/swiper/swiper.min.css b/src/Plugins/Theme.Modern/Content/swiper/swiper.min.cssnew file mode 100644index 000000000..2d3d282e5--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/swiper/swiper.min.css@@ -0,0 +1,13 @@+/**+ * Swiper 5.3.6+ * Most modern mobile touch slider and framework with hardware accelerated transitions+ * http://swiperjs.com+ *+ * Copyright 2014-2020 Vladimir Kharlampidi+ *+ * Released under the MIT License+ *+ * Released on: February 29, 2020+ */++@font-face{font-family:swiper-icons;src:url("data:application/font-woff;charset=utf-8;base64, d09GRgABAAAAAAZgABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAGRAAAABoAAAAci6qHkUdERUYAAAWgAAAAIwAAACQAYABXR1BPUwAABhQAAAAuAAAANuAY7+xHU1VCAAAFxAAAAFAAAABm2fPczU9TLzIAAAHcAAAASgAAAGBP9V5RY21hcAAAAkQAAACIAAABYt6F0cBjdnQgAAACzAAAAAQAAAAEABEBRGdhc3AAAAWYAAAACAAAAAj//wADZ2x5ZgAAAywAAADMAAAD2MHtryVoZWFkAAABbAAAADAAAAA2E2+eoWhoZWEAAAGcAAAAHwAAACQC9gDzaG10eAAAAigAAAAZAAAArgJkABFsb2NhAAAC0AAAAFoAAABaFQAUGG1heHAAAAG8AAAAHwAAACAAcABAbmFtZQAAA/gAAAE5AAACXvFdBwlwb3N0AAAFNAAAAGIAAACE5s74hXjaY2BkYGAAYpf5Hu/j+W2+MnAzMYDAzaX6QjD6/4//Bxj5GA8AuRwMYGkAPywL13jaY2BkYGA88P8Agx4j+/8fQDYfA1AEBWgDAIB2BOoAeNpjYGRgYNBh4GdgYgABEMnIABJzYNADCQAACWgAsQB42mNgYfzCOIGBlYGB0YcxjYGBwR1Kf2WQZGhhYGBiYGVmgAFGBiQQkOaawtDAoMBQxXjg/wEGPcYDDA4wNUA2CCgwsAAAO4EL6gAAeNpj2M0gyAACqxgGNWBkZ2D4/wMA+xkDdgAAAHjaY2BgYGaAYBkGRgYQiAHyGMF8FgYHIM3DwMHABGQrMOgyWDLEM1T9/w8UBfEMgLzE////P/5//f/V/xv+r4eaAAeMbAxwIUYmIMHEgKYAYjUcsDAwsLKxc3BycfPw8jEQA/gZBASFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTQZBgMAAMR+E+gAEQFEAAAAKgAqACoANAA+AEgAUgBcAGYAcAB6AIQAjgCYAKIArAC2AMAAygDUAN4A6ADyAPwBBgEQARoBJAEuATgBQgFMAVYBYAFqAXQBfgGIAZIBnAGmAbIBzgHsAAB42u2NMQ6CUAyGW568x9AneYYgm4MJbhKFaExIOAVX8ApewSt4Bic4AfeAid3VOBixDxfPYEza5O+Xfi04YADggiUIULCuEJK8VhO4bSvpdnktHI5QCYtdi2sl8ZnXaHlqUrNKzdKcT8cjlq+rwZSvIVczNiezsfnP/uznmfPFBNODM2K7MTQ45YEAZqGP81AmGGcF3iPqOop0r1SPTaTbVkfUe4HXj97wYE+yNwWYxwWu4v1ugWHgo3S1XdZEVqWM7ET0cfnLGxWfkgR42o2PvWrDMBSFj/IHLaF0zKjRgdiVMwScNRAoWUoH78Y2icB/yIY09An6AH2Bdu/UB+yxopYshQiEvnvu0dURgDt8QeC8PDw7Fpji3fEA4z/PEJ6YOB5hKh4dj3EvXhxPqH/SKUY3rJ7srZ4FZnh1PMAtPhwP6fl2PMJMPDgeQ4rY8YT6Gzao0eAEA409DuggmTnFnOcSCiEiLMgxCiTI6Cq5DZUd3Qmp10vO0LaLTd2cjN4fOumlc7lUYbSQcZFkutRG7g6JKZKy0RmdLY680CDnEJ+UMkpFFe1RN7nxdVpXrC4aTtnaurOnYercZg2YVmLN/d/gczfEimrE/fs/bOuq29Zmn8tloORaXgZgGa78yO9/cnXm2BpaGvq25Dv9S4E9+5SIc9PqupJKhYFSSl47+Qcr1mYNAAAAeNptw0cKwkAAAMDZJA8Q7OUJvkLsPfZ6zFVERPy8qHh2YER+3i/BP83vIBLLySsoKimrqKqpa2hp6+jq6RsYGhmbmJqZSy0sraxtbO3sHRydnEMU4uR6yx7JJXveP7WrDycAAAAAAAH//wACeNpjYGRgYOABYhkgZgJCZgZNBkYGLQZtIJsFLMYAAAw3ALgAeNolizEKgDAQBCchRbC2sFER0YD6qVQiBCv/H9ezGI6Z5XBAw8CBK/m5iQQVauVbXLnOrMZv2oLdKFa8Pjuru2hJzGabmOSLzNMzvutpB3N42mNgZGBg4GKQYzBhYMxJLMlj4GBgAYow/P/PAJJhLM6sSoWKfWCAAwDAjgbRAAB42mNgYGBkAIIbCZo5IPrmUn0hGA0AO8EFTQAA") format("woff");font-weight:400;font-style:normal}:root{--swiper-theme-color:#007aff}.swiper-container{margin-left:auto;margin-right:auto;position:relative;overflow:hidden;list-style:none;padding:0;z-index:1}.swiper-container-vertical>.swiper-wrapper{flex-direction:column}.swiper-wrapper{position:relative;width:100%;height:100%;z-index:1;display:flex;transition-property:transform;box-sizing:content-box}.swiper-container-android .swiper-slide,.swiper-wrapper{transform:translate3d(0px,0,0)}.swiper-container-multirow>.swiper-wrapper{flex-wrap:wrap}.swiper-container-multirow-column>.swiper-wrapper{flex-wrap:wrap;flex-direction:column}.swiper-container-free-mode>.swiper-wrapper{transition-timing-function:ease-out;margin:0 auto}.swiper-slide{flex-shrink:0;width:100%;height:100%;position:relative;transition-property:transform}.swiper-slide-invisible-blank{visibility:hidden}.swiper-container-autoheight,.swiper-container-autoheight .swiper-slide{height:auto}.swiper-container-autoheight .swiper-wrapper{align-items:flex-start;transition-property:transform,height}.swiper-container-3d{perspective:1200px}.swiper-container-3d .swiper-cube-shadow,.swiper-container-3d .swiper-slide,.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top,.swiper-container-3d .swiper-wrapper{transform-style:preserve-3d}.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top{position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;z-index:10}.swiper-container-3d .swiper-slide-shadow-left{background-image:linear-gradient(to left,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-right{background-image:linear-gradient(to right,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-top{background-image:linear-gradient(to top,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-bottom{background-image:linear-gradient(to bottom,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-css-mode>.swiper-wrapper{overflow:auto;scrollbar-width:none;-ms-overflow-style:none}.swiper-container-css-mode>.swiper-wrapper::-webkit-scrollbar{display:none}.swiper-container-css-mode>.swiper-wrapper>.swiper-slide{scroll-snap-align:start start}.swiper-container-horizontal.swiper-container-css-mode>.swiper-wrapper{scroll-snap-type:x mandatory}.swiper-container-vertical.swiper-container-css-mode>.swiper-wrapper{scroll-snap-type:y mandatory}:root{--swiper-navigation-size:44px}.swiper-button-next,.swiper-button-prev{position:absolute;top:50%;width:calc(var(--swiper-navigation-size)/ 44 * 27);height:var(--swiper-navigation-size);margin-top:calc(-1 * var(--swiper-navigation-size)/ 2);z-index:10;cursor:pointer;display:flex;align-items:center;justify-content:center;color:var(--swiper-navigation-color,var(--swiper-theme-color))}.swiper-button-next.swiper-button-disabled,.swiper-button-prev.swiper-button-disabled{opacity:.35;cursor:auto;pointer-events:none}.swiper-button-next:after,.swiper-button-prev:after{font-family:swiper-icons;font-size:var(--swiper-navigation-size);text-transform:none!important;letter-spacing:0;text-transform:none;font-variant:initial}.swiper-button-prev,.swiper-container-rtl .swiper-button-next{left:10px;right:auto}.swiper-button-prev:after,.swiper-container-rtl .swiper-button-next:after{content:'prev'}.swiper-button-next,.swiper-container-rtl .swiper-button-prev{right:10px;left:auto}.swiper-button-next:after,.swiper-container-rtl .swiper-button-prev:after{content:'next'}.swiper-button-next.swiper-button-white,.swiper-button-prev.swiper-button-white{--swiper-navigation-color:#ffffff}.swiper-button-next.swiper-button-black,.swiper-button-prev.swiper-button-black{--swiper-navigation-color:#000000}.swiper-button-lock{display:none}.swiper-pagination{position:absolute;text-align:center;transition:.3s opacity;transform:translate3d(0,0,0);z-index:10}.swiper-pagination.swiper-pagination-hidden{opacity:0}.swiper-container-horizontal>.swiper-pagination-bullets,.swiper-pagination-custom,.swiper-pagination-fraction{bottom:10px;left:0;width:100%}.swiper-pagination-bullets-dynamic{overflow:hidden;font-size:0}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{transform:scale(.33);position:relative}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active{transform:scale(1)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-main{transform:scale(1)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev{transform:scale(.66)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev-prev{transform:scale(.33)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next{transform:scale(.66)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next-next{transform:scale(.33)}.swiper-pagination-bullet{width:8px;height:8px;display:inline-block;border-radius:100%;background:#000;opacity:.2}button.swiper-pagination-bullet{border:none;margin:0;padding:0;box-shadow:none;-webkit-appearance:none;-moz-appearance:none;appearance:none}.swiper-pagination-clickable .swiper-pagination-bullet{cursor:pointer}.swiper-pagination-bullet-active{opacity:1;background:var(--swiper-pagination-color,var(--swiper-theme-color))}.swiper-container-vertical>.swiper-pagination-bullets{right:10px;top:50%;transform:translate3d(0px,-50%,0)}.swiper-container-vertical>.swiper-pagination-bullets .swiper-pagination-bullet{margin:6px 0;display:block}.swiper-container-vertical>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic{top:50%;transform:translateY(-50%);width:8px}.swiper-container-vertical>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{display:inline-block;transition:.2s transform,.2s top}.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet{margin:0 4px}.swiper-container-horizontal>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic{left:50%;transform:translateX(-50%);white-space:nowrap}.swiper-container-horizontal>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{transition:.2s transform,.2s left}.swiper-container-horizontal.swiper-container-rtl>.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{transition:.2s transform,.2s right}.swiper-pagination-progressbar{background:rgba(0,0,0,.25);position:absolute}.swiper-pagination-progressbar .swiper-pagination-progressbar-fill{background:var(--swiper-pagination-color,var(--swiper-theme-color));position:absolute;left:0;top:0;width:100%;height:100%;transform:scale(0);transform-origin:left top}.swiper-container-rtl .swiper-pagination-progressbar .swiper-pagination-progressbar-fill{transform-origin:right top}.swiper-container-horizontal>.swiper-pagination-progressbar,.swiper-container-vertical>.swiper-pagination-progressbar.swiper-pagination-progressbar-opposite{width:100%;height:4px;left:0;top:0}.swiper-container-horizontal>.swiper-pagination-progressbar.swiper-pagination-progressbar-opposite,.swiper-container-vertical>.swiper-pagination-progressbar{width:4px;height:100%;left:0;top:0}.swiper-pagination-white{--swiper-pagination-color:#ffffff}.swiper-pagination-black{--swiper-pagination-color:#000000}.swiper-pagination-lock{display:none}.swiper-scrollbar{border-radius:10px;position:relative;-ms-touch-action:none;background:rgba(0,0,0,.1)}.swiper-container-horizontal>.swiper-scrollbar{position:absolute;left:1%;bottom:3px;z-index:50;height:5px;width:98%}.swiper-container-vertical>.swiper-scrollbar{position:absolute;right:3px;top:1%;z-index:50;width:5px;height:98%}.swiper-scrollbar-drag{height:100%;width:100%;position:relative;background:rgba(0,0,0,.5);border-radius:10px;left:0;top:0}.swiper-scrollbar-cursor-drag{cursor:move}.swiper-scrollbar-lock{display:none}.swiper-zoom-container{width:100%;height:100%;display:flex;justify-content:center;align-items:center;text-align:center}.swiper-zoom-container>canvas,.swiper-zoom-container>img,.swiper-zoom-container>svg{max-width:100%;max-height:100%;object-fit:contain}.swiper-slide-zoomed{cursor:move}.swiper-lazy-preloader{width:42px;height:42px;position:absolute;left:50%;top:50%;margin-left:-21px;margin-top:-21px;z-index:10;transform-origin:50%;animation:swiper-preloader-spin 1s infinite linear;box-sizing:border-box;border:4px solid var(--swiper-preloader-color,var(--swiper-theme-color));border-radius:50%;border-top-color:transparent}.swiper-lazy-preloader-white{--swiper-preloader-color:#fff}.swiper-lazy-preloader-black{--swiper-preloader-color:#000}@keyframes swiper-preloader-spin{100%{transform:rotate(360deg)}}.swiper-container .swiper-notification{position:absolute;left:0;top:0;pointer-events:none;opacity:0;z-index:-1000}.swiper-container-fade.swiper-container-free-mode .swiper-slide{transition-timing-function:ease-out}.swiper-container-fade .swiper-slide{pointer-events:none;transition-property:opacity}.swiper-container-fade .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-fade .swiper-slide-active,.swiper-container-fade .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube{overflow:visible}.swiper-container-cube .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1;visibility:hidden;transform-origin:0 0;width:100%;height:100%}.swiper-container-cube .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-cube.swiper-container-rtl .swiper-slide{transform-origin:100% 0}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-next,.swiper-container-cube .swiper-slide-next+.swiper-slide,.swiper-container-cube .swiper-slide-prev{pointer-events:auto;visibility:visible}.swiper-container-cube .swiper-slide-shadow-bottom,.swiper-container-cube .swiper-slide-shadow-left,.swiper-container-cube .swiper-slide-shadow-right,.swiper-container-cube .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-cube .swiper-cube-shadow{position:absolute;left:0;bottom:0px;width:100%;height:100%;background:#000;opacity:.6;-webkit-filter:blur(50px);filter:blur(50px);z-index:0}.swiper-container-flip{overflow:visible}.swiper-container-flip .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1}.swiper-container-flip .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-flip .swiper-slide-active,.swiper-container-flip .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-flip .swiper-slide-shadow-bottom,.swiper-container-flip .swiper-slide-shadow-left,.swiper-container-flip .swiper-slide-shadow-right,.swiper-container-flip .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/swiper/swiper.min.js b/src/Plugins/Theme.Modern/Content/swiper/swiper.min.jsnew file mode 100644index 000000000..5ac1f3eaa--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/swiper/swiper.min.js@@ -0,0 +1,13 @@+/**+ * Swiper 6.4.11+ * Most modern mobile touch slider and framework with hardware accelerated transitions+ * https://swiperjs.com+ *+ * Copyright 2014-2021 Vladimir Kharlampidi+ *+ * Released under the MIT License+ *+ * Released on: February 6, 2021+ */++!function (e, t) { "object" == typeof exports && "undefined" != typeof module ? module.exports = t() : "function" == typeof define && define.amd ? define(t) : (e = "undefined" != typeof globalThis ? globalThis : e || self).Swiper = t() }(this, (function () { "use strict"; function e(e, t) { for (var a = 0; a < t.length; a++) { var i = t[a]; i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(e, i.key, i) } } function t() { return (t = Object.assign || function (e) { for (var t = 1; t < arguments.length; t++) { var a = arguments[t]; for (var i in a) Object.prototype.hasOwnProperty.call(a, i) && (e[i] = a[i]) } return e }).apply(this, arguments) } function a(e) { return null !== e && "object" == typeof e && "constructor" in e && e.constructor === Object } function i(e, t) { void 0 === e && (e = {}), void 0 === t && (t = {}), Object.keys(t).forEach((function (s) { void 0 === e[s] ? e[s] = t[s] : a(t[s]) && a(e[s]) && Object.keys(t[s]).length > 0 && i(e[s], t[s]) })) } var s = { body: {}, addEventListener: function () { }, removeEventListener: function () { }, activeElement: { blur: function () { }, nodeName: "" }, querySelector: function () { return null }, querySelectorAll: function () { return [] }, getElementById: function () { return null }, createEvent: function () { return { initEvent: function () { } } }, createElement: function () { return { children: [], childNodes: [], style: {}, setAttribute: function () { }, getElementsByTagName: function () { return [] } } }, createElementNS: function () { return {} }, importNode: function () { return null }, location: { hash: "", host: "", hostname: "", href: "", origin: "", pathname: "", protocol: "", search: "" } }; function r() { var e = "undefined" != typeof document ? document : {}; return i(e, s), e } var n = { document: s, navigator: { userAgent: "" }, location: { hash: "", host: "", hostname: "", href: "", origin: "", pathname: "", protocol: "", search: "" }, history: { replaceState: function () { }, pushState: function () { }, go: function () { }, back: function () { } }, CustomEvent: function () { return this }, addEventListener: function () { }, removeEventListener: function () { }, getComputedStyle: function () { return { getPropertyValue: function () { return "" } } }, Image: function () { }, Date: function () { }, screen: {}, setTimeout: function () { }, clearTimeout: function () { }, matchMedia: function () { return {} }, requestAnimationFrame: function (e) { return "undefined" == typeof setTimeout ? (e(), null) : setTimeout(e, 0) }, cancelAnimationFrame: function (e) { "undefined" != typeof setTimeout && clearTimeout(e) } }; function l() { var e = "undefined" != typeof window ? window : {}; return i(e, n), e } function o(e) { return (o = Object.setPrototypeOf ? Object.getPrototypeOf : function (e) { return e.__proto__ || Object.getPrototypeOf(e) })(e) } function d(e, t) { return (d = Object.setPrototypeOf || function (e, t) { return e.__proto__ = t, e })(e, t) } function p() { if ("undefined" == typeof Reflect || !Reflect.construct) return !1; if (Reflect.construct.sham) return !1; if ("function" == typeof Proxy) return !0; try { return Date.prototype.toString.call(Reflect.construct(Date, [], (function () { }))), !0 } catch (e) { return !1 } } function u(e, t, a) { return (u = p() ? Reflect.construct : function (e, t, a) { var i = [null]; i.push.apply(i, t); var s = new (Function.bind.apply(e, i)); return a && d(s, a.prototype), s }).apply(null, arguments) } function c(e) { var t = "function" == typeof Map ? new Map : void 0; return (c = function (e) { if (null === e || (a = e, -1 === Function.toString.call(a).indexOf("[native code]"))) return e; var a; if ("function" != typeof e) throw new TypeError("Super expression must either be null or a function"); if (void 0 !== t) { if (t.has(e)) return t.get(e); t.set(e, i) } function i() { return u(e, arguments, o(this).constructor) } return i.prototype = Object.create(e.prototype, { constructor: { value: i, enumerable: !1, writable: !0, configurable: !0 } }), d(i, e) })(e) } var h = function (e) { var t, a; function i(t) { var a, i, s; return a = e.call.apply(e, [this].concat(t)) || this, i = function (e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e }(a), s = i.__proto__, Object.defineProperty(i, "__proto__", { get: function () { return s }, set: function (e) { s.__proto__ = e } }), a } return a = e, (t = i).prototype = Object.create(a.prototype), t.prototype.constructor = t, t.__proto__ = a, i }(c(Array)); function v(e) { void 0 === e && (e = []); var t = []; return e.forEach((function (e) { Array.isArray(e) ? t.push.apply(t, v(e)) : t.push(e) })), t } function f(e, t) { return Array.prototype.filter.call(e, t) } function m(e, t) { var a = l(), i = r(), s = []; if (!t && e instanceof h) return e; if (!e) return new h(s); if ("string" == typeof e) { var n = e.trim(); if (n.indexOf("<") >= 0 && n.indexOf(">") >= 0) { var o = "div"; 0 === n.indexOf("<li") && (o = "ul"), 0 === n.indexOf("<tr") && (o = "tbody"), 0 !== n.indexOf("<td") && 0 !== n.indexOf("<th") || (o = "tr"), 0 === n.indexOf("<tbody") && (o = "table"), 0 === n.indexOf("<option") && (o = "select"); var d = i.createElement(o); d.innerHTML = n; for (var p = 0; p < d.childNodes.length; p += 1)s.push(d.childNodes[p]) } else s = function (e, t) { if ("string" != typeof e) return [e]; for (var a = [], i = t.querySelectorAll(e), s = 0; s < i.length; s += 1)a.push(i[s]); return a }(e.trim(), t || i) } else if (e.nodeType || e === a || e === i) s.push(e); else if (Array.isArray(e)) { if (e instanceof h) return e; s = e } return new h(function (e) { for (var t = [], a = 0; a < e.length; a += 1)-1 === t.indexOf(e[a]) && t.push(e[a]); return t }(s)) } m.fn = h.prototype; var g, y, w, b = { addClass: function () { for (var e = arguments.length, t = new Array(e), a = 0; a < e; a++)t[a] = arguments[a]; var i = v(t.map((function (e) { return e.split(" ") }))); return this.forEach((function (e) { var t; (t = e.classList).add.apply(t, i) })), this }, removeClass: function () { for (var e = arguments.length, t = new Array(e), a = 0; a < e; a++)t[a] = arguments[a]; var i = v(t.map((function (e) { return e.split(" ") }))); return this.forEach((function (e) { var t; (t = e.classList).remove.apply(t, i) })), this }, hasClass: function () { for (var e = arguments.length, t = new Array(e), a = 0; a < e; a++)t[a] = arguments[a]; var i = v(t.map((function (e) { return e.split(" ") }))); return f(this, (function (e) { return i.filter((function (t) { return e.classList.contains(t) })).length > 0 })).length > 0 }, toggleClass: function () { for (var e = arguments.length, t = new Array(e), a = 0; a < e; a++)t[a] = arguments[a]; var i = v(t.map((function (e) { return e.split(" ") }))); this.forEach((function (e) { i.forEach((function (t) { e.classList.toggle(t) })) })) }, attr: function (e, t) { if (1 === arguments.length && "string" == typeof e) return this[0] ? this[0].getAttribute(e) : void 0; for (var a = 0; a < this.length; a += 1)if (2 === arguments.length) this[a].setAttribute(e, t); else for (var i in e) this[a][i] = e[i], this[a].setAttribute(i, e[i]); return this }, removeAttr: function (e) { for (var t = 0; t < this.length; t += 1)this[t].removeAttribute(e); return this }, transform: function (e) { for (var t = 0; t < this.length; t += 1)this[t].style.transform = e; return this }, transition: function (e) { for (var t = 0; t < this.length; t += 1)this[t].style.transitionDuration = "string" != typeof e ? e + "ms" : e; return this }, on: function () { for (var e = arguments.length, t = new Array(e), a = 0; a < e; a++)t[a] = arguments[a]; var i = t[0], s = t[1], r = t[2], n = t[3]; function l(e) { var t = e.target; if (t) { var a = e.target.dom7EventData || []; if (a.indexOf(e) < 0 && a.unshift(e), m(t).is(s)) r.apply(t, a); else for (var i = m(t).parents(), n = 0; n < i.length; n += 1)m(i[n]).is(s) && r.apply(i[n], a) } } function o(e) { var t = e && e.target && e.target.dom7EventData || []; t.indexOf(e) < 0 && t.unshift(e), r.apply(this, t) } "function" == typeof t[1] && (i = t[0], r = t[1], n = t[2], s = void 0), n || (n = !1); for (var d, p = i.split(" "), u = 0; u < this.length; u += 1) { var c = this[u]; if (s) for (d = 0; d < p.length; d += 1) { var h = p[d]; c.dom7LiveListeners || (c.dom7LiveListeners = {}), c.dom7LiveListeners[h] || (c.dom7LiveListeners[h] = []), c.dom7LiveListeners[h].push({ listener: r, proxyListener: l }), c.addEventListener(h, l, n) } else for (d = 0; d < p.length; d += 1) { var v = p[d]; c.dom7Listeners || (c.dom7Listeners = {}), c.dom7Listeners[v] || (c.dom7Listeners[v] = []), c.dom7Listeners[v].push({ listener: r, proxyListener: o }), c.addEventListener(v, o, n) } } return this }, off: function () { for (var e = arguments.length, t = new Array(e), a = 0; a < e; a++)t[a] = arguments[a]; var i = t[0], s = t[1], r = t[2], n = t[3]; "function" == typeof t[1] && (i = t[0], r = t[1], n = t[2], s = void 0), n || (n = !1); for (var l = i.split(" "), o = 0; o < l.length; o += 1)for (var d = l[o], p = 0; p < this.length; p += 1) { var u = this[p], c = void 0; if (!s && u.dom7Listeners ? c = u.dom7Listeners[d] : s && u.dom7LiveListeners && (c = u.dom7LiveListeners[d]), c && c.length) for (var h = c.length - 1; h >= 0; h -= 1) { var v = c[h]; r && v.listener === r || r && v.listener && v.listener.dom7proxy && v.listener.dom7proxy === r ? (u.removeEventListener(d, v.proxyListener, n), c.splice(h, 1)) : r || (u.removeEventListener(d, v.proxyListener, n), c.splice(h, 1)) } } return this }, trigger: function () { for (var e = l(), t = arguments.length, a = new Array(t), i = 0; i < t; i++)a[i] = arguments[i]; for (var s = a[0].split(" "), r = a[1], n = 0; n < s.length; n += 1)for (var o = s[n], d = 0; d < this.length; d += 1) { var p = this[d]; if (e.CustomEvent) { var u = new e.CustomEvent(o, { detail: r, bubbles: !0, cancelable: !0 }); p.dom7EventData = a.filter((function (e, t) { return t > 0 })), p.dispatchEvent(u), p.dom7EventData = [], delete p.dom7EventData } } return this }, transitionEnd: function (e) { var t = this; return e && t.on("transitionend", (function a(i) { i.target === this && (e.call(this, i), t.off("transitionend", a)) })), this }, outerWidth: function (e) { if (this.length > 0) { if (e) { var t = this.styles(); return this[0].offsetWidth + parseFloat(t.getPropertyValue("margin-right")) + parseFloat(t.getPropertyValue("margin-left")) } return this[0].offsetWidth } return null }, outerHeight: function (e) { if (this.length > 0) { if (e) { var t = this.styles(); return this[0].offsetHeight + parseFloat(t.getPropertyValue("margin-top")) + parseFloat(t.getPropertyValue("margin-bottom")) } return this[0].offsetHeight } return null }, styles: function () { var e = l(); return this[0] ? e.getComputedStyle(this[0], null) : {} }, offset: function () { if (this.length > 0) { var e = l(), t = r(), a = this[0], i = a.getBoundingClientRect(), s = t.body, n = a.clientTop || s.clientTop || 0, o = a.clientLeft || s.clientLeft || 0, d = a === e ? e.scrollY : a.scrollTop, p = a === e ? e.scrollX : a.scrollLeft; return { top: i.top + d - n, left: i.left + p - o } } return null }, css: function (e, t) { var a, i = l(); if (1 === arguments.length) { if ("string" != typeof e) { for (a = 0; a < this.length; a += 1)for (var s in e) this[a].style[s] = e[s]; return this } if (this[0]) return i.getComputedStyle(this[0], null).getPropertyValue(e) } if (2 === arguments.length && "string" == typeof e) { for (a = 0; a < this.length; a += 1)this[a].style[e] = t; return this } return this }, each: function (e) { return e ? (this.forEach((function (t, a) { e.apply(t, [t, a]) })), this) : this }, html: function (e) { if (void 0 === e) return this[0] ? this[0].innerHTML : null; for (var t = 0; t < this.length; t += 1)this[t].innerHTML = e; return this }, text: function (e) { if (void 0 === e) return this[0] ? this[0].textContent.trim() : null; for (var t = 0; t < this.length; t += 1)this[t].textContent = e; return this }, is: function (e) { var t, a, i = l(), s = r(), n = this[0]; if (!n || void 0 === e) return !1; if ("string" == typeof e) { if (n.matches) return n.matches(e); if (n.webkitMatchesSelector) return n.webkitMatchesSelector(e); if (n.msMatchesSelector) return n.msMatchesSelector(e); for (t = m(e), a = 0; a < t.length; a += 1)if (t[a] === n) return !0; return !1 } if (e === s) return n === s; if (e === i) return n === i; if (e.nodeType || e instanceof h) { for (t = e.nodeType ? [e] : e, a = 0; a < t.length; a += 1)if (t[a] === n) return !0; return !1 } return !1 }, index: function () { var e, t = this[0]; if (t) { for (e = 0; null !== (t = t.previousSibling);)1 === t.nodeType && (e += 1); return e } }, eq: function (e) { if (void 0 === e) return this; var t = this.length; if (e > t - 1) return m([]); if (e < 0) { var a = t + e; return m(a < 0 ? [] : [this[a]]) } return m([this[e]]) }, append: function () { for (var e, t = r(), a = 0; a < arguments.length; a += 1) { e = a < 0 || arguments.length <= a ? void 0 : arguments[a]; for (var i = 0; i < this.length; i += 1)if ("string" == typeof e) { var s = t.createElement("div"); for (s.innerHTML = e; s.firstChild;)this[i].appendChild(s.firstChild) } else if (e instanceof h) for (var n = 0; n < e.length; n += 1)this[i].appendChild(e[n]); else this[i].appendChild(e) } return this }, prepend: function (e) { var t, a, i = r(); for (t = 0; t < this.length; t += 1)if ("string" == typeof e) { var s = i.createElement("div"); for (s.innerHTML = e, a = s.childNodes.length - 1; a >= 0; a -= 1)this[t].insertBefore(s.childNodes[a], this[t].childNodes[0]) } else if (e instanceof h) for (a = 0; a < e.length; a += 1)this[t].insertBefore(e[a], this[t].childNodes[0]); else this[t].insertBefore(e, this[t].childNodes[0]); return this }, next: function (e) { return this.length > 0 ? e ? this[0].nextElementSibling && m(this[0].nextElementSibling).is(e) ? m([this[0].nextElementSibling]) : m([]) : this[0].nextElementSibling ? m([this[0].nextElementSibling]) : m([]) : m([]) }, nextAll: function (e) { var t = [], a = this[0]; if (!a) return m([]); for (; a.nextElementSibling;) { var i = a.nextElementSibling; e ? m(i).is(e) && t.push(i) : t.push(i), a = i } return m(t) }, prev: function (e) { if (this.length > 0) { var t = this[0]; return e ? t.previousElementSibling && m(t.previousElementSibling).is(e) ? m([t.previousElementSibling]) : m([]) : t.previousElementSibling ? m([t.previousElementSibling]) : m([]) } return m([]) }, prevAll: function (e) { var t = [], a = this[0]; if (!a) return m([]); for (; a.previousElementSibling;) { var i = a.previousElementSibling; e ? m(i).is(e) && t.push(i) : t.push(i), a = i } return m(t) }, parent: function (e) { for (var t = [], a = 0; a < this.length; a += 1)null !== this[a].parentNode && (e ? m(this[a].parentNode).is(e) && t.push(this[a].parentNode) : t.push(this[a].parentNode)); return m(t) }, parents: function (e) { for (var t = [], a = 0; a < this.length; a += 1)for (var i = this[a].parentNode; i;)e ? m(i).is(e) && t.push(i) : t.push(i), i = i.parentNode; return m(t) }, closest: function (e) { var t = this; return void 0 === e ? m([]) : (t.is(e) || (t = t.parents(e).eq(0)), t) }, find: function (e) { for (var t = [], a = 0; a < this.length; a += 1)for (var i = this[a].querySelectorAll(e), s = 0; s < i.length; s += 1)t.push(i[s]); return m(t) }, children: function (e) { for (var t = [], a = 0; a < this.length; a += 1)for (var i = this[a].children, s = 0; s < i.length; s += 1)e && !m(i[s]).is(e) || t.push(i[s]); return m(t) }, filter: function (e) { return m(f(this, e)) }, remove: function () { for (var e = 0; e < this.length; e += 1)this[e].parentNode && this[e].parentNode.removeChild(this[e]); return this } }; function E(e, t) { return void 0 === t && (t = 0), setTimeout(e, t) } function x() { return Date.now() } function T(e, t) { void 0 === t && (t = "x"); var a, i, s, r = l(), n = r.getComputedStyle(e, null); return r.WebKitCSSMatrix ? ((i = n.transform || n.webkitTransform).split(",").length > 6 && (i = i.split(", ").map((function (e) { return e.replace(",", ".") })).join(", ")), s = new r.WebKitCSSMatrix("none" === i ? "" : i)) : a = (s = n.MozTransform || n.OTransform || n.MsTransform || n.msTransform || n.transform || n.getPropertyValue("transform").replace("translate(", "matrix(1, 0, 0, 1,")).toString().split(","), "x" === t && (i = r.WebKitCSSMatrix ? s.m41 : 16 === a.length ? parseFloat(a[12]) : parseFloat(a[4])), "y" === t && (i = r.WebKitCSSMatrix ? s.m42 : 16 === a.length ? parseFloat(a[13]) : parseFloat(a[5])), i || 0 } function C(e) { return "object" == typeof e && null !== e && e.constructor && e.constructor === Object } function S() { for (var e = Object(arguments.length <= 0 ? void 0 : arguments[0]), t = 1; t < arguments.length; t += 1) { var a = t < 0 || arguments.length <= t ? void 0 : arguments[t]; if (null != a) for (var i = Object.keys(Object(a)), s = 0, r = i.length; s < r; s += 1) { var n = i[s], l = Object.getOwnPropertyDescriptor(a, n); void 0 !== l && l.enumerable && (C(e[n]) && C(a[n]) ? S(e[n], a[n]) : !C(e[n]) && C(a[n]) ? (e[n] = {}, S(e[n], a[n])) : e[n] = a[n]) } } return e } function M(e, t) { Object.keys(t).forEach((function (a) { C(t[a]) && Object.keys(t[a]).forEach((function (i) { "function" == typeof t[a][i] && (t[a][i] = t[a][i].bind(e)) })), e[a] = t[a] })) } function z() { return g || (g = function () { var e = l(), t = r(); return { touch: !!("ontouchstart" in e || e.DocumentTouch && t instanceof e.DocumentTouch), pointerEvents: !!e.PointerEvent && "maxTouchPoints" in e.navigator && e.navigator.maxTouchPoints >= 0, observer: "MutationObserver" in e || "WebkitMutationObserver" in e, passiveListener: function () { var t = !1; try { var a = Object.defineProperty({}, "passive", { get: function () { t = !0 } }); e.addEventListener("testPassiveListener", null, a) } catch (e) { } return t }(), gestures: "ongesturestart" in e } }()), g } function P(e) { return void 0 === e && (e = {}), y || (y = function (e) { var t = (void 0 === e ? {} : e).userAgent, a = z(), i = l(), s = i.navigator.platform, r = t || i.navigator.userAgent, n = { ios: !1, android: !1 }, o = i.screen.width, d = i.screen.height, p = r.match(/(Android);?[\s\/]+([\d.]+)?/), u = r.match(/(iPad).*OS\s([\d_]+)/), c = r.match(/(iPod)(.*OS\s([\d_]+))?/), h = !u && r.match(/(iPhone\sOS|iOS)\s([\d_]+)/), v = "Win32" === s, f = "MacIntel" === s; return !u && f && a.touch && ["1024x1366", "1366x1024", "834x1194", "1194x834", "834x1112", "1112x834", "768x1024", "1024x768", "820x1180", "1180x820", "810x1080", "1080x810"].indexOf(o + "x" + d) >= 0 && ((u = r.match(/(Version)\/([\d.]+)/)) || (u = [0, 1, "13_0_0"]), f = !1), p && !v && (n.os = "android", n.android = !0), (u || h || c) && (n.os = "ios", n.ios = !0), n }(e)), y } function k() { return w || (w = function () { var e, t = l(); return { isEdge: !!t.navigator.userAgent.match(/Edge/g), isSafari: (e = t.navigator.userAgent.toLowerCase(), e.indexOf("safari") >= 0 && e.indexOf("chrome") < 0 && e.indexOf("android") < 0), isWebView: /(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(t.navigator.userAgent) } }()), w } Object.keys(b).forEach((function (e) { m.fn[e] = b[e] })); var L = { name: "resize", create: function () { var e = this; S(e, { resize: { resizeHandler: function () { e && !e.destroyed && e.initialized && (e.emit("beforeResize"), e.emit("resize")) }, orientationChangeHandler: function () { e && !e.destroyed && e.initialized && e.emit("orientationchange") } } }) }, on: { init: function (e) { var t = l(); t.addEventListener("resize", e.resize.resizeHandler), t.addEventListener("orientationchange", e.resize.orientationChangeHandler) }, destroy: function (e) { var t = l(); t.removeEventListener("resize", e.resize.resizeHandler), t.removeEventListener("orientationchange", e.resize.orientationChangeHandler) } } }, $ = { attach: function (e, t) { void 0 === t && (t = {}); var a = l(), i = this, s = new (a.MutationObserver || a.WebkitMutationObserver)((function (e) { if (1 !== e.length) { var t = function () { i.emit("observerUpdate", e[0]) }; a.requestAnimationFrame ? a.requestAnimationFrame(t) : a.setTimeout(t, 0) } else i.emit("observerUpdate", e[0]) })); s.observe(e, { attributes: void 0 === t.attributes || t.attributes, childList: void 0 === t.childList || t.childList, characterData: void 0 === t.characterData || t.characterData }), i.observer.observers.push(s) }, init: function () { var e = this; if (e.support.observer && e.params.observer) { if (e.params.observeParents) for (var t = e.$el.parents(), a = 0; a < t.length; a += 1)e.observer.attach(t[a]); e.observer.attach(e.$el[0], { childList: e.params.observeSlideChildren }), e.observer.attach(e.$wrapperEl[0], { attributes: !1 }) } }, destroy: function () { this.observer.observers.forEach((function (e) { e.disconnect() })), this.observer.observers = [] } }, I = { name: "observer", params: { observer: !1, observeParents: !1, observeSlideChildren: !1 }, create: function () { M(this, { observer: t({}, $, { observers: [] }) }) }, on: { init: function (e) { e.observer.init() }, destroy: function (e) { e.observer.destroy() } } }; function O(e) { var t = this, a = r(), i = l(), s = t.touchEventsData, n = t.params, o = t.touches; if (!t.animating || !n.preventInteractionOnTransition) { var d = e; d.originalEvent && (d = d.originalEvent); var p = m(d.target); if ("wrapper" !== n.touchEventsTarget || p.closest(t.wrapperEl).length) if (s.isTouchEvent = "touchstart" === d.type, s.isTouchEvent || !("which" in d) || 3 !== d.which) if (!(!s.isTouchEvent && "button" in d && d.button > 0)) if (!s.isTouched || !s.isMoved) if (!!n.noSwipingClass && "" !== n.noSwipingClass && d.target && d.target.shadowRoot && e.path && e.path[0] && (p = m(e.path[0])), n.noSwiping && p.closest(n.noSwipingSelector ? n.noSwipingSelector : "." + n.noSwipingClass)[0]) t.allowClick = !0; else if (!n.swipeHandler || p.closest(n.swipeHandler)[0]) { o.currentX = "touchstart" === d.type ? d.targetTouches[0].pageX : d.pageX, o.currentY = "touchstart" === d.type ? d.targetTouches[0].pageY : d.pageY; var u = o.currentX, c = o.currentY, h = n.edgeSwipeDetection || n.iOSEdgeSwipeDetection, v = n.edgeSwipeThreshold || n.iOSEdgeSwipeThreshold; if (h && (u <= v || u >= i.innerWidth - v)) { if ("prevent" !== h) return; e.preventDefault() } if (S(s, { isTouched: !0, isMoved: !1, allowTouchCallbacks: !0, isScrolling: void 0, startMoving: void 0 }), o.startX = u, o.startY = c, s.touchStartTime = x(), t.allowClick = !0, t.updateSize(), t.swipeDirection = void 0, n.threshold > 0 && (s.allowThresholdMove = !1), "touchstart" !== d.type) { var f = !0; p.is(s.formElements) && (f = !1), a.activeElement && m(a.activeElement).is(s.formElements) && a.activeElement !== p[0] && a.activeElement.blur(); var g = f && t.allowTouchMove && n.touchStartPreventDefault; !n.touchStartForcePreventDefault && !g || p[0].isContentEditable || d.preventDefault() } t.emit("touchStart", d) } } } function A(e) { var t = r(), a = this, i = a.touchEventsData, s = a.params, n = a.touches, l = a.rtlTranslate, o = e; if (o.originalEvent && (o = o.originalEvent), i.isTouched) { if (!i.isTouchEvent || "touchmove" === o.type) { var d = "touchmove" === o.type && o.targetTouches && (o.targetTouches[0] || o.changedTouches[0]), p = "touchmove" === o.type ? d.pageX : o.pageX, u = "touchmove" === o.type ? d.pageY : o.pageY; if (o.preventedByNestedSwiper) return n.startX = p, void (n.startY = u); if (!a.allowTouchMove) return a.allowClick = !1, void (i.isTouched && (S(n, { startX: p, startY: u, currentX: p, currentY: u }), i.touchStartTime = x())); if (i.isTouchEvent && s.touchReleaseOnEdges && !s.loop) if (a.isVertical()) { if (u < n.startY && a.translate <= a.maxTranslate() || u > n.startY && a.translate >= a.minTranslate()) return i.isTouched = !1, void (i.isMoved = !1) } else if (p < n.startX && a.translate <= a.maxTranslate() || p > n.startX && a.translate >= a.minTranslate()) return; if (i.isTouchEvent && t.activeElement && o.target === t.activeElement && m(o.target).is(i.formElements)) return i.isMoved = !0, void (a.allowClick = !1); if (i.allowTouchCallbacks && a.emit("touchMove", o), !(o.targetTouches && o.targetTouches.length > 1)) { n.currentX = p, n.currentY = u; var c = n.currentX - n.startX, h = n.currentY - n.startY; if (!(a.params.threshold && Math.sqrt(Math.pow(c, 2) + Math.pow(h, 2)) < a.params.threshold)) { var v; if (void 0 === i.isScrolling) a.isHorizontal() && n.currentY === n.startY || a.isVertical() && n.currentX === n.startX ? i.isScrolling = !1 : c * c + h * h >= 25 && (v = 180 * Math.atan2(Math.abs(h), Math.abs(c)) / Math.PI, i.isScrolling = a.isHorizontal() ? v > s.touchAngle : 90 - v > s.touchAngle); if (i.isScrolling && a.emit("touchMoveOpposite", o), void 0 === i.startMoving && (n.currentX === n.startX && n.currentY === n.startY || (i.startMoving = !0)), i.isScrolling) i.isTouched = !1; else if (i.startMoving) { a.allowClick = !1, !s.cssMode && o.cancelable && o.preventDefault(), s.touchMoveStopPropagation && !s.nested && o.stopPropagation(), i.isMoved || (s.loop && a.loopFix(), i.startTranslate = a.getTranslate(), a.setTransition(0), a.animating && a.$wrapperEl.trigger("webkitTransitionEnd transitionend"), i.allowMomentumBounce = !1, !s.grabCursor || !0 !== a.allowSlideNext && !0 !== a.allowSlidePrev || a.setGrabCursor(!0), a.emit("sliderFirstMove", o)), a.emit("sliderMove", o), i.isMoved = !0; var f = a.isHorizontal() ? c : h; n.diff = f, f *= s.touchRatio, l && (f = -f), a.swipeDirection = f > 0 ? "prev" : "next", i.currentTranslate = f + i.startTranslate; var g = !0, y = s.resistanceRatio; if (s.touchReleaseOnEdges && (y = 0), f > 0 && i.currentTranslate > a.minTranslate() ? (g = !1, s.resistance && (i.currentTranslate = a.minTranslate() - 1 + Math.pow(-a.minTranslate() + i.startTranslate + f, y))) : f < 0 && i.currentTranslate < a.maxTranslate() && (g = !1, s.resistance && (i.currentTranslate = a.maxTranslate() + 1 - Math.pow(a.maxTranslate() - i.startTranslate - f, y))), g && (o.preventedByNestedSwiper = !0), !a.allowSlideNext && "next" === a.swipeDirection && i.currentTranslate < i.startTranslate && (i.currentTranslate = i.startTranslate), !a.allowSlidePrev && "prev" === a.swipeDirection && i.currentTranslate > i.startTranslate && (i.currentTranslate = i.startTranslate), s.threshold > 0) { if (!(Math.abs(f) > s.threshold || i.allowThresholdMove)) return void (i.currentTranslate = i.startTranslate); if (!i.allowThresholdMove) return i.allowThresholdMove = !0, n.startX = n.currentX, n.startY = n.currentY, i.currentTranslate = i.startTranslate, void (n.diff = a.isHorizontal() ? n.currentX - n.startX : n.currentY - n.startY) } s.followFinger && !s.cssMode && ((s.freeMode || s.watchSlidesProgress || s.watchSlidesVisibility) && (a.updateActiveIndex(), a.updateSlidesClasses()), s.freeMode && (0 === i.velocities.length && i.velocities.push({ position: n[a.isHorizontal() ? "startX" : "startY"], time: i.touchStartTime }), i.velocities.push({ position: n[a.isHorizontal() ? "currentX" : "currentY"], time: x() })), a.updateProgress(i.currentTranslate), a.setTranslate(i.currentTranslate)) } } } } } else i.startMoving && i.isScrolling && a.emit("touchMoveOpposite", o) } function D(e) { var t = this, a = t.touchEventsData, i = t.params, s = t.touches, r = t.rtlTranslate, n = t.$wrapperEl, l = t.slidesGrid, o = t.snapGrid, d = e; if (d.originalEvent && (d = d.originalEvent), a.allowTouchCallbacks && t.emit("touchEnd", d), a.allowTouchCallbacks = !1, !a.isTouched) return a.isMoved && i.grabCursor && t.setGrabCursor(!1), a.isMoved = !1, void (a.startMoving = !1); i.grabCursor && a.isMoved && a.isTouched && (!0 === t.allowSlideNext || !0 === t.allowSlidePrev) && t.setGrabCursor(!1); var p, u = x(), c = u - a.touchStartTime; if (t.allowClick && (t.updateClickedSlide(d), t.emit("tap click", d), c < 300 && u - a.lastClickTime < 300 && t.emit("doubleTap doubleClick", d)), a.lastClickTime = x(), E((function () { t.destroyed || (t.allowClick = !0) })), !a.isTouched || !a.isMoved || !t.swipeDirection || 0 === s.diff || a.currentTranslate === a.startTranslate) return a.isTouched = !1, a.isMoved = !1, void (a.startMoving = !1); if (a.isTouched = !1, a.isMoved = !1, a.startMoving = !1, p = i.followFinger ? r ? t.translate : -t.translate : -a.currentTranslate, !i.cssMode) if (i.freeMode) { if (p < -t.minTranslate()) return void t.slideTo(t.activeIndex); if (p > -t.maxTranslate()) return void (t.slides.length < o.length ? t.slideTo(o.length - 1) : t.slideTo(t.slides.length - 1)); if (i.freeModeMomentum) { if (a.velocities.length > 1) { var h = a.velocities.pop(), v = a.velocities.pop(), f = h.position - v.position, m = h.time - v.time; t.velocity = f / m, t.velocity /= 2, Math.abs(t.velocity) < i.freeModeMinimumVelocity && (t.velocity = 0), (m > 150 || x() - h.time > 300) && (t.velocity = 0) } else t.velocity = 0; t.velocity *= i.freeModeMomentumVelocityRatio, a.velocities.length = 0; var g = 1e3 * i.freeModeMomentumRatio, y = t.velocity * g, w = t.translate + y; r && (w = -w); var b, T, C = !1, S = 20 * Math.abs(t.velocity) * i.freeModeMomentumBounceRatio; if (w < t.maxTranslate()) i.freeModeMomentumBounce ? (w + t.maxTranslate() < -S && (w = t.maxTranslate() - S), b = t.maxTranslate(), C = !0, a.allowMomentumBounce = !0) : w = t.maxTranslate(), i.loop && i.centeredSlides && (T = !0); else if (w > t.minTranslate()) i.freeModeMomentumBounce ? (w - t.minTranslate() > S && (w = t.minTranslate() + S), b = t.minTranslate(), C = !0, a.allowMomentumBounce = !0) : w = t.minTranslate(), i.loop && i.centeredSlides && (T = !0); else if (i.freeModeSticky) { for (var M, z = 0; z < o.length; z += 1)if (o[z] > -w) { M = z; break } w = -(w = Math.abs(o[M] - w) < Math.abs(o[M - 1] - w) || "next" === t.swipeDirection ? o[M] : o[M - 1]) } if (T && t.once("transitionEnd", (function () { t.loopFix() })), 0 !== t.velocity) { if (g = r ? Math.abs((-w - t.translate) / t.velocity) : Math.abs((w - t.translate) / t.velocity), i.freeModeSticky) { var P = Math.abs((r ? -w : w) - t.translate), k = t.slidesSizesGrid[t.activeIndex]; g = P < k ? i.speed : P < 2 * k ? 1.5 * i.speed : 2.5 * i.speed } } else if (i.freeModeSticky) return void t.slideToClosest(); i.freeModeMomentumBounce && C ? (t.updateProgress(b), t.setTransition(g), t.setTranslate(w), t.transitionStart(!0, t.swipeDirection), t.animating = !0, n.transitionEnd((function () { t && !t.destroyed && a.allowMomentumBounce && (t.emit("momentumBounce"), t.setTransition(i.speed), setTimeout((function () { t.setTranslate(b), n.transitionEnd((function () { t && !t.destroyed && t.transitionEnd() })) }), 0)) }))) : t.velocity ? (t.updateProgress(w), t.setTransition(g), t.setTranslate(w), t.transitionStart(!0, t.swipeDirection), t.animating || (t.animating = !0, n.transitionEnd((function () { t && !t.destroyed && t.transitionEnd() })))) : t.updateProgress(w), t.updateActiveIndex(), t.updateSlidesClasses() } else if (i.freeModeSticky) return void t.slideToClosest(); (!i.freeModeMomentum || c >= i.longSwipesMs) && (t.updateProgress(), t.updateActiveIndex(), t.updateSlidesClasses()) } else { for (var L = 0, $ = t.slidesSizesGrid[0], I = 0; I < l.length; I += I < i.slidesPerGroupSkip ? 1 : i.slidesPerGroup) { var O = I < i.slidesPerGroupSkip - 1 ? 1 : i.slidesPerGroup; void 0 !== l[I + O] ? p >= l[I] && p < l[I + O] && (L = I, $ = l[I + O] - l[I]) : p >= l[I] && (L = I, $ = l[l.length - 1] - l[l.length - 2]) } var A = (p - l[L]) / $, D = L < i.slidesPerGroupSkip - 1 ? 1 : i.slidesPerGroup; if (c > i.longSwipesMs) { if (!i.longSwipes) return void t.slideTo(t.activeIndex); "next" === t.swipeDirection && (A >= i.longSwipesRatio ? t.slideTo(L + D) : t.slideTo(L)), "prev" === t.swipeDirection && (A > 1 - i.longSwipesRatio ? t.slideTo(L + D) : t.slideTo(L)) } else { if (!i.shortSwipes) return void t.slideTo(t.activeIndex); t.navigation && (d.target === t.navigation.nextEl || d.target === t.navigation.prevEl) ? d.target === t.navigation.nextEl ? t.slideTo(L + D) : t.slideTo(L) : ("next" === t.swipeDirection && t.slideTo(L + D), "prev" === t.swipeDirection && t.slideTo(L)) } } } function G() { var e = this, t = e.params, a = e.el; if (!a || 0 !== a.offsetWidth) { t.breakpoints && e.setBreakpoint(); var i = e.allowSlideNext, s = e.allowSlidePrev, r = e.snapGrid; e.allowSlideNext = !0, e.allowSlidePrev = !0, e.updateSize(), e.updateSlides(), e.updateSlidesClasses(), ("auto" === t.slidesPerView || t.slidesPerView > 1) && e.isEnd && !e.isBeginning && !e.params.centeredSlides ? e.slideTo(e.slides.length - 1, 0, !1, !0) : e.slideTo(e.activeIndex, 0, !1, !0), e.autoplay && e.autoplay.running && e.autoplay.paused && e.autoplay.run(), e.allowSlidePrev = s, e.allowSlideNext = i, e.params.watchOverflow && r !== e.snapGrid && e.checkOverflow() } } function N(e) { var t = this; t.allowClick || (t.params.preventClicks && e.preventDefault(), t.params.preventClicksPropagation && t.animating && (e.stopPropagation(), e.stopImmediatePropagation())) } function B() { var e = this, t = e.wrapperEl, a = e.rtlTranslate; e.previousTranslate = e.translate, e.isHorizontal() ? e.translate = a ? t.scrollWidth - t.offsetWidth - t.scrollLeft : -t.scrollLeft : e.translate = -t.scrollTop, -0 === e.translate && (e.translate = 0), e.updateActiveIndex(), e.updateSlidesClasses(); var i = e.maxTranslate() - e.minTranslate(); (0 === i ? 0 : (e.translate - e.minTranslate()) / i) !== e.progress && e.updateProgress(a ? -e.translate : e.translate), e.emit("setTranslate", e.translate, !1) } var H = !1; function X() { } var Y = { init: !0, direction: "horizontal", touchEventsTarget: "container", initialSlide: 0, speed: 300, cssMode: !1, updateOnWindowResize: !0, nested: !1, width: null, height: null, preventInteractionOnTransition: !1, userAgent: null, url: null, edgeSwipeDetection: !1, edgeSwipeThreshold: 20, freeMode: !1, freeModeMomentum: !0, freeModeMomentumRatio: 1, freeModeMomentumBounce: !0, freeModeMomentumBounceRatio: 1, freeModeMomentumVelocityRatio: 1, freeModeSticky: !1, freeModeMinimumVelocity: .02, autoHeight: !1, setWrapperSize: !1, virtualTranslate: !1, effect: "slide", breakpoints: void 0, spaceBetween: 0, slidesPerView: 1, slidesPerColumn: 1, slidesPerColumnFill: "column", slidesPerGroup: 1, slidesPerGroupSkip: 0, centeredSlides: !1, centeredSlidesBounds: !1, slidesOffsetBefore: 0, slidesOffsetAfter: 0, normalizeSlideIndex: !0, centerInsufficientSlides: !1, watchOverflow: !1, roundLengths: !1, touchRatio: 1, touchAngle: 45, simulateTouch: !0, shortSwipes: !0, longSwipes: !0, longSwipesRatio: .5, longSwipesMs: 300, followFinger: !0, allowTouchMove: !0, threshold: 0, touchMoveStopPropagation: !1, touchStartPreventDefault: !0, touchStartForcePreventDefault: !1, touchReleaseOnEdges: !1, uniqueNavElements: !0, resistance: !0, resistanceRatio: .85, watchSlidesProgress: !1, watchSlidesVisibility: !1, grabCursor: !1, preventClicks: !0, preventClicksPropagation: !0, slideToClickedSlide: !1, preloadImages: !0, updateOnImagesReady: !0, loop: !1, loopAdditionalSlides: 0, loopedSlides: null, loopFillGroupWithBlank: !1, loopPreventsSlide: !0, allowSlidePrev: !0, allowSlideNext: !0, swipeHandler: null, noSwiping: !0, noSwipingClass: "swiper-no-swiping", noSwipingSelector: null, passiveListeners: !0, containerModifierClass: "swiper-container-", slideClass: "swiper-slide", slideBlankClass: "swiper-slide-invisible-blank", slideActiveClass: "swiper-slide-active", slideDuplicateActiveClass: "swiper-slide-duplicate-active", slideVisibleClass: "swiper-slide-visible", slideDuplicateClass: "swiper-slide-duplicate", slideNextClass: "swiper-slide-next", slideDuplicateNextClass: "swiper-slide-duplicate-next", slidePrevClass: "swiper-slide-prev", slideDuplicatePrevClass: "swiper-slide-duplicate-prev", wrapperClass: "swiper-wrapper", runCallbacksOnInit: !0, _emitClasses: !1 }, V = { modular: { useParams: function (e) { var t = this; t.modules && Object.keys(t.modules).forEach((function (a) { var i = t.modules[a]; i.params && S(e, i.params) })) }, useModules: function (e) { void 0 === e && (e = {}); var t = this; t.modules && Object.keys(t.modules).forEach((function (a) { var i = t.modules[a], s = e[a] || {}; i.on && t.on && Object.keys(i.on).forEach((function (e) { t.on(e, i.on[e]) })), i.create && i.create.bind(t)(s) })) } }, eventsEmitter: { on: function (e, t, a) { var i = this; if ("function" != typeof t) return i; var s = a ? "unshift" : "push"; return e.split(" ").forEach((function (e) { i.eventsListeners[e] || (i.eventsListeners[e] = []), i.eventsListeners[e][s](t) })), i }, once: function (e, t, a) { var i = this; if ("function" != typeof t) return i; function s() { i.off(e, s), s.__emitterProxy && delete s.__emitterProxy; for (var a = arguments.length, r = new Array(a), n = 0; n < a; n++)r[n] = arguments[n]; t.apply(i, r) } return s.__emitterProxy = t, i.on(e, s, a) }, onAny: function (e, t) { var a = this; if ("function" != typeof e) return a; var i = t ? "unshift" : "push"; return a.eventsAnyListeners.indexOf(e) < 0 && a.eventsAnyListeners[i](e), a }, offAny: function (e) { var t = this; if (!t.eventsAnyListeners) return t; var a = t.eventsAnyListeners.indexOf(e); return a >= 0 && t.eventsAnyListeners.splice(a, 1), t }, off: function (e, t) { var a = this; return a.eventsListeners ? (e.split(" ").forEach((function (e) { void 0 === t ? a.eventsListeners[e] = [] : a.eventsListeners[e] && a.eventsListeners[e].forEach((function (i, s) { (i === t || i.__emitterProxy && i.__emitterProxy === t) && a.eventsListeners[e].splice(s, 1) })) })), a) : a }, emit: function () { var e, t, a, i = this; if (!i.eventsListeners) return i; for (var s = arguments.length, r = new Array(s), n = 0; n < s; n++)r[n] = arguments[n]; "string" == typeof r[0] || Array.isArray(r[0]) ? (e = r[0], t = r.slice(1, r.length), a = i) : (e = r[0].events, t = r[0].data, a = r[0].context || i), t.unshift(a); var l = Array.isArray(e) ? e : e.split(" "); return l.forEach((function (e) { i.eventsAnyListeners && i.eventsAnyListeners.length && i.eventsAnyListeners.forEach((function (i) { i.apply(a, [e].concat(t)) })), i.eventsListeners && i.eventsListeners[e] && i.eventsListeners[e].forEach((function (e) { e.apply(a, t) })) })), i } }, update: { updateSize: function () { var e, t, a = this, i = a.$el; e = void 0 !== a.params.width && null !== a.params.width ? a.params.width : i[0].clientWidth, t = void 0 !== a.params.height && null !== a.params.height ? a.params.height : i[0].clientHeight, 0 === e && a.isHorizontal() || 0 === t && a.isVertical() || (e = e - parseInt(i.css("padding-left") || 0, 10) - parseInt(i.css("padding-right") || 0, 10), t = t - parseInt(i.css("padding-top") || 0, 10) - parseInt(i.css("padding-bottom") || 0, 10), Number.isNaN(e) && (e = 0), Number.isNaN(t) && (t = 0), S(a, { width: e, height: t, size: a.isHorizontal() ? e : t })) }, updateSlides: function () { var e = this, t = l(), a = e.params, i = e.$wrapperEl, s = e.size, r = e.rtlTranslate, n = e.wrongRTL, o = e.virtual && a.virtual.enabled, d = o ? e.virtual.slides.length : e.slides.length, p = i.children("." + e.params.slideClass), u = o ? e.virtual.slides.length : p.length, c = [], h = [], v = []; function f(e, t) { return !a.cssMode || t !== p.length - 1 } var m = a.slidesOffsetBefore; "function" == typeof m && (m = a.slidesOffsetBefore.call(e)); var g = a.slidesOffsetAfter; "function" == typeof g && (g = a.slidesOffsetAfter.call(e)); var y = e.snapGrid.length, w = e.slidesGrid.length, b = a.spaceBetween, E = -m, x = 0, T = 0; if (void 0 !== s) { var C, M; "string" == typeof b && b.indexOf("%") >= 0 && (b = parseFloat(b.replace("%", "")) / 100 * s), e.virtualSize = -b, r ? p.css({ marginLeft: "", marginTop: "" }) : p.css({ marginRight: "", marginBottom: "" }), a.slidesPerColumn > 1 && (C = Math.floor(u / a.slidesPerColumn) === u / e.params.slidesPerColumn ? u : Math.ceil(u / a.slidesPerColumn) * a.slidesPerColumn, "auto" !== a.slidesPerView && "row" === a.slidesPerColumnFill && (C = Math.max(C, a.slidesPerView * a.slidesPerColumn))); for (var z, P = a.slidesPerColumn, k = C / P, L = Math.floor(u / a.slidesPerColumn), $ = 0; $ < u; $ += 1) { M = 0; var I = p.eq($); if (a.slidesPerColumn > 1) { var O = void 0, A = void 0, D = void 0; if ("row" === a.slidesPerColumnFill && a.slidesPerGroup > 1) { var G = Math.floor($ / (a.slidesPerGroup * a.slidesPerColumn)), N = $ - a.slidesPerColumn * a.slidesPerGroup * G, B = 0 === G ? a.slidesPerGroup : Math.min(Math.ceil((u - G * P * a.slidesPerGroup) / P), a.slidesPerGroup); O = (A = N - (D = Math.floor(N / B)) * B + G * a.slidesPerGroup) + D * C / P, I.css({ "-webkit-box-ordinal-group": O, "-moz-box-ordinal-group": O, "-ms-flex-order": O, "-webkit-order": O, order: O }) } else "column" === a.slidesPerColumnFill ? (D = $ - (A = Math.floor($ / P)) * P, (A > L || A === L && D === P - 1) && (D += 1) >= P && (D = 0, A += 1)) : A = $ - (D = Math.floor($ / k)) * k; I.css("margin-" + (e.isHorizontal() ? "top" : "left"), 0 !== D && a.spaceBetween && a.spaceBetween + "px") } if ("none" !== I.css("display")) { if ("auto" === a.slidesPerView) { var H = t.getComputedStyle(I[0], null), X = I[0].style.transform, Y = I[0].style.webkitTransform; if (X && (I[0].style.transform = "none"), Y && (I[0].style.webkitTransform = "none"), a.roundLengths) M = e.isHorizontal() ? I.outerWidth(!0) : I.outerHeight(!0); else if (e.isHorizontal()) { var V = parseFloat(H.getPropertyValue("width") || 0), F = parseFloat(H.getPropertyValue("padding-left") || 0), R = parseFloat(H.getPropertyValue("padding-right") || 0), W = parseFloat(H.getPropertyValue("margin-left") || 0), q = parseFloat(H.getPropertyValue("margin-right") || 0), j = H.getPropertyValue("box-sizing"); if (j && "border-box" === j) M = V + W + q; else { var _ = I[0], U = _.clientWidth; M = V + F + R + W + q + (_.offsetWidth - U) } } else { var K = parseFloat(H.getPropertyValue("height") || 0), Z = parseFloat(H.getPropertyValue("padding-top") || 0), J = parseFloat(H.getPropertyValue("padding-bottom") || 0), Q = parseFloat(H.getPropertyValue("margin-top") || 0), ee = parseFloat(H.getPropertyValue("margin-bottom") || 0), te = H.getPropertyValue("box-sizing"); if (te && "border-box" === te) M = K + Q + ee; else { var ae = I[0], ie = ae.clientHeight; M = K + Z + J + Q + ee + (ae.offsetHeight - ie) } } X && (I[0].style.transform = X), Y && (I[0].style.webkitTransform = Y), a.roundLengths && (M = Math.floor(M)) } else M = (s - (a.slidesPerView - 1) * b) / a.slidesPerView, a.roundLengths && (M = Math.floor(M)), p[$] && (e.isHorizontal() ? p[$].style.width = M + "px" : p[$].style.height = M + "px"); p[$] && (p[$].swiperSlideSize = M), v.push(M), a.centeredSlides ? (E = E + M / 2 + x / 2 + b, 0 === x && 0 !== $ && (E = E - s / 2 - b), 0 === $ && (E = E - s / 2 - b), Math.abs(E) < .001 && (E = 0), a.roundLengths && (E = Math.floor(E)), T % a.slidesPerGroup == 0 && c.push(E), h.push(E)) : (a.roundLengths && (E = Math.floor(E)), (T - Math.min(e.params.slidesPerGroupSkip, T)) % e.params.slidesPerGroup == 0 && c.push(E), h.push(E), E = E + M + b), e.virtualSize += M + b, x = M, T += 1 } } if (e.virtualSize = Math.max(e.virtualSize, s) + g, r && n && ("slide" === a.effect || "coverflow" === a.effect) && i.css({ width: e.virtualSize + a.spaceBetween + "px" }), a.setWrapperSize && (e.isHorizontal() ? i.css({ width: e.virtualSize + a.spaceBetween + "px" }) : i.css({ height: e.virtualSize + a.spaceBetween + "px" })), a.slidesPerColumn > 1 && (e.virtualSize = (M + a.spaceBetween) * C, e.virtualSize = Math.ceil(e.virtualSize / a.slidesPerColumn) - a.spaceBetween, e.isHorizontal() ? i.css({ width: e.virtualSize + a.spaceBetween + "px" }) : i.css({ height: e.virtualSize + a.spaceBetween + "px" }), a.centeredSlides)) { z = []; for (var se = 0; se < c.length; se += 1) { var re = c[se]; a.roundLengths && (re = Math.floor(re)), c[se] < e.virtualSize + c[0] && z.push(re) } c = z } if (!a.centeredSlides) { z = []; for (var ne = 0; ne < c.length; ne += 1) { var le = c[ne]; a.roundLengths && (le = Math.floor(le)), c[ne] <= e.virtualSize - s && z.push(le) } c = z, Math.floor(e.virtualSize - s) - Math.floor(c[c.length - 1]) > 1 && c.push(e.virtualSize - s) } if (0 === c.length && (c = [0]), 0 !== a.spaceBetween && (e.isHorizontal() ? r ? p.filter(f).css({ marginLeft: b + "px" }) : p.filter(f).css({ marginRight: b + "px" }) : p.filter(f).css({ marginBottom: b + "px" })), a.centeredSlides && a.centeredSlidesBounds) { var oe = 0; v.forEach((function (e) { oe += e + (a.spaceBetween ? a.spaceBetween : 0) })); var de = (oe -= a.spaceBetween) - s; c = c.map((function (e) { return e < 0 ? -m : e > de ? de + g : e })) } if (a.centerInsufficientSlides) { var pe = 0; if (v.forEach((function (e) { pe += e + (a.spaceBetween ? a.spaceBetween : 0) })), (pe -= a.spaceBetween) < s) { var ue = (s - pe) / 2; c.forEach((function (e, t) { c[t] = e - ue })), h.forEach((function (e, t) { h[t] = e + ue })) } } S(e, { slides: p, snapGrid: c, slidesGrid: h, slidesSizesGrid: v }), u !== d && e.emit("slidesLengthChange"), c.length !== y && (e.params.watchOverflow && e.checkOverflow(), e.emit("snapGridLengthChange")), h.length !== w && e.emit("slidesGridLengthChange"), (a.watchSlidesProgress || a.watchSlidesVisibility) && e.updateSlidesOffset() } }, updateAutoHeight: function (e) { var t, a = this, i = [], s = 0; if ("number" == typeof e ? a.setTransition(e) : !0 === e && a.setTransition(a.params.speed), "auto" !== a.params.slidesPerView && a.params.slidesPerView > 1) if (a.params.centeredSlides) a.visibleSlides.each((function (e) { i.push(e) })); else for (t = 0; t < Math.ceil(a.params.slidesPerView); t += 1) { var r = a.activeIndex + t; if (r > a.slides.length) break; i.push(a.slides.eq(r)[0]) } else i.push(a.slides.eq(a.activeIndex)[0]); for (t = 0; t < i.length; t += 1)if (void 0 !== i[t]) { var n = i[t].offsetHeight; s = n > s ? n : s } s && a.$wrapperEl.css("height", s + "px") }, updateSlidesOffset: function () { for (var e = this.slides, t = 0; t < e.length; t += 1)e[t].swiperSlideOffset = this.isHorizontal() ? e[t].offsetLeft : e[t].offsetTop }, updateSlidesProgress: function (e) { void 0 === e && (e = this && this.translate || 0); var t = this, a = t.params, i = t.slides, s = t.rtlTranslate; if (0 !== i.length) { void 0 === i[0].swiperSlideOffset && t.updateSlidesOffset(); var r = -e; s && (r = e), i.removeClass(a.slideVisibleClass), t.visibleSlidesIndexes = [], t.visibleSlides = []; for (var n = 0; n < i.length; n += 1) { var l = i[n], o = (r + (a.centeredSlides ? t.minTranslate() : 0) - l.swiperSlideOffset) / (l.swiperSlideSize + a.spaceBetween); if (a.watchSlidesVisibility || a.centeredSlides && a.autoHeight) { var d = -(r - l.swiperSlideOffset), p = d + t.slidesSizesGrid[n]; (d >= 0 && d < t.size - 1 || p > 1 && p <= t.size || d <= 0 && p >= t.size) && (t.visibleSlides.push(l), t.visibleSlidesIndexes.push(n), i.eq(n).addClass(a.slideVisibleClass)) } l.progress = s ? -o : o } t.visibleSlides = m(t.visibleSlides) } }, updateProgress: function (e) { var t = this; if (void 0 === e) { var a = t.rtlTranslate ? -1 : 1; e = t && t.translate && t.translate * a || 0 } var i = t.params, s = t.maxTranslate() - t.minTranslate(), r = t.progress, n = t.isBeginning, l = t.isEnd, o = n, d = l; 0 === s ? (r = 0, n = !0, l = !0) : (n = (r = (e - t.minTranslate()) / s) <= 0, l = r >= 1), S(t, { progress: r, isBeginning: n, isEnd: l }), (i.watchSlidesProgress || i.watchSlidesVisibility || i.centeredSlides && i.autoHeight) && t.updateSlidesProgress(e), n && !o && t.emit("reachBeginning toEdge"), l && !d && t.emit("reachEnd toEdge"), (o && !n || d && !l) && t.emit("fromEdge"), t.emit("progress", r) }, updateSlidesClasses: function () { var e, t = this, a = t.slides, i = t.params, s = t.$wrapperEl, r = t.activeIndex, n = t.realIndex, l = t.virtual && i.virtual.enabled; a.removeClass(i.slideActiveClass + " " + i.slideNextClass + " " + i.slidePrevClass + " " + i.slideDuplicateActiveClass + " " + i.slideDuplicateNextClass + " " + i.slideDuplicatePrevClass), (e = l ? t.$wrapperEl.find("." + i.slideClass + '[data-swiper-slide-index="' + r + '"]') : a.eq(r)).addClass(i.slideActiveClass), i.loop && (e.hasClass(i.slideDuplicateClass) ? s.children("." + i.slideClass + ":not(." + i.slideDuplicateClass + ')[data-swiper-slide-index="' + n + '"]').addClass(i.slideDuplicateActiveClass) : s.children("." + i.slideClass + "." + i.slideDuplicateClass + '[data-swiper-slide-index="' + n + '"]').addClass(i.slideDuplicateActiveClass)); var o = e.nextAll("." + i.slideClass).eq(0).addClass(i.slideNextClass); i.loop && 0 === o.length && (o = a.eq(0)).addClass(i.slideNextClass); var d = e.prevAll("." + i.slideClass).eq(0).addClass(i.slidePrevClass); i.loop && 0 === d.length && (d = a.eq(-1)).addClass(i.slidePrevClass), i.loop && (o.hasClass(i.slideDuplicateClass) ? s.children("." + i.slideClass + ":not(." + i.slideDuplicateClass + ')[data-swiper-slide-index="' + o.attr("data-swiper-slide-index") + '"]').addClass(i.slideDuplicateNextClass) : s.children("." + i.slideClass + "." + i.slideDuplicateClass + '[data-swiper-slide-index="' + o.attr("data-swiper-slide-index") + '"]').addClass(i.slideDuplicateNextClass), d.hasClass(i.slideDuplicateClass) ? s.children("." + i.slideClass + ":not(." + i.slideDuplicateClass + ')[data-swiper-slide-index="' + d.attr("data-swiper-slide-index") + '"]').addClass(i.slideDuplicatePrevClass) : s.children("." + i.slideClass + "." + i.slideDuplicateClass + '[data-swiper-slide-index="' + d.attr("data-swiper-slide-index") + '"]').addClass(i.slideDuplicatePrevClass)), t.emitSlidesClasses() }, updateActiveIndex: function (e) { var t, a = this, i = a.rtlTranslate ? a.translate : -a.translate, s = a.slidesGrid, r = a.snapGrid, n = a.params, l = a.activeIndex, o = a.realIndex, d = a.snapIndex, p = e; if (void 0 === p) { for (var u = 0; u < s.length; u += 1)void 0 !== s[u + 1] ? i >= s[u] && i < s[u + 1] - (s[u + 1] - s[u]) / 2 ? p = u : i >= s[u] && i < s[u + 1] && (p = u + 1) : i >= s[u] && (p = u); n.normalizeSlideIndex && (p < 0 || void 0 === p) && (p = 0) } if (r.indexOf(i) >= 0) t = r.indexOf(i); else { var c = Math.min(n.slidesPerGroupSkip, p); t = c + Math.floor((p - c) / n.slidesPerGroup) } if (t >= r.length && (t = r.length - 1), p !== l) { var h = parseInt(a.slides.eq(p).attr("data-swiper-slide-index") || p, 10); S(a, { snapIndex: t, realIndex: h, previousIndex: l, activeIndex: p }), a.emit("activeIndexChange"), a.emit("snapIndexChange"), o !== h && a.emit("realIndexChange"), (a.initialized || a.params.runCallbacksOnInit) && a.emit("slideChange") } else t !== d && (a.snapIndex = t, a.emit("snapIndexChange")) }, updateClickedSlide: function (e) { var t = this, a = t.params, i = m(e.target).closest("." + a.slideClass)[0], s = !1; if (i) for (var r = 0; r < t.slides.length; r += 1)t.slides[r] === i && (s = !0); if (!i || !s) return t.clickedSlide = void 0, void (t.clickedIndex = void 0); t.clickedSlide = i, t.virtual && t.params.virtual.enabled ? t.clickedIndex = parseInt(m(i).attr("data-swiper-slide-index"), 10) : t.clickedIndex = m(i).index(), a.slideToClickedSlide && void 0 !== t.clickedIndex && t.clickedIndex !== t.activeIndex && t.slideToClickedSlide() } }, translate: { getTranslate: function (e) { void 0 === e && (e = this.isHorizontal() ? "x" : "y"); var t = this, a = t.params, i = t.rtlTranslate, s = t.translate, r = t.$wrapperEl; if (a.virtualTranslate) return i ? -s : s; if (a.cssMode) return s; var n = T(r[0], e); return i && (n = -n), n || 0 }, setTranslate: function (e, t) { var a = this, i = a.rtlTranslate, s = a.params, r = a.$wrapperEl, n = a.wrapperEl, l = a.progress, o = 0, d = 0; a.isHorizontal() ? o = i ? -e : e : d = e, s.roundLengths && (o = Math.floor(o), d = Math.floor(d)), s.cssMode ? n[a.isHorizontal() ? "scrollLeft" : "scrollTop"] = a.isHorizontal() ? -o : -d : s.virtualTranslate || r.transform("translate3d(" + o + "px, " + d + "px, 0px)"), a.previousTranslate = a.translate, a.translate = a.isHorizontal() ? o : d; var p = a.maxTranslate() - a.minTranslate(); (0 === p ? 0 : (e - a.minTranslate()) / p) !== l && a.updateProgress(e), a.emit("setTranslate", a.translate, t) }, minTranslate: function () { return -this.snapGrid[0] }, maxTranslate: function () { return -this.snapGrid[this.snapGrid.length - 1] }, translateTo: function (e, t, a, i, s) { void 0 === e && (e = 0), void 0 === t && (t = this.params.speed), void 0 === a && (a = !0), void 0 === i && (i = !0); var r = this, n = r.params, l = r.wrapperEl; if (r.animating && n.preventInteractionOnTransition) return !1; var o, d = r.minTranslate(), p = r.maxTranslate(); if (o = i && e > d ? d : i && e < p ? p : e, r.updateProgress(o), n.cssMode) { var u, c = r.isHorizontal(); if (0 === t) l[c ? "scrollLeft" : "scrollTop"] = -o; else if (l.scrollTo) l.scrollTo(((u = {})[c ? "left" : "top"] = -o, u.behavior = "smooth", u)); else l[c ? "scrollLeft" : "scrollTop"] = -o; return !0 } return 0 === t ? (r.setTransition(0), r.setTranslate(o), a && (r.emit("beforeTransitionStart", t, s), r.emit("transitionEnd"))) : (r.setTransition(t), r.setTranslate(o), a && (r.emit("beforeTransitionStart", t, s), r.emit("transitionStart")), r.animating || (r.animating = !0, r.onTranslateToWrapperTransitionEnd || (r.onTranslateToWrapperTransitionEnd = function (e) { r && !r.destroyed && e.target === this && (r.$wrapperEl[0].removeEventListener("transitionend", r.onTranslateToWrapperTransitionEnd), r.$wrapperEl[0].removeEventListener("webkitTransitionEnd", r.onTranslateToWrapperTransitionEnd), r.onTranslateToWrapperTransitionEnd = null, delete r.onTranslateToWrapperTransitionEnd, a && r.emit("transitionEnd")) }), r.$wrapperEl[0].addEventListener("transitionend", r.onTranslateToWrapperTransitionEnd), r.$wrapperEl[0].addEventListener("webkitTransitionEnd", r.onTranslateToWrapperTransitionEnd))), !0 } }, transition: { setTransition: function (e, t) { var a = this; a.params.cssMode || a.$wrapperEl.transition(e), a.emit("setTransition", e, t) }, transitionStart: function (e, t) { void 0 === e && (e = !0); var a = this, i = a.activeIndex, s = a.params, r = a.previousIndex; if (!s.cssMode) { s.autoHeight && a.updateAutoHeight(); var n = t; if (n || (n = i > r ? "next" : i < r ? "prev" : "reset"), a.emit("transitionStart"), e && i !== r) { if ("reset" === n) return void a.emit("slideResetTransitionStart"); a.emit("slideChangeTransitionStart"), "next" === n ? a.emit("slideNextTransitionStart") : a.emit("slidePrevTransitionStart") } } }, transitionEnd: function (e, t) { void 0 === e && (e = !0); var a = this, i = a.activeIndex, s = a.previousIndex, r = a.params; if (a.animating = !1, !r.cssMode) { a.setTransition(0); var n = t; if (n || (n = i > s ? "next" : i < s ? "prev" : "reset"), a.emit("transitionEnd"), e && i !== s) { if ("reset" === n) return void a.emit("slideResetTransitionEnd"); a.emit("slideChangeTransitionEnd"), "next" === n ? a.emit("slideNextTransitionEnd") : a.emit("slidePrevTransitionEnd") } } } }, slide: { slideTo: function (e, t, a, i) { if (void 0 === e && (e = 0), void 0 === t && (t = this.params.speed), void 0 === a && (a = !0), "number" != typeof e && "string" != typeof e) throw new Error("The 'index' argument cannot have type other than 'number' or 'string'. [" + typeof e + "] given."); if ("string" == typeof e) { var s = parseInt(e, 10); if (!isFinite(s)) throw new Error("The passed-in 'index' (string) couldn't be converted to 'number'. [" + e + "] given."); e = s } var r = this, n = e; n < 0 && (n = 0); var l = r.params, o = r.snapGrid, d = r.slidesGrid, p = r.previousIndex, u = r.activeIndex, c = r.rtlTranslate, h = r.wrapperEl; if (r.animating && l.preventInteractionOnTransition) return !1; var v = Math.min(r.params.slidesPerGroupSkip, n), f = v + Math.floor((n - v) / r.params.slidesPerGroup); f >= o.length && (f = o.length - 1), (u || l.initialSlide || 0) === (p || 0) && a && r.emit("beforeSlideChangeStart"); var m, g = -o[f]; if (r.updateProgress(g), l.normalizeSlideIndex) for (var y = 0; y < d.length; y += 1) { var w = -Math.floor(100 * g), b = Math.floor(100 * d[y]), E = Math.floor(100 * d[y + 1]); void 0 !== d[y + 1] ? w >= b && w < E - (E - b) / 2 ? n = y : w >= b && w < E && (n = y + 1) : w >= b && (n = y) } if (r.initialized && n !== u) { if (!r.allowSlideNext && g < r.translate && g < r.minTranslate()) return !1; if (!r.allowSlidePrev && g > r.translate && g > r.maxTranslate() && (u || 0) !== n) return !1 } if (m = n > u ? "next" : n < u ? "prev" : "reset", c && -g === r.translate || !c && g === r.translate) return r.updateActiveIndex(n), l.autoHeight && r.updateAutoHeight(), r.updateSlidesClasses(), "slide" !== l.effect && r.setTranslate(g), "reset" !== m && (r.transitionStart(a, m), r.transitionEnd(a, m)), !1; if (l.cssMode) { var x, T = r.isHorizontal(), C = -g; if (c && (C = h.scrollWidth - h.offsetWidth - C), 0 === t) h[T ? "scrollLeft" : "scrollTop"] = C; else if (h.scrollTo) h.scrollTo(((x = {})[T ? "left" : "top"] = C, x.behavior = "smooth", x)); else h[T ? "scrollLeft" : "scrollTop"] = C; return !0 } return 0 === t ? (r.setTransition(0), r.setTranslate(g), r.updateActiveIndex(n), r.updateSlidesClasses(), r.emit("beforeTransitionStart", t, i), r.transitionStart(a, m), r.transitionEnd(a, m)) : (r.setTransition(t), r.setTranslate(g), r.updateActiveIndex(n), r.updateSlidesClasses(), r.emit("beforeTransitionStart", t, i), r.transitionStart(a, m), r.animating || (r.animating = !0, r.onSlideToWrapperTransitionEnd || (r.onSlideToWrapperTransitionEnd = function (e) { r && !r.destroyed && e.target === this && (r.$wrapperEl[0].removeEventListener("transitionend", r.onSlideToWrapperTransitionEnd), r.$wrapperEl[0].removeEventListener("webkitTransitionEnd", r.onSlideToWrapperTransitionEnd), r.onSlideToWrapperTransitionEnd = null, delete r.onSlideToWrapperTransitionEnd, r.transitionEnd(a, m)) }), r.$wrapperEl[0].addEventListener("transitionend", r.onSlideToWrapperTransitionEnd), r.$wrapperEl[0].addEventListener("webkitTransitionEnd", r.onSlideToWrapperTransitionEnd))), !0 }, slideToLoop: function (e, t, a, i) { void 0 === e && (e = 0), void 0 === t && (t = this.params.speed), void 0 === a && (a = !0); var s = this, r = e; return s.params.loop && (r += s.loopedSlides), s.slideTo(r, t, a, i) }, slideNext: function (e, t, a) { void 0 === e && (e = this.params.speed), void 0 === t && (t = !0); var i = this, s = i.params, r = i.animating, n = i.activeIndex < s.slidesPerGroupSkip ? 1 : s.slidesPerGroup; if (s.loop) { if (r && s.loopPreventsSlide) return !1; i.loopFix(), i._clientLeft = i.$wrapperEl[0].clientLeft } return i.slideTo(i.activeIndex + n, e, t, a) }, slidePrev: function (e, t, a) { void 0 === e && (e = this.params.speed), void 0 === t && (t = !0); var i = this, s = i.params, r = i.animating, n = i.snapGrid, l = i.slidesGrid, o = i.rtlTranslate; if (s.loop) { if (r && s.loopPreventsSlide) return !1; i.loopFix(), i._clientLeft = i.$wrapperEl[0].clientLeft } function d(e) { return e < 0 ? -Math.floor(Math.abs(e)) : Math.floor(e) } var p = d(o ? i.translate : -i.translate), u = n.map((function (e) { return d(e) })); n[u.indexOf(p)]; var c, h = n[u.indexOf(p) - 1]; return void 0 === h && s.cssMode && n.forEach((function (e) { !h && p >= e && (h = e) })), void 0 !== h && (c = l.indexOf(h)) < 0 && (c = i.activeIndex - 1), i.slideTo(c, e, t, a) }, slideReset: function (e, t, a) { return void 0 === e && (e = this.params.speed), void 0 === t && (t = !0), this.slideTo(this.activeIndex, e, t, a) }, slideToClosest: function (e, t, a, i) { void 0 === e && (e = this.params.speed), void 0 === t && (t = !0), void 0 === i && (i = .5); var s = this, r = s.activeIndex, n = Math.min(s.params.slidesPerGroupSkip, r), l = n + Math.floor((r - n) / s.params.slidesPerGroup), o = s.rtlTranslate ? s.translate : -s.translate; if (o >= s.snapGrid[l]) { var d = s.snapGrid[l]; o - d > (s.snapGrid[l + 1] - d) * i && (r += s.params.slidesPerGroup) } else { var p = s.snapGrid[l - 1]; o - p <= (s.snapGrid[l] - p) * i && (r -= s.params.slidesPerGroup) } return r = Math.max(r, 0), r = Math.min(r, s.slidesGrid.length - 1), s.slideTo(r, e, t, a) }, slideToClickedSlide: function () { var e, t = this, a = t.params, i = t.$wrapperEl, s = "auto" === a.slidesPerView ? t.slidesPerViewDynamic() : a.slidesPerView, r = t.clickedIndex; if (a.loop) { if (t.animating) return; e = parseInt(m(t.clickedSlide).attr("data-swiper-slide-index"), 10), a.centeredSlides ? r < t.loopedSlides - s / 2 || r > t.slides.length - t.loopedSlides + s / 2 ? (t.loopFix(), r = i.children("." + a.slideClass + '[data-swiper-slide-index="' + e + '"]:not(.' + a.slideDuplicateClass + ")").eq(0).index(), E((function () { t.slideTo(r) }))) : t.slideTo(r) : r > t.slides.length - s ? (t.loopFix(), r = i.children("." + a.slideClass + '[data-swiper-slide-index="' + e + '"]:not(.' + a.slideDuplicateClass + ")").eq(0).index(), E((function () { t.slideTo(r) }))) : t.slideTo(r) } else t.slideTo(r) } }, loop: { loopCreate: function () { var e = this, t = r(), a = e.params, i = e.$wrapperEl; i.children("." + a.slideClass + "." + a.slideDuplicateClass).remove(); var s = i.children("." + a.slideClass); if (a.loopFillGroupWithBlank) { var n = a.slidesPerGroup - s.length % a.slidesPerGroup; if (n !== a.slidesPerGroup) { for (var l = 0; l < n; l += 1) { var o = m(t.createElement("div")).addClass(a.slideClass + " " + a.slideBlankClass); i.append(o) } s = i.children("." + a.slideClass) } } "auto" !== a.slidesPerView || a.loopedSlides || (a.loopedSlides = s.length), e.loopedSlides = Math.ceil(parseFloat(a.loopedSlides || a.slidesPerView, 10)), e.loopedSlides += a.loopAdditionalSlides, e.loopedSlides > s.length && (e.loopedSlides = s.length); var d = [], p = []; s.each((function (t, a) { var i = m(t); a < e.loopedSlides && p.push(t), a < s.length && a >= s.length - e.loopedSlides && d.push(t), i.attr("data-swiper-slide-index", a) })); for (var u = 0; u < p.length; u += 1)i.append(m(p[u].cloneNode(!0)).addClass(a.slideDuplicateClass)); for (var c = d.length - 1; c >= 0; c -= 1)i.prepend(m(d[c].cloneNode(!0)).addClass(a.slideDuplicateClass)) }, loopFix: function () { var e = this; e.emit("beforeLoopFix"); var t, a = e.activeIndex, i = e.slides, s = e.loopedSlides, r = e.allowSlidePrev, n = e.allowSlideNext, l = e.snapGrid, o = e.rtlTranslate; e.allowSlidePrev = !0, e.allowSlideNext = !0; var d = -l[a] - e.getTranslate(); if (a < s) t = i.length - 3 * s + a, t += s, e.slideTo(t, 0, !1, !0) && 0 !== d && e.setTranslate((o ? -e.translate : e.translate) - d); else if (a >= i.length - s) { t = -i.length + a + s, t += s, e.slideTo(t, 0, !1, !0) && 0 !== d && e.setTranslate((o ? -e.translate : e.translate) - d) } e.allowSlidePrev = r, e.allowSlideNext = n, e.emit("loopFix") }, loopDestroy: function () { var e = this, t = e.$wrapperEl, a = e.params, i = e.slides; t.children("." + a.slideClass + "." + a.slideDuplicateClass + ",." + a.slideClass + "." + a.slideBlankClass).remove(), i.removeAttr("data-swiper-slide-index") } }, grabCursor: { setGrabCursor: function (e) { var t = this; if (!(t.support.touch || !t.params.simulateTouch || t.params.watchOverflow && t.isLocked || t.params.cssMode)) { var a = t.el; a.style.cursor = "move", a.style.cursor = e ? "-webkit-grabbing" : "-webkit-grab", a.style.cursor = e ? "-moz-grabbin" : "-moz-grab", a.style.cursor = e ? "grabbing" : "grab" } }, unsetGrabCursor: function () { var e = this; e.support.touch || e.params.watchOverflow && e.isLocked || e.params.cssMode || (e.el.style.cursor = "") } }, manipulation: { appendSlide: function (e) { var t = this, a = t.$wrapperEl, i = t.params; if (i.loop && t.loopDestroy(), "object" == typeof e && "length" in e) for (var s = 0; s < e.length; s += 1)e[s] && a.append(e[s]); else a.append(e); i.loop && t.loopCreate(), i.observer && t.support.observer || t.update() }, prependSlide: function (e) { var t = this, a = t.params, i = t.$wrapperEl, s = t.activeIndex; a.loop && t.loopDestroy(); var r = s + 1; if ("object" == typeof e && "length" in e) { for (var n = 0; n < e.length; n += 1)e[n] && i.prepend(e[n]); r = s + e.length } else i.prepend(e); a.loop && t.loopCreate(), a.observer && t.support.observer || t.update(), t.slideTo(r, 0, !1) }, addSlide: function (e, t) { var a = this, i = a.$wrapperEl, s = a.params, r = a.activeIndex; s.loop && (r -= a.loopedSlides, a.loopDestroy(), a.slides = i.children("." + s.slideClass)); var n = a.slides.length; if (e <= 0) a.prependSlide(t); else if (e >= n) a.appendSlide(t); else { for (var l = r > e ? r + 1 : r, o = [], d = n - 1; d >= e; d -= 1) { var p = a.slides.eq(d); p.remove(), o.unshift(p) } if ("object" == typeof t && "length" in t) { for (var u = 0; u < t.length; u += 1)t[u] && i.append(t[u]); l = r > e ? r + t.length : r } else i.append(t); for (var c = 0; c < o.length; c += 1)i.append(o[c]); s.loop && a.loopCreate(), s.observer && a.support.observer || a.update(), s.loop ? a.slideTo(l + a.loopedSlides, 0, !1) : a.slideTo(l, 0, !1) } }, removeSlide: function (e) { var t = this, a = t.params, i = t.$wrapperEl, s = t.activeIndex; a.loop && (s -= t.loopedSlides, t.loopDestroy(), t.slides = i.children("." + a.slideClass)); var r, n = s; if ("object" == typeof e && "length" in e) { for (var l = 0; l < e.length; l += 1)r = e[l], t.slides[r] && t.slides.eq(r).remove(), r < n && (n -= 1); n = Math.max(n, 0) } else r = e, t.slides[r] && t.slides.eq(r).remove(), r < n && (n -= 1), n = Math.max(n, 0); a.loop && t.loopCreate(), a.observer && t.support.observer || t.update(), a.loop ? t.slideTo(n + t.loopedSlides, 0, !1) : t.slideTo(n, 0, !1) }, removeAllSlides: function () { for (var e = [], t = 0; t < this.slides.length; t += 1)e.push(t); this.removeSlide(e) } }, events: { attachEvents: function () { var e = this, t = r(), a = e.params, i = e.touchEvents, s = e.el, n = e.wrapperEl, l = e.device, o = e.support; e.onTouchStart = O.bind(e), e.onTouchMove = A.bind(e), e.onTouchEnd = D.bind(e), a.cssMode && (e.onScroll = B.bind(e)), e.onClick = N.bind(e); var d = !!a.nested; if (!o.touch && o.pointerEvents) s.addEventListener(i.start, e.onTouchStart, !1), t.addEventListener(i.move, e.onTouchMove, d), t.addEventListener(i.end, e.onTouchEnd, !1); else { if (o.touch) { var p = !("touchstart" !== i.start || !o.passiveListener || !a.passiveListeners) && { passive: !0, capture: !1 }; s.addEventListener(i.start, e.onTouchStart, p), s.addEventListener(i.move, e.onTouchMove, o.passiveListener ? { passive: !1, capture: d } : d), s.addEventListener(i.end, e.onTouchEnd, p), i.cancel && s.addEventListener(i.cancel, e.onTouchEnd, p), H || (t.addEventListener("touchstart", X), H = !0) } (a.simulateTouch && !l.ios && !l.android || a.simulateTouch && !o.touch && l.ios) && (s.addEventListener("mousedown", e.onTouchStart, !1), t.addEventListener("mousemove", e.onTouchMove, d), t.addEventListener("mouseup", e.onTouchEnd, !1)) } (a.preventClicks || a.preventClicksPropagation) && s.addEventListener("click", e.onClick, !0), a.cssMode && n.addEventListener("scroll", e.onScroll), a.updateOnWindowResize ? e.on(l.ios || l.android ? "resize orientationchange observerUpdate" : "resize observerUpdate", G, !0) : e.on("observerUpdate", G, !0) }, detachEvents: function () { var e = this, t = r(), a = e.params, i = e.touchEvents, s = e.el, n = e.wrapperEl, l = e.device, o = e.support, d = !!a.nested; if (!o.touch && o.pointerEvents) s.removeEventListener(i.start, e.onTouchStart, !1), t.removeEventListener(i.move, e.onTouchMove, d), t.removeEventListener(i.end, e.onTouchEnd, !1); else { if (o.touch) { var p = !("onTouchStart" !== i.start || !o.passiveListener || !a.passiveListeners) && { passive: !0, capture: !1 }; s.removeEventListener(i.start, e.onTouchStart, p), s.removeEventListener(i.move, e.onTouchMove, d), s.removeEventListener(i.end, e.onTouchEnd, p), i.cancel && s.removeEventListener(i.cancel, e.onTouchEnd, p) } (a.simulateTouch && !l.ios && !l.android || a.simulateTouch && !o.touch && l.ios) && (s.removeEventListener("mousedown", e.onTouchStart, !1), t.removeEventListener("mousemove", e.onTouchMove, d), t.removeEventListener("mouseup", e.onTouchEnd, !1)) } (a.preventClicks || a.preventClicksPropagation) && s.removeEventListener("click", e.onClick, !0), a.cssMode && n.removeEventListener("scroll", e.onScroll), e.off(l.ios || l.android ? "resize orientationchange observerUpdate" : "resize observerUpdate", G) } }, breakpoints: { setBreakpoint: function () { var e = this, t = e.activeIndex, a = e.initialized, i = e.loopedSlides, s = void 0 === i ? 0 : i, r = e.params, n = e.$el, l = r.breakpoints; if (l && (!l || 0 !== Object.keys(l).length)) { var o = e.getBreakpoint(l); if (o && e.currentBreakpoint !== o) { var d = o in l ? l[o] : void 0; d && ["slidesPerView", "spaceBetween", "slidesPerGroup", "slidesPerGroupSkip", "slidesPerColumn"].forEach((function (e) { var t = d[e]; void 0 !== t && (d[e] = "slidesPerView" !== e || "AUTO" !== t && "auto" !== t ? "slidesPerView" === e ? parseFloat(t) : parseInt(t, 10) : "auto") })); var p = d || e.originalParams, u = r.slidesPerColumn > 1, c = p.slidesPerColumn > 1; u && !c ? (n.removeClass(r.containerModifierClass + "multirow " + r.containerModifierClass + "multirow-column"), e.emitContainerClasses()) : !u && c && (n.addClass(r.containerModifierClass + "multirow"), "column" === p.slidesPerColumnFill && n.addClass(r.containerModifierClass + "multirow-column"), e.emitContainerClasses()); var h = p.direction && p.direction !== r.direction, v = r.loop && (p.slidesPerView !== r.slidesPerView || h); h && a && e.changeDirection(), S(e.params, p), S(e, { allowTouchMove: e.params.allowTouchMove, allowSlideNext: e.params.allowSlideNext, allowSlidePrev: e.params.allowSlidePrev }), e.currentBreakpoint = o, e.emit("_beforeBreakpoint", p), v && a && (e.loopDestroy(), e.loopCreate(), e.updateSlides(), e.slideTo(t - s + e.loopedSlides, 0, !1)), e.emit("breakpoint", p) } } }, getBreakpoint: function (e) { var t = l(); if (e) { var a = !1, i = Object.keys(e).map((function (e) { if ("string" == typeof e && 0 === e.indexOf("@")) { var a = parseFloat(e.substr(1)); return { value: t.innerHeight * a, point: e } } return { value: e, point: e } })); i.sort((function (e, t) { return parseInt(e.value, 10) - parseInt(t.value, 10) })); for (var s = 0; s < i.length; s += 1) { var r = i[s], n = r.point; r.value <= t.innerWidth && (a = n) } return a || "max" } } }, checkOverflow: { checkOverflow: function () { var e = this, t = e.params, a = e.isLocked, i = e.slides.length > 0 && t.slidesOffsetBefore + t.spaceBetween * (e.slides.length - 1) + e.slides[0].offsetWidth * e.slides.length; t.slidesOffsetBefore && t.slidesOffsetAfter && i ? e.isLocked = i <= e.size : e.isLocked = 1 === e.snapGrid.length, e.allowSlideNext = !e.isLocked, e.allowSlidePrev = !e.isLocked, a !== e.isLocked && e.emit(e.isLocked ? "lock" : "unlock"), a && a !== e.isLocked && (e.isEnd = !1, e.navigation && e.navigation.update()) } }, classes: { addClasses: function () { var e = this, t = e.classNames, a = e.params, i = e.rtl, s = e.$el, r = e.device, n = e.support, l = []; l.push("initialized"), l.push(a.direction), n.pointerEvents && !n.touch && l.push("pointer-events"), a.freeMode && l.push("free-mode"), a.autoHeight && l.push("autoheight"), i && l.push("rtl"), a.slidesPerColumn > 1 && (l.push("multirow"), "column" === a.slidesPerColumnFill && l.push("multirow-column")), r.android && l.push("android"), r.ios && l.push("ios"), a.cssMode && l.push("css-mode"), l.forEach((function (e) { t.push(a.containerModifierClass + e) })), s.addClass(t.join(" ")), e.emitContainerClasses() }, removeClasses: function () { var e = this, t = e.$el, a = e.classNames; t.removeClass(a.join(" ")), e.emitContainerClasses() } }, images: { loadImage: function (e, t, a, i, s, r) { var n, o = l(); function d() { r && r() } m(e).parent("picture")[0] || e.complete && s ? d() : t ? ((n = new o.Image).onload = d, n.onerror = d, i && (n.sizes = i), a && (n.srcset = a), t && (n.src = t)) : d() }, preloadImages: function () { var e = this; function t() { null != e && e && !e.destroyed && (void 0 !== e.imagesLoaded && (e.imagesLoaded += 1), e.imagesLoaded === e.imagesToLoad.length && (e.params.updateOnImagesReady && e.update(), e.emit("imagesReady"))) } e.imagesToLoad = e.$el.find("img"); for (var a = 0; a < e.imagesToLoad.length; a += 1) { var i = e.imagesToLoad[a]; e.loadImage(i, i.currentSrc || i.getAttribute("src"), i.srcset || i.getAttribute("srcset"), i.sizes || i.getAttribute("sizes"), !0, t) } } } }, F = {}, R = function () { function t() { for (var e, a, i = arguments.length, s = new Array(i), r = 0; r < i; r++)s[r] = arguments[r]; if (1 === s.length && s[0].constructor && s[0].constructor === Object ? a = s[0] : (e = s[0], a = s[1]), a || (a = {}), a = S({}, a), e && !a.el && (a.el = e), a.el && m(a.el).length > 1) { var n = []; return m(a.el).each((function (e) { var i = S({}, a, { el: e }); n.push(new t(i)) })), n } var l = this; l.support = z(), l.device = P({ userAgent: a.userAgent }), l.browser = k(), l.eventsListeners = {}, l.eventsAnyListeners = [], void 0 === l.modules && (l.modules = {}), Object.keys(l.modules).forEach((function (e) { var t = l.modules[e]; if (t.params) { var i = Object.keys(t.params)[0], s = t.params[i]; if ("object" != typeof s || null === s) return; if (!(i in a) || !("enabled" in s)) return; !0 === a[i] && (a[i] = { enabled: !0 }), "object" != typeof a[i] || "enabled" in a[i] || (a[i].enabled = !0), a[i] || (a[i] = { enabled: !1 }) } })); var o, d, p = S({}, Y); return l.useParams(p), l.params = S({}, p, F, a), l.originalParams = S({}, l.params), l.passedParams = S({}, a), l.params && l.params.on && Object.keys(l.params.on).forEach((function (e) { l.on(e, l.params.on[e]) })), l.params && l.params.onAny && l.onAny(l.params.onAny), l.$ = m, S(l, { el: e, classNames: [], slides: m(), slidesGrid: [], snapGrid: [], slidesSizesGrid: [], isHorizontal: function () { return "horizontal" === l.params.direction }, isVertical: function () { return "vertical" === l.params.direction }, activeIndex: 0, realIndex: 0, isBeginning: !0, isEnd: !1, translate: 0, previousTranslate: 0, progress: 0, velocity: 0, animating: !1, allowSlideNext: l.params.allowSlideNext, allowSlidePrev: l.params.allowSlidePrev, touchEvents: (o = ["touchstart", "touchmove", "touchend", "touchcancel"], d = ["mousedown", "mousemove", "mouseup"], l.support.pointerEvents && (d = ["pointerdown", "pointermove", "pointerup"]), l.touchEventsTouch = { start: o[0], move: o[1], end: o[2], cancel: o[3] }, l.touchEventsDesktop = { start: d[0], move: d[1], end: d[2] }, l.support.touch || !l.params.simulateTouch ? l.touchEventsTouch : l.touchEventsDesktop), touchEventsData: { isTouched: void 0, isMoved: void 0, allowTouchCallbacks: void 0, touchStartTime: void 0, isScrolling: void 0, currentTranslate: void 0, startTranslate: void 0, allowThresholdMove: void 0, formElements: "input, select, option, textarea, button, video, label", lastClickTime: x(), clickTimeout: void 0, velocities: [], allowMomentumBounce: void 0, isTouchEvent: void 0, startMoving: void 0 }, allowClick: !0, allowTouchMove: l.params.allowTouchMove, touches: { startX: 0, startY: 0, currentX: 0, currentY: 0, diff: 0 }, imagesToLoad: [], imagesLoaded: 0 }), l.useModules(), l.emit("_swiper"), l.params.init && l.init(), l } var a, i, s, r = t.prototype; return r.emitContainerClasses = function () { var e = this; if (e.params._emitClasses && e.el) { var t = e.el.className.split(" ").filter((function (t) { return 0 === t.indexOf("swiper-container") || 0 === t.indexOf(e.params.containerModifierClass) })); e.emit("_containerClasses", t.join(" ")) } }, r.getSlideClasses = function (e) { var t = this; return e.className.split(" ").filter((function (e) { return 0 === e.indexOf("swiper-slide") || 0 === e.indexOf(t.params.slideClass) })).join(" ") }, r.emitSlidesClasses = function () { var e = this; if (e.params._emitClasses && e.el) { var t = []; e.slides.each((function (a) { var i = e.getSlideClasses(a); t.push({ slideEl: a, classNames: i }), e.emit("_slideClass", a, i) })), e.emit("_slideClasses", t) } }, r.slidesPerViewDynamic = function () { var e = this, t = e.params, a = e.slides, i = e.slidesGrid, s = e.size, r = e.activeIndex, n = 1; if (t.centeredSlides) { for (var l, o = a[r].swiperSlideSize, d = r + 1; d < a.length; d += 1)a[d] && !l && (n += 1, (o += a[d].swiperSlideSize) > s && (l = !0)); for (var p = r - 1; p >= 0; p -= 1)a[p] && !l && (n += 1, (o += a[p].swiperSlideSize) > s && (l = !0)) } else for (var u = r + 1; u < a.length; u += 1)i[u] - i[r] < s && (n += 1); return n }, r.update = function () { var e = this; if (e && !e.destroyed) { var t = e.snapGrid, a = e.params; a.breakpoints && e.setBreakpoint(), e.updateSize(), e.updateSlides(), e.updateProgress(), e.updateSlidesClasses(), e.params.freeMode ? (i(), e.params.autoHeight && e.updateAutoHeight()) : (("auto" === e.params.slidesPerView || e.params.slidesPerView > 1) && e.isEnd && !e.params.centeredSlides ? e.slideTo(e.slides.length - 1, 0, !1, !0) : e.slideTo(e.activeIndex, 0, !1, !0)) || i(), a.watchOverflow && t !== e.snapGrid && e.checkOverflow(), e.emit("update") } function i() { var t = e.rtlTranslate ? -1 * e.translate : e.translate, a = Math.min(Math.max(t, e.maxTranslate()), e.minTranslate()); e.setTranslate(a), e.updateActiveIndex(), e.updateSlidesClasses() } }, r.changeDirection = function (e, t) { void 0 === t && (t = !0); var a = this, i = a.params.direction; return e || (e = "horizontal" === i ? "vertical" : "horizontal"), e === i || "horizontal" !== e && "vertical" !== e || (a.$el.removeClass("" + a.params.containerModifierClass + i).addClass("" + a.params.containerModifierClass + e), a.emitContainerClasses(), a.params.direction = e, a.slides.each((function (t) { "vertical" === e ? t.style.width = "" : t.style.height = "" })), a.emit("changeDirection"), t && a.update()), a }, r.mount = function (e) { var t = this; if (t.mounted) return !0; var a, i = m(e || t.params.el); return !!(e = i[0]) && (e.swiper = t, e && e.shadowRoot && e.shadowRoot.querySelector ? (a = m(e.shadowRoot.querySelector("." + t.params.wrapperClass))).children = function (e) { return i.children(e) } : a = i.children("." + t.params.wrapperClass), S(t, { $el: i, el: e, $wrapperEl: a, wrapperEl: a[0], mounted: !0, rtl: "rtl" === e.dir.toLowerCase() || "rtl" === i.css("direction"), rtlTranslate: "horizontal" === t.params.direction && ("rtl" === e.dir.toLowerCase() || "rtl" === i.css("direction")), wrongRTL: "-webkit-box" === a.css("display") }), !0) }, r.init = function (e) { var t = this; return t.initialized || !1 === t.mount(e) || (t.emit("beforeInit"), t.params.breakpoints && t.setBreakpoint(), t.addClasses(), t.params.loop && t.loopCreate(), t.updateSize(), t.updateSlides(), t.params.watchOverflow && t.checkOverflow(), t.params.grabCursor && t.setGrabCursor(), t.params.preloadImages && t.preloadImages(), t.params.loop ? t.slideTo(t.params.initialSlide + t.loopedSlides, 0, t.params.runCallbacksOnInit) : t.slideTo(t.params.initialSlide, 0, t.params.runCallbacksOnInit), t.attachEvents(), t.initialized = !0, t.emit("init"), t.emit("afterInit")), t }, r.destroy = function (e, t) { void 0 === e && (e = !0), void 0 === t && (t = !0); var a, i = this, s = i.params, r = i.$el, n = i.$wrapperEl, l = i.slides; return void 0 === i.params || i.destroyed || (i.emit("beforeDestroy"), i.initialized = !1, i.detachEvents(), s.loop && i.loopDestroy(), t && (i.removeClasses(), r.removeAttr("style"), n.removeAttr("style"), l && l.length && l.removeClass([s.slideVisibleClass, s.slideActiveClass, s.slideNextClass, s.slidePrevClass].join(" ")).removeAttr("style").removeAttr("data-swiper-slide-index")), i.emit("destroy"), Object.keys(i.eventsListeners).forEach((function (e) { i.off(e) })), !1 !== e && (i.$el[0].swiper = null, a = i, Object.keys(a).forEach((function (e) { try { a[e] = null } catch (e) { } try { delete a[e] } catch (e) { } }))), i.destroyed = !0), null }, t.extendDefaults = function (e) { S(F, e) }, t.installModule = function (e) { t.prototype.modules || (t.prototype.modules = {}); var a = e.name || Object.keys(t.prototype.modules).length + "_" + x(); t.prototype.modules[a] = e }, t.use = function (e) { return Array.isArray(e) ? (e.forEach((function (e) { return t.installModule(e) })), t) : (t.installModule(e), t) }, a = t, s = [{ key: "extendedDefaults", get: function () { return F } }, { key: "defaults", get: function () { return Y } }], (i = null) && e(a.prototype, i), s && e(a, s), t }(); Object.keys(V).forEach((function (e) { Object.keys(V[e]).forEach((function (t) { R.prototype[t] = V[e][t] })) })), R.use([L, I]); var W = { update: function (e) { var t = this, a = t.params, i = a.slidesPerView, s = a.slidesPerGroup, r = a.centeredSlides, n = t.params.virtual, l = n.addSlidesBefore, o = n.addSlidesAfter, d = t.virtual, p = d.from, u = d.to, c = d.slides, h = d.slidesGrid, v = d.renderSlide, f = d.offset; t.updateActiveIndex(); var m, g, y, w = t.activeIndex || 0; m = t.rtlTranslate ? "right" : t.isHorizontal() ? "left" : "top", r ? (g = Math.floor(i / 2) + s + o, y = Math.floor(i / 2) + s + l) : (g = i + (s - 1) + o, y = s + l); var b = Math.max((w || 0) - y, 0), E = Math.min((w || 0) + g, c.length - 1), x = (t.slidesGrid[b] || 0) - (t.slidesGrid[0] || 0); function T() { t.updateSlides(), t.updateProgress(), t.updateSlidesClasses(), t.lazy && t.params.lazy.enabled && t.lazy.load() } if (S(t.virtual, { from: b, to: E, offset: x, slidesGrid: t.slidesGrid }), p === b && u === E && !e) return t.slidesGrid !== h && x !== f && t.slides.css(m, x + "px"), void t.updateProgress(); if (t.params.virtual.renderExternal) return t.params.virtual.renderExternal.call(t, { offset: x, from: b, to: E, slides: function () { for (var e = [], t = b; t <= E; t += 1)e.push(c[t]); return e }() }), void (t.params.virtual.renderExternalUpdate && T()); var C = [], M = []; if (e) t.$wrapperEl.find("." + t.params.slideClass).remove(); else for (var z = p; z <= u; z += 1)(z < b || z > E) && t.$wrapperEl.find("." + t.params.slideClass + '[data-swiper-slide-index="' + z + '"]').remove(); for (var P = 0; P < c.length; P += 1)P >= b && P <= E && (void 0 === u || e ? M.push(P) : (P > u && M.push(P), P < p && C.push(P))); M.forEach((function (e) { t.$wrapperEl.append(v(c[e], e)) })), C.sort((function (e, t) { return t - e })).forEach((function (e) { t.$wrapperEl.prepend(v(c[e], e)) })), t.$wrapperEl.children(".swiper-slide").css(m, x + "px"), T() }, renderSlide: function (e, t) { var a = this, i = a.params.virtual; if (i.cache && a.virtual.cache[t]) return a.virtual.cache[t]; var s = i.renderSlide ? m(i.renderSlide.call(a, e, t)) : m('<div class="' + a.params.slideClass + '" data-swiper-slide-index="' + t + '">' + e + "</div>"); return s.attr("data-swiper-slide-index") || s.attr("data-swiper-slide-index", t), i.cache && (a.virtual.cache[t] = s), s }, appendSlide: function (e) { var t = this; if ("object" == typeof e && "length" in e) for (var a = 0; a < e.length; a += 1)e[a] && t.virtual.slides.push(e[a]); else t.virtual.slides.push(e); t.virtual.update(!0) }, prependSlide: function (e) { var t = this, a = t.activeIndex, i = a + 1, s = 1; if (Array.isArray(e)) { for (var r = 0; r < e.length; r += 1)e[r] && t.virtual.slides.unshift(e[r]); i = a + e.length, s = e.length } else t.virtual.slides.unshift(e); if (t.params.virtual.cache) { var n = t.virtual.cache, l = {}; Object.keys(n).forEach((function (e) { var t = n[e], a = t.attr("data-swiper-slide-index"); a && t.attr("data-swiper-slide-index", parseInt(a, 10) + 1), l[parseInt(e, 10) + s] = t })), t.virtual.cache = l } t.virtual.update(!0), t.slideTo(i, 0) }, removeSlide: function (e) { var t = this; if (null != e) { var a = t.activeIndex; if (Array.isArray(e)) for (var i = e.length - 1; i >= 0; i -= 1)t.virtual.slides.splice(e[i], 1), t.params.virtual.cache && delete t.virtual.cache[e[i]], e[i] < a && (a -= 1), a = Math.max(a, 0); else t.virtual.slides.splice(e, 1), t.params.virtual.cache && delete t.virtual.cache[e], e < a && (a -= 1), a = Math.max(a, 0); t.virtual.update(!0), t.slideTo(a, 0) } }, removeAllSlides: function () { var e = this; e.virtual.slides = [], e.params.virtual.cache && (e.virtual.cache = {}), e.virtual.update(!0), e.slideTo(0, 0) } }, q = { name: "virtual", params: { virtual: { enabled: !1, slides: [], cache: !0, renderSlide: null, renderExternal: null, renderExternalUpdate: !0, addSlidesBefore: 0, addSlidesAfter: 0 } }, create: function () { M(this, { virtual: t({}, W, { slides: this.params.virtual.slides, cache: {} }) }) }, on: { beforeInit: function (e) { if (e.params.virtual.enabled) { e.classNames.push(e.params.containerModifierClass + "virtual"); var t = { watchSlidesProgress: !0 }; S(e.params, t), S(e.originalParams, t), e.params.initialSlide || e.virtual.update() } }, setTranslate: function (e) { e.params.virtual.enabled && e.virtual.update() } } }, j = { handle: function (e) { var t = this, a = l(), i = r(), s = t.rtlTranslate, n = e; n.originalEvent && (n = n.originalEvent); var o = n.keyCode || n.charCode, d = t.params.keyboard.pageUpDown, p = d && 33 === o, u = d && 34 === o, c = 37 === o, h = 39 === o, v = 38 === o, f = 40 === o; if (!t.allowSlideNext && (t.isHorizontal() && h || t.isVertical() && f || u)) return !1; if (!t.allowSlidePrev && (t.isHorizontal() && c || t.isVertical() && v || p)) return !1; if (!(n.shiftKey || n.altKey || n.ctrlKey || n.metaKey || i.activeElement && i.activeElement.nodeName && ("input" === i.activeElement.nodeName.toLowerCase() || "textarea" === i.activeElement.nodeName.toLowerCase()))) { if (t.params.keyboard.onlyInViewport && (p || u || c || h || v || f)) { var m = !1; if (t.$el.parents("." + t.params.slideClass).length > 0 && 0 === t.$el.parents("." + t.params.slideActiveClass).length) return; var g = a.innerWidth, y = a.innerHeight, w = t.$el.offset(); s && (w.left -= t.$el[0].scrollLeft); for (var b = [[w.left, w.top], [w.left + t.width, w.top], [w.left, w.top + t.height], [w.left + t.width, w.top + t.height]], E = 0; E < b.length; E += 1) { var x = b[E]; if (x[0] >= 0 && x[0] <= g && x[1] >= 0 && x[1] <= y) { if (0 === x[0] && 0 === x[1]) continue; m = !0 } } if (!m) return } t.isHorizontal() ? ((p || u || c || h) && (n.preventDefault ? n.preventDefault() : n.returnValue = !1), ((u || h) && !s || (p || c) && s) && t.slideNext(), ((p || c) && !s || (u || h) && s) && t.slidePrev()) : ((p || u || v || f) && (n.preventDefault ? n.preventDefault() : n.returnValue = !1), (u || f) && t.slideNext(), (p || v) && t.slidePrev()), t.emit("keyPress", o) } }, enable: function () { var e = this, t = r(); e.keyboard.enabled || (m(t).on("keydown", e.keyboard.handle), e.keyboard.enabled = !0) }, disable: function () { var e = this, t = r(); e.keyboard.enabled && (m(t).off("keydown", e.keyboard.handle), e.keyboard.enabled = !1) } }, _ = { name: "keyboard", params: { keyboard: { enabled: !1, onlyInViewport: !0, pageUpDown: !0 } }, create: function () { M(this, { keyboard: t({ enabled: !1 }, j) }) }, on: { init: function (e) { e.params.keyboard.enabled && e.keyboard.enable() }, destroy: function (e) { e.keyboard.enabled && e.keyboard.disable() } } }; var U = { lastScrollTime: x(), lastEventBeforeSnap: void 0, recentWheelEvents: [], event: function () { return l().navigator.userAgent.indexOf("firefox") > -1 ? "DOMMouseScroll" : function () { var e = r(), t = "onwheel", a = t in e; if (!a) { var i = e.createElement("div"); i.setAttribute(t, "return;"), a = "function" == typeof i.onwheel } return !a && e.implementation && e.implementation.hasFeature && !0 !== e.implementation.hasFeature("", "") && (a = e.implementation.hasFeature("Events.wheel", "3.0")), a }() ? "wheel" : "mousewheel" }, normalize: function (e) { var t = 0, a = 0, i = 0, s = 0; return "detail" in e && (a = e.detail), "wheelDelta" in e && (a = -e.wheelDelta / 120), "wheelDeltaY" in e && (a = -e.wheelDeltaY / 120), "wheelDeltaX" in e && (t = -e.wheelDeltaX / 120), "axis" in e && e.axis === e.HORIZONTAL_AXIS && (t = a, a = 0), i = 10 * t, s = 10 * a, "deltaY" in e && (s = e.deltaY), "deltaX" in e && (i = e.deltaX), e.shiftKey && !i && (i = s, s = 0), (i || s) && e.deltaMode && (1 === e.deltaMode ? (i *= 40, s *= 40) : (i *= 800, s *= 800)), i && !t && (t = i < 1 ? -1 : 1), s && !a && (a = s < 1 ? -1 : 1), { spinX: t, spinY: a, pixelX: i, pixelY: s } }, handleMouseEnter: function () { this.mouseEntered = !0 }, handleMouseLeave: function () { this.mouseEntered = !1 }, handle: function (e) { var t = e, a = this, i = a.params.mousewheel; a.params.cssMode && t.preventDefault(); var s = a.$el; if ("container" !== a.params.mousewheel.eventsTarget && (s = m(a.params.mousewheel.eventsTarget)), !a.mouseEntered && !s[0].contains(t.target) && !i.releaseOnEdges) return !0; t.originalEvent && (t = t.originalEvent); var r = 0, n = a.rtlTranslate ? -1 : 1, l = U.normalize(t); if (i.forceToAxis) if (a.isHorizontal()) { if (!(Math.abs(l.pixelX) > Math.abs(l.pixelY))) return !0; r = -l.pixelX * n } else { if (!(Math.abs(l.pixelY) > Math.abs(l.pixelX))) return !0; r = -l.pixelY } else r = Math.abs(l.pixelX) > Math.abs(l.pixelY) ? -l.pixelX * n : -l.pixelY; if (0 === r) return !0; i.invert && (r = -r); var o = a.getTranslate() + r * i.sensitivity; if (o >= a.minTranslate() && (o = a.minTranslate()), o <= a.maxTranslate() && (o = a.maxTranslate()), (!!a.params.loop || !(o === a.minTranslate() || o === a.maxTranslate())) && a.params.nested && t.stopPropagation(), a.params.freeMode) { var d = { time: x(), delta: Math.abs(r), direction: Math.sign(r) }, p = a.mousewheel.lastEventBeforeSnap, u = p && d.time < p.time + 500 && d.delta <= p.delta && d.direction === p.direction; if (!u) { a.mousewheel.lastEventBeforeSnap = void 0, a.params.loop && a.loopFix(); var c = a.getTranslate() + r * i.sensitivity, h = a.isBeginning, v = a.isEnd; if (c >= a.minTranslate() && (c = a.minTranslate()), c <= a.maxTranslate() && (c = a.maxTranslate()), a.setTransition(0), a.setTranslate(c), a.updateProgress(), a.updateActiveIndex(), a.updateSlidesClasses(), (!h && a.isBeginning || !v && a.isEnd) && a.updateSlidesClasses(), a.params.freeModeSticky) { clearTimeout(a.mousewheel.timeout), a.mousewheel.timeout = void 0; var f = a.mousewheel.recentWheelEvents; f.length >= 15 && f.shift(); var g = f.length ? f[f.length - 1] : void 0, y = f[0]; if (f.push(d), g && (d.delta > g.delta || d.direction !== g.direction)) f.splice(0); else if (f.length >= 15 && d.time - y.time < 500 && y.delta - d.delta >= 1 && d.delta <= 6) { var w = r > 0 ? .8 : .2; a.mousewheel.lastEventBeforeSnap = d, f.splice(0), a.mousewheel.timeout = E((function () { a.slideToClosest(a.params.speed, !0, void 0, w) }), 0) } a.mousewheel.timeout || (a.mousewheel.timeout = E((function () { a.mousewheel.lastEventBeforeSnap = d, f.splice(0), a.slideToClosest(a.params.speed, !0, void 0, .5) }), 500)) } if (u || a.emit("scroll", t), a.params.autoplay && a.params.autoplayDisableOnInteraction && a.autoplay.stop(), c === a.minTranslate() || c === a.maxTranslate()) return !0 } } else { var b = { time: x(), delta: Math.abs(r), direction: Math.sign(r), raw: e }, T = a.mousewheel.recentWheelEvents; T.length >= 2 && T.shift(); var C = T.length ? T[T.length - 1] : void 0; if (T.push(b), C ? (b.direction !== C.direction || b.delta > C.delta || b.time > C.time + 150) && a.mousewheel.animateSlider(b) : a.mousewheel.animateSlider(b), a.mousewheel.releaseScroll(b)) return !0 } return t.preventDefault ? t.preventDefault() : t.returnValue = !1, !1 }, animateSlider: function (e) { var t = this, a = l(); return !(this.params.mousewheel.thresholdDelta && e.delta < this.params.mousewheel.thresholdDelta) && (!(this.params.mousewheel.thresholdTime && x() - t.mousewheel.lastScrollTime < this.params.mousewheel.thresholdTime) && (e.delta >= 6 && x() - t.mousewheel.lastScrollTime < 60 || (e.direction < 0 ? t.isEnd && !t.params.loop || t.animating || (t.slideNext(), t.emit("scroll", e.raw)) : t.isBeginning && !t.params.loop || t.animating || (t.slidePrev(), t.emit("scroll", e.raw)), t.mousewheel.lastScrollTime = (new a.Date).getTime(), !1))) }, releaseScroll: function (e) { var t = this, a = t.params.mousewheel; if (e.direction < 0) { if (t.isEnd && !t.params.loop && a.releaseOnEdges) return !0 } else if (t.isBeginning && !t.params.loop && a.releaseOnEdges) return !0; return !1 }, enable: function () { var e = this, t = U.event(); if (e.params.cssMode) return e.wrapperEl.removeEventListener(t, e.mousewheel.handle), !0; if (!t) return !1; if (e.mousewheel.enabled) return !1; var a = e.$el; return "container" !== e.params.mousewheel.eventsTarget && (a = m(e.params.mousewheel.eventsTarget)), a.on("mouseenter", e.mousewheel.handleMouseEnter), a.on("mouseleave", e.mousewheel.handleMouseLeave), a.on(t, e.mousewheel.handle), e.mousewheel.enabled = !0, !0 }, disable: function () { var e = this, t = U.event(); if (e.params.cssMode) return e.wrapperEl.addEventListener(t, e.mousewheel.handle), !0; if (!t) return !1; if (!e.mousewheel.enabled) return !1; var a = e.$el; return "container" !== e.params.mousewheel.eventsTarget && (a = m(e.params.mousewheel.eventsTarget)), a.off(t, e.mousewheel.handle), e.mousewheel.enabled = !1, !0 } }, K = { update: function () { var e = this, t = e.params.navigation; if (!e.params.loop) { var a = e.navigation, i = a.$nextEl, s = a.$prevEl; s && s.length > 0 && (e.isBeginning ? s.addClass(t.disabledClass) : s.removeClass(t.disabledClass), s[e.params.watchOverflow && e.isLocked ? "addClass" : "removeClass"](t.lockClass)), i && i.length > 0 && (e.isEnd ? i.addClass(t.disabledClass) : i.removeClass(t.disabledClass), i[e.params.watchOverflow && e.isLocked ? "addClass" : "removeClass"](t.lockClass)) } }, onPrevClick: function (e) { var t = this; e.preventDefault(), t.isBeginning && !t.params.loop || t.slidePrev() }, onNextClick: function (e) { var t = this; e.preventDefault(), t.isEnd && !t.params.loop || t.slideNext() }, init: function () { var e, t, a = this, i = a.params.navigation; (i.nextEl || i.prevEl) && (i.nextEl && (e = m(i.nextEl), a.params.uniqueNavElements && "string" == typeof i.nextEl && e.length > 1 && 1 === a.$el.find(i.nextEl).length && (e = a.$el.find(i.nextEl))), i.prevEl && (t = m(i.prevEl), a.params.uniqueNavElements && "string" == typeof i.prevEl && t.length > 1 && 1 === a.$el.find(i.prevEl).length && (t = a.$el.find(i.prevEl))), e && e.length > 0 && e.on("click", a.navigation.onNextClick), t && t.length > 0 && t.on("click", a.navigation.onPrevClick), S(a.navigation, { $nextEl: e, nextEl: e && e[0], $prevEl: t, prevEl: t && t[0] })) }, destroy: function () { var e = this, t = e.navigation, a = t.$nextEl, i = t.$prevEl; a && a.length && (a.off("click", e.navigation.onNextClick), a.removeClass(e.params.navigation.disabledClass)), i && i.length && (i.off("click", e.navigation.onPrevClick), i.removeClass(e.params.navigation.disabledClass)) } }, Z = { update: function () { var e = this, t = e.rtl, a = e.params.pagination; if (a.el && e.pagination.el && e.pagination.$el && 0 !== e.pagination.$el.length) { var i, s = e.virtual && e.params.virtual.enabled ? e.virtual.slides.length : e.slides.length, r = e.pagination.$el, n = e.params.loop ? Math.ceil((s - 2 * e.loopedSlides) / e.params.slidesPerGroup) : e.snapGrid.length; if (e.params.loop ? ((i = Math.ceil((e.activeIndex - e.loopedSlides) / e.params.slidesPerGroup)) > s - 1 - 2 * e.loopedSlides && (i -= s - 2 * e.loopedSlides), i > n - 1 && (i -= n), i < 0 && "bullets" !== e.params.paginationType && (i = n + i)) : i = void 0 !== e.snapIndex ? e.snapIndex : e.activeIndex || 0, "bullets" === a.type && e.pagination.bullets && e.pagination.bullets.length > 0) { var l, o, d, p = e.pagination.bullets; if (a.dynamicBullets && (e.pagination.bulletSize = p.eq(0)[e.isHorizontal() ? "outerWidth" : "outerHeight"](!0), r.css(e.isHorizontal() ? "width" : "height", e.pagination.bulletSize * (a.dynamicMainBullets + 4) + "px"), a.dynamicMainBullets > 1 && void 0 !== e.previousIndex && (e.pagination.dynamicBulletIndex += i - e.previousIndex, e.pagination.dynamicBulletIndex > a.dynamicMainBullets - 1 ? e.pagination.dynamicBulletIndex = a.dynamicMainBullets - 1 : e.pagination.dynamicBulletIndex < 0 && (e.pagination.dynamicBulletIndex = 0)), l = i - e.pagination.dynamicBulletIndex, d = ((o = l + (Math.min(p.length, a.dynamicMainBullets) - 1)) + l) / 2), p.removeClass(a.bulletActiveClass + " " + a.bulletActiveClass + "-next " + a.bulletActiveClass + "-next-next " + a.bulletActiveClass + "-prev " + a.bulletActiveClass + "-prev-prev " + a.bulletActiveClass + "-main"), r.length > 1) p.each((function (e) { var t = m(e), s = t.index(); s === i && t.addClass(a.bulletActiveClass), a.dynamicBullets && (s >= l && s <= o && t.addClass(a.bulletActiveClass + "-main"), s === l && t.prev().addClass(a.bulletActiveClass + "-prev").prev().addClass(a.bulletActiveClass + "-prev-prev"), s === o && t.next().addClass(a.bulletActiveClass + "-next").next().addClass(a.bulletActiveClass + "-next-next")) })); else { var u = p.eq(i), c = u.index(); if (u.addClass(a.bulletActiveClass), a.dynamicBullets) { for (var h = p.eq(l), v = p.eq(o), f = l; f <= o; f += 1)p.eq(f).addClass(a.bulletActiveClass + "-main"); if (e.params.loop) if (c >= p.length - a.dynamicMainBullets) { for (var g = a.dynamicMainBullets; g >= 0; g -= 1)p.eq(p.length - g).addClass(a.bulletActiveClass + "-main"); p.eq(p.length - a.dynamicMainBullets - 1).addClass(a.bulletActiveClass + "-prev") } else h.prev().addClass(a.bulletActiveClass + "-prev").prev().addClass(a.bulletActiveClass + "-prev-prev"), v.next().addClass(a.bulletActiveClass + "-next").next().addClass(a.bulletActiveClass + "-next-next"); else h.prev().addClass(a.bulletActiveClass + "-prev").prev().addClass(a.bulletActiveClass + "-prev-prev"), v.next().addClass(a.bulletActiveClass + "-next").next().addClass(a.bulletActiveClass + "-next-next") } } if (a.dynamicBullets) { var y = Math.min(p.length, a.dynamicMainBullets + 4), w = (e.pagination.bulletSize * y - e.pagination.bulletSize) / 2 - d * e.pagination.bulletSize, b = t ? "right" : "left"; p.css(e.isHorizontal() ? b : "top", w + "px") } } if ("fraction" === a.type && (r.find("." + a.currentClass).text(a.formatFractionCurrent(i + 1)), r.find("." + a.totalClass).text(a.formatFractionTotal(n))), "progressbar" === a.type) { var E; E = a.progressbarOpposite ? e.isHorizontal() ? "vertical" : "horizontal" : e.isHorizontal() ? "horizontal" : "vertical"; var x = (i + 1) / n, T = 1, C = 1; "horizontal" === E ? T = x : C = x, r.find("." + a.progressbarFillClass).transform("translate3d(0,0,0) scaleX(" + T + ") scaleY(" + C + ")").transition(e.params.speed) } "custom" === a.type && a.renderCustom ? (r.html(a.renderCustom(e, i + 1, n)), e.emit("paginationRender", r[0])) : e.emit("paginationUpdate", r[0]), r[e.params.watchOverflow && e.isLocked ? "addClass" : "removeClass"](a.lockClass) } }, render: function () { var e = this, t = e.params.pagination; if (t.el && e.pagination.el && e.pagination.$el && 0 !== e.pagination.$el.length) { var a = e.virtual && e.params.virtual.enabled ? e.virtual.slides.length : e.slides.length, i = e.pagination.$el, s = ""; if ("bullets" === t.type) { var r = e.params.loop ? Math.ceil((a - 2 * e.loopedSlides) / e.params.slidesPerGroup) : e.snapGrid.length; e.params.freeMode && !e.params.loop && r > a && (r = a); for (var n = 0; n < r; n += 1)t.renderBullet ? s += t.renderBullet.call(e, n, t.bulletClass) : s += "<" + t.bulletElement + ' class="' + t.bulletClass + '"></' + t.bulletElement + ">"; i.html(s), e.pagination.bullets = i.find("." + t.bulletClass.replace(/ /g, ".")) } "fraction" === t.type && (s = t.renderFraction ? t.renderFraction.call(e, t.currentClass, t.totalClass) : '<span class="' + t.currentClass + '"></span> / <span class="' + t.totalClass + '"></span>', i.html(s)), "progressbar" === t.type && (s = t.renderProgressbar ? t.renderProgressbar.call(e, t.progressbarFillClass) : '<span class="' + t.progressbarFillClass + '"></span>', i.html(s)), "custom" !== t.type && e.emit("paginationRender", e.pagination.$el[0]) } }, init: function () { var e = this, t = e.params.pagination; if (t.el) { var a = m(t.el); 0 !== a.length && (e.params.uniqueNavElements && "string" == typeof t.el && a.length > 1 && (a = e.$el.find(t.el)), "bullets" === t.type && t.clickable && a.addClass(t.clickableClass), a.addClass(t.modifierClass + t.type), "bullets" === t.type && t.dynamicBullets && (a.addClass("" + t.modifierClass + t.type + "-dynamic"), e.pagination.dynamicBulletIndex = 0, t.dynamicMainBullets < 1 && (t.dynamicMainBullets = 1)), "progressbar" === t.type && t.progressbarOpposite && a.addClass(t.progressbarOppositeClass), t.clickable && a.on("click", "." + t.bulletClass.replace(/ /g, "."), (function (t) { t.preventDefault(); var a = m(this).index() * e.params.slidesPerGroup; e.params.loop && (a += e.loopedSlides), e.slideTo(a) })), S(e.pagination, { $el: a, el: a[0] })) } }, destroy: function () { var e = this, t = e.params.pagination; if (t.el && e.pagination.el && e.pagination.$el && 0 !== e.pagination.$el.length) { var a = e.pagination.$el; a.removeClass(t.hiddenClass), a.removeClass(t.modifierClass + t.type), e.pagination.bullets && e.pagination.bullets.removeClass(t.bulletActiveClass), t.clickable && a.off("click", "." + t.bulletClass.replace(/ /g, ".")) } } }, J = { setTranslate: function () { var e = this; if (e.params.scrollbar.el && e.scrollbar.el) { var t = e.scrollbar, a = e.rtlTranslate, i = e.progress, s = t.dragSize, r = t.trackSize, n = t.$dragEl, l = t.$el, o = e.params.scrollbar, d = s, p = (r - s) * i; a ? (p = -p) > 0 ? (d = s - p, p = 0) : -p + s > r && (d = r + p) : p < 0 ? (d = s + p, p = 0) : p + s > r && (d = r - p), e.isHorizontal() ? (n.transform("translate3d(" + p + "px, 0, 0)"), n[0].style.width = d + "px") : (n.transform("translate3d(0px, " + p + "px, 0)"), n[0].style.height = d + "px"), o.hide && (clearTimeout(e.scrollbar.timeout), l[0].style.opacity = 1, e.scrollbar.timeout = setTimeout((function () { l[0].style.opacity = 0, l.transition(400) }), 1e3)) } }, setTransition: function (e) { var t = this; t.params.scrollbar.el && t.scrollbar.el && t.scrollbar.$dragEl.transition(e) }, updateSize: function () { var e = this; if (e.params.scrollbar.el && e.scrollbar.el) { var t = e.scrollbar, a = t.$dragEl, i = t.$el; a[0].style.width = "", a[0].style.height = ""; var s, r = e.isHorizontal() ? i[0].offsetWidth : i[0].offsetHeight, n = e.size / e.virtualSize, l = n * (r / e.size); s = "auto" === e.params.scrollbar.dragSize ? r * n : parseInt(e.params.scrollbar.dragSize, 10), e.isHorizontal() ? a[0].style.width = s + "px" : a[0].style.height = s + "px", i[0].style.display = n >= 1 ? "none" : "", e.params.scrollbar.hide && (i[0].style.opacity = 0), S(t, { trackSize: r, Froggyr: n, moveFroggyr: l, dragSize: s }), t.$el[e.params.watchOverflow && e.isLocked ? "addClass" : "removeClass"](e.params.scrollbar.lockClass) } }, getPointerPosition: function (e) { return this.isHorizontal() ? "touchstart" === e.type || "touchmove" === e.type ? e.targetTouches[0].clientX : e.clientX : "touchstart" === e.type || "touchmove" === e.type ? e.targetTouches[0].clientY : e.clientY }, setDragPosition: function (e) { var t, a = this, i = a.scrollbar, s = a.rtlTranslate, r = i.$el, n = i.dragSize, l = i.trackSize, o = i.dragStartPos; t = (i.getPointerPosition(e) - r.offset()[a.isHorizontal() ? "left" : "top"] - (null !== o ? o : n / 2)) / (l - n), t = Math.max(Math.min(t, 1), 0), s && (t = 1 - t); var d = a.minTranslate() + (a.maxTranslate() - a.minTranslate()) * t; a.updateProgress(d), a.setTranslate(d), a.updateActiveIndex(), a.updateSlidesClasses() }, onDragStart: function (e) { var t = this, a = t.params.scrollbar, i = t.scrollbar, s = t.$wrapperEl, r = i.$el, n = i.$dragEl; t.scrollbar.isTouched = !0, t.scrollbar.dragStartPos = e.target === n[0] || e.target === n ? i.getPointerPosition(e) - e.target.getBoundingClientRect()[t.isHorizontal() ? "left" : "top"] : null, e.preventDefault(), e.stopPropagation(), s.transition(100), n.transition(100), i.setDragPosition(e), clearTimeout(t.scrollbar.dragTimeout), r.transition(0), a.hide && r.css("opacity", 1), t.params.cssMode && t.$wrapperEl.css("scroll-snap-type", "none"), t.emit("scrollbarDragStart", e) }, onDragMove: function (e) { var t = this, a = t.scrollbar, i = t.$wrapperEl, s = a.$el, r = a.$dragEl; t.scrollbar.isTouched && (e.preventDefault ? e.preventDefault() : e.returnValue = !1, a.setDragPosition(e), i.transition(0), s.transition(0), r.transition(0), t.emit("scrollbarDragMove", e)) }, onDragEnd: function (e) { var t = this, a = t.params.scrollbar, i = t.scrollbar, s = t.$wrapperEl, r = i.$el; t.scrollbar.isTouched && (t.scrollbar.isTouched = !1, t.params.cssMode && (t.$wrapperEl.css("scroll-snap-type", ""), s.transition("")), a.hide && (clearTimeout(t.scrollbar.dragTimeout), t.scrollbar.dragTimeout = E((function () { r.css("opacity", 0), r.transition(400) }), 1e3)), t.emit("scrollbarDragEnd", e), a.snapOnRelease && t.slideToClosest()) }, enableDraggable: function () { var e = this; if (e.params.scrollbar.el) { var t = r(), a = e.scrollbar, i = e.touchEventsTouch, s = e.touchEventsDesktop, n = e.params, l = e.support, o = a.$el[0], d = !(!l.passiveListener || !n.passiveListeners) && { passive: !1, capture: !1 }, p = !(!l.passiveListener || !n.passiveListeners) && { passive: !0, capture: !1 }; o && (l.touch ? (o.addEventListener(i.start, e.scrollbar.onDragStart, d), o.addEventListener(i.move, e.scrollbar.onDragMove, d), o.addEventListener(i.end, e.scrollbar.onDragEnd, p)) : (o.addEventListener(s.start, e.scrollbar.onDragStart, d), t.addEventListener(s.move, e.scrollbar.onDragMove, d), t.addEventListener(s.end, e.scrollbar.onDragEnd, p))) } }, disableDraggable: function () { var e = this; if (e.params.scrollbar.el) { var t = r(), a = e.scrollbar, i = e.touchEventsTouch, s = e.touchEventsDesktop, n = e.params, l = e.support, o = a.$el[0], d = !(!l.passiveListener || !n.passiveListeners) && { passive: !1, capture: !1 }, p = !(!l.passiveListener || !n.passiveListeners) && { passive: !0, capture: !1 }; o && (l.touch ? (o.removeEventListener(i.start, e.scrollbar.onDragStart, d), o.removeEventListener(i.move, e.scrollbar.onDragMove, d), o.removeEventListener(i.end, e.scrollbar.onDragEnd, p)) : (o.removeEventListener(s.start, e.scrollbar.onDragStart, d), t.removeEventListener(s.move, e.scrollbar.onDragMove, d), t.removeEventListener(s.end, e.scrollbar.onDragEnd, p))) } }, init: function () { var e = this; if (e.params.scrollbar.el) { var t = e.scrollbar, a = e.$el, i = e.params.scrollbar, s = m(i.el); e.params.uniqueNavElements && "string" == typeof i.el && s.length > 1 && 1 === a.find(i.el).length && (s = a.find(i.el)); var r = s.find("." + e.params.scrollbar.dragClass); 0 === r.length && (r = m('<div class="' + e.params.scrollbar.dragClass + '"></div>'), s.append(r)), S(t, { $el: s, el: s[0], $dragEl: r, dragEl: r[0] }), i.draggable && t.enableDraggable() } }, destroy: function () { this.scrollbar.disableDraggable() } }, Q = { setTransform: function (e, t) { var a = this.rtl, i = m(e), s = a ? -1 : 1, r = i.attr("data-swiper-parallax") || "0", n = i.attr("data-swiper-parallax-x"), l = i.attr("data-swiper-parallax-y"), o = i.attr("data-swiper-parallax-scale"), d = i.attr("data-swiper-parallax-opacity"); if (n || l ? (n = n || "0", l = l || "0") : this.isHorizontal() ? (n = r, l = "0") : (l = r, n = "0"), n = n.indexOf("%") >= 0 ? parseInt(n, 10) * t * s + "%" : n * t * s + "px", l = l.indexOf("%") >= 0 ? parseInt(l, 10) * t + "%" : l * t + "px", null != d) { var p = d - (d - 1) * (1 - Math.abs(t)); i[0].style.opacity = p } if (null == o) i.transform("translate3d(" + n + ", " + l + ", 0px)"); else { var u = o - (o - 1) * (1 - Math.abs(t)); i.transform("translate3d(" + n + ", " + l + ", 0px) scale(" + u + ")") } }, setTranslate: function () { var e = this, t = e.$el, a = e.slides, i = e.progress, s = e.snapGrid; t.children("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y], [data-swiper-parallax-opacity], [data-swiper-parallax-scale]").each((function (t) { e.parallax.setTransform(t, i) })), a.each((function (t, a) { var r = t.progress; e.params.slidesPerGroup > 1 && "auto" !== e.params.slidesPerView && (r += Math.ceil(a / 2) - i * (s.length - 1)), r = Math.min(Math.max(r, -1), 1), m(t).find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y], [data-swiper-parallax-opacity], [data-swiper-parallax-scale]").each((function (t) { e.parallax.setTransform(t, r) })) })) }, setTransition: function (e) { void 0 === e && (e = this.params.speed); this.$el.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y], [data-swiper-parallax-opacity], [data-swiper-parallax-scale]").each((function (t) { var a = m(t), i = parseInt(a.attr("data-swiper-parallax-duration"), 10) || e; 0 === e && (i = 0), a.transition(i) })) } }, ee = { getDistanceBetweenTouches: function (e) { if (e.targetTouches.length < 2) return 1; var t = e.targetTouches[0].pageX, a = e.targetTouches[0].pageY, i = e.targetTouches[1].pageX, s = e.targetTouches[1].pageY; return Math.sqrt(Math.pow(i - t, 2) + Math.pow(s - a, 2)) }, onGestureStart: function (e) { var t = this, a = t.support, i = t.params.zoom, s = t.zoom, r = s.gesture; if (s.fakeGestureTouched = !1, s.fakeGestureMoved = !1, !a.gestures) { if ("touchstart" !== e.type || "touchstart" === e.type && e.targetTouches.length < 2) return; s.fakeGestureTouched = !0, r.scaleStart = ee.getDistanceBetweenTouches(e) } r.$slideEl && r.$slideEl.length || (r.$slideEl = m(e.target).closest("." + t.params.slideClass), 0 === r.$slideEl.length && (r.$slideEl = t.slides.eq(t.activeIndex)), r.$imageEl = r.$slideEl.find("img, svg, canvas, picture, .swiper-zoom-target"), r.$imageWrapEl = r.$imageEl.parent("." + i.containerClass), r.maxRatio = r.$imageWrapEl.attr("data-swiper-zoom") || i.maxRatio, 0 !== r.$imageWrapEl.length) ? (r.$imageEl && r.$imageEl.transition(0), t.zoom.isScaling = !0) : r.$imageEl = void 0 }, onGestureChange: function (e) { var t = this, a = t.support, i = t.params.zoom, s = t.zoom, r = s.gesture; if (!a.gestures) { if ("touchmove" !== e.type || "touchmove" === e.type && e.targetTouches.length < 2) return; s.fakeGestureMoved = !0, r.scaleMove = ee.getDistanceBetweenTouches(e) } r.$imageEl && 0 !== r.$imageEl.length ? (a.gestures ? s.scale = e.scale * s.currentScale : s.scale = r.scaleMove / r.scaleStart * s.currentScale, s.scale > r.maxRatio && (s.scale = r.maxRatio - 1 + Math.pow(s.scale - r.maxRatio + 1, .5)), s.scale < i.minRatio && (s.scale = i.minRatio + 1 - Math.pow(i.minRatio - s.scale + 1, .5)), r.$imageEl.transform("translate3d(0,0,0) scale(" + s.scale + ")")) : "gesturechange" === e.type && s.onGestureStart(e) }, onGestureEnd: function (e) { var t = this, a = t.device, i = t.support, s = t.params.zoom, r = t.zoom, n = r.gesture; if (!i.gestures) { if (!r.fakeGestureTouched || !r.fakeGestureMoved) return; if ("touchend" !== e.type || "touchend" === e.type && e.changedTouches.length < 2 && !a.android) return; r.fakeGestureTouched = !1, r.fakeGestureMoved = !1 } n.$imageEl && 0 !== n.$imageEl.length && (r.scale = Math.max(Math.min(r.scale, n.maxRatio), s.minRatio), n.$imageEl.transition(t.params.speed).transform("translate3d(0,0,0) scale(" + r.scale + ")"), r.currentScale = r.scale, r.isScaling = !1, 1 === r.scale && (n.$slideEl = void 0)) }, onTouchStart: function (e) { var t = this.device, a = this.zoom, i = a.gesture, s = a.image; i.$imageEl && 0 !== i.$imageEl.length && (s.isTouched || (t.android && e.cancelable && e.preventDefault(), s.isTouched = !0, s.touchesStart.x = "touchstart" === e.type ? e.targetTouches[0].pageX : e.pageX, s.touchesStart.y = "touchstart" === e.type ? e.targetTouches[0].pageY : e.pageY)) }, onTouchMove: function (e) { var t = this, a = t.zoom, i = a.gesture, s = a.image, r = a.velocity; if (i.$imageEl && 0 !== i.$imageEl.length && (t.allowClick = !1, s.isTouched && i.$slideEl)) { s.isMoved || (s.width = i.$imageEl[0].offsetWidth, s.height = i.$imageEl[0].offsetHeight, s.startX = T(i.$imageWrapEl[0], "x") || 0, s.startY = T(i.$imageWrapEl[0], "y") || 0, i.slideWidth = i.$slideEl[0].offsetWidth, i.slideHeight = i.$slideEl[0].offsetHeight, i.$imageWrapEl.transition(0), t.rtl && (s.startX = -s.startX, s.startY = -s.startY)); var n = s.width * a.scale, l = s.height * a.scale; if (!(n < i.slideWidth && l < i.slideHeight)) { if (s.minX = Math.min(i.slideWidth / 2 - n / 2, 0), s.maxX = -s.minX, s.minY = Math.min(i.slideHeight / 2 - l / 2, 0), s.maxY = -s.minY, s.touchesCurrent.x = "touchmove" === e.type ? e.targetTouches[0].pageX : e.pageX, s.touchesCurrent.y = "touchmove" === e.type ? e.targetTouches[0].pageY : e.pageY, !s.isMoved && !a.isScaling) { if (t.isHorizontal() && (Math.floor(s.minX) === Math.floor(s.startX) && s.touchesCurrent.x < s.touchesStart.x || Math.floor(s.maxX) === Math.floor(s.startX) && s.touchesCurrent.x > s.touchesStart.x)) return void (s.isTouched = !1); if (!t.isHorizontal() && (Math.floor(s.minY) === Math.floor(s.startY) && s.touchesCurrent.y < s.touchesStart.y || Math.floor(s.maxY) === Math.floor(s.startY) && s.touchesCurrent.y > s.touchesStart.y)) return void (s.isTouched = !1) } e.cancelable && e.preventDefault(), e.stopPropagation(), s.isMoved = !0, s.currentX = s.touchesCurrent.x - s.touchesStart.x + s.startX, s.currentY = s.touchesCurrent.y - s.touchesStart.y + s.startY, s.currentX < s.minX && (s.currentX = s.minX + 1 - Math.pow(s.minX - s.currentX + 1, .8)), s.currentX > s.maxX && (s.currentX = s.maxX - 1 + Math.pow(s.currentX - s.maxX + 1, .8)), s.currentY < s.minY && (s.currentY = s.minY + 1 - Math.pow(s.minY - s.currentY + 1, .8)), s.currentY > s.maxY && (s.currentY = s.maxY - 1 + Math.pow(s.currentY - s.maxY + 1, .8)), r.prevPositionX || (r.prevPositionX = s.touchesCurrent.x), r.prevPositionY || (r.prevPositionY = s.touchesCurrent.y), r.prevTime || (r.prevTime = Date.now()), r.x = (s.touchesCurrent.x - r.prevPositionX) / (Date.now() - r.prevTime) / 2, r.y = (s.touchesCurrent.y - r.prevPositionY) / (Date.now() - r.prevTime) / 2, Math.abs(s.touchesCurrent.x - r.prevPositionX) < 2 && (r.x = 0), Math.abs(s.touchesCurrent.y - r.prevPositionY) < 2 && (r.y = 0), r.prevPositionX = s.touchesCurrent.x, r.prevPositionY = s.touchesCurrent.y, r.prevTime = Date.now(), i.$imageWrapEl.transform("translate3d(" + s.currentX + "px, " + s.currentY + "px,0)") } } }, onTouchEnd: function () { var e = this.zoom, t = e.gesture, a = e.image, i = e.velocity; if (t.$imageEl && 0 !== t.$imageEl.length) { if (!a.isTouched || !a.isMoved) return a.isTouched = !1, void (a.isMoved = !1); a.isTouched = !1, a.isMoved = !1; var s = 300, r = 300, n = i.x * s, l = a.currentX + n, o = i.y * r, d = a.currentY + o; 0 !== i.x && (s = Math.abs((l - a.currentX) / i.x)), 0 !== i.y && (r = Math.abs((d - a.currentY) / i.y)); var p = Math.max(s, r); a.currentX = l, a.currentY = d; var u = a.width * e.scale, c = a.height * e.scale; a.minX = Math.min(t.slideWidth / 2 - u / 2, 0), a.maxX = -a.minX, a.minY = Math.min(t.slideHeight / 2 - c / 2, 0), a.maxY = -a.minY, a.currentX = Math.max(Math.min(a.currentX, a.maxX), a.minX), a.currentY = Math.max(Math.min(a.currentY, a.maxY), a.minY), t.$imageWrapEl.transition(p).transform("translate3d(" + a.currentX + "px, " + a.currentY + "px,0)") } }, onTransitionEnd: function () { var e = this, t = e.zoom, a = t.gesture; a.$slideEl && e.previousIndex !== e.activeIndex && (a.$imageEl && a.$imageEl.transform("translate3d(0,0,0) scale(1)"), a.$imageWrapEl && a.$imageWrapEl.transform("translate3d(0,0,0)"), t.scale = 1, t.currentScale = 1, a.$slideEl = void 0, a.$imageEl = void 0, a.$imageWrapEl = void 0) }, toggle: function (e) { var t = this.zoom; t.scale && 1 !== t.scale ? t.out() : t.in(e) }, in: function (e) { var t, a, i, s, r, n, o, d, p, u, c, h, v, f, m, g, y = this, w = l(), b = y.zoom, E = y.params.zoom, x = b.gesture, T = b.image; (x.$slideEl || (y.params.virtual && y.params.virtual.enabled && y.virtual ? x.$slideEl = y.$wrapperEl.children("." + y.params.slideActiveClass) : x.$slideEl = y.slides.eq(y.activeIndex), x.$imageEl = x.$slideEl.find("img, svg, canvas, picture, .swiper-zoom-target"), x.$imageWrapEl = x.$imageEl.parent("." + E.containerClass)), x.$imageEl && 0 !== x.$imageEl.length) && (x.$slideEl.addClass("" + E.zoomedSlideClass), void 0 === T.touchesStart.x && e ? (t = "touchend" === e.type ? e.changedTouches[0].pageX : e.pageX, a = "touchend" === e.type ? e.changedTouches[0].pageY : e.pageY) : (t = T.touchesStart.x, a = T.touchesStart.y), b.scale = x.$imageWrapEl.attr("data-swiper-zoom") || E.maxRatio, b.currentScale = x.$imageWrapEl.attr("data-swiper-zoom") || E.maxRatio, e ? (m = x.$slideEl[0].offsetWidth, g = x.$slideEl[0].offsetHeight, i = x.$slideEl.offset().left + w.scrollX + m / 2 - t, s = x.$slideEl.offset().top + w.scrollY + g / 2 - a, o = x.$imageEl[0].offsetWidth, d = x.$imageEl[0].offsetHeight, p = o * b.scale, u = d * b.scale, v = -(c = Math.min(m / 2 - p / 2, 0)), f = -(h = Math.min(g / 2 - u / 2, 0)), (r = i * b.scale) < c && (r = c), r > v && (r = v), (n = s * b.scale) < h && (n = h), n > f && (n = f)) : (r = 0, n = 0), x.$imageWrapEl.transition(300).transform("translate3d(" + r + "px, " + n + "px,0)"), x.$imageEl.transition(300).transform("translate3d(0,0,0) scale(" + b.scale + ")")) }, out: function () { var e = this, t = e.zoom, a = e.params.zoom, i = t.gesture; i.$slideEl || (e.params.virtual && e.params.virtual.enabled && e.virtual ? i.$slideEl = e.$wrapperEl.children("." + e.params.slideActiveClass) : i.$slideEl = e.slides.eq(e.activeIndex), i.$imageEl = i.$slideEl.find("img, svg, canvas, picture, .swiper-zoom-target"), i.$imageWrapEl = i.$imageEl.parent("." + a.containerClass)), i.$imageEl && 0 !== i.$imageEl.length && (t.scale = 1, t.currentScale = 1, i.$imageWrapEl.transition(300).transform("translate3d(0,0,0)"), i.$imageEl.transition(300).transform("translate3d(0,0,0) scale(1)"), i.$slideEl.removeClass("" + a.zoomedSlideClass), i.$slideEl = void 0) }, toggleGestures: function (e) { var t = this, a = t.zoom, i = a.slideSelector, s = a.passiveListener; t.$wrapperEl[e]("gesturestart", i, a.onGestureStart, s), t.$wrapperEl[e]("gesturechange", i, a.onGestureChange, s), t.$wrapperEl[e]("gestureend", i, a.onGestureEnd, s) }, enableGestures: function () { this.zoom.gesturesEnabled || (this.zoom.gesturesEnabled = !0, this.zoom.toggleGestures("on")) }, disableGestures: function () { this.zoom.gesturesEnabled && (this.zoom.gesturesEnabled = !1, this.zoom.toggleGestures("off")) }, enable: function () { var e = this, t = e.support, a = e.zoom; if (!a.enabled) { a.enabled = !0; var i = !("touchstart" !== e.touchEvents.start || !t.passiveListener || !e.params.passiveListeners) && { passive: !0, capture: !1 }, s = !t.passiveListener || { passive: !1, capture: !0 }, r = "." + e.params.slideClass; e.zoom.passiveListener = i, e.zoom.slideSelector = r, t.gestures ? (e.$wrapperEl.on(e.touchEvents.start, e.zoom.enableGestures, i), e.$wrapperEl.on(e.touchEvents.end, e.zoom.disableGestures, i)) : "touchstart" === e.touchEvents.start && (e.$wrapperEl.on(e.touchEvents.start, r, a.onGestureStart, i), e.$wrapperEl.on(e.touchEvents.move, r, a.onGestureChange, s), e.$wrapperEl.on(e.touchEvents.end, r, a.onGestureEnd, i), e.touchEvents.cancel && e.$wrapperEl.on(e.touchEvents.cancel, r, a.onGestureEnd, i)), e.$wrapperEl.on(e.touchEvents.move, "." + e.params.zoom.containerClass, a.onTouchMove, s) } }, disable: function () { var e = this, t = e.zoom; if (t.enabled) { var a = e.support; e.zoom.enabled = !1; var i = !("touchstart" !== e.touchEvents.start || !a.passiveListener || !e.params.passiveListeners) && { passive: !0, capture: !1 }, s = !a.passiveListener || { passive: !1, capture: !0 }, r = "." + e.params.slideClass; a.gestures ? (e.$wrapperEl.off(e.touchEvents.start, e.zoom.enableGestures, i), e.$wrapperEl.off(e.touchEvents.end, e.zoom.disableGestures, i)) : "touchstart" === e.touchEvents.start && (e.$wrapperEl.off(e.touchEvents.start, r, t.onGestureStart, i), e.$wrapperEl.off(e.touchEvents.move, r, t.onGestureChange, s), e.$wrapperEl.off(e.touchEvents.end, r, t.onGestureEnd, i), e.touchEvents.cancel && e.$wrapperEl.off(e.touchEvents.cancel, r, t.onGestureEnd, i)), e.$wrapperEl.off(e.touchEvents.move, "." + e.params.zoom.containerClass, t.onTouchMove, s) } } }, te = { loadInSlide: function (e, t) { void 0 === t && (t = !0); var a = this, i = a.params.lazy; if (void 0 !== e && 0 !== a.slides.length) { var s = a.virtual && a.params.virtual.enabled ? a.$wrapperEl.children("." + a.params.slideClass + '[data-swiper-slide-index="' + e + '"]') : a.slides.eq(e), r = s.find("." + i.elementClass + ":not(." + i.loadedClass + "):not(." + i.loadingClass + ")"); !s.hasClass(i.elementClass) || s.hasClass(i.loadedClass) || s.hasClass(i.loadingClass) || r.push(s[0]), 0 !== r.length && r.each((function (e) { var r = m(e); r.addClass(i.loadingClass); var n = r.attr("data-background"), l = r.attr("data-src"), o = r.attr("data-srcset"), d = r.attr("data-sizes"), p = r.parent("picture"); a.loadImage(r[0], l || n, o, d, !1, (function () { if (null != a && a && (!a || a.params) && !a.destroyed) { if (n ? (r.css("background-image", 'url("' + n + '")'), r.removeAttr("data-background")) : (o && (r.attr("srcset", o), r.removeAttr("data-srcset")), d && (r.attr("sizes", d), r.removeAttr("data-sizes")), p.length && p.children("source").each((function (e) { var t = m(e); t.attr("data-srcset") && (t.attr("srcset", t.attr("data-srcset")), t.removeAttr("data-srcset")) })), l && (r.attr("src", l), r.removeAttr("data-src"))), r.addClass(i.loadedClass).removeClass(i.loadingClass), s.find("." + i.preloaderClass).remove(), a.params.loop && t) { var e = s.attr("data-swiper-slide-index"); if (s.hasClass(a.params.slideDuplicateClass)) { var u = a.$wrapperEl.children('[data-swiper-slide-index="' + e + '"]:not(.' + a.params.slideDuplicateClass + ")"); a.lazy.loadInSlide(u.index(), !1) } else { var c = a.$wrapperEl.children("." + a.params.slideDuplicateClass + '[data-swiper-slide-index="' + e + '"]'); a.lazy.loadInSlide(c.index(), !1) } } a.emit("lazyImageReady", s[0], r[0]), a.params.autoHeight && a.updateAutoHeight() } })), a.emit("lazyImageLoad", s[0], r[0]) })) } }, load: function () { var e = this, t = e.$wrapperEl, a = e.params, i = e.slides, s = e.activeIndex, r = e.virtual && a.virtual.enabled, n = a.lazy, l = a.slidesPerView; function o(e) { if (r) { if (t.children("." + a.slideClass + '[data-swiper-slide-index="' + e + '"]').length) return !0 } else if (i[e]) return !0; return !1 } function d(e) { return r ? m(e).attr("data-swiper-slide-index") : m(e).index() } if ("auto" === l && (l = 0), e.lazy.initialImageLoaded || (e.lazy.initialImageLoaded = !0), e.params.watchSlidesVisibility) t.children("." + a.slideVisibleClass).each((function (t) { var a = r ? m(t).attr("data-swiper-slide-index") : m(t).index(); e.lazy.loadInSlide(a) })); else if (l > 1) for (var p = s; p < s + l; p += 1)o(p) && e.lazy.loadInSlide(p); else e.lazy.loadInSlide(s); if (n.loadPrevNext) if (l > 1 || n.loadPrevNextAmount && n.loadPrevNextAmount > 1) { for (var u = n.loadPrevNextAmount, c = l, h = Math.min(s + c + Math.max(u, c), i.length), v = Math.max(s - Math.max(c, u), 0), f = s + l; f < h; f += 1)o(f) && e.lazy.loadInSlide(f); for (var g = v; g < s; g += 1)o(g) && e.lazy.loadInSlide(g) } else { var y = t.children("." + a.slideNextClass); y.length > 0 && e.lazy.loadInSlide(d(y)); var w = t.children("." + a.slidePrevClass); w.length > 0 && e.lazy.loadInSlide(d(w)) } }, checkInViewOnLoad: function () { var e = l(), t = this; if (t && !t.destroyed) { var a = t.params.lazy.scrollingElement ? m(t.params.lazy.scrollingElement) : m(e), i = a[0] === e, s = i ? e.innerWidth : a[0].offsetWidth, r = i ? e.innerHeight : a[0].offsetHeight, n = t.$el.offset(), o = !1; t.rtlTranslate && (n.left -= t.$el[0].scrollLeft); for (var d = [[n.left, n.top], [n.left + t.width, n.top], [n.left, n.top + t.height], [n.left + t.width, n.top + t.height]], p = 0; p < d.length; p += 1) { var u = d[p]; if (u[0] >= 0 && u[0] <= s && u[1] >= 0 && u[1] <= r) { if (0 === u[0] && 0 === u[1]) continue; o = !0 } } o ? (t.lazy.load(), a.off("scroll", t.lazy.checkInViewOnLoad)) : t.lazy.scrollHandlerAttached || (t.lazy.scrollHandlerAttached = !0, a.on("scroll", t.lazy.checkInViewOnLoad)) } } }, ae = { LinearSpline: function (e, t) { var a, i, s, r, n, l = function (e, t) { for (i = -1, a = e.length; a - i > 1;)e[s = a + i >> 1] <= t ? i = s : a = s; return a }; return this.x = e, this.y = t, this.lastIndex = e.length - 1, this.interpolate = function (e) { return e ? (n = l(this.x, e), r = n - 1, (e - this.x[r]) * (this.y[n] - this.y[r]) / (this.x[n] - this.x[r]) + this.y[r]) : 0 }, this }, getInterpolateFunction: function (e) { var t = this; t.controller.spline || (t.controller.spline = t.params.loop ? new ae.LinearSpline(t.slidesGrid, e.slidesGrid) : new ae.LinearSpline(t.snapGrid, e.snapGrid)) }, setTranslate: function (e, t) { var a, i, s = this, r = s.controller.control, n = s.constructor; function l(e) { var t = s.rtlTranslate ? -s.translate : s.translate; "slide" === s.params.controller.by && (s.controller.getInterpolateFunction(e), i = -s.controller.spline.interpolate(-t)), i && "container" !== s.params.controller.by || (a = (e.maxTranslate() - e.minTranslate()) / (s.maxTranslate() - s.minTranslate()), i = (t - s.minTranslate()) * a + e.minTranslate()), s.params.controller.inverse && (i = e.maxTranslate() - i), e.updateProgress(i), e.setTranslate(i, s), e.updateActiveIndex(), e.updateSlidesClasses() } if (Array.isArray(r)) for (var o = 0; o < r.length; o += 1)r[o] !== t && r[o] instanceof n && l(r[o]); else r instanceof n && t !== r && l(r) }, setTransition: function (e, t) { var a, i = this, s = i.constructor, r = i.controller.control; function n(t) { t.setTransition(e, i), 0 !== e && (t.transitionStart(), t.params.autoHeight && E((function () { t.updateAutoHeight() })), t.$wrapperEl.transitionEnd((function () { r && (t.params.loop && "slide" === i.params.controller.by && t.loopFix(), t.transitionEnd()) }))) } if (Array.isArray(r)) for (a = 0; a < r.length; a += 1)r[a] !== t && r[a] instanceof s && n(r[a]); else r instanceof s && t !== r && n(r) } }, ie = { getRandomNumber: function (e) { void 0 === e && (e = 16); return "x".repeat(e).replace(/x/g, (function () { return Math.round(16 * Math.random()).toString(16) })) }, makeElFocusable: function (e) { return e.attr("tabIndex", "0"), e }, makeElNotFocusable: function (e) { return e.attr("tabIndex", "-1"), e }, addElRole: function (e, t) { return e.attr("role", t), e }, addElRoleDescription: function (e, t) { return e.attr("aria-role-description", t), e }, addElControls: function (e, t) { return e.attr("aria-controls", t), e }, addElLabel: function (e, t) { return e.attr("aria-label", t), e }, addElId: function (e, t) { return e.attr("id", t), e }, addElLive: function (e, t) { return e.attr("aria-live", t), e }, disableEl: function (e) { return e.attr("aria-disabled", !0), e }, enableEl: function (e) { return e.attr("aria-disabled", !1), e }, onEnterKey: function (e) { var t = this, a = t.params.a11y; if (13 === e.keyCode) { var i = m(e.target); t.navigation && t.navigation.$nextEl && i.is(t.navigation.$nextEl) && (t.isEnd && !t.params.loop || t.slideNext(), t.isEnd ? t.a11y.notify(a.lastSlideMessage) : t.a11y.notify(a.nextSlideMessage)), t.navigation && t.navigation.$prevEl && i.is(t.navigation.$prevEl) && (t.isBeginning && !t.params.loop || t.slidePrev(), t.isBeginning ? t.a11y.notify(a.firstSlideMessage) : t.a11y.notify(a.prevSlideMessage)), t.pagination && i.is("." + t.params.pagination.bulletClass.replace(/ /g, ".")) && i[0].click() } }, notify: function (e) { var t = this.a11y.liveRegion; 0 !== t.length && (t.html(""), t.html(e)) }, updateNavigation: function () { var e = this; if (!e.params.loop && e.navigation) { var t = e.navigation, a = t.$nextEl, i = t.$prevEl; i && i.length > 0 && (e.isBeginning ? (e.a11y.disableEl(i), e.a11y.makeElNotFocusable(i)) : (e.a11y.enableEl(i), e.a11y.makeElFocusable(i))), a && a.length > 0 && (e.isEnd ? (e.a11y.disableEl(a), e.a11y.makeElNotFocusable(a)) : (e.a11y.enableEl(a), e.a11y.makeElFocusable(a))) } }, updatePagination: function () { var e = this, t = e.params.a11y; e.pagination && e.params.pagination.clickable && e.pagination.bullets && e.pagination.bullets.length && e.pagination.bullets.each((function (a) { var i = m(a); e.a11y.makeElFocusable(i), e.params.pagination.renderBullet || (e.a11y.addElRole(i, "button"), e.a11y.addElLabel(i, t.paginationBulletMessage.replace(/\{\{index\}\}/, i.index() + 1))) })) }, init: function () { var e = this, t = e.params.a11y; e.$el.append(e.a11y.liveRegion); var a = e.$el; t.containerRoleDescriptionMessage && e.a11y.addElRoleDescription(a, t.containerRoleDescriptionMessage), t.containerMessage && e.a11y.addElLabel(a, t.containerMessage); var i, s, r, n = e.$wrapperEl, l = n.attr("id") || "swiper-wrapper-" + e.a11y.getRandomNumber(16); e.a11y.addElId(n, l), i = e.params.autoplay && e.params.autoplay.enabled ? "off" : "polite", e.a11y.addElLive(n, i), t.itemRoleDescriptionMessage && e.a11y.addElRoleDescription(m(e.slides), t.itemRoleDescriptionMessage), e.a11y.addElRole(m(e.slides), "group"), e.slides.each((function (t) { var a = m(t); e.a11y.addElLabel(a, a.index() + 1 + " / " + e.slides.length) })), e.navigation && e.navigation.$nextEl && (s = e.navigation.$nextEl), e.navigation && e.navigation.$prevEl && (r = e.navigation.$prevEl), s && s.length && (e.a11y.makeElFocusable(s), "BUTTON" !== s[0].tagName && (e.a11y.addElRole(s, "button"), s.on("keydown", e.a11y.onEnterKey)), e.a11y.addElLabel(s, t.nextSlideMessage), e.a11y.addElControls(s, l)), r && r.length && (e.a11y.makeElFocusable(r), "BUTTON" !== r[0].tagName && (e.a11y.addElRole(r, "button"), r.on("keydown", e.a11y.onEnterKey)), e.a11y.addElLabel(r, t.prevSlideMessage), e.a11y.addElControls(r, l)), e.pagination && e.params.pagination.clickable && e.pagination.bullets && e.pagination.bullets.length && e.pagination.$el.on("keydown", "." + e.params.pagination.bulletClass.replace(/ /g, "."), e.a11y.onEnterKey) }, destroy: function () { var e, t, a = this; a.a11y.liveRegion && a.a11y.liveRegion.length > 0 && a.a11y.liveRegion.remove(), a.navigation && a.navigation.$nextEl && (e = a.navigation.$nextEl), a.navigation && a.navigation.$prevEl && (t = a.navigation.$prevEl), e && e.off("keydown", a.a11y.onEnterKey), t && t.off("keydown", a.a11y.onEnterKey), a.pagination && a.params.pagination.clickable && a.pagination.bullets && a.pagination.bullets.length && a.pagination.$el.off("keydown", "." + a.params.pagination.bulletClass.replace(/ /g, "."), a.a11y.onEnterKey) } }, se = { init: function () { var e = this, t = l(); if (e.params.history) { if (!t.history || !t.history.pushState) return e.params.history.enabled = !1, void (e.params.hashNavigation.enabled = !0); var a = e.history; a.initialized = !0, a.paths = se.getPathValues(e.params.url), (a.paths.key || a.paths.value) && (a.scrollToSlide(0, a.paths.value, e.params.runCallbacksOnInit), e.params.history.replaceState || t.addEventListener("popstate", e.history.setHistoryPopState)) } }, destroy: function () { var e = l(); this.params.history.replaceState || e.removeEventListener("popstate", this.history.setHistoryPopState) }, setHistoryPopState: function () { var e = this; e.history.paths = se.getPathValues(e.params.url), e.history.scrollToSlide(e.params.speed, e.history.paths.value, !1) }, getPathValues: function (e) { var t = l(), a = (e ? new URL(e) : t.location).pathname.slice(1).split("/").filter((function (e) { return "" !== e })), i = a.length; return { key: a[i - 2], value: a[i - 1] } }, setHistory: function (e, t) { var a = this, i = l(); if (a.history.initialized && a.params.history.enabled) { var s; s = a.params.url ? new URL(a.params.url) : i.location; var r = a.slides.eq(t), n = se.slugify(r.attr("data-history")); s.pathname.includes(e) || (n = e + "/" + n); var o = i.history.state; o && o.value === n || (a.params.history.replaceState ? i.history.replaceState({ value: n }, null, n) : i.history.pushState({ value: n }, null, n)) } }, slugify: function (e) { return e.toString().replace(/\s+/g, "-").replace(/[^\w-]+/g, "").replace(/--+/g, "-").replace(/^-+/, "").replace(/-+$/, "") }, scrollToSlide: function (e, t, a) { var i = this; if (t) for (var s = 0, r = i.slides.length; s < r; s += 1) { var n = i.slides.eq(s); if (se.slugify(n.attr("data-history")) === t && !n.hasClass(i.params.slideDuplicateClass)) { var l = n.index(); i.slideTo(l, e, a) } } else i.slideTo(0, e, a) } }, re = { onHashCange: function () { var e = this, t = r(); e.emit("hashChange"); var a = t.location.hash.replace("#", ""); if (a !== e.slides.eq(e.activeIndex).attr("data-hash")) { var i = e.$wrapperEl.children("." + e.params.slideClass + '[data-hash="' + a + '"]').index(); if (void 0 === i) return; e.slideTo(i) } }, setHash: function () { var e = this, t = l(), a = r(); if (e.hashNavigation.initialized && e.params.hashNavigation.enabled) if (e.params.hashNavigation.replaceState && t.history && t.history.replaceState) t.history.replaceState(null, null, "#" + e.slides.eq(e.activeIndex).attr("data-hash") || ""), e.emit("hashSet"); else { var i = e.slides.eq(e.activeIndex), s = i.attr("data-hash") || i.attr("data-history"); a.location.hash = s || "", e.emit("hashSet") } }, init: function () { var e = this, t = r(), a = l(); if (!(!e.params.hashNavigation.enabled || e.params.history && e.params.history.enabled)) { e.hashNavigation.initialized = !0; var i = t.location.hash.replace("#", ""); if (i) for (var s = 0, n = e.slides.length; s < n; s += 1) { var o = e.slides.eq(s); if ((o.attr("data-hash") || o.attr("data-history")) === i && !o.hasClass(e.params.slideDuplicateClass)) { var d = o.index(); e.slideTo(d, 0, e.params.runCallbacksOnInit, !0) } } e.params.hashNavigation.watchState && m(a).on("hashchange", e.hashNavigation.onHashCange) } }, destroy: function () { var e = l(); this.params.hashNavigation.watchState && m(e).off("hashchange", this.hashNavigation.onHashCange) } }, ne = { run: function () { var e = this, t = e.slides.eq(e.activeIndex), a = e.params.autoplay.delay; t.attr("data-swiper-autoplay") && (a = t.attr("data-swiper-autoplay") || e.params.autoplay.delay), clearTimeout(e.autoplay.timeout), e.autoplay.timeout = E((function () { var t; e.params.autoplay.reverseDirection ? e.params.loop ? (e.loopFix(), t = e.slidePrev(e.params.speed, !0, !0), e.emit("autoplay")) : e.isBeginning ? e.params.autoplay.stopOnLastSlide ? e.autoplay.stop() : (t = e.slideTo(e.slides.length - 1, e.params.speed, !0, !0), e.emit("autoplay")) : (t = e.slidePrev(e.params.speed, !0, !0), e.emit("autoplay")) : e.params.loop ? (e.loopFix(), t = e.slideNext(e.params.speed, !0, !0), e.emit("autoplay")) : e.isEnd ? e.params.autoplay.stopOnLastSlide ? e.autoplay.stop() : (t = e.slideTo(0, e.params.speed, !0, !0), e.emit("autoplay")) : (t = e.slideNext(e.params.speed, !0, !0), e.emit("autoplay")), (e.params.cssMode && e.autoplay.running || !1 === t) && e.autoplay.run() }), a) }, start: function () { var e = this; return void 0 === e.autoplay.timeout && (!e.autoplay.running && (e.autoplay.running = !0, e.emit("autoplayStart"), e.autoplay.run(), !0)) }, stop: function () { var e = this; return !!e.autoplay.running && (void 0 !== e.autoplay.timeout && (e.autoplay.timeout && (clearTimeout(e.autoplay.timeout), e.autoplay.timeout = void 0), e.autoplay.running = !1, e.emit("autoplayStop"), !0)) }, pause: function (e) { var t = this; t.autoplay.running && (t.autoplay.paused || (t.autoplay.timeout && clearTimeout(t.autoplay.timeout), t.autoplay.paused = !0, 0 !== e && t.params.autoplay.waitForTransition ? (t.$wrapperEl[0].addEventListener("transitionend", t.autoplay.onTransitionEnd), t.$wrapperEl[0].addEventListener("webkitTransitionEnd", t.autoplay.onTransitionEnd)) : (t.autoplay.paused = !1, t.autoplay.run()))) }, onVisibilityChange: function () { var e = this, t = r(); "hidden" === t.visibilityState && e.autoplay.running && e.autoplay.pause(), "visible" === t.visibilityState && e.autoplay.paused && (e.autoplay.run(), e.autoplay.paused = !1) }, onTransitionEnd: function (e) { var t = this; t && !t.destroyed && t.$wrapperEl && e.target === t.$wrapperEl[0] && (t.$wrapperEl[0].removeEventListener("transitionend", t.autoplay.onTransitionEnd), t.$wrapperEl[0].removeEventListener("webkitTransitionEnd", t.autoplay.onTransitionEnd), t.autoplay.paused = !1, t.autoplay.running ? t.autoplay.run() : t.autoplay.stop()) } }, le = { setTranslate: function () { for (var e = this, t = e.slides, a = 0; a < t.length; a += 1) { var i = e.slides.eq(a), s = -i[0].swiperSlideOffset; e.params.virtualTranslate || (s -= e.translate); var r = 0; e.isHorizontal() || (r = s, s = 0); var n = e.params.fadeEffect.crossFade ? Math.max(1 - Math.abs(i[0].progress), 0) : 1 + Math.min(Math.max(i[0].progress, -1), 0); i.css({ opacity: n }).transform("translate3d(" + s + "px, " + r + "px, 0px)") } }, setTransition: function (e) { var t = this, a = t.slides, i = t.$wrapperEl; if (a.transition(e), t.params.virtualTranslate && 0 !== e) { var s = !1; a.transitionEnd((function () { if (!s && t && !t.destroyed) { s = !0, t.animating = !1; for (var e = ["webkitTransitionEnd", "transitionend"], a = 0; a < e.length; a += 1)i.trigger(e[a]) } })) } } }, oe = { setTranslate: function () { var e, t = this, a = t.$el, i = t.$wrapperEl, s = t.slides, r = t.width, n = t.height, l = t.rtlTranslate, o = t.size, d = t.browser, p = t.params.cubeEffect, u = t.isHorizontal(), c = t.virtual && t.params.virtual.enabled, h = 0; p.shadow && (u ? (0 === (e = i.find(".swiper-cube-shadow")).length && (e = m('<div class="swiper-cube-shadow"></div>'), i.append(e)), e.css({ height: r + "px" })) : 0 === (e = a.find(".swiper-cube-shadow")).length && (e = m('<div class="swiper-cube-shadow"></div>'), a.append(e))); for (var v = 0; v < s.length; v += 1) { var f = s.eq(v), g = v; c && (g = parseInt(f.attr("data-swiper-slide-index"), 10)); var y = 90 * g, w = Math.floor(y / 360); l && (y = -y, w = Math.floor(-y / 360)); var b = Math.max(Math.min(f[0].progress, 1), -1), E = 0, x = 0, T = 0; g % 4 == 0 ? (E = 4 * -w * o, T = 0) : (g - 1) % 4 == 0 ? (E = 0, T = 4 * -w * o) : (g - 2) % 4 == 0 ? (E = o + 4 * w * o, T = o) : (g - 3) % 4 == 0 && (E = -o, T = 3 * o + 4 * o * w), l && (E = -E), u || (x = E, E = 0); var C = "rotateX(" + (u ? 0 : -y) + "deg) rotateY(" + (u ? y : 0) + "deg) translate3d(" + E + "px, " + x + "px, " + T + "px)"; if (b <= 1 && b > -1 && (h = 90 * g + 90 * b, l && (h = 90 * -g - 90 * b)), f.transform(C), p.slideShadows) { var S = u ? f.find(".swiper-slide-shadow-left") : f.find(".swiper-slide-shadow-top"), M = u ? f.find(".swiper-slide-shadow-right") : f.find(".swiper-slide-shadow-bottom"); 0 === S.length && (S = m('<div class="swiper-slide-shadow-' + (u ? "left" : "top") + '"></div>'), f.append(S)), 0 === M.length && (M = m('<div class="swiper-slide-shadow-' + (u ? "right" : "bottom") + '"></div>'), f.append(M)), S.length && (S[0].style.opacity = Math.max(-b, 0)), M.length && (M[0].style.opacity = Math.max(b, 0)) } } if (i.css({ "-webkit-transform-origin": "50% 50% -" + o / 2 + "px", "-moz-transform-origin": "50% 50% -" + o / 2 + "px", "-ms-transform-origin": "50% 50% -" + o / 2 + "px", "transform-origin": "50% 50% -" + o / 2 + "px" }), p.shadow) if (u) e.transform("translate3d(0px, " + (r / 2 + p.shadowOffset) + "px, " + -r / 2 + "px) rotateX(90deg) rotateZ(0deg) scale(" + p.shadowScale + ")"); else { var z = Math.abs(h) - 90 * Math.floor(Math.abs(h) / 90), P = 1.5 - (Math.sin(2 * z * Math.PI / 360) / 2 + Math.cos(2 * z * Math.PI / 360) / 2), k = p.shadowScale, L = p.shadowScale / P, $ = p.shadowOffset; e.transform("scale3d(" + k + ", 1, " + L + ") translate3d(0px, " + (n / 2 + $) + "px, " + -n / 2 / L + "px) rotateX(-90deg)") } var I = d.isSafari || d.isWebView ? -o / 2 : 0; i.transform("translate3d(0px,0," + I + "px) rotateX(" + (t.isHorizontal() ? 0 : h) + "deg) rotateY(" + (t.isHorizontal() ? -h : 0) + "deg)") }, setTransition: function (e) { var t = this, a = t.$el; t.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e), t.params.cubeEffect.shadow && !t.isHorizontal() && a.find(".swiper-cube-shadow").transition(e) } }, de = { setTranslate: function () { for (var e = this, t = e.slides, a = e.rtlTranslate, i = 0; i < t.length; i += 1) { var s = t.eq(i), r = s[0].progress; e.params.flipEffect.limitRotation && (r = Math.max(Math.min(s[0].progress, 1), -1)); var n = -180 * r, l = 0, o = -s[0].swiperSlideOffset, d = 0; if (e.isHorizontal() ? a && (n = -n) : (d = o, o = 0, l = -n, n = 0), s[0].style.zIndex = -Math.abs(Math.round(r)) + t.length, e.params.flipEffect.slideShadows) { var p = e.isHorizontal() ? s.find(".swiper-slide-shadow-left") : s.find(".swiper-slide-shadow-top"), u = e.isHorizontal() ? s.find(".swiper-slide-shadow-right") : s.find(".swiper-slide-shadow-bottom"); 0 === p.length && (p = m('<div class="swiper-slide-shadow-' + (e.isHorizontal() ? "left" : "top") + '"></div>'), s.append(p)), 0 === u.length && (u = m('<div class="swiper-slide-shadow-' + (e.isHorizontal() ? "right" : "bottom") + '"></div>'), s.append(u)), p.length && (p[0].style.opacity = Math.max(-r, 0)), u.length && (u[0].style.opacity = Math.max(r, 0)) } s.transform("translate3d(" + o + "px, " + d + "px, 0px) rotateX(" + l + "deg) rotateY(" + n + "deg)") } }, setTransition: function (e) { var t = this, a = t.slides, i = t.activeIndex, s = t.$wrapperEl; if (a.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e), t.params.virtualTranslate && 0 !== e) { var r = !1; a.eq(i).transitionEnd((function () { if (!r && t && !t.destroyed) { r = !0, t.animating = !1; for (var e = ["webkitTransitionEnd", "transitionend"], a = 0; a < e.length; a += 1)s.trigger(e[a]) } })) } } }, pe = { setTranslate: function () { for (var e = this, t = e.width, a = e.height, i = e.slides, s = e.slidesSizesGrid, r = e.params.coverflowEffect, n = e.isHorizontal(), l = e.translate, o = n ? t / 2 - l : a / 2 - l, d = n ? r.rotate : -r.rotate, p = r.depth, u = 0, c = i.length; u < c; u += 1) { var h = i.eq(u), v = s[u], f = (o - h[0].swiperSlideOffset - v / 2) / v * r.modifier, g = n ? d * f : 0, y = n ? 0 : d * f, w = -p * Math.abs(f), b = r.stretch; "string" == typeof b && -1 !== b.indexOf("%") && (b = parseFloat(r.stretch) / 100 * v); var E = n ? 0 : b * f, x = n ? b * f : 0, T = 1 - (1 - r.scale) * Math.abs(f); Math.abs(x) < .001 && (x = 0), Math.abs(E) < .001 && (E = 0), Math.abs(w) < .001 && (w = 0), Math.abs(g) < .001 && (g = 0), Math.abs(y) < .001 && (y = 0), Math.abs(T) < .001 && (T = 0); var C = "translate3d(" + x + "px," + E + "px," + w + "px) rotateX(" + y + "deg) rotateY(" + g + "deg) scale(" + T + ")"; if (h.transform(C), h[0].style.zIndex = 1 - Math.abs(Math.round(f)), r.slideShadows) { var S = n ? h.find(".swiper-slide-shadow-left") : h.find(".swiper-slide-shadow-top"), M = n ? h.find(".swiper-slide-shadow-right") : h.find(".swiper-slide-shadow-bottom"); 0 === S.length && (S = m('<div class="swiper-slide-shadow-' + (n ? "left" : "top") + '"></div>'), h.append(S)), 0 === M.length && (M = m('<div class="swiper-slide-shadow-' + (n ? "right" : "bottom") + '"></div>'), h.append(M)), S.length && (S[0].style.opacity = f > 0 ? f : 0), M.length && (M[0].style.opacity = -f > 0 ? -f : 0) } } }, setTransition: function (e) { this.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e) } }, ue = { init: function () { var e = this, t = e.params.thumbs; if (e.thumbs.initialized) return !1; e.thumbs.initialized = !0; var a = e.constructor; return t.swiper instanceof a ? (e.thumbs.swiper = t.swiper, S(e.thumbs.swiper.originalParams, { watchSlidesProgress: !0, slideToClickedSlide: !1 }), S(e.thumbs.swiper.params, { watchSlidesProgress: !0, slideToClickedSlide: !1 })) : C(t.swiper) && (e.thumbs.swiper = new a(S({}, t.swiper, { watchSlidesVisibility: !0, watchSlidesProgress: !0, slideToClickedSlide: !1 })), e.thumbs.swiperCreated = !0), e.thumbs.swiper.$el.addClass(e.params.thumbs.thumbsContainerClass), e.thumbs.swiper.on("tap", e.thumbs.onThumbClick), !0 }, onThumbClick: function () { var e = this, t = e.thumbs.swiper; if (t) { var a = t.clickedIndex, i = t.clickedSlide; if (!(i && m(i).hasClass(e.params.thumbs.slideThumbActiveClass) || null == a)) { var s; if (s = t.params.loop ? parseInt(m(t.clickedSlide).attr("data-swiper-slide-index"), 10) : a, e.params.loop) { var r = e.activeIndex; e.slides.eq(r).hasClass(e.params.slideDuplicateClass) && (e.loopFix(), e._clientLeft = e.$wrapperEl[0].clientLeft, r = e.activeIndex); var n = e.slides.eq(r).prevAll('[data-swiper-slide-index="' + s + '"]').eq(0).index(), l = e.slides.eq(r).nextAll('[data-swiper-slide-index="' + s + '"]').eq(0).index(); s = void 0 === n ? l : void 0 === l ? n : l - r < r - n ? l : n } e.slideTo(s) } } }, update: function (e) { var t = this, a = t.thumbs.swiper; if (a) { var i = "auto" === a.params.slidesPerView ? a.slidesPerViewDynamic() : a.params.slidesPerView, s = t.params.thumbs.autoScrollOffset, r = s && !a.params.loop; if (t.realIndex !== a.realIndex || r) { var n, l, o = a.activeIndex; if (a.params.loop) { a.slides.eq(o).hasClass(a.params.slideDuplicateClass) && (a.loopFix(), a._clientLeft = a.$wrapperEl[0].clientLeft, o = a.activeIndex); var d = a.slides.eq(o).prevAll('[data-swiper-slide-index="' + t.realIndex + '"]').eq(0).index(), p = a.slides.eq(o).nextAll('[data-swiper-slide-index="' + t.realIndex + '"]').eq(0).index(); n = void 0 === d ? p : void 0 === p ? d : p - o == o - d ? o : p - o < o - d ? p : d, l = t.activeIndex > t.previousIndex ? "next" : "prev" } else l = (n = t.realIndex) > t.previousIndex ? "next" : "prev"; r && (n += "next" === l ? s : -1 * s), a.visibleSlidesIndexes && a.visibleSlidesIndexes.indexOf(n) < 0 && (a.params.centeredSlides ? n = n > o ? n - Math.floor(i / 2) + 1 : n + Math.floor(i / 2) - 1 : n > o && (n = n - i + 1), a.slideTo(n, e ? 0 : void 0)) } var u = 1, c = t.params.thumbs.slideThumbActiveClass; if (t.params.slidesPerView > 1 && !t.params.centeredSlides && (u = t.params.slidesPerView), t.params.thumbs.multipleActiveThumbs || (u = 1), u = Math.floor(u), a.slides.removeClass(c), a.params.loop || a.params.virtual && a.params.virtual.enabled) for (var h = 0; h < u; h += 1)a.$wrapperEl.children('[data-swiper-slide-index="' + (t.realIndex + h) + '"]').addClass(c); else for (var v = 0; v < u; v += 1)a.slides.eq(t.realIndex + v).addClass(c) } } }, ce = [q, _, { name: "mousewheel", params: { mousewheel: { enabled: !1, releaseOnEdges: !1, invert: !1, forceToAxis: !1, sensitivity: 1, eventsTarget: "container", thresholdDelta: null, thresholdTime: null } }, create: function () { M(this, { mousewheel: { enabled: !1, lastScrollTime: x(), lastEventBeforeSnap: void 0, recentWheelEvents: [], enable: U.enable, disable: U.disable, handle: U.handle, handleMouseEnter: U.handleMouseEnter, handleMouseLeave: U.handleMouseLeave, animateSlider: U.animateSlider, releaseScroll: U.releaseScroll } }) }, on: { init: function (e) { !e.params.mousewheel.enabled && e.params.cssMode && e.mousewheel.disable(), e.params.mousewheel.enabled && e.mousewheel.enable() }, destroy: function (e) { e.params.cssMode && e.mousewheel.enable(), e.mousewheel.enabled && e.mousewheel.disable() } } }, { name: "navigation", params: { navigation: { nextEl: null, prevEl: null, hideOnClick: !1, disabledClass: "swiper-button-disabled", hiddenClass: "swiper-button-hidden", lockClass: "swiper-button-lock" } }, create: function () { M(this, { navigation: t({}, K) }) }, on: { init: function (e) { e.navigation.init(), e.navigation.update() }, toEdge: function (e) { e.navigation.update() }, fromEdge: function (e) { e.navigation.update() }, destroy: function (e) { e.navigation.destroy() }, click: function (e, t) { var a, i = e.navigation, s = i.$nextEl, r = i.$prevEl; !e.params.navigation.hideOnClick || m(t.target).is(r) || m(t.target).is(s) || (s ? a = s.hasClass(e.params.navigation.hiddenClass) : r && (a = r.hasClass(e.params.navigation.hiddenClass)), !0 === a ? e.emit("navigationShow") : e.emit("navigationHide"), s && s.toggleClass(e.params.navigation.hiddenClass), r && r.toggleClass(e.params.navigation.hiddenClass)) } } }, { name: "pagination", params: { pagination: { el: null, bulletElement: "span", clickable: !1, hideOnClick: !1, renderBullet: null, renderProgressbar: null, renderFraction: null, renderCustom: null, progressbarOpposite: !1, type: "bullets", dynamicBullets: !1, dynamicMainBullets: 1, formatFractionCurrent: function (e) { return e }, formatFractionTotal: function (e) { return e }, bulletClass: "swiper-pagination-bullet", bulletActiveClass: "swiper-pagination-bullet-active", modifierClass: "swiper-pagination-", currentClass: "swiper-pagination-current", totalClass: "swiper-pagination-total", hiddenClass: "swiper-pagination-hidden", progressbarFillClass: "swiper-pagination-progressbar-fill", progressbarOppositeClass: "swiper-pagination-progressbar-opposite", clickableClass: "swiper-pagination-clickable", lockClass: "swiper-pagination-lock" } }, create: function () { M(this, { pagination: t({ dynamicBulletIndex: 0 }, Z) }) }, on: { init: function (e) { e.pagination.init(), e.pagination.render(), e.pagination.update() }, activeIndexChange: function (e) { (e.params.loop || void 0 === e.snapIndex) && e.pagination.update() }, snapIndexChange: function (e) { e.params.loop || e.pagination.update() }, slidesLengthChange: function (e) { e.params.loop && (e.pagination.render(), e.pagination.update()) }, snapGridLengthChange: function (e) { e.params.loop || (e.pagination.render(), e.pagination.update()) }, destroy: function (e) { e.pagination.destroy() }, click: function (e, t) { e.params.pagination.el && e.params.pagination.hideOnClick && e.pagination.$el.length > 0 && !m(t.target).hasClass(e.params.pagination.bulletClass) && (!0 === e.pagination.$el.hasClass(e.params.pagination.hiddenClass) ? e.emit("paginationShow") : e.emit("paginationHide"), e.pagination.$el.toggleClass(e.params.pagination.hiddenClass)) } } }, { name: "scrollbar", params: { scrollbar: { el: null, dragSize: "auto", hide: !1, draggable: !1, snapOnRelease: !0, lockClass: "swiper-scrollbar-lock", dragClass: "swiper-scrollbar-drag" } }, create: function () { M(this, { scrollbar: t({ isTouched: !1, timeout: null, dragTimeout: null }, J) }) }, on: { init: function (e) { e.scrollbar.init(), e.scrollbar.updateSize(), e.scrollbar.setTranslate() }, update: function (e) { e.scrollbar.updateSize() }, resize: function (e) { e.scrollbar.updateSize() }, observerUpdate: function (e) { e.scrollbar.updateSize() }, setTranslate: function (e) { e.scrollbar.setTranslate() }, setTransition: function (e, t) { e.scrollbar.setTransition(t) }, destroy: function (e) { e.scrollbar.destroy() } } }, { name: "parallax", params: { parallax: { enabled: !1 } }, create: function () { M(this, { parallax: t({}, Q) }) }, on: { beforeInit: function (e) { e.params.parallax.enabled && (e.params.watchSlidesProgress = !0, e.originalParams.watchSlidesProgress = !0) }, init: function (e) { e.params.parallax.enabled && e.parallax.setTranslate() }, setTranslate: function (e) { e.params.parallax.enabled && e.parallax.setTranslate() }, setTransition: function (e, t) { e.params.parallax.enabled && e.parallax.setTransition(t) } } }, { name: "zoom", params: { zoom: { enabled: !1, maxRatio: 3, minRatio: 1, toggle: !0, containerClass: "swiper-zoom-container", zoomedSlideClass: "swiper-slide-zoomed" } }, create: function () { var e = this; M(e, { zoom: t({ enabled: !1, scale: 1, currentScale: 1, isScaling: !1, gesture: { $slideEl: void 0, slideWidth: void 0, slideHeight: void 0, $imageEl: void 0, $imageWrapEl: void 0, maxRatio: 3 }, image: { isTouched: void 0, isMoved: void 0, currentX: void 0, currentY: void 0, minX: void 0, minY: void 0, maxX: void 0, maxY: void 0, width: void 0, height: void 0, startX: void 0, startY: void 0, touchesStart: {}, touchesCurrent: {} }, velocity: { x: void 0, y: void 0, prevPositionX: void 0, prevPositionY: void 0, prevTime: void 0 } }, ee) }); var a = 1; Object.defineProperty(e.zoom, "scale", { get: function () { return a }, set: function (t) { if (a !== t) { var i = e.zoom.gesture.$imageEl ? e.zoom.gesture.$imageEl[0] : void 0, s = e.zoom.gesture.$slideEl ? e.zoom.gesture.$slideEl[0] : void 0; e.emit("zoomChange", t, i, s) } a = t } }) }, on: { init: function (e) { e.params.zoom.enabled && e.zoom.enable() }, destroy: function (e) { e.zoom.disable() }, touchStart: function (e, t) { e.zoom.enabled && e.zoom.onTouchStart(t) }, touchEnd: function (e, t) { e.zoom.enabled && e.zoom.onTouchEnd(t) }, doubleTap: function (e, t) { e.params.zoom.enabled && e.zoom.enabled && e.params.zoom.toggle && e.zoom.toggle(t) }, transitionEnd: function (e) { e.zoom.enabled && e.params.zoom.enabled && e.zoom.onTransitionEnd() }, slideChange: function (e) { e.zoom.enabled && e.params.zoom.enabled && e.params.cssMode && e.zoom.onTransitionEnd() } } }, { name: "lazy", params: { lazy: { checkInView: !1, enabled: !1, loadPrevNext: !1, loadPrevNextAmount: 1, loadOnTransitionStart: !1, scrollingElement: "", elementClass: "swiper-lazy", loadingClass: "swiper-lazy-loading", loadedClass: "swiper-lazy-loaded", preloaderClass: "swiper-lazy-preloader" } }, create: function () { M(this, { lazy: t({ initialImageLoaded: !1 }, te) }) }, on: { beforeInit: function (e) { e.params.lazy.enabled && e.params.preloadImages && (e.params.preloadImages = !1) }, init: function (e) { e.params.lazy.enabled && !e.params.loop && 0 === e.params.initialSlide && (e.params.lazy.checkInView ? e.lazy.checkInViewOnLoad() : e.lazy.load()) }, scroll: function (e) { e.params.freeMode && !e.params.freeModeSticky && e.lazy.load() }, resize: function (e) { e.params.lazy.enabled && e.lazy.load() }, scrollbarDragMove: function (e) { e.params.lazy.enabled && e.lazy.load() }, transitionStart: function (e) { e.params.lazy.enabled && (e.params.lazy.loadOnTransitionStart || !e.params.lazy.loadOnTransitionStart && !e.lazy.initialImageLoaded) && e.lazy.load() }, transitionEnd: function (e) { e.params.lazy.enabled && !e.params.lazy.loadOnTransitionStart && e.lazy.load() }, slideChange: function (e) { e.params.lazy.enabled && e.params.cssMode && e.lazy.load() } } }, { name: "controller", params: { controller: { control: void 0, inverse: !1, by: "slide" } }, create: function () { M(this, { controller: t({ control: this.params.controller.control }, ae) }) }, on: { update: function (e) { e.controller.control && e.controller.spline && (e.controller.spline = void 0, delete e.controller.spline) }, resize: function (e) { e.controller.control && e.controller.spline && (e.controller.spline = void 0, delete e.controller.spline) }, observerUpdate: function (e) { e.controller.control && e.controller.spline && (e.controller.spline = void 0, delete e.controller.spline) }, setTranslate: function (e, t, a) { e.controller.control && e.controller.setTranslate(t, a) }, setTransition: function (e, t, a) { e.controller.control && e.controller.setTransition(t, a) } } }, { name: "a11y", params: { a11y: { enabled: !0, notificationClass: "swiper-notification", prevSlideMessage: "Previous slide", nextSlideMessage: "Next slide", firstSlideMessage: "This is the first slide", lastSlideMessage: "This is the last slide", paginationBulletMessage: "Go to slide {{index}}", containerMessage: null, containerRoleDescriptionMessage: null, itemRoleDescriptionMessage: null } }, create: function () { M(this, { a11y: t({}, ie, { liveRegion: m('<span class="' + this.params.a11y.notificationClass + '" aria-live="assertive" aria-atomic="true"></span>') }) }) }, on: { afterInit: function (e) { e.params.a11y.enabled && (e.a11y.init(), e.a11y.updateNavigation()) }, toEdge: function (e) { e.params.a11y.enabled && e.a11y.updateNavigation() }, fromEdge: function (e) { e.params.a11y.enabled && e.a11y.updateNavigation() }, paginationUpdate: function (e) { e.params.a11y.enabled && e.a11y.updatePagination() }, destroy: function (e) { e.params.a11y.enabled && e.a11y.destroy() } } }, { name: "history", params: { history: { enabled: !1, replaceState: !1, key: "slides" } }, create: function () { M(this, { history: t({}, se) }) }, on: { init: function (e) { e.params.history.enabled && e.history.init() }, destroy: function (e) { e.params.history.enabled && e.history.destroy() }, transitionEnd: function (e) { e.history.initialized && e.history.setHistory(e.params.history.key, e.activeIndex) }, slideChange: function (e) { e.history.initialized && e.params.cssMode && e.history.setHistory(e.params.history.key, e.activeIndex) } } }, { name: "hash-navigation", params: { hashNavigation: { enabled: !1, replaceState: !1, watchState: !1 } }, create: function () { M(this, { hashNavigation: t({ initialized: !1 }, re) }) }, on: { init: function (e) { e.params.hashNavigation.enabled && e.hashNavigation.init() }, destroy: function (e) { e.params.hashNavigation.enabled && e.hashNavigation.destroy() }, transitionEnd: function (e) { e.hashNavigation.initialized && e.hashNavigation.setHash() }, slideChange: function (e) { e.hashNavigation.initialized && e.params.cssMode && e.hashNavigation.setHash() } } }, { name: "autoplay", params: { autoplay: { enabled: !1, delay: 3e3, waitForTransition: !0, disableOnInteraction: !0, stopOnLastSlide: !1, reverseDirection: !1 } }, create: function () { M(this, { autoplay: t({}, ne, { running: !1, paused: !1 }) }) }, on: { init: function (e) { e.params.autoplay.enabled && (e.autoplay.start(), r().addEventListener("visibilitychange", e.autoplay.onVisibilityChange)) }, beforeTransitionStart: function (e, t, a) { e.autoplay.running && (a || !e.params.autoplay.disableOnInteraction ? e.autoplay.pause(t) : e.autoplay.stop()) }, sliderFirstMove: function (e) { e.autoplay.running && (e.params.autoplay.disableOnInteraction ? e.autoplay.stop() : e.autoplay.pause()) }, touchEnd: function (e) { e.params.cssMode && e.autoplay.paused && !e.params.autoplay.disableOnInteraction && e.autoplay.run() }, destroy: function (e) { e.autoplay.running && e.autoplay.stop(), r().removeEventListener("visibilitychange", e.autoplay.onVisibilityChange) } } }, { name: "effect-fade", params: { fadeEffect: { crossFade: !1 } }, create: function () { M(this, { fadeEffect: t({}, le) }) }, on: { beforeInit: function (e) { if ("fade" === e.params.effect) { e.classNames.push(e.params.containerModifierClass + "fade"); var t = { slidesPerView: 1, slidesPerColumn: 1, slidesPerGroup: 1, watchSlidesProgress: !0, spaceBetween: 0, virtualTranslate: !0 }; S(e.params, t), S(e.originalParams, t) } }, setTranslate: function (e) { "fade" === e.params.effect && e.fadeEffect.setTranslate() }, setTransition: function (e, t) { "fade" === e.params.effect && e.fadeEffect.setTransition(t) } } }, { name: "effect-cube", params: { cubeEffect: { slideShadows: !0, shadow: !0, shadowOffset: 20, shadowScale: .94 } }, create: function () { M(this, { cubeEffect: t({}, oe) }) }, on: { beforeInit: function (e) { if ("cube" === e.params.effect) { e.classNames.push(e.params.containerModifierClass + "cube"), e.classNames.push(e.params.containerModifierClass + "3d"); var t = { slidesPerView: 1, slidesPerColumn: 1, slidesPerGroup: 1, watchSlidesProgress: !0, resistanceRatio: 0, spaceBetween: 0, centeredSlides: !1, virtualTranslate: !0 }; S(e.params, t), S(e.originalParams, t) } }, setTranslate: function (e) { "cube" === e.params.effect && e.cubeEffect.setTranslate() }, setTransition: function (e, t) { "cube" === e.params.effect && e.cubeEffect.setTransition(t) } } }, { name: "effect-flip", params: { flipEffect: { slideShadows: !0, limitRotation: !0 } }, create: function () { M(this, { flipEffect: t({}, de) }) }, on: { beforeInit: function (e) { if ("flip" === e.params.effect) { e.classNames.push(e.params.containerModifierClass + "flip"), e.classNames.push(e.params.containerModifierClass + "3d"); var t = { slidesPerView: 1, slidesPerColumn: 1, slidesPerGroup: 1, watchSlidesProgress: !0, spaceBetween: 0, virtualTranslate: !0 }; S(e.params, t), S(e.originalParams, t) } }, setTranslate: function (e) { "flip" === e.params.effect && e.flipEffect.setTranslate() }, setTransition: function (e, t) { "flip" === e.params.effect && e.flipEffect.setTransition(t) } } }, { name: "effect-coverflow", params: { coverflowEffect: { rotate: 50, stretch: 0, depth: 100, scale: 1, modifier: 1, slideShadows: !0 } }, create: function () { M(this, { coverflowEffect: t({}, pe) }) }, on: { beforeInit: function (e) { "coverflow" === e.params.effect && (e.classNames.push(e.params.containerModifierClass + "coverflow"), e.classNames.push(e.params.containerModifierClass + "3d"), e.params.watchSlidesProgress = !0, e.originalParams.watchSlidesProgress = !0) }, setTranslate: function (e) { "coverflow" === e.params.effect && e.coverflowEffect.setTranslate() }, setTransition: function (e, t) { "coverflow" === e.params.effect && e.coverflowEffect.setTransition(t) } } }, { name: "thumbs", params: { thumbs: { swiper: null, multipleActiveThumbs: !0, autoScrollOffset: 0, slideThumbActiveClass: "swiper-slide-thumb-active", thumbsContainerClass: "swiper-container-thumbs" } }, create: function () { M(this, { thumbs: t({ swiper: null, initialized: !1 }, ue) }) }, on: { beforeInit: function (e) { var t = e.params.thumbs; t && t.swiper && (e.thumbs.init(), e.thumbs.update(!0)) }, slideChange: function (e) { e.thumbs.swiper && e.thumbs.update() }, update: function (e) { e.thumbs.swiper && e.thumbs.update() }, resize: function (e) { e.thumbs.swiper && e.thumbs.update() }, observerUpdate: function (e) { e.thumbs.swiper && e.thumbs.update() }, setTransition: function (e, t) { var a = e.thumbs.swiper; a && a.setTransition(t) }, beforeDestroy: function (e) { var t = e.thumbs.swiper; t && e.thumbs.swiperCreated && t && t.destroy() } } }]; return R.use(ce), R }));\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/swiper/vue-awesome-swiper.min.js b/src/Plugins/Theme.Modern/Content/swiper/vue-awesome-swiper.min.jsnew file mode 100644index 000000000..194afdbda--- /dev/null+++ b/src/Plugins/Theme.Modern/Content/swiper/vue-awesome-swiper.min.js@@ -0,0 +1,8 @@+/**+ * Minified by jsDelivr using Terser v3.14.1.+ * Original file: /npm/[email protected]/dist/vue-awesome-swiper.js+ *+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files+ */+!function (e, t) { "object" == typeof exports && "undefined" != typeof module ? t(exports, require("swiper"), require("vue")) : "function" == typeof define && define.amd ? define(["exports", "swiper", "vue"], t) : t((e = e || self).VueAwesomeSwiper = {}, e.Swiper, e.Vue) }(this, function (e, t, n) { "use strict"; var i; t = t && Object.prototype.hasOwnProperty.call(t, "default") ? t.default : t, n = n && Object.prototype.hasOwnProperty.call(n, "default") ? n.default : n, function (e) { e.SwiperComponent = "Swiper", e.SwiperSlideComponent = "SwiperSlide", e.SwiperDirective = "swiper", e.SwiperInstance = "$swiper" }(i || (i = {})); var o, r, l = Object.freeze({ containerClass: "swiper-container", wrapperClass: "swiper-wrapper", slideClass: "swiper-slide" }); !function (e) { e.Ready = "ready", e.ClickSlide = "clickSlide" }(o || (o = {})), function (e) { e.AutoUpdate = "autoUpdate", e.AutoDestroy = "autoDestroy", e.DeleteInstanceOnDestroy = "deleteInstanceOnDestroy", e.CleanupStylesOnDestroy = "cleanupStylesOnDestroy" }(r || (r = {})); var a = ["init", "beforeDestroy", "slideChange", "slideChangeTransitionStart", "slideChangeTransitionEnd", "slideNextTransitionStart", "slideNextTransitionEnd", "slidePrevTransitionStart", "slidePrevTransitionEnd", "transitionStart", "transitionEnd", "touchStart", "touchMove", "touchMoveOpposite", "sliderMove", "touchEnd", "click", "tap", "doubleTap", "imagesReady", "progress", "reachBeginning", "reachEnd", "fromEdge", "setTranslate", "setTransition", "resize", "observerUpdate", "beforeLoopFix", "loopFix"]; function s() { for (var e = 0, t = 0, n = arguments.length; t < n; t++)e += arguments[t].length; var i = Array(e), o = 0; for (t = 0; t < n; t++)for (var r = arguments[t], l = 0, a = r.length; l < a; l++, o++)i[o] = r[l]; return i } var d, u = function (e) { return e.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/\s+/g, "-").toLowerCase() }, p = function (e, t, n) { var i, r, l; if (e && !e.destroyed) { var a = (null === (i = t.composedPath) || void 0 === i ? void 0 : i.call(t)) || t.path; if ((null == t ? void 0 : t.target) && a) { var s = Array.from(e.slides), d = Array.from(a); if (s.includes(t.target) || d.some(function (e) { return s.includes(e) })) { var p = e.clickedIndex, c = Number(null === (l = null === (r = e.clickedSlide) || void 0 === r ? void 0 : r.dataset) || void 0 === l ? void 0 : l.swiperSlideIndex), v = Number.isInteger(c) ? c : null; n(o.ClickSlide, p, v), n(u(o.ClickSlide), p, v) } } } }, c = function (e, t) { a.forEach(function (n) { e.on(n, function () { for (var e = arguments, i = [], o = 0; o < arguments.length; o++)i[o] = e[o]; t.apply(void 0, s([n], i)); var r = u(n); r !== n && t.apply(void 0, s([r], i)) }) }) }, v = "instanceName"; function f(e, t) { var n = function (e, t) { var n, i, o, r, l = null === (i = null === (n = e.data) || void 0 === n ? void 0 : n.attrs) || void 0 === i ? void 0 : i[t]; return void 0 !== l ? l : null === (r = null === (o = e.data) || void 0 === o ? void 0 : o.attrs) || void 0 === r ? void 0 : r[u(t)] }, a = function (e, t, o) { return t.arg || n(o, v) || e.id || i.SwiperInstance }, s = function (e, t, n) { var i = a(e, t, n); return n.context[i] || null }, d = function (e) { return e.value || t }, f = function (e) { return [!0, void 0, null, ""].includes(e) }, h = function (e) { var t, n, i = (null === (t = e.data) || void 0 === t ? void 0 : t.on) || (null === (n = e.componentOptions) || void 0 === n ? void 0 : n.listeners); return function (e) { for (var t, n = arguments, o = [], r = 1; r < arguments.length; r++)o[r - 1] = n[r]; var l = null === (t = i) || void 0 === t ? void 0 : t[e]; l && l.fns.apply(l, o) } }; return { bind: function (e, t, n) { -1 === e.className.indexOf(l.containerClass) && (e.className += (e.className ? " " : "") + l.containerClass), e.addEventListener("click", function (i) { var o = h(n), r = s(e, t, n); p(r, i, o) }) }, inserted: function (t, n, i) { var r = i.context, l = d(n), s = a(t, n, i), u = h(i), p = r, v = null == p ? void 0 : p[s]; v && !v.destroyed || (v = new e(t, l), p[s] = v, c(v, u), u(o.Ready, v)) }, componentUpdated: function (e, t, i) { var o, l, a, u, p, c, v, h, w, S, y, m, C = n(i, r.AutoUpdate); if (f(C)) { var g = s(e, t, i); if (g) { var I = d(t).loop; I && (null === (l = null === (o = g) || void 0 === o ? void 0 : o.loopDestroy) || void 0 === l || l.call(o)), null === (a = null == g ? void 0 : g.update) || void 0 === a || a.call(g), null === (p = null === (u = g.navigation) || void 0 === u ? void 0 : u.update) || void 0 === p || p.call(u), null === (v = null === (c = g.pagination) || void 0 === c ? void 0 : c.render) || void 0 === v || v.call(c), null === (w = null === (h = g.pagination) || void 0 === h ? void 0 : h.update) || void 0 === w || w.call(h), I && (null === (y = null === (S = g) || void 0 === S ? void 0 : S.loopCreate) || void 0 === y || y.call(S), null === (m = null == g ? void 0 : g.update) || void 0 === m || m.call(g)) } } }, unbind: function (e, t, i) { var o, l = n(i, r.AutoDestroy); if (f(l)) { var a = s(e, t, i); a && a.initialized && (null === (o = null == a ? void 0 : a.destroy) || void 0 === o || o.call(a, f(n(i, r.DeleteInstanceOnDestroy)), f(n(i, r.CleanupStylesOnDestroy)))) } } } } function h(e) { var t; return n.extend({ name: i.SwiperComponent, props: (t = { defaultOptions: { type: Object, required: !1, default: function () { return {} } }, options: { type: Object, required: !1 } }, t[r.AutoUpdate] = { type: Boolean, default: !0 }, t[r.AutoDestroy] = { type: Boolean, default: !0 }, t[r.DeleteInstanceOnDestroy] = { type: Boolean, required: !1, default: !0 }, t[r.CleanupStylesOnDestroy] = { type: Boolean, required: !1, default: !0 }, t), data: function () { var e; return (e = {})[i.SwiperInstance] = null, e }, computed: { swiperInstance: { cache: !1, set: function (e) { this[i.SwiperInstance] = e }, get: function () { return this[i.SwiperInstance] } }, swiperOptions: function () { return this.options || this.defaultOptions }, wrapperClass: function () { return this.swiperOptions.wrapperClass || l.wrapperClass } }, methods: { handleSwiperClick: function (e) { p(this.swiperInstance, e, this.$emit.bind(this)) }, autoReLoopSwiper: function () { var e, t; if (this.swiperInstance && this.swiperOptions.loop) { var n = this.swiperInstance; null === (e = null == n ? void 0 : n.loopDestroy) || void 0 === e || e.call(n), null === (t = null == n ? void 0 : n.loopCreate) || void 0 === t || t.call(n) } }, updateSwiper: function () { var e, t, n, i, o, l, a, s; this[r.AutoUpdate] && this.swiperInstance && (this.autoReLoopSwiper(), null === (t = null === (e = this.swiperInstance) || void 0 === e ? void 0 : e.update) || void 0 === t || t.call(e), null === (i = null === (n = this.swiperInstance.navigation) || void 0 === n ? void 0 : n.update) || void 0 === i || i.call(n), null === (l = null === (o = this.swiperInstance.pagination) || void 0 === o ? void 0 : o.render) || void 0 === l || l.call(o), null === (s = null === (a = this.swiperInstance.pagination) || void 0 === a ? void 0 : a.update) || void 0 === s || s.call(a)) }, destroySwiper: function () { var e, t; this[r.AutoDestroy] && this.swiperInstance && this.swiperInstance.initialized && (null === (t = null === (e = this.swiperInstance) || void 0 === e ? void 0 : e.destroy) || void 0 === t || t.call(e, this[r.DeleteInstanceOnDestroy], this[r.CleanupStylesOnDestroy])) }, initSwiper: function () { this.swiperInstance = new e(this.$el, this.swiperOptions), c(this.swiperInstance, this.$emit.bind(this)), this.$emit(o.Ready, this.swiperInstance) } }, mounted: function () { this.swiperInstance || this.initSwiper() }, activated: function () { this.updateSwiper() }, updated: function () { this.updateSwiper() }, beforeDestroy: function () { this.$nextTick(this.destroySwiper) }, render: function (e) { return e("div", { staticClass: l.containerClass, on: { click: this.handleSwiperClick } }, [this.$slots[d.ParallaxBg], e("div", { class: this.wrapperClass }, this.$slots.default), this.$slots[d.Pagination], this.$slots[d.PrevButton], this.$slots[d.NextButton], this.$slots[d.Scrollbar]]) } }) } !function (e) { e.ParallaxBg = "parallax-bg", e.Pagination = "pagination", e.Scrollbar = "scrollbar", e.PrevButton = "button-prev", e.NextButton = "button-next" }(d || (d = {})); var w = n.extend({ name: i.SwiperSlideComponent, computed: { slideClass: function () { var e, t; return (null === (t = null === (e = this.$parent) || void 0 === e ? void 0 : e.swiperOptions) || void 0 === t ? void 0 : t.slideClass) || l.slideClass } }, methods: { update: function () { var e, t = this.$parent; t[r.AutoUpdate] && (null === (e = null == t ? void 0 : t.swiperInstance) || void 0 === e || e.update()) } }, mounted: function () { this.update() }, updated: function () { this.update() }, render: function (e) { return e("div", { class: this.slideClass }, this.$slots.default) } }), S = function (e) { var t = function (n, o) { if (!t.installed) { var r = h(e); o && (r.options.props.defaultOptions.default = function () { return o }), n.component(i.SwiperComponent, r), n.component(i.SwiperSlideComponent, w), n.directive(i.SwiperDirective, f(e, o)), t.installed = !0 } }; return t }; var y = function (e) { var t; return (t = { version: "4.1.1", install: S(e), directive: f(e) })[i.SwiperComponent] = h(e), t[i.SwiperSlideComponent] = w, t }(t), m = y.version, C = y.install, g = y.directive, I = y.Swiper, O = y.SwiperSlide; e.Swiper = I, e.SwiperSlide = O, e.default = y, e.directive = g, e.install = C, e.version = m, Object.defineProperty(e, "__esModule", { value: !0 }) });+//# sourceMappingURL=/sm/20d7110b3463446defd51923206a17b7ff00b136457c620768cd77a8c5a24bfc.map\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Content/theme.jpg b/src/Plugins/Theme.Modern/Content/theme.jpgnew file mode 100644index 000000000..79f664e31Binary files /dev/null and b/src/Plugins/Theme.Modern/Content/theme.jpg differdiff --git a/src/Plugins/Theme.Modern/Manifest.cs b/src/Plugins/Theme.Modern/Manifest.csnew file mode 100644index 000000000..7c0629a9c--- /dev/null+++ b/src/Plugins/Theme.Modern/Manifest.cs@@ -0,0 +1,9 @@+using Grand.Infrastructure.Plugins;++[assembly: PluginInfo(+ FriendlyName = "Modern theme (beta)",+ Group = "Themes",+ SystemName = "Theme.Modern",+ Author = "grandnode team",+ Version = "1.0.0"+)]\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/ModernThemePlugin.cs b/src/Plugins/Theme.Modern/ModernThemePlugin.csnew file mode 100644index 000000000..a4ad7e1b5--- /dev/null+++ b/src/Plugins/Theme.Modern/ModernThemePlugin.cs@@ -0,0 +1,14 @@+using Grand.Infrastructure.Plugins;++namespace Theme.Modern+{+ /// <summary>+ /// Plugin+ /// </summary>+ public class MinimalThemePlugin : BasePlugin, IPlugin+ {+ public MinimalThemePlugin()+ {+ }+ }+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/ModernThemeView.cs b/src/Plugins/Theme.Modern/ModernThemeView.csnew file mode 100644index 000000000..e188bce22--- /dev/null+++ b/src/Plugins/Theme.Modern/ModernThemeView.cs@@ -0,0 +1,21 @@+using Grand.Web.Common.Themes;++namespace Theme.Modern;++public class ModernThemeView: IThemeView+{+ public string AreaName => "";+ public string ThemeName => "Modern";++ public ThemeInfo ThemeInfo => new ("Modern theme (beta)", "~/Plugins/Theme.Modern/Content/theme.jpg", "Minimal theme (beta)", false);++ public IEnumerable<string> GetViewLocations()+ {+ return new List<string> {+ "/Views/Modern/{1}/{0}.cshtml",+ "/Views/Modern/Shared/{0}.cshtml",+ "/Views/{1}/{0}.cshtml",+ "/Views/Shared/{0}.cshtml"+ };+ }+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/StartupApplication.cs b/src/Plugins/Theme.Modern/StartupApplication.csnew file mode 100644index 000000000..bcbf590d7--- /dev/null+++ b/src/Plugins/Theme.Modern/StartupApplication.cs@@ -0,0 +1,24 @@+using Grand.Infrastructure;+using Grand.Web.Common.Themes;+using Microsoft.AspNetCore.Builder;+using Microsoft.AspNetCore.Hosting;+using Microsoft.Extensions.Configuration;+using Microsoft.Extensions.DependencyInjection;++namespace Theme.Modern;++public class StartupApplication : IStartupApplication+{+ public void ConfigureServices(IServiceCollection services, IConfiguration configuration)+ {+ services.AddScoped<IThemeView, ModernThemeView>();+ }++ public int Priority => 10;++ public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)+ {+ }++ public bool BeforeConfigure => false;+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Theme.Modern.csproj b/src/Plugins/Theme.Modern/Theme.Modern.csprojnew file mode 100644index 000000000..f11784751--- /dev/null+++ b/src/Plugins/Theme.Modern/Theme.Modern.csproj@@ -0,0 +1,59 @@+<Project Sdk="Microsoft.NET.Sdk.Razor">+ <Import Project="..\..\Build\Grand.Common.props" />+ <PropertyGroup>+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>+ </PropertyGroup>++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">+ <OutputPath>..\..\Web\Grand.Web\Plugins\Theme.Modern\</OutputPath>+ <OutDir>$(OutputPath)</OutDir>+ </PropertyGroup>++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">+ <OutputPath>..\..\Web\Grand.Web\Plugins\Theme.Modern\</OutputPath>+ <OutDir>$(OutputPath)</OutDir>+ </PropertyGroup>++ <Target Name="PostBuild" AfterTargets="PostBuildEvent">+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Theme.Modern\refs" />+ </Target>++ <ItemGroup>+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">+ <Private>false</Private>+ </ProjectReference>+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">+ <Private>false</Private>+ </ProjectReference>+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">+ <Private>false</Private>+ </ProjectReference>+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">+ <Private>false</Private>+ </ProjectReference>+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">+ <Private>false</Private>+ </ProjectReference>+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">+ <Private>false</Private>+ <ExcludeAssets>all</ExcludeAssets>+ </ProjectReference>+ <ProjectReference Include="..\..\Web\Grand.Web\Grand.Web.csproj">+ <Private>false</Private>+ <ExcludeAssets>all</ExcludeAssets>+ </ProjectReference>+ </ItemGroup>++ <ItemGroup>+ <Folder Include="Views\" />+ </ItemGroup>+ <ItemGroup>+ <None Update="Content\**\*.*">+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>+ </None>+ <None Update="logo.jpg">+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>+ </None>+ </ItemGroup>++</Project>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/AddressAdd.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/AddressAdd.cshtmlnew file mode 100644index 000000000..4e7f96518--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/AddressAdd.cshtml@@ -0,0 +1,42 @@+@model CustomerAddressEditModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Addresses })+}+<vc:widget widget-zone="customer-address-add-before" additional-data="@Model"></vc:widget>+<validation-observer v-slot="{ handleSubmit }">+ <form asp-route="CustomerAddressAdd" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <div class="page account-page address-edit-page pl-lg-3 mb-3 pt-lg-0 pt-3">+ <h1 class="generalTitle h2"><div>@Loc["Account.CustomerAddresses.AddNew"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ <div asp-validation-summary="All" class="message-error"></div>+ @{+ var dataDictAddress = new ViewDataDictionary(ViewData);+ dataDictAddress.TemplateInfo.HtmlFieldPrefix = "Address";+ <partial name="Partials/CreateOrUpdateAddress" model="Model.Address" view-data="dataDictAddress" />+ }+ <vc:widget widget-zone="customer-address-add-form" additional-data="@Model"></vc:widget>+ <div class="buttons generalMarginSupporter mt-1 mb-1">+ <input type="submit" class="btn btn-info save-address-button" value="@Loc["Common.Save"]" />+ </div>+ </div>+ </form>+</validation-observer>+<vc:widget widget-zone="customer-address-add-after" additional-data="@Model"></vc:widget>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/AddressEdit.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/AddressEdit.cshtmlnew file mode 100644index 000000000..9d4ffc1cc--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/AddressEdit.cshtml@@ -0,0 +1,42 @@+@model CustomerAddressEditModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Addresses })+}+<vc:widget widget-zone="customer-address-edit-before" additional-data="@Model"></vc:widget>+<validation-observer v-slot="{ handleSubmit }">+ <form asp-route="CustomerAddressEdit" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <div class="page account-page address-edit-page pl-lg-3 mb-3 pt-lg-0 pt-3">+ <h1 class="h2 generalTitle"><div>@Loc["Account.CustomerAddresses.Edit"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ <div asp-validation-summary="All" class="message-error"></div>+ @{+ var dataDictAddress = new ViewDataDictionary(ViewData);+ dataDictAddress.TemplateInfo.HtmlFieldPrefix = "Address";+ <partial name="Partials/CreateOrUpdateAddress" model="Model.Address" view-data="dataDictAddress" />+ }+ <vc:widget widget-zone="customer-address-edit-form" additional-data="@Model"></vc:widget>+ <div class="buttons generalMarginSupporter">+ <input type="submit" class="btn btn-info save-address-button" value="@Loc["Common.Save"]" />+ </div>+ </div>+ </form>+</validation-observer>+<vc:widget widget-zone="customer-address-edit-after" additional-data="@Model"></vc:widget>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Addresses.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Addresses.cshtmlnew file mode 100644index 000000000..c177c962b--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Addresses.cshtml@@ -0,0 +1,177 @@+@model CustomerAddressListModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Addresses })+}+<div class="page account-page address-list-page pl-lg-3 pt-lg-0 pt-3">+ @Html.AntiForgeryToken()+ <h1 class="h2 generalTitle"><div>@Loc["Account.CustomerAddresses"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ <div class="w-100">+ <b-button variant="outline-secondary" class="add-address-button my-3" onclick="location.href='@Url.RouteUrl("CustomerAddressAdd")'">+ <b-icon icon="clipboard-plus"></b-icon> @Loc["Common.AddNew"]+ </b-button>+ </div>+ @if (Model.Addresses.Any())+ {+ <div class="address-list table-responsive">+ <table class="table table-bordered hover-table">+ <thead>+ <tr>+ <th scope="col">@Loc["Address.Fields.Name"]</th>+ <th scope="col">@Loc["Address.Fields.Address"]</th>+ <th scope="col"></th>+ </tr>+ </thead>+ <tbody>+ @for (int i = 0; i < Model.Addresses.Count; i++)+ {+ var address = Model.Addresses[i];+ <tr>+ <td>+ <h3 class="h5 mb-0">+ @address.FirstName @address.LastName+ </h3>+ @address.Email+ </td>+ <td>+ <ul class="m-0 p-0">+ @if (address.PhoneEnabled)+ {+ <li class="phone">+ <label class="mb-0"><strong>@Loc["Address.Fields.PhoneNumber"]:</strong></label>+ @address.PhoneNumber+ </li>+ }+ @if (address.FaxEnabled)+ {+ <li class="fax">+ <label class="mb-0"><strong>@Loc["Address.Fields.FaxNumber"]:</strong></label>+ @address.FaxNumber+ </li>+ }+ @if (address.CompanyEnabled && !String.IsNullOrEmpty(address.Company))+ {+ <li class="company">@address.Company</li>+ }+ @if (address.VatNumberEnabled && !String.IsNullOrEmpty(address.VatNumber))+ {+ <li class="vatnumber">@address.VatNumber</li>+ }+ @if (address.StreetAddressEnabled)+ {+ <li class="address1">+ @address.Address1+ </li>+ }+ @if (address.StreetAddress2Enabled && !String.IsNullOrEmpty(address.Address2))+ {+ <li class="address2">+ @address.Address2+ </li>+ }+ @if (address.CityEnabled || address.StateProvinceEnabled || address.ZipPostalCodeEnabled)+ {+ var cityStateZip = "";+ if (address.CityEnabled)+ {+ cityStateZip = address.City;+ if (address.StateProvinceEnabled || address.ZipPostalCodeEnabled)+ {+ cityStateZip += ",";+ }+ }+ if (address.StateProvinceEnabled)+ {+ if (!String.IsNullOrEmpty(cityStateZip))+ {+ cityStateZip += " ";+ }+ cityStateZip += address.StateProvinceName;+ }+ if (address.ZipPostalCodeEnabled)+ {+ if (!String.IsNullOrEmpty(cityStateZip))+ {+ cityStateZip += " ";+ }+ cityStateZip += address.ZipPostalCode;+ }+ <li class="city-state-zip">+ @cityStateZip+ </li>+ }+ @if (address.CountryEnabled && !String.IsNullOrEmpty(address.CountryName))+ {+ <li class="country">+ @address.CountryName+ </li>+ }+ @if (!String.IsNullOrEmpty(address.FormattedCustomAddressAttributes))+ {+ <li class="custom-attributes-view">+ @Html.Raw(address.FormattedCustomAddressAttributes)+ </li>+ }+ </ul>+ </td>+ <td>+ <div class="buttons d-flex flex-column">+ <button class="btn btn-secondary edit-address-button" onclick="location.href='@(Url.RouteUrl("CustomerAddressEdit", new { addressId = address.Id }))'">+ @Loc["Common.Edit"]+ </button>+ <button class="btn btn-danger delete-address-button mt-1" onclick="deletecustomeraddress('@(address.Id)')">+ @Loc["Common.Delete"]+ </button>+ </div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ <script asp-location="Footer">+ function deletecustomeraddress(addressId) {+ if (confirm('@Loc["Admin.Common.AreYouSure"]')) {++ var bodyFormData = new FormData();+ bodyFormData.append('addressId', addressId);+ bodyFormData.append('__RequestVerificationToken', document.querySelector('input[name=__RequestVerificationToken]').value);++ axios({+ url: '@Url.Action("AddressDelete", "Account")',+ data: bodyFormData,+ method: 'post',+ }).then(function (response) {+ location = response.data.redirect;+ }).catch(function (error) {+ alert(error)+ })+ }+ }+ </script>+ }+ else+ {+ <div class="no-data alert alert-info">+ @Loc["Account.CustomerAddresses.NoAddresses"]+ </div>+ }+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Auctions.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Auctions.cshtmlnew file mode 100644index 000000000..ed5df48e3--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Auctions.cshtml@@ -0,0 +1,163 @@+@model CustomerAuctionsModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";+ //title+ pagebuilder.AddTitleParts(Loc["Title.Auctions"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Auctions })+}++<div class="page account-page auction-list-page pl-lg-3 pt-3 pt-lg-0">+ <h1 class="h2 generalTitle"><div>@Loc["Account.CustomerAuctions"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (Model.ProductBidList.Any())+ {+ <div>+ <b-tabs content-class="mt-3">+ <b-tab title="@Loc["Account.Auctions.Tab.Ongoing"]" active>+ @if (Model.ProductBidList.Where(x => !x.Ended).Any())+ {+ <div id="auction-table-ongoing" class="table-responsive">+ <table class="table">+ <thead role="rowgroup">+ <tr role="row">+ <th role="columnheader"><div>@Loc["Account.CustomerAuctions.ProductName"]</div></th>+ <th role="columnheader"><div>@Loc["Account.CustomerAuctions.Status"]</div></th>+ <th role="columnheader"><div>@Loc["Account.CustomerAuctions.Highestbid"]</div></th>+ <th role="columnheader"><div>@Loc["Account.CustomerAuctions.AuctionEndTime"]</div></th>+ </tr>+ </thead>+ <tbody role="rowgroup">+ @{+ var ongoing = Model.ProductBidList.Where(x => !x.Ended);+ }+ @foreach (var item in ongoing)+ {+ <tr role="row">+ <td>+ <div><a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })">@item.ProductName</a></div>+ </td>+ @if (item.HighestBidder)+ {+ <td>+ <div>+ <span class="text-success">@Loc["Account.CustomerAuctions.Status.HighestBidder"]</span>+ </div>+ </td>+ }+ else+ {+ <td>+ <div>+ <span class="text-danger">@Loc["Account.CustomerAuctions.Status.Outbid"]</span>+ </div>+ </td>+ }+ <td>+ <div>+ @item.CurrentBidAmount @if (item.CurrentBidAmountValue > item.BidAmountValue)+ {<small>(@item.BidAmount)</small>}+ </div>+ </td>+ <td>+ <div>@item.EndBidDate</div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ else+ {+ <div class="no-data alert alert-info">+ @Loc["Account.Auctions.NoOngoingAuctions"]+ </div>+ }+ </b-tab>+ <b-tab title="@Loc["Account.Auctions.Tab.Ended"]">+ @if (Model.ProductBidList.Where(x => x.Ended).Any())+ {++ <div id="auction-table-ended" class="table-responsive">+ <table class="table">+ <thead role="rowgroup">+ <tr role="row">+ <th role="columnheader"><div>@Loc["Account.CustomerAuctions.ProductName"]</div></th>+ <th role="columnheader"><div>@Loc["Account.CustomerAuctions.Status"]</div></th>+ <th role="columnheader"><div>@Loc["Account.CustomerAuctions.Highestbid"]</div></th>+ <th role="columnheader"><div>@Loc["Account.CustomerAuctions.AuctionEndTime"]</div></th>+ </tr>+ </thead>+ <tbody role="rowgroup">+ @{+ var ended = Model.ProductBidList.Where(x => x.Ended);+ }++ @foreach (var item in ended)+ {+ <tr role="row">+ <td>+ <div><a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })">@item.ProductName</a></div>+ </td>+ @if (item.HighestBidder)+ {+ <td>+ <div>+ <span class="text-success">@Loc["Account.CustomerAuctions.Status.HighestBidder"]</span>+ </div>+ </td>+ }+ else+ {+ <td>+ <div>+ <span class="text-danger">@Loc["Account.CustomerAuctions.Status.Outbid"]</span>+ </div>+ </td>+ }+ <td>+ <div>+ @item.CurrentBidAmount @if (item.CurrentBidAmountValue > item.BidAmountValue)+ {<small>(@item.BidAmount)</small>}+ </div>+ </td>+ <td>+ <div>@item.EndBidDate</div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ else+ {+ <div class="no-data alert alert-info">+ @Loc["Account.Auctions.NoOngoingAuctions"]+ </div>+ }+ </b-tab>+ </b-tabs>+ </div>+ }+ else+ {+ <div class="no-data alert alert-info">+ @Loc["Account.Auctions.NoAuctions"]+ </div>+ }+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/ChangePassword.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/ChangePassword.cshtmlnew file mode 100644index 000000000..c7acfd700--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/ChangePassword.cshtml@@ -0,0 +1,78 @@+@model ChangePasswordModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.ChangePassword })+}+<validation-observer v-slot="{ handleSubmit }">+ <form asp-route="CustomerChangePassword" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <section class="page account-page change-password-page pl-lg-3 pt-3 pt-lg-0">+ <h1 class="h2 generalTitle"><div>@Loc["Account.ChangePassword"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (!String.IsNullOrEmpty(Model.Result))+ {+ <section class="result alert alert-info">+ @Model.Result+ </section>+ }+ <div asp-validation-summary="ModelOnly" class="message-error"></div>++ <fieldset>+ <div class="form-fields">+ <fieldset class="form-group">+ <validation-provider tag="div" rules="required" name="OldPassword" v-slot="{ errors, classes }">+ <label asp-for="OldPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.OldPassword"]:</label>+ <input asp-for="OldPassword" v-model="changepassword.OldPassword" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="OldPassword"></span>+ </validation-provider>+ </fieldset>+ <fieldset class="form-group">+ <validation-provider tag="div" vid="changepassword.NewPassword" rules="required" v-slot="{ errors, classes }">+ <label asp-for="NewPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.NewPassword"]:</label>+ <input asp-for="NewPassword" v-model="changepassword.NewPassword" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="NewPassword"></span>+ </validation-provider>+ </fieldset>+ <fieldset class="form-group">+ <validation-provider tag="div" vid="changepassword.ConfirmNewPassword" rules="required|confirmed:@@changepassword.NewPassword" v-slot="{ errors, classes }">+ <label asp-for="ConfirmNewPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.ConfirmNewPassword"]:</label>+ <input asp-for="ConfirmNewPassword" v-model="changepassword.ConfirmNewPassword" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="ConfirmNewPassword"></span>+ </validation-provider>+ </fieldset>+ </div>+ </fieldset>+ <div class="text-xs-center">+ <input type="submit" class="btn btn-info change-password-button" value="@Loc["Account.ChangePassword.Button"]" />+ </div>+ </section>+ </form>+</validation-observer>+<script asp-location="Footer" asp-order="300">+ var changepassword = new Vue({+ data: () => ({+ OldPassword: '',+ NewPassword: '',+ ConfirmNewPassword: '',+ })+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Courses.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Courses.cshtmlnew file mode 100644index 000000000..3bcec15af--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Courses.cshtml@@ -0,0 +1,69 @@+@model CoursesModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";+ //title+ pagebuilder.AddTitleParts(Loc["Title.Courses"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Courses })+}++<div class="page account-page auction-list-page pl-lg-3 pt-3 pt-lg-0">+ <h1 class="h2 generalTitle"><div>@Loc["Account.Courses"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (Model.CourseList.Any())+ {+ foreach (var item in Model.CourseList)+ {+ <div class="card mb-3">+ <div class="card-header">+ <h3 class="h5 mb-0 d-inline-flex">+ <a href="@Url.RouteUrl("Course", new { SeName = item.SeName })">+ @item.Name+ </a>+ </h3>+ <div class="d-inline-flex flex-column align-items-end">+ @if (item.Approved)+ {+ <div class="custom-control custom-checkbox my-1 mr-sm-2">+ <input type="checkbox" class="custom-control-input" id="customControlInline" checked disabled>+ <label class="custom-control-label" for="customControlInline"></label>+ </div>+ }+ else+ {+ <div class="custom-control disabled custom-checkbox my-1 mr-sm-2">+ <input type="checkbox" class="custom-control-input" id="customControlInline" disabled>+ <label class="custom-control-label" for="customControlInline"></label>+ </div>+ }+ </div>+ </div>+ @if (!string.IsNullOrEmpty(item.ShortDescription))+ {+ <div class="card-body">+ @Html.Raw(item.ShortDescription)+ </div>+ }+ </div>+ }+ }+ else+ {+ <div class="no-data alert alert-info my-3">+ @Loc["Account.Courses.NoExists"]+ </div>+ }+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/DeleteAccount.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/DeleteAccount.cshtmlnew file mode 100644index 000000000..8fc933254--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/DeleteAccount.cshtml@@ -0,0 +1,56 @@+@model DeleteAccountModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.DeleteAccount })+}+<validation-observer v-slot="{ handleSubmit }">+ <form asp-route="CustomerDeleteAccount" method="post" autocomplete="off" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <section class="page account-page change-password-page pl-lg-3 pt-3 pt-lg-0">+ <h1 class="h2 generalTitle"><div>@Loc["Account.DeleteAccount"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div class="alert alert-danger" role="alert">+ @Loc["Account.DeleteAccount.DangerAlert"]+ </div>+ <fieldset>+ <div class="form-fields">+ <fieldset class="form-group">+ <validation-provider tag="div" rules="required" name="Password" v-slot="{ errors, classes }">+ <label asp-for="Password" class="col-form-label">@Loc["Account.DeleteAccount.Fields.Password"]:</label>+ <input asp-for="Password" v-model="deleteaccount.Password" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Password"></span>+ </validation-provider>+ </fieldset>+ </div>+ </fieldset>+ <div class="text-xs-center">+ <input type="submit" class="btn btn-danger change-password-button" value="@Loc["Account.DeleteAccount.Button"]" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]'); " />+ </div>+ </section>+ </form>+</validation-observer>+<script asp-location="Footer" asp-order="300">+ var deleteaccount = new Vue({+ data: () => ({+ Password: '',+ })+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Documents.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Documents.cshtmlnew file mode 100644index 000000000..5743175e6--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Documents.cshtml@@ -0,0 +1,77 @@+@model DocumentsModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";+ //title+ pagebuilder.AddTitleParts(Loc["Title.Documents"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Documents })+}++<div class="page account-page auction-list-page pl-lg-3 pt-3 pt-lg-0">+ <h1 class="h2 generalTitle"><div>@Loc["Account.Documents"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (Model.DocumentList.Any())+ {+ foreach (var item in Model.DocumentList)+ {+ <div class="card mb-3">+ <div class="card-header d-sm-inline-flex flex-sm-row d-flex flex-column px-sm-3 px-2">+ <div class="pr-3">+ <strong>@item.Number</strong> <small>(@item.Status)</small>+ </div>+ @if (item.DocDate.HasValue)+ {+ <div class="ml-auto">+ <span class="pr-1">@Loc["Account.Documents.DocDate"]</span>+ <i class="far fa-clock pr-1 text-muted"></i>+ <span class="text-muted">@item.DocDate.Value.ToShortDateString()</span>+ </div>+ }+ @if (item.DueDate.HasValue)+ {+ <div class="ml-auto">+ <span class="pr-1">@Loc["Account.Documents.DueDate"]</span>+ <i class="far fa-clock pr-1 text-muted"></i>+ <span class="text-muted">@item.DueDate.Value.ToShortDateString()</span>+ </div>+ }+ </div>+ @if (!string.IsNullOrEmpty(item.Description))+ {+ <div class="card-body px-sm-3 px-2">+ @Html.Raw(item.Description)+ </div>+ }+ @if (!string.IsNullOrEmpty(item.DownloadId))+ {+ <div class="d-inline-flex p-sm-3 p-2 border-top">+ <span class="mb-2">+ @Loc["Account.Documents.Attachment"]:+ <a href="@Url.RouteUrl("GetDocumentFile", new { documentId = item.Id})">@Loc["Account.Documents.Download"]</a>+ </span>+ </div>+ }+ </div>+ }+ <page-navigation asp-query-param="pagenumber" asp-pagination="Model.PagingContext" />+ }+ else+ {+ <div class="no-data alert alert-info">+ @Loc["Account.Documents.NoExists"]+ </div>+ }+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/DownloadableProducts.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/DownloadableProducts.cshtmlnew file mode 100644index 000000000..6bdad2c96--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/DownloadableProducts.cshtml@@ -0,0 +1,76 @@+@model CustomerDownloadableProductsModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.DownloadableProducts })+}+<section class="page account-page downloadable-products-page pl-lg-3 pt-lg-0 pt-3">+ <h1 class="h2 generalTitle"><div>@Loc["Account.DownloadableProducts"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (Model.Items.Any())+ {++ <div id="downloadable-products"></div>+ <script>+ var DownloadableProducts = Vue.extend({+ template: '<b-table :fields="fields" :items="items" responsive><template v-slot:cell(order)="data"><div v-html="data.value.order"></div></template><template v-slot:cell(date)="data"><div v-html="data.value.date"></div></template><template v-slot:cell(product)="data"><div v-html="data.value.product"></div></template><template v-slot:cell(download)="data"><div v-html="data.value.download"></div></template></b-table>',+ data: function () {+ return {+ fields: [+ { key: 'order', label: '@Loc["DownloadableProducts.Fields.Order"]'},+ { key: 'date', label: '@Loc["DownloadableProducts.Fields.Date"]'},+ { key: 'product', label: '@Loc["DownloadableProducts.Fields.Product"]'},+ { key: 'download', label: '@Loc["DownloadableProducts.Fields.Download"]'},+ ],+ items: [+ @for (int i = 0; i < Model.Items.Count; i++)+ {+ var item = Model.Items[i];+ <text>+ {+ order: {+ order: '<a href="@Url.RouteUrl("OrderDetails", new { orderId = item.OrderId })">@item.OrderNumber</a>'+ },+ date: {+ date: '@item.CreatedOn.ToString("d")'+ },+ product: {+ product: '<a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })">@item.ProductName</a>@if (!String.IsNullOrEmpty(item.ProductAttributes)) {<div class="attributes">@Html.Raw(item.ProductAttributes)</div>}'+ },+ download: {+ download: '@if (!String.IsNullOrEmpty(item.DownloadId)) { <a href="@Url.RouteUrl("GetDownload", new { orderItemId = item.OrderItemGuid })">@Loc["DownloadableProducts.Fields.Download"]</a>}else {@Loc["DownloadableProducts.Fields.Download.NA"]}@if (!String.IsNullOrEmpty(item.LicenseId))@if (!String.IsNullOrEmpty(item.LicenseId)) {<a href="@Url.RouteUrl("GetLicense", new { orderItemId = item.OrderItemGuid })">@Loc["DownloadableProducts.Fields.DownloadLicense"]</a> }'+ },++ },+ </text>+ }+ ]+ }+ }+ })+ new DownloadableProducts().$mount('#downloadable-products')+ </script>+ }+ else+ {+ <div class="no-data alert alert-info">+ @Loc["DownloadableProducts.NoItems"]+ </div>+ }+</section>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Info.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Info.cshtmlnew file mode 100644index 000000000..b4f012c9f--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Info.cshtml@@ -0,0 +1,675 @@+@model CustomerInfoModel+@inject Grand.Domain.Customers.CustomerSettings customerSettings+@inject IPageHeadBuilder pagebuilder+@using Grand.Web.Models.Customer;+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Info })+}++@if (Model.CountryEnabled && Model.StateProvinceEnabled)+{+ <script asp-location="Footer" asp-order="300">+ function @Html.IdFor(model => model.CountryId)_select_element(e) {+ var selectedItem = e.value;+ var ddlStates = document.getElementById("@Html.IdFor(model => model.StateProvinceId)");+ axios({+ method: 'get',+ url: "@(Url.RouteUrl("GetStatesByCountryId"))",+ params: { "countryId": selectedItem, "addSelectStateItem": "true" },+ }).then(function (response) {+ ddlStates.innerHTML = '';+ response.data.forEach(function (id, option) {+ elChild = document.createElement('option');+ elChild.setAttribute('value', id.id);+ elChild.innerHTML = id.name;+ ddlStates.appendChild(elChild);+ });+ customer.StateProvinceId = response.data[0].id;+ }).then(function () {+ ddlStates.classList.remove('is-valid');+ ddlStates.classList.add('is-invalid');+ }).catch(function (error) {+ alert(error);+ });+ }+ function @Html.IdFor(model => model.StateProvinceId)_select_element(e) {+ var ddlStates = document.getElementById("@Html.IdFor(model => model.StateProvinceId)");+ if (e.selectedIndex > 0) {+ ddlStates.classList.remove('is-invalid');+ ddlStates.classList.add('is-valid');+ } else {+ ddlStates.classList.remove('is-valid');+ ddlStates.classList.add('is-invalid');+ }+ }+ </script>+}+<script asp-location="Footer">+ function toggleNewsletterCat() {+ var element = document.getElementById('@Html.IdFor(model => model.Newsletter)');+ if (element) {+ if (document.getElementById('@Html.IdFor(model => model.Newsletter)').checked) {+ if (document.querySelector('.register-category-newsletter')) {+ document.querySelector('.register-category-newsletter').style.display = "block";+ }+ }+ else {+ if (document.querySelector('.register-category-newsletter')) {+ document.querySelector('.register-category-newsletter').style.display = "none";+ }+ }+ }+ }+ document.addEventListener("DOMContentLoaded", function () {+ toggleNewsletterCat();+ });+</script>+<div class="page account-page customer-info-page pl-lg-3 pt-3 pt-lg-0">+ @if (customerSettings.AllowUsersToExportData)+ {+ <button class="btn btn-info float-sm-right mt-2" onclick="location.href='/account/export'">+ <b-icon icon="server"></b-icon> @Loc["Account.CustomerExportToXls"]+ </button>+ }+ <h2 class="generalTitle"><div>@Loc["Account.CustomerInfo"]</div></h2>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ <validation-observer v-slot="{ handleSubmit }">+ <form asp-route="CustomerInfo" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div class="card mb-3">+ <h3 class="card-header">@Loc["Account.YourPersonalDetails"]</h3>+ <div class="card-body">+ <fieldset class="form-fields">+ <legend class="sr-only">@Loc["Account.Fields.Gender"]</legend>+ @if (Model.GenderEnabled)+ {+ <label class="col-form-label">+ @Loc["Account.Fields.Gender"]:+ </label>+ <div class="form-group gender">+ <div class="flex-row">+ <div class="custom-control custom-radio male custom-control-inline">+ <input type="radio" asp-for="Gender" value="M" checked="@(Model.Gender == "M")" id="gender-male" class="custom-control-input" />+ <label class="custom-control-label" for="gender-male">@Loc["Account.Fields.Gender.Male"]</label>+ </div>+ <div class="custom-control custom-radio female custom-control-inline">+ <input type="radio" asp-for="Gender" value="F" checked="@(Model.Gender == "F")" id="gender-female" class="custom-control-input" />+ <label class="custom-control-label" for="gender-female">@Loc["Account.Fields.Gender.Female"]</label>+ </div>+ </div>+ </div>+ }+ </fieldset>+ <div class="form-row">+ <fieldset class="form-group col-sm-6 col-12">+ <legend class="sr-only">@Loc["account.fields.firstname"]</legend>+ @if (Model.FirstLastNameRequired)+ {+ <validation-provider tag="div" rules="required" name="FirstName" v-slot="{ errors, classes }">+ <label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>+ <span class="required">*</span>+ <input asp-for="FirstName" v-model="customer.FirstName" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="FirstName"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>+ <input asp-for="FirstName" class="form-control" />+ }+ </fieldset>+ <fieldset class="form-group col-sm-6 col-12">+ <legend class="sr-only">@Loc["account.fields.lastname"]</legend>+ @if (Model.FirstLastNameRequired)+ {+ <validation-provider tag="div" rules="required" name="LastName" v-slot="{ errors, classes }">+ <label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>+ <span class="required">*</span>+ <input asp-for="LastName" v-model="customer.LastName" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="LastName"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>+ <input asp-for="LastName" class="form-control" />+ }+ </fieldset>+ </div>+ @if (Model.DateOfBirthEnabled)+ {+ <fieldset class="form-group date-of-birth">+ <legend class="sr-only">@Loc["account.fields.dateofbirth"]</legend>+ <span class="col-form-label">+ @Loc["Account.Fields.DateOfBirth"]:+ </span>+ @if (Model.DateOfBirthRequired)+ {+ <span class="required">*</span>+ }+ <div class="input-group">+ <date-picker-dropdown control-day="@Html.IdFor(x => x.DateOfBirthDay)"+ control-month="@Html.IdFor(x => x.DateOfBirthMonth)"+ control-year="@Html.IdFor(x => x.DateOfBirthYear)"+ begin-year="@(DateTime.Now.Year - 100)"+ end-year="DateTime.Now.Year"+ selected-day="(Model.DateOfBirthDay.HasValue ? Model.DateOfBirthDay.Value : 0)"+ selected-month="(Model.DateOfBirthMonth.HasValue ? Model.DateOfBirthMonth.Value : 0)"+ selected-year="(Model.DateOfBirthYear.HasValue ? Model.DateOfBirthYear.Value : 0)"+ class="col-12 input-group px-0" />++ <span asp-validation-for="DateOfBirthDay"></span>+ <span asp-validation-for="DateOfBirthMonth"></span>+ <span asp-validation-for="DateOfBirthYear"></span>+ </div>+ </fieldset>+ }+ <fieldset class="form-group row mail">+ <legend class="sr-only">@Loc["account.associatedexternalauth.email"]</legend>+ <div class="col-12">+ <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">+ <label asp-for="Email" class="col-form-label">@Loc["Account.Fields.Email"]:</label>+ <span class="required">*</span>+ <input asp-for="Email" v-model="customer.Email" v-bind:class="[classes , 'form-control']" asp-readonly=@(!Model.AllowUsersToChangeEmail) />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Email"></span>+ </validation-provider>+ </div>+ </fieldset>+ @if (Model.UsernamesEnabled)+ {+ if (Model.AllowUsersToChangeUsernames)+ {+ <fieldset class="form-group row mb-0">+ <legend class="sr-only">@Loc["account.associatedexternalauth.email"]</legend>+ <div class="col-12">+ <validation-provider tag="div" rules="required" name="Username" v-slot="{ errors, classes }">+ <label asp-for="Username" class="col-form-label">@Loc["Account.Fields.Username"]:</label>+ <span class="required">*</span>+ <input asp-for="Username" v-model="customer.Username" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Username"></span>+ </validation-provider>+ @if (Model.CheckUsernameAvailabilityEnabled)+ {+ <partial name="Partials/CheckUsernameAvailability" />+ }+ </div>+ </fieldset>+ }+ else+ {+ <fieldset class="form-group row mb-0">+ <legend class="sr-only">@Loc["account.fields.username"]</legend>+ <div class="form-group">+ <label asp-for="Username" class="col-form-label px-3">@Loc["Account.Fields.Username"]:</label>+ <span class="readonly-username px-3">@Model.Username</span>+ </div>+ </fieldset>+ }+ }+ </div>+ </div>+ @if (Model.CompanyEnabled || Model.DisplayVatNumber)+ {+ <div class="card mb-3">+ <h3 class="card-header">@Loc["Account.CompanyDetails"]</h3>+ <div class="card-body">+ <div class="form-fields">+ @if (Model.CompanyEnabled)+ {+ <div class="form-group">+ @if (Model.CompanyRequired)+ {+ <validation-provider tag="div" rules="required" name="Company" v-slot="{ errors, classes }">+ <label asp-for="Company" class="col-form-label">@Loc["Account.Fields.Company"]:</label>+ <span class="required">*</span>+ <input asp-for="Company" v-model="customer.Company" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Company"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="Company" class="col-form-label">@Loc["Account.Fields.Company"]:</label>+ <input asp-for="Company" class="form-control" />+ <span asp-validation-for="Company"></span>+ }+ </div>+ }+ @if (Model.DisplayVatNumber)+ {+ <div class="form-group">+ <label asp-for="VatNumber" class="col-form-label">@Loc["Account.Fields.VatNumber"]:</label>+ <input asp-for="VatNumber" class="form-control" />+ <span class="vat-status">@Model.VatNumberStatusNote</span>+ <span class="vat-note"><em>@Loc["Account.Fields.VatNumber.Note"]</em></span>+ </div>+ }+ </div>+ </div>+ </div>+ }+ @if (Model.StreetAddressEnabled ||+ Model.StreetAddress2Enabled ||+ Model.ZipPostalCodeEnabled ||+ Model.CityEnabled ||+ Model.CountryEnabled)+ {+ <div class="card mb-3">+ <h3 class="card-header">+ @Loc["Account.YourAddress"]+ </h3>+ <div class="card-body">+ <div class="form-fields">+ <div class="row d-flex">+ @if (Model.StreetAddressEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.streetaddress"]</legend>+ @if (Model.StreetAddressRequired)+ {+ <validation-provider tag="div" rules="required" name="StreetAddress" v-slot="{ errors, classes }">+ <label asp-for="StreetAddress" class="col-form-label">@Loc["Account.Fields.StreetAddress"]:</label>+ <span class="required">*</span>+ <input asp-for="StreetAddress" v-model="customer.StreetAddress" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="StreetAddress"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="StreetAddress" class="col-form-label">@Loc["Account.Fields.StreetAddress"]:</label>+ <input asp-for="StreetAddress" class="form-control" />+ <span asp-validation-for="StreetAddress"></span>+ }+ </fieldset>+ }+ @if (Model.StreetAddress2Enabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.streetaddress2"]</legend>+ @if (Model.StreetAddress2Required)+ {+ <validation-provider tag="div" rules="required" name="StreetAddress2" v-slot="{ errors, classes }">+ <label asp-for="StreetAddress2" class="col-form-label">@Loc["Account.Fields.StreetAddress2"]:</label>+ <span class="required">*</span>+ <input asp-for="StreetAddress2" v-model="customer.StreetAddress2" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="StreetAddress2"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="StreetAddress2" class="col-form-label">@Loc["Account.Fields.StreetAddress2"]:</label>+ <input asp-for="StreetAddress2" class="form-control" />+ <span asp-validation-for="StreetAddress2"></span>+ }+ </fieldset>+ }+ @if (Model.ZipPostalCodeEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.zippostalcode"]</legend>+ @if (Model.ZipPostalCodeRequired)+ {+ <validation-provider tag="div" rules="required" name="ZipPostalCode" v-slot="{ errors, classes }">+ <label asp-for="ZipPostalCode" class="col-form-label">@Loc["Account.Fields.ZipPostalCode"]:</label>+ <span class="required">*</span>+ <input asp-for="ZipPostalCode" v-model="customer.ZipPostalCode" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="ZipPostalCode"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="ZipPostalCode" class="col-form-label">@Loc["Account.Fields.ZipPostalCode"]:</label>+ <input asp-for="ZipPostalCode" class="form-control" />+ <span asp-validation-for="ZipPostalCode"></span>+ }+ </fieldset>+ }+ @if (Model.CityEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.city"]</legend>+ @if (Model.CityRequired)+ {+ <validation-provider tag="div" rules="required" name="City" v-slot="{ errors, classes }">+ <label asp-for="City" class="col-form-label">@Loc["Account.Fields.City"]:</label>+ <span class="required">*</span>+ <input asp-for="City" v-model="customer.City" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="City"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="City" class="col-form-label">@Loc["Account.Fields.City"]:</label>+ <input asp-for="City" class="form-control" />+ <span asp-validation-for="City"></span>+ }+ </fieldset>+ }+ @if (Model.CountryEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.country"]</legend>+ @if (Model.CountryRequired)+ {+ <validation-provider tag="div" rules="required" name="CountryId" v-slot="{ errors, classes }">+ <label asp-for="CountryId" class="col-form-label">@Loc["Account.Fields.Country"]:</label>+ <span class="required">*</span>+ <select asp-for="CountryId" asp-items="Model.AvailableCountries"+ onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="customer.CountryId"></select>+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="CountryId"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="CountryId" class="col-form-label">@Loc["Account.Fields.Country"]:</label>+ <select asp-for="CountryId" class="custom-select form-control" asp-items="Model.AvailableCountries"></select>+ <span asp-validation-for="CountryId"></span>+ }+ </fieldset>+ }+ @if (Model.CountryEnabled && Model.StateProvinceEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.stateprovince"]</legend>+ <validation-provider tag="div" rules="required" name="StateProvinceId" v-slot="{ errors, classes }">+ <label asp-for="StateProvinceId" class="col-form-label">@Loc["Account.Fields.StateProvince"]:</label>+ @if (Model.StateProvinceRequired)+ {+ <span class="required">*</span>+ }+ <select asp-for="StateProvinceId" data-val-required="@Loc["Address.Fields.StateProvince.Required"]" class="custom-select form-control"+ onchange="@Html.IdFor(model => model.StateProvinceId)_select_element(this)" asp-items="Model.AvailableStates" v-model="customer.StateProvinceId"></select>+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="StateProvinceId"></span>+ <span id="states-loading-progress" style="display: none;" class="please-wait">@Loc["Common.Wait..."]</span>+ </validation-provider>+ </fieldset>+ }+ </div>++ </div>+ </div>+ </div>+ }+ @if (Model.PhoneEnabled || Model.FaxEnabled)+ {+ <div class="card mb-3">+ <h3 class="card-header">@Loc["Account.YourContactInformation"]</h3>+ <div class="card-body d-flex flex-row row">+ @if (Model.PhoneEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.phone"]</legend>+ @if (Model.PhoneRequired)+ {+ <validation-provider tag="div" rules="required" name="Phone" v-slot="{ errors, classes }">+ <label asp-for="Phone" class="col-form-label">@Loc["Account.Fields.Phone"]:</label>+ <span class="required">*</span>+ <input asp-for="Phone" v-bind:class="[classes , 'form-control']" v-model="customer.Phone" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Phone"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="Phone" class="col-form-label">@Loc["Account.Fields.Phone"]:</label>+ <input asp-for="Phone" class="form-control" />+ <span asp-validation-for="Phone"></span>+ }++ </fieldset>+ }+ @if (Model.FaxEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.fax"]</legend>+ @if (Model.FaxRequired)+ {+ <validation-provider tag="div" rules="required" name="Fax" v-slot="{ errors, classes }">+ <label asp-for="Fax" class="col-form-label">@Loc["Account.Fields.Fax"]:</label>+ <span class="required">*</span>+ <input asp-for="Fax" v-bind:class="[classes , 'form-control']" v-model="customer.Fax" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Fax"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="Fax" class="col-form-label">@Loc["Account.Fields.Fax"]:</label>+ <input asp-for="Fax" class="form-control" />+ <span asp-validation-for="Fax"></span>+ }+ </fieldset>+ }+ </div>+ </div>+ }++ @if (Model.NewsletterEnabled || Model.CustomerAttributes.Any())+ {+ <div class="card mb-3">+ <h3 class="card-header">+ @Loc["Account.Options"]+ </h3>+ <div class="card-body">+ <fieldset class="form-fields">+ <legend class="sr-only">@Loc["account.fields.newsletter"]</legend>+ @if (Model.NewsletterEnabled)+ {+ <div class="form-group">+ <label for="Newsletter" class="ml-1 custom-control custom-checkbox">+ <input class="custom-control-input" asp-for="Newsletter" onchange="toggleNewsletterCat()" />+ <span class="custom-control-label">@Loc["account.fields.newsletter"]</span>+ <span class="sr-only">@Loc["account.fields.newsletter"]</span>+ </label>+ <span asp-validation-for="Newsletter"></span>+ </div>+ <partial name="Partials/NewsLetterCategories" model="Model.NewsletterCategories" />+ }++ @if (Model.CustomerAttributes.Any())+ {+ <partial name="Partials/CustomerAttributes" model="Model.CustomerAttributes" />+ }+ </fieldset>+ </div>+ </div>+ }+ @if (Model.NumberOfExternalAuthenticationProviders > 0)+ {+ <div class="card mb-3">+ <h3 class="card-header">@Loc["Account.AssociatedExternalAuth"]</h3>+ <div class="card-body">+ @if (Model.AssociatedExternalAuthRecords.Count > 0)+ {+ //existing associated external records+ <div class="table-responsive">+ <table class="table table-hover">+ <colgroup>+ <col />+ <col />+ <col />+ </colgroup>+ <thead class="tab">+ <tr>+ <th class="auth-method-name">+ @Loc["Account.AssociatedExternalAuth.AuthMethodName"]+ </th>+ <th class="email">+ @Loc["Account.AssociatedExternalAuth.Email"]+ </th>+ <th class="external-id">+ @Loc["Account.AssociatedExternalAuth.ExternalIdentifier"]+ </th>+ <th class="remove">+ @Loc["Account.AssociatedExternalAuth.Remove"]+ </th>+ </tr>+ </thead>+ <tbody>+ @foreach (var item in Model.AssociatedExternalAuthRecords)+ {+ <tr>+ <td class="auth-method-name">+ @item.AuthMethodName+ </td>+ <td class="email">+ @item.Email+ </td>+ <td class="external-id">+ @CommonHelper.EnsureMaximumLength(item.ExternalIdentifier, 40, "...")+ </td>+ <td class="remove">+ <a href="#" onclick="removeexternalassociation('@item.Id')">@Loc["Account.AssociatedExternalAuth.Remove"]</a>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ @if (Model.NumberOfExternalAuthenticationProviders > Model.AssociatedExternalAuthRecords.Count)+ {+ //we can add more external records+ <div class="form-fields add-more-external-records">+ @Loc["Account.AssociatedExternalAuth.AddMoreRecords"] <a href="@Url.RouteUrl("Login", null, Context.Request.Scheme)">@Url.RouteUrl("Login", null, Context.Request.Scheme)</a>+ </div>+ }+ </div>+ </div>+ }++ @if (customerSettings.TwoFactorAuthenticationEnabled)+ {+ <div class="card mb-3">+ <h3 class="card-header">@Loc["Account.TwoFactorAuth"]</h3>+ @if (Model.Is2faEnabled)+ {+ @Html.ActionLink(Loc["Account.TwoFactorAuth.Disable"], "DisableTwoFactorAuthenticator", "Account", new object { }, new { @class = "btn btn-info login-button" })+ }+ else+ {+ @Html.ActionLink(Loc["Account.TwoFactorAuth.Enable"], "EnableTwoFactorAuthenticator", "Account", new object { }, new { @class = "btn btn-info login-button" })+ }+ </div>+ }+ <div class="generalMarginSupporter">+ <input type="submit" value="@Loc["Common.Save"]" name="save-info-button" class="btn btn-info save-customer-info-button" />+ </div>+ </form>+ </validation-observer>+</div>+<script asp-location="Footer" asp-order="300">+ var customer = new Vue({+ data: () => ({+ @{+ <text>+ FirstName: '@Html.Raw(Model.FirstName)',+ LastName: '@Html.Raw(Model.LastName)',+ Company: '@Html.Raw(Model.Company)',+ StreetAddress: '@Html.Raw(Model.StreetAddress)',+ StreetAddress2: '@Html.Raw(Model.StreetAddress2)',+ ZipPostalCode: '@Html.Raw(Model.ZipPostalCode)',+ City: '@Html.Raw(Model.City)',+ CountryId: '@Model.CountryId',+ StateProvinceId: '@Model.StateProvinceId',+ Phone: '@Html.Raw(Model.Phone)',+ Fax: '@Html.Raw(Model.Fax)',+ Username: '@Html.Raw(Model.Username)',+ Email: '@Html.Raw(Model.Email)',+ @foreach (var item in Model.CustomerAttributes)+ {+ @switch (item.AttributeControlType)+ {+ case AttributeControlType.DropdownList:+ {+ @foreach (var itemValue in item.Values)+ {+ if (itemValue.IsPreSelected)+ {+ <text>customer_attribute_</text> @item.Id <text>: '@itemValue.Id',</text>+ break;+ } else {+ <text>customer_attribute_</text> @item.Id <text>: '',</text>+ }+ }+ }+ break;+ case AttributeControlType.Checkboxes:+ case AttributeControlType.RadioList:+ case AttributeControlType.ReadonlyCheckboxes:+ {+ <text>customer_attribute_</text> @item.Id <text>: [+ @foreach (var itemValue in item.Values)+ {+ if (itemValue.IsPreSelected)+ {+ <text>'@itemValue.Id',</text>+ }+ }+ ],</text>+ }+ break;+ case AttributeControlType.TextBox:+ case AttributeControlType.MultilineTextbox:+ {+ <text>customer_attribute_</text> @item.Id <text>: @if (item.DefaultValue != null) { <text>'@item.DefaultValue'</text> } else { <text>''</text> },</text>+ }+ break;+ }++ }+ </text>+ }+ }),+ created() {+ document.addEventListener("DOMContentLoaded", function () {+ document.querySelectorAll("[data-checked='true']").forEach(function (element) {+ element.checked = true;+ })+ });+ }+ });+ function removeexternalassociation(itemId) {+ if (confirm('@Loc["Common.AreYouSure"]')) {+ var bodyFormData = new FormData();+ bodyFormData.append('Id', itemId);+ bodyFormData.append('__RequestVerificationToken', document.querySelector('input[name=__RequestVerificationToken]').value);+ axios({+ method: 'POST',+ url: '@Url.Action("RemoveExternalAssociation", "Account")',+ data: bodyFormData,+ }).then(function (response) {+ location = response.data.redirect;+ }).catch(function (error) {+ alert(error);+ })+ }+ return false;+ }+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtmlnew file mode 100644index 000000000..7a0519170--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml@@ -0,0 +1,158 @@+@model LoginModel+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_SingleColumn";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Login"]);++ //register URL with return URL (if specified)+ var registerUrl = Url.RouteUrl("Register", new { returnUrl = this.Context.Request.Query["returnUrl"] });+}+<div class="page login-page">+ <h2 class="generalTitle text-center mt-3"><div>@Loc["Account.Login.Welcome"]</div></h2>+ <div cols="12">+ <div class="my-3">+ @* login main block *@+ <div class="col-12 mx-lg-0 mx-auto mt-3">+ <validation-observer v-slot="{ handleSubmit }">+ <form asp-route="Login" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)" method="post">+ <div class="card">+ <div class="card-header">+ <h3 class="h5 mb-0 text-center">+ @Loc["Account.Login.ReturningCustomer"]+ </h3>+ </div>+ <div class="card-body">+ <div asp-validation-summary="ModelOnly" class="message-error w-100 alert alert-danger pb-0 text-center">@Loc["Account.Login.Unsuccessful"]</div>+ <div class="col-12 form-group mb-0">+ @if (Model.UsernamesEnabled)+ {+ <div class="row form-group">+ <div class="col-12 col-lg-3 d-flex align-items-start justify-content-sm-start">+ <label asp-for="Username" class="col-form-label">@Loc["Account.Login.Fields.UserName"]:</label>+ </div>+ <div class="col-lg-9 col-12">+ <validation-provider tag="div" rules="required" name="UserName" v-slot="{ errors, classes }">+ <input asp-for="Username" v-model="login.Username" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Username"></span>+ </validation-provider>+ </div>+ </div>+ }+ else+ {+ <div class="row form-group">+ <div class="col-lg-3 col-12 d-flex align-items-start justify-content-start">+ <label asp-for="Email" class="col-form-label">@Loc["Account.Login.Fields.Email"]:</label>+ </div>+ <div class="col-lg-9 col-12">+ <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">+ <input asp-for="Email" v-model="login.Email" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Email"></span>+ </validation-provider>++ </div>+ </div>+ }+ <div class="row form-group">+ <div class="col-lg-3 col-12 d-flex align-items-center justify-content-start">+ <label asp-for="Password" class="col-form-label">@Loc["Account.Login.Fields.Password"]:</label>+ </div>+ <div class="col-lg-9 col-12">+ <validation-provider tag="div" rules="required" name="Password" v-slot="{ errors, classes }">+ <input asp-for="Password" v-model="login.Password" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Password"></span>+ </validation-provider>+ </div>+ </div>+ <div class="inputs d-flex flex-sm-row flex-column justify-content-center">+ <label class="custom-control custom-checkbox">+ <input class="custom-control-input" asp-for="RememberMe" />+ <input class="custom-control-label" name="RememberMe" type="hidden" value="false">+ <span class="custom-control-label"></span>+ <span class="custom-control-description">@Loc["Account.Login.Fields.RememberMe"]</span>+ </label>+ <span class="ml-3 forgot-password">+ <a asp-route="PasswordRecovery">@Loc["Account.Login.ForgotPassword"]</a>+ </span>+ </div>+ @if (Model.DisplayCaptcha)+ {+ <div class="captcha-box">+ <captcha />+ </div>+ }+ </div>+ </div>+ <div class="card-footer">+ <div class="buttons text-center">+ <button class="btn btn-info login-button px-4" type="submit">@Loc["Account.Login.LoginButton"]</button>+ </div>+ </div>+ </div>+ </form>+ </validation-observer>+ <div class="external-authentication row mx-lg-0 mx-auto mt-3">+ @await Component.InvokeAsync("ExternalMethods")+ </div>+ </div>+ @if (Model.CheckoutAsGuest)+ {+ <div class="col-12 new-wrapper checkout-as-guest-or-register-block mt-3 mx-lg-0 mx-auto">+ <div class="card">+ <div class="card-header">+ <h3 class="h5 mb-0 text-center">+ @Loc["Account.Login.CheckoutAsGuestOrRegister"]+ </h3>+ </div>+ <div class="card-body text-center">+ <div class="row text">+ <div class="col-12">+ @await Component.InvokeAsync("PageBlock", new { systemName = "CheckoutAsGuestOrRegister" })+ </div>+ </div>+ <div class="btn-group buttons text-center mt-1 areYouGuest">+ <button class="btn btn-secondary checkout-as-guest-button" onclick="location.href='@Url.RouteUrl("Checkout")'">+ @Loc["Account.Login.CheckoutAsGuest"]+ </button>+ <button class="btn btn-secondary register-button" onclick="location.href='@registerUrl'">+ @Loc["Account.Register"]+ </button>+ </div>+ </div>+ </div>+ </div>+ }+ else+ {+ <div class="col-12 mx-lg-0 mx-auto mt-3">+ <div class="card">+ <div class="card-body">+ <div class="text-center generalMarginSupporter">+ @Loc["Account.Login.NewCustomer"]+ </div>+ <div class="d-inline-flex align-items-center justify-content-center w-100">+ <a class="btn btn-info ml-3 register-button px-5" href="@registerUrl">+ @Loc["Account.Register"]+ </a>+ </div>+ </div>+ </div>+ </div>+ }+ </div>+ </div>+</div>+<script asp-location="Footer" asp-order="300">+ var login = new Vue({+ data: () => ({+ Username: '',+ Email: '',+ Password: '',+ })+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Notes.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Notes.cshtmlnew file mode 100644index 000000000..19c61a16f--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Notes.cshtml@@ -0,0 +1,64 @@+@model CustomerNotesModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";+ //title+ pagebuilder.AddTitleParts(Loc["Title.Notes"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Notes })+}++<div class="page account-page auction-list-page pl-lg-3 pt-3 pt-lg-0">+ <h1 class="h2 generalTitle"><div>@Loc["Account.CustomerNotes"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (Model.CustomerNoteList.Any())+ {+ foreach (var item in Model.CustomerNoteList)+ {+ <b-card class="mb-3">+ <template v-slot:header>+ <h5 class="d-inline-flex">+ @item.Title+ </h5>+ <div class="d-inline-flex align-items-center w-100">+ <small class="text-muted mr-2">@Loc["Account.CustomerNotes.Createdate"]:</small>+ <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>+ <small class="text-muted">@item.CreatedOn</small>+ </div>+ </template>+ <b-card-text>+ @item.Note+ </b-card-text>+ <template v-slot:footer>+ @if (!string.IsNullOrEmpty(item.DownloadId))+ {+ <div class="d-inline-flex">+ <span class="mb-2">+ <b-label class="col-form-label">@Loc["Account.CustomerNotes.Attachment"]:</b-label>+ <b-link class="mx-2" href="@Url.RouteUrl("GetCustomerNoteFile", new { customerNoteId = item.NoteId})">@Loc["Customer.Notes.Download"]</b-link>+ </span>+ </div>+ }+ </template>+ </b-card>+ }+ }+ else+ {+ <div class="no-data alert alert-info mt-3">+ @Loc["Account.CustomerNotes.NoExists"]+ </div>+ }+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/PasswordRecovery.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/PasswordRecovery.cshtmlnew file mode 100644index 000000000..87a6280bc--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/PasswordRecovery.cshtml@@ -0,0 +1,59 @@+@model PasswordRecoveryModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_SingleColumn";++ //title+ pagebuilder.AddTitleParts(Loc["Title.PasswordRecovery"]);+}+<div class="page password-recovery-page">+ <h1 class="generalTitle h2"><div>@Loc["Account.PasswordRecovery"]</div></h1>+ @if (!String.IsNullOrEmpty(Model.Result))+ {+ <div class="result alert alert-info mt-3">+ @Model.Result+ </div>+ }+ @if (!Model.Send)+ {+ <validation-observer v-slot="{ handleSubmit }">+ <form asp-route="PasswordRecovery" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <input type="hidden" asp-for="DisplayCaptcha" />+ <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div class="form-group">+ <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">+ <label asp-for="Email" class="col-form-label">@Loc["Account.PasswordRecovery.Email"]:</label>+ <input asp-for="Email" v-model="passwordrecovery.Email" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Email"></span>+ </validation-provider>+ </div>+ @if (Model.DisplayCaptcha)+ {+ <div class="form-group">+ <div class="captcha-box">+ <captcha />+ </div>+ </div>+ }+ <div class="row text-xs-center">+ <div class="col-12">+ <button class="btn btn-secondary password-recovery-button">@Loc["Account.PasswordRecovery.RecoverButton"]</button>+ </div>+ </div>++ <div class="alert-info mt-3 alert">+ @Loc["Account.PasswordRecovery.Tooltip"]+ </div>+ </form>+ </validation-observer>+ }+</div>+<script asp-location="Footer" asp-order="300">+ var passwordrecovery = new Vue({+ data: () => ({+ Email: '',+ })+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Register.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Register.cshtmlnew file mode 100644index 000000000..d3a13cf51--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Register.cshtml@@ -0,0 +1,587 @@+@model RegisterModel+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_SingleColumn";+ //title+ pagebuilder.AddTitleParts(Loc["Title.Register"]);+}+@if (Model.CountryEnabled && Model.StateProvinceEnabled)+{+ <script asp-location="Footer" asp-order="300">+ function @Html.IdFor(model => model.CountryId)_select_element(e) {+ var selectedItem = e.value;+ var ddlStates = document.getElementById("@Html.IdFor(model => model.StateProvinceId)");+ axios({+ method: 'get',+ url: "@(Url.RouteUrl("GetStatesByCountryId"))",+ params: { "countryId": selectedItem, "addSelectStateItem": "true" },+ }).then(function (response) {+ ddlStates.innerHTML = '';+ response.data.forEach(function (id, option) {+ elChild = document.createElement('option');+ elChild.setAttribute('value', id.id);+ elChild.innerHTML = id.name;+ ddlStates.appendChild(elChild);+ });+ customer.StateProvinceId = response.data[0].id;+ }).then(function () {+ ddlStates.classList.remove('is-valid');+ ddlStates.classList.add('is-invalid');+ }).catch(function (error) {+ alert(error);+ });+ }+ function @Html.IdFor(model => model.StateProvinceId)_select_element(e) {+ var ddlStates = document.getElementById("@Html.IdFor(model => model.StateProvinceId)");+ if (e.selectedIndex > 0) {+ ddlStates.classList.remove('is-invalid');+ ddlStates.classList.add('is-valid');+ } else {+ ddlStates.classList.remove('is-valid');+ ddlStates.classList.add('is-invalid');+ }+ }+ </script>+}++<script asp-location="Footer">+ toggleNewsletterCat();++ function toggleNewsletterCat() {+ var element = document.getElementById('@Html.IdFor(model => model.Newsletter)');+ if (element) {+ if (element.checked) {+ if (document.querySelector('.register-category-newsletter')) {+ document.querySelector('.register-category-newsletter').style.display = "block";+ }+ }+ else {+ if (document.querySelector('.register-category-newsletter')) {+ document.querySelector('.register-category-newsletter').style.display = "none";+ }+ }+ }+ }+</script>++<validation-observer v-slot="{ handleSubmit }">+ <form asp-route="Register" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <div class="page registration-page">+ <div asp-validation-summary="All" class="message-error"></div>+ <div class="card my-3">+ <div class="card-header">+ <h3 class="h5 mb-0">@Loc["Account.YourPersonalDetails"]</h3>+ </div>+ <div class="card-body">+ @if (Model.GenderEnabled)+ {+ <div class="row">+ <div class="col-lg-3 col-sm-12">+ <span>@Loc["Account.Fields.Gender"]:</span>+ </div>+ </div>+ <fieldset class="gender px-3">+ <legend class="sr-only">@Loc["Account.Fields.Gender"]</legend>+ <div class="d-flex row">+ <label class="male custom-control custom-radio">+ <input id="gender-male" name="Gender" type="radio" value="M" checked="@(Model.Gender == "M")" class="custom-control-input">+ <span class="custom-control-label"></span>+ <span class="forcheckbox custom-control-description">@Loc["Account.Fields.Gender.Male"]</span>+ </label>+ <label class="female custom-control custom-radio ml-2">+ <input id="gender-female" name="Gender" type="radio" value="F" checked="@(Model.Gender == "F")" class="custom-control-input">+ <span class="custom-control-label"></span>+ <span class="forcheckbox custom-control-description">@Loc["Account.Fields.Gender.Female"]</span>+ </label>+ </div>+ </fieldset>+ }+ <div class="form-row">+ <fieldset class="col-sm-6 col-12 form-group">+ <legend class="sr-only">@Loc["account.fields.firstname"]</legend>+ @if (Model.FirstLastNameRequired)+ {+ <validation-provider tag="div" rules="required" name="FirstName" v-slot="{ errors, classes }">+ <label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>+ <span class="required">*</span>+ <input asp-for="FirstName" v-model="customer.FirstName" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="FirstName"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>+ <input asp-for="FirstName" class="form-control" />+ }+ </fieldset>+ <fieldset class="col-sm-6 col-12 form-group">+ <legend class="sr-only">@Loc["account.fields.lastname"]</legend>+ @if (Model.FirstLastNameRequired)+ {+ <validation-provider tag="div" rules="required" name="LastName" v-slot="{ errors, classes }">+ <label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>+ <span class="required">*</span>+ <input asp-for="LastName" v-model="customer.LastName" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="LastName"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>+ <input asp-for="LastName" class="form-control" />+ }+ </fieldset>+ </div>++ @if (Model.DateOfBirthEnabled)+ {+ <fieldset class="form-group date-of-birth col-sm-12">+ <legend class="sr-only">@Loc["Account.Fields.DateOfBirth"]</legend>+ <div class="row">+ <span class="col-form-label col-12 py-0 px-0">@Loc["Account.Fields.DateOfBirth"]:<span class="required">*</span></span>+ <date-picker-dropdown control-day="@Html.IdFor(x => x.DateOfBirthDay)"+ control-month="@Html.IdFor(x => x.DateOfBirthMonth)"+ control-year="@Html.IdFor(x => x.DateOfBirthYear)"+ begin-year="@(DateTime.Now.Year - 100)"+ end-year="DateTime.Now.Year"+ selected-day="Model.DateOfBirthDay.HasValue ? Model.DateOfBirthDay.Value : 0"+ selected-month="Model.DateOfBirthMonth.HasValue ? Model.DateOfBirthMonth.Value : 0"+ selected-year="Model.DateOfBirthYear.HasValue ? Model.DateOfBirthYear.Value : 0"+ class="col-12 input-group px-0" />+ </div>+ <div class="row">+ <span asp-validation-for="DateOfBirthDay"></span>+ <span asp-validation-for="DateOfBirthMonth"></span>+ <span asp-validation-for="DateOfBirthYear"></span>+ </div>+ </fieldset>+ }+ <fieldset class="form-group mail">+ <legend class="sr-only">@Loc["account.fields.email"]</legend>+ <validation-provider tag="div" rules="required" name="Email" v-slot="{ errors, classes }">+ <label asp-for="Email" class="col-form-label">@Loc["Account.Fields.Email"]:</label>+ <span class="required">*</span>+ <input asp-for="Email" v-model="customer.Email" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Email"></span>+ </validation-provider>+ </fieldset>++ @if (Model.UsernamesEnabled)+ {+ <div class="form-group row">+ <div class="col-12">+ <label asp-for="Username" class="col-form-label">@Loc["Account.Fields.Username"]:</label>+ <span class="required">*</span>+ </div>+ <div class="col-12">+ <validation-provider tag="div" rules="required" name="Username" v-slot="{ errors, classes }">+ <input asp-for="Username" v-model="customer.Username" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Username"></span>+ </validation-provider>+ @if (Model.CheckUsernameAvailabilityEnabled)+ {+ <partial name="Partials/CheckUsernameAvailability" />+ }+ </div>+ </div>+ }+ </div>+ </div>++ @if (Model.CompanyEnabled)+ {+ <div class="card mb-3" no-footer>+ <div class="card-header">+ <h3 class="h5 mb-0">@Loc["Account.CompanyDetails"]</h3>+ </div>+ <div class="card-body">+ <div class="form-group">+ @if (Model.CompanyRequired)+ {+ <validation-provider tag="div" rules="required" name="Company" v-slot="{ errors, classes }">+ <label asp-for="Company" class="col-form-label">@Loc["Account.Fields.Company"]:</label>+ <span class="required">*</span>+ <input asp-for="Company" v-model="customer.Company" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Company"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="Company" class="col-form-label">@Loc["Account.Fields.Company"]:</label>+ <input asp-for="Company" class="form-control" />+ <span asp-validation-for="Company"></span>+ }+ </div>+ </div>+ </div>+ }+ @if (Model.DisplayVatNumber)+ {+ <div class="card mb-3">+ <div class="card-body">+ <div class="form-group">+ <label asp-for="VatNumber" class="col-form-label">@Loc["Account.Fields.VatNumber"]:</label>+ <input asp-for="VatNumber" class="form-control" />+ <span class="vat-note"><em>@Loc["Account.Fields.VatNumber.Note"]</em></span>+ <span asp-validation-for="VatNumber"></span>+ </div>+ </div>+ </div>+ }+ @if (Model.StreetAddressEnabled ||+ Model.StreetAddress2Enabled ||+ Model.ZipPostalCodeEnabled ||+ Model.CityEnabled ||+ Model.CountryEnabled)+ {+ <div class="card mb-3">+ <div class="card-header">+ <h3 class="h5 mb-0">+ @Loc["Account.YourAddress"]+ </h3>+ </div>+ <div class="card-body">+ <div class="row form-fields d-flex">+ @if (Model.StreetAddressEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.streetaddress"]</legend>+ @if (Model.StreetAddressRequired)+ {+ <validation-provider tag="div" rules="required" name="StreetAddress" v-slot="{ errors, classes }">+ <label asp-for="StreetAddress" class="col-form-label">@Loc["Account.Fields.StreetAddress"]:</label>+ <span class="required">*</span>+ <input asp-for="StreetAddress" v-model="customer.StreetAddress" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="StreetAddress"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="StreetAddress" class="col-form-label">@Loc["Account.Fields.StreetAddress"]:</label>+ <input asp-for="StreetAddress" class="form-control" />+ <span asp-validation-for="StreetAddress"></span>+ }+ </fieldset>+ }+ @if (Model.StreetAddress2Enabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.streetaddress2"]</legend>+ @if (Model.StreetAddress2Required)+ {+ <validation-provider tag="div" rules="required" name="StreetAddress2" v-slot="{ errors, classes }">+ <label asp-for="StreetAddress2" class="col-form-label">@Loc["Account.Fields.StreetAddress2"]:</label>+ <span class="required">*</span>+ <input asp-for="StreetAddress2" v-model="customer.StreetAddress2" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="StreetAddress2"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="StreetAddress2" class="col-form-label">@Loc["Account.Fields.StreetAddress2"]:</label>+ <input asp-for="StreetAddress2" class="form-control" />+ <span asp-validation-for="StreetAddress2"></span>+ }+ </fieldset>+ }+ @if (Model.ZipPostalCodeEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.zippostalcode"]</legend>+ @if (Model.ZipPostalCodeRequired)+ {+ <validation-provider tag="div" rules="required" name="ZipPostalCode" v-slot="{ errors, classes }">+ <label asp-for="ZipPostalCode" class="col-form-label">@Loc["Account.Fields.ZipPostalCode"]:</label>+ <span class="required">*</span>+ <input asp-for="ZipPostalCode" v-model="customer.ZipPostalCode" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="ZipPostalCode"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="ZipPostalCode" class="col-form-label">@Loc["Account.Fields.ZipPostalCode"]:</label>+ <input asp-for="ZipPostalCode" class="form-control" />+ <span asp-validation-for="ZipPostalCode"></span>+ }+ </fieldset>+ }+ @if (Model.CityEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.city"]</legend>+ @if (Model.CityRequired)+ {+ <validation-provider tag="div" rules="required" name="City" v-slot="{ errors, classes }">+ <label asp-for="City" class="col-form-label">@Loc["Account.Fields.City"]:</label>+ <span class="required">*</span>+ <input asp-for="City" v-model="customer.City" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="City"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="City" class="col-form-label">@Loc["Account.Fields.City"]:</label>+ <input asp-for="City" class="form-control" />+ <span asp-validation-for="City"></span>+ }+ </fieldset>+ }+ @if (Model.CountryEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.country"]</legend>+ @if (Model.CountryRequired)+ {+ <validation-provider tag="div" rules="required" name="CountryId" v-slot="{ errors, classes }">+ <label asp-for="CountryId" class="col-form-label">@Loc["Account.Fields.Country"]:</label>+ <span class="required">*</span>+ <select asp-for="CountryId" asp-items="Model.AvailableCountries"+ onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="customer.CountryId"></select>+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="CountryId"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="CountryId" class="col-form-label">@Loc["Account.Fields.Country"]:</label>+ <select asp-for="CountryId" class="custom-select form-control" asp-items="Model.AvailableCountries"></select>+ <span asp-validation-for="CountryId"></span>+ }+ </fieldset>+ }+ @if (Model.CountryEnabled && Model.StateProvinceEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.stateprovince"]</legend>+ <validation-provider tag="div" rules="required" name="StateProvinceId" v-slot="{ errors, classes }">+ <label asp-for="StateProvinceId" class="col-form-label">@Loc["Account.Fields.StateProvince"]:</label>+ <span class="required">*</span>+ <select asp-for="StateProvinceId" data-val-required="@Loc["Address.Fields.StateProvince.Required"]" v-bind:class="[classes , 'form-control custom-select']"+ onchange="@Html.IdFor(model => model.StateProvinceId)_select_element(this)" asp-items="Model.AvailableStates" v-model="customer.StateProvinceId"></select>+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="StateProvinceId"></span>+ <span id="states-loading-progress" style="display: none;" class="please-wait">@Loc["Common.Wait..."]</span>+ </validation-provider>+ </fieldset>+ }+ </div>+ </div>+ </div>+ }++ @if (Model.PhoneEnabled || Model.FaxEnabled)+ {+ <div class="card mb-3">+ <div class="card-header">+ <h3 class="h5 mb-0">@Loc["Account.YourContactInformation"]</h3>+ </div>+ <div class="card-body">+ <div class="row d-flex">+ @if (Model.PhoneEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.phone"]</legend>+ @if (Model.PhoneRequired)+ {+ <validation-provider tag="div" rules="required" name="Phone" v-slot="{ errors, classes }">+ <label asp-for="Phone" class="col-form-label">@Loc["Account.Fields.Phone"]:</label>+ <span class="required">*</span>+ <input asp-for="Phone" v-model="customer.Phone" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Phone"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="Phone" class="col-form-label">@Loc["Account.Fields.Phone"]:</label>+ <input asp-for="Phone" class="form-control" />+ <span asp-validation-for="Phone"></span>+ }+ </fieldset>+ }+ @if (Model.FaxEnabled)+ {+ <fieldset class="form-group col-12 col-sm-6">+ <legend class="sr-only">@Loc["account.fields.fax"]</legend>+ @if (Model.FaxRequired)+ {+ <validation-provider tag="div" rules="required" name="Fax" v-slot="{ errors, classes }">+ <label asp-for="Fax" class="col-form-label">@Loc["Account.Fields.Fax"]:</label>+ <span class="required">*</span>+ <input asp-for="Fax" v-model="customer.Fax" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Fax"></span>+ </validation-provider>+ }+ else+ {+ <label asp-for="Fax" class="col-form-label">@Loc["Account.Fields.Fax"]:</label>+ <input asp-for="Fax" class="form-control" />+ <span asp-validation-for="Fax"></span>+ }+ </fieldset>+ }+ </div>+ </div>+ </div>+ }++ @if (Model.NewsletterEnabled || Model.CustomerAttributes.Any())+ {+ <div class="card mb-3">+ <div class="card-header">+ <h3 class="h5 mb-0">@Loc["Account.Options"]</h3>+ </div>+ <div class="card-body">+ @if (Model.NewsletterEnabled)+ {+ <div class="form-group">+ <label for="Newsletter" class="ml-1 custom-control custom-checkbox">+ <input class="custom-control-input" asp-for="Newsletter" onchange="toggleNewsletterCat()" />+ <span class="custom-control-label">@Loc["account.fields.newsletter"]</span>+ <span class="sr-only">@Loc["account.fields.newsletter"]</span>+ </label>+ <span asp-validation-for="Newsletter"></span>+ </div>+ <partial name="Partials/NewsLetterCategories" model="Model.NewsletterCategories" />+ }+ @if (Model.CustomerAttributes.Any())+ {+ <partial name="Partials/CustomerAttributes" model="Model.CustomerAttributes" />+ }+ </div>+ </div>+ }+ <div class="card mb-3">+ <div class="card-header">+ <h3 class="h5 mb-0">@Loc["Account.YourPassword"]</h3>+ </div>+ <div class="card-body">+ <div class="form-group">+ <validation-provider tag="div" vid="customer.Password" rules="required" v-slot="{ errors, classes }">+ <label asp-for="Password" class="col-form-label">@Loc["Account.Fields.Password"]:</label>+ <input asp-for="Password" v-model="customer.Password" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="Password"></span>+ </validation-provider>+ </div>+ <div class="form-group">+ <validation-provider tag="div" vid="customer.ConfirmPassword" rules="required|confirmed:@@customer.Password" v-slot="{ errors, classes }">+ <label asp-for="ConfirmPassword" class="col-form-label">@Loc["Account.Fields.ConfirmPassword"]:</label>+ <input asp-for="ConfirmPassword" v-model="customer.ConfirmPassword" v-bind:class="[classes , 'form-control']" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ <span asp-validation-for="ConfirmPassword"></span>+ </validation-provider>+ </div>+ @if (Model.DisplayCaptcha)+ {+ <div class="captcha-box form-group">+ <captcha />+ </div>+ }+ </div>+ </div>++ @if (Model.AcceptPrivacyPolicyEnabled)+ {++ <validation-provider tag="div" vid="customer.AcceptPrivacyPolicy" :rules="{ required: { allowFalse: false } }" v-slot="{ errors, classes }">+ <div class="d-inline-flex">+ <label class="custom-control custom-checkbox">+ <input id="accept-privacy-policy" name="acceptprivacypolicy" v-model="customer.AcceptPrivacyPolicy" data-val="true" data-val-required="@Loc["account.fields.acceptprivacypolicy.required"]" type="checkbox" v-bind:class="[classes , 'custom-control-input']">+ <span class="custom-control-label"></span>+ <span class="custom-control-description">@Loc["Account.Fields.AcceptPrivacyPolicy"]</span>+ </label>+ <b-link class="read mx-2" onclick="window.open('@Url.RouteUrl("PagePopup", new { SystemName = "privacyinfo" })', 450, 500, true)">@Loc["Account.Fields.AcceptPrivacyPolicy.Read"]</b-link>+ </div>+ <span class="field-validation-error d-flex w-100">{{ errors[0] }}</span>+ </validation-provider>+ }+ </div>+ <input type="submit" id="register-button" class="btn btn-info register-next-step-button my-3" value="@Loc["Account.Register.Button"]" />+ </form>+</validation-observer>+<script asp-location="Footer" asp-order="300">+ var customer = new Vue({+ data: () => ({+ @{+ <text>+ FirstName: '@Html.Raw(Model.FirstName)',+ LastName: '@Html.Raw(Model.LastName)',+ Company: '@Html.Raw(Model.Company)',+ StreetAddress: '@Html.Raw(Model.StreetAddress)',+ StreetAddress2: '@Html.Raw(Model.StreetAddress2)',+ ZipPostalCode: '@Html.Raw(Model.ZipPostalCode)',+ City: '@Html.Raw(Model.City)',+ CountryId: '@Model.CountryId',+ StateProvinceId: '@Model.StateProvinceId',+ Phone: '@Html.Raw(Model.Phone)',+ Fax: '@Html.Raw(Model.Fax)',+ Username: '@Html.Raw(Model.Username)',+ Email: '@Html.Raw(Model.Email)',+ Password: '',+ ConfirmPassword: '',+ AcceptPrivacyPolicy: false,+ @foreach (var item in Model.CustomerAttributes)+ {+ @switch (item.AttributeControlType)+ {+ case AttributeControlType.DropdownList:+ {+ @foreach (var itemValue in item.Values)+ {+ if (itemValue.IsPreSelected)+ {+ <text>customer_attribute_</text> @item.Id <text>: '@itemValue.Id',</text>+ break;+ } else {+ <text>customer_attribute_</text> @item.Id <text>: '',</text>+ }+ }+ }+ break;+ case AttributeControlType.Checkboxes:+ case AttributeControlType.RadioList:+ case AttributeControlType.ReadonlyCheckboxes:+ {+ <text>customer_attribute_</text> @item.Id <text>: [+ @foreach (var itemValue in item.Values)+ {+ if (itemValue.IsPreSelected)+ {+ <text>'@itemValue.Id',</text>+ }+ }+ ],</text>+ }+ break;+ case AttributeControlType.TextBox:+ case AttributeControlType.MultilineTextbox:+ {+ <text>customer_attribute_</text> @item.Id <text>: @if (item.DefaultValue != null) { <text>'@item.DefaultValue'</text> } else { <text>''</text> },</text>+ }+ break;+ }++ }+ </text>+ }+ }),+ created() {+ document.addEventListener("DOMContentLoaded", function () {+ document.querySelectorAll("[data-checked='true']").forEach(function (element) {+ element.checked = true;+ })+ });+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Reviews.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Reviews.cshtmlnew file mode 100644index 000000000..0274bc81e--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Reviews.cshtml@@ -0,0 +1,77 @@+@model CustomerProductReviewsModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Reviews })+}+<div class="page account-page product-reviews-page pl-lg-3 pt-lg-0 pt-3">+ <h1 class="h2 generalTitle"><div>@Loc["Account.Reviews"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (Model.Reviews.Any())+ {+ <div class="product-review-list">+ @foreach (var review in Model.Reviews)+ {+ int ratingStars = review.Rating;+ <div class="card product-review-item mb-3">+ <header class="card-header">+ <div class="review-info d-inline-flex w-100">+ <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>+ <small class="date d-flex text-muted">+ <span class="mr-1">@Loc["Reviews.Date"]:</span>+ <span>@review.CreatedOn.ToString("g")</span>+ </small>+ </div>+ </header>+ <div class="card-body">+ <div class="review-title mb-3">+ <div class="user d-inline-flex align-items-center w-100">+ <a href="@Url.RouteUrl("Product", new { SeName = review.ProductSeName })"><h6 class="mb-0">@review.ProductName</h6></a>+ </div>+ <b-form-rating id='rating-inline2' class='p-0' variant='warning' no-border size='sm' show-value precision='2' readonly inline value='@(ratingStars)'></b-form-rating>+ </div>+ <div class="review-content">+ <div class="review-text">+ @review.ReviewText+ </div>+ </div>+ </div>+ <footer class="card-footer">+ @if (!string.IsNullOrEmpty(review.ReplyText))+ {+ <div class="reply-content">+ <blockquote class="administration-response">+ <h5 class="administration-response-header">@Loc["Reviews.AdministrationResponse"]</h5>+ <i>@review.ReplyText</i>+ <p class="h6 mb-0 mt-2">@review.Signature</p>+ </blockquote>+ </div>+ }+ </footer>+ </div>+ }+ </div>+ }+ else+ {+ <div class="no-data alert alert-info my-3">+ @Loc["Account.Reviews.NoExists"]+ </div>+ }+</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccountAdd.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccountAdd.cshtmlnew file mode 100644index 000000000..9cfe4df50--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccountAdd.cshtml@@ -0,0 +1,35 @@+@model SubAccountCreateModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.SubAccounts })+}+<validation-observer v-slot="{ handleSubmit }">+ <form asp-route="CustomerSubAccountAdd" asp-antiforgery="true" method="post" autocomplete="off" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <div class="page account-page subaccount-edit-page pl-lg-3 mb-3 pt-lg-0 pt-3">+ <h1 class="generalTitle h2"><div>@Loc["Account.SubAccount.AddNew"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ <div asp-validation-summary="ModelOnly" class="message-error alert alert-danger my-3"></div>+ <partial name="Partials/CreateOrUpdateSubAccount" model="Model" />+ <div class="buttons generalMarginSupporter">+ <input type="submit" class="btn btn-info save-subaccount-button" value="@Loc["Common.Save"]" />+ </div>+ </div>+ </form>+</validation-observer>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccountEdit.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccountEdit.cshtmlnew file mode 100644index 000000000..979837a20--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccountEdit.cshtml@@ -0,0 +1,35 @@+@model SubAccountEditModel+@using Grand.Web.Models.Customer;+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.SubAccounts })+}+<validation-observer v-slot="{ handleSubmit }">+ <form asp-route="CustomerSubAccountEdit" asp-antiforgery="true" method="post" autocomplete="off" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">+ <div class="page account-page subaccount-edit-page pl-lg-3 mb-3 pt-lg-0 pt-3">+ <h1 class="generalTitle h2"><div>@Loc["Account.SubAccount.Edit"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ <div asp-validation-summary="ModelOnly" class="message-error alert alert-danger"></div>+ <partial name="Partials/CreateOrUpdateSubAccount" model="Model" />+ <div class="buttons generalMarginSupporter">+ <input type="submit" class="btn btn-info save-subaccount-button" value="@Loc["Common.Save"]" />+ </div>+ </div>+ </form>+</validation-observer>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccounts.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccounts.cshtmlnew file mode 100644index 000000000..2d201fbc9--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/SubAccounts.cshtml@@ -0,0 +1,101 @@+@model IList<SubAccountSimpleModel>+ @using Grand.Web.Models.Customer;+ @inject IPageHeadBuilder pagebuilder+ @{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.SubAccounts"]);+ }+ @section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.SubAccounts })+ }+ <vc:widget widget-zone="customer-subaccounts" additional-data="@Model"></vc:widget>+ <div class="page account-page subaccounts-list-page pl-lg-3 pt-lg-0 pt-3">+ @Html.AntiForgeryToken()+ <h1 class="h2 generalTitle"><div>@Loc["Account.SubAccounts"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ <div class="w-100">+ <button class="btn btn-outline-secondary add-address-button my-3" onclick="location = '@Url.RouteUrl("CustomerSubAccountAdd")'">+ <b-icon icon="clipboard-plus"></b-icon> @Loc["Common.AddNew"]+ </button>+ </div>+ @if (Model.Any())+ {+ <div class="col-12 px-0">+ <div class="row account-list">+ @for (int i = 0; i < Model.Count; i++)+ {+ var account = Model[i];+ <div class="col-md-6 col-12 mb-3">+ <div class="card">+ <div class="card-header">+ <h5 class="mb-0"><strong>@account.FirstName @account.LastName</strong></h5>+ </div>+ <div class="card-body">+ <div class="account-item">+ @account.Email+ </div>+ </div>+ <div class="card-footer">+ <div class="btn-group">+ <button class="btn btn-secondary edit-subaccount-button" onclick="location = '@(Url.RouteUrl("CustomerSubAccountEdit", new { id = account.Id }))'">+ @Loc["Common.Edit"]+ </button>+ <button class="btn btn-danger delete-subaccount-button" onclick="deletecustomersubaccount('@(account.Id)')">+ @Loc["Common.Delete"]+ </button>+ </div>+ </div>+ </div>+ </div>+ }+ </div>+ </div>+ <script asp-location="Footer">+ function deletecustomersubaccount(accountId) {+ if (confirm('@Loc["Admin.Common.AreYouSure"]')) {+ var postData = {+ Id: accountId+ };+ addAntiForgeryToken(postData);++ var bodyFormData = new FormData();+ bodyFormData.append('Id', accountId)+ bodyFormData.append('__RequestVerificationToken', document.querySelector('input[name=__RequestVerificationToken]').value);+ axios({+ method: 'post',+ url: '@(Url.RouteUrl("CustomerSubAccountDelete"))',+ data: bodyFormData,+ headers: { 'Content-Type': 'multipart/form-data' }+ }).then(function (response) {+ if (response.data.success) {+ location = response.data.redirect;+ }+ else {+ alert(response.error);+ }+ }).catch(function (error) {+ alert(error);+ })+ }+ }+ </script>+ }+ else+ {+ <div class="no-data alert alert-info my-3">+ @Loc["Account.SubAccounts.NotExists"]+ </div>+ }+ </div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Blog/BlogPost.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Blog/BlogPost.cshtmlnew file mode 100644index 000000000..a99ce4cd8--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Blog/BlogPost.cshtml@@ -0,0 +1,183 @@+@model BlogPostModel+@using Grand.Web.Models.Blogs;+@inject IWorkContext workContext+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Title);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);+}+@section left {+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_blog_before" })+ @await Component.InvokeAsync("BlogCategories")+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_before_blog_archive" })+ @await Component.InvokeAsync("BlogMonths")+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_after_blog_archive" })+ @await Component.InvokeAsync("BlogTags")+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_blog_after" })+}+<div class="page news-item-page">+ <div class="container">+ <a class="left-side-toggler" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["catalog.selectors.fiters"]+ </div>+ </a>+ @await Component.InvokeAsync("Widget", new { widgetZone = "blogpost_page_top", additionalData = Model.Id })+ <b-card class="card post-news mt-3">+ <template v-slot:header>+ @if (!string.IsNullOrEmpty(Model.PictureModel.ImageUrl))+ {+ <img class="img-fluid" src="@Model.PictureModel.ImageUrl" alt="@Model.PictureModel.AlternateText" />+ }+ <div class="content">+ <h1 class="h5 title generalTitle">+ @Model.Title+ </h1>+ <div class="date">+ @Model.CreatedOn.ToString("D")+ </div>+ </div>+ </template>+ @await Component.InvokeAsync("Widget", new { widgetZone = "blogpost_page_before_body", additionalData = Model.Id })+ @Html.Raw(Model.Body)+ </b-card>++ @await Component.InvokeAsync("Widget", new { widgetZone = "blogpost_page_before_products", additionalData = Model.Id })++ @await Component.InvokeAsync("BlogPostProducts", new { blogPostId = Model.Id })++ @if (Model.Tags.Any())+ {+ <div class="tags generalMarginSupporter">+ <div class="col-form-label w-100">@Loc["Blog.Tags"]:</div>+ @for (int i = 0; i < Model.Tags.Count; i++)+ {+ var tag = Model.Tags[i];+ <b-button variant="light" size="sm" class="mr-2 mb-2" href="@Url.RouteUrl("BlogByTag", new {tag = tag})">@tag</b-button>+ }+ </div>+ }++ @await Component.InvokeAsync("Widget", new { widgetZone = "blogpost_page_before_comments", additionalData = Model.Id })+ @if (Model.AllowComments)+ {+ <div class="fieldset new-comment generalMarginSupporter d-flex flex-column w-100" id="comments">+ <h4 class="generalTitle generalMarginSupporter">@Loc["Blog.Comments.LeaveYourComment"]</h4>+ <div class="notifications">+ <div asp-validation-summary="ModelOnly" class="message-error"></div>+ @{+ var result = TempData["Grand.blog.addcomment.result"] as string;+ }+ @if (!String.IsNullOrEmpty(result))+ {+ <div class="alert alert-info">@result</div>+ }+ </div>+ <validation-observer v-slot="{ handleSubmit }">+ <form id="addBlogComment" asp-controller="Blog" asp-action="BlogPost" asp-route-id="@Model.Id" method="post" v-on:submit.prevent="handleSubmit(blog.submitBlogComment)">+ <input type="hidden" name="Id" value="@Model.Id"/>+ <div class="form-fields">+ <div class="form-group">+ <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">+ <label for="CommentText" class="col-form-label">@Loc["Blog.Comments.CommentText"]:</label>+ <textarea name="CommentText" v-model="blog.CommentText"+ data-val-required="Enter comment"+ v-bind:class="[classes , 'form-control']" autofocus="autofocus" rows="4"></textarea>+ <span class="field-validation-error">{{ errors[0] }}</span>+ </validation-provider>+ </div>+ @if (Model.AddNewComment.DisplayCaptcha)+ {+ <div class="captcha-box">+ <captcha/>+ </div>+ }+ </div>+ <div class="buttons text-xs-center text-md-left generalMarginSupporter">+ <input type="submit" asp-action="BlogCommentAdd" name="add-comment" class="btn btn-info blog-post-add-comment-button" value="@Loc["Blog.Comments.SubmitButton"]"/>+ </div>+ </form>+ </validation-observer>+ <script asp-location="Footer" asp-order="300">+ var blog = new Vue({+ data: function () {+ return {+ Model: null,+ CommentText: ''+ }+ },+ created() {+ this.Model = @Json.Serialize(Model.Comments);+ },+ methods: {+ submitBlogComment() {+ var form = document.getElementById("addBlogComment");+ var url = form.getAttribute("action");+ var bodyFormData = new FormData(form);+ axios({+ url: url,+ data: bodyFormData,+ method: 'post',+ headers: {+ 'Accept': 'application/json'+ }+ }).then(function (response) {+ if (response.data.success == true){+ blog.CommentText = ' ';+ vm.displayBarNotification(response.data.message, '', 'success', 3000);+ if (response.data.model){+ blog.addComment(response.data.model)+ }+ } else {+ vm.displayBarNotification(response.data.message, '', 'error', 3500);+ }+ })+ },+ addComment(model) {+ // Add object item to array+ this.Model.push(model);+ }+ }+ });+ </script>+ </div>+ <template v-if="blog.Model.length > 0">+ <div class="comment-list">+ <h4 class="generalTitle generalMarginSupporter">+ <strong>@Loc["Blog.Comments"]</strong>+ </h4>+ <div class="comments">+ <template v-for="comment in blog.Model">+ <div class="card mb-3">+ <div class="card-header">+ <div class="d-inline-flex w-100">+ <h6 class="mb-0">{{comment.CustomerName}}</h6>+ <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>+ <small class="date text-muted">+ <span>@Loc["Blog.Comments.CreatedOn"]:</span>+ <span>{{new Date( comment.CreatedOn).toDateString()}}</span>+ </small>+ </div>+ </div>+ <div class="card-body">+ {{comment.CommentText}}+ </div>+ </div>+ </template>+ </div>+ </div>+ </template>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "blogpost_page_after_comments", additionalData = Model.Id })+ @await Component.InvokeAsync("Widget", new { widgetZone = "blogpost_page_bottom", additionalData = Model.Id })+ </div>+</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogCategories/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogCategories/Default.cshtmlnew file mode 100644index 000000000..8158a8f35--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogCategories/Default.cshtml@@ -0,0 +1,21 @@+@model IList<BlogPostCategoryModel>+@using Grand.Web.Models.Blogs+@if (Model.Any())+{+ <section id="block-blog-archive" class="block block-blog-archive">+ <h2 class="h5"><strong>@Loc["Blog.Category"]</strong></h2>+ <div class="viewBox">+ <ul class="list">+ @foreach (var category in Model)+ {+ <li>+ <a href="@Url.RouteUrl("BlogByCategory", new { categorySeName = category.SeName })">+ @category.Name+ (@(category.BlogPostCount))+ </a>+ </li>+ }+ </ul>+ </div>+ </section>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogMonths/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogMonths/Default.cshtmlnew file mode 100644index 000000000..8c1f23956--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogMonths/Default.cshtml@@ -0,0 +1,29 @@+@model IList<BlogPostYearModel>+@using Grand.Web.Models.Blogs;+@if (Model.Any())+{+ <section id="block-blog-archive" class="block block-blog-archive">+ <h2 class="h5"><strong>@Loc["Blog.Archive"]</strong></h2>+ <div class="viewBox">+ <ul class="list" id="blog-month-list">+ @foreach (var yearItem in Model)+ {+ <li class="year">+ <strong class="number">@(yearItem.Year)</strong>+ <ul class="sublist" id="blog-year-@(yearItem.Year)">+ @foreach (var monthItem in yearItem.Months)+ {+ <li class="month">+ <a href="@Url.RouteUrl("BlogByMonth", new { month = yearItem.Year + "-" + monthItem.Month })">+ @(new DateTime(yearItem.Year, monthItem.Month, 1).ToString("MMMM"))+ (@(monthItem.BlogPostCount))+ </a>+ </li>+ }+ </ul>+ </li>+ }+ </ul>+ </div>+ </section>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogTags/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogTags/Default.cshtmlnew file mode 100644index 000000000..a8b33a2ce--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Blog/Components/BlogTags/Default.cshtml@@ -0,0 +1,18 @@+@model BlogPostTagListModel+@using Grand.Web.Models.Blogs+@if (Model.Tags.Any())+{+ <div id="block-popular-blogtags" class="block block-popular-blogtags">+ <h2 class="h5"><strong>@Loc["Blog.TagCloud"]</strong></h2>+ <div class="viewBox">+ <div class="product-tags-list">+ @foreach (var item in Model.Tags)+ {+ <b-button variant="light" size="sm" class="mb-2 mr-2" href="@Url.RouteUrl("BlogByTag", new { tag = item.Name })" style="font-size:@(Model.GetFontSize(item))%;">+ @item.Name+ </b-button>+ }+ </div>+ </div>+ </div>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Blog/List.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Blog/List.cshtmlnew file mode 100644index 000000000..6e28548c5--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Blog/List.cshtml@@ -0,0 +1,136 @@+@model BlogPostListModel+@using Grand.Web.Models.Blogs;+@inject IWorkContext workContext+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Blog"]);+}+@section left {+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_blog_before" })+ @await Component.InvokeAsync("BlogCategories")+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_before_blog_archive" })+ @await Component.InvokeAsync("BlogMonths")+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_after_blog_archive" })+ @await Component.InvokeAsync("BlogTags")+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_blog_after" })+}+<div class="page blog-page">+ <div class="container">+ <h2 class="generalTitle">+ @if (String.IsNullOrEmpty(Model.PagingFilteringContext.Tag))+ {+ if (Model.PagingFilteringContext.GetParsedMonth().HasValue)+ {+ @String.Format(Loc["Blog.FilteredByMonth"], Model.PagingFilteringContext.GetParsedMonth().Value.Year, Model.PagingFilteringContext.GetParsedMonth().Value.ToString("MMMM"))+ }+ else+ {+ @Loc["Blog"]+ }+ }+ else+ {+ @String.Format(Loc["Blog.TaggedWith"], Model.PagingFilteringContext.Tag)+ }+ @if (!string.IsNullOrEmpty(Model.SearchKeyword))+ {+ <label class="mb-0 error-label red">@Loc["Blog.ResultsFor"] <i>@Model.SearchKeyword</i></label>+ }+ </h2>+ <form method="get" id="small-search-box-form-blog" asp-action="BlogByKeyword" asp-controller="Blog" novalidate="novalidate">+ <div class="mb-3 input-group">+ <span role="status" aria-live="polite" class="ui-helper-hidden-accessible"></span>+ <input type="text" class="form-control search-box-text ui-autocomplete-input" id="small-searchterms-blog"+ autocomplete="off" name="SearchKeyword" placeholder="@Loc["Blog.SearchPlaceholder"]">++ <span class="input-group-append">+ <b-button type="submit" variant="secondary" class="search-box-button d-flex align-items-center float-sm-right">+ <span class="sr-only">Search store</span>+ <b-icon icon="search" class="mx-1"></b-icon>+ <span class="d-none d-lg-block">@Loc["Blog.Search"]</span>+ </b-button>+ </span>+ </div>+ </form>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["catalog.selectors.fiters"]+ </div>+ </a>+ @await Component.InvokeAsync("Widget", new { widgetZone = "bloglist_page_before_posts" })+ <b-row class="blog-posts">+ @foreach (var item in Model.BlogPosts)+ {+ <b-col xl="4" lg="6" md="6" sm="6" cols="12">+ <b-card class="post-news mb-3">+ <template v-slot:header>+ @if (!string.IsNullOrEmpty(item.PictureModel.ImageUrl))+ {+ <b-link class="img-container">+ <img src="@item.PictureModel.ImageUrl" alt="@item.PictureModel.AlternateText" />+ </b-link>+ }+ <h3 class="h5 title">+ <b-link href="@Url.RouteUrl("BlogPost", new { SeName = item.SeName })">+ @item.Title+ </b-link>+ </h3>+ <div class="date">+ @item.CreatedOn.ToString("D")+ </div>+ </template>+ <div class="buttons mt-3">+ <a class="btn btn-sm btn-outline-secondary read-more" href="@Url.RouteUrl("BlogPost", new { SeName = item.SeName })">@Loc["Blog.MoreInfo"]</a>+ </div>+ </b-card>+ </b-col>+++ @*+ @await Component.InvokeAsync("Widget", new { widgetZone = "bloglist_page_before_post", additionalData = item.Id })+ <b-col xl="4" lg="4" cols="12" class="mb-3">+ <b-card class="blog-post" onclick="window.location.href = '@Url.RouteUrl("BlogPost", new { SeName = item.SeName })'">+ <template v-slot:header>+ @if (!string.IsNullOrEmpty(item.PictureModel.ImageUrl))+ {+ <b-link href="@Url.RouteUrl("BlogPost", new { SeName = item.SeName })" class="img-container">+ <img src="@item.PictureModel.ImageUrl" alt="@item.PictureModel.AlternateText" />+ </b-link>+ }+ <div class="content">+ <h3 class="h5 title">+ <b-link class="text-white" href="@Url.RouteUrl("BlogPost", new { SeName = item.SeName })">+ @item.Title+ </b-link>+ </h3>+ <div class="date">+ @item.CreatedOn.ToString("D")+ </div>+ </div>+ </template>+ @await Component.InvokeAsync("Widget", new { widgetZone = "bloglist_page_inside_post", additionalData = item.Id })+ </b-card>++ @if (item.AllowComments)+ {+ <b-button href="@Url.RouteUrl("BlogPost", new {SeName = item.SeName})#comments" variant="outline-secondary" class="read-comments btn-sm">@string.Format(Loc["Blog.CommentsLink"], item.NumberOfComments)</b-button>+ }+ <b-button href="@Url.RouteUrl("BlogPost", new {SeName = item.SeName})" variant="outline-secondary" class="read-more btn-sm">@Loc["Blog.MoreInfo"]</b-button>+ </b-col>+ @await Component.InvokeAsync("Widget", new { widgetZone = "bloglist_page_after_post", additionalData = item.Id })+ *@+ }+ </b-row>+ <page-navigation asp-query-param="pagenumber" asp-pagination="Model.PagingFilteringContext" />++ @await Component.InvokeAsync("Widget", new { widgetZone = "bloglist_page_after_posts" })+ </div>+</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/BrandLayout.GridOrLines.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/BrandLayout.GridOrLines.cshtmlnew file mode 100644index 000000000..440dec237--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/BrandLayout.GridOrLines.cshtml@@ -0,0 +1,89 @@+@model BrandModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ var canonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;+ if (canonicalUrlsEnabled)+ {+ var collectionUrl = Url.RouteUrl("Brand", new { SeName = Model.SeName }, this.Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(collectionUrl);+ }+ <script asp-location="Header" asp-src="/theme/script/catalog.js"></script>+}++<b-skeleton-wrapper :loading="catalog.loading == true">+ <template #loading>+ <div>+ <b-skeleton width="100%" height="20vh" class="mb-3"></b-skeleton>+ <b-skeleton width="100%" height="80vh"></b-skeleton>+ </div>+ </template>+ <div class="page brand-page catalog-page mb-2">+ <template v-if="catalog.Model.Description !== null">+ <div v-html="catalog.Model.Description"></div>+ </template>+ <h1 class="generalTitle h2"><div>{{catalog.Model.Name}}</div></h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_top", additionalData = Model.Id })+ @*Rendering description section*@+ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_before_featured_products", additionalData = Model.Id })+ @*Rendering featured products section*@+ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_after_featured_products", additionalData = Model.Id })+ <div id="catalog-products">+ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_before_filters", additionalData = Model.Id })+ <partial name="Partials/Selectors" />+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <b-col cols="12" class="product-grid standard px-0">+ <b-form-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <b-col lg="4" sm="6" cols="6" class="product-container new-col-6 mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </b-col>+ </template>+ </b-form-row>+ </b-col>+ </template>+ <template v-else>+ <div class="product-list">+ <b-col cols="12">+ <b-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <product-box-list-vue :Model="Model"></product-box-list-vue>+ </template>+ </b-row>+ </b-col>+ </div>+ </template>+ @*<partial name="Partials/Pagination" />*@+ <partial name="Partials/ScrollPagination" />+ </template>+ <template v-else>+ <b-alert variant="info" show class="my-3">+ @Loc["search.noresultstext"]+ </b-alert>+ </template>+ </div>+ @*Rendering bottom description section*@+ <template v-if="catalog.Model.BottomDescription !== null">+ <div v-html="catalog.Model.BottomDescription"></div>+ </template>++ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_bottom", additionalData = Model.Id })+ </div>+</b-skeleton-wrapper>++@section filters+ {+ @*Rendering filtering section*@+ @*@if (Model.PagingFilteringContext.SpecificationFilter.Enabled)+ {+ <partial name="Partials/Filtering" />+ }*@+}+<partial name="Partials/ModelScript" model="@Json.Serialize(Model)" />\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/CategoryLayout.GridOrLines.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/CategoryLayout.GridOrLines.cshtmlnew file mode 100644index 000000000..6738ffac2--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/CategoryLayout.GridOrLines.cshtml@@ -0,0 +1,167 @@+@model CategoryModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);+ var canonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;+ if (canonicalUrlsEnabled)+ {+ var categoryUrl = Url.RouteUrl("Category", new { SeName = Model.SeName }, this.Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(categoryUrl);+ }+}++@* Rednering category breadcrumbs*@+@section Breadcrumb+ {+ @if (Model.DisplayCategoryBreadcrumb)+ {++ var count = 0;++ <ol class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList">+ <li class="breadcrumb-item" itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem">+ <a href="@Url.RouteUrl("HomePage")" title="@Loc["Categories.Breadcrumb.Top"]">+ <b-icon icon="house-door" scale="1.25" shift-v="1.25" aria-hidden="true"></b-icon>+ <span itemprop="name">@Loc["Products.Breadcrumb.Top"]</span>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ id="@Url.RouteUrl("HomePage")">+ </span>+ <meta itemprop="position" content="@count" />+ </a>+ </li>+ @foreach (var cat in Model.CategoryBreadcrumb)+ {+ count++;+ var isLastCategory = cat.Id == Model.Id;+ @if (isLastCategory)+ {+ <li class="breadcrumb-item active" itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem">+ <a>+ <strong class="current-item" itemprop="name">@cat.Name</strong>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ id="@Url.RouteUrl("Category", new {SeName = cat.SeName})">+ </span>+ <meta itemprop="position" content="@count" />+ </a>+ </li>+ }+ else+ {+ <li class="breadcrumb-item" itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem">+ <a href="@Url.RouteUrl("Category", new { SeName = cat.SeName })" title="@cat.Name" itemprop="item">+ <span itemprop="name">@cat.Name</span>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ id="@Url.RouteUrl("Category", new { SeName = cat.SeName })">+ </span>+ <meta itemprop="position" content="@count" />+ </a>+ </li>+ }++ }+ </ol>+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_after_breadcrumb", additionalData = Model.Id })+ }+}+ <div class="page category-page catalog-page mb-2">+ <template v-if="catalog.Model.Description !== null">+ <div v-html="catalog.Model.Description"></div>+ </template>+ <h1 class="generalTitle h2"><div>{{catalog.Model.Name}}</div></h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_top", additionalData = Model.Id })+ @*Rendering category description*@+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_before_subcategories", additionalData = Model.Id })+ @*Rendering subcategories*@+ <template v-if="catalog.Model.SubCategories.length > 0">+ <div id="subcatslider" class="mb-3">+ <swiper ref="SubCategories"+ :options="subcatslider.swiperOptions">+ <template v-for="item in catalog.Model.SubCategories">+ <swiper-slide>+ <b-link class="category-item" :href="'/' + item.SeName" :title="item.PictureModel.Title">+ <img :src="item.PictureModel.ImageUrl" :alt="item.PictureModel.AlternateText" />+ <div class="content">+ <h6 class="title mb-0">{{item.Name}}</h6>+ </div>+ </b-link>+ </swiper-slide>+ </template>+ </swiper>+ </div>+ </template>+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_before_featured_products", additionalData = Model.Id })+ @*Rendering featured products section*@+ <template v-if="catalog.Model.FeaturedProducts.length > 0">+ <b-col cols="12" class="product-grid featured-product-grid px-0">+ <h2 class="generalTitle mb-3">+ <span>@Loc["Products.FeaturedProducts"]</span>+ </h2>+ <div class="item-row">+ <template :key="Model" v-for="Model in catalog.Model.FeaturedProducts">+ <b-col lg="4" sm="6" cols="6" class="product-container new-col-6 px-0 mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </b-col>+ </template>+ </div>+ </b-col>+ </template>+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_after_featured_products", additionalData = Model.Id })+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_before_filters", additionalData = Model.Id })+ <div id="catalog-products">+ <template v-if="catalog.Model !== undefined">+ <partial name="Partials/Selectors" />+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <b-col cols="12" class="product-grid standard px-0">+ <b-form-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <b-col lg="3" sm="4" cols="6" class="product-container px-0 mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </b-col>+ </template>+ </b-form-row>+ </b-col>+ </template>+ <template v-else>+ <div class="product-list">+ <b-col cols="12">+ <b-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <product-box-list-vue :Model="Model"></product-box-list-vue>+ </template>+ </b-row>+ </b-col>+ </div>+ </template>+ @*<partial name="Partials/Pagination" />*@+ <partial name="Partials/ScrollPagination" />+ </template>+ <template v-else>+ <b-alert variant="info" show class="my-3">+ @Loc["search.noresultstext"]+ </b-alert>+ </template>+ </template>+ </div>+ @*Rendering bottom description*@+ <template v-if="catalog.Model.BottomDescription !== null">+ <div v-html="catalog.Model.BottomDescription"></div>+ </template>+ @*Rendering rccently viewed products section*@+ @await Component.InvokeAsync("RecentlyViewedProductsBlock", new { productThumbPictureSize = 235 })+ </div>+@section filters+ {+ @*Rendering filtering section*@+ @if (Model.PagingFilteringContext.SpecificationFilter.Enabled)+ {+ <partial name="Partials/Filtering" />+ }+}++<partial name="Partials/ModelScript" model="@Json.Serialize(Model)" />\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/CollectionLayout.GridOrLines.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/CollectionLayout.GridOrLines.cshtmlnew file mode 100644index 000000000..78c4f4200--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/CollectionLayout.GridOrLines.cshtml@@ -0,0 +1,103 @@+@model CollectionModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";+ pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ var canonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;+ if (canonicalUrlsEnabled)+ {+ var collectionUrl = Url.RouteUrl("Collection", new { SeName = Model.SeName }, this.Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(collectionUrl);+ }+}++<b-skeleton-wrapper :loading="catalog.loading == true">+ <template #loading>+ <div>+ <b-skeleton width="100%" height="20vh" class="mb-3"></b-skeleton>+ <b-skeleton width="100%" height="80vh"></b-skeleton>+ </div>+ </template>+ <div id="catalog-products" class="page collection-page mb-2">+ @*Rendering description section*@+ <template v-if="catalog.Model.Description !== null">+ <div v-html="catalog.Model.Description"></div>+ </template>+ <h1 class="generalTitle h2"><div>{{catalog.Model.Name}}</div></h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_top", additionalData = Model.Id })+ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_before_featured_products", additionalData = Model.Id })+ @*Rendering featured products section*@+ <template v-if="catalog.Model.FeaturedProducts.length > 0">+ <b-col cols="12" class="product-grid featured-product-grid px-0">+ <h2 class="h5 text-left mb-3">+ <span>@Loc["Products.FeaturedProducts"]</span>+ </h2>+ <div class="item-row">+ <template :key="Model.Id" v-for="Model in catalog.Model.FeaturedProducts">+ <b-col lg="4" sm="6" cols="6" class="product-container new-col-6 px-0 mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </b-col>+ </template>+ </div>+ </b-col>+ </template>+ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_after_featured_products", additionalData = Model.Id })+ <div id="catalog-products">+ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_before_filters", additionalData = Model.Id })+ <partial name="Partials/Selectors" />+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <b-col cols="12" class="product-grid px-0">+ <b-form-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <b-col lg="4" sm="6" cols="6" class="product-container new-col-6 mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </b-col>+ </template>+ </b-form-row>+ </b-col>+ </template>+ <template v-else>+ <div class="product-list">+ <b-col cols="12">+ <b-row>+ <template v-for="Model in catalog.Model.Products">+ <partial name="Partials/ProductBoxListVue" />+ </template>+ </b-row>+ </b-col>+ </div>+ </template>+ @*<partial name="Partials/Pagination" />*@+ <partial name="Partials/ScrollPagination" />+ </template>+ <template v-else>+ <b-alert variant="info" show class="my-3">+ @Loc["search.noresultstext"]+ </b-alert>+ </template>+ </div>++ @*Rendering bottom description section*@+ <template v-if="catalog.Model.BottomDescription !== null">+ <div v-html="catalog.Model.BottomDescription"></div>+ </template>++ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_bottom", additionalData = Model.Id })+ </div>+</b-skeleton-wrapper>++ @section filters+ {+ @*Rendering filtering section*@+ @if (Model.PagingFilteringContext.SpecificationFilter.Enabled)+ {+ <partial name="Partials/Filtering" />+ }+ }++ <partial name="Partials/ModelScript" model="@Json.Serialize(Model)" />diff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Filtering.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Filtering.cshtmlnew file mode 100644index 000000000..c2f71d548--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Filtering.cshtml@@ -0,0 +1,65 @@+<template v-if="catalog.Model !== null">+ <template v-if="catalog.Model.PagingFilteringContext.SpecificationFilter.Enabled">+ <div id="block-product-spec-filter" class="block product-filter product-spec-filter">+ <h2 class="h5">+ <strong>@Loc["Filtering.SpecificationFilter"]</strong>+ </h2>+ <div class="filter-content viewBox">+ <template v-if="catalog.Model.PagingFilteringContext.SpecificationFilter.NotFilteredItems !== undefined">+ <div class="available-items">+ <template v-for="group in catalog.Model.PagingFilteringContext.SpecificationFilter.NotFilteredItems">+ <b-col cols="12" class="px-0">+ <ul class="group product-spec-group">+ <li class="title">+ <h6>{{group[0].SpecificationAttributeName}}</h6>+ </li>+ <li>+ <b-button-group size="sm" class="d-inline-flex flex-wrap">+ <template v-for="spec in group">+ <template v-if="spec.SpecificationAttributeOptionColorRgb !== null">+ <b-button size="sm" variant="outline-secondary" class="color-container mb-1 mr-1" @@click="catalog.loadProducts(spec.FilterUrl)">+ <span class="color" :title="spec.SpecificationAttributeOptionName" :style="'background-color:' + spec.SpecificationAttributeOptionColorRgb"> </span>+ </b-button>+ </template>+ <template v-else>+ <b-button size="sm" variant="outline-secondary" class="mb-1 mr-1" @@click="catalog.loadProducts(spec.FilterUrl)">+ {{spec.SpecificationAttributeOptionName}}+ </b-button>+ </template>+ </template>+ </b-button-group>+ </li>+ </ul>+ </b-col>+ </template>+ </div>+ </template>+ </div>+ <template v-if="JSON.stringify(catalog.Model.PagingFilteringContext.SpecificationFilter.AlreadyFilteredItems) !== '{}'">+ <b-card header="@Loc["Filtering.SpecificationFilter.CurrentlyFilteredBy"]" header-tag="h6" class="filtered-items mb-3">+ <ul class="p-0 mb-0">+ <template v-for="group in catalog.Model.PagingFilteringContext.SpecificationFilter.AlreadyFilteredItems">+ <li class="item">+ <div class="mb-2">+ <strong>{{group[0].SpecificationAttributeName}}:</strong>+ </div>+ <div class="d-inline-flex flex-wrap w-100">+ <template v-for="spec in group">++ <b-link class="d-flex align-items-center mr-2 mb-2 pb-0" @@click="catalog.loadProducts(spec.FilterUrl)">{{spec.SpecificationAttributeOptionName}}<b-icon class="ml-2 text-danger" icon="x-circle-fill"></b-icon></b-link>++ </template>+ </div>+ </li>+ </template>+ </ul>+ <div class="remove-filter">+ <b-button size="sm" variant="danger" @@click="catalog.loadProducts(catalog.Model.PagingFilteringContext.SpecificationFilter.RemoveFilterUrl)">+ @Loc["Filtering.SpecificationFilter.Remove"]+ </b-button>+ </div>+ </b-card>+ </template>+ </div>+ </template>+</template>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ModelScript.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ModelScript.cshtmlnew file mode 100644index 000000000..c1b9d79a8--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ModelScript.cshtml@@ -0,0 +1,146 @@+@model object+<script asp-location="Footer" asp-order="300">+ var catalog = new Vue({+ data: function () {+ return {+ Model: [],+ pager: [],+ Count: []+ }+ },+ methods: {+ loadProducts(url) {+ //set state+ var stateurl = new URL(url);++ stateurl.searchParams.delete('timestamp');+ stateurl.searchParams.delete('pagenumber');++ if (typeof AjaxFilter !== "undefined") {+ stateurl.searchParams.forEach(function (key, value) {+ document.querySelector("#ajaxfilter-form ." + value).value = key;+ AjaxFilter.setFilter(value);+ });+ } else {+ catalog.getResponse(url);+ }++ window.history.replaceState({ path: stateurl.href }, '', stateurl.href);+ },+ getResponse(url) {+ url = new URL(url);+ url.searchParams.set('timestamp', new Date().getTime());+ const options = {+ headers: {+ 'Accept': 'application/json',+ 'Content-Type': 'application/json',+ 'X-Response-View': 'Json'+ }+ };+ axios.get(url, options)+ .then(response => {+ let currentPageNumber = response.data.PagingFilteringContext.PageNumber;++ if (currentPageNumber > 1 && response.data.PagingFilteringContext.PageNumber !== catalog.Model.PagingFilteringContext.PageNumber) {+ const oldProducts = catalog.Model.Products;+ catalog.Model = response.data;+ const products = oldProducts.concat(response.data.Products);+ catalog.Model.Products = products;+ } else {+ catalog.Model = response.data;+ }++ scrollpagination.stop = false;+ })+ .catch(err => {+ console.log(`${err} whilst contacting the catalog page.`)+ });+ },+ goToPage(page) {+ let urlPagenumber = new URL(window.location.href);+ catalog.loadProducts(urlPagenumber.href);+ },+ setCount(pageSize) {+ if (pageSize > 0) {+ var p_size = pageSize;+ } else {+ var p_size = 1;+ }+ var p_count = catalog.Model.Products.length;+ totalPage = Math.ceil(p_count / p_size);+ var p_numbers = Array.from(Array(totalPage).keys());++ const originalObj = this.Count;+ let newModel = { ...originalObj, p_numbers }+ this.Count = newModel;+ },+ next() {+ var currentPage = catalog.Model.PagingFilteringContext.PageNumber - 1;+ var my_array = catalog.Model.Count;+ var last_element = my_array[my_array.length - 1];+ if (last_element > currentPage) {+ document.getElementById("PageNumber").value = currentPage + 1;+ AjaxFilter.setFilter('pagenumber');+ }+ },+ pageScroll() {+ const catalogProdH = document.getElementById("catalog-products").scrollHeight;+ const TotalPages = catalog.Model.PagingFilteringContext.TotalPages;+ let PageNumber = catalog.Model.PagingFilteringContext.PageNumber;++ if (window.pageYOffset >= catalogProdH && PageNumber < TotalPages && !this.stop) {+ this.stop = true;+ this.next();+ }+ }+ },+ created() {+ this.Model = @Model;+ },+ watch: {+ Model: function(val) {+ if (val) {+ catalog.pager = [];+ function getValMin() {+ var i;+ if ((catalog.Model.PagingFilteringContext.PageNumber - 4) < 1) {+ i = 1;+ } else {+ i = catalog.Model.PagingFilteringContext.PageNumber - 4;+ }+ return i;+ }+ function getValMax() {+ var i;+ if ((catalog.Model.PagingFilteringContext.PageNumber + 4) < catalog.Model.PagingFilteringContext.TotalPages) {+ i = catalog.Model.PagingFilteringContext.PageNumber + 4;+ } else {+ i = catalog.Model.PagingFilteringContext.TotalPages;+ }+ return i;+ }+ for (var i = getValMin(); i <= getValMax(); i++) {+ catalog.pager.push(i);+ }++ var notFilteredList = catalog.Model.PagingFilteringContext.SpecificationFilter.NotFilteredItems;+ var filteredList = catalog.Model.PagingFilteringContext.SpecificationFilter.AlreadyFilteredItems;+ var filterName = 'SpecificationAttributeName';++ var groupBy = function (xs, key) {+ return xs.reduce(function (rv, x) {+ (rv[x[key]] = rv[x[key]] || []).push(x);+ return rv;+ }, {});+ };++ catalog.Model.PagingFilteringContext.SpecificationFilter.NotFilteredItems = groupBy(notFilteredList, filterName);+ catalog.Model.PagingFilteringContext.SpecificationFilter.AlreadyFilteredItems = groupBy(filteredList, filterName);++ var pageSize = 0;+ this.setCount(pageSize);+ }+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Pagination.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Pagination.cshtmlnew file mode 100644index 000000000..70b3ccb67--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Pagination.cshtml@@ -0,0 +1,31 @@+<template v-if="catalog.Model !== null">+ <template v-if="catalog.Model.PagingFilteringContext.TotalPages > 1">+ <div class="vue-pager">+ <template v-if="(catalog.Model.PagingFilteringContext.PageIndex >= 3) && (catalog.Model.PagingFilteringContext.TotalPages > 5)">+ <div class="page-item prev" @@click="catalog.goToPage(1)">+ @Loc["pager.firstpagetitle"]+ </div>+ </template>+ <template v-if="catalog.Model.PagingFilteringContext.HasPreviousPage">+ <div class="page-item" @@click="catalog.goToPage(catalog.Model.PagingFilteringContext.PageNumber - 1)">+ @Loc["pager.previouspagetitle"]+ </div>+ </template>+ <template v-for="item in catalog.pager">+ <div class="page-item" v-bind:class="{ current: (catalog.Model.PagingFilteringContext.PageNumber) == item }" @@click="catalog.goToPage(item)">+ {{item}}+ </div>+ </template>+ <template v-if="catalog.Model.PagingFilteringContext.HasNextPage">+ <div class="page-item next" @@click="catalog.goToPage(catalog.Model.PagingFilteringContext.PageNumber + 1)">+ @Loc["pager.nextpagetitle"]+ </div>+ </template>+ <template v-if="((catalog.Model.PagingFilteringContext.PageIndex + 3) < catalog.Model.PagingFilteringContext.TotalPages) && (catalog.Model.PagingFilteringContext.TotalPages > 5)">+ <div class="page-item last" @@click="catalog.goToPage(catalog.Model.PagingFilteringContext.TotalPages)">+ @Loc["pager.lastpagetitle"]+ </div>+ </template>+ </div>+ </template>+</template>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ScrollPagination.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ScrollPagination.cshtmlnew file mode 100644index 000000000..91c6fb993--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ScrollPagination.cshtml@@ -0,0 +1,54 @@+<div id="ajax-preloader-container" class="d-flex justify-content-center align-items-center">+ <div class="alert-info alert">+ <template v-if="catalog.Model.PagingFilteringContext.PageNumber !== catalog.Model.PagingFilteringContext.TotalPages">+ <div class="d-inline-flex align-items-center w-100">+ <div class="spinner-border text-info mr-3" role="status"></div>+ <div>@Loc["View.ScrollDown"]</div>+ </div>+ </template>+ <template v-else>+ @Loc["View.Nomore"]+ </template>+ </div>+</div>+<script asp-location="Footer" asp-order="300">+ var scrollpagination = new Vue({+ data: function () {+ return {+ stop: false+ }+ },+ methods: {+ next() {+ let currentPage = catalog.Model.PagingFilteringContext.PageNumber;+ let nextPage = currentPage + 1;+ let my_array = catalog.Count.p_numbers;+ let last_element = my_array[my_array.length - 1];+ if (last_element > currentPage && last_element !== currentPage) {+ if (typeof AjaxFilter === 'undefined') {+ let urlPagenumber = new URL(window.location.href);+ urlPagenumber.searchParams.set('pagenumber', nextPage)+ catalog.loadProducts(urlPagenumber);+ } else {+ document.getElementById("PageNumber").value = currentPage;+ AjaxFilter.setFilter('pagenumber');+ }+ }+ },+ pageScroll() {+ let catalogProdH = document.getElementById("catalog-products").scrollHeight * .5;+ let TotalPages = catalog.Model.PagingFilteringContext.TotalPages;+ let PageNumber = catalog.Model.PagingFilteringContext.PageNumber;+ if (window.pageYOffset >= catalogProdH && PageNumber < TotalPages && !this.stop) {+ this.stop = true;+ this.next();+ }+ }+ },+ created() {+ document.addEventListener("DOMContentLoaded", function () {+ window.addEventListener('scroll', scrollpagination.pageScroll);+ });+ }+ })+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Selectors.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Selectors.cshtmlnew file mode 100644index 000000000..b73c7df8d--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/Selectors.cshtml@@ -0,0 +1,91 @@+<template v-if="catalog.Model.Products.length > 0">+ <div class="categoryGrid catalog-selectors mb-3">+ @*Rendering mobile left side trigger*@+ <div class="d-flex flex-row row align-items-end px-3">+ <a class="left-side-toggler" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["catalog.selectors.fiters"]+ </div>+ </a>+ @*Rendering sorting*@+ <template v-if="catalog.Model.PagingFilteringContext.AllowProductSorting">+ <div class="sort-container column">+ <label class="col-form-label">@Loc["Catalog.OrderBy"]</label>+ <select class="custom-select form-control" id="AvailableSortOption" name="AvailableSortOption" v-on:change="catalog.loadProducts($event.target.value)" aria-label="@Loc["Catalog.OrderBy"]">+ <template v-for="item in catalog.Model.PagingFilteringContext.AvailableSortOptions">+ <option :selected="item.Selected" :value="item.Value" :disabled="false">+ {{item.Text}}+ </option>+ </template>+ </select>+ </div>+ </template>+ <div class="item-statistics d-sm-flex d-none align-items-center mx-auto order-2" id="items_statistics">+ <div class="items-page-size d-none">{{catalog.Model.PagingFilteringContext.TotalItems}}</div>+ <div class="items-per-page d-lg-inline-flex">+ <span>@Loc["catalog.selectors.items"]</span>+ <span class="number">+ <template v-if="catalog.Model.Products.length > 0">+ <span>1</span>+ <span> - </span>+ <span>{{catalog.Model.Products.length}}</span>+ </template>+ </span>+ </div>+ <div class="items-separator">@Loc["catalog.selectors.of"]</div>+ <div class="items-total">{{catalog.Model.PagingFilteringContext.TotalItems}}</div>+ </div>+ @*page size*@+ <template v-if="catalog.Model.PagingFilteringContext.AllowCustomersToSelectPageSize">+ <div class="sort-container column">+ <label class="col-form-label">@Loc["Catalog.PageSize"]</label>+ <select class="custom-select form-control" id="PageSizeOption" name="PageSizeOption" v-on:change="catalog.loadProducts($event.target.value)" aria-label="@Loc["Catalog.PageSize"]">+ <template v-for="item in catalog.Model.PagingFilteringContext.PageSizeOptions">+ <option :selected="item.Selected" :value="item.Value" :disabled="false">+ {{item.Text}}+ </option>+ </template>+ </select>+ </div>+ </template>+ @*Rendering view mode selectors*@+ <template v-if="catalog.Model.PagingFilteringContext.AllowProductViewModeChanging">+ <template v-if="catalog.Model.PagingFilteringContext.AvailableViewModes.length > 1">+ <div class="sort-container order-3 d-inline-flex ml-sm-0 ml-auto change-view">+ <template v-for="viewmode in catalog.Model.PagingFilteringContext.AvailableViewModes">+ <template v-if="viewmode.Text == 'Grid'">+ <b-link @@click="localStorage.setItem('catalogProdCols', 'grid'); catalog.loadProducts(viewmode.Value)" class="viewmode-icon align-items-center grid mr-3" v-bind:class="{ selected: viewmode.Selected, 'text-info': viewmode.Selected }" data-cols="5" :title="viewmode.Text">+ @*<b-icon scale="2" icon="@if(gridMode.Selected){<text>grid3x2-gap-fill</text>} else { <text>grid3x2-gap</text> }"></b-icon>*@+ <span class="grid-icon cols-5">+ <span></span>+ <span></span>+ <span></span>+ <span></span>+ <span></span>+ </span>+ <span class="sr-only">viewmode grid</span>+ </b-link>+ </template>+ <template v-else>+ <b-link @@click="localStorage.setItem('catalogProdCols', 'list'); catalog.loadProducts(viewmode.Value)" class="viewmode-icon align-items-center list" data-cols="2" v-bind:class="{ selected: viewmode.Selected, 'text-info': viewmode.Selected }" :title="viewmode.Text">+ @*<b-icon scale="2" icon="@if(gridMode.Selected){<text>grid3x2-gap-fill</text>} else { <text>grid3x2-gap</text> }"></b-icon>*@+ <span class="list-icon">+ <span></span>+ <span></span>+ <span></span>+ </span>+ <span class="sr-only">viewmode list</span>+ </b-link>+ </template>+ </template>+ </div>+ </template>+ </template>+ </div>+ </div>+</template>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/ProductsByTag.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/ProductsByTag.cshtmlnew file mode 100644index 000000000..6eb2fdd69--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/ProductsByTag.cshtml@@ -0,0 +1,65 @@+@model ProductsByTagModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(string.Format(Loc["Title.ProductsByTag"], Model.TagName));++ //canonical URL+ var canonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;+ if (canonicalUrlsEnabled)+ {+ var productsByTagUrl = Url.RouteUrl("ProductsByTag", new { productTagId = Model.Id, SeName = Model.TagSeName }, this.Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(productsByTagUrl);+ }+}+<b-skeleton-wrapper :loading="catalog.loading == true">+ <template #loading>+ <div>+ <b-skeleton width="100%" height="20vh" class="mb-3"></b-skeleton>+ <b-skeleton width="100%" height="80vh"></b-skeleton>+ </div>+ </template>+ <div id="catalog-products" class="page product-tag-page">+ <h1 class="generalTitle h2"><div>@String.Format(Loc["Products.Tags.ProductsTaggedWith"], Model.TagName)</div></h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "productsbytag_top", additionalData = Model.Id })+ <div id="catalog-products">+ <partial name="Partials/Selectors" />+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <b-col cols="12" class="product-grid px-0">+ <b-form-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <b-col lg="4" sm="6" cols="6" class="product-container new-col-6 mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </b-col>+ </template>+ </b-form-row>+ </b-col>+ </template>+ <template v-else>+ <div class="product-list">+ <b-col cols="12">+ <b-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <product-box-list-vue :Model="Model"></product-box-list-vue>+ </template>+ </b-row>+ </b-col>+ </div>+ </template>+ <partial name="Partials/ScrollPagination" />+ </template>+ <template v-else>+ <b-alert variant="info" show class="my-3">+ @Loc["search.noresultstext"]+ </b-alert>+ </template>+ </div>+ </div>+</b-skeleton-wrapper>+@await Component.InvokeAsync("Widget", new { widgetZone = "productsbytag_bottom", additionalData = Model.Id })++<partial name="Partials/ModelScript" model="@Json.Serialize(Model)" />\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Search.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Search.cshtmlnew file mode 100644index 000000000..1870eef93--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Search.cshtml@@ -0,0 +1,162 @@+@model Grand.Web.Models.Catalog.SearchModel+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Search"]);+}+<script asp-location="Footer">+ document.addEventListener("DOMContentLoaded", function () {+ document.getElementById("@Html.IdFor(model => model.adv)").addEventListener('click', toggleAdvancedSearch);+ toggleAdvancedSearch();+ });+ function toggleAdvancedSearch() {+ if (document.getElementById('@Html.IdFor(model => model.adv)').checked) {+ document.getElementById('advanced-search-block').style.display = "flex";+ }+ else {+ document.getElementById('advanced-search-block').style.display = "none";+ }+ }+</script>++<div class="page search-page">+ <h1 class="generalTitle h2"><div>@Loc["Search"]</div></h1>+ <div class="search-input">+ <form asp-route="ProductSearch" method="get">+ <div class="fieldset">+ <div class="form-fields">+ <div class="basic-search">+ <label class="col-form-label" asp-for="q">@Loc["Search.SearchTerm"]:</label>+ <div class="input-group mb-2">+ <input asp-for="q" type="search" class="form-control search-text" />+ <div class="input-group-append">+ <input type="submit" class="btn btn-secondary search-button" value="@Loc["Search.Button"]" />+ </div>+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "productsearch_page_basic" })+ <div class="inputs reversed">+ <label for="adv" class="custom-control custom-checkbox">+ <span class="sr-only">adv</span>+ <input asp-for="adv" class="custom-control-input" />+ <span class="custom-control-label"></span>+ <span class="custom-control-description">@Loc["search.advancedsearch"]</span>+ </label>+ </div>+ </div>+ <div class="advanced-search form-row" id="advanced-search-block">+ @if (Model.AvailableCategories.Any())+ {+ <div class="col-md-6 col-12">+ <div class="inputs">+ <label class="col-form-label" asp-for="cid">@Loc["Search.Category"]:</label>+ <select asp-for="cid" class="form-control" asp-items="Model.AvailableCategories"></select>+ </div>+ </div>+ }+ @if (Model.AvailableCollections.Any())+ {+ <div class="col-md-6 col-12">+ <div class="inputs">+ <label class="col-form-label" asp-for="mid">@Loc["Search.Collection"]:</label>+ <select asp-for="mid" class="form-control mb-3" asp-items="Model.AvailableCollections"></select>+ </div>+ </div>+ }+ @if (Model.asv && Model.AvailableVendors.Any())+ {+ <div class="col-md-6 col-12">+ <div class="inputs">+ <label class="col-form-label" asp-for="vid">@Loc["Search.Vendor"]:</label>+ <select asp-for="vid" class="form-control mb-3" asp-items="Model.AvailableVendors"></select>+ </div>+ </div>+ }+ <div class="col-md-12 col-12">+ <div class="inputs pt-1">+ <div class="flex-sm-row">+ <label class="col-form-label col-12 px-0 mt-1">@Loc["Search.PriceRange"]:</label>+ <div class="price-range flex-sm-row row">+ <div class="col">+ <label class="col-form-label" asp-for="pf">@Loc["Search.PriceRange.From"]</label>+ <input asp-for="pf" class="form-control price-from" />+ </div>+ <div class="col">+ <label class="col-form-label" asp-for="pt">@Loc["Search.PriceRange.To"]</label>+ <input asp-for="pt" class="form-control price-to" />+ </div>+ </div>+ </div>+ </div>+ <div class="inputs reversed">+ <label for="sid" class="custom-control custom-checkbox">+ <input asp-for="sid" class="custom-control-input" />+ <span class="custom-control-label"></span>+ <span class="custom-control-description">@Loc["search.searchindescriptions"]</span>+ </label>+ </div>+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "productsearch_page_advanced" })+ </div>+ </div>+ </div>+ </form>+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "productsearch_page_before_results" })+ <div class="search-results">+ <div id="catalog-products">+ @await Component.InvokeAsync("Widget", new { widgetZone = "productsearch_page_before_results" })+ <partial name="Partials/Selectors" />+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <b-col cols="12" class="product-grid px-0">+ <b-form-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <b-col lg="4" sm="6" cols="6" class="product-container new-col-6 mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </b-col>+ </template>+ </b-form-row>+ </b-col>+ </template>+ <template v-else>+ <div class="product-list">+ <b-col cols="12">+ <b-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <product-box-list-vue :Model="Model"></product-box-list-vue>+ </template>+ </b-row>+ </b-col>+ </div>+ </template>+ @*<partial name="Partials/Pagination" />*@+ <partial name="Partials/ScrollPagination" />+ </template>+ </div>+ @if (!String.IsNullOrEmpty(Model.Warning))+ {+ <div class="warning alert alert-danger my-3">+ @Model.Warning+ </div>+ }+ @if (Model.NoResults)+ {+ <div class="no-result alert alert-info my-3">+ @Loc["Search.NoResultsText"]+ </div>+ }+ </div>+</div>+@await Component.InvokeAsync("Widget", new { widgetZone = "productsearch_page_after_results" })++@section filters+{+ @*Rendering filtering section*@+ @if (Model.PagingFilteringContext.SpecificationFilter.Enabled)+ {+ <partial name="Partials/Filtering" model="Model.PagingFilteringContext.SpecificationFilter" />+ }+}+<partial name="Partials/ModelScript" model="@Json.Serialize(Model)" />\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Vendor.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Vendor.cshtmlnew file mode 100644index 000000000..be8595492--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Vendor.cshtml@@ -0,0 +1,203 @@+@model VendorModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";+ pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ var canonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;+ if (canonicalUrlsEnabled)+ {+ var vendorUrl = Url.RouteUrl("Vendor", new { SeName = Model.SeName }, this.Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(vendorUrl);+ }+}++<div class="page vendor-page">+ <div class="card mt-3">+ <div class="col-12 card-body">+ <div class="row">+ <div class="col-xl-2 col-lg-3 col-md-4">+ <img class="img-fluid" alt="@Model.PictureModel.AlternateText" src="@Model.PictureModel.ImageUrl">+ </div>+ <div class="col-xl-10 col-lg-9 col-md-8 align-items-center d-flex">+ <div>+ <h1 class="h2 generalTitle w-100">+ {{catalog.Model.Name}}+ </h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "vendordetails_top", additionalData = Model.Id })+ @*rendering review section*@+ @if (Model.VendorReviewOverview.AllowCustomerReviews)+ {+ <div>+ <partial name="Partials/VendorReviewOverview" model="Model.VendorReviewOverview" />+ </div>+ }+ </div>+ </div>+ </div>+ <div class="row">+ <div class="col-12">+ <b-tabs class="mt-3" content-class="mt-3" align="center">+ @if (!String.IsNullOrEmpty(Model.Description))+ {+ <b-tab id="description-tab" title="@Loc["vendor.Description"]" active>+ <article class="text-xs-center generalMarginSupporter vendor-description" v-html="catalog.Model.Description"></article>+ </b-tab>+ }+ @if (Model.Address != null)+ {+ <b-tab id="address-tab" title="@Loc["Vendor.Address"]">+ <ul class="info px-0 mb-0">+ @if (Model.Address.CompanyEnabled && !String.IsNullOrEmpty(Model.Address.Company))+ {+ <li class="company">+ <label class="col-form-label">@Loc["Address.Fields.Company"]:</label>+ @Model.Address.Company+ </li>+ }+ @if (Model.Address.StreetAddressEnabled && !String.IsNullOrEmpty(Model.Address.Address1))+ {+ <li class="address1">+ <label class="col-form-label w-100">@Loc["Address.Fields.Address1"]:</label>+ @Model.Address.Address1+ </li>+ }+ @if (Model.Address.StreetAddress2Enabled && !String.IsNullOrEmpty(Model.Address.Address2))+ {+ <li class="address2">+ <label class="col-form-label">@Loc["Address.Fields.Address2"]:</label>+ @Model.Address.Address2+ </li>+ }+ @if (Model.Address.CityEnabled || Model.Address.StateProvinceEnabled || Model.Address.ZipPostalCodeEnabled)+ {+ var cityStateZip = "";+ if (Model.Address.CityEnabled && !String.IsNullOrEmpty(Model.Address.City))+ {+ cityStateZip = Model.Address.City;+ if (Model.Address.StateProvinceEnabled || Model.Address.ZipPostalCodeEnabled)+ {+ cityStateZip += ",";+ }+ }+ if (Model.Address.StateProvinceEnabled)+ {+ if (!String.IsNullOrEmpty(cityStateZip))+ {+ cityStateZip += " ";+ }+ cityStateZip += Model.Address.StateProvinceName;+ }+ if (Model.Address.ZipPostalCodeEnabled)+ {+ if (!String.IsNullOrEmpty(cityStateZip))+ {+ cityStateZip += " ";+ }+ cityStateZip += Model.Address.ZipPostalCode;+ }+ if (!String.IsNullOrEmpty(cityStateZip))+ {+ <li class="city-state-zip">+ @cityStateZip+ </li>+ }+ }+ @if (Model.Address.CountryEnabled && !String.IsNullOrEmpty(Model.Address.CountryName))+ {+ <li class="country">+ @Model.Address.CountryName+ </li>+ }+ @if (Model.Address.PhoneEnabled && !String.IsNullOrEmpty(Model.Address.PhoneNumber))+ {+ <li class="phone">+ <label class="col-form-label">@Loc["Address.Fields.PhoneNumber"]:</label>+ @Model.Address.PhoneNumber+ </li>+ }+ @if (Model.Address.FaxEnabled && !String.IsNullOrEmpty(Model.Address.FaxNumber))+ {+ <li class="fax">+ <label class="col-form-label">@Loc["Address.Fields.FaxNumber"]:</label>+ @Model.Address.FaxNumber+ </li>+ }+ </ul>+ </b-tab>+ }+ @if (Model.VendorReviewOverview.AllowCustomerReviews)+ {+ <b-tab id="review-tab" title="@Loc["vendor.Reviews"]" :active="active ? true : false">+ @await Component.InvokeAsync("VendorReviews", new { vendorId = Model.Id })+ </b-tab>+ }+ @if (Model.AllowCustomersToContactVendors)+ {+ <b-tab id="contact-tab" title="@Loc["ContactVendor"]" @@click="contactvendor.getCaptcha()">+ @await Component.InvokeAsync("VendorContact", new { vendorId = Model.Id })+ </b-tab>+ }+ </b-tabs>+ </div>+ </div>+ </div>+ </div>+ <div id="catalog-products">+ <partial name="Partials/Selectors" />+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <b-col cols="12" class="product-grid standard px-0">+ <b-form-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <b-col lg="4" sm="6" cols="6" class="product-container new-col-6 px-0 mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </b-col>+ </template>+ </b-form-row>+ </b-col>+ </template>+ <template v-else>+ <div class="product-list">+ <b-col cols="12">+ <b-row>+ <template :key="Model.Id" v-for="Model in catalog.Model.Products">+ <product-box-list-vue :Model="Model"></product-box-list-vue>+ </template>+ </b-row>+ </b-col>+ </div>+ </template>+ @*<partial name="Partials/Pagination" />*@+ <partial name="Partials/ScrollPagination" />+ </template>+ <template v-else>+ <div class="alert alert-info my-3">+ @Loc["search.noresultstext"]+ </div>+ </template>+ </div>+</div>+@if (Model.RenderCaptcha)+{+ <div id="captcha-container">+ <div class="captcha-box" id="captcha-box">+ <captcha />+ </div>+ </div>+}+@await Component.InvokeAsync("Widget", new { widgetZone = "vendordetails_bottom", additionalData = Model.Id })++@section filters+{+ @*Rendering filtering*@+ @if (Model.PagingFilteringContext.SpecificationFilter.Enabled)+ {+ <partial name="Partials/Filtering" model="Model.PagingFilteringContext.SpecificationFilter" />+ }+}++<partial name="Partials/ModelScript" model="@Json.Serialize(Model)" />\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Checkout/Completed.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Checkout/Completed.cshtmlnew file mode 100644index 000000000..d770323f9--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Checkout/Completed.cshtml@@ -0,0 +1,22 @@+@inject IWorkContext workContext++@model CheckoutCompletedModel+@{+ Layout = "_SingleColumn";+}+<div class="page checkout-page order-completed-page text-xs-center">+ <div class="checkout-data mt-3">+ @await Component.InvokeAsync("Widget", new { widgetZone = "checkout_completed_top", additionalData = Model.OrderId })+ <b-card title="@Loc["Checkout.ThankYou"]" sub-title="@Loc["Checkout.YourOrderHasBeenSuccessfullyProcessed"]">+ <div class="h5 mb-0">@Loc["Checkout.OrderNumber"]: <span class="text-gold">@Model.OrderNumber</span></div>+ <hr class="my-4">+ <div class="buttons">+ <a class="btn btn-secondary mb-1" href="@Url.RouteUrl("OrderDetails", new { orderId = Model.OrderId })">@Loc["Checkout.PlacedOrderDetails"]</a>+ <button type="button" class="btn btn-info order-completed-continue-button mb-1" onclick="location=('@Url.RouteUrl("HomePage")')">+ @Loc["Checkout.ThankYou.Continue"]+ </button>+ </div>+ </b-card>+ @await Component.InvokeAsync("Widget", new { widgetZone = "checkout_completed_bottom", additionalData = Model.OrderId })+ </div>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Checkout/Partials/Summary.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Checkout/Partials/Summary.cshtmlnew file mode 100644index 000000000..438adfcc3--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Checkout/Partials/Summary.cshtml@@ -0,0 +1,132 @@+@{++ var modelExists = Model != null;+}+<div class="order-summary-content mt-3" id="ordersummarypagecart" v-if="vmorder.cart">+ @await Component.InvokeAsync("Widget", new { widgetZone = "checkout_summary_content_before" })+ <div v-if="typeof vmorder.cart.Items !== 'undefined' && vmorder.cart.Items.length > 0">+ <template v-if="vmorder.OrderReviewData && vmorder.Confirm">+ <partial name="Partials/ReviewData" />+ </template>+ <ul v-if="typeof vmorder.cart.Warnings !== 'undefined' && vmorder.cart.Warnings.length > 0" class="px-0 mb-3">+ <li v-for="item in vmorder.cart.Warnings">+ <div class="alert alert-danger mb-1">{{item}}</div>+ </li>+ </ul>+ <form asp-route="ShoppingCart" method="post" enctype="multipart/form-data" id="shopping-cart-form">+ <div class="col-12">+ <div class="form-row">+ <div class="col-lg-8 col-12 cart-out-container">+ <div class="shopping-cart-container">+ <div class="shopping-cart-container">+ <table class="shopping-cart table">+ <colgroup>+ <col span="1">+ <col span="1">+ <col>+ <col span="1">+ <col span="1">+ </colgroup>+ <thead>+ <tr>+ <th v-if="vmorder.cart.ShowProductImages" class="product-picture text-center">+ @Loc["ShoppingCart.Image"]+ </th>+ <th class="product text-center">+ @Loc["ShoppingCart.Product(s)"]+ </th>+ <th class="unit-price text-center">+ @Loc["ShoppingCart.UnitPrice"]+ </th>+ <th class="quantity text-center">+ @Loc["ShoppingCart.Quantity"]+ </th>+ <th class="subtotal text-center">+ @Loc["ShoppingCart.ItemTotal"]+ </th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="item in vmorder.cart.Items">+ <td v-if="vmorder.cart.ShowProductImages" class="product-picture text-center">+ <a :href="'/' + item.ProductSeName">+ <img alt="item.Picture.AlternateText" :src="item.Picture.ImageUrl" title="item.Picture.Title" />+ </a>+ </td>+ <td class="product">+ <div class="mb-2">+ <a :href="'/' + item.ProductSeName" class="product-name">+ {{item.ProductName}}+ </a>+ </div>+ <span v-if="vmorder.cart.ShowSku" class="sku-number">+ {{item.Sku}}+ </span>+ <div v-if="item.AttributeInfo !== ''" v-html="item.AttributeInfo" class="attributes small"></div>+ <div v-if="item.WarehouseName !== null" v-html="item.WarehouseName" class="attributes small"></div>+ <div v-if="item.VendorName !== null" v-html="item.VendorName" class="attributes small"></div>+ <div v-if="item.AuctionInfo !== null" v-html="item.AuctionInfo" class="attributes small"></div>+ <div v-if="item.RecurringInfo !== null" v-html="item.RecurringInfo" class="recurring-info"></div>+ <div v-if="item.ReservationInfo !== null" v-html="item.ReservationInfo" class="rental-info attributes small"></div>+ <div v-if="vmorder.cart.IsEditable && item.AllowItemEditing" class="edit-item mb-1 mt-1">+ <a class="btn btn-sm btn-secondary" :href="'/' + item.ProductSeName + '?updatecartitemid=' + item.Id">@Loc["Common.Edit"]</a>+ </div>+ <div v-if="typeof item.Warnings !== 'undefined' && item.Warnings.length > 0" class="message-error alert alert-danger">+ <ul v-for="warning in item.Warnings" class="mb-0 p-0">+ <li>{{warning}}</li>+ </ul>+ </div>+ </td>+ <td class="unit-price">+ <span class="product-unit-price price">{{item.UnitPrice}}</span>+ <div v-if="item.UnitPriceWithoutDiscountValue != item.UnitPriceValue && item.UnitPriceWithoutDiscountValue > 0" class="text-center">+ <del class="small text-danger">{{item.UnitPriceWithoutDiscount}}</del>+ </div>+ </td>+ <td class="quantity">+ <span :id="'itemquantity' + item.Id" :name="'itemquantity' + item.Id" class="qty-opc">+ {{item.Quantity}}+ </span>+ </td>+ <td class="subtotal">+ <div v-if="item.Discount" class="d-flex flex-column">+ <p class="mb-0 prod-total">{{item.SubTotal}}</p>+ <div class="discount text-success text-center">+ <span>@Loc["ShoppingCart.ItemYouSave"]: </span>+ <span>{{item.Discount}}</span>+ <span v-if="item.DiscountedQty > 0" class="font-weight-light font-italic">@Loc["ShoppingCart.DiscountedQty"]: </span>+ <span v-if="item.DiscountedQty > 0" class="font-weight-light font-italic">{{item.DiscountedQty}}</span>+ </div>+ </div>+ <div v-else>+ <p class="mb-0 prod-total">{{item.SubTotal}}</p>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "checkout_summary_cart_footer" })+ <div class="cart-options">+ <div class="row">+ <div class="selected-checkout-attributes col-sm-3 col-md-6 col-12 ml-auto justify-content-end text-right mt-3">+ <div v-html="vmorder.cart.CheckoutAttributeInfo"></div>+ </div>+ </div>+ </div>+ </div>+ <div class="col-lg-4 col-12 totals">+ <div class="totals-inner">+ <partial name="Partials/OrderTotals" />+ </div>+ </div>+ </div>+ </div>+ </form>+ </div>+ <div v-else class="no-data alert alert-info text-center">+ @Loc["ShoppingCart.CartIsEmpty"]+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "checkout_summary_content_after" })+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Common/PageNotFound.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Common/PageNotFound.cshtmlnew file mode 100644index 000000000..4c93df6f1--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Common/PageNotFound.cshtml@@ -0,0 +1,17 @@+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_SingleColumn";++ //title+ pagebuilder.AddTitleParts(Loc["Title.PageNotFound"]);+}+<div class="page page-not-found">+ <div class="not-found-container">+ <h1 class="top">404</h1>+ <div class="bottom">Error</div>+ <div class="content">+ @Loc["Title.PageNotFound"]+ </div>+ </div>+ @await Component.InvokeAsync("PageBlock", new { systemName = "PageNotFound" })+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Home/Index.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Home/Index.cshtmlnew file mode 100644index 000000000..05dc8e8d1--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Home/Index.cshtml@@ -0,0 +1,61 @@+@inject Grand.Business.Core.Interfaces.Storage.IPictureService pictureService+@inject SeoSettings seoSettings+@{+ Layout = "_SingleColumn";+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/home/home.css">+}++@section meta {+ @if (seoSettings.OpenGraphMetaTags)+ {+ <meta property="og:type" content="website" />+ <meta property="og:title" content="@seoSettings.DefaultTitle" />+ <meta property="og:description" content="@Html.Encode(seoSettings.DefaultMetaDescription)" />+ @if (!String.IsNullOrWhiteSpace(seoSettings.StorePictureId))+ {+ var picture = await pictureService.GetPictureUrl(seoSettings.StorePictureId);+ <meta property="og:image" content="@picture" />+ }+ <meta property="og:url" content="@this.Url.ActionContext.HttpContext.Request.GetEncodedUrl()" />+ }+ @if (seoSettings.TwitterMetaTags)+ {+ <meta property="twitter:card" content="summary" />+ <meta property="twitter:site" content="@seoSettings.DefaultTitle" />+ <meta property="twitter:title" content="@seoSettings.DefaultTitle" />+ <meta property="twitter:description" content="@Html.Encode(seoSettings.DefaultMetaDescription)" />+ @if (!String.IsNullOrWhiteSpace(seoSettings.StorePictureId))+ {+ var picture = await pictureService.GetPictureUrl(seoSettings.StorePictureId);+ <meta property="twitter:image" content="@picture" />+ }++ <meta property="twitter:url" content="@this.Url.ActionContext.HttpContext.Request.GetEncodedUrl()" />+ }+}++<div id="home-page" v-bind:class="{ toggled: !menuToggled }" class="page home-page custom-container d-flex flex-column mt-0">+ @await Component.InvokeAsync("PushNotificationsRegistration")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_top" })+ @await Component.InvokeAsync("PageBlock", new { systemName = "HomePageText" })+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_categories" })+ @await Component.InvokeAsync("HomePageCategories")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_products" })+ @await Component.InvokeAsync("PersonalizedProducts")+ @await Component.InvokeAsync("CustomerRecommendedProducts")+ @await Component.InvokeAsync("SuggestedProducts")+ @await Component.InvokeAsync("HomePageProducts")+ @await Component.InvokeAsync("HomePageNewProducts")+ @await Component.InvokeAsync("CategoryFeaturedProducts")+ @await Component.InvokeAsync("HomePageBrands")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_best_sellers" })+ @await Component.InvokeAsync("HomePageBestSellers")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_collections" })+ @await Component.InvokeAsync("HomePageCollections")+ @await Component.InvokeAsync("CollectionFeaturedProducts")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_news" })+ @await Component.InvokeAsync("HomePageNews")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_blog" })+ @await Component.InvokeAsync("HomePageBlog")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_bottom" })+</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/MerchandiseReturn/CustomerMerchandiseReturns.cshtml b/src/Plugins/Theme.Modern/Views/Modern/MerchandiseReturn/CustomerMerchandiseReturns.cshtmlnew file mode 100644index 000000000..83afffc1e--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/MerchandiseReturn/CustomerMerchandiseReturns.cshtml@@ -0,0 +1,65 @@+@model CustomerMerchandiseReturnsModel+@using Grand.Web.Models.Customer+@using Grand.Web.Models.Orders+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+ {+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.MerchandiseReturns })+}+<div class="page account-page return-request-list-page pl-lg-3 pt-3 pt-lg-0">+ <h1 class="h2 generalTitle"><div>@Loc["Account.CustomerMerchandiseReturns"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (Model.Items.Any())+ {+ <b-row>+ @foreach (var item in Model.Items)+ {+ <b-col class="col-lg-6 col-md-6 col-12">+ <b-card>+ <template v-slot:header>+ <h5 class="mb-0">+ @string.Format(Loc["Account.CustomerMerchandiseReturns.Title"], item.ReturnNumber, item.MerchandiseReturnStatus)+ </h5>+ </template>+ <div class="d-inline-flex align-items-center flex-wrap mb-3">+ <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>+ <small class="date text-muted">+ <label class="mb-0">@Loc["Account.CustomerMerchandiseReturns.Date"]</label>+ <span>@item.CreatedOn.ToString()</span>+ </small>+ </div>+ <div class="alert alert-info mb-0">+ @string.Format(Loc["Account.CustomerMerchandiseReturns.Totals"], item.ProductsCount, item.ReturnTotal)+ </div>+ <template v-slot:footer>+ <b-button variant="info" size="sm" onclick="location = ('@Url.RouteUrl("MerchandiseReturnDetails", new { merchandiseReturnId = item.Id })')">+ @Loc["Account.CustomerMerchandiseReturns.Details"]+ </b-button>+ </template>+ </b-card>+ </b-col>+ }+ </b-row>+ }+ else+ {+ <div class="no-data alert alert-info my-3">+ @Loc["Account.CustomerMerchandiseReturns.NoMerchandiseReturns"]+ </div>+ }+</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/News/List.cshtml b/src/Plugins/Theme.Modern/Views/Modern/News/List.cshtmlnew file mode 100644index 000000000..228c248ba--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/News/List.cshtml@@ -0,0 +1,58 @@+@model NewsItemListModel+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/blog-news/blog-news.css">+ //title+ pagebuilder.AddTitleParts(Loc["Title.NewsArchive"]);+}+<div class="page news-list-page">+ <h1 class="generalTitle h2"><div>@Loc["News"]</div></h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "newslist_page_before_items" })+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["catalog.selectors.fiters"]+ </div>+ </a>+ <b-row class="news-items">+ @foreach (var item in Model.NewsItems)+ {+ <b-col xl="4" lg="6" md="6" sm="6" cols="12">+ <b-card class="post-news mb-3">+ <template v-slot:header>+ @if (!string.IsNullOrEmpty(item.PictureModel.ImageUrl))+ {+ <b-link class="img-container">+ <img src="@item.PictureModel.ImageUrl" alt="@item.PictureModel.AlternateText" />+ </b-link>+ }+ <h3 class="h5 title">+ <b-link href="@Url.RouteUrl("NewsItem", new { SeName = item.SeName })">+ @item.Title+ </b-link>+ </h3>+ <div class="date">+ @item.CreatedOn.ToString("D")+ </div>+ </template>+ <b-card-text>+ <div class="short">+ @Html.Raw(item.Short)+ </div>+ </b-card-text>+ <div class="buttons mt-3">+ <a class="btn btn-sm btn-outline-secondary read-more" href="@Url.RouteUrl("NewsItem", new { SeName = item.SeName })">@Loc["News.MoreInfo"]</a>+ </div>+ </b-card>+ </b-col>+ }+ <page-navigation asp-query-param="pagenumber" asp-pagination="Model.PagingFilteringContext" />+ @await Component.InvokeAsync("Widget", new { widgetZone = "newslist_page_after_items" })+ </b-row>++</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/News/NewsItem.cshtml b/src/Plugins/Theme.Modern/Views/Modern/News/NewsItem.cshtmlnew file mode 100644index 000000000..9f4d60ee1--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/News/NewsItem.cshtml@@ -0,0 +1,161 @@+@model NewsItemModel+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Title);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/blog-news/blog-news.css">+}+ <div class="page news-item-page">+ <a class="left-side-toggler" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["catalog.selectors.fiters"]+ </div>+ </a>+ <b-card class="post-news mt-3">+ <template v-slot:header>+ @if (!string.IsNullOrEmpty(Model.PictureModel.ImageUrl))+ {+ <img class="img-fluid" src="@Model.PictureModel.ImageUrl" alt="@Model.PictureModel.AlternateText" />+ }+ <h1 class="h5 title generalTitle">+ <div>@Model.Title</div>+ </h1>+ <span class="date">+ @Model.CreatedOn.ToString("D")+ </span>+ </template>+ @await Component.InvokeAsync("Widget", new { widgetZone = "newsitem_page_before_body", additionalData = Model.Id })+ @Html.Raw(Model.Full)+ </b-card>+ @await Component.InvokeAsync("Widget", new { widgetZone = "newsitem_page_before_comments", additionalData = Model.Id })+ @if (Model.AllowComments)+ {+ <fieldset class="new-comment py-3 px-0" id="comments">+ <h5><strong>@Loc["News.Comments.LeaveYourComment"]</strong></h5>+ <div class="notifications">+ <div asp-validation-summary="ModelOnly" class="message-error"></div>+ @{+ var result = TempData["Grand.news.addcomment.result"] as string;+ }+ @if (!String.IsNullOrEmpty(result))+ {+ <div class="result alert alert-info">@result</div>+ }+ </div>+ <validation-observer v-slot="{ handleSubmit }">+ <form id="addNewsComment" asp-action="NewsCommentAdd" asp-controller="News" method="post" v-on:submit.prevent="handleSubmit(news.submitNewsComment)">+ <input type="hidden" name="Id" value="@Model.Id"/>+ <fieldset class="form-group">+ <validation-provider tag="div" rules="required" name="CommentTitle" v-slot="{ errors, classes }">+ <label for="CommentTitle" class="col-form-label">@Loc["News.Comments.CommentTitle"]:</label>+ <input name="CommentTitle" v-bind:class="[classes , 'form-control enter-comment-title']"+ data-val-required="@Loc["News.Comments.CommentTitle.Required"]"+ v-model="news.CommentTitle"/>+ <span class="field-validation-error">{{ errors[0] }}</span>+ </validation-provider>+ </fieldset>+ <fieldset class="form-group">+ <validation-provider tag="div" rules="required" name="CommentText" v-slot="{ errors, classes }">+ <label for="CommentText" class="col-form-label">@Loc["News.Comments.CommentText"]:</label>+ <textarea name="CommentText" v-model="news.CommentText"+ data-val-required="@Loc["News.Comments.CommentText.Required"]"+ v-bind:class="[classes , 'form-control']" autofocus="autofocus" rows="4"></textarea>+ <span class="field-validation-error">{{ errors[0] }}</span>+ </validation-provider>+ </fieldset>+ @if (Model.AddNewComment.DisplayCaptcha)+ {+ <div class="captcha-box">+ <captcha/>+ </div>+ }+ <div class="buttons text-xs-center text-md-left generalMarginSupporter">+ <input type="submit" name="add-comment" class="btn btn-info news-item-add-comment-button" value="@Loc["News.Comments.SubmitButton"]"/>+ </div>+ </form>+ </validation-observer>+ </fieldset>+ <script asp-location="Footer" asp-order="300">+ var news = new Vue({+ data: () => {+ return {+ Model: null,+ CommentTitle: '',+ CommentText: ''+ }+ },+ created() {+ this.Model = @Json.Serialize(Model.Comments);+ },+ methods: {+ submitNewsComment() {+ var form = document.getElementById("addNewsComment");+ var url = form.getAttribute("action");+ var bodyFormData = new FormData(form);+ axios({+ url: url,+ data: bodyFormData,+ method: 'post',+ headers: {+ 'Accept': 'application/json'+ }+ }).then(function (response) {+ if (response.data.success == true){+ news.CommentTitle = ' ';+ news.CommentText = ' ';+ vm.displayBarNotification(response.data.message, '', 'success', 3000);+ if (response.data.model){+ news.addComment(response.data.model)+ }+ } else {+ vm.displayBarNotification(response.data.message, '', 'error', 3500);+ }+ })+ },+ addComment(model) {+ // Add object item to array+ this.Model.push(model);+ }+ }+ });+ </script>+ <template v-if="news.Model.length > 0">+ <div class="comment-list">+ <h4 class="generalTitle generalMarginSupporter">+ <strong>@Loc["News.Comments"]</strong>+ </h4>+ <div class="comments">+ <template v-for="comment in news.Model">+ <div class="card mb-3">+ <div class="card-header">+ <div class="d-inline-flex w-100">+ <h6 class="mb-0">{{comment.CustomerName}}</h6>+ <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>+ <small class="date text-muted">+ <span>@Loc["News.Comments.CreatedOn"]:</span>+ <span>{{new Date( comment.CreatedOn).toDateString()}}</span>+ </small>+ </div>+ </div>+ <div class="card-body">+ <h5>{{comment.CommentTitle}}</h5>+ {{comment.CommentText}}+ </div>+ </div>+ </template>+ </div>+ </div>+ </template>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "newsitem_page_after_comments", additionalData = Model.Id })+ </div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Order/CustomerOrders.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Order/CustomerOrders.cshtmlnew file mode 100644index 000000000..ae28f149d--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Order/CustomerOrders.cshtml@@ -0,0 +1,76 @@+@model CustomerOrderListModel+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Account"]);+}+@section left+{+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Orders })+}+<div class="page account-page order-list-page pl-lg-3 pt-lg-0 pt-3">+ <h1 class="generalTitle h2"><div>@Loc["Account.CustomerOrders"]</div></h1>+ <a class="left-side-toggler mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["Account.Navigation"]+ </div>+ </a>+ @if (Model.Orders.Any())+ {+ <div class="account-order table-responsive">+ <table class="table table-bordered hover-table">+ <thead>+ <tr>+ <th scope="col">@Loc["Account.CustomerOrders.OrderNumber"]</th>+ <th scope="col">@Loc["Account.CustomerOrders.OrderStatus"]</th>+ <th scope="col">@Loc["Account.CustomerOrders.OrderDate"]</th>+ <th scope="col">@Loc["Account.CustomerOrders.OrderTotal"]</th>+ <th scope="col"></th>+ </tr>+ </thead>+ <tbody>+ @foreach (var order in Model.Orders)+ {+ <tr>+ <td>+ <span>@order.OrderNumber</span>+ </td>+ <td>+ <span class="@order.OrderStatus.ToLower() badge status order-status">@order.OrderStatus</span>+ </td>+ <td>+ <span>@order.CreatedOn.ToString("g")</span>+ </td>+ <td>+ <span class="order-total">@order.OrderTotal</span>+ </td>+ <td>+ <div class="buttons d-flex flex-column">+ <input type="button" value="@Loc["Account.CustomerOrders.OrderDetails"]" class="btn btn-sm btn-info order-details-button" onclick="location = ('@Url.RouteUrl("OrderDetails", new { orderId = order.Id })')" />+ @if (order.IsMerchandiseReturnAllowed)+ {+ <input type="button" value="@Loc["Account.CustomerOrders.ReturnItems"]" class="btn btn-sm btn-warning text-white return-items-button mt-1" onclick="location = ('@Url.RouteUrl("MerchandiseReturn", new { orderId = order.Id })')" />+ }+ </div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ <page-navigation asp-query-param="pagenumber" asp-pagination="Model.PagingContext" />+ }+ else+ {+ <div class="no-data alert alert-info">+ @Loc["Account.CustomerOrders.NoOrders"]+ </div>+ }+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Order/Details.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Order/Details.cshtmlnew file mode 100644index 000000000..94307a450--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Order/Details.cshtml@@ -0,0 +1,725 @@+@model OrderDetailsModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_SingleColumn";+ //title+ pagebuilder.AddTitleParts(Loc["Title.OrderDetails"]);+}+<div class="page order-details-page mb-3">+ <h1 class="generalTitle h2"><div>@Loc["Order.OrderInformation"]</div></h1>+ <div asp-validation-summary="All"></div>++ <div class="btn-group btn-group-sm">+ @if (!Model.PdfInvoiceDisabled)+ {+ <a href="@Url.RouteUrl("GetOrderPdfInvoice", new { orderId = Model.Id })" class="btn btn-outline-secondary pdf-invoice-button">@Loc["Order.GetPDFInvoice"]</a>+ }++ @if (Model.ShowAddOrderNote)+ {+ <a @@click="$bvModal.show('ModalAddOrderNote')" class="btn btn-outline-secondary">@Loc["Order.AddOrderNote"]</a>++ var notemodel = new AddOrderNoteModel();+ notemodel.OrderId = Model.Id;++ <partial name="Partials/AddOrderNote" model="@notemodel" />+ }+ </div>+ @if (Model.UserCanCancelUnpaidOrder)+ {+ <a href="@Url.RouteUrl("CancelOrder", new { orderId = Model.Id })" class="btn btn-danger btn-sm cancel-unpaid-order-button float-right" onclick="return confirm('@Loc["Admin.Common.AreYouSure"]');">@Loc["Order.CancelOrder"]</a>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "orderdetails_page_top", additionalData = Model.Id })++ <div class="order-details-area mt-3">+ <div class="card">+ <div class="card-body">+ <div class="form-row">+ <div class="col-lg-4 col-md-6 col-12 order-info">+ <ul class="order-overview px-0">+ <li class="title">+ <h5 class="order-number h4">+ <span class="d-flex"><strong>@Loc["Order.Order#"]</strong><strong>@Model.OrderNumber</strong></span>+ </h5>+ </li>+ @if (!string.IsNullOrEmpty(Model.OrderCode))+ {+ <li class="order-code d-flex">+ <span class="mx-1">@Loc["Order.OrderCode"]:</span><span>@Model.OrderCode</span>+ </li>+ }+ <li class="order-date d-flex">+ <span class="mx-1">@Loc["Order.OrderDate"]:</span>+ <span>@Model.CreatedOn.ToString("D")</span>+ </li>+ <li class="order-status d-flex">+ <span class="mx-1">@Loc["Order.OrderStatus"]:</span><span>@Model.OrderStatus</span>+ </li>+ <li class="order-total d-flex">+ <span class="mx-1">@Loc["Order.OrderTotal"]:</span><span class="h5 mb-0"><strong>@Model.OrderTotal</strong></span>+ </li>+ @await Component.InvokeAsync("Widget", new { widgetZone = "orderdetails_page_overview", additionalData = Model.Id })+ </ul>+ </div>+ <div class="col-lg-4 col-md-6 col-12 billing">+ <ul class="billing-info px-0">+ <li class="title">+ <h5 class="generalTitle">@Loc["Order.BillingAddress"]</h5>+ </li>+ <li class="name">+ @Model.BillingAddress.FirstName @Model.BillingAddress.LastName+ </li>+ <li class="email">+ @Loc["Order.Email"]: @Model.BillingAddress.Email+ </li>+ @if (Model.BillingAddress.PhoneEnabled)+ {+ <li class="phone">+ @Loc["Order.Phone"]: @Model.BillingAddress.PhoneNumber+ </li>+ }+ @if (Model.BillingAddress.FaxEnabled)+ {+ <li class="fax">+ @Loc["Order.Fax"]: @Model.BillingAddress.FaxNumber+ </li>+ }+ @if (Model.BillingAddress.CompanyEnabled && !String.IsNullOrEmpty(Model.BillingAddress.Company))+ {+ <li class="company">+ @Model.BillingAddress.Company+ </li>+ }+ @if (Model.BillingAddress.VatNumberEnabled && !String.IsNullOrEmpty(Model.BillingAddress.VatNumber))+ {+ <li class="company">+ @Model.BillingAddress.VatNumber+ </li>+ }+ @if (Model.BillingAddress.StreetAddressEnabled)+ {+ <li class="address1">+ @Model.BillingAddress.Address1+ </li>+ }+ @if (Model.BillingAddress.StreetAddress2Enabled && !String.IsNullOrEmpty(Model.BillingAddress.Address2))+ {+ <li class="address2">+ @Model.BillingAddress.Address2+ </li>+ }+ @if (Model.BillingAddress.CityEnabled ||+ Model.BillingAddress.StateProvinceEnabled ||+ Model.BillingAddress.ZipPostalCodeEnabled)+ {+ <li class="city-state-zip">+ @if (Model.BillingAddress.CityEnabled)+ {+ @Model.BillingAddress.City+ }+ @if (Model.BillingAddress.CityEnabled && (Model.BillingAddress.StateProvinceEnabled || Model.BillingAddress.ZipPostalCodeEnabled))+ {+ <text>, </text>+ }+ @if (Model.BillingAddress.StateProvinceEnabled)+ {+ @Model.BillingAddress.StateProvinceName+ }+ @if (Model.BillingAddress.ZipPostalCodeEnabled)+ {+ <text> </text> @Model.BillingAddress.ZipPostalCode+ }+ </li>+ }+ @if (Model.BillingAddress.CountryEnabled && !String.IsNullOrEmpty(Model.BillingAddress.CountryName))+ {+ <li class="country">+ @Model.BillingAddress.CountryName+ </li>+ }+ @if (!String.IsNullOrEmpty(Model.VatNumber))+ {+ <li class="vat">+ <span class="label">+ @Loc["Order.VATNumber"]+ </span>+ <span class="value">+ @Model.VatNumber+ </span>+ </li>+ }+ @if (!String.IsNullOrEmpty(Model.BillingAddress.FormattedCustomAddressAttributes))+ {+ <li class="custom-attributes-view">+ @Html.Raw(Model.BillingAddress.FormattedCustomAddressAttributes)+ </li>+ }+ @if (!String.IsNullOrEmpty(Model.PaymentMethod))+ {+ <li class="title">+ <h5 class="generalMarginSupporter generalTitle">@Loc["Order.Payment"]</h5>+ </li>+ <li class="payment-method">+ <span class="label">+ @Loc["Order.Payment.Method"]:+ </span>+ <span class="value">+ @Model.PaymentMethod+ </span>+ </li>+ <li class="payment-method-status">+ <span class="label">+ @Loc["Order.Payment.Status"]:+ </span>+ <span class="value">+ @Model.PaymentMethodStatus+ </span>+ </li>+ if (Model.CanRePostProcessPayment)+ {+ <li class="repost">+ <form asp-route="OrderDetails" method="post">+ <input type="hidden" name="orderId" value="@Model.Id" />+ <input type="submit" asp-action="RePostPayment" name="repost-payment" value="@Loc["Order.RetryPayment"]" class="btn btn-secondary re-order-button" />+ <p class="hint">+ <em>@Loc["Order.RetryPayment.Hint"]</em>+ </p>+ </form>+ </li>+ }+ }+ @if (Model.CustomValues != null)+ {+ foreach (var item in Model.CustomValues)+ {+ <li class="custom-value">+ <span class="label">+ @item.Key:+ </span>+ <span class="value">+ @(item.Value != null ? item.Value.ToString() : "")+ </span>+ </li>+ }+ }+ </ul>+ </div>+ @if (Model.IsShippable)+ {+ <div class="col-lg-4 col-md-6 col-12 shipping">+ <ul class="shipping-info px-0">+ <li class="title">+ <h5 class="generalTitle">@(Model.PickUpInStore ? Loc["Order.PickupAddress"] : Loc["Order.ShippingAddress"])</h5>+ </li>+ @if (!Model.PickUpInStore)+ {+ <li class="name">+ @Model.ShippingAddress.FirstName @Model.ShippingAddress.LastName+ </li>+ <li class="email">+ @Loc["Order.Email"]: @Model.ShippingAddress.Email+ </li>+ if (Model.ShippingAddress.PhoneEnabled)+ {+ <li class="phone">+ @Loc["Order.Phone"]: @Model.ShippingAddress.PhoneNumber+ </li>+ }+ if (Model.ShippingAddress.FaxEnabled)+ {+ <li class="fax">+ @Loc["Order.Fax"]: @Model.ShippingAddress.FaxNumber+ </li>+ }+ if (Model.ShippingAddress.CompanyEnabled && !String.IsNullOrEmpty(Model.ShippingAddress.Company))+ {+ <li class="company">+ @Model.ShippingAddress.Company+ </li>+ }+ if (Model.ShippingAddress.StreetAddressEnabled)+ {+ <li class="address1">+ @Model.ShippingAddress.Address1+ </li>+ }+ if (Model.ShippingAddress.StreetAddress2Enabled && !String.IsNullOrEmpty(Model.ShippingAddress.Address2))+ {+ <li class="address2">+ @Model.ShippingAddress.Address2+ </li>+ }+ if (Model.ShippingAddress.CityEnabled ||+ Model.ShippingAddress.StateProvinceEnabled ||+ Model.ShippingAddress.ZipPostalCodeEnabled)+ {+ <li class="city-state-zip">+ @if (Model.ShippingAddress.CityEnabled)+ {+ @Model.ShippingAddress.City+ }+ @if (Model.ShippingAddress.CityEnabled && (Model.ShippingAddress.StateProvinceEnabled || Model.ShippingAddress.ZipPostalCodeEnabled))+ {+ <text>, </text>+ }+ @if (Model.ShippingAddress.StateProvinceEnabled)+ {+ @Model.ShippingAddress.StateProvinceName+ }+ @if (Model.ShippingAddress.ZipPostalCodeEnabled)+ {+ <text> </text> @Model.ShippingAddress.ZipPostalCode+ }+ </li>+ }+ if (Model.ShippingAddress.CountryEnabled && !String.IsNullOrEmpty(Model.ShippingAddress.CountryName))+ {+ <li class="country">+ @Model.ShippingAddress.CountryName+ </li>+ }+ if (!String.IsNullOrEmpty(Model.ShippingAddress.FormattedCustomAddressAttributes))+ {+ <li class="custom-attributes-view">+ @Html.Raw(Model.ShippingAddress.FormattedCustomAddressAttributes)+ </li>+ }+ }+ else+ {+ if (!string.IsNullOrEmpty(Model.PickupAddress.Address1))+ {+ <li class="address1">+ @Model.PickupAddress.Address1+ </li>+ }+ if (!string.IsNullOrEmpty(Model.PickupAddress.City) || !string.IsNullOrEmpty(Model.PickupAddress.ZipPostalCode))+ {+ <li class="city-state-zip">+ @if (!string.IsNullOrEmpty(Model.PickupAddress.City))+ {+ @Model.PickupAddress.City+ }+ @if (!string.IsNullOrEmpty(Model.PickupAddress.ZipPostalCode))+ {+ <text>,</text>+ @Model.PickupAddress.ZipPostalCode+ }+ </li>+ }+ if (!string.IsNullOrEmpty(Model.PickupAddress.CountryName))+ {+ <li class="country">+ @Model.PickupAddress.CountryName+ </li>+ }+ }+ <li class="title">+ <h5 class="generalMarginSupporter generalTitle">@Loc["Order.Shipping"]</h5>+ </li>+ <li class="shipping-method">+ <span class="label">+ @Loc["Order.Shipping.Name"]:+ </span>+ <span class="value">+ @Model.ShippingMethod+ </span>+ @if (!string.IsNullOrEmpty(Model.ShippingAdditionDescription))+ {+ <div> @Html.Raw(Model.ShippingAdditionDescription)</div>+ }++ </li>+ @if (!Model.PickUpInStore)+ {+ <li class="shipping-status">+ <span class="label">+ @Loc["Order.Shipping.Status"]:+ </span>+ <span class="value">+ @Model.ShippingStatus+ </span>+ </li>+ }+ </ul>+ </div>+ }+ </div>+ </div>+ </div>+ </div>++ @if (Model.Items.Any())+ {+ @await Component.InvokeAsync("Widget", new { widgetZone = "orderdetails_page_beforeproducts", additionalData = Model.Id })+<div class="products mt-3 shopping-cart-page">+ <div>+ <div class="col-12 px-0">+ <div class="row">+ <div class="col-xl-8 col-12 cart-out-container">+ <h5 class="generalTitle">@Loc["Order.Product(s)"]</h5>+ <div class="shopping-cart-container">+ <div id="order-details" class="table-responsive">+ <table class="table">+ <thead role="rowgroup">+ <tr role="row">+ <th role="columnheader" class="text-center"><div>@Loc["Order.Product(s).Picture"]</div></th>+ <th role="columnheader" class="text-center"><div>@Loc["Order.Product(s).Name"]</div></th>+ <th role="columnheader" class="text-center"><div>@Loc["Order.Product(s).Price"]</div></th>+ <th role="columnheader" class="text-center"><div>@Loc["Order.Product(s).Quantity"]</div></th>+ <th role="columnheader" class="text-center"><div>@Loc["Order.Product(s).Total"]</div></th>+ </tr>+ </thead>+ <tbody role="rowgroup">+ @foreach (var item in Model.Items)+ {+ <tr role="row">+ <td class="text-center">+ <div>+ <a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })">+ <img alt="@item.Picture.AlternateText" src="@item.Picture.ImageUrl" title="@item.Picture.Title" />+ </a>+ </div>+ </td>+ <td class="text-center">+ <div>+ <em><a href="@Url.RouteUrl("Product", new { SeName = item.ProductSeName })">@item.ProductName</a></em>+ @if (Model.ShowSku)+ {+ <div class="sku w-100 text-center text-md-left">@item.Sku</div>+ }+ @if (!string.IsNullOrEmpty(item.AttributeInfo))+ {+ <div class="attributes">@Html.Raw(item.AttributeInfo)</div>+ }+ @if (!string.IsNullOrEmpty(item.RentalInfo))+ {+ <div class="rental-info">@Html.Raw(item.RentalInfo)</div>+ }+ @if (!String.IsNullOrEmpty(item.DownloadId))+ {+ <div class="download"><a href="@Url.RouteUrl("GetDownload", new { orderItemId = item.OrderItemGuid })">@Loc["DownloadableProducts.Fields.Download"]</a></div>+ }+ @if (!String.IsNullOrEmpty(item.LicenseId))+ {+ <div class="download license">+ <a href="@Url.RouteUrl("GetLicense", new {orderItemId = item.OrderItemGuid})">@Loc["DownloadableProducts.Fields.DownloadLicense"]</a>+ </div>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "orderdetails_product_line", additionalData = item.Id })+ </div>+ </td>+ <td class="text-center">+ <div>+ <span class="product-unit-price price">@item.UnitPrice</span>+ @if (item.UnitPriceWithoutDiscountValue != item.UnitPriceValue && item.UnitPriceWithoutDiscountValue > 0)+ {+ <div class="text-center">+ <del class="small text-danger">(@item.UnitPriceWithoutDiscount)</del>+ </div>+ }+ </div>+ </td>+ <td class="text-center">+ <div>+ <span class="d-inline-block d-xl-none mr-1">@Loc["shoppingcart.quantity"]:</span> @item.Quantity+ </div>+ </td>+ <td class="text-center">+ <div>+ <span class="product-subtotal price prod-total">@item.SubTotal</span>+ @if (!string.IsNullOrEmpty(item.Discount))+ {+ <div class="discount text-success text-center"><span>@Loc["ShoppingCart.Discount"]: </span><span>@item.Discount</span></div>+ }+ </div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ </div>+ </div>+ <div class="col-lg-4 col-12 totals">+ <div class="totals-inner">+ <div class="total-info table-responsive px-0">+ <table class="table table-hover">+ <tbody>+ <tr>+ <td class="cart-total-left">+ <label>@Loc["Order.SubTotal"]:</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@Model.OrderSubtotal</span>+ </td>+ </tr>+ @if (!string.IsNullOrEmpty(Model.OrderSubTotalDiscount))+ {+ <tr>+ <td class="cart-total-left">+ <label>@Loc["Order.SubTotalDiscount"]:</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@Model.OrderSubTotalDiscount</span>+ </td>+ </tr>+ }+ @if (Model.IsShippable)+ {+ <tr>+ <td class="cart-total-left">+ <label>@Loc["Order.Shipping"]:</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@Model.OrderShipping</span>+ </td>+ </tr>+ }+ @if (!string.IsNullOrEmpty(Model.PaymentMethodAdditionalFee))+ {+ <tr>+ <td class="cart-total-left">+ <label>@Loc["Order.PaymentMethodAdditionalFee"]:</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@Model.PaymentMethodAdditionalFee</span>+ </td>+ </tr>+ }+ @if (Model.DisplayTaxRates && Model.TaxRates.Any())+ {+ foreach (var taxRate in Model.TaxRates)+ {+ <tr>+ <td class="cart-total-left">+ <label>@string.Format(Loc["Order.TaxRateLine"], taxRate.Rate):</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@taxRate.Value</span>+ </td>+ </tr>+ }+ }+ @if (Model.DisplayTax)+ {+ <tr>+ <td class="cart-total-left">+ <label>@Loc["Order.Tax"]:</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@Model.Tax</span>+ </td>+ </tr>+ }+ @if (!string.IsNullOrEmpty(Model.OrderTotalDiscount))+ {+ <tr>+ <td class="cart-total-left">+ <label>@Loc["Order.TotalDiscount"]:</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@Model.OrderTotalDiscount</span>+ </td>+ </tr>+ }+ @if (Model.GiftVouchers.Any())+ {+ foreach (var gc in Model.GiftVouchers)+ {+ <tr>+ <td class="cart-total-left">+ <label>@string.Format(Loc["Order.GiftVoucherInfo"], gc.CouponCode):</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@gc.Amount</span>+ </td>+ </tr>+ }+ }+ @if (Model.RedeemedLoyaltyPoints > 0)+ {+ <tr>+ <td class="cart-total-left">+ <label>@string.Format(Loc["Order.LoyaltyPoints"], Model.RedeemedLoyaltyPoints):</label>+ </td>+ <td class="cart-total-right text-right">+ <span>@Model.RedeemedLoyaltyPointsAmount</span>+ </td>+ </tr>+ }+ <tr>+ <td class="cart-total-left">+ <label>@Loc["Order.OrderTotal"]:</label>+ </td>+ <td class="cart-total-right text-right">+ <span><strong>@Model.OrderTotal</strong></span>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ <div class="d-inline-flex w-100 justify-content-between flex-wrap">+ @if (!String.IsNullOrEmpty(Model.CheckoutAttributeInfo))+ {+ <div class="selected-checkout-attributes">+ @Html.Raw(Model.CheckoutAttributeInfo)+ </div>+ }+ <div class="actions">+ @if (Model.IsReOrderAllowed)+ {+ <input type="button" value="@Loc["Order.Reorder"]" class="btn btn-outline-info re-order-button" onclick="location = ('@Url.RouteUrl("ReOrder", new { orderId = Model.Id }) ')" />+ }+ @if (Model.IsMerchandiseReturnAllowed)+ {+ <input type="button" value="@Loc["Order.ReturnItems"]" class="btn btn-outline-info return-items-button" onclick="location = ('@Url.RouteUrl("MerchandiseReturn", new { orderId = Model.Id }) ')" />+ }+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</div>+@await Component.InvokeAsync("Widget", new { widgetZone = "orderdetails_page_afterproducts", additionalData = Model.Id })+}+else+{+<script>var mix = {}</script>+}+ @if (Model.Shipments.Any())+ {+ <div class="shipments px-0">+ <h5><strong>@Loc["Order.Shipments"]</strong></h5>+ <div class="col-12 px-1">+ <table class="table table-hover">+ <colgroup>+ <col />+ </colgroup>+ <thead class="table-inverse">+ <tr>+ <th>+ <div class="row">+ <div class="shipment-id col-md-2 col-sm-12">+ @Loc["Order.Shipments.ID"]+ </div>+ <div class="tracking-number col-sm-2 d-none d-md-block">+ @Loc["Order.Shipments.TrackingNumber"]+ </div>+ <div class="shipping-date col-sm-3 d-none d-md-block">+ @Loc["Order.Shipments.ShippedDate"]+ </div>+ <div class="delivery-date col-sm-3 d-none d-md-block">+ @Loc["Order.Shipments.DeliveryDate"]+ </div>+ <div class="view-details col-sm-2 d-none d-md-block">+ @Loc["Order.Shipments.ViewDetails"]+ </div>+ </div>+ </th>+ </tr>+ </thead>+ <tbody>+ @foreach (var item in Model.Shipments)+ {+ <tr>+ <td>+ <div class="row">+ <div class="shipment-id col-md-2 col-sm-12">+ <strong class="d-lg-none">@Loc["Order.Shipments.ID"]: </strong>+ <span>@item.ShipmentNumber.ToString()</span>+ </div>+ <div class="tracking-number col-md-2 col-sm-12">+ <strong class="d-lg-none">@Loc["Order.Shipments.TrackingNumber"]: </strong>+ @item.TrackingNumber+ </div>+ <div class="shipped-date col-md-3 col-sm-12">+ <div class="d-flex">+ @if (item.ShippedDate.HasValue)+ {+ <strong class="mx-1 d-lg-none">@Loc["Order.Shipments.ShippedDate"]:</strong>+ <span>@item.ShippedDate.Value.ToString("D")</span>+ }+ else+ {+ <strong class="d-lg-none">@Loc["Order.Shipments.ShippedDate"]: </strong>+ <span>@Loc["Order.Shipments.ShippedDate.NotYet"]</span>+ }+ </div>+ </div>+ <div class="delivery-date col-md-3 col-sm-12">+ <div class="d-fle">+ @if (item.DeliveryDate.HasValue)+ {+ <strong class="mx-1 d-lg-none">@Loc["Order.Shipments.OrderDate"]:</strong>+ <span>@item.DeliveryDate.Value.ToString("D")</span>+ }+ else+ {+ <span class="d-lg-none">@Loc["Order.Shipments.ViewDetails"]</span>+ <span>@Loc["Order.Shipments.DeliveryDate.NotYet"]</span>+ }+ </div>+ </div>+ <div class="view-details col-md-2 col-sm-12">+ <a class="btn btn-sm btn-secondary" href="@Url.RouteUrl("ShipmentDetails", new { shipmentId = item.Id })" title="@Loc["Order.Shipments.ViewDetails"]">@Loc["Order.Shipments.ViewDetails"]</a>+ </div>+ </div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ </div>+ }+ @if (Model.OrderNotes.Any())+ {+ <div class="order-notes">+ <h5>+ @Loc["Order.Notes"]+ </h5>+ <div class="table-responsive">+ <table class="table table-hover data-table">+ <colgroup>+ <col />+ <col />+ </colgroup>+ <thead class="table-inverse">+ <tr class="row mx-0">+ <th class="created-on col-4">+ @Loc["Order.Notes.CreatedOn"]+ </th>+ <th class="note col-8">+ @Loc["Order.Notes.Note"]+ </th>+ </tr>+ </thead>+ <tbody>+ @foreach (var item in Model.OrderNotes)+ {+ <tr class="row mx-0">+ <td class="created-on col-4">+ @item.CreatedOn.ToString()+ </td>+ <td class="note col-8">+ @Html.Raw(item.Note)+ @if (item.HasDownload)+ {+ <p class="download">+ <a href="@Url.RouteUrl("GetOrderNoteFile", new { ordernoteid = item.Id })">@Loc["Order.Notes.Download"]</a>+ </p>+ }+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ </div>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "orderdetails_page_bottom", additionalData = Model.Id })+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/CompareProducts.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/CompareProducts.cshtmlnew file mode 100644index 000000000..7c34811e8--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/CompareProducts.cshtml@@ -0,0 +1,136 @@+@model CompareProductsModel+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_SingleColumn";++ //title+ pagebuilder.AddTitleParts(Loc["Title.CompareProducts"]);+}+@using Grand.Web.Models.Catalog;+@{+ var specificationAttributes = new List<ProductSpecificationModel>();+ foreach (var product in Model.Products)+ {+ foreach (var attribute in product.SpecificationAttributeModels)+ {+ if (specificationAttributes.FirstOrDefault(sa => sa.SpecificationAttributeId == attribute.SpecificationAttributeId) == null)+ {+ specificationAttributes.Add(attribute);+ }+ }+ }+}+<div class="page compare-products-page">+ <h2 class="text-center generalTitle"><div>@Loc["Products.Compare.Title"]</div></h2>+ <template v-if="compareproducts !== null && compareproducts.Products.length > 0">+ <a class="btn btn-danger mb-3" @@click="removeFromCompareList(); getCompareList('@Url.RouteUrl("CompareProducts")')">@Loc["Products.Compare.Clear"]</a>+ <div class="table-responsive">+ <table class="table table-hover compare-products-table table-bordered">+ <tbody>+ <tr class="remove-product">+ <td class="empty"> </td>+ <template v-for="product in compareproducts.Products">+ <td class="same-width">+ <button type="button" title="@Loc["Common.Remove"]" class="btn btn-sm btn-link remove-button d-flex align-items-center justify-content-center" @@click="removeFromCompareList(product.Id); getCompareList('@Url.RouteUrl("CompareProducts")')">+ <b-icon icon="trash" variant="danger" aria-hidden="true"></b-icon>+ </button>+ </td>+ </template>+ </tr>+ <tr class="product-picture">+ <td class="empty"> </td>+ <template v-for="product in compareproducts.Products">+ <td class="same-width">+ <a class="picture" :href="product.Url"><img class="compare-img" :alt="product.DefaultPictureModel.AlternateText" :src="product.DefaultPictureModel.ImageUrl" :title="product.DefaultPictureModel.Title" /></a>+ </td>+ </template>+ </tr>+ <tr class="product-name">+ <td>+ <label>@Loc["Products.Compare.Name"]</label>+ </td>+ <template v-for="product in compareproducts.Products">+ <td class="same-width">+ <a :href="product.Url">{{product.Name}}</a>+ </td>+ </template>+ </tr>+ <tr class="product-price">+ <td>+ <label><strong>@Loc["Products.Compare.Price"]</strong></label>+ </td>+ <template v-for="product in compareproducts.Products">+ <td class="same-width">+ <strong>{{product.ProductPrice.Price}}</strong>+ </td>+ </template>+ </tr>+ <template v-if="compareproducts.IncludeShortDescriptionInCompareProducts">+ <tr class="short-description">+ <td>+ <label>@Loc["Products.Compare.ShortDescription"]</label>+ </td>+ <template v-for="product in compareproducts.Products">+ <td class="same-width">+ <div v-html="product.ShortDescription"></div>+ </td>+ </template>+ </tr>+ </template>+ <template v-for="specificationAttribute in specificationAttributes.Model">+ <tr class="specification">+ <td>+ <label>{{specificationAttribute.SpecificationAttributeName}}</label>+ </td>+ <template v-for="product in compareproducts.Products">+ <td class="same-width">+ <template v-for="spec in product.SpecificationAttributeModels">+ <template v-if="spec.SpecificationAttributeId == specificationAttribute.SpecificationAttributeId">+ <template v-if="spec.ColorSquaresRgb == null">+ <div v-html="spec.ValueRaw" class="d-inline-flex mx-1"></div>+ </template>+ <template v-else>+ <div class="color-squares d-inline-flex mx-1">+ <span class="color-container" :title="spec.ValueRaw">+ <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span>+ </span>+ </div>+ </template>+ </template>+ </template>+ </td>+ </template>+ </tr>+ </template>+ <template v-if="compareproducts.IncludeFullDescriptionInCompareProducts">+ <tr class="full-description">+ <td>+ <label>@Loc["Products.Compare.FullDescription"]</label>+ </td>+ <template v-for="product in compareproducts.Products">+ <td class="same-width">+ <div v-html="product.FullDescription"></div>+ </td>+ </template>+ </tr>+ </template>+ </tbody>+ </table>+ </div>+ </template>+ <template v-else>+ <div class="no-data alert alert-info text-center my-3">+ @Loc["Products.Compare.NoItems"]+ </div>+ </template>+</div>+<script asp-location="Footer" asp-order="300">+ var specificationAttributes = new Vue({+ data: () => ({+ Model: @Json.Serialize(specificationAttributes),+ }),+ })+ document.addEventListener("DOMContentLoaded", function () {+ vm.getCompareList('@Url.RouteUrl("CompareProducts")')+ })+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Default.cshtmlnew file mode 100644index 000000000..eb2e8d49c--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Default.cshtml@@ -0,0 +1,189 @@+@model ProductReviewsModel++<template v-if="productreviews.Model.AddProductReview.CanCurrentCustomerLeaveReview">+ <div class="mb-3">+ <a class="btn btn-info" @@click="productreviews.addProductReview()">@Loc["Reviews.Overview.AddNew"]</a>+ </div>+</template>+<template v-else>+ <div class="alert alert-danger">+ @Loc["reviews.onlyregistereduserscanwritereviews"]+ </div>+</template>+<partial name="Partials/ProductReview.Modal.cshtml" model="Model" />++<template id="product-review-list" v-if="productreviews.Model !== null">+ <div class="product-review-list">+ <template v-if="productreviews.Model.Items.length > 0">+ <h5 class="mb-3"><strong>@Loc["Reviews.ExistingReviews"]</strong></h5>+ <template v-for="review in productreviews.Model.Items">+ <div class="card product-review-item mb-3">+ <div class="card-header">+ <div class="review-info d-inline-flex w-100">+ <div class="user d-inline-flex align-items-center">+ <small class="text-muted mr-2">@Loc["Reviews.From"]:</small>+ <h6 class="mb-0">{{review.CustomerName}}</h6>+ </div>+ <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>+ <small class="date text-muted">+ <span class="ml-1">@Loc["Reviews.Date"]:</span>+ <span>{{review.WrittenOnStr}}</span>+ </small>+ </div>+ </div>+ <div class="card-body">+ <div class="review-title mb-3">+ <h5 class="mb-0">{{review.Title}}</h5>+ <b-form-rating id='rating-inline2' class='p-0' variant='warning' no-border size='sm' show-value precision='2' readonly inline :value='review.Rating'></b-form-rating>+ </div>+ <div class="review-content">+ <div class="review-text">+ {{review.ReviewText}}+ </div>+ </div>+ </div>+ <template v-if="review.ReplyText !== null">+ <div class="reply-content">+ <blockquote class="administration-response px-3">+ <h5 class="administration-response-header">@Loc["Reviews.AdministrationResponse"]</h5>+ <span>{{review.ReplyText}}</span>+ <figcaption class="blockquote-footer">+ {{review.Signature}}+ </figcaption>+ </blockquote>+ </div>+ </template>+ <div class="card-footer">+ <div class="product-review-helpfulness d-inline-flex justify-content-end align-items-center flex-wrap">+ <span class="question">@Loc["Reviews.Helpfulness.WasHelpful?"]</span>+ <span class="vote-options btn-group">+ <span :id="'vote-yes-' + review.Helpfulness.ProductReviewId" @@click="productreviews.setProductReviewHelpfulness('@Url.RouteUrl("SetProductReviewHelpfulness")', 'true' , review.Id, '@Model.ProductId' , '@Loc[" Reviews.Helpfulness.WasHelpful?"]' )" class="btn btn-sm btn-outline vote"><b-icon variant="success" icon="hand-thumbs-up"></b-icon></span>+ <span :id="'vote-no-' + review.Helpfulness.ProductReviewId" @@click="productreviews.setProductReviewHelpfulness('@Url.RouteUrl("SetProductReviewHelpfulness")', 'false' , review.Id, '@Model.ProductId' , '@Loc[" Reviews.Helpfulness.WasHelpful?"]' )" class="btn btn-sm btn-outline vote"><b-icon variant="danger" icon="hand-thumbs-down"></b-icon></span>+ </span>+ <span class="vote-stats d-inline-flex">+ (<span :id="'helpfulness-vote-yes-' + review.Helpfulness.ProductReviewId">{{review.Helpfulness.HelpfulYesTotal}}</span>/<span :id="'helpfulness-vote-no-' + review.Helpfulness.ProductReviewId">{{review.Helpfulness.HelpfulNoTotal}}</span>)+ </span>+ </div>+ </div>+ </div>+ </template>+ </template>+ <template v-else>+ <div class="alert alert-info">@Loc["Products.Reviews.Empty"]</div>+ </template>+ </div>+</template>++<script asp-location="Footer" asp-order="300">+ var productreviews = new Vue({+ data: function () {+ return {+ Model: null,+ rating: null,+ captcha: null+ }+ },+ created() {+ this.Model = @Json.Serialize(Model);+ },+ methods: {+ setProductReviewHelpfulness(url, wasHelpful, reviewId, productId, toastTitle) {+ axios({+ url: url,+ method: 'post',+ params: { "productReviewId": reviewId, "productId": productId, "washelpful": wasHelpful },+ headers: {+ 'X-Response-View': 'Json'+ },+ }).then(function (response) {+ document.getElementById("helpfulness-vote-yes-" + reviewId + "").innerHTML = response.data.TotalYes+ document.getElementById("helpfulness-vote-no-" + reviewId + "").innerHTML = response.data.TotalNo;+ new Vue({+ el: ".modal-place",+ methods: {+ toast() {+ this.$bvToast.toast(response.data.Result, {+ title: toastTitle,+ variant: 'info',+ autoHideDelay: 3000,+ solid: true+ })+ }+ },+ mounted: function () {+ this.toast();+ }+ });+ }).catch(function (error) {+ alert(error);+ })+ },+ addProductReview: function () {+ vm.$refs['ModalProductReview'].show();+ },+ modalReviewShown: function () {+ if (productreviews.Model.AddProductReview.DisplayCaptcha && document.querySelector("#ModalProductReview .captcha-box") == null && !productreviews.Model.AddProductReview.SuccessfullyAdded) {+ var html = document.getElementById("captcha-box");+ document.getElementById("captcha-popup").prepend(html);+ }+ productreviews.Model = Object.assign({}, productreviews.Model, { ReviewTitle: '', ReviewText: '' })+ },+ modalReviewClose: function () {+ if (productreviews.Model.AddProductReview.DisplayCaptcha && document.querySelector("#ModalProductReview .captcha-box") !== null) {+ var html = document.getElementById("captcha-box");+ document.getElementById("captcha-container").prepend(html);+ }+ },+ submitProductReview: function () {+ var form = document.getElementById("addReviewForm");+ var url = form.getAttribute("action");+ var resultTitle = form.getAttribute("data-title");+ var bodyFormData = new FormData(form);+ axios({+ method: "post",+ url: url,+ data: bodyFormData,+ headers: {+ "Content-Type": "multipart/form-data",+ 'X-Response-View': 'Json'+ },+ }).then(function (response) {+ productreviews.Model = response.data;+ var result = response.data.AddProductReview.Result;+ var variant = "";++ if (response.data.AddProductReview.SuccessfullyAdded) {++ variant = "info";+ vm.$refs['ModalProductReview'].hide();++ } else {+ variant = "danger";+ }++ new Vue({+ el: ".modal-place",+ methods: {+ toast() {+ this.$bvToast.toast(result, {+ title: resultTitle,+ variant: variant,+ autoHideDelay: 3000,+ solid: true+ })+ }+ },+ mounted: function () {+ this.toast();+ }+ });++ if (response.data.ProductReviewOverviewModel !== null) {+ productreviewsoverview.Model = response.data.ProductReviewOverviewModel;+ }+ });+ return+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Partials/ProductReview.Modal.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Partials/ProductReview.Modal.cshtmlnew file mode 100644index 000000000..1b7a7e196--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Partials/ProductReview.Modal.cshtml@@ -0,0 +1,58 @@+@model ProductReviewsModel++@{+ var productlink = @Url.RouteUrl("Product", new { SeName = Model.ProductSeName });+}++<b-modal id="ModalProductReview" ref="ModalProductReview" :dark-theme="darkMode" size="xl" @@shown="productreviews.modalReviewShown()" @@hide="productreviews.modalReviewClose()" centered hide-footer hide-header>+ <template v-if="productreviews.Model !== null">+ <h2 class="generalTitle h3">@Loc["Reviews.ProductReviewsFor"] <a :href="'@productlink'">{{productreviews.Model.ProductName}}</a></h2>+ <a class="modal-close" @@click="$bvModal.hide('ModalProductReview')"><b-icon icon="x"></b-icon></a>+ <template v-if="!productreviews.Model.AddProductReview.SuccessfullyAdded">+ <div class="write-review" id="review-form">+ <h5 class="generalTitle"><strong>@Loc["Reviews.Write"]</strong></h5>+ <validation-observer v-slot="{ handleSubmit }">+ <form id="addReviewForm" asp-route="ProductReviews" asp-route-ProductId="@Model.ProductId" method="post" ref="modalForm"+ v-on:submit.prevent="handleSubmit(productreviews.submitProductReview)" :data-title="'@Loc["Reviews.ProductReviewsFor"] ' + productreviews.Model.ProductName">+ <input type="hidden" asp-for="@Model.ProductId" />+ <div asp-validation-summary="ModelOnly" class="message-error alert alert-danger my-3"></div>+ <fieldset>+ <div class="form-fields">+ <div class="form-group">+ <validation-provider tag="div" rules="required" name="AddProductReview.Title" v-slot="{ errors, classes }">+ <label for="AddProductReview_Title" class="col-form-label">@Loc["Reviews.Fields.Title"]:</label>+ <input data-val-required="@Loc["reviews.fields.title.required"]" v-model="productreviews.Model.AddProductReview.Title" id="AddProductReview_Title" name="AddProductReview.Title" v-bind:class="[classes , 'form-control review-title']" :disabled="!productreviews.Model.AddProductReview.CanCurrentCustomerLeaveReview" />+ <span class="field-validation-error">{{ errors[0] }}</span>+ </validation-provider>+ </div>+ <div class="form-group">+ <validation-provider tag="div" rules="required" name="AddProductReview.ReviewText" v-slot="{ errors, classes }">+ <label for="AddProductReview_ReviewText" class="col-form-label">@Loc["Reviews.Fields.ReviewText"]:</label>+ <textarea data-val-required="@Loc["reviews.fields.reviewtext.required"]" v-model="productreviews.Model.AddProductReview.ReviewText" id="AddProductReview_ReviewText" name="AddProductReview.ReviewText" v-bind:class="[classes , 'form-control review-text']" :disabled="!productreviews.Model.AddProductReview.CanCurrentCustomerLeaveReview"></textarea>+ <span class="field-validation-error">{{ errors[0] }}</span>+ </validation-provider>+ </div>+ <div class="form-group review-rating d-flex flex-wrap">+ <label for="AddProductReview_Rating" class="col-form-label w-100">@Loc["Reviews.Fields.Rating"]:</label>+ <b-form-rating v-model="value" variant="warning" show-value value="5" inline></b-form-rating>+ <input class="sr-only" id="AddProductReview_Rating" name="AddProductReview.Rating" v-model="value" />+ </div>+ <template v-if="productreviews.Model.AddProductReview.DisplayCaptcha">+ <div id="captcha-popup"></div>+ </template>+ </div>+ </fieldset>+ <div class="buttons my-3">+ <input type="submit" class="btn btn-info write-product-review-button" value="@Loc[" Reviews.SubmitButton"]" :disabled="!productreviews.Model.AddProductReview.CanCurrentCustomerLeaveReview" />+ </div>+ </form>+ </validation-observer>+ </div>+ </template>+ <template v-else>+ <div class="alert alert-info">+ {{productreviews.Model.AddProductReview.Result}}+ </div>+ </template>+ </template>+</b-modal>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/NewProducts.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/NewProducts.cshtmlnew file mode 100644index 000000000..593b76121--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/NewProducts.cshtml@@ -0,0 +1,23 @@+@model IList<ProductOverviewModel>+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_SingleColumn";++ //title+ pagebuilder.AddTitleParts(Loc["Title.NewProducts"]);+}+@using Grand.Web.Models.Catalog;+<div class="page recently-added-products-page col-12 px-0">+ <h1 class="h2 generalTitle text-center"><div>@Loc["Products.NewProducts"]</div></h1>+ @if (Model.Any())+ {+ <div class="item-row">+ @foreach (var product in Model)+ {+ <b-col xl="3" lg="3" sm="6" cols="6" class="product-container mb-2">+ <partial name="Partials/CatalogProductView" model="product" />+ </b-col>+ }+ </div>+ }+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/AddToCart.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/AddToCart.cshtmlnew file mode 100644index 000000000..c2c26a3a0--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/AddToCart.cshtml@@ -0,0 +1,103 @@+@model ProductDetailsModel.AddToCartModel+@{+ var shoppingCartType = Model.UpdateShoppingCartItemType ?? ShoppingCartType.ShoppingCart;+}+@if (!string.IsNullOrEmpty(Model.UpdatedShoppingCartItemId))+{+ <input asp-for="UpdatedShoppingCartItemId" type="hidden" />+}+@if (Model.EnteredPrice)+{+ <div class="customer-entered-price mb-3 d-flex w-100 flex-column">+ <div class="price-input">+ <label for=@($"CustomerEnteredPrice_{Model.ProductId}") class="enter-price-label">@Loc["Products.EnterProductPrice"]</label>+ <input type="text" id=@($"CustomerEnteredPrice_{Model.ProductId}") name="CustomerEnteredPrice" value="@Convert.ToInt32(Math.Ceiling(Model.CustomerEnteredPrice))" class="form-control enter-price-input"/>+ </div>+ <div class="price-range pt-1">+ @Model.CustomerEnteredPriceRange+ </div>+ </div>+}+<div role="group" class="input-group product-add-to-cart flex-nowrap">+ @if (!Model.DisableBuyButton || Model.EnteredPrice)+ {+ if (!string.IsNullOrEmpty(Model.MinimumQuantityNotification))+ {+ <div class="min-qty-notification text-danger w-100 mb-2">@Model.MinimumQuantityNotification</div>+ }+ if (!Model.DisableBuyButton)+ {+ @if (Model.AllowedQuantities.Any())+ {+ <select name="EnteredQuantity" id=@($"EnteredQuantity_{Model.ProductId}") asp-items="Model.AllowedQuantities" class="custom-select form-control qty-dropdown mr-2"></select>+ if (!string.IsNullOrEmpty(Model.MeasureUnit))+ {+ <span class="qty-unit d-flex align-items-center mr-2">+ @Model.MeasureUnit+ </span>+ }+ }+ else+ {++ var addId = "addtocart_" + @Model.ProductId + "_EnteredQuantity";+ <label for="@addId" class="sr-only">@Loc["ShoppingCart.AddToCart"]</label>+ <div class="qty-controls">+ <div class="plus" onclick="increaseValue()"></div>+ <div class="minus" onclick="decreaseValue()"></div>+ </div>+ <input type="number" inputmode="numeric" id=@($"EnteredQuantity_{Model.ProductId}") name="EnteredQuantity" value="1" class="qty-input form-control text-center">+ <script asp-location="Footer">+ function increaseValue() {+ var value = parseInt(document.getElementById("@addId").value, 10);+ value = isNaN(value) ? 0 : value;+ value++;+ document.getElementById("@addId").value = value;+ }+ function decreaseValue() {+ var value = parseInt(document.getElementById("@addId").value, 10);+ value = isNaN(value) ? 0 : value;+ value < 2 ? value = 2 : '';+ value--;+ document.getElementById("@addId").value = value;+ }+ </script>+ if (!string.IsNullOrEmpty(Model.MeasureUnit))+ {+ <span class="qty-unit d-flex align-items-center mr-2">+ @Model.MeasureUnit+ </span>+ }++ }+ {+ var addToCartText = "";+ if (!string.IsNullOrEmpty(Model.UpdatedShoppingCartItemId) && Model.UpdateShoppingCartItemType is ShoppingCartType.ShoppingCart or ShoppingCartType.OnHoldCart)+ {+ addToCartText = Loc["ShoppingCart.AddToCart.Update"];+ }+ else+ {+ addToCartText = Loc["ShoppingCart.AddToCart"];+ if (Model.IsReservation)+ {+ addToCartText = Loc["ShoppingCart.Reservation"];+ }+ if (Model.AvailableForPreOrder)+ {+ addToCartText = Loc["ShoppingCart.PreOrder"];+ }+ if (Model.IsAuction)+ {+ addToCartText = Loc["ShoppingCart.BuyNow"];+ }+ }+ <div class="input-group-append">+ <button type="button" id="[email protected]" class="btn btn-info w-100 add-to-cart-button d-inline-flex" data-productid="@Model.ProductId" onclick="AxiosCart.addproducttocart_details('@Url.RouteUrl("AddProductDetails", new { productId = Model.ProductId, shoppingCartTypeId = (int)shoppingCartType })', @($"'#product-details-form-{Model.ProductId}'"));return false;">+ <span>@addToCartText</span>+ </button>+ </div>+ }+ }+ }+</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/AddToWishlist.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/AddToWishlist.cshtmlnew file mode 100644index 000000000..0387fa0e3--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/AddToWishlist.cshtml@@ -0,0 +1,18 @@+@model ProductDetailsModel.AddToCartModel+@if (!Model.DisableWishlistButton)+{+ var addToWishlistText = "";+ if (!string.IsNullOrEmpty(Model.UpdatedShoppingCartItemId) && Model.UpdateShoppingCartItemType is ShoppingCartType.Wishlist)+ {+ addToWishlistText = Loc["ShoppingCart.AddToWishlist.Update"];+ }+ else+ {+ addToWishlistText = Loc["ShoppingCart.AddToWishlist"];+ }++<b-button variant="outline-secondary" id="[email protected]" class="add-to-wishlist-button mr-1" data-productid="@Model.ProductId" onclick="AxiosCart.addproducttocart_details('@Url.RouteUrl("AddProductDetails", new { productId = Model.ProductId, shoppingCartTypeId = (int)ShoppingCartType.Wishlist })', @($"'#product-details-form-{Model.ProductId}'"));return false;" v-b-tooltip.hover.bottom title="@addToWishlistText">+ <span class="sr-only">@addToWishlistText</span>+ <span class="icons icon-heart"></span>+</b-button>+}diff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/Breadcrumbs.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/Breadcrumbs.cshtmlnew file mode 100644index 000000000..503dfa430--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/Breadcrumbs.cshtml@@ -0,0 +1,38 @@+@model ProductDetailsModel.ProductBreadcrumbModel+@if (Model.Enabled)+{+ var count = 1;+ <ol class="breadcrumb mb-0" itemscope="itemscope" itemtype="http://schema.org/BreadcrumbList">+ @await Component.InvokeAsync("Widget", new { widgetZone = "productbreadcrumb_before" })+ <li class="breadcrumb-item" itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem">+ <a href="@Url.RouteUrl("HomePage")" target="_self">+ <b-icon icon="house-door" scale="1.25" shift-v="1.25" aria-hidden="true"></b-icon>+ <span itemprop="name">@Loc["Products.Breadcrumb.Top"]</span>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ id="@Url.RouteUrl("HomePage")">+ </span>+ <meta itemprop="position" content="@count" />+ </a>+ </li>+ @foreach (var category in Model.CategoryBreadcrumb)+ {+ count++;+ <li itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem" class="breadcrumb-item">+ <a href="@Url.RouteUrl("Category", new { SeName = category.SeName })" target="_self">+ <span itemprop="name">@category.Name</span>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ id="@Url.RouteUrl("Category", new { SeName = category.SeName })">+ </span>+ <meta itemprop="position" content="@count" />+ </a>+ </li>+ }+ <li itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem" class="breadcrumb-item active">+ <strong class="current-item" itemprop="name">@Model.ProductName</strong>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ id="@Url.RouteUrl("Product", new { SeName = Model.ProductSeName })">+ </span>+ <meta itemprop="position" content="@(count+1)" />+ </li>+ </ol>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/Pictures.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/Pictures.cshtmlnew file mode 100644index 000000000..7164370c5--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/Pictures.cshtml@@ -0,0 +1,92 @@+@model ProductDetailsModel++@{+ <script asp-location="Footer" asp-order="300" asp-src="/Plugins/Theme.Modern/Content/script/medium-zoom.min.js"></script>+}+<b-col xl="7" lg="6" md="5" cols="12" class="px-0">+ @if (!string.IsNullOrEmpty(Model.Flag))+ {+ <div class="product-label">+ @Html.Raw(Model.Flag)+ </div>+ }+ <div class="gallery">+ <template>+ <div id="ppslider" class="gallery-slider">+ <template>+ <!-- swiper1 Thumbs -->+ <swiper class="swiper gallery-thumbs" :options="ppslider.swiperOptionThumbs" ref="swiperThumbs">+ @foreach (var picture in Model.PictureModels)+ {+ <swiper-slide>+ <img src="@picture.ThumbImageUrl" alt="@picture.AlternateText" title="@picture.Title" />+ </swiper-slide>+ }+ </swiper>+ <!-- swiper2 Main -->+ <swiper class="swiper gallery-top" :options="ppslider.swiperOptionTop" ref="swiperTop">+ @foreach (var picture in Model.PictureModels)+ {+ <swiper-slide>+ <img src="@picture.ImageUrl" data-srcs="@picture.ImageUrl" data-zoom-src="@picture.FullSizeImageUrl" alt="@picture.AlternateText" title="@picture.Title" />+ @if (Model.DefaultPictureZoomEnabled)+ {+ <div class="zoom-button" onclick="zoomImg(this)">+ <span class="icons icon-frame"></span>+ </div>+ }+ </swiper-slide>+ }+ <div class="swiper-button-next swiper-button-white" slot="button-next"></div>+ <div class="swiper-button-prev swiper-button-white" slot="button-prev"></div>+ </swiper>+ </template>+ </div>+ </template>+ </div>+</b-col>+<script asp-location="Footer" asp-order="301">+ Vue.use(VueAwesomeSwiper)+ var ppslider = new Vue({+ el: '#ppslider',+ data() {+ return {+ Model: @Json.Serialize(Model),+ swiperOptionTop: {+ loop: true,+ loopedSlides: 4, // looped slides should be the same+ spaceBetween: 10,+ navigation: {+ nextEl: '#ppslider .swiper-button-next',+ prevEl: '#ppslider .swiper-button-prev'+ },+ },+ swiperOptionThumbs: {+ direction: 'vertical',+ loop: true,+ loopedSlides: 4, // looped slides should be the same+ spaceBetween: 10,+ centeredSlides: true,+ slidesPerView: 'auto',+ touchRatio: 0.2,+ slideToClickedSlide: true,+ }+ }+ },+ created() {+ setTimeout(function () {+ const swiperTop = vm.$refs.swiperTop.$swiper+ const swiperThumbs = vm.$refs.swiperThumbs.$swiper+ swiperTop.controller.control = swiperThumbs+ swiperThumbs.controller.control = swiperTop+ }, 1000)+ }+ });+</script>+<script asp-location="Footer" asp-order="302">+ function zoomImg(el) {+ var img = el.parentElement.querySelector('img');+ const zoom = mediumZoom(img, { background: '#232323', margin: 30 });+ zoom.open()+ }+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductAttributes.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductAttributes.cshtmlnew file mode 100644index 000000000..9afc5a60d--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductAttributes.cshtml@@ -0,0 +1,322 @@+@using System.Text;+@model ProductDetailsModel++<div id="product-attributes"></div>+@{+ //dynamic update support+ var attributeChangeScriptsBuilder = new StringBuilder();+ var attributeChangeHandlerFuncName = $"attribute_change_handler_{Model.Id}";+ var fileLink = Url.RouteUrl("UploadFileProductAttribute");+ //generate change event script+ foreach (var attribute in Model.ProductAttributes)+ {+ var controlId = $"product_attribute_{attribute.Id}";+ switch (attribute.AttributeControlType)+ {+ case AttributeControlType.DropdownList:+ {+ attributeChangeScriptsBuilder.Append($"document.querySelector('#{controlId}').addEventListener('change', function (){{{attributeChangeHandlerFuncName}();}});\n");+ }+ break;+ case AttributeControlType.RadioList:+ case AttributeControlType.ColorSquares:+ case AttributeControlType.ImageSquares:+ {+ foreach (var attributeValue in attribute.Values)+ {+ attributeChangeScriptsBuilder.Append($"document.querySelector('#{controlId}_{attributeValue.Id}').addEventListener('click',function(e){{{attributeChangeHandlerFuncName}();}},false);\n");+ }+ }+ break;+ case AttributeControlType.Checkboxes:+ case AttributeControlType.ReadonlyCheckboxes:+ {+ foreach (var attributeValue in attribute.Values)+ {+ attributeChangeScriptsBuilder.Append($"document.querySelector('#{controlId}_{attributeValue.Id}').addEventListener('click',function(e){{{attributeChangeHandlerFuncName}();}},false);\n");+ }+ }+ break;+ }+ }+ //render scripts+ <div id="product-attributes">+ <template v-if="standardProductAttributes_@(Model.Id).ProductAttributes !== 'undefined'">+ <div class="attributes">+ <table class="table">+ <tr v-for="attribute in standardProductAttributes_@(Model.Id).ProductAttributes">+ <td :id="'product_attribute_label_' + attribute.Id">+ <span class="attribute-name">{{attribute.Name}}</span> <span v-if="attribute.IsRequired" class="required">*</span>+ <template v-if="attribute.TextPrompt !==null">+ <span class="text-prompt">{{attribute.TextPrompt}}</span>+ </template>+ <template v-if="attribute.Description !==null">+ <span v-html="attribute.Description" class="attribute-description"></span>+ </template>+ </td>+ <td :id="'product_attribute_input_' + attribute.Id">+ <template v-if="attribute.AttributeControlType==4">+ <label :for="'product_attribute_' + attribute.Id" class="sr-only">product_attribute_{{attribute.Id}}</label>+ <input :name="'attributes[' + attribute.Id+']'" type="text" class="form-control textbox" :id="'product_attribute_' + attribute.Id" :value="attribute.DefaultValue" @@change="standardProductAttributes_@(Model.Id).attrchange" />+ </template>+ <template v-if="attribute.AttributeControlType==1">+ <label :for="'product_attribute_' + attribute.Id" class="sr-only">product_attribute_{{attribute.Id}}</label>+ <select :id="'product_attribute_' + attribute.Id" class="form-control custom-select" :name="'attributes[' + attribute.Id+']'" @@change="standardProductAttributes_@(Model.Id).attrchange">+ <template v-if="attribute.IsRequired==false">+ <option value="">---</option>+ </template>+ <option v-for="attributeValue in attribute.Values" :selected="attributeValue.IsPreSelected" :value="attributeValue.Id" :data-disable="attributeValue.Id">+ <template v-if="attributeValue.PriceAdjustment==null">+ {{attributeValue.Name}}+ </template>+ <template v-else>+ {{attributeValue.Name}}[{{attributeValue.PriceAdjustment}}]+ </template>+ </option>+ </select>+ </template>+ <template v-if="attribute.AttributeControlType==2">+ <ul class="option-list px-0 mb-0">+ <li v-for="attributeValue in attribute.Values">+ <fieldset>+ <legend class="sr-only">product_attribute_{{attribute.Id}}</legend>+ <label class="custom-control custom-radio">+ <input class="custom-control-input"+ :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id"+ type="radio"+ :name="'attributes[' + attribute.Id+']'"+ :value="attributeValue.Id"+ :checked="attributeValue.IsPreSelected"+ :data-disable="attributeValue.Id"+ @@change="standardProductAttributes_@(Model.Id).attrchange" />+ <span class="custom-control-label"></span>+ <span class="custom-control-description" :for="'product_attribute_' + attribute.Id + '_' + attributeValue.Id">+ <template v-if="attributeValue.PriceAdjustment==null">+ {{attributeValue.Name}}+ </template>+ <template v-else>+ {{attributeValue.Name}}[{{attributeValue.PriceAdjustment}}]+ </template>+ </span>+ </label>+ </fieldset>+ </li>+ </ul>+ </template>+ <template v-if="attribute.AttributeControlType==3 || attribute.AttributeControlType==50">+ <fieldset>+ <legend></legend>+ <ul class="option-list px-0 mb-0">+ <li v-for="attributeValue in attribute.Values">+ <label class="custom-control custom-checkbox">+ <input v-if="attribute.AttributeControlType==50"+ class="custom-control-input"+ :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id"+ type="checkbox"+ :name="'attributes[' + attribute.Id+']'"+ :value="attributeValue.Id"+ :checked="attributeValue.IsPreSelected"+ @@change="standardProductAttributes_@(Model.Id).attrchange"+ disabled="disabled" />+ <input v-else+ class="custom-control-input"+ :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id"+ type="checkbox"+ :name="'attributes[' + attribute.Id+']'"+ :value="attributeValue.Id"+ :checked="attributeValue.IsPreSelected"+ :data-disable="attributeValue.Id"+ @@change="standardProductAttributes_@(Model.Id).attrchange" />+ <span class="custom-control-label"></span>+ <span class="custom-control-description" :for="'product_attribute_' + attribute.Id + '_' + attributeValue.Id">+ <template v-if="attributeValue.PriceAdjustment==null">+ {{attributeValue.Name}}+ </template>+ <template v-else>+ {{attributeValue.Name}}[{{attributeValue.PriceAdjustment}}]+ </template>+ </span>+ </label>+ </li>+ </ul>+ </fieldset>+ </template>+ <template v-if="attribute.AttributeControlType==10">+ <textarea :id="'product_attribute_' + attribute.Id" :name="'attributes[' + attribute.Id+']'">{{attribute.DefaultValue}}</textarea>+ </template>+ <template v-if="attribute.AttributeControlType==30">+ <template>+ <div :id="'product_attribute_' + attribute.Id + 'uploader'">+ <b-form-file :accept="attribute.AllowedFileExtensions"+ type="file"+ id="qqfile"+ name="qqfile"+ :data-url="'@fileLink/' + attribute.Id + '?productId=' + attribute.ProductId"+ @@change="vm.uploadFile($event.target)" />+ </div>+ </template>+ <input class="hidden-upload-input"+ type="hidden"+ :id="'product_attribute_' + attribute.Id"+ :name="'attributes[' + attribute.Id+']'"+ v-model="attribute.DefaultValue"+ :value="attribute.DefaultValue" />+ <div id="download-message" class="alert my-2" style="display: none;"></div>+ <div :id="'product_attribute_' + attribute.Id + 'downloadurl'" class="download-file" style="display: none;"><a class="btn btn-outline-info"> Download </a></div>+ </template>+ <template v-if="attribute.AttributeControlType==40">+ <ul class="option-list color-squares w-100 d-inline-flex flex-wrap px-0 mb-0" :id="'color-squares-' + attribute.Id">+ <li v-for="attributeValue in attribute.Values" class="mr-1 p-0">+ <label :for="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" class="mb-0">+ <input :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" type="radio" :name="'attributes[' + attribute.Id+']'" :value="attributeValue.Id" :checked="attributeValue.IsPreSelected" :data-disable="attributeValue.Id" @@change="standardProductAttributes_@(Model.Id).attrchange" />+ <template v-if="attributeValue.PriceAdjustment==null">+ <span class="color-container" :title="attributeValue.Name"> <span class="color" :style="'background-color:' + attributeValue.ColorSquaresRgb"></span> </span>+ </template>+ <template v-else>+ <span class="color-container" :title="attributeValue.Name + ' [' + attributeValue.PriceAdjustment + ']'"> <span class="color" :style="'background-color:' + attributeValue.ColorSquaresRgb"></span> </span>+ </template>+ </label>+ </li>+ </ul>+ </template>+ <template v-if="attribute.AttributeControlType==45">+ <ul class="option-list color-squares w-100 d-inline-flex flex-wrap px-0 mb-0" :id="'color-squares-' + attribute.Id">+ <li v-for="attributeValue in attribute.Values" class="mr-1 p-0">+ <label :for="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" class="mb-0">+ <template v-if="attributeValue.PriceAdjustment==null">+ <input :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" type="radio" :name="'attributes[' + attribute.Id+']'" :value="attributeValue.Id" :checked="attributeValue.IsPreSelected" :data-disable="attributeValue.Id" @@change="standardProductAttributes_@(Model.Id).attrchange" />+ <span :id="'imgSqr_' + attributeValue.Id" class="color-container">+ <span class="color" :style="'background: url(' + attributeValue.ImageSquaresPictureModel.ImageUrl + ') 50% 50% no-repeat;'"></span>+ </span>+ <b-tooltip :target="'imgSqr_' + attributeValue.Id" placement="bottom">+ <div class="image-square-tooltip"><img :src="attributeValue.ImageSquaresPictureModel.FullSizeImageUrl" :alt="attributeValue.Name" /> <span>{{attributeValue.Name}}</span></div>+ </b-tooltip>+ </template>+ <template v-else>+ <input :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" type="radio" :name="'attributes[' + attribute.Id+']'" :value="attributeValue.Id" :checked="attributeValue.IsPreSelected" :data-disable="attributeValue.Id" @@change="standardProductAttributes_@(Model.Id).attrchange" />+ <span :id="'imgSqr_' + attributeValue.Id" class="color-container"> <span class="color" :style="'background: url(' + attributeValue.ImageSquaresPictureModel.ImageUrl + ') 50% 50% no-repeat;'"></span> </span>+ <b-tooltip :target="'imgSqr_' + attributeValue.Id" placement="bottom">+ <div class="image-square-tooltip">+ <img :src="attributeValue.ImageSquaresPictureModel.FullSizeImageUrl" :alt="attributeValue.Name + ' [' + attributeValue.PriceAdjustment + ']'" />+ <span>{{attributeValue.Name}}[{{attributeValue.PriceAdjustment}}]</span>+ </div>+ </b-tooltip>+ </template>+ </label>+ </li>+ </ul>+ </template>+ </td>+ </tr>+ </table>+ </div>+ </template>+ </div>+ <script asp-location="Footer" asp-order="300">+ var standardProductAttributes_@(Model.Id) = new Vue({+ data: function () {+ return {+ ProductAttributes: null+ }+ },+ methods: {+ attrchange: function @(attributeChangeHandlerFuncName)() {+ var form = document.getElementById('@($"product-details-form-{Model.Id}")');+ var data = new FormData(form);+ axios({+ url: '@Html.Raw(Url.Action("productdetails_attributechange", "product", new { productId = Model.Id, loadPicture = true }))',+ data: data,+ method: 'post',+ params: { product: '@Model.Id' },+ }).then(function (response) {+ if (response.data.price) {+ if (document.querySelector('[email protected] .actual-price'))+ document.querySelector('[email protected] .actual-price').innerText = response.data.price;+ else+ document.querySelector('[email protected]').innerText = response.data.price;+ }+ if (response.data.sku) {+ if(document.querySelector('#[email protected]'))+ document.querySelector('#[email protected]').innerText = response.data.sku;+ }+ if (response.data.mpn) {+ if(document.querySelector('#[email protected]'))+ document.querySelector('#[email protected]').innerText = response.data.mpn;+ }+ if (response.data.gtin) {+ if(document.querySelector('#[email protected]'))+ document.querySelector('#[email protected]').innerText = response.data.gtin;+ }+ if (response.data.stockAvailability) {+ if(document.querySelector('#[email protected]'))+ document.querySelector('#[email protected]').innerText = response.data.stockAvailability;+ }+ if (response.data.outOfStockSubscription) {+ var element = document.querySelector('#[email protected]');+ if (element)+ element.style.display = "block";+ }+ if (response.data.outOfStockSubscription == false) {+ var element = document.querySelector('#[email protected]');+ if (element) {+ element.style.display = "none";+ }+ }+ if (response.data.buttonTextOutOfStockSubscription) {+ var element = document.querySelector('#[email protected]');+ if (element)+ element.value = response.data.buttonTextOutOfStockSubscription;+ }+ if (response.data.enabledattributemappingids) {+ for (var i = 0; i < response.data.enabledattributemappingids.length; i++) {+ document.querySelector('#product_attribute_label_' + response.data.enabledattributemappingids[i]).style.display = "table-cell";+ document.querySelector('#product_attribute_input_' + response.data.enabledattributemappingids[i]).style.display = "table-cell";+ }+ }+ if (response.data.disabledattributemappingids) {+ for (var i = 0; i < response.data.disabledattributemappingids.length; i++) {+ document.querySelector('#product_attribute_label_' + response.data.disabledattributemappingids[i]).style.display = "none";+ document.querySelector('#product_attribute_input_' + response.data.disabledattributemappingids[i]).style.display = "none";+ }+ }+ @*if (response.data.notAvailableAttributeMappingids) {+ document.querySelectorAll('[data-disable]').forEach((element) => element.disabled = false);+ for (var i = 0; i < response.data.notAvailableAttributeMappingids.length; i++) {+ if (document.querySelectorAll("[data-disable='" + response.data.notAvailableAttributeMappingids[i] + "']").length > 0) {+ document.querySelectorAll("[data-disable='" + response.data.notAvailableAttributeMappingids[i] + "']")[0].disabled = true;+ }+ }+ }*@+ var product = this.product;+ setTimeout(function () {+ if (response.data.pictureDefaultSizeUrl) {+ if (document.querySelector(".product-grouped")) {+ document.getElementById('main-product-img-' + product).setAttribute("src", response.data.pictureDefaultSizeUrl);+ }+ else {+ var active_img_src = vm.$refs.swiperTop.$swiper.slides[vm.$refs.swiperTop.$swiper.activeIndex].querySelector("img").dataset.srcs;+ if (!(active_img_src == response.data.pictureDefaultSizeUrl)) {+ vm.$refs.swiperTop.$swiper.slides.forEach(function (element, index) {+ var img_src = element.querySelector('img').dataset.srcs;+ if (img_src == response.data.pictureDefaultSizeUrl) {+ vm.$refs.swiperTop.$swiper.slideTo(index, 1000, false)+ }+ })+ }+ }++ }+ }, 100);+ });+ },+ },+ created() {+ this.ProductAttributes = @Json.Serialize(Model.ProductAttributes);+ }+ });++ document.addEventListener("DOMContentLoaded", function () {+ standardProductAttributes_@(Model.Id).attrchange();+ });+ </script>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductTags.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductTags.cshtmlnew file mode 100644index 000000000..98e1b68ff--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductTags.cshtml@@ -0,0 +1,11 @@+@model IList<ProductTagModel>+<b-col cols="12" class="product-tags-box px-0">+ <div class="product-tags-list">+ @for (int i = 0; i < Model.Count; i++)+ {+ <b-button size="sm" variant="outline-secondary" class="producttag" href="@Url.RouteUrl("ProductsByTagName", new { SeName = Model[i].SeName })">+ @Model[i].Name <span>@Loc["Products.Tags.Count", Model[i].ProductCount]</span>+ </b-button>+ }+ </div>+</b-col>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductsComparison.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductsComparison.cshtmlnew file mode 100644index 000000000..1df7a2d78--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/ProductsComparison.cshtml@@ -0,0 +1,11 @@+@model ProductDetailsModel+@{+ var addtocomparelink = Url.RouteUrl("AddProductToCompare", new { productId = Model.Id });+}+@if (Model.CompareProductsEnabled)+{+ <a class="btn btn-outline-secondary add-to-compare-list-button mr-1" onclick="AxiosCart.addproducttocomparelist('@Model.Id', '@Loc["Products.ProductHasBeenAddedToCompareList.Link"]', '@Url.RouteUrl("CompareProducts")')" v-b-tooltip.hover.bottom title="@Loc["Products.Compare.AddToCompareList"]">+ <b-icon icon="shuffle"></b-icon>+ <span class="sr-only">@Loc["Products.Compare.AddToCompareList"]</span>+ </a>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/SendFriend.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/SendFriend.cshtmlnew file mode 100644index 000000000..ef9374f46--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Partials/SendFriend.cshtml@@ -0,0 +1,5 @@+@model ProductDetailsModel+<a class="btn btn-outline-secondary email-a-friend-button mr-1" @@click="$bvModal.show('ModalProductEmailAFriend')" v-b-tooltip.hover.bottom title="@Loc["Products.EmailAFriend"]">+ <b-icon icon="envelope"></b-icon>+ <span class="sr-only">@Loc["Products.EmailAFriend"]</span>+</a>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/ProductEmailAFriend.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/ProductEmailAFriend.cshtmlnew file mode 100644index 000000000..aba2bf725--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/ProductEmailAFriend.cshtml@@ -0,0 +1,57 @@+@model ProductEmailAFriendModel+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_SingleColumn";++ //title+ pagebuilder.AddTitleParts(Model.ProductName);+ pagebuilder.AddTitleParts(Loc["Title.ProductEmailAFriend"]);+}+<div class="page email-a-friend-page">+ <h1 class="h2 text-center generalTitle"><div>@Loc["Products.EmailAFriend.Title"]</div></h1>+ <div class="mb-3">+ <h4 class="mb-0"><a href="@Url.RouteUrl("Product", new { SeName = Model.ProductSeName })" class="product">@Model.ProductName</a></h4>+ @if (Model.SuccessfullySent)+ {+ <div class="alert alert-info my-3 text-center result">+ @Model.Result+ </div>+ }+ else+ {+ <form asp-route="ProductEmailAFriend" method="post" v-on:submit.prevent="validateBeforeSubmit($event)">+ <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div class="form-fields">+ <div class="form-group">+ <label asp-for="FriendEmail" class="col-form-label">@Loc["Products.EmailAFriend.FriendEmail"]:</label>+ <input asp-for="FriendEmail" class="form-control friend-email"+ v-validate="'required|email'" placeholder="@Loc["Products.EmailAFriend.FriendEmail.Hint"]" />+ <span class="field-validation-error">{{veeErrors.first('FriendEmail')}}</span>+ <span asp-validation-for="FriendEmail"></span>+ </div>+ <div class="form-group">+ <label asp-for="YourEmailAddress" class="col-form-label">@Loc["Products.EmailAFriend.YourEmailAddress"]:</label>+ <input asp-for="YourEmailAddress" class="form-control your-email" v-validate="'required|email'" placeholder="@Loc["Products.EmailAFriend.YourEmailAddress.Hint"]" />+ <span class="field-validation-error">{{veeErrors.first('YourEmailAddress')}}</span>+ <span asp-validation-for="YourEmailAddress"></span>+ </div>+ <div class="form-group">+ <label asp-for="PersonalMessage" class="col-form-label">@Loc["Products.EmailAFriend.PersonalMessage"]:</label>+ <textarea asp-for="PersonalMessage" class="form-control your-email" placeholder="@Loc["Products.EmailAFriend.PersonalMessage.Hint"]" v-validate="'required'"></textarea>+ <span class="field-validation-error">{{veeErrors.first('PersonalMessage')}}</span>+ <span asp-validation-for="PersonalMessage"></span>+ </div>+ @if (Model.DisplayCaptcha)+ {+ <div class="captcha-box">+ <captcha />+ </div>+ }+ </div>+ <div class="btn-group">+ <input type="submit" name="send-email" class="btn btn-secondary send-email-a-friend-button" value="@Loc["Products.EmailAFriend.Button"]" />+ </div>+ </form>+ }+ </div>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/ProductLayout.Grouped.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/ProductLayout.Grouped.cshtmlnew file mode 100644index 000000000..50c32da54--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/ProductLayout.Grouped.cshtml@@ -0,0 +1,220 @@+@model ProductDetailsModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder++@{+ Layout = "_SingleColumn";++ //title, meta+ pagebuilder.AddTitleParts(!string.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ //canonical URL+ if (seoSettings.CanonicalUrlsEnabled)+ {+ var productUrl = Url.RouteUrl("Product", new { Model.SeName }, Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(productUrl);+ }+}+@section meta{++ @if (seoSettings.OpenGraphMetaTags)+ {+ <meta property="og:type" content="product" />+ <meta property="og:title" content="@Html.Encode(Model.Name)" />+ <meta property="og:description" content="@Html.Encode(Model.MetaDescription)" />+ <meta property="og:image" content="@Model.DefaultPictureModel.ImageUrl" />+ <meta property="og:image:url" content="@Model.DefaultPictureModel.ImageUrl" />+ <meta property="og:url" content="@this.Url.ActionContext.HttpContext.Request.GetEncodedUrl()" />+ <meta property="og:site_name" content="@Html.Encode(Model.CurrentStoreName)" />+ }+ @if (seoSettings.TwitterMetaTags)+ {+ <meta property="twitter:card" content="summary" />+ <meta property="twitter:site" content="@Html.Encode(Model.CurrentStoreName)" />+ <meta property="twitter:title" content="@Html.Encode(Model.Name)" />+ <meta property="twitter:description" content="@Html.Encode(Model.MetaDescription)" />+ <meta property="twitter:image" content="@Model.DefaultPictureModel.ImageUrl" />+ <meta property="twitter:url" content="@this.Url.ActionContext.HttpContext.Request.GetEncodedUrl()" />+ }+}+<!--product breadcrumb-->+@section Breadcrumb+{+ <partial name="Partials/Breadcrumbs" model="Model.Breadcrumb" />+}+@await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_after_breadcrumb", additionalData = Model.Id })+ <div class="page product-details-page product-standard product-grouped">+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_top", additionalData = Model.Id })+ <validation-observer ref="ProductFormObserver">+ <div itemscope itemtype="http://schema.org/Product" data-productid="@Model.Id">+ <div class="product-essential">+ <b-col>+ <b-row>+ <vc:widget widget-zone="productdetails_before_pictures" additional-data="@Model.Id"></vc:widget>+ <!--product pictures-->+ <partial name="Partials/Pictures" model="Model" />+ <vc:widget widget-zone="productdetails_after_pictures" additional-data="@Model.Id"></vc:widget>+ <b-col xl="5" lg="6" md="7" cols="12" class="overview pl-md-3 pl-0 pr-0">+ <partial name="Partials/Unavailable" model="Model" />+ <div class="product-name">+ <h1 class="generalTitle mb-3" itemprop="name">+ @Model.Name+ </h1>+ </div>+ @if (!String.IsNullOrEmpty(Model.ShortDescription))+ {+ <div class="short-description mb-3">+ @Html.Raw(Model.ShortDescription)+ </div>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_overview_top", additionalData = Model.Id })+ <!--product reviews-->+ @if (Model.ProductReviewOverview.AllowCustomerReviews)+ {+ <partial name="Partials/ProductReviewOverview" model="Model.ProductReviewOverview" />+ }+ <!--product collections-->+ @if (Model.ProductCollections.Any())+ {+ <partial name="Partials/Collections" model="Model.ProductCollections" />+ }+ <!--warehouses-->+ @if (Model.AllowToSelectWarehouse)+ {+ <partial name="Partials/Warehouses" model="Model" />+ }+ <!--compare, email a friend-->+ <b-btn-group class="mt-2 mb-3 w-100">+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_inside_overview_buttons_before", additionalData = Model.Id })+ <partial name="Partials/ProductsComparison" model="Model" />+ <partial name="Partials/SendFriend" model="Model" />+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_inside_overview_buttons_after", additionalData = Model.Id })+ </b-btn-group>+ <partial name="Partials/ShareButton" model="Model" />+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_overview_bottom", additionalData = Model.Id })+ </b-col>+ </b-row>+ </b-col>+ </div>++ <b-col cols="12" class="px-0 my-3">+ <div>+ <b-tabs content-class="mt-3" align="center">+ <b-tab title="@Loc["Products.Description"]" active>+ @Html.Raw(Model.FullDescription)+ </b-tab>+ @if (Model.ProductTags.Any())+ {+ <b-tab title="@Loc["Products.Tags"]">+ <partial name="Partials/ProductTags" model="Model.ProductTags" />+ </b-tab>+ }+ @if (Model.ProductSpecifications.Any())+ {+ <b-tab title="@Loc["Products.Specs"]">+ <partial name="Partials/ProductSpecifications" model="Model.ProductSpecifications" />+ </b-tab>+ }+ @if (Model.ProductReviewOverview.AllowCustomerReviews)+ {+ <b-tab id="review-tab" title="@Loc["Products.Reviews"]" :active="active ? true : false">+ @await Component.InvokeAsync("ProductReviews", new { productId = Model.Id })+ </b-tab>+ }+ @if (Model.AskQuestionOnProduct)+ {+ <b-tab title="@Loc["Products.ContactUs"]">+ <partial name="Partials/AskQuestionOnProduct" model="Model.ProductAskQuestion" />+ </b-tab>+ }+ </b-tabs>+ </div>+ </b-col>+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_before_collateral", additionalData = Model.Id })+ <div class="product-collateral">+ <div>+ <!--associated products-->+ @foreach (var variant in Model.AssociatedProducts)+ {+ <form asp-route="Product" asp-route-sename="@Model.SeName" method="post" id=@($"product-details-form-{variant.Id}") ref="form" v-on:submit.prevent="formSubmitParam($event, vm.$refs.ProductFormObserver)">+ <b-card no-body class="overflow-hidden associatedItem mb-3">+ <b-row no-gutters>+ <b-col lg="3" md="4">+ <b-card-img id="[email protected]" alt="@variant.DefaultPictureModel.AlternateText" src="@variant.DefaultPictureModel.ImageUrl" class="rounded-0"></b-card-img>+ </b-col>+ <b-col lg="9" md="8">+ <b-card-body class="overview" title="@variant.Name">+ <b-card-text>+ @Html.Raw(variant.ShortDescription)+ </b-card-text>+ <!--availability-->+ <partial name="Partials/Availability" model="variant" />+ <!--Code products - SKU, MAN, GTIN, Vendor info -->+ <partial name="Partials/Codes" model="variant" />+ <!--delivery-->+ @if ((variant.FreeShippingNotificationEnabled && Model.IsFreeShipping) || !string.IsNullOrWhiteSpace(variant.DeliveryDate)+ || variant.NotReturnable || variant.AdditionalShippingCharge > 0)+ {+ <partial name="Partials/DeliveryInfo" model="variant" />+ }+ <!--sample download-->+ @if (variant.HasSampleDownload)+ {+ <partial name="Partials/DownloadSample" model="variant" />+ }+ <!--attributes-->+ @{+ if (variant.ProductAttributes.Any())+ {+ <partial name="Partials/ProductAttributes" model="variant" />+ }+ }+ <!--gift voucher-->+ @{+ if (variant.GiftVoucher.IsGiftVoucher)+ {+ <partial name="Partials/GiftVoucherInfo" model="variant.GiftVoucher" />+ }+ }+ <!--price breaks-->+ @if (variant.TierPrices.Any())+ {+ <partial name="Partials/TierPrices" model="variant.TierPrices" />+ }+ @{+ var dataDictAddToCart = new ViewDataDictionary(ViewData);+ dataDictAddToCart.TemplateInfo.HtmlFieldPrefix = string.Format("addtocart_{0}", variant.Id);+ }+ <!--price & add to cart-->+ <partial name="Partials/Prices" model="variant.ProductPrice"/>+ <partial name="Partials/AddToCart" model="variant.AddToCart"/>+ <div class="mt-2">+ <partial name="Partials/AddToWishlist" model="variant.AddToCart"/>+ </div>++ </b-card-body>+ </b-col>+ </b-row>+ </b-card>+ </form>+ }++ @if (Model.AssociatedProducts.Count == 0)+ {+ <div class="no-associated-products">+ @Loc["Products.NoAssociatedProducts"]+ </div>+ }+ </div>+ </div>+ </div>+ @await Component.InvokeAsync("RelatedProducts", new { productId = Model.Id })+ </validation-observer>+ @if (Model.EmailAFriendEnabled)+ {+ @await Component.InvokeAsync("ProductEmailAFriend", new { productId = Model.Id })+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_bottom", additionalData = Model.Id })+ </div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/ProductLayout.Simple.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/ProductLayout.Simple.cshtmlnew file mode 100644index 000000000..e3543fe7f--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/ProductLayout.Simple.cshtml@@ -0,0 +1,230 @@+@model ProductDetailsModel+@using Microsoft.AspNetCore.Http.Extensions+@inject SeoSettings seoSettings+@inject IWorkContext workContext+@inject IPageHeadBuilder pagebuilder++@{+ Layout = "_SingleColumn";++ //title, meta+ pagebuilder.AddTitleParts(!String.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ //canonical URL+ if (seoSettings.CanonicalUrlsEnabled)+ {+ var productUrl = Url.RouteUrl("Product", new { SeName = Model.SeName }, this.Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(productUrl);+ }+}++@section meta {+ @if (seoSettings.OpenGraphMetaTags)+ {+ <meta property=og:type content=product />+ <meta property="og:title" content="@Html.Encode(Model.Name)" />+ <meta property="og:description" content="@Html.Encode(Model.MetaDescription)" />+ <meta property="og:image" content="@Model.DefaultPictureModel.ImageUrl" />+ <meta property="og:image:url" content="@Model.DefaultPictureModel.ImageUrl" />+ <meta property="og:url" content="@this.Url.ActionContext.HttpContext.Request.GetEncodedUrl()" />+ <meta property="og:site_name" content="@Html.Encode(Model.CurrentStoreName)" />+ }++ @if (seoSettings.TwitterMetaTags)+ {+ <meta property="twitter:card" content="summary" />+ <meta property="twitter:site" content="@Html.Encode(Model.CurrentStoreName)" />+ <meta property="twitter:title" content="@Html.Encode(Model.Name)" />+ <meta property="twitter:description" content="@Html.Encode(Model.MetaDescription)" />+ <meta property="twitter:image" content="@Model.DefaultPictureModel.ImageUrl" />+ <meta property="twitter:url" content="@this.Url.ActionContext.HttpContext.Request.GetEncodedUrl()" />+ }+}++<!--product breadcrumb-->+@section Breadcrumb+{+ <partial name="Partials/Breadcrumbs" model="Model.Breadcrumb" />+}++<vc:widget widget-zone="productdetails_after_breadcrumb" additional-data="@Model.Id"></vc:widget>+<div class="page product-details-page product-standard">+ <validation-observer ref="ProductFormObserver">+ <form asp-route="Product" asp-route-sename="@Model.SeName" method="post" id=@($"product-details-form-{Model.Id}") ref="form" v-on:submit.prevent="formSubmitParam($event, vm.$refs.ProductFormObserver)">+ <div itemscope itemtype="http://schema.org/Product" data-productid="@Model.Id">+ <b-col class="position-relative">+ <b-row>+ <vc:widget widget-zone="productdetails_before_pictures" additional-data="@Model.Id"></vc:widget>+ <!--product pictures-->+ <partial name="Partials/Pictures" model="Model" />+ <vc:widget widget-zone="productdetails_after_pictures" additional-data="@Model.Id"></vc:widget>+ <b-col xl="5" lg="6" md="7" cols="12" class="overview pl-md-3 pl-0 pr-0">+ <partial name="Partials/Unavailable" model="Model" />+ <h1 class="generalTitle" itemprop="name">+ @Model.Name+ </h1>+ <!--product reviews-->+ @if (Model.ProductReviewOverview.AllowCustomerReviews)+ {+ <partial name="Partials/ProductReviewOverview" model="Model.ProductReviewOverview" />+ }+ <vc:widget widget-zone="productdetails_overview_top" additional-data="@Model.Id"></vc:widget>+ @if (!String.IsNullOrEmpty(Model.ShortDescription))+ {+ <div class="short-description generalMarginSupporter">+ @Html.Raw(Model.ShortDescription)+ </div>+ }+ <!--collections-->+ @if (Model.ProductCollections.Any())+ {+ <partial name="Partials/Collections" model="Model.ProductCollections" />+ }+ <!--availability-->+ @if (!String.IsNullOrWhiteSpace(Model.StockAvailability) || Model.DisplayOutOfStockSubscription)+ {+ <partial name="Partials/Availability" model="Model" />+ }+ <!--Code products - SKU, MAN, GTIN, Vendor info -->+ <partial name="Partials/Codes" model="Model" />+ <!--delivery-->+ @if ((Model.FreeShippingNotificationEnabled && Model.IsFreeShipping) || !string.IsNullOrWhiteSpace(Model.DeliveryDate)+ || Model.NotReturnable || Model.AdditionalShippingCharge > 0)+ {+ <partial name="Partials/DeliveryInfo" model="Model" />+ }+ <!--sample download-->+ @if (Model.HasSampleDownload)+ {+ <partial name="Partials/DownloadSample" model="Model" />+ }+ <!--product bundles-->+ @if (Model.ProductBundleModels.Any())+ {+ <partial name="Partials/ProductBundles" model="Model" />+ }+ <!--attributes-->+ @if (Model.ProductAttributes.Any())+ {+ <partial name="Partials/ProductAttributes" model="Model" />+ }+ <!--warehouses-->+ @if (Model.AllowToSelectWarehouse)+ {+ <partial name="Partials/Warehouses" model="Model" />+ }+ <!--gift voucher-->+ @{+ if (Model.GiftVoucher.IsGiftVoucher)+ {+ <partial name="Partials/GiftVoucherInfo" model="Model"/>+ }+ }+ <!--reservation info-->+ @if (Model.ProductType == ProductType.Reservation)+ {+ var dataDictReservation = new ViewDataDictionary(ViewData);+ dataDictReservation.TemplateInfo.HtmlFieldPrefix = string.Format("reservation_{0}", Model.Id);+ <partial name="Partials/ReservationInfo" model="Model" view-data="dataDictReservation" />+ }+ <!--price & add to cart-->+ <div class="overview-buttons generalMarginSupporter">+ @if (Model.TierPrices.Any())+ {+ <div class="col-lg-12 px-0">+ <partial name="Partials/TierPrices" model="Model.TierPrices" />+ </div>+ }+ <div class="col-lg-12 px-0">+ @{+ var dataDictPrice = new ViewDataDictionary(ViewData);+ dataDictPrice.TemplateInfo.HtmlFieldPrefix = string.Format("price_{0}", Model.Id);+ <partial name="Partials/Prices" model="Model.ProductPrice" view-data="dataDictPrice" />+ }+ </div>+ <div class="generalMarginSupporter">+ <!--auction-->+ @if (Model.ProductType == ProductType.Auction)+ {+ var dataDictAuction = new ViewDataDictionary(ViewData);+ dataDictAuction.TemplateInfo.HtmlFieldPrefix = string.Format("auction_{0}", Model.Id);+ <partial name="Partials/AuctionInfo" model="Model" view-data="dataDictAuction" />+ }+ @{+ var dataDictAddToWishlist = new ViewDataDictionary(ViewData);+ dataDictAddToWishlist.TemplateInfo.HtmlFieldPrefix = string.Format("addtocart_{0}", Model.Id);+ var dataDictAddToCart = new ViewDataDictionary(ViewData);+ dataDictAddToCart.TemplateInfo.HtmlFieldPrefix = string.Format("addtocart_{0}", Model.Id);+ }+ <partial name="Partials/AddToCart" model="Model.AddToCart" view-data="dataDictAddToCart" />+ <b-btn-group class="mt-2 mb-3 w-100 flex-wrap">+ @if (Model.ProductType == ProductType.SimpleProduct || Model.ProductType == ProductType.BundledProduct)+ {+ <partial name="Partials/AddToWishlist" model="Model.AddToCart" view-data="dataDictAddToWishlist" />+ <partial name="Partials/ProductsComparison" model="Model" />+ }+ @if (Model.EmailAFriendEnabled)+ {+ <partial name="Partials/SendFriend" model="Model" />+ }+ </b-btn-group>+ </div>+ </div>+ @if (!String.IsNullOrWhiteSpace(Model.PageShareCode))+ {+ <div class="col-12 product-share px-0">+ <partial name="Partials/ShareButton" model="Model" />+ </div>+ }+ <vc:widget widget-zone="productdetails_overview_bottom" additional-data="@Model.Id"></vc:widget>+ </b-col>+ </b-row>+ </b-col>++ <b-col cols="12" class="px-0 my-3">+ <div>+ <b-tabs content-class="mt-3" align="center">+ <b-tab title="@Loc["Products.Description"]" active>+ @Html.Raw(Model.FullDescription)+ </b-tab>+ @if (Model.ProductTags.Any())+ {+ <b-tab title="@Loc["Products.Tags"]">+ <partial name="Partials/ProductTags" model="Model.ProductTags" />+ </b-tab>+ }+ @if (Model.ProductSpecifications.Any())+ {+ <b-tab title="@Loc["Products.Specs"]">+ <partial name="Partials/ProductSpecifications" model="Model.ProductSpecifications" />+ </b-tab>+ }+ @if (Model.ProductReviewOverview.AllowCustomerReviews)+ {+ <b-tab id="review-tab" title="@Loc["Products.Reviews"]" :active="active ? true : false">+ @await Component.InvokeAsync("ProductReviews", new { productId = Model.Id })+ </b-tab>+ }+ @if (Model.AskQuestionOnProduct)+ {+ <b-tab title="@Loc["Products.ContactUs"]">+ <partial name="Partials/AskQuestionOnProduct" model="Model.ProductAskQuestion" />+ </b-tab>+ }+ </b-tabs>+ </div>+ </b-col>+ <vc:products-also-purchased product-id="@Model.Id" product-thumb-picture-size="null"></vc:products-also-purchased>+ <vc:related-products product-id="@Model.Id" product-thumb-picture-size="null"></vc:related-products>+ <vc:similar-products product-id="@Model.Id" product-thumb-picture-size="null"></vc:similar-products>+ </div>+ </form>+ </validation-observer>+ @if (Model.EmailAFriendEnabled)+ {+ @await Component.InvokeAsync("ProductEmailAFriend", new { productId = Model.Id })+ }+ <vc:widget widget-zone="productdetails_bottom" additional-data="@Model.Id"></vc:widget>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/RecentlyViewedProducts.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/RecentlyViewedProducts.cshtmlnew file mode 100644index 000000000..50edde1e5--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/RecentlyViewedProducts.cshtml@@ -0,0 +1,34 @@+@model IList<ProductOverviewModel>+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ //title+ pagebuilder.AddTitleParts(Loc["Title.RecentlyViewedProducts"]);+}+<b-col cols="12" class="page recently-viewed-products-page px-0">+ <h1 class="generalTitle h2 text-center"><div>@Loc["Products.RecentlyViewedProducts"]</div></h1>+ <div class="d-inline-flex align-items-center">+ <a class="left-side-toggler mx-0 mb-3" onclick="sideToggle()">+ <div class="inner">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div class="text">+ @Loc["catalog.selectors.fiters"]+ </div>+ </a>+ </div>+ @if (Model.Any())+ {+ <div class="item-row">+ @foreach (var product in Model)+ {+ <b-col xl="3" lg="3" sm="6" cols="6" class="col-for-5-xl new-col-6 product-container mb-2">+ <partial name="Partials/CatalogProductView" model="product" />+ </b-col>+ }+ </div>+ }+</b-col>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/BlogPostProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/BlogPostProducts/Default.cshtmlnew file mode 100644index 000000000..1d6e0e7f0--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/BlogPostProducts/Default.cshtml@@ -0,0 +1,15 @@+@model IList<ProductOverviewModel>++ <div class="product-grid blogpost-product-grid col-12 px-0">+ <h2 class="h3 generalTitle text-center">+ @Loc["Blog.Products"]+ </h2>+ <div class=" form-row flex-grid">+ @foreach (var product in Model)+ {+ <div class="col-lg-3 col-md-4 col-sm-6 col-6 mb-2">+ <partial name="Partials/CatalogProductView" model="product" />+ </div>+ }+ </div>+ </div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CategoryFeaturedProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CategoryFeaturedProducts/Default.cshtmlnew file mode 100644index 000000000..d951d4a3d--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CategoryFeaturedProducts/Default.cshtml@@ -0,0 +1,29 @@+@model IList<CategoryModel>+<template>+ <div class="home-page-section">+ <div id="CategoryFeaturedProducts" class="section">+ <div class="featured-product-grid">+ <b-tabs class="products-tabs" content-class="products-tabs-content">+ <template v-for="(Category, index) in homePCategoryProducts.Model">+ <b-tab :title="Category.Name" lazy>+ <div class="item-row">+ <div :key="Model.Id" class="col-for-5-xl col-xl-3 col-lg-3 col-md-4 col-sm-6 col-6" v-for="Model in Category.FeaturedProducts">+ <product-box-vue :Model="Model"></product-box-vue>+ </div>+ </div>+ </b-tab>+ </template>+ </b-tabs>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePCategoryProducts = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CollectionFeaturedProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CollectionFeaturedProducts/Default.cshtmlnew file mode 100644index 000000000..7ad070a00--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CollectionFeaturedProducts/Default.cshtml@@ -0,0 +1,29 @@+@model IList<CollectionModel>+<template>+ <div class="home-page-section">+ <div id="CollectionFeaturedProducts" class="section">+ <div class="featured-product-grid">+ <b-tabs class="products-tabs" content-class="products-tabs-content">+ <template v-for="(Collection, index) in homePCollectionProducts.Model">+ <b-tab :title="Collection.Name" lazy>+ <div class="item-row">+ <div :key="Model.Id" class="col-for-5-xl col-xl-3 col-lg-3 col-md-4 col-sm-6 col-6" v-for="Model in Collection.FeaturedProducts">+ <product-box-vue :Model="Model"></product-box-vue>+ </div>+ </div>+ </b-tab>+ </template>+ </b-tabs>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePCollectionProducts = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CollectionNavigation/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CollectionNavigation/Default.cshtmlnew file mode 100644index 000000000..a5b57c69c--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CollectionNavigation/Default.cshtml@@ -0,0 +1,28 @@+@model CollectionNavigationModel+<div id="block-collection-navigation" class="block block-collection-navigation">+ <h2 class="h5 d-block">+ <strong>@Loc["Collections"]</strong>+ </h2>+ <div class="viewBox">+ <ul>+ @foreach (var collection in Model.Collections)+ {+ <li class="@(collection.IsActive ? "active" : "inactive")">+ <a href="@Url.RouteUrl("Collection", new { SeName = collection.SeName })">+ @if (!string.IsNullOrEmpty(collection.Icon))+ {+ <span class="category-icon @collection.Icon"></span>+ }+ @collection.Name+ </a>+ </li>+ }+ </ul>+ @if (Model.TotalCollections > Model.Collections.Count)+ {+ <div class="view-all mb-1">+ <a class="btn btn-sm btn-outline-secondary" href="@Url.RouteUrl("CollectionList")">@Loc["Collections.ViewAll"]</a>+ </div>+ }+ </div>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CustomerNavigation/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CustomerNavigation/Default.cshtmlnew file mode 100644index 000000000..595f4a187--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CustomerNavigation/Default.cshtml@@ -0,0 +1,146 @@+@model CustomerNavigationModel+@{+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/customer/customer.css">+}+<div id="block-account-navigation" class="block block-account-navigation mt-2">+ <h2 class="h5"><strong>@Loc["Account.Navigation"]</strong></h2>+ <ul class="list viewBox">+ @await Component.InvokeAsync("Widget", new { widgetZone = "account_navigation_before" })+ @if (!Model.HideInfo)+ {+ <li class="customer-info">+ <a href="@Url.RouteUrl("CustomerInfo")" class="@if (Model.SelectedTab == AccountNavigationEnum.Info)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="person"></b-icon> <span>@Loc["Account.CustomerInfo"]</span></a>+ </li>+ }+ @if (!Model.HideAddresses)+ {+ <li class="customer-addresses">+ <a href="@Url.RouteUrl("CustomerAddresses")" class="@if (Model.SelectedTab == AccountNavigationEnum.Addresses)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="file-earmark-richtext"></b-icon> <span>@Loc["Account.CustomerAddresses"]</span></a>+ </li>+ }+ @if (!Model.HideOrders)+ {+ <li class="customer-orders">+ <a href="@Url.RouteUrl("CustomerOrders")" class="@if (Model.SelectedTab == AccountNavigationEnum.Orders)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="cart-check"></b-icon> <span>@Loc["Account.CustomerOrders"]</span></a>+ </li>+ }+ @if (!Model.HideCourses)+ {+ <li class="customer-auctions">+ <a href="@Url.RouteUrl("CustomerCourses")" class="@if (Model.SelectedTab == AccountNavigationEnum.Courses)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="file-earmark-easel"></b-icon> <span>@Loc["Account.CustomerCourses"]</span></a>+ </li>+ }+ @if (!Model.HideAuctions)+ {+ <li class="customer-auctions">+ <a href="@Url.RouteUrl("CustomerAuctions")" class="@if (Model.SelectedTab == AccountNavigationEnum.Auctions)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="hammer"></b-icon> <span>@Loc["Account.CustomerAuctions"]</span></a>+ </li>+ }+ @if (!Model.HideNotes)+ {+ <li class="customer-notes">+ <a href="@Url.RouteUrl("CustomerNotes")" class="@if (Model.SelectedTab == AccountNavigationEnum.Notes)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="file-earmark-font"></b-icon> <span>@Loc["Account.CustomerNotes"]</span></a>+ </li>+ }+ @if (!Model.HideDocuments)+ {+ <li class="customer-notes">+ <a href="@Url.RouteUrl("CustomerDocuments")" class="@if (Model.SelectedTab == AccountNavigationEnum.Documents)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="file-earmark-check"></b-icon> <span>@Loc["Account.CustomerDocuments"]</span></a>+ </li>+ }+ @if (!Model.HideMerchandiseReturns)+ {+ <li class="customer-returns">+ <a href="@Url.RouteUrl("CustomerMerchandiseReturns")" class="@if (Model.SelectedTab == AccountNavigationEnum.MerchandiseReturns)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="arrow-return-left"></b-icon> <span>@Loc["Account.CustomerMerchandiseReturns"]</span></a>+ </li>+ }+ @if (!Model.HideDownloadableProducts)+ {+ <li class="customer-downloadable">+ <a href="@Url.RouteUrl("CustomerDownloadableProducts")" class="@if (Model.SelectedTab == AccountNavigationEnum.DownloadableProducts)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="cloud-download"></b-icon> <span>@Loc["Account.DownloadableProducts"]</span></a>+ </li>+ }+ @if (!Model.HideOutOfStockSubscriptions)+ {+ <li class="customer-back">+ <a href="@Url.RouteUrl("CustomerOutOfStockSubscriptions")" class="@if (Model.SelectedTab == AccountNavigationEnum.OutOfStockSubscriptions)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="skip-backward"></b-icon> <span>@Loc["Account.OutOfStockSubscriptions"]</span></a>+ </li>+ }+ @if (!Model.HideLoyaltyPoints)+ {+ <li class="loyalty-points">+ <a href="@Url.RouteUrl("CustomerLoyaltyPoints")" class="@if (Model.SelectedTab == AccountNavigationEnum.LoyaltyPoints)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="trophy"></b-icon> <span>@Loc["Account.LoyaltyPoints"]</span></a>+ </li>+ }+ @if (!Model.HideChangePassword)+ {+ <li class="change-password">+ <a href="@Url.RouteUrl("CustomerChangePassword")" class="@if (Model.SelectedTab == AccountNavigationEnum.ChangePassword)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="file-earmark-lock2"></b-icon> <span>@Loc["Account.ChangePassword"]</span></a>+ </li>+ }+ @if (!Model.HideDeleteAccount)+ {+ <li class="customer-delete">+ <a href="@Url.RouteUrl("CustomerDeleteAccount")" class="@if (Model.SelectedTab == AccountNavigationEnum.DeleteAccount)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="trash"></b-icon> <span>@Loc["Account.DeleteAccount"]</span></a>+ </li>+ }+ @if (!Model.HideReviews)+ {+ <li class="customer-notes">+ <a href="@Url.RouteUrl("CustomerReviews")" class="@if(Model.SelectedTab == AccountNavigationEnum.Reviews)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="star"></b-icon> <span>@Loc["Account.Reviews"]</span></a>+ </li>+ }+ @if (!Model.HideSubAccounts)+ {+ <li class="customer-subaccounts">+ <a href="@Url.RouteUrl("CustomerSubAccounts")" class="@if(Model.SelectedTab == AccountNavigationEnum.SubAccounts)+ {<text>active</text>}+ else+ {<text>inactive</text>}"><b-icon icon="person-plus"></b-icon> <span>@Loc["Account.SubAccounts"]</span></a>+ </li>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "account_navigation_after", additionalData = Model })+ </ul>+</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CustomerRecommendedProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CustomerRecommendedProducts/Default.cshtmlnew file mode 100644index 000000000..900efc13c--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/CustomerRecommendedProducts/Default.cshtml@@ -0,0 +1,26 @@+@model IList<ProductOverviewModel>+<template>+ <div class="home-page-section">+ <div id="CustomerRecommendedProducts" class="section">+ <div class="product-grid">+ <h2 class="generalTitle text-center"><span>@Loc["HomePage.Recommended.Products"]</span></h2>+ <div class="col-12 px-0">+ <div class="item-row">+ <div :key="Model.Id" v-for="Model in homePRecommended.Model" class="col-xl-3 col-lg-4 col-md-4 col-sm-6 col-6 col-for-5-xl product-container mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePRecommended = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/Footer/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/Footer/Default.cshtmlnew file mode 100644index 000000000..2f2be72cb--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/Footer/Default.cshtml@@ -0,0 +1,197 @@+@model FooterModel+<footer class="footer">+ <div class="footer-top section">+ <b-container>+ <div class="item-row">+ <b-col xl="6" lg="4" md="12">+ <div class="about-us block">+ <ul class="social-icons">+ @if (!string.IsNullOrEmpty(Model.FacebookLink))+ {+ <li>+ <a title="facebook" href="@Model.FacebookLink" rel="noopener" target="_blank">+ <b-img-lazy height="24" width="24" src="/theme/images/facebook.svg" alt="facebook"></b-img-lazy>+ <span class="sr-only">Facebook</span>++ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.TwitterLink))+ {+ <li>+ <a title="twitter" href="@Model.TwitterLink" rel="noopener" target="_blank">+ <b-img-lazy height="24" width="24" src="/theme/images/twitter.svg" alt="twitter"></b-img-lazy>+ <span class="sr-only">twitter</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.YoutubeLink))+ {+ <li>+ <a title="youtube" href="@Model.YoutubeLink" rel="noopener" target="_blank">+ <b-img-lazy height="24" width="24" src="/theme/images/youtube.svg" alt="youtube"></b-img-lazy>+ <span class="sr-only">youtube</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.InstagramLink))+ {+ <li>+ <a href="@Model.InstagramLink" rel="noopener" target="_blank">+ <b-img-lazy height="24" width="24" src="/theme/images/instagram.svg" alt="instagram"></b-img-lazy>+ <span class="sr-only">instagram</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.LinkedInLink))+ {+ <li>+ <a href="@Model.LinkedInLink" rel="noopener" target="_blank">+ <b-img-lazy height="24" width="24" src="/theme/images/linkedin.svg" alt="linkedin"></b-img-lazy>+ <span class="sr-only">linkedin</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.PinterestLink))+ {+ <li>+ <a href="@Model.PinterestLink" rel="noopener" target="_blank">+ <b-img-lazy height="24" width="24" src="/theme/images/pinterest.svg" alt="pinterest"></b-img-lazy>+ <span class="sr-only">pinterest</span>+ </a>+ </li>+ }+ </ul>+ <partial name="Partials/NewsletterBox" />+ <h6 class="title">@Loc["Footer.AboutUs"]</h6>+ <ul class="info">+ <li>+ <span class="icons icon-location-pin"></span>+ <span class="text">+ @Loc["Footer.CompanyName.Title"] @Model.CompanyName @Model.CompanyAddress+ </span>+ </li>+ <li>+ <span class="icons icon-phone"></span>+ <span class="text">+ @Loc["Footer.Phone.Title"] @Model.CompanyPhone+ </span>+ </li>+ <li>+ <span class="icons icon-clock"></span>+ <span class="text">+ @Loc["Footer.Hour.Title"] @Model.CompanyHours+ </span>+ </li>+ <li>+ <span class="icons icon-envelope-letter"></span>+ <span class="text">+ @Loc["Footer.Email.Title"] @Model.CompanyEmail+ </span>+ </li>+ </ul>+ </div>+ </b-col>+ <b-col xl="3" lg="4" md="6">+ <h6 class="title">@Loc["Footer.Information"]</h6>+ <ul>+ <li>+ <b-link href="@Url.RouteUrl("Sitemap")">@Loc["Sitemap"]</b-link>+ </li>+ @if (Model.PrivacyPreference)+ {+ <li>+ <b-link id="btnPrivacyPreference" href="#" @@click="getPrivacyPreference('@Url.RouteUrl("PrivacyPreference")'); return false;">@Loc["PrivacyPreference"]</b-link>+ </li>+ }+ @foreach (var topic in Model.Pages.Where(x => x.IncludeInFooterRow1).ToList())+ {+ <li>+ <b-link href="@Url.RouteUrl("Page", new { SeName = topic.SeName })">@topic.Name</b-link>+ </li>+ }+ @if (Model.NewsEnabled)+ {+ <li>+ <b-link href="@Url.RouteUrl("NewsArchive")">@Loc["News"]</b-link>+ </li>+ }+ @if (Model.BlogEnabled)+ {+ <li>+ <b-link href="@Url.RouteUrl("Blog")">@Loc["Blog"]</b-link>+ </li>+ }+ @if (Model.KnowledgebaseEnabled)+ {+ <li>+ <b-link href="@Url.RouteUrl("Knowledgebase")">@Loc["Knowledgebase"]</b-link>+ </li>+ }+ @if (Model.NewProductsEnabled)+ {+ <li>+ <b-link href="@Url.RouteUrl("NewProducts")">@Loc["Products.NewProducts"]</b-link>+ </li>+ }+ </ul>+ </b-col>+ <b-col xl="3" lg="4" md="6">+ <h6 class="title">@Loc["Footer.MyAccount"]</h6>+ <ul>+ <li>+ <b-link href="@Url.RouteUrl("CustomerInfo")">@Loc["Account.MyAccount"]</b-link>+ </li>+ <li>+ <b-link href="@Url.RouteUrl("CustomerOrders")">@Loc["Account.CustomerOrders"]</b-link>+ </li>+ <li>+ <b-link href="@Url.RouteUrl("CustomerAddresses")">@Loc["Account.CustomerAddresses"]</b-link>+ </li>+ @if (Model.ShoppingCartEnabled)+ {+ <li>+ <b-link href="@Url.RouteUrl("ShoppingCart")">@Loc["ShoppingCart"]</b-link>+ </li>+ }+ @if (Model.WishlistEnabled)+ {+ <li>+ <b-link href="@Url.RouteUrl("Wishlist")">@Loc["Wishlist"]</b-link>+ </li>+ }+ @if (Model.RecentlyViewedProductsEnabled)+ {+ <li>+ <b-link href="@Url.RouteUrl("RecentlyViewedProducts")">@Loc["Products.RecentlyViewedProducts"]</b-link>+ </li>+ }+ @if (Model.AllowCustomersToApplyForVendorAccount)+ {+ <li>+ <b-link href="@Url.RouteUrl("ApplyVendorAccount")">@Loc["Vendors.ApplyAccount"]</b-link>+ </li>+ }+ @foreach (var topic in Model.Pages.Where(x => x.IncludeInFooterRow2).ToList())+ {+ <b-link href="@Url.RouteUrl("Page", new { SeName = topic.SeName })" target="_blank">@topic.Name</b-link>+ }+ </ul>+ </b-col>+ </div>+ </b-container>+ </div>+ <div class="footer-bottom">+ <b-container>+ <div class="item-row section">+ <b-col md="6" cols="12" class="pb-1 pt-1 flex-column text-lg-left text-center copyright">+ <span class="footer-disclaimer">@Html.Raw(Loc["Content.CopyrightNotice", DateTime.Now.Year, Model.StoreName])</span>+ </b-col>+ <b-col md="6" cols="12" class="pb-1 pt-1 text-center text-lg-right">+ <span>Shopping cart software by </span><a class="pr-1 text-success" href="https://grandnode.com/">GrandNode</a>™+ </b-col>+ </div>+ </b-container>+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "footer" })+</footer>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBestSellers/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBestSellers/Default.cshtmlnew file mode 100644index 000000000..64ba1b013--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBestSellers/Default.cshtml@@ -0,0 +1,26 @@+@model IList<ProductOverviewModel>+<template>+ <div class="home-page-section">+ <div id="HomePageBestSellers" class="section">+ <div class="product-grid">+ <h2 class="generalTitle text-center"><span>@Loc["Bestsellers"]</span></h2>+ <div class="col-12 px-0">+ <div class="item-row">+ <div :key="Model.Id" v-for="Model in homePBest.Model" class="col-xl-3 col-lg-3 col-md-3 col-sm-6 col-6 product-container mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePBest = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBlog/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBlog/Default.cshtmlnew file mode 100644index 000000000..1c3c03fea--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBlog/Default.cshtml@@ -0,0 +1,48 @@+@model HomePageBlogItemsModel+<template>+ <div id="HomePageBlog" class="home-page-section">+ <div class="section">+ <div class="col-12">+ <h2 class="generalTitle text-center"><span>@Loc["Blog.Latest"]</span></h2>+ <div class="col-12 px-0">+ <div class="row">+ <template :key="Item.Id" v-for="Item in homePBlog.Model.Items">+ <div class="col-xl-4 col-lg-6 col-md-4 col-sm-6 col-12 mb-3">+ <div class="blog-post" @@click="window.location.href = '' + Item.SeName + ''">+ <a>+ <template v-if="Item.PictureModel !== null">+ <b-img-lazy :src="Item.PictureModel.ImageUrl" :alt="Item.PictureModel.AlternateText"></b-img-lazy>+ </template>+ <span v-if="Item.Category !== null" class="category">{{Item.Category}}</span>+ <div class="content">+ <h3 class="title">+ {{Item.Title}}+ </h3>+ <div class="date">+ <div class="day part" v-html="new Date(Item.CreatedOn).getUTCDate()"></div>+ <div class="month part" v-html="new Date(Item.CreatedOn).toLocaleString('default', { month: 'long' })"></div>+ <div class="year part" v-html="new Date(Item.CreatedOn).getUTCFullYear()"></div>+ </div>+ </div>+ </a>+ </div>+ </div>+ </template>+ </div>+ </div>+ <div class="view-all text-center mt-3">+ <a class="btn btn-outline-secondary" href="@Url.RouteUrl("Blog")">@Loc["Blog.ViewAll"]</a>+ </div>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePBlog = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBrands/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBrands/Default.cshtmlnew file mode 100644index 000000000..b559ac5bf--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageBrands/Default.cshtml@@ -0,0 +1,28 @@+@model IList<BrandModel>+<div class="home-page-section">+ <div id="HomePageBrands">+ <div class="col-12">+ <div class="row">+ <template :key="Model.Id" v-for="Model in homePBrands.Model">+ <div class="col-xl-4 col-lg-4 col-md-4 col-sm-6 col-12">+ <a class="category-item" :href="'/' + Model.SeName">+ <b-img-lazy :src="Model.PictureModel.ImageUrl" :alt="Model.PictureModel.Title" class="img-fluid gallery-img"></b-img-lazy>+ <div class="content">+ <h6 class="title mb-0">{{Model.Name}}</h6>+ </div>+ </a>+ </div>+ </template>+ </div>+ </div>+ </div>+</div>+<script asp-location="Footer" asp-order="300">+ var homePBrands = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageCategories/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageCategories/Default.cshtmlnew file mode 100644index 000000000..f890ffda8--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageCategories/Default.cshtml@@ -0,0 +1,30 @@+@model IList<CategoryModel>+<div class="home-page-section">+ <div id="HomePageCategories">+ <div class="section">+ <div class="col-12 px-0">+ <div class="row">+ <template :key="Model.Id" v-for="Model in homePCategories.Model">+ <div class="col-xl-4 col-lg-4 col-md-4 col-sm-6 col-12">+ <a class="category-item" :href="'/' + Model.SeName">+ <b-img-lazy :src="Model.PictureModel.ImageUrl" :alt="Model.PictureModel.Title" class="img-fluid gallery-img"></b-img-lazy>+ <div class="content">+ <h6 class="title mb-0">{{Model.Name}}</h6>+ </div>+ </a>+ </div>+ </template>+ </div>+ </div>+ </div>+ </div>+</div>+<script asp-location="Footer" asp-order="300">+ var homePCategories = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageNewProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageNewProducts/Default.cshtmlnew file mode 100644index 000000000..d4b950c22--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageNewProducts/Default.cshtml@@ -0,0 +1,116 @@+<div id="hpnslider" class="main-slider bottom-shadow row">+ @await Component.InvokeAsync("PageBlock", new { systemName = "newproductsbackground" })+ <swiper ref="HomePageNewProducts"+ class="swiper"+ :options="homePNewProducts.swiperOptions">+ <swiper-slide class="slide-wide" v-for="Model in homePNewProducts.Model">+ <product-box-slide-vue :key="'hpnp_' + Model.Id" :Model="Model"></product-box-slide-vue>+ </swiper-slide>+ <div class="swiper-pagination swiper-pagination-horizontal" slot="pagination"></div>+ <div class="swiper-button-prev" slot="button-prev"></div>+ <div class="swiper-button-next" slot="button-next"></div>+ <div class="swiper-scrollbar" slot="scrollbar"></div>+ </swiper>+</div>+<partial name="Partials/ProductBoxSlideVue" />+<script asp-location="Footer" asp-order="118" type="module">+ Vue.component('product-box-slide-vue', {+ template: '#product-box-slide-vue',+ props: {+ Model: null+ }+ });+</script>+<script asp-location="Footer" asp-order="300">+ var homePNewProducts = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model),+ swiperOptions: {+ effect: 'fade',+ lazy: {+ preloaderClass: 'preloader'+ },+ autoplay: {+ delay: 5000,+ },+ fadeEffect: {+ crossFade: true+ },+ pagination: {+ el: '#hpnslider .swiper-pagination',+ clickable: true+ },+ navigation: {+ nextEl: '#hpnslider .swiper-button-next',+ prevEl: '#hpnslider .swiper-button-prev'+ },+ scrollbar: {+ el: '#hpnslider .swiper-scrollbar',+ draggable: true,+ hide: false+ },+ slidesPerView: 1,+ on: {+ init: function () {+ homePNewProducts.progressBarIn(this);+ homePNewProducts.animateIn(this);+ },+ slideChangeTransitionStart: function () {+ homePNewProducts.progressBarIn(this);+ homePNewProducts.animateIn(this);+ },+ activeIndexChange: function () {+ homePNewProducts.progressBarOut(this);+ homePNewProducts.animateOut(this);+ },+ }+ }+ }+ },+ methods: {+ animateIn(slider) {+ if (typeof (homePNewProducts.Model) == 'object') {+ if (slider.slides.length > 0) {+ var active = slider.slides[slider.activeIndex];+ active.querySelectorAll('.animate__animated').forEach(function (element) {+ var delay = element.dataset.delay;+ var animation = element.dataset.animation;+ element.classList.add(delay);+ element.classList.add(animation);+ });+ }+ }+ },+ animateOut(slider) {+ if (typeof (homePNewProducts.Model) == 'object') {+ var prev = slider.slides[slider.previousIndex];+ prev.querySelectorAll('.animate__animated').forEach(function (element) {+ var delay = element.dataset.delay;+ var animation = element.dataset.animation;+ element.classList.remove(delay);+ element.classList.remove(animation);+ });+ }+ },+ progressBarIn(slider) {+ slider.scrollbar.init();+ void slider.el.querySelector('#hpnslider .swiper-scrollbar').offsetWidth;+ slider.el.querySelector('#hpnslider .swiper-scrollbar').classList.add('progressAnimation');+ slider.scrollbar.dragEl.style.animationDuration = "5s";+ },+ progressBarOut(slider) {+ slider.scrollbar.init();+ void slider.el.querySelector('#hpnslider .swiper-scrollbar').offsetWidth;+ slider.el.querySelector('#hpnslider .swiper-scrollbar').classList.remove('progressAnimation');+ slider.scrollbar.dragEl.style.animationDuration = "0s";+ },+ groupBy(xs, key) {+ return xs.reduce(function (rv, x) {+ (rv[x[key]] = rv[x[key]] || []).push(x);+ return rv;+ }, {});+ }+ }+ });+</script>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageNews/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageNews/Default.cshtmlnew file mode 100644index 000000000..c461f8b76--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageNews/Default.cshtml@@ -0,0 +1,81 @@+@model HomePageNewsItemsModel+<template>+ <div class="home-page-section">+ <div id="HomePageNews" class="section mb-3">+ <div class="product-grid">+ <h2 class="generalTitle text-center"><span>@Loc["News"]</span></h2>+ <div class="col-12 px-0">+ <div class="row">+ <div class="col-xl-4 col-lg-4 col-md-6 col-sm-6 col-12 post-container mb-2" :key="Item.Id" v-for="Item in homePNews.Model.NewsItems">+ <div class="card post-news">+ <div class="card-header">+ <a class="img-container" v-if="Item.PictureModel.ImageUrl !== null">+ <b-img-lazy width="300" height="300" :src="Item.PictureModel.ImageUrl" :alt="Item.PictureModel.AlternateText" />+ </a>+ <h3 class="h5 title">+ <a :href="'/' + Item.SeName">+ {{Item.Title}}+ </a>+ </h3>+ <div class="date">+ <div class="day part" v-html="new Date(Item.CreatedOn).getUTCDate()"></div>+ <div class="month part" v-html="new Date(Item.CreatedOn).toLocaleString('default', { month: 'long' })"></div>+ <div class="year part" v-html="new Date(Item.CreatedOn).getUTCFullYear()"></div>+ </div>+ </div>+ <div class="card-body">+ <div class="short" v-html="Item.Short"></div>+ </div>+ <div class="card-footer">+ <a :href="'/' + Item.SeName" class="btn btn-outline-secondary">+ @Loc["News.MoreInfo"]+ </a>+ </div>+ </div>+ </div>+ </div>+ <div class="mt-3 w-100 text-center">+ <a class="btn btn-outline-secondary" href="@Url.RouteUrl("NewsArchive")">@Loc["News.ViewAll"]</a>+ </div>+ </div>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePNews = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model),+ swiperOptions: {+ lazy: {+ preloaderClass: 'preloader'+ },+ autoplay: {+ delay: 5000,+ },+ fadeEffect: {+ crossFade: true+ },+ slidesPerView: 1,+ spaceBetween: 15,+ navigation: {+ nextEl: '#HomePageNews .swiper-button-next',+ prevEl: '#HomePageNews .swiper-button-prev'+ },+ breakpoints: {+ 320: {+ slidesPerView: 1+ },+ 575: {+ slidesPerView: 2,+ },+ 992: {+ slidesPerView: 3,+ }+ }+ },+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageProducts/Default.cshtmlnew file mode 100644index 000000000..b3fceae29--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/HomePageProducts/Default.cshtml@@ -0,0 +1,26 @@+@model IList<ProductOverviewModel>+<template>+ <div class="home-page-section">+ <div id="HomePageProducts" class="section">+ <div class="product-grid">+ <h2 class="generalTitle text-center"><span>@Loc["HomePage.Products"]</span></h2>+ <div class="col-12 px-0">+ <div class="item-row">+ <div :key="Model.Id" v-for="Model in homePProducts.Model" class="col-xl-3 col-lg-3 col-md-3 col-sm-6 col-6 product-container mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePProducts = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/Menu/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/Menu/Default.cshtmlnew file mode 100644index 000000000..129e205fd--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/Menu/Default.cshtml@@ -0,0 +1,134 @@+@model MenuModel+@await Component.InvokeAsync("Widget", new { widgetZone = "header_menu_before" })+@{+ var rootCategories = Model.Categories.ToList();+}+@foreach (var category in rootCategories)+{+ var categoryLineModel = new MenuModel.CategoryLineModel+ {+ Category = category+ };+ <partial name="Partials/CategoryLine.Menu" model="categoryLineModel" />+}+@if (Model.Brands.Any())+{++ <li class="category -hasSubmenu" text="@Loc["Brands.Menu"]">+ <a href="@Url.RouteUrl("BrandList")">+ <span class="title">@Loc["Brands.Menu"]</span>+ </a>+ <ul>+ @foreach (var brand in Model.Brands)+ {+ <li>+ <a href="@Url.RouteUrl("Brand", new { SeName = brand.SeName })">+ <span class="title">@brand.Name</span>+ @if (!string.IsNullOrEmpty(brand.Icon))+ {+ <span class="category-icon @brand.Icon"></span>+ }++ </a>+ </li>+ }+ </ul>+ <span class="go-back"></span>+ <span class="go-forward"></span>+ </li>+}+@if (Model.Collections.Any())+{+ <li class="category -hasSubmenu" text="@Loc["Collections.Menu"]">+ <a href="#">+ <span class="title">@Loc["Collections.Menu"]</span>+ </a>+ <ul>+ @foreach (var collect in Model.Collections)+ {+ <li>+ <a href="@Url.RouteUrl("Collection", new { SeName = collect.SeName })">+ <span class="title">@collect.Name</span>+ @if (!string.IsNullOrEmpty(collect.Icon))+ {+ <span class="category-icon @collect.Icon"></span>+ }++ </a>+ </li>+ }+ </ul>+ <span class="go-back"></span>+ <span class="go-forward"></span>+ </li>+}+@if (Model.DisplaySearchMenu | Model.DisplayNewProductsMenu | Model.DisplayCustomerMenu | Model.DisplayBlogMenu | Model.DisplayContactUsMenu | Model.Pages.Any())+{+ <li class="other-links">+ <ul>+ @if (Model.DisplayHomePageMenu)+ {+ <li class="home-link">+ <a href="@Url.RouteUrl("HomePage")">+ <span class="title">@Loc["HomePage"]</span>+ </a>+ </li>+ }+ @foreach (var mpage in Model.Pages)+ {+ <li>+ <a href="@Url.RouteUrl("Page", new { SeName=mpage.SeName })">+ <span class="title">@mpage.Name</span>+ </a>+ </li>+ }+ @if (Model.NewProductsEnabled && Model.DisplayNewProductsMenu)+ {+ <li>+ <a href="@Url.RouteUrl("NewProducts")">+ <span class="title">@Loc["Products.NewProducts"]</span>+ </a>+ </li>+ }+ @if (Model.DisplaySearchMenu)+ {+ <li>+ <a href="@Url.RouteUrl("ProductSearch")">+ <span class="title">@Loc["Search"]</span>+ </a>+ </li>+ }+ @if (Model.DisplayCustomerMenu)+ {+ <li>+ <a href="@Url.RouteUrl("CustomerInfo")">+ <span class="title">@Loc["Account.MyAccount"]</span>+ </a>+ </li>+ }+ @if (Model.BlogEnabled && Model.DisplayBlogMenu)+ {+ <li>+ <a href="@Url.RouteUrl("Blog")">+ <span class="title">@Loc["Blog"]</span>+ </a>+ </li>+ }+ @if (Model.DisplayContactUsMenu)+ {+ <li>+ <a href="@Url.RouteUrl("ContactUs")">+ <span class="title">@Loc["ContactUs"]</span>+ </a>+ </li>+ }+ </ul>+ </li>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "header_menu_after" })++ @{+ var rootCategoriesResponsive = Model.Categories.ToList();+ //name it "Categories" if we have only categories. Otherwise, "Menu"+ var responsiveMenuTitle = (rootCategoriesResponsive.Any() && Model.Pages.Any()) ? Loc["Categories"] : Loc["Menu"];+ }diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/PageBlock/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/PageBlock/Default.cshtmlnew file mode 100644index 000000000..324aac027--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/PageBlock/Default.cshtml@@ -0,0 +1,77 @@+@model PageModel+@if (Model.IsPasswordProtected)+{+ <script asp-location="Footer">+ document.addEventListener("DOMContentLoaded", function () {+ document.getElementById('button-password').addEventListener('click', function () {+ var postData = {+ id: document.getElementById("@Html.IdFor(model => model.Id)").value,+ password: document.getElementById('[email protected]').value+ };+ addAntiForgeryToken(postData);++ var bodyFormData = new FormData();+ bodyFormData.append('id', document.getElementById("@Html.IdFor(model => model.Id)").value);+ bodyFormData.append('password', document.getElementById('[email protected]').value);+ bodyFormData.append('__RequestVerificationToken', document.querySelector('input[name=__RequestVerificationToken]').value);+ axios({+ method: 'post',+ url: '@Url.RouteUrl("PageAuthenticate")',+ data: bodyFormData,+ headers: { 'Content-Type': 'multipart/form-data' }+ }).then(function (response) {+ if (response.data.Authenticated) {+ document.querySelector('#[email protected] #[email protected] h1').innerText = response.data.Title;+ if (document.querySelector('#[email protected] #[email protected] h1').innerText == '') {+ document.getElementById('#[email protected]').style.display = "none";+ }+ document.querySelector('#[email protected] .page-body').innerHTML = response.data.Body;+ document.getElementById('[email protected]').style.display = "none";+ document.getElementById('[email protected]').style.display = "block";+ //$.validator.unobtrusive.parse('#ph-page');+ }+ else {+ document.getElementById('[email protected]').innerText = response.data.Error;+ }+ })+ });+++ });+ </script>+ <div class="page-password" id="[email protected]">+ <form asp-route="PageAuthenticate" method="post">+ <input asp-for="Id" type="hidden" />+ <div class="enter-password-title">+ @Loc["Page.EnterPassword"]+ </div>+ <div class="enter-password-form">+ @Html.Password("password", null, new { id = "password-" + @Model.Id, @class = "form-control mt-1" })+ <b-button id="button-password" variant="secondary" class="page-password-button mt-1 mb-1">+ @Loc["Page.Button"]+ </b-button>+ </div>+ <div class="password-error">+ <span class="text-danger" id="[email protected]"></span>+ </div>+ </form>+ </div>+++ <div class="page-block" id="[email protected]">+ <div class="page-block-title" id="[email protected]">+ <h1 class="generalTitle h2 text-sm-center">@Model.Title</h1>+ </div>+ <b-col cols="12" class="page-body px-0">+ @Html.Raw(Model.Body)+ </b-col>+ </div>+}+else+{+ @if (!String.IsNullOrEmpty(Model.Title))+ {+ <h1 class="generalTitle h2 text-sm-center">@Model.Title</h1>+ }+ @Html.Raw(Model.Body)+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/PersonalizedProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/PersonalizedProducts/Default.cshtmlnew file mode 100644index 000000000..a4db1e930--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/PersonalizedProducts/Default.cshtml@@ -0,0 +1,26 @@+@model IList<ProductOverviewModel>+<template>+ <div class="home-page-section">+ <div id="PersonalizedProducts" class="section">+ <div class="product-grid">+ <h2 class="generalTitle text-center"><span>@Loc["HomePage.Personalized.Products"]</span></h2>+ <div class="col-12 px-0">+ <div class="item-row">+ <div :key="Model.Id" v-for="Model in homePPersonalized.Model" class="col-xl-3 col-lg-4 col-md-4 col-sm-6 col-6 col-for-5-xl product-container mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePPersonalized = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/ProductsAlsoPurchased/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/ProductsAlsoPurchased/Default.cshtmlnew file mode 100644index 000000000..2bf7a34fb--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/ProductsAlsoPurchased/Default.cshtml@@ -0,0 +1,16 @@+@model IList<ProductOverviewModel>+@if (Model.Any())+{+ <b-col cols="12" class="also-purchased-products-grid product-grid my-3 px-0">+ <h2 class="h3 generalTitle mb-3"><span>@Loc["Products.AlsoPurchased"]</span></h2>+ <b-form-row>+ @foreach (var item in Model)+ {+ <b-col xl="3" lg="4" md="4" sm="6" cols="6" class="product-container col-for-5-xl px-0 mb-2">+ <partial name="Partials/CatalogProductView" model="item" />+ </b-col>+ }+ </b-form-row>+ </b-col>+}+diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RecentlyViewedProductsBlock/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RecentlyViewedProductsBlock/Default.cshtmlnew file mode 100644index 000000000..531331317--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RecentlyViewedProductsBlock/Default.cshtml@@ -0,0 +1,25 @@+@model IList<ProductOverviewModel>+@if (Model.Any())+{+<div id="block-recently-viewed-products" class="block block-recently-viewed-products">+ <h2 class="generalTitle"><span>@Loc["Products.RecentlyViewedProducts"]</span></h2>+ <div class="col-12 px-0">+ <div class="form-row">+ @for (int i = 0; i < Model.Count; i++)+ {+ var product = Model[i];+ <div class="col-xl-3 col-lg-3 col-md-3 col-sm-4 col-6 mb-2 col-for-5-xl">+ <div class="card">+ <a class="text-center picture" href="@Url.RouteUrl("Product", new { SeName = product.SeName })">+ <b-img-lazy class="img-fluid" alt="@product.DefaultPictureModel.AlternateText" src="@product.DefaultPictureModel.ImageUrl" title="@product.DefaultPictureModel.Title"></b-img-lazy>+ </a>+ <div class="card-body">+ <h5 class="h6"><a href="@Url.RouteUrl("Product", new { SeName = product.SeName })">@product.Name</a></h5>+ </div>+ </div>+ </div>+ }+ </div>+ </div>+</div>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RecommendedProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RecommendedProducts/Default.cshtmlnew file mode 100644index 000000000..c7412b376--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RecommendedProducts/Default.cshtml@@ -0,0 +1,16 @@+@model IList<ProductOverviewModel>+@if (Model.Any())+{+ <b-col cols="12" class="recommended-products-grid product-grid px-0">+ <h2 class="h3 generalTitle text-center">@Loc["Products.RecommendedProducts"]</h2>+ <b-form-row>+ @foreach (var item in Model)+ {+ <b-col xl="3" lg="4" md="4" sm="6" class="product-container mb-2">+ <partial name="Partials/CatalogProductView" model="item" />+ </b-col>+ }+ </b-form-row>+ </b-col>+}+diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RelatedProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RelatedProducts/Default.cshtmlnew file mode 100644index 000000000..9d59aacf1--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/RelatedProducts/Default.cshtml@@ -0,0 +1,16 @@+@model IList<ProductOverviewModel>+@if (Model.Any())+{+ <b-col cols="12" class="related-products-grid product-grid my-3 px-0">+ <h2 class="h3 generalTitle mb-3"><span>@Loc["Products.RelatedProducts"]</span></h2>+ <b-form-row>+ @foreach (var item in Model)+ {+ <b-col xl="3" lg="4" md="4" sm="3" cols="6" class="product-container px-0 mb-2">+ <partial name="Partials/CatalogProductView" model="item" />+ </b-col>+ }+ </b-form-row>+ </b-col>+}+diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SearchBox/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SearchBox/Default.cshtmlnew file mode 100644index 000000000..afd3e5d03--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SearchBox/Default.cshtml@@ -0,0 +1,305 @@+@model SearchBoxModel+@inject Grand.Domain.Blogs.BlogSettings blogSettings+@inject IWorkContext workContext+@{+ var lang = workContext.WorkingLanguage.LanguageCulture;+}+<ul class="search-item">+ <li>+ <template id="searchBoxContainer">+ <validation-observer v-slot="{ handleSubmit }">+ <form asp-route="ProductSearch" method="get" id="small-search-box-form" ref="searchForm" v-on:submit.prevent="handleSubmit(searchbox.formSubmit)" class="searchBox w-100">+ <validation-provider tag="div" rules="required|min:@(Model.SearchTermMinimumLength)" name="q" v-slot="{ errors, classes }">+ <input type="hidden" asp-for="Box" value="true" />+ <label for="small-searchterms" class="sr-only">@Loc["Search.SearchBox.Tooltip"]</label>+ <div class="input-group flex-row">+ <input minlength="@(Model.SearchTermMinimumLength)" maxlength="20"+ data-val-required="@string.Format(Loc["search.searchtermminimumlengthisncharacters"], Model.SearchTermMinimumLength)"+ data-val-min="@string.Format(Loc["search.searchtermminimumlengthisncharacters"], Model.SearchTermMinimumLength)" @if (Model.AutoCompleteEnabled) { <text> @@input="searchbox.autocompleteVue()" </text> } v-model="searchbox.text" type="search" name="q" ref="searchBoxInput" class="form-control search-box-text" id="small-searchterms" :placeholder="searchbox.placeholder">++ @if (Model.AvailableCategories.Any())+ {+ <select asp-for="SearchCategoryId" asp-items="Model.AvailableCategories" class="search-box-select custom-select input-group-addon"></select>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "searchbox_before_search_button" })++ <div class="input-group-append">+ <button id="voiceSearchButton"+ v-if="searchbox.allowed"+ @@touchstart="searchbox.recording = true"+ @@touchcancel="searchbox.recording = false; $root.$emit('bv::hide::tooltip')"+ @@touchend="searchbox.recording = false; $root.$emit('bv::hide::tooltip')"+ @@mousedown="searchbox.recording = true"+ @@mouseup="searchbox.recording = false"+ @@mouseleave="searchbox.recording = false"+ v-b-tooltip.hover.bottom :title="searchbox.micMessage" ref="micBtn" type="button" v-bind:class="[{ focus: searchbox.recording }, 'btn btn-outline-secondary search-button btn-mic']">+ <template v-if="searchbox.recording">+ <span class="icons icon-microphone"></span>+ </template>+ <template v-else>+ <span class="icons icon-microphone"></span>+ </template>+ </button>+ <button type="submit" class="btn btn-outline-secondary search-box-button search-button float-sm-right d-inline-flex align-items-center">+ <span class="sr-only">@Loc["Search.SearchBox.Tooltip"]</span>+ <span class="icons icon-magnifier"></span>+ </button>+ </div>+ </div>+ </validation-provider>+ <template v-if="searchbox.searchitems !== null">+ <div id="adv_search" class="advanced-search-results" onclick="StopPropagation(event)">+ <div class="col-12">+ <div class="form-row">+ <div class="col-md-6 col-12">+ <h5 class="title">@Loc["search.category"]</h5>+ <div v-if="searchbox.searchcategories.length">+ <ul class="list px-0">+ <li v-for="item in searchbox.searchcategories">+ <h6 class="mb-0"><a :href="item.Url">{{item.Label}}</a></h6>+ <p v-if="item.Desc">{{item.Desc}}</p>+ </li>+ </ul>+ </div>+ <ul v-else class="px-0 mb-1">+ <li class="alert alert-info">@Loc["search.noresultstextcategory"]</li>+ </ul>+ <h5 class="title">@Loc["search.brand"]</h5>+ <div v-if="searchbox.searchbrands.length">+ <ul class="list px-0">+ <li v-for="item in searchbox.searchbrands">+ <h6 class="mb-0"><a :href="item.Url">{{item.Label}}</a></h6>+ <p v-if="item.Desc">{{item.Desc}}</p>+ </li>+ </ul>+ </div>+ <ul v-else class="px-0 mb-1">+ <li class="alert alert-info">@Loc["search.noresultstextbrand"]</li>+ </ul>+ @if (blogSettings.ShowBlogPostsInSearchAutoComplete)+ {+ <h5 class="title">@Loc["search.blog"]</h5>+ <div v-if="searchbox.searchblog.length">+ <ul class="list px-0">+ <li v-for="item in searchbox.searchblog">+ <h6 class="mb-0"><a :href="item.Url">{{item.Label}}</a></h6>+ <p v-if="item.Desc">{{item.Desc}}</p>+ </li>+ </ul>+ </div>+ <ul v-else class="px-0 mb-1">+ <li class="alert alert-info">@Loc["search.noresultstextblog"]</li>+ </ul>+ }+ </div>+ <div class="col-md-6 col-12 products">+ <h5 class="title">@Loc["search.products"]</h5>+ <div v-if="searchbox.searchproducts.length">+ <ul class="list px-0">+ <li class="media" v-for="item in searchbox.searchproducts">+ <div class="media-aside" v-if="item.PictureUrl">+ <img class="img-fluid" alt="placeholder" :src="item.PictureUrl" />+ </div>+ <div class="media-body">+ <h6 class="mb-0"><a :href="item.Url">{{item.Label}}</a></h6>+ <b-form-rating class="p-0" variant="warning" no-border size="sm" show-value precision="2" readonly inline :value="item.Rating / 20"></b-form-rating>+ <div v-if="item.Price" class="price">{{item.Price}}</div>+ <p v-html="item.Desc" class="mt-1 mb-0"></p>+ </div>+ </li>+ </ul>+ </div>+ <ul v-else class="px-0 mb-1">+ <li class="alert alert-info">@Loc["search.noresultstext"]</li>+ </ul>+ </div>+ </div>+ </div>+ </div>+ </template>+ @await Component.InvokeAsync("Widget", new { widgetZone = "searchbox" })+ </form>+ </validation-observer>+ </template>+ <script asp-location="Footer" asp-order="300">+ var searchBox = Vue.extend({+ data: () => ({+ recording: false,+ recognition: null,+ searchitems: null,+ focus: false,+ text: "",+ lang: '@lang',+ placeholder: "@Loc["Search.SearchBox.Tooltip"]",+ micMessage: "@Loc["search.voice.holdtospeak"]",+ searchcategories: null,+ searchbrands: null,+ searchblog: null,+ searchproducts: null,+ allowed: true,+ }),+ methods: {+ formSubmit() {+ vm.$refs.searchForm.submit();+ },+ startRecording() {+ this.recognition.start();+ },+ stopRecording() {+ this.recognition.stop();+ },+ allowCheck() {+ var checkPermission = navigator.permissions+ if (checkPermission) {+ navigator.permissions.query(+ { name: 'microphone' }+ ).then(function (permissionStatus) {+ if (permissionStatus.state == "denied") {+ searchbox.allowed = false;+ } else {+ searchbox.allowed = true;+ }+ permissionStatus.onchange = function () {+ if (this.state == "denied") {+ searchbox.allowed = false;+ } else {+ searchbox.allowed = true;+ }+ }+ })+ }+ },+ autocompleteVue() {+ const minLength = vm.$refs.searchBoxInput.getAttribute('minlength');+ const length = vm.$refs.searchBoxInput.value.length;+ var delayTimer;+ function getCategories(item) {+ if (item.SearchType == 'Category') {+ return item+ }+ }+ function getBrands(item) {+ if (item.SearchType == 'Brand') {+ return item+ }+ }+ function getBlog(item) {+ if (item.SearchType == 'Blog') {+ return item+ }+ }+ function getProducts(item) {+ if (item.SearchType == 'Product') {+ return item+ }+ }+ clearTimeout(delayTimer);+ delayTimer = setTimeout(function () {+ var value = searchbox.text;+ var category = '';+ if (document.getElementById("SearchCategoryId")) {+ category = document.getElementById("SearchCategoryId").value;+ }+ if (length >= minLength) {+ axios({+ url: '/catalog/searchtermautocomplete',+ method: 'get',+ params: {+ term: value,+ categoryId: category+ }+ }).then(function (response) {+ if (response.data) {+ searchbox.searchitems = response.data;+ var categories = response.data.map(getCategories).filter(function (element) {+ return element !== undefined;+ });+ var brands = response.data.map(getBrands).filter(function (element) {+ return element !== undefined;+ });+ var blog = response.data.map(getBlog).filter(function (element) {+ return element !== undefined;+ });+ var products = response.data.map(getProducts).filter(function (element) {+ return element !== undefined;+ });+ searchbox.searchcategories = categories;+ searchbox.searchbrands = brands;+ searchbox.searchblog = blog;+ searchbox.searchproducts = products;+ }+ })+ }+ }, 600);+ }+ },+ created() {+ this.allowCheck();+ },+ watch: {+ text: function () {+ const searchBoxInput = vm.$refs.searchBoxInput;+ this.autocompleteVue(searchBoxInput);+ if (this.text == '') {+ searchbox.searchitems = null;+ }+ },+ recording: function () {+ const speech = window.SpeechRecognition || window.webkitSpeechRecognition;+ if (speech) {+ if (this.recording) {++ this.$bvToast.toast('@Loc["search.voice.annotation"]', {+ title: '@Loc["search.voice.placeholder"]',+ variant: 'info',+ autoHideDelay: 3000,+ solid: true+ })++ this.recognition = new speech();+ this.recognition.continuous = true;+ this.recognition.lang = searchbox.lang;+ const searchForm = vm.$refs.searchForm;+ const searchBoxInput = vm.$refs.searchBoxInput;+ searchBoxInput.focus();+ this.startRecording();+ this.placeholder = '@Loc["search.voice.placeholder"]';+ this.micMessage = '@Loc["search.voice.placeholder"]';+ this.recognition.addEventListener("result", resultOfSpeechRecognition);+ function resultOfSpeechRecognition(event) {+ const current = event.resultIndex;+ const transcript = event.results[current][0].transcript;+ if (transcript.toLowerCase().trim() === "@Loc["search.voice.stop"]") {+ searchbox.stopRecording();+ }+ else if (!searchBoxInput.value && searchbox.recording) {+ searchbox.text = transcript;+ }+ else {+ if (transcript.toLowerCase().trim() === '@Loc["search.voice.go"]') {+ searchbox.stopRecording();+ searchForm.submit();+ }+ else if (transcript.toLowerCase().trim() === '@Loc["search.voice.reset"]') {+ searchbox.text = "";+ }+ else if (searchbox.recording) {+ searchbox.text = transcript;+ }+ }+ }+ } else {+ this.stopRecording();+ this.placeholder = '@Loc["Search.SearchBox.Tooltip"]';+ this.micMessage = '@Loc["search.voice.holdtospeak"]'+ }+ } else {+ this.allowed = false;+ }+ }+ }+ });+ var searchbox = new searchBox().$mount('#small-search-box-form')+ </script>+ </li>+</ul>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SimilarProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SimilarProducts/Default.cshtmlnew file mode 100644index 000000000..e61774b9d--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SimilarProducts/Default.cshtml@@ -0,0 +1,15 @@+@model IList<ProductOverviewModel>+@if (Model.Any())+{+ <b-col cols="12" class="similar-products-grid product-grid px-0">+ <h2 class="h3 generalTitle text-center">@Loc["Products.SimilarProducts"]</h2>+ <b-form-row>+ @foreach (var item in Model)+ {+ <b-col xl="3" lg="4" md="4" sm="6" cols="6" class="product-container col-for-5-xl px-0 mb-2">+ <partial name="Partials/CatalogProductView" model="item" />+ </b-col>+ }+ </b-form-row>+ </b-col>+}diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SuggestedProducts/Default.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SuggestedProducts/Default.cshtmlnew file mode 100644index 000000000..b18a4e83e--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Components/SuggestedProducts/Default.cshtml@@ -0,0 +1,26 @@+@model IList<ProductOverviewModel>+<template>+ <div class="home-page-section">+ <div id="SuggestedProducts" class="section">+ <div class="product-grid">+ <h2 class="generalTitle text-center"><span>@Loc["HomePage.Suggested.Products"]</span></h2>+ <div class="col-12 px-0">+ <div class="item-row">+ <div :key="Model.Id" v-for="Model in homePSuggested.Model" class="col-xl-3 col-lg-4 col-md-4 col-sm-6 col-6 col-for-5-xl product-container mb-2">+ <product-box-vue :Model="Model"></product-box-vue>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="300">+ var homePSuggested = new Vue({+ data: function () {+ return {+ Model: @Json.Serialize(Model)+ }+ }+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Head.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Head.cshtmlnew file mode 100644index 000000000..89978f3e6--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Head.cshtml@@ -0,0 +1,32 @@++@{+ <script asp-location="Head" src="/bundles/app.runtime.bundle.js"></script>+ <script asp-location="Head" src="/bundles/chunk-vendors.runtime.bundle.js"></script>+ <link asp-src="/bundles/libs.css" rel="stylesheet">++ <link rel="stylesheet" type="text/css" asp-src="/assets/custom/style.css">++ <link asp-src="/Plugins/Theme.Modern/Content/swiper/swiper.min.css" rel="stylesheet">+ <link asp-src="/Plugins/Theme.Modern/Content/css/fonts/simple-line-icons.min.css" rel="stylesheet">+++ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/common/common.css">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/header/header.css">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/catalog/catalog.css">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/product/product.css">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/customer/customer.css">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/cart/cart.css">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Modern/Content/css/blog-news/blog-news.css">++ <script asp-location="Footer" asp-src="/theme/script/public.common.js" asp-order="201"></script>+ <script asp-location="Footer" asp-src="/theme/script/public.axios.js" asp-order="202"></script>++ <script asp-location="Footer" asp-src="/Plugins/Theme.Modern/Content/swiper/swiper.min.js" asp-order="298"></script>+ <script asp-location="Footer" asp-src="/Plugins/Theme.Modern/Content/swiper/vue-awesome-swiper.min.js" asp-order="299"></script>++ <script asp-location="Footer" asp-src="/Plugins/Theme.Modern/Content/script/menu.js" asp-order="902"></script>+ <script asp-location="Footer" asp-src="/Plugins/Theme.Modern/Content/script/app.js" asp-order="903"></script>++ <script asp-location="Footer" asp-src="/assets/custom/script.js" asp-order="906"></script>++}diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Header.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Header.cshtmlnew file mode 100644index 000000000..114371be3--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Header.cshtml@@ -0,0 +1,25 @@+@inject StoreInformationSettings StoreInformationSettings+@inject CommonSettings CommonSettings++<div class="header-nav">+ <nav class="navbar navbar-light navbar-expand">+ <b-container fluid id="header-container">+ <ul class="navbar-nav selectors">+ <partial name="Partials/Selector_TaxType"/>+ <partial name="Partials/Selector_Currency"/>+ <partial name="Partials/Selector_Language"/>+ @if (CommonSettings.AllowToSelectStore)+ {+ <partial name="Partials/Selector_Store"/>+ }+ @if (StoreInformationSettings.AllowCustomerToSelectTheme)+ {+ <partial name="Partials/Selector_Theme"/>+ }+ </ul>+ <swiper class="swiper-info" ref="topHeaderInfo" :options="topHeaderInfo.swiperOptions">+ @await Component.InvokeAsync("PageBlock", new { systemName = "topHeaderInfo" })+ </swiper>+ </b-container>+ </nav>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/CatalogProductView.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/CatalogProductView.cshtmlnew file mode 100644index 000000000..2a19d2b4d--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/CatalogProductView.cshtml@@ -0,0 +1,377 @@+@model ProductOverviewModel+@{+ //prepare "Add to cart" Axios link+ string addtocartlink = "";+ string addtowishlistlink = "";+ string quickviewurl = Url.RouteUrl("QuickView-Product", new { productId = Model.Id });++ var shoppingCartTypeId = (int)ShoppingCartType.ShoppingCart;+ var quantity = 1;+ if (!Model.ShowQty)+ {+ if (Model.ProductPrice.ForceRedirectionAfterAddingToCart)+ {+ addtocartlink = Url.RouteUrl("AddProductCatalog", new { productId = Model.Id, shoppingCartTypeId = shoppingCartTypeId, quantity = quantity, forceredirection = Model.ProductPrice.ForceRedirectionAfterAddingToCart });+ }+ else+ {+ addtocartlink = Url.RouteUrl("AddProductCatalog", new { productId = Model.Id, shoppingCartTypeId = shoppingCartTypeId, quantity = quantity });+ }+ addtowishlistlink = Url.RouteUrl("AddProductCatalog", new { productId = Model.Id, shoppingCartTypeId = (int)ShoppingCartType.Wishlist, quantity = quantity });+ }+ else+ {+ if (Model.ProductPrice.ForceRedirectionAfterAddingToCart)+ {+ addtocartlink = Url.RouteUrl("AddProductCatalog", new { productId = Model.Id, shoppingCartTypeId = shoppingCartTypeId, forceredirection = Model.ProductPrice.ForceRedirectionAfterAddingToCart });+ }+ else+ {+ addtocartlink = Url.RouteUrl("AddProductCatalog", new { productId = Model.Id, shoppingCartTypeId = shoppingCartTypeId });+ }+ addtowishlistlink = Url.RouteUrl("AddProductCatalog", new { productId = Model.Id, shoppingCartTypeId = (int)ShoppingCartType.Wishlist });+ }+ var addtocomparelink = Url.RouteUrl("AddProductToCompare", new { productId = Model.Id });+}++@await Component.InvokeAsync("Widget", new { widgetZone = "productbox_before_content", additionalData = Model })+<b-card no-body tag="article" v-bind:class="{mobile: isMobile()}" class="product-box show product-provider mb-2" @@mouseover="hover = true" @@mouseleave="hover = false">+ @if (!string.IsNullOrEmpty(Model.Flag))+ {+ <div class="flag-label">+ @Html.Raw(Model.Flag)+ </div>+ }+ <div class="picture-container">+ <b-link class="img-container" href="@Url.RouteUrl("Product", new { SeName = Model.SeName })" title="@Model.DefaultPictureModel.Title">+ <b-card-img-lazy alt="@Model.DefaultPictureModel.AlternateText" class="main-product-img" src="@Model.DefaultPictureModel.ImageUrl" title="@Model.DefaultPictureModel.Title"></b-card-img-lazy>+ @if (!string.IsNullOrEmpty(Model.SecondPictureModel.ImageUrl))+ {+ <b-card-img-lazy class="hover-img" alt="@Model.SecondPictureModel.AlternateText" src="@Model.SecondPictureModel.ImageUrl"></b-card-img-lazy>+ }+ </b-link>+ @if (Model.ProductAttributeModels.Any())+ {+ <div class="attr-container">+ <table>+ <tbody>+ @foreach (var item in Model.ProductAttributeModels)+ {+ <tr class="attr">+ <td>+ @*<div class="attr-name">+ @item.Name+ </div>*@+ </td>+ <td>+ <div class="attr-value">+ @foreach (var spec in item.Values)+ {+ switch (item.AttributeControlType)+ {+ case AttributeControlType.DropdownList:+ case AttributeControlType.RadioList:+ case AttributeControlType.Checkboxes:+ case AttributeControlType.ReadonlyCheckboxes:+ <b-button variant="light" size="sm" class="name" href="@Url.RouteUrl("Product", new { SeName = Model.SeName })[email protected][email protected](spec.Name)">+ @Html.Raw(spec.Name)+ </b-button>+ break;+ case AttributeControlType.ColorSquares:+ if ((spec.PictureModel.FullSizeImageUrl) != null)+ {+ <b-button variant="light" size="sm" class="name color-container" title="@spec.Name" v-on:click='productImage' data-href="@spec.PictureModel.FullSizeImageUrl">+ <span class="color" style="background-color:@spec.ColorSquaresRgb;"> </span>+ </b-button>+ }+ else+ {+ <b-button variant="light" size="sm" class="name color-container" title="@spec.Name" href="@Url.RouteUrl("Product", new { SeName = Model.SeName })[email protected][email protected](spec.Name)">+ <span class="color" style="background-color:@spec.ColorSquaresRgb;"> </span>+ </b-button>+ }+ break;+ case AttributeControlType.ImageSquares:+ if ((spec.PictureModel.FullSizeImageUrl) != null)+ {+ <b-button variant="light" size="sm" class="p-1 name image-container" v-on:click='productImage' data-href="@spec.PictureModel.FullSizeImageUrl">+ <img src="@spec.ImageSquaresPictureModel?.ImageUrl" alt="@spec.Name" />+ </b-button>+ }+ else+ {+ <b-button variant="light" size="sm" class="p-1 name image-container" href="@Url.RouteUrl("Product", new { SeName = Model.SeName })[email protected][email protected](spec.Name)">+ <img src="@spec.ImageSquaresPictureModel?.ImageUrl" alt="@spec.Name" />+ </b-button>+ }+ break;+ default:+ break;+ }+ }+ </div>+ </td>++ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ <div class="other-buttons">+ @if (!Model.ProductPrice.DisableBuyButton)+ {+ var addToCartText = Loc["ShoppingCart.AddToCart"];+ if (Model.ProductType == ProductType.Reservation)+ {+ addToCartText = Loc["ShoppingCart.Reservation"];+ }+ if (Model.ProductPrice.AvailableForPreOrder)+ {+ addToCartText = Loc["ShoppingCart.PreOrder"];+ }+ <b-button v-b-tooltip.hover.bottom title="@(addToCartText)" variant="outline-secondary" onclick="AxiosCart.addproducttocart_catalog('@addtocartlink', '@Model.ShowQty', '@Model.Id');return false;">+ <span class="icons icon-handbag"></span>+ <span class="sr-only">AddToCart</span>+ </b-button>+ }+ else+ {+ if (Model.ProductType == ProductType.Auction)+ {++ var addToCartText = Loc["ShoppingCart.Bids"];+ <b-button v-b-tooltip.hover.bottom title="@(addToCartText)" variant="outline-secondary" class="add-to-cart-button" onclick="AxiosCart.addproducttocart_catalog('@addtocartlink', 'false', '@Model.Id');return false;">+ <span class="icons icon-bell"></span>+ <span class="sr-only">AddToCart</span>+ </b-button>+ }+ }+ @if (!Model.ProductPrice.DisableWishlistButton && Model.ProductType == ProductType.SimpleProduct)+ {+ <a v-b-tooltip.hover.bottom title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-outline-secondary" onclick="AxiosCart.addproducttocart_catalog('@addtowishlistlink', '@Model.ShowQty', '@Model.Id');return false;">+ <span class="icons icon-heart"></span>+ <span class="sr-only">AddToWishlist</span>+ </a>+ }+ @if (!Model.ProductPrice.DisableAddToCompareListButton && Model.ProductType == ProductType.SimpleProduct)+ {+ <a v-b-tooltip.hover.bottom title="@Loc["ShoppingCart.AddToCompareList"]" class="btn btn-outline-secondary" onclick="AxiosCart.addproducttocomparelist('@Model.Id', '@Loc["Products.ProductHasBeenAddedToCompareList.Link"]', '@Url.RouteUrl("CompareProducts")')">+ <span class="sr-only">AddToCompareList</span>+ <span class="icons icon-shuffle"></span>+ </a>+ }+ </div>+ <div class="qvb-container">+ <a class="quick-view-button w-100 btn btn-secondary" data-target="ModalQuickView" onclick="AxiosCart.quickview_product('@quickviewurl');return false;">+ <span class="icons icon-magnifier"></span>+ <span>@Loc["Products.QuickView"]</span>+ </a>+ </div>+ </div>+ <b-card-body>+ <h5 class="card-title mb-0">+ <a href="@Url.RouteUrl("Product", new { SeName = Model.SeName })">+ @Model.Name+ </a>+ </h5>+ @if (Model.ShowSku && !string.IsNullOrEmpty(Model.Sku))+ {+ <span class="sku">@Model.Sku</span>+ }+ <div class="prices-rating">+ @if (Model.ReviewOverviewModel.AllowCustomerReviews)+ {+ decimal ratingValue = 0;+ if (Model.ReviewOverviewModel.TotalReviews != 0)+ {+ ratingValue = Convert.ToDecimal(((Model.ReviewOverviewModel.RatingSum * (double)100) / Model.ReviewOverviewModel.TotalReviews) / (double)100);+ }+ <template>+ <div class="rating">+ <b-form-rating id="[email protected]" class="p-0" variant="warning" no-border size="sm" show-value precision="2" readonly inline value="@(ratingValue)"></b-form-rating>+ <b-link href="@Url.RouteUrl("Product", new { SeName = Model.SeName })">@Model.ReviewOverviewModel.TotalReviews @Loc["Reviews.Overview.Reviews"]</b-link>+ </div>+ </template>+ }+ @if (Model.ProductType == ProductType.Auction)+ {++ @if (Model.EndTime.HasValue)+ {+ <div class="countdown-box alert alert-info w-100 mb-1">+ @if (Model.EndTime > DateTime.UtcNow)+ {+ <countdown :end-time="@Model.EndTime.Value.ToUniversalTime().Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds">+ <template v-slot:process="{ timeObj }">+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>+ <span>{{ `${timeObj.d}` }} : </span>+ <span>{{ `${timeObj.h}` }} : </span>+ <span>{{ `${timeObj.m}` }} : </span>+ <span>{{ `${timeObj.s}` }}</span>+ </template>+ <template v-slot:finish>+ <span>@Loc["ShoppingCart.Auctionends"]</span>+ </template>+ </countdown>+ }+ else+ {+ <div class="d-inline-flex flex-wrap justify-content-center">+ <label class="ended-label">@Loc["ShoppingCart.Auctionends"]:</label>+ <div class="count-date">@Model.EndTimeLocalTime.Value.ToString()</div>+ </div>+ }+ </div>+ }+ }+ <div class="prices @if (Model.ProductType == ProductType.Reservation) { <text>reservation-price</text> } ">+ @if (Model.ProductType != ProductType.Auction)+ {+ <div class="actual-price price">+ @Model.ProductPrice.Price+ </div>+ }+ else+ {+ <div class="actual-price price">+ @(Model.ProductPrice.HighestBidValue > 0 ? Model.ProductPrice.HighestBid : Model.ProductPrice.StartPrice)+ </div>+ }+ @if (!String.IsNullOrEmpty(Model.ProductPrice.OldPrice))+ {+ <div class="old-price price">+ @Model.ProductPrice.OldPrice+ </div>+ }+ </div>+ </div>+ </b-card-body>+ <div class="card-footer">+ <div class="desc">+ @Html.Raw(Model.ShortDescription)+ </div>+ <div class="mt-auto">+ <div class="list-button-container">+ @if (Model.ShowQty)+ {+ var qtyId = "addtocart_" + @Model.Id + "_EnteredQuantity";+ <input class="form-control input-group-addon catalog-quantity" type="number" id="@qtyId" name="@qtyId" value="1">+ }+ @if (!Model.ProductPrice.DisableBuyButton)+ {+ var addToCartText = Loc["ShoppingCart.AddToCart"];+ if (Model.ProductType == ProductType.Reservation)+ {+ addToCartText = Loc["ShoppingCart.Reservation"];+ }+ if (Model.ProductPrice.AvailableForPreOrder)+ {+ addToCartText = Loc["ShoppingCart.PreOrder"];+ }+ <b-button variant="outline-secondary" class="add-to-cart-button" onclick="AxiosCart.addproducttocart_catalog('@addtocartlink', '@Model.ShowQty', '@Model.Id');return false;">+ <span class="add-cart-text">@(addToCartText)</span>+ <span class="sr-only">AddToCart</span>+ </b-button>+ }+ else+ {+ if (Model.ProductType == ProductType.Auction)+ {++ var addToCartText = Loc["ShoppingCart.Bids"];+ <b-button variant="outline-secondary" class="add-to-cart-button" onclick="AxiosCart.addproducttocart_catalog('@addtocartlink', 'false', '@Model.Id');return false;">+ <span class="add-cart-text">@Loc["ShoppingCart.Bids"]</span>+ <span class="sr-only">AddToCart</span>+ </b-button>+ }+ }+ </div>+ </div>+ </div>+ @*<template v-slot:footer>+ @if (Model.SpecificationAttributeModels.Any())+ {+ <div class="spec-container">+ @{+ var group = Model.SpecificationAttributeModels.GroupBy(x => x.SpecificationAttributeName);+ }+ <table>+ <tbody>+ @foreach (var item in group)+ {+ <tr>+ <td>+ <div class="spec-name">+ @{+ var groupList = item.ToList();+ }+ @groupList[0].SpecificationAttributeName:+ </div>+ </td>+ <td>+ @{+ var groupList2 = item.ToList();+ }+ <div class="spec-value">+ @foreach (var spec in groupList)+ {+ <span>+ @Html.Raw(spec.ValueRaw)+ </span>+ }+ </div>+ </td>++ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ </template>*@+ @*<template v-slot:footer>+ @if (Model.SpecificationAttributeModels.Any())+ {+ <div class="spec-container">+ @{+ var group = Model.SpecificationAttributeModels.GroupBy(x => x.SpecificationAttributeName);+ }+ <table>+ <tbody>+ @foreach (var item in group)+ {+ <tr class="spec">+ <td>+ <div class="spec-name">+ @{+ var groupList = item.ToList();+ }+ @groupList[0].SpecificationAttributeName:+ </div>+ </td>+ <td>+ @{+ var groupList2 = item.ToList();+ }+ <div class="spec-value">+ @foreach (var spec in groupList)+ {+ <span>+ @Html.Raw(spec.ValueRaw)+ </span>+ }+ </div>+ </td>++ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ <div class="desc">+ @Html.Raw(Model.ShortDescription)+ </div>+ </template>*@+</b-card>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/CategoryLine.Menu.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/CategoryLine.Menu.cshtmlnew file mode 100644index 000000000..5442aea74--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/CategoryLine.Menu.cshtml@@ -0,0 +1,95 @@+@model MenuModel.CategoryLineModel++@if (Model.Category.IncludeInMenu)+{++ var galleryCheck = Model.Category.UserFields.FirstOrDefault(x => x.Key == "gallery")?.Value;+++ <li class="@if (galleryCheck == "true") { <text>hasGallery</text> } @(Model.Category.SubCategories.Count() == 0 ? "category": "category -hasSubmenu" )">++ <a href="@Url.RouteUrl("Category", new { SeName = Model.Category.SeName })">+ @if (!string.IsNullOrEmpty(Model.Category.Icon))+ {+ <b-icon icon="@Model.Category.Icon" class="category-icon"></b-icon>+ <span class="category-icon @Model.Category.Icon"></span>+ }+ @{+ var imageCheck = Model.Category.UserFields.FirstOrDefault(x => x.Key == "showImage")?.Value;++ if (imageCheck == "true")+ {+ <picture>+ <source media="(max-width: 991px)" sizes="1px" srcset="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7 1w" />+ <b-img-lazy class="img-fluid" src="@Model.Category.ImageUrl"></b-img-lazy>+ </picture>+ }+ }+ <span>@Model.Category.Name</span>+ @if (!string.IsNullOrEmpty(Model.Category.FlagStyle))+ {+ <span class="badge @Model.Category.FlagStyle">@Model.Category.Flag</span>+ }+ </a>++ @{+ //subcategories+ var subCategories =+ Model.Category.SubCategories.Where(x => x.IncludeInMenu).ToList();++ var levelClass = "";+ var gallery = "";+ if (Model.Level == 0)+ {+ levelClass = "first-level";+ gallery = "gallery ";+ if (subCategories.Any())+ {+ var sizeCheck = Model.Category.UserFields.FirstOrDefault(x => x.Key == "size")?.Value;+ var colsCheck = Model.Category.UserFields.FirstOrDefault(x => x.Key == "cols")?.Value;+ var opacityCheck = Model.Category.UserFields.FirstOrDefault(x => x.Key == "opacity")?.Value;+ var menuBg = Model.Category.UserFields.FirstOrDefault(x => x.Key == "menuBg")?.Value;++ <ul class="@if (galleryCheck == "true") { <text> @gallery </text> @if (sizeCheck != "") { <text> size-@sizeCheck </text> } @if (colsCheck != "") { <text> columns-@colsCheck </text> }} @if (opacityCheck == "true") { <text>opacity</text> } ">+ @if (!string.IsNullOrEmpty(Model.Category.FlagStyle))+ {+ <li class="menuBg" style="background-image:url('@menuBg')"></li>+ }+ @foreach (var subCategory in subCategories)+ {+ var categoryLineModel = new MenuModel.CategoryLineModel+ {+ Category = subCategory,+ Level = Model.Level + 1,+ ResponsiveMobileMenu = Model.ResponsiveMobileMenu+ };+ <partial name="Partials/CategoryLine.Menu" model="categoryLineModel" />+ }+ </ul>+ }+ }+ if (Model.Level >= 1 && subCategories.Any())+ {+ levelClass = "next-level";+ <ul class="sublist @levelClass">+ @foreach (var subCategory in subCategories)+ {+ var categoryLineModel = new MenuModel.CategoryLineModel+ {+ Category = subCategory,+ Level = Model.Level + 1,+ ResponsiveMobileMenu = Model.ResponsiveMobileMenu+ };+ <partial name="Partials/CategoryLine.Menu" model="categoryLineModel" />+ }+ </ul>+ }+ @if (Model.Category.SubCategories.Count() > 0)+ {+ <span class="go-back"></span>+ <span class="go-forward"></span>+ }+ }+ </li>+}+diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/Logo.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/Logo.cshtmlnew file mode 100644index 000000000..57f6628f1--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/Logo.cshtml@@ -0,0 +1,10 @@+@inject StoreInformationSettings storeInformation+@inject IWorkContext workContext+@inject Grand.Business.Core.Interfaces.Storage.IPictureService pictureService+@{+ var urlLogo = await pictureService.GetPictureUrl(storeInformation.LogoPictureId);+}+<a class="navbar-brand store-logo" target="_self" href="@Url.RouteUrl("HomePage")">+ <img width="236" height="53" src="@urlLogo" alt="@workContext.CurrentStore.Name" />+ <span class="sr-only">@Loc["Logo"]</span>+</a>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/NewsletterBox.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/NewsletterBox.cshtmlnew file mode 100644index 000000000..17379d64f--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/NewsletterBox.cshtml@@ -0,0 +1,47 @@+@inject CustomerSettings customerSettings++@if (!customerSettings.HideNewsletterBlock)+{+ <div class="newsletter">+ <h2 class="newsletter-title">+ @Loc["Newsletter.Title"]+ </h2>+ <div class="newsletter-desc">+ @Loc["Newsletter.Desc"]+ </div>+ <div class="input-group" role="group">+ <input id="newsletter-email" class="input-group-text form-control newsletter-email"+ placeholder="@Loc["Newsletter.Email.Placeholder"]" aria-label="@Loc["Newsletter.Email.Placeholder"]" />+ <label for="newsletter-email" class="sr-only">newsletter</label>+ <div class="input-group-append">+ <button class="btn btn-secondary newsletter-email-button" id="newsletter-subscribe-button" @@click="newsletterBox(@customerSettings.NewsletterBlockAllowToUnsubscribe.ToString().ToLower(), '@(Url.RouteUrl("SubscribeNewsletter"))')">+ <b-icon icon="envelope"></b-icon>+ </button>+ </div>+ </div>+ @if (customerSettings.NewsletterBlockAllowToUnsubscribe)+ {+ <div class="custom-controls-stacked newsletter-subscribe-unsubscribe justify-content-center w-100 pt-1">+ <fieldset class="d-inline-flex justify-content-center w-100">+ <div class="custom-control custom-radio mb-2">+ <input value="newsletter_unsubscribe" id="newsletter_subscribe" name="newsletter_block" type="radio" class="custom-control-input" checked="checked">+ <label class="custom-control-label text-white" for="newsletter_subscribe">@Loc["Newsletter.Options.Subscribe"]</label>+ </div>+ <div class="custom-control custom-radio ml-3 mb-2">+ <input value="newsletter_unsubscribe" id="newsletter_unsubscribe" name="newsletter_block" type="radio" class="custom-control-input">+ <label class="custom-control-label text-white" for="newsletter_unsubscribe">@Loc["Newsletter.Options.Unsubscribe"]</label>+ </div>+ </fieldset>+ </div>+ }+ <div class="newsletter-validation text-white text-center w-100">+ <span id="subscribe-loading-progress" style="display: none;" class="please-wait">@Loc["Common.Wait..."]</span>++ </div>+ <div id="newsletter-result-block" style="display: none;" class="newsletter-result text-center text-white w-100">+ <div class="alert alert-info">+ </div>+ </div>+ <input type="hidden" id="newsletterbox" data-href="@(Url.RouteUrl("SubscribeNewsletter"))" data-allowtounsubscribe=@customerSettings.NewsletterBlockAllowToUnsubscribe />+ </div>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/PopupAddToCart.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/PopupAddToCart.cshtmlnew file mode 100644index 000000000..1b4866b29--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/PopupAddToCart.cshtml@@ -0,0 +1,136 @@+<b-modal id="ModalAddToCart" ref="ModalAddToCart" content-class="border-0" :dark-theme="darkMode" body-class="p-0" size="lg" centered hide-footer hide-header>+ <template v-if="PopupAddToCartVueModal !== null">+ <button class="modal-close btn" @@click="$bvModal.hide('ModalAddToCart')"><b-icon icon="x"></b-icon></button>+ <div class="card rounded-0 border-0">+ <div class="card-header rounded-0 border-0">+ <h5 class="mb-0">+ <template v-if="PopupAddToCartVueModal.CartType == 1 || PopupAddToCartVueModal.CartType == 0">+ <strong>@Loc["AddToCart.ShoppingCart"]</strong>+ </template>+ <template v-else-if="PopupAddToCartVueModal.CartType == 2">+ <strong>@Loc["AddToCart.Wishlist"]</strong>+ </template>+ <template v-else-if="PopupAddToCartVueModal.CartType == 3">+ <strong>@Loc["shoppingcart.yourbidhasbeenplaced"]</strong>+ </template>+ </h5>+ </div>+ <div class="card-body">+ <div class="col-12 px-0">+ <div class="form-row">+ <div class="d-sm-block d-none p-2">+ <img :src="PopupAddToCartVueModal.Picture.ImageUrl" :alt="PopupAddToCartVueModal.Picture.AlternateText" :title="PopupAddToCartVueModal.Picture.Title" />+ </div>+ <div>+ <a :href="'/' + PopupAddToCartVueModal.ProductSeName"><h4>{{PopupAddToCartVueModal.ProductName}}</h4></a>+ <template v-if="PopupAddToCartVueModal.AttributeDescription !== ''">+ <div class="form-group col-12 px-0 d-none d-md-block my-2">+ <label class="w-100 mb-0"><strong>@Loc["AddToCart.Attributes"]</strong></label>+ <div class="attributes p-2" v-html="PopupAddToCartVueModal.AttributeDescription">+ </div>+ </div>+ </template>+ <template v-if="PopupAddToCartVueModal.ReservationInfo !== null">+ <div class="form-group col-12 px-0 d-none d-md-block">+ <label class="w-100"><strong>@Loc["AddToCart.ReservationInfo"]</strong></label>+ <div class="attributes p-2" v-html="PopupAddToCartVueModal.ReservationInfo">+ </div>+ </div>+ </template>+ <template v-if="!PopupAddToCartVueModal.IsAuction">+ <div class="form-group col-12 pl-0 mb-0 d-flex">+ <label class="mb-0"><strong>@Loc["AddToCart.Qty"]</strong></label>+ <label class="pl-3 mb-0">{{PopupAddToCartVueModal.Quantity}}</label>+ </div>+ </template>+ <template v-else>+ <div class="form-group col-12 pl-0 mb-0 d-flex">+ <template v-if="PopupAddToCartVueModal.EndTime !== null">+ <div>+ <template v-if="new Date(PopupAddToCartVueModal.EndTime).getTime() > new Date().getTime()">+ <countdown :end-time="new Date(PopupAddToCartVueModal.EndTime).getTime()">+ <template v-slot:process="{ timeObj }">+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>+ <span>{{ `${timeObj.d}` }} </span>+ <span>: {{ `${timeObj.h}` }} </span>+ <span>: {{ `${timeObj.m}` }} </span>+ <span>: {{ `${timeObj.s}` }}</span>+ </template>+ <template v-slot:finish>+ <span>@Loc["ShoppingCart.Auctionends"]</span>+ </template>+ </countdown>+ </template>+ <template v-else>+ <label>@Loc["ShoppingCart.Auctionends"]: {{PopupAddToCartVueModal.EndTime.Value}}</label>+ </template>+ </div>+ </template>+ </div>+ </template>++ <div class="form-group col-12 pl-0 mb-1 d-flex">+ <template v-if="PopupAddToCartVueModal.IsAuction">+ <label class=""><strong>@Loc["AddToCart.Yourbid"]:</strong></label>+ <label class="pl-3 mb-0">{{PopupAddToCartVueModal.HighestBid}}</label>+ </template>+ <template v-else>+ <label class=""><strong>@Loc["AddToCart.Price"]</strong></label>+ <label class="pl-3 mb-0">{{PopupAddToCartVueModal.Price}}</label>+ </template>+ </div>+ </div>+ <div class="col-12">+ <div class="jumbotron border mt-3 mb-0 p-3 text-center">+ <h5>+ <template v-if="PopupAddToCartVueModal.CartType == 1">+ @Loc["AddToCart.Cart.Items"].ToString().Replace("{0}", "{{PopupAddToCartVueModal.TotalItems}}")+ </template>+ <template v-else-if="PopupAddToCartVueModal.CartType == 2">+ @Loc["AddToCart.Wishlist.Items"].ToString().Replace("{0}", "{{PopupAddToCartVueModal.TotalItems}}")+ </template>+ <template v-else-if="PopupAddToCartVueModal.CartType == 3">+ @Loc["AddToCart.Auctions.Ongoing"].ToString().Replace("{0}", "{{PopupAddToCartVueModal.TotalItems}}")+ </template>+ </h5>+ <div class="lead">+ <template v-if="PopupAddToCartVueModal.SubTotalDiscount !== null">+ <div class="form-group mb-1 d-flex justify-content-center">+ <label class="text-muted mb-0">@Loc["AddToCart.SubTotalDiscount"]</label>+ <label class="pl-3 mb-0 text-muted">{{PopupAddToCartVueModal.SubTotalDiscount}}</label>+ </div>+ </template>+ <template v-if="PopupAddToCartVueModal.SubTotal !== null">+ <div class="form-group mb-0 d-flex justify-content-center">+ <label class="text-dark mb-0">@Loc["AddToCart.SubTotal"]</label>+ <label class="pl-3 mb-0 text-dark mb-0">{{PopupAddToCartVueModal.SubTotal}}</label>+ </div>+ </template>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ <div class="card-footer">+ <div class="btn-group w-100" role="group">+ <template v-if="PopupAddToCartVueModal.CartType == 3">+ <button class="btn btn-outline-secondary text-uppercase" @@click='$bvModal.hide("ModalAddToCart")'>@Loc["AddToCart.Continue"]</button>+ </template>+ <template v-else>+ <button class="btn btn-outline-secondary text-uppercase" @@click='$bvModal.hide("ModalAddToCart")'>@Loc["AddToCart.Continue"]</button>+ </template>+ <template v-if="PopupAddToCartVueModal.CartType == 1 || PopupAddToCartVueModal.CartType == 0">+ <button class="btn btn-secondary text-uppercase" @@click="location='@(Url.RouteUrl("ShoppingCart"))'">@Loc["AddToCart.ViewCart"]</button>+ </template>+ <template v-else-if="PopupAddToCartVueModal.CartType == 2">+ <button class="btn btn-secondary text-uppercase" @@click="location='@(Url.RouteUrl("Wishlist"))'">@Loc["AddToCart.ViewWishlist"]</button>+ </template>+ <template v-else-if="PopupAddToCartVueModal.CartType == 3">+ <button class="btn btn-secondary text-uppercase" @@click="location='@(Url.RouteUrl("CustomerAuctions"))'">@Loc["AddToCart.ViewAuctions"]</button>+ </template>+ </div>+ </div>+ </div>+ </template>+</b-modal>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductBoxListVue.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductBoxListVue.cshtmlnew file mode 100644index 000000000..dc1350567--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductBoxListVue.cshtml@@ -0,0 +1,172 @@+<template id="product-box-list-vue" asp-footer="true">+<b-card no-body class="product-box show list product-provider mb-3">+ <template v-if="Model.Flag !== null">+ <div class="flag-label" v-html="Model.Flag"></div>+ </template> <div class="picture-container">+ <b-link class="img-container" :href="'/' + Model.SeName" :title="Model.DefaultPictureModel.Title">+ <b-img-lazy width="150" height="200" :alt="Model.DefaultPictureModel.AlternateText" class="main-product-img" :src="Model.DefaultPictureModel.ImageUrl" :title="Model.DefaultPictureModel.Title"></b-img-lazy>+ <template v-if="Model.SecondPictureModel.ImageUrl !== null">+ <b-img-lazy width="150" height="200" class="hover-img" :alt="Model.SecondPictureModel.AlternateText" :src="Model.SecondPictureModel.ImageUrl"></b-img-lazy>+ </template>+ </b-link>+ </div> <b-card-body>+ <h5 class="card-title"> <a :href="'/' + Model.SeName"> {{Model.Name}} </a> </h5>+ <template v-if="Model.ShowSku && Model.Sku !== null">+ <span class="sku">{{Model.Sku}}</span>+ </template> <div class="prices-rating">+ <template v-if="Model.ReviewOverviewModel.AllowCustomerReviews">+ <div class="rating">+ <template v-if="Model.ReviewOverviewModel.TotalReviews > 0">+ <b-form-rating :id="'rating-inline-grid-' + Model.Id" class="p-0" variant="gold" aria-label="Rating" no-border size="sm" show-value precision="2" readonly inline :value="Model.ReviewOverviewModel.RatingSum / Model.ReviewOverviewModel.TotalReviews"></b-form-rating>+ </template>+ <template v-else>+ <b-form-rating :id="'rating-inline-grid-' + Model.Id" class="p-0" variant="gold" no-border size="sm" show-value precision="2" readonly inline :value="0"></b-form-rating>+ </template> <b-link :href="'/' + Model.SeName">{{Model.ReviewOverviewModel.TotalReviews}} @Loc["Reviews.Overview.Reviews"]</b-link>+ </div>+ </template>+ <template v-if="Model.ProductType == 25">+ <template v-if="Model.EndTime !== null">+ <div class="countdown-box alert alert-info w-100 mb-1">+ <template v-if="new Date(Model.EndTime).getTime() > new Date().getTime()">+ <countdown :end-time="new Date(Model.EndTime).getTime()">+ <template v-slot:process="{ timeObj }">+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>+ <span>{{ `${timeObj.d}` }} : </span>+ <span>{{ `${timeObj.h}` }} : </span>+ <span>{{ `${timeObj.m}` }} : </span>+ <span>{{ `${timeObj.s}` }}</span>+ </template>+ <template v-slot:finish>+ <span>@Loc["ShoppingCart.Auctionends"]</span>+ </template>+ </countdown>+ </template>+ <template v-else>+ <div class="d-inline-flex flex-wrap justify-content-center"> <label class="ended-label">@Loc["ShoppingCart.Auctionends"]:</label> <div class="count-date">{{Model.EndTimeLocalTime.Value}}</div> </div>+ </template>+ </div>+ </template>+ </template> <div class="prices" v-bind:class="{ 'reservation-price': Model.ProductType == 20 }">+ <template v-if="Model.ProductType != 40">+ <div class="actual-price price"> {{Model.ProductPrice.Price}} </div>+ </template>+ <template v-else>+ <div class="actual-price price">+ <template v-if="Model.ProductPrice.HighestBidValue > 0 ">+ {{Model.ProductPrice.HighestBid}}+ </template>+ <template v-else>+ {{Model.ProductPrice.StartPrice}}+ </template>+ </div>+ </template>+ <template v-if="Model.ProductPrice.OldPrice !== null">+ <div class="old-price price"> {{Model.ProductPrice.OldPrice}} </div>+ </template>+ </div>+ </div> <div class="desc" v-html="Model.ShortDescription"></div>+ <template v-if="Model.ProductAttributeModels.length > 0">+ <div class="attr-container">+ <table>+ <tbody>+ <tr v-for="item in Model.ProductAttributeModels">+ <td> <div v-if="item.AttributeControlType !== 40 && item.AttributeControlType !== 45" class="attr-name"> {{item.Name}} </div> </td>+ <td>+ <div class="attr-value">+ <template v-for="spec in item.Values">+ <template v-if="item.AttributeControlType == 1 || item.AttributeControlType == 2 || item.AttributeControlType == 3 || item.AttributeControlType == 50">+ <b-button variant="light" size="sm" class="name" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name"> {{spec.Name}} </b-button>+ </template>+ <template v-if="item.AttributeControlType == 40">+ <template v-if="spec.ImageSquaresPictureModel.FullSizeImageUrl !== undefined">+ <b-button variant="light" size="sm" class="standard name color-container" :title="spec.Name" @@click="if(spec.PictureModel.FullSizeImageUrl !== null){vm.productImage($event)}" :data-href="spec.PictureModel.FullSizeImageUrl"> <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span> </b-button>+ </template>+ <template v-else>+ <b-button variant="light" size="sm" class="standard name color-container" :title="spec.Name" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name"> <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span> </b-button>+ </template>+ </template>+ <template v-if="item.AttributeControlType == 45">+ <template v-if="spec.ImageSquaresPictureModel.FullSizeImageUrl !== undefined">+ <b-button variant="light" size="sm" class="standard p-1 name image-container" v-on:click='if(spec.PictureModel.FullSizeImageUrl !== null){vm.productImage($event)}' :data-href="spec.PictureModel.FullSizeImageUrl"> <b-img-lazy :src="spec.ImageSquaresPictureModel.ImageUrl" :alt="spec.Name"></b-img-lazy> </b-button>+ </template>+ <template v-else>+ <b-button variant="light" size="sm" class="standard p-1 name image-container" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name"> <b-img-lazy :src="spec.ImageSquaresPictureModel.ImageUrl" alt="spec.Name"></b-img-lazy> </b-button>+ </template>+ </template>+ </template>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </template> <div class="mt-auto">+ <div class="list-button-container">+ <template v-if="Model.ShowQty">+ <input class="form-control input-group-addon catalog-quantity" type="number" :id="'addtocart_' + Model.Id + '_EnteredQuantity'" :name="'addtocart_' + Model.Id + '_EnteredQuantity'" value="1">+ </template>+ <template v-if="!Model.ProductPrice.DisableBuyButton">+ <template v-if="!Model.ShowQty">+ <a class="add-to-cart-button btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/1?quantity=1`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'">+ <span class="add-cart-text">+ <template v-if="Model.ProductType == 20">+ @Loc["ShoppingCart.Reservation"]+ </template>+ <template v-else>+ <template v-if="Model.ProductPrice.AvailableForPreOrder">+ @Loc["ShoppingCart.PreOrder"]+ </template>+ <template v-else>+ @Loc["ShoppingCart.AddToCart"]+ </template>+ </template>+ </span> <span class="sr-only">AddToCart</span>+ </a>+ </template>+ <template v-else>+ <a class="add-to-cart-button btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/2`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'">+ <template v-if="Model.ProductType == 20">+ @Loc["ShoppingCart.Reservation"]+ </template>+ <template v-else>+ <template v-if="Model.ProductPrice.AvailableForPreOrder">+ @Loc["ShoppingCart.PreOrder"]+ </template>+ <template v-else>+ @Loc["ShoppingCart.AddToCart"]+ </template>+ </template> <span class="sr-only">AddToCart</span>+ </a>+ </template>+ </template>+ <template v-else>+ <template v-if="Model.ProductType == 40">+ <a variant="info" class="add-to-cart-button btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`/addproducttocart/catalog/' + Model.Id +'/1?quantity=1`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'"> <span class="add-cart-text">@Loc["ShoppingCart.Bids"]</span> <span class="sr-only">AddToCart</span> </a>+ </template>+ </template> <div class="other-buttons">+ <a title="@Loc["Products.QuickView"]" v-b-tooltip.hover.bottom class="quick-view-button btn btn-outline-secondary" data-target="ModalQuickView" :onclick="'AxiosCart.quickview_product(`@Url.RouteUrl("QuickView-Product")/' + Model.Id + '`);return false;'"> <b-icon icon="search"></b-icon> </a>+ <template v-if="!Model.ProductPrice.DisableWishlistButton && Model.ProductType == 0">+ <template v-if="!Model.ShowQty">+ <a v-b-tooltip.hover.bottom title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/2?quantity=1`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'"> <b-icon icon="heart"></b-icon> <span class="sr-only">AddToWishlist</span> </a>+ </template>+ <template v-else>+ <a v-b-tooltip.hover.bottom title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/2`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'"> <b-icon icon="heart"></b-icon> <span class="sr-only">AddToWishlist</span> </a>+ </template>+ </template>+ <template v-if="!Model.ProductPrice.DisableAddToCompareListButton && Model.ProductType == 0">+ <a v-b-tooltip.hover.bottom title="@Loc["ShoppingCart.AddToCompareList"]" class="btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocomparelist(`'+ Model.Id +'`, `@Loc["Products.ProductHasBeenAddedToCompareList.Link"]`, `@Url.RouteUrl("CompareProducts")`)'"> <span class="sr-only">AddToCompareList</span> <b-icon icon="shuffle"></b-icon> </a>+ </template>+ </div>+ </div>+ </div>+ </b-card-body> <!--<template v-slot:footer> <template v-if="Model.SpecificationAttributeModels.length > 0"> <div class="spec-container"> <table> <tbody> <tr class="attr" v-for="item in Model.SpecificationAttributeModels" v-bind:id="item.SpecificationAttributeId"> <td> <div class="spec-name"> {{item.SpecificationAttributeName}} </div> </td> <td> <div class="spec-value"> <span v-html="item.ValueRaw"></span> </div> </td> </tr> </tbody> </table> </div> </template> <template v-if="Model.ProductAttributeModels.length > 0"> <div class="attr-container"> <table> <tbody> <tr v-for="item in Model.ProductAttributeModels" v-bind:id="item.ProductAttributeId"> <td> <div class="attr-name"> {{item.Name}} </div> </td> <td> <div class="attr-value"> <template v-for="spec in item.Values"> <template v-if="item.AttributeControlType == 1 || item.AttributeControlType == 2 || item.AttributeControlType == 3 || item.AttributeControlType == 50"> <b-button variant="light" size="sm" class="name" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name"> {{spec.Name}} </b-button> </template> <template v-if="item.AttributeControlType == 40"> <template v-if="spec.PictureModel.FullSizeImageUrl.length > 0"> <b-button variant="light" size="sm" class="name color-container" :title="spec.Name" @@click="vm.productImage($event)" :data-href="spec.PictureModel.FullSizeImageUrl"> <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span> </b-button> </template> <template v-else> <b-button variant="light" size="sm" class="name color-container" :title="spec.Name" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name"> <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span> </b-button> </template> </template> <template v-if="item.AttributeControlType == 45"> <template v-if="spec.PictureModel.FullSizeImageUrl.length > 0"> <b-button variant="light" size="sm" class="p-1 name image-container" v-on:click='productImage' :data-href="spec.PictureModel.FullSizeImageUrl"> <img :src="spec.ImageSquaresPictureModel?.ImageUrl" :alt="spec.Name" /> </b-button> </template> <template v-else> <b-button variant="light" size="sm" class="p-1 name image-container" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name"> <img :src="spec.ImageSquaresPictureModel?.ImageUrl" alt="spec.Name" /> </b-button> </template> </template> </template> </div> </td> </tr> </tbody> </table> </div> </template>--> @*<div class="desc" v-html="Model.ShortDescription"></div>*@ <!--</template>-->+</b-card>+</template>+<script asp-location="Footer" asp-order="118" type="module">+ Vue.component('product-box-list-vue', {+ template: '#product-box-list-vue',+ props: {+ Model: Object+ },+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductBoxVue.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductBoxVue.cshtmlnew file mode 100644index 000000000..0d30c8994--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductBoxVue.cshtml@@ -0,0 +1,244 @@+<template id="product-box-vue" asp-footer="true">+ <div class="card product-box show product-provider mb-2">+ <template v-if="Model.Flag !== null">+ <div class="flag-label">+ <span v-html="Model.Flag"></span>+ </div>+ </template>+ <div class="picture-container">+ <a class="img-container" :href="'/' + Model.SeName" :title="Model.DefaultPictureModel.Title">+ <b-img-lazy width="150" height="200" :alt="Model.DefaultPictureModel.AlternateText" class="main-product-img" :src="Model.DefaultPictureModel.ImageUrl" :title="Model.DefaultPictureModel.Title"></b-img-lazy>+ <template v-if="Model.SecondPictureModel.ImageUrl !== null">+ <b-img-lazy width="150" height="200" class="hover-img" :alt="Model.SecondPictureModel.AlternateText" :src="Model.SecondPictureModel.ImageUrl"></b-img-lazy>+ </template>+ </a>+ <template v-if="Model.ProductAttributeModels.length > 0">+ <div class="attr-container">+ <table>+ <tbody>+ <tr v-for="item in Model.ProductAttributeModels">+ <td>+ <div v-if="item.AttributeControlType !== 40 && item.AttributeControlType !== 45" class="attr-name">+ {{item.Name}}+ </div>+ </td>+ <td>+ <div class="attr-value">+ <template v-for="spec in item.Values">+ <template v-if="item.AttributeControlType == 1 || item.AttributeControlType == 2 || item.AttributeControlType == 3 || item.AttributeControlType == 50">+ <b-button variant="light" size="sm" class="name" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name">+ {{spec.Name}}+ </b-button>+ </template>+ <template v-if="item.AttributeControlType == 40">+ <template v-if="spec.ImageSquaresPictureModel.FullSizeImageUrl !== undefined">+ <b-button variant="light" size="sm" class="standard name color-container" :title="spec.Name" @@click="if(spec.PictureModel.FullSizeImageUrl !== null){vm.productImage($event)}" :data-href="spec.PictureModel.FullSizeImageUrl">+ <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span>+ </b-button>+ </template>+ <template v-else>+ <b-button variant="light" size="sm" class="standard name color-container" :title="spec.Name" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name">+ <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span>+ </b-button>+ </template>+ </template>+ <template v-if="item.AttributeControlType == 45">+ <template v-if="spec.ImageSquaresPictureModel.FullSizeImageUrl !== undefined">+ <b-button variant="light" size="sm" class="standard p-1 name image-container" v-on:click='if(spec.PictureModel.FullSizeImageUrl !== null){vm.productImage($event)}' :data-href="spec.PictureModel.FullSizeImageUrl">+ <b-img-lazy :src="spec.ImageSquaresPictureModel.ImageUrl" :alt="spec.Name"></b-img-lazy>+ </b-button>+ </template>+ <template v-else>+ <b-button variant="light" size="sm" class="standard p-1 name image-container" :href="'/'+ Model.SeName + '?' + item.Name + '=' + spec.Name">+ <b-img-lazy :src="spec.ImageSquaresPictureModel.ImageUrl" alt="spec.Name"></b-img-lazy>+ </b-button>+ </template>+ </template>+ </template>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </template>+ <div class="other-buttons">+ <template v-if="!Model.ProductPrice.DisableWishlistButton && Model.ProductType == 0">+ <template v-if="!Model.ShowQty">+ <a v-b-tooltip.hover.bottom title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/2?quantity=1`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'">+ <span class="icons icon-heart"></span>+ <span class="sr-only">AddToWishlist</span>+ </a>+ </template>+ <template v-else>+ <a v-b-tooltip.hover.bottom title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/2`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'">+ <span class="icons icon-heart"></span>+ <span class="sr-only">AddToWishlist</span>+ </a>+ </template>+ </template>+ <template v-if="!Model.ProductPrice.DisableAddToCompareListButton && Model.ProductType == 0">+ <a v-b-tooltip.hover.bottom title="@Loc["ShoppingCart.AddToCompareList"]" class="btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocomparelist(`'+ Model.Id +'`, `@Loc["Products.ProductHasBeenAddedToCompareList.Link"]`, `@Url.RouteUrl("CompareProducts")`)'">+ <span class="sr-only">AddToCompareList</span>+ <span class="icons icon-shuffle"></span>+ </a>+ </template>+ </div>+ <div class="qvb-container">+ <a title="@Loc["Products.QuickView"]" class="quick-view-button w-100 btn btn-secondary" data-target="ModalQuickView" :onclick="'AxiosCart.quickview_product(`@Url.RouteUrl("QuickView-Product")/' + Model.Id + '`);return false;'">+ <span class="icons icon-magnifier"></span>+ <span>@Loc["Products.QuickView"]</span>+ </a>+ </div>+ </div>+ <div class="card-body">+ <h5 class="card-title">+ <a :href="'/' + Model.SeName">+ {{Model.Name}}+ </a>+ </h5>+ <template v-if="Model.ShowSku && Model.Sku !== null">+ <span class="sku">{{Model.Sku}}</span>+ </template>+ <div class="prices-rating">+ <template v-if="Model.ReviewOverviewModel.AllowCustomerReviews">+ <div class="rating">+ <template v-if="Model.ReviewOverviewModel.TotalReviews > 0">+ <b-form-rating :id="'rating-inline-grid-' + Model.Id" icon-full="star-fill" icon-empty="star-fill" class="p-0" aria-label="Rating" no-border size="sm" show-value precision="2" readonly inline :value="Model.ReviewOverviewModel.RatingSum / Model.ReviewOverviewModel.TotalReviews"></b-form-rating>+ </template>+ <template v-else>+ <b-form-rating :id="'rating-inline-grid-' + Model.Id" icon-empty="star-fill" class="p-0" no-border size="sm" show-value precision="2" readonly inline :value="0"></b-form-rating>+ </template>+ <b-link :href="'/' + Model.SeName">{{Model.ReviewOverviewModel.TotalReviews}} @Loc["Reviews.Overview.Reviews"]</b-link>+ </div>+ </template>+ <template v-if="Model.ProductType == 40">+ <template v-if="Model.EndTime !== null">+ <div class="countdown-box alert alert-info w-100 mb-1">+ <template v-if="new Date(Model.EndTime).getTime() > new Date().getTime()">+ <countdown :end-time="new Date(Model.EndTime).getTime()">+ <template v-slot:process="{ timeObj }">+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]:</span>+ <span>{{ `${timeObj.d}` }} : </span>+ <span>{{ `${timeObj.h}` }} : </span>+ <span>{{ `${timeObj.m}` }} : </span>+ <span>{{ `${timeObj.s}` }}</span>+ </template>+ <template v-slot:finish>+ <span>@Loc["ShoppingCart.Auctionends"]</span>+ </template>+ </countdown>+ </template>+ <template v-else>+ <div class="d-inline-flex flex-wrap justify-content-center">+ <label class="ended-label">@Loc["ShoppingCart.Auctionends"]:</label>+ <div class="count-date">{{Model.EndTimeLocalTime.Value}}</div>+ </div>+ </template>+ </div>+ </template>+ </template>+ <div class="prices" v-bind:class="{ 'reservation-price': Model.ProductType == 20 }">+ <template v-if="Model.ProductType != 40">+ <div class="actual-price price">+ {{Model.ProductPrice.Price}}+ </div>+ </template>+ <template v-else>+ <div class="actual-price price">+ <template v-if="Model.ProductPrice.HighestBidValue > 0 ">+ {{Model.ProductPrice.HighestBid}}+ </template>+ <template v-else>+ {{Model.ProductPrice.StartPrice}}+ </template>+ </div>+ </template>+ <template v-if="Model.ProductPrice.OldPrice !== null">+ <div class="old-price price">+ {{Model.ProductPrice.OldPrice}}+ </div>+ </template>+ </div>+ </div>+ </div>+ <div class="card-footer">+ <template v-if="Model.SpecificationAttributeModels[0] !== null">+ <div class="spec-container animate__animated" data-animation="animate__fadeIn" data-delay="animate__delay-1s">+ <table>+ <tbody>+ <tr v-for="group in Model.SpecificationAttributeModels">+ <template v-if="group[0] !== undefined">+ <td>+ {{group[0].SpecificationAttributeName}}+ </td>+ <td v-for="spec in group" v-bind:id="spec.SpecificationAttributeId">+ <template v-if="spec.ColorSquaresRgb == null">+ <div class="spec-value"> <span v-html="spec.ValueRaw"></span></div>+ </template>+ </td>+ </template>+ </tr>+ </tbody>+ </table>+ </div>+ </template>+ <div class="desc" v-html="Model.ShortDescription"></div>+ <template v-if="Model.ShowQty">+ <input class="form-control input-group-addon catalog-quantity" type="number" :id="'addtocart_' + Model.Id + '_EnteredQuantity'" :name="'addtocart_' + Model.Id + '_EnteredQuantity'" value="1">+ </template>+ <template v-if="!Model.ProductPrice.DisableBuyButton">+ <template v-if="!Model.ShowQty">+ <a class="add-to-cart-button btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/1?quantity=1`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'">+ <span class="add-cart-text">+ <template v-if="Model.ProductType == 20">+ @Loc["ShoppingCart.Reservation"]+ </template>+ <template v-else>+ <template v-if="Model.ProductPrice.AvailableForPreOrder">+ @Loc["ShoppingCart.PreOrder"]+ </template>+ <template v-else>+ @Loc["ShoppingCart.AddToCart"]+ </template>+ </template>+ </span>+ <span class="sr-only">AddToCart</span>+ </a>+ </template>+ <template v-else>+ <a class="add-to-cart-button btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/2`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'">+ <template v-if="Model.ProductType == 20">+ @Loc["ShoppingCart.Reservation"]+ </template>+ <template v-else>+ <template v-if="Model.ProductPrice.AvailableForPreOrder">+ @Loc["ShoppingCart.PreOrder"]+ </template>+ <template v-else>+ @Loc["ShoppingCart.AddToCart"]+ </template>+ </template>+ <span class="sr-only">AddToCart</span>+ </a>+ </template>+ </template>+ <template v-else>+ <template v-if="Model.ProductType == 40">+ <a variant="info" class="add-to-cart-button btn btn-outline-secondary" :onclick="'AxiosCart.addproducttocart_catalog(`@Url.RouteUrl("AddProductCatalog")/' + Model.Id +'/1?quantity=1`, `' + Model.ShowQty +'`,`' + Model.Id + '`);return false;'">+ <span class="add-cart-text">@Loc["ShoppingCart.Bids"]</span>+ <span class="sr-only">AddToCart</span>+ </a>+ </template>+ </template>+ </div>+ </div>+</template>+<script asp-location="Footer" asp-order="118" type="module">+ Vue.component('product-box-vue', {+ template: '#product-box-vue',+ props: {+ Model: Object+ },+ });+</script>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductQuickView.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductQuickView.cshtmlnew file mode 100644index 000000000..b0e998b6a--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ProductQuickView.cshtml@@ -0,0 +1,307 @@+@{+ var categoryLink = @Url.RouteUrl("Category");+ var productLink = @Url.RouteUrl("Product");+}+<b-modal id="ModalQuickView" ref="ModalQuickView" :dark-theme="darkMode" @@shown="initReservationQV(), QuickViewShown()" size="xl" centered hide-footer hide-header>+<template v-if="PopupQuickViewVueModal !== null">+<form method="post" id="product-details-form" :action="'/' + PopupQuickViewVueModal.SeName">+<div itemscope itemtype="http://schema.org/Product" :data-productid="PopupQuickViewVueModal.Id">+<div class="quick-view">+<div class="col-12 px-0">+<div class="form-row">+<div class="col-lg-5 col-12">+ <div v-if="PopupQuickViewVueModal.PictureModels.length > 1" class="product-gallery">+ <swiper ref="QuickViewSlider"+ :options="QuickViewSlider.swiperOptions">+ <swiper-slide class="slide-wide" v-for="picture in PopupQuickViewVueModal.PictureModels">+ <img class="img-fluid" :src="picture.ImageUrl" :data-srcs="picture.ImageUrl" :alt="picture.AlternateText" :title="picture.Title"/>+ </swiper-slide>+ <div class="swiper-button-prev" slot="button-prev"></div>+ <div class="swiper-button-next" slot="button-next"></div>+ </swiper>+ <swiper ref="QuickViewSliderThumbs"+ :options="QuickViewSliderThumbs.swiperOptions"+ class="thumbs">+ <swiper-slide class="slide-wide" v-for="(picture, index) in PopupQuickViewVueModal.PictureModels">+ <img @@click="vm.slideTo($event.target)" :data-index="index" class="img-thumb" :src="picture.ThumbImageUrl" :alt="picture.AlternateText" :title="picture.Title" :data-img="picture.ImageUrl"/>+ </swiper-slide>+ </swiper>+ </div>+ <div v-else class="product-picture">+ <img :src="PopupQuickViewVueModal.DefaultPictureModel.ImageUrl" :alt="PopupQuickViewVueModal.DefaultPictureModel.AlternateText" :title="PopupQuickViewVueModal.DefaultPictureModel.Title" class="img-fluid" id="main_qv_img"/>+ </div>+</div>+<div class="col-lg-7 col-12">+<div class="quick-view-overview">+<template v-if="PopupQuickViewVueModal.Breadcrumb.Enabled">+ <div class="container px-0">+ <ol class="breadcrumb pt-0 mb-3" itemscope="itemscope" itemtype="http://schema.org/BreadcrumbList">+ <li class="breadcrumb-item" itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem">+ <a href="@Url.RouteUrl("HomePage")" target="_self">+ <b-icon icon="house-door" scale="1.25" shift-v="1.25" aria-hidden="true"></b-icon>+ <span itemprop="name">@Loc["Products.Breadcrumb.Top"]</span>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ id="@Url.RouteUrl("HomePage")">+ </span>+ <meta itemprop="position" content="1"/>+ </a>+ </li>+ <template v-for="(category, index) in PopupQuickViewVueModal.Breadcrumb.CategoryBreadcrumb">+ <li itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem" class="breadcrumb-item">+ <a :href="category.SeName" target="_self">+ <span itemprop="name">{{category.Name}}</span>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ :id="category.SeName">+ </span>+ <meta itemprop="position" :content="index + 2"/>+ </a>+ </li>+ </template>+ <li itemprop="itemListElement" itemscope="itemscope" itemtype="http://schema.org/ListItem" class="breadcrumb-item active">+ <strong class="current-item" itemprop="name">{{PopupQuickViewVueModal.Breadcrumb.ProductName}}</strong>+ <span itemprop="item" itemscope itemtype="http://schema.org/Thing"+ :id="'@productLink' + PopupQuickViewVueModal.SeName">+ </span>+ <meta itemprop="position" content="2"/>+ </li>+ </ol>+ </div>+</template>+<h2 class="qv-title">+ <a :href="'@productLink' + PopupQuickViewVueModal.SeName">+ {{PopupQuickViewVueModal.Name}}+ </a>+</h2>+<template v-if="PopupQuickViewVueModal.ProductReviewOverview.AllowCustomerReviews">+ <div class="d-inline-flex align-items-center">+ <b-form-rating :id="'rating-inline-overview-' + PopupQuickViewVueModal.Id" class="p-0" variant="warning" no-border size="sm" show-value precision="2" readonly inline :value="PopupQuickViewVueModal.ProductReviewOverview.RatingSum / PopupQuickViewVueModal.ProductReviewOverview.TotalReviews"></b-form-rating>+ <span class="review-count">{{PopupQuickViewVueModal.ProductReviewOverview.TotalReviews}} @Loc["Reviews.Overview.Reviews"]</span>+ </div>+</template>+<a class="modal-close" @@click="$bvModal.hide('ModalQuickView')">+ <b-icon icon="x"></b-icon>+</a>+<template>+<div class="accordion" role="tablist">+<div role="tab">+ <a v-b-toggle.accordion-qv-details class="btn btn-light collapse-button">+ <span class="icons icon-info"></span>+ <span>@Loc["products.details"]</span>+ <b-icon icon="chevron-double-down"></b-icon>+ </a>+</div>+<b-collapse class="collapse-panel" visible id="accordion-qv-details" accordion="accordion-qv-details" role="tabpanel">+ <template v-if="PopupQuickViewVueModal.StockAvailability !== ''">+ <div class="stock mb-3">+ <label class="label col-form-label">@Loc["Products.Availability"]:</label>+ <span class="value" :id="'stock-availability-value-' + PopupQuickViewVueModal.Id">+ <link itemprop="availability" href="http://schema.org/InStock"/>+ <template v-if="PopupQuickViewVueModal.StockAvailability !== ''">+ {{PopupQuickViewVueModal.StockAvailability}}+ </template>+ <template v-else-if="PopupQuickViewVueModal.DisplayDiscontinuedMessage">+ @Loc["Products.Discontinued"]+ </template>+ </span>+ </div>+ </template>++ @* PRODUCT BUNDLES *@++ <partial name="Partials/QuickView/ProductBundles"/>++ @* ATTRIBUTES *@++ <partial name="Partials/QuickView/Attributes"/>++ <template v-if="PopupQuickViewVueModal.ProductAttributes.length > 0">+ <div class="attributes">+ <table class="table">+ <template v-for="(attribute, index) in PopupQuickViewVueModal.ProductAttributes">+ <product-attribute-quickview :ref="'QVattribute' + index" :attribute="attribute"></product-attribute-quickview>+ </template>+ </table>+ </div>+ </template>++ <script asp-location="Footer" asp-order="302">+ Vue.component('product-attribute-quickview', {+ template: '#product-attribute-quickview',+ props: {+ attribute: null+ }+ });+ </script>++ @* WAREHOUSES *@++ <partial name="Partials/QuickView/Warehouses"/>++ @* RESERVATIONS *@++ <partial name="Partials/QuickView/ReservationInfo"/>++ @* GIFT VOUCHERS *@++ <partial name="Partials/QuickView/GiftVoucherInfo"/>++ @* PRICES *@++ <partial name="Partials/QuickView/Prices"/>++ @* AUCTION *@++ <partial name="Partials/QuickView/AuctionInfo"/>++ @* ADD TO CART *@++ <template v-if="PopupQuickViewVueModal.ProductType !== 10">+ <partial name="Partials/QuickView/AddToCart"/>+ <template v-if="(!PopupQuickViewVueModal.AddToCart.DisableWishlistButton || PopupQuickViewVueModal.CompareProductsEnabled || PopupQuickViewVueModal.EmailAFriendEnabled) && PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId == null">+ <div class="btn-group mt-2 mb-3 w-100">+ <partial name="Partials/QuickView/AddToWishlist"/>+ <partial name="Partials/QuickView/ProductsComparison"/>+ </div>+ </template>+ </template>++ @* END OF ADD TO CART *@++</b-collapse>+<template v-if="PopupQuickViewVueModal.ProductSpecifications.length !== 0">+ <div role="tab">+ <a v-b-toggle.accordion-qv-spec class="btn btn-light collapse-button">+ <span class="icons icon-speedometer"></span>+ <span>@Loc["Products.Specs"]</span>+ <b-icon icon="chevron-double-down"></b-icon>+ </a>+ </div>+ <b-collapse class="collapse-panel" id="accordion-qv-spec" accordion="accordion-qv-spec" role="tabpanel">+ <div class="spec-container table-responsive">+ <table class="table data-table border-bottom-0">+ <colgroup>+ <col/>+ <col/>+ </colgroup>+ <tbody>+ <template v-for="item in PopupQuickViewVueModal.ProductSpecifications">+ <tr class="spec">+ <td class="border-bottom border-top-0">+ <div class="spec-name">+ {{item.SpecificationAttributeName}}+ </div>+ </td>+ <td class="border-bottom border-top-0">+ <div class="spec-value d-inline-flex w-100">+ <template v-if="item.ColorSquaresRgb !== null">+ <div class="color-squares mb-2 mr-2">+ <span class="color-container" :title="item.ValueRaw">+ <span class="color" v-bind:style="'background-color:' + item.ValueRaw"> </span>+ </span>+ </div>+ </template>+ <template v-else>+ <div class="mb-2 mr-2" v-html="item.ValueRaw"></div>+ </template>+ </div>+ </td>+ </tr>+ </template>+ </tbody>+ </table>+ </div>+ </b-collapse>+</template>+<template v-if="PopupQuickViewVueModal.ShortDescription !== null">+ <div role="tab">+ <a v-b-toggle.accordion-qv-desc class="btn btn-light collapse-button">+ <span class="icons icon-book-open"></span>+ <span>@Loc["Products.description"]</span>+ <b-icon icon="chevron-double-down"></b-icon>+ </a>+ </div>+ <b-collapse visible class="collapse-panel" id="accordion-qv-desc" accordion="accordion-qv-desc" role="tabpanel">+ <div class="qv-description" v-html="PopupQuickViewVueModal.ShortDescription"></div>+ </b-collapse>+</template>++@* ASSOCIATED PRODUCTS *@++<template v-if="PopupQuickViewVueModal.ProductType == 10">+ <div role="tab">+ <a v-b-toggle.accordion-qv-group class="btn btn-light collapse-button">+ <span class="icons icon-list"></span>+ <span>@Loc["admin.catalog.products.associatedproducts"]</span>+ <b-icon icon="chevron-double-down"></b-icon>+ </a>+ </div>+ <b-collapse visible class="collapse-panel" id="accordion-qv-group" accordion="accordion-qv-group" role="tabpanel">+ <template v-if="PopupQuickViewVueModal.AssociatedProducts.length > 0">+ <template v-for="variant in PopupQuickViewVueModal.AssociatedProducts">+ <div class="card overflow-hidden associatedItem mb-3">+ <div class="row" no-gutters>+ <div class="col-lg-3 col-md-4">+ <img :id="'main-product-img-' + variant.Id" :alt="variant.DefaultPictureModel.AlternateText" :src="variant.DefaultPictureModel.ImageUrl" class="rounded-0 img-fluid">+ </div>+ <div class="col-lg-9 col-md-8">+ <div class="card-body overview" :title="variant.Name">++ <!--short description-->++ <div v-if="variant.ShortDescription !== null" class="short-description mb-3" v-html="variant.ShortDescription"></div>++ <!--availability-->++ <template v-if="variant.StockAvailability !== null">+ <div class="stock">+ <label class="col-form-label">@Loc["Products.Availability"]:</label>+ <span class="value" :id="'stock-availability-value-' + variant.Id">+ <link itemprop="availability" href="http://schema.org/InStock"/>+ {{variant.StockAvailability}}+ </span>+ </div>+ </template>++ <!--attributes-->+ <template v-if="variant.ProductAttributes.length > 0">+ <div class="attributes">+ <table class="table">+ <template v-for="(attribute, index) in variant.ProductAttributes">+ <product-attribute-quickview :attribute="attribute"></product-attribute-quickview>+ </template>+ </table>+ </div>+ </template>++ <!--price & add to cart-->++ <partial name="Partials/QuickView/PricesGroup"/>+ <partial name="Partials/QuickView/AddToCartGroup"/>++ </div>+ </div>+ </div>+ </div>+ </template>+ </template>+ <template v-else>+ <div class="no-associated-products alert alert-info">+ @Loc["Products.NoAssociatedProducts"]+ </div>+ </template>+ </b-collapse>+</template>++@* END OF ASSOCIATED PRODUCTS *@+</div>+</template>+</div>+</div>+@*<partial name="Partials/LinkedProducts" />*@+</div>+</div>+</div>+</div>+</form>+</template>+</b-modal>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/AddToCart.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/AddToCart.cshtmlnew file mode 100644index 000000000..55223923f--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/AddToCart.cshtml@@ -0,0 +1,80 @@+@{+ var addtocart = @Url.RouteUrl("AddProductDetails");+ var updateitemcart = @Url.RouteUrl("UpdateItemCart");+}+<template v-if="PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId !== null">+ <input type="hidden" id="shoppingCartItemId" name="shoppingCartItemId" :value="UpdatedShoppingCartItemId" />+</template>+<template v-if="PopupQuickViewVueModal.AddToCart.EnteredPrice">+ <div class="customer-entered-price mb-3 d-flex w-100 flex-column">+ <div class="price-input">+ <label :for="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_CustomerEnteredPrice'" class="enter-price-label">@Loc["Products.EnterProductPrice"]</label>+ <input :id="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_CustomerEnteredPrice'" :name="'CustomerEnteredPrice'" type="text" :value="PopupQuickViewVueModal.AddToCart.CustomerEnteredPrice" class="form-control enter-price-input" />+ </div>+ <div class="price-range pt-1">+ {{PopupQuickViewVueModal.AddToCart.CustomerEnteredPriceRange}}+ </div>+ </div>+</template>+<div role="group" class="input-group product-add-to-cart flex-nowrap">+ <template v-if="!PopupQuickViewVueModal.AddToCart.DisableBuyButton || PopupQuickViewVueModal.AddToCart.EnteredPrice">+ <template v-if="PopupQuickViewVueModal.AddToCart.MinimumQuantityNotification !== null">+ <div class="min-qty-notification text-danger w-100 mb-2">{{PopupQuickViewVueModal.AddToCart.MinimumQuantityNotification}}</div>+ </template>+ </template>+ <template v-if="!PopupQuickViewVueModal.AddToCart.DisableBuyButton">+ <template v-if="PopupQuickViewVueModal.AddToCart.AllowedQuantities.length > 0">+ <select :id="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_EnteredQuantity'" :name="'EnteredQuantity'" class="custom-select form-control qty-dropdown mr-2">+ <template v-for="option in PopupQuickViewVueModal.AddToCart.AllowedQuantities">+ <option :value="option.Value" :disabled="option.Disabled" :selected="option.Selected">{{option.Text}}</option>+ </template>+ </select>+ </template>+ <template v-else>+ <label :for="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_EnteredQuantity'" class="sr-only">@Loc["ShoppingCart.AddToCart"]</label>+ <div class="qty-controls">+ <div class="plus" @@click="vm.$refs.qtyqv.value ++"></div>+ <div class="minus" @@click="vm.$refs.qtyqv.value --"></div>+ </div>+ <input ref="qtyqv" :value="PopupQuickViewVueModal.AddToCart.EnteredQuantity" :id="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_EnteredQuantity'" :name="'EnteredQuantity'" min="1" class="qty-input form-control text-center" type="number" inputmode="numeric" />+ <template v-if="PopupQuickViewVueModal.AddToCart.MeasureUnit !== ''">+ <span class="qty-unit d-flex align-items-center mr-2">+ {{PopupQuickViewVueModal.AddToCart.MeasureUnit}}+ </span>+ </template>+ </template>+ <div class="input-group-append w-100">+ <template v-if="typeof vmwishlist !== 'undefined' && PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId !== null">+ <button :id="'add-to-wishlist-button-' + PopupQuickViewVueModal.AddToCart.ProductId" class="btn btn-info add-to-cart-button d-inline-flex" title="@Loc[" ShoppingCart.AddToWishlist.Update"]" :data-productid="PopupQuickViewVueModal.AddToCart.ProductId" :onclick="'AxiosCart.updateitem(`@updateitemcart`, `#product-details-form`);return false;'" v-b-tooltip.hover.bottom>+ <span>+ @Loc["ShoppingCart.AddToWishlist.Update"]+ </span>+ </button>+ </template>+ <template v-else>+ <button type="button" :id="'add-to-cart-button-' + PopupQuickViewVueModal.AddToCart.ProductId" class="btn btn-info add-to-cart-button d-inline-flex"+ data-productid="PopupQuickViewVueModal.AddToCart.ProductId" :onclick="PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId !== null ?+ 'AxiosCart.updateitem(`@updateitemcart`, `#product-details-form`);return false;' :+ 'AxiosCart.addproducttocart_details(`@addtocart/' + PopupQuickViewVueModal.AddToCart.ProductId + '/1`, `#product-details-form`);return false;'">+ <span>+ <template v-if="PopupQuickViewVueModal.AddToCart.IsAuction">+ @Loc["ShoppingCart.BuyNow"]+ </template>+ <template v-else-if="PopupQuickViewVueModal.AddToCart.IsReservation">+ @Loc["ShoppingCart.Reservation"]+ </template>+ <template v-else-if="PopupQuickViewVueModal.AddToCart.AvailableForPreOrder">+ @Loc["ShoppingCart.PreOrder"]+ </template>+ <template v-else-if="PopupQuickViewVueModal.AddToCart.UpdateShoppingCartItemType !== null">+ @Loc["ShoppingCart.AddToCart.Update"]+ </template>+ <template v-else>+ @Loc["ShoppingCart.AddToCart"]+ </template>+ </span>+ </button>+ </template>+ </div>+ </template>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/AddToWishlist.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/AddToWishlist.cshtmlnew file mode 100644index 000000000..3b9774de5--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/AddToWishlist.cshtml@@ -0,0 +1,13 @@+@{+ var addtowishlist = @Url.RouteUrl("AddProductDetails");+}+<template v-if="!PopupQuickViewVueModal.AddToCart.DisableWishlistButton">+ <template v-if="PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId == null">+ <a :id="'add-to-wishlist-button-' + PopupQuickViewVueModal.AddToCart.ProductId" class="btn btn-outline-secondary add-to-wishlist-button mr-1" title="@Loc["ShoppingCart.AddToWishlist"]" :data-productid="PopupQuickViewVueModal.AddToCart.ProductId" :onclick="'AxiosCart.addproducttocart_details(`@addtowishlist/' + PopupQuickViewVueModal.AddToCart.ProductId + '/2`, `#product-details-form`);return false;'" v-b-tooltip.hover.bottom>+ <span class="sr-only">+ @Loc["ShoppingCart.AddToWishlist"]+ </span>+ <b-icon icon="heart"></b-icon>+ </a>+ </template>+</template>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/Attributes.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/Attributes.cshtmlnew file mode 100644index 000000000..8300f7c2f--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/Attributes.cshtml@@ -0,0 +1,169 @@+@{+ var fileLink = @Url.RouteUrl("UploadFileProductAttribute");+}+<template id="product-attribute-quickview" asp-footer="true">+ <tr>+ <td :id="'product_attribute_label_' + attribute.Id">+ <span class="attribute-name">{{attribute.Name}}</span> <span v-if="attribute.IsRequired" class="required">*</span>+ <template v-if="attribute.TextPrompt !==null">+ <span class="text-prompt">{{attribute.TextPrompt}}</span>+ </template>+ <template v-if="attribute.Description !==null">+ <span v-html="attribute.Description" class="attribute-description"></span>+ </template>+ </td>+ <td :id="'product_attribute_input_' + attribute.Id">+ <template v-if="attribute.AttributeControlType==4">+ <label :for="'product_attribute_' + attribute.Id" class="sr-only">product_attribute_{{attribute.Id}}</label>+ <input :name="'attributes[' + attribute.Id+']'" type="text" class="form-control textbox" :id="'product_attribute_' + attribute.Id" :value="attribute.DefaultValue" @@change="vm.attrchange(attribute.ProductId, true)" />+ </template>+ <template v-if="attribute.AttributeControlType==1">+ <label :for="'product_attribute_' + attribute.Id" class="sr-only">product_attribute_{{attribute.Id}}</label>+ <select :id="'product_attribute_' + attribute.Id" class="form-control custom-select" :name="'attributes[' + attribute.Id+']'" @@change="vm.attrchange(attribute.ProductId, true)">+ <template v-if="attribute.IsRequired==false">+ <option value="">---</option>+ </template>+ <option v-for="attributeValue in attribute.Values" :selected="attributeValue.IsPreSelected" :data-disable="attributeValue.Id" :value="attributeValue.Id">+ <template v-if="attributeValue.PriceAdjustment==null">+ {{attributeValue.Name}}+ </template>+ <template v-else>+ {{attributeValue.Name}}[{{attributeValue.PriceAdjustment}}]+ </template>+ </option>+ </select>+ </template>+ <template v-if="attribute.AttributeControlType==2">+ <ul class="option-list px-0 mb-0">+ <li v-for="attributeValue in attribute.Values">+ <fieldset>+ <legend class="sr-only">product_attribute_{{attribute.Id}}</legend>+ <label class="custom-control custom-radio">+ <input class="custom-control-input"+ :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id"+ type="radio"+ :name="'attributes[' + attribute.Id+']'"+ :value="attributeValue.Id"+ :checked="attributeValue.IsPreSelected"+ :data-disable="attributeValue.Id"+ @@change="vm.attrchange(attribute.ProductId, true)" />+ <span class="custom-control-label"></span>+ <span class="custom-control-description" :for="'product_attribute_' + attribute.Id + '_' + attributeValue.Id">+ <template v-if="attributeValue.PriceAdjustment==null">+ {{attributeValue.Name}}+ </template>+ <template v-else>+ {{attributeValue.Name}}[{{attributeValue.PriceAdjustment}}]+ </template>+ </span>+ </label>+ </fieldset>+ </li>+ </ul>+ </template>+ <template v-if="attribute.AttributeControlType==3 || attribute.AttributeControlType==50">+ <fieldset>+ <legend></legend>+ <ul class="option-list px-0 mb-0">+ <li v-for="attributeValue in attribute.Values">+ <label class="custom-control custom-checkbox">+ <input v-if="attribute.AttributeControlType==50"+ class="custom-control-input"+ :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id"+ type="checkbox"+ :name="'attributes[' + attribute.Id+']'"+ :value="attributeValue.Id"+ :checked="attributeValue.IsPreSelected"+ @@change="vm.attrchange(attribute.ProductId, true)"+ disabled="disabled" />+ <input v-else+ class="custom-control-input"+ :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id"+ type="checkbox"+ :name="'attributes[' + attribute.Id+']'"+ :value="attributeValue.Id"+ :checked="attributeValue.IsPreSelected"+ :data-disable="attributeValue.Id"+ @@change="vm.attrchange(attribute.ProductId, true)" />+ <span class="custom-control-label"></span>+ <span class="custom-control-description" :for="'product_attribute_' + attribute.Id + '_' + attributeValue.Id">+ <template v-if="attributeValue.PriceAdjustment==null">+ {{attributeValue.Name}}+ </template>+ <template v-else>+ {{attributeValue.Name}}[{{attributeValue.PriceAdjustment}}]+ </template>+ </span>+ </label>+ </li>+ </ul>+ </fieldset>+ </template>+ <template v-if="attribute.AttributeControlType==10">+ <textarea :id="'product_attribute_' + attribute.Id" :name="'attributes[' + attribute.Id+']'">{{attribute.DefaultValue}}</textarea>+ </template>+ <template v-if="attribute.AttributeControlType==30">+ <template>+ <div :id="'product_attribute_' + attribute.Id + 'uploader'">+ <b-form-file :accept="attribute.AllowedFileExtensions"+ type="file"+ id="qqfile"+ name="qqfile"+ :data-url="'@fileLink/' + attribute.Id + '?productId=' + attribute.ProductId"+ @@change="vm.uploadFile($event.target)" />+ </div>+ </template>+ <input class="hidden-upload-input"+ type="hidden"+ :id="'product_attribute_' + attribute.Id"+ :name="'attributes[' + attribute.Id+']'"+ v-model="attribute.DefaultValue"+ :value="attribute.DefaultValue" />+ <div id="download-message" class="alert my-2" style="display: none;"></div>+ <div :id="'product_attribute_' + attribute.Id + 'downloadurl'" class="download-file" style="display: none;"><a class="btn btn-outline-info"> Download </a></div>+ </template>+ <template v-if="attribute.AttributeControlType==40">+ <ul class="option-list color-squares w-100 d-inline-flex flex-wrap px-0 mb-0" :id="'color-squares-' + attribute.Id">+ <li v-for="attributeValue in attribute.Values" class="mr-1 p-0">+ <label :for="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" class="mb-0">+ <input :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" type="radio" :name="'attributes[' + attribute.Id+']'" :value="attributeValue.Id" :data-disable="attributeValue.Id" :checked="attributeValue.IsPreSelected" @@change="vm.attrchange(attribute.ProductId, true)" />+ <template v-if="attributeValue.PriceAdjustment==null">+ <span class="color-container" :title="attributeValue.Name"> <span class="color" :style="'background-color:' + attributeValue.ColorSquaresRgb"></span> </span>+ </template>+ <template v-else>+ <span class="color-container" :title="attributeValue.Name + ' [' + attributeValue.PriceAdjustment + ']'"> <span class="color" :style="'background-color:' + attributeValue.ColorSquaresRgb"></span> </span>+ </template>+ </label>+ </li>+ </ul>+ </template>+ <template v-if="attribute.AttributeControlType==45">+ <ul class="option-list color-squares w-100 d-inline-flex flex-wrap px-0 mb-0" :id="'color-squares-' + attribute.Id">+ <li v-for="attributeValue in attribute.Values" class="mr-1 p-0">+ <label :for="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" class="mb-0">+ <template v-if="attributeValue.PriceAdjustment==null">+ <input :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" type="radio" :name="'attributes[' + attribute.Id+']'" :value="attributeValue.Id" :checked="attributeValue.IsPreSelected" :data-disable="attributeValue.Id" @@change="vm.attrchange(attribute.ProductId, true)" />+ <span :id="'imgSqr_' + attributeValue.Id" class="color-container">+ <span class="color" :style="'background: url(' + attributeValue.ImageSquaresPictureModel.ImageUrl + ') 50% 50% no-repeat;'"></span>+ </span>+ <b-tooltip :target="'imgSqr_' + attributeValue.Id" placement="bottom">+ <div class="image-square-tooltip"><img :src="attributeValue.ImageSquaresPictureModel.FullSizeImageUrl" :alt="attributeValue.Name" /> <span>{{attributeValue.Name}}</span></div>+ </b-tooltip>+ </template>+ <template v-else>+ <input :id="'product_attribute_' + attribute.Id + '_' + attributeValue.Id" type="radio" :name="'attributes[' + attribute.Id+']'" :value="attributeValue.Id" :checked="attributeValue.IsPreSelected" :data-disable="attributeValue.Id" @@change="vm.attrchange(attribute.ProductId, true)" />+ <span class="color-container"> <span class="color" :style="'background: url(' + attributeValue.ImageSquaresPictureModel.ImageUrl + ') 50% 50% no-repeat;'"></span> </span>+ <b-tooltip :target="'imgSqr_' + attributeValue.Id" placement="bottom">+ <div class="image-square-tooltip">+ <img :src="attributeValue.ImageSquaresPictureModel.FullSizeImageUrl" :alt="attributeValue.Name + ' [' + attributeValue.PriceAdjustment + ']'" />+ <span>{{attributeValue.Name}}[{{attributeValue.PriceAdjustment}}]</span>+ </div>+ </b-tooltip>+ </template>+ </label>+ </li>+ </ul>+ </template>+ </td>+ </tr>+</template>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/ProductsComparison.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/ProductsComparison.cshtmlnew file mode 100644index 000000000..4e43b1139--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/ProductsComparison.cshtml@@ -0,0 +1,9 @@+@{+ var addtocomparelink = Url.RouteUrl("AddProductToCompare");+}+<template v-if="PopupQuickViewVueModal.CompareProductsEnabled">+ <a class="btn btn-outline-secondary add-to-compare-list-button mr-1" :onclick="'AxiosCart.addproducttocomparelist(`'+ PopupQuickViewVueModal.Id +'`, `@string.Format(Loc["Products.ProductHasBeenAddedToCompareList.Link"], Url.RouteUrl("CompareProducts"))`)'" v-b-tooltip.hover.bottom title="@Loc["Products.Compare.AddToCompareList"]">+ <b-icon icon="shuffle"></b-icon>+ <span class="sr-only">@Loc["Products.Compare.AddToCompareList"]</span>+ </a>+</template>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/SendFriend.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/SendFriend.cshtmlnew file mode 100644index 000000000..b9ef1ad03--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/SendFriend.cshtml@@ -0,0 +1,9 @@+@{+ var sendfriend = @Url.RouteUrl("ProductEmailAFriend");+}+<template v-if="PopupQuickViewVueModal.EmailAFriendEnabled">+ <a class="btn btn-outline-secondary email-a-friend-button mr-1" :href="'@sendfriend/' + PopupQuickViewVueModal.Id" v-b-tooltip.hover.bottom title="@Loc["Products.EmailAFriend"]">+ <span class="icons icon-envelope-letter"></span>+ <span class="sr-only">@Loc["Products.EmailAFriend"]</span>+ </a>+</template>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/Warehouses.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/Warehouses.cshtmlnew file mode 100644index 000000000..165d99ad5--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/QuickView/Warehouses.cshtml@@ -0,0 +1,24 @@+@{+ var warehouseLink = @Url.Action("productdetails_warehousechange", "product");+}+<template v-if="PopupQuickViewVueModal.AllowToSelectWarehouse">+ <template v-if="PopupQuickViewVueModal.ProductWarehouses.length > 0">+ <div class="mb-3">+ <label for="warehouseId" class="col-form-label">@Loc["Products.Warehouse"]:</label>+ <template v-if="PopupQuickViewVueModal.ProductAttributes.length > 0">+ <select class="custom-select form-control" name="WarehouseId" id="WarehouseId" @@change="vm.attrchange(PopupQuickViewVueModal.Id)">+ <template v-for="warehouse in PopupQuickViewVueModal.ProductWarehouses">+ <option :selected="warehouse.Selected" :value="warehouse.WarehouseId">{{warehouse.Name}}</option>+ </template>+ </select>+ </template>+ <template v-else>+ <select class="custom-select form-control" name="WarehouseId" id="WarehouseId" @@change="warehouse_change_handler(PopupQuickViewVueModal.Id, '@warehouseLink')">+ <template v-for="warehouse in PopupQuickViewVueModal.ProductWarehouses">+ <option :selected="warehouse.Selected" :value="warehouse.WarehouseId">{{warehouse.Name}}</option>+ </template>+ </select>+ </template>+ </div>+ </template>+</template>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ShoppingCartLinks.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ShoppingCartLinks.cshtmlnew file mode 100644index 000000000..645bcdeee--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/ShoppingCartLinks.cshtml@@ -0,0 +1,64 @@+@inject IWorkContext workContext+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService+@inject Grand.Business.Core.Interfaces.Checkout.Orders.IShoppingCartService shoppingCartService++@inject ShoppingCartSettings shoppingCartSettings+@inject CatalogSettings catalogSettings+@using Grand.Business.Core.Utilities.Common.Security+@{++ var shoppingCartTypes = new List<ShoppingCartType>();+ shoppingCartTypes.Add(ShoppingCartType.ShoppingCart);+ shoppingCartTypes.Add(ShoppingCartType.Auctions);+ if (shoppingCartSettings.AllowOnHoldCart)+ shoppingCartTypes.Add(ShoppingCartType.OnHoldCart);++ var shoppingCartEnabled = await permissionService.Authorize(StandardPermission.EnableShoppingCart);+ var wishlistEnabled = await permissionService.Authorize(StandardPermission.EnableWishlist);+ var miniShoppingCartEnabled = shoppingCartSettings.MiniShoppingCartEnabled;+ var shoppingCartItems =+ workContext.CurrentCustomer.ShoppingCartItems.Any() ?+ (await shoppingCartService.GetShoppingCart(workContext.CurrentStore.Id, shoppingCartTypes.ToArray()))+ .Sum(x => x.Quantity) : 0;++ var wishlistItems = workContext.CurrentCustomer.ShoppingCartItems.Any() ?+ (await shoppingCartService.GetShoppingCart(workContext.CurrentStore.Id, ShoppingCartType.Wishlist))+ .Sum(x => x.Quantity) : 0;++}+@if (catalogSettings.CompareProductsEnabled)+{+ <partial name="Partials/SidebarCompareProducts" />+}+@if (wishlistEnabled || shoppingCartEnabled)+{+ @if (miniShoppingCartEnabled)+ {+ if (wishlistEnabled)+ {+ <partial name="Partials/SidebarWishlist" model="wishlistItems" />+ }+ <partial name="Partials/SidebarShoppingCart" model="shoppingCartItems" />+ }+ else+ {+ if (wishlistEnabled)+ {+ <li class="nav-item">+ <a class="nav-link" href="@Url.RouteUrl("Wishlist")">+ <span class="icon-heart icons"></span>+ <div class="qty-indicator wishlist-qty" ref="wishlistQty">@Loc["Wishlist.HeaderQuantity", wishlistItems]</div>+ </a>+ </li>+ }+ if (shoppingCartEnabled)+ {+ <li class="nav-item">+ <a class="nav-link" href="@Url.RouteUrl("ShoppingCart")">+ <span class="icon-basket icons"></span>+ <div class="qty-indicator cart-qty">@Loc["ShoppingCart.HeaderQuantity", shoppingCartItems]</div>+ </a>+ </li>+ }+ }+}\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarCompareProducts.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarCompareProducts.cshtmlnew file mode 100644index 000000000..c8acb4bef--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarCompareProducts.cshtml@@ -0,0 +1,73 @@+<li class="nav-item">+ <ul class="sidebar-cart px-0">+ <li class="nav-item">+ <a class="nav-link" @@click="getCompareList('@Url.RouteUrl("CompareProducts")')" v-b-toggle.sidebar-compare>+ <span class="icons icon-shuffle"></span>+ <span class="qty-indicator">+ {{compareProductsQty}}+ </span>+ </a>+ </li>+ <template>+ <li>+ <b-sidebar id="sidebar-compare" backdrop right text-variant="standard">+ <template v-slot:title>+ @Loc["Products.Compare.Title"]+ </template>+ <template v-if="compareProductsQty > 0">+ <template v-if="compareproducts !== null">+ <template v-for="product in compareproducts.Products">+ <div class="item comapre-product d-inline-flex no-wrap">+ <a :href="product.Url" :title="product.DefaultPictureModel.Title" v-if="product.DefaultPictureModel.ImageUrl">+ <b-img :alt="product.DefaultPictureModel.AlternateText" :src="product.DefaultPictureModel.ImageUrl" :title="product.DefaultPictureModel.Title" fluid></b-img>+ </a>+ <div class="col">+ <a :href="product.Url">{{product.Name}}</a>+ <div class="price"><span>@Loc["Wishlist.Mini.UnitPrice"]:</span> <strong>{{product.ProductPrice.Price}}</strong></div>+ </div>+ <div>+ <a class="deleteitem" @@click="removeFromCompareList(product.Id); getCompareList('@Url.RouteUrl("CompareProducts")'); ">+ <b-icon icon="trash" variant="danger"></b-icon>+ </a>+ </div>+ </div>+ </template>+ </template>+ <template v-if="loader">+ <div class="d-flex justify-content-center align-items-center h-100" v-if="wishlistitems == undefined">+ <div class="spinner-border text-info" role="status">+ </div>+ </div>+ </template>+ </template>+ <template v-else>+ <div class="d-flex flex-column justify-content-center align-items-center">+ <b-icon icon="shuffle" font-scale="7.5" variant="secondary"></b-icon>+ <div class="text-center text-muted mt-3">@Loc["Products.Compare.NoItems"]</div>+ </div>+ </template>+ <template v-slot:footer>+ <template v-if="compareProductsQty > 0">+ <b-col class="p-3">+ <div class="form-row">+ <div class="col-lg-6 col-12">+ <a class="btn btn-secondary d-flex align-items-center justify-content-center w-100 h-100 py-3 text-uppercase" href="@Url.RouteUrl("CompareProducts")">+ <b-icon icon="shuffle" class="pr-2"></b-icon>+ @Loc["Products.Compare.Title"]+ </a>+ </div>+ <div class="col-lg-6 col-12 mt-lg-0 mt-2">+ <a class="btn btn-secondary d-flex align-items-center justify-content-center w-100 h-100 py-3 text-uppercase" @@click="removeFromCompareList()">+ <b-icon icon="trash" class="pr-2"></b-icon>+ @Loc["Products.Compare.Clear"]+ </a>+ </div>+ </div>+ </b-col>+ </template>+ </template>+ </b-sidebar>+ </li>+ </template>+ </ul>+</li>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarShoppingCart.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarShoppingCart.cshtmlnew file mode 100644index 000000000..a93e51882--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarShoppingCart.cshtml@@ -0,0 +1,79 @@+@model int+<li class="nav-item">+ <ul class="sidebar-cart cart-only px-0">+ <li class="nav-item">+ <a class="nav-link" @@click="if(flycartfirstload){updateSidebarShoppingCart('@Url.RouteUrl("SidebarShoppingCart")')}" v-b-toggle.sidebar-cart>+ <span class="icon-basket icons"></span>+ <span class="qty-indicator cart-qty">+ <template v-if="flycartindicator == null">+ @Loc["ShoppingCart.HeaderQuantity", Model]+ </template>+ <template v-else>+ {{flycartindicator}}+ </template>+ </span>+ </a>+ </li>+ <template>+ <li>+ <b-sidebar id="sidebar-cart" backdrop right text-variant="standard">+ <template v-slot:title v-if="flycartindicator > 0">+ @Html.Raw(string.Format(Loc["ShoppingCart.Mini.ItemsText"], string.Format("<a href=\"{0}\">{1}</a>", Url.RouteUrl("ShoppingCart"), string.Format(Loc["ShoppingCart.Mini.Items"], "{{flycartindicator}}"))))+ </template>+ <template v-slot:title v-else>+ @Loc["ShoppingCart.Mini.NoItems"]+ </template>+ <div class="d-flex justify-content-center align-items-center h-100" v-if="flycartitems == undefined">+ <div class="spinner-border text-info" role="status">+ </div>+ </div>+ <div v-for="item in flycartitems" class="item d-inline-flex no-wrap">+ <a :href="item.ProductUrl" :title="item.Picture.Title" v-if="item.Picture.ImageUrl">+ <b-img :alt="item.Picture.AlternateText" :src="item.Picture.ImageUrl" :title="item.Picture.Title" fluid></b-img>+ </a>+ <div class="col">+ <a :href="item.ProductUrl">{{item.ProductName}}</a>+ <div class="attributes p-2" v-if="item.AttributeInfo">+ <div v-html="item.AttributeInfo"></div>+ </div>+ <div class="price"><span>@Loc["ShoppingCart.Mini.UnitPrice"]:</span> <strong>{{item.UnitPrice}}</strong></div>+ <div class="quantity"><span>@Loc["ShoppingCart.Mini.Quantity"]:</span> <strong>{{item.Quantity}}</strong></div>+ </div>+ <div>+ <a class="deleteitem" @@click="deletecartitem('@Url.RouteUrl("DeleteCartItem")/'+ item.Id)">+ <b-icon icon="trash" class="deleteitem" variant="danger"></b-icon>+ </a>+ </div>+ </div>+ <template v-slot:footer v-if="flycartindicator > 0">+ <div class="p-3 col-12">+ <div class="row">+ <div class="col-lg-6 col-5 text-center text-white d-flex flex-column">+ <span class="h5 mb-0">@Loc["ShoppingCart.Totals.SubTotal"]:</span>+ <span class="h4 mb-0">{{flycart.SubTotal}}</span>+ </div>+ <div class="col-lg-6 col-7 text-center d-flex justify-content-center align-items-center">+ <a v-if="flycart.DisplayShoppingCartButton" class="btn cart-button w-100 h-100 text-uppercase btn-secondary" @@click="location='@Url.RouteUrl("ShoppingCart")'">@Loc["ShoppingCart.Mini.ViewCart"]</a>+ <div v-if="flycart.DisplayCheckoutButton" class="w-100 h-100">+ <div v-if="flycart.CurrentCustomerIsGuest && flycart.CurrentCustomerIsGuest">+ <a class="btn cart-button w-100 h-100 text-uppercase btn-secondary" onclick="location='@Url.RouteUrl("LoginCheckoutAsGuest", new { returnUrl = Url.RouteUrl("ShoppingCart") })'">@Loc["Checkout.Button"]</a>+ </div>+ <div v-else>+ <a class="btn cart-button w-100 h-100 text-uppercase btn-secondary" onclick="location='@Url.RouteUrl("Checkout")'">@Loc["Checkout.Button"]</a>+ </div>+ </div>+ </div>+ </div>+ </div>+ </template>+ <template v-else-if="flycartindicator !== undefined">+ <div class="d-flex flex-column justify-content-center align-items-center">+ <b-icon icon="cart-x" font-scale="7.5" variant="secondary"></b-icon>+ <div class="text-center text-muted mt-3">@Loc["ShoppingCart.Mini.NoDataText"]</div>+ </div>+ </template>+ </b-sidebar>+ </li>+ </template>+ </ul>+</li>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarWishlist.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarWishlist.cshtmlnew file mode 100644index 000000000..09e9aa905--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/Partials/SidebarWishlist.cshtml@@ -0,0 +1,59 @@+<li class="nav-item">+ <ul class="sidebar-cart wishlist px-0">+ <li class="nav-item">+ <a class="nav-link" @@click="updateWishlist('@Url.RouteUrl("SidebarWishlist")')" v-b-toggle.sidebar-wishlist>+ <span class="icon-heart icons"></span>+ <span class="qty-indicator wishlist-qty" ref="wishlistQty">+ @Loc["Wishlist.HeaderQuantity", Model]+ </span>+ </a>+ </li>+ <template>+ <li>+ <b-sidebar id="sidebar-wishlist" backdrop right bg-variant="white" text-variant="standard">+ <template v-slot:title v-if="wishindicator > 0">+ @Html.Raw(string.Format(Loc["Wishlist.Mini.ItemsText"], string.Format("<a href=\"{0}\">{1}</a>", Url.RouteUrl("Wishlist"), string.Format(Loc["Wishlist.Mini.Items"], "{{wishindicator}}"))))+ </template>+ <template v-slot:title v-else>+ @Loc["Wishlist.Mini.NoItems"]+ </template>+ <div class="d-flex justify-content-center align-items-center h-100" v-if="wishlistitems == undefined">+ <div class="spinner-border text-gold" role="status">+ </div>+ </div>+ <div v-for="item in wishlistitems" class="item d-inline-flex no-wrap">+ <b-link :href="'/' + item.ProductSeName" :title="item.Picture.Title" v-if="item.Picture.ImageUrl">+ <b-img :alt="item.Picture.AlternateText" :src="item.Picture.ImageUrl" :title="item.Picture.Title" fluid></b-img>+ </b-link>+ <b-col>+ <b-link :href="'/' + item.ProductSeName">{{item.ProductName}}</b-link>+ <div class="attributes p-2" v-if="item.AttributeInfo">+ <div v-html="item.AttributeInfo"></div>+ </div>+ <div class="price"><span>@Loc["Wishlist.Mini.UnitPrice"]:</span> <strong>{{item.UnitPrice}}</strong></div>+ <div class="quantity"><span>@Loc["Wishlist.Mini.Quantity"]:</span> <strong>{{item.Quantity}}</strong></div>+ </b-col>+ </div>+ <template v-slot:footer v-if="wishindicator > 0">+ <template v-if="flywish !== undefined">+ <b-col cols="12" class="p-3">+ <div class="btn-group w-100">+ <b-button variant="secondary" class="d-flex align-items-center justify-content-center w-100 h-100 py-3 text-uppercase" href="@Url.RouteUrl("Wishlist")">+ <b-icon icon="heart" class="pr-2"></b-icon>+ @Loc["Wishlist"]+ </b-button>+ </div>+ </b-col>+ </template>+ </template>+ <template v-else-if="wishindicator !== undefined">+ <div class="d-flex flex-column justify-content-center align-items-center">+ <span class="icons icon-heart no-items-icon"></span>+ <div class="text-center text-muted mt-3">@Loc["Wishlist.Mini.NoDataText"]</div>+ </div>+ </template>+ </b-sidebar>+ </li>+ </template>+ </ul>+</li>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/_Layout.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/_Layout.cshtmlnew file mode 100644index 000000000..99ef3b170--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/_Layout.cshtml@@ -0,0 +1,96 @@+<!DOCTYPE html>+<html use-lang="true">+<head>+ <title asp-default-title="true"></title>+ <meta charset="utf-8">+ <meta-description>+ <meta-keywords>+ <meta name="generator" content="grandnode">+ <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">+ @RenderSection("meta", required: false)+ <head-custom>+ <partial name="Head" />+ <vc:widget widget-zone="head_html_tag" additional-data="null"></vc:widget>+ <canonical-urls>+ @*Favicon - upload favicon.ico file to the wwwroot directory*@+ <partial name="Partials/Favicons" />+ <resources asp-type="HeadLink" />+ <resources asp-type="HeadScript" />+ @RenderSection("head", required: false)+</head>+<body>+ <resources asp-type="ScriptHeader" />+ @await Component.InvokeAsync("Widget", new { widgetZone = "body_start_html_tag_after" })++ <div id="app" v-cloak>+ <div class="page-loader-container">+ <div class="page-loader"></div>+ </div>+ <partial name="Partials/Notifications" />+ <vc:get-coordinate></vc:get-coordinate>+ <b-container fluid class="main-container">+ @await Component.InvokeAsync("Widget", new { widgetZone = "content_before" })+ <div class="row">+ <div class="left-side-container" v-bind:class="{ toggled : !menuToggled}">+ <div class="container px-0">+ <partial name="Header" />+ <div class="header-nav-bottom">+ <partial name="Partials/Logo" />+ @await Component.InvokeAsync("SearchBox")+ <ul class="navbar-nav top-header-items">+ <template>+ <li class="nav-item">+ <a class="nav-link" v-b-toggle.sidebar-right>+ <span class="icons icon-user"></span>+ </a>+ <template>+ <b-sidebar id="sidebar-right" bg-variant="white" text-variant="standard" body-class="user-panel" title="@Loc["Account.MyAccount"]" right backdrop>+ <partial name="Partials/HeaderLinks" />+ </b-sidebar>+ </template>+ </li>+ </template>+ <partial name="Partials/ShoppingCartLinks" />+ </ul>+ </div>+ <div class="top-menu-container">+ <div id="menu-toggler" class="menu-toggler d-lg-none d-flex" @@click="openMenu($event.target, 'mainMenu')">+ <span></span>+ <span></span>+ <span></span>+ </div>+ <div id="menu-button" @@click="menuButton()" v-bind:class="{ show: menuToggled }" class="menu-button d-lg-flex d-none">+ <span class="icon">+ <span></span>+ <span></span>+ <span></span>+ </span>+ <span class="title">@Loc["Categories"]</span>+ </div>+ <ul class="Menu -vertical" id="mainMenu">+ @await Component.InvokeAsync("Menu")+ </ul>+ <ul id="links-container" class="p-0 mb-0"></ul>+ </div>+ </div>+ </div>+ <div class="container right-container">+ @if (IsSectionDefined("Breadcrumb"))+ {+ @RenderSection("Breadcrumb")+ }+ @RenderBody()+ </div>+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "content_after" })+ </b-container>+ <div id="backdrop-menu" class="backdrop-menu"></div>+ @await Component.InvokeAsync("Footer")+ <partial name="Partials/Cookie" />+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "body_end_html_tag_before" })+ <partial name="Partials/ProductBoxVue" />+ <resources asp-type="ScriptFooter" />+ <resources asp-type="TemplateFooter" />+</body>+</html>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Shared/_TwoColumns.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Shared/_TwoColumns.cshtmlnew file mode 100644index 000000000..0754afe65--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Shared/_TwoColumns.cshtml@@ -0,0 +1,80 @@+@{+ Layout = "_Layout";+ <script asp-location="Footer" asp-order="300" asp-src="/Plugins/Theme.Modern/Content/script/parallax.min.js"></script>++ //current category ID+ string currentCategoryId = "";+ if (Url.ActionContext.RouteData.Values["controller"].ToString().Equals("catalog", StringComparison.OrdinalIgnoreCase) &&+ Url.ActionContext.RouteData.Values["action"].ToString().Equals("category", StringComparison.OrdinalIgnoreCase))+ {+ currentCategoryId = Url.ActionContext.RouteData.Values["categoryId"].ToString();+ }+++ //current collection ID+ string currentCollectionId = "";+ if (Url.ActionContext.RouteData.Values["controller"].ToString().Equals("catalog", StringComparison.OrdinalIgnoreCase) &&+ Url.ActionContext.RouteData.Values["action"].ToString().Equals("collection", StringComparison.OrdinalIgnoreCase))+ {+ currentCollectionId = Url.ActionContext.RouteData.Values["collectionId"].ToString();+ }+++ //current product ID+ string currentProductId = "";+ if (Url.ActionContext.RouteData.Values["controller"].ToString().Equals("product", StringComparison.OrdinalIgnoreCase) &&+ Url.ActionContext.RouteData.Values["action"].ToString().Equals("productdetails", StringComparison.OrdinalIgnoreCase))+ {+ currentProductId = Url.ActionContext.RouteData.Values["productId"].ToString();+ }+}+@if (IsSectionDefined("Breadcrumb"))+{+ @section Breadcrumb {+ @RenderSection("Breadcrumb")+ }+}+@section meta {+ @RenderSection("meta", required: false)+}+@section head {+ @RenderSection("head", required: false)+ <script asp-location="Footer" asp-order="301" src="/Plugins/Theme.Modern/Content/script/catalog.js"></script>+}+@if (!string.IsNullOrEmpty(currentCategoryId))+{+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_category", additionalData = Model.Id })+}+@if (!string.IsNullOrEmpty(currentCollectionId))+{+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_collection", additionalData = Model.Id })+}+<b-row id="TwoColumns" class="custom-container mt-3">+ <b-col xl="3" lg="4" md="6" sm="8" cols="9" class="generalLeftSide" onclick="StopPropagation(event)">+ <div class="modal-close" onclick="closeLeftSide()"><b-icon icon="x"></b-icon></div>+ @if (IsSectionDefined("left"))+ {+ @RenderSection("left")+ }+ else+ {+ if (IsSectionDefined("filters"))+ {+ @RenderSection("filters")+ }++ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_before" })+ @await Component.InvokeAsync("CategoryNavigation", new { currentCategoryId = currentCategoryId, currentProductId = currentProductId })+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_after_category_navigation" })+ @await Component.InvokeAsync("CollectionNavigation", new { currentCollectionId = currentCollectionId })+ @await Component.InvokeAsync("VendorNavigation")+ @await Component.InvokeAsync("Widget", new { widgetZone = "left_side_column_after" })+ }+ </b-col>+ <b-col lg="9" md="12" class="generalSideRight">+ @await Component.InvokeAsync("Widget", new { widgetZone = "main_column_before" })+ @RenderBody()+ @await Component.InvokeAsync("Widget", new { widgetZone = "main_column_after" })+ </b-col>+</b-row>+<partial name="Partials/ProductBoxListVue" />\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/ShoppingCart/Cart.cshtml b/src/Plugins/Theme.Modern/Views/Modern/ShoppingCart/Cart.cshtmlnew file mode 100644index 000000000..e6097c70a--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/ShoppingCart/Cart.cshtml@@ -0,0 +1,14 @@+@inject IPageHeadBuilder pagebuilder+@model ShoppingCartModel+@{+ Layout = "_SingleColumn";++ //title+ pagebuilder.AddTitleParts(Loc["Title.ShoppingCart"]);+}+<div class="page shopping-cart-page">+ <h2 class="generalTitle text-center mt-3"><div>@Loc["ShoppingCart"]</div></h2>+ <div class="page-body">+ <partial name="Partials/CartSummary" model="Model" />+ </div>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Modern/Views/Modern/Wishlist/Index.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Wishlist/Index.cshtmlnew file mode 100644index 000000000..ee1bf9ef6--- /dev/null+++ b/src/Plugins/Theme.Modern/Views/Modern/Wishlist/Index.cshtml@@ -0,0 +1,200 @@+@model WishlistModel+@inject IPageHeadBuilder pagebuilder++@{+ Layout = "_SingleColumn";++ //title+ pagebuilder.AddTitleParts(Loc["Title.Wishlist"]);+}+<div class="page wishlist-page mt-3" id="wishlistPage">+ <h2 class="generalTitle text-center mt-3">+ <div>+ @if (Model.IsEditable)+ {+ @Loc["Wishlist"]+ }+ else+ {+ @String.Format(Loc["Wishlist.WishlistOf"], Model.CustomerFullname)+ }+ </div>+ </h2>+ <template v-if="vmwishlist.Model.Items.length > 0">+ <div class="wishlist-content mt-3">+ <template v-if="vmwishlist.Model.Warnings.length > 0">+ <div class="message-error">+ <ul>+ <template v-for="warning in vmwishlist.Model.Warnings">+ <li>{{warning}}</li>+ </template>+ </ul>+ </div>+ </template>+ <form asp-controller="Wishlist" asp-action="Index" method="post" id="wishlist-cart-form">+ @if (!Model.IsEditable && Model.Items.Any())+ {+ <input type="hidden" asp-for="@Model.CustomerGuid" />+ }+ <div class="shopping-cart-container">+ <div class="static-cart">+ <div id="wishlist-cart">+ <table id="cart-table" class="table b-table shopping-cart">+ <thead role="rowgroup">+ <tr role="row">+ <template v-if="vmwishlist.Model.ShowProductImages">+ <th role="columnheader" scope="col" class="text-center">+ <div>@Loc["ShoppingCart.Image"]</div>+ </th>+ </template>+ <th role="columnheader" scope="col" class="text-center">+ <div>@Loc["ShoppingCart.Product(s)"]</div>+ </th>+ <th role="columnheader" scope="col" class="text-center">+ <div>@Loc["ShoppingCart.Quantity"]</div>+ </th>+ <th role="columnheader" scope="col" class="text-center">+ <div>@Loc["ShoppingCart.UnitPrice"]</div>+ </th>+ <th role="columnheader" scope="col" class="text-center">+ <div>@Loc["ShoppingCart.ItemTotal"]</div>+ </th>+ <template v-if="vmwishlist.Model.IsEditable || vmwishlist.Model.DisplayAddToCart">+ <template v-if="vmwishlist.Model.IsEditable">+ <th role="columnheader" scope="col" class="text-center">+ <div>@Loc["Remove"]</div>+ </th>+ </template>+ <template v-if="vmwishlist.Model.DisplayAddToCart">+ <th role="columnheader" scope="col" class="text-center">+ <div>@Loc["addToCart"]</div>+ </th>+ </template>+ </template>+ </tr>+ </thead>+ <tbody role="rowgroup">+ <template v-for="item in vmwishlist.Model.Items">+ <tr role="row">+ <template v-if="vmwishlist.Model.ShowProductImages">+ <td role="cell" class="text-center">+ <div>+ <a :href="item.ProductUrl">+ <img :alt="item.Picture.AlternateText" :src="item.Picture.ImageUrl" :title="item.Picture.Title" />+ </a>+ </div>+ </td>+ </template>+ <td role="cell" class="text-center">+ <div class="d-inline-flex align-items-center">+ <a :href="item.ProductUrl" class="product-name">+ {{item.ProductName}}+ </a>+ <div v-if="vmwishlist.Model.IsEditable && item.AllowItemEditing" class="edit-item">+ <a class="btn btn-link" @@click="vmwishlist.getItemCart(item.Id)"><b-icon icon="pencil"></b-icon></a>+ </div>+ </div>+ <template v-if="vmwishlist.Model.ShowSku && item.Sku !== null">+ <span class="sku-number">{{item.Sku}}</span>+ </template>+ <template v-if="item.AttributeInfo !== ''">+ <div class="attributes small" v-html="item.AttributeInfo"></div>+ </template>+ <template v-if="item.Warnings.length > 0">+ <div class="warnings message-error small alert alert-danger mt-2 mb-0">+ <ul class="mb-0 p-0">+ <template v-for="warning in item.Warnings">+ <li>{{warning}}</li>+ </template>+ </ul>+ </div>+ </template>+ <template v-if="item.RecurringInfo !== null">+ <div class="recurring-info" v-html="item.RecurringInfo"></div>+ </template>+ </td>+ <template v-if="vmwishlist.Model.IsEditable">+ <td role="cell" class="text-center">+ <template v-if="item.AllowedQuantities[0]">+ <select :id="'itemquantity' + item.Id" :name="'itemquantity' + item.Id" class="custom-select form-control qty-dropdown" v-on:change="vmwishlist.updateQuantity('itemquantity', item.Id)">+ <template v-for="qty in item.AllowedQuantities">+ <option :id="'itemqty' + item.Id" :selected="qty.Selected" :value="qty.Value">{{qty.Value}}</option>+ </template>+ </select>+ </template>+ <template v-else>+ <input :id="'itemquantity' + item.Id" :name="'itemquantity' + item.Id" type="number" v-model="item.Quantity" min="1" v-on:change="vmwishlist.updateQuantity('itemquantity', item.Id)" class="qty-input form-control text-center" />+ </template>+ </td>+ </template>+ <template v-else>+ <td role="cell" class="text-center">+ <input :id="'itemquantity' + item.Id" :name="'itemquantity' + item.Id" type="text" :value="item.Quantity" class="qty-input-ro form-control text-center" readonly />+ </td>+ </template>+ <td role="cell" class="text-center">+ <span class="product-unit-price price">{{item.UnitPrice}}</span>+ </td>+ <template v-if="item.Discount !== null">+ <td role="cell" class="text-center">+ <div class="d-flex flex-column">+ <p class="mb-0 prod-total">{{item.SubTotal}}</p><div class="discount text-success text-center"><span>@Loc["ShoppingCart.ItemYouSave"]: </span><span>{{item.Discount}}</span></div>+ </div>+ </td>+ </template>+ <template v-else>+ <td role="cell" class="text-center">+ <p class="mb-0 prod-total">{{item.SubTotal}}</p>+ </td>+ </template>+ <template v-if="vmwishlist.Model.IsEditable || vmwishlist.Model.DisplayAddToCart">+ <template v-if="vmwishlist.Model.IsEditable">+ <td>+ <b-button variant="link" @@click="vmwishlist.deleteFromWishlist(item.Id)">+ <b-icon icon="trash" font-scale="1.5" class="text-danger"></b-icon>+ </b-button>+ </td>+ </template>+ <template v-if="vmwishlist.Model.DisplayAddToCart">+ <td>+ <b-button variant="link" @@click="vmwishlist.addToCartFromWishlist(item.Id)">+ <b-icon icon="cart" font-scale="1.5" class="text-info"></b-icon>+ </b-button>+ </td>+ </template>+ </template>+ </tr>+ </template>+ </tbody>+ </table>+ </div>+ </div>+ </div>+ <template v-if="vmwishlist.Model.IsEditable && vmwishlist.Model.EmailWishlistEnabled">+ <button type="button" class="btn btn-secondary email-a-friend-wishlist-button d-flex align-items-center my-3" @@click="$bvModal.show('ModalEmailWishlist')">+ <b-icon font-scale="2" icon="envelope" class="pr-2"></b-icon>+ <span class="d-sm-block d-none">@Loc["Wishlist.EmailAFriend"]</span>+ </button>+ </template>+ </form>+ </div>+ </template>+ <template v-else>+ <div class="no-data alert alert-info text-center">+ @Loc["Wishlist.CartIsEmpty"]+ </div>+ </template>+ <template v-if="vmwishlist.Model.IsEditable && vmwishlist.Model.Items.length > 0">+ <div class="row">+ <div class="col-12 share-info generalMarginSupporter text-center text-md-left">+ <span class="share-label">@Loc["Wishlist.YourWishlistURL"]:</span>+ <a href="@Url.RouteUrl("Wishlist", new { customerGuid = Model.CustomerGuid })" class="small ml-2">@Url.RouteUrl("Wishlist", new { customerGuid = Model.CustomerGuid }, "http")</a>+ </div>+ </div>+ </template>+</div>+@if (Model.IsEditable && Model.Items.Any())+{+ @await Component.InvokeAsync("EmailWishlist")+}+<partial name="Partials/ModelScript" model="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web/Themes/Default/Views/_ViewImports.cshtml b/src/Plugins/Theme.Modern/Views/Modern/_ViewImports.cshtmlsimilarity index 93%rename from src/Web/Grand.Web/Themes/Default/Views/_ViewImports.cshtmlrename to src/Plugins/Theme.Modern/Views/Modern/_ViewImports.cshtmlindex f506024d7..6b290b81f 100644--- a/src/Web/Grand.Web/Themes/Default/Views/_ViewImports.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/_ViewImports.cshtml@@ -31,13 +31,14 @@@using Grand.Web.Models.ShoppingCart@using Grand.Web.Models.Pages@using Grand.Web.Models.Vendors-@using Grand.Infrastructure@using Grand.Domain@using Grand.Domain.Catalog@using Grand.Domain.Common@using Grand.Domain.Orders+@using Grand.Domain.Customers@using Grand.Domain.Tax@using Grand.Domain.Seo-@using Grand.Web.Common.Localization+@using Grand.Domain.Stores+@using Grand.Infrastructure-@inject LocService Loc+@inject Grand.Web.Common.Localization.LocService Locdiff --git a/src/Web/Grand.Web/Themes/Default/Views/_ViewStart.cshtml b/src/Plugins/Theme.Modern/Views/Modern/_ViewStart.cshtmlsimilarity index 100%rename from src/Web/Grand.Web/Themes/Default/Views/_ViewStart.cshtmlrename to src/Plugins/Theme.Modern/Views/Modern/_ViewStart.cshtmldiff --git a/src/Plugins/Theme.Modern/logo.jpg b/src/Plugins/Theme.Modern/logo.jpgnew file mode 100644index 000000000..778f79493Binary files /dev/null and b/src/Plugins/Theme.Modern/logo.jpg differdiff --git a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.csindex 0f3c0fac2..40a3faea0 100644--- a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs+++ b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs@@ -1,7 +1,6 @@using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Storage;using Grand.Infrastructure;-using Grand.Web.Common.Components;using Microsoft.AspNetCore.Mvc;using Widgets.Slider.Domain;using Widgets.Slider.Models;@@ -81,7 +80,7 @@ namespace Widgets.Slider.Componentsif (!model.Slide.Any())return Content("");- return View(this.GetViewPath(), model);+ return View(model);}}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.cshtmlindex 9e1e0e7c7..22edc32df 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.cshtml@@ -1,13 +1,9 @@@model GeneralCommonSettingsModel-@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService-@using Grand.Business.Core.Utilities.Common.Security;@{- var canUpload = await permissionService.Authorize(StandardPermission.ManagePlugins);//page titleViewBag.Title = Loc["Admin.Settings.GeneralCommon"];}<form asp-area="@Constants.AreaAdmin" asp-controller="Setting" asp-action="GeneralCommon" method="post">-<div asp-validation-summary="All"></div><div class="row"><div class="col-md-12">@@ -78,59 +74,4 @@</div></div></div>--</form>-@if (canUpload)-{- <div class="modal-dialog" id="importfile-window" style="display:none; padding: 0 10px;">- <form asp-area="@Constants.AreaAdmin" asp-controller="Plugin" asp-action="UploadTheme" method="post" enctype="multipart/form-data">-- <ul class="common-list">- <li>- <strong>NOTE: It can take up to several minutes.</strong>- </li>- <li>- <strong>NOTE: DO NOT click twice.</strong>- </li>- </ul>- <div class="form-group">- <div class="col-md-2" style="margin-top: 7px; height: 34px; padding-left: 25px;">- <label class="control-label">- Zip file- </label>- </div>- <div class="col-md-10">- <input id="importfiledialog" name="zippedFile" class="form-control" type="file">- </div>- </div>- <div class="form-group">- - </div>- <div class="form-group">- <div class="col-md-2">- - </div>- <div class="col-md-10 text-right mt-10">- <input id="importfilesubmit" class="btn btn-success" value="@Loc["Admin.Configuration.Themes.Upload"]" type="submit">- </div>- </div>- </form>- </div>-- <script>- $(document).ready(function () {- $("#importfile").click(function (e) {- e.preventDefault();- var window = $("#importfile-window");- if (!window.data("kendoWindow")) {- window.kendoWindow({- modal: true,- title: "@Loc["Admin.Configuration.Themes.Upload"]",- actions: ["Close"]- });- }- window.data('kendoWindow').center().open();- });- });- </script>-}\ No newline at end of file+</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtmlindex 8a171d335..d7f251d6f 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml@@ -1,9 +1,4 @@@model GeneralCommonSettingsModel-@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService-@using Grand.Business.Core.Utilities.Common.Security;-@{- var canUpload = await permissionService.Authorize(StandardPermission.ManagePlugins);-}<script>$(document).ready(function () {@@ -63,7 +58,7 @@<label for="[email protected]"><img src="@Url.Content(theme.PreviewImageUrl)" alt="@theme.PreviewText" title="@theme.PreviewText" width="175"><br />- <label style="text-align:center;font-weight:bold;width:170px;">@theme.ThemeTitle (@theme.ThemeVersion)</label>+ <label style="text-align:center;font-weight:bold;width:170px;">@theme.ThemeTitle</label></label></p></li>@@ -71,11 +66,6 @@</ul></div><span asp-validation-for="StoreInformationSettings.DefaultStoreTheme"></span>- @if (canUpload)- {- <div class="note note-info">@Loc["Admin.Settings.GeneralCommon.DefaultStoreTheme.GetMore"] <a href="http://www.grandnode.com/extensions?category=4&utm_source=admin-panel&utm_medium=theme-settings&utm_campaign=admin-panel" target="_blank">http://www.grandnode.com/extensions</a></div>- <input type="button" id="importfile" class="btn yellow" value="@Loc["Admin.Configuration.Themes.Upload"]" />- }</div></div><div class="form-group">diff --git a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs b/src/Web/Grand.Web.Admin/Controllers/PluginController.csindex 4531c999a..100370288 100644--- a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PluginController.cs@@ -10,7 +10,6 @@ using Grand.Web.Admin.Models.Plugins;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;using Grand.Web.Common.Security.Authorization;-using Grand.Web.Common.Themes;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using Microsoft.Extensions.Hosting;@@ -26,19 +25,18 @@ namespace Grand.Web.Admin.Controllers#region Fieldsprivate readonly ITranslationService _translationService;- private readonly IThemeProvider _themeProvider;private readonly ILogger<PluginController> _logger;private readonly IHostApplicationLifetime _applicationLifetime;private readonly IServiceProvider _serviceProvider;private readonly IWorkContext _workContext;private readonly ExtensionsConfig _extConfig;+#endregion#region Constructorspublic PluginController(ITranslationService translationService,- IThemeProvider themeProvider,ILogger<PluginController> logger,IHostApplicationLifetime applicationLifetime,IWorkContext workContext,@@ -46,7 +44,6 @@ namespace Grand.Web.Admin.ControllersExtensionsConfig extConfig){_translationService = translationService;- _themeProvider = themeProvider;_logger = logger;_workContext = workContext;_applicationLifetime = applicationLifetime;@@ -71,6 +68,7 @@ namespace Grand.Web.Admin.Controllersvar pluginInstance = PluginInfo.Instance(_serviceProvider);pluginModel.ConfigurationUrl = pluginInstance.ConfigurationUrl();}+return pluginModel;}@@ -116,6 +114,7 @@ namespace Grand.Web.Admin.Controllers}}}+#endregion#region Methods@@ -124,8 +123,7 @@ namespace Grand.Web.Admin.Controllerspublic IActionResult List(){- var model = new PluginListModel- {+ var model = new PluginListModel {//load modesAvailableLoadModes = LoadPluginsStatus.All.ToSelectList(HttpContext, false).ToList()};@@ -153,8 +151,8 @@ namespace Grand.Web.Admin.Controllers{items.Add(PreparePluginModel(item));}- var gridModel = new DataSourceResult- {++ var gridModel = new DataSourceResult {Data = items,Total = pluginInfos.Count};@@ -176,6 +174,7 @@ namespace Grand.Web.Admin.ControllersError("You can't install unsupported version of plugin");return RedirectToAction("List");}+//check whether plugin is not installedif (pluginInfo.Installed)return RedirectToAction("List");@@ -186,7 +185,8 @@ namespace Grand.Web.Admin.ControllersSuccess(_translationService.GetResource("Admin.Plugins.Installed"));- _logger.LogInformation("The plugin has been installed by the user {CurrentCustomerEmail}", _workContext.CurrentCustomer.Email);+ _logger.LogInformation("The plugin has been installed by the user {CurrentCustomerEmail}",+ _workContext.CurrentCustomer.Email);//stop application_applicationLifetime.StopApplication();@@ -219,7 +219,8 @@ namespace Grand.Web.Admin.ControllersSuccess(_translationService.GetResource("Admin.Plugins.Uninstalled"));- _logger.LogInformation("The plugin has been uninstalled by the user {CurrentCustomerEmail}", _workContext.CurrentCustomer.Email);+ _logger.LogInformation("The plugin has been uninstalled by the user {CurrentCustomerEmail}",+ _workContext.CurrentCustomer.Email);//stop application_applicationLifetime.StopApplication();@@ -237,7 +238,7 @@ namespace Grand.Web.Admin.Controllers{if (_extConfig.DisableUploadExtensions){- Error("Upload plugins/themes is disable");+ Error("Upload plugins is disable");return RedirectToAction("List");}@@ -252,7 +253,8 @@ namespace Grand.Web.Admin.Controllersforeach (var folder in Directory.GetDirectories(pluginsPath)){- if (Path.GetFileName(folder) != "bin" && Directory.GetFiles(folder).Select(x => Path.GetFileName(x)).Contains(pluginInfo.PluginFileName))+ if (Path.GetFileName(folder) != "bin" && Directory.GetFiles(folder).Select(x => Path.GetFileName(x))+ .Contains(pluginInfo.PluginFileName)){DeleteDirectory(folder);}@@ -261,7 +263,8 @@ namespace Grand.Web.Admin.Controllers//uninstall pluginSuccess(_translationService.GetResource("Admin.Plugins.Removed"));- _logger.LogInformation("The plugin has been removed by the user {CurrentCustomerEmail}", _workContext.CurrentCustomer.Email);+ _logger.LogInformation("The plugin has been removed by the user {CurrentCustomerEmail}",+ _workContext.CurrentCustomer.Email);//stop application_applicationLifetime.StopApplication();@@ -276,7 +279,8 @@ namespace Grand.Web.Admin.Controllerspublic IActionResult ReloadList(){- _logger.LogInformation("Reload list of plugins by the user {CurrentCustomerEmail}", _workContext.CurrentCustomer.Email);+ _logger.LogInformation("Reload list of plugins by the user {CurrentCustomerEmail}",+ _workContext.CurrentCustomer.Email);//stop application_applicationLifetime.StopApplication();@@ -287,11 +291,12 @@ namespace Grand.Web.Admin.Controllers[HttpPost]public IActionResult UploadPlugin(IFormFile zippedFile){- if(_extConfig.DisableUploadExtensions)+ if (_extConfig.DisableUploadExtensions){- Error("Upload plugins/themes is disable");+ Error("Upload plugins is disable");return RedirectToAction("List");}+if (zippedFile == null || zippedFile.Length == 0){Error(_translationService.GetResource("Admin.Common.UploadFile"));@@ -301,7 +306,8 @@ namespace Grand.Web.Admin.Controllersvar zipFilePath = "";try{- if (!Path.GetExtension(zippedFile.FileName)?.Equals(".zip", StringComparison.InvariantCultureIgnoreCase) ?? true)+ if (!Path.GetExtension(zippedFile.FileName)+ ?.Equals(".zip", StringComparison.InvariantCultureIgnoreCase) ?? true)throw new Exception("Only zip archives are supported");//ensure that temp directory is created@@ -325,7 +331,8 @@ namespace Grand.Web.Admin.ControllersSystem.IO.File.Delete(zipFilePath);}- _logger.LogInformation("The plugin has been uploaded by the user {CurrentCustomerEmail}", _workContext.CurrentCustomer.Email);+ _logger.LogInformation("The plugin has been uploaded by the user {CurrentCustomerEmail}",+ _workContext.CurrentCustomer.Email);//stop application_applicationLifetime.StopApplication();@@ -333,144 +340,81 @@ namespace Grand.Web.Admin.Controllersreturn RedirectToAction("List");}- [HttpPost]- public IActionResult UploadTheme(IFormFile zippedFile)- {- if (_extConfig.DisableUploadExtensions)- {- Error("Upload plugins/themes is disable");- return RedirectToAction("GeneralCommon", "Setting");- }-- if (zippedFile == null || zippedFile.Length == 0)- {- Error(_translationService.GetResource("Admin.Common.UploadFile"));- return RedirectToAction("GeneralCommon", "Setting");- }-- var zipFilePath = "";-- try- {- if (!Path.GetExtension(zippedFile.FileName)?.Equals(".zip", StringComparison.InvariantCultureIgnoreCase) ?? true)- throw new Exception("Only zip archives are supported");-- //ensure that temp directory is created- var tempDirectory = CommonPath.TmpUploadPath;- Directory.CreateDirectory(new DirectoryInfo(tempDirectory).FullName);-- //copy original archive to the temp directory- zipFilePath = Path.Combine(tempDirectory, zippedFile.FileName);- using (var fileStream = new FileStream(zipFilePath, FileMode.Create))- zippedFile.CopyTo(fileStream);-- Upload(zipFilePath);-- var message = _translationService.GetResource("Admin.Configuration.Themes.Uploaded");- Success(message);- }- catch (Exception ex)- {- var message = _translationService.GetResource("Admin.Configuration.Themes.Failed");- Error(message + "\r\n" + ex.Message);- }- finally- {- //delete temporary file- if (!string.IsNullOrEmpty(zipFilePath))- System.IO.File.Delete(zipFilePath);- }-- return RedirectToAction("GeneralCommon", "Setting");- }-private void Upload(string archivePath){var pluginsDirectory = CommonPath.PluginsPath;- var themesDirectory = CommonPath.ThemePath;-var uploadedItemDirectoryName = "";PluginInfo _pluginInfo = null;- ThemeInfo _themeInfo = null;using (var archive = ZipFile.Open(archivePath, ZipArchiveMode.Update)){- var rootDirectories = archive.Entries.Where(entry => entry.FullName.Count(ch => ch == '/') == 1 && entry.FullName.EndsWith("/")).ToList();+ var rootDirectories = archive.Entries.Where(entry =>+ entry.FullName.Count(ch => ch == '/') == 1 && entry.FullName.EndsWith("/")).ToList();if (rootDirectories.Count != 1){- throw new Exception($"The archive should contain only one root plugin or theme directory. " +- $"For example, Payments.PayPalDirect or DefaultClean. ");+ throw new Exception(+ $"The archive should contain only one root plugin. For example, Payments.PayPalDirect.");}//get directory name (remove the ending /)uploadedItemDirectoryName = rootDirectories.First().FullName.TrimEnd('/');- var themeDescriptorEntry = archive.Entries.FirstOrDefault(x => x.FullName.Contains("theme.cfg"));- if (themeDescriptorEntry != null)+ var supportedVersion = false;+ var _fpath = "";+ foreach (var entry in archive.Entries.Where(x => x.FullName.Contains(".dll"))){- using var unzippedEntryStream = themeDescriptorEntry.Open();- using var reader = new StreamReader(unzippedEntryStream);- _themeInfo = _themeProvider.GetThemeDescriptorFromText(reader.ReadToEnd());- }- else- {- var supportedVersion = false;- var _fpath = "";- foreach (var entry in archive.Entries.Where(x => x.FullName.Contains(".dll")))+ using var unzippedEntryStream = entry.Open();+ try{- using var unzippedEntryStream = entry.Open();- try- {- var assembly = Assembly.Load(ToByteArray(unzippedEntryStream));- var pluginInfo = assembly.GetCustomAttribute<PluginInfoAttribute>();- if (pluginInfo != null && pluginInfo.SupportedVersion == GrandVersion.SupportedPluginVersion)- {- supportedVersion = true;- _fpath = entry.FullName[..entry.FullName.LastIndexOf("/", StringComparison.Ordinal)];- archive.Entries.Where(x => !x.FullName.Contains(_fpath)).ToList()- .ForEach(y => { archive.GetEntry(y.FullName)!.Delete(); });-- _pluginInfo = new PluginInfo();- break;- }- }- catch (Exception ex)+ var assembly = Assembly.Load(ToByteArray(unzippedEntryStream));+ var pluginInfo = assembly.GetCustomAttribute<PluginInfoAttribute>();+ if (pluginInfo != null && pluginInfo.SupportedVersion == GrandVersion.SupportedPluginVersion){- _logger.LogError(ex, ex.Message);+ supportedVersion = true;+ _fpath = entry.FullName[..entry.FullName.LastIndexOf("/", StringComparison.Ordinal)];+ archive.Entries.Where(x => !x.FullName.Contains(_fpath)).ToList()+ .ForEach(y => { archive.GetEntry(y.FullName)!.Delete(); });++ _pluginInfo = new PluginInfo();+ break;}}- if (!supportedVersion)- throw new Exception($"This plugin doesn't support the current version - {GrandVersion.SupportedPluginVersion}");-- var pluginname = _fpath[(_fpath.LastIndexOf('/') + 1)..];- var _path = "";-- var entries = archive.Entries.ToArray();- foreach (var y in entries)+ catch (Exception ex){- if (y.Name.Length > 0)- _path = y.FullName.Replace(y.Name, "").Replace(_fpath, pluginname).TrimEnd('/');- else- _path = y.FullName.Replace(_fpath, pluginname);+ _logger.LogError(ex, ex.Message);+ }+ }- var _entry = archive.CreateEntry($"{_path}/{y.Name}");- using (var a = y.Open())- using (var b = _entry.Open())- a.CopyTo(b);+ if (!supportedVersion)+ throw new Exception(+ $"This plugin doesn't support the current version - {GrandVersion.SupportedPluginVersion}");- archive.GetEntry(y.FullName).Delete();+ var pluginname = _fpath[(_fpath.LastIndexOf('/') + 1)..];+ var _path = "";- }+ var entries = archive.Entries.ToArray();+ foreach (var y in entries)+ {+ if (y.Name.Length > 0)+ _path = y.FullName.Replace(y.Name, "").Replace(_fpath, pluginname).TrimEnd('/');+ else+ _path = y.FullName.Replace(_fpath, pluginname);++ var _entry = archive.CreateEntry($"{_path}/{y.Name}");+ using (var a = y.Open())+ using (var b = _entry.Open())+ a.CopyTo(b);++ archive.GetEntry(y.FullName).Delete();}}- if (_pluginInfo == null && _themeInfo == null)+ if (_pluginInfo == null)throw new Exception("No info file is found.");if (string.IsNullOrEmpty(uploadedItemDirectoryName))- throw new Exception($"Cannot get the {(_pluginInfo != null ? "plugin" : "theme")} directory name");+ throw new Exception($"Cannot get the plugin directory name");- var directoryPath = _pluginInfo != null ? pluginsDirectory : themesDirectory;- var pathToUpload = Path.Combine(directoryPath, uploadedItemDirectoryName);+ var pathToUpload = Path.Combine(pluginsDirectory, uploadedItemDirectoryName);try{@@ -479,9 +423,9 @@ namespace Grand.Web.Admin.Controllers}catch { }- ZipFile.ExtractToDirectory(archivePath, directoryPath);+ ZipFile.ExtractToDirectory(archivePath, pluginsDirectory);}#endregion}-}+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.csindex ee1a6c6b2..8c75bb9b8 100644--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs@@ -51,7 +51,6 @@ namespace Grand.Web.Admin.Controllersprivate readonly IPictureService _pictureService;private readonly ITranslationService _translationService;private readonly IDateTimeService _dateTimeService;- private readonly IThemeProvider _themeProvider;private readonly IWorkContext _workContext;private readonly IMediator _mediator;private readonly IMerchandiseReturnService _merchandiseReturnService;@@ -68,7 +67,6 @@ namespace Grand.Web.Admin.ControllersIPictureService pictureService,ITranslationService translationService,IDateTimeService dateTimeService,- IThemeProvider themeProvider,IWorkContext workContext,IMediator mediator,IMerchandiseReturnService merchandiseReturnService,@@ -81,7 +79,6 @@ namespace Grand.Web.Admin.Controllers_pictureService = pictureService;_translationService = translationService;_dateTimeService = dateTimeService;- _themeProvider = themeProvider;_workContext = workContext;_mediator = mediator;_merchandiseReturnService = merchandiseReturnService;@@ -595,7 +592,7 @@ namespace Grand.Web.Admin.Controllersreturn RedirectToAction("Customer");}- public async Task<IActionResult> GeneralCommon()+ public async Task<IActionResult> GeneralCommon([FromServices] IEnumerable<IThemeView> themes){var model = new GeneralCommonSettingsModel();var storeScope = await GetActiveStore();@@ -617,10 +614,17 @@ namespace Grand.Web.Admin.Controllersvar storeInformationSettings = _settingService.LoadSetting<StoreInformationSettings>(storeScope);model.StoreInformationSettings = storeInformationSettings.ToModel();- model.StoreInformationSettings.AvailableStoreThemes = _themeProvider- .GetConfigurations()- .Select(x => x.ToModel(storeInformationSettings.DefaultStoreTheme)).ToList();-+ model.StoreInformationSettings.AvailableStoreThemes =+ themes.Where(x => x.AreaName == "").Select(x =>+ new GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel {+ ThemeName = x.ThemeName,+ ThemeTitle = x.ThemeInfo.Title,+ PreviewImageUrl = x.ThemeInfo.PreviewImageUrl,+ PreviewText = x.ThemeInfo.PreviewText,+ SupportRtl = x.ThemeInfo.SupportRtl,+ Selected = x.ThemeName == storeInformationSettings.DefaultStoreTheme+ }).ToList();+//commonvar commonSettings = _settingService.LoadSetting<CommonSettings>(storeScope);model.CommonSettings = commonSettings.ToModel();diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.csdeleted file mode 100644index e6830a00d..000000000--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/Settings/ThemeConfigurationMappingExtensions.cs+++ /dev/null@@ -1,16 +0,0 @@-using Grand.Infrastructure.Mapper;-using Grand.Web.Admin.Models.Settings;-using Grand.Web.Common.Themes;--namespace Grand.Web.Admin.Extensions.Mapping.Settings-{- public static class ThemeConfigurationMappingExtensions- {- public static GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel ToModel(this ThemeConfiguration entity, string defaultStoreTheme)- {- var result = entity.MapTo<ThemeConfiguration, GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel>();- result.Selected = result.ThemeName.Equals(defaultStoreTheme, StringComparison.OrdinalIgnoreCase);- return result;- }- }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Infrastructure/AdminAreaViewFactory.cs b/src/Web/Grand.Web.Admin/Infrastructure/AdminAreaViewFactory.csnew file mode 100644index 000000000..2375661cd--- /dev/null+++ b/src/Web/Grand.Web.Admin/Infrastructure/AdminAreaViewFactory.cs@@ -0,0 +1,38 @@+using Grand.Web.Admin.Extensions;+using Grand.Web.Common.Themes;+using Grand.Web.Common.View;++namespace Grand.Web.Admin.Infrastructure;++public class AdminAreaViewFactory : IAreaViewFactory+{+ public string AreaName => Constants.AreaAdmin;+ private readonly IThemeContext _themeContext;++ public AdminAreaViewFactory(IThemeContextFactory themeContextFactory)+ {+ _themeContext = themeContextFactory.GetThemeContext(AreaName);+ }++ public IEnumerable<string> GetViewLocations(IEnumerable<string> viewLocations)+ {+ var themeName = _themeContext?.GetCurrentTheme();++ var basicViewLocations = new[] {+ $"/Areas/{AreaName}/Views/{{1}}/{{0}}.cshtml",+ $"/Areas/{AreaName}/Views/Shared/{{0}}.cshtml"+ };+ if (string.IsNullOrWhiteSpace(themeName))+ {+ return basicViewLocations;+ }++ var themeViewLocations = new[] {+ $"/Areas/{AreaName}/Themes/{themeName}/Views/{{1}}/{{0}}.cshtml",+ $"/Areas/{AreaName}/Themes/{themeName}/Views/Shared/{{0}}.cshtml"+ };++ return themeViewLocations.Concat(basicViewLocations);+ }++}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Infrastructure/AdminThemeContext.cs b/src/Web/Grand.Web.Admin/Infrastructure/AdminThemeContext.csnew file mode 100644index 000000000..736ff9e66--- /dev/null+++ b/src/Web/Grand.Web.Admin/Infrastructure/AdminThemeContext.cs@@ -0,0 +1,42 @@+using Grand.Domain.Stores;+using Grand.Infrastructure.Configuration;+using Grand.Web.Admin.Extensions;+using Grand.Web.Common.Themes;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.Admin.Infrastructure;++public class AdminThemeContext : ThemeContextBase+{+ private readonly StoreInformationSettings _storeInformationSettings;+ private readonly IHttpContextAccessor _contextAccessor;+ private string _themeName;+ public AdminThemeContext(+ IHttpContextAccessor contextAccessor,+ SecurityConfig securityConfig,+ StoreInformationSettings storeInformationSettings) :+ base(contextAccessor, securityConfig)+ {+ _storeInformationSettings = storeInformationSettings;+ _contextAccessor = contextAccessor;+ }++ public override string AreaName => Constants.AreaAdmin;++ public override string GetCurrentTheme()+ {+ if (!string.IsNullOrEmpty(_themeName))+ return _themeName;++ var theme = "";+ if (_storeInformationSettings.AllowToSelectAdminTheme)+ {+ theme = _contextAccessor.HttpContext?.Request.Cookies[this.CookiesName];+ }+ //default store theme+ if (string.IsNullOrEmpty(theme))+ theme = _storeInformationSettings.DefaultStoreTheme;++ return _themeName = theme;+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Infrastructure/AdminViewLocationExpander.cs b/src/Web/Grand.Web.Admin/Infrastructure/AdminViewLocationExpander.csdeleted file mode 100644index d6283511c..000000000--- a/src/Web/Grand.Web.Admin/Infrastructure/AdminViewLocationExpander.cs+++ /dev/null@@ -1,33 +0,0 @@-using Grand.Web.Common.Themes;-using Microsoft.AspNetCore.Mvc.Razor;--namespace Grand.Web.Admin.Infrastructure-{- public class AdminViewLocationExpander : IViewLocationExpander- {- private const string AreaAdminKey = "AdminTheme";--- public void PopulateValues(ViewLocationExpanderContext context)- {- if (!(context.AreaName?.Equals("Admin") ?? false)) return;-- var themeContext = (IThemeContext)context.ActionContext.HttpContext.RequestServices.GetService(typeof(IThemeContext));- context.Values[AreaAdminKey] = themeContext?.AdminAreaThemeName;- }-- public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)- {-- if ((context.AreaName?.Equals("Admin") ?? false) && context.Values.TryGetValue(AreaAdminKey, out var adminTheme))- {- viewLocations = new[] {- $"/Areas/{{2}}/Themes/{adminTheme}/Views/{{1}}/{{0}}.cshtml",- $"/Areas/{{2}}/Themes/{adminTheme}/Views/Shared/{{0}}.cshtml"- }- .Concat(viewLocations);- }- return viewLocations;- }- }-}diff --git a/src/Web/Grand.Web.Admin/Mapper/ThemeConfigurationProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ThemeConfigurationProfile.csdeleted file mode 100644index f040dbd08..000000000--- a/src/Web/Grand.Web.Admin/Mapper/ThemeConfigurationProfile.cs+++ /dev/null@@ -1,20 +0,0 @@-using AutoMapper;-using Grand.Infrastructure.Mapper;-using Grand.Web.Admin.Models.Settings;-using Grand.Web.Common.Themes;--namespace Grand.Web.Admin.Mapper-{- public class ThemeConfigurationProfile : Profile, IAutoMapperProfile- {- public ThemeConfigurationProfile()- {- CreateMap<ThemeConfiguration, GeneralCommonSettingsModel.StoreInformationSettingsModel.ThemeConfigurationModel>()- .ForMember(dest => dest.ThemeTitle, mo => mo.MapFrom(p => p.Title))- .ForMember(dest => dest.ThemeName, mo => mo.MapFrom(p => p.Name))- .ForMember(dest => dest.ThemeVersion, mo => mo.MapFrom(p => p.Version));- }-- public int Order => 0;- }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.csindex 581acdac9..e75180bac 100644--- a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs@@ -87,7 +87,6 @@ namespace Grand.Web.Admin.Models.Settingspublic class ThemeConfigurationModel{public string ThemeName { get; set; }- public string ThemeVersion { get; set; }public string ThemeTitle { get; set; }public string PreviewImageUrl { get; set; }public string PreviewText { get; set; }diff --git a/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs b/src/Web/Grand.Web.Admin/Startup/StartupApplication.csindex 84a4e4995..e1fb09f72 100644--- a/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs@@ -4,6 +4,7 @@ using Grand.Infrastructure;using Grand.Web.Admin.Infrastructure;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Services;+using Grand.Web.Common.View;using Microsoft.AspNetCore.Builder;using Microsoft.AspNetCore.Hosting;using Microsoft.AspNetCore.Mvc.Razor;@@ -58,12 +59,8 @@ namespace Grand.Web.Admin.Startupservices.AddScoped<IPictureViewModelService, PictureViewModelService>();services.AddScoped<IElFinderViewModelService, ElFinderViewModelService>();services.AddScoped<IMenuViewModelService, MenuViewModelService>();-- //themes support- services.Configure<RazorViewEngineOptions>(options =>- {- options.ViewLocationExpanders.Add(new AdminViewLocationExpander());- });++ services.AddScoped<IAreaViewFactory, AdminAreaViewFactory>();}public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)diff --git a/src/Web/Grand.Web.Common/Components/ViewComponentExtensions.cs b/src/Web/Grand.Web.Common/Components/ViewComponentExtensions.csdeleted file mode 100644index 9cdefdf9a..000000000--- a/src/Web/Grand.Web.Common/Components/ViewComponentExtensions.cs+++ /dev/null@@ -1,22 +0,0 @@-using Grand.Web.Common.Themes;-using Microsoft.AspNetCore.Mvc;-using Microsoft.AspNetCore.Mvc.ViewEngines;-using Microsoft.Extensions.DependencyInjection;--namespace Grand.Web.Common.Components-{- public static class ViewComponentExtensions- {- public static string GetViewPath(this ViewComponent viewComponent, string viewName = "Default")- {- var themeContext = viewComponent.HttpContext.RequestServices.GetService<IThemeContext>();- var theme = themeContext.WorkingThemeName;-- var viewPath = $"Views/Shared/Components/{viewComponent.ViewComponentContext.ViewComponentDescriptor.ShortName}/{viewName}.cshtml";- var themeViewPath = $"/Themes/{theme}/{viewPath}";- var viewEngine = viewComponent.ViewContext.HttpContext.RequestServices.GetRequiredService<ICompositeViewEngine>();- var result = viewEngine.GetView("", themeViewPath, isMainPage: false);- return result.Success ? themeViewPath : viewName;- }- }-}diff --git a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.csindex a0f73d34c..5eb5cc88c 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs@@ -189,18 +189,6 @@ namespace Grand.Web.Common.Infrastructure});- //themes- if (Directory.Exists(CommonPath.ThemePath))- application.UseStaticFiles(new StaticFileOptions {- FileProvider = new PhysicalFileProvider(CommonPath.ThemePath),- RequestPath = new PathString("/Themes"),- OnPrepareResponse = ctx =>- {- if (!string.IsNullOrEmpty(appConfig.StaticFilesCacheControl))- ctx.Context.Response.Headers.Append(HeaderNames.CacheControl, appConfig.StaticFilesCacheControl);- }- });-//pluginsif (Directory.Exists(CommonPath.PluginsPath))application.UseStaticFiles(new StaticFileOptions {diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.csindex 0b8d147d7..9e2a31352 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs@@ -12,7 +12,7 @@ using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Plugins;using Grand.Infrastructure.TypeSearch;using Grand.SharedKernel.Extensions;-using Grand.Web.Common.Themes;+using Grand.Web.Common.View;using Microsoft.AspNetCore.Builder;using Microsoft.AspNetCore.DataProtection;using Microsoft.AspNetCore.Http;@@ -91,7 +91,7 @@ namespace Grand.Web.Common.Infrastructure//themes supportservices.Configure<RazorViewEngineOptions>(options =>{- options.ViewLocationExpanders.Add(new ThemeViewLocationExpander());+ options.ViewLocationExpanders.Add(new ViewLocationExpander());});}diff --git a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs b/src/Web/Grand.Web.Common/Startup/StartupApplication.csindex 6a152cd61..3944d2ebe 100644--- a/src/Web/Grand.Web.Common/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Common/Startup/StartupApplication.cs@@ -15,6 +15,7 @@ using Grand.Web.Common.Security.Captcha;using Grand.Web.Common.TagHelpers;using Grand.Web.Common.Themes;using Grand.Web.Common.Validators;+using Grand.Web.Common.View;using Grand.Web.Common.ViewRender;using Microsoft.AspNetCore.Builder;using Microsoft.AspNetCore.Hosting;@@ -81,6 +82,21 @@ namespace Grand.Web.Common.Startup//helper for SettingsserviceCollection.AddScoped<IStoreHelper, StoreHelper>();++ //View factory+ serviceCollection.AddScoped<IViewFactory, ViewFactory>();++ //Default view area+ serviceCollection.AddScoped<IAreaViewFactory, DefaultAreaViewFactory>();++ //Theme context factory+ serviceCollection.AddScoped<IThemeContextFactory, ThemeContextFactory>();++ //Default theme context+ serviceCollection.AddScoped<IThemeContext, ThemeContext>();++ //Default theme view+ serviceCollection.AddScoped<IThemeView, DefaultThemeView>();}@@ -88,11 +104,6 @@ namespace Grand.Web.Common.Startup{serviceCollection.AddScoped<IPageHeadBuilder, PageHeadBuilder>();- serviceCollection.AddSingleton<IThemeList, ThemeList>();-- serviceCollection.AddScoped<IThemeProvider, ThemeProvider>();- serviceCollection.AddScoped<IThemeContext, ThemeContext>();-serviceCollection.AddScoped<SlugRouteTransformer>();serviceCollection.AddScoped<IResourceManager, ResourceManager>();diff --git a/src/Web/Grand.Web.Common/Themes/DefaultThemeView.cs b/src/Web/Grand.Web.Common/Themes/DefaultThemeView.csnew file mode 100644index 000000000..700bef9e7--- /dev/null+++ b/src/Web/Grand.Web.Common/Themes/DefaultThemeView.cs@@ -0,0 +1,17 @@+namespace Grand.Web.Common.Themes;++public class DefaultThemeView : IThemeView+{+ public string AreaName => "";+ public string ThemeName => "Default";++ public ThemeInfo ThemeInfo => new ("Default theme", "~/assets/samples/default-theme.jpg", "Default GrandNode theme", true);++ public IEnumerable<string> GetViewLocations()+ {+ return new List<string> {+ "/Views/{1}/{0}.cshtml",+ "/Views/Shared/{0}.cshtml"+ };+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Themes/IThemeContext.cs b/src/Web/Grand.Web.Common/Themes/IThemeContext.csindex a1284ed0b..9dcdb5ed3 100644--- a/src/Web/Grand.Web.Common/Themes/IThemeContext.cs+++ b/src/Web/Grand.Web.Common/Themes/IThemeContext.cs@@ -1,25 +1,22 @@-//Contribution https://github.com/smartstore/SmartStoreNET/blob/2.0.x/src/Presentation/SmartStore.Web.Framework/Themes/IThemeContext.cs+namespace Grand.Web.Common.Themes;-namespace Grand.Web.Common.Themes+/// <summary>+/// Work context+/// </summary>+public interface IThemeContext{/// <summary>- /// Work context+ /// Get area name/// </summary>- public interface IThemeContext- {- /// <summary>- /// Get current theme system name- /// </summary>- string WorkingThemeName { get; }+ string AreaName { get; }- /// <summary>- /// Get admin area current theme name- /// </summary>- string AdminAreaThemeName { get; }+ /// <summary>+ /// Get current theme system name+ /// </summary>+ string GetCurrentTheme();- /// <summary>- /// Set current theme system name- /// </summary>- Task SetWorkingTheme(string themeName);- }-}+ /// <summary>+ /// Set current theme system name+ /// </summary>+ Task SetTheme(string themeName);+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Themes/IThemeContextFactory.cs b/src/Web/Grand.Web.Common/Themes/IThemeContextFactory.csnew file mode 100644index 000000000..a49b6afbd--- /dev/null+++ b/src/Web/Grand.Web.Common/Themes/IThemeContextFactory.cs@@ -0,0 +1,6 @@+namespace Grand.Web.Common.Themes;++public interface IThemeContextFactory+{+ IThemeContext GetThemeContext(string areaName);+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Themes/IThemeList.cs b/src/Web/Grand.Web.Common/Themes/IThemeList.csdeleted file mode 100644index fff642b3d..000000000--- a/src/Web/Grand.Web.Common/Themes/IThemeList.cs+++ /dev/null@@ -1,7 +0,0 @@-namespace Grand.Web.Common.Themes-{- public interface IThemeList- {- IList<ThemeConfiguration> ThemeConfigurations { get; }- }-}diff --git a/src/Web/Grand.Web.Common/Themes/IThemeProvider.cs b/src/Web/Grand.Web.Common/Themes/IThemeProvider.csdeleted file mode 100644index 724ba03c6..000000000--- a/src/Web/Grand.Web.Common/Themes/IThemeProvider.cs+++ /dev/null@@ -1,13 +0,0 @@-using Grand.Infrastructure.Plugins;--namespace Grand.Web.Common.Themes-{- public interface IThemeProvider- {- bool ThemeConfigurationExists(string themeName);-- IList<ThemeConfiguration> GetConfigurations();-- ThemeInfo GetThemeDescriptorFromText(string text);- }-}diff --git a/src/Web/Grand.Web.Common/Themes/IThemeView.cs b/src/Web/Grand.Web.Common/Themes/IThemeView.csnew file mode 100644index 000000000..bcf4665c5--- /dev/null+++ b/src/Web/Grand.Web.Common/Themes/IThemeView.cs@@ -0,0 +1,11 @@+namespace Grand.Web.Common.Themes;++public interface IThemeView+{+ string AreaName { get; }+ string ThemeName { get; }+ public ThemeInfo ThemeInfo { get; }+ IEnumerable<string> GetViewLocations();+}++public record ThemeInfo(string Title, string PreviewImageUrl, string PreviewText, bool SupportRtl);diff --git a/src/Web/Grand.Web.Common/Themes/ThemeConfiguration.cs b/src/Web/Grand.Web.Common/Themes/ThemeConfiguration.csdeleted file mode 100644index dd701e1af..000000000--- a/src/Web/Grand.Web.Common/Themes/ThemeConfiguration.cs+++ /dev/null@@ -1,14 +0,0 @@-namespace Grand.Web.Common.Themes-{- public class ThemeConfiguration- {- public string Name { get; set; }- public string Title { get; set; }- public string PreviewImageUrl { get; set; }- public string PreviewText { get; set; }- public bool SupportRtl { get; set; }- public string Version { get; set; }- public string Directory { get; set; }-- }-}diff --git a/src/Web/Grand.Web.Common/Themes/ThemeContext.cs b/src/Web/Grand.Web.Common/Themes/ThemeContext.csindex 1dd077bcb..bc211c011 100644--- a/src/Web/Grand.Web.Common/Themes/ThemeContext.cs+++ b/src/Web/Grand.Web.Common/Themes/ThemeContext.cs@@ -1,133 +1,42 @@-using Grand.Business.Core.Interfaces.Common.Directory;-using Grand.Infrastructure;-using Grand.Domain.Common;-using Grand.Domain.Customers;-using Grand.Domain.Stores;-using Grand.Domain.Vendors;+using Grand.Domain.Stores;+using Grand.Infrastructure.Configuration;+using Microsoft.AspNetCore.Http;-namespace Grand.Web.Common.Themes+namespace Grand.Web.Common.Themes;++public class ThemeContext : ThemeContextBase{- /// <summary>- /// Theme context- /// </summary>- public class ThemeContext : IThemeContext+ private readonly StoreInformationSettings _storeInformationSettings;+ private readonly IHttpContextAccessor _contextAccessor;+ private string _themeName;++ public ThemeContext(+ IHttpContextAccessor contextAccessor,+ SecurityConfig securityConfig,+ StoreInformationSettings storeInformationSettings) :+ base(contextAccessor, securityConfig){- private readonly IWorkContext _workContext;- private readonly IUserFieldService _userFieldService;- private readonly StoreInformationSettings _storeInformationSettings;- private readonly VendorSettings _vendorSettings;- private readonly IThemeProvider _themeProvider;-- private bool _themeIsCached, _adminThemeIsCached;- private string _cachedThemeName, _cachedAdminThemeName;-- public ThemeContext(IWorkContext workContext,- IUserFieldService userFieldService,- StoreInformationSettings storeInformationSettings,- VendorSettings vendorSettings,- IThemeProvider themeProvider)- {- _workContext = workContext;- _userFieldService = userFieldService;- _storeInformationSettings = storeInformationSettings;- _vendorSettings = vendorSettings;- _themeProvider = themeProvider;- }-- /// <summary>- /// Get current theme system name- /// </summary>- public string WorkingThemeName- {- get- {- if (_themeIsCached)- return _cachedThemeName;-- var theme = "";- if (_storeInformationSettings.AllowCustomerToSelectTheme)- {- if (_workContext.CurrentCustomer != null)- theme = _workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.WorkingThemeName, _workContext.CurrentStore.Id);- }-- //default store theme- if (string.IsNullOrEmpty(theme))- theme = _storeInformationSettings.DefaultStoreTheme;+ _storeInformationSettings = storeInformationSettings;+ _contextAccessor = contextAccessor;+ }- //ensure that theme exists- if (!_themeProvider.ThemeConfigurationExists(theme))- {- var themeInstance = _themeProvider.GetConfigurations()- .FirstOrDefault();- if (themeInstance == null)- throw new Exception("No theme could be loaded");- theme = themeInstance.Name;- }+ public override string AreaName => "";- //cache theme- _cachedThemeName = theme;- _adminThemeIsCached = true;- return theme;- }- }+ public override string GetCurrentTheme()+ {+ if (!string.IsNullOrEmpty(_themeName))+ return _themeName;- /// <summary>- /// Get current theme system name- /// </summary>- public string AdminAreaThemeName+ var theme = "";+ if (_storeInformationSettings.AllowCustomerToSelectTheme){- get- {-- if (_adminThemeIsCached)- return _cachedAdminThemeName;-- var theme = "Default";-- if (!string.IsNullOrEmpty(_workContext.CurrentStore.DefaultAdminTheme))- theme = _workContext.CurrentStore.DefaultAdminTheme;-- if (_storeInformationSettings.AllowToSelectAdminTheme)- {- if (_workContext.CurrentCustomer != null)- {- var customerTheme = _workContext.CurrentCustomer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.AdminThemeName, _workContext.CurrentStore.Id);- if (!string.IsNullOrEmpty(customerTheme))- theme = customerTheme;- }- }-- if (_workContext.CurrentVendor != null)- {- if (!string.IsNullOrEmpty(_vendorSettings.DefaultAdminTheme))- theme = _vendorSettings.DefaultAdminTheme;- }-- //cache theme- _cachedAdminThemeName = theme;- _themeIsCached = true;- return theme;- }+ theme = _contextAccessor.HttpContext?.Request.Cookies[this.CookiesName];}- /// <summary>- /// Set current theme system name- /// </summary>- /// <param name="themeName"></param>- /// <returns></returns>- public virtual async Task SetWorkingTheme(string themeName)- {- if (!_storeInformationSettings.AllowCustomerToSelectTheme)- return;-- if (_workContext.CurrentCustomer == null)- return;+ //default store theme+ if (string.IsNullOrEmpty(theme))+ theme = _storeInformationSettings.DefaultStoreTheme;- await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.WorkingThemeName, themeName, _workContext.CurrentStore.Id);-- //clear cache- _themeIsCached = false;- }+ return _themeName = theme;}-}+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Themes/ThemeContextBase.cs b/src/Web/Grand.Web.Common/Themes/ThemeContextBase.csnew file mode 100644index 000000000..ce83f31c9--- /dev/null+++ b/src/Web/Grand.Web.Common/Themes/ThemeContextBase.cs@@ -0,0 +1,28 @@+using Grand.Infrastructure.Configuration;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.Common.Themes;++public abstract class ThemeContextBase : IThemeContext+{+ private readonly IHttpContextAccessor _contextAccessor;+ private readonly SecurityConfig _securityConfig;+ protected ThemeContextBase(IHttpContextAccessor contextAccessor, SecurityConfig securityConfig)+ {+ _contextAccessor = contextAccessor;+ _securityConfig = securityConfig;+ }++ public abstract string AreaName { get; }++ public string CookiesName => $"{_securityConfig.CookiePrefix}.{AreaName}.Theme";+ public abstract string GetCurrentTheme();++ public Task SetTheme(string themeName)+ {+ _contextAccessor.HttpContext?.Response.Cookies.Delete(CookiesName);+ _contextAccessor.HttpContext?.Response.Cookies.Append(CookiesName, themeName,+ new CookieOptions { HttpOnly = false, Expires = DateTimeOffset.Now.AddYears(1)});+ return Task.CompletedTask;+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Themes/ThemeContextFactory.cs b/src/Web/Grand.Web.Common/Themes/ThemeContextFactory.csnew file mode 100644index 000000000..99ea8b2f7--- /dev/null+++ b/src/Web/Grand.Web.Common/Themes/ThemeContextFactory.cs@@ -0,0 +1,17 @@+namespace Grand.Web.Common.Themes;++public class ThemeContextFactory : IThemeContextFactory+{+ private readonly IDictionary<string, IThemeContext> _themeContexts;++ public ThemeContextFactory(IEnumerable<IThemeContext> themeContexts)+ {+ _themeContexts = themeContexts.ToDictionary(f => f.AreaName, f => f);++ }++ public IThemeContext GetThemeContext(string areaName)+ {+ return _themeContexts.TryGetValue(areaName, out var themeContext) ? themeContext : null;+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Themes/ThemeList.cs b/src/Web/Grand.Web.Common/Themes/ThemeList.csdeleted file mode 100644index bdd419b1a..000000000--- a/src/Web/Grand.Web.Common/Themes/ThemeList.cs+++ /dev/null@@ -1,37 +0,0 @@-using Grand.SharedKernel.Extensions;-using Newtonsoft.Json;--namespace Grand.Web.Common.Themes-{- public class ThemeList : IThemeList- {- public ThemeList()- {- ThemeConfigurations = new List<ThemeConfiguration>();- if (!Directory.Exists(CommonPath.ThemePath)) return;- foreach (var themeName in Directory.GetDirectories(CommonPath.ThemePath))- {- var configuration = CreateThemeConfiguration(themeName);- if (configuration != null)- {- ThemeConfigurations.Add(configuration);- }- }- }-- public IList<ThemeConfiguration> ThemeConfigurations { get; }-- private static ThemeConfiguration CreateThemeConfiguration(string themePath)- {- var themeDirectory = new DirectoryInfo(themePath);- var themeConfigFile = new FileInfo(Path.Combine(themeDirectory.FullName, "theme.cfg"));-- if (!themeConfigFile.Exists) return null;- var themeConfiguration = JsonConvert.DeserializeObject<ThemeConfiguration>(File.ReadAllText(themeConfigFile.FullName));- if (themeConfiguration == null) return null;- themeConfiguration.Name = themeDirectory.Name;- return themeConfiguration;- }-- }-}diff --git a/src/Web/Grand.Web.Common/Themes/ThemeProvider.cs b/src/Web/Grand.Web.Common/Themes/ThemeProvider.csdeleted file mode 100644index f91fd15d0..000000000--- a/src/Web/Grand.Web.Common/Themes/ThemeProvider.cs+++ /dev/null@@ -1,54 +0,0 @@-using Grand.Infrastructure.Plugins;-using Grand.SharedKernel.Extensions;-using Newtonsoft.Json;--namespace Grand.Web.Common.Themes-{- public class ThemeProvider : IThemeProvider- {- #region Fields-- private readonly IThemeList _themeList;-- #endregion-- #region Constructors-- public ThemeProvider(IThemeList themeList)- {- _themeList = themeList;- }-- #endregion-- #region Methods-- public bool ThemeConfigurationExists(string themeName)- {- return GetConfigurations().Any(configuration => configuration.Name.Equals(themeName, StringComparison.OrdinalIgnoreCase));- }-- public IList<ThemeConfiguration> GetConfigurations()- {- return string.IsNullOrEmpty(CommonPath.Param) ? _themeList.ThemeConfigurations : _themeList.ThemeConfigurations.Where(x => string.IsNullOrEmpty(x.Directory) || x.Directory == CommonPath.Param).ToList();- }-- public ThemeInfo GetThemeDescriptorFromText(string text)- {- var themeDescriptor = new ThemeInfo();- try- {- var themeConfiguration = JsonConvert.DeserializeObject<ThemeConfiguration>(text);- themeDescriptor.FriendlyName = themeConfiguration?.Title;- }- catch- {- // ignored- }-- return themeDescriptor;- }-- #endregion- }-}diff --git a/src/Web/Grand.Web.Common/Themes/ThemeViewLocationExpander.cs b/src/Web/Grand.Web.Common/Themes/ThemeViewLocationExpander.csdeleted file mode 100644index e5f730fc1..000000000--- a/src/Web/Grand.Web.Common/Themes/ThemeViewLocationExpander.cs+++ /dev/null@@ -1,30 +0,0 @@-using Microsoft.AspNetCore.Mvc.Razor;--namespace Grand.Web.Common.Themes-{- public class ThemeViewLocationExpander : IViewLocationExpander- {- private const string ThemeKey = "Theme";-- public void PopulateValues(ViewLocationExpanderContext context)- {- if (!string.IsNullOrEmpty(context.AreaName)) return;-- var themeContext = (IThemeContext)context.ActionContext.HttpContext.RequestServices.GetService(typeof(IThemeContext));- context.Values[ThemeKey] = themeContext?.WorkingThemeName;- }-- public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)- {- if (string.IsNullOrEmpty(context.AreaName) && context.Values.TryGetValue(ThemeKey, out var theme))- {- viewLocations = new[] {- $"/Themes/{theme}/Views/{{1}}/{{0}}.cshtml",- $"/Themes/{theme}/Views/Shared/{{0}}.cshtml"- }- .Concat(viewLocations);- }- return viewLocations;- }- }-}diff --git a/src/Web/Grand.Web.Common/View/DefaultAreaViewFactory.cs b/src/Web/Grand.Web.Common/View/DefaultAreaViewFactory.csnew file mode 100644index 000000000..cf9968c80--- /dev/null+++ b/src/Web/Grand.Web.Common/View/DefaultAreaViewFactory.cs@@ -0,0 +1,38 @@+using Grand.Web.Common.Themes;++namespace Grand.Web.Common.View;++public class DefaultAreaViewFactory : IAreaViewFactory+{+ public string AreaName => "";++ private readonly IEnumerable<IThemeView> _themeFactories;+ private readonly IThemeContext _themeContext;++ public DefaultAreaViewFactory(IEnumerable<IThemeView> themeFactories, IThemeContextFactory themeContextFactory)+ {+ _themeContext = themeContextFactory.GetThemeContext(AreaName);+ _themeFactories = themeFactories.Where(x=>x.AreaName == AreaName);+ }++ public IEnumerable<string> GetViewLocations(IEnumerable<string> viewLocations)+ {+ var themeName = _themeContext?.GetCurrentTheme();++ if(string.IsNullOrEmpty(themeName)) return GetDefaultViewLocations();++ var themeViewLocations = _themeFactories+ .Where(x=>x.ThemeName == themeName)+ .SelectMany(x=>x.GetViewLocations())+ .ToList();+ return themeViewLocations.Any() ? themeViewLocations.Concat(GetDefaultViewLocations()) : GetDefaultViewLocations();+ }++ private IEnumerable<string> GetDefaultViewLocations()+ {+ return new List<string> {+ "/Views/{1}/{0}.cshtml",+ "/Views/Shared/{0}.cshtml"+ };+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/View/IAreaViewFactory.cs b/src/Web/Grand.Web.Common/View/IAreaViewFactory.csnew file mode 100644index 000000000..11cc44b8e--- /dev/null+++ b/src/Web/Grand.Web.Common/View/IAreaViewFactory.cs@@ -0,0 +1,7 @@+namespace Grand.Web.Common.View;++public interface IAreaViewFactory+{+ string AreaName { get; }+ IEnumerable<string> GetViewLocations(IEnumerable<string> viewLocations);+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/View/IViewFactory.cs b/src/Web/Grand.Web.Common/View/IViewFactory.csnew file mode 100644index 000000000..31c475d6e--- /dev/null+++ b/src/Web/Grand.Web.Common/View/IViewFactory.cs@@ -0,0 +1,8 @@+namespace Grand.Web.Common.View;++public interface IViewFactory+{+ void GetViewPath(+ string areaName,+ ref IEnumerable<string> viewLocations);+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/View/ViewFactory.cs b/src/Web/Grand.Web.Common/View/ViewFactory.csnew file mode 100644index 000000000..246d6a243--- /dev/null+++ b/src/Web/Grand.Web.Common/View/ViewFactory.cs@@ -0,0 +1,27 @@+#nullable enable+namespace Grand.Web.Common.View;++public class ViewFactory : IViewFactory+{+ private readonly IDictionary<string, IAreaViewFactory> _areaFactories;++ public ViewFactory(IEnumerable<IAreaViewFactory> areaFactories)+ {+ _areaFactories = areaFactories.ToDictionary(f => f.AreaName, f => f);+ }++ public void GetViewPath(string areaName, ref IEnumerable<string> viewLocations)+ {+ if (_areaFactories.TryGetValue(areaName, out var areaFactory))+ {+ viewLocations = areaFactory.GetViewLocations(viewLocations);+ return;+ }++ viewLocations = new List<string>+ {+ "/Views/{1}/{0}.cshtml",+ "/Views/Shared/{0}.cshtml"+ };+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/View/ViewLocationExpander.cs b/src/Web/Grand.Web.Common/View/ViewLocationExpander.csnew file mode 100644index 000000000..f41937868--- /dev/null+++ b/src/Web/Grand.Web.Common/View/ViewLocationExpander.cs@@ -0,0 +1,29 @@+using Grand.Web.Common.Themes;+using Microsoft.AspNetCore.Mvc.Razor;+using Microsoft.Extensions.DependencyInjection;++namespace Grand.Web.Common.View+{+ public class ViewLocationExpander : IViewLocationExpander+ {+ private const string ThemeKey = "Theme";+ public void PopulateValues(ViewLocationExpanderContext context)+ {+ var themeContextFactory = context.ActionContext.HttpContext.RequestServices.GetRequiredService<IThemeContextFactory>();+ var themeContext = themeContextFactory.GetThemeContext(context.AreaName ?? "");+ var themeName = themeContext?.GetCurrentTheme();+ if(!string.IsNullOrEmpty(themeName))+ context.Values[ThemeKey] = themeContext?.GetCurrentTheme();+ }++ public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)+ {+ if (!context.Values.TryGetValue(ThemeKey, out var _)) return viewLocations;++ var viewFactory = context.ActionContext.HttpContext.RequestServices.GetRequiredService<IViewFactory>();+ viewFactory.GetViewPath(context.AreaName ?? "", ref viewLocations);++ return viewLocations;+ }+ }+}diff --git a/src/Web/Grand.Web.Vendor/Infrastructure/VendorViewLocationExpander.cs b/src/Web/Grand.Web.Vendor/Infrastructure/VendorViewLocationExpander.csdeleted file mode 100644index d02addd49..000000000--- a/src/Web/Grand.Web.Vendor/Infrastructure/VendorViewLocationExpander.cs+++ /dev/null@@ -1,31 +0,0 @@-using Microsoft.AspNetCore.Mvc.Razor;--namespace Grand.Web.Vendor.Infrastructure-{- public class VendorViewLocationExpander : IViewLocationExpander- {- private const string AreaVendorKey = "Vendor";--- public void PopulateValues(ViewLocationExpanderContext context)- {- if (!(context.AreaName?.Equals("Vendor") ?? false)) return;-- context.Values[AreaVendorKey] = AreaVendorKey;- }-- public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)- {-- if ((context.AreaName?.Equals("Vendor") ?? false) && context.Values.TryGetValue(AreaVendorKey, out var vendorTheme))- {- viewLocations = new[] {- $"/Areas/{{2}}/Themes/{vendorTheme}/Views/{{1}}/{{0}}.cshtml",- $"/Areas/{{2}}/Themes/{vendorTheme}/Views/Shared/{{0}}.cshtml"- }- .Concat(viewLocations);- }- return viewLocations;- }- }-}diff --git a/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs b/src/Web/Grand.Web.Vendor/Startup/StartupApplication.csindex 820598f46..02d0dd836 100644--- a/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs@@ -1,11 +1,9 @@using Grand.Data;using Grand.Infrastructure;-using Grand.Web.Vendor.Infrastructure;using Grand.Web.Vendor.Interfaces;using Grand.Web.Vendor.Services;using Microsoft.AspNetCore.Builder;using Microsoft.AspNetCore.Hosting;-using Microsoft.AspNetCore.Mvc.Razor;using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;@@ -17,12 +15,6 @@ namespace Grand.Web.Vendor.Startup{if (!DataSettingsManager.DatabaseIsInstalled())return;-- //themes support- services.Configure<RazorViewEngineOptions>(options =>- {- options.ViewLocationExpanders.Add(new VendorViewLocationExpander());- });services.AddScoped<IProductViewModelService, ProductViewModelService>();services.AddScoped<IOrderViewModelService, OrderViewModelService>();diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 13cc9c405..cdee9a085 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -5010,12 +5010,6 @@<Resource Name="Admin.Configuration.Themes.Failed" Area="Admin"><Value>Failed to upload theme. Make sure you are not uploading already existing one. If so, try deleting it manually before resubmitting.</Value></Resource>- <Resource Name="Admin.Configuration.Themes.Upload" Area="Admin">- <Value>Upload theme</Value>- </Resource>- <Resource Name="Admin.Configuration.Themes.Uploaded" Area="Admin">- <Value>Theme uploaded</Value>- </Resource><Resource Name="Admin.Configuration.Updated" Area="Admin"><Value>The settings have been updated successfully.</Value></Resource>@@ -17476,6 +17470,12 @@<Resource Name="Vendors.ViewAll" Area="Front"><Value>View all</Value></Resource>+ <Resource Name="View.Nomore" Area="Front">+ <Value>No more products</Value>+ </Resource>+ <Resource Name="View.ScrollDown" Area="Front">+ <Value>Scroll down to view more products</Value>+ </Resource><Resource Name="voicenavigator.voice.annotation" Area="Front"><Value>Say what do you want to do in the store, i.e Show me the cart</Value></Resource>diff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xmlindex fde5bfb81..6de308caf 100644--- a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml+++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml@@ -2063,5 +2063,10 @@<Resource Name="Vendor.Fields.SeName" Area="Vendor"><Value>SeName</Value></Resource>-+ <Resource Name="View.Nomore" Area="Front">+ <Value>No more products</Value>+ </Resource>+ <Resource Name="View.ScrollDown" Area="Front">+ <Value>Scroll down to view more products</Value>+ </Resource></Language>\ No newline at end of filediff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.jsonindex 1713db459..1874bf8e5 100644--- a/src/Web/Grand.Web/App_Data/appsettings.json+++ b/src/Web/Grand.Web/App_Data/appsettings.json@@ -107,7 +107,7 @@//https://github.com/dotnet/roslyn/wiki/Roslyn-Overview"UseRoslynScripts": false,- //Disable upload extensions plugins/themes+ //Disable upload extensions plugins"DisableUploadExtensions": false,//A list of plugins to be ignored during start application - patterndiff --git a/src/Web/Grand.Web/Controllers/CommonController.cs b/src/Web/Grand.Web/Controllers/CommonController.csindex 510c92c00..5969b5197 100644--- a/src/Web/Grand.Web/Controllers/CommonController.cs+++ b/src/Web/Grand.Web/Controllers/CommonController.cs@@ -69,13 +69,15 @@ namespace Grand.Web.Controllersvar _ = new PathString(url).StartsWithSegments(pathBase, out PathString result);url = WebUtility.UrlDecode(result);- var firstSegment = url.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault() ?? string.Empty;+ var firstSegment = url.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault() ??+ string.Empty;if (string.IsNullOrEmpty(firstSegment))return false;//suppose that the first segment is the language code and try to get languagevar language = (await _languageService.GetAllLanguages())- .FirstOrDefault(urlLanguage => urlLanguage.UniqueSeoCode.Equals(firstSegment, StringComparison.OrdinalIgnoreCase));+ .FirstOrDefault(urlLanguage =>+ urlLanguage.UniqueSeoCode.Equals(firstSegment, StringComparison.OrdinalIgnoreCase));return language?.Published ?? false;}@@ -117,6 +119,7 @@ namespace Grand.Web.ControllersResponse.ContentType = "text/html";return View();}+[IgnoreApi][HttpGet]public virtual IActionResult Route(string routeName)@@ -136,6 +139,7 @@ namespace Grand.Web.Controllers{return View(errors);}+[HttpGet][PublicStore(true)][DenySystemAccount]@@ -143,7 +147,6 @@ namespace Grand.Web.Controllers[FromServices] AppConfig config,string langCode, string returnUrl = default){-var language = await _languageService.GetLanguageByCode(langCode);if (!language?.Published ?? false)language = _workContext.WorkingLanguage;@@ -218,10 +221,12 @@ namespace Grand.Web.Controllersawait _workContext.SetWorkingCurrency(currency);//clear coupon code- await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.DiscountCoupons, "");+ await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.DiscountCoupons,+ "");//clear gift card- await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.GiftVoucherCoupons, "");+ await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.GiftVoucherCoupons,+ "");//notificationawait _mediator.Publish(new ChangeCurrencyEvent(_workContext.CurrentCustomer, currency));@@ -252,7 +257,8 @@ namespace Grand.Web.Controllers{if (commonSettings.AllowToSelectStore){- var selectedstore = storeService.GetAll().FirstOrDefault(x => string.Equals(x.Shortcut, shortcut, StringComparison.InvariantCultureIgnoreCase));+ var selectedstore = storeService.GetAll().FirstOrDefault(x =>+ string.Equals(x.Shortcut, shortcut, StringComparison.InvariantCultureIgnoreCase));if (selectedstore != null){await storeHelper.SetStoreCookie(selectedstore.Id);@@ -305,9 +311,13 @@ namespace Grand.Web.Controllers[DenySystemAccount][HttpGet]public virtual async Task<IActionResult> SetStoreTheme(- [FromServices] IThemeContext themeContext, string themeName, string returnUrl = "")+ [FromServices] StoreInformationSettings storeInformationSettings,+ [FromServices] IThemeContextFactory themeContextFactory, string themeName, string returnUrl = ""){- await themeContext.SetWorkingTheme(themeName);+ if (!storeInformationSettings.AllowCustomerToSelectTheme) return Redirect(returnUrl);++ var themeContext = themeContextFactory.GetThemeContext("");+ if (themeContext != null) await themeContext.SetTheme(themeName);//notificationawait _mediator.Publish(new ChangeThemeEvent(_workContext.CurrentCustomer, themeName));@@ -352,18 +362,22 @@ namespace Grand.Web.Controllersreturn Json(new { stored = false });//save consent cookies- await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ConsentCookies, "", _workContext.CurrentStore.Id);+ await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ConsentCookies, "",+ _workContext.CurrentStore.Id);var dictionary = new Dictionary<string, bool>();var consentCookies = cookiePreference.GetConsentCookies();foreach (var item in consentCookies.Where(x => x.AllowToDisable)){dictionary.Add(item.SystemName, accept);}+if (dictionary.Any())- await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ConsentCookies, dictionary, _workContext.CurrentStore.Id);+ await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ConsentCookies,+ dictionary, _workContext.CurrentStore.Id);//save setting - CookieAccepted- await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.CookieAccepted, true, _workContext.CurrentStore.Id);+ await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.CookieAccepted,+ true, _workContext.CurrentStore.Id);return Json(new { stored = true });}@@ -383,8 +397,7 @@ namespace Grand.Web.ControllersStore = _workContext.CurrentStore});- return Json(new- {+ return Json(new {html = await this.RenderPartialViewToString("PrivacyPreference", model, true),model});@@ -399,18 +412,19 @@ namespace Grand.Web.Controllers[FromServices] IUserFieldService userFieldService,[FromServices] ICookiePreference cookiePreference){-if (!storeInformationSettings.DisplayPrivacyPreference)return Json(new { success = false });const string consent = "ConsentCookies";- await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ConsentCookies, "", _workContext.CurrentStore.Id);+ await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ConsentCookies, "",+ _workContext.CurrentStore.Id);var selectedConsentCookies = new List<string>();foreach (var item in model){if (item.Key.StartsWith(consent))selectedConsentCookies.Add(item.Value);}+var dictionary = new Dictionary<string, bool>();var consentCookies = cookiePreference.GetConsentCookies();foreach (var item in consentCookies)@@ -419,7 +433,8 @@ namespace Grand.Web.Controllersdictionary.Add(item.SystemName, selectedConsentCookies.Contains(item.SystemName));}- await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ConsentCookies, dictionary, _workContext.CurrentStore.Id);+ await userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.ConsentCookies,+ dictionary, _workContext.CurrentStore.Id);return Json(new { success = true });}@@ -433,6 +448,7 @@ namespace Grand.Web.Controllersvar sb = await _mediator.Send(new GetRobotsTextFile { StoreId = _workContext.CurrentStore.Id });return Content(sb, "text/plain");}+[IgnoreApi][HttpGet]public virtual IActionResult GenericUrl()@@ -468,4 +484,4 @@ namespace Grand.Web.Controllers#endregion}-}+}\ No newline at end of filediff --git a/src/Web/Grand.Web/Grand.Web.csproj b/src/Web/Grand.Web/Grand.Web.csprojindex 06e1273f3..28e34d323 100644--- a/src/Web/Grand.Web/Grand.Web.csproj+++ b/src/Web/Grand.Web/Grand.Web.csproj@@ -9,17 +9,6 @@Server garbage collection should be the fastest option for more than two processors.More details about GC you can see here: https://docs.microsoft.com/en-us/dotnet/standard/garbage-collection/fundamentals--><ServerGarbageCollection>false</ServerGarbageCollection>- <!--In workstation or server garbage collection, you can enable concurrent garbage collection,- which enables threads to run concurrently with a dedicated thread that performs the garbage- collection for most of the duration of the collection.- Concurrent garbage collection enables interactive applications to be more responsive by- minimizing pauses for a collection. Managed threads can continue to run most of the time while- the concurrent garbage collection thread is running. This results in shorter pauses while- a garbage collection is occurring.- To improve performance when several processes are running, disable concurrent garbage collection.- More details here: https://docs.microsoft.com/en-us/dotnet/standard/garbage-collection/fundamentals#concurrent-garbage-collection-->- <ConcurrentGarbageCollection>false</ConcurrentGarbageCollection>-<PreserveCompilationReferences>true</PreserveCompilationReferences><DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath><UserSecretsId>a2091e37-94a0-4446-8a5d-1d5c0835333a</UserSecretsId>@@ -38,17 +27,14 @@<ItemGroup><Content Include="App_Data\**" CopyToPublishDirectory="PreserveNewest" Exclude="App_Data\appsettings.json;App_Data\DataProtectionKeys\*.xml;" />- <Content Include="Themes\**" CopyToPublishDirectory="PreserveNewest" Exclude="Themes\**\*.cfg;Themes\**\*.cshtml" /><Content Include="Roslyn\**" CopyToPublishDirectory="PreserveNewest" Exclude="Roslyn\**\*.dll" /><Content Include="logs\**" CopyToPublishDirectory="PreserveNewest" /><Content Remove="wwwroot\assets\images\thumbs\*.jpeg;wwwroot\assets\images\thumbs\*.jpg;wwwroot\assets\images\thumbs\*.png" /></ItemGroup><Target Name="PublishViews" BeforeTargets="PrepareForPublish"><ItemGroup>- <ThemeViews Include="Themes/**/*" /><PluginFiles Include="Plugins/**/*" /></ItemGroup>- <Copy SourceFiles="@(ThemeViews)" DestinationFolder="$(PublishDir)/Themes/%(RecursiveDir)" SkipUnchangedFiles="true" /><Copy SourceFiles="@(PluginFiles)" DestinationFolder="$(PublishDir)/Plugins/%(RecursiveDir)" SkipUnchangedFiles="true" /></Target><!--<PropertyGroup>@@ -62,5 +48,5 @@<Content Update="Plugins\**"><CopyToOutputDirectory>Always</CopyToOutputDirectory></Content>- </ItemGroup>+ </ItemGroup></Project>diff --git a/src/Web/Grand.Web/Grand.Web.sln b/src/Web/Grand.Web/Grand.Web.slnnew file mode 100644index 000000000..3ed4bf656--- /dev/null+++ b/src/Web/Grand.Web/Grand.Web.sln@@ -0,0 +1,25 @@++Microsoft Visual Studio Solution File, Format Version 12.00+# Visual Studio Version 17+VisualStudioVersion = 17.5.002.0+MinimumVisualStudioVersion = 10.0.40219.1+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Web", "Grand.Web.csproj", "{A5DE43B1-31A5-4B4E-80CC-06F9D456C77C}"+EndProject+Global+ GlobalSection(SolutionConfigurationPlatforms) = preSolution+ Debug|Any CPU = Debug|Any CPU+ Release|Any CPU = Release|Any CPU+ EndGlobalSection+ GlobalSection(ProjectConfigurationPlatforms) = postSolution+ {A5DE43B1-31A5-4B4E-80CC-06F9D456C77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {A5DE43B1-31A5-4B4E-80CC-06F9D456C77C}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {A5DE43B1-31A5-4B4E-80CC-06F9D456C77C}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {A5DE43B1-31A5-4B4E-80CC-06F9D456C77C}.Release|Any CPU.Build.0 = Release|Any CPU+ EndGlobalSection+ GlobalSection(SolutionProperties) = preSolution+ HideSolutionNode = FALSE+ EndGlobalSection+ GlobalSection(ExtensibilityGlobals) = postSolution+ SolutionGuid = {114FC0AE-137B-47F1-8A95-6CB71ED0E1A7}+ EndGlobalSection+EndGlobaldiff --git a/src/Web/Grand.Web/Themes/Default/theme.cfg b/src/Web/Grand.Web/Themes/Default/theme.cfgdeleted file mode 100644index c7b0db3c0..000000000--- a/src/Web/Grand.Web/Themes/Default/theme.cfg+++ /dev/null@@ -1,7 +0,0 @@-{- "Title": "Default theme",- "SupportRTL": "true",- "PreviewImageUrl": "~/Themes/Default/preview.jpg",- "PreviewText": "Default GrandNode theme",- "Version": "1.0"-}\ No newline at end of filediff --git a/src/Web/Grand.Web/Views/Shared/Partials/Header.cshtml b/src/Web/Grand.Web/Views/Shared/Partials/Header.cshtmlindex 8e129050b..5a8882bb6 100644--- a/src/Web/Grand.Web/Views/Shared/Partials/Header.cshtml+++ b/src/Web/Grand.Web/Views/Shared/Partials/Header.cshtml@@ -1,4 +1,6 @@@inject IWorkContext workContext+@inject StoreInformationSettings StoreInformationSettings+@inject CommonSettings CommonSettings@{var supportRtl = workContext.WorkingLanguage.Rtl;}@@ -52,8 +54,15 @@<partial name="Partials/Selector_TaxType" /><partial name="Partials/Selector_Currency" /><partial name="Partials/Selector_Language" />+ @if(CommonSettings.AllowToSelectStore)+ {+ <partial name="Partials/Selector_Store" />+ }<partial name="Partials/Selector_Store" />- <partial name="Partials/Selector_Theme" />+ @if (StoreInformationSettings.AllowCustomerToSelectTheme)+ {+ <partial name="Partials/Selector_Theme"/>+ }@await Component.InvokeAsync("Widget", new { widgetZone = "header_selectors" })</div><partial name="Partials/HeaderLinks" />diff --git a/src/Web/Grand.Web/Views/Shared/Partials/Selector_Store.cshtml b/src/Web/Grand.Web/Views/Shared/Partials/Selector_Store.cshtmlindex be4777da6..0e9d55eed 100644--- a/src/Web/Grand.Web/Views/Shared/Partials/Selector_Store.cshtml+++ b/src/Web/Grand.Web/Views/Shared/Partials/Selector_Store.cshtml@@ -1,37 +1,34 @@@using Grand.Business.Core.Extensions@using Grand.Business.Core.Interfaces.Common.Stores-@inject CommonSettings commonSettings-@inject IStoreService storeService-@inject IWorkContext workContext+@inject IStoreService StoreService+@inject IWorkContext WorkContext@{- if (commonSettings.AllowToSelectStore)- {- var availableStores = storeService.GetAll()- .Select(x =>+ var availableStores = StoreService.GetAll()+ .Select(x =>+ {+ //model+ var storeModel = new StoreModel{- //model- var storeModel = new StoreModel- {- Id = x.Id,- Name = x.GetTranslation(y => y.Name, workContext.WorkingLanguage.Id),- Shortcut = x.Shortcut- };- return storeModel;- }).ToList();+ Id = x.Id,+ Name = x.GetTranslation(y => y.Name, WorkContext.WorkingLanguage.Id),+ Shortcut = x.Shortcut+ };+ return storeModel;+ }).ToList();- if (availableStores.Count > 1)- {- var returnUrl = Context?.Request?.GetEncodedPathAndQuery();+ if (availableStores.Count > 1)+ {+ var returnUrl = Context?.Request?.GetEncodedPathAndQuery();- <b-dropdown class="mr-2" text="@availableStores.FirstOrDefault(x => x.Id == workContext.CurrentStore.Id).Name">- @foreach (var store in availableStores)- {- var className = store.Id == workContext.CurrentStore.Id ? "active" : "";- <b-dropdown-item class="@className" href="@Url.RouteUrl("ChangeStore", new { shortcut = store.Shortcut, returnUrl })">- @store.Name- </b-dropdown-item>- }- </b-dropdown>- }+ <b-dropdown class="mr-2" text="@availableStores.FirstOrDefault(x => x.Id == WorkContext.CurrentStore.Id)?.Name">+ @foreach (var store in availableStores)+ {+ var className = store.Id == WorkContext.CurrentStore.Id ? "active" : "";+ <b-dropdown-item class="@className" href="@Url.RouteUrl("ChangeStore", new { shortcut = store.Shortcut, returnUrl })">+ @store.Name+ </b-dropdown-item>+ }+ </b-dropdown>}+}\ No newline at end of filediff --git a/src/Web/Grand.Web/Views/Shared/Partials/Selector_Theme.cshtml b/src/Web/Grand.Web/Views/Shared/Partials/Selector_Theme.cshtmlindex 2c30cb2a7..afb750aa0 100644--- a/src/Web/Grand.Web/Views/Shared/Partials/Selector_Theme.cshtml+++ b/src/Web/Grand.Web/Views/Shared/Partials/Selector_Theme.cshtml@@ -1,28 +1,25 @@-@inject StoreInformationSettings storeInformationSettings-@inject IThemeProvider themeProvider-@inject IThemeContext themeContext+@inject IThemeContextFactory ThemeContext+@inject IEnumerable<IThemeView> Themes@{- if (storeInformationSettings.AllowCustomerToSelectTheme)- {- var availablThemes = themeProvider.GetConfigurations()- .Select(x => new StoreThemeModel- {- Name = x.Name,- Title = x.Title- }).ToList();-- var returnurl = Context?.Request?.GetEncodedPathAndQuery();- if (availablThemes.Count > 1)+ var themeContext = ThemeContext.GetThemeContext("");+ var availablThemes = Themes.Where(x => x.AreaName == "").ToList()+ .Select(x => new StoreThemeModel{- <b-dropdown class="mr-2" text="@availablThemes.FirstOrDefault(x => x.Name == themeContext.WorkingThemeName)?.Name">- @foreach (var theme in availablThemes)- {- var className = theme.Name == themeContext.WorkingThemeName ? "active" : "";- <b-dropdown-item class="@className" href="@Url.Action("SetStoreTheme", "Common", new { themename = theme.Name, returnUrl = returnurl })">- @theme.Name- </b-dropdown-item>- }- </b-dropdown>- }+ Name = x.ThemeName,+ Title = x.ThemeInfo?.Title+ }).ToList();++ var returnurl = Context?.Request?.GetEncodedPathAndQuery();+ if (availablThemes.Count > 1)+ {+ <b-dropdown class="mr-2" text="@availablThemes.FirstOrDefault(x => x.Name == themeContext?.GetCurrentTheme())?.Name">+ @foreach (var theme in availablThemes)+ {+ var className = theme.Name == themeContext?.GetCurrentTheme() ? "active" : "";+ <b-dropdown-item class="@className" href="@Url.Action("SetStoreTheme", "Common", new { themename = theme.Name, returnUrl = returnurl })">+ @theme.Name+ </b-dropdown-item>+ }+ </b-dropdown>}-}+}\ No newline at end of filediff --git a/src/Web/Grand.Web/Themes/Default/preview.jpg b/src/Web/Grand.Web/wwwroot/assets/samples/default-theme.jpgsimilarity index 100%rename from src/Web/Grand.Web/Themes/Default/preview.jpgrename to src/Web/Grand.Web/wwwroot/assets/samples/default-theme.jpg