Merge pull request #82 from vuepress-reco/feature/reco

fix: fix filtering of article data

Author: reco_luan

components/Home.vue

@@ -9,7 +9,7 @@
 
       <h1 v-if="data.isShowTitleInHome !== false">{{ data.heroText || $title || '午后南杂' }}</h1>
 
-      <p class="description">{{ data.tagline || $description || 'Welcome to your vuePress-theme-reco site' }}</p>
+      <p class="description">{{ $description || 'Welcome to your vuePress-theme-reco site' }}</p>
       <p class="huawei" v-if="$themeConfig.huawei === true">
         <i class="iconfont reco-huawei" style="color: #fc2d38"></i>
         &nbsp;&nbsp;&nbsp;华为，为中华而为之！

components/HomeBlog.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="home-blog" :class="recoShow?'reco-show': 'reco-hide'">
     <div class="hero" :style="{background: `url(${$frontmatter.bgImage ? $withBase($frontmatter.bgImage) : require('../images/home-bg.jpg')}) center/cover no-repeat`, ...bgImageStyle}">
-      <h1>{{ data.heroText || $title || '午后南杂' }}</h1>
+      <h1>{{ homeFrontmatter.heroText || $title || '午后南杂' }}</h1>
 
-      <p class="description">{{ data.tagline || $description || 'Welcome to your vuePress-theme-reco site' }}</p>
+      <p class="description">{{ $description || 'Welcome to your vuePress-theme-reco site' }}</p>
       <p class="huawei" v-if="$themeConfig.huawei === true"><i class="iconfont reco-huawei" style="color: #fc2d38"></i>&nbsp;&nbsp;&nbsp;华为，为中华而为之！</p>
     </div>
 
@@ -72,47 +72,54 @@ export default {
   computed: {
     // 时间降序后的博客列表
     posts () {
-      let posts = this.$site.pages
-      posts = this._filterPostData(posts)
-      this._sortPostData(posts)
+      const {
+        $site: { pages },
+        _filterPostData,
+        _sortPostData
+      } = this
+
+      let posts = pages
+      posts = _filterPostData(posts)
+      _sortPostData(posts)
+
       return posts
     },
-
     // 分类信息
     getPagesLength () {
-      let num = 0
-      this.$categories.list.map(v => {
-        num += v.pages.length
-      })
-      return num
+      return this.posts.length
     },
-    data () {
+    homeFrontmatter () {
       return this.$frontmatter
     },
-
     actionLink () {
+      const {
+        actionLink: link,
+        actionText: text
+      } = this.homeFrontmatter
+
       return {
-        link: this.data.actionLink,
-        text: this.data.actionText
+        link,
+        text
       }
     },
-
     heroImageStyle () {
-      return this.data.heroImageStyle || {
+      return this.homeFrontmatter.heroImageStyle || {
         maxHeight: '200px',
         margin: '6rem auto 1.5rem'
       }
     },
-
     bgImageStyle () {
-      const bgImageStyle = {
+      const initBgImageStyle = {
         height: '350px',
         textAlign: 'center',
         overflow: 'hidden'
       }
-      return this.data.bgImageStyle ? { ...bgImageStyle, ...this.data.bgImageStyle } : bgImageStyle
-    },
+      const {
+        bgImageStyle
+      } = this.homeFrontmatter
 
+      return bgImageStyle ? { ...initBgImageStyle, ...bgImageStyle } : initBgImageStyle
+    },
     heroHeight () {
       return document.querySelector('.hero').clientHeight
     }
@@ -142,10 +149,6 @@ export default {
       const base = this.$site.base
       window.location.href = `${base}tag/?tag=${currentTag}`
     },
-    // 获取时间的数字类型
-    _getTimeNum (data) {
-      return parseInt(new Date(data.frontmatter.date).getTime())
-    },
     _setPage (page) {
       this.currentPage = page
       this.$page.currentPage = page

layouts/TimeLines.vue

@@ -107,7 +107,7 @@ export default {
 .timeline-wrapper
   box-sizing border-box
   max-width: 740px;
-  margin: 4rem auto;
+  margin: 8rem auto 4rem;
   position relative
   list-style none
   &::after {

mixins/index.js

@@ -8,10 +8,10 @@ export default {
     },
     _filterPostData (posts, isTimeline) {
       posts = posts.filter(item => {
-        const { home, date, publish } = item.frontmatter
+        const { title, frontmatter: { home, date, publish }} = item
         return isTimeline === true
-          ? !(home == true || date === undefined || publish === false)
-          : !(home == true || publish === false)
+          ? !(home == true || title == undefined || date === undefined || publish === false)
+          : !(home == true || title == undefined || publish === false)
       })
       return posts
     },