xarvh/fipamo
1
0
Fork 0
forked from projects/fipamo
Code Pull requests Activity

removed global dependency for pm2 and nodemon, port now configurable

Browse source
This commit is contained in:
Ro 2020-08-06 12:43:10 -07:00
parent ce434968b4
commit fdc217d5e5
6 changed files with 1610 additions and 6205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
brain/data/Settings.js
View file

@ -21,6 +21,7 @@ export default class Settings {
let payload = req.body; let payload = req.body;
//so payload matches loaded config //so payload matches loaded config
payload.global.display_limit = result.settings.global.display_limit; payload.global.display_limit = result.settings.global.display_limit;
payload.global.port = result.settings.global.port;
payload.global.last_backup = result.settings.global.last_backup; payload.global.last_backup = result.settings.global.last_backup;
let user = req.session.user; let user = req.session.user;
let found = _.find(result.folks, { id: user.id }); let found = _.find(result.folks, { id: user.id });

2
brain/views/frame.pug
View file

@ -29,7 +29,7 @@ html(xmlns='http://www.w3.org/1999/xhtml', lang='en', xml:lang="en")
-if(status) -if(status)
include partials/dash-nav include partials/dash-nav
block main-content block main-content
script(src='/assets/scripts/dashkit.min.js' type="text/javascript") //script(src='/assets/scripts/dashkit.min.js' type="text/javascript")
script(src='/assets/scripts/dash.min.js' type="text/javascript") script(src='/assets/scripts/dash.min.js' type="text/javascript")

3
init.js
View file

@ -7,12 +7,13 @@
var app = require('./brain/app'); var app = require('./brain/app');
var debug = require('debug')('fipamo:server'); var debug = require('debug')('fipamo:server');
var http = require('http'); var http = require('http');
var config = require('./site/settings.json');
/** /**
* Get port from environment and store in Express. * Get port from environment and store in Express.
*/ */
var port = normalizePort(process.env.PORT || '2314'); var port = normalizePort(process.env.PORT || config.global.port);
app.set('port', port); app.set('port', port);
/** /**

7770
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
package.json
View file

@ -39,6 +39,7 @@
"multer": "latest", "multer": "latest",
"nodemailer": "^6.4.8", "nodemailer": "^6.4.8",
"nodemailer-mailgun-transport": "^1.4.0", "nodemailer-mailgun-transport": "^1.4.0",
"pm2": "^4.4.0",
"pug": "^3.0.0", "pug": "^3.0.0",
"reframe.js": "^2.2.8", "reframe.js": "^2.2.8",
"request": "^2.88.2", "request": "^2.88.2",
@ -48,5 +49,8 @@
"sortablejs": "^1.10.2", "sortablejs": "^1.10.2",
"tiny-date-picker": "^3.2.8", "tiny-date-picker": "^3.2.8",
"uuid": "^3.4.0" "uuid": "^3.4.0"
},
"devDependencies": {
"nodemon": "^2.0.4"
} }
} }

3
site/init/settings-template.json
View file

@ -8,7 +8,8 @@
"renderOnSave": "false", "renderOnSave": "false",
"theme": "default-light", "theme": "default-light",
"display_limit": 5, "display_limit": 5,
"last_backup": null "last_backup": null,
"port": 2314
}, },
"library_stats": { "library_stats": {
"current_index": 1 "current_index": 1