move to more centralized faq

WatermelonKatanaDevs · Jan 6, 2025 · 0e112e1 · 0e112e1
1 parent 68c2929
commit 0e112e1
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 120 deletions.
diff --git a/Assets/scripts/footer.js b/Assets/scripts/footer.js
@@ -21,7 +21,7 @@ footer.innerHTML = `
 <div class="footer-info">
     <p>Email: <a href="mailto:[email protected]">[email protected]</a></p>
     <p>&copy; 2024 - 2025 WatermelonKatana. All rights reserved.</p>
-    <p>Stay updated with our <a href="/news">latest news</a>!</p>
+    <p>Stay updated with our <a href="/faq">FAQ</a>!</p>
 </div>
 `;
 footer.onclick = function() {

diff --git a/Pages/faq/faq.html b/Pages/faq/faq.html
@@ -0,0 +1,89 @@
+<!-- This is basically a mirror of updates.html, but with better logic -->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>FAQ | WatermelonKatana</title>
+  <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
+  <link rel="manifest" href="/site.webmanifest">
+  <meta property="og:title" content="FAQ | WatermelonKatana"/>
+  <meta property="og:type" content="profile"/>
+  <meta property="og:description" content="The WatermelonKatana FAQ"/>
+  <link rel="stylesheet" type="text/css" href="/styles/style.css">
+  <script src="/scripts/script.js"></script>
+</head>
+<body>
+  <script src="/scripts/navbar.js"></script>
+
+  <div id="content" style="width: 90%">Loading...</div>
+
+  <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+  <script src="/scripts/md-render.js"></script>
+  <script>
+    // Define update page mappings
+    const updatePages = {
+      "watermelonkatana_overview": "WatermelonKatana/refs/heads/main/README.md",
+      "website_announcements": "discussions/refs/heads/main/announcements/current_announcement.md",
+      "terms_of_service": "WatermelonKatana/refs/heads/main/Assets/md/tos.md",
+      "posting_guidelines": "WatermelonKatana/refs/heads/main/Assets/md/posting_guidelines.md",
+      "turbowarp_guide": "TurboWarp/refs/heads/main/README.md"
+    };
+
+    /**
+     * Fetch and render Markdown content
+     * @param {string} url - URL of the Markdown file
+     */
+    function fetchMarkdown(url) {
+      fetch(url)
+        .then(response => {
+          if (!response.ok) {
+            throw new Error(`Failed to fetch content from ${url}`);
+          }
+          return response.text();
+        })
+        .then(markdown => {
+          document.querySelector("#content").innerHTML = marked.parse(markdown);
+        })
+        .catch(error => {
+          document.querySelector("#content").innerHTML = `<p style="color:red;">Error loading content: ${error.message}</p>`;
+        });
+    }
+
+    /**
+     * Load bookmarks list
+     */
+    function loadBookmarks() {
+      const bookmarks = `
+        <div id="bookmarks" style="text-align: center">
+          <h1>FAQ</h1>
+          <br>
+          ${Object.keys(updatePages)
+            .map(page => 
+              `<h2><a href="/faq?page=${page}">${page.replace(/_/g, " ").replace(/\b\w/g, e => e.toUpperCase())}</a></h2>`
+            )
+            .join("")}
+        </div>`;
+      document.querySelector("#content").innerHTML = bookmarks;
+    }
+
+    // Main logic for page loading
+    window.onload = function() {
+      const page = new URLSearchParams(location.search).get("page") || "";
+      const fileUrl = updatePages[page];
+
+      if (fileUrl) {
+        // Fetch the Markdown content if the page exists in updatePages
+        const fullUrl = `https://raw.githubusercontent.com/WatermelonKatanaDevs/${fileUrl}`;
+        fetchMarkdown(fullUrl);
+      } else {
+        // Load the bookmarks list if no valid page is specified
+        loadBookmarks();
+      }
+    };
+  </script>
+</body>
+</html>
diff --git a/Pages/faq/posting_guidelines.html b/Pages/faq/posting_guidelines.html
diff --git a/Pages/faq/tos.html b/Pages/faq/tos.html
diff --git a/Pages/forum/publish.html b/Pages/forum/publish.html
@@ -14,7 +14,7 @@
 
     <h1>Post Discussion</h1>
     <span style="text-align: center"> Please make sure your post follows our 
-      <a href="/updates?page=posting_guidelines"> guidelines </a>
+      <a href="/faq?page=posting_guidelines"> guidelines </a>
     </span>
 
     <form>

diff --git a/Pages/home.html b/Pages/home.html
@@ -31,7 +31,7 @@ <h2 id="username" style="color: #777777"></h2>
           <a href="/chat">Chat</a>
           <a href="/search">Project Gallery</a>
           <a href="/forum">Forum</a>
-          <a href="/updates?page=website_announcements">Announcements</a>
+          <a href="/faq">FAQ</a>
           <a href="https://www.patreon.com/watermelonkatana"> Donate </a>
         </nav>
       </header>
@@ -103,7 +103,7 @@ <h2>Hot Forum Topics</h2>
           <a href="/chat">Chat</a>
           <a href="/search">Project Gallery</a>
           <a href="/forum">Forum</a>
-          <a href="/updates?page=website_announcements">Announcements</a>
+          <a href="/faq">FAQ</a>
           <a href="/userlist">User List</a>
           ${(data.user.role === "Admin" ? `<a href="/admin">Admin List</a>`: "")}
           <a href="https://www.patreon.com/watermelonkatana"> Donate </a>

diff --git a/Pages/projects/publish.html b/Pages/projects/publish.html
@@ -17,10 +17,10 @@
 
   <h1>Publish Project</h1>
   <span style="text-align: center"> Please make sure your project follows our 
-    <a href="/updates?page=posting_guidelines"> guidelines </a>
+    <a href="/faq?page=posting_guidelines"> guidelines </a>
     <br>
     Publishing a code.org project? Feel free to read this
-    <a href="/updates?page=turbowarp_guide"> guide </a>
+    <a href="/faq?page=turbowarp_guide"> guide </a>
     if unsure where to start.
   </span>
 

diff --git a/Pages/sitemap.xml b/Pages/sitemap.xml
@@ -21,7 +21,7 @@
       <priority>0.2</priority>
    </url>
    <url>
-      <loc>https://watermelonkatana.com/updates/</loc>
+      <loc>https://watermelonkatana.com/faq/</loc>
       <changefreq>weekly</changefreq>
       <priority>0.2</priority>
    </url>

diff --git a/Pages/updates.html b/Pages/updates.html
diff --git a/index.js b/index.js
@@ -75,8 +75,7 @@ app.get("/lib/meloncanvas.js", (req, res) => res.sendFile(__dirname + "/lib/melo
 /**
  * WatermelonKatana FAQ pages
  */
-app.get("/tos", (req, res) => res.sendFile(cldir + "/faq/tos.html")); // Terms of Service
-app.get("/posting_guidelines", (req, res) => res.sendFile(cldir + "/faq/posting_guidelines.html")); // Posting Guidelines
+app.get("/faq", (req, res) => res.sendFile(cldir + "/faq/faq.html"));  // Faq
 
 // Logout route: clear the JWT cookie and redirect to home
 app.get("/logout", (req, res) => {
@@ -140,9 +139,6 @@ app.get("/project/:id/delete", userAuth, (req, res) => res.redirect("/api/projec
 // Authors
 app.get("/authors", (req, res) => { res.sendFile(cldir + "/authors.html") });
 
-// Updates
-app.get("/updates", (req, res) => res.sendFile(cldir + "/updates.html"));
-
 // Posts
 app.get("/forum", (req, res) => res.sendFile(cldir + "/forum/home.html")); // Forum Home/Search
 app.get("/forum/post", userAuth, (req, res) => res.sendFile(cldir + "/forum/publish.html")); // Publish page, users only