LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

moved /server to /server/server.js

Browse source
This commit is contained in:
bill bittner 2018-03-20 12:52:34 -07:00
parent d29c44973f
commit e3f1dbdf5e
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
server.js → server/server.js
View file

@ -5,7 +5,7 @@ const expressHandlebars = require('express-handlebars');
const Handlebars = require('handlebars'); const Handlebars = require('handlebars');
const helmet = require('helmet'); const helmet = require('helmet');
const passport = require('passport'); const passport = require('passport');
const { serializeSpeechUser, deserializeSpeechUser } = require('./server/helpers/authHelpers.js'); const { serializeSpeechUser, deserializeSpeechUser } = require('./helpers/authHelpers.js');
const cookieSession = require('cookie-session'); const cookieSession = require('cookie-session');
const http = require('http'); const http = require('http');
// logging dependencies // logging dependencies
@ -13,16 +13,16 @@ const logger = require('winston');
function SpeechServer () { function SpeechServer () {
this.configureMysql = (mysqlConfig) => { this.configureMysql = (mysqlConfig) => {
require('./config/mysqlConfig.js').configure(mysqlConfig); require('../config/mysqlConfig.js').configure(mysqlConfig);
}; };
this.configureSite = (siteConfig) => { this.configureSite = (siteConfig) => {
require('./config/siteConfig.js').configure(siteConfig); require('../config/siteConfig.js').configure(siteConfig);
console.log(require('./config/siteConfig.js')); console.log(require('../config/siteConfig.js'));
this.sessionKey = siteConfig.auth.sessionKey; this.sessionKey = siteConfig.auth.sessionKey;
this.PORT = siteConfig.details.port; this.PORT = siteConfig.details.port;
}; };
this.configureSlack = (slackConfig) => { this.configureSlack = (slackConfig) => {
require('./config/slackConfig.js').configure(slackConfig); require('../config/slackConfig.js').configure(slackConfig);
}; };
this.createApp = () => { this.createApp = () => {
// create an Express application // create an Express application
@ -44,8 +44,8 @@ function SpeechServer () {
// configure passport // configure passport
passport.serializeUser(serializeSpeechUser); passport.serializeUser(serializeSpeechUser);
passport.deserializeUser(deserializeSpeechUser); passport.deserializeUser(deserializeSpeechUser);
const localSignupStrategy = require('./server/passport/local-signup.js'); const localSignupStrategy = require('./passport/local-signup.js');
const localLoginStrategy = require('./server/passport/local-login.js'); const localLoginStrategy = require('./passport/local-login.js');
passport.use('local-signup', localSignupStrategy); passport.use('local-signup', localSignupStrategy);
passport.use('local-login', localLoginStrategy); passport.use('local-login', localLoginStrategy);
// initialize passport // initialize passport
@ -66,22 +66,22 @@ function SpeechServer () {
app.set('view engine', 'handlebars'); app.set('view engine', 'handlebars');
// set the routes on the app // set the routes on the app
require('./server/routes/auth-routes.js')(app); require('./routes/auth-routes.js')(app);
require('./server/routes/api-routes.js')(app); require('./routes/api-routes.js')(app);
require('./server/routes/page-routes.js')(app); require('./routes/page-routes.js')(app);
require('./server/routes/asset-routes.js')(app); require('./routes/asset-routes.js')(app);
require('./server/routes/fallback-routes.js')(app); require('./routes/fallback-routes.js')(app);
this.app = app; this.app = app;
}; };
this.initialize = () => { this.initialize = () => {
require('./server/helpers/configureLogger.js')(logger); require('./helpers/configureLogger.js')(logger);
require('./server/helpers/configureSlack.js')(logger); require('./helpers/configureSlack.js')(logger);
this.createApp(); this.createApp();
this.server = http.Server(this.app); this.server = http.Server(this.app);
}; };
this.start = () => { this.start = () => {
const db = require('./server/models/index'); const db = require('./models/index');
// sync sequelize // sync sequelize
db.sequelize.sync() db.sequelize.sync()
// start the server // start the server

2
webpack.server.common.js
View file

@ -8,7 +8,7 @@ module.exports = {
__dirname: false, __dirname: false,
}, },
externals: [nodeExternals()], externals: [nodeExternals()],
entry : ['babel-polyfill', 'whatwg-fetch', './server.js'], entry : ['babel-polyfill', 'whatwg-fetch', './server/server.js'],
output : { output : {
path : Path.join(__dirname, '/'), path : Path.join(__dirname, '/'),
publicPath : '/', publicPath : '/',