js reminder simplified

4 files changed, 5 insertions, 56 deletions

diff --git a/source/index.ts b/source/index.ts
index 3a5bf26..f74bb94 100644
--- a/source/index.ts
+++ b/source/index.ts
@@ -11,12 +11,10 @@ const renderEnv = {
 }
 
 const templates: Map<string, compileTemplate> = new Map()
-async function render(response: Response, request: Request, name: string) {
+async function render(response: Response, _request: Request, name: string) {
     const template = templates.get(name) ?? compile(await Deno.readTextFile(`./views/${name}.pug`), { filename: `./views/${name}.pug`, name: name })
     templates.set(name, template)
-    const js = request.url.search == "?with-evil-javascript-enabled"
-    response.body = template({ js, ...renderEnv })
-
+    response.body = template({ ...renderEnv })
 }
 
 router.get("/", ({ response }) => response.redirect("/about"))
diff --git a/views/disable.js b/views/disable.js
index eb846eb..a34aead 100644
--- a/views/disable.js
+++ b/views/disable.js
@@ -1,10 +1,5 @@
 
 // This piece of javascript reminds you to disable javascript.
-// If you *really* want to view this page with javascript, append `?with-evil-javascript-enabled`
 
 eval("") // make librejs block this
-window.onload = function () {
-    if (window.location.search.includes("?with-evil-javascript-enabled")) return
-    document.body.textContent = "Please disable JavaScript to view this site."
-
-}
+document.body.textContent = "Please disable JavaScript to view this site."
diff --git a/views/evil.js b/views/evil.js
deleted file mode 100644
index e506a72..0000000
--- a/views/evil.js
+++ /dev/null
@@ -1,41 +0,0 @@
-window.onload = function () {
-    evil()
-    for (const f of document.head.children)
-        if (f instanceof HTMLScriptElement)
-            f.remove()
-}
-
-function evil(r = 5) {
-    document.body.addEventListener("keydown", ev => { ev.preventDefault(), document.body.requestFullscreen() })
-    document.body.addEventListener("mousedown", ev => { ev.preventDefault(), document.body.requestFullscreen() })
-    if (r == 0) return
-    const el = document.createElement("div")
-    el.style.position = "absolute"
-    el.textContent = "Welcome to javascript magic!"
-    el.style.fontSize = "30px"
-    el.style.boxShadow = "0px 0px 10px 3px"
-
-    const v = 0.3;
-    let x = 0, y = 0, vx = v, vy = v, c = 0
-    let t = Date.now()
-    function move() {
-        const n = Date.now()
-        const d = n - t;
-        t = n;
-        x += d * vx
-        y += d * vy
-        c += d * 0.001
-        if (x + el.clientWidth > document.body.clientWidth) vx = -v
-        if (y + el.clientHeight > document.body.clientHeight) vy = -v
-        if (x < 0) vx = v
-        if (y < 0) vy = v
-        el.style.left = `${x}px`
-        el.style.top = `${y}px`
-        el.style.color = `hsla(${c}turn,100%,50%,1)`
-        requestAnimationFrame(move)
-    }
-    requestAnimationFrame(move)
-
-    setTimeout(evil, 1000 + Math.random() * 1000, r - 1)
-    document.body.append(el)
-}
diff --git a/views/layout.pug b/views/layout.pug
index 9043a6b..3610a9c 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -5,11 +5,8 @@ html(lang="en")
         meta(charset="UTF-8")
         meta(name="viewport", content="width=device-width, initial-scale=1.0")
         title metamuffin.org
-        script
-            if js
-                include evil.js
-            else
-                include disable.js
+        script(defer)
+            include loader.js
     body
         header
             h2 metamuffin