Making website

Signed-off-by: DefinetlyNotAI <[email protected]>
DefinetlyNotAI · Nov 29, 2024 · 9eb785e · 9eb785e
1 parent 9912c1d
commit 9eb785e
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 20 deletions.
diff --git a/Website/js/favicon+urlpretty.js → Website/js/favicon.js b/Website/js/favicon+urlpretty.js → Website/js/favicon.js
@@ -9,6 +9,16 @@ function updateFavicon() {
     }
 }
 
+document.addEventListener('DOMContentLoaded', function () {
+    const currentUrl = window.location.href;
+    const urlPath = window.location.pathname;
+
+    if (currentUrl.includes('wesmun.com') && !urlPath.endsWith('.html')) {
+        window.location.href = currentUrl.replace('.html', '');
+    }
+});
+
+
 // Initial check
 updateFavicon();
 

diff --git a/Website/js/timer.index.js b/Website/js/timer.index.js
@@ -1,27 +1,25 @@
-const themeRevealDate = new Date("December 1, 2024 00:00:00").getTime();
-const hackathonStartDate = new Date("December 13, 2024 00:00:00").getTime();
-const hackathonEndDate = new Date("December 15, 2024 00:00:00").getTime();
+const RegisterDate = new Date("December 1, 2024 00:00:00").getTime();
+const StartDate = new Date("December 13, 2024 00:00:00").getTime();
+const EndDate = new Date("December 15, 2024 00:00:00").getTime();
 
 const countdownTimer = setInterval(() => {
     const now = Date.now();
     let message;
     let extraMessage = "";
 
-    if (now < themeRevealDate) {
-        const timeLeft = themeRevealDate - now;
-        message = `Theme reveal in ${Math.floor(timeLeft / (1000 * 60 * 60 * 24))} days, ${Math.floor((timeLeft % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))} hours, ${Math.floor((timeLeft % (1000 * 60 * 60)) / (1000 * 60))} minutes, and ${Math.floor((timeLeft % (1000 * 60)) / 1000)} seconds.`;
-    } else if (now < hackathonStartDate) {
-        const timeLeft = hackathonStartDate - now;
-        <!-- What are you lookin here for?? We aint leakin the theme lil bro -->
-        message = `The theme is NAHHH! Start Practicing 🤗!`;
-        extraMessage = `Competition in ${Math.floor(timeLeft / (1000 * 60 * 60 * 24))} days, ${Math.floor((timeLeft % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))} hours, ${Math.floor((timeLeft % (1000 * 60 * 60)) / (1000 * 60))} minutes, and ${Math.floor((timeLeft % (1000 * 60)) / 1000)} seconds.<br><br>Very important, DO NOT finish the project! You won't be allowed to enter the competition if you do. You are allowed to finish the project up to 60% - This will be decided by the organisers.`;
-    } else if (now <= hackathonEndDate) {
-        message = "The Official Wesgreen Hackathon has begun!";
+    if (now < RegisterDate) {
+        const timeLeft = RegisterDate - now;
+        message = `WesMun Registration Start in ${Math.floor(timeLeft / (1000 * 60 * 60 * 24))} days, ${Math.floor((timeLeft % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))} hours, ${Math.floor((timeLeft % (1000 * 60 * 60)) / (1000 * 60))} minutes, and ${Math.floor((timeLeft % (1000 * 60)) / 1000)} seconds.`;
+    } else if (now < StartDate) {
+        const timeLeft = StartDate - now;
+        message = `WesMun Start in ${Math.floor(timeLeft / (1000 * 60 * 60 * 24))} days, ${Math.floor((timeLeft % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))} hours, ${Math.floor((timeLeft % (1000 * 60 * 60)) / (1000 * 60))} minutes, and ${Math.floor((timeLeft % (1000 * 60)) / 1000)} seconds.`;
+    } else if (now <= EndDate) {
+        message = "The Official WesMun has begun!";
     } else {
-        message = "The Official Wesgreen Hackathon has ended.";
+        message = "The Official WesMun has ended.";
     }
 
     document.getElementById("countdown").innerHTML = message + (extraMessage ? `<br>${extraMessage}` : "");
 
-    if (now > hackathonEndDate) clearInterval(countdownTimer);
+    if (now > EndDate) clearInterval(countdownTimer);
 }, 1000);
diff --git a/committees.html b/committees.html
@@ -10,7 +10,7 @@
     <!-- Site Metas -->
     <link href="Website/images/wesmun.jpg" rel="shortcut icon" type="">
     <link href="Website/css/favicon.css" rel="stylesheet" type="text/css"/>
-    <script src="Website/js/favicon+urlpretty.js"></script>
+    <script src="Website/js/favicon.js"></script>
 
     <title>WesMun - Committees</title>
 

diff --git a/index.html b/index.html
@@ -11,7 +11,7 @@
     <link href="Website/images/wesmun.jpg" rel="shortcut icon" type="">
     <link href="Website/css/favicon.css" rel="stylesheet" type="text/css"/>
     <script src="Website/js/cookie.js"></script>
-    <script src="Website/js/favicon+urlpretty.js"></script>
+    <script src="Website/js/favicon.js"></script>
 
     <title>WesMun Home Page</title>
 

diff --git a/rules.html b/rules.html
@@ -10,7 +10,7 @@
     <!-- Site Metas -->
     <link href="Website/images/wesmun.jpg" rel="icon" type="image/png">
     <link href="Website/css/favicon.css" rel="stylesheet" type="text/css"/>
-    <script src="Website/js/favicon+urlpretty.js"></script>
+    <script src="Website/js/favicon.js"></script>
 
     <title>WesMun - Rules</title>
 

diff --git a/team.html b/team.html
@@ -9,7 +9,7 @@
     <!-- Site Metas -->
     <link href="Website/images/wesmun.jpg" rel="shortcut icon" type="">
     <link href="Website/css/favicon.css" rel="stylesheet" type="text/css"/>
-    <script src="Website/js/favicon+urlpretty.js"></script>
+    <script src="Website/js/favicon.js"></script>
     <meta content="width=device-width, initial-scale=1.0" name="viewport">
     <title>Meet the Team</title>
     <link href="Website/css/volunteer.css" rel="stylesheet">

diff --git a/venue.html b/venue.html
@@ -10,7 +10,7 @@
     <!-- Site Metas -->
     <link href="Website/images/wesmun.jpg" rel="shortcut icon" type="">
     <link href="Website/css/favicon.css" rel="stylesheet" type="text/css"/>
-    <script src="Website/js/favicon+urlpretty.js"></script>
+    <script src="Website/js/favicon.js"></script>
     <meta content="width=device-width, initial-scale=1.0" name="viewport">