Merge branch 'master' of ssh://gitea.yvvas.com:4022/craft-in-america/vue-wp

plugins/cia-endpoints/includes/formats.php

@@ -43,7 +43,7 @@ function default_post_format( $item, $include_content ) {
     $filtered[hero] = get_post_meta( $item->ID, 'hero_header', true );
 
     // Materials + type endpoints
-    $posts_with_type = ['artist', 'exhibition', 'event'];
+    $posts_with_type = ['artist', 'exhibition', 'event', 'short', 'guide', 'object', 'publication', 'technique' ];
     if( in_array($item->post_type, $posts_with_type) ) {
         $filtered[materials] = make_taxonomy_endpoint_for(get_the_terms( $item, 'material'));
         $filtered[subtypes] = make_taxonomy_endpoint_for(get_the_terms( $item, $item->post_type . '_type' ));

vue-theme/src/components/card.vue

@@ -22,8 +22,8 @@
                 h1.t-up.t-cntr.t-b {{ content.title }}
 
             p(v-if="content.end && type == 'event'" class="datetime") {{ dateFrom(content.start, type=='event') }} – {{ dateFrom(content.end, type=='event').split(',')[1] }}
-            p(v-if="content.date && type == 'post'" class="datetime") {{ dateFrom((new Date(content.date).getTime()/1000), type=='post') }}
-            p(v-else-if="content.end" class="datetime") {{ dateFrom(content.start, type=='event') }} – {{ dateFrom(content.end, type=='event') }}
+            p(v-if="content.date && type == 'post'" class="datetime") {{ dateFrom((new Date(content.date).getTime()/1000), type=='post').split(',')[0] }}
+            p(v-else-if="content.end && type == 'exhibition'" class="datetime") {{ dateFrom(content.start) }} – {{ dateFrom(content.end) }}
             p(v-html="content.excerpt").excerpt
 
             router-link(v-if="type == 'post'" :to="`/blog/${content.slug}`")

vue-theme/src/components/footer.vue

@@ -1,8 +1,8 @@
 <template lang="pug">
 .footer-wrapper.t-up.t-sans
     footer.main.w-max
-        //- address contact
         ul.f-col.start
+            //- address contact   
             li
                 h4 Craft in America
                 ul
@@ -13,29 +13,38 @@
                     li (323) 951-0610 center
                     li
                         router-link(to="mailto:info@craftinamerica.org") info@craftinamerica.org
+            //- social media   
             li
                 h4 Connect with Us
                 ul.f-row
                     li
-                        h3.t-cntr
-                            a(href="https://www.facebook.com/CraftinAmerica") FB<br>
-                                img(src="../star.svg")
+                        h3 
+                            a(href="https://www.facebook.com/CraftinAmerica")
+                                //- img(src="../assets/facebook-brands.svg")
                                 //- replace with respective icon 
+                                svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="facebook" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512")
+                                    path(fill="currentColor" d="M504 256C504 119 393 8 256 8S8 119 8 256c0 123.78 90.69 226.38 209.25 245V327.69h-63V256h63v-54.64c0-62.15 37-96.48 93.67-96.48 27.14 0 55.52 4.84 55.52 4.84v61h-31.28c-30.8 0-40.41 19.12-40.41 38.73V256h68.78l-11 71.69h-57.78V501C413.31 482.38 504 379.78 504 256z")
                     li
-                        h3.t-cntr
-                            a(href="http://www.youtube.com/user/craftinamerica") YT<br>
-                                img(src="../star.svg")
+                        h3 
+                            a(href="http://www.youtube.com/user/craftinamerica")
+                                //- img(src="../star.svg")
                                 //- replace with respective icon 
+                                svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="youtube" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512")
+                                    path(fill="currentColor" d="M549.655 124.083c-6.281-23.65-24.787-42.276-48.284-48.597C458.781 64 288 64 288 64S117.22 64 74.629 75.486c-23.497 6.322-42.003 24.947-48.284 48.597-11.412 42.867-11.412 132.305-11.412 132.305s0 89.438 11.412 132.305c6.281 23.65 24.787 41.5 48.284 47.821C117.22 448 288 448 288 448s170.78 0 213.371-11.486c23.497-6.321 42.003-24.171 48.284-47.821 11.412-42.867 11.412-132.305 11.412-132.305s0-89.438-11.412-132.305zm-317.51 213.508V175.185l142.739 81.205-142.739 81.201z")
                     li
-                        h3.t-cntr
-                            a(href="http://www.instagram.com/craftinamerica") IG<br>
-                                img(src="../star.svg")
+                        h3 
+                            a(href="http://www.instagram.com/craftinamerica")
+                                //- img(src="../star.svg")
                                 //- replace with respective icon 
+                                svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="instagram" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512")
+                                    path(fill="currentColor" d="M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z")
                     li
-                        h3.t-cntr
-                            a(href="https://twitter.com/CraftinAmerica") TT<br>
-                                img(src="../star.svg")
+                        h3 
+                            a(href="https://twitter.com/CraftinAmerica")
+                                //- img(src="../star.svg")
                                 //- replace with respective icon                 
+                                svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400")
+                                    path(fill="currentColor" d="M400,200c0,110.5-89.5,200-200,200S0,310.5,0,200S89.5,0,200,0S400,89.5,400,200z M163.4,305.5 c88.7,0,137.2-73.5,137.2-137.2c0-2.1,0-4.2-0.1-6.2c9.4-6.8,17.6-15.3,24.1-25c-8.6,3.8-17.9,6.4-27.7,7.6 c10-6,17.6-15.4,21.2-26.7c-9.3,5.5-19.6,9.5-30.6,11.7c-8.8-9.4-21.3-15.2-35.2-15.2c-26.6,0-48.2,21.6-48.2,48.2 c0,3.8,0.4,7.5,1.3,11c-40.1-2-75.6-21.2-99.4-50.4c-4.1,7.1-6.5,15.4-6.5,24.2c0,16.7,8.5,31.5,21.5,40.1c-7.9-0.2-15.3-2.4-21.8-6 c0,0.2,0,0.4,0,0.6c0,23.4,16.6,42.8,38.7,47.3c-4,1.1-8.3,1.7-12.7,1.7c-3.1,0-6.1-0.3-9.1-0.9c6.1,19.2,23.9,33.1,45,33.5 c-16.5,12.9-37.3,20.6-59.9,20.6c-3.9,0-7.7-0.2-11.5-0.7C110.8,297.5,136.2,305.5,163.4,305.5")
             li
                 h5
                     a(href="https://visitor.r20.constantcontact.com/d.jsp?llr=fyb4y9cab&p=oi&m=fyb4y9cab&sit=olvymhdeb&f=ee3616e1-10de-4a59-b451-1a882111b1f5", target="_blank") Join email list
@@ -43,28 +52,63 @@
         //- menu links
         ul.f-col.start
             li
+                h5 
+                    router-link(to="/episode") PBS Series
+                    ul.f-col.start 
+                        li 
+                            router-link(to="/episode") &nbsp; Episodes
+                        li 
+                            router-link(to="/short") &nbsp; Shorts
+                        li 
+                            router-link(to="/technique") &nbsp; Techniques
+            li 
                 h5
-                    router-link(to="/episodes") PBS Series
-                ul.f-col.start
-                    li Episodes
-
-                h5
-                    router-link(to="/artists") Artists
-                ul.f-col.start
-                    li
-                        router-link(to="/artists/by-alpha") A-Z
+                    router-link(to="/artist") Artists
+                    ul.f-col.start
+                        li
+                            router-link(to="/artist/sorted/by-alpha") &nbsp; A-Z
+                        li
+                            router-link(to="/artist/sorted/by-material") &nbsp; by Material
 
             li
                 h5 
-                    router-link(to="/exhibitions") Exhibitions
+                    router-link(to="/exhibition") Exhibitions
+                    ul.f-col.start
+                        li
+                            router-link(to="/exhibition/sorted/by-current-and-upcoming") &nbsp; Current/Upcoming
+                        li
+                            router-link(to="/object/") &nbsp; Objects
 
             li
                 h5
-                    router-link(to="/events") Events
+                    router-link(to="/event") Center 
+                    ul.f-col.start
+                        li
+                            router-link(to="/exhibition") &nbsp; Exhibitions
+                        li 
+                            router-link(to="/event/sorted/by-current-and-upcoming") &nbsp; Events 
+                        li
+                            router-link(to="/event/sorted/by-type&talks") &nbsp; Talks &amp; Interviews
+            li
+                h5
+                    router-link(to="") Education 
+                    ul.f-col.start
+                        li
+                            router-link(to="/guide") &nbsp; Guides 
+                        li 
+                            router-link(to="/publication") &nbsp; Publications 
+
 
             li
                 h5
-                    router-link(to="/posts") News
+                    router-link(to="") News
+                    ul.f-col.start
+                        li
+                            router-link(to="/blog") &nbsp; Blog Posts  
+                        li 
+                            router-link(to="/blog/sorted/by-type&releases") &nbsp; Press Releases 
+                        li 
+                            router-link(to="/blog/sorted/by-type&articles") &nbsp; In the News 
 
     .sub-footer.f-col.start
         h6 Craft in America &copy; 2010&ndash;{{ today }} 
@@ -128,18 +172,8 @@ export default {
                     align-items: flex-start
                     > li
                         padding: 0 0 $ms--5
-                img
-                    width: $ms-0
-                    height: $ms-0
-                    padding: 0
-                        &.social-icons
-                        flex-direction: row
-                        justify-content: space-around
-                        > li
-                            padding: 0.2em 0.3em 0 0
-                            svg
-                                color: $cia_white
-                                font-size: 2em
+                svg 
+                    height: 1.5em
 
 
     .sub-footer

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

@@ -53,7 +53,7 @@ export default {
                 // 'resources',
                 // 'support',
                 // 'about',
-                // '🔍'
+                '🔍'
             ]
             const ignore = [
                 'page',
@@ -92,6 +92,7 @@ nav.main
     .menu, .mobile-menu
         /* padding: $ms-0 0 */
         a
+            text-decoration: none
             color: $cia_black
             &:hover
                 color: $cia_darker
@@ -127,7 +128,6 @@ nav.main
     
     .mobile-menu
         a
-            text-decoration: none
         /* cia logotype for smaller screens */
         img 
             margin: $ms--7 $ms--6 0 $ms-0

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

@@ -2,7 +2,7 @@
 aside.sidebar
     section
         //- if not single layout with sorting
-        .shadow(v-if="['artist', 'exhibition', 'event', 'post'].includes(type) && layout !== 'single'")
+        .shadow(v-if="['artist', 'exhibition', 'event', 'short', 'guide', 'object', 'publication', 'technique', 'post'].includes(type) && layout !== 'single'")
             h3.t-up sort {{ type }} by
             ul.t-up
                 li(v-for="option in sortOptions")
@@ -11,11 +11,15 @@ aside.sidebar
                 //- temporary reminder
                 template(v-if="['exhibition', 'event'].includes(type) && layout === 'list'")
                     p 
-                        router-link(:to="`/${type}/sorted/by-date`")
+                        router-link(:to="`/${type}/`")
                             p by all
                     p 
                         router-link(:to="`/${type}/sorted/by-current-and-upcoming`")
                             p by current and upcoming
+                template(v-if="['short', 'guide', 'publication', 'technique', 'post'].includes(type) && layout === 'list'")
+                    p 
+                        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)")
@@ -103,6 +107,7 @@ export default {
                 case 'short':
                     opts = [
                         Object.keys(this.sortTypes)[2],
+                        Object.keys(this.sortTypes)[1],
                         Object.keys(this.sortTypes)[3],
                     ]
                     break
@@ -112,6 +117,22 @@ export default {
                         Object.keys(this.sortTypes)[1],
                     ]
                     break
+                case 'object':
+                    opts = [
+                        Object.keys(this.sortTypes)[1],
+                    ]
+                    break
+                case 'publication':
+                    opts = [
+                        Object.keys(this.sortTypes)[1],
+                    ]
+                    break
+                case 'technique':
+                    opts = [
+                        Object.keys(this.sortTypes)[1],
+                        Object.keys(this.sortTypes)[3],
+                    ]
+                    break
             }
             return opts
         },

vue-theme/src/pages/index.vue

@@ -12,19 +12,19 @@
                 li.post.shadow(v-for="sticky in allSticky")
                     card(:content="sticky" :type="`${sticky.type}`")
         
-        //- firstRow: ['episodes', 'exhibitions', 'events', 'shorts', 'posts'], exceprt on episodes only.
+        //- firstRow: ['episode', 'exhibition', 'event', 'short', 'post'], exceprt on episode only.
         section
             ul
                 li.post.shadow(v-for="type in firstRow")
                     card(:content="firstPostOfType(type)" :type="type")
         
-        //- secondRow: 'artists', // This is only ONE post, excerpt on artist
+        //- secondRow: 'artist', // This is only ONE post, excerpt on artist
         section.max
             ul.w-max
                 li.post.shadow(v-for="post in randomPosts.filter(p => p.type == secondRow)")
                     card(v-if="post" :content="post" :type="`${post.type}`" :wide="true")
         
-        //- (thirdRow) firstRow.flipped: ['guides', 'objects', 'techniques', 'talks', 'center'], exceprt on guides only
+        //- (thirdRow) firstRow.flipped: ['object', 'technique', 'publication', 'center', 'guide'], exceprt on guide only
         section
             ul.flipped
                 li.post.shadow(v-for="type in thirdRow")
@@ -45,7 +45,7 @@ export default {
         return {
             firstRow: ['episode', 'exhibition', 'event', 'short', 'post'],
             secondRow: 'artist', // This is only ONE post
-            thirdRow: ['object', 'short', 'publication', 'post', 'guide'],
+            thirdRow: ['object', 'technique', 'publication', 'center', 'guide'],
         }
     },
     async created() {
@@ -83,7 +83,7 @@ export default {
             await this.$store.dispatch('getAllPages', { sortType: null, params: null })
         }
         await this.checkAndSetHero('welcome')
-        await this.$store.dispatch('getRandomPosts', ['artist', 'guide', 'object', 'short', 'publication', 'post'])
+        await this.$store.dispatch('getRandomPosts', ['artist', 'guide', 'object', 'technique', 'publication', 'post'])
     },
     methods: {
         firstPostOfType(type) {