Prettied all js in src/

This commit is contained in:
mrfry 2020-10-01 14:44:24 +02:00
parent 3f081d8dff
commit ee0f0a9f3b
17 changed files with 1012 additions and 688 deletions

View file

@ -41,117 +41,125 @@ try {
logger.Log('Couldnt read donate URL file!', logger.GetColor('red'))
}
function GetApp () {
app.use(bodyParser.urlencoded({
limit: '5mb',
extended: true
}))
app.use(bodyParser.json({
limit: '5mb'
}))
function GetApp() {
app.use(
bodyParser.urlencoded({
limit: '5mb',
extended: true,
})
)
app.use(
bodyParser.json({
limit: '5mb',
})
)
app.set('view engine', 'ejs')
app.set('views', [
'./modules/qmining/views',
'./sharedViews'
])
app.use(auth({
userDB: userDB,
jsonResponse: false,
exceptions: [
'/thanks',
'/thanks.html',
'/img/thanks.gif',
'/install',
'/favicon.ico',
'/getVeteranPw',
'/moodle-test-userscript/stable.user.js',
'/donate',
'/irc'
]
}))
app.set('views', ['./modules/qmining/views', './sharedViews'])
app.use(
auth({
userDB: userDB,
jsonResponse: false,
exceptions: [
'/thanks',
'/thanks.html',
'/img/thanks.gif',
'/install',
'/favicon.ico',
'/getVeteranPw',
'/moodle-test-userscript/stable.user.js',
'/donate',
'/irc',
],
})
)
publicdirs.forEach((pdir) => {
logger.Log(`Using public dir: ${pdir}`)
app.use(express.static(pdir))
})
app.use(express.static(nextdir))
app.use(busboy({
limits: {
fileSize: 10000 * 1024 * 1024
}
}))
app.use(
busboy({
limits: {
fileSize: 10000 * 1024 * 1024,
},
})
)
// --------------------------------------------------------------
// REDIRECTS
// --------------------------------------------------------------
// to be backwards compatible
app.get('/ask', function (req, res) {
app.get('/ask', function(req, res) {
logger.DebugLog(`Qmining module ask redirect`, 'ask', 1)
res.redirect(`http://api.frylabs.net/ask?q=${req.query.q}&subj=${req.query.subj}&data=${req.query.data}`)
res.redirect(
`http://api.frylabs.net/ask?q=${req.query.q}&subj=${req.query.subj}&data=${req.query.data}`
)
})
const simpleRedirects = [
{
from: '/dataeditor',
to: 'https://dataeditor.frylabs.net'
to: 'https://dataeditor.frylabs.net',
},
{
from: '/install',
to: 'https://qmining.frylabs.net/moodle-test-userscript/stable.user.js'
to: 'https://qmining.frylabs.net/moodle-test-userscript/stable.user.js',
},
{
from: '/servergit',
to: 'https://gitlab.com/MrFry/mrfrys-node-server'
to: 'https://gitlab.com/MrFry/mrfrys-node-server',
},
{
from: '/scriptgit',
to: 'https://gitlab.com/MrFry/moodle-test-userscript'
to: 'https://gitlab.com/MrFry/moodle-test-userscript',
},
{
from: '/qminingSite',
to: 'https://gitlab.com/MrFry/qmining-page'
to: 'https://gitlab.com/MrFry/qmining-page',
},
{
from: '/classesgit',
to: 'https://gitlab.com/MrFry/question-classes'
to: 'https://gitlab.com/MrFry/question-classes',
},
{
from: '/menuClick',
to: '/'
to: '/',
},
{
from: '/lred',
to: '/allQuestions.html'
to: '/allQuestions.html',
},
{
from: '/donate',
to: donateURL
to: donateURL,
},
{ // to be backwards compatible
{
// to be backwards compatible
from: '/legacy',
to: '/allQuestions.html'
to: '/allQuestions.html',
},
{
from: '/allqr',
to: 'http://api.frylabs.net/allqr.txt'
to: 'http://api.frylabs.net/allqr.txt',
},
{
from: '/allqr.txt',
to: 'http://api.frylabs.net/allqr.txt'
to: 'http://api.frylabs.net/allqr.txt',
},
{
from: '/infos',
to: 'http://api.frylabs.net/infos?version=true&motd=true&subjinfo=true',
nolog: true
nolog: true,
},
{
from: '/irc',
to: 'https://kiwiirc.com/nextclient/irc.sub.fm/#qmining'
}
to: 'https://kiwiirc.com/nextclient/irc.sub.fm/#qmining',
},
]
simpleRedirects.forEach((redirect) => {
app.get(redirect.from, function (req, res) {
app.get(redirect.from, function(req, res) {
if (!redirect.nolog) {
logger.LogReq(req)
}
@ -162,7 +170,7 @@ function GetApp () {
// --------------------------------------------------------------
function AddHtmlRoutes (files) {
function AddHtmlRoutes(files) {
const routes = files.reduce((acc, f) => {
if (f.includes('html')) {
acc.push(f.split('.')[0])
@ -173,7 +181,7 @@ function GetApp () {
routes.forEach((route) => {
logger.DebugLog(`Added route /${route}`, 'Qmining routes', 1)
app.get(`/${route}`, function (req, res) {
app.get(`/${route}`, function(req, res) {
logger.LogReq(req)
res.redirect(`${route}.html`)
})
@ -183,29 +191,29 @@ function GetApp () {
// --------------------------------------------------------------
app.get('/', function (req, res) {
app.get('/', function(req, res) {
res.end('hai')
logger.LogReq(req)
})
app.get('/getVeteranPw', function (req, res) {
app.get('/getVeteranPw', function(req, res) {
res.render('veteranPw', {
cid: req.query.cid || '',
devel: process.env.NS_DEVEL
devel: process.env.NS_DEVEL,
})
logger.LogReq(req)
})
app.get('*', function (req, res) {
app.get('*', function(req, res) {
res.status(404).render('404')
})
app.post('*', function (req, res) {
app.post('*', function(req, res) {
res.status(404).render('404')
})
return {
app: app
app: app,
}
}