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

vue-theme/src/components/footer.vue

@@ -84,14 +84,14 @@
                         li
                             router-link(to="/page/center")   Info
                         li
-                            router-link(to="/exhibition")   Exhibitions
+                            router-link(to="/exhibition/sorted/by-current-and-upcoming")   Exhibitions
                         li 
                             router-link(to="/event/sorted/by-current-and-upcoming")   Events 
                         li
                             router-link(to="/event?type=talks")   Talks & Interviews
             li
                 h5
-                    router-link(to="") Education 
+                    router-link(to="/guide") Education 
                     ul.f-col
                         li
                             router-link(to="/guide")   Guides 
@@ -101,7 +101,7 @@
                             router-link(to="/page/library")   Library 
             li
                 h5
-                    router-link(to="") News 
+                    router-link(to="/blog") News 
                     ul.f-col
                         li
                             router-link(to="/blog")   Blog Posts 

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

@@ -1,6 +1,6 @@
 <template lang="pug">
 //- most recent upcoming event - sidebar in events list - max=2?
-h3.t-up {{ listType }} events
+h3.t-up events {{ listType }} 
 ul.t-up
     li(v-for="post in events")
         router-link(:to="`/event/${post.slug}`")
@@ -28,7 +28,7 @@ export default {
     },
     data() {
         return {
-            listType: 'upcoming',
+            listType: 'current/upcoming',
         }
     },
     methods: {
@@ -40,7 +40,7 @@ export default {
                 {
                     sortType: sortTypes.currentAndUpcoming,
                     params: {
-                        limit: 99,
+                        limit: 3,
                         page: 1
                     }
                 }

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

@@ -1,6 +1,6 @@
 <template lang="pug">
 //- most recent upcoming exhibition - sidebar in events list - max=2?
-h3.t-up {{ listType }} exhibitions
+h3.t-up exhibitions {{ listType }} 
 ul.t-up
     li(v-for="post in exhibitions")
         router-link(:to="`/exhibition/${post.slug}`")
@@ -28,7 +28,7 @@ export default {
     },
     data() {
         return {
-            listType: 'upcoming',
+            listType: 'current/upcoming',
         }
     },
     methods: {
@@ -40,7 +40,7 @@ export default {
                 {
                     sortType: sortTypes.currentAndUpcoming,
                     params: {
-                        limit: 99,
+                        limit: 3,
                         page: 1
                     }
                 }

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

@@ -3,7 +3,7 @@ aside.sidebar
     section
         //- if not single layout with sorting
         .shadow(v-if="shouldShowListSort.includes(type) && layout !== 'single'")
-            h3.t-up sort {{ type }}
+            h3.t-up sort {{ type }}s
             ul.t-up
                 li 
                     //- post?type=articles //
@@ -52,7 +52,7 @@ aside.sidebar
         
         //- if {{type}} has sorted by-material show material sets
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
-            h3.t-up {{ type }} by material
+            h3.t-up {{ type }}s by material
             ul.t-up
                 li
                     template(v-for="material in materials") 
@@ -61,7 +61,7 @@ aside.sidebar
 
         //- if {{type}} has sorted by-episode show episode sets           
         .shadow(v-if="shouldShowEpisodeSort.includes(type) && layout !== 'single'")
-            h3.t-up {{ type }} by episode  
+            h3.t-up {{ type }}s by episode  
             ul.t-up
                 li.f-row.start.wrap
                     template(v-for="episodeSet in episodeSets") 
@@ -70,7 +70,7 @@ aside.sidebar
 
         //- if {{type}} has sorted by-type show subtype sets           
         .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single'")
-            h3.t-up {{ type }} type  
+            h3.t-up {{ type }}s type  
             ul.t-up
                 li
                     template(v-for="subtypeSet in subtypeSets") 

vue-theme/src/pages/list.vue

@@ -8,7 +8,7 @@
                 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('-', ' ') }}
+                    h3 {{ sortBy.replace(/\-/g, ' ')}} 
 
             h3(v-if="!loaded") loading...
             .content(

vue-theme/src/pages/mixin-post-types.js

@@ -80,12 +80,13 @@ const heroUtils = {
                 post.type == 'page' && post.slug == 'community-craft-calendar' || 
                 post.type == 'page' && post.slug == 'video-resources-for-educators' || 
                 post.type == 'page' && post.slug == 'craft-in-schools' || 
-                post.type == 'page' && post.slug == 'mailing-list' 
+                post.type == 'page' && post.slug == 'mailing-list' ||
+                post.type == 'page' && post.slug == 'handwork-celebrating-american-craft-2026' 
+
                 
             ) { 
                 json.text = post.title 
             }
-           
             // post.type == 'page' && post.slug == 'thing' || post.type == 'page' && post.slug == 'otherthing'
             return json
         },

vue-theme/src/utils/helpers.js

@@ -3,7 +3,7 @@ const convertTitleCase = type => {
     return type.charAt(0).toUpperCase() + type.slice(1)
 }
 
-const materials = ['clay', 'fiber', 'glass', 'metal', 'paper', 'wood']
+const materials = ['clay', 'fiber', 'glass', 'metal', 'paper', 'wood', 'other']
 
 const sortTypes = {
     alpha: 'by-alpha',