jekyll-zeta 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919077f0e2679d399ca69e89c32b77b4564f1b2f8e81b20b31eb681f5f59d5b0
-  data.tar.gz: 32ccee6ae73513ba00f818f1b3d47b5eb7eec2060eff0ab53e0fc0730075a4ad
+  metadata.gz: 355269c9bb3e0eb724d648b8841875bc45026fa10b6173a17236940fb225e2d0
+  data.tar.gz: 7960a7083bb100e9cb89c4517fa8a26a15f864f8d243a23291b36096034b0a17
 SHA512:
-  metadata.gz: 9b22c45cd8bb3e0611f4db3faab73b7297379bdc575c48838e51a0a587d25bb758c06b42b27b84fbeadd328d0033c2094e9cefacb765b68037c97b2c4997d22a
-  data.tar.gz: f8a182e18e976e2f9b08d00cf954cf8e5fa0a3451f92b876d595911e46fdfab37f562266764f0a6857d359fe18d67a99d3dc25eda4b472204429a3d159510227
+  metadata.gz: faa4c3db616777ece4b3b80097f0ea0bddf5d32d9157bb813d6f0f48ebc82db47f7ca651aa60fa4ee6766dde31ef6d730b37f010f646c5f4fbfe05f6a79750cd
+  data.tar.gz: e17428da2bb51de98dd6547c2cc1ff4b283d1dad835f784412f6dbb687136c102f0dbff78a46874d95dae0099958ad7c670da42758d1300db1184c16465a29cd

data/_includes/heatmap.html

@@ -4,29 +4,6 @@
   {%- assign posts = site.posts -%}
 {%- endif -%}
 
-{%- assign jsstr='' -%}
-{%- for post in posts limit: include.limit -%}
-
-
-
-{%- capture url -%}
-{{ post.url | relative_url }}
-{%- endcapture -%}
-
-{%- capture postdate -%}
-{{ post.date | date: '%Y-%m-%d'  }}
-{%- endcapture -%}
-
-
-{%- capture posttitlex -%}
-{{ post.title | replace: '"'," "}}
-{%- endcapture -%}
-
-
-{%- capture jsstr -%}
-{{ jsstr | append: url  | append:"\x01" | append: posttitlex | append:"\x01" | append: postdate   | append:"\n" }} 
-{%- endcapture -%}
-{%- endfor -%}
 <div>
 <span class="heatmap-title">{{ heatMapTitle | site.theme_config.heatMapTitle }}</span>
 <div class='heatmap' id="heatmap">
@@ -36,7 +13,7 @@
 </div>
 <script >
   (function(){
-    var _GALLPOSTSTR = "{{jsstr}}";
+
     {%- assign MothStr = site.theme_config.heatMapMonth  -%}
     {%- assign HeatMapShowWeek = site.theme_config.heatMapShowWeek  -%}
 
@@ -46,6 +23,8 @@
     var _HeatMapType = "{{ HeatMapType | default:'1' }}"
     var _MonthStr =  '{{ MothnStr | default: "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" }}'
     var _showWeek =  '{{ HeatMapShowWeek | default: "Mon Wed Fri" }}';
+
+    var _allyearurl =  '{{ "assets/dyn/allyear.json" | relative_url }}';
     {% include heatmap.js %}
   })()
 </script>

data/_includes/heatmap.js

@@ -1,68 +1,257 @@
-;(function(){
-
-var Map = {}
-var  arr1 = _GALLPOSTSTR.split("\n")
-arr1.forEach(element => {
-  var post = element.split('\x01')
-
-  var url = post[0]
-  var title = post[1]
-  var date = post[2]
-  if (date && title && url) {
-    var arrDatePost = Map[date]
-  if (!arrDatePost ) {
-    arrDatePost = []
-    Map[date] = arrDatePost;
+;!function(){
+
+function date2ymd(t){
+  let m = t.getMonth() + 1;
+  let d = t.getDate()
+  return `${t.getFullYear()}-${m< 10 ? '0' + m : m }-${d<10 ? '0'+d:d}`
+}
+
+
+const dateEnd = new Date();
+const  endStamp = dateEnd.getTime()
+const dayEleId = Math.random().toString(16).substring(2);
+let arr = _allyearurl.split('/');
+arr.pop();
+const jsonUrlBase = arr.join('/')
+
+
+const ColumnsCount = 53;
+const RowCount = 7;
+const DayCount = (ColumnsCount - 1) * RowCount + dateEnd.getDay() + 1;
+
+!function fillData(){
+  let year = '' + dateEnd.getFullYear()
+  let preYear = '' + (year - 1)
+  fetch(_allyearurl)
+  .then(r => r.json())
+  .then(d=>{
+    let yearCfg = d ;
+    let arr = []
+    if (yearCfg[year]) {
+      arr.push(getYearData(year ))
+    }
+
+    if (yearCfg[preYear]) {
+      arr.push(getYearData(preYear ))
+    }
+    Promise.all(arr).then(alldata=>{
+      let combineData = {};
+      let d1 = alldata[0];
+      let d2 = alldata[1];
+      
+      for (const key in d1) {
+        if (Object.prototype.hasOwnProperty.call(d1, key)) {
+          const element = d1[key];
+          let keyNew = 'K1-' + key;
+          combineData[keyNew] = element
+        }
+      }
+
+      for (const key in d2) {
+        if (Object.prototype.hasOwnProperty.call(d2, key)) {
+          const element = d2[key];
+          let keyNew = 'K2-' + key;
+          combineData[keyNew] = element
+        }
+      }
+
+
+      updateCell(combineData);
+    })
+  })
+
+  function getIndex(ymd){
+    return DayCount - Math.floor((endStamp - new Date(ymd).getTime())/ (24 * 3600000)) -1
   }
-  arrDatePost.push({title,url})
+
+  function idx2Ymd(idx){
+    let t = new Date(endStamp - ( (DayCount - 1) - idx) * 3600000 * 24)
+    let m = t.getMonth() + 1
+    let d = t.getDate()
+    return `${t.getFullYear()}-${m< 10 ? '0' + m : m }-${d<10 ? '0'+d:d}`
   }
-  
-});
- 
 
-var Father = document.getElementById("heatmap");
+  function updateCell(data){
+    if(!data)return
+
+    console.log(data)
+
+    let daysEle = document.getElementById(dayEleId)
+    let dayCells = daysEle.childNodes
+
+    let Map = {}
+
+    for (const key in data) {
+      if (Object.prototype.hasOwnProperty.call(data, key)) {
+        const element = data[key];
+        if(Array.isArray(element)){
+          element.forEach(e=>{
+            if(e.date && e.title && e.url){
+              let arr = Map[e.date]
+              if (!arr) {
+                arr = []
+                Map[e.date] = arr
+              }
+              arr.push(e)
+            }
+          })
+        }
+      }
+    }
 
-const Frag = document.createDocumentFragment();
 
-const monthEle = document.createElement("div");
-monthEle.className = "heatmap-month";
-Frag.appendChild(monthEle);
-const monthStr = _MonthStr.split(" ");
 
-var dateEnd = new Date();
+    let ymdArr = []
 
-{%- comment -%}
-if(_HeatMapType == '1'){
-  dateEnd = new Date()
-}else if(_HeatMapType == '2'){
-  
-  let chooseddate = ''
-  for (const key in Map) {
-    if (Object.prototype.hasOwnProperty.call(Map, key)) {
-      const element = Map[key];
-      if(element){
-        if(key && key > chooseddate){
-          chooseddate = key
+    for (const dateKeyYmd in Map) {
+      if (Object.prototype.hasOwnProperty.call(Map, dateKeyYmd)) {
+        ymdArr.push(dateKeyYmd)
+      } 
+    }
+
+
+    var G_idxOfDay = DayCount - 1;
+
+    function shuffle(array) {
+      let currentIndex = array.length;
+    
+      // While there remain elements to shuffle...
+      while (currentIndex != 0) {
+    
+        // Pick a remaining element...
+        let randomIndex = Math.floor(Math.random() * currentIndex);
+        currentIndex--;
+    
+        // And swap it with the current element.
+        [array[currentIndex], array[randomIndex]] = [
+          array[randomIndex], array[currentIndex]];
+      }
+    }
+
+    const SEQ = new Array(DayCount)
+    let tmp = DayCount
+    while (tmp -- > 0) {
+      SEQ[tmp] = tmp
+    }
+
+    shuffle(SEQ)
+
+    function update1Day(){
+      if (G_idxOfDay < 0) {
+        return
+      }
+      const idxOfDay = SEQ[G_idxOfDay --];
+      
+      let dateKeyYmd = idx2Ymd(idxOfDay )
+
+
+      let  arrPostInOneDay = Map[dateKeyYmd];
+      // debug
+      arrPostInOneDay = arrPostInOneDay 
+
+
+      const dayCell = dayCells[idxOfDay]
+      const nobg = parseInt(dateKeyYmd.substring(5,7))%2  == 1? 'hm-check-no-b' : 'hm-check-no-a';
+      dayCell.classList = `heatmap-day-cell ${!arrPostInOneDay ? nobg :arrPostInOneDay.length > 1 ? 'hm-check2' : 'hm-check' }`  
+
+      
+      if ((arrPostInOneDay && arrPostInOneDay.length > 0 )) {
+
+
+        let isDirectly = arrPostInOneDay.length == 1
+        let tip = document.createElement("div");
+
+        if (isDirectly) {
+          let lnk = document.createElement('a');
+          lnk.href = arrPostInOneDay[0].url
+          dayCell.appendChild(lnk)
         }
+
+        tip.className = "hm-tip";
+        let desc = ''
+        arrPostInOneDay.forEach(element => {
+
+          let lnk = document.createElement('a');
+          lnk.className = 'hm-tiplink'
+          lnk.href = element.url
+          tip.appendChild(lnk)
+
+          let t = document.createElement('span')
+          t.className = 'hm-date'
+          t.innerText = dateKeyYmd.substring(5);
+          lnk.appendChild(t);
+
+          
+          let t2 = document.createElement('span')
+          t2.className = 'hm-title'
+          t2.innerText = element.title
+          lnk.appendChild(t2);
+
+        });
+        dayCell.appendChild(tip);
+        
+      }
+      
+    }
+
+
+    function updateMultiDays(){
+      let day = 13;
+      while (day -- ) {
+        update1Day();
       }
+
+      if (G_idxOfDay >= 0) {
+        requestAnimationFrame(updateMultiDays)
+      }
+
     }
+    requestAnimationFrame(updateMultiDays)
+    
+    return
+ 
+ 
+    
+
+
   }
 
-  dateEnd = new Date(chooseddate)
-  console.log(chooseddate,dateEnd,typeof chooseddate)
+   
+
+  function getYearData(year){
+    return fetch(`${jsonUrlBase}/${year}.json`)
+    .then(r => r.json())
+    .catch(e=>{
+      return null
+    })
+
+  }
+
+
+
+  
+}()
+
 
-}else{
-  dateEnd = new Date()
-}
 
-{% endcomment %}
+;(function initMap(){
 
-var nowM = dateEnd.getMonth();
-var nowWeek = dateEnd.getDay();
-var  endStamp = dateEnd.getTime()
+let Father = document.getElementById("heatmap");
 
-for (var i = 0; i < monthStr.length; i++) {
-  var m = document.createElement("span");
+const Frag = document.createDocumentFragment();
+
+const monthEle = document.createElement("div");
+monthEle.className = "heatmap-month";
+Frag.appendChild(monthEle);
+const monthStr = _MonthStr.split(" ");
+
+
+let nowM = dateEnd.getMonth();
+let nowWeek = dateEnd.getDay();
+
+
+for (let i = 0; i < monthStr.length ; i++) {
+  let m = document.createElement("span");
   m.className = "heatmap-month-cell";
   m.innerHTML = `${monthStr[(i + nowM + 1) % 12]}`;
   monthEle.appendChild(m);
@@ -72,8 +261,8 @@ const weekEle = document.createElement("div");
 weekEle.className = "heatmap-week";
 const WeekStr = _showWeek.split(" ");
 
-for (var i = 0; i < WeekStr.length; i++) {
-  var m = document.createElement("div");
+for (let i = 0; i < WeekStr.length; i++) {
+  let m = document.createElement("div");
   m.className = "heatmap-week-cell";
   m.innerHTML = `<span>${WeekStr[i]}</span>`;
   weekEle.appendChild(m);
@@ -84,11 +273,10 @@ Frag.appendChild(weekEle);
 const dayEle = document.createElement("div");
 
 dayEle.className = "heatmap-day";
+dayEle.id = dayEleId;
 
-const ColumnsCount = 53;
-const RowCount = 7;
 
-var  firstDateDayDiff = (ColumnsCount - 1) * RowCount + nowWeek;
+let  firstDateDayDiff = (ColumnsCount - 1) * RowCount + nowWeek;
 
 
 console.log(nowWeek, firstDateDayDiff);
@@ -98,55 +286,22 @@ for (let c = 0; c < ColumnsCount; c++) {
     if (r > nowWeek && c == ColumnsCount - 1) {
       break
     }
-    const i = c * RowCount + r ;
-    const date = new Date(endStamp - (firstDateDayDiff - i) * 3600000 * 24);
-    const month = date.getMonth() + 1
-    let dateStr = `${date.getFullYear()}-${month < 10 ? '0' + month : month}-${date.getDate() < 10 ? '0' + date.getDate() :  date.getDate() }`
-
-    var m = document.createElement("span");
-    const arrPostInOneDay = Map[dateStr]
-    m.classList = `heatmap-day-cell ${!arrPostInOneDay ? 'hm-check-no':arrPostInOneDay.length > 1 ? 'hm-check2' : 'hm-check' }`  
-    
 
-    if (arrPostInOneDay ) {
-      var isDirectly = arrPostInOneDay.length == 1
-      var tip = document.createElement("div");
+    let m = document.createElement("span");
+    m.classList = `heatmap-day-cell hm-check-nodata`  
+    dayEle.appendChild(m);
+  }
+}
+
 
-      if (isDirectly) {
-        var lnk = document.createElement('a');
-        lnk.href = arrPostInOneDay[0].url
-        m.appendChild(lnk)
-      }
+Frag.appendChild(dayEle);
+Father.append(Frag);
+})()
 
-      tip.className = "hm-tip";
-      var desc = ''
-      arrPostInOneDay.forEach(element => {
 
-        var lnk = document.createElement('a');
-        lnk.className = 'hm-tiplink'
-        lnk.href = element.url
-        tip.appendChild(lnk)
 
-        var t = document.createElement('span')
-        t.className = 'hm-date'
-        t.innerText = dateStr.substring(5);
-        lnk.appendChild(t);
 
-        
-        var t2 = document.createElement('span')
-        t2.className = 'hm-title'
-        t2.innerText = element.title
-        lnk.appendChild(t2);
 
-      });
-      m.appendChild(tip);
-      
-    }
-    dayEle.appendChild(m);
-  }
-}
+}();
 
 
-Frag.appendChild(dayEle);
-Father.append(Frag);
-})()

data/_layouts/heatmap.html

@@ -3,4 +3,59 @@ layout: default
 ---
 <link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url }}" />
 <br/><br/><br/>
-{%- include heatmap.html -%}
+{%- include heatmap.html -%}
+ 
+
+{% comment %}
+generate this page only once。
+{% endcomment %}
+{% assign ALLJSON = "{" %}
+
+{% assign postsByYear = site.posts | group_by_exp: "post", "post.date | date: '%Y' " %}
+
+
+
+{%- for post in postsByYear -%}
+    {%- capture kv %}
+      "{{ post.name }}":1
+      {%- unless forloop.last -%},
+      {%- endunless -%}
+    {%- endcapture -%}
+    {% assign ALLJSON = ALLJSON | append:kv %}
+
+
+    {% assign itemM = post.items | group_by_exp: "post", "post.date | date: '%m' " %}
+
+    {%- capture  SingleYearJson -%}
+    {
+        "year":"{{post.name}}",
+        {%- for item0 in itemM %}
+    "{{item0.name }}":
+             [
+                {%- for item00 in item0.items -%}
+                   {
+                    "title":"{{ item00.title | replace: '"', ' '}}",
+                     "url":"{{ item00.url | relative_url}}",
+                     "date": "{{ item00.date | date:"%Y-%m-%d"}}"
+                   }{%- unless forloop.last -%},{%- endunless -%}
+                 {%- endfor -%}
+             ]   
+             {%- unless forloop.last -%},{%- endunless -%}
+        {%- endfor -%}
+    }
+    {%- endcapture -%}
+
+    {%- capture  FILENAME -%}
+    assets/dyn/{{post.name}}.json
+    {%- endcapture -%}
+
+    {{ SingleYearJson | write_file: FILENAME }}
+{%- endfor -%}
+
+{% assign ALLJSON = ALLJSON | append: " }" %}
+{{ ALLJSON | write_file: "assets/dyn/allyear.json" }}
+
+
+
+ <br>
+ {{ content }}

data/_sass/jekyll-zeta.scss

@@ -9,8 +9,8 @@ $color-lightGrayBg: #F0f2f4;
 $heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR PL SungtiL GB",NSimSun,SimSun,"TW\-Sung","WenQuanYi Bitmap Song","AR PL UMing CN","AR PL UMing HK","AR PL UMing TW","AR PL UMing TW MBE",sans-serif;
 
 $dbgBorder:none;//ssolid 1px red;
-$hmbloksizeW:12px;
-$hmbloksizeH:15.2px;
+$hmbloksizeW:11px;
+$hmbloksizeH:13px;
 $dayGap:1px;
 $hmdaywidth: $dayGap * 52 + $hmbloksizeW * 53;
 $hmmonthWidth:40px;
@@ -360,7 +360,7 @@ img{
   grid-column-end: 3;
 
   display: grid;
-  grid-template-columns:repeat(12,1fr);
+  grid-template-columns: repeat(12,1fr);
 
   width: $hmdaywidth;
   border: $dbgBorder;
@@ -376,7 +376,6 @@ img{
   font-family:  $heatFont;
   font-size: 0.8rem;
 
-  border: $dbgBorder;
   height: 12px;
 
   padding: 0.2em 0;
@@ -393,8 +392,7 @@ img{
   
 
   grid-auto-flow: row;
-
-  height: $hmbloksizeW * 7
+  height: $hmbloksizeH * 7  + $dayGap * 6;
 }
  
 
@@ -433,6 +431,11 @@ img{
   overflow:hidden;
 }
 
+
+.hm-check-nodata{
+  background-color: #93d5dc;
+}
+
 .hm-check{
   background-color: #40c463bb;
   position: relative;
@@ -444,8 +447,13 @@ img{
   position: relative;
 }
 
-.hm-check-no{
-  background-color: #edebf0;
+.hm-check-no-a{
+  background-color: #edebf0;;
+}
+
+
+.hm-check-no-b{
+  background-color: #edebf0aa;
 }
 
 .heatmap-day-cell:hover{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - vitock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 2024-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll