optimization toc,fix bugs, close flysnow-org#13,close flysnow-org#45,c…

…lose flysnow-org#46,close flysnow-org#68

README.md

@@ -41,7 +41,7 @@ Maupassant theme, ported to Hugo.
 
 ```bash
 cd <YOUR Bolg Root Dir>
-git clone https://github.com/rujews/maupassant-hugo themes/maupassant
+git clone https://github.com/flysnow-org/maupassant-hugo themes/maupassant
 ```
 
 ## 配置
@@ -52,40 +52,17 @@ git clone https://github.com/rujews/maupassant-hugo themes/maupassant
 theme = "maupassant"
 ```
 
-#### 基本配置
+#### 快速开始
 
-```toml
-baseURL = "http://www.flysnow.org"
-languageCode = "zh-CN"
-title = "飞雪无情的博客"
-theme = "maupassant"
-
-## 保持分类的原始名字（false会做转小写处理）
-preserveTaxonomyNames = true
-## 是否禁止URL Path转小写
-disablePathToLower = true
+在主题的 [exampleSite](exampleSite/) 示例目录下有`config.toml `文件，把`config.toml `文件复制到你的站点目录下，然后根据自己的需求修改即可
 
-hasCJKLanguage = true
-summaryLength = 140
+**PS: 一定要使用`post`目录，而不是`posts`,一定要记住，所以如果你使用`hugo`命令，你应该`hugo new post/filename.md`这样创建**
 
-[author]
-  name = "飞雪无情"
+**PS: 一定要使用`post`目录，而不是`posts`,一定要记住，所以如果你使用`hugo`命令，你应该`hugo new post/filename.md`这样创建**
 
-[params]
-  author = "飞雪无情"
-  subtitle = "专注于Android、Java、Go语言(golang)、移动互联网、项目管理、软件架构"
-  keywords = "golang,go语言,go语言笔记,飞雪无情,java,android,博客,项目管理,python,软件架构,公众号,小程序"
-  description = "专注于IT互联网，包括但不限于Go语言(golang)、Java、Android、Python、项目管理、抖音分析、软件架构等"
-  busuanzi = true
-  localSearch = true
+**PS: 一定要使用`post`目录，而不是`posts`,一定要记住，所以如果你使用`hugo`命令，你应该`hugo new post/filename.md`这样创建**
 
-[markup]
-  [markup.highlight]
-    lineNos = true
-    style = "github"
-```
 
-基本配置大家都比较熟悉，这是我的博客的配置，仅供参考。
 
 #### 代码高亮
 
@@ -431,7 +408,7 @@ disablePathToLower = true
 + Wordpress：https://github.com/iMuFeng/maupassant/
 + Ghost: https://github.com/LjxPrime/maupassant/
 + Hexo: https://github.com/tufu9441/maupassant-hexo
-+ Hugo: https://github.com/rujews/maupassant-hugo
++ Hugo: https://github.com/flysnow-org/maupassant-hugo
 
 ```
 

README_EN.md

@@ -16,7 +16,7 @@ A simple Hugo template with great performance on different devices, ported from
 
 ```bash
 cd <YOUR Bolg Root Dir>
-git clone https://github.com/rujews/maupassant-hugo themes/maupassant
+git clone https://github.com/flysnow-org/maupassant-hugo themes/maupassant
 ```
 
 ## Configuration
@@ -27,23 +27,9 @@ git clone https://github.com/rujews/maupassant-hugo themes/maupassant
 theme = "maupassant"
 ```
 
-#### Basic Configuration
+#### Quick Start
 
-```toml
-baseURL = "http://www.flysnow.org"
-languageCode = "zh-CN"
-title = "飞雪无情的博客"
-theme = "maupassant"
-
-[author]
-  name = "飞雪无情"
-
-[params]
-  author = "飞雪无情"
-  subtitle = "专注于Android、Java、Go语言(golang)、移动互联网、项目管理、软件架构"
-  keywords = "golang,go语言,go语言笔记,飞雪无情,java,android,博客,项目管理,python,软件架构,公众号,小程序"
-  description = "专注于IT互联网，包括但不限于Go语言(golang)、Java、Android、Python、项目管理、抖音分析、软件架构等"
-```
+See [exampleSite](exampleSite/) folder,  copy the`config.toml` in the root folder of your Hugo site and change it to your needs.
 
 #### Menus
 
@@ -272,4 +258,4 @@ Looking forward to your pull request.
 + Wordpress：https://github.com/iMuFeng/maupassant/
 + Ghost: https://github.com/LjxPrime/maupassant/
 + Hexo: https://github.com/tufu9441/maupassant-hexo
-+ Hugo: https://github.com/rujews/maupassant-hugo
++ Hugo: https://github.com/flysnow-org/maupassant-hugo

archetypes/default.md

@@ -1,2 +1,8 @@
 +++
+title='{{ replace .Name "-" " " | title }}'
+tags=[]
+categories=[]
+date="{{ .Date }}"
+toc=true
+draft=true
 +++

exampleSite/config.toml

@@ -0,0 +1,102 @@
+baseURL = "https://www.flysnow.org"
+languageCode = "zh-CN"
+title = "飞雪无情的博客"
+theme = "maupassant"
+googleAnalytics = ""  # UA-XXXXXXXX-X
+
+## 保持分类的原始名字（false会做转小写处理）
+preserveTaxonomyNames = true
+## 是否禁止URL Path转小写
+disablePathToLower = true
+
+hasCJKLanguage = true
+summaryLength = 140
+
+disqusShortname = "yourdiscussshortname"  ## 是否开启disqus评论，不要和utteranc同时开启
+
+[author]
+  name = "飞雪无情"
+
+[params]
+  author = "飞雪无情"
+  subtitle = "专注于Android、Java、Go语言(golang)、移动互联网、项目管理、软件架构"
+  keywords = "golang,go语言,go语言笔记,飞雪无情,java,android,博客,项目管理,python,软件架构,公众号,小程序"
+  description = "专注于IT互联网，包括但不限于Go语言(golang)、Java、Android、Python、项目管理、抖音分析、软件架构等"
+  busuanzi = true #启用不算子网页统计
+  googleAd = "ca-pub-4031353640611810"  #ca-pub-xxxxxxxxxxxxxx
+  localSearch = true # 启用本地搜索
+
+  # 这里我存放在了主题的static文件夹里，根目录的似乎也可以
+  customCSS = ['douban.css', 'other.css']
+  # if ['custom.css'], load '/static/css/custom.css' file
+  customJS = ['douban.js']
+  # if ['custom.js'], load '/static/js/custom.js' file
+
+  # 全局开关，你也可以在每一篇内容的 front matter 中针对单篇内容关闭或开启某些功能
+  toc = true  # 是否开启目录
+
+## 友情链接，可以多个
+
+[[params.links]]
+  title = "飞雪无情的博客"
+  name = "飞雪无情的博客"
+  url = "https://www.flysnow.org/"
+
+[[params.links]]
+  title = "Android Gradle权威指南"
+  name = "Android Gradle权威指南"
+  url = "http://yuedu.baidu.com/ebook/14a722970740be1e640e9a3e"
+
+## 侧边栏广告位
+[[params.ads]]
+  title = "【2019双12】ALL IN CLoud 低至1折"
+  url = "https://www.aliyun.com/minisite/goods?userCode=jdg9oj97&share_source=copy_link"
+  img = "https://img.alicdn.com/tfs/TB1_rYHo7P2gK0jSZPxXXacQpXa-690-388.jpg"
+[[params.ads]]
+  title = "助力产业智慧升级，云服务器首年88元起，更有千元代金券礼包免费领！"
+  url = "https://cloud.tencent.com/act/cps/redirect?redirect=1048&cps_key=14ff722692ac784fa8c3301c8c28d924&from=console"
+  img = "https://upload-dianshi-1255598498.file.myqcloud.com/345-7c71532bd4935fbdd9a67c1a71e577b1767b805c.200%E7%89%88%E6%9C%ACB.jpg"
+[[params.ads]]
+  title = "【渠道专享低折扣】11月特惠 限时2折"
+  url = "https://www.aliyun.com/acts/limit-buy?userCode=jdg9oj97"
+  img = "https://img.alicdn.com/tfs/TB1hblJl7Y2gK0jSZFgXXc5OFXa-750-400.jpg"
+
+## 配置 utteranc评论,教程参考 https://utteranc.es/
+[params.utteranc]
+  enable = true
+  repo = "flysnow-org/comment"
+  issueTerm = "pathname"
+  theme = "github-light"
+
+## 开启版权声明，协议名字和链接都可以换
+[params.cc]
+    name = "知识共享署名-非商业性使用-禁止演绎 4.0 国际许可协议"
+    link = "https://creativecommons.org/licenses/by-nc-nd/4.0/"
+
+## 配置代码高亮
+[markup]
+  [markup.highlight]
+    lineNos = true
+    style = "github"
+
+## 配置网站菜单
+
+[menu]
+
+  [[menu.main]]
+    identifier = "tools"
+    name = "工具"
+    url = "/tools/"
+    weight = 2
+
+  [[menu.main]]
+    identifier = "archives"
+    name = "归档"
+    url = "/archives/"
+    weight = 3
+
+  [[menu.main]]
+    identifier = "about"
+    name = "关于"
+    url = "/about/"
+    weight = 4

exampleSite/content/about/index.md

@@ -0,0 +1,15 @@
+---
+title: "关于我"
+date: 2015-03-10 00:13:27
+description: 《Go 实战笔记》系列作者，《Golang Gin 实战》系列作者，《Android Gradle权威指南》作者，现负责技术管理
+---
+
+《Go 实战笔记》系列作者，《Golang Gin 实战》系列作者，《Android Gradle权威指南》作者，现负责技术管理。
+
+[Android Gradle权威指南](http://yuedu.baidu.com/ebook/14a722970740be1e640e9a3e)
+
+公众号，扫码关注
+
+![扫码关注](qrcode_for_weixin.jpg)
+
+

exampleSite/content/archives/index.md

@@ -0,0 +1,6 @@
+---
+title: "归档"
+description: Android资深工程师 ，Go和Java打杂师，《Android Gradle权威指南》作者，Android官方技术文档译者
+type: archives
+---
+

exampleSite/content/post/2019-12-13-golang-gin-parameters-in-path.md

@@ -0,0 +1,27 @@
++++
+title="Golang Gin 实战（三）| 路由参数"
+tags=["golang"]
+categories=["Golang"]
+date="2019-12-13T21:00:00+08:00"
+toc=true
++++
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容

exampleSite/content/post/2019-12-15-golang-gin-query-parameters-source-code-analysis.md

@@ -0,0 +1,26 @@
++++
+title="Golang Gin 实战（三）| 路由参数"
+tags=["golang"]
+categories=["Golang"]
+date="2019-12-13T21:00:00+08:00"
++++
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容

exampleSite/content/post/2019-12-18-golang-gin-query-parameters-array-map.md

@@ -0,0 +1,28 @@
++++
+title="Golang Gin 实战（五）| 接收数组和 Map"
+tags=["golang"]
+categories=["Golang"]
+date="2019-12-18T21:55:00+08:00"
+url="/2019/12/18/golang-gin-query-parameters-array-map.html"
+toc=true
++++
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容
+
+## 标题
+
+段落内容

exampleSite/content/search/index.md

@@ -0,0 +1,6 @@
+---
+title: "搜索"
+description: "搜索页面"
+type: "search"
+---
+

layouts/_default/section.html

@@ -0,0 +1,32 @@
+{{ define "content"}}
+{{- $paginator := .Paginate .Data.Pages.ByDate.Reverse 10 }}
+<div class="res-cons">
+    {{ range $index,$data := $paginator.Pages }}
+    {{ if not .Params.hidden }}
+    <article class="post">
+        <header>
+            <h1 class="post-title">
+                <a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title }}</a>
+            </h1>
+        </header>
+        <date class="post-meta meta-date">
+            {{ .Date.Year }}年{{ printf "%d" .Date.Month }}月{{ .Date.Day }}日
+        </date>
+        {{ with .Params.Categories }}
+        <div class="post-meta">
+            <span>|</span>
+            {{ range . }}
+            <span class="meta-category"><a href='{{ "/categories/" | absLangURL }}{{ . | urlize }}'>{{ . }}</a></span>
+            {{ end }}
+        </div>
+        {{ end }}
+        <div class="post-content">
+            {{ .Summary }}……
+        </div>
+        <p class="readmore"><a href="{{ .Permalink }}">阅读全文</a></p>
+    </article>
+    {{ end }}
+    {{ end }}
+    {{ partial "paginator" . }}
+</div>
+{{ end }}

layouts/_default/single.html

@@ -1,5 +1,6 @@
 {{ define "content"}}
 <div class="res-cons">
+    {{ partial "toc" . }}
     <article class="post">
         <header>
             <h1 class="post-title">{{ .Title }}</h1>

layouts/index.html

@@ -1,7 +1,7 @@
 {{ define "content"}}
 <div class="res-cons">
-    {{ range $index,$data := .Paginator.Pages }}
-    {{ if not .Params.hidden }}
+    {{- $paginator := .Paginate (where .Site.RegularPages "Type" "in" (slice "post" "posts")) }}
+    {{ range $index,$data := $paginator.Pages }}
     <article class="post">
         <header>
             <h1 class="post-title">
@@ -25,7 +25,6 @@ <h1 class="post-title">
         <p class="readmore"><a href="{{ .Permalink }}">阅读全文</a></p>
     </article>
     {{ end }}
-    {{ end }}
     {{ partial "paginator" . }}
 </div>
 {{ end }}