diff --git a/package.json b/package.json index dcdcdea..3d5bb43 100644 --- a/package.json +++ b/package.json @@ -15,5 +15,8 @@ "ava": "^6.2.0", "luxon": "^3.5.0", "tailwindcss": "^4.0.13" + }, + "devDependencies": { + "@tailwindcss/typography": "^0.5.16" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bd3a99b..9b8d661 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,6 +23,10 @@ importers: tailwindcss: specifier: ^4.0.13 version: 4.0.13 + devDependencies: + '@tailwindcss/typography': + specifier: ^0.5.16 + version: 0.5.16(tailwindcss@4.0.13) packages: @@ -555,6 +559,11 @@ packages: resolution: {integrity: sha512-pTH3Ex5zAWC9LbS+WsYAFmkXQW3NRjmvxkKJY3NP1x0KHBWjz0Q2uGtdGMJzsa0EwoZ7wq9RTbMH1UNPceCpWw==} engines: {node: '>= 10'} + '@tailwindcss/typography@0.5.16': + resolution: {integrity: sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA==} + peerDependencies: + tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1' + '@tailwindcss/vite@4.0.13': resolution: {integrity: sha512-0XTd/NoVUAktIDaA4MdXhve0QWYh7WlZg20EHCuBFR80F8FhbVkRX+AY5cjbUP/IO2itHzt0iHc0iSE5kBUMhQ==} peerDependencies: @@ -1267,6 +1276,15 @@ packages: resolution: {integrity: sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + lodash.castarray@4.4.0: + resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==} + + lodash.isplainobject@4.0.6: + resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} + + lodash.merge@4.6.2: + resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} + lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} @@ -1583,6 +1601,10 @@ packages: resolution: {integrity: sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + postcss-selector-parser@6.0.10: + resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} + engines: {node: '>=4'} + postcss@8.5.3: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} @@ -1946,6 +1968,9 @@ packages: uploadthing: optional: true + util-deprecate@1.0.2: + resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + vfile-location@5.0.3: resolution: {integrity: sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==} @@ -2512,6 +2537,14 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.0.13 '@tailwindcss/oxide-win32-x64-msvc': 4.0.13 + '@tailwindcss/typography@0.5.16(tailwindcss@4.0.13)': + dependencies: + lodash.castarray: 4.4.0 + lodash.isplainobject: 4.0.6 + lodash.merge: 4.6.2 + postcss-selector-parser: 6.0.10 + tailwindcss: 4.0.13 + '@tailwindcss/vite@4.0.13(vite@6.2.1(jiti@2.4.2)(lightningcss@1.29.2))': dependencies: '@tailwindcss/node': 4.0.13 @@ -3331,6 +3364,12 @@ snapshots: load-json-file@7.0.1: {} + lodash.castarray@4.4.0: {} + + lodash.isplainobject@4.0.6: {} + + lodash.merge@4.6.2: {} + lodash@4.17.21: {} longest-streak@3.1.0: {} @@ -3804,6 +3843,11 @@ snapshots: dependencies: irregular-plurals: 3.5.0 + postcss-selector-parser@6.0.10: + dependencies: + cssesc: 3.0.0 + util-deprecate: 1.0.2 + postcss@8.5.3: dependencies: nanoid: 3.3.9 @@ -4210,6 +4254,8 @@ snapshots: ofetch: 1.4.1 ufo: 1.5.4 + util-deprecate@1.0.2: {} + vfile-location@5.0.3: dependencies: '@types/unist': 3.0.3 diff --git a/src/components/ui/Box.astro b/src/components/ui/Box.astro index 9fe3b1a..ffed2e4 100644 --- a/src/components/ui/Box.astro +++ b/src/components/ui/Box.astro @@ -1,20 +1,20 @@ --- interface Props { - title?: string; - description?: string; - icon?: string; + title?: string; + description?: string; + icon?: string; } const { title, description, icon } = Astro.props; ---
- - {icon && } - {title && {title}} - {description && {description}} - - + + {icon && } + {title && {title}} + {description && {description}} + +
diff --git a/src/components/ui/Navigation.astro b/src/components/ui/Navigation.astro index 8c3bb78..792de62 100644 --- a/src/components/ui/Navigation.astro +++ b/src/components/ui/Navigation.astro @@ -5,6 +5,11 @@ const headerLinks = [ href: "/about", icon: "fa-solid fa-user", // font awesome css class }, + { + label: "/now", + href: "/now", + icon: "fa-solid fa-calendar-days" + }, { label: "Projects", href: "/projects", @@ -24,12 +29,7 @@ const headerLinks = [ label: "Contact", href: "/contact", icon: "fa-solid fa-envelope", - }, - { - label: "More", - href: "/more", - icon: "fa-solid fa-ellipsis", - }, + }, ]; --- diff --git a/src/components/ui/Prose.astro b/src/components/ui/Prose.astro new file mode 100644 index 0000000..559ed59 --- /dev/null +++ b/src/components/ui/Prose.astro @@ -0,0 +1,7 @@ +--- + +--- + +
+ +
diff --git a/src/content/bio.md b/src/content/bio.md new file mode 100644 index 0000000..df845bc --- /dev/null +++ b/src/content/bio.md @@ -0,0 +1,7 @@ +--- +--- + +I'm a musician, student, part-time software developer and writer. + +I like making weird noises, websites (like this one) with [Astro](https://astro.build), and going outside whenever I'm not doing either of those things. + diff --git a/src/content/now.md b/src/content/now.md new file mode 100644 index 0000000..966aef5 --- /dev/null +++ b/src/content/now.md @@ -0,0 +1,14 @@ +Spending less time on the internet, or at least trying to. + +### 🎵 music + +I've been listening to a lot of Sampha, recently. + +In London, I picked up the [new Godspeed You! Black Emperor album, ""](https://cstrecords.com/en-gb/products/cst183) and it's one of the most hauntingly beautiful things I've listened to in a while. + +### 📖 reading + +I've been digitising my book collection into a Notion database and it's so much work but so fun. plus i can make *GRAPHS* + +- currently reading: This Is How You Lose The Time War by Amal El-Mohtar & Max Gladstone +- just picked up: Yellowface by Rebecca F. Kuang diff --git a/src/pages/index.astro b/src/pages/index.astro index 5262e63..8328302 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -6,6 +6,7 @@ import Box from "~/components/ui/Box.astro"; import CollectionList from "~/components/lists/BlogPostList.astro"; import NoteList from "~/components/lists/NoteList.astro"; import StyledLink from "~/components/util/StyledLink.astro"; +import {Content as Bio} from "~/content/bio.md" --- @@ -17,24 +18,8 @@ import StyledLink from "~/components/util/StyledLink.astro"; > Hi! I'm Ivy, welcome to my website! -

- I'm a musician, student, part-time software developer and writer.
- I mostly work with Rust, Typescript, and web frameworks like Astro, and Eleventy. -

+ +
diff --git a/src/pages/now.astro b/src/pages/now.astro new file mode 100644 index 0000000..f66404f --- /dev/null +++ b/src/pages/now.astro @@ -0,0 +1,15 @@ +--- +import Page from "~/layouts/Page.astro"; +import { Content } from "~/content/now.md"; +import Prose from "~/components/ui/Prose.astro" +--- + + + + + +

+ This is a /now page and + you should make one, too. +

+ diff --git a/src/styles/global.css b/src/styles/global.css index d91b6aa..9e68315 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -1,4 +1,5 @@ @import "tailwindcss"; +@plugin "@tailwindcss/typography"; @theme { /* Disable default colors to prevent their use; feel free to re-enable as needed. */ @@ -199,4 +200,6 @@ hr { @apply border-0 h-0.5 my-4 bg-light-pu dark:bg-dark-pu; -} \ No newline at end of file +} + +