Global site url source

This commit is contained in:
MrFry 2019-10-26 10:08:56 +02:00
parent 61c71e6c8d
commit d841e464f5
7 changed files with 37 additions and 17 deletions

View file

@ -18,7 +18,7 @@
------------------------------------------------------------------------- */
const siteUrl = 'https://qmining.frylabs.net' // http(s)//asd.basd
let url = '' // http(s)//asd.basd
const express = require('express')
const bodyParser = require('body-parser')
@ -49,7 +49,7 @@ app.use(bodyParser.json({
app.get('/', function (req, res) {
res.render('main/main', {
siteurl: siteUrl
siteurl: url
})
})
@ -65,5 +65,8 @@ app.post('*', function (req, res) {
})
exports.app = app
exports.setup = (x) => {
url = x.url
}
logger.Log('Main module started', logger.GetColor('yellow'))

View file

@ -18,6 +18,7 @@
------------------------------------------------------------------------- */
let url = ''
const express = require('express')
const app = express()
@ -26,17 +27,20 @@ const logger = require('../utils/logger.js')
// --------------------------------------------------------------
app.get('/', function (req, res) {
res.redirect('https://qmining.frylabs.net' + req.url)
res.redirect(url + req.url)
})
app.get('*', function (req, res) {
res.redirect('https://qmining.frylabs.net' + req.url)
res.redirect(url + req.url)
})
app.post('*', function (req, res) {
res.redirect('https://qmining.frylabs.net' + req.url)
res.redirect(url + req.url)
})
exports.app = app
exports.setup = (x) => {
url = x.url
}
logger.Log('Old module started', logger.GetColor('yellow'))

View file

@ -18,7 +18,7 @@
------------------------------------------------------------------------- */
const siteUrl = 'https://qmining.frylabs.net' // http(s)//asd.basd
let url = ''
const express = require('express')
const bodyParser = require('body-parser')
@ -60,7 +60,7 @@ app.get('/', function (req, res) {
// req.hostname
res.render('qmining/main', {
siteurl: siteUrl,
siteurl: url,
qa: actions.ProcessQA()
})
res.end()
@ -97,7 +97,7 @@ app.get('/legacy', function (req, res) {
data: d,
scount: scount,
qcount: qcount,
siteurl: siteUrl
siteurl: url
})
logger.LogReq(req)
@ -154,7 +154,7 @@ app.get('/greasy', function (req, res) {
})
app.get('/install', function (req, res) {
res.redirect('http://qmining.frylabs.net/moodle-test-userscript/stable.user.js')
res.redirect(url + '/moodle-test-userscript/stable.user.js')
res.end()
logger.LogReq(req)
})
@ -225,5 +225,8 @@ app.post('*', function (req, res) {
})
exports.app = app
exports.setup = (x) => {
url = x.url
}
logger.Log('Qmining module started', logger.GetColor('yellow'))

View file

@ -23,6 +23,7 @@ const bodyParser = require('body-parser')
const busboy = require('connect-busboy')
const fs = require('fs')
const app = express()
let url = ''
const logger = require('../utils/logger.js')
// const utils = require('../utils/utils.js')
@ -91,7 +92,8 @@ app.get('/*', function (req, res) {
res.render('stuff/folders', {
folders: f,
dirname: relPath,
prevDir
prevDir,
url
})
} else {
let fileStream = fs.createReadStream(curr)
@ -99,7 +101,8 @@ app.get('/*', function (req, res) {
}
} catch (e) {
res.render('stuff/nofile', {
missingFile: curr
missingFile: curr,
url
})
}
})
@ -118,5 +121,8 @@ app.post('*', function (req, res) {
})
exports.app = app
exports.setup = (x) => {
url = x.url
}
logger.Log('Stuff module started', logger.GetColor('yellow'))

View file

@ -68,7 +68,13 @@ const app = express()
Object.keys(modules).forEach(function (k, i) {
let x = modules[k]
try {
x.app = require(x.path).app
let mod = require(x.path)
if (mod.setup) {
mod.setup({
url: 'http://' + x.urls[0] // TODO http https or neither
})
}
x.app = mod.app
x.urls.forEach((url) => {
app.use(vhost(url, x.app))
})

View file

@ -65,7 +65,7 @@
<%=dirname%>
</h1>
</center>
<a href="<%= "http://stuff.frylabs.net" + prevDir%>" > Up one level </a>
<a href="<%= url + prevDir%>" > Up one level </a>
</p>
<table class="maintable">
@ -75,7 +75,7 @@
<button class="butt">
<table class="subtable">
<td style='width:30%;'>
<a href="<%= "http://stuff.frylabs.net" + folders[i].path%>"> <%=folders[i].name %> </a>
<a href="<%= url + folders[i].path%>"> <%=folders[i].name %> </a>
</td>
<td style='width:30%;'>
<%=folders[i].path %>

View file

@ -1,4 +1,3 @@
<html>
<body bgcolor="#212127">
@ -58,7 +57,6 @@
.butt:hover {
background-color: #555;
}
</style>
</head>
<center>
@ -67,7 +65,7 @@
</br>
<%= missingFile %>
</br>
<a href="<%= "http://stuff.frylabs.net" %>" > Back to root </a>
<a href="<%= url %>" > Back to root </a>
</h1>
</center>
</body>