hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Fix logging and static content serving; Fix user content-creator

pull/1/head
Florian Hartwich 2017-05-10 13:36:40 +02:00
parent 4180f66667
commit 2a7dead843
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opt-cc-api/server.js
View File

@ -33,16 +33,16 @@ mongoose.Promise = global.Promise;
// app creation // app creation
const app = express(); const app = express();
// Middlewares *************************************************
app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
app.use(express.static(path.join(__dirname, 'public')));
app.use(bodyParser.json());
// logging // logging
if (process.env.NODE_ENV !== config.test.env) { if (process.env.NODE_ENV !== config.test.env) {
app.use(requestLogger('dev')); app.use(requestLogger('dev'));
} }
// Middlewares *************************************************
app.use(favicon(path.join(__dirname, '../public', 'favicon.ico')));
app.use(express.static(path.join(__dirname, 'public')));
app.use(bodyParser.json());
// API request checks for API-version and JSON etc. // API request checks for API-version and JSON etc.
app.use(restAPIchecks); app.use(restAPIchecks);
@ -62,7 +62,7 @@ app.use('/cmd', apiAuthenticationMiddleware, commandRouter);
// send index.html on all different paths // send index.html on all different paths
app.use(function (req, res) { app.use(function (req, res) {
res.sendFile("../public/index.html", {root: __dirname}); res.sendFile("public/index.html", {root: __dirname});
}); });

31
opt-cc-api/test/content-tool/user-db-item-creator.js
View File

@ -1,10 +1,10 @@
const config = require('../../config'); const config = require('../../config');
const mongoose = require('mongoose'); const mongoose = require('mongoose');
mongoose.connect(config.database); mongoose.connect(config.database.uri + config.database.db);
const UserModel = require('../../models/user'); const UserModel = require('../../models/user');
const squads = ['590ddfd93f4b67019d0ad4b5', '590e366bfbe1835513601cc5', const squads = ['590dd702b899f8050691f09a', '59101b6366d61c085a9f57df',
'590e367cfbe1835513601cc6', '590f77d33de40440ca826263']; '591025e266d61c085a9f57e1', '591025cf66d61c085a9f57e0', '590d2cf5bd08480bd4ecc128'];
/** /**
@ -16,9 +16,18 @@ const quantity = process.argv[2];
// CONNECTION EVENTS // CONNECTION EVENTS
// When successfully connected // When successfully connected
mongoose.connection.on('connected', () => { mongoose.connection.on('connected', () => {
console.log('Mongoose default connection open to ' + config.database); console.log('Mongoose default connection open');
}); });
const createString = (possible, length) => {
let text = "";
for( let i=0; i < length; i++ )
text += possible.charAt(Math.floor(Math.random() * possible.length));
return text;
};
for (let i = 0; i < quantity; i++) { for (let i = 0; i < quantity; i++) {
const squadId = squads[Math.floor(Math.random() * squads.length)]; const squadId = squads[Math.floor(Math.random() * squads.length)];
@ -46,17 +55,3 @@ process.on('SIGINT', () => {
}); });
// process.exit(); // process.exit();
let createString = (possible, length) =>
{
let text = "";
for( var i=0; i < length; i++ )
text += possible.charAt(Math.floor(Math.random() * possible.length));
return text;
};