Firepup650/firepup-site
1
1
Fork 1
Code Issues Pull requests Activity Actions

GIT IS ANNOYING

Browse source
This commit is contained in:
Firepup Sixfifty 2023-10-09 13:22:55 -05:00
parent 546050c3d0
commit 83722f95a5
1 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
index.js
View file

@ -1,12 +1,6 @@
<<<<<<< HEAD
const express = require("express"), http = require('http'), UAParser = require('ua-parser-js'), fs = require('fs'), path = require("path"), app = express(), directory = __dirname, htmlfileloc = directory + "/public/pages", rawfileloc = directory + "/public/raw", cssfileloc = directory + "/public/scripts", jsfileloc = directory + "/public/styles", iconfileloc = directory + "/public/icons", errorfileloc = directory + "/public/errors", dynamfileloc = directory + "/public/dynamic", err404loc = errorfileloc + "/404.ejs", err422loc = errorfileloc + "/422.ejs", err403loc = errorfileloc + "/403.ejs", err500loc = errorfileloc + "/500.ejs", conloc = htmlfileloc + "/construction.html", port = 8080, validImageTypes = ['.jpg', '.jpeg', '.png', '.gif'], imgsrv = "https://image-hosting.firepup650.repl.co", axios = require('axios'), und = undefined, users = ["youngchief","coderelijah","bigminiboss","pikachub2005","jayayseaohbee14","9pfs"], aliases = {"smallmaxworker":"bigminiboss","9pfs1":"9pfs"};
var tracks = und, datas = und;
app.use(require("expressjs-remembering-doomsdaybear"))
=======
const express = require("express"), http = require('http'), UAParser = require('ua-parser-js'), fs = require('fs'), path = require("path"), app = express(), directory = __dirname, htmlfileloc = directory + "/public/pages", rawfileloc = directory + "/public/raw", cssfileloc = directory + "/public/scripts", jsfileloc = directory + "/public/styles", iconfileloc = directory + "/public/icons", errorfileloc = directory + "/public/errors", dynamfileloc = directory + "/public/dynamic", err404loc = errorfileloc + "/404.ejs", err422loc = errorfileloc + "/422.ejs", err403loc = errorfileloc + "/403.ejs", err500loc = errorfileloc + "/500.ejs", conloc = htmlfileloc + "/construction.html", port = 8080, validImageTypes = ['.jpg', '.jpeg', '.png', '.gif'], imgsrv = "https://image-hosting.firepup650.repl.co", axios = require('axios'), und = undefined, users = ["youngchief","coderelijah","bigminiboss","pikachub2005","jayayseaohbee14","9pfs","omegaorbitals"], aliases = {"smallmaxworker":"bigminiboss","9pfs1":"9pfs"}, exec = require('child_process').exec; const express = require("express"), http = require('http'), UAParser = require('ua-parser-js'), fs = require('fs'), path = require("path"), app = express(), directory = __dirname, htmlfileloc = directory + "/public/pages", rawfileloc = directory + "/public/raw", cssfileloc = directory + "/public/scripts", jsfileloc = directory + "/public/styles", iconfileloc = directory + "/public/icons", errorfileloc = directory + "/public/errors", dynamfileloc = directory + "/public/dynamic", err404loc = errorfileloc + "/404.ejs", err422loc = errorfileloc + "/422.ejs", err403loc = errorfileloc + "/403.ejs", err500loc = errorfileloc + "/500.ejs", conloc = htmlfileloc + "/construction.html", port = 8080, validImageTypes = ['.jpg', '.jpeg', '.png', '.gif'], imgsrv = "https://image-hosting.firepup650.repl.co", axios = require('axios'), und = undefined, users = ["youngchief","coderelijah","bigminiboss","pikachub2005","jayayseaohbee14","9pfs","omegaorbitals"], aliases = {"smallmaxworker":"bigminiboss","9pfs1":"9pfs"}, exec = require('child_process').exec;
var tracks = und, datas = und; var tracks = und, datas = und;
//app.use(require("expressjs-remembering-doomsdaybear")) //app.use(require("expressjs-remembering-doomsdaybear"))
>>>>>>> 24c184c (Init)
app.set('trust proxy', 1) app.set('trust proxy', 1)
const cookieCheck = (req, res, next) => { const cookieCheck = (req, res, next) => {
const options = { const options = {
@ -168,8 +162,6 @@ function secondsToMinutes(seconds) {
return minutes + ":" + leftoverSeconds + "0"; return minutes + ":" + leftoverSeconds + "0";
} }
}; };
<<<<<<< HEAD
=======
function execute(command, callback){ function execute(command, callback){
exec(command, function(error, stdout, stderr){ callback(stdout); }); exec(command, function(error, stdout, stderr){ callback(stdout); });
}; };
@ -183,7 +175,6 @@ function format(seconds){
return pad(hours) + ':' + pad(minutes) + ':' + pad(seconds); return pad(hours) + ':' + pad(minutes) + ':' + pad(seconds);
} }
>>>>>>> 24c184c (Init)
app.use(cookieCheck); app.use(cookieCheck);
app.use(express.static(cssfileloc)); app.use(express.static(cssfileloc));
app.use(express.static(jsfileloc)); app.use(express.static(jsfileloc));
@ -272,14 +263,6 @@ app.get('/about-you', function(req, res) {
}); });
}); });
app.get("/server-info", (req, res) => { app.get("/server-info", (req, res) => {
<<<<<<< HEAD
let uptime = (Date.now() - startTime) / 1000;
let author = "Firepup650";
res.render(dynamfileloc + '/server-info.ejs', {
author: author,
uptime: uptime,
images: totalPages
=======
execute("uptime -p", (sysup) => { execute("uptime -p", (sysup) => {
let uptime = process.uptime(); let uptime = process.uptime();
let author = "Firepup650"; let author = "Firepup650";
@ -289,7 +272,6 @@ app.get("/server-info", (req, res) => {
system: sysup, system: sysup,
images: totalPages images: totalPages
}) })
>>>>>>> 24c184c (Init)
}); });
}); });
// Youngchief // Youngchief
@ -544,8 +526,4 @@ app.on("error", error => {
default: default:
throw error; throw error;
} }
<<<<<<< HEAD
}); });
=======
});
>>>>>>> 24c184c (Init)