v1.8.2

xugaoyi · May 2, 2021 · 3fb8ea1 · 3fb8ea1 · vercel · May 2, 2021
1 parent 46ce942
commit 3fb8ea1
Show file tree

Hide file tree

Showing 22 changed files with 159 additions and 190 deletions.
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -3,7 +3,7 @@ const plugins = require('./config/plugins.js');
 const themeConfig = require('./config/themeConfig.js');
 
 module.exports = {
-  theme: 'vdoing', // 使用依赖包主题
+  theme: 'vdoing', // 使用npm包主题
   // theme: require.resolve('../../theme-vdoing'), // 使用本地主题
 
   title: "Evan's blog",

diff --git a/docs/01.前端/40.学习笔记/00.《JavaScript教程》笔记.md b/docs/01.前端/40.学习笔记/00.《JavaScript教程》笔记.md
@@ -1,8 +1,8 @@
 ---
-pageComponent: 
+pageComponent:
   name: Catalogue
-  data: 
-    key: 《JavaScript教程》笔记
+  data:
+    path: 《JavaScript教程》笔记
     imgUrl: https://cdn.jsdelivr.net/gh/xugaoyi/image_store/blog/20200112120340.png
     description: 本章内容为博主在原教程基础上添加学习笔记，教程版权归原作者所有。来源：<a href='https://wangdoc.com/javascript/' target='_blank'>JavaScript教程</a>
 title: 《JavaScript教程》笔记
@@ -11,7 +11,7 @@ permalink: /note/javascript
 article: false
 comment: false
 editLink: false
-author: 
+author:
   name: xugaoyi
   link: https://github.com/xugaoyi
 ---
diff --git a/docs/01.前端/40.学习笔记/10.《ES6 教程》笔记.md b/docs/01.前端/40.学习笔记/10.《ES6 教程》笔记.md
@@ -2,7 +2,7 @@
 pageComponent:
   name: Catalogue
   data:
-    key: 《ES6 教程》笔记
+    path: 《ES6 教程》笔记
     imgUrl: https://cdn.jsdelivr.net/gh/xugaoyi/image_store/blog/20200112160453.png
     description: 本章内容为博主在原教程基础上添加学习笔记，教程版权归原作者所有。来源：<a href='https://es6.ruanyifeng.com/' target='_blank'>ES6教程</a>
 title: 《ES6 教程》笔记

diff --git a/docs/01.前端/40.学习笔记/20.《Vue》笔记.md b/docs/01.前端/40.学习笔记/20.《Vue》笔记.md
@@ -2,7 +2,7 @@
 pageComponent:
   name: Catalogue
   data:
-    key: 《Vue》笔记
+    path: 《Vue》笔记
     imgUrl: https://cdn.jsdelivr.net/gh/xugaoyi/image_store/blog/20200204143633.png
     description: 本章内容是博主的Vue学习笔记，非教程文档，请以官方文档为准。
 title: 《Vue》笔记

diff --git a/docs/01.前端/40.学习笔记/25.《Reqct》笔记.md → docs/01.前端/40.学习笔记/25.《React》笔记.md b/docs/01.前端/40.学习笔记/25.《Reqct》笔记.md → docs/01.前端/40.学习笔记/25.《React》笔记.md
@@ -2,7 +2,7 @@
 pageComponent:
   name: Catalogue
   data:
-    key: 《React》笔记
+    path: 《React》笔记
     imgUrl: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii0xMS41IC0xMC4yMzE3NCAyMyAyMC40NjM0OCI+CiAgPHRpdGxlPlJlYWN0IExvZ288L3RpdGxlPgogIDxjaXJjbGUgY3g9IjAiIGN5PSIwIiByPSIyLjA1IiBmaWxsPSIjNjFkYWZiIi8+CiAgPGcgc3Ryb2tlPSIjNjFkYWZiIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiPgogICAgPGVsbGlwc2Ugcng9IjExIiByeT0iNC4yIi8+CiAgICA8ZWxsaXBzZSByeD0iMTEiIHJ5PSI0LjIiIHRyYW5zZm9ybT0icm90YXRlKDYwKSIvPgogICAgPGVsbGlwc2Ugcng9IjExIiByeT0iNC4yIiB0cmFuc2Zvcm09InJvdGF0ZSgxMjApIi8+CiAgPC9nPgo8L3N2Zz4K
     description: 本章内容是博主的React学习笔记，非教程文档，请以官方文档为准。
 title: 《React》笔记

diff --git a/docs/01.前端/40.学习笔记/30.《TypeScript 从零实现 axios》.md b/docs/01.前端/40.学习笔记/30.《TypeScript 从零实现 axios》.md
@@ -1,8 +1,8 @@
 ---
-pageComponent: 
+pageComponent:
   name: Catalogue
-  data: 
-    key: 《TypeScript 从零实现 axios》
+  data:
+    path: 《TypeScript 从零实现 axios》
     imgUrl: https://cdn.jsdelivr.net/gh/xugaoyi/image_store/blog/20200105104632.png
     description: 学习使用 TypeScript 从零实现 axios 库
 title: 《TypeScript 从零实现 axios》
@@ -11,7 +11,7 @@ permalink: /note/typescript-axios
 article: false
 comment: false
 editLink: false
-author: 
+author:
   name: xugaoyi
   link: https://github.com/xugaoyi
 ---
diff --git a/docs/01.前端/40.学习笔记/33.《Git》学习笔记.md b/docs/01.前端/40.学习笔记/33.《Git》学习笔记.md
@@ -2,7 +2,7 @@
 pageComponent:
   name: Catalogue
   data:
-    key: 《Git》学习笔记
+    path: 《Git》学习笔记
     imgUrl: https://avatars3.githubusercontent.com/u/18133?s=200&v=4
     description: <a href='https://git-scm.com/book/zh/v2' target='_blank'>Git官网文档</a>的学习笔记，以官方文档为准。
 title: 《Git》学习笔记

diff --git a/docs/_posts/随笔/你知道的越多，不知道的也就越多.md b/docs/_posts/随笔/你知道的越多，不知道的也就越多.md
@@ -3,13 +3,13 @@ title: 你知道的越多，不知道的也就越多
 date: 2020-05-06 15:52:40
 permalink: /pages/f2e63f
 sidebar: auto
-categories: 
+categories:
   - 随笔
-tags: 
+tags:
   - 学习
   - 知识
   - 鸡汤
-author: 
+author:
   name: xugaoyi
   link: https://github.com/xugaoyi
 ---
@@ -30,5 +30,3 @@ author:
 ::: tip 鸡汤2
 当代青年人都应该摆脱冷气，只管向上走，不必听从自暴自弃者的流言。能做事的做事，能发声的发声。有一份热，发一份光，就像萤火一般，也可以在黑暗里发一点光，不必等候炬火。
 :::
-
-
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "deploy": "bash deploy.sh",
     "editFm": "node utils/editFrontmatter.js",
     "baiduPush": "node utils/baiduPush.js https://xugaoyi.com && bash baiduPush.sh",
-    "publish": "cd theme-vdoing && npm publish && cd ../ && npm run updateTheme",
+    "publish": "cd ./theme-vdoing && npm publish && cd ../ && npm run updateTheme",
     "updateTheme": "npm uninstall vuepress-theme-vdoing && rm -rf node_modules && npm i && npm i vuepress-theme-vdoing -D"
   },
   "license": "MIT",
@@ -22,7 +22,7 @@
     "vuepress-plugin-one-click-copy": "^1.0.2",
     "vuepress-plugin-thirdparty-search": "^1.0.2",
     "vuepress-plugin-zooming": "^1.1.7",
-    "vuepress-theme-vdoing": "^1.8.1",
+    "vuepress-theme-vdoing": "^1.8.2",
     "yamljs": "^0.3.0"
   },
   "dependencies": {

diff --git a/theme-vdoing/components/ArchivesPage.vue b/theme-vdoing/components/ArchivesPage.vue
@@ -6,21 +6,21 @@
           :src="currentBadge"
           v-if="$themeConfig.titleBadge === false ? false : true"
         />
-        {{this.$page.title}}
+        {{ this.$page.title }}
       </h1>
       <ul>
         <template v-for="(item, index) in postsList">
           <li
             class="year"
-            v-if="(year = getYear(index)) !== getYear(index-1)"
-            :key="index+$sortPostsByDate.length"
+            v-if="(year = getYear(index)) !== getYear(index - 1)"
+            :key="index + $sortPostsByDate.length"
           >
-            <h2>{{year}}</h2>
+            <h2>{{ year }}</h2>
           </li>
           <li :key="index">
             <router-link :to="item.path">
               <span>{{ getDate(item) }}</span>
-              {{item.title}}
+              {{ item.title }}
             </router-link>
           </li>
         </template>

diff --git a/theme-vdoing/components/ArticleInfo.vue b/theme-vdoing/components/ArticleInfo.vue
@@ -6,50 +6,58 @@
         v-if="articleInfo.classify1 && articleInfo.classify1 !== '_posts'"
       >
         <li>
-          <router-link
-            to="/"
-            class="iconfont icon-home"
-            title="首页"
-          />
+          <router-link to="/" class="iconfont icon-home" title="首页" />
         </li>
         <li>
           <router-link
             v-if="articleInfo.cataloguePermalink"
             :to="articleInfo.cataloguePermalink"
-            :title="articleInfo.classify1+'-目录页'"
-          >{{articleInfo.classify1}}</router-link>
+            :title="articleInfo.classify1 + '-目录页'"
+            >{{ articleInfo.classify1 }}</router-link
+          >
           <router-link
             v-else-if="$themeConfig.category !== false"
-            :to="`/categories/?category=${encodeURIComponent(articleInfo.classify1)}`"
+            :to="`/categories/?category=${encodeURIComponent(
+              articleInfo.classify1
+            )}`"
             title="分类"
-          >{{articleInfo.classify1}}</router-link>
+            >{{ articleInfo.classify1 }}</router-link
+          >
           <span v-else>{{ articleInfo.classify1 }}</span>
         </li>
         <li v-if="articleInfo.classify2">
           <router-link
             v-if="articleInfo.cataloguePermalink"
             :to="articleInfo.cataloguePermalink + '/#' + articleInfo.classify2"
-            :title="articleInfo.classify1+'#'+articleInfo.classify2"
-          >{{articleInfo.classify2}}</router-link>
+            :title="articleInfo.classify1 + '#' + articleInfo.classify2"
+            >{{ articleInfo.classify2 }}</router-link
+          >
           <router-link
             v-else-if="$themeConfig.category !== false"
-            :to="`/categories/?category=${encodeURIComponent(articleInfo.classify2)}`"
+            :to="`/categories/?category=${encodeURIComponent(
+              articleInfo.classify2
+            )}`"
             title="分类"
-          >{{articleInfo.classify2}}</router-link>
-          <span v-else>{{articleInfo.classify2}}</span>
+            >{{ articleInfo.classify2 }}</router-link
+          >
+          <span v-else>{{ articleInfo.classify2 }}</span>
         </li>
         <li v-if="articleInfo.classify3">
           <router-link
             v-if="articleInfo.cataloguePermalink"
             :to="articleInfo.cataloguePermalink + '/#' + articleInfo.classify3"
-            :title="articleInfo.classify1+'#'+articleInfo.classify3"
-          >{{articleInfo.classify3}}</router-link>
+            :title="articleInfo.classify1 + '#' + articleInfo.classify3"
+            >{{ articleInfo.classify3 }}</router-link
+          >
           <router-link
             v-else-if="$themeConfig.category !== false"
-            :to="`/categories/?category=${encodeURIComponent(articleInfo.classify3)}`"
+            :to="`/categories/?category=${encodeURIComponent(
+              articleInfo.classify3
+            )}`"
             title="分类"
-          >{{articleInfo.classify3}}</router-link>
-          <span v-else>{{articleInfo.classify3}}</span>
+            >{{ articleInfo.classify3 }}</router-link
+          >
+          <span v-else>{{ articleInfo.classify3 }}</span>
         </li>
       </ul>
       <div class="info">
@@ -60,33 +68,42 @@
         >
           <a
             :href="articleInfo.author.href || articleInfo.author.link"
-            v-if="articleInfo.author.href || articleInfo.author.link && typeof(articleInfo.author.link) === 'string'"
+            v-if="
+              articleInfo.author.href ||
+              (articleInfo.author.link &&
+                typeof articleInfo.author.link === 'string')
+            "
             target="_blank"
             class="beLink"
             title="作者"
-          >{{articleInfo.author.name}}</a>
-          <a
-            v-else
-            href="javascript:;"
-          >{{articleInfo.author.name || articleInfo.author}}</a>
+            >{{ articleInfo.author.name }}</a
+          >
+          <a v-else href="javascript:;">{{
+            articleInfo.author.name || articleInfo.author
+          }}</a>
         </div>
         <div
           class="date iconfont icon-riqi"
           title="创建时间"
           v-if="articleInfo.date"
         >
-          <a href="javascript:;">{{articleInfo.date}}</a>
+          <a href="javascript:;">{{ articleInfo.date }}</a>
         </div>
         <div
           class="date iconfont icon-wenjian"
           title="分类"
-          v-if="$themeConfig.category !== false && !(articleInfo.classify1 && articleInfo.classify1 !== '_posts') && articleInfo.categories"
+          v-if="
+            $themeConfig.category !== false &&
+            !(articleInfo.classify1 && articleInfo.classify1 !== '_posts') &&
+            articleInfo.categories
+          "
         >
           <router-link
             :to="`/categories/?category=${encodeURIComponent(item)}`"
             v-for="(item, index) in articleInfo.categories"
             :key="index"
-          >{{item + ' '}}</router-link>
+            >{{ item + ' ' }}</router-link
+          >
         </div>
       </div>
     </div>
@@ -123,7 +140,6 @@ export default {
       const classify3 = relativePathArr.length > 3 ? relativePathArr[2].split('.')[1] : undefined// 文章三级分类名称
 
       const cataloguePermalink = sidebar && sidebar.catalogue ? sidebar.catalogue[classify1] : undefined// 目录页永久链接
-
       const author = this.$frontmatter.author || this.$themeConfig.author // 作者
       let date = (pageInfo.frontmatter.date || '').split(' ')[0] // 文章创建时间
 

diff --git a/theme-vdoing/components/BloggerBar.vue b/theme-vdoing/components/BloggerBar.vue
@@ -1,29 +1,22 @@
 <template>
   <aside class="blogger-wrapper card-box">
     <div class="avatar">
-      <img
-        :src="blogger.avatar"
-        alt="头像"
-        title="我好看吗"
-      />
+      <img :src="blogger.avatar" alt="头像" title="我好看吗" />
     </div>
-    <div
-      class="icons"
-      v-if="social && social.icons && social.icons.length"
-    >
+    <div class="icons" v-if="social && social.icons && social.icons.length">
       <a
         v-for="(item, index) in social.icons"
         :key="index"
         :href="item.link"
         :title="item.title"
         :class="['iconfont', item.iconClass]"
-        :style="{width: 100/social.icons.length + '%'}"
+        :style="{ width: 100 / social.icons.length + '%' }"
         target="_blank"
       />
     </div>
     <div class="blogger">
-      <span class="name">{{blogger.name}}</span>
-      <span class="slogan">{{blogger.slogan}}</span>
+      <span class="name">{{ blogger.name }}</span>
+      <span class="slogan">{{ blogger.slogan }}</span>
     </div>
   </aside>
 </template>
@@ -45,7 +38,7 @@ export default {
 .blogger-wrapper
   height auto
   display inline-table
-  padding-top 0!important
+  padding-top 0 !important
   overflow hidden
   .avatar
     width 100%

diff --git a/theme-vdoing/components/Buttons.vue b/theme-vdoing/components/Buttons.vue
@@ -33,9 +33,11 @@
             v-for="item in modeList"
             :key="item.KEY"
             class="iconfont"
-            :class="[item.icon, {active: item.KEY === currentMode}]"
+            :class="[item.icon, { active: item.KEY === currentMode }]"
             @click="toggleMode(item.KEY)"
-          >{{item.name}}</li>
+          >
+            {{ item.name }}
+          </li>
         </ul>
       </transition>
     </div>