Moved public dirs to seperate directories

This commit is contained in:
MrFry 2020-04-13 10:49:38 +02:00
parent fe580747d6
commit 4e22b94b5d
9 changed files with 59 additions and 14 deletions

View file

@ -52,6 +52,7 @@ const daysAfterUserGetsPWs = 2 // days after user gets pw-s
let userDB
let url
let publicdirs = []
function GetApp () {
app.use(bodyParser.urlencoded({
@ -79,7 +80,10 @@ function GetApp () {
'/badtestsender'
]
}))
app.use(express.static('public'))
publicdirs.forEach((pdir) => {
logger.Log(`Using public dir: ${pdir}`)
app.use(express.static(pdir))
})
app.use(busboy({
limits: {
fileSize: 50000 * 1024 * 1024
@ -653,4 +657,5 @@ exports.getApp = GetApp
exports.setup = (data) => {
userDB = data.userDB
url = data.url
publicdirs = data.publicdirs
}

View file

@ -28,6 +28,7 @@ const logger = require('../../utils/logger.js')
const auth = require('../../middlewares/auth.middleware.js')
let userDB
let publicdirs = []
function GetApp () {
app.use(bodyParser.urlencoded({
@ -50,8 +51,10 @@ function GetApp () {
'/getVeteranPw'
]
}))
app.use(express.static('modules/dataEditor/public'))
app.use(express.static('public'))
publicdirs.forEach((pdir) => {
logger.Log(`Using public dir: ${pdir}`)
app.use(express.static(pdir))
})
app.use(busboy({
limits: {
fileSize: 10000 * 1024 * 1024
@ -103,4 +106,5 @@ exports.name = 'Data editor'
exports.getApp = GetApp
exports.setup = (data) => {
userDB = data.userDB
publicdirs = data.publicdirs
}

View file

@ -25,17 +25,22 @@ const bodyParser = require('body-parser')
const busboy = require('connect-busboy')
const app = express()
// const logger = require('../../utils/logger.js')
const logger = require('../../utils/logger.js')
// const utils = require('../utils/utils.js')
// const actions = require('../utils/actions.js')
let publicdirs = []
function GetApp () {
app.set('view engine', 'ejs')
app.set('views', [
'./modules/main/views',
'./sharedViews'
])
app.use(express.static('public'))
publicdirs.forEach((pdir) => {
logger.Log(`Using public dir: ${pdir}`)
app.use(express.static(pdir))
})
app.use(busboy({
limits: {
fileSize: 10000 * 1024 * 1024
@ -73,6 +78,7 @@ function GetApp () {
exports.name = 'Main'
exports.getApp = GetApp
exports.setup = (x) => {
url = x.url
exports.setup = (data) => {
url = data.url
publicdirs = data.publicdirs
}

View file

@ -28,6 +28,7 @@ const logger = require('../../utils/logger.js')
const auth = require('../../middlewares/auth.middleware.js')
let donateURL = ''
let publicdirs = []
let userDB
try {
@ -61,8 +62,10 @@ function GetApp () {
'/irc'
]
}))
app.use(express.static('modules/qmining/public'))
app.use(express.static('public'))
publicdirs.forEach((pdir) => {
logger.Log(`Using public dir: ${pdir}`)
app.use(express.static(pdir))
})
app.use(busboy({
limits: {
fileSize: 10000 * 1024 * 1024
@ -201,4 +204,5 @@ exports.name = 'Qmining'
exports.getApp = GetApp
exports.setup = (data) => {
userDB = data.userDB
publicdirs = data.publicdirs
}

View file

@ -31,13 +31,18 @@ const utils = require('../../utils/utils.js')
const uloadFiles = './public/f'
let publicdirs = []
function GetApp () {
app.set('view engine', 'ejs')
app.set('views', [
'./modules/sio/views',
'./sharedViews'
])
app.use(express.static('public'))
publicdirs.forEach((pdir) => {
logger.Log(`Using public dir: ${pdir}`)
app.use(express.static(pdir))
})
app.use(busboy({
limits: {
fileSize: 10000 * 1024 * 1024
@ -102,3 +107,6 @@ function GetApp () {
exports.name = 'Sio'
exports.getApp = GetApp
exports.setup = (data) => {
publicdirs = data.publicdirs
}

View file

@ -31,13 +31,18 @@ const logger = require('../../utils/logger.js')
const listedFiles = './public/files'
let publicdirs = []
function GetApp () {
app.set('view engine', 'ejs')
app.set('views', [
'./modules/stuff/views',
'./sharedViews'
])
app.use(express.static('public'))
publicdirs.forEach((pdir) => {
logger.Log(`Using public dir: ${pdir}`)
app.use(express.static(pdir))
})
app.use(busboy({
limits: {
fileSize: 10000 * 1024 * 1024
@ -213,6 +218,7 @@ function GetApp () {
exports.name = 'Stuff'
exports.getApp = GetApp
exports.setup = (x) => {
url = x.url
exports.setup = (data) => {
url = data.url
publicdirs = data.publicdirs
}