Optimize + sort stuffs out

Kirisoup · Nov 12, 2023 · c078f74 · c078f74
1 parent 5276f4c
commit c078f74
Show file tree

Hide file tree

Showing 33 changed files with 2,659 additions and 1,681 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,4 +6,5 @@ source "https://rubygems.org"
 
 gem "jekyll"
 gem 'jekyll-sitemap'
-gem 'jekyll-seo-tag'
+gem 'jekyll-seo-tag'
+gem 'jekyll-spaceship', group: :jekyll_plugins
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,9 +9,12 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
+    ffi (1.16.2)
     ffi (1.16.2-x64-mingw-ucrt)
     forwardable-extended (2.6.0)
+    gemoji (3.0.1)
     google-protobuf (3.24.3-x64-mingw-ucrt)
+    google-protobuf (3.24.3-x86_64-linux)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -37,6 +40,11 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-spaceship (0.10.2)
+      gemoji (~> 3.0)
+      jekyll (>= 3.6, < 5.0)
+      nokogiri (~> 1.6)
+      rainbow (~> 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (2.4.0)
@@ -48,9 +56,15 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
+    nokogiri (1.15.4-x64-mingw-ucrt)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.0.3)
+    racc (1.7.3)
+    rainbow (3.1.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -59,6 +73,8 @@ GEM
     safe_yaml (1.0.5)
     sass-embedded (1.68.0-x64-mingw-ucrt)
       google-protobuf (~> 3.23)
+    sass-embedded (1.68.0-x86_64-linux-gnu)
+      google-protobuf (~> 3.23)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.4.2)
@@ -72,6 +88,7 @@ DEPENDENCIES
   jekyll
   jekyll-seo-tag
   jekyll-sitemap
+  jekyll-spaceship
 
 BUNDLED WITH
    2.4.20
diff --git a/_config.yml b/_config.yml
@@ -6,6 +6,7 @@ sass:
 plugins:
   - jekyll-sitemap
   - jekyll-seo-tag
+  - jekyll-spaceship
 
 permalink: /:categories/:title
 

diff --git a/_data/nav.yml b/_data/nav.yml
@@ -2,7 +2,7 @@
   link: /home
 - name: 关于
   link: /about
-- name: Markdown 实验室
-  link: /md-lab
+- name: Web 实验室
+  link: /weblab/
 - name: 归档页面
   link: /archive
diff --git a/_includes/ip.js.md b/_includes/ip.js.md
@@ -8,6 +8,6 @@
         };
     }
 </script>
-<script src="http://api.ipify.org?format=jsonp&callback=getIP" async></script>
+<script src="http://api.ipify.org?format=jsonp&callback=getIP" async priority="low"></script>
 {% endcapture %}
 {{ ip | strip_newlines | normalize_whitespace }}
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -1,11 +1,9 @@
-<nav>
-  {% for item in site.data.nav %}
-    <p>
-      {% if page.url == item.link %}<strong class="urHere-i"> >>&nbsp; </strong>{% endif %}
-      <a href="{{ item.link }}" {% if page.url == item.link %}class="urHere"{% endif %}>
-        {{ item.name }} 
-      </a>
-      <!-- {% if page.url == item.link %}<strong class="urHere-i"> <<< </strong>{% endif %} -->
-    </p>
-  {% endfor %}
-</nav>
+{% for item in site.data.nav %}
+  <p>
+    {% if page.url == item.link %}<strong class="urHere-i"> >>&nbsp; </strong>{% endif %}
+    <a href="{{ item.link }}" {% if page.url == item.link %}class="urHere"{% endif %}>
+      {{ item.name }} 
+    </a>
+    <!-- {% if page.url == item.link %}<strong class="urHere-i"> <<< </strong>{% endif %} -->
+  </p>
+{% endfor %}
diff --git a/_includes/weather.js.md b/_includes/weather.js.md
@@ -2,7 +2,7 @@
 <script>
     doneWeather = false;
 
-    fetch('https://api.open-meteo.com/v1/forecast?latitude=36.7&longitude=137.85&current=temperature_2m,relative_humidity_2m,weather_code,wind_speed_10m,wind_direction_10m&daily=weather_code,temperature_2m_max,temperature_2m_min&timezone=Asia%2FTokyo&past_days=1&forecast_days=8')
+    fetch('https://api.open-meteo.com/v1/forecast?latitude=36.7&longitude=137.85&current=temperature_2m,relative_humidity_2m,weather_code,wind_speed_10m,wind_direction_10m&daily=weather_code,temperature_2m_max,temperature_2m_min&timezone=Asia%2FTokyo&past_days=1&forecast_days=8', {priority: 'low'})
     .then(response => response.json())
     .then(jsonWeather => { if (!doneWeather) { doneWeather = true;
 
@@ -76,4 +76,4 @@
     }})
 </script>
 {% endcapture %}
-{{ weather | remove: "<script>" | remove: "</script>"}}
+{{ weather | remove: "<script>" | remove: "</script>" }}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="zh_cn">
+<html lang="en_us">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -13,11 +13,6 @@
     </title>
     <script async src="/assets/js/fallback-dom.js" onerror="this.onerror=null;newScript=document.createElement('script');newScript.src ='https://ghproxy.com/https://raw.githubusercontent.com/Kirisoup/kirisoup.github.io/main/_site/assets/js/fallback-dom.js';document.head.appendChild(newScript);"></script> <!-- store ghproxy prepended link as variable -->
     <link rel="stylesheet" href="/assets/css/default/layout.css" onerror="fall(this)"> <!-- essential stylesheet -->
-    <link rel="stylesheet" href="/assets/css/default/style.css" id="style" onerror="fall(this)" media="print" onload="this.onload=null;this.removeAttribute('media');" > <!-- async stylesheet -->
-    <noscript><link rel="stylesheet" href="/assets/css/default/style.css" id="style-nojs"></noscript> <!-- non-js fallback (no onerror for gfw suckers because, well, noscript) -->
-    <script async src="/assets/js/fallback-cssAsset.js" onerror="fallsc(this)"></script> <!-- load stylesheet asset with ghproxy if needed for gfw suckers -->
-    <script async src="/assets/js/cursor.js"            onerror="fallsc(this)"></script> <!-- cursor trace -->
-    <script> window.addEventListener("load", (event) => { new cursoreffects.ghostCursor(); }); </script> <!-- cursor trace -->
   </head>
   <body>
     <!-- change id only if javascript is enabled -->
@@ -30,12 +25,11 @@
         <div class="banner"></div>
         <div class="main">
           <div class="nav">
-            <div class="nav-c">{% include nav.html %}</div>
-            <div class="nav-b"></div>
+            <nav> {% include nav.html %} </nav>
           </div>
           <div class="window">
             <main class="content">
-              {%- capture opt -%} <img onerror="this.onerror=null; this.src = ghprxy_s + getAttribute('src')" loading="lazy" {% endcapture %}
+              {%- capture opt -%} <img onerror="this.onerror=null; this.src = ghprxy_s + getAttribute('src')" loading="lazy" fetchpriority="low" {% endcapture %}
               {%- capture pageurl -%} <a pageurl="{{page.url}}" {% endcapture %}
               {%- assign content_baked = content
                 | replace: '<img ', opt
@@ -79,7 +73,7 @@
       <div class="content f">
         {{ content_baked
           | replace: 'id="', 'id="f_'
-          | replace: 'a href="#', 'a href="#f_'
+          | replace: 'href="#', 'href="#f_'
         }}
       </div> <!-- really stupid way to fix duplicated id issue -->
       <div class="bottomBar">
@@ -102,9 +96,16 @@
       </div>
       <div class="pc-b"></div>
     </div>
-    <script async src="/assets/js/queryStrings.js" onerror="fallsc(this)"></script>
-    <script async src="/assets/js/link-id-copy.js" onerror="fallsc(this)"></script>
-    <script async src="/assets/js/resize-sync.js"  onerror="fallsc(this)"></script>
-    <script async src="/assets/neko/oneko.js"      onerror="fallsc(this)"></script>
   </body>
+  <footer>
+    <link rel="stylesheet" href="/assets/css/default/style.css" id="style" priority="high" onerror="fall(this)"> <!-- async stylesheet -->
+    <link rel="stylesheet" href="/assets/css/markaround.css" priority="low" onerror="fall(this)"> <!-- async stylesheet -->
+    <script defer src="/assets/js/fallback-cssAsset.js" onerror="fallsc(this)"></script> <!-- load stylesheet asset with ghproxy if needed for gfw suckers -->
+    <script defer src="/assets/js/cursor.js"            onerror="fallsc(this)" priority="low"></script> <!-- cursor trace -->
+    <script> window.addEventListener("load", (event) => { new cursoreffects.ghostCursor(); }); </script> <!-- cursor trace -->
+    <script defer src="/assets/js/queryStrings.js" onerror="fallsc(this)"></script>
+    <script defer src="/assets/js/link-id-copy.js" onerror="fallsc(this)"></script>
+    <script defer src="/assets/js/resize-sync.js"  onerror="fallsc(this)"></script>
+    <script defer src="/assets/neko/oneko.js"      onerror="fallsc(this)" priority="low"></script>
+  </footer>
 </html>
diff --git a/_site/about.html b/_site/about.html
@@ -1,17 +1,13 @@
-<!doctype html>
-<html lang="zh_cn">
+<!DOCTYPE html>
+<html lang="en_us">
   <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>
       霧雨蘑菇店 |/¥About.xml</title>
     <script async src="/assets/js/fallback-dom.js" onerror="this.onerror=null;newScript=document.createElement('script');newScript.src ='https://ghproxy.com/https://raw.githubusercontent.com/Kirisoup/kirisoup.github.io/main/_site/assets/js/fallback-dom.js';document.head.appendChild(newScript);"></script> <!-- store ghproxy prepended link as variable -->
     <link rel="stylesheet" href="/assets/css/default/layout.css" onerror="fall(this)"> <!-- essential stylesheet -->
-    <link rel="stylesheet" href="/assets/css/default/style.css" id="style" onerror="fall(this)" media="print" onload="this.onload=null;this.removeAttribute('media');" > <!-- async stylesheet -->
-    <noscript><link rel="stylesheet" href="/assets/css/default/style.css" id="style-nojs"></noscript> <!-- non-js fallback (no onerror for gfw suckers because, well, noscript) -->
-    <script async src="/assets/js/fallback-cssAsset.js" onerror="fallsc(this)"></script> <!-- load stylesheet asset with ghproxy if needed for gfw suckers -->
-    <script async src="/assets/js/cursor.js"            onerror="fallsc(this)"></script> <!-- cursor trace -->
-    <script> window.addEventListener("load", (event) => { new cursoreffects.ghostCursor(); }); </script> <!-- cursor trace -->
   </head>
   <body>
     <!-- change id only if javascript is enabled -->
@@ -24,43 +20,40 @@
         <div class="banner"></div>
         <div class="main">
           <div class="nav">
-            <div class="nav-c"><nav>
-
-    <p>
-
-      <a href="/home" >
-        主页 
-      </a>
-      <!--  -->
-    </p>
-
-    <p>
-      <strong class="urHere-i"> >>&nbsp; </strong>
-      <a href="/about" class="urHere">
-        关于 
-      </a>
-      <!-- <strong class="urHere-i"> <<< </strong> -->
-    </p>
-
-    <p>
-
-      <a href="/md-lab" >
-        Markdown 实验室 
-      </a>
-      <!--  -->
-    </p>
-
-    <p>
-
-      <a href="/archive" >
-        归档页面 
-      </a>
-      <!--  -->
-    </p>
-
-</nav>
-</div>
-            <div class="nav-b"></div>
+            <nav> 
+  <p>
+
+    <a href="/home">
+      主页 
+    </a>
+    <!--  -->
+  </p>
+
+  <p>
+    <strong class="urHere-i"> &gt;&gt;  </strong>
+    <a href="/about" class="urHere">
+      关于 
+    </a>
+    <!-- <strong class="urHere-i"> <<< </strong> -->
+  </p>
+
+  <p>
+
+    <a href="/weblab/">
+      Web 实验室 
+    </a>
+    <!--  -->
+  </p>
+
+  <p>
+
+    <a href="/archive">
+      归档页面 
+    </a>
+    <!--  -->
+  </p>
+
+ </nav>
           </div>
           <div class="window">
             <main class="content"><h1 id="关于">关于：</h1>
@@ -80,13 +73,7 @@
       <div class="c2">
         <div class="c2-b"></div>
         <div class="chatroom">
-          <script async src="https://giscus.app/client.js" crossorigin="anonymous" data-repo="Kirisoup/kirisoup.github.io" data-repo-id="R_kgDOKbS-PQ" data-category="Announcements" data-category-id="DIC_kwDOKbS-Pc4CaAzL"
-            data-mapping="specific" data-term="chat-room"
-            data-reactions-enabled="0"
-            data-input-position="top"
-            data-theme="https://kirisoup.github.io/assets/css/giscus.css"
-            data-lang="zh-CN"
-            data-loading="lazy">
+          <script async src="https://giscus.app/client.js" crossorigin="anonymous" data-repo="Kirisoup/kirisoup.github.io" data-repo-id="R_kgDOKbS-PQ" data-category="Announcements" data-category-id="DIC_kwDOKbS-Pc4CaAzL" data-mapping="specific" data-term="chat-room" data-reactions-enabled="0" data-input-position="top" data-theme="https://kirisoup.github.io/assets/css/giscus.css" data-lang="zh-CN" data-loading="lazy">
           </script>
         </div>
         <!-- <div class="giscus"></div> -->
@@ -114,21 +101,28 @@ <h1 id="f_关于">关于：</h1>
         </div>
       </div>
     </div>
-    <div class="cornerCara" ID="0" title="" onclick='this.id = Math.floor(Math.random() * 15 + 1)'></div>
+    <div class="cornerCara" id="0" title="" onclick="this.id = Math.floor(Math.random() * 15 + 1)"></div>
     <div class="cornerCara-b"></div>
     <div class="ibm-b">
       <div class="pc"></div>
     </div>
     <div class="ibm">
       <label class="mask power" title="开机?"><input type="checkbox"></label>
       <div class="vid">
-        <iframe loading="lazy" scrolling="no" frameborder="no" sandbox="allow-same-origin allow-scripts" src="https://www.bilibili.com/blackboard/html5mobileplayer.html?aid=625760&autoplay=1&muted=1" ></iframe>
+        <iframe loading="lazy" scrolling="no" frameborder="no" sandbox="allow-same-origin allow-scripts" src="https://www.bilibili.com/blackboard/html5mobileplayer.html?aid=625760&autoplay=1&muted=1"></iframe>
       </div>
       <div class="pc-b"></div>
     </div>
-    <script async src="/assets/js/queryStrings.js" onerror="fallsc(this)"></script>
-    <script async src="/assets/js/link-id-copy.js" onerror="fallsc(this)"></script>
-    <script async src="/assets/js/resize-sync.js"  onerror="fallsc(this)"></script>
-    <script async src="/assets/neko/oneko.js"      onerror="fallsc(this)"></script>
   </body>
+  <footer>
+    <link rel="stylesheet" href="/assets/css/default/style.css" id="style" priority="high" onerror="fall(this)"> <!-- async stylesheet -->
+    <link rel="stylesheet" href="/assets/css/markaround.css" priority="low" onerror="fall(this)"> <!-- async stylesheet -->
+    <script defer src="/assets/js/fallback-cssAsset.js" onerror="fallsc(this)"></script> <!-- load stylesheet asset with ghproxy if needed for gfw suckers -->
+    <script defer src="/assets/js/cursor.js" onerror="fallsc(this)" priority="low"></script> <!-- cursor trace -->
+    <script> window.addEventListener("load", (event) => { new cursoreffects.ghostCursor(); }); </script> <!-- cursor trace -->
+    <script defer src="/assets/js/queryStrings.js" onerror="fallsc(this)"></script>
+    <script defer src="/assets/js/link-id-copy.js" onerror="fallsc(this)"></script>
+    <script defer src="/assets/js/resize-sync.js" onerror="fallsc(this)"></script>
+    <script defer src="/assets/neko/oneko.js" onerror="fallsc(this)" priority="low"></script>
+  </footer>
 </html>