@webresto/graphql 1.3.2 → 1.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/additionalResolvers.js +1 -1
- package/src/additionalResolvers.ts +1 -1
- package/src/graphql.js +40 -22
- package/src/graphql.ts +42 -25
- package/src/resolvers/cart.d.ts +225 -7
- package/src/resolvers/cart.js +21 -7
- package/src/resolvers/cart.ts +23 -8
- package/src/resolvers/checkout.ts +1 -0
- package/test/{_bootstrap.js → bootstrap.js} +6 -7
- package/test/bootstrap.ts +3 -0
- package/test/fixture/.sailsrc +14 -0
- package/test/fixture/api/controllers/.gitkeep +0 -0
- package/test/fixture/api/models/.gitkeep +0 -0
- package/test/fixture/api/services/.gitkeep +0 -0
- package/test/fixture/app-export.js +73 -73
- package/test/fixture/app.js +56 -56
- package/test/fixture/config/adminpanel.js +25 -3
- package/test/fixture/config/bootstrap.js +161 -0
- package/test/fixture/config/connections.js +9 -9
- package/test/fixture/config/env/development.js +10 -10
- package/test/fixture/config/env/production.js +16 -16
- package/test/fixture/config/globals.js +16 -16
- package/test/fixture/config/hookTimeout.js +8 -8
- package/test/fixture/config/http.js +93 -93
- package/test/fixture/config/i18n.js +57 -57
- package/test/fixture/config/log.js +29 -29
- package/test/fixture/config/models.js +8 -8
- package/test/fixture/config/modulemanager.js +22 -22
- package/test/fixture/config/policies.js +51 -51
- package/test/fixture/config/routes.js +49 -49
- package/test/fixture/config/session.js +100 -100
- package/test/fixture/config/sockets.js +141 -141
- package/test/fixture/config/views.js +94 -94
- package/test/fixture/hacks/waterline.js +39 -0
- package/test/fixture/package.json +33 -30
- package/test/fixture/seeds/dish.json +37042 -0
- package/test/fixture/seeds/group.json +1418 -0
- package/test/fixture/seeds/iikoDiscount.json +365 -0
- package/test/fixture/views/403.ejs +68 -68
- package/test/fixture/views/404.ejs +68 -68
- package/test/fixture/views/500.ejs +73 -73
- package/test/fixture/views/homepage.ejs +74 -74
- package/test/fixture/views/layout.ejs +91 -91
- package/test/integration/graphql.test.js +11 -0
- package/test/integration/graphql.test.ts +15 -0
- package/test/{unit → integration}/sails_not_crash.test.js +0 -0
- package/test/{unit → integration}/sails_not_crash.test.ts +0 -0
- package/test/unit/first.test.js +1 -1
- package/test/unit/first.test.ts +1 -1
- package/test/fixture/.tmp/localDiskDb/archive.db +0 -1
- package/test/fixture/.tmp/localDiskDb/dish.db +0 -1
- package/test/fixture/.tmp/localDiskDb/dish_images__image_dish.db +0 -1
- package/test/fixture/.tmp/localDiskDb/group.db +0 -1
- package/test/fixture/.tmp/localDiskDb/group_images__image_group.db +0 -1
- package/test/fixture/.tmp/localDiskDb/image.db +0 -1
- package/test/fixture/.tmp/localDiskDb/maintenance.db +0 -1
- package/test/fixture/.tmp/localDiskDb/order.db +0 -1
- package/test/fixture/.tmp/localDiskDb/orderdish.db +0 -1
- package/test/fixture/.tmp/localDiskDb/paymentdocument.db +0 -1
- package/test/fixture/.tmp/localDiskDb/paymentmethod.db +0 -2
- package/test/fixture/.tmp/localDiskDb/place.db +0 -1
- package/test/fixture/.tmp/localDiskDb/settings.db +0 -2
- package/test/fixture/.tmp/localDiskDb/street.db +0 -1
- package/test/fixture/package-lock.json +0 -9805
- package/test.zip +0 -0
File without changes
|
File without changes
|
File without changes
|
@@ -1,73 +1,73 @@
|
|
1
|
-
/**
|
2
|
-
* app.js
|
3
|
-
*
|
4
|
-
* Use `app.js` to run your app without `sails lift`.
|
5
|
-
* To start the server, run: `node app.js`.
|
6
|
-
*
|
7
|
-
* This is handy in situations where the sails CLI is not relevant or useful.
|
8
|
-
*
|
9
|
-
* For example:
|
10
|
-
* => `node app.js`
|
11
|
-
* => `forever start app.js`
|
12
|
-
* => `node debug app.js`
|
13
|
-
* => `modulus deploy`
|
14
|
-
* => `heroku scale`
|
15
|
-
*
|
16
|
-
*
|
17
|
-
* The same command-line arguments are supported, e.g.:
|
18
|
-
* `node app.js --silent --port=80 --prod`
|
19
|
-
*/
|
20
|
-
|
21
|
-
|
22
|
-
// Ensure we're in the project directory, so cwd-relative paths work as expected
|
23
|
-
// no matter where we actually lift from.
|
24
|
-
// > Note: This is not required in order to lift, but it is a convenient default.
|
25
|
-
process.chdir(__dirname);
|
26
|
-
|
27
|
-
// Attempt to import `sails`.
|
28
|
-
var sails;
|
29
|
-
try {
|
30
|
-
sails = require('sails');
|
31
|
-
} catch (e) {
|
32
|
-
console.error('To run an app using `node app.js`, you usually need to have a version of `sails` installed in the same directory as your app.');
|
33
|
-
console.error('To do that, run `npm install sails`');
|
34
|
-
console.error('');
|
35
|
-
console.error('Alternatively, if you have sails installed globally (i.e. you did `npm install -g sails`), you can use `sails lift`.');
|
36
|
-
console.error('When you run `sails lift`, your app will still use a local `./node_modules/sails` dependency if it exists,');
|
37
|
-
console.error('but if it doesn\'t, the app will run with the global sails instead!');
|
38
|
-
return;
|
39
|
-
}
|
40
|
-
|
41
|
-
// --•
|
42
|
-
// Try to get `rc` dependency (for loading `.sailsrc` files).
|
43
|
-
var rc;
|
44
|
-
try {
|
45
|
-
rc = require('rc');
|
46
|
-
} catch (e0) {
|
47
|
-
try {
|
48
|
-
rc = require('sails/accessible/rc');
|
49
|
-
} catch (e1) {
|
50
|
-
console.error('Could not find dependency: `rc`.');
|
51
|
-
console.error('Your `.sailsrc` file(s) will be ignored.');
|
52
|
-
console.error('To resolve this, run:');
|
53
|
-
console.error('npm install rc --save');
|
54
|
-
rc = function () { return {}; };
|
55
|
-
}
|
56
|
-
}
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
// function sails() {
|
61
|
-
// return new Promise(function (resolve, reject) {
|
62
|
-
// sails.lift(rc('sails'), (err, _sails) => {
|
63
|
-
// if (err) { return done(err); }
|
64
|
-
// resolve(_sails);
|
65
|
-
// });
|
66
|
-
// })
|
67
|
-
// }
|
68
|
-
|
69
|
-
|
70
|
-
module.exports = {
|
71
|
-
sails: sails,
|
72
|
-
rc: rc('sails')
|
73
|
-
}
|
1
|
+
/**
|
2
|
+
* app.js
|
3
|
+
*
|
4
|
+
* Use `app.js` to run your app without `sails lift`.
|
5
|
+
* To start the server, run: `node app.js`.
|
6
|
+
*
|
7
|
+
* This is handy in situations where the sails CLI is not relevant or useful.
|
8
|
+
*
|
9
|
+
* For example:
|
10
|
+
* => `node app.js`
|
11
|
+
* => `forever start app.js`
|
12
|
+
* => `node debug app.js`
|
13
|
+
* => `modulus deploy`
|
14
|
+
* => `heroku scale`
|
15
|
+
*
|
16
|
+
*
|
17
|
+
* The same command-line arguments are supported, e.g.:
|
18
|
+
* `node app.js --silent --port=80 --prod`
|
19
|
+
*/
|
20
|
+
|
21
|
+
|
22
|
+
// Ensure we're in the project directory, so cwd-relative paths work as expected
|
23
|
+
// no matter where we actually lift from.
|
24
|
+
// > Note: This is not required in order to lift, but it is a convenient default.
|
25
|
+
process.chdir(__dirname);
|
26
|
+
|
27
|
+
// Attempt to import `sails`.
|
28
|
+
var sails;
|
29
|
+
try {
|
30
|
+
sails = require('sails');
|
31
|
+
} catch (e) {
|
32
|
+
console.error('To run an app using `node app.js`, you usually need to have a version of `sails` installed in the same directory as your app.');
|
33
|
+
console.error('To do that, run `npm install sails`');
|
34
|
+
console.error('');
|
35
|
+
console.error('Alternatively, if you have sails installed globally (i.e. you did `npm install -g sails`), you can use `sails lift`.');
|
36
|
+
console.error('When you run `sails lift`, your app will still use a local `./node_modules/sails` dependency if it exists,');
|
37
|
+
console.error('but if it doesn\'t, the app will run with the global sails instead!');
|
38
|
+
return;
|
39
|
+
}
|
40
|
+
|
41
|
+
// --•
|
42
|
+
// Try to get `rc` dependency (for loading `.sailsrc` files).
|
43
|
+
var rc;
|
44
|
+
try {
|
45
|
+
rc = require('rc');
|
46
|
+
} catch (e0) {
|
47
|
+
try {
|
48
|
+
rc = require('sails/accessible/rc');
|
49
|
+
} catch (e1) {
|
50
|
+
console.error('Could not find dependency: `rc`.');
|
51
|
+
console.error('Your `.sailsrc` file(s) will be ignored.');
|
52
|
+
console.error('To resolve this, run:');
|
53
|
+
console.error('npm install rc --save');
|
54
|
+
rc = function () { return {}; };
|
55
|
+
}
|
56
|
+
}
|
57
|
+
|
58
|
+
|
59
|
+
|
60
|
+
// function sails() {
|
61
|
+
// return new Promise(function (resolve, reject) {
|
62
|
+
// sails.lift(rc('sails'), (err, _sails) => {
|
63
|
+
// if (err) { return done(err); }
|
64
|
+
// resolve(_sails);
|
65
|
+
// });
|
66
|
+
// })
|
67
|
+
// }
|
68
|
+
|
69
|
+
|
70
|
+
module.exports = {
|
71
|
+
sails: sails,
|
72
|
+
rc: rc('sails')
|
73
|
+
}
|
package/test/fixture/app.js
CHANGED
@@ -1,56 +1,56 @@
|
|
1
|
-
/**
|
2
|
-
* app.js
|
3
|
-
*
|
4
|
-
* Use `app.js` to run your app without `sails lift`.
|
5
|
-
* To start the server, run: `node app.js`.
|
6
|
-
*
|
7
|
-
* This is handy in situations where the sails CLI is not relevant or useful,
|
8
|
-
* such as when you deploy to a server, or a PaaS like Heroku.
|
9
|
-
*
|
10
|
-
* For example:
|
11
|
-
* => `node app.js`
|
12
|
-
* => `npm start`
|
13
|
-
* => `forever start app.js`
|
14
|
-
* => `node debug app.js`
|
15
|
-
*
|
16
|
-
* The same command-line arguments and env vars are supported, e.g.:
|
17
|
-
* `NODE_ENV=production node app.js --port=80 --verbose`
|
18
|
-
*
|
19
|
-
* For more information see:
|
20
|
-
* https://sailsjs.com/anatomy/app.js
|
21
|
-
*/
|
22
|
-
|
23
|
-
|
24
|
-
// Ensure we're in the project directory, so cwd-relative paths work as expected
|
25
|
-
// no matter where we actually lift from.
|
26
|
-
// > Note: This is not required in order to lift, but it is a convenient default.
|
27
|
-
process.chdir(__dirname);
|
28
|
-
|
29
|
-
process.env.DEV = "TRUE";
|
30
|
-
|
31
|
-
|
32
|
-
// Attempt to import `sails` dependency, as well as `rc` (for loading `.sailsrc` files).
|
33
|
-
var sails;
|
34
|
-
var rc;
|
35
|
-
try {
|
36
|
-
sails = require('sails');
|
37
|
-
rc = require('sails/accessible/rc');
|
38
|
-
} catch (err) {
|
39
|
-
console.error('Encountered an error when attempting to require(\'sails\'):');
|
40
|
-
console.error(err.stack);
|
41
|
-
console.error('--');
|
42
|
-
console.error('To run an app using `node app.js`, you need to have Sails installed');
|
43
|
-
console.error('locally (`./node_modules/sails`). To do that, just make sure you\'re');
|
44
|
-
console.error('in the same directory as your app and run `npm install`.');
|
45
|
-
console.error();
|
46
|
-
console.error('If Sails is installed globally (i.e. `npm install -g sails`) you can');
|
47
|
-
console.error('also run this app with `sails lift`. Running with `sails lift` will');
|
48
|
-
console.error('not run this file (`app.js`), but it will do exactly the same thing.');
|
49
|
-
console.error('(It even uses your app directory\'s local Sails install, if possible.)');
|
50
|
-
return;
|
51
|
-
}//-•
|
52
|
-
|
53
|
-
console.log(rc('sails'))
|
54
|
-
|
55
|
-
// Start server
|
56
|
-
sails.lift(rc('sails'));
|
1
|
+
/**
|
2
|
+
* app.js
|
3
|
+
*
|
4
|
+
* Use `app.js` to run your app without `sails lift`.
|
5
|
+
* To start the server, run: `node app.js`.
|
6
|
+
*
|
7
|
+
* This is handy in situations where the sails CLI is not relevant or useful,
|
8
|
+
* such as when you deploy to a server, or a PaaS like Heroku.
|
9
|
+
*
|
10
|
+
* For example:
|
11
|
+
* => `node app.js`
|
12
|
+
* => `npm start`
|
13
|
+
* => `forever start app.js`
|
14
|
+
* => `node debug app.js`
|
15
|
+
*
|
16
|
+
* The same command-line arguments and env vars are supported, e.g.:
|
17
|
+
* `NODE_ENV=production node app.js --port=80 --verbose`
|
18
|
+
*
|
19
|
+
* For more information see:
|
20
|
+
* https://sailsjs.com/anatomy/app.js
|
21
|
+
*/
|
22
|
+
|
23
|
+
|
24
|
+
// Ensure we're in the project directory, so cwd-relative paths work as expected
|
25
|
+
// no matter where we actually lift from.
|
26
|
+
// > Note: This is not required in order to lift, but it is a convenient default.
|
27
|
+
process.chdir(__dirname);
|
28
|
+
|
29
|
+
process.env.DEV = "TRUE";
|
30
|
+
|
31
|
+
|
32
|
+
// Attempt to import `sails` dependency, as well as `rc` (for loading `.sailsrc` files).
|
33
|
+
var sails;
|
34
|
+
var rc;
|
35
|
+
try {
|
36
|
+
sails = require('sails');
|
37
|
+
rc = require('sails/accessible/rc');
|
38
|
+
} catch (err) {
|
39
|
+
console.error('Encountered an error when attempting to require(\'sails\'):');
|
40
|
+
console.error(err.stack);
|
41
|
+
console.error('--');
|
42
|
+
console.error('To run an app using `node app.js`, you need to have Sails installed');
|
43
|
+
console.error('locally (`./node_modules/sails`). To do that, just make sure you\'re');
|
44
|
+
console.error('in the same directory as your app and run `npm install`.');
|
45
|
+
console.error();
|
46
|
+
console.error('If Sails is installed globally (i.e. `npm install -g sails`) you can');
|
47
|
+
console.error('also run this app with `sails lift`. Running with `sails lift` will');
|
48
|
+
console.error('not run this file (`app.js`), but it will do exactly the same thing.');
|
49
|
+
console.error('(It even uses your app directory\'s local Sails install, if possible.)');
|
50
|
+
return;
|
51
|
+
}//-•
|
52
|
+
|
53
|
+
console.log(rc('sails'))
|
54
|
+
|
55
|
+
// Start server
|
56
|
+
sails.lift(rc('sails'));
|
@@ -1,3 +1,25 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
1
|
+
'use strict';
|
2
|
+
|
3
|
+
|
4
|
+
setTimeout(() => {
|
5
|
+
sails.after(["hook:orm:loaded"], () => {
|
6
|
+
Object.keys(sails.models).forEach((modelname) => {
|
7
|
+
let modelName = sails.models[modelname].globalId;
|
8
|
+
sails.config.adminpanel.instances["dev" + modelName] = {
|
9
|
+
title: "dev" + modelName,
|
10
|
+
icon: 'cube',
|
11
|
+
model: modelName,
|
12
|
+
fields: {
|
13
|
+
createdAt: false,
|
14
|
+
updatedAt: false
|
15
|
+
}
|
16
|
+
};
|
17
|
+
});
|
18
|
+
});
|
19
|
+
}, 5000);
|
20
|
+
|
21
|
+
|
22
|
+
module.exports.adminpanel = {
|
23
|
+
instances: {
|
24
|
+
}
|
25
|
+
};
|
@@ -0,0 +1,161 @@
|
|
1
|
+
maintenanceSeed = [
|
2
|
+
{
|
3
|
+
id: "maintenance1",
|
4
|
+
title: "Сайт временно не работает",
|
5
|
+
description: "<div>\r\n<p>По техническим причинам доставка сейчас не осуществляется</p>\r\n</div>",
|
6
|
+
enable: false,
|
7
|
+
startDate: "2019-12-31T21:00:00.000Z",
|
8
|
+
stopDate: "2020-12-31T21:00:00.000Z",
|
9
|
+
},
|
10
|
+
];
|
11
|
+
|
12
|
+
const fs = require("fs");
|
13
|
+
const path = require("path");
|
14
|
+
|
15
|
+
module.exports.bootstrap = async function () {
|
16
|
+
sails.config.paths.app = process.cwd();
|
17
|
+
|
18
|
+
/**
|
19
|
+
* # Bootsrap seeds from seeds folder
|
20
|
+
* Magic: filename.json where filename is model name
|
21
|
+
*/
|
22
|
+
|
23
|
+
if (sails.config.models.migrate === "drop" || process.env.FORCE_SEED === "TRUE") {
|
24
|
+
sails.log.info("Seeding 🌱 process start")
|
25
|
+
try {
|
26
|
+
let seedsDir = process.env.SEED_PATH ? process.env.SEED_PATH : __dirname + "/../seeds/";
|
27
|
+
// load JSON data
|
28
|
+
let seeds = fs.readdirSync(seedsDir).filter(function (file) {
|
29
|
+
return path.extname(file).toLowerCase() === ".json";
|
30
|
+
});
|
31
|
+
|
32
|
+
for await (let seed of seeds) {
|
33
|
+
try {
|
34
|
+
let seedFile = seedsDir + seed;
|
35
|
+
let model = seed.split(".")[0].toLowerCase();
|
36
|
+
let json_seed_data = require(seedFile);
|
37
|
+
|
38
|
+
sails.log.info("🌱 Bootstrap > Seed for model: ", model);
|
39
|
+
|
40
|
+
if (sails.models[model]) {
|
41
|
+
await sails.models[model].destroy({}).fetch();
|
42
|
+
if (Array.isArray(json_seed_data)) {
|
43
|
+
for await (seed_item of json_seed_data) {
|
44
|
+
cleanSeedItem(seed_item);
|
45
|
+
await sails.models[model].create(seed_item).fetch();
|
46
|
+
}
|
47
|
+
sails.log.debug(`🌱 Bootstrap seed ${model}: > count: ${json_seed_data.length}`);
|
48
|
+
} else {
|
49
|
+
sails.log.debug(`🌱 Bootstrap seed ${model}: > one item`);
|
50
|
+
cleanSeedItem(seed_item);
|
51
|
+
await sails.models[model].create(json_seed_data).fetch();
|
52
|
+
}
|
53
|
+
sails.log.info(`Bootstrap seed model: > ${model} was seeded, count: ${json_seed_data.length}`);
|
54
|
+
} else {
|
55
|
+
sails.log.warn(`Bootstrap seed model: > ${model} SKIPED (model not present in sails)`);
|
56
|
+
}
|
57
|
+
} catch (error) {
|
58
|
+
sails.log.error(`🌱 Seeding error: ${error}`);
|
59
|
+
}
|
60
|
+
}
|
61
|
+
|
62
|
+
// Load JS files
|
63
|
+
seeds = fs.readdirSync(seedsDir).filter(function (file) {
|
64
|
+
return path.extname(file).toLowerCase() === ".js";
|
65
|
+
});
|
66
|
+
|
67
|
+
/**
|
68
|
+
* If file .queue exist then sort seedqueue by this file
|
69
|
+
*/
|
70
|
+
|
71
|
+
if (fs.existsSync(seedsDir + ".queue")) {
|
72
|
+
var queuelist = fs
|
73
|
+
.readFileSync(seedsDir + ".queue")
|
74
|
+
.toString()
|
75
|
+
.split("\n");
|
76
|
+
let _seeds = [...seeds];
|
77
|
+
seeds = [];
|
78
|
+
|
79
|
+
// Build head loadlist of js seeds files
|
80
|
+
queuelist.forEach((qItem) => {
|
81
|
+
_seeds.forEach((sItem) => {
|
82
|
+
if (sItem.includes(qItem) && !isCommented(qItem)) {
|
83
|
+
seeds.push(sItem);
|
84
|
+
}
|
85
|
+
});
|
86
|
+
});
|
87
|
+
|
88
|
+
// Build foot
|
89
|
+
seeds = [...seeds, ..._seeds.filter((n) => !seeds.includes(n))];
|
90
|
+
}
|
91
|
+
|
92
|
+
for await (let seed of seeds) {
|
93
|
+
let seedFile = seedsDir + seed;
|
94
|
+
if (fs.existsSync(seedFile)) {
|
95
|
+
let bootstrap_model_seed = require(seedFile);
|
96
|
+
await bootstrap_model_seed.default(sails);
|
97
|
+
}
|
98
|
+
}
|
99
|
+
} catch (error) {
|
100
|
+
console.error("Bootstrap seeds error: > ", error);
|
101
|
+
}
|
102
|
+
}
|
103
|
+
|
104
|
+
await Settings.set("enableIikoSimpleDiscounts", true);
|
105
|
+
//////////////////////////////////////////////////////////
|
106
|
+
|
107
|
+
setTimeout(() => {
|
108
|
+
console.log("ADMINPANEL", sails.config.adminpanel.instances.discount)
|
109
|
+
}, 10000)
|
110
|
+
|
111
|
+
if (sails.config.models.migrate === "drop") {
|
112
|
+
// create init params for webresto
|
113
|
+
try {
|
114
|
+
if ((await Maintenance.count()) === 0) {
|
115
|
+
sails.log.verbose("BOOTSTRAP > Start Import Maintenance SEED");
|
116
|
+
await Maintenance.createEach(maintenanceSeed).fetch();
|
117
|
+
}
|
118
|
+
|
119
|
+
process.env.TZ = (await Settings.use("timezone")) ? await Settings.use("timezone") : process.env.TZ;
|
120
|
+
|
121
|
+
return
|
122
|
+
} catch (error) {
|
123
|
+
console.log(error);
|
124
|
+
}
|
125
|
+
} else {
|
126
|
+
process.env.TZ = (await Settings.use("timezone")) ? await Settings.use("timezone") : process.env.TZ;
|
127
|
+
return
|
128
|
+
}
|
129
|
+
return
|
130
|
+
};
|
131
|
+
|
132
|
+
function isCommented(str) {
|
133
|
+
return (Boolean(str) && (
|
134
|
+
str
|
135
|
+
.split(" ")
|
136
|
+
.filter((a) => {
|
137
|
+
return Boolean(a);
|
138
|
+
})[0]
|
139
|
+
.charAt(0) === "#"
|
140
|
+
));
|
141
|
+
}
|
142
|
+
|
143
|
+
|
144
|
+
function cleanSeedItem(item) {
|
145
|
+
|
146
|
+
if(item.createdAt) delete(item.createdAt)
|
147
|
+
if(item.updatedAt) delete(item.updatedAt)
|
148
|
+
if(typeof item.id === "number") delete(item.id)
|
149
|
+
|
150
|
+
for (const [key, value] of Object.entries(item)) {
|
151
|
+
if (value === null || value === undefined) {
|
152
|
+
delete(item[key])
|
153
|
+
} else {
|
154
|
+
try {
|
155
|
+
let json_value = JSON.parse(value);
|
156
|
+
item[key] = json_value
|
157
|
+
} catch (e) {
|
158
|
+
}
|
159
|
+
}
|
160
|
+
}
|
161
|
+
}
|
@@ -1,9 +1,9 @@
|
|
1
|
-
module.exports.connections = {
|
2
|
-
// postgres: {
|
3
|
-
// adapter: 'sails-postgresql',
|
4
|
-
// host: process.env.PG_HOST === undefined ? '127.0.0.1' : process.env.PG_HOST,
|
5
|
-
// user: process.env.PG_USER === undefined ? 'postgres' : process.env.PG_USER,
|
6
|
-
// password: process.env.PG_PASSWORD === undefined ? 'postgres' : process.env.PG_PASSWORD,
|
7
|
-
// database: process.env.PG_DATABASE === undefined ? 'testdb' : process.env.PG_DATABASE
|
8
|
-
// }
|
9
|
-
};
|
1
|
+
module.exports.connections = {
|
2
|
+
// postgres: {
|
3
|
+
// adapter: 'sails-postgresql',
|
4
|
+
// host: process.env.PG_HOST === undefined ? '127.0.0.1' : process.env.PG_HOST,
|
5
|
+
// user: process.env.PG_USER === undefined ? 'postgres' : process.env.PG_USER,
|
6
|
+
// password: process.env.PG_PASSWORD === undefined ? 'postgres' : process.env.PG_PASSWORD,
|
7
|
+
// database: process.env.PG_DATABASE === undefined ? 'testdb' : process.env.PG_DATABASE
|
8
|
+
// }
|
9
|
+
};
|
@@ -1,10 +1,10 @@
|
|
1
|
-
module.exports = {
|
2
|
-
// models: {
|
3
|
-
// connection: 'postgres'
|
4
|
-
|
5
|
-
// },
|
6
|
-
port: process.env.PORT === undefined ? 42772 : process.env.PORT,
|
7
|
-
log: {
|
8
|
-
level: process.env.LOG_LEVEL === undefined ? 'verbose' : process.env.PORT
|
9
|
-
}
|
10
|
-
};
|
1
|
+
module.exports = {
|
2
|
+
// models: {
|
3
|
+
// connection: 'postgres'
|
4
|
+
|
5
|
+
// },
|
6
|
+
port: process.env.PORT === undefined ? 42772 : process.env.PORT,
|
7
|
+
log: {
|
8
|
+
level: process.env.LOG_LEVEL === undefined ? 'verbose' : process.env.PORT
|
9
|
+
}
|
10
|
+
};
|
@@ -1,16 +1,16 @@
|
|
1
|
-
module.exports = {
|
2
|
-
// models: {
|
3
|
-
// connection: 'postgres',
|
4
|
-
// migrate: 'safe'
|
5
|
-
// },
|
6
|
-
adminpanel:{
|
7
|
-
auth: true
|
8
|
-
},
|
9
|
-
log: {
|
10
|
-
level: 'info'
|
11
|
-
},
|
12
|
-
port: process.env.PORT === undefined ? 42772 : process.env.PORT,
|
13
|
-
log: {
|
14
|
-
level: "verbose"
|
15
|
-
}
|
16
|
-
};
|
1
|
+
module.exports = {
|
2
|
+
// models: {
|
3
|
+
// connection: 'postgres',
|
4
|
+
// migrate: 'safe'
|
5
|
+
// },
|
6
|
+
adminpanel:{
|
7
|
+
auth: true
|
8
|
+
},
|
9
|
+
log: {
|
10
|
+
level: 'info'
|
11
|
+
},
|
12
|
+
port: process.env.PORT === undefined ? 42772 : process.env.PORT,
|
13
|
+
log: {
|
14
|
+
level: "verbose"
|
15
|
+
}
|
16
|
+
};
|
@@ -1,16 +1,16 @@
|
|
1
|
-
/**
|
2
|
-
* THIS FILE WAS ADDED AUTOMATICALLY by the Sails 1.0 app migration tool.
|
3
|
-
* The original file was backed up as `config/globals-old.js.txt`
|
4
|
-
*/
|
5
|
-
|
6
|
-
module.exports.globals = {
|
7
|
-
|
8
|
-
_: require('lodash'),
|
9
|
-
|
10
|
-
async: require('async'),
|
11
|
-
|
12
|
-
models: true,
|
13
|
-
|
14
|
-
sails: true
|
15
|
-
|
16
|
-
};
|
1
|
+
/**
|
2
|
+
* THIS FILE WAS ADDED AUTOMATICALLY by the Sails 1.0 app migration tool.
|
3
|
+
* The original file was backed up as `config/globals-old.js.txt`
|
4
|
+
*/
|
5
|
+
|
6
|
+
module.exports.globals = {
|
7
|
+
|
8
|
+
_: require('lodash'),
|
9
|
+
|
10
|
+
async: require('async'),
|
11
|
+
|
12
|
+
models: true,
|
13
|
+
|
14
|
+
sails: true
|
15
|
+
|
16
|
+
};
|
@@ -1,8 +1,8 @@
|
|
1
|
-
module.exports.orm = {
|
2
|
-
_hookTimeout: 100000000
|
3
|
-
};
|
4
|
-
|
5
|
-
module.exports.pubsub = {
|
6
|
-
_hookTimeout: 100000000
|
7
|
-
};
|
8
|
-
|
1
|
+
module.exports.orm = {
|
2
|
+
_hookTimeout: 100000000
|
3
|
+
};
|
4
|
+
|
5
|
+
module.exports.pubsub = {
|
6
|
+
_hookTimeout: 100000000
|
7
|
+
};
|
8
|
+
|