Init-conflicts

This commit is contained in:
Firepup Sixfifty 2023-10-09 13:04:58 -05:00
parent 7a0ad54639
commit ad18db030a
5 changed files with 57 additions and 2135 deletions

81
.replit
View file

@ -1,81 +0,0 @@
entrypoint = "index.js"
hidden = [".config", "package-lock.json"]
#[interpreter]
#command = ["prybar-nodejs", "-q", "--ps1", "\u0001\u001b[33m\u0002\u0001\u001b[00m\u0002 ", "-i"]
run = ["npm", "run", "start"]
[[hints]]
regex = "Error \\[ERR_REQUIRE_ESM\\]"
message = "We see that you are using require(...) inside your code. We currently do not support this syntax. Please use 'import' instead when using external modules. (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import)"
[nix]
channel = "stable-22_11"
[env]
XDG_CONFIG_HOME = "/home/runner/.config"
PATH = "/home/runner/$REPL_SLUG/.config/npm/node_global/bin:/home/runner/$REPL_SLUG/node_modules/.bin"
npm_config_prefix = "/home/runner/$REPL_SLUG/.config/npm/node_global"
[gitHubImport]
requiredFiles = [".replit", "replit.nix", ".config", "package.json", "package-lock.json"]
[packager]
language = "nodejs"
[packager.features]
packageSearch = true
guessImports = false
enabledForHosting = false
[unitTest]
language = "nodejs"
[debugger]
support = true
[debugger.interactive]
transport = "localhost:0"
startCommand = [ "dap-node" ]
[debugger.interactive.initializeMessage]
command = "initialize"
type = "request"
[debugger.interactive.initializeMessage.arguments]
clientID = "replit"
clientName = "replit.com"
columnsStartAt1 = true
linesStartAt1 = true
locale = "en-us"
pathFormat = "path"
supportsInvalidatedEvent = true
supportsProgressReporting = true
supportsRunInTerminalRequest = true
supportsVariablePaging = true
supportsVariableType = true
[debugger.interactive.launchMessage]
command = "launch"
type = "request"
[debugger.interactive.launchMessage.arguments]
args = []
console = "externalTerminal"
cwd = "."
environment = []
pauseForSourceMap = false
program = "./index.js"
request = "launch"
sourceMaps = true
stopOnEntry = false
type = "pwa-node"
[languages]
[languages.javascript]
pattern = "**/{*.js,*.jsx,*.ts,*.tsx}"
[languages.javascript.languageServer]
start = "typescript-language-server --stdio"

View file

@ -1,6 +1,12 @@
<<<<<<< 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"}; 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; var tracks = und, datas = und;
app.use(require("expressjs-remembering-doomsdaybear")) 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;
var tracks = und, datas = und;
//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 = {
@ -162,6 +168,22 @@ function secondsToMinutes(seconds) {
return minutes + ":" + leftoverSeconds + "0"; return minutes + ":" + leftoverSeconds + "0";
} }
}; };
<<<<<<< HEAD
=======
function execute(command, callback){
exec(command, function(error, stdout, stderr){ callback(stdout); });
};
function format(seconds){
function pad(s){
return (s < 10 ? '0' : '') + s;
}
var hours = Math.floor(seconds / (60*60));
var minutes = Math.floor(seconds % (60*60) / 60);
var seconds = Math.floor(seconds % 60);
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));
@ -250,12 +272,24 @@ 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 uptime = (Date.now() - startTime) / 1000;
let author = "Firepup650"; let author = "Firepup650";
res.render(dynamfileloc + '/server-info.ejs', { res.render(dynamfileloc + '/server-info.ejs', {
author: author, author: author,
uptime: uptime, uptime: uptime,
images: totalPages images: totalPages
=======
execute("uptime -p", (sysup) => {
let uptime = process.uptime();
let author = "Firepup650";
res.render(dynamfileloc + '/server-info.ejs', {
author: author,
uptime: format(process.uptime()),
system: sysup,
images: totalPages
})
>>>>>>> 24c184c (Init)
}); });
}); });
// Youngchief // Youngchief
@ -510,4 +544,8 @@ app.on("error", error => {
default: default:
throw error; throw error;
} }
<<<<<<< HEAD
}); });
=======
});
>>>>>>> 24c184c (Init)

2035
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,18 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>FP650 - Server Info</title>
<link href="/ejsstyle.css" rel="stylesheet" type="text/css" />
<link rel="icon" type="image/x-icon" href="/favicon.ico">
<link href="/styles/bounce.css" rel="stylesheet" type="text/css" />
<!-- <script async src="https://api.countapi.xyz/hit/firepup650.repl.co/visits"></script> -->
<!-- <script async src="https://api.countapi.xyz/hit/firepup650.repl.co/abtserv"></script> -->
</head>
<body class=center>
<h3 class=rainbow>Server Info:</h3>
<p class=rainbow>Author: <%= author %></p>
<p class=rainbow>Uptime: <%= uptime %> seconds</p>
<p class=rainbow>Total Pages: <%= images %></p>
<script src="/footer.js"></script>
</body>
</html>

18
public/errors/502.html Normal file
View file

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<title>FP650 - 502 Error</title>
<link href="/style.css" rel="stylesheet" type="text/css" />
<link href="/styles/bounce.css" rel="stylesheet" type="text/css" />
<!-- <script async src="https://api.countapi.xyz/hit/firepup650.repl.co/visits"></script> -->
<!-- <script async src="https://api.countapi.xyz/hit/firepup650.repl.co/500error"></script> -->
</head>
<body>
<h1 class="center warning">502 Server Offline</h1>
<p class="center warning">Whoops! Looks like the webserver is down.</p>
<p class="center warning">It's probably just brief maintenance, try refreshing.</p>
<script src="/footer.js"></script>
</body>
</html>