:recycle: adding arrangement helper for modules | adding by-episode and by-material for shorts guides and techniques

vue-theme/src/components/sidebars/sidebar.vue

@@ -10,17 +10,14 @@ aside.sidebar
                         p {{ option }}
                 //- exhibition, event list sidebar
                 template(v-if="['exhibition', 'event'].includes(type) && layout === 'list'")
-                    p 
-                        router-link(:to="`/${type}`")
-                            p by all
-                    p 
-                        router-link(:to="`/${type}/sorted/by-current-and-upcoming`")
-                            p by current and upcoming
+                    router-link(:to="`/${type}`")
+                        p by all
+                    router-link(:to="`/${type}/sorted/by-current-and-upcoming`")
+                        p by current and upcoming
                 //- list sidebar 
                 template(v-if="['short', 'guide', 'publication', 'technique', 'post'].includes(type) && layout === 'list'")
-                    p 
-                        router-link(:to="`/${type}`")
-                            p by all
+                    router-link(:to="`/${type}`")
+                        p by all
 
         //- p2p types and related posts
         .shadow(v-if="layout === 'single' && Object.keys(related).length" v-for="p2pPostType in Object.keys(related)")
@@ -107,9 +104,8 @@ export default {
                     break
                 case 'short':
                     opts = [
-                        Object.keys(this.sortTypes)[2],
-                        Object.keys(this.sortTypes)[1],
                         Object.keys(this.sortTypes)[3],
+                        Object.keys(this.sortTypes)[1],
                     ]
                     break
                 case 'guide':
@@ -130,8 +126,8 @@ export default {
                     break
                 case 'technique':
                     opts = [
-                        Object.keys(this.sortTypes)[1],
                         Object.keys(this.sortTypes)[3],
+                        Object.keys(this.sortTypes)[1],
                     ]
                     break
             }

vue-theme/src/store/modules/arrangements.js

@@ -0,0 +1,91 @@
+const _arrangeByMaterial = postsList => {
+    const byMaterial = {
+        clay: []
+    }
+    postsList.forEach(post => {
+        post.materials.forEach(mat => {
+            if(!byMaterial[mat]) byMaterial[mat] = []
+            byMaterial[mat].push(post)
+        })
+    })
+    const flatPacked = []
+    Object.keys(byMaterial).forEach(material => {
+        flatPacked.push({ slug: material, title: material, inbetween: true })
+        byMaterial[material].forEach(post => flatPacked.push(post))
+    })
+    return flatPacked
+}
+
+const _arrangeByType = postsList => {
+    const byType = {}
+    postsList.forEach(post => {
+        const subtypes = post.subtypes
+        subtypes.forEach(type => {
+            if(!byType[type]) byType[type] = []
+            byType[type].push(post)
+        })
+    })
+    const flatPacked = []
+    Object.keys(byType).forEach(type => {
+        flatPacked.push({ slug: type, title: type, inbetween: true })
+        byType[type].forEach(post => flatPacked.push(post))
+    })
+    return flatPacked
+}
+
+const _arrangeByAlpha = postsList => {
+    const alphabet = [...'9abcdefghijklmnopqrstuvwxyz']
+    const flatPacked = []
+    
+    const storeTitle = letter => {
+        if(state.seenTitles.includes(letter)) return
+        flatPacked.push({ slug: letter, title: letter, inbetween: true })
+        state.seenTitles.push(letter)
+    }
+
+    postsList.forEach(post => {
+        const lastWord = post.slug.split('-').filter(c => c).pop()
+        const firstCharaOflastWord = lastWord[0]
+        const firstCharaOfSortWord = post.sortname ? post.sortname[0] : 'z'
+        const charaIndex = alphabet.indexOf(firstCharaOflastWord) < alphabet.indexOf(firstCharaOfSortWord) ? alphabet.indexOf(firstCharaOflastWord) : alphabet.indexOf(firstCharaOfSortWord)
+
+        storeTitle(alphabet[charaIndex])
+        flatPacked.push(post)
+    })
+    return flatPacked
+}
+
+const _arrangeByEpisode = postsList => {
+    const byEpisode = {}
+    postsList.forEach(post => {
+        const relatedEpisode = post.related_episode
+        if(!byEpisode[relatedEpisode]) byEpisode[relatedEpisode] = []
+        byEpisode[relatedEpisode].push(post)
+    })
+    const flatPacked = []
+    Object.keys(byEpisode).forEach(episode => {
+        flatPacked.push({ slug: episode, title: episode, inbetween: true })
+        byEpisode[episode].forEach(post => flatPacked.push(post))
+    })
+    return flatPacked
+}
+
+const repackBySort = (postsList, sortedBy) => {
+    let repacked = postsList
+    if(sortedBy == sortTypes.material) {
+        repacked = _arrangeByMaterial(postsList)
+    } else if(sortedBy == sortTypes.episode) {
+        repacked = _arrangeByEpisode(postsList)
+    } else if(sortedBy == sortTypes.subtype) {
+        repacked = _arrangeByType(postsList)
+    }
+    return repacked
+}
+
+export {
+    repackBySort,
+    _arrangeByMaterial,
+    _arrangeByType,
+    _arrangeByAlpha,
+    _arrangeByEpisode
+}

vue-theme/src/store/modules/artist.js

@@ -1,5 +1,6 @@
 import api from '../../utils/api'
 import { sortTypes } from '../../utils/helpers'
+import { repackBySort } from './arrangements'
 
 const state = {
     all: [],
@@ -18,92 +19,12 @@ const getters = {
     allArtistsLoaded: state => state.loaded,
 }
 
-
-const _arrangeByMaterial = artistsList => {
-    const byMaterial = {
-        clay: []
-    }
-    artistsList.forEach(artist => {
-        artist.materials.forEach(mat => {
-            if(!byMaterial[mat]) byMaterial[mat] = []
-            byMaterial[mat].push(artist)
-        })
-    })
-    const flatPacked = []
-    Object.keys(byMaterial).forEach(material => {
-        flatPacked.push({ slug: material, title: material, inbetween: true })
-        byMaterial[material].forEach(artist => flatPacked.push(artist))
-    })
-    return flatPacked
-}
-
-const _arrangeByType = artistsList => {
-    const byType = {}
-    artistsList.forEach(artist => {
-        const subtypes = artist.subtypes
-        subtypes.forEach(type => {
-            if(!byType[type]) byType[type] = []
-            byType[type].push(artist)
-        })
-    })
-    const flatPacked = []
-    Object.keys(byType).forEach(type => {
-        flatPacked.push({ slug: type, title: type, inbetween: true })
-        byType[type].forEach(artist => flatPacked.push(artist))
-    })
-    return flatPacked
-}
-
-const _arrangeByAlpha = artistsList => {
-    const alphabet = [...'9abcdefghijklmnopqrstuvwxyz']
-    const flatPacked = []
-    
-    const storeTitle = letter => {
-        if(state.seenTitles.includes(letter)) return
-        flatPacked.push({ slug: letter, title: letter, inbetween: true })
-        state.seenTitles.push(letter)
-    }
-
-    artistsList.forEach(artist => {
-        const lastWord = artist.slug.split('-').filter(c => c).pop()
-        const firstCharaOflastWord = lastWord[0]
-        const firstCharaOfSortWord = artist.sortname ? artist.sortname[0] : 'z'
-        const charaIndex = alphabet.indexOf(firstCharaOflastWord) < alphabet.indexOf(firstCharaOfSortWord) ? alphabet.indexOf(firstCharaOflastWord) : alphabet.indexOf(firstCharaOfSortWord)
-
-        storeTitle(alphabet[charaIndex])
-        flatPacked.push(artist)
-    })
-    return flatPacked
-}
-
-const _arrangeByEpisode = artistsList => {
-    const byEpisode = {}
-    artistsList.forEach(artist => {
-        const relatedEpisode = artist.related_episode
-        if(!byEpisode[relatedEpisode]) byEpisode[relatedEpisode] = []
-        byEpisode[relatedEpisode].push(artist)
-    })
-    const flatPacked = []
-    Object.keys(byEpisode).forEach(episode => {
-        flatPacked.push({ slug: episode, title: episode, inbetween: true })
-        byEpisode[episode].forEach(artist => flatPacked.push(artist))
-    })
-    return flatPacked
-}
-
 const actions = {
     getAllArtists({ commit }, { sortType, params }) {
         commit('CLEAR_ARTISTS')
         commit('ARTISTS_LOADED', false)
         const storeFetch = (artists => {
-            let repacked = artists
-            if(sortType == sortTypes.material) {
-                repacked = _arrangeByMaterial(artists)
-            } else if(sortType == sortTypes.episode) {
-                repacked = _arrangeByEpisode(artists)
-            } else if(sortType == sortTypes.subtype) {
-                repacked = _arrangeByType(artists)
-            }
+            let repacked = repackBySort(artists, sortType)
             commit('STORE_FETCHED_ARTISTS', { artists: repacked })
             commit('ARTISTS_LOADED', true)
         })
@@ -113,7 +34,7 @@ const actions = {
         const storeFetch = (artists => {
             let repacked = artists
             if(sortType == sortTypes.alpha) {
-                repacked = _arrangeByAlpha(artists)
+                repacked = repackBySort(artists, sortType)
             }
             commit('ADD_TO_FETCHED_ARTISTS', { artists: repacked })
             commit('ARTISTS_LOADED', true)

vue-theme/src/store/modules/guide.js

@@ -1,4 +1,6 @@
 import api from '../../utils/api'
+import { sortTypes } from '../../utils/helpers'
+import { repackBySort } from './arrangements'
 
 const state = {
     all: [],
@@ -21,7 +23,7 @@ const actions = {
         commit('CLEAR_GUIDES')
         commit('GUIDES_LOADED', false)
         const storeFetch = (guides => {
-            let repacked = guides
+            let repacked = repackBySort(guides, sortType)
             commit('STORE_FETCHED_GUIDES', { guides: repacked })
             commit('GUIDES_LOADED', true)
         })

vue-theme/src/store/modules/short.js

@@ -1,4 +1,5 @@
 import api from '../../utils/api'
+import { repackBySort } from './arrangements'
 
 const state = {
     all: [],
@@ -21,7 +22,7 @@ const actions = {
         commit('CLEAR_SHORTS')
         commit('SHORTS_LOADED', false)
         const storeFetch = (shorts => {
-            let repacked = shorts
+            let repacked = repackBySort(shorts, sortType)
             commit('STORE_FETCHED_SHORTS', { shorts: repacked })
             commit('SHORTS_LOADED', true)
         })

vue-theme/src/store/modules/technique.js

@@ -1,4 +1,5 @@
 import api from '../../utils/api'
+import { repackBySort } from './arrangements'
 
 const state = {
     all: [],
@@ -21,7 +22,7 @@ const actions = {
         commit('CLEAR_TECHNIQUES')
         commit('TECHNIQUES_LOADED', false)
         const storeFetch = (techniques => {
-            let repacked = techniques
+            let repacked = repackBySort(techniques, sortType)
             commit('STORE_FETCHED_TECHNIQUES', { techniques: repacked })
             commit('TECHNIQUES_LOADED', true)
         })