From 22c54f54ca0ca9ac8a6ad4b3d9d1e2253f621adf Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Fri, 29 Mar 2024 15:53:30 +1300
Subject: [PATCH 01/18] chore: cleanup style

---
 astro.config.mjs                              |  99 ++++++++-----
 src/components/Button.astro                   |  62 ++++++++
 src/components/Landing/Card.astro             |  53 +++++++
 src/components/Landing/ListCard.astro         |  51 +++++++
 src/components/Landing/SplitCard.astro        |  50 +++++++
 src/components/ScriptWorkaround.astro         |   1 +
 src/components/about-tuhura.astro             |  39 -----
 src/components/starlight/Hero.astro           | 137 ++++++++++++++++++
 src/content/docs/404.md                       |  13 ++
 .../docs/guides/cybersecurity/competitions.md |   5 +-
 .../docs/guides/cybersecurity/index.md        |   6 +
 .../guides/cybersecurity/sql-injection.md     |   2 +
 .../guides/game-design/{about.md => index.md} |   1 -
 .../docs/guides/{about.md => index.md}        |   0
 .../javascript/{setting-up.mdx => index.mdx}  |   3 +-
 src/content/docs/index.mdx                    |  74 ++++++----
 src/content/docs/ncea/{about.md => index.md}  |   0
 src/javascript/utils.js                       |  64 ++++++++
 src/styles/custom.css                         |  36 +++++
 src/tailwind.css                              |   4 -
 tailwind.config.cjs                           |  16 --
 21 files changed, 582 insertions(+), 134 deletions(-)
 create mode 100644 src/components/Button.astro
 create mode 100644 src/components/Landing/Card.astro
 create mode 100644 src/components/Landing/ListCard.astro
 create mode 100644 src/components/Landing/SplitCard.astro
 create mode 100644 src/components/ScriptWorkaround.astro
 delete mode 100644 src/components/about-tuhura.astro
 create mode 100644 src/components/starlight/Hero.astro
 create mode 100644 src/content/docs/404.md
 create mode 100644 src/content/docs/guides/cybersecurity/index.md
 rename src/content/docs/guides/game-design/{about.md => index.md} (95%)
 rename src/content/docs/guides/{about.md => index.md} (100%)
 rename src/content/docs/guides/javascript/{setting-up.mdx => index.mdx} (99%)
 rename src/content/docs/ncea/{about.md => index.md} (100%)
 create mode 100644 src/javascript/utils.js
 create mode 100644 src/styles/custom.css
 delete mode 100644 src/tailwind.css
 delete mode 100644 tailwind.config.cjs

diff --git a/astro.config.mjs b/astro.config.mjs
index 9b268755..16b7b202 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -1,39 +1,30 @@
 import starlight from '@astrojs/starlight';
-import tailwind from '@astrojs/tailwind';
 import { defineConfig } from 'astro/config';
 import starlightLinksValidator from 'starlight-links-validator'
-export const locales = {
-  root: {
-    label: 'English',
-    lang: 'en' // lang is required for root locales
-  },
 
-  mi: {
-    label: 'Māori',
-    lang: 'mi'
-  }
-};
-const site = 'https://wiki.tuhuratech.org.nz/';
-
-
-// https://astro.build/config
 export default defineConfig({
-  site,
+  site: 'https://wiki.tuhuratech.org.nz/',
   integrations: [starlight({
     title: 'Wiki',
+    description: 'A collection of guides and resources for learning technology targeted towards rangatahi and kura in Aotearoa',
     logo: {
       light: './src/assets/logo-light.png',
       dark: './src/assets/logo-dark.png',
       replacesTitle: true
     },
+    lastUpdated: true,
+    editLink: {
+      baseUrl: 'https://github.com/Tuhura-Tech/Wiki/blob/main/'
+    },
     social: {
       mastodon: 'https://mastodon.nzoss.nz/@tuhuratech',
       github: 'https://github.com/Tuhura-Tech/Wiki',
       discord: 'https://discord.gg/PNxh7cwKfQ'
     },
-    editLink: {
-      baseUrl: 'https://github.com/Tuhura-Tech/Wiki/blob/main/'
-    },
+    customCss: [
+      // Relative path to your custom CSS file
+      './src/styles/custom.css',
+    ],
     sidebar: [{
       label: 'Guides',
       items: [{
@@ -41,34 +32,43 @@ export default defineConfig({
         link: 'guides/about'
       }, {
         label: "Javascript",
-        collapsed: true,
         items: [{
           label: "Setting Up",
           link: 'guides/javascript/setting-up'
         }, {
           label: "Creative Coding",
-          collapsed: true,
           autogenerate: {
             directory: 'guides/javascript/creative-coding'
           }
         }]
       },
-      { label: "Python", collapsed: true, autogenerate: { directory: 'guides/python' } },
+      {
+        label: "Python", items: [{
+          label: "Setting Up",
+          link: 'guides/python'
+        }, {
+          label: "Setting Up",
+          link: 'guides/python/setting-up'
+        }, {
+          label: "Flask",
+          autogenerate: {
+            directory: 'guides/python/flask'
+          }
+        }]
+      },
       {
         label: "Git",
-        collapsed: true,
         autogenerate: {
           directory: 'guides/git'
         }
       }, {
         label: "Cybersecurity",
-        collapsed: true,
+
         autogenerate: {
           directory: 'guides/cybersecurity'
         }
       }, {
         label: "Game Design",
-        collapsed: true,
         items: [{
           label: "About",
           link: 'guides/game-design/about'
@@ -81,7 +81,6 @@ export default defineConfig({
       },
       {
         label: "SQL",
-        collapsed: true,
         autogenerate: {
           directory: 'guides/sql'
         }
@@ -93,16 +92,27 @@ export default defineConfig({
         link: 'ncea/about'
       }, {
         label: "NCEA Level 2",
-        collapsed: true,
-        autogenerate: {
-          directory: 'ncea/level-2'
-        }
+        items: [{
+          label: "About",
+          link: 'ncea/level-2'
+        }, {
+          label: "Flask",
+          autogenerate: {
+            directory: 'ncea/level-2/flask'
+          }
+        }]
       }, {
         label: "NCEA Level 3",
-        collapsed: true,
-        autogenerate: {
-          directory: 'ncea/level-3'
-        }
+        items: [{
+          label: "About",
+          link: 'ncea/level-3'
+        }, {
+          label: "Flask",
+
+          autogenerate: {
+            directory: 'ncea/level-3/flask'
+          }
+        }]
       }]
     }, {
       label: "Tuhura Tech Resources",
@@ -110,7 +120,17 @@ export default defineConfig({
         directory: 'tuhura-tech'
       }
     }],
-    locales,
+    locales: {
+      root: {
+        label: 'English',
+        lang: 'en' // lang is required for root locales
+      },
+
+      mi: {
+        label: 'Māori',
+        lang: 'mi'
+      }
+    },
     favicon: '/images/favicon.svg',
     head: [
       // Add ICO favicon fallback for Safari.
@@ -123,14 +143,13 @@ export default defineConfig({
         }
       }],
     plugins: [starlightLinksValidator()],
-  }), tailwind({
-    // Disable the default base styles:
-    applyBaseStyles: false
-  }),],
+    components: {
+      Hero: './src/components/starlight/Hero.astro',
+    },
+  })],
   image: {
     service: {
       entrypoint: 'astro/assets/services/sharp'
     }
   }
-
 });
diff --git a/src/components/Button.astro b/src/components/Button.astro
new file mode 100644
index 00000000..1d41f995
--- /dev/null
+++ b/src/components/Button.astro
@@ -0,0 +1,62 @@
+---
+import { Icon } from '@astrojs/starlight/components';
+import { z } from 'astro/zod';
+type IconName = Parameters<typeof Icon>[0]['name'];
+
+interface Props {
+	variant: 'primary' | 'secondary' | 'minimal';
+	link: string;
+	icon?: undefined | { type: 'icon'; name: IconName } | { type: 'raw'; html: string };
+}
+
+const propsSchema = z.object({
+	variant: z.enum(['primary', 'secondary', 'minimal']).default('primary'),
+	link: z.string(),
+	icon: z
+		.union([
+			z.object({ type: z.literal('icon'), name: z.custom<IconName>(z.string().parse) }),
+			z.object({ type: z.literal('raw'), html: z.string() }),
+		])
+		.optional(),
+});
+
+const { link, variant, icon } = propsSchema.parse(Astro.props);
+---
+
+<a class:list={['sl-flex action', variant]} href={link}>
+	<slot />
+	{icon?.type === 'icon' && <Icon name={icon.name} size="1.5em" />}
+	{icon?.type === 'raw' && <Fragment set:html={icon.html} />}
+</a>
+
+<style>
+	.action {
+		gap: 0.5em;
+		align-items: center;
+		border-radius: 999rem;
+		padding: 0.5rem 1.125rem;
+		color: var(--sl-color-white);
+		line-height: 1.1875;
+		text-decoration: none;
+		font-size: var(--sl-text-sm);
+	}
+	.action.primary,
+	.action.primary:hover {
+		background: var(--sl-color-text-accent);
+		color: var(--sl-color-black);
+	}
+	.action.secondary {
+		background: var(--sl-color-black);
+		border: 2px solid;
+	}
+	.action.minimal {
+		padding-inline: 0;
+	}
+
+	@media (min-width: 50rem) {
+		.action {
+			font-size: var(--sl-text-base);
+			padding: 1rem 1.25rem;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/src/components/Landing/Card.astro b/src/components/Landing/Card.astro
new file mode 100644
index 00000000..5ad95501
--- /dev/null
+++ b/src/components/Landing/Card.astro
@@ -0,0 +1,53 @@
+---
+import { Card as StarlightCard } from "@astrojs/starlight/components";
+export type Props = Parameters<typeof StarlightCard>[0];
+---
+
+<div class="landing-card">
+  <StarlightCard {...Astro.props}><slot /></StarlightCard>
+</div>
+
+<style>
+  .landing-card {
+    --card-bg: rgba(23, 25, 30, 0.8);
+    display: contents;
+    color: var(--sl-color-white);
+  }
+  :global(:root[data-theme="light"]) .landing-card {
+    --card-bg: rgba(255, 255, 255, 0.8);
+  }
+
+  .landing-card :global(.card) {
+    overflow: hidden;
+    background: var(--card-bg);
+    position: relative;
+  }
+
+  .landing-card :global(.card > *) {
+    z-index: 1;
+  }
+  .landing-card :global(.card::before) {
+    content: "";
+    position: absolute;
+    top: 0;
+    inset-inline-end: 0;
+    width: 6.25rem;
+    height: 6.25rem;
+    /* background: var(--landing-card-accent, var(--sl-color-accent)); */
+    border-radius: 100%;
+    filter: blur(3.25rem);
+    opacity: 0.33;
+  }
+
+  /* .landing-card :global(.card) {
+    --sl-card-bg: var(--sl-color-blue-low);
+    --sl-card-border: var(--sl-color-blue-high);
+    --landing-card-accent: hsl(165, 90%, 46%);
+  }
+
+  .landing-card:nth-child(2n) :global(.card) {
+    --sl-card-bg: var(--sl-color-blue-low);
+    --sl-card-border: var(--sl-color-blue-high);
+    --landing-card-accent: var(--sl-color-blue);
+  } */
+</style>
diff --git a/src/components/Landing/ListCard.astro b/src/components/Landing/ListCard.astro
new file mode 100644
index 00000000..8536137e
--- /dev/null
+++ b/src/components/Landing/ListCard.astro
@@ -0,0 +1,51 @@
+---
+import Card from './Card.astro';
+export type Props = Parameters<typeof Card>[0];
+---
+
+<Card {...Astro.props}>
+	<div class="link-list">
+		<slot />
+	</div>
+</Card>
+
+<style>
+	.link-list :global(ul) {
+		list-style-type: none;
+		padding: 0;
+	}
+
+	.link-list :global(li) {
+		border-bottom: 1px solid var(--sl-color-gray-6);
+		padding: 0.25rem 0;
+		margin: 0 !important;
+	}
+	.link-list :global(li:last-child) {
+		border-bottom: none;
+	}
+
+	.link-list :global(a) {
+		display: flex;
+		gap: 0.5rem;
+		justify-content: space-between;
+		align-items: center;
+		text-decoration: none;
+	}
+
+	/* Add arrow icon to links. */
+	.link-list :global(a::after) {
+		content: '';
+		background-color: currentColor;
+		width: 1rem;
+		height: 1rem;
+		flex-shrink: 0;
+		mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M17.92 11.62a1.001 1.001 0 0 0-.21-.33l-5-5a1.003 1.003 0 1 0-1.42 1.42l3.3 3.29H7a1 1 0 0 0 0 2h7.59l-3.3 3.29a1.002 1.002 0 0 0 .325 1.639 1 1 0 0 0 1.095-.219l5-5a1 1 0 0 0 .21-.33 1 1 0 0 0 0-.76Z'%3E%3C/path%3E%3C/svg%3E");
+		-webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M17.92 11.62a1.001 1.001 0 0 0-.21-.33l-5-5a1.003 1.003 0 1 0-1.42 1.42l3.3 3.29H7a1 1 0 0 0 0 2h7.59l-3.3 3.29a1.002 1.002 0 0 0 .325 1.639 1 1 0 0 0 1.095-.219l5-5a1 1 0 0 0 .21-.33 1 1 0 0 0 0-.76Z'%3E%3C/path%3E%3C/svg%3E");
+		mask-size: 100%;
+		-webkit-mask-size: 100%;
+	}
+	/* Mirror arrow in RTL layouts */
+	:global([dir='rtl']) .link-list :global(a::after:not(:where([dir='rtl'] [dir='ltr'] *))) {
+		transform: matrix(-1, 0, 0, 1, 0, 0);
+	}
+</style>
\ No newline at end of file
diff --git a/src/components/Landing/SplitCard.astro b/src/components/Landing/SplitCard.astro
new file mode 100644
index 00000000..30e6a04b
--- /dev/null
+++ b/src/components/Landing/SplitCard.astro
@@ -0,0 +1,50 @@
+---
+import { Card } from "@astrojs/starlight/components";
+
+export type Props = Parameters<typeof Card>[0];
+---
+
+<div class="card--fullwidth">
+  <Card {...Astro.props}>
+    <div class="split">
+      <slot />
+    </div>
+  </Card>
+</div>
+
+<style>
+  .card--fullwidth {
+    --card-bg: rgba(23, 25, 30, 0.8);
+    grid-column: 1 / -1;
+  }
+  :global(:root[data-theme="light"]) .card--fullwidth {
+    --card-bg: rgba(255, 255, 255, 0.8);
+  }
+
+  .split {
+    margin-top: 1rem;
+    display: flex;
+    flex-direction: column;
+    gap: 0 1rem;
+    color: var(--sl-color-white);
+  }
+
+  .card--fullwidth :global(.card) {
+    /* background:
+      radial-gradient(var(--sl-color-orange-low), transparent 70%) no-repeat 50% -25% /
+        120% 300%,
+      var(--card-bg); */
+    position: relative;
+  }
+
+  @media screen and (min-width: 78rem) {
+    .split {
+      flex-direction: row;
+      gap: 2.5rem;
+    }
+    .split > :global(*) {
+      margin-top: 0 !important;
+      flex: 1;
+    }
+  }
+</style>
diff --git a/src/components/ScriptWorkaround.astro b/src/components/ScriptWorkaround.astro
new file mode 100644
index 00000000..761053b3
--- /dev/null
+++ b/src/components/ScriptWorkaround.astro
@@ -0,0 +1 @@
+<script src="/src/javascript/utils.js"></script>
diff --git a/src/components/about-tuhura.astro b/src/components/about-tuhura.astro
deleted file mode 100644
index 34afdddc..00000000
--- a/src/components/about-tuhura.astro
+++ /dev/null
@@ -1,39 +0,0 @@
----
-import { Image } from "astro:assets";
-import logoIcon from "./../assets/logo.svg";
-
-interface Props {
-  title: string;
-}
-
-const { title } = Astro.props;
----
-
-<article class="sl-flex not-content" aria-labelledby="about-tuhura-heading">
-  <small id="about-tuhura-heading">
-    {title}
-    <span class="sr-only">Tūhura Tech</span>
-  </small>
-  <slot />
-</article>
-
-<style>
-  article {
-    max-width: 40rem;
-    margin-inline: auto;
-    padding-block: 5rem;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-    gap: 0.5rem;
-  }
-  article > :global(*) {
-    max-width: 50ch;
-  }
-  small {
-    color: var(--sl-color-gray-3);
-  }
-  svg {
-    width: 15rem;
-  }
-</style>
diff --git a/src/components/starlight/Hero.astro b/src/components/starlight/Hero.astro
new file mode 100644
index 00000000..0bef613c
--- /dev/null
+++ b/src/components/starlight/Hero.astro
@@ -0,0 +1,137 @@
+---
+import type { Props } from "@astrojs/starlight/props";
+import Button from "../Button.astro";
+
+const { hero } = Astro.props.entry.data;
+const { title, tagline, actions } = hero!;
+---
+
+<div class="hero">
+  <div class="grid-bg"></div>
+  <div id="_top" class="hero-content stack" style="--stack-gap: 2rem;">
+    <div class="stack" style="--stack-gap: 1rem;">
+      <h1 set:html={title} />
+      <p set:html={tagline} />
+    </div>
+    <div class="sl-flex actions">
+      {
+        actions.map(({ link, icon, text, variant }) => (
+          <Button {link} {variant} {icon} set:html={text} />
+        ))
+      }
+    </div>
+  </div>
+</div>
+
+<style>
+  .hero {
+    position: relative;
+    margin: -1.5rem calc(-1 * var(--sl-content-pad-x));
+  }
+
+  .grid-bg {
+    z-index: -1;
+    position: absolute;
+    content: "";
+    inset: 0;
+    background-image: linear-gradient(
+        to right,
+        var(--sl-color-white) 1px,
+        transparent 1px
+      ),
+      linear-gradient(to bottom, var(--sl-color-white) 1px, transparent 1px);
+    background-position: right -1px;
+    background-size: 23px 23px;
+    -webkit-mask-image: radial-gradient(
+      circle at 100% 0%,
+      white,
+      transparent 65%
+    );
+    mask-image: radial-gradient(circle at 100% 0%, white, transparent 65%);
+    opacity: 0.05;
+  }
+
+  .stack {
+    display: flex;
+    flex-direction: column;
+    gap: var(--stack-gap, 1.5rem);
+  }
+
+  .hero-content {
+    padding: 3rem var(--sl-content-pad-x);
+    text-align: center;
+  }
+
+  h1 {
+    font-size: var(--sl-text-5xl);
+    line-height: var(--sl-line-height-headings);
+    font-weight: 600;
+    color: var(--sl-color-white);
+  }
+  .actions {
+    flex-wrap: wrap;
+    gap: 1rem 2rem;
+    justify-content: center;
+  }
+
+  :global([data-has-hero] .main-pane) {
+    --sl-content-margin-inline: 0;
+    width: 100%;
+  }
+
+  @media (min-width: 32rem) {
+    .hero-content {
+      max-width: 36rem;
+      padding-block: 6rem;
+    }
+
+    h1 {
+      font-size: var(--sl-text-6xl);
+    }
+  }
+
+  :global([data-has-hero] .sl-container) {
+    max-width: 100%;
+  }
+
+  .hero-content,
+  :global([data-has-hero] .sl-markdown-content) {
+    max-width: 72rem;
+    margin-inline: auto;
+  }
+
+  @media (min-width: 78rem) {
+    :global([data-has-hero] .main-pane) {
+      --cell-size: 3.5rem;
+      background:
+        radial-gradient(var(--sl-color-green-low), transparent 40%) no-repeat -170vw -55vh /
+          250vw 250vh,
+        radial-gradient(closest-side, var(--sl-color-green-low), transparent)
+          no-repeat calc(100% + var(--cell-size) * 6)
+          calc(var(--cell-size) * -7) / calc(var(--cell-size) * 12)
+          calc(var(--cell-size) * 19);
+    }
+
+    .hero {
+      display: grid;
+    }
+    .hero > :global(*) {
+      /* Position all elements in the hero on top of each other in the same grid area. */
+      grid-area: 1 / 1 / -1 / -1;
+    }
+
+    .hero-content {
+      width: 100%;
+      text-align: start;
+      align-self: center;
+    }
+    .hero-content > * {
+      /* Limit the content width so it doesn’t overlap with facepile elements. */
+      /* max-width: calc(100% - 29rem); */
+    }
+
+    .actions {
+      justify-content: start;
+    }
+  }
+</style>
diff --git a/src/content/docs/404.md b/src/content/docs/404.md
new file mode 100644
index 00000000..17ab03cc
--- /dev/null
+++ b/src/content/docs/404.md
@@ -0,0 +1,13 @@
+---
+title: Not found
+template: splash
+editUrl: false
+hero:
+  title: '404'
+  tagline: <strong>Houston, we have a problem.</strong> We couldn’t find that page.<br>Check the URL or try using the search bar.
+  actions:
+    - text: Go home
+      icon: right-arrow
+      link: /
+      variant: primary
+---
\ No newline at end of file
diff --git a/src/content/docs/guides/cybersecurity/competitions.md b/src/content/docs/guides/cybersecurity/competitions.md
index 77a2cf28..ed486495 100644
--- a/src/content/docs/guides/cybersecurity/competitions.md
+++ b/src/content/docs/guides/cybersecurity/competitions.md
@@ -1,6 +1,8 @@
 ---
 title: Competition Resources
 description: Gives a good source of resources for CTFs and the various NZ CTFs out there
+sidebar:
+   order: 2
 ---
 
 Cybersecurity competitions are a great way to learn and practice your skills in a safe and legal environment. These competitions are normally organized by universities, companies, and CTF teams and have a range of challenges suiting different skill levels and interests. Named CTFs (Capture the Flag), each of the challenges in the competition has a mock realistic scenario and a flag that you need to find. The flag is usually a string of characters that you need to submit to the competition's website to get points. The team with the most points at the end of the competition wins.
@@ -18,9 +20,8 @@ The most common category of CTFs is Jeopardy, as these have the most variety of
 
 ### Good CTFs
 
-- [Aotearoa CTF](https://aotearoactf.com/) - Aotearoa CTF is a New Zealand based CTF competition with a focus on secondary and tertiary students. It is organized by us, ([Tūhura Tech](https://tuhuratech.org.nz)) and is designed to be beginner-friendly.
+- [DUCTF](https://downunderctf.com)  - DownUnderCTF is a world-wide Capture The Flag (CTF) competition targeted at Australian and Aotearoa secondary and tertiary students.
 - [NZCSC](https://cybersecuritychallenge.org.nz) - The New Zealand Cyber Security Challenge is organized by the University of Waikato and is designed to be beginner-friendly. It has an online Round 0 qualification round and two in person rounds along with some talks at the University of Waikato.
-- [DUCTF](https://downunderctf.com)  - DownUnderCTF is a world-wide Capture The Flag (CTF) competition targeted at Australian secondary and tertiary students.
 - [PicoCTF](https://picoctf.com/) - This is an international CTF competition for high school students. It is a great way to get started in CTFs and learn the basics of cybersecurity. The challenges are very beginner-friendly, and they have a range of resources on their website.
 
 ## CTFs (Attack/Defense)
diff --git a/src/content/docs/guides/cybersecurity/index.md b/src/content/docs/guides/cybersecurity/index.md
new file mode 100644
index 00000000..950bd0a3
--- /dev/null
+++ b/src/content/docs/guides/cybersecurity/index.md
@@ -0,0 +1,6 @@
+---
+title: Javascript
+description: A simple website built using flask
+sidebar:
+   order: 1
+---
\ No newline at end of file
diff --git a/src/content/docs/guides/cybersecurity/sql-injection.md b/src/content/docs/guides/cybersecurity/sql-injection.md
index 875da1a3..412e047e 100644
--- a/src/content/docs/guides/cybersecurity/sql-injection.md
+++ b/src/content/docs/guides/cybersecurity/sql-injection.md
@@ -1,6 +1,8 @@
 ---
 title: SQL Injection
 description: Simple introduction to injecting SQL into a website
+sidebar:
+   order: 3
 ---
 
 SQL injection is one of the most common web vulnerabilities.
diff --git a/src/content/docs/guides/game-design/about.md b/src/content/docs/guides/game-design/index.md
similarity index 95%
rename from src/content/docs/guides/game-design/about.md
rename to src/content/docs/guides/game-design/index.md
index 20efc038..9f99de62 100644
--- a/src/content/docs/guides/game-design/about.md
+++ b/src/content/docs/guides/game-design/index.md
@@ -3,7 +3,6 @@ title: Intro
 description: Brief overview of game design
 
 sidebar:
-  # Make this always the first
   order: 1
 ---
 
diff --git a/src/content/docs/guides/about.md b/src/content/docs/guides/index.md
similarity index 100%
rename from src/content/docs/guides/about.md
rename to src/content/docs/guides/index.md
diff --git a/src/content/docs/guides/javascript/setting-up.mdx b/src/content/docs/guides/javascript/index.mdx
similarity index 99%
rename from src/content/docs/guides/javascript/setting-up.mdx
rename to src/content/docs/guides/javascript/index.mdx
index 7b7372d2..bb1adfa2 100644
--- a/src/content/docs/guides/javascript/setting-up.mdx
+++ b/src/content/docs/guides/javascript/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Setting Up
 description: This is how to set up a JavaScript environment.
-order: -1
+sidebar:
+   order: 1
 ---
 
 
diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index 7a605a83..db5917ae 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -1,45 +1,57 @@
 ---
 title: Tūhura Tech Wiki
 description: Free and public resources from Tūhura Tech for NZ Students.
-template: splash
+editUrl: false
+tableOfContents: false
+lastUpdated: false
+next: false
 hero:
-  tagline: Supporting the next generation of students!
-  image:
-    file: ../../assets/logo.svg
+  title: Tūhura Tech Wiki
+  tagline: |
+    <div class="roller">
+      <span id="pre_text">Supporting the next generation of</span>
+      <span id="changing_text">RANGATAHI.</span>
+    </div>
   actions:
-    - text: Our guides
-      link: ./guides/about
-      icon: right-arrow
-      variant: primary
-    - text: Our Website
+    - text: About Us
       link: https://tuhuratech.org.nz
       icon: external
 ---
 
-import { Card, CardGrid } from "@astrojs/starlight/components";
-import AboutTuhura from "../../components/about-tuhura.astro";
+import { CardGrid } from "@astrojs/starlight/components";
+import Card from '/src/components/Landing/Card.astro'
+import ListCard from '/src/components/Landing/ListCard.astro'
+import SplitCard from '/src/components/Landing/SplitCard.astro'
+import ScriptWorkaround from "/src/components/ScriptWorkaround.astro";
 
-## Resorces
-
-<CardGrid stagger>
-  <Card title="NCEA Content" icon="open-book">
-    A collection of curated and supported resources by the Tūhura Tech and our
-    partner schools to support NCEA DigiTech.
-  </Card>
-  <Card title="Programming Guides" icon="add-document">
-    Guides on getting started in python, cybersecurity, 3D Printing and more.
-  </Card>
-  <Card title="Projects" icon="setting">
-    Cool projects and guides created by staff and students.
+<CardGrid>
+  {/* <Card title="What will you build with Astro?" icon="laptop">
+    Explore [Astro starter themes](https://astro.build/themes/) for blogs, portfolios, docs, landing pages, SaaS, marketing, ecommerce sites, and more!
   </Card>
-  <Card title="Tūhura Tech Resources" icon="open-book">
-    Resources for how we run our sessions.
-  </Card>
-</CardGrid>
 
-<AboutTuhura title="Brought to you by">
-Tūhura Tech is a Aotearoa based charity focused on technology education.
+  <Card title="Take a guided tour" icon="star">
+    Complete our introductory [Build a Blog Tutorial](/en/tutorial/0-introduction/) to learn the basics and create your first Astro site.
+  </Card> */}
 
-[About Tūhura Tech](https://tuhuratech.org.nz/)
+  <ListCard title="Learn" icon="open-book">
+    - [Python](/guides/python)
+    - [Javascript](/guides/javascript)
+    - [Game Development](/guides/game-design)
+    - [CyberSecurity](/guides/cybersecurity)
+  </ListCard>
+
+  <ListCard title="NCEA Resources" icon="puzzle">
+    - [NCEA Level 2 Flask](/ncea/lvl-2/flask)
+    - [NCEA Level 3 Flask](/ncea/lvl-3/flask)
+  </ListCard>
+
+  <SplitCard title="Open Source, Industry Standards, For You" icon="rocket">
+    All of our resources are free and open source. We aim to provide the best resources for students in Aotearoa. They are licenced under a [GNU Affero General Public License](https://www.gnu.org/licenses/agpl-3.0.en.html) ensuring they are free for all and never behind a paywall.
+  </SplitCard>
+
+  <Card title="Contribute" icon="star">
+    Anyone can contribute to the resources whether you are a student, teacher or industry professional. We are always looking for new resources to add to the wiki. If you would like to contribute please visit our [Contributing Guide](/tuhura-tech/contributing).
+  </Card>
+</CardGrid>
 
-</AboutTuhura>
+<ScriptWorkaround />
\ No newline at end of file
diff --git a/src/content/docs/ncea/about.md b/src/content/docs/ncea/index.md
similarity index 100%
rename from src/content/docs/ncea/about.md
rename to src/content/docs/ncea/index.md
diff --git a/src/javascript/utils.js b/src/javascript/utils.js
new file mode 100644
index 00000000..111f81cf
--- /dev/null
+++ b/src/javascript/utils.js
@@ -0,0 +1,64 @@
+document.addEventListener('DOMContentLoaded', (event) => {
+    const letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    const word = document.querySelector("#changing_text");
+    const texts = ["Kura.", "Teachers.", "Students.", "Rangatahi.", "Schools.", "ākonga."];
+    let textIndex = 0;
+
+    let isAnimating = false;
+    let rafID;
+    let then = Date.now();
+    const interval = 30;
+
+    const animate = () => {
+        isAnimating = true;
+        let iterations = 0;
+        const originalText = texts[textIndex].toUpperCase();
+
+        const changeLetter = () => {
+            let now = Date.now();
+            let elapsed = now - then;
+
+            if (elapsed > interval) {
+                word.innerText = originalText
+                    .split("")
+                    .map((letter, index) => {
+                        if (index < iterations) {
+                            return originalText[index];
+                        }
+                        if (letter == " ") {
+                            return " ";
+                        }
+                        return letters[Math.floor(Math.random() * 22)];
+                    })
+                    .join("");
+
+                iterations += 1 / 3;
+                then = now - (elapsed % interval);
+            }
+
+            if (iterations < word.innerText.length && isAnimating) {
+                rafID = requestAnimationFrame(changeLetter);
+            }
+        }
+
+        rafID = requestAnimationFrame(changeLetter);
+    }
+
+    animate();
+
+    setInterval(() => {
+        textIndex = (textIndex + 1) % texts.length;
+        if (!document.hidden) {
+            animate();
+        }
+    }, 4000);
+
+    document.addEventListener('visibilitychange', function () {
+        if (document.hidden) {
+            isAnimating = false;
+            cancelAnimationFrame(rafID);
+        } else {
+            animate();
+        }
+    });
+});
\ No newline at end of file
diff --git a/src/styles/custom.css b/src/styles/custom.css
new file mode 100644
index 00000000..2b40fd21
--- /dev/null
+++ b/src/styles/custom.css
@@ -0,0 +1,36 @@
+/* Dark mode colours. */
+:root {
+  --sl-color-accent-low: #131e4f;
+  --sl-color-accent: #3447ff;
+  --sl-color-accent-high: #b3c7ff;
+  --sl-color-white: #ffffff;
+  --sl-color-gray-1: #eceef2;
+  --sl-color-gray-2: #c0c2c7;
+  --sl-color-gray-3: #888b96;
+  --sl-color-gray-4: #545861;
+  --sl-color-gray-5: #353841;
+  --sl-color-gray-6: #24272f;
+  --sl-color-black: #2c2c2c;
+}
+
+/* Light mode colours. */
+:root[data-theme="light"] {
+  --sl-color-accent-low: #c7d6ff;
+  --sl-color-accent: #364bff;
+  --sl-color-accent-high: #182775;
+  --sl-color-white: #2c2c2c;
+  --sl-color-gray-1: #24272f;
+  --sl-color-gray-2: #353841;
+  --sl-color-gray-3: #545861;
+  --sl-color-gray-4: #888b96;
+  --sl-color-gray-5: #c0c2c7;
+  --sl-color-gray-6: #eceef2;
+  --sl-color-gray-7: #f5f6f8;
+  --sl-color-black: #ffffff;
+}
+
+/* Changing text on the landing page */
+#changing_text {
+  color: #6aa469;
+  font-weight: bold;
+}
diff --git a/src/tailwind.css b/src/tailwind.css
deleted file mode 100644
index 4ea6118d..00000000
--- a/src/tailwind.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* src/tailwind.css */
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
deleted file mode 100644
index 5b561a22..00000000
--- a/tailwind.config.cjs
+++ /dev/null
@@ -1,16 +0,0 @@
-const starlightPlugin = require('@astrojs/starlight-tailwind');
-
-// Generated color palettes
-const accent = { 200: '#bbcfba', 600: '#427b42', 900: '#213921', 950: '#192819' };
-const gray = { 100: '#f4f7f3', 200: '#eaf0e8', 300: '#bdc4bb', 400: '#82907f', 500: '#4f5c4d', 700: '#303c2d', 800: '#1f2a1c', 900: '#151a13' };
-
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-	content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
-	theme: {
-		extend: {
-			colors: { accent, gray },
-		},
-	},
-	plugins: [starlightPlugin()],
-};
\ No newline at end of file

From 331dd27718474fa2a06bb02f4cd29b4764b5a3ff Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Fri, 29 Mar 2024 15:56:10 +1300
Subject: [PATCH 02/18] fix: remove currently invalid links

---
 src/content/docs/index.mdx | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index db5917ae..2dd77279 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -25,14 +25,6 @@ import SplitCard from '/src/components/Landing/SplitCard.astro'
 import ScriptWorkaround from "/src/components/ScriptWorkaround.astro";
 
 <CardGrid>
-  {/* <Card title="What will you build with Astro?" icon="laptop">
-    Explore [Astro starter themes](https://astro.build/themes/) for blogs, portfolios, docs, landing pages, SaaS, marketing, ecommerce sites, and more!
-  </Card>
-
-  <Card title="Take a guided tour" icon="star">
-    Complete our introductory [Build a Blog Tutorial](/en/tutorial/0-introduction/) to learn the basics and create your first Astro site.
-  </Card> */}
-
   <ListCard title="Learn" icon="open-book">
     - [Python](/guides/python)
     - [Javascript](/guides/javascript)
@@ -41,8 +33,8 @@ import ScriptWorkaround from "/src/components/ScriptWorkaround.astro";
   </ListCard>
 
   <ListCard title="NCEA Resources" icon="puzzle">
-    - [NCEA Level 2 Flask](/ncea/lvl-2/flask)
-    - [NCEA Level 3 Flask](/ncea/lvl-3/flask)
+    {/* - [NCEA Level 2 Flask](/ncea/lvl-2/flask)
+    - [NCEA Level 3 Flask](/ncea/lvl-3/flask) */}
   </ListCard>
 
   <SplitCard title="Open Source, Industry Standards, For You" icon="rocket">

From 40f1da5e8e04731db21745a38e0fac77f2e8ffd9 Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Fri, 29 Mar 2024 16:07:16 +1300
Subject: [PATCH 03/18] fix: remove green gradient on left

---
 src/components/starlight/Hero.astro | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/starlight/Hero.astro b/src/components/starlight/Hero.astro
index 0bef613c..0f93b40a 100644
--- a/src/components/starlight/Hero.astro
+++ b/src/components/starlight/Hero.astro
@@ -104,12 +104,14 @@ const { title, tagline, actions } = hero!;
     :global([data-has-hero] .main-pane) {
       --cell-size: 3.5rem;
       background:
-        radial-gradient(var(--sl-color-green-low), transparent 40%) no-repeat -170vw -55vh /
-          250vw 250vh,
-        radial-gradient(closest-side, var(--sl-color-green-low), transparent)
-          no-repeat calc(100% + var(--cell-size) * 6)
-          calc(var(--cell-size) * -7) / calc(var(--cell-size) * 12)
-          calc(var(--cell-size) * 19);
+        /* radial-gradient(var(--sl-color-green-low), transparent 40%) no-repeat -170vw -55vh /
+          250vw 250vh, */ radial-gradient(
+          closest-side,
+          var(--sl-color-green-low),
+          transparent
+        )
+        no-repeat calc(100% + var(--cell-size) * 6) calc(var(--cell-size) * -7) /
+        calc(var(--cell-size) * 12) calc(var(--cell-size) * 19);
     }
 
     .hero {

From de16f1eaba677e85824b88d6b38ea957a3d8d58e Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Fri, 29 Mar 2024 16:07:34 +1300
Subject: [PATCH 04/18] fix: remove sidebar on landing page

---
 src/content/docs/index.mdx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index 2dd77279..88dc4967 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -5,6 +5,7 @@ editUrl: false
 tableOfContents: false
 lastUpdated: false
 next: false
+template: splash
 hero:
   title: Tūhura Tech Wiki
   tagline: |
@@ -33,8 +34,8 @@ import ScriptWorkaround from "/src/components/ScriptWorkaround.astro";
   </ListCard>
 
   <ListCard title="NCEA Resources" icon="puzzle">
-    {/* - [NCEA Level 2 Flask](/ncea/lvl-2/flask)
-    - [NCEA Level 3 Flask](/ncea/lvl-3/flask) */}
+    - [NCEA Level 2 Flask](/ncea/lvl-2/flask)
+    - [NCEA Level 3 Flask](/ncea/lvl-3/flask)
   </ListCard>
 
   <SplitCard title="Open Source, Industry Standards, For You" icon="rocket">

From ae2111dcbf22c330390304e58c82214585383b8c Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Fri, 29 Mar 2024 16:20:36 +1300
Subject: [PATCH 05/18] fix: make glow slightly smaller

---
 src/components/starlight/Hero.astro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/starlight/Hero.astro b/src/components/starlight/Hero.astro
index 0f93b40a..69d4250b 100644
--- a/src/components/starlight/Hero.astro
+++ b/src/components/starlight/Hero.astro
@@ -102,7 +102,7 @@ const { title, tagline, actions } = hero!;
 
   @media (min-width: 78rem) {
     :global([data-has-hero] .main-pane) {
-      --cell-size: 3.5rem;
+      --cell-size: 3rem;
       background:
         /* radial-gradient(var(--sl-color-green-low), transparent 40%) no-repeat -170vw -55vh /
           250vw 250vh, */ radial-gradient(

From 8d788354058740470ef2b7b8938d6f7bbf1b33da Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Fri, 29 Mar 2024 16:32:36 +1300
Subject: [PATCH 06/18] feat: add about us info to landing page

---
 src/content/docs/index.mdx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index 88dc4967..4d09bd84 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -47,4 +47,12 @@ import ScriptWorkaround from "/src/components/ScriptWorkaround.astro";
   </Card>
 </CardGrid>
 
+## What is this Wiki for?
+
+This Wiki is a collection of resources and guides for ākonga (students) and kura (schools) in Aotearoa. We aim to provide free and open source resources for students to learn about technology. Our resources are designed to be used by students in their own time or by teachers in the classroom. It covers introductory guides, NCEA resources and is kept up to date by our staff and all the volunteer contributors.
+
+## About Us
+
+At [Tūhura Tech](https://tuhuratech.org.nz), our mission is to provide free technology education to rangatahi in the Wellington region. We believe that every rangatahi should have the opportunity to learn about and engage with technology, regardless of their background or financial situation. As part of that we maintain a collection of public resources.
+
 <ScriptWorkaround />
\ No newline at end of file

From 3accebb7d4b094fb3fbf13807bf15a9b4b9981fe Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Fri, 29 Mar 2024 16:38:34 +1300
Subject: [PATCH 07/18] chore: hide broken links

---
 src/content/docs/index.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index 4d09bd84..9dceed7d 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -34,8 +34,8 @@ import ScriptWorkaround from "/src/components/ScriptWorkaround.astro";
   </ListCard>
 
   <ListCard title="NCEA Resources" icon="puzzle">
-    - [NCEA Level 2 Flask](/ncea/lvl-2/flask)
-    - [NCEA Level 3 Flask](/ncea/lvl-3/flask)
+    {/* - [NCEA Level 2 Flask](/ncea/lvl-2/flask)
+    - [NCEA Level 3 Flask](/ncea/lvl-3/flask) */}
   </ListCard>
 
   <SplitCard title="Open Source, Industry Standards, For You" icon="rocket">

From 14eb3b98dd14275b28ba90be8af5657f224a1247 Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Sat, 30 Mar 2024 00:52:25 +1300
Subject: [PATCH 08/18] feat: add hover text for social media links

---
 src/styles/custom.css | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/styles/custom.css b/src/styles/custom.css
index 2b40fd21..af45596b 100644
--- a/src/styles/custom.css
+++ b/src/styles/custom.css
@@ -29,6 +29,26 @@
   --sl-color-black: #ffffff;
 }
 
+/* Display name of social links */
+.social-icons a {
+  position: relative;
+}
+.social-icons a:hover .sr-only,
+.social-icons a:focus .sr-only {
+  all: unset;
+  position: absolute;
+  inset-inline-start: 50%;
+  bottom: 0;
+  transform: translateX(-50%) translateY(100%);
+  background: var(--sl-color-black);
+  color: var(--sl-color-white);
+  padding: 0.25rem;
+  line-height: 1;
+  border-radius: 0.25rem;
+  box-shadow: var(--sl-shadow-md);
+  font-size: var(--sl-text-xs);
+}
+
 /* Changing text on the landing page */
 #changing_text {
   color: #6aa469;

From ab7f40db975e9c57fc67f411fb75f30f3185b9ea Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Sat, 30 Mar 2024 22:22:31 +1300
Subject: [PATCH 09/18] fix: colour on card in dark mode

---
 src/components/Landing/Card.astro | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Landing/Card.astro b/src/components/Landing/Card.astro
index 5ad95501..2e9c41cf 100644
--- a/src/components/Landing/Card.astro
+++ b/src/components/Landing/Card.astro
@@ -9,7 +9,6 @@ export type Props = Parameters<typeof StarlightCard>[0];
 
 <style>
   .landing-card {
-    --card-bg: rgba(23, 25, 30, 0.8);
     display: contents;
     color: var(--sl-color-white);
   }

From 0a0b43335ca96588a5c49d974dc7071be9f22cca Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Sat, 30 Mar 2024 22:22:47 +1300
Subject: [PATCH 10/18] chore: remove ncea

---
 astro.config.mjs                              | 119 +++---
 .../cybersecurity/competitions.md             |   0
 .../docs/{guides => }/cybersecurity/index.md  |   0
 .../cybersecurity/sql-injection.md            |   0
 .../{guides => }/game-design/godot/3d.mdx     |   0
 .../{guides => }/game-design/godot/basics.mdx |   0
 .../docs/{guides => }/game-design/index.md    |   0
 src/content/docs/{guides => }/git/basics.mdx  |   0
 .../docs/{guides => }/git/tips-and-tricks.md  |   0
 src/content/docs/guides/index.md              |  10 -
 src/content/docs/index.mdx                    |  19 +-
 .../javascript/creative-coding/paintbrush.mdx |   0
 .../javascript/creative-coding/start-here.mdx |   0
 .../docs/{guides => }/javascript/index.mdx    |   0
 src/content/docs/ncea/index.md                |  10 -
 src/content/docs/ncea/level-2/about.md        |   8 -
 src/content/docs/ncea/level-2/flask/about.md  |  50 ---
 .../ncea/level-2/flask/application-setup.mdx  |  85 -----
 .../ncea/level-2/flask/blog-functionality.mdx | 199 ----------
 .../docs/ncea/level-2/flask/database.mdx      | 182 ---------
 .../docs/ncea/level-2/flask/extension.mdx     |  32 --
 .../ncea/level-2/flask/project-layout.mdx     |  62 ----
 .../docs/ncea/level-2/flask/static-files.mdx  |  70 ----
 .../docs/ncea/level-2/flask/templates.mdx     | 286 ---------------
 .../docs/ncea/level-2/flask/testing.mdx       | 346 ------------------
 src/content/docs/ncea/level-3/about.md        |   8 -
 src/content/docs/ncea/level-3/flask/about.md  |   6 -
 .../ncea/level-3/flask/adding-content.mdx     |   6 -
 .../ncea/level-3/flask/authentication.mdx     |   6 -
 .../docs/ncea/level-3/flask/search.mdx        |   6 -
 .../docs/{guides => }/python/flask.mdx        |   0
 src/content/docs/{guides => }/python/index.md |   0
 .../docs/{guides => }/python/setting-up.mdx   |   0
 src/content/docs/{guides => }/sql/basics.mdx  |   0
 src/content/docs/{guides => }/sql/design.mdx  |   0
 src/content/docs/{guides => }/sql/index.mdx   |   0
 src/content/docs/{guides => }/sql/tables.mdx  |   0
 src/content/docs/{guides => }/web/index.md    |   0
 38 files changed, 49 insertions(+), 1461 deletions(-)
 rename src/content/docs/{guides => }/cybersecurity/competitions.md (100%)
 rename src/content/docs/{guides => }/cybersecurity/index.md (100%)
 rename src/content/docs/{guides => }/cybersecurity/sql-injection.md (100%)
 rename src/content/docs/{guides => }/game-design/godot/3d.mdx (100%)
 rename src/content/docs/{guides => }/game-design/godot/basics.mdx (100%)
 rename src/content/docs/{guides => }/game-design/index.md (100%)
 rename src/content/docs/{guides => }/git/basics.mdx (100%)
 rename src/content/docs/{guides => }/git/tips-and-tricks.md (100%)
 delete mode 100644 src/content/docs/guides/index.md
 rename src/content/docs/{guides => }/javascript/creative-coding/paintbrush.mdx (100%)
 rename src/content/docs/{guides => }/javascript/creative-coding/start-here.mdx (100%)
 rename src/content/docs/{guides => }/javascript/index.mdx (100%)
 delete mode 100644 src/content/docs/ncea/index.md
 delete mode 100644 src/content/docs/ncea/level-2/about.md
 delete mode 100644 src/content/docs/ncea/level-2/flask/about.md
 delete mode 100644 src/content/docs/ncea/level-2/flask/application-setup.mdx
 delete mode 100644 src/content/docs/ncea/level-2/flask/blog-functionality.mdx
 delete mode 100644 src/content/docs/ncea/level-2/flask/database.mdx
 delete mode 100644 src/content/docs/ncea/level-2/flask/extension.mdx
 delete mode 100644 src/content/docs/ncea/level-2/flask/project-layout.mdx
 delete mode 100644 src/content/docs/ncea/level-2/flask/static-files.mdx
 delete mode 100644 src/content/docs/ncea/level-2/flask/templates.mdx
 delete mode 100644 src/content/docs/ncea/level-2/flask/testing.mdx
 delete mode 100644 src/content/docs/ncea/level-3/about.md
 delete mode 100644 src/content/docs/ncea/level-3/flask/about.md
 delete mode 100644 src/content/docs/ncea/level-3/flask/adding-content.mdx
 delete mode 100644 src/content/docs/ncea/level-3/flask/authentication.mdx
 delete mode 100644 src/content/docs/ncea/level-3/flask/search.mdx
 rename src/content/docs/{guides => }/python/flask.mdx (100%)
 rename src/content/docs/{guides => }/python/index.md (100%)
 rename src/content/docs/{guides => }/python/setting-up.mdx (100%)
 rename src/content/docs/{guides => }/sql/basics.mdx (100%)
 rename src/content/docs/{guides => }/sql/design.mdx (100%)
 rename src/content/docs/{guides => }/sql/index.mdx (100%)
 rename src/content/docs/{guides => }/sql/tables.mdx (100%)
 rename src/content/docs/{guides => }/web/index.md (100%)

diff --git a/astro.config.mjs b/astro.config.mjs
index 16b7b202..058ee181 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -26,96 +26,61 @@ export default defineConfig({
       './src/styles/custom.css',
     ],
     sidebar: [{
-      label: 'Guides',
+      label: "Javascript",
       items: [{
-        label: "About our Guides",
-        link: 'guides/about'
+        label: "Setting Up",
+        link: 'javascript/setting-up'
       }, {
-        label: "Javascript",
-        items: [{
-          label: "Setting Up",
-          link: 'guides/javascript/setting-up'
-        }, {
-          label: "Creative Coding",
-          autogenerate: {
-            directory: 'guides/javascript/creative-coding'
-          }
-        }]
-      },
-      {
-        label: "Python", items: [{
-          label: "Setting Up",
-          link: 'guides/python'
-        }, {
-          label: "Setting Up",
-          link: 'guides/python/setting-up'
-        }, {
-          label: "Flask",
-          autogenerate: {
-            directory: 'guides/python/flask'
-          }
-        }]
-      },
-      {
-        label: "Git",
+        label: "Creative Coding",
         autogenerate: {
-          directory: 'guides/git'
+          directory: 'javascript/creative-coding'
         }
+      }]
+    },
+    {
+      label: "Python", items: [{
+        label: "Setting Up",
+        link: 'python'
       }, {
-        label: "Cybersecurity",
-
-        autogenerate: {
-          directory: 'guides/cybersecurity'
-        }
+        label: "Setting Up",
+        link: 'python/setting-up'
       }, {
-        label: "Game Design",
-        items: [{
-          label: "About",
-          link: 'guides/game-design/about'
-        }, {
-          label: "Godot",
-          autogenerate: {
-            directory: 'guides/game-design/godot'
-          }
-        }],
-      },
-      {
-        label: "SQL",
+        label: "Flask",
         autogenerate: {
-          directory: 'guides/sql'
+          directory: 'python/flask'
         }
       }]
+    },
+    {
+      label: "Git",
+      autogenerate: {
+        directory: 'git'
+      }
     }, {
-      label: 'NCEA Resources',
+      label: "Cybersecurity",
+
+      autogenerate: {
+        directory: 'cybersecurity'
+      }
+    }, {
+      label: "Game Design",
       items: [{
-        label: "About our Resources",
-        link: 'ncea/about'
+        label: "About",
+        link: 'game-design/about'
       }, {
-        label: "NCEA Level 2",
-        items: [{
-          label: "About",
-          link: 'ncea/level-2'
-        }, {
-          label: "Flask",
-          autogenerate: {
-            directory: 'ncea/level-2/flask'
-          }
-        }]
-      }, {
-        label: "NCEA Level 3",
-        items: [{
-          label: "About",
-          link: 'ncea/level-3'
-        }, {
-          label: "Flask",
-
-          autogenerate: {
-            directory: 'ncea/level-3/flask'
-          }
-        }]
-      }]
+        label: "Godot",
+        autogenerate: {
+          directory: 'game-design/godot'
+        }
+      }],
+    },
+    {
+      label: "SQL",
+      autogenerate: {
+        directory: 'sql'
+      }
     }, {
-      label: "Tuhura Tech Resources",
+      label: "Tūhura Tech Resources",
       autogenerate: {
         directory: 'tuhura-tech'
       }
diff --git a/src/content/docs/guides/cybersecurity/competitions.md b/src/content/docs/cybersecurity/competitions.md
similarity index 100%
rename from src/content/docs/guides/cybersecurity/competitions.md
rename to src/content/docs/cybersecurity/competitions.md
diff --git a/src/content/docs/guides/cybersecurity/index.md b/src/content/docs/cybersecurity/index.md
similarity index 100%
rename from src/content/docs/guides/cybersecurity/index.md
rename to src/content/docs/cybersecurity/index.md
diff --git a/src/content/docs/guides/cybersecurity/sql-injection.md b/src/content/docs/cybersecurity/sql-injection.md
similarity index 100%
rename from src/content/docs/guides/cybersecurity/sql-injection.md
rename to src/content/docs/cybersecurity/sql-injection.md
diff --git a/src/content/docs/guides/game-design/godot/3d.mdx b/src/content/docs/game-design/godot/3d.mdx
similarity index 100%
rename from src/content/docs/guides/game-design/godot/3d.mdx
rename to src/content/docs/game-design/godot/3d.mdx
diff --git a/src/content/docs/guides/game-design/godot/basics.mdx b/src/content/docs/game-design/godot/basics.mdx
similarity index 100%
rename from src/content/docs/guides/game-design/godot/basics.mdx
rename to src/content/docs/game-design/godot/basics.mdx
diff --git a/src/content/docs/guides/game-design/index.md b/src/content/docs/game-design/index.md
similarity index 100%
rename from src/content/docs/guides/game-design/index.md
rename to src/content/docs/game-design/index.md
diff --git a/src/content/docs/guides/git/basics.mdx b/src/content/docs/git/basics.mdx
similarity index 100%
rename from src/content/docs/guides/git/basics.mdx
rename to src/content/docs/git/basics.mdx
diff --git a/src/content/docs/guides/git/tips-and-tricks.md b/src/content/docs/git/tips-and-tricks.md
similarity index 100%
rename from src/content/docs/guides/git/tips-and-tricks.md
rename to src/content/docs/git/tips-and-tricks.md
diff --git a/src/content/docs/guides/index.md b/src/content/docs/guides/index.md
deleted file mode 100644
index 26cb2be3..00000000
--- a/src/content/docs/guides/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: About our Guides
-description: About the guides in this wiki.
-
-sidebar:
-  # Make this always the first
-  order: 1
----
-
-As part of our mission, we make our resources and guides public which you can use to learn new topics.
diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index 9dceed7d..be1c1afd 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -27,24 +27,19 @@ import ScriptWorkaround from "/src/components/ScriptWorkaround.astro";
 
 <CardGrid>
   <ListCard title="Learn" icon="open-book">
-    - [Python](/guides/python)
-    - [Javascript](/guides/javascript)
-    - [Game Development](/guides/game-design)
-    - [CyberSecurity](/guides/cybersecurity)
+    - [Python](/python)
+    - [Javascript](/javascript)
+    - [Game Development](/game-design)
+    - [CyberSecurity](/cybersecurity)
   </ListCard>
 
-  <ListCard title="NCEA Resources" icon="puzzle">
-    {/* - [NCEA Level 2 Flask](/ncea/lvl-2/flask)
-    - [NCEA Level 3 Flask](/ncea/lvl-3/flask) */}
-  </ListCard>
+  <Card title="Contribute" icon="star">
+    Anyone can contribute to the resources whether you are a student, teacher or industry professional. We are always looking for new resources to add to the wiki. If you would like to contribute please visit our [Contributing Guide](/tuhura-tech/contributing).
+  </Card>
 
   <SplitCard title="Open Source, Industry Standards, For You" icon="rocket">
     All of our resources are free and open source. We aim to provide the best resources for students in Aotearoa. They are licenced under a [GNU Affero General Public License](https://www.gnu.org/licenses/agpl-3.0.en.html) ensuring they are free for all and never behind a paywall.
   </SplitCard>
-
-  <Card title="Contribute" icon="star">
-    Anyone can contribute to the resources whether you are a student, teacher or industry professional. We are always looking for new resources to add to the wiki. If you would like to contribute please visit our [Contributing Guide](/tuhura-tech/contributing).
-  </Card>
 </CardGrid>
 
 ## What is this Wiki for?
diff --git a/src/content/docs/guides/javascript/creative-coding/paintbrush.mdx b/src/content/docs/javascript/creative-coding/paintbrush.mdx
similarity index 100%
rename from src/content/docs/guides/javascript/creative-coding/paintbrush.mdx
rename to src/content/docs/javascript/creative-coding/paintbrush.mdx
diff --git a/src/content/docs/guides/javascript/creative-coding/start-here.mdx b/src/content/docs/javascript/creative-coding/start-here.mdx
similarity index 100%
rename from src/content/docs/guides/javascript/creative-coding/start-here.mdx
rename to src/content/docs/javascript/creative-coding/start-here.mdx
diff --git a/src/content/docs/guides/javascript/index.mdx b/src/content/docs/javascript/index.mdx
similarity index 100%
rename from src/content/docs/guides/javascript/index.mdx
rename to src/content/docs/javascript/index.mdx
diff --git a/src/content/docs/ncea/index.md b/src/content/docs/ncea/index.md
deleted file mode 100644
index ee0d64f0..00000000
--- a/src/content/docs/ncea/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: About our Resources
-description: About the NCEA resources in this wiki.
-
-sidebar:
-  # Make this always the first
-  order: 1
----
-
-These are a collection of resources that can be used for courses that relate to NCEA.
diff --git a/src/content/docs/ncea/level-2/about.md b/src/content/docs/ncea/level-2/about.md
deleted file mode 100644
index 2d93b752..00000000
--- a/src/content/docs/ncea/level-2/about.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: About
-description: About the level 2 NCEA guides in this wiki.
-
-sidebar:
-  # Make this always the first
-  order: 1
----
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-2/flask/about.md b/src/content/docs/ncea/level-2/flask/about.md
deleted file mode 100644
index 41e68ea8..00000000
--- a/src/content/docs/ncea/level-2/flask/about.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: Overview
-description: A simple website built using flask
-sidebar:
-    order: 1
----
-
-This is a set of resources covering 3 internals that builds a working website. The core functionality is in Python with the frontend in HTML/CSS and a SQL database. A blog is used as the example throughout this resource as it covers all the criteria of knowledge for excellence with easy transferable skills to whatever you build. The covered internal are:
-
-- Programming [AS91896](https://www.nzqa.govt.nz/nqfdocs/ncea-resource/achievements/2019/as91896.pdf) (6 credits)
-- Database [AS91892](https://www.nzqa.govt.nz/nqfdocs/ncea-resource/achievements/2019/as91892.pdf) (4 credits)
-- Media (Web) [AS91893](https://www.nzqa.govt.nz/nqfdocs/ncea-resource/achievements/2019/as91893.pdf) (4 credits)
-
-## Knowledge Required
-
-Basic familiarity with Python, Flask, HTML/CSS and SQL will be needed to build this website with guides available for each of these topics:
-
-- [Flask](/guides/python/flask)
-- [Python](/guides/python/)
-- [HTML/CSS](/guides/web/)
-- [SQL](/guides/sql/)
-
-### What is used
-
-Different libraries and frameworks are used to allow the website to be used and their details can be found below:
-
-- [Flask](https://flask.palletsprojects.com/en/3.0.x/) - functionality
-- [Bootstrap](https://getbootstrap.com) - styling
-- [SQLite](https://www.sqlite.org/index.html) - database
-
-## What is Flask? What are we doing?
-
-Flask is a web framework that can be used in Python to build websites or other web applications. It is a very popular framework and is used by many large companies such as Pinterest, LinkedIn and Netflix. Flask is very easy to use and is a great way to learn how to build websites. It is used as a library in Python which means its a bundle of code you can use and customise in your own code.
-
-### Device Requirements
-
-If you are doing local development you will need a modern computer running either Linux, Windows 10/11 or MacOS (Chromebooks do not work).
-
-- [Python](https://python.org/downloads) v3.12+ (the latest version is always recommended as its faster and has better error messages).
-- [IDE](https://vscodium.com) any modern IDE can be used with VSCodium recommended.
-
-### Getting Setup
-
-To setup your python project you should follow the [guide](/guides/python/setting-up) and install these dependencies:
-
-- flask
-
-## Acknowledgements
-
-These resourced are inspired and build on the [Flask Tutorial](https://flask.palletsprojects.com/en/3.0.x/tutorial/).
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-2/flask/application-setup.mdx b/src/content/docs/ncea/level-2/flask/application-setup.mdx
deleted file mode 100644
index 6b3d6515..00000000
--- a/src/content/docs/ncea/level-2/flask/application-setup.mdx
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: Application Setup
-description: Setup the base of the application
-sidebar:
-    order: 3
----
-
-Flask apps can take many different forms but once they go beyond one or two pages it's a good idea to structure them properly. As we know the blog will be several different pages with different functionality it will be setup for this from the start. We also will want automated tests so we will add the base for that as well.
-
-```py
-// __init__.py
-"""Flask App Entry."""
-import contextlib
-import os
-
-from flask import Flask
-
-
-def create_app(test_config=None):
-    """Creation factory for Flask app."""
-    app = Flask(__name__, instance_relative_config=True)
-    app.config.from_mapping(
-        SECRET_KEY="dev",
-        DATABASE=os.path.join(app.instance_path, "flaskapp.sqlite"),
-    )
-
-    if test_config is None:
-        # load the instance config, if it exists, when not testing
-        app.config.from_pyfile("config.py", silent=True)
-    else:
-        # load the test config if passed in
-        app.config.from_mapping(test_config)
-
-    # ensure the instance folder exists
-    with contextlib.suppress(OSError):
-        os.makedirs(app.instance_path)
-
-    # a simple page that says hello
-    @app.route("/hello")
-    def hello():
-        return "Hello, World!"
-
-    return app
-```
-
-## What does this all mean?
-
-1. The `create_app` function is the application factory which means its a function that will create our application (similar to a factory).
-
-2. The `app = Flask(__name__, instance_relative_config=True)` creates the Flask instance with `__name__` being the current module name (`flaskapp`) and `instance_relative_config=True` tells Flask that configuration files are relative to the instance folder. The instance folder is located outside the flaskapp package and can hold local data that shouldn’t be committed to version control, such as configuration secrets and the database file. It also means we don't have to worry about where certain things are stored which makes testing a lot easier.
-
-3. `app.config.from_mapping` is used for the core config of our app, we have a secret key `DEV` and a database location. The secret key is used to keep the client-side sessions secure. The database location is where the database will be stored.
-
-:::note
-If this were ever going to be run in production or as a normal application the secret key should be very secure and not just `DEV`.
-:::
-
-4. As we know that automated tests are going to be used we add the ability for the tests to override some settings so that it can be tested properly and not break our app.
-
-5. `with contextlib.suppress(OSError):` is used to suppress the error if the instance folder already exists. This is because we don't want to overwrite anything that is already there.
-
-6. To make sure our application works we create a simple route that returns "Hello, World!" that can be accessed at `/hello`.
-
-
-## Running our Application
-
-```bash title="Shell"
-flask --app flaskapp run --debug
-```
-
-You’ll see output similar to this:
-
-```bash title="Output"
-* Serving Flask app "flaskapp"
-* Debug mode: on
-* Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
-* Restarting with stat
-* Debugger is active!
-* Debugger PIN: nnn-nnn-nnn
-```
-
-Visit [http://127.0.0.1:5000/hello](http://127.0.0.1:5000/hello) in a browser and you should see the “Hello, World!” message. Congratulations, you’re now running your Flask web application!
-
-
-If another program is already using port 5000, you’ll see `OSError: [Errno 98]` or `OSError: [WinError 10013]` when the server tries to start. See [Address already in use](https://flask.palletsprojects.com/en/3.0.x/server/#address-already-in-use) for how to handle that.
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-2/flask/blog-functionality.mdx b/src/content/docs/ncea/level-2/flask/blog-functionality.mdx
deleted file mode 100644
index 2f8fe07a..00000000
--- a/src/content/docs/ncea/level-2/flask/blog-functionality.mdx
+++ /dev/null
@@ -1,199 +0,0 @@
----
-title: Blog Functionality
-description: Core functionality for the blog
-sidebar:
-    order: 7
----
-
-To make life easier all blog related routes will sit inside their own file (blueprint) and then be registered with the app. This makes it easier to seperate code by functionality rather than having one large file with all routes.
-
-### Create a Blueprint
-
-Creating a blueprint is as simple as creating a new file and adding the following code.
-
-```python
-// flaskapp/blog.py
-"""Blog routes."""
-from flask import Blueprint, redirect, render_template, request, url_for
-from werkzeug.exceptions import abort
-
-from flaskapp.db import get_db
-
-bp = Blueprint("blog", __name__)
-```
-
-With our blueprint created we can now register it with the app. The `index` route in our blueprint is also going to be the main page of our website so we will set a url rule to link it to `/`.
-
-```diff lang=python
-// flaskapp/__init__.py
-def create_app():
-    app = ...
-    # existing code omitted
-
-+    from . import blog
-+
-+    app.register_blueprint(blog.bp)
-+    app.add_url_rule('/', endpoint='index')
-
-    return app
-```
-
-## Routes
-
-For our blog multiple different routes are needed, each serving one of the already created templates. The routes will also need to interact with the database to get the required data to then fill the template.
-
-### Index route
-
-Our main page needs to show a preview of all posts and the amount of comments on each post.
-
-```python
-@bp.route("/")
-def index():
-    """Main view page."""
-    db = get_db()
-    posts = db.execute(
-        "SELECT post.id, post.title, SUBSTR(post.body, 1, 400) AS body, post.created, "
-        "count(comment.id) AS comment_amount FROM post LEFT JOIN comment ON "
-        "comment.post_id=post.id group by post.id ORDER BY post.created DESC",
-    ).fetchall()
-    return render_template("blog/index.html", posts=posts)
-```
-
-1. To only show a preview of the post we use the `SUBSTR` function to only get the first 400 characters of the post body.
-
-2. To get the amount of comments on each post we use a `LEFT JOIN` to join the `comment` table to the `post` table. This will return all posts even if they have no comments. We then use the `count` function to count the amount of comments on each post. the `LEFT JOIN` command adds the contents of the `comment` table into our query.
-
-3. So that all posts are in the correct order we use the `ORDER BY` command to order the posts by their creation date.
-
-### Display post
-
-With our index page displaying a preview of all posts we now need to create a page to display the full post and all comments on that post. To keep things organised we will seperate the code to get the post and the code to get the comments into seperate functions. This page will also handle adding comments to the post.
-
-```python
-def get_post(id):
-    """Get a blog post.
-
-    Args:
-        id (int): the id of the post to get.
-
-    Returns:
-        the post if found otherwise redirects the user to a 404.
-    """
-    post = (
-        get_db()
-        .execute(
-            "SELECT id, title, body, created FROM post WHERE id = ?",
-            (id,),
-        )
-        .fetchone()
-    )
-
-    if post is None:
-        abort(404, f"Post id {id} doesn't exist.")
-
-    return post
-
-
-def get_comments(id):
-    """Gets all comments on a post.
-
-    Args:
-        id (int): the id of the post to get.
-
-    Returns:
-        A list of all comments if found.
-    """
-    post = (
-        get_db()
-        .execute(
-            "SELECT id, body, created FROM comment WHERE post_id = ?",
-            (id,),
-        )
-        .fetchall()
-    )
-
-    return post
-
-
-@bp.route("/<int:id>/post", methods=("GET", "POST"))
-def post(id):
-    """Post page with comments and the ability to add comments."""
-    error = None
-    if request.method == "POST":
-        body = request.form["body"]
-
-        if len(body) < 10:
-            error = "Comment is too short"
-
-        if error is None:
-            db = get_db()
-            db.execute(
-                "INSERT INTO comment (body, post_id) VALUES (?, ?)",
-                (
-                    body,
-                    id,
-                ),
-            )
-            db.commit()
-            return redirect(f"/{id}/post")
-    post = get_post(id)
-    comments = get_comments(id)
-    return render_template(
-        "blog/post.html",
-        post=post,
-        comments=comments,
-        error=error,
-    )
-```
-
-1. The route of `/<int:id>/post` means that the route will be `/1/post` for example. The `int` part of the route means that the id will be converted to an integer before being passed to the function.
-
-2. As this page has both `GET` and `POST` methods we need to check which method is being used. If the method is `POST` then we know that the user is trying to add a comment to the post. We then get the comment from the form and check that it is at least 10 characters long. If the comment is valid we then add it to the database and redirect the user back to the post page.
-
-### Creating posts
-
-Similar to creating comments creating posts functions the same way, when you initially load the page it will be a `GET` request and when you submit the form it will be a `POST` request. Validation is done to make sure that the title is not empty.
-
-```python
-@bp.route("/create", methods=("GET", "POST"))
-def create():
-    """Create post page."""
-    error = None
-    if request.method == "POST":
-        title = request.form["title"]
-        body = request.form["body"]
-
-        if not title:
-            error = "Title is required."
-
-        if error is None:
-            db = get_db()
-            db.execute(
-                "INSERT INTO post (title, body) VALUES (?, ?)",
-                (title, body),
-            )
-            db.commit()
-            return redirect(url_for("blog.index"))
-
-    return render_template("blog/create.html", error=error)
-```
-
-### Searching posts
-
-Searching posts is done by using the `LIKE` command in SQL. This command allows you to search for a string within a string. The `%` character is used as a wildcard so that the search will return any post that contains the search query. Any results are then passed to the template to be displayed.
-
-```python
-@bp.route("/search")
-def search():
-    """Search page."""
-    query = request.args.get("query")
-    db = get_db()
-    results = db.execute(
-        (
-            "SELECT id, title, SUBSTR(body, 1, 400) AS body, created FROM post "
-            "WHERE title LIKE ? OR body LIKE ?"
-        ),
-        (f"%{query}%", f"%{query}%"),
-    ).fetchall()
-    return render_template("blog/search.html", posts=results, query=query)
-```
diff --git a/src/content/docs/ncea/level-2/flask/database.mdx b/src/content/docs/ncea/level-2/flask/database.mdx
deleted file mode 100644
index 9802a7e4..00000000
--- a/src/content/docs/ncea/level-2/flask/database.mdx
+++ /dev/null
@@ -1,182 +0,0 @@
----
-title: Database
-description: Build and create the Database
-sidebar:
-    order: 4
----
-
-At the core of our application is our database which stores all the data (posts and comments) and allows us to retrieve it later and update it. We will be using SQLite as our database engine as Python has built-in support through [sqlite3](https://docs.python.org/3/library/sqlite3.html#module-sqlite3).
-
-## Creating our Database
-
-Creation and management of our database will be done in SQL which allows us to easily recreate and change our database whenever we want. The [SQL tutorial](/guides/sql/) can offer a good deep dive into the syntax.
-
-### What do we need?
-
-With our simple blog we will need two tables, one for posts and one for comments. Our posts table will be able to store the title and body of the post as well as the date it was created. Our comments table will store the body of the comment, the date it was created and the post it belongs to.
-
-### Posts Table
-
-Our posts table needs to include the post id, the date it was created, the title and the body of the post. The id will be the primary key and will be auto incremented. The created date will be set to the current time when the post is created. The title and body will be text fields that cannot be null.
-
-
-| id | created             | title  | body         |
-|----|---------------------|--------|--------------|
-| 1  | 2024-01-02 01:59:47 | Post 1 | great post   |
-| 2  | 2024-01-02 01:59:47 | Post 2 | amazing post |
-| 3  | 2024-01-02 01:59:47 | Post 3 | awesome post |
-
-
-To create our table we can use the following SQL:
-
-```sql
-CREATE TABLE post (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    title TEXT NOT NULL,
-    body TEXT NOT NULL
-);
-```
-
-### Comments Table
-
-The comments table will be similar to the posts table but will also include the post id that it belongs to. The id will be the primary key and will be auto incremented. The created date will be set to the current time when the comment is created. The body will be a text field that cannot be null. The post id will be an integer that cannot be null and will be a foreign key to the post table.
-
-
-| id | created             | body            | post_id |
-|----|---------------------|-----------------|---------|
-| 1  | 2024-01-02 01:59:47 | great comment   | 1       |
-| 2  | 2024-01-02 01:59:47 | amazing comment | 1       |
-| 3  | 2024-01-02 01:59:47 | awesome comment | 2       |
-
-
-To create our table we can use the following SQL:
-
-```sql
-CREATE TABLE comment (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    body TEXT NOT NULL,
-    post_id INTEGER NOT NULL,
-    FOREIGN KEY (post_id) REFERENCES post (id)
-);
-```
-
-### Creation Script
-
-As we know how to create our tables we can combine that into a creation script that can be run whenever we want a new database. This script will empty the current database and then recreate the new database. When changes are made to the database we can just update the script and run it which will recreate the database.
-
-```sql
-// flaskapp/schema.sql
-DROP TABLE IF EXISTS post;
-CREATE TABLE post (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    title TEXT NOT NULL,
-    body TEXT NOT NULL
-);
-DROP TABLE IF EXISTS comments;
-CREATE TABLE comment (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    body TEXT NOT NULL,
-    post_id INTEGER NOT NULL,
-    FOREIGN KEY (post_id) REFERENCES post (id)
-);
-```
-
-## Core DB functionality
-
-To make sure we can connect to our database and close it when we are done we will create a `db.py` file that will contain all the core functionality. This allows us to re-use all the code across our entire app.
-
-```python
-// flaskapp/db.py
-"""DB functionality."""
-import sqlite3
-
-import click
-from flask import current_app, g
-
-
-def get_db():
-    """Shared db object."""
-    if "db" not in g:
-        g.db = sqlite3.connect(
-            current_app.config["DATABASE"],
-            detect_types=sqlite3.PARSE_DECLTYPES,
-        )
-        g.db.row_factory = sqlite3.Row
-
-    return g.db
-
-
-def close_db(e=None):
-    """Close the db."""
-    db = g.pop("db", None)
-
-    if db is not None:
-        db.close()
-```
-
-1. One of the things that makes Flask nice is the `g` object. This is a global object that is unique for each request. We can use this to store our database connection so that we can re-use it across our entire app without importing anything.
-
-2. We also need to close the database connection when we are done with it so that we don't run out of connections.
-
-
-### Initialize the database
-
-With our script we need a way to be able to initialise our database on command. We can use [`click`](https://click.palletsprojects.com) which is included as part of flask to give us a command to initialise the database. This will allow us to run `flask init-db` to create the database.
-
-```python
-// flaskapp/db.py
-def init_db():
-    """Create and fill the db."""
-    db = get_db()
-
-    with current_app.open_resource("schema.sql") as f:
-        db.executescript(f.read().decode("utf8"))
-
-
-@click.command("init-db")
-def init_db_command():
-    """Clear the existing data and create new tables."""
-    init_db()
-    click.echo("Initialized the database.")
-```
-
-### Integrating into our app
-
-As we now have the ability to manage our db we need to integrate it into our app with adding the teardown and cli commands.
-
-```python
-// flaskapp/db.py
-def init_app(app):
-    """Add teardown and cli on app creation."""
-    app.teardown_appcontext(close_db)
-    app.cli.add_command(init_db_command)
-```
-
-Once we have this we can then import our db into our app and call the `init_app` function inside our `create_app` factory. This code should be at the end of the function to allow the application to be created first.
-
-```diff lang="python"
-// flaskapp/__init__.py
-def create_app():
-    app = ...
-    # existing code omitted
-
-+    from . import db
-+    db.init_app(app)
-
-    return app
-```
-
-## Initialising the Database
-
-As we have now integrated our database into our app we can now initialise it. To do this we can run the following command:
-
-```bash
-$ flask --app flaskapp init-db
-Initialized the database.
-```
-
-You should now be able to see a `flaskapp.sqlite` file in the `instance` folder in your project which is your newly created database.
diff --git a/src/content/docs/ncea/level-2/flask/extension.mdx b/src/content/docs/ncea/level-2/flask/extension.mdx
deleted file mode 100644
index 35745f29..00000000
--- a/src/content/docs/ncea/level-2/flask/extension.mdx
+++ /dev/null
@@ -1,32 +0,0 @@
----
-title: Extension
-description: Areas to extend or enhance
-sidebar:
-    order: 9
----
-
-While this is a simple blog, there are a few areas that could be extended or enhanced to make it more useful.
-
-1. Adding Auth to control logging in and updating posts
-2. Extending search to include comments
-3. Nested comments
-4. Images in posts
-5. Categories for posts
-6. Pagination for posts/search
-
-You should also explore the resources for the tools used to build this blog.
-
-- [Flask](https://flask.palletsprojects.com/en/3.0.x/)
-- [Jinja](https://jinja.palletsprojects.com/en/3.1.x/)
-- [Click](https://click.palletsprojects.com/en/8.1.x/)
-- [Bootstrap](https://getbootstrap.com)
-- [SQLite](https://www.sqlite.org/index.html)
-
-## Other approaches
-
-There are many other approaches to building a blog with different tools and technologies that you can explore.
-
-- [FastAPI](https://fastapi.tiangolo.com) and [React](https://react.dev)
-- [SvelteKit](https://kit.svelte.dev)
-- [Nuxt](https://nuxt.com) or [NextJS](https://nextjs.org)
-- [Go](https://go.dev)
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-2/flask/project-layout.mdx b/src/content/docs/ncea/level-2/flask/project-layout.mdx
deleted file mode 100644
index 2bc48d0b..00000000
--- a/src/content/docs/ncea/level-2/flask/project-layout.mdx
+++ /dev/null
@@ -1,62 +0,0 @@
----
-title: Project Layout
-description: A simple website built using flask
-sidebar:
-    order: 2
----
-
-This follows the basic structure that most Flask projects follow. It can work with different layouts (eg. one file) but this is not recommended. Follow [Python Setup](/guides/python/setting-up) guide to get your project ready with everything installed. You will also need to install flask follow the dependency instructions.
-
-## Project Structure
-
-A basic flask project could be a simple file with everything in one place:
-
-```py
-// main.py
-from flask import Flask
-
-app = Flask(__name__)
-
-@app.route('/')
-def hello():
-    return 'Hello, World!'
-```
-
-Using a single file doesn't scale to larger websites and becomes confusing and difficult to navigate. For this reason projects are split into multiple files to organise the code by function. We will have a main app folder called `flaskapp` which will contain our app, database and our html pages, we will also have a folder to house our automated tests.
-
-
-import { FileTree } from '@astrojs/starlight/components';
-
-<FileTree>
-
-- flaskapp/
-  - static/
-    - style.css
-  - templates/
-    - blog/
-      - create.html
-      - index.html
-      - post.html
-      - search.html
-    - components/
-      - comment.html
-      - footer.html
-      - navbar.hyml
-      - post.html
-    - base.html
-  - `__init__.py`
-  - blog.py
-  - db.py
-  - schema.sql
-- tests/
-  - `__init__.py`
-  - conftest.py
-  - data.sql
-  - test_blog.py
-  - test_factory.py
-  - test_db.py
-
-</FileTree>
-
-:::note
-This can look intimidating with the number of files at first and they don't need to all exist to start. As you build the project you will add more files and folders as you need them and eventually reach this state.
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-2/flask/static-files.mdx b/src/content/docs/ncea/level-2/flask/static-files.mdx
deleted file mode 100644
index 2b042ac1..00000000
--- a/src/content/docs/ncea/level-2/flask/static-files.mdx
+++ /dev/null
@@ -1,70 +0,0 @@
----
-title: Static Files
-description: Static files
-sidebar:
-    order: 6
----
-
-Our pages have already been styled using Bootstrap however to make greater modifications we will need to add our own CSS. This can also be extended into serving images or JavaScript using the same method.
-
-By default Flask will treat any files in the `static/` directory as static files which allows us to serve them directly. We can create a `static/` directory in our project root and add a `style.css` file to it.
-
-```css
-// flaskapp/static/style.css
-.blog-header-logo {
-  font-family: Georgia, "Times New Roman", serif;
-  font-size: 2.25rem;
-}
-
-.blog-header-logo:hover {
-  text-decoration: none;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-family: Georgia, "Times New Roman", serif;
-}
-
-.flex-auto {
-  flex: 0 0 auto;
-}
-
-.h-250 {
-  height: 250px;
-}
-
-@media (min-width: 768px) {
-  .h-md-250 {
-    height: 250px;
-  }
-}
-
-/* Pagination */
-.blog-pagination {
-  margin-bottom: 4rem;
-}
-
-/*
- * Blog posts
- */
-.blog-post {
-  margin-bottom: 4rem;
-}
-
-.blog-post-meta {
-  margin-bottom: 1.25rem;
-  color: #727272;
-}
-
-.comment-created {
-  font-size: 0.75rem;
-  color: #828282;
-  margin-bottom: 0rem;
-}
-```
-
-With our reference of `url_for("static", filename="style.css")` in our `base.html` it will now autmatically load this CSS across our site.
diff --git a/src/content/docs/ncea/level-2/flask/templates.mdx b/src/content/docs/ncea/level-2/flask/templates.mdx
deleted file mode 100644
index 23672deb..00000000
--- a/src/content/docs/ncea/level-2/flask/templates.mdx
+++ /dev/null
@@ -1,286 +0,0 @@
----
-title: Templates
-description: Jinja templates
-sidebar:
-    order: 5
----
-
-At the base of our application is the HTML pages that are visible to our users. These pages are created using [Jinja](https://jinja.palletsprojects.com/en/2.11.x/) templates. Jinja is a templating language that allows us to create dynamic HTML pages. This means that we can create pages that change based on the data that we pass to them. The overall style is inspired from the [Bootstrap Blog Example](https://getbootstrap.com/docs/5.0/examples/blog/#) and heavily modified.
-
-## Base template
-
-The base template is the template that all other templates extend. It contains the basic HTML structure of our pages. It also contains the CSS and JavaScript that is used on all pages. To make styling easier we use [Bootstrap](https://getbootstrap.com/). Bootstrap is a CSS framework that provides us with a set of CSS classes that we can use to style our pages and is what all the class tags are.
-
-```html
-// flaskapp/templates/base.html
-<!doctype html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{% block title %}{% endblock %}</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
-        integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-    <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
-</head>
-
-<body>
-    <main class="container">
-        {% block content %}{% endblock %}
-    </main>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
-        integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
-        crossorigin="anonymous"></script>
-</body>
-
-</html>
-```
-
-1. This page contains a few things that are important to note. The first is the `{% block title %}{% endblock %}`. This is a block that we can use to set the title of the page. We can set the title of the page by adding a block to our template that extends the base template.
-
-```html
-{% extends "base.html" %}
-
-{% block title %}Home{% endblock %}
-
-{% block content %}
-```
-
-2. The second thing to note is the `{% block content %}{% endblock %}`. This is a block that we can use to set the content of the page. We can set the content of the page by adding a block to our template that extends the base template.
-
-```html
-{% extends "base.html" %}
-
-{% block title %}Home{% endblock %}
-
-{% block content %}
-    <h1>Home</h1>
-{% endblock %}
-```
-
-3. Bootstrap is added in through a CDN. This means that we don't have to download the files and add them to our project. We can just add a link to the files that are hosted on a server somewhere else. This is a great way to add libraries to our project without having to download them. It also means that we don't have to worry about updating the libraries when new versions are released.
-
-4. The last thing to note is the `{{ url_for('static', filename='style.css') }}`. This allows us to provide our own CSS files. We can add our own CSS files to the `static` folder and then link to them in our templates. This allows us to override the Bootstrap styles and add our own styles to our pages.
-
-### Navbar
-
-At the top of our site we need a way to navigate between pages. We can do this by adding a navbar to our base template. The navbar will contain links to the home page, the create page and the search page.
-
-```html
-// flaskapp/templates/components/navbar.html
-<header class="border-bottom lh-1 py-3">
-    <div class="container">
-        <div class="row flex-nowrap justify-content-between align-items-center">
-            <div class="col-4 pt-1"> </div>
-            <div class="col-4 text-center">
-                <a class="blog-header-logo text-body-emphasis text-decoration-none" href="/">Our Blog</a>
-            </div>
-            <div class="col-4 d-flex justify-content-end align-items-center">
-                <a class="link-secondary" href="/create" aria-label="Create">
-                    Create Post
-                </a>
-                <a class="link-secondary" href="/search" aria-label="Search">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" stroke="currentColor"
-                        stroke-linecap="round" stroke-linejoin="round" stroke-width="2" class="mx-3" role="img"
-                        viewBox="0 0 24 24">
-                        <title>Search</title>
-                        <circle cx="10.5" cy="10.5" r="7.5" />
-                        <path d="M21 21l-5.2-5.2" />
-                    </svg>
-                </a>
-            </div>
-        </div>
-    </div>
-</header>
-```
-
-As we want this included on every page we can add it to our base template.
-
-```diff lang=html
-// flaskapp/template/base.html
-<body>
-+    {% include 'components/navbar.html' %}
-    <main class="container">
-```
-
-:::tip
-As you build a site it may be easy to put everything into the same `base.html` template to make it easy to reuse. However, this can lead to a lot of duplication and can make it hard to maintain your code. It is better to break your templates up into smaller components that you can reuse. This will make it easier to maintain your code and will make it easier to add new features to your site.
-:::
-
-### Footer
-
-At the bottom of our site we need a way to navigate back to the top of the page. We can do this by adding a footer to our base template. The footer will contain a link to the top of the page and a link to the Tūhura Tech website.
-
-```html
-// flaskapp/templates/components/footer.html
-<footer class="py-5 text-center text-body-secondary bg-body-tertiary footer mt-auto">
-    <div class="container">
-        <p>Built by <a href="https://tuhuratech.org.nz">Tūhura Tech</a>.</p>
-        <p class="mb-0">
-            <a href="#">Back to top</a>
-        </p>
-    </div>
-</footer>
-```
-
-As we want this included on every page we can add it to our base template.
-
-```diff lang=html
-// flaskapp/template/base.html
-    </main>
-
-+    {% include 'components/footer.html' %}
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
-```
-
-## Home page
-
-Our Home page that will first be seen by our users will contain a preview of all of the posts that have been created. We can create a template for this page that extends the base template and use a post template to display each post.
-
-```html
-// flaskapp/templates/blog/index.html
-{% extends 'base.html' %}
-
-{% block header %}
-<h1>{% block title %}Posts{% endblock %}</h1>
-{% endblock %}
-
-{% block content %}
-
-<div class="row g-5">
-    <div>
-        {% for post in posts %}
-        {% include 'components/post.html' %}
-        {% endfor %}
-    </div>
-</div>
-{% endblock %}
-```
-
-### Post Component
-
-As we will want to show the same preview on different pages, eg. the home page and the search page, we can create a component that we can reuse on different pages.
-
-```html
-// flaskapp/templates/components/post.html
-<article class="blog-post">
-    <h2 class="display-5 link-body-emphasis mb-1"><a href='{{ post["id"] }}/post'
-            style="text-decoration: inherit; color: inherit;">{{ post["title"] }}</a></h2>
-    <p class="blog-post-meta">{{ post["created"] }} - {{ post["comment_amount"] }} comments</p>
-    <p>{{ post["body"] }}...</p>
-    <p class=""><a href='{{ post["id"] }}/post' class="text-body-emphasis fw-bold">Continue reading...</a></p>
-</article>
-```
-
-## Post page
-
-As our home page only displays a preview of each post we need a way for our users to view the full post. We can do this by creating a post page that will display the full post. We will also include a form that will allow our users to add comments to the post.
-
-```html
-// flaskapp/templates/blog/post.html
-{% extends 'base.html' %}
-
-{% block header %}
-<h1>{% block title %}{{ post["title"] }}{% endblock %}</h1>
-{% endblock %}
-
-{% block content %}
-<section class="post">
-    <h2 class="display-5 link-body-emphasis mb-1">{{ post["title"] }}</h2>
-    <p class="blog-post-meta">{{ post["created"] }}</p>
-    <p>{{ post["body"] }}</p>
-</section>
-<hr>
-{% if error %}
-<p class=error><strong>Error:</strong> {{ error }}</p>
-{% endif %}
-<form method="post">
-    <div class="input-group mb-3">
-        <textarea class="form-control" aria-label="With textarea" name="body"></textarea>
-        <button type="submit" class="btn">Submit</button>
-    </div>
-</form>
-
-<section class="comments">
-    <div class="row">
-        {% for comment in comments %}
-        {% include 'components/comment.html' %}
-        {% endfor %}
-    </div>
-</section>
-{% endblock %}
-```
-
-### Comment Component
-
-As all comments should follow the same structure we can create a component that we can reuse on different pages for displaying comments.
-
-```html
-// flaskapp/templates/components/comment.html
-<article class="comment">
-    <p class="comment-created">{{ comment["created"] }}</p>
-    <p>{{ comment["body"] }}...</p>
-</article>
-```
-
-## Create Page
-
-To allow our users to create new posts we need to create a page that allows them to do this. This page will mostly be a form that can send data to our server to create a new post.
-
-```html
-// flaskapp/templates/blog/create.html
-{% extends 'base.html' %}
-
-{% block header %}
-<h1>{% block title %}New Post{% endblock %}</h1>
-{% endblock %}
-
-{% block content %}
-{% if error %}
-<p class=error><strong>Error:</strong> {{ error }}</p>
-{% endif %}
-<form method="post">
-  <label for="title">Title</label>
-  <input name="title" id="title" value="{{ request.form['title'] }}" required>
-  <label for="body">Body</label>
-  <textarea name="body" id="body">{{ request.form['body'] }}</textarea>
-  <input type="submit" value="Save">
-</form>
-{% endblock %}
-```
-
-## Search Page
-
-The search page functions as a simple form with a search input. When the user submits the form the page will have all the results loaded beneath the form.
-
-```html
-// flaskapp/templates/blog/search.html
-{% extends 'base.html' %}
-
-{% block header %}
-<h1>{% block title %}Search{% endblock %}</h1>
-{% endblock %}
-
-{% block content %}
-<div class="container">
-    <div class="row g-5 m-auto">
-        <form>
-            <div class="input-group mb-3">
-                <input name="query" id="query" placeholder="{{ query }}" class="form-control" required>
-                <button type="submit" class="btn">Search</button>
-            </div>
-        </form>
-    </div>
-    <div class="row g-5">
-        <div class="">
-            {% for post in posts %}
-            {% include 'components/post.html' %}
-            {% endfor %}
-        </div>
-    </div>
-</div>
-{% endblock %}
-```
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-2/flask/testing.mdx b/src/content/docs/ncea/level-2/flask/testing.mdx
deleted file mode 100644
index 5b6854f1..00000000
--- a/src/content/docs/ncea/level-2/flask/testing.mdx
+++ /dev/null
@@ -1,346 +0,0 @@
----
-title: Testing
-description: A simple website built using flask
-sidebar:
-    order: 8
----
-
-Whenever things are built it is important to test them. Testing can be done manually, but this is time consuming and prone to human error. It is better to automate your testing. This will allow you to test your code more frequently and ensure that it is working as expected. For this application unit tests will be used to make sure that all routes function as intended.
-
-:::note
-These tests should ideally be created as you write your code. This will help you to identify bugs early on and ensure that your code is working as expected.
-:::
-
-With our tests we can track the coverage to see if every line of code is tested and if there are any lines that are not tested. 100% coverage can be challenging to achieve as applications grow in complexity, but it is a good goal to aim for.
-
-:::tip
-No type of testing can guarantee that your code is bug free. It is important to test your code in a variety of ways to ensure that it is working as expected such as unit testing, integration testing, and end-to-end testing.
-:::
-
-## Unit tests
-
-In Python the [pytest](https://pytest.org) framework is commonly used for unit testing. This framework allows you to write tests as functions and run them from the command line. To run the tests you can use the `pytest` command. This will run all tests in the current directory and subdirectories. You can also specify a specific file or directory to run tests from. The [Pytest docs](https://docs.pytest.org/en/7.4.x/index.html) contain a good getting started guide.
-
-### Setup
-
-As our tests should run seperate from whatever is happening with our application they will need their own data which means that the tests can always be run.
-
-```sql
-// tests/data.sql
-INSERT INTO post (id, title, body)
-VALUES (
-        1,
-        'POST 1',
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Aliquam faucibus purus in massa tempor nec feugiat nisl. Diam quis enim lobortis scelerisque fermentum dui. Maecenas sed enim ut sem viverra. Urna condimentum mattis pellentesque id nibh tortor id aliquet. Dignissim sodales ut eu sem integer vitae justo eget magna. Nisi est sit amet facilisis. Aenean euismod elementum nisi quis eleifend. Urna condimentum mattis pellentesque id nibh tortor id aliquet lectus. Urna porttitor rhoncus dolor purus non enim praesent elementum facilisis. Convallis tellus id interdum velit laoreet id donec ultrices. Sed enim ut sem viverra aliquet eget. Mattis enim ut tellus elementum sagittis vitae et leo. In metus vulputate eu scelerisque felis imperdiet. Amet facilisis magna etiam tempor orci.'
-    ),
-    (
-        2,
-        'POST 2',
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Aliquam faucibus purus in massa tempor nec feugiat nisl. Diam quis enim lobortis scelerisque fermentum dui. Maecenas sed enim ut sem viverra. Urna condimentum mattis pellentesque id nibh tortor id aliquet. Dignissim sodales ut eu sem integer vitae justo eget magna. Nisi est sit amet facilisis. Aenean euismod elementum nisi quis eleifend. Urna condimentum mattis pellentesque id nibh tortor id aliquet lectus. Urna porttitor rhoncus dolor purus non enim praesent elementum facilisis. Convallis tellus id interdum velit laoreet id donec ultrices. Sed enim ut sem viverra aliquet eget. Mattis enim ut tellus elementum sagittis vitae et leo. In metus vulputate eu scelerisque felis imperdiet. Amet facilisis magna etiam tempor orci.'
-    ),
-    (
-        3,
-        'POST 3',
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Aliquam faucibus purus in massa tempor nec feugiat nisl. Diam quis enim lobortis scelerisque fermentum dui. Maecenas sed enim ut sem viverra. Urna condimentum mattis pellentesque id nibh tortor id aliquet. Dignissim sodales ut eu sem integer vitae justo eget magna. Nisi est sit amet facilisis. Aenean euismod elementum nisi quis eleifend. Urna condimentum mattis pellentesque id nibh tortor id aliquet lectus. Urna porttitor rhoncus dolor purus non enim praesent elementum facilisis. Convallis tellus id interdum velit laoreet id donec ultrices. Sed enim ut sem viverra aliquet eget. Mattis enim ut tellus elementum sagittis vitae et leo. In metus vulputate eu scelerisque felis imperdiet. Amet facilisis magna etiam tempor orci.'
-    ),
-    (
-        4,
-        'POST 4',
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Aliquam faucibus purus in massa tempor nec feugiat nisl. Diam quis enim lobortis scelerisque fermentum dui. Maecenas sed enim ut sem viverra. Urna condimentum mattis pellentesque id nibh tortor id aliquet. Dignissim sodales ut eu sem integer vitae justo eget magna. Nisi est sit amet facilisis. Aenean euismod elementum nisi quis eleifend. Urna condimentum mattis pellentesque id nibh tortor id aliquet lectus. Urna porttitor rhoncus dolor purus non enim praesent elementum facilisis. Convallis tellus id interdum velit laoreet id donec ultrices. Sed enim ut sem viverra aliquet eget. Mattis enim ut tellus elementum sagittis vitae et leo. In metus vulputate eu scelerisque felis imperdiet. Amet facilisis magna etiam tempor orci.'
-    ),
-    (
-        5,
-        'POST 5',
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Aliquam faucibus purus in massa tempor nec feugiat nisl. Diam quis enim lobortis scelerisque fermentum dui. Maecenas sed enim ut sem viverra. Urna condimentum mattis pellentesque id nibh tortor id aliquet. Dignissim sodales ut eu sem integer vitae justo eget magna. Nisi est sit amet facilisis. Aenean euismod elementum nisi quis eleifend. Urna condimentum mattis pellentesque id nibh tortor id aliquet lectus. Urna porttitor rhoncus dolor purus non enim praesent elementum facilisis. Convallis tellus id interdum velit laoreet id donec ultrices. Sed enim ut sem viverra aliquet eget. Mattis enim ut tellus elementum sagittis vitae et leo. In metus vulputate eu scelerisque felis imperdiet. Amet facilisis magna etiam tempor orci.'
-    );
-INSERT INTO comment (body, post_id)
-VALUES ('comment 1', 1),
-    ('comment 2', 1),
-    ('comment 3', 1),
-    ('comment 4', 1);
-```
-
-With our data we can create the core config for our tests which will create the temporary database for testing and also share the application to all of the tests to use.
-
-```python
-//tests/conftest.py
-"""Config and setup for tests."""
-import os
-import tempfile
-
-import pytest
-from flaskapp import create_app
-from flaskapp.db import get_db, init_db
-
-with open(os.path.join(os.path.dirname(__file__), "data.sql"), "rb") as f:
-    _data_sql = f.read().decode("utf8")
-
-
-@pytest.fixture()
-def app():
-    """App initialisation."""
-    db_fd, db_path = tempfile.mkstemp()
-
-    app = create_app(
-        {
-            "TESTING": True,
-            "DATABASE": db_path,
-        },
-    )
-
-    with app.app_context():
-        init_db()
-        get_db().executescript(_data_sql)
-
-    yield app
-
-    os.close(db_fd)
-    os.unlink(db_path)
-
-
-@pytest.fixture()
-def client(app):
-    """App test client."""
-    return app.test_client()
-
-
-@pytest.fixture()
-def runner(app):
-    """App cli runner."""
-    return app.test_cli_runner()
-```
-
-1. `@pytest.fixture` can be used in any other test function by including it in a parameter, eg. `def test_hello(client):` will use the `client` fixture. This allows us to create predefined configs that can be reused (fixtures can also use each other).
-
-2. The `app` fixture creates a temporary database and initialises it with the data from `data.sql`. This is done by creating a temporary file and passing the path to the database to the application. The `TESTING` config is also set to `True` to ensure that the application is in testing mode.
-
-We also should test the factory to make sure our app is being created the correct way.
-
-```python
-// tests/test_factory.py
-"""Factory test methods."""
-from flaskapp import create_app
-
-
-def test_config():
-    """Test app is in test config mode."""
-    assert not create_app().testing
-    assert create_app({"TESTING": True}).testing
-
-
-def test_hello(client):
-    """Test hello default route."""
-    response = client.get("/hello")
-    assert response.data == b"Hello, World!"
-```
-
-### Testing the database
-
-Our database should close once the context it is in is closed through the teardown context that was created earlier.
-
-```python
-// tests/test_db.py
-"""Test db functions."""
-import sqlite3
-
-import pytest
-from flaskapp.db import get_db
-
-
-def test_get_close_db(app):
-    """Test db can be closed."""
-    with app.app_context():
-        db = get_db()
-        assert db is get_db()
-
-    with pytest.raises(sqlite3.ProgrammingError) as e:
-        db.execute("SELECT 1")
-
-    assert "closed" in str(e.value)
-```
-
-The create command should also be tested to ensure that it is creating the database correctly. To make sure that the function is being run the function is monkeypatched (modified) to record if it is run. 
-
-
-```python
-def test_init_db_command(runner, monkeypatch):
-    """Test db init command runs."""
-
-    class Recorder:
-        called = False
-
-    def fake_init_db():
-        Recorder.called = True
-
-    monkeypatch.setattr("flaskapp.db.init_db", fake_init_db)
-    result = runner.invoke(args=["init-db"])
-    assert "Initialized" in result.output
-    assert Recorder.called
-```
-
-### Testing the blog
-
-All the blog routes involve reading from the database so we can test that the correct data is being returned and if data is being correctly added. As we know the contents of the database the tests can be hardcoded for the expected behaviour.
-
-```python
-// tests/test_blog.py
-"""Test blog routes."""
-from flaskapp.db import get_db
-
-
-def test_index(client):
-    """Test index page."""
-    response = client.get("/")
-    assert b"Our Blog" in response.data
-
-    assert b"POST 1" in response.data
-    assert b"Continue reading..." in response.data\
-
-def test_post(client):
-    """Test post page."""
-    response = client.get("/1/post")
-
-    assert b"POST 1" in response.data
-    assert (
-        b"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-        b"tempor incididunt ut labore et dolore magna aliqua. Aliquam faucibus purus "
-        b"in massa tempor nec feugiat nisl. Diam quis enim lobortis scelerisque "
-        b"fermentum dui. Maecenas sed enim ut sem viverra. Urna condimentum mattis "
-        b"pellentesque id nibh tortor id aliquet. Dignissim sodales ut eu sem integer "
-        b"vitae justo eget magna. Nisi est sit amet facilisis. Aenean euismod "
-        b"elementum nisi quis eleifend. Urna condimentum mattis pellentesque id nibh "
-        b"tortor id aliquet lectus. Urna porttitor rhoncus dolor purus non enim "
-        b"praesent elementum facilisis. Convallis tellus id interdum velit laoreet id "
-        b"donec ultrices. Sed enim ut sem viverra aliquet eget. Mattis enim ut tellus "
-        b"elementum sagittis vitae et leo. In metus vulputate eu scelerisque felis "
-        b"imperdiet. Amet facilisis magna etiam tempor orci." in response.data
-    )
-
-
-def test_invalid_post(client):
-    """Test invalid route for a post."""
-    assert client.get("/6/post").status_code == 404
-
-
-def test_create(client, app):
-    """Test creating a post."""
-    assert client.get("/create").status_code == 200
-    client.post("/create", data={"title": "created", "body": "testing"})
-
-    with app.app_context():
-        db = get_db()
-        count = db.execute("SELECT COUNT(id) FROM post").fetchone()[0]
-        assert count == 6
-
-        post = db.execute("SELECT * FROM post WHERE id=6").fetchone()
-        assert post["title"] == "created"
-        assert post["body"] == "testing"
-
-
-def test_invalid_create(client, app):
-    """Test invalid create post with no title."""
-    assert client.get("/create").status_code == 200
-    post = client.post("/create", data={"title": "", "body": "testing"})
-
-    with app.app_context():
-        db = get_db()
-        count = db.execute("SELECT COUNT(id) FROM post").fetchone()[0]
-        assert count == 5
-
-    assert b"Title is required." in post.data
-
-
-def test_comment(client, app):
-    """Test comment view and creation."""
-    response = client.get("/1/post")
-
-    assert b"comment 1..." in response.data
-    client.post("/1/post", data={"body": "testing comment"})
-
-    with app.app_context():
-        db = get_db()
-        count = db.execute("SELECT COUNT(id) FROM comment").fetchone()[0]
-        assert count == 5
-
-        post = db.execute("SELECT * FROM comment WHERE id=5").fetchone()
-        assert post["body"] == "testing comment"
-
-
-def test_invalid_comment(client, app):
-    """Test invalid comment creation with too short of a body."""
-    post = client.post("/1/post", data={"body": "short"})
-
-    with app.app_context():
-        db = get_db()
-        count = db.execute("SELECT COUNT(id) FROM comment").fetchone()[0]
-        assert count == 4
-
-    assert b"Comment is too short" in post.data
-
-
-def test_search(client):
-    """Test searching for a post."""
-    response = client.get("/search?query=1")
-
-    assert b"POST 1" in response.data
-```
-
-### Running the tests
-
-To make it easier to run the tests some of the settings cna be solved in the `pyproject.toml` file.
-
-```toml
-[tool.pytest.ini_options]
-testpaths = ["tests"]
-
-[tool.coverage.run]
-branch = true
-source = ["flaskapp"]
-```
-
-The `pytest` command can now be run which will find and execute all tests. To get a more verbose output the `-v` flag can be used `pytest -v`.
-
-```bash
-$ pytest
-============================ test session starts ============================
-platform linux -- Python 3.11.1, pytest-7.4.4, pluggy-1.3.0
-rootdir: /home/user/Projects/ncea-lvl2-web-flask-example
-configfile: pyproject.toml
-testpaths: src/tests
-collected 12 items                                                          
-
-src/tests/test_blog.py ........                                       [ 66%]
-src/tests/test_db.py ..                                               [ 83%]
-src/tests/test_factory.py ..                                          [100%]
-
-============================ 12 passed in 0.31s =============================
-```
-
-With our tests we can measure the amount of code that is covered with our tests to see if anything is missed.
-
-```bash
-coverage run -m pytest
-```
-
-Once the tests are run the report can be visualised with `coverage report`.
-
-```bash
-$ coverage report
-Name                       Stmts   Miss Branch BrPart  Cover
-------------------------------------------------------------
-src/flaskapp/__init__.py      20      0      6      0   100%
-src/flaskapp/blog.py          52      0     22      0   100%
-src/flaskapp/db.py            23      0      8      0   100%
-------------------------------------------------------------
-TOTAL                         95      0     36      0   100%
-```
-
-A more in depth report with details on lines missed can be seen from `coverage html` which will create a `htmlcov` directory with the report.
-
-## Accessibility Testing
-
-While it is important that your site functions correctly, it is also important that it is accessible to all users. This includes users with disabilities, users with slow internet connections, and users with older devices. There are a number of tools that can be used to test your site for accessibility.
-
-### Lighthouse
-
-An easy way to test your site is to use the [Lighthouse](https://developer.chrome.com/docs/lighthouse/overview/) tool built into Chrome. This tool can be accessed by opening the developer tools and clicking on the Lighthouse tab. This tool will run a number of tests on your site and give you a score for each category. It will also give you a list of things you can do to improve your score.
diff --git a/src/content/docs/ncea/level-3/about.md b/src/content/docs/ncea/level-3/about.md
deleted file mode 100644
index 3994e528..00000000
--- a/src/content/docs/ncea/level-3/about.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: About
-description: About the level 3 NCEA guides in this wiki.
-
-sidebar:
-  # Make this always the first
-  order: 1
----
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-3/flask/about.md b/src/content/docs/ncea/level-3/flask/about.md
deleted file mode 100644
index 372e3847..00000000
--- a/src/content/docs/ncea/level-3/flask/about.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Complex Flask App
-description: A not so simple website built using flask
-sidebar:
-    order: 1
----
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-3/flask/adding-content.mdx b/src/content/docs/ncea/level-3/flask/adding-content.mdx
deleted file mode 100644
index f97a7d9d..00000000
--- a/src/content/docs/ncea/level-3/flask/adding-content.mdx
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Adding Content
-description: A not so simple website built using flask
-sidebar:
-    order: 4
----
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-3/flask/authentication.mdx b/src/content/docs/ncea/level-3/flask/authentication.mdx
deleted file mode 100644
index 997121b5..00000000
--- a/src/content/docs/ncea/level-3/flask/authentication.mdx
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Authentication
-description: A not so simple website built using flask
-sidebar:
-    order: 2
----
\ No newline at end of file
diff --git a/src/content/docs/ncea/level-3/flask/search.mdx b/src/content/docs/ncea/level-3/flask/search.mdx
deleted file mode 100644
index c4265b33..00000000
--- a/src/content/docs/ncea/level-3/flask/search.mdx
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Search
-description: A not so simple website built using flask
-sidebar:
-    order: 3
----
\ No newline at end of file
diff --git a/src/content/docs/guides/python/flask.mdx b/src/content/docs/python/flask.mdx
similarity index 100%
rename from src/content/docs/guides/python/flask.mdx
rename to src/content/docs/python/flask.mdx
diff --git a/src/content/docs/guides/python/index.md b/src/content/docs/python/index.md
similarity index 100%
rename from src/content/docs/guides/python/index.md
rename to src/content/docs/python/index.md
diff --git a/src/content/docs/guides/python/setting-up.mdx b/src/content/docs/python/setting-up.mdx
similarity index 100%
rename from src/content/docs/guides/python/setting-up.mdx
rename to src/content/docs/python/setting-up.mdx
diff --git a/src/content/docs/guides/sql/basics.mdx b/src/content/docs/sql/basics.mdx
similarity index 100%
rename from src/content/docs/guides/sql/basics.mdx
rename to src/content/docs/sql/basics.mdx
diff --git a/src/content/docs/guides/sql/design.mdx b/src/content/docs/sql/design.mdx
similarity index 100%
rename from src/content/docs/guides/sql/design.mdx
rename to src/content/docs/sql/design.mdx
diff --git a/src/content/docs/guides/sql/index.mdx b/src/content/docs/sql/index.mdx
similarity index 100%
rename from src/content/docs/guides/sql/index.mdx
rename to src/content/docs/sql/index.mdx
diff --git a/src/content/docs/guides/sql/tables.mdx b/src/content/docs/sql/tables.mdx
similarity index 100%
rename from src/content/docs/guides/sql/tables.mdx
rename to src/content/docs/sql/tables.mdx
diff --git a/src/content/docs/guides/web/index.md b/src/content/docs/web/index.md
similarity index 100%
rename from src/content/docs/guides/web/index.md
rename to src/content/docs/web/index.md

From 0d4b1da9f533d9a9bd6292a030873a56b6d7ce8d Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Sat, 30 Mar 2024 22:24:20 +1300
Subject: [PATCH 11/18] fix: remove mention of schools

---
 src/javascript/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/javascript/utils.js b/src/javascript/utils.js
index 111f81cf..f77f26da 100644
--- a/src/javascript/utils.js
+++ b/src/javascript/utils.js
@@ -1,7 +1,7 @@
 document.addEventListener('DOMContentLoaded', (event) => {
     const letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     const word = document.querySelector("#changing_text");
-    const texts = ["Kura.", "Teachers.", "Students.", "Rangatahi.", "Schools.", "ākonga."];
+    const texts = ["Students.", "Rangatahi.", "Youth.", "ākonga."];
     let textIndex = 0;
 
     let isAnimating = false;

From 88fa623e08743f373855347e940a823876a6ce72 Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Sat, 30 Mar 2024 22:34:19 +1300
Subject: [PATCH 12/18] fix: remove relative links

---
 .../docs/cybersecurity/sql-injection.md       | 10 ++---
 src/content/docs/game-design/godot/3d.mdx     | 14 +++----
 src/content/docs/game-design/godot/basics.mdx | 40 +++++++++----------
 .../javascript/creative-coding/paintbrush.mdx |  2 +-
 .../javascript/creative-coding/start-here.mdx |  2 +-
 src/content/docs/javascript/index.mdx         |  2 +-
 src/content/docs/python/flask.mdx             |  8 ++--
 7 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/content/docs/cybersecurity/sql-injection.md b/src/content/docs/cybersecurity/sql-injection.md
index 412e047e..4d7804fb 100644
--- a/src/content/docs/cybersecurity/sql-injection.md
+++ b/src/content/docs/cybersecurity/sql-injection.md
@@ -95,11 +95,11 @@ Go to the Juice Shop login page, and open your browser's developer tools. Most b
 Go to the network tab in the developer tools, and try to login with some random word as the email and password, it doesn't matter.
 
 Here is what the login request looks like in Firefox-based browser LibreWolf:
-![Juice Shop login request](../../../../assets/sql-injection/LoginHeader.png)
+![Juice Shop login request](/assets/sql-injection/LoginHeader.png)
 Here we can see the real request is being made to `http://localhost:3000/rest/user/login` and not `http://localhost:3000/#/login`.
 
-If we go to the Request tab on Firefox-based broswers and toggle Raw, or the Payload tab on Chromium-based browsers and press view source, we can see the important data:
-![Juice Shop login request payload where the email is Tūhura and the password is Tech!](../../../../assets/sql-injection/LoginPayload.png)
+If we go to the Request tab on Firefox-based browsers and toggle Raw, or the Payload tab on Chromium-based browsers and press view source, we can see the important data:
+![Juice Shop login request payload where the email is Tūhura and the password is Tech!](/assets/sql-injection/LoginPayload.png)
 Here we can see the data is being sent as `{"email":"<email>","password":"<password>"}`.
 
 Sqlmap only needs the names of the data and an example of valid input, and it seperates values with `&`, so `--data` should be `email=test@example.com&password=test`.
@@ -150,14 +150,14 @@ This isn't very useful, we already knew to try `' OR 1=1--`. So let's try it on
 Open up your local version of Juice Shop in a new tab, and then search something. It might not show in the network tab if you use the same tab.
 
 Here's what the search request looks like in LibreWolf:
-![Juice Shop search request](../../../../assets/sql-injection/SearchHeader.png)
+![Juice Shop search request](/assets/sql-injection/SearchHeader.png)
 
 This time it's a GET request, which makes this whole process so much easier.
 
 First just check out what's at `http://localhost:3000/rest/products/search?q=test` in your browser. It's just a JSON array of products with the word test in them.
 
 Here's what it looks like in LibreWolf:
-![Juice Shop search request](../../../../assets/sql-injection/SearchJSON.png)
+![Juice Shop search request](/assets/sql-injection/SearchJSON.png)
 
 All in all, this isn't very useful. We could have just searched "" and gotten this all on the regular page.
 
diff --git a/src/content/docs/game-design/godot/3d.mdx b/src/content/docs/game-design/godot/3d.mdx
index dd3bc5e3..4a8233ad 100644
--- a/src/content/docs/game-design/godot/3d.mdx
+++ b/src/content/docs/game-design/godot/3d.mdx
@@ -5,7 +5,7 @@ sidebar:
     order: 2
 ---
 
-This is a guide for making a 3-dimentional game in [Godot](https://godotengine.org/). If you are unfamiliar with Godot, check out the [Godot basics](/guides/game-design/godot/basics) doc.
+This is a guide for making a 3-dimentional game in [Godot](https://godotengine.org/). If you are unfamiliar with Godot, check out the [Godot basics](/game-design/godot/basics) doc.
 
 :::note[Version]
 This guide is up-to-date with Godot 4.1.3 stable official release but will most likely work with any 4.x release.
@@ -14,7 +14,7 @@ This guide is up-to-date with Godot 4.1.3 stable official release but will most
 ## Making the project
 
 Making the project is just as easy as 2D.
-![Godot new project window](../../../../../assets/godot/3D/NewProject.png)
+![Godot new project window](/assets/godot/3D/NewProject.png)
 
 Make sure your project is set to **Forward+**.
 
@@ -24,7 +24,7 @@ With 3D, there is a large disparity between the renderers.
 Read the notes next to each renderer before picking something other than **Forward+**.
 :::
 
-![Create root node, 3D Scene highlighted](../../../../../assets/godot/3D/CreateRootNode.png)
+![Create root node, 3D Scene highlighted](/assets/godot/3D/CreateRootNode.png)
 
 Set the root node to 3D and your project is set up!  
 Although, go ahead and save the scene with **Scene > Save Scene** so you have the scene file saved.
@@ -57,7 +57,7 @@ First, you're going to want to set up a platform for the player to stand on.
 11. One final step, add a **DirectionalLight3D** as a child of **Node3D** and rotate it to point down, this can be anywhere in the scene.
 
 Phew! That was some setup, your scene should look something like this:
-![Scene with player](../../../../../assets/godot/3D/InitialScene.png)
+![Scene with player](/assets/godot/3D/InitialScene.png)
 Now when you play the game and press **down** on the arrow keys you should move backwards off the platform and fall off, you should see the platform briefly as you fall.
 
 ### First person camera
@@ -120,7 +120,7 @@ You will need to add a capsule mesh to the CharacterBody3D, so the player is vis
 
 The tricky part here is the y rotation shouldn't be centered on the camera but on the player's head.  
 Here's an example of what it should look like:
-![Third person camera](../../../../../assets/godot/3D/ThirdPersonCamera.gif)
+![Third person camera](/assets/godot/3D/ThirdPersonCamera.gif)
 :::
 
 #### Changing the controls
@@ -176,7 +176,7 @@ First, the text. As a child of **Camera3D**, add **Label**.
 Give the label some text and move it to the center of the feint camera box.
 
 It should look something like this:
-![Label](../../../../../assets/godot/3D/Label.png)
+![Label](/assets/godot/3D/Label.png)
 Feel free to change the label to a **RichTextLabel** and mess around with making it look pretty.
 
 After making your text, select your label and, in the inspector, go to **CanvasItem > Visibility** and turn **Visible** off, we will be making it visible with code.
@@ -191,7 +191,7 @@ Go to groups and type in "Button" and press **Add**.
 
 Add a **RayCast3D** as a child of your **Camera3D** and move it to aim in the same direction as the camera and move it to the same position as where the camera originates.  
 Your button and ray cast should look something like this:
-![Button and ray cast](../../../../../assets/godot/3D/RayCastButton.png)
+![Button and ray cast](/assets/godot/3D/RayCastButton.png)
 Then, decrease the ray cast's target position's y to -3 or lower.
 
 ### Scripting
diff --git a/src/content/docs/game-design/godot/basics.mdx b/src/content/docs/game-design/godot/basics.mdx
index fab51cff..f6ae7836 100644
--- a/src/content/docs/game-design/godot/basics.mdx
+++ b/src/content/docs/game-design/godot/basics.mdx
@@ -21,7 +21,7 @@ There are several options for developing with Godot. The recommended way is to d
 - Many Linux distros will have Godot in their native app store, such as the Pop!_Shop, AUR, or Snapcraft. **Please note these are sometimes unofficial** and may be different or unsafe. More often than not it's better to run the executable from the normal Godot downloads page.
 
 For most platforms outside of the web editor, you should face an interface that looks similar to this upon opening the program:
-![Godot project manager](../../../../../assets/godot/basics/ProjectManager.png)
+![Godot project manager](/assets/godot/basics/ProjectManager.png)
 
 :::note[C# programming]
 A version of the engine that uses C# as a programming language is also available, called the .NET version. It is not recommended for beginners, but if you are familiar with C# it may be a better option for you. You can download it from the [downloads page](https://godotengine.org/download/) for your desktop platform. However, it is not available for use in the special use cases. This guide will also be using GDScript and you will have to look up the C# version yourself.
@@ -32,7 +32,7 @@ A version of the engine that uses C# as a programming language is also available
 ### Making a new project
 
 Click the **New Project** button to create a new project, the following window will appear:
-![New project window](../../../../../assets/godot/basics/NewProject.png)
+![New project window](/assets/godot/basics/NewProject.png)
 
 - **Project Name:**
 This is the name of your project, it can be anything you want. For this guide, we will use **Godot Is Awesome!**.
@@ -48,14 +48,14 @@ Forward+ is only good for desktop and console platforms, and has the most featur
 Mobile is best for mobile platforms, but supports desktop, and has fewer features with better performance.
 Compatibility supports desktop, mobile, and web platforms, it has the fewest features and the best performance. It is not recommended to use compatibility for 3D projects.  
 - **Version Control Metadata:**
-This is used to store version control information in the project folder. It is recommended to leave this on Git even if you are not using version control. It is also recommended to use version control for your projects, but it is not required. To use git version contol, after creating the project navigate to the project folder and [create a git repository](/guides/git/basics).
+This is used to store version control information in the project folder. It is recommended to leave this on Git even if you are not using version control. It is also recommended to use version control for your projects, but it is not required. To use git version contol, after creating the project navigate to the project folder and [create a git repository](/git/basics).
 
 #### Workspace
 
 The next window that'll open is the meat of the game engine, it is where you make your actual game. At first, it can be a little daunting, all the buttons and docks, but it's simple to understand once you've used it a bit.
-![Empty Godot project](../../../../../assets/godot/basics/EmptyEngine.png)
+![Empty Godot project](/assets/godot/basics/EmptyEngine.png)
 For this guide, we will use 2D to introduce all the key concepts.
-But, if you're already familiar with game development and want to start with 3D, we have a [3d guide](/guides/game-design/godot/3d) as well. If you choose this you may miss out on core aspects like signals.
+But, if you're already familiar with game development and want to start with 3D, we have a [3d guide](/game-design/godot/3d) as well. If you choose this you may miss out on core aspects like signals.
 
 ### The interface
 
@@ -81,7 +81,7 @@ Signals communicate to scripts when something happens to a node.
 To start out with you need to make a basic scene, we'll return to scenes later but for now one big scene will work just fine.
 
 At the top left under **Create Root Node:** click the **2D Scene** button. This will create a new scene with a **Node2D** root node.
-![Empty scene with Node2D as scene route](../../../../../assets/godot/basics/BaseProject.png)
+![Empty scene with Node2D as scene route](/assets/godot/basics/BaseProject.png)
 
 This should be the core scene of your game, or the scene that you do the core of your development in.  
 At any time save your scene with **Scene > Save Scene** or save all scenes with **Scene > Save All Scenes**, we saved the scene as **main.tscn**.
@@ -114,7 +114,7 @@ We also need to have the camera center on the player so add a **Camera2D** node
 > Add **Sprite2D**, **CollisionShape2D**, and **Camera2D** as children of **CharacterBody2D**.
 
 To make sure a node is a child of another node check that your **scene tree** looks like this:
-![Godot scene tree with characterbody2d as child of root node, and sprite2d, collisionshape2d, and camera2d as children of characterbody2d](../../../../../assets/godot/basics/ChildNodes.png)
+![Godot scene tree with characterbody2d as child of root node, and sprite2d, collisionshape2d, and camera2d as children of characterbody2d](/assets/godot/basics/ChildNodes.png)
 This is what having **CharacterBody2D** as a child of **Node2D**, and **Sprite2D**, **CollisionShape2D**, and **Camera2D** as a child of **CharacterBody2D**.
 
 #### Modifying the node's properties
@@ -124,7 +124,7 @@ On the **Sprite2D** node, you can change the texture property to a new texture.
 On the right side of the screen you'll see the **Inspector** dock, this is where you can edit the properties of the selected node.
 
 If you want to use an image and don't have your own, save the little birdie image below to your device with **right-click > Save Image As...** and drag it into the **FileSystem** tab in the bottom left of the screen, alternatively you can make your own image and use that. Once it's in the **FileSystem** dock, you can drag it into the **Texture** property of the **Sprite2D** node.
-![Cute pixel art circular sprite](../../../../../assets/godot/basics/LilBirdie.png)
+![Cute pixel art circular sprite](/assets/godot/basics/LilBirdie.png)
 :::note[Pixel art palette]
 If you want to make your own pixel art similar to this to expand your game later, use the [PICO-8 palette](https://lospec.com/palette-list/pico-8).
 :::
@@ -137,10 +137,10 @@ If you do use a **New PlaceholderTexture2D** you should change the **CollisionSh
 The **CollisionShape2D** node has a warning icon, this is because it needs a shape to define its collision.
 
 > Select the CollisionShape2D and change the **Shape** property, to a **New CircleShape2D** if you used the bird and **New RectangleShape2D** if you used a placeholder.
-![Drop-down of shape property on CollisionShape2D node highlighting New CircleShape2D](../../../../../assets/godot/basics/CircleShape.png)
+![Drop-down of shape property on CollisionShape2D node highlighting New CircleShape2D](/assets/godot/basics/CircleShape.png)
 
 Your scene should now look something like this:
-![Scene with tiny texture in the viewport](../../../../../assets/godot/basics/UpdatedScene.png)
+![Scene with tiny texture in the viewport](/assets/godot/basics/UpdatedScene.png)
 
 The 'viewport' is the largest area of the screen that shows the scene. You can move around the viewport with the middle mouse button and zoom in and out by scrolling.
 
@@ -172,7 +172,7 @@ If you click the new **Open in Editor** icon that appeared on your player, it'll
 Go back to the main scene by using the tabs at the top of the screen, we'll make platforms first.
 
 > Make a **StaticBody2D** with **Sprite2D** and **CollisionShape2D** as children, then give them **PlaceholderTexture2D** and **RectangleShape2D** as texture and shape, respectively.
-![What the scene tree should look like now](../../../../../assets/godot/basics/PlatformTree.png)
+![What the scene tree should look like now](/assets/godot/basics/PlatformTree.png)
 
 > Rename **StaticBody2D** to **Platform** and save it in its own scene.
 
@@ -184,7 +184,7 @@ All work you do in this scene will apply to every copy of this scene.
 Currently there is one copy of this **platform.tscn** scene in your **Main.tscn** scene, we call that an instance of the **platform.tscn** scene.
 
 > Zoom into the **CollisionShape2D** and **Sprite2D** and click on each of them, pull the orange handles to make them about this large compared to the feint blue box and how zoomed out my viewport is.
-![At 42% zoom the sprite and collider takes up about a third of the width of the viewport and is pretty thin](../../../../../assets/godot/basics/PlatformSize.png)
+![At 42% zoom the sprite and collider takes up about a third of the width of the viewport and is pretty thin](/assets/godot/basics/PlatformSize.png)
 
 :::caution[Best practice]
 Make sure the body, the sprite, and the collider are all at the position 0, 0 in your scene unless you have good reason.
@@ -198,10 +198,10 @@ Go back to the Main scene.
 > Go to your player scene and do the same thing, make it smaller than your platform.
 
 Start your magnificent game by clicking the **Run Project** button in the top right of the screen or by pressing **F5**. You should see a window like this:
-![Godot warning no main scene has been selected](../../../../../assets/godot/basics/WarningUndefinedMain.png)
+![Godot warning no main scene has been selected](/assets/godot/basics/WarningUndefinedMain.png)
 Press **Select Current** if you are in your main scene. Now your gorgeous game should be running!
 Here's what my version of this game looks like so far:
-![Empty scene with a magenta rectangle on top of a pixelated red circle](../../../../../assets/godot/basics/StaticGame.png)
+![Empty scene with a magenta rectangle on top of a pixelated red circle](/assets/godot/basics/StaticGame.png)
 
 > Close the game and go back to your Main scene, move your platform below your player.
 
@@ -215,7 +215,7 @@ As mentioned before, you can write scripts in C# as well, but it is not recommen
 #### Making a new script
 
 To add a script to a node, select the node and **right-click > Attach Script** or press the **Attach a new or existing script to the selected node** button above the node tree. For now, add a script to the player node, it will open a new window that looks like:
-![Godot window for making a new script on a CharacterBody2D node](../../../../../assets/godot/basics/NewScript.png)
+![Godot window for making a new script on a CharacterBody2D node](/assets/godot/basics/NewScript.png)
 The defaults are fine, but let's go over what each field means.
 
 - **Language:**
@@ -230,7 +230,7 @@ Built in scripts don't make a separate file for the scripts, they are stored wit
 This is the path to the script file. If you are not using a built-in script, it will be replaced by a "**Name:**" field. For the player, we will use the default path `res://player.gd`. It is a good idea to make a folder just for scripts or just for scenes to make organization easier, but for this small project this is easier.
 
 Click **Create** and you should automatically switch to the script screen. It should have the script you just made loaded in and look like this:
-![Godot scripts screen with default CharacterBody2D template loaded on a GDScript called player.gd](../../../../../assets/godot/basics/Script.png)
+![Godot scripts screen with default CharacterBody2D template loaded on a GDScript called player.gd](/assets/godot/basics/Script.png)
 You can make the script take up the whole window with the full-screen icon in the top right, and if you have a console open, you can close it by pressing **Output** at the bottom of the screen, and zoom in and out with **Ctrl + +/-**.
 
 Now if you run the game with **F5** the player should fall down. 
@@ -329,7 +329,7 @@ If you didn't, check the positions, check the if statement.
 If you're not moving at all it's most likely because you haven't indented your `global_position = reset_position`.
 
 You can see the simple 3 lines of code that got this working:
-![The default script with the previously outlined lines of code added](../../../../../assets/godot/basics/DeathboxCode.png)
+![The default script with the previously outlined lines of code added](/assets/godot/basics/DeathboxCode.png)
 
 ### Signals - Making checkpoints
 
@@ -341,7 +341,7 @@ An **Area2D** has some good built-in signals that communicate when a **body** li
 
 > Move the **Area2D** to somewhere further along your obstacle course, then give the **CollisionShape2D** a rectangle shape and make it take a bit of the platform.
 
-![A small 4-platform obstacle course with the player starting on the left and the checkpoint on the right](../../../../../assets/godot/basics/SimpleObstacleCourse.png)
+![A small 4-platform obstacle course with the player starting on the left and the checkpoint on the right](/assets/godot/basics/SimpleObstacleCourse.png)
 It should look something similar to this.
 
 Click on your **Area2D** in the scene tree and on the right of the screen go to the **Node** tab.
@@ -349,7 +349,7 @@ Click on your **Area2D** in the scene tree and on the right of the screen go to
 Once here, double click the **body_entered(body:Node2D)** signal.
 It is imperative you select the **body_entered** and not the **area_entered** one, otherwise it will not detect the player.
 
-![Godot Connect a Signal to a Method dialogue box with the receiver method changed to _on_checkpoint_entered](../../../../../assets/godot/basics/Signal.png)
+![Godot Connect a Signal to a Method dialogue box with the receiver method changed to _on_checkpoint_entered](/assets/godot/basics/Signal.png)
 Once you get to this screen, change the **Receiver Method** to **_on_checkpoint_entered** just to make things clear.
 
 Make sure you have the player selected from the list of nodes, then click **Connect**.
@@ -364,7 +364,7 @@ For a good introduction to writing your own scripts to control nodes, see the [G
 
 If you have followed this entire guide, you know enough terminology and technique to make almost any 2D game!
 You will definitely need to look things up and reference the documentation, no one stops using google, but the more you create, the more you will develop muscle memory and gain understanding.
-3D games aren't much more difficult, [read the guide on making a 3D game](/guides/game-design/godot/3d).
+3D games aren't much more difficult, [read the guide on making a 3D game](/game-design/godot/3d).
 
 To test your skills, try adding some simple things almost all 2D platformers will have:
 1. Giving the player a double-jump.
diff --git a/src/content/docs/javascript/creative-coding/paintbrush.mdx b/src/content/docs/javascript/creative-coding/paintbrush.mdx
index 5e8f1931..9134626c 100644
--- a/src/content/docs/javascript/creative-coding/paintbrush.mdx
+++ b/src/content/docs/javascript/creative-coding/paintbrush.mdx
@@ -8,7 +8,7 @@ sidebar:
 import { Tabs, TabItem } from "@astrojs/starlight/components";
 
 :::note[Note]
-This lesson assumes you have done the [start here](/guides/javascript/creative-coding/start-here/) page.
+This lesson assumes you have done the [start here](/javascript/creative-coding/start-here/) page.
 :::
 
 ## Using shapes
diff --git a/src/content/docs/javascript/creative-coding/start-here.mdx b/src/content/docs/javascript/creative-coding/start-here.mdx
index 8fe28314..3ed959f3 100644
--- a/src/content/docs/javascript/creative-coding/start-here.mdx
+++ b/src/content/docs/javascript/creative-coding/start-here.mdx
@@ -74,5 +74,5 @@ Inside this file, copy and paste this code:
 
 ## Continue Learning
 
-You're done with the basics of your project! I recommend moving onto the [Paintbrush page](/guides/javascript/creative-coding/paintbrush/).
+You're done with the basics of your project! I recommend moving onto the [Paintbrush page](/javascript/creative-coding/paintbrush/).
 
diff --git a/src/content/docs/javascript/index.mdx b/src/content/docs/javascript/index.mdx
index bb1adfa2..9e017b21 100644
--- a/src/content/docs/javascript/index.mdx
+++ b/src/content/docs/javascript/index.mdx
@@ -204,7 +204,7 @@ If you want immediate feedback and have a small project, I would recommend doing
 
 Click on the extensions tab to the left on VS Code. Search up 'Live Server' and install the one which looks like this:
 
-![Live Server plugin](../../../../assets/javascript/LiveServer.png)
+![Live Server plugin](/assets/javascript/LiveServer.png)
 
 You should now be able to see a little button down the right-hand corner of VS Code, which says **'Go Live'**.
 
diff --git a/src/content/docs/python/flask.mdx b/src/content/docs/python/flask.mdx
index c2b02307..b85970eb 100644
--- a/src/content/docs/python/flask.mdx
+++ b/src/content/docs/python/flask.mdx
@@ -9,13 +9,13 @@ sidebar:
 
 Basic familiarity with Python, HTML/CSS and SQL will be needed to build this website and resources can be found here:
 
-- [Python](/guides/python/)
-- [HTML/CSS](/guides/web/)
-- [SQL](/guides/sql/)
+- [Python](/python/)
+- [HTML/CSS](/web/)
+- [SQL](/sql/)
 
 ## Getting Setup
 
-To setup your python project you should follow the guide [here](/guides/python/setting-up) and install these dependencies:
+To setup your python project you should follow the guide [here](/python/setting-up) and install these dependencies:
 
 - flask (Web server)
 

From 55108c7b42ade6c8f77fe826143e534beace8a74 Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Sat, 30 Mar 2024 22:54:27 +1300
Subject: [PATCH 13/18] feat: add the sidebar back into the landing page

---
 src/content/docs/index.mdx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index be1c1afd..9f628eb0 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -5,7 +5,6 @@ editUrl: false
 tableOfContents: false
 lastUpdated: false
 next: false
-template: splash
 hero:
   title: Tūhura Tech Wiki
   tagline: |

From 0c5d1dbd7e2f067d3faaf5d618fc455cadba672e Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Sun, 31 Mar 2024 00:36:19 +1300
Subject: [PATCH 14/18] feat: reorder sidebar

---
 astro.config.mjs | 102 +++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/astro.config.mjs b/astro.config.mjs
index 05aa0d51..2c581864 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -20,73 +20,73 @@ export default defineConfig({
     },
     social: {
       mastodon: 'https://mastodon.nzoss.nz/@tuhuratech',
-      github: 'https://github.com/Tuhura-Tech/Wiki',
-      discord: 'https://discord.gg/PNxh7cwKfQ'
+      discord: 'https://discord.gg/PNxh7cwKfQ',
+      github: 'https://github.com/Tuhura-Tech/Wiki'
     },
     customCss: [
       // Relative path to your custom CSS file
       './src/styles/custom.css',
     ],
-    sidebar: [{
-      label: "Javascript",
-      items: [{
-        label: "Setting Up",
-        link: 'javascript/setting-up'
+    sidebar: [
+      {
+        label: "Python", items: [{
+          label: "Setting Up",
+          link: 'python'
+        }, {
+          label: "Setting Up",
+          link: 'python/setting-up'
+        }, {
+          label: "Flask",
+          autogenerate: {
+            directory: 'python/flask'
+          }
+        }]
       }, {
-        label: "Creative Coding",
+        label: "Game Design",
+        items: [{
+          label: "About",
+          link: 'game-design/about'
+        }, {
+          label: "Godot",
+          autogenerate: {
+            directory: 'game-design/godot'
+          }
+        }],
+      },
+      {
+        label: "Cybersecurity",
+
         autogenerate: {
-          directory: 'javascript/creative-coding'
+          directory: 'cybersecurity'
+        }
+      },
+      {
+        label: "SQL",
+        autogenerate: {
+          directory: 'sql'
         }
-      }]
-    },
-    {
-      label: "Python", items: [{
-        label: "Setting Up",
-        link: 'python'
       }, {
-        label: "Setting Up",
-        link: 'python/setting-up'
+        label: "Javascript",
+        items: [{
+          label: "Setting Up",
+          link: 'javascript/setting-up'
+        }, {
+          label: "Creative Coding",
+          autogenerate: {
+            directory: 'javascript/creative-coding'
+          }
+        }]
       }, {
-        label: "Flask",
+        label: "Git",
         autogenerate: {
-          directory: 'python/flask'
+          directory: 'git'
         }
-      }]
-    },
-    {
-      label: "Git",
-      autogenerate: {
-        directory: 'git'
-      }
-    }, {
-      label: "Cybersecurity",
-
-      autogenerate: {
-        directory: 'cybersecurity'
-      }
-    }, {
-      label: "Game Design",
-      items: [{
-        label: "About",
-        link: 'game-design/about'
       }, {
-        label: "Godot",
+        label: "Tūhura Tech Resources",
         autogenerate: {
-          directory: 'game-design/godot'
+          directory: 'tuhura-tech'
         }
       }],
-    },
-    {
-      label: "SQL",
-      autogenerate: {
-        directory: 'sql'
-      }
-    }, {
-      label: "Tūhura Tech Resources",
-      autogenerate: {
-        directory: 'tuhura-tech'
-      }
-    }],
     locales: {
       root: {
         label: 'English',

From 50b63f27b853118d5ee829c1dd1659845414b57e Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Sun, 31 Mar 2024 01:25:31 +1300
Subject: [PATCH 15/18] feat: fix colour of gradient

---
 src/components/starlight/Hero.astro | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/components/starlight/Hero.astro b/src/components/starlight/Hero.astro
index 69d4250b..43288ba5 100644
--- a/src/components/starlight/Hero.astro
+++ b/src/components/starlight/Hero.astro
@@ -103,14 +103,8 @@ const { title, tagline, actions } = hero!;
   @media (min-width: 78rem) {
     :global([data-has-hero] .main-pane) {
       --cell-size: 3rem;
-      background:
-        /* radial-gradient(var(--sl-color-green-low), transparent 40%) no-repeat -170vw -55vh /
-          250vw 250vh, */ radial-gradient(
-          closest-side,
-          var(--sl-color-green-low),
-          transparent
-        )
-        no-repeat calc(100% + var(--cell-size) * 6) calc(var(--cell-size) * -7) /
+      background: radial-gradient(closest-side, #6aa469, transparent) no-repeat
+        calc(100% + var(--cell-size) * 6) calc(var(--cell-size) * -7) /
         calc(var(--cell-size) * 12) calc(var(--cell-size) * 19);
     }
 
@@ -127,10 +121,6 @@ const { title, tagline, actions } = hero!;
       text-align: start;
       align-self: center;
     }
-    .hero-content > * {
-      /* Limit the content width so it doesn’t overlap with facepile elements. */
-      /* max-width: calc(100% - 29rem); */
-    }
 
     .actions {
       justify-content: start;

From f2e78fe8d3f477a0ebea09c650aca4c7d06c8b6a Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Mon, 1 Apr 2024 16:51:49 +1300
Subject: [PATCH 16/18] feat: add contribute to toc

---
 astro.config.mjs                              |  1 +
 package.json                                  |  3 +-
 .../starlight/TableOfContents.astro           | 53 +++++++++++++++++++
 .../{contributing.mdx => contribute.mdx}      |  0
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/components/starlight/TableOfContents.astro
 rename src/content/docs/tuhura-tech/{contributing.mdx => contribute.mdx} (100%)

diff --git a/astro.config.mjs b/astro.config.mjs
index 2c581864..257f12dc 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -112,6 +112,7 @@ export default defineConfig({
     plugins: [starlightLinksValidator()],
     components: {
       Hero: './src/components/starlight/Hero.astro',
+      TableOfContents: './src/components/starlight/TableOfContents.astro',
     },
   })],
   markdown: {
diff --git a/package.json b/package.json
index 1300bd1c..e47dc66a 100644
--- a/package.json
+++ b/package.json
@@ -26,5 +26,6 @@
     "hastscript": "9.0.0",
     "rehype": "13.0.1",
     "unist-util-visit": "5.0.0"
-  }
+  },
+  "packageManager": "pnpm@8.13.1+sha256.9e5f62ce5f2b7d4ceb3c2848f41cf0b33032c24d683c7088b53f62b1885fb246"
 }
diff --git a/src/components/starlight/TableOfContents.astro b/src/components/starlight/TableOfContents.astro
new file mode 100644
index 00000000..13db916d
--- /dev/null
+++ b/src/components/starlight/TableOfContents.astro
@@ -0,0 +1,53 @@
+---
+import TableOfContentsList from "../../../node_modules/@astrojs/starlight/components/TableOfContents/TableOfContentsList.astro";
+import type { Props } from "@astrojs/starlight/props";
+import { Icon } from "@astrojs/starlight/components";
+
+const { toc, editUrl} = Astro.props;
+---
+
+{
+  toc && (
+    <starlight-toc
+      data-min-h={toc.minHeadingLevel}
+      data-max-h={toc.maxHeadingLevel}
+    >
+      <nav aria-labelledby="starlight__on-this-page">
+        <TableOfContentsList toc={toc.items} />
+        <h2 class="contribute">Contribute</h2>
+        <ul>
+          <li>
+            <a href="/tuhura-tech/contribute/">
+              <Icon name="open-book" /> Contribute
+            </a>
+          </li>
+          <li>
+            <a href={editUrl}>
+              <Icon name="pencil" /> Edit this page
+            </a>
+          </li>
+          <!-- <li>
+            <a href="/tuhura-tech/i18n/">
+              <Icon name="translate" /> Translate this page
+            </a>
+          </li> -->
+        </ul>
+      </nav>
+    </starlight-toc>
+  )
+}
+
+<style>
+  ul {
+    padding: 0;
+    list-style: none;
+  }
+
+  .contribute {
+    margin-top: 1rem;
+  }
+</style>
+
+<script
+  src="../../../node_modules/@astrojs/starlight/components/TableOfContents/starlight-toc"
+></script>
diff --git a/src/content/docs/tuhura-tech/contributing.mdx b/src/content/docs/tuhura-tech/contribute.mdx
similarity index 100%
rename from src/content/docs/tuhura-tech/contributing.mdx
rename to src/content/docs/tuhura-tech/contribute.mdx

From d4b2d1f3da298b153cba45b11a20e33d2bc2f2e6 Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Mon, 1 Apr 2024 17:11:41 +1300
Subject: [PATCH 17/18] fix: contributing link

---
 src/content/docs/index.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index 9f628eb0..1965a518 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -33,7 +33,7 @@ import ScriptWorkaround from "/src/components/ScriptWorkaround.astro";
   </ListCard>
 
   <Card title="Contribute" icon="star">
-    Anyone can contribute to the resources whether you are a student, teacher or industry professional. We are always looking for new resources to add to the wiki. If you would like to contribute please visit our [Contributing Guide](/tuhura-tech/contributing).
+    Anyone can contribute to the resources whether you are a student, teacher or industry professional. We are always looking for new resources to add to the wiki. If you would like to contribute please visit our [Contributing Guide](/tuhura-tech/contribute).
   </Card>
 
   <SplitCard title="Open Source, Industry Standards, For You" icon="rocket">

From 639067ea492c4cb8e10e7901807bb9d0a1a8e176 Mon Sep 17 00:00:00 2001
From: Leon Bowie <leon@bowie-co.nz>
Date: Mon, 8 Apr 2024 21:10:02 +1200
Subject: [PATCH 18/18] fix: remove custom toc and glow on hero

---
 astro.config.mjs                              |  1 -
 src/components/starlight/Hero.astro           | 29 ----------
 .../starlight/TableOfContents.astro           | 53 -------------------
 3 files changed, 83 deletions(-)
 delete mode 100644 src/components/starlight/TableOfContents.astro

diff --git a/astro.config.mjs b/astro.config.mjs
index 257f12dc..2c581864 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -112,7 +112,6 @@ export default defineConfig({
     plugins: [starlightLinksValidator()],
     components: {
       Hero: './src/components/starlight/Hero.astro',
-      TableOfContents: './src/components/starlight/TableOfContents.astro',
     },
   })],
   markdown: {
diff --git a/src/components/starlight/Hero.astro b/src/components/starlight/Hero.astro
index 43288ba5..97f78be4 100644
--- a/src/components/starlight/Hero.astro
+++ b/src/components/starlight/Hero.astro
@@ -29,28 +29,6 @@ const { title, tagline, actions } = hero!;
     margin: -1.5rem calc(-1 * var(--sl-content-pad-x));
   }
 
-  .grid-bg {
-    z-index: -1;
-    position: absolute;
-    content: "";
-    inset: 0;
-    background-image: linear-gradient(
-        to right,
-        var(--sl-color-white) 1px,
-        transparent 1px
-      ),
-      linear-gradient(to bottom, var(--sl-color-white) 1px, transparent 1px);
-    background-position: right -1px;
-    background-size: 23px 23px;
-    -webkit-mask-image: radial-gradient(
-      circle at 100% 0%,
-      white,
-      transparent 65%
-    );
-    mask-image: radial-gradient(circle at 100% 0%, white, transparent 65%);
-    opacity: 0.05;
-  }
-
   .stack {
     display: flex;
     flex-direction: column;
@@ -101,13 +79,6 @@ const { title, tagline, actions } = hero!;
   }
 
   @media (min-width: 78rem) {
-    :global([data-has-hero] .main-pane) {
-      --cell-size: 3rem;
-      background: radial-gradient(closest-side, #6aa469, transparent) no-repeat
-        calc(100% + var(--cell-size) * 6) calc(var(--cell-size) * -7) /
-        calc(var(--cell-size) * 12) calc(var(--cell-size) * 19);
-    }
-
     .hero {
       display: grid;
     }
diff --git a/src/components/starlight/TableOfContents.astro b/src/components/starlight/TableOfContents.astro
deleted file mode 100644
index 13db916d..00000000
--- a/src/components/starlight/TableOfContents.astro
+++ /dev/null
@@ -1,53 +0,0 @@
----
-import TableOfContentsList from "../../../node_modules/@astrojs/starlight/components/TableOfContents/TableOfContentsList.astro";
-import type { Props } from "@astrojs/starlight/props";
-import { Icon } from "@astrojs/starlight/components";
-
-const { toc, editUrl} = Astro.props;
----
-
-{
-  toc && (
-    <starlight-toc
-      data-min-h={toc.minHeadingLevel}
-      data-max-h={toc.maxHeadingLevel}
-    >
-      <nav aria-labelledby="starlight__on-this-page">
-        <TableOfContentsList toc={toc.items} />
-        <h2 class="contribute">Contribute</h2>
-        <ul>
-          <li>
-            <a href="/tuhura-tech/contribute/">
-              <Icon name="open-book" /> Contribute
-            </a>
-          </li>
-          <li>
-            <a href={editUrl}>
-              <Icon name="pencil" /> Edit this page
-            </a>
-          </li>
-          <!-- <li>
-            <a href="/tuhura-tech/i18n/">
-              <Icon name="translate" /> Translate this page
-            </a>
-          </li> -->
-        </ul>
-      </nav>
-    </starlight-toc>
-  )
-}
-
-<style>
-  ul {
-    padding: 0;
-    list-style: none;
-  }
-
-  .contribute {
-    margin-top: 1rem;
-  }
-</style>
-
-<script
-  src="../../../node_modules/@astrojs/starlight/components/TableOfContents/starlight-toc"
-></script>