LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues95 Pull requests2 Projects Releases4 Packages Wiki Activity

Folder structure #398

Merged
bones7242 merged 76 commits from folder-structure into master 2018-03-20 00:01:08 +01:00
Conversation 0 Commits 76 Files changed 177 +6 -5
6 changed files with 6 additions and 5 deletions
Showing only changes of commit f840281b4c - Show all commits

1
config/siteConfig.js
View file

@ -11,6 +11,7 @@ function SiteConfig () {
sessionKey: 'default', sessionKey: 'default',
}; };
this.details = { this.details = {
port : 3000,
title : 'Spee.ch', title : 'Spee.ch',
host : 'default', host : 'default',
description: 'Open-source, decentralized image and video sharing.', description: 'Open-source, decentralized image and video sharing.',

2
index.js
View file

File diff suppressed because one or more lines are too long

2
index.js.map
View file

File diff suppressed because one or more lines are too long

2
public/bundle/bundle.js
View file

File diff suppressed because one or more lines are too long

2
public/bundle/bundle.js.map
View file

File diff suppressed because one or more lines are too long

2
server.js
View file

@ -12,7 +12,6 @@ const http = require('http');
const logger = require('winston'); const logger = require('winston');
function SpeechServer ({ mysqlConfig, siteConfig, slackConfig }) { function SpeechServer ({ mysqlConfig, siteConfig, slackConfig }) {
this.PORT = 3000;
this.start = () => { this.start = () => {
this.configureConfigFiles(); this.configureConfigFiles();
this.configureLogging(); this.configureLogging();
@ -25,6 +24,7 @@ function SpeechServer ({ mysqlConfig, siteConfig, slackConfig }) {
mysqlAppConfig.configure(mysqlConfig); mysqlAppConfig.configure(mysqlConfig);
const siteAppConfig = require('./config/siteConfig.js'); const siteAppConfig = require('./config/siteConfig.js');
siteAppConfig.configure(siteConfig); siteAppConfig.configure(siteConfig);
this.PORT = siteAppConfig.details.port;
const slackAppConfig = require('./config/slackConfig.js'); const slackAppConfig = require('./config/slackConfig.js');
slackAppConfig.configure(slackConfig); slackAppConfig.configure(slackConfig);
}; };