npm - @lexho111/plainblog - Versions diffs - 0.6.8 → 0.6.10 - Mend

@lexho111/plainblog 0.6.8 → 0.6.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/Blog.js +142 -134
package/Formatter.js +5 -5
package/README.md +9 -0
package/package.json +1 -1
package/public/index.html +2 -2
package/public/main-V4OTOWYB.js +7 -0
package/public/scripts.min.js +2 -2
package/public/styles-CRQIYMR5.css +1 -0
package/public/styles.min.css +2 -2
package/router.js +115 -0
package/src/fetchData.js +1 -1
package/src/styles.css +58 -23

package/Blog.js CHANGED Viewed

@@ -17,6 +17,7 @@ import DataModel from "./model/DataModel.js";
 import { BinarySearchTreeHashMap } from "./model/datastructures/BinarySearchTreeHashMap.js";
 import createDebug from "./debug-loader.js";
 import { readFile } from "node:fs/promises";
+import { login, logout, api, new1, getPages } from "./router.js";
 // Initialize the debugger with a specific namespace
 const debug = createDebug("plainblog:Blog");
@@ -47,6 +48,7 @@ export default class Blog {
     this.compiledStyles = "";
     //this.compiledScripts = "";
     this.reloadStylesOnGET = false;
+    this.angular = false;
     this.sessions = new Set();
     this.#version = pkg.version;
@@ -377,27 +379,13 @@ export default class Blog {
     const server = http.createServer(async (req, res) => {
       //debug("query %s", req.url);
-      // API routes
-      // workaround for angular frontend
-      if (req.url === "/api/login" && req.method === "POST") {
-        await this.#handleLogin(req, res);
-        return;
-      }
-      if (req.url === "/api/logout") {
-        this.#handleLogout(req, res);
-        return;
-      }
-      // ---------------------------------------------
-      if (req.url.startsWith("/api")) {
-        await this.#jsonAPI(req, res);
-        return;
-      }
-      // Web Page Routes
-      if (req.url === "/login") {
-        if (req.method === "GET") {
-          res.writeHead(200, { "Content-Type": "text/html" });
+      await login(
+        req,
+        res,
+        async (req, res) => {
+          await this.#handleLogin(req, res);
+        },
+        async (req, res) => {
           res.end(`${header("My Blog")}<body>
             <form class="loginform" id="loginForm">
   <h1>Blog</h1>
@@ -445,126 +433,141 @@ export default class Blog {
   });
 </script>
 </body></html>`);
-          return;
-          /*res.end(`${header("My Blog")}
-<body>
-<form class="loginform" method="POST">
-<h1>Blog</h1>
-<h2>Login</h2>
-<input type="password" class="form_element password" name="password" placeholder="Password" />
-<button class="btn">Login</button></form>
-</body></html>`);
-          return;*/
-        } else if (req.method === "POST") {
-          await this.#handleLogin(req, res);
-          return;
-        }
-      }
+        },
+      );
+      if (res.headersSent) return;
-      if (req.url === "/logout") {
+      await logout(req, res, async (req, res) => {
         this.#handleLogout(req, res);
-        return;
-      }
-      // load articles
-      // GET artciles
-      if (req.method === "GET" && req.url === "/") {
-        // reload styles and scripts on (every) request
-        if (this.reloadStylesOnGET) {
-          if (this.#stylesheetPath != null && this.compilestyle) {
-            await this.#processStylesheets(this.#stylesheetPath);
-          }
-          const __filename = fileURLToPath(import.meta.url);
-          const __dirname = path.dirname(__filename);
-          const srcScriptPath = path.join(__dirname, "src", "fetchData.js");
-          await this.#processScripts(srcScriptPath);
-        }
-        let loggedin = false;
-        if (!this.#isAuthenticated(req)) {
-          // login
-          loggedin = false;
-        } else {
-          // logout
-          loggedin = true;
-        }
+      });
+      if (res.headersSent) return;
-        // use built in view engine
-        try {
-          const html = await this.toHTML(loggedin); // render this blog to HTML
-          res.writeHead(200, { "Content-Type": "text/html; charset=UTF-8" });
-          res.end(html);
-        } catch (err) {
-          console.error(err);
-          res.writeHead(500, { "Content-Type": "text/plain" });
-          res.end("Internal Server Error");
-        }
+      await api(req, res, async (req, res) => {
+        await this.#jsonAPI(req, res);
+      });
+      if (res.headersSent) return;
+      await new1(req, res, (req, res) => {
+        return new Promise((resolve, reject) => {
+          if (!this.#isAuthenticated(req)) {
+            debug("not authenticated");
+            res.writeHead(403, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ error: "Forbidden" }));
+            resolve();
+            return;
+          }
+          let body = "";
-        // use angular frontend
-        /*const filePath = path.join(this.#publicDir, "index.html");
+          // 1. Collect data chunks
+          req.on("data", (chunk) => {
+            body += chunk.toString();
+          });
-        debug("%s", filePath);
-        try {
-          const data = await readFile(filePath);
-          // Manual MIME type detection (simplified)
-          const ext = path.extname(filePath);
-          const mimeTypes = {
-            ".html": "text/html",
-            ".css": "text/css",
-            ".js": "text/javascript",
-          };
-          res.writeHead(200, {
-            "Content-Type": mimeTypes[ext] || "application/octet-stream",
+          req.on("end", async () => {
+            try {
+              // 2. Parse x-www-form-urlencoded using URLSearchParams
+              const params = new URLSearchParams(body);
+              // 3. Convert to a plain object
+              const articleData = Object.fromEntries(params.entries());
+              console.log("New Article Data:", articleData);
+              // local
+              await this.#databaseModel.save(articleData); // --> to api server
+              this.postArticle(articleData);
+              // external
+              // Success response
+              res.writeHead(302, { Location: "/" });
+              res.end();
+              resolve();
+            } catch (err) {
+              if (!res.headersSent) {
+                res.writeHead(400, { "Content-Type": "application/json" });
+                res.end(JSON.stringify({ error: "Failed to parse form data" }));
+              }
+              resolve();
+            }
           });
-          res.end(data);
-        } catch (err) {
-          if (err) {
-            res.writeHead(404);
-            return res.end("Index-File Not Found");
+          req.on("error", reject);
+        });
+        /*await this.#handleLogin(req, res, async () => {
+          await this.#handleLogin(req, res);
+        })*/
+      });
+      if (res.headersSent) return;
+      await getPages(
+        req,
+        res,
+        async (req, res) => {
+          // reload styles and scripts on (every) request
+          if (this.reloadStylesOnGET) {
+            if (this.#stylesheetPath != null && this.compilestyle) {
+              await this.#processStylesheets(this.#stylesheetPath);
+            }
+            const __filename = fileURLToPath(import.meta.url);
+            const __dirname = path.dirname(__filename);
+            const srcScriptPath = path.join(__dirname, "src", "fetchData.js");
+            await this.#processScripts(srcScriptPath);
           }
-        }*/
-        try {
-          //const html = await this.toHTML(loggedin); // render this blog to HTML
-          //res.writeHead(200, { "Content-Type": "text/html; charset=UTF-8" });
-          //res.end(html);
-        } catch (err) {
-          console.error(err);
-          res.writeHead(500, { "Content-Type": "text/plain" });
-          res.end("Internal Server Error");
-        }
-      } else {
-        // Try to serve static files from public folder
-        // Normalize path to prevent directory traversal attacks
-        const safePath = path.normalize(req.url).replace(/^(\.\.[\/\\])+/, "");
-        const filePath = path.join(
-          this.#publicDir,
-          safePath === "/" ? "index.html" : safePath,
-        );
+          let loggedin = false;
+          if (!this.#isAuthenticated(req)) {
+            // login
+            loggedin = false;
+          } else {
+            // logout
+            loggedin = true;
+          }
-        debug("%s", filePath);
-        try {
-          const data = await readFile(filePath);
-          // Manual MIME type detection (simplified)
-          const ext = path.extname(filePath);
-          const mimeTypes = {
-            ".html": "text/html",
-            ".css": "text/css",
-            ".js": "text/javascript",
-          };
-          res.writeHead(200, {
-            "Content-Type": mimeTypes[ext] || "application/octet-stream",
-          });
-          res.end(data);
-        } catch (err) {
-          if (err) {
-            res.writeHead(404);
-            return res.end("File Not Found");
+          if (this.angular) {
+            // use angular frontend
+            const filePath = path.join(this.#publicDir, "index.html");
+            debug("%s", filePath);
+            try {
+              const data = await readFile(filePath);
+              // Manual MIME type detection (simplified)
+              const ext = path.extname(filePath);
+              const mimeTypes = {
+                ".html": "text/html",
+                ".css": "text/css",
+                ".js": "text/javascript",
+              };
+              res.writeHead(200, {
+                "Content-Type": mimeTypes[ext] || "application/octet-stream",
+              });
+              res.end(data);
+            } catch (err) {
+              if (err) {
+                res.writeHead(404);
+                return res.end("Index-File Not Found");
+              }
+            }
+          } else {
+            // use built in view engine
+            try {
+              const html = await this.toHTML(loggedin); // render this blog to HTML
+              res.writeHead(200, {
+                "Content-Type": "text/html; charset=UTF-8",
+              });
+              res.end(html);
+              return;
+            } catch (err) {
+              console.error(err);
+              if (!res.headersSent) {
+                res.writeHead(500, { "Content-Type": "text/plain" });
+                res.end("Internal Server Error");
+              }
+              return;
+            }
           }
-        }
-        return;
-      }
+        },
+        this.#publicDir,
+      );
     });
     this.#server = server;
@@ -754,7 +757,7 @@ export default class Blog {
       // local
       await this.#databaseModel.save(newArticle); // --> to api server
       this.postArticle(newArticle);
-      // extern
+      // external
       res.writeHead(201, { "Content-Type": "application/json" });
       res.end(JSON.stringify(newArticle));
     } else if (req.method === "DELETE") {
@@ -833,8 +836,13 @@ export default class Blog {
       login: "",
     };
-    if (loggedin) data.login = `<a href="/logout">logout</a>`;
-    else data.login = `<a href="/login">login</a>`;
+    if (loggedin)
+      data.login = `<form action="/logout" method="POST" style="display:inline;">
+  <button type="submit" class="btn">
+    logout
+  </button>
+</form>`;
+    else data.login = `<a class="btn login" href="/login">login</a>`;
     //debug("typeof data: %o", typeof data);
     //debug("typeof data.articles: %o", typeof data.articles);

package/Formatter.js CHANGED Viewed

@@ -26,26 +26,26 @@ export function formatHTML(data) {
   const button = "";
   let form1 = "";
   if (data.loggedin) {
-    form1 = `<form id="createNew" action="/" method="POST">
-        <h3>Add a New Article</h3>
+    form1 = `<form id="createNew" action="/new" method="POST">
+        <h2>Add a New Article</h2>
         <input type="text" id="title" class="form_element new_title wide" name="title" placeholder="Article Title" required>
         <textarea id="content" class="form_element new_content wide" name="content" placeholder="Article Content" required></textarea>
-        <button type="submit">Add Article</button>${button}
+        <button type="submit" class="btn">Add Article</button>${button}
       </form>
       <hr>`;
   }
   const form = form1;
   return `${header(data.title)}
   <body>
+      <div id="wrapper">
     <nav>
+      ${data.login}
   <input type="text" id="search" placeholder="Search...">
-  ${data.login}
   </nav>
   <div id="header">
   <h1>${data.title}</h1>
   <img src="headerphoto.jpg" onerror="this.classList.add('hide-image')" />
     </div>
-    <div id="wrapper">
     ${form}
       <section id="articles" class="articles">
       ${data.articles.map((article) => article.toHTML(data.loggedin)).join("")}

package/README.md CHANGED Viewed

@@ -30,6 +30,15 @@ Now you can open your blog in your webbrowser on `http://localhost:8080`. Login
 To add a headerphoto to your blog simply name it "headerphoto.jpg" and put it in the _public_ folder.
+### change view engine
+You can put your own angular theme in the public folder.
+```
+...
+blog.angular = true;
+```
 ### set a Database Adapter
 #### connect to a sqlite database

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",

package/public/index.html CHANGED Viewed

@@ -10,8 +10,8 @@
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <style>@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3GUBGEe.woff2) format('woff2');unicode-range:U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;}@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3iUBGEe.woff2) format('woff2');unicode-range:U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;}@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3CUBGEe.woff2) format('woff2');unicode-range:U+1F00-1FFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3-UBGEe.woff2) format('woff2');unicode-range:U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMawCUBGEe.woff2) format('woff2');unicode-range:U+0302-0303, U+0305, U+0307-0308, U+0310, U+0312, U+0315, U+031A, U+0326-0327, U+032C, U+032F-0330, U+0332-0333, U+0338, U+033A, U+0346, U+034D, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2016-2017, U+2034-2038, U+203C, U+2040, U+2043, U+2047, U+2050, U+2057, U+205F, U+2070-2071, U+2074-208E, U+2090-209C, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2100-2112, U+2114-2115, U+2117-2121, U+2123-214F, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B7, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+3030, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMaxKUBGEe.woff2) format('woff2');unicode-range:U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8BB, U+1F8C0-1F8C1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA89, U+1FA8F-1FAC6, U+1FACE-1FADC, U+1FADF-1FAE9, U+1FAF0-1FAF8, U+1FB00-1FBFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3OUBGEe.woff2) format('woff2');unicode-range:U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;}@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3KUBGEe.woff2) format('woff2');unicode-range:U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:300;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3yUBA.woff2) format('woff2');unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3GUBGEe.woff2) format('woff2');unicode-range:U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3iUBGEe.woff2) format('woff2');unicode-range:U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3CUBGEe.woff2) format('woff2');unicode-range:U+1F00-1FFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3-UBGEe.woff2) format('woff2');unicode-range:U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMawCUBGEe.woff2) format('woff2');unicode-range:U+0302-0303, U+0305, U+0307-0308, U+0310, U+0312, U+0315, U+031A, U+0326-0327, U+032C, U+032F-0330, U+0332-0333, U+0338, U+033A, U+0346, U+034D, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2016-2017, U+2034-2038, U+203C, U+2040, U+2043, U+2047, U+2050, U+2057, U+205F, U+2070-2071, U+2074-208E, U+2090-209C, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2100-2112, U+2114-2115, U+2117-2121, U+2123-214F, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B7, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+3030, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMaxKUBGEe.woff2) format('woff2');unicode-range:U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8BB, U+1F8C0-1F8C1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA89, U+1FA8F-1FAC6, U+1FACE-1FADC, U+1FADF-1FAE9, U+1FAF0-1FAF8, U+1FB00-1FBFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3OUBGEe.woff2) format('woff2');unicode-range:U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3KUBGEe.woff2) format('woff2');unicode-range:U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3yUBA.woff2) format('woff2');unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3GUBGEe.woff2) format('woff2');unicode-range:U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3iUBGEe.woff2) format('woff2');unicode-range:U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3CUBGEe.woff2) format('woff2');unicode-range:U+1F00-1FFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3-UBGEe.woff2) format('woff2');unicode-range:U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMawCUBGEe.woff2) format('woff2');unicode-range:U+0302-0303, U+0305, U+0307-0308, U+0310, U+0312, U+0315, U+031A, U+0326-0327, U+032C, U+032F-0330, U+0332-0333, U+0338, U+033A, U+0346, U+034D, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2016-2017, U+2034-2038, U+203C, U+2040, U+2043, U+2047, U+2050, U+2057, U+205F, U+2070-2071, U+2074-208E, U+2090-209C, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2100-2112, U+2114-2115, U+2117-2121, U+2123-214F, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B7, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+3030, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMaxKUBGEe.woff2) format('woff2');unicode-range:U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8BB, U+1F8C0-1F8C1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA89, U+1FA8F-1FAC6, U+1FACE-1FADC, U+1FADF-1FAE9, U+1FAF0-1FAF8, U+1FB00-1FBFF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3OUBGEe.woff2) format('woff2');unicode-range:U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3KUBGEe.woff2) format('woff2');unicode-range:U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;}@font-face{font-family:'Roboto';font-style:normal;font-weight:500;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3yUBA.woff2) format('woff2');unicode-range:U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;}</style>
   <style>@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/materialicons/v145/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:24px;line-height:1;letter-spacing:normal;text-transform:none;display:inline-block;white-space:nowrap;word-wrap:normal;direction:ltr;-webkit-font-feature-settings:'liga';-webkit-font-smoothing:antialiased;}</style>
-<style>:root{--blue:hsl(224, 100%, 41%);--yellow:hsl(53, 100%, 50%);--orange:hsl(44, 100%, 50%);--poisongreen:hsl(88, 100%, 50%);--green:hsl(85, 100%, 40%);--pink:hsl(303, 100%, 40%);--basecolor:var(--orange);--primary:var(--basecolor);--primary-inverted:rgb(from var(--primary) calc(1 - r) calc(1 - g) calc(1 - b) );--header_bg:var(--basecolor);--header_darker:hsl(from var(--primary) h s l / .4);--header_darker_high-contrast:hsl(from var(--primary) h s l);--gray:rgba(255, 255, 255, .3);--darkgray:rgba(54, 54, 54, .5);--white:#fefefe;--white_darker:#eeeeee;--red:hsla(0, 100%, 38%, .7);--black:black;--contrast_text:rgb( from var(--header_darker) clamp(0, (r * .299 + g * .587 + b * .114 - 128) * -1000, 255) clamp(0, (r * .299 + g * .587 + b * .114 - 128) * -1000, 255) clamp(0, (r * .299 + g * .587 + b * .114 - 128) * -1000, 255) );--text-primary:var(--black);--text-secondary:var(--white)}html,body{margin:0}body{color:var(--text-primary);background:var(--white_darker);font-family:Arial,sans-serif}@media print{body{font-size:12pt;color:#000;background:#fff}}</style><link rel="stylesheet" href="styles-I55BTQOK.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles-I55BTQOK.css"></noscript></head>
+<style>@font-face{font-family:Freckle Face;font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/freckleface/v16/AMOWz4SXrmKHCvXTohxY-YIEWli389k.woff2) format("woff2");unicode-range:U+0100-02BA,U+02BD-02C5,U+02C7-02CC,U+02CE-02D7,U+02DD-02FF,U+0304,U+0308,U+0329,U+1D00-1DBF,U+1E00-1E9F,U+1EF2-1EFF,U+2020,U+20A0-20AB,U+20AD-20C0,U+2113,U+2C60-2C7F,U+A720-A7FF}@font-face{font-family:Freckle Face;font-style:normal;font-weight:400;font-display:swap;src:url(https://fonts.gstatic.com/s/freckleface/v16/AMOWz4SXrmKHCvXTohxY-YIEVFi3.woff2) format("woff2");unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD}@font-face{font-family:Fredoka;font-style:normal;font-weight:300 700;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/fredoka/v17/X7n64b87HvSqjb_WIi2yDCRwoQ_k7367_DWs89XyHw.woff2) format("woff2");unicode-range:U+0307-0308,U+0590-05FF,U+200C-2010,U+20AA,U+25CC,U+FB1D-FB4F}@font-face{font-family:Fredoka;font-style:normal;font-weight:300 700;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/fredoka/v17/X7n64b87HvSqjb_WIi2yDCRwoQ_k7367_DWg89XyHw.woff2) format("woff2");unicode-range:U+0100-02BA,U+02BD-02C5,U+02C7-02CC,U+02CE-02D7,U+02DD-02FF,U+0304,U+0308,U+0329,U+1D00-1DBF,U+1E00-1E9F,U+1EF2-1EFF,U+2020,U+20A0-20AB,U+20AD-20C0,U+2113,U+2C60-2C7F,U+A720-A7FF}@font-face{font-family:Fredoka;font-style:normal;font-weight:300 700;font-stretch:100%;font-display:swap;src:url(https://fonts.gstatic.com/s/fredoka/v17/X7n64b87HvSqjb_WIi2yDCRwoQ_k7367_DWu89U.woff2) format("woff2");unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD}:root{--blue:hsl(224, 100%, 41%);--yellow:hsl(53, 100%, 50%);--orange:hsl(44, 100%, 50%);--poisongreen:hsl(88, 100%, 50%);--green:hsl(85, 100%, 40%);--pink:hsl(303, 100%, 40%);--basecolor:var(--green);--primary:var(--basecolor);--primary-inverted:rgb(from var(--primary) calc(1 - r) calc(1 - g) calc(1 - b) );--header_bg:var(--basecolor);--header_darker:hsl(from var(--primary) h s l / .4);--header_darker_high-contrast:hsl(from var(--primary) h s l);--gray:rgba(255, 255, 255, .3);--darkgray:rgba(54, 54, 54, .5);--white:#fefefe;--white_darker:#eeeeee;--red:hsla(0, 100%, 38%, .7);--black:black;--contrast_text:rgb( from var(--header_darker) clamp(0, (r * .299 + g * .587 + b * .114 - 128) * -1000, 255) clamp(0, (r * .299 + g * .587 + b * .114 - 128) * -1000, 255) clamp(0, (r * .299 + g * .587 + b * .114 - 128) * -1000, 255) );--text-primary:var(--black);--text-secondary:var(--white);--font:"Freckle Face", system-ui;--buttonfont:Arial, sans-serif;--readable-font:"Fredoka", sans-serif}html,body{margin:0}body{color:var(--text-primary);background:var(--white_darker);font-family:var(--font)}@media print{body{font-size:12pt;color:#000;background:#fff}}</style><link rel="stylesheet" href="styles-CRQIYMR5.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles-CRQIYMR5.css"></noscript></head>
 <body>
   <app-root></app-root>
-<script src="main-LAI5FAZI.js" type="module"></script></body>
+<script src="main-V4OTOWYB.js" type="module"></script></body>
 </html>