yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-28 02:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix path to retrieve defaults settings and remove useless files

Browse Source
This commit is contained in:
aurelsicoko 2017-07-31 12:12:51 +02:00
parent 8e55bd14a2
commit 937a4839bd
8 changed files with 3 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-ejs/lib/index.js
View File

@ -38,7 +38,7 @@ module.exports = function (strapi) {
initialize: cb => {
// Force cache mode in production
if (strapi.config.environment === 'production') {
strapi.config.hook.ejs.cache = true;
strapi.config.hook.settings.ejs.cache = true;
}
render(strapi.app, strapi.config.hook.settings.ejs);

0
packages/strapi-generate-new/files/config/environments/development/hook.json
View File

0
packages/strapi-generate-new/files/config/environments/production/hook.json
View File

0
packages/strapi-generate-new/files/config/environments/test/hook.json
View File

29
packages/strapi-generate-plugin/files/admin/src/containers/NotFoundPage/index.js~74aef739ab1a971f3ff26f018b672577305d21a4
View File

@ -1,29 +0,0 @@
/**
* NotFoundPage
*
* This is the page we show when the user visits a url that doesn't have a route
*
* NOTE: while this component should technically be a stateless functional
* component (SFC), hot reloading does not currently support SFCs. If hot
* reloading is not a neccessity for you then you can refactor it and remove
* the linting exception.
*/
import React from 'react';
import { FormattedMessage } from 'react-intl';
import messages from './messages';
export default class NotFound extends React.Component {
render() {
return (
<div>
<div className="container">
<h1>
<FormattedMessage {...messages.pageNotFound} />
</h1>
</div>
</div>
);
}
}

29
packages/strapi-generate-plugin/files/admin/src/containers/NotFoundPage/index.js~HEAD
View File

@ -1,29 +0,0 @@
/**
* NotFoundPage
*
* This is the page we show when the user visits a url that doesn't have a route
*
* NOTE: while this component should technically be a stateless functional
* component (SFC), hot reloading does not currently support SFCs. If hot
* reloading is not a neccessity for you then you can refactor it and remove
* the linting exception.
*/
import React from 'react';
import { FormattedMessage } from 'react-intl';
import messages from './messages';
export default class NotFound extends React.Component {
render() {
return (
<div>
<div className="container">
<h1>
<FormattedMessage {...messages.pageNotFound} />
</h1>
</div>
</div>
);
}
}

2
packages/strapi-mongoose/lib/index.js
View File

@ -46,7 +46,7 @@ module.exports = function (strapi) {
}
_.forEach(_.pickBy(strapi.config.connections, {connector: 'strapi-mongoose'}), (connection, connectionName) => {
const {host, port, username, password, database} = _.defaults(connection.settings, strapi.config.hook.settings);
const {host, port, username, password, database} = _.defaults(connection.settings, strapi.config.hook.settings.mongoose);
// Connect to mongo database
if (_.isEmpty(username) || _.isEmpty(password)) {

2
packages/strapi-redis/lib/index.js
View File

@ -51,7 +51,7 @@ module.exports = function(strapi) {
// For each connection in the config register a new Knex connection.
_.forEach(connections, (connection, name) => {
// Apply defaults
_.defaults(connection.settings, strapi.hook.redis.defaults);
_.defaults(connection.settings, strapi.config.hook.settings.redis);
try {
const redis = new Redis(_.defaultsDeep({