Upgrade theme

Author: totoroyyb

.gitignore

@@ -44,3 +44,5 @@ vendor/bundle
 .jekyll-metadata
 *.gem
 _zip
+
+#<removed>

.prettierignore

@@ -0,0 +1,6 @@
+package.json
+*.md
+*.html
+*.scss
+*.css
+_js/lib

.scripts/build-css.js

@@ -11,42 +11,41 @@ const writeFile = promisify(fs.writeFile);
 
 const ENC = 'utf-8';
 
-const INLINE_REGEX = /(.*)\s*\/\/\s*inline\s*$/uigm;
-const DEFER_REGEX = /(.*)\s*\/\/\s*link\s*$/uigm;
-const INLINE_BLOCK_REGEX = /\/\/\s*>*\s*<{3,}\s*inline([\s\S]*?)\/\/\s*>{3,}.*/uigm;
-const DEFER_BLOCK_REGEX = /\/\/\s*>*\s*<{3,}\s*link([\s\S]*?)\/\/\s*>{3,}.*/uigm;
+const INLINE_REGEX = /(.*)\s*\/\/\s*inline\s*$/gimu;
+const DEFER_REGEX = /(.*)\s*\/\/\s*link\s*$/gimu;
+const INLINE_BLOCK_REGEX = /\/\/\s*>*\s*<{3,}\s*inline([\s\S]*?)\/\/\s*>{3,}.*/gimu;
+const DEFER_BLOCK_REGEX = /\/\/\s*>*\s*<{3,}\s*link([\s\S]*?)\/\/\s*>{3,}.*/gimu;
 
 function genHeader(filename) {
-  return `/*
- * THIS FILE IS AUTOGENERATED, DO NOT MODIFY!
- *
- * To change the contents of this file,
- * edit \`${filename}\`
- * and run \`npm run build:css\`.
- *
- * During development you can run \`npm run watch:css\`
- * to continuosly rebuild this file.
- */
-
+  return `// THIS FILE IS AUTOGENERATED, DO NOT MODIFY!
+//
+// To change the contents of this file,
+// edit \`${filename}\`
+// and run \`npm run build:css\`.
+//
+// During development you can run \`npm run watch:css\`
+// to continuosly rebuild this file.
+//
 `;
 }
 
 // <https://stackoverflow.com/a/45130990/870615>
 async function getFiles(dir) {
   const subdirs = await readdir(dir);
-  const files = await Promise.all(subdirs.map(async (subdir) => {
-    const res = resolve(dir, subdir);
-    return (await stat(res)).isDirectory() ? getFiles(res) : res;
-  }));
+  const files = await Promise.all(
+    subdirs.map(async subdir => {
+      const res = resolve(dir, subdir);
+      return (await stat(res)).isDirectory() ? getFiles(res) : res;
+    }),
+  );
   return files.reduce((a, f) => a.concat(f), []);
 }
 
 (async function main() {
   try {
     const files = process.argv.length > 2 ? [process.argv[2]] : await getFiles('_sass');
-    await Promise.all(files
-      .filter(f => f.endsWith('.pre.scss'))
-      .map(async (file) => {
+    await Promise.all(
+      files.filter(f => f.endsWith('.pre.scss')).map(async file => {
         const content = await readFile(file, ENC);
         const name = basename(file, '.pre.scss');
         const filename = format({ name, ext: '.scss' });
@@ -71,10 +70,11 @@ async function getFiles(dir) {
           writeFile(resolve(dir, '__inline', filename), header + inline, ENC),
           writeFile(resolve(dir, '__link', filename), header + defer, ENC),
         ]);
-      }));
+      }),
+    );
     process.exit(0);
   } catch (e) {
     console.error(e); // eslint-disable-line
     process.exit(1);
   }
-}());
+})();

Gemfile

@@ -16,20 +16,17 @@ gem "jekyll"
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  # gem "jekyll-avatar"
-  # gem "jekyll-default-layout"
+  gem "jekyll-default-layout"
   gem "jekyll-feed"
-  # gem "jekyll-gist"
-  # gem "jekyll-optional-front-matter"
+  gem "jekyll-optional-front-matter"
   gem "jekyll-paginate"
-  # gem "jekyll-readme-index"
-  # gem "jekyll-redirect-from"
+  gem "jekyll-readme-index"
+  gem "jekyll-redirect-from"
   gem "jekyll-relative-links"
-  # gem "jekyll-remote-theme"
   gem "jekyll-seo-tag"
   gem "jekyll-sitemap"
-  gem 'jemoji'
-  # gem "jekyll-titles-from-headings"
+  gem "jekyll-titles-from-headings"
+  gem "jemoji"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -8,13 +8,13 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.5)
-    ffi (1.9.23)
+    eventmachine (1.2.7)
+    ffi (1.9.25)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.3)
+    jekyll (3.8.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -27,20 +27,30 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.9.3)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.10.0)
       jekyll (~> 3.3)
+    jekyll-optional-front-matter (0.3.0)
+      jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
+    jekyll-readme-index (0.2.0)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.14.0)
+      jekyll (~> 3.3)
     jekyll-relative-links (0.5.3)
       jekyll (~> 3.3)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.4.0)
+    jekyll-seo-tag (2.5.0)
       jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.5.1)
+      jekyll (~> 3.3)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
-    kramdown (1.16.2)
+    kramdown (1.17.0)
     liquid (4.0.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -67,11 +77,16 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll
+  jekyll-default-layout
   jekyll-feed
+  jekyll-optional-front-matter
   jekyll-paginate
+  jekyll-readme-index
+  jekyll-redirect-from
   jekyll-relative-links
   jekyll-seo-tag
   jekyll-sitemap
+  jekyll-titles-from-headings
   tzinfo-data
 
 BUNDLED WITH

_config.yml

@@ -19,7 +19,7 @@ baseurl:               /UWP-Develop-Tutorial
 
 # Language of your content in 2-letter code, e.g.: en, de.
 # You may also provide a location, e.g.: en-us, de_AT.
-lang:                  zh-cn
+lang:                  cn
 
 # The title of your blog. Used in the sidebar and the browser tab.
 title:                 UWP 平台开发系列教程
@@ -59,7 +59,7 @@ copyright:             © TotoroQ 2018. All rights reserved.
 #     href:              /cookies-policy/
 
 # Format of the permalinks
-permalink:             pretty
+permalink:             /:categories/:year-:month-:day-:title/
 
 # Pagination configuration (used by the `blog` layout)
 paginate:              5
@@ -71,18 +71,52 @@ paginate_path:         /page-:num/
 
 # Sidebar image and theme color of the site.
 accent_image:          /assets/img/sidebar-bg.jpg
-accent_color:          '#4fb1ba'
+accent_color:          rgb(79,177,186)
+
+# This is used for the `theme-color` meta tag,
+# which changes the background color of the browser UI in certain browsers.
+# Defaults to `accent_color`.
+theme_color:           rgb(25,55,71)
 
 # The string encoding which fonts to fetch from Google Fonts.
-# See: <https://qwtel.com/hydejack/docs/configuration/>
-google_fonts:          Roboto+Slab:700|Noto+Sans:400,400i,700,700i
+# See: <https://hydejack.com/docs/configuration/>
+google_fonts:          Roboto+Slab:400|Noto+Sans:400,400i,700,700i
 
 # The text font. Expects a string that is a valid CSS font-family value.
+# To change font-weight, see _sass/variables.scss
 font:                  Noto Sans, Helvetica, Arial, sans-serif
 
 # The font used for headings. Expects a string that is a valid CSS font-family value.
+# To change font-weight, see _sass/variables.scss
 font_heading:          Roboto Slab, Helvetica, Arial, sans-serif
 
+defaults:
+  - scope:
+      path:            hyde
+    values:
+      accent_color:    rgb(38,139,210)
+      accent_image:
+        background:    rgb(32,32,32)
+        overlay:       false
+
+  # `jekyll-seo-tag` will mark collection outputs as `BlogPosting`,
+  # but we want them to be `WebPage`s:
+  - scope:
+      type:            projects
+    values:
+      seo:
+        type:          WebPage
+  - scope:
+      type:            featured_categories
+    values:
+      seo:
+        type:          WebPage
+  - scope:
+      type:            featured_tags
+    values:
+      seo:
+        type:          WebPage
+
 # 3rd Party Integrations
 # ----------------------------------------------------------------------------------------
 
@@ -142,18 +176,25 @@ hydejack:
   # When enabled, no user-related data will be stored until the user gives consent.
   cookies_banner:      false
 
-
+# ⚡️ DANGER ZONE ⚡️
+  # ----------------
+  # This is an _experimental_ feature.
+  # Only use if you know what Service Workers are and how they can impact your site!
+  # Coding skills highly recommended.
+  offline:
+    enabled:           true
+    cache_version:     1
 
 # Collections
 # ========================================================================================
 
 collections:
   featured_categories:
-    permalink:         /category/:name/
+    permalink:         /:name/
     output:            true
 
   featured_tags:
-    permalink:         /tag/:name/
+    permalink:         /tag-:name/
     output:            true
 
   projects:
@@ -171,6 +212,8 @@ exclude:
   - node_modules
   - package.json
   - package-lock.json
+  - webpack.config.js
+  - "*.gemspec"
 include:
   - LICENSE.md
 
@@ -179,20 +222,17 @@ include:
 # ========================================================================================
 
 plugins:
-  # - jekyll-avatar
-  # - jekyll-default-layout
+  - jekyll-default-layout
   - jekyll-feed
-  # - jekyll-gist
-  # - jekyll-optional-front-matter
+  - jekyll-optional-front-matter
   - jekyll-paginate
-  # - jekyll-readme-index
-  # - jekyll-redirect-from
+  - jekyll-readme-index
+  - jekyll-redirect-from
   - jekyll-relative-links
-  # - jekyll-remote-theme
   - jekyll-seo-tag
   - jekyll-sitemap
+  - jekyll-titles-from-headings
   - jemoji
-  # - jekyll-titles-from-headings
 
 # Theme
 # ---------------------------------------------------------------------------------------
@@ -237,6 +277,7 @@ optional_front_matter:
 
 readme_index:
   remove_originals:    true
+  with_frontmatter:    true
 
 relative_links:
   collections:         true
@@ -261,9 +302,4 @@ compress_html:
     envs:              [development]
 
 sass:
-  style:               compressed
-
-# If you are upgrading form v5 (or earlier), uncomment the lines below,
-# so that the location of the feed XML stays the same.
-# feed:
-#   path:                atom.xml
+  style:               compressed

_includes/body/analytics.html

@@ -0,0 +1,36 @@
+{% if site.google_analytics %}
+  <script>
+    window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+
+    /*{% if site.hydejack.cookies_banner %}*/
+      if (navigator.CookiesOK) {
+        ga('create', '{{ site.google_analytics }}', 'auto');
+      } else if (document.cookie.indexOf("hy--cookies-ok=true") > -1) {
+        ga('create', '{{ site.google_analytics }}', {
+          'storage': 'none',
+          'clientId': localStorage ? localStorage.getItem('ga--client-id') : undefined
+        });
+      } else {
+        ga('create', '{{ site.google_analytics }}', {
+          'storage': 'none'
+        });
+        ga('set', 'forceSSL', true);
+        ga('set', 'anonymizeIp', true);
+      }
+    /*{% else %}*/
+      ga('create', '{{ site.google_analytics }}', 'auto');
+    /*{% endif %}*/
+
+    var pushStateEl = document.getElementsByTagName('hy-push-state')[0];
+    var timeoutId;
+    pushStateEl.addEventListener('hy-push-state-load', function() {
+      window.clearTimeout(timeoutId);
+      timeoutId = window.setTimeout(function() {
+        ga('set', 'page', window.location.pathname);
+        ga('send', 'pageview');
+      }, 500);
+    });
+
+    window.loadJSDeferred('https://www.google-analytics.com/analytics.js');
+  </script>
+{% endif %}

_includes/body/comments.html

@@ -0,0 +1,8 @@
+{% assign disqus = site.disqus | default:site.disqus_shortname %}
+{% if disqus and page.comments %}
+<aside class="comments related" role="complementary">
+  <h2 class="hr">{{ site.data.strings.comments | default:"Comments" }}</h2>
+  <div id="disqus_thread"></div>
+  <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
+</aside>
+{% endif %}