-
-
-
-
-
-
{{articleInfo.date}}
@@ -29,6 +29,8 @@
\ No newline at end of file
+
diff --git a/theme-vdoing/components/Home改版.vue b/theme-vdoing/components/Home改版.vue
deleted file mode 100644
index 0ca7fc3..0000000
--- a/theme-vdoing/components/Home改版.vue
+++ /dev/null
@@ -1,490 +0,0 @@
-
- }, ...}
- */
+ // fileMatterObj => {content:'剔除frontmatter后的文件内容字符串', data:{}, ...}
const fileMatterObj = matter(dataStr);
if (Object.keys(fileMatterObj.data).length === 0) { // 未定义FrontMatter数据
const stat = fs.statSync(file.filePath);
const dateStr = dateFormat(stat.birthtime);// 文件的创建时间
- const newData = `---\r\ntitle: ${file.name}\r\ndate: ${dateStr}\r\npermalink: ${file.permalink}\r\n---\r\n` + fileMatterObj.content;
+
+
+ const categories = getCategories(file)
+// 注意下面这个字符串的格式会映射到文件
+const newData = `---
+title: ${file.name}
+date: ${dateStr}
+permalink: ${getPermalink()}
+categories:
+ - ${categories[0]}${categories[1] ? '\r\n - '+ categories[1] : ''}
+tags:
+ -
+---
+\r\n${fileMatterObj.content}`;
+
fs.writeFileSync(file.filePath, newData); // 写入
log(chalk.blue('tip ') + chalk.green(`write frontmatter(写入frontmatter)：${file.filePath} `))
@@ -32,23 +47,35 @@ function setFrontmatter(sourceDir) {
const matterData = fileMatterObj.data;
let mark = false;
- // 已有FrontMatter，但是没有title、date、permalink数据的
- if (!matterData.hasOwnProperty('title')) {
+ // 已有FrontMatter，但是没有title、date、permalink、categories、tags数据的
+ if (!matterData.hasOwnProperty('title')) { // 标题
matterData.title = file.name;
mark = true;
}
- if (!matterData.hasOwnProperty('date')) {
+ if (!matterData.hasOwnProperty('date')) { // 日期
const stat = fs.statSync(file.filePath);
matterData.date = dateFormat(stat.birthtime);
mark = true;
}
- if (!matterData.hasOwnProperty('permalink')) {
- matterData.permalink = file.permalink;
+ if (!matterData.hasOwnProperty('permalink')) { // 永久链接
+ matterData.permalink = getPermalink();
mark = true;
}
+ if ( !matterData.hasOwnProperty('pageComponent') && matterData.article !== false ) { // 是文章页才添加分类和标签
+ if (!matterData.hasOwnProperty('categories')) { // 分类
+ matterData.categories = getCategories(file)
+ mark = true;
+ }
+
+ if (!matterData.hasOwnProperty('tags')) { // 标签
+ matterData.tags = [''];
+ mark = true;
+ }
+ }
+
if (mark) {
if(matterData.date && type(matterData.date) === 'date') {
matterData.date = repairDate(matterData.date) // 修复时间格式
@@ -58,23 +85,29 @@ function setFrontmatter(sourceDir) {
log(chalk.blue('tip ') + chalk.green(`write frontmatter(写入frontmatter)：${file.filePath} `))
}
-
- // 更新title和permalink
- // if (arg === '-update' && matterData.title != file.name){ // 当title和文件名不一致时才更新
- // matterData.title = file.name;
- // if (/pages/.test(matterData.permalink)) {
- // matterData.permalink = file.permalink;
- // }
- // // 修复date时区和格式被修改的问题 (并非更新date的值)
- // matterData.date = repairDate(matterData.date);
-
- // const newData2 = jsonToYaml.stringify(JSON.parse(JSON.stringify(matterData))).replace(/\n\s{2}/g,"\n").replace(/"/g,"") + '---\r\n' + fileMatterObj.content;
- // fs.writeFileSync(file.filePath, newData2); // 写入
- // log(chalk.blue('tip ') + chalk.green(`update frontmatter title and permalink(更新frontmatter的标题和永久链接)：${file.filePath} `))
- // }
-
}
})
}
+// 获取分类数据
+function getCategories(file) {
+ let categories = ['博文']
+
+ if (file.filePath.indexOf('_posts') === -1) { // 不在_posts文件夹
+ const filePathArr = file.filePath.split('\\')
+ categories[0] = filePathArr[filePathArr.length -2].split('.').pop() // 获取分类1
+ const c = filePathArr[filePathArr.length -3].split('.').pop() // 获取分类2
+ if (c !== 'docs') {
+ categories[1] = c
+ }
+ }
+ return categories
+}
+
+// 定义永久链接数据
+function getPermalink() {
+ return `${PREFIX + (Math.random() + Math.random()).toString(16).slice(2, 8)}`
+}
+
+
module.exports = setFrontmatter;
diff --git a/theme-vdoing/styles/palette.styl b/theme-vdoing/styles/palette.styl
index 60997ba..40ccfd2 100644
--- a/theme-vdoing/styles/palette.styl
+++ b/theme-vdoing/styles/palette.styl
@@ -49,8 +49,8 @@ $cardLayout = 1200px // 卡片式布局响应节点
--bg: #fff
--textColor: #004050
--textLightenColor: #0085AD
- --sidebarBg: rgba(255,255,255,.85)
- --pageBg: rgba(220,220,220,0.2)
+ --sidebarBg: rgba(255,255,255,.8)
+ --pageBg: rgba(220,220,220,0.3)
--borderColor: rgba(0,0,0,.15)
--codeBgColor: #f6f6f6
--codeColor: #525252
@@ -74,7 +74,7 @@ $cardLayout = 1200px // 卡片式布局响应节点
--textColor: #004050
--textLightenColor: #0085AD
--sidebarBg: #f5f5d5
- --pageBg: rgba(220,220,220,0.1)
+ --pageBg: rgba(220,220,220,0.2)
--borderColor: rgba(0,0,0,.15)
--codeBgColor: #282c34
--codeColor: #fff
diff --git a/theme-vdoing/util/index.js b/theme-vdoing/util/index.js
index fbf6416..a504f2f 100644
--- a/theme-vdoing/util/index.js
+++ b/theme-vdoing/util/index.js
@@ -243,3 +243,18 @@ function resolveItem (item, pages, base, groupDepth = 1) {
}
}
}
+
+
+
+// 日期格式化
+export function dateFormat(date) {
+ if (!(date instanceof Date)) {
+ date = new Date(date)
+ }
+ return `${date.getUTCFullYear()}-${zero(date.getUTCMonth()+1)}-${zero(date.getUTCDate())}`
+}
+
+// 小于10补0
+function zero(d){
+ return d.toString().padStart(2,'0')
+}
\ No newline at end of file
diff --git a/utils/baiduPush.js b/utils/baiduPush.js
index f5a3321..7ed2df0 100644
--- a/utils/baiduPush.js
+++ b/utils/baiduPush.js
@@ -27,7 +27,7 @@ function main() {
const { data } = matter(fs.readFileSync(file.filePath, 'utf8'));
if (data.permalink) {
- const link = `\r\n${DOMAIN}${data.permalink}/`;
+ const link = `\r\n${DOMAIN}${data.permalink}`;
console.log(link)
fs.appendFileSync(urlsRoot, link);
}
diff --git a/utils/config.yml b/utils/config.yml
index 17a123a..33287bb 100644
--- a/utils/config.yml
+++ b/utils/config.yml
@@ -2,8 +2,7 @@
# 需要批量处理的路径，docs文件夹内的文件夹 (数组。路径：docs/arr[0]/arr[1] ... )
path:
- - 03.技术
- - 02.GitHub技巧
+ - 《ES6 教程》笔记
# 要删除的字段 (数组)
delete:
@@ -12,5 +11,4 @@ delete:
# 要添加、修改front matter的数据 （front matter中没有的数据则添加，已有的数据则覆盖）
data:
- # tags:
- # - GitHub技巧
\ No newline at end of file
+ author: 阮一峰
\ No newline at end of file
diff --git a/utils/editFrontmatter.js b/utils/editFrontmatter.js
index 78b4839..8991f32 100644
--- a/utils/editFrontmatter.js
+++ b/utils/editFrontmatter.js
@@ -23,7 +23,7 @@ async function main() {
const promptList = [{
type: "confirm",
- message: "批量操作frontmatter有修改数据的风险，确定要继续吗？",
+ message: chalk.yellow('批量操作frontmatter有修改数据的风险，确定要继续吗？'),
name: "edit",
}];
let edit = true;
@@ -80,6 +80,6 @@ async function main() {
}
const newData = jsonToYaml.stringify(matterData).replace(/\n\s{2}/g,"\n").replace(/"/g,"") + '---\r\n' + fileMatterObj.content;
fs.writeFileSync(file.filePath, newData); // 写入
- log(`update frontmatter：${file.filePath} `)
+ log(chalk.green(`update frontmatter：${file.filePath} `))
})
}
diff --git a/utils/modules/readFileList.js b/utils/modules/readFileList.js
index 95bd459..4a93193 100644
--- a/utils/modules/readFileList.js
+++ b/utils/modules/readFileList.js
@@ -3,15 +3,10 @@
*/
const fs = require('fs'); // 文件模块
const path = require('path'); // 路径模块
-const MD5 = require('md5.js');
const docsRoot = path.join(__dirname, '..', '..', 'docs'); // docs文件路径
-const PREFIX = '/pages/'; // 链接前缀
-
function readFileList(dir = docsRoot, filesList = []) {
-
const files = fs.readdirSync(dir);
-
files.forEach( (item, index) => {
let filePath = path.join(dir, item);
const stat = fs.statSync(filePath);
@@ -25,8 +20,7 @@ function readFileList(dir = docsRoot, filesList = []) {
filesList.push({
order,
name,
- filePath,
- permalink: PREFIX + new MD5().update(name).digest('hex').substring(0,16) // 永久链接
+ filePath
});
}
}
-
-
-
-
-
-
-
-
diff --git a/theme-vdoing/components/Home未改.vue b/theme-vdoing/components/Home未改.vue
new file mode 100644
index 0000000..a29df60
--- /dev/null
+++ b/theme-vdoing/components/Home未改.vue
@@ -0,0 +1,473 @@
+
+
+
-
-
-
-
-
- ![]()
-
-
-
-
-
-
- {{ homeData.heroText || $title || 'Hello' }}
-{{ homeData.tagline || $description || 'Welcome to your VuePress site' }}
-
-
-
-
-
-
- ![]()
-
-
- {{ feature.title }}
-{{ feature.details }}
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
- {{ feature.title }}
-{{ feature.details }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/theme-vdoing/components/Page.vue b/theme-vdoing/components/Page.vue
index 7280142..53e545a 100644
--- a/theme-vdoing/components/Page.vue
+++ b/theme-vdoing/components/Page.vue
@@ -50,6 +50,7 @@ export default {
props: ['sidebarItems'],
components: { PageEdit, PageNav, ArticleInfo, Catalogue, UpdateArticle, Timeline, Footer, RightMenu},
created() {
+ console.log(this.$themeConfig)
this.updateBarConfig = this.$themeConfig.updateBar
},
computed: {
diff --git a/theme-vdoing/components/Timeline.vue b/theme-vdoing/components/Timeline.vue
index 6da8d25..90ff257 100644
--- a/theme-vdoing/components/Timeline.vue
+++ b/theme-vdoing/components/Timeline.vue
@@ -110,6 +110,7 @@ export default {
diff --git a/theme-vdoing/node_utils/getSidebarData.js b/theme-vdoing/node_utils/getSidebarData.js
index 88310cb..d671e3c 100644
--- a/theme-vdoing/node_utils/getSidebarData.js
+++ b/theme-vdoing/node_utils/getSidebarData.js
@@ -3,6 +3,7 @@ const path = require('path'); // 路径模块
const chalk = require('chalk') // 命令行打印美化
const matter = require('gray-matter'); // front matter解析器
const log = console.log
+
let catalogueData = {}; // 目录页数据
/**
@@ -13,15 +14,23 @@ let catalogueData = {}; // 目录页数据
function createSidebarData(sourceDir, collapsable){
const sidebarData = {};
const tocs = readTocs(sourceDir);
-
tocs.forEach(toc => { // toc是每个目录的绝对路径
- const sidebarObj = mapTocToSidebar(toc, collapsable);
- if (!sidebarObj.sidebar.length) {
- log(chalk.yellow(`warning: 该目录 "${toc}" 内部没有任何可用文件，将忽略生成对应侧边栏`))
- return;
+
+ const tocArr = toc.split('\\')
+ if (tocArr[tocArr.length -1] === '_posts') { // 碎片化文章
+
+ const sidebarArr = mapTocToPostSidebar(toc);
+ sidebarData[`/${path.basename(toc)}/`] = sidebarArr
+
+ } else {
+ const sidebarObj = mapTocToSidebar(toc, collapsable);
+ if (!sidebarObj.sidebar.length) {
+ log(chalk.yellow(`warning: 该目录 "${toc}" 内部没有任何文件或文件序号出错，将忽略生成对应侧边栏`))
+ return;
+ }
+ sidebarData[`/${path.basename(toc)}/`] = sidebarObj.sidebar
+ sidebarData.catalogue = sidebarObj.catalogueData
}
- sidebarData[`/${path.basename(toc)}/`] = sidebarObj.sidebar
- sidebarData.catalogue = sidebarObj.catalogueData
})
return sidebarData
@@ -47,17 +56,57 @@ function readTocs(root){
}
+/**
+ * 将碎片化文章目录(_posts)映射为对应的侧边栏配置数据
+ * @param {String} root
+ */
+function mapTocToPostSidebar(root){
+ let postSidebar = [] // 碎片化文章数据
+ const files = fs.readdirSync(root); // 读取目录（文件和文件夹）,返回数组
+
+ files.forEach(filename => {
+ const file = path.resolve(root, filename); // 方法：将路径或路径片段的序列解析为绝对路径
+ const stat = fs.statSync(file); // 文件信息
+
+ const fileNameArr = filename.split('.');
+ if (fileNameArr.length > 2) {
+ log(chalk.yellow(`warning: 该文件 "${file}" 在_posts文件夹中，不应有序号，且文件名中间不应有'.'`))
+ return
+ }
+ if(stat.isDirectory()){ // 是文件夹目录
+ log(chalk.yellow(`warning: 该目录 "${file}" 内文件无法生成侧边栏，_posts文件夹里面不能有二级目录。`))
+ return
+ }
+
+ let [title, type] = filename.split('.');
+ if (type !== 'md') {
+ log(chalk.yellow(`warning: 该文件 "${file}" 非.md格式文件，不支持该文件类型`))
+ return;
+ }
+
+ const contentStr = fs.readFileSync(file, 'utf8') // 读取md文件内容，返回字符串
+ const { data } = matter(contentStr) // 解析出front matter数据
+ const permalink = data.permalink || ''
+ postSidebar.push([filename, title, permalink ]); // [<路径>, <文件标题>, <永久链接>]
+ })
+
+ return postSidebar
+}
+
+
/**
* 将目录映射为对应的侧边栏配置数据
* @param {String} root
* @param {Boolean} collapsable
* @param {String} prefix
*/
+
function mapTocToSidebar(root, collapsable, prefix){
prefix = prefix || '';
let sidebar = [];
const files = fs.readdirSync(root); // 读取目录（文件和文件夹）,返回数组
- files.forEach(filename => {
+
+ files.forEach(filename => { // 结构化文章
const file = path.resolve(root, filename); // 方法：将路径或路径片段的序列解析为绝对路径
const stat = fs.statSync(file); // 文件信息
let [order, title, type] = filename.split('.');
diff --git a/theme-vdoing/node_utils/modules/readFileList.js b/theme-vdoing/node_utils/modules/readFileList.js
index 35d1fef..bd44864 100644
--- a/theme-vdoing/node_utils/modules/readFileList.js
+++ b/theme-vdoing/node_utils/modules/readFileList.js
@@ -3,15 +3,11 @@
*/
const fs = require('fs'); // 文件模块
const path = require('path'); // 路径模块
-const MD5 = require('md5.js');
-// const docsRoot = path.join(__dirname, '..', '..', '..', 'docs'); // docs文件路径
-
-const PREFIX = '/pages/'; // 链接前缀
+const chalk = require('chalk') // 命令行打印美化
+const log = console.log
function readFileList(dir, filesList = []) {
-
const files = fs.readdirSync(dir);
-
files.forEach( (item, index) => {
let filePath = path.join(dir, item);
const stat = fs.statSync(filePath);
@@ -19,14 +15,23 @@ function readFileList(dir, filesList = []) {
readFileList(path.join(dir, item), filesList); //递归读取文件
} else {
if(path.basename(dir) !== 'docs'){ // 过滤docs目录级下的文件
- let [order, name, type] = path.basename(filePath).split('.');
- order = parseInt(order, 10);
+
+ const fileNameArr = path.basename(filePath).split('.')
+ let name = null, type = null;
+ if (fileNameArr.length === 2) { // 没有序号的文件
+ name = fileNameArr[0]
+ type = fileNameArr[1]
+ } else if (fileNameArr.length === 3) { // 有序号的文件
+ name = fileNameArr[1]
+ type = fileNameArr[2]
+ } else { // 超过两个‘.’的
+ log(chalk.yellow(`warning: 该文件 "${filePath}" 没有按照约定命名，将忽略生成相应数据。`))
+ return
+ }
if(type === 'md'){ // 过滤非md文件
filesList.push({
- order,
name,
- filePath,
- permalink: PREFIX + new MD5().update(name).digest('hex').substring(0,16) // 永久链接
+ filePath
});
}
}
diff --git a/theme-vdoing/node_utils/setFrontmatter.js b/theme-vdoing/node_utils/setFrontmatter.js
index cf98a5a..8f93411 100644
--- a/theme-vdoing/node_utils/setFrontmatter.js
+++ b/theme-vdoing/node_utils/setFrontmatter.js
@@ -7,6 +7,9 @@ const readFileList = require('./modules/readFileList');
const { type, repairDate, dateFormat} = require('./modules/fn');
const log = console.log
+const PREFIX = '/pages/'
+
+
/**
* 给.md文件设置frontmatter(标题、日期、永久链接)
*/
@@ -16,15 +19,27 @@ function setFrontmatter(sourceDir) {
files.forEach(file => {
let dataStr = fs.readFileSync(file.filePath, 'utf8');// 读取每个md文件内容
- /**
- * fileMatterObj => {content:'剔除frontmatter后的文件内容字符串', data:{
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ {{ data.heroText || $title || 'Hello' }}
+{{ data.tagline || $description || 'Welcome to your VuePress site' }}
+
+
+
+
+
+
+ ![]()
+
+
+ {{ feature.title }}
+{{ feature.details }}
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{ feature.title }}
+{{ feature.details }}
+
+
+
+
+
+
+
+
+
+
+
+