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
newsletterBox and PrivacyPreference - scripts moved to appjs
DanielŻuławski6814ae866edf
diff --git a/src/Web/Grand.Web/Views/Common/PrivacyPreference.cshtml b/src/Web/Grand.Web/Views/Common/PrivacyPreference.cshtmlindex 1c072ec76..d9515d9fa 100644--- a/src/Web/Grand.Web/Views/Common/PrivacyPreference.cshtml+++ b/src/Web/Grand.Web/Views/Common/PrivacyPreference.cshtml@@ -21,7 +21,7 @@</div></div>}- <input type="button" class="btn btn-info w-100" @@click="$bvModal.hide('ModalPrivacyPreference')" value="Save" onclick="SavePrivacyPreference('@Url.RouteUrl("PrivacyPreference")');" />+ <input type="button" class="btn btn-info w-100" @@click="$bvModal.hide('ModalPrivacyPreference');vm.savePrivacyPreference('@Url.RouteUrl("PrivacyPreference")')" value="Save" /></div></form>}diff --git a/src/Web/Grand.Web/Views/Newsletter/NewsletterCategory.cshtml b/src/Web/Grand.Web/Views/Newsletter/NewsletterCategory.cshtmlindex f1f800815..e9ac67a1b 100644--- a/src/Web/Grand.Web/Views/Newsletter/NewsletterCategory.cshtml+++ b/src/Web/Grand.Web/Views/Newsletter/NewsletterCategory.cshtml@@ -16,7 +16,7 @@</div>}<div class="newsletter-category-save pt-1 pb-1">- <input type="button" value="@Loc["NewsletterCategory.Options.Save"]" id="newsletter-category-button" @@click="$bvModal.hide('ModalNewsletterCategory')" onclick="newsletter_subscribe_category('@(Url.RouteUrl("SubscribeNewsletterCategory"))')" class="btn btn-outline-info newsletter-subscribe-button" />+ <input type="button" value="@Loc["NewsletterCategory.Options.Save"]" id="newsletter-category-button" @@click="$bvModal.hide('ModalNewsletterCategory');vm.newsletterSubscribeCategory('@(Url.RouteUrl("SubscribeNewsletterCategory"))')" class="btn btn-outline-info newsletter-subscribe-button" /></div></div></form>diff --git a/src/Web/Grand.Web/Views/Shared/Components/Footer/Default.cshtml b/src/Web/Grand.Web/Views/Shared/Components/Footer/Default.cshtmlindex 842c36880..865401899 100644--- a/src/Web/Grand.Web/Views/Shared/Components/Footer/Default.cshtml+++ b/src/Web/Grand.Web/Views/Shared/Components/Footer/Default.cshtml@@ -17,7 +17,7 @@}@if (Model.PrivacyPreference){- <a class="list-group-item list-group-item-action" id="btnPrivacyPreference" href="#" onclick="GetPrivacyPreference('@Url.RouteUrl("PrivacyPreference")'); return false;">@Loc["PrivacyPreference"]</a>+ <a class="list-group-item list-group-item-action btn btn-link" id="btnPrivacyPreference" @@click="getPrivacyPreference('@Url.RouteUrl("PrivacyPreference")'); return false;">@Loc["PrivacyPreference"]</a>}@foreach (var mpage in Model.Pages.Where(x => x.IncludeInFooterRow1).ToList()){diff --git a/src/Web/Grand.Web/Views/Shared/_NewsletterBox.cshtml b/src/Web/Grand.Web/Views/Shared/_NewsletterBox.cshtmlindex 7bb3f7c44..8dd998492 100644--- a/src/Web/Grand.Web/Views/Shared/_NewsletterBox.cshtml+++ b/src/Web/Grand.Web/Views/Shared/_NewsletterBox.cshtml@@ -20,7 +20,7 @@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">+ <button class="btn btn-secondary newsletter-email-button" id="newsletter-subscribe-button" @@click="newsletterBox('@customerSettings.NewsletterBlockAllowToUnsubscribe', '@(Url.RouteUrl("SubscribeNewsletter"))')"><b-icon icon="envelope"></b-icon></button></div>@@ -31,7 +31,7 @@<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">+ <input value="newsletter_unsubscribe" id="newsletter_subscribe" ref="newsletterSubscribe" 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">diff --git a/src/Web/Grand.Web/wwwroot/theme/script/app.js b/src/Web/Grand.Web/wwwroot/theme/script/app.jsindex b9be82d64..9fd042111 100644--- a/src/Web/Grand.Web/wwwroot/theme/script/app.js+++ b/src/Web/Grand.Web/wwwroot/theme/script/app.js@@ -45,6 +45,114 @@}},methods: {+ 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;diff --git a/src/Web/Grand.Web/wwwroot/theme/script/public.common.js b/src/Web/Grand.Web/wwwroot/theme/script/public.common.jsindex d75f76c73..e5082d97d 100644--- a/src/Web/Grand.Web/wwwroot/theme/script/public.common.js+++ b/src/Web/Grand.Web/wwwroot/theme/script/public.common.js@@ -1,77 +1,4 @@-function displayPopupPrivacyPreference(html) {- new Vue({- el: '#ModalPrivacyPreference',- data: {- template: null,- darkMode: false,- },- render: function (createElement) {- if (!this.template) {- return createElement('b-overlay', {- attrs: { show: 'true' }- });- } else {- return this.template();- }- },- methods: {- showModal: function() {- this.$refs['ModalPrivacyPreference'].show()- }- },- watch: {- darkMode: function (newValue) {- localStorage.darkMode = newValue;- },- },- mounted: function () {- var self = this;- self.template = Vue.compile(html).render;- if (localStorage.darkMode == "true") this.darkMode = true;- },- updated: function () {- this.showModal();- }- });-}-function displayPopupNewsletterCategory(html) {- new Vue({- el: '#ModalNewsletterCategory',- data: {- template: null,- darkMode: false,- },- render: function (createElement) {- if (!this.template) {- return createElement('b-overlay', {- attrs: { show: 'true' }- });- } else {- return this.template();- }- },- methods: {- showModal: function () {- this.$refs['ModalNewsletterCategory'].show()- }- },- watch: {- darkMode: function (newValue) {- localStorage.darkMode = newValue;- },- },- mounted: function () {- var self = this;- self.template = Vue.compile(html).render;- if (localStorage.darkMode == "true") this.darkMode = true;- },- updated: function () {- this.showModal();- }- });-}--// CSRF (XSRF) security+// CSRF (XSRF) securityfunction addAntiForgeryToken(data) {//if the object is undefined, create a new one.if (!data) {@@ -85,84 +12,6 @@ function addAntiForgeryToken(data) {return data;};-function newsletter_subscribe(subscribe) {- var subscribeProgress = document.getElementById("subscribe-loading-progress");- subscribeProgress.style.display = "block";- var postData = {- subscribe: subscribe,- email: document.getElementById("newsletter-email").value- };- var href = document.getElementById("newsletterbox").getAttribute('data-href');- axios({- url: href,- params: postData,- method: 'post',- }).then(function (response) {- subscribeProgress.style.display = "none";- document.querySelector("#newsletter-result-block .alert").innerHTML = response.data.Result;- if (response.data.Success) {- document.querySelector('.newsletter-inputs .input-group').style.display = "none";- if (document.querySelector('.newsletter-inputs .newsletter-subscribe-unsubscribe')) {- document.querySelector('.newsletter-inputs .newsletter-subscribe-unsubscribe').style.display = "none";- }- document.querySelector("#newsletter-result-block").style.display = "block";- document.getElementById('newsletter-result-block').classList.add("success");- document.getElementById('newsletter-result-block').style.bottom = "unset";- if (response.data.Showcategories) {- displayPopupNewsletterCategory(response.data.ResultCategory)- }- } else {- document.querySelector("#newsletter-result-block").style.display = "block";- window.setTimeout(function () {- document.getElementById('newsletter-result-block').style.display = "none"- }, 2000);- }- }).catch(function (error) {- subscribeProgress.style.display = "none";- })-}--function newsletter_subscribe_category(url) {- var form = document.getElementById('newsletter-category-method-form');- var 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);- })-}--function newsletterBox() {- if (document.getElementById('newsletter-subscribe-button')) {- var el = document.getElementById('newsletter-subscribe-button');- el.onclick = function () {- var allowToUnsubscribe = document.getElementById("newsletterbox").getAttribute('data-allowtounsubscribe').toLowerCase();- if (allowToUnsubscribe == 'true') {- if (document.getElementById('newsletter_subscribe').checked) {- newsletter_subscribe('true');- }- else {- newsletter_subscribe('false');- }- }- else {- newsletter_subscribe('true');- }- };- document.getElementById("newsletter-email").addEventListener("keyup", function (event) {- if (event.keyCode == 13) {- document.getElementById("newsletter-subscribe-button").click();- }- });- }-}-// runs an array of async functions in sequential orderfunction seq(arr, callback, index) {// first call, without an index@@ -258,30 +107,6 @@ function runScripts($container) {seq(runList, scriptsDone)}-function GetPrivacyPreference(href) {- axios({- url: href,- method: 'get',- }).then(function (response) {- displayPopupPrivacyPreference(response.data.html)- }).catch(function (error) {- alert(error);- });-}-function SavePrivacyPreference(href) {- var form = document.querySelector('#frmPrivacyPreference');- var data = new FormData(form);- axios({- url: href,- method: 'post',- data: data- }).then(function (response) {-- }).catch(function (error) {- alert(error);- });-}-function SaveCurrentPossition(href, latitude, longitude) {var bodyData = new FormData();bodyData.append('latitude', latitude);@@ -414,7 +239,7 @@ function backToTop() {}document.addEventListener("DOMContentLoaded", function () {- newsletterBox();+/* newsletterBox();*/backToTop();});