Removed extra routes, moved static to main file
This commit is contained in:
parent
bdfd512c10
commit
54e73085c6
16
lolisafe.js
16
lolisafe.js
|
@ -1,6 +1,5 @@
|
|||
const config = require('./config.js')
|
||||
const api = require('./routes/api.js')
|
||||
const routes = require('./routes/routes.js')
|
||||
const express = require('express')
|
||||
const db = require('knex')(config.database)
|
||||
const fs = require('fs')
|
||||
|
@ -19,12 +18,23 @@ if( prefix !== '' )
|
|||
|
||||
safe.use('/' + prefix, express.static('./uploads'))
|
||||
safe.use('/', express.static('./public'))
|
||||
safe.use('/', routes)
|
||||
safe.use('/api', api)
|
||||
|
||||
safe.get('/', function (req, res, next) {
|
||||
res.sendFile('home.html', {
|
||||
root: './pages/'
|
||||
})
|
||||
})
|
||||
|
||||
safe.get('/panel', function (req, res, next) {
|
||||
res.sendFile('panel.html', {
|
||||
root: './pages/'
|
||||
})
|
||||
})
|
||||
|
||||
safe.use(function (req, res, next) {
|
||||
res.status(404).sendFile('404.html', {
|
||||
root: './public/error/',
|
||||
root: './pages/error/',
|
||||
})
|
||||
})
|
||||
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
const config = require('../config.js')
|
||||
const routes = require('express').Router()
|
||||
const path = require('path')
|
||||
|
||||
let options = {
|
||||
root: 'pages/',
|
||||
dotfiles: 'deny',
|
||||
headers: {
|
||||
'x-timestamp': Date.now(),
|
||||
'x-sent': true
|
||||
}
|
||||
}
|
||||
|
||||
routes.get('/', (req, res) => {
|
||||
|
||||
res.sendFile('home.html', options, function (err) {
|
||||
if (err) {
|
||||
console.log(err)
|
||||
res.status(err.status).end()
|
||||
}
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
routes.get('/panel', function (req, res, next) {
|
||||
|
||||
res.sendFile('panel.html', options, function (err) {
|
||||
if (err) {
|
||||
console.log(err)
|
||||
res.status(err.status).end()
|
||||
}
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
module.exports = routes
|
Loading…
Reference in New Issue