jekyll-zeta 0.9.8.1 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28c35ed3eaa0a85fb55d982c6b9c6a1457461747d8f65e4472d39daa6ce4de7e
-  data.tar.gz: dcfb141e16e82c5683ca974a3ae8d78088d2a1223cd68aa0f5aefc5d25efd0fe
+  metadata.gz: 6cd84b8ba748c01cfd4776295116a4bf6593ef12bb1662ad56cbb5b1db95a569
+  data.tar.gz: d57343875f6aa327652889884babf666f76552ea2cb9eb3063b70486d1d584cd
 SHA512:
-  metadata.gz: 86b78e40aaa99a3f51b72ac43af2a6aee789bfe76ab00b7c2899d5f5a4e3bcc4619c05c8f885f5a3d872ea06fc12033bb2c131ed4aa593b57c98c3adbb5d28e5
-  data.tar.gz: 18ec27221c62e491795de4e7d0f4ee30b3811da7c952b0c9b2cec1636bc3ec2552ead6647035b2c8fbe6c2dca018acdde784ce92d3b73dc474ddfb896138864d
+  metadata.gz: 6893d527ca9c609ecc25d55baaccbf7ba58882239328aac78f6f9967b0ebc8819c69956566138a882177af01b9baa9bd395ab1750828a48c30ebbd81ae4db697
+  data.tar.gz: 7ea6209372677d4320c4673f5f51a67923b40fae6da0cd59236f285a30be0ad7f603ce78126169d913de97fa10821fabde14fff9a307ccf13b485e5c620ae34e

data/_includes/getmapdata.js

@@ -0,0 +1,170 @@
+
+(function () {
+  var g_id = 100;
+
+
+  function getConfigFromStr(str,obj){
+    if (str && str.startsWith('#')) {
+      // #color #121212
+      // #title 123
+      let arr = str.split(' ')
+      if(arr.length >= 2){
+        let key = arr[0].substring(1)
+        if(key ){
+          obj[key] = str.substring(key.length + 2).trim()
+          return 1
+        }
+      }
+    }
+    return 0
+  }
+
+  /// 2025-01-01 描述，日期格式yyyy-mm-dd，空格后跟上 描述
+  function getDataFromSignleLine(str0,gData) {
+    let str = str0.trim()
+    if (!str) return null
+
+    if(getConfigFromStr(str,gData)) return null
+
+
+    var arr = str.split(" ")
+    var date0 = arr[0]
+    let date = ''
+    if (date0) {
+      let ymd = date0.split("-")
+      if (ymd.length == 3) {
+        let year = ymd[0]
+        let month = ymd[1]
+        let day = ymd[2]
+
+        let nY = Number(year)
+        let nM = Number(month)
+        let nD = Number(month)
+        if (isNaN(nY) || isNaN(nD) || isNaN(nM) || nY < 1900 || nY > 2100 || nM < 1 || nM > 12 || nD < 1 || nD > 31) {
+          return null
+        }
+        date = year + "-" + month.padStart(2, '0') + "-" + day.padStart(2, '0')
+      }
+    }
+    else {
+      return null
+    }
+
+    if (!date) {
+      return null
+    }
+    var title = ""
+    if (arr.length > 1) {
+      title = arr.slice(1).join(" ")
+    }
+    return { date: date, title: title }
+  }
+
+  function fillDataObj(data, item) {
+    if (!item) return
+    let y = item.date.substring(0, 4);
+    let m = item.date.substring(5, 7);
+    let c = data.allYear[y];
+    data.allYear[y] = c ? c + 1 : 1;
+
+    let yObj = data[y]
+    if (!yObj) {
+      yObj = {}
+      data[y] = yObj;
+    }
+
+    let arr = yObj[m]
+    if (!arr) {
+      arr = []
+      yObj[m] = arr
+    }
+    arr.push(item)
+
+  }
+
+
+  async function wait (t ) {
+    return new Promise(function(r){
+      setTimeout(() => {
+         r()
+      }, t );
+    })
+  }
+  
+  function parseDataAndCeateMap(strData,node) {
+   
+
+    let allYear = {}
+    let dataObj = { allYear: allYear };
+ 
+    let Recent365Count = 0;
+    let nowDate = new Date
+    let Recent365YMD = `${nowDate.getFullYear() - 1}-${(nowDate.getMonth() + 1).toString().padStart(2, '0')}-${nowDate.getDate().toString().padStart(2, '0')}`
+ 
+
+    strData.split("\n").forEach(function (str,idx) {
+      if(idx == 0) return 
+      let item = getDataFromSignleLine(str,dataObj)
+      fillDataObj(dataObj, item)
+      if (item) {
+        if (item.date >= Recent365YMD) {
+          Recent365Count++
+        }
+      }
+    })
+
+    let allYearArr = Object.keys(allYear).sort().reverse()
+    console.log(dataObj)
+
+    if(Recent365Count){
+      create_heatmap('lmpRecent365' + g_id ++, '', dataObj, "Last 1Y", Recent365Count,node)
+    }
+    
+    for (let i = 0; i < allYearArr.length; i++) {
+      let y = allYearArr[i]
+      create_heatmap('lmp' + y + g_id ++ , y, dataObj,undefined,undefined,node)
+    }
+
+  
+
+  };
+
+  async function initData(){
+    let arrCodes = document.querySelectorAll('pre > code')
+    if (!arrCodes || arrCodes.length == 0) return
+
+    if (arrCodes.length > 0) {
+      for (let i  = 0; i  < arrCodes.length; i ++) {
+        const code = arrCodes[i ];
+        var strAll = code.textContent
+        if (!strAll.startsWith("#mapdata")) {
+          return 
+        }
+
+        parseDataAndCeateMap(strAll,code.parentNode.parentNode.parentNode)
+ 
+        
+      }
+   
+    }
+  }
+
+  initData()
+
+  window['_after_dec_fun'] = function () {
+    let con = document.getElementById('loveiContainer')
+    if (!con) {
+      let decryptContent = document.getElementById('decryptContent')
+      if (!decryptContent) return
+      con = document.createElement('div')
+      con.id = 'loveiContainer'
+      decryptContent.insertBefore(con, decryptContent.firstChild)
+
+    }
+
+    initData()
+  }
+  window['_after_enc_fun'] = function () {
+    document.getElementById('loveiContainer').innerHTML = ''
+  }
+})();

data/_includes/heatmap.js

@@ -1,7 +1,9 @@
 function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_showWeek,_allyearurl,dataSourceObj,checkPrefix) {
+  checkPrefix = null
   
   const WeeKStart = parseInt(WeeKStartStr)
 
+  const color = dataSourceObj && dataSourceObj.color; 
 
   var GDATA = window._G_DATA;
   if (!GDATA) {
@@ -33,7 +35,7 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
   const minYmd = `${Number(endYear) - 1}${maxDateYmd.substring(4)}`
   
 
-  console.log('maxDateYmd',maxDateYmd)
+ 
   
   const dateEnd =
     endYear && endYear.length == 4 ? new Date(maxDateYmd) : new Date();
@@ -240,6 +242,12 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
             : checkClassPrefix + "-check"
         }`;
 
+        if (color && arrPostInOneDay && arrPostInOneDay.length) {
+          dayCell.style.backgroundColor = color + (arrPostInOneDay.length > 2 ? "ff" : arrPostInOneDay.length > 1 ? 'cc' : '99')
+        }
+
+        
+
         if (arrPostInOneDay && arrPostInOneDay.length > 0) {
           let isDirectly = arrPostInOneDay.length == 1;
           let tip = document.createElement("div");

data/_layouts/lovemap.html

@@ -54,8 +54,8 @@ layout: default
  
 
   <script >
-    function create_heatmap(heatmapid,endYear,dataObj,title,count){
-      let container =  document.getElementById('loveiContainer')
+    function create_heatmap(heatmapid,endYear,dataObj,title,count,node){
+      let container =  document.createElement('div')
       let divtitle = document.createElement('div')
       divtitle.className = 'lv-year'
 
@@ -66,7 +66,7 @@ layout: default
 
       let divYearC =  document.createElement('div')
       divYearC.className = 'lv-year-count'
-      divYearC.innerText = count  || ('' + dataObj.allYear[endYear])
+      divYearC.innerText = ''  + (count  || (dataObj.allYear[endYear] ||''))
       divtitle.appendChild(divYearC)
 
 
@@ -77,6 +77,7 @@ layout: default
       div.id = heatmapid
 
       container.appendChild(div)
+      node.parentNode.insertBefore(container,node)
 
       setTimeout(() => {
         create_heatmap0( heatmapid,endYear,dataObj)
@@ -129,134 +130,6 @@ layout: default
 
   
  <script> 
- (function(){
-    
-   /// 2025-01-01 描述，日期格式yyyy-mm-dd，空格后跟上 描述
-   function getDataFromSignleLine(str0){
-      let str = str0.trim()
-      if(!str) return null
-      var arr = str.split(" ")
-      var date0 = arr[0]
-      let date = ''
-      if(date0 ){
-        let ymd = date0.split("-")
-        if(ymd.length == 3){
-          let year =  ymd[0]
-          let month = ymd[1]
-          let day =   ymd[2]
-
-          let nY = Number(year)
-          let nM = Number(month)
-          let nD = Number(month)
-          if (isNaN(nY) || isNaN(nD) || isNaN(nM) || nY < 1900 || nY > 2100 || nM < 1 || nM > 12 || nD < 1 || nD > 31) {
-            return null 
-          }
-        date = year + "-" + month.padStart(2, '0') + "-" + day.padStart(2, '0')
-      }
-    }
-      else{
-        return null
-      }
-
-      if (!date) {
-        console.error("Invalid date format: " + str0)
-        return null
-      }
-      var title = ""
-      if(arr.length > 1){
-        title = arr.slice(1).join(" ")
-      }
-      return {date:date,title:title}
-   }
-
-   function fillDataObj(data,item){
-    if(!item) return
-    let y = item.date.substring(0,4);
-    let m = item.date.substring(5,7);
-    let c = data.allYear[y]; 
-    data.allYear[y] = c ? c + 1 : 1;
-    
-    let yObj = data[y]
-    if(!yObj){
-      yObj = {}
-      data[y] = yObj;
-    }
-
-    let arr = yObj[m]
-    if(!arr){
-      arr = []
-      yObj[m] = arr
-    }
-    arr.push(item)
-
-   }
-   function initData(){
-    var endYear = "{{ include.endYear }}"
-    
-    let allYear = {}
-    let data = {allYear:allYear};
-    
-
-
-
-   let Recent365Count = 0;
-   let nowDate = new Date
-   let Recent365YMD =  `${nowDate.getFullYear()-1}-${(nowDate.getMonth() + 1).toString().padStart(2, '0')}-${nowDate.getDate().toString().padStart(2, '0')}`
-
-   console.log(Recent365YMD)
-
-
-    let arrCodes = document.querySelectorAll('pre > code')
-    if(!arrCodes ||  arrCodes.length == 0) return
-    if(arrCodes.length > 0){
-      arrCodes.forEach(function(code){
-        var strAll = code.textContent
-        strAll.split("\n").forEach(function(str){
-          let item = getDataFromSignleLine(str)
-          fillDataObj(data,item)
-          if(item  ){
-            if(item.date >= Recent365YMD){
-              
-              Recent365Count ++
-            }            
-            
-          }
-        })
-        
-      })
-    }
-
-    let allYearArr = Object.keys(allYear).sort().reverse()
-
-    create_heatmap('lmpRecent365'   ,'',data ,"Last 1Y",Recent365Count)
-    for(let i = 0; i < allYearArr.length; i++){
-      let y = allYearArr[i]
-      create_heatmap('lmp' + y ,y,data )
-
-
-    } 
-    
-    
-  };
-
-  initData()
-
-  window['_after_dec_fun'] = function(){
-    let con = document.getElementById('loveiContainer')
-    if(!con){
-      let decryptContent = document.getElementById('decryptContent') 
-      if(!decryptContent) return
-      con = document.createElement('div')
-      con.id = 'loveiContainer'
-      decryptContent.insertBefore(con,decryptContent.firstChild)
-      
-    }
-
-    initData()
-  }
-  window['_after_enc_fun'] = function (){
-    document.getElementById('loveiContainer').innerHTML = ''
-  }
-})();
   
+  {%- include getmapdata.js %}
   </script>

data/_sass/heatmap.scss

@@ -1,7 +1,7 @@
 
 $hmbloksizeH:13px;
 $dayGap:1px;
-$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;
+// $heatFont: 'Courier New', Courier, monospace;; //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;
 
 .heatmap{
   display: grid;
@@ -36,7 +36,7 @@ $heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR P
   align-items: center;
   justify-content: center;
 
-  font-family:  $heatFont;
+  // font-family:  $heatFont;
   font-size: 0.8rem;
 
   height: 12px;
@@ -65,7 +65,7 @@ $heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR P
   justify-content: center;
   padding-right: 0.2em;
   font-size: 0.8rem;
-  font-family:  $heatFont;
+  // font-family:  $heatFont;
   line-height: $hmbloksizeH;
   height: $hmbloksizeH;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.9.8.1
+  version: 0.9.10
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-11 00:00:00.000000000 Z
+date: 2025-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -66,6 +66,7 @@ files:
 - _includes/back_link.html
 - _includes/collecttags.html
 - _includes/encrypted.html
+- _includes/getmapdata.js
 - _includes/goat_counter.html
 - _includes/head.html
 - _includes/heatmap.html