From db169cb9f0394b3c7ded3d252a3990d0391606fd Mon Sep 17 00:00:00 2001
From: George Raptis <georapbox@gmail.com>
Date: Tue, 17 Sep 2019 17:30:04 +0300
Subject: [PATCH 1/3] Add password preview

Co-authored-by: timvisee <tim@visee.me>
---
 app/ui/archiveTile.js | 69 +++++++++++++++++++++++++++++++++++--------
 assets/eye-off.svg    |  1 +
 assets/eye.svg        |  1 +
 3 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 assets/eye-off.svg
 create mode 100644 assets/eye.svg

diff --git a/app/ui/archiveTile.js b/app/ui/archiveTile.js
index 50c1e5bc..83382164 100644
--- a/app/ui/archiveTile.js
+++ b/app/ui/archiveTile.js
@@ -48,19 +48,37 @@ function password(state) {
           ${state.translate('addPassword')}
         </label>
       </div>
-      <input
-        id="password-input"
-        class="${state.archive.password
-          ? ''
-          : 'invisible'} border rounded focus:border-blue-60 leading-normal my-1 py-1 px-2 h-8 dark:bg-grey-80"
-        autocomplete="off"
-        maxlength="${MAX_LENGTH}"
-        type="password"
-        oninput="${inputChanged}"
-        onfocus="${focused}"
-        placeholder="${state.translate('unlockInputPlaceholder')}"
-        value="${state.archive.password || ''}"
-      />
+      <div class="relative inline-block">
+        <input
+          id="password-input"
+          class="${state.archive.password
+            ? ''
+            : 'invisible'} border rounded focus:border-blue-60 leading-normal my-1 py-1 px-2 h-8 dark:bg-grey-80"
+          autocomplete="off"
+          maxlength="${MAX_LENGTH}"
+          type="password"
+          oninput="${inputChanged}"
+          onfocus="${focused}"
+          placeholder="${state.translate('unlockInputPlaceholder')}"
+          value="${state.archive.password || ''}"
+        />
+        <button
+          id="password-preview-button"
+          type="button"
+          class="${state.archive.password
+            ? ''
+            : 'invisible'} absolute top-0 right-0 p-2"
+          onclick="${onPasswordPreviewButtonclicked}"
+        >
+          <img src="assets/eye.svg" width="22" height="22" />
+          <img
+            src="assets/eye-off.svg"
+            width="22"
+            height="22"
+            class="${state.archive.password ? '' : 'hidden'}"
+          />
+        </button>
+      </div>
       <label
         id="password-msg"
         for="password-input"
@@ -69,15 +87,40 @@ function password(state) {
     </div>
   `;
 
+  function onPasswordPreviewButtonclicked(event) {
+    event.preventDefault();
+    const target = event.currentTarget;
+    const input = document.getElementById('password-input');
+    const eyeOn = target.querySelector('img:first-child');
+    const eyeOff = target.querySelector('img:last-child');
+
+    if (input.type === 'password') {
+      input.type = 'text';
+      eyeOn.classList.add('hidden');
+      eyeOff.classList.remove('hidden');
+    } else {
+      input.type = 'password';
+      eyeOn.classList.remove('hidden');
+      eyeOff.classList.add('hidden');
+    }
+
+    input.focus();
+  }
+
   function togglePasswordInput(event) {
     event.stopPropagation();
     const checked = event.target.checked;
     const input = document.getElementById('password-input');
+    const passwordPreviewButton = document.getElementById(
+      'password-preview-button'
+    );
     if (checked) {
       input.classList.remove('invisible');
+      passwordPreviewButton.classList.remove('invisible');
       input.focus();
     } else {
       input.classList.add('invisible');
+      passwordPreviewButton.classList.add('invisible');
       input.value = '';
       document.getElementById('password-msg').textContent = '';
       state.archive.password = null;
diff --git a/assets/eye-off.svg b/assets/eye-off.svg
new file mode 100644
index 00000000..6364669f
--- /dev/null
+++ b/assets/eye-off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#4A4A4A" d="M256.1 144.8c56.2 0 101.9 45.3 101.9 101.1 0 13.1-2.6 25.5-7.3 37l59.5 59c30.8-25.5 55-58.4 69.9-96-35.3-88.7-122.3-151.6-224.2-151.6-28.5 0-55.8 5.1-81.1 14.1l44 43.7c11.6-4.6 24.1-7.3 37.3-7.3zM52.4 89.7l46.5 46.1 9.4 9.3c-33.9 26-60.4 60.8-76.3 100.8 35.2 88.7 122.2 151.6 224.1 151.6 31.6 0 61.7-6.1 89.2-17l8.6 8.5 59.7 59 25.9-25.7L78.2 64 52.4 89.7zM165 201.4l31.6 31.3c-1 4.2-1.6 8.7-1.6 13.1 0 33.5 27.3 60.6 61.1 60.6 4.5 0 9-.6 13.2-1.6l31.6 31.3c-13.6 6.7-28.7 10.7-44.8 10.7-56.2 0-101.9-45.3-101.9-101.1 0-15.8 4.1-30.7 10.8-44.3zm87.8-15.7l64.2 63.7.4-3.2c0-33.5-27.3-60.6-61.1-60.6l-3.5.1z"/></svg>
diff --git a/assets/eye.svg b/assets/eye.svg
new file mode 100644
index 00000000..4428872a
--- /dev/null
+++ b/assets/eye.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#4A4A4A" d="M256 105c-101.8 0-188.4 62.4-224 151 35.6 88.6 122.2 151 224 151s188.4-62.4 224-151c-35.6-88.6-122.2-151-224-151zm0 251.7c-56 0-101.8-45.3-101.8-100.7S200 155.3 256 155.3 357.8 200.6 357.8 256 312 356.7 256 356.7zm0-161.1c-33.6 0-61.1 27.2-61.1 60.4s27.5 60.4 61.1 60.4 61.1-27.2 61.1-60.4-27.5-60.4-61.1-60.4z"/></svg>

From 7797f485f2491ce609fc970cfc6639bae8557c70 Mon Sep 17 00:00:00 2001
From: George Raptis <georapbox@gmail.com>
Date: Wed, 18 Sep 2019 10:32:17 +0300
Subject: [PATCH 2/3] make color dimmer

Co-authored-by: timvisee <tim@visee.me>
---
 assets/eye-off.svg | 2 +-
 assets/eye.svg     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/eye-off.svg b/assets/eye-off.svg
index 6364669f..6edb1745 100644
--- a/assets/eye-off.svg
+++ b/assets/eye-off.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#4A4A4A" d="M256.1 144.8c56.2 0 101.9 45.3 101.9 101.1 0 13.1-2.6 25.5-7.3 37l59.5 59c30.8-25.5 55-58.4 69.9-96-35.3-88.7-122.3-151.6-224.2-151.6-28.5 0-55.8 5.1-81.1 14.1l44 43.7c11.6-4.6 24.1-7.3 37.3-7.3zM52.4 89.7l46.5 46.1 9.4 9.3c-33.9 26-60.4 60.8-76.3 100.8 35.2 88.7 122.2 151.6 224.1 151.6 31.6 0 61.7-6.1 89.2-17l8.6 8.5 59.7 59 25.9-25.7L78.2 64 52.4 89.7zM165 201.4l31.6 31.3c-1 4.2-1.6 8.7-1.6 13.1 0 33.5 27.3 60.6 61.1 60.6 4.5 0 9-.6 13.2-1.6l31.6 31.3c-13.6 6.7-28.7 10.7-44.8 10.7-56.2 0-101.9-45.3-101.9-101.1 0-15.8 4.1-30.7 10.8-44.3zm87.8-15.7l64.2 63.7.4-3.2c0-33.5-27.3-60.6-61.1-60.6l-3.5.1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#8795a1" d="M256.1 144.8c56.2 0 101.9 45.3 101.9 101.1 0 13.1-2.6 25.5-7.3 37l59.5 59c30.8-25.5 55-58.4 69.9-96-35.3-88.7-122.3-151.6-224.2-151.6-28.5 0-55.8 5.1-81.1 14.1l44 43.7c11.6-4.6 24.1-7.3 37.3-7.3zM52.4 89.7l46.5 46.1 9.4 9.3c-33.9 26-60.4 60.8-76.3 100.8 35.2 88.7 122.2 151.6 224.1 151.6 31.6 0 61.7-6.1 89.2-17l8.6 8.5 59.7 59 25.9-25.7L78.2 64 52.4 89.7zM165 201.4l31.6 31.3c-1 4.2-1.6 8.7-1.6 13.1 0 33.5 27.3 60.6 61.1 60.6 4.5 0 9-.6 13.2-1.6l31.6 31.3c-13.6 6.7-28.7 10.7-44.8 10.7-56.2 0-101.9-45.3-101.9-101.1 0-15.8 4.1-30.7 10.8-44.3zm87.8-15.7l64.2 63.7.4-3.2c0-33.5-27.3-60.6-61.1-60.6l-3.5.1z"/></svg>
diff --git a/assets/eye.svg b/assets/eye.svg
index 4428872a..059dd2e9 100644
--- a/assets/eye.svg
+++ b/assets/eye.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#4A4A4A" d="M256 105c-101.8 0-188.4 62.4-224 151 35.6 88.6 122.2 151 224 151s188.4-62.4 224-151c-35.6-88.6-122.2-151-224-151zm0 251.7c-56 0-101.8-45.3-101.8-100.7S200 155.3 256 155.3 357.8 200.6 357.8 256 312 356.7 256 356.7zm0-161.1c-33.6 0-61.1 27.2-61.1 60.4s27.5 60.4 61.1 60.4 61.1-27.2 61.1-60.4-27.5-60.4-61.1-60.4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#8795a1" d="M256 105c-101.8 0-188.4 62.4-224 151 35.6 88.6 122.2 151 224 151s188.4-62.4 224-151c-35.6-88.6-122.2-151-224-151zm0 251.7c-56 0-101.8-45.3-101.8-100.7S200 155.3 256 155.3 357.8 200.6 357.8 256 312 356.7 256 356.7zm0-161.1c-33.6 0-61.1 27.2-61.1 60.4s27.5 60.4 61.1 60.4 61.1-27.2 61.1-60.4-27.5-60.4-61.1-60.4z"/></svg>

From b5865f00e96391a80fcf6166611e5e6ffaa8a5c8 Mon Sep 17 00:00:00 2001
From: George Raptis <georapbox@gmail.com>
Date: Wed, 18 Sep 2019 10:34:24 +0300
Subject: [PATCH 3/3] toggle preview image src instead of havingtwo images

Co-authored-by: timvisee <tim@visee.me>
---
 app/ui/archiveTile.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/ui/archiveTile.js b/app/ui/archiveTile.js
index 83382164..2028a980 100644
--- a/app/ui/archiveTile.js
+++ b/app/ui/archiveTile.js
@@ -48,12 +48,12 @@ function password(state) {
           ${state.translate('addPassword')}
         </label>
       </div>
-      <div class="relative inline-block">
+      <div class="relative inline-block my-1">
         <input
           id="password-input"
           class="${state.archive.password
             ? ''
-            : 'invisible'} border rounded focus:border-blue-60 leading-normal my-1 py-1 px-2 h-8 dark:bg-grey-80"
+            : 'invisible'} border rounded focus:border-blue-60 leading-normal py-1 pl-2 pr-8 h-8 dark:bg-grey-80"
           autocomplete="off"
           maxlength="${MAX_LENGTH}"
           type="password"
@@ -67,15 +67,14 @@ function password(state) {
           type="button"
           class="${state.archive.password
             ? ''
-            : 'invisible'} absolute top-0 right-0 p-2"
+            : 'invisible'} absolute top-0 right-0 w-8 h-8"
           onclick="${onPasswordPreviewButtonclicked}"
         >
-          <img src="assets/eye.svg" width="22" height="22" />
           <img
-            src="assets/eye-off.svg"
+            src="${assets.get('eye.svg')}"
             width="22"
             height="22"
-            class="${state.archive.password ? '' : 'hidden'}"
+            class="m-auto"
           />
         </button>
       </div>
@@ -89,19 +88,15 @@ function password(state) {
 
   function onPasswordPreviewButtonclicked(event) {
     event.preventDefault();
-    const target = event.currentTarget;
     const input = document.getElementById('password-input');
-    const eyeOn = target.querySelector('img:first-child');
-    const eyeOff = target.querySelector('img:last-child');
+    const eyeIcon = event.currentTarget.querySelector('img');
 
     if (input.type === 'password') {
       input.type = 'text';
-      eyeOn.classList.add('hidden');
-      eyeOff.classList.remove('hidden');
+      eyeIcon.src = assets.get('eye-off.svg');
     } else {
       input.type = 'password';
-      eyeOn.classList.remove('hidden');
-      eyeOff.classList.add('hidden');
+      eyeIcon.src = assets.get('eye.svg');
     }
 
     input.focus();