jekyll-zeta 0.9.6 → 0.9.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3276dc1294876327e9a9d24f1cd91d58c8361d78876f56e3710fa2a296cf3ed
-  data.tar.gz: 36e13f87209f0a7466a46129494371645356b4e8d0c95d4dee28998b2462895f
+  metadata.gz: 28c35ed3eaa0a85fb55d982c6b9c6a1457461747d8f65e4472d39daa6ce4de7e
+  data.tar.gz: dcfb141e16e82c5683ca974a3ae8d78088d2a1223cd68aa0f5aefc5d25efd0fe
 SHA512:
-  metadata.gz: 5075c8a40c03e2c8d846153a0b1b30b84e2cc0ca057dacb797ae03d4895c9936495c8039525f2d8dbe7b5686458644381ee39e36c00070e7dab28879a8198ae3
-  data.tar.gz: 10d0b5c46a43ae8a8e2251f8384b537180cf946484ca9bb622864056ba4a90b8fd581276170675556d70409da7e1e29f9b7f3dbdc5902d072da0055e3efcfa7e
+  metadata.gz: 86b78e40aaa99a3f51b72ac43af2a6aee789bfe76ab00b7c2899d5f5a4e3bcc4619c05c8f885f5a3d872ea06fc12033bb2c131ed4aa593b57c98c3adbb5d28e5
+  data.tar.gz: 18ec27221c62e491795de4e7d0f4ee30b3811da7c952b0c9b2cec1636bc3ec2552ead6647035b2c8fbe6c2dca018acdde784ce92d3b73dc474ddfb896138864d

data/_config.yml

@@ -51,8 +51,8 @@ theme_config:
         - /tags/ 
     - title: About
       url: /about.html
-    - title: lmap
-      url: /lovemap.html
+    - title: Happy Life
+      url: /happylife.html
 
   # 
   # forbid_cache_password:  true

data/_includes/heatmap.js

@@ -18,8 +18,23 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
 
   const todayYmd = date2ymd(new Date())
   // 指定日期，可以是年2014  或者 年月 2012-12-03
-  const strictMod =  endYear && endYear.length == 4;
-  const maxDateYmd = `${endYear}-12-31`
+
+  var  maxDateYmd = `${endYear}-12-31`
+  if (endYear &&  endYear.length == 4) {
+     maxDateYmd = `${endYear}-12-31`  
+  }else if(endYear && endYear.length == 10) { /// 
+    maxDateYmd = endYear
+  }else if(!endYear){
+    maxDateYmd = todayYmd
+    
+  }
+  endYear = maxDateYmd.substring(0, 4)
+
+  const minYmd = `${Number(endYear) - 1}${maxDateYmd.substring(4)}`
+  
+
+  console.log('maxDateYmd',maxDateYmd)
+  
   const dateEnd =
     endYear && endYear.length == 4 ? new Date(maxDateYmd) : new Date();
 
@@ -187,7 +202,6 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
 
       shuffle(SEQ);
 
-      const minYmd = `${endYear - 1}${maxDateYmd.substring(4)}`
       function update1Day() {
         if (G_idxOfDay < 0) {
           return;
@@ -197,8 +211,8 @@ function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_s
         let arrPostInOneDay = Map[dateKeyYmd];
 
         let hideblock = false
-        if (strictMod) {
-          hideblock = dateKeyYmd <= minYmd;
+        if (minYmd) {
+          hideblock = dateKeyYmd < minYmd;
         }
 
         let isFuture = dateKeyYmd > todayYmd;

data/_layouts/lovemap.html

@@ -19,26 +19,30 @@ layout: default
 <style>
   .lv-year{
     margin-top: 2.5rem;
+    font-family: 'Courier New', Courier, monospace;
   }
 
   .lv-year-title{
     font-weight: bold;
-    font-size: 3.2em; 
+    font-size: 1.8em; 
     display: inline-block;
-    color: #eeeeee;
+    color: #aaa;
+    
   }
   .lv-year-count{
     font-weight: bold;
     display: inline-block;
-    font-size: 2.2em;
-    color: #ccc;
+    font-size: 1.2em;
+    color: #aaa;
+    
   }
   .lv-year-count::before{
     content: "x";
     margin-left: 1em;
     margin-right: 0.2em;
+    font-weight: 400;
     font-size: 1.5rem;
-    color: #ccc;
+    color: #aaa;
   }
 
   #loveiContainer{
@@ -50,19 +54,19 @@ layout: default
  
 
   <script >
-    function create_heatmap(heatmapid,endYear,dataObj){
+    function create_heatmap(heatmapid,endYear,dataObj,title,count){
       let container =  document.getElementById('loveiContainer')
       let divtitle = document.createElement('div')
       divtitle.className = 'lv-year'
 
       let divYear =  document.createElement('div')
       divYear.className = 'lv-year-title'
-      divYear.innerText = endYear 
+      divYear.innerText =  title || endYear 
       divtitle.appendChild(divYear)
 
       let divYearC =  document.createElement('div')
       divYearC.className = 'lv-year-count'
-      divYearC.innerText = '' + dataObj.allYear[endYear]
+      divYearC.innerText = count  || ('' + dataObj.allYear[endYear])
       divtitle.appendChild(divYearC)
 
 
@@ -145,7 +149,6 @@ layout: default
           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) {
-            console.error("Invalid date format: " + str0)
             return null 
           }
         date = year + "-" + month.padStart(2, '0') + "-" + day.padStart(2, '0')
@@ -193,6 +196,16 @@ layout: default
     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){
@@ -200,8 +213,14 @@ layout: default
         var strAll = code.textContent
         strAll.split("\n").forEach(function(str){
           let item = getDataFromSignleLine(str)
-          console.log('xxxx',item,str)
           fillDataObj(data,item)
+          if(item  ){
+            if(item.date >= Recent365YMD){
+              
+              Recent365Count ++
+            }            
+            
+          }
         })
         
       })
@@ -209,8 +228,7 @@ layout: default
 
     let allYearArr = Object.keys(allYear).sort().reverse()
 
-    console.log(allYear)
-    console.log(allYearArr)
+    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 )

data/_sass/heatmap.scss

@@ -7,7 +7,7 @@ $heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR P
   display: grid;
   grid-template-rows: auto 1fr;
   grid-template-columns: auto 1fr;
-  // max-width: 740px;
+  max-width: 680px;
 }
 
 .heatmap-title{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8.1
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll