Merge branch 'dev' of craft-in-america/vue-wp into master

vue-theme/src/components/navigation/navigation.vue

@@ -21,14 +21,14 @@ nav.main.w-max
                     li
                         router-link(to="/technique") Techniques
             li.f-grow
-                router-link(to="/artist/") Artists
+                router-link(to="/artist") Artists
                 ul.submenu
                     li
                         router-link(to="/artist/sorted/by-alpha") A - Z
                     li
                         router-link(to="/artist/sorted/by-material") By Material
             li.f-grow 
-                router-link(to="/exhibition/") Exhibitions
+                router-link(to="/exhibition") Exhibitions
                 ul.submenu 
                     li
                         router-link(to="/exhibition/sorted/by-current-and-upcoming") Current/Upcoming

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

@@ -69,9 +69,20 @@ aside.sidebar
                         router-link(:to="`/${type}/sorted/by-episode#${episodeSet}`")
                             p {{ episodeSet }}   
 
+        //- //- if {{type}} has sorted by-type show subtype sets 
+        //- .shadow(v-if="includes(type) && layout !== 'single'")
+        //-     h3.t-up {{ type }}s type  
+        //-     ul.t-up
+        //-         li
+        //-             template(v-for="subtypeSet in subtypeSets") 
+        //-                 router-link(:to="`/${type}/sorted/by-type#${subtypeSet}`")
+        //-                     p {{ subtypeSet }}
+
         //- if {{type}} has sorted by-type show subtype sets 
+        
+        //- .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single' && type === 'artist'")
         .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single'")
-            h3.t-up {{ type }}s type  
+            h3.t-up Organizations & Institutions   
             ul.t-up
                 li
                     template(v-for="subtypeSet in subtypeSets") 
@@ -136,6 +147,7 @@ export default {
                 'by episode': `${sortTypes.episode}`,   //:3
                 'by type': `${sortTypes.subtype}`,      //:4
                 'by past': `${sortTypes.past}`,         //:5
+                'Organizations & Institutions': `${sortTypes.subtype}`,      //:6
                 // subtype: 'by-type',
             },
             charaSets: [
@@ -143,7 +155,7 @@ export default {
                 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
             ],
             episodeSets: [
-                'play', 'miniatures', 'inspiration', 'home', 'jewelry', 'harmony', 'storytellers', 
+                'collectors', 'science', 'play', 'miniatures', 'inspiration', 'home', 'jewelry', 'harmony', 'storytellers', 
                 'democracy', 'identity', 'quilts', 'visionaries', 'california', 
                 'neighbors', 'borders', 'nature', 'teachers', 'music', 
                 'celebration', 'service', 'industry', 'holiday', 'forge', 
@@ -185,7 +197,7 @@ export default {
                         Object.keys(this.sortTypes)[0],
                         Object.keys(this.sortTypes)[1],
                         Object.keys(this.sortTypes)[3],
-                        Object.keys(this.sortTypes)[4],
+                        Object.keys(this.sortTypes)[6],
                         // `by ${this.type} type`,
                     ]
                     break
@@ -203,7 +215,7 @@ export default {
                     break
                 case 'post':
                     opts = [
-                        Object.keys(this.sortTypes)[4],
+                        // Object.keys(this.sortTypes)[4],
                     ]
                     break
                 case 'short':

vue-theme/src/pages/list.vue

@@ -7,8 +7,9 @@
                 h3(v-else-if="hasSubtype") {{ type }}s: {{ $route.query.type }} 
                 h3(v-else) Search results for: {{$route.query.s }} 
                 span(v-if="sortBy")
-                    h3 {{ sortBy.replace(/[-]/g, ' ')}}
-                    //- h3 :{{ sortBy.replace(/[b][y]|[-]/g, ' ')}}
+                    //- h3 {{ sortBy.replace(/[-]/g, ' ')}}
+                    //- h3 {{ sortBy.replace(/[-]type/g, ' Organizations & Institutions ')}}
+                    h3 :{{ sortBy.replace(/[b][y]|[-]/g, ' ')}}
 
             h3(v-if="!loaded") loading...
             .content(