Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Move /api to /ghost/api

Browse source 
closes #1249
- changed routes
- changed apiRoots
This commit is contained in:
Sebastian Gierlinger 2013-10-24 14:50:17 +02:00
parent 0ddd7e8dd1
commit 6505986f6b
5 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/client/init.js
View file

@ -10,7 +10,7 @@
Validate : new Validator(), Validate : new Validator(),
settings: { settings: {
apiRoot: '/api/v0.1' apiRoot: '/ghost/api/v0.1'
}, },
// This is a helper object to denote legacy things in the // This is a helper object to denote legacy things in the

4
core/client/views/base.js
View file

@ -205,7 +205,7 @@
headers: { headers: {
'X-CSRF-Token': $("meta[name='csrf-param']").attr('content') 'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
}, },
url: '/api/v0.1/notifications/' + $(self).find('.close').data('id') url: Ghost.settings.apiRoot + '/notifications/' + $(self).find('.close').data('id')
}).done(function (result) { }).done(function (result) {
bbSelf.$el.slideUp(250, function () { bbSelf.$el.slideUp(250, function () {
$(this).show().css({height: "auto"}); $(this).show().css({height: "auto"});
@ -237,7 +237,7 @@
headers: { headers: {
'X-CSRF-Token': $("meta[name='csrf-param']").attr('content') 'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
}, },
url: '/api/v0.1/notifications/' + $(self).data('id') url: Ghost.settings.apiRoot + '/notifications/' + $(self).data('id')
}).done(function (result) { }).done(function (result) {
var height = bbSelf.$('.js-notification').outerHeight(true), var height = bbSelf.$('.js-notification').outerHeight(true),
$parent = $(self).parent(); $parent = $(self).parent();

34
core/server.js
View file

@ -283,7 +283,7 @@ when(ghost.init()).then(function () {
server.use(express.urlencoded()); server.use(express.urlencoded());
server.use('/ghost/upload/', express.multipart()); server.use('/ghost/upload/', express.multipart());
server.use('/ghost/upload/', express.multipart({uploadDir: __dirname + '/content/images'})); server.use('/ghost/upload/', express.multipart({uploadDir: __dirname + '/content/images'}));
server.use('/api/v0.1/db/', express.multipart()); server.use('/ghost/api/v0.1/db/', express.multipart());
server.use(express.cookieParser(ghost.dbHash)); server.use(express.cookieParser(ghost.dbHash));
server.use(express.cookieSession({ cookie : { maxAge: 12 * 60 * 60 * 1000 }})); server.use(express.cookieSession({ cookie : { maxAge: 12 * 60 * 60 * 1000 }}));
@ -316,27 +316,27 @@ when(ghost.init()).then(function () {
// ### API routes // ### API routes
/* TODO: auth should be public auth not user auth */ /* TODO: auth should be public auth not user auth */
// #### Posts // #### Posts
server.get('/api/v0.1/posts', authAPI, disableCachedResult, api.requestHandler(api.posts.browse)); server.get('/ghost/api/v0.1/posts', authAPI, disableCachedResult, api.requestHandler(api.posts.browse));
server.post('/api/v0.1/posts', authAPI, disableCachedResult, api.requestHandler(api.posts.add)); server.post('/ghost/api/v0.1/posts', authAPI, disableCachedResult, api.requestHandler(api.posts.add));
server.get('/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.read)); server.get('/ghost/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.read));
server.put('/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.edit)); server.put('/ghost/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.edit));
server.del('/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.destroy)); server.del('/ghost/api/v0.1/posts/:id', authAPI, disableCachedResult, api.requestHandler(api.posts.destroy));
// #### Settings // #### Settings
server.get('/api/v0.1/settings/', authAPI, disableCachedResult, api.requestHandler(api.settings.browse)); server.get('/ghost/api/v0.1/settings/', authAPI, disableCachedResult, api.requestHandler(api.settings.browse));
server.get('/api/v0.1/settings/:key/', authAPI, disableCachedResult, api.requestHandler(api.settings.read)); server.get('/ghost/api/v0.1/settings/:key/', authAPI, disableCachedResult, api.requestHandler(api.settings.read));
server.put('/api/v0.1/settings/', authAPI, disableCachedResult, api.requestHandler(api.settings.edit)); server.put('/ghost/api/v0.1/settings/', authAPI, disableCachedResult, api.requestHandler(api.settings.edit));
// #### Users // #### Users
server.get('/api/v0.1/users/', authAPI, disableCachedResult, api.requestHandler(api.users.browse)); server.get('/ghost/api/v0.1/users/', authAPI, disableCachedResult, api.requestHandler(api.users.browse));
server.get('/api/v0.1/users/:id/', authAPI, disableCachedResult, api.requestHandler(api.users.read)); server.get('/ghost/api/v0.1/users/:id/', authAPI, disableCachedResult, api.requestHandler(api.users.read));
server.put('/api/v0.1/users/:id/', authAPI, disableCachedResult, api.requestHandler(api.users.edit)); server.put('/ghost/api/v0.1/users/:id/', authAPI, disableCachedResult, api.requestHandler(api.users.edit));
// #### Tags // #### Tags
server.get('/api/v0.1/tags/', authAPI, disableCachedResult, api.requestHandler(api.tags.all)); server.get('/ghost/api/v0.1/tags/', authAPI, disableCachedResult, api.requestHandler(api.tags.all));
// #### Notifications // #### Notifications
server.del('/api/v0.1/notifications/:id', authAPI, disableCachedResult, api.requestHandler(api.notifications.destroy)); server.del('/ghost/api/v0.1/notifications/:id', authAPI, disableCachedResult, api.requestHandler(api.notifications.destroy));
server.post('/api/v0.1/notifications/', authAPI, disableCachedResult, api.requestHandler(api.notifications.add)); server.post('/ghost/api/v0.1/notifications/', authAPI, disableCachedResult, api.requestHandler(api.notifications.add));
// #### Import/Export // #### Import/Export
server.get('/api/v0.1/db/', auth, api.db['export']); server.get('/ghost/api/v0.1/db/', auth, api.db['export']);
server.post('/api/v0.1/db/', auth, api.db['import']); server.post('/ghost/api/v0.1/db/', auth, api.db['import']);
// ### Admin routes // ### Admin routes
/* TODO: put these somewhere in admin */ /* TODO: put these somewhere in admin */

4
core/server/views/debug.hbs
View file

@ -20,12 +20,12 @@
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label>Export</label> <label>Export</label>
<a href="/api/v0.1/db/" class="button-save">Export</a> <a href="/ghost/api/v0.1/db/" class="button-save">Export</a>
<p>Export the blog settings and data.</p> <p>Export the blog settings and data.</p>
</div> </div>
</fieldset> </fieldset>
</form> </form>
<form id="settings-import" method="post" action="/api/v0.1/db/" enctype="multipart/form-data"> <form id="settings-import" method="post" action="/ghost/api/v0.1/db/" enctype="multipart/form-data">
<input type="hidden" name="_csrf" value="{{csrfToken}}" /> <input type="hidden" name="_csrf" value="{{csrfToken}}" />
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">

2
core/test/unit/utils/api.js
View file

@ -2,7 +2,7 @@ var _ = require('underscore'),
when = require('when'), when = require('when'),
http = require('http'), http = require('http'),
HttpMethods, HttpMethods,
ApiRouteBase = '/api/v0.1/'; ApiRouteBase = '/ghost/api/v0.1/';
HttpMethods = { HttpMethods = {
GET: 'GET', GET: 'GET',