From 569b1614defd0f3088201fc5f90430ca40c69ec7 Mon Sep 17 00:00:00 2001
From: Chris Chinchilla <chris@chrischinchilla.com>
Date: Fri, 26 Jul 2024 17:57:23 +0200
Subject: [PATCH] Rough support and contact pages

---
 netlify.toml                                  |  6 +-
 public/robots.txt                             |  4 +-
 src/components/common/MetaTags.astro          |  1 +
 src/components/widgets/Header.astro           | 15 ++++-
 src/components/widgets/HeaderNoLogo.astro     | 15 ++++-
 src/components/widgets/Note.astro             |  2 +-
 ...community-volunteering.md => community.md} | 12 +++-
 src/pages/contact.mdx                         | 22 +++++++
 src/pages/index.astro                         | 60 ++++++++-----------
 src/pages/support.md                          | 12 +---
 10 files changed, 96 insertions(+), 53 deletions(-)
 rename src/pages/{community-volunteering.md => community.md} (51%)
 create mode 100644 src/pages/contact.mdx

diff --git a/netlify.toml b/netlify.toml
index 01dabc37..d789976b 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,3 +1,7 @@
 [functions]
   node_bundler = "esbuild"
-  external_node_modules = ["sharp"]
\ No newline at end of file
+  external_node_modules = ["sharp"]
+
+[[redirects]]
+  from = "/support"
+  to = "/contact"
\ No newline at end of file
diff --git a/public/robots.txt b/public/robots.txt
index 6f27bb66..87648ba4 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +1,4 @@
 User-agent: *
-Disallow:
\ No newline at end of file
+Allow: /
+
+Sitemap: https://chrischinchilla.com/sitemap-index.xml
\ No newline at end of file
diff --git a/src/components/common/MetaTags.astro b/src/components/common/MetaTags.astro
index 290c5678..35109afe 100644
--- a/src/components/common/MetaTags.astro
+++ b/src/components/common/MetaTags.astro
@@ -99,3 +99,4 @@ const image =
 <link rel="shortcut icon" href={getAsset('/favicon.ico')} />
 <link rel="icon" type="image/svg+xml" href={getAsset('/favicon.svg')} />
 <link rel="mask-icon" href={getAsset('/favicon.svg')} color="#8D46E7" />
+<link rel="sitemap" href={getAsset('/sitemap-index.xml')} />
\ No newline at end of file
diff --git a/src/components/widgets/Header.astro b/src/components/widgets/Header.astro
index b7652436..116b6c9e 100644
--- a/src/components/widgets/Header.astro
+++ b/src/components/widgets/Header.astro
@@ -8,8 +8,19 @@ import { getHomePermalink, getBlogPermalink, getPermalink, getAsset } from '~/ut
 
 // TODO: Function
 const links = [
-  { text: 'About', href: getPermalink('/about') },
-
+{
+    text: 'About',
+    links: [
+      {
+        text: 'Contact',
+        href: getPermalink('/contact'),
+      },
+      {
+        text: 'Community & volunteering',
+        href: getPermalink('/community'),
+      },
+    ],
+  },
   {
     text: 'Writing',
     links: [
diff --git a/src/components/widgets/HeaderNoLogo.astro b/src/components/widgets/HeaderNoLogo.astro
index 4b56ee8d..2a1bed66 100644
--- a/src/components/widgets/HeaderNoLogo.astro
+++ b/src/components/widgets/HeaderNoLogo.astro
@@ -6,8 +6,19 @@ import ToggleMenu from '~/components/common/ToggleMenu.astro';
 import { getHomePermalink, getBlogPermalink, getPermalink, getAsset } from '~/utils/permalinks';
 // TODO: Function
 const links = [
-  { text: 'About', href: getPermalink('/about') },
-
+{
+    text: 'About',
+    links: [
+      {
+        text: 'Contact',
+        href: getPermalink('/contact'),
+      },
+      {
+        text: 'Community & volunteering',
+        href: getPermalink('/community'),
+      },
+    ],
+  },
   {
     text: 'Writing',
     links: [
diff --git a/src/components/widgets/Note.astro b/src/components/widgets/Note.astro
index 5783cf4d..37fad573 100644
--- a/src/components/widgets/Note.astro
+++ b/src/components/widgets/Note.astro
@@ -5,7 +5,7 @@ import json from '../../data/contact.json';
 ---
 
 <section class="md:flex md:items-center md:justify-between py-6 md:py-8 bg-brandBlue dark:bg-slate-800 content-center">
-  <ul class=" mx-auto flex mb-4 md:order-1 md:mb-0">
+  <ul class=" mx-auto flex mb-4 md:order-1 md:mb-0 list-none">
   {
     json.map((contactLink) => (
       <li><a
diff --git a/src/pages/community-volunteering.md b/src/pages/community.md
similarity index 51%
rename from src/pages/community-volunteering.md
rename to src/pages/community.md
index 82954320..24a69707 100644
--- a/src/pages/community-volunteering.md
+++ b/src/pages/community.md
@@ -1,4 +1,7 @@
-# Community and volunteering
+---
+title: 'Community and volunteering'
+layout: '~/layouts/MarkdownLayout.astro'
+---
 
 I am and have been involved in the following communities and volunteering efforts.
 
@@ -16,3 +19,10 @@ The Berlin chapter has the largest membership base and meets the most regularly
 _Drum tutor, xx to present_
 
 The open music school is part of give something back to berlin and holds multiple free music classes every week, largely aimed at refugees and those on low incomes.
+
+## Write the Docs
+- I run the Write the Docs meetup in Berlin and have organised other meetups in the past.
+- I was on the organising committee for the 2018, 2019, 2020, 2021 EU, and 2019 Australian Write the Docs conferences.
+- I co-organised the "Tool the Docs" devroom at FOSDEM in 2018, 2019, 2021, and 2024.
+## Open source
+I have always been active in open source communities, including regular contributions to: Drupal, CiviCRM, Atom, Visual Studio Code, Webpack, Kubernetes, Obsidian, and Vale. See [my GitHub profile][3] for more.
diff --git a/src/pages/contact.mdx b/src/pages/contact.mdx
new file mode 100644
index 00000000..c5cdf978
--- /dev/null
+++ b/src/pages/contact.mdx
@@ -0,0 +1,22 @@
+---
+title: 'Contact'
+layout: '~/layouts/MarkdownLayout.astro'
+---
+import Note from '~/components/widgets/Note.astro';
+
+<Note />
+
+## Want to hire me?
+
+Sounds great! [Let's arrange a chat](https://fantastical.app/chrischinchilla/30-minute-work-meeting).
+
+## Sponsored content requests
+
+If you have a product or service you think matches my audience or experience and would like to sponsor content on my YouTube channel, I'd love to hear from you!
+
+I charge **$/€/£ 150 per 5-10 minute video** and aim to complete and publish the video within 30 days of payment. This includes a private preview of your video for approval and up to 3 edits before publishing. If you're interested in commissioning me you have two options.
+
+- Pay instantly and we can arrange a call to discuss your requirements. Your options are:
+  - Request via [Buy Me a Coffee](https://www.buymeacoffee.com/chrischinchilla/commissions).
+  - Request via [Ko-fi](https://ko-fi.com/chrischinchilla/commissions).
+- If you'd rather discuss first and pay in a different way, [arrange a call to discuss your requirements](https://fantastical.app/chrischinchilla/sponsored-content-discussion)
\ No newline at end of file
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 52936382..6811ab06 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -18,23 +18,19 @@ const meta = {
 
 <Layout {meta}>
   <!-- Hero Widget ******************* -->
-<!-- TODO: Parameterise -->
-  <HeroBGImg
-    callToAction={{ text: 'What do I do?', href: '#features2' }}
-  >
-  <!-- TODO: Parameterise -->
-    <Fragment slot="title">
-      I am Chris Chinchilla 👋
-    </Fragment>
   <!-- TODO: Parameterise -->
+  <HeroBGImg callToAction={{ text: 'What do I do?', href: '#features2' }}>
+    <!-- TODO: Parameterise -->
+    <Fragment slot="title"> I am Chris Chinchilla 👋 </Fragment>
+    <!-- TODO: Parameterise -->
     <Fragment slot="subtitle">
-      I tell stories through documentation, blog posts, videos, books and more. I am a podcaster, video maker, writer of interactive fiction, and games.
+      I tell stories through documentation, blog posts, videos, books and more. I am a podcaster, video maker, writer of
+      interactive fiction, and games.
     </Fragment>
-  </Hero>
+  </HeroBGImg>
 
   <!-- Features Widget *************** -->
 
-
   <!-- Content Widget **************** -->
 
   <!-- Content Widget **************** -->
@@ -42,58 +38,51 @@ const meta = {
   <!-- Steps Widget ****************** -->
 
   <!-- Features2 Widget ************** -->
-<!-- TODO: refactor to match content types -->
+  <!-- TODO: refactor to match content types -->
   <Features2
     title="More about me"
     subtitle="Here's all I do, well mostly…"
     items={[
       {
         title: 'Writing',
-        description:
-          'Find my blog posts and books or hire me to write and edit something for you!',
+        description: 'Find my blog posts and books or hire me to write and edit something for you!',
         icon: 'ph:pencil-circle-bold',
         // TODO: Generalised writing page
         permalink: '/blog',
       },
       {
         title: 'Podcasts',
-        description:
-          'Hear me on one of the many podcasts I regulary host and appear on.',
+        description: 'Hear me on one of the many podcasts I regulary host and appear on.',
         icon: 'fa:podcast',
         permalink: '/podcast',
       },
       {
         title: 'Videos',
-        description:
-          'Watch all my livestreams, recorded videos, and presentations.',
+        description: 'Watch all my livestreams, recorded videos, and presentations.',
         icon: 'fa:podcast',
         permalink: '/videos',
       },
       {
         title: 'Games',
-        description:
-          'Download, buy, and play games I created or contributed to.',
+        description: 'Download, buy, and play games I created or contributed to.',
         icon: 'fa:podcast',
         permalink: '/games',
       },
       {
         title: 'Events',
-        description:
-          'Meetups and conferences I\'m speaking at, reporting on, or attending.',
+        description: "Meetups and conferences I'm speaking at, reporting on, or attending.",
         icon: 'carbon:calendar-heat-map',
         permalink: '/events',
       },
       {
         title: 'Work',
-        description:
-          'Who I\'ve worked with, the work I\'ve done, and how I can help you.',
+        description: "Who I've worked with, the work I've done, and how I can help you.",
         icon: 'fluent:people-audience-20-filled',
         permalink: '/clients',
       },
       {
         title: 'Support',
-        description:
-          'Like what I do? Support me with a donation, subscription, or buy merchandise.',
+        description: 'Like what I do? Support me with a donation, subscription, or buy merchandise.',
         icon: 'ri:money-euro-circle-fill',
         permalink: '/support',
       },
@@ -104,25 +93,23 @@ const meta = {
 
   <Note />
   <!-- HighlightedPosts Widget ******* -->
-<!-- TODO: Generalise to all content types -->
+  <!-- TODO: Generalise to all content types -->
+  <!-- TODO: UPDATE! -->
+
   <HighlightedPosts
     title="Highlights"
     information={`Current highlights for your enjoyment.`}
     postIds={[
       '2022/2022-02-20-how-setup-raspberry-pi-files-media.md',
       '2022/2022-01-20-reducing-negative-language-documentation.md',
-      '2021/2021-12-12-migrating-mac.md'
+      '2021/2021-12-12-migrating-mac.md',
     ]}
   />
 
   <!-- FAQs Widget ******************* -->
 
-  
-
   <!-- Stats Widget ****************** -->
 
-
-
   <!-- CallToAction Widget *********** -->
 
   <CallToAction
@@ -132,10 +119,15 @@ const meta = {
       icon: 'tabler:download',
     }}
   >
-
     <Fragment slot="title">
       Join my mailing list
-      <iframe src="https://chinchillasqueaks.substack.com/embed" width="480" height="320" style="border:1px solid #EEE; background:white;" frameborder="0" scrolling="no"></iframe>
+      <iframe
+        src="https://chinchillasqueaks.substack.com/embed"
+        width="480"
+        height="320"
+        style="border:1px solid #EEE; background:white;"
+        frameborder="0"
+        scrolling="no"></iframe>
     </Fragment>
   </CallToAction>
 </Layout>
diff --git a/src/pages/support.md b/src/pages/support.md
index fbe67e6d..e64ab0cc 100644
--- a/src/pages/support.md
+++ b/src/pages/support.md
@@ -2,7 +2,7 @@
 title: 'Support me'
 layout: '~/layouts/MarkdownLayout.astro'
 ---
-
+<!-- TODO: Refactor to a common footer and add sponsored content to enquire page -->
 Here are some ways you can support me. _This page is a work in progress_.
 
 ## General options
@@ -50,13 +50,3 @@ Here are some ways you can support me. _This page is a work in progress_.
 
 
 
-## Sponsored content requests
-
-If you have a product or service you think matches my audience or experience and would like to sponsor content on my YouTube channel, I'd love to hear from you!
-
-I charge **$/€/£ 150 per 5-10 minute video** and aim to complete and publish the video within 30 days of payment. This includes a private preview of your video for approval and up to 3 edits before publishing. If you're interested in commissioning me you have two options.
-
-- Pay instantly and we can arrange a call to discuss your requirements. Your options are:
-  - Request via [Buy Me a Coffee](https://www.buymeacoffee.com/chrischinchilla/commissions).
-  - Request via [Ko-fi](https://ko-fi.com/chrischinchilla/commissions).
-- If you'd rather discuss first and pay in a different way, [arrange a call to discuss your requirements](https://fantastical.app/chrischinchilla/sponsored-content-discussion)
\ No newline at end of file