From a4c0950b40281c3530b546bd48d73dd2f834d727 Mon Sep 17 00:00:00 2001
From: Daragh Downes <esy@skynet.ie>
Date: Mon, 19 Aug 2024 22:48:10 +0100
Subject: [PATCH] restructure

---
 .gitignore                                    |   3 +
 .md.toml                                      |  23 ----
 flake.lock                                    | 104 +-----------------
 .../assets/backgroundsharkycoin.png           |   0
 .../assets/favicon/favicon-16x16.png          |   0
 src/{wiki => }/assets/highlight.min.js        |   0
 src/{wiki => }/assets/hybrid.min.css          |   0
 src/{wiki => }/assets/index.css               |   0
 src/{wiki => }/assets/sharky.svg              |   0
 src/{wiki => }/migration.md                   |   0
 src/{wiki => }/migration/img.png              |   0
 src/{wiki => }/migration/img_1.png            |   0
 src/{wiki => }/migration/img_2.png            |   0
 src/{wiki => }/recovery.md                    |   0
 src/{wiki => }/renew.md                       |   0
 src/{wiki => }/renewal/renew1.jpg             |   0
 src/{wiki => }/renewal/renew2.png             |   0
 src/{wiki => }/renewal/renew3.png             |   0
 src/{wiki => }/renewal/renew4.png             |   0
 src/{wiki => }/renewal/renew5.jpg             |   0
 src/{wiki => }/renewal/renew6.jpg             |   0
 src/{wiki => }/renewal/renew7.png             |   0
 src/templates/general.html                    |  27 -----
 src/templates/powerpoint.html                 |  83 --------------
 src/templates/wiki.html                       |  40 -------
 src/templates/wiki_index.html                 |  38 -------
 26 files changed, 5 insertions(+), 313 deletions(-)
 delete mode 100644 .md.toml
 rename src/{wiki => }/assets/backgroundsharkycoin.png (100%)
 rename src/{wiki => }/assets/favicon/favicon-16x16.png (100%)
 rename src/{wiki => }/assets/highlight.min.js (100%)
 rename src/{wiki => }/assets/hybrid.min.css (100%)
 rename src/{wiki => }/assets/index.css (100%)
 rename src/{wiki => }/assets/sharky.svg (100%)
 rename src/{wiki => }/migration.md (100%)
 rename src/{wiki => }/migration/img.png (100%)
 rename src/{wiki => }/migration/img_1.png (100%)
 rename src/{wiki => }/migration/img_2.png (100%)
 rename src/{wiki => }/recovery.md (100%)
 rename src/{wiki => }/renew.md (100%)
 rename src/{wiki => }/renewal/renew1.jpg (100%)
 rename src/{wiki => }/renewal/renew2.png (100%)
 rename src/{wiki => }/renewal/renew3.png (100%)
 rename src/{wiki => }/renewal/renew4.png (100%)
 rename src/{wiki => }/renewal/renew5.jpg (100%)
 rename src/{wiki => }/renewal/renew6.jpg (100%)
 rename src/{wiki => }/renewal/renew7.png (100%)
 delete mode 100644 src/templates/general.html
 delete mode 100644 src/templates/powerpoint.html
 delete mode 100644 src/templates/wiki.html
 delete mode 100644 src/templates/wiki_index.html

diff --git a/.gitignore b/.gitignore
index eccad86..48084e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ test.*
 # Nix
 result
 /result
+
+# Mkdocs
+/site
diff --git a/.md.toml b/.md.toml
deleted file mode 100644
index 5db7994..0000000
--- a/.md.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-html_void = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"]
-dont_copy_paths = [
-   # "./src/templates"
-]
-
-src = "./src"
-dest = "./build"
-[template]
-enable = true
-order = [
-    { type = "Powerpoint", path = "./src/templates/powerpoint.html" },
-    { type = "Adjacent" },
-    { type = "AdjacentFolder" },
-    { type = "RootFolder", path = "./src/templates/folder.html" },
-    # path to the templates' folder,
-    { type = "Root", path = "./src/templates" },
-    { type = "General", path = "./src/templates/general.html" },
-    { type = "Default" },
-]
-
-[indexing]
-roots = ["wiki"]
-render_drafts = false
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 957502d..128e4d5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,72 +1,6 @@
 {
   "nodes": {
-    "bfom": {
-      "inputs": {
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs_2",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1723500950,
-        "narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=",
-        "owner": "silver_rust",
-        "repo": "bfom",
-        "rev": "7f339f28442758ecc3f1697e3f70d441973664b9",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "silver_rust",
-        "repo": "bfom",
-        "type": "gitlab"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1713520724,
-        "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1714091391,
-        "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1714091391,
-        "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1695837737,
         "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=",
@@ -82,9 +16,8 @@
     },
     "root": {
       "inputs": {
-        "bfom": "bfom",
-        "nixpkgs": "nixpkgs_3",
-        "utils": "utils_2"
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
       }
     },
     "systems": {
@@ -102,43 +35,10 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "utils": {
       "inputs": {
         "systems": "systems"
       },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
       "locked": {
         "lastModified": 1694529238,
         "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
diff --git a/src/wiki/assets/backgroundsharkycoin.png b/src/assets/backgroundsharkycoin.png
similarity index 100%
rename from src/wiki/assets/backgroundsharkycoin.png
rename to src/assets/backgroundsharkycoin.png
diff --git a/src/wiki/assets/favicon/favicon-16x16.png b/src/assets/favicon/favicon-16x16.png
similarity index 100%
rename from src/wiki/assets/favicon/favicon-16x16.png
rename to src/assets/favicon/favicon-16x16.png
diff --git a/src/wiki/assets/highlight.min.js b/src/assets/highlight.min.js
similarity index 100%
rename from src/wiki/assets/highlight.min.js
rename to src/assets/highlight.min.js
diff --git a/src/wiki/assets/hybrid.min.css b/src/assets/hybrid.min.css
similarity index 100%
rename from src/wiki/assets/hybrid.min.css
rename to src/assets/hybrid.min.css
diff --git a/src/wiki/assets/index.css b/src/assets/index.css
similarity index 100%
rename from src/wiki/assets/index.css
rename to src/assets/index.css
diff --git a/src/wiki/assets/sharky.svg b/src/assets/sharky.svg
similarity index 100%
rename from src/wiki/assets/sharky.svg
rename to src/assets/sharky.svg
diff --git a/src/wiki/migration.md b/src/migration.md
similarity index 100%
rename from src/wiki/migration.md
rename to src/migration.md
diff --git a/src/wiki/migration/img.png b/src/migration/img.png
similarity index 100%
rename from src/wiki/migration/img.png
rename to src/migration/img.png
diff --git a/src/wiki/migration/img_1.png b/src/migration/img_1.png
similarity index 100%
rename from src/wiki/migration/img_1.png
rename to src/migration/img_1.png
diff --git a/src/wiki/migration/img_2.png b/src/migration/img_2.png
similarity index 100%
rename from src/wiki/migration/img_2.png
rename to src/migration/img_2.png
diff --git a/src/wiki/recovery.md b/src/recovery.md
similarity index 100%
rename from src/wiki/recovery.md
rename to src/recovery.md
diff --git a/src/wiki/renew.md b/src/renew.md
similarity index 100%
rename from src/wiki/renew.md
rename to src/renew.md
diff --git a/src/wiki/renewal/renew1.jpg b/src/renewal/renew1.jpg
similarity index 100%
rename from src/wiki/renewal/renew1.jpg
rename to src/renewal/renew1.jpg
diff --git a/src/wiki/renewal/renew2.png b/src/renewal/renew2.png
similarity index 100%
rename from src/wiki/renewal/renew2.png
rename to src/renewal/renew2.png
diff --git a/src/wiki/renewal/renew3.png b/src/renewal/renew3.png
similarity index 100%
rename from src/wiki/renewal/renew3.png
rename to src/renewal/renew3.png
diff --git a/src/wiki/renewal/renew4.png b/src/renewal/renew4.png
similarity index 100%
rename from src/wiki/renewal/renew4.png
rename to src/renewal/renew4.png
diff --git a/src/wiki/renewal/renew5.jpg b/src/renewal/renew5.jpg
similarity index 100%
rename from src/wiki/renewal/renew5.jpg
rename to src/renewal/renew5.jpg
diff --git a/src/wiki/renewal/renew6.jpg b/src/renewal/renew6.jpg
similarity index 100%
rename from src/wiki/renewal/renew6.jpg
rename to src/renewal/renew6.jpg
diff --git a/src/wiki/renewal/renew7.png b/src/renewal/renew7.png
similarity index 100%
rename from src/wiki/renewal/renew7.png
rename to src/renewal/renew7.png
diff --git a/src/templates/general.html b/src/templates/general.html
deleted file mode 100644
index 9f5a47b..0000000
--- a/src/templates/general.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-ie">
-  <head>
-    <title>{title}</title>
-    <link href="./assets/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
-    <link href="./assets/index.css" rel="stylesheet" type="text/css"/>
-
-    <!-- for code formatting -->
-    <link rel="stylesheet" href="./assets/hybrid.min.css">
-    <script src="./assets/highlight.min.js"></script>
-    <script>hljs.highlightAll()</script>
-  </head>
-  <body>
-    <div class="wrapper">
-      <header class="page-header"></header>
-      <main class="page-body">
-{body}
-      </main>
-      <footer class="page-footer">
-        UL Computer Society 2023-<span id="year">2023</span>
-        <script>
-          document.getElementById('year').textContent = new Date().getFullYear().toString()
-        </script>
-      </footer>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/src/templates/powerpoint.html b/src/templates/powerpoint.html
deleted file mode 100644
index 4b1e07b..0000000
--- a/src/templates/powerpoint.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-  <head>
-    <title>{title}</title>
-    <link href="./assets/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
-
-    <!-- for code formatting -->
-    <link rel="stylesheet" href="./assets/hybrid.min.css">
-    <script src="./assets/highlight.min.js"></script>
-    <script>hljs.highlightAll()</script>
-  </head>
-  <body>
-{body}
-  </body>
-  <style>
-    section.slide {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%) scale(3);
-    }
-    ol, ul {
-      margin-top: 0;
-      margin-bottom: 0;
-    }
-    img{
-      display: block;
-      margin-left: auto;
-      margin-right: auto;
-      max-width: 40%;
-      max-height: 40%;
-    }
-  </style>
-  <script>
-    let slide_number = 0;
-    let slide_max = 0;
-
-    for (let section of document.querySelectorAll("section.slide")) {
-      let number = parseInt(section.id, 10);
-      if (number > slide_max) {
-        slide_max = number;
-      }
-    }
-
-    slide_next = (change) => {
-      // make old hidden
-      document.getElementById(`${slide_number}`).style.display = "none";
-
-      // make the change
-      let slide_number_new = slide_number + change;
-      if (slide_number_new >= 0 && slide_number_new <= slide_max) {
-        slide_number += change;
-      }
-
-      // make current visible
-      document.getElementById(`${slide_number}`).style.display = "block";
-    }
-
-    // add event listner
-    onkeydown = (event) => {
-      if (event.key === "ArrowRight" || event.key === "ArrowDown") {
-        slide_next(1);
-      }
-      if (event.key === "ArrowLeft" || event.key === "ArrowUp") {
-        slide_next(-1);
-      }
-    };
-
-    on_events = (clickTargetWidth, xCoordInClickTarget) => {
-      if (clickTargetWidth / 2 > xCoordInClickTarget) {
-        slide_next(-1);
-      } else {
-        slide_next(1);
-      }
-    }
-
-    ontouchstart = (event) => {
-      on_events(event.target.offsetWidth, event.touches[0].clientX - event.target.getBoundingClientRect().left);
-    };
-    // show the first slide
-    slide_next(0)
-  </script>
-</html>
\ No newline at end of file
diff --git a/src/templates/wiki.html b/src/templates/wiki.html
deleted file mode 100644
index 1e46577..0000000
--- a/src/templates/wiki.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-ie">
-  <head>
-    <title>{title}</title>
-    <link href="./assets/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
-    <link href="./assets/index.css" rel="stylesheet" type="text/css"/>
-
-    <!-- for code formatting -->
-    <link rel="stylesheet" href="./assets/hybrid.min.css">
-    <script src="./assets/highlight.min.js"></script>
-    <script>hljs.highlightAll()</script>
-  </head>
-  <body>
-    <div class="wrapper">
-      <header class="page-header">
-        <a href="./" >
-          <img alt="Sharky, our mascot" height="81.56" src="./assets/sharky.svg" width="145"/>
-        </a>
-        <h1>
-          <a href="./" >
-            <h1>Skynet Wiki</h1>
-          </a>
-        </h1>
-      </header>
-
-      <main class="page-body">
-        <h1>{title}</h1>
-        <h4>{date}</h4>
-<!--indentation is managed by the converter-->
-{body}
-      </main>
-      <footer class="page-footer">
-        UL Computer Society 2023-<span id="year">2023</span>
-        <script>
-          document.getElementById('year').textContent = new Date().getFullYear().toString()
-        </script>
-      </footer>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/src/templates/wiki_index.html b/src/templates/wiki_index.html
deleted file mode 100644
index dcbb28a..0000000
--- a/src/templates/wiki_index.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-ie">
-  <head>
-    <title>{title}</title>
-    <link href="./assets/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
-    <link href="./assets/index.css" rel="stylesheet" type="text/css"/>
-
-    <!-- for code formatting -->
-    <link rel="stylesheet" href="./assets/hybrid.min.css">
-    <script src="./assets/highlight.min.js"></script>
-    <script>hljs.highlightAll()</script>
-  </head>
-  <body>
-    <div class="wrapper">
-      <header class="page-header">
-        <a href="./" >
-          <img alt="Sharky, our mascot" height="81.56" src="./assets/sharky.svg" width="145"/>
-        </a>
-        <h1>
-          <a href="./" >
-            <h1>Skynet Wiki</h1>
-          </a>
-        </h1>
-      </header>
-
-      <main class="page-body">
-<!--indentation is managed by the converter-->
-{body}
-      </main>
-      <footer class="page-footer">
-        UL Computer Society 2023-<span id="year">2023</span>
-        <script>
-          document.getElementById('year').textContent = new Date().getFullYear().toString()
-        </script>
-      </footer>
-    </div>
-  </body>
-</html>
\ No newline at end of file