Added:

- NordPass (Import and Export) - Dashlane (Import and Export) Fixed: - Import - LastPass export - Other small visual bugs
Rabbit-Company · Oct 23, 2021 · 3abbbeb · 3abbbeb
1 parent 8915106
commit 3abbbeb
Show file tree

Hide file tree

Showing 11 changed files with 321 additions and 37 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.rabbitcompany.passky"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 6
-        versionName '4.1.1'
+        versionCode 7
+        versionName '4.2.0'
     }
 
     buildTypes {

diff --git a/app/src/main/assets/export.html b/app/src/main/assets/export.html
@@ -71,7 +71,7 @@ <h3 class="tertiaryColor mt-6 text-lg font-medium">Passky</h3>
               </div>
               <div>
                   <div class="-mt-px flex">
-                  <div class="w-0 flex-1 flex">
+                    <div class="w-0 flex-1 flex">
                       <a id="passky-import-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
                           <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2c3e50" fill="none" stroke-linecap="round" stroke-linejoin="round">
                               <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
@@ -80,7 +80,7 @@ <h3 class="tertiaryColor mt-6 text-lg font-medium">Passky</h3>
                           </svg>
                           <span id="passky-import-btn-text" class="ml-3">Import</span>
                       </a>
-                  </div>
+                    </div>
                   <div class="w-0 flex-1 flex">
                     <a id="passky-backup-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
                         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2c3e50" fill="none" stroke-linecap="round" stroke-linejoin="round">
@@ -91,7 +91,7 @@ <h3 class="tertiaryColor mt-6 text-lg font-medium">Passky</h3>
                         </svg>
                         <span id="passky-backup-btn-text" class="ml-3">Backup</span>
                     </a>
-                </div>
+                  </div>
                   <div class="w-0 flex-1 flex">
                       <a id="passky-export-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
                           <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2c3e50" fill="none" stroke-linecap="round" stroke-linejoin="round">
@@ -106,6 +106,56 @@ <h3 class="tertiaryColor mt-6 text-lg font-medium">Passky</h3>
               </div>
             </li>
             <li class="secondaryBackgroundColor col-span-1 flex flex-col text-center rounded-lg shadow divide-y divide-gray-200">
+              <div class="flex-1 flex flex-col p-8">
+                  <img id="bitwarden-logo" class="w-24 h-24 flex-shrink-0 mx-auto rounded-full" src="images/bitwarden.png" alt="Bitwarden">
+                  <h3 class="tertiaryColor mt-6 text-lg font-medium">Bitwarden</h3>
+              </div>
+              <div>
+                  <div class="-mt-px flex">
+                  <div class="w-0 flex-1 flex">
+                      <a id="bitwarden-import-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
+                          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2c3e50" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                              <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+                              <path d="M14 3v4a1 1 0 0 0 1 1h4" />
+                              <path d="M5 13v-8a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2h-5.5m-9.5 -2h7m-3 -3l3 3l-3 3" />
+                          </svg>
+                          <span id="bitwarden-import-btn-text" class="ml-3">Import</span>
+                      </a>
+                  </div>
+                  </div>
+              </div>
+          </li>
+          <li class="secondaryBackgroundColor col-span-1 flex flex-col text-center rounded-lg shadow divide-y divide-gray-200">
+            <div class="flex-1 flex flex-col p-8">
+                <img id="nordpass-logo" class="w-24 h-24 flex-shrink-0 mx-auto rounded-full" src="images/nordpass.png" alt="NordPass">
+                <h3 class="tertiaryColor mt-6 text-lg font-medium">NordPass</h3>
+            </div>
+            <div>
+                <div class="-mt-px flex">
+                  <div class="w-0 flex-1 flex">
+                    <a id="nordpass-import-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2c3e50" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+                            <path d="M14 3v4a1 1 0 0 0 1 1h4" />
+                            <path d="M5 13v-8a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2h-5.5m-9.5 -2h7m-3 -3l3 3l-3 3" />
+                        </svg>
+                        <span id="nordpass-import-btn-text" class="ml-3">Import</span>
+                    </a>
+                  </div>
+                <div class="w-0 flex-1 flex">
+                    <a id="nordpass-export-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2c3e50" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+                            <path d="M14 3v4a1 1 0 0 0 1 1h4" />
+                            <path d="M11.5 21h-4.5a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v5m-5 6h7m-3 -3l3 3l-3 3" />
+                        </svg>
+                        <span id="nordpass-export-btn-text" class="ml-3">Export</span>
+                    </a>
+                </div>
+                </div>
+            </div>
+        </li>
+          <li class="secondaryBackgroundColor col-span-1 flex flex-col text-center rounded-lg shadow divide-y divide-gray-200">
               <div class="flex-1 flex flex-col p-8">
                   <img id="lastpass-logo" class="w-24 h-24 flex-shrink-0 mx-auto rounded-full" src="images/lastpass.png" alt="Lastpass">
                   <h3 class="tertiaryColor mt-6 text-lg font-medium">Lastpass</h3>
@@ -136,25 +186,35 @@ <h3 class="tertiaryColor mt-6 text-lg font-medium">Lastpass</h3>
               </div>
           </li>
           <li class="secondaryBackgroundColor col-span-1 flex flex-col text-center rounded-lg shadow divide-y divide-gray-200">
-              <div class="flex-1 flex flex-col p-8">
-                  <img id="bitwarden-logo" class="w-24 h-24 flex-shrink-0 mx-auto rounded-full" src="images/bitwarden.png" alt="Bitwarden">
-                  <h3 class="tertiaryColor mt-6 text-lg font-medium">Bitwarden</h3>
-              </div>
-              <div>
-                  <div class="-mt-px flex">
+            <div class="flex-1 flex flex-col p-8">
+                <img id="dashlane-logo" class="w-24 h-24 flex-shrink-0 mx-auto rounded-full" src="images/dashlane.png" alt="Dashlane">
+                <h3 class="tertiaryColor mt-6 text-lg font-medium">Dashlane</h3>
+            </div>
+            <div>
+                <div class="-mt-px flex">
                   <div class="w-0 flex-1 flex">
-                      <a id="bitwarden-import-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
+                      <a id="dashlane-import-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
                           <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2c3e50" fill="none" stroke-linecap="round" stroke-linejoin="round">
                               <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
                               <path d="M14 3v4a1 1 0 0 0 1 1h4" />
                               <path d="M5 13v-8a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2h-5.5m-9.5 -2h7m-3 -3l3 3l-3 3" />
                           </svg>
-                          <span id="bitwarden-import-btn-text" class="ml-3">Import</span>
+                          <span id="dashlane-import-btn-text" class="ml-3">Import</span>
                       </a>
                   </div>
+                  <div class="w-0 flex-1 flex">
+                    <a id="dashlane-export-btn" href="#" class="importExportButtons relative -mr-px w-0 flex-1 inline-flex items-center justify-center py-4 text-sm font-medium border border-transparent">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="#2c3e50" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+                            <path d="M14 3v4a1 1 0 0 0 1 1h4" />
+                            <path d="M11.5 21h-4.5a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v5m-5 6h7m-3 -3l3 3l-3 3" />
+                        </svg>
+                        <span id="dashlane-export-btn-text" class="ml-3">Export</span>
+                    </a>
                   </div>
-              </div>
-          </li>
+                </div>
+            </div>
+        </li>
         </ul>
     </div>
 

diff --git a/app/src/main/assets/js/default-functions.js b/app/src/main/assets/js/default-functions.js
@@ -63,7 +63,7 @@ function downloadTxt(exportTxt, exportName){
     let dataStr = "data:text/plain;charset=utf-8," + encodeURIComponent(exportTxt);
     let downloadAnchorNode = document.createElement('a');
     downloadAnchorNode.setAttribute("href", dataStr);
-    downloadAnchorNode.setAttribute("download", exportName + ".txt");
+    downloadAnchorNode.setAttribute("download", exportName);
     document.body.appendChild(downloadAnchorNode); // required for firefox
     downloadAnchorNode.click();
     downloadAnchorNode.remove();
@@ -192,4 +192,4 @@ function isSessionValid(){
 function logout(){
     clearStorage();
     window.location.href = 'index.html';
-}
+}