KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issues

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2019-03-10 22:19:52 +01:00
parent 55a0b678d6
commit a8363ebbd2
4 changed files with 2462 additions and 1739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gulpfile.js
View File

@@ -88,9 +88,10 @@ gulp.task('callback', function () {
.pipe(gulp.dest('server/public/assets/dist')); .pipe(gulp.dest('server/public/assets/dist'));
}); });
gulp.task('build', function() { gulp.task('build', done => {
return gulp.run(['css', 'css-embed', 'js', 'embed', 'remotecontroller', 'callback', 'token']); gulp.series('css', 'css-embed', 'js', 'embed', 'remotecontroller', 'callback', 'token')();
}) done();
});
gulp.task('remotecontroller', function () { gulp.task('remotecontroller', function () {
return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/remotecontroller.js', 'server/public/assets/js/helpers.js']) return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/remotecontroller.js', 'server/public/assets/js/helpers.js'])

4141
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

32
package.json
View File

@@ -20,41 +20,41 @@
"url": "https://github.com/zoff-music/zoff/issues" "url": "https://github.com/zoff-music/zoff/issues"
}, },
"devDependencies": { "devDependencies": {
"gulp": "~3.9.0", "gulp": "^4.0.0",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
"gulp-cssnano": "^2.1.3", "gulp-cssnano": "^2.1.3",
"gulp-uglify": "^3.0.1", "gulp-uglify": "^3.0.2",
"gulp-util": "^3.0.8" "gulp-util": "^3.0.8"
}, },
"homepage": "https://github.com/zoff-music/zoff#readme", "homepage": "https://github.com/zoff-music/zoff#readme",
"dependencies": { "dependencies": {
"bad-words": "^1.6.1", "bad-words": "^1.6.5",
"bcrypt-nodejs": "0.0.3", "bcrypt-nodejs": "0.0.3",
"body-parser": "^1.17.1", "body-parser": "^1.18.3",
"color-thief-jimp": "^2.0.2", "color-thief-jimp": "^2.0.2",
"compression": "^1.7.3", "compression": "^1.7.3",
"cookie-parser": "^1.4.3", "connect-mongo": "^2.0.3",
"cors": "^2.8.4", "cookie-parser": "^1.4.4",
"express": "^4.16.3", "cors": "^2.8.5",
"express-handlebars": "^3.0.0", "express": "^4.16.4",
"express-handlebars": "^3.0.2",
"express-recaptcha": "^3.0.1", "express-recaptcha": "^3.0.1",
"express-session": "^1.15.6", "express-session": "^1.15.6",
"express-sessions": "^1.0.6", "gulp-sourcemaps": "^2.6.5",
"gulp-sourcemaps": "^2.6.4",
"gulp-uglify-es": "^1.0.4", "gulp-uglify-es": "^1.0.4",
"helmet": "^3.12.0", "helmet": "^3.16.0",
"jimp": "^0.2.28", "jimp": "^0.2.28",
"mongodb": "^2.2.35", "mongodb": "^2.2.36",
"mongojs": "^2.5.0", "mongojs": "^2.6.0",
"mongojs-paginate": "^1.2.0", "mongojs-paginate": "^1.2.0",
"mongoose": "^5.0.16", "mongoose": "^5.4.18",
"mpromise": "^0.5.5", "mpromise": "^0.5.5",
"nodemailer": "^4.6.4", "nodemailer": "^4.7.0",
"passport": "^0.4.0", "passport": "^0.4.0",
"passport-local": "^1.0.0", "passport-local": "^1.0.0",
"redis": "^2.8.0", "redis": "^2.8.0",
"request": "^2.88.0", "request": "^2.88.0",
"socket.io": "^2.1.0", "socket.io": "^2.2.0",
"socket.io-redis": "^5.2.0", "socket.io-redis": "^5.2.0",
"sticky-session": "^1.1.2", "sticky-session": "^1.1.2",
"uniqid": "5.0.3" "uniqid": "5.0.3"

11
server/apps/admin.js
View File

@@ -20,6 +20,7 @@ var db = mongojs(mongo_db_cred.config);
var token_db = mongojs("tokens"); var token_db = mongojs("tokens");
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
var session = require('express-session'); var session = require('express-session');
var MongoStore = require('connect-mongo')(session);
var api = require(pathThumbnails + '/routing/admin/api.js'); var api = require(pathThumbnails + '/routing/admin/api.js');
var User = require(pathThumbnails + '/models/user.js'); var User = require(pathThumbnails + '/models/user.js');
@@ -40,13 +41,11 @@ app.use(session({
secret: mongo_db_cred.secret, secret: mongo_db_cred.secret,
resave: true, resave: true,
saveUninitialized: true, saveUninitialized: true,
store: new (require('express-sessions'))({ store: new MongoStore({
storage: 'mongodb', url: url,
instance: mongoose, useNewUrlParser: true,
host: mongo_db_cred.host,
port: 27017,
collection: 'sessions', collection: 'sessions',
expire: mongo_db_cred.expire ttl: mongo_db_cred.expire
}) })
})); // session secret })); // session secret
app.use(passport.initialize()); app.use(passport.initialize());