🎨 b3log#151 for Next

wuzhidexiaolang · Nov 1, 2018 · 102daed · 102daed
1 parent 29feb1f
commit 102daed
Show file tree

Hide file tree

Showing 18 changed files with 29,322 additions and 14 deletions.
diff --git a/theme/comment/comments.html b/theme/comment/comments.html
@@ -1,4 +1,5 @@
 {{define "comment/comments"}}
+<div id="pipeCommentsWrap">
 {{if gt (len .Comments) 0}}
 <div id="pipeComments" class="fn-clear"
      data-title="{{.I18n.Comment}}{{.I18n.Colon}}{{.Article.Title}}"
@@ -46,4 +47,5 @@
     {{.I18n.StayStep}}
 </div>
 {{end}}
+</div>
 {{end}}
diff --git a/theme/js/article.js b/theme/js/article.js
@@ -148,13 +148,13 @@ export const InitComment = () => {
   })
 
   // bottom reply
-  $('#pipeComments').on('click', '#pipeCommentBottomComment', function () {
+  $('#pipeCommentsWrap').on('click', '#pipeCommentBottomComment', function () {
     const $bottomComment = $(this)
     ShowEditor($bottomComment.data('text'), $bottomComment.data('id'))
   })
 
   // comment show reply
-  $('#pipeComments').on('click', '.fn-pointer', function () {
+  $('#pipeCommentsWrap').on('click', '#pipeComments .fn-pointer', function () {
     const $it = $(this)
     if ($it.hasClass('disabled')) {
       return
@@ -223,8 +223,8 @@ export const InitComment = () => {
   })
 
   // comment remove
-  $('#pipeComments').
-    on('click', '.pipe-comment__btn--danger', function () {
+  $('#pipeCommentsWrap').
+    on('click', '#pipeComments .pipe-comment__btn--danger', function () {
       const $it = $(this)
       if (confirm($it.data('label'))) {
         $.ajax({
@@ -255,8 +255,8 @@ ${$it.data('label2')}`).click(function () {
     })
 
   // comment reply
-  $('#pipeComments').
-    on('click', '.pipe-comment__btn--reply', function () {
+  $('#pipeCommentsWrap').
+    on('click', '#pipeComments .pipe-comment__btn--reply', function () {
       const $it = $(this)
       ShowEditor($it.data('title'), $it.data('id'), $it.data('commentid'))
     })

diff --git a/theme/x/Medium/js/common.js b/theme/x/Medium/js/common.js
@@ -2,7 +2,7 @@
  * @fileoverview util and every page should be used.
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 0.3.0.0, Dec 1, 2018
+ * @version 0.3.0.0, Nov 1, 2018
  */
 
 import $ from 'jquery'

diff --git a/theme/x/Next/archive-articles.html b/theme/x/Next/archive-articles.html
@@ -8,6 +8,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper">
         <h2 class="page__articles">
         {{.Archive.Title}}
@@ -16,11 +18,15 @@ <h2 class="page__articles">
         {{template "Next/article-list" .}}
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
 <script>
   increase({{.Archive.ArticleCount}}, 1000, 'archiveArticleCount', 0)
 </script>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
 </body>
 </html>
 {{end}}
diff --git a/theme/x/Next/archives.html b/theme/x/Next/archives.html
@@ -8,6 +8,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper page">
         <h2 class="page__title">
             <span id="archiveMonthCount">0</span> <span class="ft-fade ft-13">{{.I18n.Month2}}</span>
@@ -21,12 +23,16 @@ <h2 class="page__title">
         {{end}}
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
 <script>
   increase({{len .Archives}}, 1000, 'archiveMonthCount', 0)
   increase({{.Statistic.StatisticArticleCount}}, 1000, 'archiveArticleCount', 0)
 </script>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
 </body>
 </html>
 {{end}}
diff --git a/theme/x/Next/article.html b/theme/x/Next/article.html
@@ -9,6 +9,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper">
         <article class="article__item">
             <header class="article__header article__header--center">
@@ -151,6 +153,8 @@ <h2>
     {{end}}
     {{template "comment/editor" .}}
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
 </body>

diff --git a/theme/x/Next/author-articles.html b/theme/x/Next/author-articles.html
@@ -8,6 +8,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper">
         <h2 class="page__articles">
             {{.Author.Name}}
@@ -16,11 +18,15 @@ <h2 class="page__articles">
         {{template "Next/article-list" .}}
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
 <script>
   increase({{.Author.ArticleCount}}, 1000, 'authorCount', 0)
 </script>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
 </body>
 </html>
 {{end}}
diff --git a/theme/x/Next/authors.html b/theme/x/Next/authors.html
@@ -8,6 +8,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper">
         <h2 class="page__articles">
             <span id="authorCount">0</span> <span class="ft-fade ft-13">{{.I18n.TeamMember2}}</span>
@@ -25,11 +27,15 @@ <h3 class="author__name">{{.Name}}</h3>
         </div>
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
 <script>
   increase({{len .Authors}}, 1000, 'authorCount', 0)
 </script>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
 </body>
 </html>
 {{end}}
diff --git a/theme/x/Next/categories.html b/theme/x/Next/categories.html
@@ -7,6 +7,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper page">
         <h2 class="page__title">
             <span id="categoriesCount">0</span> <span class="ft-fade ft-13">{{.I18n.Categories2}}</span>
@@ -32,11 +34,15 @@ <h3>
         {{end}}
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
 <script>
   increase({{len .Categories}}, 1000, 'categoriesCount', 0)
 </script>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
 </body>
 </html>
 {{end}}
diff --git a/theme/x/Next/category-articles.html b/theme/x/Next/category-articles.html
@@ -8,6 +8,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper">
         <h2 class="page__articles">
             {{.Category.Title}}
@@ -16,11 +18,15 @@ <h2 class="page__articles">
         {{template "Next/article-list" .}}
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
 <script>
   increase({{.Category.ArticleCount}}, 1000, 'categoryArticleCount', 0)
 </script>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
 </body>
 </html>
 {{end}}
diff --git a/theme/x/Next/css/common.css b/theme/x/Next/css/common.css
diff --git a/theme/x/Next/css/common.scss b/theme/x/Next/css/common.scss
@@ -408,7 +408,7 @@ a:hover {
 .header {
   background: #f5f5f5;
   margin-bottom: 80px;
-  padding: 40px 0;
+  padding: 40px 0 20px;
 
   &__logo {
     position: relative;
@@ -417,6 +417,7 @@ a:hover {
     border-bottom-width: 0;
     color: #222;
     float: left;
+    margin-bottom: 20px;
 
     div {
       opacity: 0;
@@ -929,7 +930,7 @@ a:hover {
 
 @media (max-width: 768px) {
   .header {
-    padding: 20px 0;
+    padding: 20px 0 0;
     margin-bottom: 20px;
     nav {
       display: none;

diff --git a/theme/x/Next/index.html b/theme/x/Next/index.html
@@ -8,10 +8,14 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper">
         {{template "Next/article-list" .}}
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
 </body>

diff --git a/theme/x/Next/js/article.min.js b/theme/x/Next/js/article.min.js
diff --git a/theme/x/Next/js/common.js b/theme/x/Next/js/common.js
@@ -2,7 +2,7 @@
  * @fileoverview util and every page should be used.
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 0.2.0.0, Oct 11, 2018
+ * @version 0.3.0.0, Nov 1, 2018
  */
 
 import $ from 'jquery'
@@ -12,6 +12,7 @@ import {
   KillBrowser,
   PreviewImg,
 } from '../../../js/common'
+import config from '../../../../pipe.json'
 
 const Common = {
   /**
@@ -20,7 +21,22 @@ const Common = {
   init: () => {
     PreviewImg()
     KillBrowser()
-    initPjax('Next')
+    initPjax(() => {
+      if ($('#pipeComments').length === 1) {
+        $.ajax({
+          method: 'GET',
+          url: `${config.StaticServer}/theme/x/Next/js/article.min.js`,
+          dataType: 'script',
+          cache: true,
+        })
+      }
+
+      if ($('#pipeComments').length !== 1 || $('#toc').length !== 1) {
+        $('#sideBar').removeClass('sidebar--active')
+        $('.main').css('margin-right', '0')
+        $('.side').removeClass('side--active')
+      }
+    })
     $('#sideBar').click(function () {
       if ($(this).hasClass('sidebar--active')) {
         $(this).removeClass('sidebar--active')

diff --git a/theme/x/Next/js/common.min.js b/theme/x/Next/js/common.min.js
diff --git a/theme/x/Next/tag-articles.html b/theme/x/Next/tag-articles.html
@@ -8,6 +8,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper">
         <h2 class="page__articles">
             {{.Tag.Title}}
@@ -16,11 +18,15 @@ <h2 class="page__articles">
         {{template "Next/article-list" .}}
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
 <script>
   increase({{.Tag.ArticleCount}}, 1000, 'tagArticlesCount', 0)
 </script>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
 </body>
 </html>
 {{end}}
diff --git a/theme/x/Next/tags.html b/theme/x/Next/tags.html
@@ -8,6 +8,8 @@
 <body>
 <div class="main">
     {{template "Next/header" .}}
+    <div id="pjax">
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
     <div class="wrapper">
         <h2 class="page__articles">
             <span id="tagArticleCount">0</span> <span class="ft-fade ft-13">{{.I18n.Tags2}}</span>
@@ -22,12 +24,16 @@ <h2 class="page__articles">
         </div>
     </div>
     {{template "Next/side" .}}
+        {{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
+    </div>
     {{template "Next/footer" .}}
 </div>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} start ---->"}}{{end}}
 <script>
   increase({{len .Tags}}, 1000, 'tagArticleCount', 0)
   addLevelToTag()
 </script>
+{{if .pjax}}{{noescape "<!---- pjax {#pjax} end ---->"}}{{end}}
 </body>
 </html>
 {{end}}