jekyll-theme-chirpy-customized-upe 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a37ef646fc1d5be7246c991273a43f722fbffd39bef648b23281632fe92676
-  data.tar.gz: 626719f0ed661e61f00e6c5659adc9ddf0932a3ed7bbd0b8a4aab03729ebacc5
+  metadata.gz: 787b5394b48c9baab9a02e63fa01f654b136bdc83affaa0cce2cde1b8afac066
+  data.tar.gz: 938f098f58865bf1486f8ef055b596fb11421011c104fa937bfea959a3f46c01
 SHA512:
-  metadata.gz: 1f109cbd53493834b37ded9dc42eb3f7aa0f29c97bfafbb5dea6e3793454cd5972a2d49d565251e77f7d0ae11534907dee120bca2e9ddfeef82bc3098f4aa88d
-  data.tar.gz: ec87a6b9e9616677b37a6627fb2592090cd46e3cf0280a994db73b05d5117912af604503ad3c20dac3ee56a79a85dcc311280cddba4e1287cce2e0620464d559
+  metadata.gz: b78e7fd89e5b63b4fc7471fd71079c0367b7c47a5fad48706577f066911ef39b58b4b3704586e718e97e1fc8602753d6d2d91d7020105a70227c54cdeda9579e
+  data.tar.gz: 144fce3a5395dee9847ff2e04b5ddf3ce01ed1d68c856f5f3555fc6c7601ad8ca04872a773ce4378522bf7bdc7e185f868d0b4da8371ec69ba976d2db9c5d8d3

data/_includes/sidebar.html

@@ -4,7 +4,8 @@
   display: none;
   justify-content: center;
   align-items: center;
-  position: absolute;
+  position: fixed;
+  max-width: 400px;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
@@ -23,7 +24,7 @@
     transform: translate(-50%, -50%);
   }
   }
-  
+
   .form-changeInfo input[type="text"], 
   input[type="url"]
   {
@@ -45,7 +46,8 @@
   }
   .form-buttons {
     display: flex;
-    justify-content: space-evenly;
+    justify-content: center;
+    gap: 100px;
   }
   .form-submit {
     margin: 0 20px;
@@ -69,25 +71,26 @@
   }
 </style>
 
+{% include lang.html %}
 <div id = "InfoForm">
   <div class = "info">
       <form target="_self" class="form-changeInfo">
         <div class="form-avatar">
-          <label for="avatar">请提供新头像的URL:</label>
-          <input type="url" name="avatar" placeholder="Optional" id="newAvatar" onblur="formValidate.checkAvatar()"/>
+          <label for="avatar">{{ site.data.locales[lang].sidebar.new_avatar }}</label>
+          <input type="url" name="avatar" placeholder="{{ site.data.locales[lang].sidebar.optional }}" id="newAvatar" onblur="formValidate.checkAvatar()"/>
           <span class="validatemsg" id="isAvatarValid"></span>
         </div>
         <div class="form-nickname">
-          <label for="nickname">请输入您的新昵称: </label>
-          <input type="text" name="nickname" maxlength="15" placeholder="Optional" id="newNickname" onblur="formValidate.checkNickname()"/>
+          <label for="nickname">{{ site.data.locales[lang].sidebar.new_nickname }}</label>
+          <input type="text" name="nickname" maxlength="15" placeholder="{{ site.data.locales[lang].sidebar.optional }}" id="newNickname" onblur="formValidate.checkNickname()"/>
           <span class="validatemsg" id="isNicknameValid"></span>
         </div>
         <div class="form-buttons">
           <div class="form-submit">
-            <input type="button" class="submitChange" value="Submit" onclick="updateUserInfo()"/>
+            <input type="button" class="submitChange" value="{{ site.data.locales[lang].sidebar.submit }}" onclick="updateUserInfo()"/>
           </div>
           <div class="form-cancel">
-            <input type="button" class="cancelChange" value="Cancel"/>
+            <input type="button" class="cancelChange" value="{{ site.data.locales[lang].sidebar.cancel }}"/>
           </div>
         </div>
       </form>
@@ -120,7 +123,7 @@
       <!-- home -->
       <li class="nav-item{% if page.layout == 'home' %}{{ " active" }}{% endif %}">
         <a href="{{ '/' | relative_url }}" class="nav-link">
-          <i class="fa-fw fas fa-home"></i>
+          <i class="fa-fw fas fa-eye-slash"></i>
           <span>{{ site.data.locales[include.lang].tabs.home | upcase }}</span>
         </a>
       </li>
@@ -190,7 +193,7 @@
         </a>
       {% endif %}
     {% endfor %}
-      <a href="javascript:void(0);" onclick="AV.User.logOut();setTimeout(function() { window.location.reload(); }, 1000)">
+      <a href="javascript:void(0);" onclick="AV.User.logOut();setTimeout(function() { window.location.reload(); }, 1000)" title="{{ site.data.locales[lang].login.logout }}">
         <i class="fas fa-right-from-bracket" style="color: rgb(181, 27, 27);"></i>
       </a>
   </div>
@@ -221,7 +224,7 @@
         document.getElementById('isAvatarValid').style.color = 'green';
         return true;
       } else if (document.getElementById('newAvatar').value.trim() !='') {
-        document.getElementById('isAvatarValid').innerHTML = '<i class="fa-fw fas fa-xmark"></i>Invalid URL';
+        document.getElementById('isAvatarValid').innerHTML = '<i class="fa-fw fas fa-xmark"></i>{{ site.data.locales[lang].sidebar.invalid_url }}';
         document.getElementById('isAvatarValid').style.color = 'red';
       } else {
         document.getElementById('isAvatarValid').innerHTML = '';
@@ -245,7 +248,7 @@
     currentUser.save().then((user) => {
       console.log('保存成功！');
       if (newAvatar != '' || newNickname != '') {
-        alert("Save Successfully!");
+        alert("{{ site.data.locales[lang].sidebar.save_success }}");
         window.location.reload();
       }
     }).catch((error) => {

data/_layouts/login.html

@@ -133,17 +133,18 @@ layout: compress
 </head>
 
 <body>
+    {% include lang.html %}
     <div class="shell">
-        <h2 class="title">Login</h2>
-        <input type="text" id="username" placeholder="Username">
-        <input type="password" id="password" placeholder="Password">
-        <input type="email" id="email" placeholder="Email(MUST)">
-        <input type="submit" value="Login" id="loginBtn">
+        <h2 class="title">{{ site.data.locales[lang].login.login }}</h2>
+        <input type="text" id="username" placeholder="{{ site.data.locales[lang].login.username }}">
+        <input type="password" id="password" placeholder="{{ site.data.locales[lang].login.password }}">
+        <input type="email" id="email" placeholder="{{ site.data.locales[lang].login.email }}">
+        <input type="submit" value="{{ site.data.locales[lang].login.login }}" id="loginBtn">
         <div class="footer">
             {% if site.Leancloud.allowRegister %}
-                <button id="signUp">Go to Register</button>
+            <button id="signUp">{{ site.data.locales[lang].login.go_to_register }}</button>
             {% endif %}
-            <button id="forgotPassword">Forgot Password?</button>
+            <button id="forgotPassword">{{ site.data.locales[lang].login.forgot_password }}</button>
         </div>
     </div>
 
@@ -153,22 +154,22 @@ layout: compress
             var title = document.querySelector('.title');
             var loginBtn = document.getElementById('loginBtn');
             var signUpBtn = document.getElementById('signUp');
-            if (title.innerText == 'Login') {
-                title.innerText = 'Register';
-                loginBtn.value = 'Register';
-                signUpBtn.innerText = 'Go to login';
+            if (title.innerText == '{{ site.data.locales[lang].login.login }}') {
+                title.innerText = '{{ site.data.locales[lang].login.register }}';
+                loginBtn.value = '{{ site.data.locales[lang].login.register }}';
+                signUpBtn.innerText = '{{ site.data.locales[lang].login.go_to_login }}';
                 document.getElementById('username').value = '';
                 document.getElementById('password').value = '';
-                document.getElementById('username').placeholder = 'New User Name';
-                document.getElementById('password').placeholder = 'New Password';
+                document.getElementById('username').placeholder = '{{ site.data.locales[lang].login.new_username }}';
+                document.getElementById('password').placeholder = '{{ site.data.locales[lang].login.new_password }}';
                 document.getElementById('password').type = 'password';
                 document.getElementById('email').style.display = 'block';
             } else {
-                title.innerText = 'Login';
-                loginBtn.value = 'Login';
-                signUpBtn.innerText = 'Go to register';
-                document.getElementById('username').placeholder = 'Username';
-                document.getElementById('password').placeholder = 'Password';
+                title.innerText = '{{ site.data.locales[lang].login.login }}';
+                loginBtn.value = '{{ site.data.locales[lang].login.login }}';
+                signUpBtn.innerText = '{{ site.data.locales[lang].login.go_to_register }}';
+                document.getElementById('username').placeholder = '{{ site.data.locales[lang].login.username }}';
+                document.getElementById('password').placeholder = '{{ site.data.locales[lang].login.password }}';
                 document.getElementById('password').type = 'password';
                 document.getElementById('email').style.display = 'none';
             }
@@ -202,11 +203,11 @@ layout: compress
         document.getElementById('loginBtn').addEventListener("click", function () {
             var username = document.getElementById('username').value.trim();
             var password = document.getElementById('password').value.trim();
-            if (document.querySelector('.title').innerText == 'Login') {
+            if (document.querySelector('.title').innerText == '{{ site.data.locales[lang].login.login }}') {
                 AV.User.logIn(username, password).then(function (user) {
                     if (user.get("emailVerified")) {
                         /* 登录成功 */
-                        console.log('登录成功');
+                        console.log('Successfully logged in');
                         console.log(AV.User.emailVerified);
                         /* document.getElementById('username').value = '';
                         document.getElementById('password').value = ''; */
@@ -217,26 +218,27 @@ layout: compress
                             window.location.href = redirectUrl;
                         }
                         else {
-                            window.location.href = '{{ site.baseUrl }}';
+                            window.location.href = '{{ site.baseurl }}';
                         }
+                        
                     } else {
-                        alert('当前用户邮箱未通过验证，暂时无法登录');
+                        alert('{{ site.data.locales[lang].login.email_not_verified }}');
                     }
                 }).catch(function (error) {
                     /* 登录失败，处理错误信息 */
-                    console.log('登录失败：', error);
-                    alert('登录失败！');
+                    console.log('Login failed:', error);
+                    alert('{{ site.data.locales[lang].login.login_fail }}');
                 });
             } else {
                 var email = document.getElementById('email').value;
                 if (!validateEmail(email)) {
-                    alert('请输入有效的电子邮件地址！');
+                    alert('{{ site.data.locales[lang].login.enter_vaild_email }}');
                     return;
                 } else if (username == '') {
-                    alert('请输入用户名');
+                    alert('{{ site.data.locales[lang].login.enter_username }}');
                     return;
                 } else if (password == '') {
-                    alert('请输入密码');
+                    alert('{{ site.data.locales[lang].login.enter_password }}');
                     return;
                 } else {
                     const user = new AV.User();
@@ -247,13 +249,13 @@ layout: compress
 
                     user.signUp().then(function (user) {
                         /* 注册成功 */
-                        alert('注册成功，等待验证邮箱。邮件已发送！');
+                        alert('{{ site.data.locales[lang].login.waiting_for_verification }}');
                         console.log('注册成功，等待验证邮箱');
                         window.location.reload();
                     }).catch(function (error) {
                         /* 注册失败，处理错误信息 */
                         console.log('注册失败：', error);
-                        alert('注册失败！');
+                        alert('{{ site.data.locales[lang].login.register_fail }}');
                     });
                 }
             };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-chirpy-customized-upe
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jo Cruise