diff --git a/package-lock.json b/package-lock.json index 9ce11b0..5837d08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2818,9 +2818,9 @@ "license": "MIT" }, "node_modules/consola": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/consola/-/consola-3.3.2.tgz", - "integrity": "sha512-X3dcWPU+QeEaPrdtX3zBRQ0P0kIeEnmJV49uNtpy4N/TPnzA3grJvHftKjHuFIQNLrqBPzzykmc3fNrkQDl5yA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.3.3.tgz", + "integrity": "sha512-Qil5KwghMzlqd51UXM0b6fyaGHtOC22scxrwrz4A2882LyUMwQjnvaedN1HAeXzphspQ6CpHkzMAWxBTUruDLg==", "license": "MIT", "engines": { "node": "^14.18.0 || >=16.10.0" @@ -3211,9 +3211,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", - "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz", + "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==", "license": "MIT" }, "node_modules/esast-util-from-estree": { @@ -6652,20 +6652,21 @@ } }, "node_modules/regex": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/regex/-/regex-5.0.2.tgz", - "integrity": "sha512-/pczGbKIQgfTMRV0XjABvc5RzLqQmwqxLHdQao2RTXPk+pmTXB2P0IaUHYdYyk412YLwUIkaeMd5T+RzVgTqnQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/regex/-/regex-5.1.0.tgz", + "integrity": "sha512-KNCzMdCkhhFKcWnqKIixAKDRzERQ/RTvENLRuLSqNFYdvn/XEgKSrpBHluYqnQxuDnzOB+iZRNGidQeEVe9upw==", "license": "MIT", "dependencies": { "regex-utilities": "^2.3.0" } }, "node_modules/regex-recursion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-5.0.0.tgz", - "integrity": "sha512-UwyOqeobrCCqTXPcsSqH4gDhOjD5cI/b8kjngWgSZbxYh5yVjAwTjO5+hAuPRNiuR70+5RlWSs+U9PVcVcW9Lw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-5.1.0.tgz", + "integrity": "sha512-8PNVYEQEw5fyIGDuLqXMP5WSSjNey+9q+pUFdVqBbPxo9PL8nl7ucZRa3jzooTz7D6wMOHDrCMdwc6fqL60EXw==", "license": "MIT", "dependencies": { + "regex": "^5.1.0", "regex-utilities": "^2.3.0" } }, diff --git a/src/components/Article.astro b/src/components/Article.astro index 02d8b5d..bb771f2 100644 --- a/src/components/Article.astro +++ b/src/components/Article.astro @@ -30,15 +30,17 @@ const listFormatter = new Intl.ListFormat("en-GB", { >

- {article.data.title} + {article.data.title}{article.data.description}

@@ -71,7 +73,7 @@ const listFormatter = new Intl.ListFormat("en-GB", {
{ article.data.extraAuthors ? ( -
+

In collaboration with{" "} {listFormatter.format(article.data.extraAuthors)} @@ -82,14 +84,14 @@ const listFormatter = new Intl.ListFormat("en-GB", {

    { article.data.categories.map((category: string) => ( -
  • +
  • {category}
    • )) } { article.data.tags.map((tag: string) => ( -
  • +
  • {tag}
    • )) diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 6e7bb77..3575ecd 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -19,9 +19,6 @@ import { Icon } from "astro-icon/components";
-

- Sections -

    { SITE.NAVLINKS.map((i) => ( diff --git a/src/components/Prose.astro b/src/components/Prose.astro index ed7df02..dac3ef5 100644 --- a/src/components/Prose.astro +++ b/src/components/Prose.astro @@ -1,5 +1,5 @@
    diff --git a/src/components/RelatedArticles.astro b/src/components/RelatedArticles.astro index 8b14ddc..12c3136 100644 --- a/src/components/RelatedArticles.astro +++ b/src/components/RelatedArticles.astro @@ -33,7 +33,7 @@ const next = items[(index + 1) % items.length]; /> -

    +

    {prev.data.title}

    @@ -42,7 +42,7 @@ const next = items[(index + 1) % items.length]; class="group flex w-fit flex-row items-center justify-between gap-6 self-end" > -

    +

    {next.data.title}

    diff --git a/src/components/Showcase.astro b/src/components/Showcase.astro deleted file mode 100644 index 54a804c..0000000 --- a/src/components/Showcase.astro +++ /dev/null @@ -1,49 +0,0 @@ ---- -import { Image } from "astro:assets"; -import FormattedDate from "@components/FormattedDate.astro"; - -type Props = { - collection: any; -}; - -const { collection } = Astro.props; ---- - -
    - {collection.data.image.alt} -
    -
    - -

    - {collection.data.title} -

    -
    - { - collection.data.collection ? ( - - • Collection - - ) : ( - - ) - } -
    -
    diff --git a/src/components/ShowcasePage.astro b/src/components/ShowcasePage.astro deleted file mode 100644 index 44f6cab..0000000 --- a/src/components/ShowcasePage.astro +++ /dev/null @@ -1,23 +0,0 @@ ---- -import Layout from "@layouts/Layout.astro"; -import { SITE } from "@consts"; -import Showcase from "@components/Showcase.astro"; - -interface Props { - content: any; - CONSTS: any; -} - -const { content, CONSTS } = Astro.props; ---- - - -

    - {CONSTS.TITLE} -

    -
    - {content.map((article: any) => )} -
    -     diff --git a/src/components/ShowcasePost.astro b/src/components/ShowcasePost.astro new file mode 100644 index 0000000..70f8d4c --- /dev/null +++ b/src/components/ShowcasePost.astro @@ -0,0 +1,28 @@ +--- +import FormattedDate from "@components/FormattedDate.astro"; + +type Props = { + collection: any; +}; + +const { collection } = Astro.props; +--- + +
  • + +
    +

    + {collection.data.title}{collection.data.description} +

    + +
    +     +
    • diff --git a/src/components/ShowcaseProject.astro b/src/components/ShowcaseProject.astro new file mode 100644 index 0000000..154dfe6 --- /dev/null +++ b/src/components/ShowcaseProject.astro @@ -0,0 +1,51 @@ +--- +import { Image } from "astro:assets"; +import FormattedDate from "@components/FormattedDate.astro"; + +type Props = { + collection: any; +}; + +const { collection } = Astro.props; +--- + +
  • +
    + {collection.data.image.alt} +
    +
    + +

    + {collection.data.title} +

    +
    + { + collection.data.collection ? ( + + • Collection + + ) : ( + + ) + } +
    +
    +
    • diff --git a/src/content/projects/mortis/index.mdx b/src/content/projects/mortis/index.mdx index 75c7885..570910e 100644 --- a/src/content/projects/mortis/index.mdx +++ b/src/content/projects/mortis/index.mdx @@ -14,8 +14,6 @@ categories: ["personal"] includeHero: true --- -> 1 Corinthians 15:26 - The last enemy to be destroyed is death. - ![Final finished artwork for Mortis project](troy-lusty-mortis.avif) _Final_ diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index be869c7..f81643c 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -35,16 +35,6 @@ const { title, description, image, date, updated, tags } = Astro.props; - -
diff --git a/src/pages/cv.astro b/src/pages/cv.astro index 78ba5c7..2ef81c6 100644 --- a/src/pages/cv.astro +++ b/src/pages/cv.astro @@ -14,7 +14,7 @@ import Prose from "@components/Prose.astro";
-

+

Troy Lusty

!post.data.draft) @@ -21,7 +22,7 @@ const projects = (await getCollection("projects"))

Featured projects @@ -38,17 +39,17 @@ const projects = (await getCollection("projects")) />

-
- {projects.map((project) => )} -
+ {projects.map((project) => )} +

Recent posts @@ -65,10 +66,10 @@ const projects = (await getCollection("projects")) />

-
- {posts.map((post) => )} -
+ {posts.map((post) => )} +
diff --git a/src/pages/posts/index.astro b/src/pages/posts/index.astro index 95f39ea..e305ec8 100644 --- a/src/pages/posts/index.astro +++ b/src/pages/posts/index.astro @@ -1,11 +1,21 @@ --- import { getCollection } from "astro:content"; -import { POSTS } from "@consts"; -import ShowcasePage from "@components/ShowcasePage.astro"; +import { SITE, POSTS } from "@consts"; +import ShowcasePost from "@components/ShowcasePost.astro"; +import Layout from "@layouts/Layout.astro"; const posts = (await getCollection("posts")) .filter((post) => !post.data.draft) .sort((a, b) => b.data.date.valueOf() - a.data.date.valueOf()); --- - + +

+ {POSTS.TITLE} +

+
    + {posts.map((article: any) => )} +
+ diff --git a/src/pages/projects/index.astro b/src/pages/projects/index.astro index e7b33c7..e839209 100644 --- a/src/pages/projects/index.astro +++ b/src/pages/projects/index.astro @@ -1,11 +1,21 @@ --- import { getCollection } from "astro:content"; -import { PROJECTS } from "@consts"; -import ShowcasePage from "@components/ShowcasePage.astro"; +import { PROJECTS, SITE } from "@consts"; +import Layout from "@layouts/Layout.astro"; +import ShowcaseProject from "@components/ShowcaseProject.astro"; const projects = (await getCollection("projects")) .filter((project) => !project.data.draft) .sort((a, b) => b.data.date.valueOf() - a.data.date.valueOf()); --- - + +

+ {PROJECTS.TITLE} +

+
    + {projects.map((article: any) => )} +
+ diff --git a/src/styles/tailwind.css b/src/styles/tailwind.css index 2d7805b..c7bb20f 100644 --- a/src/styles/tailwind.css +++ b/src/styles/tailwind.css @@ -7,17 +7,17 @@ @layer base { :root { - --primary: 60deg 3.03% 93.53%; - --secondary: 60deg 5.56% 7.06%; - --tertiary: 45deg 5.13% 30.59%; - --accent: 60deg 2.44% 83.92%; + --primary: 0deg 0% 99%; + --secondary: 0deg 0% 13%; + --tertiary: 0deg 0% 51%; + --accent: 0deg 0% 39%; } @media (prefers-color-scheme: dark) { :root { - --primary: 60deg 3.03% 6.47%; - --secondary: 60deg 5.56% 92.94%; - --tertiary: 45deg 5.13% 69.41%; - --accent: 60deg 2.44% 16.08%; + --primary: 0deg 0% 0%; + --secondary: 0deg 0% 93%; + --tertiary: 0deg 0% 45%; + --accent: 0deg 0% 71%; } } }