Simplify public key verification screen

Tankred Hase 8 years ago
parent c30fbe8b6b
commit 8295806b1f

@ -1,6 +1,6 @@
'use strict';
var RETRY_INTERVAL = 10000;
var RETRY_INTERVAL = 5000;
var PublicKeyVerifierCtrl = function($scope, $location, $q, $timeout, $interval, auth, publickeyVerifier, publicKey) {
$scope.retries = 0;
@ -9,11 +9,6 @@ var PublicKeyVerifierCtrl = function($scope, $location, $q, $timeout, $interval,
* Runs a verification attempt
$scope.verify = function() {
if ($scope.busy) {
$scope.busy = true;
return $q(function(resolve) {
@ -34,7 +29,6 @@ var PublicKeyVerifierCtrl = function($scope, $location, $q, $timeout, $interval,
return success();
}).catch(function(error) {
$scope.busy = false;
$scope.errMsg = error.message; // display error
scheduleVerification(); // schedule next verification attempt

@ -1,4 +1,4 @@
<section class="page" ng-class="{'u-waiting-cursor': busy}">
<section class="page u-waiting-cursor">
<div class="page__canvas">
<header class="page__header">
<img src="img/whiteout_logo.svg" alt="">
@ -6,30 +6,14 @@
<main class="page__main">
<h2 class="typo-title">Email address verification</h2>
<p class="typo-paragraph">
We will now automatically verify your email address with a confirmation message we've sent you.
We will now automatically verify your email address with a confirmation message.
<div ng-show="!busy">
<p class="typo-paragraph">
Verifying your email address in {{countdown}} seconds.
<form class="form" name="form">
<p class="form__error-message" ng-show="errMsg">{{errMsg}}</p>
<div class="form__row">
<button type="submit" ng-click="verify()" class="btn" tabindex="1">Verify now</button>
<p class="form__error-message" ng-show="errMsg">{{errMsg}}</p>
<div ng-show="busy">
<p class="typo-paragraph">
This could take a moment. Please be patient, you'll be forwarded to your inbox when verification is successful.
<div class="spinner-block spinner-block--standalone">
<span class="spinner spinner--big"></span>
<div class="spinner-block spinner-block--standalone">
<span class="spinner spinner--big"></span>
<div ng-include="'tpl/page-footer.html'"></div>