github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(auth): login spinner (#2999)

pull/3003/head
xAt0mZ 2019-07-10 18:13:03 +02:00 committed by Anthony Lapenna
parent 4084e7c8ec
commit 693182fbd3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/portainer/views/auth/auth.html
View File

@ -43,7 +43,10 @@
</div> </div>
</a> </a>
<button type="submit" class="btn btn-primary btn-sm pull-right" ng-click="authenticateUser()"><i class="fa fa-sign-in-alt" aria-hidden="true"></i> Login</button> <button type="submit" class="btn btn-primary btn-sm pull-right" ng-click="authenticateUser()" button-spinner="state.loginInProgress" ng-disabled="state.loginInProgress">
<span ng-hide="state.loginInProgress"><i class="fa fa-sign-in-alt" aria-hidden="true"></i> Login</span>
<span ng-show="state.loginInProgress">Login in progress...</span>
</button>
<span class="pull-right" style="margin: 5px;" ng-if="state.AuthenticationError"> <span class="pull-right" style="margin: 5px;" ng-if="state.AuthenticationError">
<i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-right: 2px;"></i> <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>

4
app/portainer/views/auth/authController.js
View File

@ -23,12 +23,14 @@ function($async, $q, $scope, $state, $stateParams, $sanitize, Authentication, Us
await ExtensionService.retrieveAndSaveEnabledExtensions(); await ExtensionService.retrieveAndSaveEnabledExtensions();
} catch (err) { } catch (err) {
Notifications.error('Failure', err, 'Unable to retrieve enabled extensions'); Notifications.error('Failure', err, 'Unable to retrieve enabled extensions');
$scope.state.loginInProgress = false;
} }
} }
$scope.authenticateUser = function() { $scope.authenticateUser = function() {
var username = $scope.formValues.Username; var username = $scope.formValues.Username;
var password = $scope.formValues.Password; var password = $scope.formValues.Password;
$scope.state.loginInProgress = true;
Authentication.login(username, password) Authentication.login(username, password)
.then(function success() { .then(function success() {
@ -53,6 +55,7 @@ function($async, $q, $scope, $state, $stateParams, $sanitize, Authentication, Us
}) })
.catch(function error() { .catch(function error() {
$scope.state.AuthenticationError = 'Invalid credentials'; $scope.state.AuthenticationError = 'Invalid credentials';
$scope.state.loginInProgress = false;
}); });
}); });
}; };
@ -96,6 +99,7 @@ function($async, $q, $scope, $state, $stateParams, $sanitize, Authentication, Us
}) })
.catch(function error(err) { .catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve endpoints'); Notifications.error('Failure', err, 'Unable to retrieve endpoints');
$scope.state.loginInProgress = false;
}); });
} }