jekyll-zeta 0.9.5.3 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b77877e58bbe892e776930edf846fca7feb836f1d329b98b5658100f1e474f9
-  data.tar.gz: d61959c7dd998e78b66357cc2622c3084be0862b3b8e1e9f693ab7591ace9d10
+  metadata.gz: fa86d3bd66ee76b459472c8ed572fea26c2b2612bc47b09e99bd7714f2beda88
+  data.tar.gz: e4527f7f75eaebff06f1a30f38884f2d6e9a53e6897ec9477defcdcda51de011
 SHA512:
-  metadata.gz: 4033fe8c0d6761c44f1b649c1eee6da07eb58783392a982d2cc221c2ee613f8a81490412ab1755c7ae448ed1f5502f1cc6063295d3064e52f4a66b24f3029f5d
-  data.tar.gz: f19852036c85e7c453d5a0641d8756cf0852d963c1472f308fe8a075acd1988733c5c13f7ab6b7d342782ce7c3972c1d5f9bf7a081aead0427f150fe8b9561e0
+  metadata.gz: fcb887d4f38746a4e6f683a66dd338e525d9b6572702a6afc1c46210a3c5a78b243df25b234975a6ffa0d4c9bc530ba7334b8122d78b7d4084dce7d10c257fed
+  data.tar.gz: 382bf62a7ea5075b3d72b12f3f0745eb3cdeebfdebb8d06331efd6db71789f6b0a0b515b8d493a06d4cd6c7de7a784d9d3b5dcbe485023c358b81602abd84992

data/_config.yml

@@ -51,6 +51,8 @@ theme_config:
         - /tags/ 
     - title: About
       url: /about.html
+    - title: Happy Life
+      url: /happylife.html
 
   # 
   # forbid_cache_password:  true
@@ -81,4 +83,6 @@ enc_tags:
       # 123
       password: AQAQACAAIQCvWkhJdhn0b21Pz381AdTeMLb5bRO4d2F3usQtpIL0fDD0G8cg4klENXxJNX+rAHwD8VW2iJo4hZKDQrjdOjbJFugo60XnMmbdLEfzXpkqGpjjbe875/owWyNnGGPk3Vf4
     - tag: encryp_abcd
-      password: AQAQACAAIQDpWALGGTzrk5vX930Eq/4CzvN0JZjzlBHDSf1of9tXL9OlxpR5EsuIELyQ2bmliMYDzaDZC7SBQC+p103Gtt91K3DEq2v/r2NRv+QYMes1u6mu/AHi5B4aqhNE8f416Bjc
+      password: AQAQACAAIQDpWALGGTzrk5vX930Eq/4CzvN0JZjzlBHDSf1of9tXL9OlxpR5EsuIELyQ2bmliMYDzaDZC7SBQC+p103Gtt91K3DEq2v/r2NRv+QYMes1u6mu/AHi5B4aqhNE8f416Bjc
+    - tag: happy_life
+      password: AQAQACAAIQA4iKfMvVHya5kaVOktOEUetbNm+B/IYr+wOodayIezEQQYZKIkfyO5TPVHHyzBVtUCZEHTY7twL9g40ECLbr/a0IPoiT3hSQF5AV7cJ9Vish55Ng+HXsLxc+tAc9vLpkXV

data/_includes/encrypted.html

@@ -209,8 +209,14 @@ function uint8ArrayToHex(uint8Array) {
     
                     window.dispatchEvent(loadevent)
                     window.dispatchEvent(DOMContentLoaded_event)
+
+                    const DECFUN = window['_after_dec_fun']
+                    
+                    if (DECFUN && typeof DECFUN == 'function') {
+                        DECFUN()
+                    }
     
-                }, 500);
+                }, 100);
             } catch (error) {
                 console.log(error)
                 // alert("wrong password.")
@@ -234,6 +240,11 @@ function uint8ArrayToHex(uint8Array) {
             document.getElementById('decryptContent').innerHTML = ':)'
     
             clearKey()
+
+            const ENCFUN = window['_after_enc_fun']
+            if (ENCFUN && typeof ENCFUN == 'function') {
+                ENCFUN()
+            }
         }
 
      

data/_includes/heatmap.html

@@ -38,6 +38,8 @@
     var _showWeek =  '{{ HeatMapShowWeek | default: "Sun Mon Tue Wed Thu Fri Sat" }}';
     var _allyearurl =  '{{ "assets/dyn/allyear.json" | relative_url }}';
     {% include heatmap.js  %}
+
+    __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_showWeek,_allyearurl)
   }
 </script>
 

data/_includes/heatmap.js

@@ -1,4 +1,4 @@
-;!(function () {
+function __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_showWeek,_allyearurl,dataSourceObj,checkPrefix) {
   
   const WeeKStart = parseInt(WeeKStartStr)
 
@@ -17,8 +17,24 @@
   }
 
   const todayYmd = date2ymd(new Date())
-  const strictMod =  endYear && endYear.length == 4;
-  const maxDateYmd = `${endYear}-12-31`
+  // 指定日期，可以是年2014  或者 年月 2012-12-03
+
+  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();
 
@@ -36,8 +52,14 @@
   let queue  = window._y_queue || []
   window._y_queue = queue;
  
+ 
 
   function getAllYearCfg(){
+     /// 如果直接有数据，那么组装成
+  if (dataSourceObj && dataSourceObj.allYear) {
+    return Promise.resolve(dataSourceObj.allYear)
+  }
+    
     
     
     if (GDATA['_allYear']) {
@@ -132,7 +154,7 @@
           const element = data[key];
           if (Array.isArray(element)) {
             element.forEach((e) => {
-              if (e.date && e.title && e.url) {
+              if (e.date ) {
                 let arr = Map[e.date];
                 if (!arr) {
                   arr = [];
@@ -180,7 +202,6 @@
 
       shuffle(SEQ);
 
-      const minYmd = `${endYear - 1}${maxDateYmd.substring(4)}`
       function update1Day() {
         if (G_idxOfDay < 0) {
           return;
@@ -190,8 +211,8 @@
         let arrPostInOneDay = Map[dateKeyYmd];
 
         let hideblock = false
-        if (strictMod) {
-          hideblock = dateKeyYmd <= minYmd;
+        if (minYmd) {
+          hideblock = dateKeyYmd < minYmd;
         }
 
         let isFuture = dateKeyYmd > todayYmd;
@@ -204,6 +225,7 @@
         }
         else{
           
+          const checkClassPrefix = checkPrefix || 'hm'
           const nobg =
           parseInt(dateKeyYmd.substring(5, 7)) % 2 == 1
             ? "hm-check-no-b"
@@ -211,9 +233,11 @@
         dayCell.classList = `heatmap-day-cell ${
           !arrPostInOneDay
             ? nobg
-            : arrPostInOneDay.length > 1
-            ? "hm-check2"
-            : "hm-check"
+            : arrPostInOneDay.length > 2
+            ?  (checkClassPrefix + "-check3")
+            : arrPostInOneDay.length == 2 ?
+             (checkClassPrefix + "-check2") 
+            : checkClassPrefix + "-check"
         }`;
 
         if (arrPostInOneDay && arrPostInOneDay.length > 0) {
@@ -222,7 +246,8 @@
 
           if (isDirectly) {
             let lnk = document.createElement("a");
-            lnk.href = arrPostInOneDay[0].url;
+
+            lnk.href = arrPostInOneDay[0].url ? arrPostInOneDay[0].url : 'javascript:void(0);';
             dayCell.appendChild(lnk);
           }
 
@@ -231,7 +256,7 @@
           arrPostInOneDay.forEach((element) => {
             let lnk = document.createElement("a");
             lnk.className = "hm-tiplink";
-            lnk.href = element.url;
+            lnk.href = element.url || 'javascript:void(0);'
             tip.appendChild(lnk);
 
             let t = document.createElement("span");
@@ -272,7 +297,7 @@
     function getYearData(year) {
       year = '' + year
 
-    
+      if (dataSourceObj ) {return Promise.resolve(dataSourceObj[year])}
       if(GDATA[year]){
 
         return GDATA[year]
@@ -364,7 +389,7 @@
         }
 
         let m = document.createElement("span");
-        m.classList = `heatmap-day-cell hm-check-nodata`;
+        m.classList = `heatmap-day-cell ${checkPrefix || "hm"}-check-nodata`;
         dayEle.appendChild(m);
       }
     }
@@ -372,4 +397,4 @@
     Frag.appendChild(dayEle);
     Father.append(Frag);
   })();
-})();
+};

data/_layouts/lovemap.html

@@ -0,0 +1,262 @@
+---
+layout: default
+---
+
+{%- assign titlelen = page.title.size -%}
+{%- if titlelen > 0 -%}
+<h2>{{ page.title }}</h2>
+{%- endif -%}
+<time datetime="{{ page.date }}">{{ page.date | date: site.theme_config.post_date_format }}</time> &nbsp; &nbsp; 
+  {%- for tag in page.tags -%}
+  {%- capture tag_name -%}{{ tag }}{%- endcapture -%}
+      <a href="{{ site.baseurl }}/tags/{{ tag_name }}.html" class="tag"><text><nobr>#{{ tag_name }}</nobr></text>&nbsp;</a>
+{%- endfor -%}
+
+<br/>
+
+
+
+<style>
+  .lv-year{
+    margin-top: 2.5rem;
+    font-family: 'Courier New', Courier, monospace;
+  }
+
+  .lv-year-title{
+    font-weight: bold;
+    font-size: 1.8em; 
+    display: inline-block;
+    color: #aaa;
+    
+  }
+  .lv-year-count{
+    font-weight: bold;
+    display: inline-block;
+    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: #aaa;
+  }
+
+  #loveiContainer{
+    margin-bottom: 2em;
+  }
+
+</style>
+
+ 
+
+  <script >
+    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 =  title || endYear 
+      divtitle.appendChild(divYear)
+
+      let divYearC =  document.createElement('div')
+      divYearC.className = 'lv-year-count'
+      divYearC.innerText = count  || ('' + dataObj.allYear[endYear])
+      divtitle.appendChild(divYearC)
+
+
+
+      container.appendChild(divtitle) 
+      let div = document.createElement('div')
+      div.className = 'heatmap'
+      div.id = heatmapid
+
+      container.appendChild(div)
+
+      setTimeout(() => {
+        create_heatmap0( heatmapid,endYear,dataObj)
+      }, 1);
+    }
+    function create_heatmap0(heatmapid,endYear,dataObj){
+   
+    {%- assign MothStr = site.theme_config.heatMapMonth  -%}
+    {%- assign HeatMapShowWeek = site.theme_config.heatMapShowWeek  -%}
+    {%- assign heatMapLoadCount = site.theme_config.heatMapLoadCount | default: 9  -%}
+    
+    const WeeKStartStr = "{{ site.theme_config.heatMapWeekStart | default: 0 }}" ;//  0 sunday 1 monday 2. tuesday ...
+
+    const heatMapLoadCount = {{heatMapLoadCount}};
+    var _MonthStr =  '{{ MothStr | default: "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" }}';
+    var _showWeek =  '{{ HeatMapShowWeek | default: "Sun Mon Tue Wed Thu Fri Sat" }}';
+    var _allyearurl =  '{{ "assets/dyn/allyear.json" | relative_url }}';
+    {% include heatmap.js  %}
+
+
+    __filldata(heatmapid,endYear,WeeKStartStr,heatMapLoadCount,_MonthStr,_showWeek,_allyearurl,dataObj,'lv')
+    }
+
+
+
+  </script>
+   
+  
+
+  
+  
+   <article>
+
+
+ {%- assign encid = "" | get_encrypt_id:page  -%}
+  {%- if  encid == '' -%}
+  <div id="loveiContainer">
+ 
+    <!-- <div class='heatmap' id="loveid"> -->
+      
+  </div>
+     
+  {{ content }}
+  {%- else -%}
+  {%-include encrypted.html-%}
+  {%- endif -%}
+
+  </article>
+
+
+  
+ <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 = ''
+  }
+})();
+  
+  </script>

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: 640px;
+  max-width: 680px;
 }
 
 .heatmap-title{
@@ -100,17 +100,53 @@ $heatFont:Georgia,"Nimbus Roman No9 L","Songti SC",STSong,"AR PL New Sung","AR P
   background-color: #93d5dc;
 }
 
-.hm-check{
-  background-color: #40c463bb;
+.lv-check-nodata{
+  background-color: #add5a2;
+}
+
+
+.hm-checkBase{
   position: relative;
+  background-color: #40c46377;
   cursor: pointer;
 }
+.hm-check{
+  
+  @extend .hm-checkBase;
+  background-color: #40c46377;
+  
+}
 
 .hm-check2{
+  @extend .hm-checkBase;
+  background-color: #40c463bb;
+
+}
+
+.hm-check3{
+  @extend .hm-checkBase;
   background-color: #40c463ff;
-  position: relative;
 }
 
+.lv-check{
+  
+  @extend .hm-checkBase;
+  background-color: #ef347399;
+  
+}
+
+.lv-check2{
+  @extend .hm-checkBase;
+  background-color: #ef3473cc;
+
+}
+
+.lv-check3{
+  @extend .hm-checkBase;
+  background-color: #ef3473;
+}
+
+
 .hm-check-no-a{
   background-color: #edebf0;;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zeta
 version: !ruby/object:Gem::Version
-  version: 0.9.5.3
+  version: 0.9.8
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -83,6 +83,7 @@ files:
 - _layouts/default.html
 - _layouts/heatmap.html
 - _layouts/home.html
+- _layouts/lovemap.html
 - _layouts/page.html
 - _layouts/paginate.html
 - _layouts/post.html