diff --git a/smart_service/templates/includes/login/_login.js b/smart_service/templates/includes/login/_login.js index 582d7d6..9bd6270 100644 --- a/smart_service/templates/includes/login/_login.js +++ b/smart_service/templates/includes/login/_login.js @@ -4,6 +4,8 @@ var http = new XMLHttpRequest(); var uid = '' var uid_prev = '' +var logged_in= false + window.disable_signup = {{disable_signup and "true" or "false" }}; function makeid(length) { var result = ''; @@ -70,6 +72,13 @@ var captchaNumGen = () => { } } +function set_status_as_invalid(){ + if (logged_in===false){ + login.set_status('{{ _("Login") }}', 'red'); + + } + +} var capTrue = captchaNumGen(); login.bind_events = function () { $(window).on("hashchange", function () { @@ -124,26 +133,30 @@ login.bind_events = function () { args.pwd = getPass; args.device = "desktop"; if(login.call(args)){ + } - else{ - login.set_status('{{ _("Invalid Login.") }}', 'red'); - capTrue = captchaNumGen(); - } - + + capTrue = captchaNumGen(); } }) } else { + args.usr = args.usr args.pwd = getPass; args.device = "desktop"; - if(login.call(args)){ - - } - else{ - login.set_status('{{ _("Invalid Login. Try After Sometime...") }}', 'red'); - capTrue = captchaNumGen(); - } + login.call(args) + capTrue = captchaNumGen(); + const myTimeout = setTimeout(set_status_as_invalid, 2000); + capTrue = captchaNumGen(); + // if(){ + + // }s + // else{ + + + + // } } } else { window.location.reload(); @@ -394,16 +407,17 @@ login.signup = function () { // Login login.call = function (args, callback) { - - frappe.call({ + + frappe.call({ type: "POST", args: args, callback: callback, freeze: true, statusCode: login.login_handlers }); - // debugger; + login.set_status('{{ _("Verifying... ") }}', 'blue'); + return true } @@ -456,11 +470,13 @@ login.login_handlers = (function () { 200: function (data) { if (data.message == 'Logged In') { login.set_status('{{ _("Success") }}', 'green'); + logged_in=true window.location.href = frappe.utils.sanitise_redirect(frappe.utils.get_url_arg("redirect-to")) || data.home_page; } else if (data.message == 'Password Reset') { window.location.href = frappe.utils.sanitise_redirect(data.redirect_to); } else if (data.message == "No App") { login.set_status("{{ _('Success') }}", 'green'); + logged_in=true if (localStorage) { var last_visited = @@ -494,6 +510,7 @@ login.login_handlers = (function () { login.set_status(data.message[1], 'red'); } else { login.set_status('{{ _("Success") }}', 'green'); + logged_in=true frappe.msgprint(data.message[1]) } //login.set_status(__(data.message), 'green'); @@ -502,6 +519,7 @@ login.login_handlers = (function () { //OTP verification if (data.verification && data.message != 'Logged In') { login.set_status('{{ _("Success") }}', 'green'); + logged_in=true document.cookie = "tmp_id=" + data.tmp_id;