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
Minor improvements - Views - Use page loader for longer requests
KrzysztofPajaka04cfb13947d
diff --git a/src/Web/Grand.Web/wwwroot/theme/script/app.js b/src/Web/Grand.Web/wwwroot/theme/script/app.jsindex 5dc259e62..db8eff21c 100644--- a/src/Web/Grand.Web/wwwroot/theme/script/app.js+++ b/src/Web/Grand.Web/wwwroot/theme/script/app.js@@ -1,4 +1,5 @@-+axios.defaults.showLoader = true;+var vm = new Vue({el: '#app',data: function () {@@ -26,7 +27,7 @@ var vm = new Vue({flywish: null,wishlistitems: null,wishindicator: undefined,- UpdatedShoppingCartItemId: null,+ UpdatedShoppingCartItemId: null,},mounted: function () {if (localStorage.fluid == "true") this.fluid = "fluid";@@ -48,6 +49,40 @@ var vm = new Vue({vm.getLinkedProductsQV(vm.PopupQuickViewVueModal.Id);}},+ created: function () {+ axios.interceptors.request.use(+ config => {+ if (config.showLoader) {+ document.getElementById("app").setAttribute("v-cloak", true);+ }+ return config;+ },+ error => {+ if (error.config.showLoader) {+ document.getElementById("app").removeAttribute("v-cloak");+ }+ return Promise.reject(error);+ }+ );+ axios.interceptors.response.use(+ response => {+ if (response.config.showLoader) {+ document.getElementById("app").removeAttribute("v-cloak");+ }++ return response;+ },+ error => {+ let response = error.response;++ if (response.config.showLoader) {+ document.getElementById("app").removeAttribute("v-cloak");+ }++ return Promise.reject(error);+ }+ )+ },methods: {backToTop() {if (!document.querySelector('.up-btn')) {@@ -235,7 +270,8 @@ var vm = new Vue({'Accept': 'application/json','Content-Type': 'application/json','X-Response-View': 'Json'- }+ },+ showLoader: false}).then(response => (this.flycart = response.data,this.flycartitems = response.data.Items,@@ -251,7 +287,8 @@ var vm = new Vue({headers: {'Accept': 'application/json','Content-Type': 'application/json',- }+ },+ showLoader: false}).then(response => (this.loader = false,this.flywish = response.data,@@ -272,7 +309,8 @@ var vm = new Vue({'Accept': 'application/json','Content-Type': 'application/json','X-Response-View': 'Json'- }+ },+ showLoader: false}).then(response => {this.loader = false;this.compareproducts = response.datadiff --git a/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js b/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.jsindex 3dd1bf90c..b70654459 100644--- a/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js+++ b/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js@@ -251,7 +251,8 @@ var vmorder = new Vue({headers: {'Accept': 'application/json','Content-Type': 'application/json',- }+ },+ showLoader: false}).then(response => {vmorder.paymentBusy = false;var html = response.data;@@ -345,13 +346,13 @@ var vmorder = new Vue({save: function () {if (vmorder.Checkout.loadWaiting != false) return;vmorder.Checkout.setLoadWaiting('shipping');-var form = document.querySelector(this.form);var data = new FormData(form);axios({url: this.saveUrl,method: 'post',data: data,+ showLoader: false}).then(function (response) {if (response.data.goto_section !== undefined) {if (!(response.data.update_section.name == "shipping")) {@@ -431,6 +432,7 @@ var vmorder = new Vue({url: this.saveUrl,method: 'post',data: data,+ showLoader: false}).then(function (response) {if (document.querySelector('#back-' + response.data.goto_section)) {vmorder.previousStep.push('buttonBilling');@@ -508,6 +510,7 @@ var vmorder = new Vue({url: this.saveUrl,method: 'post',data: data,+ showLoader: false}).then(function (response) {if (response.data.error !== undefined) {vmorder.ShippingMethodError = response.data.message;@@ -589,6 +592,7 @@ var vmorder = new Vue({url: this.saveUrl,method: 'post',data: data,+ showLoader: false}).then(function (response) {if (response.data.goto_section !== undefined) {vmorder.vPaymentMethod.nextStep(response);@@ -646,6 +650,7 @@ var vmorder = new Vue({url: this.saveUrl,method: 'post',data: data,+ showLoader: false}).then(function (response) {if (response.data.goto_section !== undefined) {vmorder.previousStep.push('buttonPaymentInfo');@@ -660,6 +665,7 @@ var vmorder = new Vue({baseURL: '/Component/Form?Name=' + model.PaymentViewComponentName,method: 'post',data: data,+ showLoader: false}).then(response => {var html = response.data;document.querySelector('.payment-info .info').innerHTML = html;@@ -715,6 +721,7 @@ var vmorder = new Vue({axios({url: this.saveUrl,method: 'post',+ showLoader: false}).then(function (response) {vmorder.vConfirmOrder.nextStep(response);}).catch(function (error) {@@ -770,7 +777,8 @@ var vmorder = new Vue({'Accept': 'application/json','Content-Type': 'application/json','X-Response-View': 'Json'- }+ },+ showLoader: false}).then(response => {this.cart = response.data;})@@ -784,7 +792,8 @@ var vmorder = new Vue({'Accept': 'application/json','Content-Type': 'application/json','X-Response-View': 'Json'- }+ },+ showLoader: false}).then(response => {this.totals = response.data;});@@ -828,6 +837,7 @@ var vmorder = new Vue({axios({url: url,method: 'post',+ showLoader: false}).then(function (response) {vmorder.shippingBusy = false;document.getElementById('shipping_form').innerHTML = response.data;