Skip to content

Commit

Permalink
Updated Electron to v19.0.0 and Passky Client to v6.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zigazajc007 committed Jun 24, 2022
1 parent ba81fe9 commit 256b577
Show file tree
Hide file tree
Showing 12 changed files with 1,464 additions and 746 deletions.
2 changes: 1 addition & 1 deletion css/tailwind.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
! tailwindcss v3.0.23 | MIT License | https://tailwindcss.com
! tailwindcss v3.0.24 | MIT License | https://tailwindcss.com
*/

/*
Expand Down
40 changes: 40 additions & 0 deletions export.html
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,46 @@ <h3 class="tertiaryColor mt-6 text-lg font-medium">Dashlane</h3>
</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="chromium-logo" class="w-24 h-24 flex-shrink-0 mx-auto rounded-full" src="images/chromium.png" alt="Chromium">
<h3 class="tertiaryColor mt-6 text-lg font-medium">Chromium</h3>
</div>
<div>
<div class="-mt-px flex">
<div class="w-0 flex-1 flex">
<a id="chromium-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="chromium-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="firefox-logo" class="w-24 h-24 flex-shrink-0 mx-auto rounded-full" src="images/firefox.png" alt="Firefox">
<h3 class="tertiaryColor mt-6 text-lg font-medium">Firefox</h3>
</div>
<div>
<div class="-mt-px flex">
<div class="w-0 flex-1 flex">
<a id="firefox-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="firefox-import-btn-text" class="ml-3">Import</span>
</a>
</div>
</div>
</div>
</li>
</ul>
</div>
<div id="dialog" class="fixed z-10 inset-0 overflow-y-auto invisible" aria-labelledby="dialog-title" role="dialog" aria-modal="true">
Expand Down
Binary file added images/chromium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/firefox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/yubikey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ <h3 class="tertiaryColor text-lg leading-6 font-medium" id="dialog-title"></h3>
</form>
</div>
</div>
<script>
if('serviceWorker' in navigator) {
window.addEventListener('load', () => {
navigator.serviceWorker.register('service-worker.js');
});
}
</script>
<script src="js/aes.js"></script>
<script src="js/default-functions.js"></script>
<script src="js/sha512.js"></script>
Expand Down
36 changes: 36 additions & 0 deletions js/export.js
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,22 @@ function import_csv(id){
messageID = 8;
titleID = 1;
break;
case 8:
//Firefox
websiteID = 0;
usernameID = 1;
passwordID = 2;
messageID = 9;
titleID = 0;
break;
case 9:
//Chromium
websiteID = 1;
usernameID = 2;
passwordID = 3;
messageID = 4;
titleID = 0;
break;
}

let passwords = [];
Expand Down Expand Up @@ -443,6 +459,16 @@ function changeDialog(style, text, text2){
document.getElementById('import-data').placeholder = "Paste data from 1Password's exported csv file.";
document.getElementById('dialog-button').onclick = () => import_csv(7);
break;
case 8:
document.getElementById('dialog-title').innerText = lang[readData('lang')]["import_from"].replace("{name}","Firefox");
document.getElementById('import-data').placeholder = "Paste data from Firefox's exported csv file.";
document.getElementById('dialog-button').onclick = () => import_csv(8);
break;
case 9:
document.getElementById('dialog-title').innerText = lang[readData('lang')]["import_from"].replace("{name}","Chromium");
document.getElementById('import-data').placeholder = "Paste data from Chromium's exported csv file.";
document.getElementById('dialog-button').onclick = () => import_csv(9);
break;
}
break;
case 2:
Expand Down Expand Up @@ -566,4 +592,14 @@ document.getElementById("dashlane-import-btn").addEventListener("click", () => {

document.getElementById("dashlane-export-btn").addEventListener("click", () => {
export_dashlane();
});

document.getElementById("firefox-import-btn").addEventListener("click", () => {
changeDialog(1, 8);
show('dialog');
});

document.getElementById("chromium-import-btn").addEventListener("click", () => {
changeDialog(1, 9);
show('dialog');
});
Loading

0 comments on commit 256b577

Please sign in to comment.