From bec4205018624abcb3aae4f9f39ace1c2b7419ef Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 3 Sep 2019 18:50:11 +0200 Subject: [PATCH] wip #2951 @1:40 --- resources/js/components/Search.vue | 12 +- resources/js/components/SearchField.vue | 12 +- resources/js/mailform.js | 1 + resources/js/vendor/cubist/gtag/gtag.js | 19 ++- resources/views/components/map-link.blade.php | 5 +- .../views/components/phone-link.blade.php | 3 +- resources/views/pages/cart.blade.php | 1 + resources/views/pages/contact.blade.php | 4 +- resources/views/pages/search.blade.php | 19 ++- .../views/partials/contact-details.blade.php | 3 +- resources/views/partials/form.blade.php | 118 ++++++++++-------- 11 files changed, 120 insertions(+), 77 deletions(-) diff --git a/resources/js/components/Search.vue b/resources/js/components/Search.vue index ccc6b0d..98c47b8 100644 --- a/resources/js/components/Search.vue +++ b/resources/js/components/Search.vue @@ -3,17 +3,16 @@ - +
-
- + - @@ -51,7 +50,7 @@ } }, - mounted () { + mounted() { let component = this; // Allow search field to be opened using the common '/' shortcut @@ -81,6 +80,9 @@ focusField() { this.$refs.searchInput.focus() + }, + submitForm() { + cubistga.event('search', 'engagment', null, null, false, {'search_term': this.$refs.searchInput.getInputValue()}); } } } diff --git a/resources/js/components/SearchField.vue b/resources/js/components/SearchField.vue index a70351e..56889a7 100644 --- a/resources/js/components/SearchField.vue +++ b/resources/js/components/SearchField.vue @@ -2,6 +2,7 @@ { @@ -69,7 +77,7 @@ return result.title }, - handleSubmit(input) { + handleSubmit() { let $this = this; this.$nextTick(function () { $this.$el.closest('form').submit(); diff --git a/resources/js/mailform.js b/resources/js/mailform.js index 42ef232..d480620 100644 --- a/resources/js/mailform.js +++ b/resources/js/mailform.js @@ -30,6 +30,7 @@ $(function () { 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'); diff --git a/resources/js/vendor/cubist/gtag/gtag.js b/resources/js/vendor/cubist/gtag/gtag.js index 31119e2..88dbac2 100644 --- a/resources/js/vendor/cubist/gtag/gtag.js +++ b/resources/js/vendor/cubist/gtag/gtag.js @@ -11,11 +11,11 @@ cubistga.prototype.initEvents = function () { }); document.addEventListener('click', function (e) { - if (e.target.matches('[data-ga]')) { + if (e.target.matches('a[data-ga]')) { $this.handleGtag(e.target); } - if (e.target.closest('[data-ga]')) { - $this.handleGtag(e.target.closest('[data-ga]')); + if (e.target.closest('a[data-ga]')) { + $this.handleGtag(e.target.closest('a[data-ga]')); } }, false); }; @@ -53,7 +53,7 @@ cubistga.prototype.event = function (action, category, label, value, noninteract if (undefined !== value && null !== value) { options.value = value; } - console.log('gtag event',action,options); + console.log('gtag event', action, options); return gtag('event', action, options) }; @@ -63,8 +63,17 @@ cubistga.prototype.handleGtag = function (el) { let category = el.getAttribute('data-ga-category'); let label = el.getAttribute('data-ga-label'); let value = el.getAttribute('data-ga-value'); + let options = el.getAttribute('data-ga-options'); + if (options !== null) { + try { + options = JSON.parse(options); + }catch (e) { + console.log(options); + options={}; + } + } - return this.event(action, category, label, value, el.getAttribute('data-ga-noninteraction') === 1); + return this.event(action, category, label, value, el.getAttribute('data-ga-noninteraction') === 1, options); } }; diff --git a/resources/views/components/map-link.blade.php b/resources/views/components/map-link.blade.php index e32a550..144ba24 100644 --- a/resources/views/components/map-link.blade.php +++ b/resources/views/components/map-link.blade.php @@ -3,7 +3,10 @@ @if (!empty($address)) - + {{ $slot }} diff --git a/resources/views/components/phone-link.blade.php b/resources/views/components/phone-link.blade.php index a532a51..63ea854 100644 --- a/resources/views/components/phone-link.blade.php +++ b/resources/views/components/phone-link.blade.php @@ -13,7 +13,8 @@ @endphp - + {{ $slot }} diff --git a/resources/views/pages/cart.blade.php b/resources/views/pages/cart.blade.php index 3ac9298..5cbd3d5 100644 --- a/resources/views/pages/cart.blade.php +++ b/resources/views/pages/cart.blade.php @@ -19,6 +19,7 @@
@form([ 'action' => '/ajax/request_quote', + 'ga'=>false, 'extra_fields' => '' // Populated by VueJS ])
diff --git a/resources/views/pages/contact.blade.php b/resources/views/pages/contact.blade.php index b252987..263c9d2 100644 --- a/resources/views/pages/contact.blade.php +++ b/resources/views/pages/contact.blade.php @@ -18,7 +18,9 @@ {{-- Social Networks --}} @php($networks = ['twitter' => 'Twitter', 'linkedin' => 'LinkedIn']) @foreach ($networks as $networkID => $network) - @svg("icon-{$networkID}", 'mr-3') {{ __($network) }} diff --git a/resources/views/pages/search.blade.php b/resources/views/pages/search.blade.php index 8ab3844..b2f063c 100644 --- a/resources/views/pages/search.blade.php +++ b/resources/views/pages/search.blade.php @@ -3,18 +3,23 @@ @section('content') - + +
- + - + - @@ -36,14 +41,16 @@
@foreach ($result['breadcrumbs'] as $breadcrumb) @endforeach
- {{ $result['title'] }} + {{ $result['title'] }}
@endforeach
diff --git a/resources/views/partials/contact-details.blade.php b/resources/views/partials/contact-details.blade.php index 60e34fb..8e01234 100644 --- a/resources/views/partials/contact-details.blade.php +++ b/resources/views/partials/contact-details.blade.php @@ -6,7 +6,8 @@
- + @svg('icon-email', 'contact-details-icon')
{{ __('Email') }}
diff --git a/resources/views/partials/form.blade.php b/resources/views/partials/form.blade.php index 3ed44b0..8e680e8 100644 --- a/resources/views/partials/form.blade.php +++ b/resources/views/partials/form.blade.php @@ -1,77 +1,85 @@ +@php + $gaattrs='data-ga="event" data-ga-action="send" data-ga-category="contact" data-ga-label="form"'; + if(isset($ga) && !$ga){ + $gaattrs=''; + } +@endphp @if ($page->get('form')) - @push('scripts') @endpush -
-
- @if($page->get('form_intro')) -
@markdown($page->get('form_intro'))
- @endif - - @honeypot - +
+
+ @if($page->get('form_intro')) +
@markdown($page->get('form_intro'))
+ @endif + + @honeypot + - {!! $extra_fields ?? '' !!} + {!! $extra_fields ?? '' !!} -
- @foreach($page->get('form') as $field) - @php - $required=$field['mandatory']?' required':''; - $asx=$field['mandatory']?' *':''; - @endphp - + @endforeach +
@markdown($global->get('form_privacy'))
- *{{__('Champs obligatoires')}} + *{{__('Champs obligatoires')}}
-- 2.39.5