Skip to content

Commit

Permalink
Update to v8.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zigazajc007 committed Dec 14, 2022
1 parent 893ff9f commit d41b6fa
Show file tree
Hide file tree
Showing 18 changed files with 423 additions and 331 deletions.
4 changes: 4 additions & 0 deletions css/export.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ body{
overflow-x: hidden;
}

body * {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}

#passky-logo{
background-color: #e6f5ff;
}
Expand Down
4 changes: 4 additions & 0 deletions css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ body{
min-width: 300px;
}

body * {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}

input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button{
-webkit-appearance: none;
Expand Down
4 changes: 4 additions & 0 deletions css/passwords.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ body{
overflow-x: hidden;
}

body * {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}

input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button{
-webkit-appearance: none;
Expand Down
4 changes: 4 additions & 0 deletions css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ body{
overflow-x: hidden;
}

body * {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}

select{
-webkit-appearance: none;
}
2 changes: 1 addition & 1 deletion css/tailwind.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="primaryBackgroundColor min-h-screen flex items-center justify-center py-6 px-4 sm:px-3 lg:px-8">
<div class="max-w-md w-full space-y-6">
<div>
<img class="mx-auto h-20 w-auto" src="images/logo.png" alt="Passky">
<img id="passky-logo" class="mx-auto h-20 w-auto" src="images/logo.png" alt="Passky">
</div>
<form id="login_form" class="mt-8 space-y-6">
<input type="hidden" name="remember" value="true">
Expand Down
36 changes: 23 additions & 13 deletions js/export.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ function import_bitwarden(){

let ido = JSON.parse(imported_data);

if(ido["encrypted"] == null || typeof(ido["encrypted"]) == 'undefined' || ido["encrypted"] == true){
if(typeof(ido["encrypted"]) == 'undefined' || ido["encrypted"] == null || ido["encrypted"] == true){
changeDialog(2, 1, 2);
return;
}

if(ido["items"] == null || typeof(ido["items"]) == 'undefined'){
if(typeof(ido["items"]) == 'undefined' || ido["items"] == null){
changeDialog(2, 1, 2);
return;
}
Expand All @@ -118,18 +118,22 @@ function import_bitwarden(){
if(typeof(ido["items"][i]["login"]["uris"]) != 'undefined' && typeof(ido["items"][i]["login"]["uris"][0]) != 'undefined' && typeof(ido["items"][i]["login"]["uris"][0]["uri"]) != 'undefined'){
website = ido["items"][i]["login"]["uris"][0]["uri"];
}

if(typeof(website) == 'undefined' || website == null) continue;
website = website.replace("http://", "").replace("https://", "").replace("www.", "").replace(" ", "-");
if(website.slice(-1) == '/') website = website.slice(0, -1);
let username = ido["items"][i]["login"]["username"];
let password = ido["items"][i]["login"]["password"];
let message = ido["items"][i]["login"]["notes"];

if(typeof(username) == 'undefined' || username == null) continue;
if(typeof(password) == 'undefined' || password == null) continue;
if(typeof(message) == 'undefined' || message == null) message = "";

passwords[j] = {};
passwords[j]["website"] = website;
passwords[j]["username"] = username;
passwords[j]["password"] = password;
passwords[j]["message"] = message;
passwords[j]["website"] = website.toString();
passwords[j]["username"] = username.toString();
passwords[j]["password"] = password.toString();
passwords[j]["message"] = message.toString();
j++;
}

Expand Down Expand Up @@ -341,7 +345,9 @@ function import_csv(id){

let passwords = [];
for(let i = 1, j = 0; i < ido.length; i++){
let website = ido[i][websiteID].replace("http://", "").replace("https://", "").replace("www.", "").replace(" ", "-");
let website = ido[i][websiteID];
if(typeof(website) == 'undefined' || website == null) website = ido[i][titleID];
website = website.replace("http://", "").replace("https://", "").replace("www.", "").replace(" ", "-");
if(website.slice(-1) == '/') website = website.slice(0, -1);

if(!Validate.pWebsite(website)){
Expand All @@ -353,11 +359,15 @@ function import_csv(id){
let password = ido[i][passwordID];
let message = ido[i][messageID];

if(typeof(username) == 'undefined' || username == null) continue;
if(typeof(password) == 'undefined' || password == null) continue;
if(typeof(message) == 'undefined' || message == null) message = "";

passwords[j] = {};
passwords[j]["website"] = website;
passwords[j]["username"] = username;
passwords[j]["password"] = password;
passwords[j]["message"] = message;
passwords[j]["website"] = website.toString();
passwords[j]["username"] = username.toString();
passwords[j]["password"] = password.toString();
passwords[j]["message"] = message.toString();
j++;
}

Expand All @@ -373,7 +383,7 @@ function import_data(passwords, encrypted = false){

showDialogButtons();

if(typeof response['error'] === 'undefined'){
if(typeof(response['error']) == 'undefined'){
changeDialog(0, lang["server_unreachable"]);
return;
}
Expand Down
42 changes: 42 additions & 0 deletions js/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ loadData().then(() => {

});

let debugMode = 0;

document.getElementById("login_form").addEventListener("submit", e => {
e.preventDefault();
login_check();
Expand All @@ -43,6 +45,15 @@ document.getElementById("server-picker").addEventListener("click", () => {
toggleServerPicker('passky-server', 'passky-server2', 'server-picker');
});

document.getElementById('passky-logo').addEventListener('click', () => {
debugMode++;
if(debugMode >= 5){
debugMode = 0;
changeDialog(5);
show("dialog");
}
});

function toggleServerPicker(id, id2, buttonID){
if(isfHidden(id)){
fhide(id2);
Expand Down Expand Up @@ -130,6 +141,25 @@ function changeDialog(style, text){

hideDialogButtons();
break;
case 5:
//Debug dialog
document.getElementById('dialog-icon').className = "mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:mx-0 sm:h-10 sm:w-10";
document.getElementById('dialog-icon').innerHTML = "<svg class='h-6 w-6 text-green-600' xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24' stroke='currentColor' aria-hidden='true'><path stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M5 13l4 4L19 7' /></svg>";

document.getElementById('dialog-title').innerText = "Debug";

document.getElementById('dialog-text').innerText = getDebugInfo();

document.getElementById('dialog-button-cancel').style.display = 'initial';
document.getElementById("dialog-button-cancel").onclick = () => hide("dialog");

document.getElementById('dialog-button').className = "primaryButton inline-flex justify-center w-full rounded-md border border-transparent shadow-sm px-4 py-2 text-base font-medium focus:outline-none sm:w-auto sm:text-sm";
document.getElementById('dialog-button').innerText = lang["copy"];
document.getElementById('dialog-button').onclick = () => {
copyToClipboard(getDebugInfo());
hide('dialog');
}
break;
}
}

Expand Down Expand Up @@ -267,4 +297,16 @@ function forget_username(){
break;
}
});
}

function getDebugInfo(){
let info = "Client Version: 8.0.1";
if(readData('url') != null) info += "\nServer: " + readData('url');
if(readData('username') != null) info += "\nUsername: " + readData('username');
info += "\nTheme: " + readData('theme');
info += "\nLanguage: " + readData('lang');
info += "\nSession Duration: " + readData('sessionDuration');
info += "\nWorkers Supported: " + !!window.Worker;
info += "\nUser Agent: " + navigator.userAgent;
return info;
}
46 changes: 34 additions & 12 deletions js/passwords.js

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions lang/es-ES/lang.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"26": "La autenticación de dos factores ya está activada.",
"27": "La autenticación de dos factores no está activada.",
"28": "El correo electrónico no está activado en este servidor.",
"29": "License key is invalid!",
"30": "This license key has already been used.",
"29": "¡La clave de licencia no es válida!",
"30": "Esta clave de licencia ya se ha utilizado.",
"300": "¡El sitio web es demasiado largo!",
"301": "¡El nombre de usuario es demasiado largo!",
"302": "¡La contraseña es demasiado larga!",
Expand Down Expand Up @@ -100,9 +100,9 @@
"password_generator": "Generar contraseña",
"delete_password": "Eliminar contraseña",
"delete_password_confirmation": "¿Esta seguro que desea eliminar su contraseña? Su contraseña será eliminada permanentemente del servidor. Esta acción NO puede revertirse.",
"delete_passwords": "Delete passwords",
"delete_passwords_info": "Deleted passwords can not be recovered.",
"delete_passwords_confirmation": "Are you sure you want to delete your passwords? Your passwords will be permanently removed from the server. This action can NOT be undone.",
"delete_passwords": "Eliminar contraseñas",
"delete_passwords_info": "Las contraseñas eliminadas no se pueden recuperar.",
"delete_passwords_confirmation": "¿Está seguro de que desea eliminar sus contraseñas? Sus contraseñas se eliminarán permanentemente del servidor. Esta acción no se puede deshacer.",
"delete_account": "Eliminar cuenta",
"delete_account_info": "Una vez eliminada su cuenta, perderá toda la información asociada a ella.",
"delete_account_confirmation": "¿Está seguro que desea eliminar su cuenta? Toda su información será eliminada permanentemente del servidor. Esta acción NO puede revertirse.",
Expand Down Expand Up @@ -131,28 +131,28 @@
"total_passwords": "Total de contraseñas",
"decryption_time": "Tiempo de descifrado",
"client_version": "Versión del cliente",
"upgrade_account": "Upgrade Account",
"validate": "Validate",
"license_key": "License Key",
"account": "Account",
"expiration": "Expiration",
"free": "Free",
"premium": "Premium",
"never": "Never",
"license_added_successfully": "Your account has been successfully upgraded to Premium and it will last until {date}.",
"please_wait": "PLEASE WAIT",
"saving_password": "Saving password...",
"changing_password": "Changing password...",
"deleting_password": "Deleting password...",
"deleting_passwords": "Deleting passwords...",
"deleting_account": "Deleting account...",
"signing_in": "Signing in...",
"signing_up": "Signing up...",
"sending_email": "Sending email...",
"enabling_2fa": "Enabling 2FA...",
"disabling_2fa": "Disabling 2FA...",
"adding_yubikey": "Adding Yubikey...",
"removing_yubikey": "Removing Yubikey...",
"validating_license": "Validating license key...",
"decrypting_passwords": "Decrypting passwords..."
"upgrade_account": "Actualizar cuenta",
"validate": "Validar",
"license_key": "Clave de licencia",
"account": "Cuenta",
"expiration": "Vencimiento",
"free": "Libre",
"premium": "Prémium",
"never": "Nunca",
"license_added_successfully": "Su cuenta se ha actualizado con éxito a Prémium y durará hasta él {date}.",
"please_wait": "ESPERE POR FAVOR",
"saving_password": "Guardando contraseña...",
"changing_password": "Cambiando contraseña...",
"deleting_password": "Eliminando contraseña...",
"deleting_passwords": "Eliminando contraseñas...",
"deleting_account": "Eliminando cuenta...",
"signing_in": "Iniciando sesión...",
"signing_up": "Registrarse...",
"sending_email": "Enviando correo electrónico...",
"enabling_2fa": "Habilitando 2FA...",
"disabling_2fa": "Deshabilitando 2FA...",
"adding_yubikey": "Agregando Yubikey...",
"removing_yubikey": "Eliminando Yubikey...",
"validating_license": "Validando clave de licencia...",
"decrypting_passwords": "Descifrando contraseñas..."
}
Loading

0 comments on commit d41b6fa

Please sign in to comment.