feat: read disqus_shortname from theme config (#93)

Author: stevenjoezhang

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: Deploy preview site
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: [$default-branch]
+    branches: [master]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

_config.yml

@@ -21,9 +21,11 @@ google_analytics:
 rss:
 
 comment_provider: facebook
+# Disqus comment
+disqus_shortname:
 # Facebook comment
 facebook:
-  appid: 123456789012345
+  appid: # <appId>
   comment_count: 5
   comment_width: 840
   comment_colorscheme: light

layout/_partial/after_footer.ejs

@@ -2,9 +2,9 @@
 <%- js('js/jquery.imagesloaded.min.js') %>
 <%- js('js/gallery.js') %>
 
-<% if (config.disqus_shortname){ %>
+<% if (theme.disqus_shortname){ %>
 <script>
-var disqus_shortname = '<%= config.disqus_shortname %>';
+var disqus_shortname = '<%= theme.disqus_shortname %>';
 
 (function(){
   var dsq = document.createElement('script');

layout/_partial/article.ejs

@@ -24,7 +24,7 @@
             <a href="<%- url_for(item.path) %>#more" class="more-link"><%= theme.excerpt_link %></a>
           </div>
         <% } %>
-        <% if (item.comment && config.disqus_shortname){ %>
+        <% if (item.comments && theme.disqus_shortname){ %>
         <div class="alignright">
           <a href="<%- item.permalink %>#disqus_thread" class="comment-link">Comments</a>
         </div>

layout/_partial/comment.ejs

@@ -6,7 +6,7 @@
       if (theme.facebook) { %>
       <%- partial('_partial/facebook_comment', {fbConfig: theme.facebook}) %>
       <% } %>
-  <% } else if(config.disqus_shortname) { %>
+  <% } else if(theme.disqus_shortname) { %>
   <div id="disqus_thread">
     <noscript>Please enable JavaScript to view the <a href="//disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
   </div>