mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-01 05:50:35 +03:00
Merge pull request #2388 from manuelmitasch/ember-login
Ember.js: User fixtures + injection + login
This commit is contained in:
commit
382ddb148b
@ -1,5 +1,6 @@
|
||||
import Resolver from 'ember/resolver';
|
||||
import initFixtures from 'ghost/fixtures/init';
|
||||
import {currentUser, injectCurrentUser} from 'ghost/initializers/current-user';
|
||||
|
||||
var App = Ember.Application.extend({
|
||||
/**
|
||||
@ -16,4 +17,7 @@ var App = Ember.Application.extend({
|
||||
|
||||
initFixtures();
|
||||
|
||||
export default App;
|
||||
App.initializer(currentUser);
|
||||
App.initializer(injectCurrentUser);
|
||||
|
||||
export default App;
|
5
core/client/controllers/application.js
Normal file
5
core/client/controllers/application.js
Normal file
@ -0,0 +1,5 @@
|
||||
var ApplicationController = Ember.Controller.extend({
|
||||
isLogin: Ember.computed.equal('currentPath', 'login')
|
||||
});
|
||||
|
||||
export default ApplicationController;
|
@ -1,32 +1,41 @@
|
||||
/*global ic */
|
||||
import postFixtures from 'ghost/fixtures/posts';
|
||||
import userFixtures from 'ghost/fixtures/users';
|
||||
|
||||
var response = function (responseBody, status) {
|
||||
status = status || 200;
|
||||
var textStatus = (status === 200) ? 'success' : 'error';
|
||||
|
||||
var post = function (id) {
|
||||
return {
|
||||
response: postFixtures.findBy('id', id),
|
||||
jqXHR: {},
|
||||
textStatus: 'success'
|
||||
response: responseBody,
|
||||
jqXHR: { status: status },
|
||||
textStatus: textStatus
|
||||
};
|
||||
};
|
||||
|
||||
var posts = function () {
|
||||
return {
|
||||
response: {
|
||||
'posts': postFixtures,
|
||||
'page': 1,
|
||||
'limit': 15,
|
||||
'pages': 1,
|
||||
'total': 2
|
||||
},
|
||||
jqXHR: {},
|
||||
textStatus: 'success'
|
||||
};
|
||||
var user = function (status) {
|
||||
return response(userFixtures.findBy('id', 1), status);
|
||||
};
|
||||
|
||||
var defineFixtures = function () {
|
||||
ic.ajax.defineFixture('/ghost/api/v0.1/posts', posts());
|
||||
ic.ajax.defineFixture('/ghost/api/v0.1/posts/1', post(1));
|
||||
ic.ajax.defineFixture('/ghost/api/v0.1/posts/2', post(2));
|
||||
var post = function (id, status) {
|
||||
return response(postFixtures.findBy('id', id), status);
|
||||
};
|
||||
|
||||
var posts = function (status) {
|
||||
return response({
|
||||
'posts': postFixtures,
|
||||
'page': 1,
|
||||
'limit': 15,
|
||||
'pages': 1,
|
||||
'total': 2
|
||||
}, status);
|
||||
};
|
||||
|
||||
var defineFixtures = function (status) {
|
||||
ic.ajax.defineFixture('/ghost/api/v0.1/posts', posts(status));
|
||||
ic.ajax.defineFixture('/ghost/api/v0.1/posts/1', post(1, status));
|
||||
ic.ajax.defineFixture('/ghost/api/v0.1/posts/2', post(2, status));
|
||||
ic.ajax.defineFixture('/ghost/api/v0.1/signin', user(status));
|
||||
};
|
||||
|
||||
export default defineFixtures;
|
23
core/client/fixtures/users.js
Normal file
23
core/client/fixtures/users.js
Normal file
@ -0,0 +1,23 @@
|
||||
var users = [
|
||||
{
|
||||
"id": 1,
|
||||
"uuid": "ba9c67e4-8046-4b8c-9349-0eed3cca7529",
|
||||
"name": "some-user",
|
||||
"slug": "some-user",
|
||||
"email": "some@email.com",
|
||||
"image": null,
|
||||
"cover": null,
|
||||
"bio": "",
|
||||
"website": "",
|
||||
"location": "",
|
||||
"accessibility": null,
|
||||
"status": "active",
|
||||
"language": "en_US",
|
||||
"meta_title": null,
|
||||
"meta_description": null,
|
||||
"created_at": "2014-02-15T20:02:25.000Z",
|
||||
"updated_at": "2014-03-11T14:06:43.000Z"
|
||||
}
|
||||
];
|
||||
|
||||
export default users;
|
26
core/client/initializers/current-user.js
Normal file
26
core/client/initializers/current-user.js
Normal file
@ -0,0 +1,26 @@
|
||||
import userFixtures from 'ghost/fixtures/users';
|
||||
|
||||
var currentUser = {
|
||||
name: 'currentUser',
|
||||
|
||||
initialize: function (container) {
|
||||
var userFixture = userFixtures.findBy("id", 1);
|
||||
|
||||
container.register('user:current', Ember.Object.extend(userFixture));
|
||||
// Todo: remove userFixture
|
||||
// Todo: use model User instead of Ember.Object once model layer exists
|
||||
}
|
||||
};
|
||||
|
||||
var injectCurrentUser = {
|
||||
name: 'injectCurrentUser',
|
||||
|
||||
initialize: function (container) {
|
||||
if (container.lookup('user:current')) {
|
||||
container.injection('route', 'user', 'user:current');
|
||||
container.injection('controller', 'user', 'user:current');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export {currentUser, injectCurrentUser};
|
@ -9,6 +9,7 @@ Router.reopen({
|
||||
});
|
||||
|
||||
Router.map(function () {
|
||||
this.route('login', { path: '/signin' });
|
||||
this.resource('posts', { path: '/' }, function () {
|
||||
this.route('post', { path: ':post_id' });
|
||||
});
|
||||
|
11
core/client/routes/authenticated.js
Normal file
11
core/client/routes/authenticated.js
Normal file
@ -0,0 +1,11 @@
|
||||
var AuthenticatedRoute = Ember.Route.extend({
|
||||
actions: {
|
||||
error: function (error) {
|
||||
if (error.jqXHR.status === 401) {
|
||||
this.transitionTo('login');
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
export default AuthenticatedRoute;
|
@ -1,7 +1,8 @@
|
||||
import ajax from 'ghost/utils/ajax';
|
||||
import styleBody from 'ghost/mixins/style-body';
|
||||
import AuthenticatedRoute from 'ghost/routes/authenticated';
|
||||
|
||||
var EditorRoute = Ember.Route.extend(styleBody, {
|
||||
var EditorRoute = AuthenticatedRoute.extend(styleBody, {
|
||||
classNames: ['editor'],
|
||||
|
||||
model: function (params) {
|
||||
|
32
core/client/routes/login.js
Normal file
32
core/client/routes/login.js
Normal file
@ -0,0 +1,32 @@
|
||||
import ajax from 'ghost/utils/ajax';
|
||||
import styleBody from 'ghost/mixins/style-body';
|
||||
|
||||
var isEmpty = Ember.isEmpty;
|
||||
|
||||
var LoginRoute = Ember.Route.extend(styleBody, {
|
||||
classNames: ['ghost-login'],
|
||||
|
||||
actions: {
|
||||
login: function () {
|
||||
var self = this,
|
||||
controller = this.get('controller'),
|
||||
data = controller.getProperties('email', 'password');
|
||||
|
||||
if (!isEmpty(data.email) && !isEmpty(data.password)) {
|
||||
|
||||
ajax('/ghost/api/v0.1/signin', data).then(
|
||||
function (response) {
|
||||
self.set('user', response);
|
||||
self.transitionTo('posts');
|
||||
}, function () {
|
||||
window.alert('Error'); // Todo Show notification
|
||||
}
|
||||
);
|
||||
} else {
|
||||
window.alert('Must enter email + passwort. Todo: Must show as notification'); // Todo Show notification
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
export default LoginRoute;
|
@ -1,7 +1,8 @@
|
||||
import ajax from 'ghost/utils/ajax';
|
||||
import styleBody from 'ghost/mixins/style-body';
|
||||
import AuthenticatedRoute from 'ghost/routes/authenticated';
|
||||
|
||||
var PostsRoute = Ember.Route.extend(styleBody, {
|
||||
var PostsRoute = AuthenticatedRoute.extend(styleBody, {
|
||||
classNames: ['manage'],
|
||||
|
||||
model: function () {
|
||||
|
@ -1,5 +1,7 @@
|
||||
{{partial "navbar"}}
|
||||
{{#unless isLogin}}
|
||||
{{partial "navbar"}}
|
||||
{{/unless}}
|
||||
|
||||
<main role="main" id="main">
|
||||
{{outlet}}
|
||||
</main>
|
||||
</main>
|
19
core/client/templates/login.hbs
Normal file
19
core/client/templates/login.hbs
Normal file
@ -0,0 +1,19 @@
|
||||
<main role="main" id="main">
|
||||
<aside id="notifications" class="notifications">
|
||||
</aside>
|
||||
|
||||
<section class="login-box js-login-box" style="opacity: 1;">
|
||||
<form id="login" class="login-form" method="post" novalidate="novalidate">
|
||||
<div class="email-wrap">
|
||||
{{input class="email" type="email" placeholder="Email Address" name="email" autocapitalize="off" autocorrect="off" value=email}}
|
||||
</div>
|
||||
<div class="password-wrap">
|
||||
{{input class="password" type="password" placeholder="Password" name="password" value=password}}
|
||||
</div>
|
||||
<button class="button-save" type="submit" {{action "login"}}>Log in</button>
|
||||
<section class="meta">
|
||||
<a class="forgotten-password" href="/ghost/forgotten/">Forgotten password?</a>
|
||||
</section>
|
||||
</form>
|
||||
</section>
|
||||
</main>
|
@ -31,7 +31,7 @@ var middleware = {
|
||||
authenticate: function (req, res, next) {
|
||||
var noAuthNeeded = [
|
||||
'/ghost/signin/', '/ghost/signout/', '/ghost/signup/',
|
||||
'/ghost/forgotten/', '/ghost/reset/'
|
||||
'/ghost/forgotten/', '/ghost/reset/', '/ghost/ember/'
|
||||
],
|
||||
subPath;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user