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

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

@@ -113,15 +113,15 @@ nav.main.w-max
         input(id="toggle-mobile-menu" type="checkbox").hide
 
         ul.drop-down.w-max.t-up
+            li.f-col.center
+                h5
+                    input(v-model="searchTerms" @keyup.enter="sendSearch" tabindex="10")
+                    button(@click="sendSearch" tabindex="11")  🔍 search 
             li(v-for="item in menuItems").f-row.center
                 router-link(@click="uncheck" v-if="item == 'about' || item == 'donate'" :to="`/page/${item}`")
                     h5 {{ item }}
                 router-link(@click="uncheck" v-else= "" :to="`/${item}`")
                     h5 {{ item }}
-            li.f-col.center
-                h5
-                    input(v-model="searchTerms" @keyup.enter="sendSearch" tabindex="10")
-                    button(@click="sendSearch" tabindex="11") 🔍 search
 
 </template>
 

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

@@ -25,13 +25,6 @@ aside.sidebar
                     //- event?type=talks //
                     router-link(v-if="type === 'event' " :to="`/${type}?type=talks`")
                         p talks 
-                //- li 
-                //-     //- event?type=recorded-talks-and-interviews //
-                //-     router-link(v-if="type === 'event' " :to="`/${type}?type=recorded-talks-and-interviews`")
-                //-         p Recorded Talks + Interviews 
-                //- li 
-                //-     router-link(v-if="type === 'event' " :to="`/page/recorded-talks-and-interviews`")
-                //-         p Recorded Talks + Interviews 
                 li 
                     //- event?type=workshops //
                     router-link(v-if="type === 'event' " :to="`/${type}?type=workshops`")
@@ -40,13 +33,14 @@ aside.sidebar
                     //- by type //
                 li(v-for="option in sortOptions")
                     router-link(:to="`/${type}/sorted/${sortTypes[option]}`")
-                        p {{ option }}
+                        p {{ option }} 
                 li
                     router-link(v-if="shouldShowDateSort.includes(type) " :to="`/${type}/sorted/by-current-and-upcoming`")
-                        p by current and upcoming
-                //- li
-                //-     router-link(v-if="type === ('event' || 'exhibition') " :to="`/${type}/`")
-                //-         p by all 
+                        p current and upcoming
+                li
+                    //- router-link(v-if="type === ('post') " :to="`/${type}/`")
+                    router-link(v-if="type === ('post') " :to="`/blog`")
+                        p by all 
 
         //- if artist has sorted by-alpha show alpha sets           
         .shadow(v-if="['artist'].includes(type) && layout !== 'single'")
@@ -75,7 +69,7 @@ aside.sidebar
                         router-link(:to="`/${type}/sorted/by-episode#${episodeSet}`")
                             p {{ episodeSet }}   
 
-        //- if {{type}} has sorted by-type show subtype sets           
+        //- if {{type}} has sorted by-type show subtype sets 
         .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single'")
             h3.t-up {{ type }}s type  
             ul.t-up

vue-theme/src/pages/list.vue

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