diff --git a/modules/main.js b/modules/main.js index 831e0d5..79fda89 100644 --- a/modules/main.js +++ b/modules/main.js @@ -18,6 +18,8 @@ ------------------------------------------------------------------------- */ +const siteUrl = 'https://qmining.frylabs.net' // http(s)//asd.basd + const express = require('express') const bodyParser = require('body-parser') const busboy = require('connect-busboy') @@ -55,8 +57,9 @@ app.use(bodyParser.json({ // -------------------------------------------------------------- app.get('/', function (req, res) { - // res.render() - res.end('henlo') + res.render('main/main', { + siteurl: siteUrl + }) }) app.get('*', function (req, res) { diff --git a/utils/logger.js b/utils/logger.js index e8f7bc2..3ff1afd 100644 --- a/utils/logger.js +++ b/utils/logger.js @@ -27,48 +27,44 @@ module.exports = { const DELIM = '|' -var utils = require('../utils/utils.js') -const nlogFile = './stats/nlogs' +const utils = require('../utils/utils.js') const locLogFile = './stats/logs' const logFile = '/nlogs/nlogs' const allLogFile = '/nlogs/log' function GetDateString () { - var m = new Date() + const m = new Date() return m.getFullYear() + '/' + - ('0' + (m.getMonth() + 1)).slice(-2) + '/' + - ('0' + m.getDate()).slice(-2) + ' ' + - ('0' + m.getHours()).slice(-2) + ':' + - ('0' + m.getMinutes()).slice(-2) + ':' + - ('0' + m.getSeconds()).slice(-2) + ('0' + (m.getMonth() + 1)).slice(-2) + '/' + + ('0' + m.getDate()).slice(-2) + ' ' + + ('0' + m.getHours()).slice(-2) + ':' + + ('0' + m.getMinutes()).slice(-2) + ':' + + ('0' + m.getSeconds()).slice(-2) } function Log (s, c, b) { - if (c != undefined) { console.log(c, GetDateString() + DELIM + s) } else { console.log(GetDateString() + DELIM + s) } + if (c !== undefined) { console.log(c, GetDateString() + DELIM + s) } else { console.log(GetDateString() + DELIM + s) } if (b) { utils.Beep() } - utils.AppendToFile(GetDateString() + DELIM + s, nlogFile) utils.AppendToFile(GetDateString() + DELIM + s, logFile) } function LogReq (req, toFile, sc) { try { - var ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress - var logEntry = ip + DELIM + req.hostname + DELIM + req.headers['user-agent'] + - DELIM + req.method + DELIM + let ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress + let logEntry = ip + DELIM + req.hostname + DELIM + req.headers['user-agent'] + DELIM + req.method + DELIM logEntry += req.url - if (sc != undefined && sc == 404) { logEntry += DELIM + sc } - var color = GetColor('green') + if (sc !== undefined && sc === 404) { logEntry += DELIM + sc } + let color = GetColor('green') if (req.url.toLowerCase().includes('isadding')) { color = GetColor('yellow') } if (!toFile) { Log(logEntry, color) } else { - var defLogs = GetDateString() + DELIM + logEntry - var extraLogs = '\n\t' + JSON.stringify(req.headers) + '\n\t' + JSON.stringify(req.body) + '\n' + let defLogs = GetDateString() + DELIM + logEntry utils.AppendToFile(defLogs, locLogFile) utils.AppendToFile(defLogs, allLogFile) @@ -80,11 +76,11 @@ function LogReq (req, toFile, sc) { } function GetColor (c) { - if (c == 'redbg') { return '\x1b[41m%s\x1b[0m' } - if (c == 'bluebg') { return '\x1b[44m%s\x1b[0m' } - if (c == 'red') { return '\x1b[31m%s\x1b[0m' } - if (c == 'green') { return '\x1b[32m%s\x1b[0m' } - if (c == 'yellow') { return '\x1b[33m%s\x1b[0m' } - if (c == 'blue') { return '\x1b[34m%s\x1b[0m' } - if (c == 'cyan') { return '\x1b[36m%s\x1b[0m' } + if (c === 'redbg') { return '\x1b[41m%s\x1b[0m' } + if (c === 'bluebg') { return '\x1b[44m%s\x1b[0m' } + if (c === 'red') { return '\x1b[31m%s\x1b[0m' } + if (c === 'green') { return '\x1b[32m%s\x1b[0m' } + if (c === 'yellow') { return '\x1b[33m%s\x1b[0m' } + if (c === 'blue') { return '\x1b[34m%s\x1b[0m' } + if (c === 'cyan') { return '\x1b[36m%s\x1b[0m' } } diff --git a/utils/utils.js b/utils/utils.js index 86f5e78..e4a7c42 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -14,9 +14,6 @@ var fs = require('fs') var logger = require('../utils/logger.js') -const recievedFile = './stats/recieved' -const manFile = './public/man.html' -const logFile = './stats/logs' const dataFile = './public/data.json' function ReadFile (name) { diff --git a/views/main/main.ejs b/views/main/main.ejs new file mode 100644 index 0000000..f614e2d --- /dev/null +++ b/views/main/main.ejs @@ -0,0 +1,36 @@ + + + + + + FryLabs.net + + + + + +

+ +

+ QMining +

+ + + + henlo + + +