jekyll-zeta 0.9.5.2 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49bf758ab35688bec27fff00453d6bd90785db2083efc8950d478aaf13385054
-  data.tar.gz: 679e357ccd83f807e1a1d52199ccd55c8aa2b91d12e884ed18ddcfc12f717d13
+  metadata.gz: b3276dc1294876327e9a9d24f1cd91d58c8361d78876f56e3710fa2a296cf3ed
+  data.tar.gz: 36e13f87209f0a7466a46129494371645356b4e8d0c95d4dee28998b2462895f
 SHA512:
-  metadata.gz: 946fb0475881ac33465a7e7c6a613451a942946077b06ac49a58d72d0a10406fb954741dd7c6e9b3677bd79c0844f362f25289740007f75a272d8e0f2ac46a16
-  data.tar.gz: c60c6f230f6d6f2983ea2a1c322a78169780dd8dc38a367cda044a51fbf278c2794063795ff55ef64ac8d0460cce4b38e61ea56e68be195fb1708c3cd8ee77a9
+  metadata.gz: 5075c8a40c03e2c8d846153a0b1b30b84e2cc0ca057dacb797ae03d4895c9936495c8039525f2d8dbe7b5686458644381ee39e36c00070e7dab28879a8198ae3
+  data.tar.gz: 10d0b5c46a43ae8a8e2251f8384b537180cf946484ca9bb622864056ba4a90b8fd581276170675556d70409da7e1e29f9b7f3dbdc5902d072da0055e3efcfa7e

data/_config.yml

@@ -51,6 +51,8 @@ theme_config:
         - /tags/ 
     - title: About
       url: /about.html
+    - title: lmap
+      url: /lovemap.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.")
@@ -231,19 +237,18 @@ function uint8ArrayToHex(uint8Array) {
             document.getElementById("encrypted").style.display = 'block'
             // / show decrypted 
             document.getElementById("decrypted").style.display = "none"
+            document.getElementById('decryptContent').innerHTML = ':)'
     
             clearKey()
-        }
 
-        document.getElementById("EncryptBtn").onclick = function(){
-            /// hide input
-            document.getElementById("encrypted").style.display = 'block'
-            // / show decrypted 
-            document.getElementById("decrypted").style.display = "none"
-    
-            clearKey()
+            const ENCFUN = window['_after_enc_fun']
+            if (ENCFUN && typeof ENCFUN == 'function') {
+                ENCFUN()
+            }
         }
 
+     
+
         document.getElementById("ClearBtn1").onclick = function(){
             localStorage.clear();
             document.getElementById('passwordinput').value = ''

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,6 +17,7 @@
   }
 
   const todayYmd = date2ymd(new Date())
+  // 指定日期，可以是年2014  或者 年月 2012-12-03
   const strictMod =  endYear && endYear.length == 4;
   const maxDateYmd = `${endYear}-12-31`
   const dateEnd =
@@ -36,8 +37,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 +139,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 = [];
@@ -204,6 +211,7 @@
         }
         else{
           
+          const checkClassPrefix = checkPrefix || 'hm'
           const nobg =
           parseInt(dateKeyYmd.substring(5, 7)) % 2 == 1
             ? "hm-check-no-b"
@@ -211,9 +219,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 +232,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 +242,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 +283,7 @@
     function getYearData(year) {
       year = '' + year
 
-    
+      if (dataSourceObj ) {return Promise.resolve(dataSourceObj[year])}
       if(GDATA[year]){
 
         return GDATA[year]
@@ -364,7 +375,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 +383,4 @@
     Frag.appendChild(dayEle);
     Father.append(Frag);
   })();
-})();
+};

data/_layouts/lovemap.html

@@ -0,0 +1,244 @@
+---
+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;
+  }
+
+  .lv-year-title{
+    font-weight: bold;
+    font-size: 3.2em; 
+    display: inline-block;
+    color: #eeeeee;
+  }
+  .lv-year-count{
+    font-weight: bold;
+    display: inline-block;
+    font-size: 2.2em;
+    color: #ccc;
+  }
+  .lv-year-count::before{
+    content: "x";
+    margin-left: 1em;
+    margin-right: 0.2em;
+    font-size: 1.5rem;
+    color: #ccc;
+  }
+
+  #loveiContainer{
+    margin-bottom: 2em;
+  }
+
+</style>
+
+ 
+
+  <script >
+    function create_heatmap(heatmapid,endYear,dataObj){
+      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 
+      divtitle.appendChild(divYear)
+
+      let divYearC =  document.createElement('div')
+      divYearC.className = 'lv-year-count'
+      divYearC.innerText = '' + 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) {
+            console.error("Invalid date format: " + str0)
+            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 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)
+          console.log('xxxx',item,str)
+          fillDataObj(data,item)
+        })
+        
+      })
+    }
+
+    let allYearArr = Object.keys(allYear).sort().reverse()
+
+    console.log(allYear)
+    console.log(allYearArr)
+    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: 740px;
 }
 
 .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.2
+  version: 0.9.6
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-04-10 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