:recycle: moved mixins to utils

frontend/src/components/Messages.vue

@@ -15,17 +15,16 @@
 </template>
 
 <script>
+import { mixins } from '../utils'
+
 export default {
     name: 'ProfileMessages',
+    mixins: [ mixins.pidMixin ],
     props: {
         matches: {
             type: [Object, Array],
             default: () => []
         },
-        pid: {
-            required: true,
-            type: Number
-        }
     },
 }
 </script>

frontend/src/utils/index.js

@@ -3,6 +3,7 @@ import Joi from 'joi'
 import { Connector } from './db'
 import { SurveyFactory } from './survey'
 import { possible } from './lang'
+import { pidMixin, cardMixin } from './mixins'
 
 const api = new Connector('kittens')
 
@@ -19,4 +20,12 @@ const makeKebob = input => {
 
 const surveyFactory = new SurveyFactory(possible['usa'])
 
-export { api, validatorMapping, surveyFactory, makeKebob }
+const mixins = { pidMixin, cardMixin }
+
+export { 
+    api,
+    validatorMapping,
+    surveyFactory,
+    makeKebob,
+    mixins
+}

frontend/src/views/mixins.js → frontend/src/utils/mixins.js

@@ -5,7 +5,10 @@ const pidMixin = {
             required: true,
             validator: prop => typeof prop === 'number' || prop === null
         },
-    },
+    }
+}
+
+const cardMixin = {
     data: () => ({
         cards: [],
         loading: true,
@@ -24,4 +27,4 @@ const pidMixin = {
     }
 }
 
-export { pidMixin }
+export { pidMixin, cardMixin }

frontend/src/views/HomeView.vue

@@ -16,7 +16,7 @@ import ProfileCardList from '../components/ProfileCardList.vue'
 
 import { Card } from '../entities'
 import { fetchQueueByProfileId } from '../services'
-import { pidMixin } from './mixins'
+import { mixins } from '../utils'
 
 /** Callback used to format incoming into card */
 const convertToCard = profile => {
@@ -36,7 +36,7 @@ const convertToCard = profile => {
 export default {
     name: 'HomeView',
     components: { ProfileCardList },
-    mixins: [ pidMixin ],
+    mixins: [ mixins.pidMixin, mixins.cardMixin ],
     methods: {
         /** Gets called from pidMixins */
         async getCards() {

frontend/src/views/MatchesView.vue

@@ -16,7 +16,7 @@ import ProfileCardList from '../components/ProfileCardList.vue'
 
 import { Card } from '../entities'
 import { fetchMembershipsByProfileId } from '../services'
-import { pidMixin } from './mixins'
+import { mixins } from '../utils'
 
 /** Callback used to format incoming into card */
 const convertToCard = grouping => {
@@ -36,7 +36,7 @@ const convertToCard = grouping => {
 export default {
     name: 'MatchView',
     components: { ProfileCardList },
-    mixins: [ pidMixin ],
+    mixins: [ mixins.pidMixin, mixins.cardMixin ],
     methods: {
         /** Gets called from pidMixins */
         async getCards() {