Move org rotation into a global plugin

Author: kenmickles

assets/js/helpers.js

@@ -80,19 +80,6 @@ export function sendToMothership(data={}) {
   return postFormData('https://queue.fightforthefuture.org/action', data)
 }
 
-export function getRandomOrg() {
-  var coinToss = Math.random();
-  if (coinToss < .20) {
-    return 'fp';
-  }
-  else if (coinToss < .60) {
-    return 'dp';
-  }
-  else {
-    return 'fftf';
-  }
-}
-
 export function getDonateLink(org) {
   switch (org) {
     case 'fp':

components/Disclaimer.vue

@@ -16,12 +16,9 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
-  props: {
-    org: {
-      type: String,
-      default: 'fftf'
-    }
-  }
+  computed: mapState(['org'])
 }
 </script>

components/PetitionForm.vue

@@ -126,7 +126,7 @@
         <span v-else>Write Congress</span>
       </button>
       <no-ssr>
-        <disclaimer :org="org"></disclaimer>
+        <disclaimer></disclaimer>
       </no-ssr>
     </form>
     <div class="petition-copy">

nuxt.config.js

@@ -73,6 +73,7 @@ module.exports = {
     // '~/plugins/org-rotation.js'
     '~/plugins/filters.js',
     '~/plugins/components.js',
-    { src: '~/plugins/analytics.js', ssr: false},
+    { src: '~/plugins/analytics.js', ssr: false },
+    '~/plugins/org-rotation.js'
   ]
 }

pages/index.vue

@@ -176,13 +176,8 @@ export default {
 
   computed: {
     isCallPage() {
-      return this.$router.currentRoute.name === 'call' || this.$router.currentRoute.query.call
+      return this.$route.name === 'call' || this.$route.query.call
     }
-  },
-
-  created() {
-    const org = this.$router.currentRoute.query.org || getRandomOrg()
-    this.$store.commit('setOrg', org)
   }
 }
 </script>

plugins/org-rotation.js

@@ -1,4 +1,21 @@
-import Vue from 'vue'
-import VueOrgRotation from './vue-org-rotation'
+// fp = 20%, dp = 40%, fftf = 40%
+function getRandomOrg() {
+  var coinToss = Math.random();
+  if (coinToss < .20) {
+    return 'fp';
+  }
+  else if (coinToss < .60) {
+    return 'dp';
+  }
+  else {
+    return 'fftf';
+  }
+}
 
-Vue.use(VueOrgRotation)
+// set org on route change
+export default ({ app }) => {
+  app.router.afterEach((to, from) => {
+    const org = to.query.org || to.query.source || getRandomOrg()
+    app.store.commit('setOrg', org)
+  })
+}