diff options
| author | Jules Laplace <jules@okfoc.us> | 2016-09-01 18:32:18 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2016-09-01 18:32:18 -0400 |
| commit | 233188e7d36dea5f5e5102322be4df81b9d4114e (patch) | |
| tree | 4d6ecc02d517341e57e8c8fcb4f97d5c0d313a56 | |
| parent | a3fff2bf629b3d33d327b81f2e2699a1840a27bd (diff) | |
fix adminConfig pathv0.1.38
| -rw-r--r-- | app/index.js | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/app/index.js b/app/index.js index 48e713a..c0d2ff3 100644 --- a/app/index.js +++ b/app/index.js @@ -31,14 +31,23 @@ function OKCMS(options) { app.enable('strict routing'); app.disable('x-powered-by'); + var schemaConfig = options.schemas || {}; + var resourceConfig = options.resources || []; + var viewConfig = options.views || { + '/': { template: 'index' } + }; + var serviceConfig = options.services || {}; + var adminConfig = options.admin || {} + var root = this._root = options.root || 'public'; - var adminConfig = options.admin || {}; + var templateRoot = options.templateRoot || 'templates'; + + var adminPath = this._adminPath = adminConfig.path || '/admin'; var adminRoot = this._adminRoot = adminConfig.root || path.join(__dirname, '../themes/okadmin/public'); - var adminPath = this._adminPath = '/admin'; - var templateRoot = options.templateRoot || 'templates'; - var adminTemplateRoot = options.templateRoot || + var adminTemplateRoot = adminConfig.templateRoot || path.join(__dirname, '../themes/okadmin/templates'); + var debug = !!options.debug; var production = !!options.production; @@ -58,14 +67,6 @@ function OKCMS(options) { services: options.services, }, metaDefault, metaUser); - var schemaConfig = options.schemas || {}; - var resourceConfig = options.resources || []; - var viewConfig = options.views || { - '/': { template: 'index' } - }; - var serviceConfig = options.services || {}; - var adminConfig = options.admin || {} - var templateProvider = this._templateProvider = new OKTemplate({ root: templateRoot, debug: debug |
