From: Vincent Vanwaelscappel Date: Tue, 10 Sep 2019 14:34:04 +0000 (+0200) Subject: wait #3023 @3 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=46698dc9391bc8b7e4d7b62b724158054a81975c;p=pmi.git wait #3023 @3 --- diff --git a/package.json b/package.json index 8226e86..29d1832 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,10 @@ "element-closest": "^3.0.1", "gsap": "^2.1.3", "hammerjs": "^2.0.8", - "jquery": "^3.2", "laravel-mix": "^4.0.7", "laravel-mix-purgecss": "^4.1.0", - "lodash": "^4.17.15", "lost": "^8.3.1", "mmenu-light": "^2.1.1", - "popper.js": "^1.12", "portal-vue": "^2.1.5", "resolve-url-loader": "^2.3.1", "rupture": "^0.7.1", @@ -36,7 +33,9 @@ "vue": "^2.6.10", "vue-slide-up-down": "^1.7.2", "vue-slider-component": "^3.0.40", - "vue-template-compiler": "^2.6.10" + "vue-template-compiler": "^2.6.10", + "cash-dom": "^4.1.5" }, - "dependencies": {} + "dependencies": { + } } diff --git a/resources/js/carrousel.js b/resources/js/carrousel.js index e239c51..264f802 100644 --- a/resources/js/carrousel.js +++ b/resources/js/carrousel.js @@ -1,7 +1,7 @@ import TweenMax from "gsap/TweenMax"; import TimelineMax from "gsap/TimelineMax"; import * as Hammer from 'hammerjs'; -import fa from "../../public/vendor/adminlte/bower_components/moment/src/locale/fa"; +import $ from "cash-dom/dist/cash.esm"; window.Hammer = Hammer.default; @@ -303,7 +303,7 @@ window.Hammer = Hammer.default; }, }; - jQuery.fn.PMISlide = function () { + $.fn.PMISlide = function () { return this.each(function () { var $this = $(this); if ($(this).data('PMISlide') === undefined) { @@ -311,7 +311,7 @@ window.Hammer = Hammer.default; } }) }; -})(jQuery); +})($); $(function () { $(".slider-container").PMISlide(); diff --git a/resources/js/home.js b/resources/js/home.js index af762e3..2232cdf 100644 --- a/resources/js/home.js +++ b/resources/js/home.js @@ -1,2 +1 @@ -window.$ = window.jQuery = require('jquery'); require('./carrousel'); diff --git a/resources/js/mailform.js b/resources/js/mailform.js index 2ad4587..8c9d65a 100644 --- a/resources/js/mailform.js +++ b/resources/js/mailform.js @@ -1,19 +1,14 @@ -window.$ = window.jQuery = require('jquery'); +import $ from "cash-dom/dist/cash.esm"; $(function () { + $('form.mailform').each(function () { - inputs = $(this).find('label input,select'); + var inputs = $(this).find('label input,select'); var nb_fields = inputs.length; var nb_to_divide = Math.floor(nb_fields / 2) * 2; $(inputs).slice(0, nb_to_divide).closest('label').addClass('half'); }); - $.ajaxSetup({ - headers: { - 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') - } - }); - $(document).on('keydown', 'form.mailform input,textarea', function () { $(this).removeClass('error'); $(this).prevAll('.errormessage').remove(); @@ -22,28 +17,26 @@ $(function () { $(document).on('submit', 'form.mailform', function () { var form = $(this); var button = $(this).find('button[type="submit"]'); - button.attr('data-text', button.text()).prop('disabled', true).text(button.data('sending')); - $.ajax({ - url: $(this).attr('action'), - type: $(this).attr('method'), - data: $(this).serialize(), - }).done(function (response) { - let responseClasses = form.data('confirmation-classes') || 'text-2xl text-center p-8'; - form.find('.error').removeClass('error'); - form.html(`

${form.data('confirmation')}

`); + $(button).attr('data-text', button.text()).prop('disabled', true).text(button.data('sending')); + + axios.post($(this).attr('action'), $(this).serialize()).then((response) => { + let responseClasses = $(form).data('confirmation-classes') || 'text-2xl text-center p-8'; + $(form).find('.error').removeClass('error'); + $(form).html(`

${$(form).data('confirmation')}

`); cubistga.handleGtag($(form).get(0)); - }).fail(function (response) { - button.text(button.data('text')).prop('disabled', false); - form.find('.error').removeClass('error'); - form.find('.errormessage').remove(); - $.each(response.responseJSON.errors, function (k, v) { - if (v.length > 0) { - var field = form.find('[name="' + k + '"]'); - $(field).addClass('error'); - $('' + v[0] + '').insertBefore(field); - } - }); + }).catch((error) => { + $(button).text(button.data('text')).prop('disabled', false); + $(form).find('.error').removeClass('error'); + $(form).find('.errormessage').remove(); + + for (let k in error.response.data.errors) { + let v = error.response.data.errors[k]; + let field = $(form).find('[name="' + k + '"]'); + $(field).addClass('error'); + $('' + v[0] + '').insertBefore(field); + } }); + return false; }); }); diff --git a/yarn.lock b/yarn.lock index 1d4a81d..2ca8500 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1595,6 +1595,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000971, caniuse-lite@^1.0.30000974: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8" integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww== +cash-dom@^4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/cash-dom/-/cash-dom-4.1.5.tgz#0ef0cf205bc7603aa4e2dfada5808442a7a0e6ca" + integrity sha512-E6MO0A6ms5iZPtexznQXWRkFEvqdPqCmdx/SiJr2PnhOQNhZNfALkLG5t83Hk3J5JELzED7PJuzhMoS2tT64XA== + chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -6816,10 +6821,12 @@ stylus-loader@^3.0.2: dependencies: css-parse "~2.0.0" debug "~3.1.0" - glob "~7.1.2" + glob "^7.1.3" mkdirp "~0.5.x" + safer-buffer "^2.1.2" sax "~1.2.4" - source-map "~0.7.2" + semver "^6.0.0" + source-map "^0.7.3" supports-color@^2.0.0: version "2.0.0"