Windy/juci
1
0
Fork 0
mirror of https://github.com/mkschreder/juci.git synced 2025-01-09 04:19:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

juci-login: remove unwanted spaces and change invalid password message to "valid" instead of "correct" as it is more standardized formulation.

Browse Source
This commit is contained in:
Martin Schröder 2016-10-26 13:25:24 +02:00
parent 993f468f91
commit 4498ebb5b2
1 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
juci/src/widgets/juci-login.js
View File

@ -1,4 +1,4 @@
/*
/*
This file is part of JUCI (https://github.com/mkschreder/juci.git)
Copyright (c) 2015 Martin K. Schröder <mkschreder.uk@gmail.com>
@ -12,102 +12,102 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
*/
*/
JUCI.app
.directive("juciLogin", function(){
return {
// accepted parameters for this tag
scope: {
},
templateUrl: "/widgets/juci-login.html",
replace: true,
},
templateUrl: "/widgets/juci-login.html",
replace: true,
controller: "juciLogin",
controllerAs: "ctrl"
};
};
})
.controller("juciLogin", function($scope, $config, $state,
.controller("juciLogin", function($scope, $config, $state,
$window, $rpc, $localStorage, gettext){
$scope.form = {
"username": "",
"password": "",
"remember": 0,
$scope.form = {
"username": "",
"password": "",
"remember": 0,
"host": localStorage.getItem("rpc_url") || ""
};
$scope.showlogin = true;
$scope.showHost = true;
};
$scope.showlogin = true;
$scope.showHost = true;
if($config.settings.login){
$scope.form.username = ($config.settings && $config.settings.login)? $config.settings.login.defaultuser.value: "admin";
$scope.showlogin = ($config.settings && $config.settings.login)? $config.settings.login.showusername.value:true;
$scope.showHost = $config.settings.login.showhost.value;
}
}
$scope.connecting = true;
$scope.errors = [];
$scope.connecting = true;
$scope.errors = [];
JUCI.interval.repeat("login-connection-check", 5000, function(done){
// TODO: this connection logic is bad. Must refactor this into something that is more stable.
// TODO: this connection logic is bad. Must refactor this into something that is more stable.
// Must be done without forcing user to reload the page!
$scope.is_connected = $rpc.$isConnected();
$scope.connecting = $rpc.conn_promise && !$scope.is_connected;
setTimeout(function(){ $scope.$apply(); }, 0);
done();
});
$scope.is_connected = $rpc.$isConnected();
$scope.connecting = $rpc.conn_promise && !$scope.is_connected;
setTimeout(function(){ $scope.$apply(); }, 0);
done();
});
$scope.doLogin = function(redirect){
var deferred = $.Deferred();
if(!redirect) redirect = "overview";
$scope.errors = [];
$scope.logging_in = true;
var deferred = $.Deferred();
if(!redirect) redirect = "overview";
$scope.errors = [];
$scope.logging_in = true;
async.series([
function(next){
$rpc.$connect($scope.form.host).done(function(){
next();
next();
}).fail(function(){
$scope.errors.push(gettext("Could not connect to "+$scope.form.host+"!"));
$scope.logging_in = false;
$scope.$apply();
deferred.reject();
});
},
$scope.logging_in = false;
$scope.$apply();
deferred.reject();
});
},
function(next){
$rpc.$login($scope.form.username,$scope.form.password).done(function success(res){
window.location.href = "/";
//JUCI.redirectHome();
next();
window.location.href = "/";
//JUCI.redirectHome();
next();
}).fail(function fail(res){
//$scope.errors.push(res);
console.error("Could not log in!");
$scope.errors.push(gettext("Please enter correct username and password!"));
$scope.logging_in = false;
$scope.$apply();
deferred.reject();
});
},
//$scope.errors.push(res);
console.error("Could not log in!");
$scope.errors.push(gettext("Please enter valid username and password!"));
$scope.logging_in = false;
$scope.$apply();
deferred.reject();
});
},
function(next){
JUCI.$init().done(function(){
$state.go(redirect);
deferred.resolve();
});
$state.go(redirect);
deferred.resolve();
});
}
]);
return deferred.promise();
]);
return deferred.promise();
}
$scope.doLogout = function(){
var deferred = $.Deferred();
var deferred = $.Deferred();
$rpc.$logout().done(function(){
console.log("Logged out!");
JUCI.redirectHome();
window.location.reload();
deferred.resolve();
console.log("Logged out!");
JUCI.redirectHome();
window.location.reload();
deferred.resolve();
}).fail(function(){
console.error("Error logging out!");
deferred.reject();
});
return deferred.promise();
deferred.reject();
});
return deferred.promise();
}
});
});