yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-17 02:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated _admin hook

Browse Source
This commit is contained in:
loicsaintroch 2015-10-30 13:13:32 +01:00
parent 3652f3dd49
commit e9da4c7711
7 changed files with 4 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ROADMAP.md
View File

@ -1,12 +1,9 @@
# Roadmap
**v1.3.0**:
- Auto restart the server on changes from the Studio.
- Add remote admin panel.
- JSON API support ([http://jsonapi.org/](http://jsonapi.org/)).
**v1.4.0**:
- Add resourceful Pub / Sub for models and routes via WebSockets.
- Auto restart the server on changes from the Studio.
- JSON API support ([http://jsonapi.org/](http://jsonapi.org/)).
**v1.5.0**:
- Content-negotiation on the request and respond either a JSON or a view.

167
lib/configuration/hooks/_admin/index.js
View File

@ -1,167 +0,0 @@
'use strict';
/**
* Module dependencies
*/
// Node.js core.
const path = require('path');
// Public node modules.
const _ = require('lodash');
const async = require('async');
// Local utilities.
const dictionary = require('../../../../util/dictionary');
/**
* Async module loader to create a
* dictionary of the admin dashboard
*/
module.exports = function (strapi) {
const hook = {
/**
* Initialize the hook
*/
initialize: function (cb) {
async.auto({
// Load admin controllers from `./admin/controllers/*.js`.
'controllers/*': function (cb) {
dictionary.optional({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.admin, 'api', strapi.config.paths.controllers),
filter: /(.+)\.(js)$/,
depth: 1
}, cb);
},
// Load admin models from `./admin/models/*.js` and `./admin/models/*.settings.json`.
'models/*': function (cb) {
async.parallel({
settings: function (cb) {
dictionary.optional({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.admin, 'api', strapi.config.paths.models),
filter: /(.+)\.settings.json$/,
depth: 1
}, cb);
},
functions: function (cb) {
dictionary.optional({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.admin, 'api', strapi.config.paths.models),
filter: /(.+)\.js$/,
depth: 1
}, cb);
}
}, function (err, models) {
if (err) {
return cb(err);
}
return cb(null, _.merge(models.settings, models.functions));
});
},
// Load admin services from `./admin/services/*.js`.
'services/*': function (cb) {
dictionary.optional({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.admin, 'api', strapi.config.paths.services),
filter: /(.+)\.(js)$/,
depth: 1
}, cb);
},
// Load admin policies from `./admin/policies/*.js`.
'policies/*': function (cb) {
dictionary.aggregate({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.admin, 'api', strapi.config.paths.policies),
filter: /(.+)\.(js)$/,
depth: 1
}, cb);
},
// Load admin settings from `./admin/config/*.json`.
'config/*': function (cb) {
dictionary.aggregate({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.admin, strapi.config.paths.config),
excludeDirs: /(locales|environments)$/,
filter: /(.+)\.(json)$/,
depth: 2
}, cb);
},
// Load functions scripts config from `./admin/config/functions/*.js`.
'config/functions/*': function (cb) {
dictionary.aggregate({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.admin, strapi.config.paths.config, 'functions'),
filter: /(.+)\.(js)$/,
depth: 1
}, cb);
},
// Load environment-specific config directory from `./admin/config/environments/**/*.json`.
'config/environments/**': function (cb) {
dictionary.aggregate({
dirname: path.resolve(strapi.config.appPath, strapi.config.paths.admin, strapi.config.paths.config, 'environments', strapi.config.environment),
filter: /(.+)\.(json)$/,
depth: 2
}, cb);
}
},
// Callback.
function (err, admin) {
// Just in case there is an error.
if (err) {
return cb(err);
}
// Expose the admin dictionary.
strapi.admin = {
controllers: admin['controllers/*'],
models: admin['models/*'],
services: admin['services/*'],
policies: admin['policies/*'],
config: _.merge(
admin['config/*'],
admin['config/environments/**'],
admin['config/functions/*']
)
};
// Merge admin controllers with the main ones.
strapi.controllers = _.merge(strapi.controllers, strapi.admin.controllers);
// Merge admin models with the main ones.
strapi.models = _.merge(strapi.models, strapi.admin.models);
// Merge admin policies with the main ones.
strapi.policies = _.merge(strapi.policies, strapi.admin.policies);
// Merge admin routes with the main ones.
strapi.config.routes = _.merge(strapi.config.routes, strapi.admin.config.routes);
});
cb();
},
/**
* Reload the hook
*/
reload: function () {
hook.initialize(function (err) {
if (err) {
strapi.log.error('Failed to reinitialize the admin hook.');
strapi.stop();
} else {
strapi.emit('hook:_admin:reloaded');
}
});
}
};
return hook;
};

3
lib/configuration/hooks/dashboard/routes/find.js
View File

@ -9,13 +9,12 @@ const routeService = require('./helpers');
/**
* Returns the config of the application used
* by the admin panel
* by the dashboard
*/
module.exports = function * () {
try {
const routes = yield routeService.find();
this.body = routes;
} catch (err) {
this.status = 500;

2
lib/configuration/hooks/dashboard/routes/update.js
View File

@ -9,7 +9,7 @@ const routeService = require('./helpers');
/**
* Returns the config of the application used
* by the admin panel
* by the dashboard
*/
module.exports = function *() {

1
lib/configuration/hooks/defaultHooks.js
View File

@ -7,7 +7,6 @@
module.exports = {
_config: true,
_api: true,
_admin: false,
responseTime: true,
waterline: true,
bodyParser: true,

1
lib/configuration/index.js
View File

@ -58,7 +58,6 @@ module.exports = function (strapi) {
// Default paths.
paths: {
tmp: '.tmp',
admin: 'admin',
config: 'config',
static: 'public',
views: 'views',

1
lib/rebuild.js
View File

@ -29,7 +29,6 @@ module.exports = function () {
dictionaries: function (cb) {
self.hooks._config.reload();
self.hooks._api.reload();
self.hooks._admin.reload();
cb();
},