no-style-please2 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d26ad74aacb375a90dca0665fc7f4d4f5b75050f8cd1d51e629e593d098348b5
-  data.tar.gz: 59cdcb62447b336295853ffcd2f8ceb6fd4359e933507959ac6f1b48cfac48d7
+  metadata.gz: d9afc4c08d2e387cb510730849d4365927060f101b60f4fd8222cfd94d0a6a13
+  data.tar.gz: fbc828eb73facfb2a644e6092b98050ffb869916c16e2211d6a7434c04522132
 SHA512:
-  metadata.gz: 63a7ca32a0099fde7ddbebc1f83303b1a2e73a080d9689ab6c2bb972f3c5e3e2da64199006a49f091c9b564f2a38bd9851d997ccc8727a6db311ba8e424e369e
-  data.tar.gz: 7c0700461ffd0b57ed1a4107a112a37d66394316f17165049bd55844c2a5283f77cb8c707f678e85bbbab2e1faf80a6f6577f5ca67cf7d265b0a124ee5af14b0
+  metadata.gz: bbea77bad9bb678e98415b87109e8928b4e6baae9b5c53fa7b0b26f7280b8567fb853d129858f480e4d9402c546e28e26b4a840e4e12ad6bc6069fddc74ff38a
+  data.tar.gz: c9a88c78fa49f29ea80041fba960c39e257dd38b65c9c2e9423e8e6889552442baf2700d8d6689e54216cae73b30fe68bc2104f2ef2b87ee3a67d102c4bb17ec

data/_config.yml

@@ -18,8 +18,13 @@ theme_config:
   date_format: "%Y-%m-%d" # customize how date is formatted
   show_description: false # show blog description in home page
   encrypt_title: "Content is Encryped :)"
-  # decrypt_btn: 解密
-  # encrypt_btn: 重新加密
+  encrypt_clear_btn: "清空缓存密码"
+  decrypt_btn: 解密
+  encrypt_btn: 重新加密
+  tag_showall: true
+  all_tags_path: tags
+  all_tags_title: All Tags
+
   # 
   # forbid_cache_password:  true
 
@@ -46,4 +51,3 @@ enc_tags:
     - tag: encrypt2
       # 123
       password: AQAQACAAIQCvWkhJdhn0b21Pz381AdTeMLb5bRO4d2F3usQtpIL0fDD0G8cg4klENXxJNX+rAHwD8VW2iJo4hZKDQrjdOjbJFugo60XnMmbdLEfzXpkqGpjjbe875/owWyNnGGPk3Vf4
-    

data/_includes/encrypted.html

@@ -1,28 +1,22 @@
 
 <div id="encrypted">
-    {% if site.theme_config.encrypt_title %}
-    <h3> {{ site.theme_config.encrypt_title }} </h3>
-    {% else %}
-    <h3>Content is Encrypted</h3>
-    {% endif %}
+    <h3> {{ site.theme_config.encrypt_title | default : 'Content is Encrypted'}} </h3>
+   
     <input style="width:100%; " type="password" id="passwordinput" placeholder="输入密码"></input>
     <p>
-    {% if site.theme_config.decrypt_btn %}
-    <input type="button" value= "{{ site.theme_config.decrypt_btn }}" id="DecryptBtn"/>
-    {% else %}
-    <input type="button" value= "Decrypt" id="DecryptBtn"/>
-    {% endif %}
+        <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>
     
     <div id="decrypted"  style = "display:none">
         <p>
         <div>
-            {% if site.theme_config.encrypt_btn %}
-            <input type="button" value= "{{ site.theme_config.encrypt_btn }}" id="EncryptBtn"/>
-            {% else %}
-            <input type="button" value= "Encrypt" id="EncryptBtn"/>
-            {% endif %}
+           
+            <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="ClearBtn2"/>
+           
         </div>
         <div id = 'decryptContent'>
         </div>
@@ -32,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 
@@ -91,6 +102,26 @@
     
             clearKey()
         }
+
+        document.getElementById("EncryptBtn").onclick = function(){
+            /// hide input
+            document.getElementById("encrypted").style.display = 'block'
+            // / show decrypted 
+            document.getElementById("decrypted").style.display = "none"
+    
+            clearKey()
+        }
+
+        document.getElementById("ClearBtn1").onclick = function(){
+            localStorage.clear();
+        }
+        document.getElementById("ClearBtn2").onclick = function(){
+            localStorage.clear();
+        }
+
+        
+
+        
     
         {% if site.theme_config.forbid_cache_password %}
         function readKey(){
@@ -114,8 +145,9 @@
             }
             var cachekey = readKey()
             if(cachekey){
-                decrypt(cachekey)
+                decrypt(cachekey,true)
             }
+
         {% 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.1
+  version: 0.6.0
 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