jekyll-zeta 0.7.5.1 → 0.9.1

data/_includes/heatmap.js

@@ -1,307 +1,350 @@
-;!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
-  }
+;!(function () {
 
-  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 GDATA = window._G_DATA;
+  if (!GDATA) {
+    GDATA = {}
+    window._G_DATA = GDATA
   }
 
-  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)
-            }
-          })
-        }
-      }
-    }
-
 
+  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}`;
+  }
 
-    let ymdArr = []
+  const dateEnd =
+    endYear && endYear.length == 4 ? new Date(`${endYear}-12-31`) : new Date();
 
-    for (const dateKeyYmd in Map) {
-      if (Object.prototype.hasOwnProperty.call(Map, dateKeyYmd)) {
-        ymdArr.push(dateKeyYmd)
-      } 
-    }
+  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;
 
-    var G_idxOfDay = DayCount - 1;
+  let queue  = window._y_queue || []
+  window._y_queue = queue;
+ 
 
-    function shuffle(array) {
-      let currentIndex = array.length;
+  function getAllYearCfg(){
     
-      // 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]];
-      }
+    if (GDATA['_allYear']) {
+      return GDATA['_allYear'];
     }
 
-    const SEQ = new Array(DayCount)
-    let tmp = DayCount
-    while (tmp -- > 0) {
-      SEQ[tmp] = tmp
+    if (window._isFetchAllYearData == 1) {
+      return new Promise(r=>{
+        queue.push(r);
+      })
     }
 
-    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)
+    
+    window._isFetchAllYearData = 1;
+    return fetch(_allyearurl)
+      .then((r) => r.json())
+      .then(d => { 
+        window._isFetchAllYearData = 0;
+        if (queue.length) {
+          queue.forEach(calback=>{calback(d)});
+          queue.length = 0;
+        }
+        GDATA['_allYear'] = d ;return d ;})
+  }
+  !(function fillData() {
+    let year = "" + dateEnd.getFullYear();
+    let preYear = "" + (year - 1);
+    getAllYearCfg()
+      .then((d) => {
+        let yearCfg = d;
+        let arr = [];
+        if (yearCfg[year]) {
+          arr.push(getYearData(year));
         }
 
-        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);
+        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;
+            }
+          }
 
-          
-          let t2 = document.createElement('span')
-          t2.className = 'hm-title'
-          t2.innerText = element.title
-          lnk.appendChild(t2);
+          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);
         });
-        dayCell.appendChild(tip);
-        
-      }
-      
+      });
+
+    function getIndex(ymd) {
+      return (
+        DayCount -
+        Math.floor((endStamp - new Date(ymd).getTime()) / (24 * 3600000)) -
+        1
+      );
     }
 
-
-    function updateMultiDays(){
-      let day = heatMapLoadCount;
-      while (day -- ) {
-        update1Day();
-      }
-
-      if (G_idxOfDay >= 0) {
-        requestAnimationFrame(updateMultiDays)
-      }
-
+    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
+      }`;
     }
-    requestAnimationFrame(updateMultiDays)
-    
-    return
- 
- 
-    
-
 
-  }
+    function updateCell(data) {
+      if (!data) return;
 
-   
 
-  function getYearData(year){
-    return fetch(`${jsonUrlBase}/${year}.json`)
-    .then(r => r.json())
-    .catch(e=>{
-      return null
-    })
+      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);
+              }
+            });
+          }
+        }
+      }
 
+      let ymdArr = [];
 
-  
-}()
+      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;
 
-;(function initMap(){
+        // While there remain elements to shuffle...
+        while (currentIndex != 0) {
+          // Pick a remaining element...
+          let randomIndex = Math.floor(Math.random() * currentIndex);
+          currentIndex--;
 
-let Father = document.getElementById("heatmap");
+          // And swap it with the current element.
+          [array[currentIndex], array[randomIndex]] = [
+            array[randomIndex],
+            array[currentIndex],
+          ];
+        }
+      }
 
-const Frag = document.createDocumentFragment();
+      const SEQ = new Array(DayCount);
+      let tmp = DayCount;
+      while (tmp-- > 0) {
+        SEQ[tmp] = tmp;
+      }
 
-const monthEle = document.createElement("div");
-monthEle.className = "heatmap-month";
-Frag.appendChild(monthEle);
-const monthStr = _MonthStr.split(" ");
+      shuffle(SEQ);
 
+      function update1Day() {
+        if (G_idxOfDay < 0) {
+          return;
+        }
+        const idxOfDay = SEQ[G_idxOfDay--];
+        let dateKeyYmd = idx2Ymd(idxOfDay);
+        let arrPostInOneDay = Map[dateKeyYmd];
+        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);
+        }
+      }
 
-let nowM = dateEnd.getMonth();
-let nowWeek = dateEnd.getDay();
+      function updateMultiDays() {
+        let day = heatMapLoadCount;
+        if (!day || day <= 0) {
+          day = 8;
+        }
+        while (day--) {
+          update1Day();
+        }
 
+        if (G_idxOfDay >= 0) {
+          requestAnimationFrame(updateMultiDays);
+        }
+      }
+      requestAnimationFrame(updateMultiDays);
 
-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);
-}
+      return;
+    }
 
-const weekEle = document.createElement("div");
-weekEle.className = "heatmap-week";
-const WeekStr = _showWeek.split(" ");
+    function getYearData(year) {
+      year = '' + year
 
-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);
-}
+    
+      if(GDATA[year]){
 
-Frag.appendChild(weekEle);
+        return GDATA[year]
+      }
 
-const dayEle = document.createElement("div");
+      let queueFlgKey = '_singleyearFlg' + year
+      let queueArrKey = '_singleyearQueue' + year
+      if (GDATA[queueFlgKey] == 1) {
+        // console.log('put in queue',year,Math.random())
+        let arrQueue = GDATA[queueArrKey]
+        if (!arrQueue) {
+          arrQueue = []
+          GDATA[queueArrKey] = arrQueue;
+        }
+        
+        return  new Promise(r=>{
+          arrQueue.push(r);
+        });
+      }
 
-dayEle.className = "heatmap-day";
-dayEle.id = dayEleId;
 
+      GDATA[queueFlgKey] = 1;
+      // console.log('RealQuery',year,Math.random())
+      return fetch(`${jsonUrlBase}/${year}.json`)
+        .then((r) => r.json())
+        .then(d=>{
+          GDATA[queueFlgKey] = 0 ;GDATA[year] = d; 
+          let queue = GDATA[queueArrKey];
+          // console.log('queryFinish',year)
+          if(queue && queue.length){
+            queue.forEach(cb=>{
+              // console.log('queryFinishQueue',year,queue.length,Math.random());
+              cb(d);})
+            queue.length = 0;
+            GDATA[queueArrKey] = undefined
+          }
+
+          return d})
+        .catch((e) => {
+          return null;
+        });
+    }
+  })();
+  (function initMap() {
+    let Father = document.getElementById(heatmapid);
 
-let  firstDateDayDiff = (ColumnsCount - 1) * RowCount + nowWeek;
+    const Frag = document.createDocumentFragment();
 
+    const monthEle = document.createElement("div");
+    monthEle.className = "heatmap-month";
+    Frag.appendChild(monthEle);
+    const monthStr = _MonthStr.split(" ");
 
-console.log(nowWeek, firstDateDayDiff);
+    let nowM = dateEnd.getMonth();
+    let nowWeek = dateEnd.getDay();
 
-for (let c = 0; c < ColumnsCount; c++) {
-  for (let r = 0; r < RowCount; r++) {
-    if (r > nowWeek && c == ColumnsCount - 1) {
-      break
+    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);
     }
 
-    let m = document.createElement("span");
-    m.classList = `heatmap-day-cell hm-check-nodata`  
-    dayEle.appendChild(m);
-  }
-}
+    const weekEle = document.createElement("div");
+    weekEle.className = "heatmap-week";
+    const WeekStr = _showWeek.split(" ");
 
+    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);
+    }
 
-Frag.appendChild(dayEle);
-Father.append(Frag);
-})()
+    Frag.appendChild(weekEle);
 
+    const dayEle = document.createElement("div");
 
+    dayEle.className = "heatmap-day";
+    dayEle.id = dayEleId;
 
+    let firstDateDayDiff = (ColumnsCount - 1) * RowCount + nowWeek;
 
+    // console.log(nowWeek, firstDateDayDiff);
 
-}();
+    for (let c = 0; c < ColumnsCount; c++) {
+      for (let r = 0; r < RowCount; r++) {
+        if (r > nowWeek && c == ColumnsCount - 1) {
+          break;
+        }
 
+        let m = document.createElement("span");
+        m.classList = `heatmap-day-cell hm-check-nodata`;
+        dayEle.appendChild(m);
+      }
+    }
 
+    Frag.appendChild(dayEle);
+    Father.append(Frag);
+  })();
+})();

data/_includes/home.html

@@ -1,13 +1,12 @@
-
-
- 
-{%- include heatmap.html -%}
- 
-
 {%- assign titlelen = page.title.size -%}
 {%- if titlelen > 0 -%}
 <h2>{{ page.title }}</h2>
 {%- endif -%}
+
+{%- include heatmap.html -%}
+ 
+
+
 {%-assign nextPage = site.paginate_path | replace: ':num', '2' -%}
 
 

data/_includes/navbar_left.html

@@ -0,0 +1,39 @@
+<div class="sidebar">
+<div class="sidecontent">
+{%- capture currentUrl -%}{{ page.url | relative_url}}{%- endcapture %}
+<img src="{{'assets/image/avartar.png' | relative_url }}"  class="avatar"/> 
+
+
+<nav>
+  <ul class="navul">
+    {%-for item in site.theme_config.menu %}
+
+      {%- if item.url -%}
+        {%- capture itemurl -%}{{ item.url | relative_url}}{%- endcapture -%}
+        
+      {%- assign iscurrent= false %}
+      {%- if currentUrl == itemurl -%}
+            {%- assign iscurrent= true %}
+      {%- else -%}
+            {%- for subpath in item.subpath %}
+               {%- if currentUrl contains subpath %}
+                  {%- assign iscurrent= true %}
+                  {%- break %}
+              {%- endif  %}
+            {%- endfor %}
+      {%- endif %}
+      <li class="{% if iscurrent  == true -%}navli curNav{%-else -%}navli{%- endif -%}">
+
+      <a href="{{ itemurl }}" class="nav">{{ item.title }}</a>
+        
+      {%- else -%}
+        {{ item.title }}
+      {%- endif -%}
+      </li>
+    {%-endfor-%}
+  </ul>
+</nav>
+
+
+</div>
+</div>

data/_includes/page_frame_left.html

@@ -0,0 +1,20 @@
+<header>
+    {%- include navbar_left.html -%}
+</header>
+<section class="rightsidecontent">
+<div class="w">
+    
+    {{ content }} 
+
+    {%- assign footnote = site.theme_config.show_footnote  -%}
+    {%- if footnote == true   -%}
+    
+     <footer class="footer">
+      <p> Powered by <a href="https://jekyllrb.com/">Jekyll</a> & <a href="https://github.com/vitock/jekyll-zeta">Jekyll-zeta</a>
+     </p>
+    </footer>
+    {%- endif -%}
+
+ 
+</div>
+</section>