From 40d8e58cceb6c43d6367c64a28df23397eb64522 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 8 Jan 2023 19:25:23 +0000 Subject: [PATCH] chore: run prettier on Astro files --- website/src/components/AboutMe.astro | 14 +- website/src/components/Card.astro | 101 +-- website/src/components/DailyEmailForm.astro | 633 +++++++++++++++++- website/src/components/Navbar.astro | 11 +- website/src/components/talk/Events.astro | 65 +- website/src/components/talk/Slides.astro | 8 +- website/src/components/talk/Video.astro | 35 +- website/src/layouts/DailyEmailLayout.astro | 8 +- website/src/layouts/Layout.astro | 127 ++-- website/src/layouts/PageLayout.astro | 6 +- website/src/pages/archive/[...page].astro | 54 +- .../archive/[year]/[month]/[day]/[slug].astro | 28 +- website/src/pages/blog/[slug].astro | 29 +- website/src/pages/blog/index.astro | 72 +- website/src/pages/search.astro | 53 +- website/src/pages/talks/[slug].astro | 38 +- website/src/pages/talks/index.astro | 53 +- 17 files changed, 1005 insertions(+), 330 deletions(-) diff --git a/website/src/components/AboutMe.astro b/website/src/components/AboutMe.astro index 6b4011b1a..aba7b2654 100644 --- a/website/src/components/AboutMe.astro +++ b/website/src/components/AboutMe.astro @@ -3,13 +3,21 @@
- Picture of Oliver + Picture of Oliver

- Oliver Davies is a PHP Developer and Linux Systems Administrator based in the UK. - He is a Full Stack Software Consultant specialising in Drupal application development, and a Lead Developer at Transport for Wales. + Oliver Davies is a PHP Developer and Linux Systems Administrator based + in the UK. He is a Full Stack Software Consultant specialising in Drupal + application development, and a Lead Developer at Transport for Wales.

diff --git a/website/src/components/Card.astro b/website/src/components/Card.astro index ee57d4df4..aca50780c 100644 --- a/website/src/components/Card.astro +++ b/website/src/components/Card.astro @@ -1,62 +1,63 @@ --- export interface Props { - title: string; - body: string; - href: string; + title: string; + body: string; + href: string; } const { href, title, body } = Astro.props; --- diff --git a/website/src/components/DailyEmailForm.astro b/website/src/components/DailyEmailForm.astro index 7d03a28e0..282207452 100644 --- a/website/src/components/DailyEmailForm.astro +++ b/website/src/components/DailyEmailForm.astro @@ -3,18 +3,629 @@ -
    + +
    +
      +
    -
    - -
    +
    +
    + +
    -
    -
    +
    + +
    - + - + +
    +
    + diff --git a/website/src/components/Navbar.astro b/website/src/components/Navbar.astro index aaa093dea..47b43f7cf 100644 --- a/website/src/components/Navbar.astro +++ b/website/src/components/Navbar.astro @@ -9,14 +9,15 @@ viewBox="0 0 706 504" xmlns="http://www.w3.org/2000/svg" > - + - - Oliver Davies - + Oliver Davies
    - diff --git a/website/src/components/talk/Events.astro b/website/src/components/talk/Events.astro index 92c2837de..3f19a89da 100644 --- a/website/src/components/talk/Events.astro +++ b/website/src/components/talk/Events.astro @@ -1,42 +1,47 @@ --- interface Event { - date: string - location: string - name: string - online?: boolean - time: string - url?: string + date: string; + location: string; + name: string; + online?: boolean; + time: string; + url?: string; } interface Props { - events: Event[] + events: Event[]; } -const { events } = Astro.props +const { events } = Astro.props; --- -{events && ( -
    -

    Events

    - +{ + events && (
    -
      - {events.map((event) => ( -
    • - {event.url ? ({event.name}) : event.name} +

      Events

      - {event.location && `in ${event.location}`} - - - {new Date(event.date).toLocaleDateString('en-GB', { - day: 'numeric', - month: 'long', - year: 'numeric', - })} - - {event.online && '(online)'} -
    • - ))} -
    +
    +
      + {events.map((event) => ( +
    • + {event.url ? ( + + {event.name} + + ) : ( + event.name + )} + {event.location && `in ${event.location}`}-{" "} + {new Date(event.date).toLocaleDateString("en-GB", { + day: "numeric", + month: "long", + year: "numeric", + })} + {event.online && "(online)"} +
    • + ))} +
    +
    -
    -)} + ) +} diff --git a/website/src/components/talk/Slides.astro b/website/src/components/talk/Slides.astro index 19710b7b9..321d72c32 100644 --- a/website/src/components/talk/Slides.astro +++ b/website/src/components/talk/Slides.astro @@ -1,10 +1,10 @@ --- interface Props { - id: string - ratio?: string + id: string; + ratio?: string; } -const { id, ratio }: Props = Astro.props +const { id, ratio }: Props = Astro.props; ---
    @@ -15,7 +15,7 @@ const { id, ratio }: Props = Astro.props
    diff --git a/website/src/components/talk/Video.astro b/website/src/components/talk/Video.astro index cc2081566..892e28179 100644 --- a/website/src/components/talk/Video.astro +++ b/website/src/components/talk/Video.astro @@ -1,25 +1,26 @@ --- interface Props { - id: string - type: string + id: string; + type: string; } -const { id, type }: Props = Astro.props +const { id, type }: Props = Astro.props; --- -{type == "youtube" && ( -
    -

    Video

    +{ + type == "youtube" && ( +
    +

    Video

    -
    - +
    +