diff --git a/index.js b/index.js index bd1f427..be9652a 100644 --- a/index.js +++ b/index.js @@ -47,5 +47,9 @@ fs.readdir("./routes", (err, files) => { } }) +// app.use(function(req,res,next) { +// res.status(404).send("miau") +// }) + process.stdout.write(`>>> EnstrayedAPI ${globalVersion} | Started ${startTime} on ${process.env.API_PORT ?? 8081}`) app.listen(process.env.API_PORT ?? 8081) \ No newline at end of file diff --git a/routes/frontpage.js b/routes/frontpage.js index 4328ba5..8606908 100644 --- a/routes/frontpage.js +++ b/routes/frontpage.js @@ -7,7 +7,7 @@ import { marked } from "marked" var timeSinceLastQuery = Date.now()-10000 var cachedResult = "" -app.get("/indexbeta", (rreq, rres) => { +app.get("/", (rreq, rres) => { if (Date.now() < timeSinceLastQuery+10000) { rres.send(cachedResult) } else { @@ -17,9 +17,9 @@ app.get("/indexbeta", (rreq, rres) => { } }) -app.get("/", (rreq, rres) => { - rres.sendFile(process.cwd()+"/website/templates/construction.html") -}) +// app.get("/", (rreq, rres) => { +// rres.sendFile(process.cwd()+"/website/templates/construction.html") +// }) app.get("/static/*", (rreq,rres) => { rres.sendFile(process.cwd()+"/website/static/"+rreq.url.replace("/static/","")) diff --git a/routes/helpdesk.js b/routes/helpdesk.js index 3d97927..270ea95 100644 --- a/routes/helpdesk.js +++ b/routes/helpdesk.js @@ -13,7 +13,7 @@ app.get("/helpdesk/articles/*", (rreq, rres) => { if (rreq.url.endsWith(".md")) { let file = fs.readFileSync(process.cwd() + "/website/helpdesk/templates/article.html", "utf-8") file = file.replace("", `https://enstrayed.com${rreq.url}`) - file = file.replaceAll("", rreq.url.replace("/posts/", "").slice(9).replace(/-/g, " ").replace(".md", "")) + file = file.replaceAll("", rreq.url.replace("/helpdesk/articles/", "").replace(/(-|_)/g, " ").replace(".md", "")) file = file.replace("", marked.parse(fs.readFileSync(process.cwd() + "/website/helpdesk/kbas/" + rreq.url.replace("/helpdesk/articles/", ""), "utf-8"))) rres.send(file) } else { @@ -29,4 +29,8 @@ app.get("/api/helpdesk/forms/*", (rreq, rres) => { rres.sendFile(process.cwd()+"/website/helpdesk/forms/"+rreq.url.replace("/api/helpdesk/forms/","")) }) +app.get("/helpdesk/static/*", (rreq,rres) => { + rres.sendFile(process.cwd()+"/website/helpdesk/static/"+rreq.url.replace("/helpdesk/static/","")) +}) + export { app } \ No newline at end of file diff --git a/website/static/helpdesk/helpdesk.css b/website/helpdesk/static/helpdesk.css similarity index 92% rename from website/static/helpdesk/helpdesk.css rename to website/helpdesk/static/helpdesk.css index 6a4e234..c0eaf45 100644 --- a/website/static/helpdesk/helpdesk.css +++ b/website/helpdesk/static/helpdesk.css @@ -19,8 +19,14 @@ body { flex-direction: row; gap: 2em; align-items: center; + padding: 1em 2em; } +.headerbarTitle { + font-size: xx-large; + color: black; + text-decoration: none; +} .headerbarright { margin-left: auto; @@ -99,4 +105,5 @@ dialog > button { dialog::backdrop { background-color: rgba(0, 0, 0, 0.5); -} \ No newline at end of file +} + diff --git a/website/static/helpdesk/login.js b/website/helpdesk/static/login.js similarity index 100% rename from website/static/helpdesk/login.js rename to website/helpdesk/static/login.js diff --git a/website/helpdesk/templates/article.html b/website/helpdesk/templates/article.html index 58075b8..19f594c 100644 --- a/website/helpdesk/templates/article.html +++ b/website/helpdesk/templates/article.html @@ -4,8 +4,8 @@