Changed the file structure to make it more readable and removed the file endings in urls

This commit is contained in:
ION606
2022-10-11 08:38:45 -04:00
parent 5a34a4cbab
commit 1f717bf78e
10 changed files with 53 additions and 50 deletions
+1 -1
View File
@@ -67,6 +67,6 @@
<h1 id="counter"></h1>
<h2>You look a little lost...</h2>
<h2>The page you're looking for can't be found!</h2>
<button onclick="window.location='index.html'">HOME</button>
<button onclick="window.location='/'">HOME</button>
</body>
</html>
+5 -5
View File
@@ -496,7 +496,7 @@
<body>
<nav class="navbar navbar-expand-sm navbar-fixed-top">
<div class="container-fluid mx-auto">
<a class="navbar-brand" href="index.html">
<a class="navbar-brand" href="/">
<img src="https://github.com/ION606/selmer-bot-website/blob/main/assets/Selmer-icon.png?raw=true" alt="Selmer Icon" style="width: 50px;">
</a>
@@ -505,11 +505,11 @@
</li> -->
<ul class="navbar-nav">
<li class="nav-item">
<a href="myGuilds.html" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
<a href="myGuilds" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
</li>
<li class="nav-item">
<a href="calendar.html" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
<a href="calendar" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
</li>
<li class="nav-item">
@@ -517,7 +517,7 @@
</li>
<li class="nav-item">
<a href="premium.html" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
<a href="premium" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
</li>
<li class="nav-item">
@@ -545,7 +545,7 @@
<div id="unauth" style="display: none;" class="text-center">
<h1 style="margin-bottom: 20px;">You have to be a premium subscriber to use this feature!</h1>
<h3 style="margin-bottom: 50px;">vvv GET PREMIUM NOW vvv</h3>
<a href="premium.html"><i class="fa-solid fa-crown" style="scale: 4; color: gold;" alt="PREMIUM"></i></a>
<a href="premium"><i class="fa-solid fa-crown" style="scale: 4; color: gold;" alt="PREMIUM"></i></a>
</div>
+7 -7
View File
@@ -525,7 +525,7 @@
return;
} else if (xhrverify.response == 'Internal Server Error') {
alert("Uh oh, an Internal Server Error has occured!\nPlease try again!");
return window.location.href = "index.html";
return window.location.href = "/";
}
@@ -583,7 +583,7 @@
xhr.onloadend = (e) => {
window.localStorage.clear();
window.sessionStorage.clear();
window.location.href = 'index.html';
window.location.href = '/';
}
xhr.send();
}
@@ -702,17 +702,17 @@
<body>
<nav class="navbar navbar-expand-sm navbar-fixed-top">
<div class="container-fluid mx-auto">
<a class="navbar-brand" href="index.html">
<a class="navbar-brand" href="/">
<img src="https://github.com/ION606/selmer-bot-website/blob/main/assets/Selmer-icon.png?raw=true" alt="Selmer Icon" style="width: 50px;">
</a>
<ul class="navbar-nav">
<li class="nav-item">
<a href="myGuilds.html" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
<a href="myGuilds" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
</li>
<li class="nav-item">
<a href="calendar.html" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
<a href="calendar" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
</li>
<li class="nav-item">
@@ -720,7 +720,7 @@
</li>
<li class="nav-item">
<a href="premium.html" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
<a href="premium" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
</li>
<li class="nav-item">
@@ -822,7 +822,7 @@
<div id="unauth" class="text-center" style="display: none;">
<h1 style="margin-bottom: 20px;">You have to be a premium subscriber to use this feature!</h1>
<h3 style="margin-bottom: 50px;">vvv GET PREMIUM NOW vvv</h3>
<a href="premium.html"><i class="fa-solid fa-crown" style="scale: 4; color: gold;" alt="PREMIUM"></i></a>
<a href="premium"><i class="fa-solid fa-crown" style="scale: 4; color: gold;" alt="PREMIUM"></i></a>
</div>
<h1 id="monthName", style="text-align: center; margin-top: 50px; margin-bottom: 25px;"></h1>
+6 -6
View File
@@ -251,7 +251,7 @@
window.localStorage.setItem('sessionId', xhr.response);
document.getElementById('alertrow').style = "";
window.location.href = "index.html";
window.location.href = "/";
//Too far down, user can't see it
// $(".custom-alert").slideDown(500);
@@ -293,7 +293,7 @@
xhr.onloadend = (e) => {
window.localStorage.clear();
window.sessionStorage.clear();
window.location.href = 'index.html';
window.location.href = '/';
}
xhr.send();
}
@@ -315,7 +315,7 @@
<!-- Nav Bar -->
<nav class="navbar navbar-expand-sm navbar-fixed-top">
<div class="container-fluid mx-auto">
<a class="navbar-brand" href="index.html">
<a class="navbar-brand" href="/">
<img src="https://github.com/ION606/selmer-bot-website/blob/main/assets/Selmer-icon.png?raw=true" alt="Selmer Icon" style="width: 50px;">
</a>
@@ -324,11 +324,11 @@
</li> -->
<ul class="navbar-nav">
<li class="nav-item">
<a href="myGuilds.html" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
<a href="myGuilds" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
</li>
<li class="nav-item">
<a href="calendar.html" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
<a href="calendar" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
</li>
<li class="nav-item">
@@ -336,7 +336,7 @@
</li>
<li class="nav-item">
<a href="premium.html" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
<a href="premium" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
</li>
<li class="nav-item">
+5 -5
View File
@@ -171,7 +171,7 @@
xhr.onloadend = (e) => {
window.localStorage.clear();
window.sessionStorage.clear();
window.location.href = 'index.html';
window.location.href = '/';
}
xhr.send();
}
@@ -207,17 +207,17 @@
<!-- Nav Bar -->
<nav class="navbar navbar-expand-sm bg-black">
<div class="container-fluid">
<a class="navbar-brand" href="index.html">
<a class="navbar-brand" href="/">
<img src="https://github.com/ION606/selmer-bot-website/blob/main/assets/Selmer-icon.png?raw=true" alt="Selmer Icon" style="width: 50px;">
</a>
<ul class="navbar-nav">
<li class="nav-item">
<a href="myGuilds.html" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
<a href="myGuilds" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
</li>
<li class="nav-item">
<a href="calendar.html" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
<a href="calendar" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
</li>
<li class="nav-item">
@@ -225,7 +225,7 @@
</li>
<li class="nav-item">
<a href="premium.html" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
<a href="premium" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
</li>
<li class="nav-item">
+4 -4
View File
@@ -201,7 +201,7 @@
<!-- Nav Bar -->
<nav class="navbar navbar-expand-sm navbar-fixed-top">
<div class="container-fluid mx-auto">
<a class="navbar-brand" href="index.html">
<a class="navbar-brand" href="/">
<img src="https://github.com/ION606/selmer-bot-website/blob/main/assets/Selmer-icon.png?raw=true" alt="Selmer Icon" style="width: 50px;">
</a>
@@ -210,11 +210,11 @@
</li> -->
<ul class="navbar-nav">
<li class="nav-item">
<a href="myGuilds.html" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
<a href="myGuilds" id="guildslink" class="nav-link"><i class="fa-solid fa-server" alt="Servers" style="scale: 2; color: rgb(11, 189, 189);"></i></a>
</li>
<li class="nav-item">
<a href="calendar.html" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
<a href="calendar" id="callink" class="nav-link"><i class="fa-solid fa-calendar" alt="Calendar" style="scale: 2; color: lightgrey;"></i></a>
</li>
<li class="nav-item">
@@ -222,7 +222,7 @@
</li>
<li class="nav-item">
<a href="premium.html" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
<a href="premium" class="nav-link"><i class="fa-solid fa-crown" style="scale: 2; color: gold;" alt="PREMIUM"></i></a>
</li>
<li class="nav-item">
+25 -22
View File
@@ -117,11 +117,6 @@ app.post('/getSessionInfo', async (req, res) => {
});
app.get('/myGuilds.html', async (req, res) => {
return res.sendFile('myGuilds.html', { root: '.' });
});
app.post('/getServer', async (req, res) => {
const id = req.headers.servernumber;
@@ -162,8 +157,6 @@ app.get('/getChannels', async (req, res) => {
});
// app.get('/temp.html', async (req, res) => { return res.sendFile('temp.html', { root: '.' }); });
//Headers: servernumber, sessionid
app.post('/setCurrentServer', async (req, res) => {
try {
@@ -264,35 +257,45 @@ app.get('/getCal', async (req, res) => {
})
});
app.get('/dashboard.html', async (req, res) => {
return res.sendFile('dashboard.html', { root: '.' });
//#region HTML gile serving
app.get('/myGuilds', async (req, res) => {
return res.sendFile('myGuilds.html', { root: 'HTML' });
});
app.get('/premium.html', async (req, res) => {
return res.sendFile('premium.html', { root: '.' });
app.get('/dashboard', async (req, res) => {
return res.sendFile('dashboard.html', { root: 'HTML' });
});
app.get('/index.html', async (req, res) => {
return res.sendFile('index.html', { root: '.' });
app.get('/premium', async (req, res) => {
return res.sendFile('premium.html', { root: 'HTML' });
});
app.get('/calEvent.html', async (req, res) => {
return res.sendFile('calEvent.html', { root: '.' });
app.get('/index', async (req, res) => {
return res.sendFile('index.html', { root: 'HTML' });
});
app.get('/newCalEvent.html', async (req, res) => {
return res.sendFile('newCalEvent.html', { root: '.' });
app.get('/calEvent', async (req, res) => {
return res.sendFile('calEvent.html', { root: 'HTML' });
});
app.get('/calendar.html', async (req, res) => {
return res.sendFile('calendar.html', { root: '.' });
app.get('/newCalEvent', async (req, res) => {
return res.sendFile('newCalEvent.html', { root: 'HTML' });
});
app.get('/calendar', async (req, res) => {
return res.sendFile('calendar.html', { root: 'HTML' });
});
app.get('/team', async (req, res) => {
return res.sendFile("team.html", { root: '.' });
return res.sendFile("team.html", { root: 'HTML' });
})
//#endregion
app.post("/suggestion", async (req, res)=> {
if (req.headers.sessionid == 'null') {
return res.sendStatus(401);
@@ -565,12 +568,12 @@ app.get('/', async ({ query }, response) => {
}
}
return response.sendFile('index.html', { root: '.' });
return response.sendFile('index.html', { root: 'HTML' });
});
app.get("*",(req,res) => {
res.sendFile("404.html", {root: '.'});
res.sendFile("404.html", {root: 'HTML'});
})
app.listen(port, () => console.log(`App listening on port ${port}`));