:recycle: loading current and upcoming events and exhibitions by default | altering some styles | adjusted excerpt length filter | changed some navigation settings to use sortby

plugins/cia-endpoints/cia-end-points.php

@@ -70,6 +70,10 @@ add_action( 'rest_api_init', function () {
     $sort_controller->register_custom_route('events/by-upcoming');
     $sort_controller = new Make_Sort_By('exhibition', 'by_upcoming');
     $sort_controller->register_custom_route('exhibitions/by-upcoming');
+    $sort_controller = new Make_Sort_By('event', 'by_current_and_upcoming');
+    $sort_controller->register_custom_route('events/by-current-and-upcoming');
+    $sort_controller = new Make_Sort_By('exhibition', 'by_current_and_upcoming');
+    $sort_controller->register_custom_route('exhibitions/by-current-and-upcoming');
 });
 
 /**
@@ -97,4 +101,8 @@ add_filter('wp_rest_cache/allowed_endpoints', function () {
         $allowed_endpoints['craft/v2'][] = 'artists';
 
     return $allowed_endpoints;
-}, 10, 1);
+}, 10, 1);
+
+add_filter('excerpt_length', function ($length) {
+    return 20;
+});

plugins/cia-endpoints/includes/class.make-sortby.php

@@ -92,6 +92,29 @@ class Make_Sort_By extends WP_REST_Controller {
         return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
     }
     
+    public function by_current_and_upcoming( $request ) {
+        global $wpdb;
+        $time = strval(time());
+        $start = 'exhibit-start-date';
+        $end = 'exhibit-end-date';
+        if($this->post_type == 'event') {
+            $start = 'event-start-time';
+            $end = 'event-end-time';
+        }
+        $res = $wpdb->get_results($wpdb->prepare(
+            "SELECT DISTINCT wp_posts.* FROM wp_posts 
+            JOIN wp_postmeta AS starts
+            ON (starts.post_id = wp_posts.ID AND starts.meta_key = %s AND starts.meta_value <= %s OR starts.meta_value > %s)
+            JOIN wp_postmeta AS ends
+            ON (ends.post_id = wp_posts.ID AND ends.meta_key = %s AND ends.meta_value >= %s)
+            WHERE post_type = %s AND post_status = 'publish'
+            ORDER BY starts.meta_value DESC",
+            $start, $time, $time, $end, $time, $this->post_type
+        ));
+        wp_reset_postdata();
+        return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
+    }
+    
     public function by_upcoming( $request ) {
         global $wpdb;
         $time = strval(time());

plugins/cia-endpoints/includes/formats.php

@@ -43,12 +43,12 @@ function default_post_format( $item, $include_content ) {
     if($item->post_type === 'event') {
         $filtered[start] = get_post_meta( $item->ID, 'event-start-time', true );
         $filtered[end] = get_post_meta( $item->ID, 'event-end-time', true );
-        $filtered[now] = time();
+        $filtered[current] = time() <= (int)$filtered[end] && time() >= (int)$filtered[start];
     }
     if($item->post_type === 'exhibition') {
         $filtered[start] = get_post_meta( $item->ID, 'exhibit-start-date', true );
         $filtered[end] = get_post_meta( $item->ID, 'exhibit-end-date', true );
-        $filtered[now] = time();
+        $filtered[current] = time() <= (int)$filtered[end] && time() >= (int)$filtered[start];
     }
 
     // Post categories and tags (store just the slugs)

vue-theme/src/components/card.vue

@@ -25,7 +25,7 @@ export default {
 @import '../sss/variables.sss'
 @import '../sss/theme.sss'
 .card
-    padding: $ms-0
+    padding: $ms--1
     overflow: hidden
     text-overflow: clip
     &--info
@@ -33,7 +33,8 @@ export default {
         justify-content: center
     header
         a
-            /* text-decoration: none */
+            font-size: $ms--1
+            text-decoration: none
     img
         width: 100%
         height: auto

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

@@ -10,7 +10,9 @@ nav.main.w-max
                     h1.t-serif.t-up craft in america
             li.f-grow
             li(v-for="item in menuItems")
-                router-link(:to="`/${item}`")
+                router-link(v-if="['events','exhibitions'].includes(item)" :to="`/${item}/by-current-and-upcoming`")
+                    h5.t-up {{ item }}
+                router-link(v-else :to="`/${item}`")
                     h5.t-up {{ item }}
 
     .mobile-menu

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

@@ -127,6 +127,8 @@ export default {
 @import '../../sss/variables.sss'
 @import '../../sss/theme.sss'
 aside.sidebar
+    p, h3
+        margin: 0
     position: sticky
     /* top: 65px */
     top: $ms-7

vue-theme/src/pages/index.vue

@@ -35,17 +35,15 @@
 import { postTypeGetters, scrollTop } from './mixin-post-types'
 import card from '@/components/card.vue'
 
-import { convertTitleCase, postTypes } from '@/utils/helpers'
+import { convertTitleCase, postTypes, sortTypes } from '@/utils/helpers'
 
 export default {
     mixins: [postTypeGetters, scrollTop],
     components: { card },
     data() { 
         return {
-            // firstRow: ['episodes', 'exhibitions', 'events', 'shorts', 'posts'],
             firstRow: ['episodes', 'exhibitions', 'events', 'artists', 'posts'],
             secondRow: 'artists', // This is only ONE post
-            // thirdRow: ['guides', 'objects', 'techniques', 'talks', 'center']
             thirdRow: ['episodes', 'exhibitions', 'events', 'artists', 'posts']
         }
     },
@@ -53,7 +51,15 @@ export default {
         // console.log(wp)
         postTypes.forEach(type => {
             const capitalizedType = convertTitleCase(type)
-            this.$store.dispatch(`getAll${capitalizedType}`)
+
+            // We try and fetch EVERYTHING except
+            // for EVENTS and EXHIBITIONS we only grab
+            // the current or upcoming on load
+            if(!['events', 'exhibitions'].includes(type)) {
+                this.$store.dispatch(`getAll${capitalizedType}`)
+            } else {
+                this.$store.dispatch(`getAll${capitalizedType}`, sortTypes.currentAndUpcoming)
+            }
         })
         this.checkAndSetHero('welcome')
     },

vue-theme/src/pages/list.vue

@@ -3,15 +3,10 @@
     article.f-grow
 
         header.center.t-up
-            //- breadcrumb links here at top of page probably not needed for list page as its obvious - delete probably       
-            breadcrumb.f-row.start
-                router-link(:to="`/${type}`")
-                    h5.t-up {{ type }}
-
             .title.f-row
                 h3 {{ type }} list
                 span(v-if="sortBy")
-                    h3  sorted by {{ sortBy.replace('-', ' ') }}
+                    h3 sorted {{ sortBy.replace('-', ' ') }}
 
             h3(v-if="!loaded") loading...
             .content(v-else-if="allPagesLoaded && type && allPages[type]" v-html="allPages[type].content")
@@ -25,17 +20,7 @@
             p {{ `show sidebar: ${sidebar}` }}
         
     sidebar(v-if="sidebar" :type="`${type}`" layout="list")
-        //- .shadow.t-up
-        //-     h3 Upcoming {{ type }}
-        //-     div
-        //-         p upcoming title
-        //-         p date-from: date-to: 
-        //-         p location
-        //-         br
-        //-         p upcoming title
-        //-         p date-from: date-to: 
-        //-         p location
-
+    
 </template>
 
 <script>
@@ -128,6 +113,8 @@ export default {
             let type = convertTitleCase(this.type)
             let sort = this.sortBy ? this.sortBy : to.path.split('/').pop()
             this.checkAndSetHero(this.type)
+            console.log('---')
+            console.log(sort)
             if(!this[`all${type}Loaded`] || sort) this.getPosts()
         }
     },

vue-theme/src/pages/single.vue

@@ -9,8 +9,10 @@
         header
             //- breadcrumb links at top of page, needs link routing
             breadcrumb.f-row.start.t-up
-                router-link(:to="`/${type}`")
-                    h5 {{ type }}
+                router-link(v-if="['events','exhibitions'].includes(type)" :to="`/${type}/by-current-and-upcoming`")
+                    h5.t-up {{ type }}
+                router-link(v-else :to="`/${type}`")
+                    h5.t-up {{ type }}
                 //- h5 •
                 h5 >
                 router-link(:to="`/${type}/${post.slug}`")

vue-theme/src/router/routes.js

@@ -30,6 +30,26 @@ export default [
         component: listPage,
         props: { sidebar: true, grid: true, sortBy: `${sortTypes.material}` },
     },
+    {
+        path: `/:type/${sortTypes.past}`,
+        component: listPage,
+        props: { sidebar: true, sortBy: `${sortTypes.past}` },
+    },
+    {
+        path: `/:type/${sortTypes.current}`,
+        component: listPage,
+        props: { sidebar: true, sortBy: `${sortTypes.current}` },
+    },
+    {
+        path: `/:type/${sortTypes.currentAndUpcoming}`,
+        component: listPage,
+        props: { sidebar: true, sortBy: `${sortTypes.currentAndUpcoming}` },
+    },
+    {
+        path: `/:type/${sortTypes.upcoming}`,
+        component: listPage,
+        props: { sidebar: true, sortBy: `${sortTypes.upcoming}` },
+    },
     {
         path: `/:type/${sortTypes.alpha}`,
         component: listPage,

vue-theme/src/utils/helpers.js

@@ -13,6 +13,10 @@ const sortTypes = {
     material: 'by-material',
     artist: 'by-artist',
     episode: 'by-episode',
+    upcoming: 'by-upcoming',
+    current: 'by-current',
+    currentAndUpcoming: 'by-current-and-upcoming',
+    past: 'by-past',
 }
 
 /**