#199: Max pagination to reduce siteData.js bundle

thinktandem · Sep 14, 2020 · e2f4232 · e2f4232
1 parent 5476a80
commit e2f4232
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/site/.vuepress/config.js b/site/.vuepress/config.js
@@ -25,7 +25,7 @@ module.exports = {
           itemLayout: 'Post',
           layout: 'Blog',
           pagination: {
-            lengthPerPage: 5,
+            lengthPerPage: 1000,
           },
           title: 'Blog',
         },
@@ -36,8 +36,7 @@ module.exports = {
           itemLayout: 'CaseStudy',
           layout: 'Work',
           pagination: {
-            lengthPerPage: 5,
-
+            lengthPerPage: 1000,
           },
           title: 'Work',
         },
@@ -48,6 +47,9 @@ module.exports = {
           itemPermalink: '/:slug',
           itemLayout: 'Page',
           layout: 'About',
+          pagination: {
+            lengthPerPage: 1000,
+          },
           title: 'About',
         },
       ],
@@ -59,7 +61,7 @@ module.exports = {
           scopeLayout: 'Tag',
           title: 'Content',
           pagination: {
-            lengthPerPage: 5,
+            lengthPerPage: 1000,
           },
         },
       ],

diff --git a/site/.vuepress/theme/components/ContentList.vue b/site/.vuepress/theme/components/ContentList.vue
@@ -13,7 +13,7 @@
       itemtype="https://schema.org/BlogPosting"
     />
     <div
-      v-if="(this.$pagination.paginationIndex + 1) < this.$pagination.length"
+      v-if="(this.paginationIndex * this.paginator) < this.$pagination.pages.length"
       class="load-more"
       @click="more"
     >
@@ -33,18 +33,23 @@ import WorkSummary from '@theme/components/WorkSummary.vue';
 export default {
   components: {PostSummary, WorkSummary},
   props: {
-    sortOrder: {
-      type: Array,
-      default: () => ([]),
-    },
     moreText: {
       type: String,
       default: 'Load more stuff',
     },
+    paginator: {
+      type: Number,
+      default: 5,
+    },
+    sortOrder: {
+      type: Array,
+      default: () => ([]),
+    },
   },
   data() {
     return {
       paginationComponent: null,
+      paginationIndex: 1,
       pages: [],
     };
   },
@@ -56,10 +61,8 @@ export default {
   },
   methods: {
     more() {
-      this.$pagination.paginationIndex++;
-      let next = this.$pagination._paginationPages[this.$pagination.paginationIndex];
-      let nextPages = this.$pagination._matchedPages.slice(next.interval[0], next.interval[1] + 1);
-      for (let i = 0; i < nextPages.length; i++) this.pages.push(nextPages[i]);
+      this.paginationIndex++;
+      this.pages = this.sort(this.$pagination.pages);
     },
     sortByType(a, b) {
       if (this.sortOrder.indexOf(a.id) > this.sortOrder.indexOf(b.id)) {
@@ -71,7 +74,7 @@ export default {
       }
     },
     sort(data) {
-      return data.sort(this.sortByType);
+      return data.sort(this.sortByType).slice(0, this.paginator * this.paginationIndex);
     },
   },
 

diff --git a/site/.vuepress/theme/layouts/Tag.vue b/site/.vuepress/theme/layouts/Tag.vue
@@ -10,10 +10,7 @@
         <p>{{ byline }}</p>
       </div>
     </SectionHeader>
-    <ContentList
-      v-if="$pagination"
-      :sort-order="sortOrder"
-    />
+    <ContentList v-if="$pagination" />
     <Content v-else />
   </div>
 </template>

diff --git a/site/work/imsglobal-d8-migration.md b/site/work/imsglobal-d8-migration.md
@@ -32,7 +32,6 @@ tags:
   - non-profit
   - support
   - training
-  - development
   - migrations
 ---
 ::: point Summary.

diff --git a/site/work/isna-vuepress-migration.md b/site/work/isna-vuepress-migration.md
@@ -30,7 +30,6 @@ tags:
   - development
   - vue
   - non-profit
-  - development
   - migrations
 ---
 ::: point Summary.

diff --git a/site/work/poets-blackbaud.md b/site/work/poets-blackbaud.md
@@ -30,7 +30,6 @@ tags:
   - php
   - development
   - non-profit
-  - development
   - crm
   - blackbaud
 ---