no-style-please2 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50265dc5887dbce77e697614df742ab5e5f58edf9db5a2a1cae47b8af40f6b79
-  data.tar.gz: fa1561da1295e1ec5d20127f5838304870e1649eb35498cb2075a28dee39db64
+  metadata.gz: d0c99df39b0e743327415cec4366cbaf21a7c52a5fc2b67040e443ed92fbe8df
+  data.tar.gz: 9ee3f4e378217b7683fecf0fbe640bdf8353ca409f5868659d697ad3c6b6a018
 SHA512:
-  metadata.gz: e9c76ebe93fa850438814503dad66f2d503ca77c29fa49044f11b7f29e7eda503d9008464de6bb40ad5dbf1ca94cc9ea0aae9358d668b2a4ee0c78faac6d2c3a
-  data.tar.gz: fb7c803793081f6ab2ee4824035cf3b0d5b023eea3aef3475f59bcc3fe84939eae6fb9de5187d6fbebaac3782af015a41278d09e52c95a10e361541c35213fe6
+  metadata.gz: ea652495e5857f22c787f91c2166e16642d9db4831b8251243c618e58193adefa17d91cf8d02067757ad560e667320c136c6c32d81ec6065e04a9b8537f51937
+  data.tar.gz: f3fff925aab0aa75bd082bb6dce24a5ac12f6d65f85080a310a3e8359e89ee702aeee2d21b17db145f44332aac8e2366462d1dde66825ca7d24eac3a1e02a8ce

data/_config.yml

@@ -21,7 +21,12 @@ theme_config:
   encrypt_clear_btn: "清空缓存密码"
   decrypt_btn: 解密
   encrypt_btn: 重新加密
-  encrypt_clear_btn: 清空密码缓存
+  tag_showall: true
+  all_tags_path: tags
+  all_tags_title: All Tags
+  archive_date_format: "%Y-%m"
+  archive_title_date_format: "%m-%d"
+
   # 
   # forbid_cache_password:  true
 
@@ -48,4 +53,3 @@ enc_tags:
     - tag: encrypt2
       # 123
       password: AQAQACAAIQCvWkhJdhn0b21Pz381AdTeMLb5bRO4d2F3usQtpIL0fDD0G8cg4klENXxJNX+rAHwD8VW2iJo4hZKDQrjdOjbJFugo60XnMmbdLEfzXpkqGpjjbe875/owWyNnGGPk3Vf4
-    

data/_includes/encrypted.html

@@ -5,6 +5,7 @@
     <input style="width:100%; " type="password" id="passwordinput" placeholder="输入密码"></input>
     <p>
         <input type="button" value= "{{ site.theme_config.decrypt_btn | default : 'Decrypt' }}" id="DecryptBtn"/>
+        <input type="button" value= "{{ site.theme_config.encrypt_clear_btn | default: 'Clear password cache' }}" id="ClearBtn1"/>
     
     </div>
     
@@ -14,7 +15,7 @@
            
             <input type="button" value= "{{ site.theme_config.encrypt_btn | default: 'Encrypt' }}" id="EncryptBtn"/>
 
-            <input type="button" value= "{{ site.theme_config.encrypt_clear_btn | default: 'Clear password cache' }}" id="ClearBtn"/>
+            <input type="button" value= "{{ site.theme_config.encrypt_clear_btn | default: 'Clear password cache' }}" id="ClearBtn2"/>
            
         </div>
         <div id = 'decryptContent'>
@@ -25,27 +26,44 @@
     <script src="//cdn.jsdelivr.net/gh/vitock/jsdelivr@0.1.1/js/md5.js"></script>
     <script>
         !function(){
-        var encryptedContent = '{{ content | contentEncrypt:page}}'
+        
+        {%- capture prefix0 %} {{page.url   |default: "no-style-please2" }} {% endcapture  -%}
+        {%- capture prefix %} {{prefix0 | strip }} {% endcapture  -%}
+        
+        const preFix = "{{prefix}}"
+        var encryptedContent = '{{ content | contentEncrypt:page, prefix}}'
+        const nonceStr = encryptedContent.substring(0,16);
+        const msg = encryptedContent.substring(17)
     
         function hexToUint8Arr(hexString){
             return new Uint8Array(hexString.match(/.{1,2}/g).map(byte => parseInt(byte, 16)));
         }
-        function decrypt (key0){
+
+
+        function decrypt (key0,isCached){
             // const key = Uint8Array([...]); // 32 bytes key
-            var key = new TextEncoder("utf-8").encode(md5(key0));
             
-            /// hex 
-            var nonceStr = encryptedContent.substring(0,16)
+            var key  = ''
+            var keyDgst = ""
+            if(isCached){
+                keyDgst= key0
+                key = new TextEncoder("utf-8").encode(keyDgst);
+            }
+            else{
+                var keyS = preFix + key0 +  preFix
+                keyDgst = md5(keyS)
+                key = new TextEncoder("utf-8").encode(keyDgst);
+            }
             var nonce = hexToUint8Arr(nonceStr)
     
-            const msg = encryptedContent.substring(17)
+            
             const message = Base64.toUint8Array(msg)
             // Encrypt //
             const decrypt = new JSSalsa20(key, nonce).decrypt(message);
             var plain = new TextDecoder("utf-8").decode(decrypt)
             var check = md5(plain)
             if(check.indexOf(nonceStr) == 0){
-                setKey(key0)
+                setKey(keyDgst)
                 /// hide input
                 document.getElementById("encrypted").style.display = 'none'
                 // / show decrypted 
@@ -94,7 +112,10 @@
             clearKey()
         }
 
-        document.getElementById("ClearBtn").onclick = function(){
+        document.getElementById("ClearBtn1").onclick = function(){
+            localStorage.clear();
+        }
+        document.getElementById("ClearBtn2").onclick = function(){
             localStorage.clear();
         }
 
@@ -124,8 +145,9 @@
             }
             var cachekey = readKey()
             if(cachekey){
-                decrypt(cachekey)
+                decrypt(cachekey,true)
             }
+
         {% endif %}
         
         

data/_layouts/archive.html

@@ -6,4 +6,30 @@ layout: default
 
 <h1>{{ page.title }}</h1>
 
-{%-include post_list.html category=page.which_category-%}
+
+{%-assign posts = site.posts-%}
+{%- if posts.size > 0 -%}
+
+{% assign ymPre = "" %}
+{% capture archive_date_format %} {{ site.theme_config.archive_date_format | default: "%Y"}}{% endcapture %}
+
+{% capture archive_date_titleformat %} {{ site.theme_config.archive_title_date_format | default: "%m-%d"}}{% endcapture %}
+{%- for post in posts limit: include.limit -%}
+    {% capture  ymCur %} {{post.date | date: archive_date_format}} {% endcapture %}
+    {% if ymCur != ymPre %}
+        {{ymCur}}
+    {% endif %}
+    {% assign ymPre = ymCur %}
+
+
+  <ul>
+        
+        
+        <li>
+          <span>{{- post.date | date: archive_date_titleformat }}</span>
+          <a href="{{ post.url | relative_url }}">{{ post.title | downcase }}</a>
+        </li>
+    
+  </ul>
+{%- endfor -%}
+{%- endif -%}

data/_layouts/tagpage.html

@@ -3,13 +3,22 @@ layout: default
 ---
 {%-include back_link.html -%}
 <div class="post">
-<h1>Tag: {{ page.tag }}</h1>
+<h1></h1>
+<li>Tag: {{ page.tag }}</li>
+
 <ul>
-{% for post in site.tags[page.tag] %}
+  {% for post in site.tags[page.tag] %}
   <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a> ({{ post.date | date_to_string }})<br>
       {{ post.description }}
         </li>
         {% endfor %}
         </ul>
         </div>
-        <hr>
+{% if site.theme_config.tag_showall %}
+        <li><a href="{{ site.baseurl }}/{{site.theme_config.all_tags_path | default:'tags' }}.html"> {{site.theme_config.all_tags_title | default:'All Tags' }}</a>
+        </li>
+         
+{% endif %}
+       
+        <hr>
+        

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: no-style-please2
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description:
 email:
 - r