upstream_referrer and scss cleanup

Author: samuelcolvin

config.js

@@ -50,8 +50,8 @@ module.exports = {
       SOCKET_API_URL: '"https://socket.tutorcruncher.com"',
       GRECAPTCHA_KEY: '"6LdyXRgUAAAAADUNhMVKJDXiRr6DUN8TGOgllqbt"',
       RAVEN_DSN: 'null',
-      // GA_ID: 'null',
-      GA_ID: '"UA-41117087-3"',
+      GA_ID: 'null',
+      // GA_ID: '"UA-41117087-3"',
     },
     port: 5000,
     build_dir: path.resolve(__dirname, 'dev'),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tutorcruncher-socket",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "TutorCruncher socket",
   "author": "Samuel Colvin <[email protected]>",
   "private": false,

src/app.vue

@@ -12,3 +12,24 @@ export default {
   components: {error}
 }
 </script>
+
+<style lang="scss">
+@import './conf';
+
+.tcs-button {
+  display: inline-block;
+  background-color: $button-colour;
+  color: white;
+  border-radius: 5px;
+  font-size: 17px;
+  padding: 8px 12px;
+  border: none;
+  transition: all .3s ease;
+  outline: none;
+  cursor: pointer;
+  text-decoration: none;
+  &:hover {
+    background-color: darken($button-colour, 20%);
+  }
+}
+</style>

src/components/con-modal.vue

@@ -140,7 +140,7 @@ export default {
   }
 
   button {
-    @extend .tcs-button;
+    @extend %tcs-button;
     margin: 10px auto 0;
     width: 100%;
   }

src/components/enquiry-button.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="tcs-enquiry-modal">
-    <router-link :to="{name: 'enquiry-modal'}" class="tcs-button tcs-enquiry-button">
+    <router-link :to="{name: 'enquiry-modal'}" class="tcs-enquiry-button">
       {{ $root.config.enquiry_button }}
     </router-link>
     <router-view></router-view>
@@ -13,4 +13,8 @@ export default {}
 
 <style lang="scss">
 @import '../conf';
+
+.tcs-enquiry-button {
+  @extend %tcs-button;
+}
 </style>

src/components/enquiry.vue

@@ -77,6 +77,7 @@ export default {
       if (this.contractor !== null) {
         this.$set(this.$root.enquiry_data, 'contractor', this.contractor.id)
       }
+      this.$set(this.$root.enquiry_data, 'upstream_http_referrer', document.referrer)
       this.$root.submit_enquiry(this.submission_complete)
       this.$root.ga_event('enquiry-form', 'submitted', this.mode)
     },
@@ -138,7 +139,7 @@ form.tcs {
 .tcs-submit {
   text-align: center;
   button {
-    @extend .tcs-button;
+    @extend %tcs-button;
     font-size: 17px;
     padding: 10px 12px;
   }

src/conf.scss

@@ -15,8 +15,7 @@ $size-sm: 768px;
 // contact button on modals
 $button-colour: $hightlight;
 
-
-.tcs-button {
+%tcs-button {
   display: inline-block;
   background-color: $button-colour;
   color: white;

test/unit/index.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-extend-native */
 Function.prototype.bind = require('function-bind')
 
-// const testsContext = require.context('./specs', true, /main\.js$/)
+// const testsContext = require.context('./specs', true, /enquiry\.js$/)
 const testsContext = require.context('./specs', true)
 testsContext.keys().forEach(testsContext)
 

test/unit/specs/_shared.js

@@ -65,16 +65,20 @@ function generate_vm (router, vm_data_) {
     render: h => h('router-view'),
     data: vm_data_ || vm_data(),
     methods: {
-      __record_call: function (method_name) {
+      __record_call: function (method_name, extra_args) {
         if (this.hasOwnProperty('method_calls')) {
-          this.method_calls[method_name] = (this.method_calls[method_name] || 0) + 1
+          if (this.method_calls[method_name]) {
+            this.method_calls[method_name].push(extra_args || null)
+          } else {
+            this.method_calls[method_name] = [extra_args || null]
+          }
         }
       },
       get_details: function () { this.__record_call('get_details') },
       get_enquiry: function () { this.__record_call('get_enquiry') },
       get_text: function () { this.__record_call('get_text') },
       submit_enquiry: function (callback) {
-        this.__record_call('submit_enquiry')
+        this.__record_call('submit_enquiry', this.enquiry_data)
         this.enquiry_data = {}
         callback()
       },

test/unit/specs/enquiry.js

@@ -45,7 +45,7 @@ describe('con-modal.vue, enquiry.vue', () => {
     vm.$el.querySelector('form').dispatchEvent(new window.Event('submit'))
 
     await tick()
-    expect(vm.method_calls['submit_enquiry']).to.equal(1)
+    expect(vm.method_calls['submit_enquiry']).to.have.lengthOf(1)
     expect(vm.enquiry_data).to.deep.equal({})
   })
 })
@@ -70,7 +70,8 @@ describe('enquiry.vue', () => {
     vm.$el.querySelector('form').dispatchEvent(new window.Event('submit'))
 
     await tick()
-    expect(vm.method_calls['submit_enquiry']).to.equal(1)
+    expect(vm.method_calls['submit_enquiry']).to.have.lengthOf(1)
+    expect(vm.method_calls['submit_enquiry'][0].upstream_http_referrer).to.contain('http://localhost')
     expect(vm.enquiry_data).to.deep.equal({})
   })
 })
@@ -93,7 +94,7 @@ describe('enquiry-modal.vue', () => {
     vm.$el.querySelector('form').dispatchEvent(new window.Event('submit'))
 
     await tick()
-    expect(vm.method_calls['submit_enquiry']).to.equal(1)
+    expect(vm.method_calls['submit_enquiry']).to.have.lengthOf(1)
     expect(vm.enquiry_data).to.deep.equal({})
 
     vm.$router.push({name: 'index'})