Add login to wmail on singup screen

Remove red border on required text input on Firefox
This commit is contained in:
Tankred Hase 2015-02-14 16:07:04 +01:00
parent 59dc2008a4
commit 93dc53f7b7
5 changed files with 33 additions and 7 deletions

View File

@ -17,7 +17,19 @@ appCfg.config = {
privkeyServerUrl: 'https://keychain.whiteout.io', privkeyServerUrl: 'https://keychain.whiteout.io',
adminUrl: 'https://admin-node.whiteout.io', adminUrl: 'https://admin-node.whiteout.io',
settingsUrl: 'https://settings.whiteout.io/autodiscovery/', settingsUrl: 'https://settings.whiteout.io/autodiscovery/',
wmailDomain: 'wmail.io', mailServer: {
domain: 'wmail.io',
imap: {
hostname: 'imap.wmail.io',
port: 993,
secure: true
},
smtp: {
hostname: 'smtp.wmail.io',
port: 465,
secure: true
}
},
oauthDomains: [/\.gmail\.com$/, /\.googlemail\.com$/], oauthDomains: [/\.gmail\.com$/, /\.googlemail\.com$/],
ignoreUploadOnSentDomains: [/\.gmail\.com$/, /\.googlemail\.com$/], ignoreUploadOnSentDomains: [/\.gmail\.com$/, /\.googlemail\.com$/],
serverPrivateKeyId: 'EE342F0DDBB0F3BE', serverPrivateKeyId: 'EE342F0DDBB0F3BE',

View File

@ -5,6 +5,7 @@ var CreateAccountCtrl = function($scope, $location, $routeParams, $q, auth, admi
// init phone region // init phone region
$scope.region = 'DE'; $scope.region = 'DE';
$scope.domain = '@' + appConfig.config.mailServer.domain;
$scope.createWhiteoutAccount = function() { $scope.createWhiteoutAccount = function() {
if ($scope.form.$invalid) { if ($scope.form.$invalid) {
@ -19,7 +20,7 @@ var CreateAccountCtrl = function($scope, $location, $routeParams, $q, auth, admi
}).then(function() { }).then(function() {
// read form values // read form values
var emailAddress = $scope.user + '@' + appConfig.config.wmailDomain; var emailAddress = $scope.user + $scope.domain;
var phone = PhoneNumber.Parse($scope.dial, $scope.region); var phone = PhoneNumber.Parse($scope.dial, $scope.region);
if (!phone || !phone.internationalNumber) { if (!phone || !phone.internationalNumber) {
throw new Error('Invalid phone number!'); throw new Error('Invalid phone number!');
@ -50,6 +51,15 @@ var CreateAccountCtrl = function($scope, $location, $routeParams, $q, auth, admi
$scope.errMsg = err.errMsg || err.message; $scope.errMsg = err.errMsg || err.message;
}); });
}; };
$scope.loginToExisting = function() {
// set server config
$scope.state.login = {
mailConfig: appConfig.config.mailServer
};
// proceed to login
$location.path('/login-set-credentials');
};
}; };
module.exports = CreateAccountCtrl; module.exports = CreateAccountCtrl;

View File

@ -105,6 +105,7 @@
font-size: $font-size-base; font-size: $font-size-base;
padding: 0.5em 0.7em; padding: 0.5em 0.7em;
outline: none; outline: none;
box-shadow: none;
// ios // ios
border-radius: 0; border-radius: 0;
-webkit-appearance: none; -webkit-appearance: none;

View File

@ -5,15 +5,15 @@
</header> </header>
<main class="page__main"> <main class="page__main">
<h2 class="typo-title">Create Whiteout account</h2> <h2 class="typo-title">Create Whiteout account</h2>
<p class="typo-paragraph">Please fill out the following form. You will need a <em>beta access code</em> during the private beta period. To participate in the private beta please <a href="http://eepurl.com/ba09in" target="_blank">sign up</a>.</p> <p class="typo-paragraph">Sign up for an encrypted mailbox hosted in Germany.<br>Already have an account? <a href="#" wo-touch="$event.preventDefault(); loginToExisting()">Log in here</a>.</p>
<form class="form" name="form"> <form class="form" name="form">
<p class="form__error-message" ng-show="errMsg">{{errMsg}}</p> <p class="form__error-message" ng-show="errMsg">{{errMsg}}</p>
<div class="form__row"> <div class="form__row">
<div class="input-email-fixed-domain"> <div class="input-email-fixed-domain">
<input class="input-text" ng-model="user" required type="text" wo-focus-me="true" tabindex="1" <input class="input-text" ng-model="user" required type="text" tabindex="1"
pattern='[a-zA-Z0-9\.]+' placeholder="User name" pattern='[a-zA-Z0-9\.]+' placeholder="User name"
autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"> autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false">
<span>@wmail.io</span> <span>{{domain}}</span>
</div> </div>
</div> </div>
<div class="form__row"> <div class="form__row">
@ -288,7 +288,7 @@
</div> </div>
</div> </div>
<div class="form__row"> <div class="form__row">
<input class="input-text" type="text" ng-model="betaCode" required placeholder="Beta access code" tabindex="6"> <input class="input-text" type="text" ng-model="betaCode" required placeholder="Beta access code (for private beta)" tabindex="6">
</div> </div>
<div class="spinner-block" ng-show="busy"> <div class="spinner-block" ng-show="busy">
<span class="spinner spinner--big"></span> <span class="spinner spinner--big"></span>
@ -297,6 +297,9 @@
<button class="btn" type="submit" ng-click="createWhiteoutAccount()">Create</button> <button class="btn" type="submit" ng-click="createWhiteoutAccount()">Create</button>
</div> </div>
</form> </form>
<p class="typo-paragraph">
<a href="http://eepurl.com/ba09in" target="_blank" title="Sign up for private beta access.">Need a beta access code?</a>
</p>
</main> </main>
<div ng-include="'tpl/page-footer.html'"></div> <div ng-include="'tpl/page-footer.html'"></div>
</div> </div>

View File

@ -32,7 +32,7 @@
</div> </div>
<div class="form__row"> <div class="form__row">
<input class="input-text" type="text" ng-model="realname" <input class="input-text" type="text" ng-model="realname"
placeholder="Full name (optional)" wo-focus-me="true" tabindex="2"> placeholder="Full name (optional)" tabindex="2">
</div> </div>
<div class="form__row" ng-hide="useOAuth"> <div class="form__row" ng-hide="useOAuth">
<input ng-required="!useOAuth" class="input-text" type="password" <input ng-required="!useOAuth" class="input-text" type="password"