TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-11 08:43:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #686 from matthojo/Sign-up-screen-UI

Browse Source 
Improved Auth screen markup and validation checks
This commit is contained in:
Hannah Wolfe 2013-09-12 06:25:27 -07:00
commit cc785cc981
9 changed files with 102 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/client/assets/sass/layouts/login.scss → core/client/assets/sass/layouts/auth.scss
View File

@ -1,5 +1,5 @@
/*
* These styles control elements specific to the Ghost admin login screen.
* These styles control elements specific to the Ghost admin login / signup screens.
*
* Table of Contents:
*
@ -14,6 +14,7 @@
============================================================================= */
.ghost-login,
.ghost-signup,
.ghost-forgotten {
color: $midgrey;
background: $darkgrey;
@ -28,7 +29,9 @@
}//.ghost-login
.login-box {
.login-box,
.signup-box,
.forgotten-box {
max-width: 530px;
height: 90%;
margin: 0 auto;

2
core/client/assets/sass/screen.scss
View File

@ -37,7 +37,7 @@
@import "layouts/editor";
/* The write/edit post screen. */
@import "layouts/login";
@import "layouts/auth";
/* The login screen. */
@import "layouts/errors";

4
core/client/router.js
View File

@ -19,7 +19,7 @@
},
signup: function () {
Ghost.currentView = new Ghost.Views.Signup({ el: '.js-login-box' });
Ghost.currentView = new Ghost.Views.Signup({ el: '.js-signup-box' });
},
login: function () {
@ -27,7 +27,7 @@
},
forgotten: function () {
Ghost.currentView = new Ghost.Views.Forgotten({ el: '.js-login-box' });
Ghost.currentView = new Ghost.Views.Forgotten({ el: '.js-forgotten-box' });
},
blog: function () {

85
core/client/views/login.js
View File

@ -2,17 +2,14 @@
(function () {
"use strict";
Ghost.Views.Login = Ghost.View.extend({
Ghost.SimpleFormView = Ghost.View.extend({
initialize: function () {
this.render();
$(".js-login-box").fadeIn(500, function () {
$(".js-login-box").css({"opacity": 0}).animate({"opacity": 1}, 500, function () {
$("[name='email']").focus();
});
}
});
Ghost.Views.Login = Ghost.SimpleFormView.extend({
},
templateName: "login",
@ -48,7 +45,14 @@
}
});
Ghost.Views.Signup = Ghost.SimpleFormView.extend({
Ghost.Views.Signup = Ghost.View.extend({
initialize: function () {
this.render();
$(".js-signup-box").css({"opacity": 0}).animate({"opacity": 1}, 500, function () {
$("[name='name']").focus();
});
},
templateName: "signup",
@ -62,29 +66,56 @@
email = this.$el.find('.email').val(),
password = this.$el.find('.password').val();
$.ajax({
url: '/ghost/signup/',
type: 'POST',
data: {
name: name,
email: email,
password: password
},
success: function (msg) {
window.location.href = msg.redirect;
},
error: function (xhr) {
Ghost.notifications.addItem({
type: 'error',
message: Ghost.Views.Utils.getRequestErrorMessage(xhr),
status: 'passive'
});
}
});
if (!name) {
Ghost.notifications.addItem({
type: 'error',
message: "Please enter a name",
status: 'passive'
});
} else if (!email) {
Ghost.notifications.addItem({
type: 'error',
message: "Please enter an email",
status: 'passive'
});
} else if (!password) {
Ghost.notifications.addItem({
type: 'error',
message: "Please enter a password",
status: 'passive'
});
} else {
$.ajax({
url: '/ghost/signup/',
type: 'POST',
data: {
name: name,
email: email,
password: password
},
success: function (msg) {
window.location.href = msg.redirect;
},
error: function (xhr) {
Ghost.notifications.addItem({
type: 'error',
message: Ghost.Views.Utils.getRequestErrorMessage(xhr),
status: 'passive'
});
}
});
}
}
});
Ghost.Views.Forgotten = Ghost.SimpleFormView.extend({
Ghost.Views.Forgotten = Ghost.View.extend({
initialize: function () {
this.render();
$(".js-forgotten-box").css({"opacity": 0}).animate({"opacity": 1}, 500, function () {
$("[name='email']").focus();
});
},
templateName: "forgotten",

6
core/server/controllers/admin.js
View File

@ -110,7 +110,7 @@ adminControllers = {
}
},
'login': function (req, res) {
res.render('signup', {
res.render('login', {
bodyClass: 'ghost-login',
hideNavbar: true,
adminNav: setSelected(adminNavbar, 'login')
@ -155,7 +155,7 @@ adminControllers = {
},
'signup': function (req, res) {
res.render('signup', {
bodyClass: 'ghost-login',
bodyClass: 'ghost-signup',
hideNavbar: true,
adminNav: setSelected(adminNavbar, 'login')
});
@ -183,7 +183,7 @@ adminControllers = {
},
'forgotten': function (req, res) {
res.render('signup', {
res.render('forgotten', {
bodyClass: 'ghost-forgotten',
hideNavbar: true,
adminNav: setSelected(adminNavbar, 'login')

4
core/server/views/forgotten.hbs Normal file
View File

@ -0,0 +1,4 @@
{{!< default}}
<section class="forgotten-box js-forgotten-box">
</section>

2
core/server/views/signup.hbs
View File

@ -1,4 +1,4 @@
{{!< default}}
<section class="login-box js-login-box">
<section class="signup-box js-signup-box">
</section>

42
core/test/functional/admin/01_login_test.js
View File

@ -17,15 +17,13 @@ casper.test.begin('Ensure a User is Registered', 2, function suite(test) {
casper.start(url + 'ghost/signup/').viewport(1280, 1024);
casper.waitFor(function checkOpaque() {
return this.evaluate(function () {
var loginBox = document.querySelector('.login-box');
return window.getComputedStyle(loginBox).getPropertyValue('display') === "table"
&& window.getComputedStyle(loginBox).getPropertyValue('opacity') === "1";
casper.waitForOpaque(".signup-box",
function then() {
this.fill("#signup", newUser, true);
},
function onTimeout() {
test.fail('Sign up form didn\'t fade in.');
});
}, function then() {
this.fill("#signup", user, true);
});
casper.waitForSelectorTextChange('.notification-error', function onSuccess() {
test.assertSelectorHasText('.notification-error', 'already registered');
@ -86,18 +84,13 @@ casper.test.begin("Can't spam it", 4, function suite(test) {
test.assertTitle("", "Ghost admin has no title");
}).viewport(1280, 1024);
casper.waitFor(function checkOpaque() {
return this.evaluate(function () {
var loginBox = document.querySelector('.login-box');
return window.getComputedStyle(loginBox).getPropertyValue('display') === "table"
&& window.getComputedStyle(loginBox).getPropertyValue('opacity') === "1";
casper.waitForOpaque(".login-box",
function then() {
this.fill("#login", falseUser, true);
},
function onTimeout() {
test.fail('Sign in form didn\'t fade in.');
});
}, function then() {
this.fill("#login", falseUser, true);
}, function onTimeout() {
test.fail('Sign in form didn\'t fade in.');
});
casper.wait(200, function doneWait() {
this.fill("#login", falseUser, true);
@ -127,15 +120,10 @@ casper.test.begin("Can login to Ghost", 4, function suite(test) {
test.assertTitle("", "Ghost admin has no title");
}).viewport(1280, 1024);
casper.waitFor(function checkOpaque() {
return casper.evaluate(function () {
var loginBox = document.querySelector('.login-box');
return window.getComputedStyle(loginBox).getPropertyValue('display') === "table"
&& window.getComputedStyle(loginBox).getPropertyValue('opacity') === "1";
casper.waitForOpaque(".login-box",
function then() {
this.fill("#login", user, true);
});
}, function then() {
this.fill("#login", user, true);
});
casper.waitForResource(/ghost\/$/, function testForDashboard() {
test.assertUrlMatch(/ghost\/$/, 'We got redirected to the Ghost page');

13
core/test/functional/base.js
View File

@ -27,6 +27,11 @@ var host = casper.cli.options.host || 'localhost',
email = casper.cli.options.email || 'ghost@tryghost.org',
password = casper.cli.options.password || 'Sl1m3rson',
url = "http://" + host + (noPort ? '/' : ":" + port + "/"),
newUser = {
name: "Test User",
email: email,
password: password
},
user = {
email: email,
password: password
@ -51,6 +56,14 @@ casper.writeContentToCodeMirror = function (content) {
return this;
};
casper.waitForOpaque = function (classname, then, timeout) {
casper.waitFor(function checkOpaque() {
return this.evaluate(function (element) {
var target = document.querySelector(element);
return window.getComputedStyle(target).getPropertyValue('opacity') === "1";
}, classname);
}, then, timeout);
};
// ## Debugging
// output all errors to the console