From 3d4d2bb4d685f124bd669943ee153f490f6e6627 Mon Sep 17 00:00:00 2001 From: Southpaw Date: Tue, 13 Aug 2024 13:54:42 +0100 Subject: [PATCH] Migrate team member cards to astro-icon icons --- package.json | 11 ++-- pnpm-lock.yaml | 30 +++++++++++ src/components/parts/team/TeamMember.astro | 26 ++++----- src/data/TeamData.mjs | 62 +++++++++++----------- 4 files changed, 81 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 5792a953..d02e6b5c 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,9 @@ }, "dependencies": { "@babel/traverse": "^7.25.3", + "@iconify-json/cib": "^1.1.10", + "@iconify-json/material-symbols": "^1.1.87", + "@iconify-json/mdi": "^1.1.68", "@tsndr/cloudflare-worker-jwt": "^2.5.3", "astro-compress": "^2.3.1", "astro-icon": "^1.1.0", @@ -55,10 +58,10 @@ "xml-js": "^1.6.11" }, "pnpm": { - "overrides": { - "@iconify/tools": "^4.0.0" - } - }, + "overrides": { + "@iconify/tools": "^4.0.0" + } + }, "engines": { "node": ">=20" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index beb1a382..7045be75 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,15 @@ importers: '@babel/traverse': specifier: ^7.25.3 version: 7.25.3 + '@iconify-json/cib': + specifier: ^1.1.10 + version: 1.1.10 + '@iconify-json/material-symbols': + specifier: ^1.1.87 + version: 1.1.87 + '@iconify-json/mdi': + specifier: ^1.1.68 + version: 1.1.68 '@tsndr/cloudflare-worker-jwt': specifier: ^2.5.3 version: 2.5.3 @@ -440,6 +449,15 @@ packages: resolution: {integrity: sha512-5D2qVpZrgpjtqU4eNOcWGp1gnUCgjfM+vKGE2y03kKN6z5EBhtx0qdRFbg8QuNNj8wXNoX93KJoYb+NqoxswmQ==} engines: {node: '>=14.0.0', npm: '>=7.0.0'} + '@iconify-json/cib@1.1.10': + resolution: {integrity: sha512-AisBsRyUDWOMv2M++O7h/9TFyNCqMBHUcmR5ARkZHi7xJHfLQvZ5qaFuSW3cQ9UYc+LXS+nK1QXWsiopxj16ug==} + + '@iconify-json/material-symbols@1.1.87': + resolution: {integrity: sha512-Da6IB5y0QIs3YtvL/VkrPK/j8rLtW2ur9wVfaUAzpNWuxvqnaIn3gCAYXMWPXXx4QtehZ5K3fyb4ne1z+ckseQ==} + + '@iconify-json/mdi@1.1.68': + resolution: {integrity: sha512-7//TKCiXLU6kNWeOJRTBbisofVO7rF1sD1TZTL4/V9nqlmVNczQ5IOY0GgKOTsitkcTnX9GXgrgbjw3OI5B69w==} + '@iconify/tools@4.0.5': resolution: {integrity: sha512-l8KoA1lxlN/FFjlMd3vjfD7BtcX/QnFWtlBapILMlJSBgM5zhDYak/ldw/LkKG3258q/0YmXa48sO/QpxX7ptg==} @@ -3934,6 +3952,18 @@ snapshots: '@fluent/syntax@0.19.0': {} + '@iconify-json/cib@1.1.10': + dependencies: + '@iconify/types': 2.0.0 + + '@iconify-json/material-symbols@1.1.87': + dependencies: + '@iconify/types': 2.0.0 + + '@iconify-json/mdi@1.1.68': + dependencies: + '@iconify/types': 2.0.0 + '@iconify/tools@4.0.5': dependencies: '@iconify/types': 2.0.0 diff --git a/src/components/parts/team/TeamMember.astro b/src/components/parts/team/TeamMember.astro index d799f4f8..0c9a7735 100644 --- a/src/components/parts/team/TeamMember.astro +++ b/src/components/parts/team/TeamMember.astro @@ -2,10 +2,7 @@ import type { TeamMember,} from "@data/Team"; import { t } from "i18next"; import SystemMembers from "./SystemMembers.astro"; - -import CurseforgeLogo from '../../assets/icon/solid/curseforge.svg?raw'; -import ModrinthLogo from '../../assets/icon/solid/modrinth.svg?raw'; -import ModrinthLogoSmall from '../../assets/icon/solid/modrinth-small.svg?raw'; +import { Icon } from "astro-icon/components" export interface Props { member: TeamMember; @@ -16,12 +13,6 @@ const { member, isLeader } = Astro.props as Props; // this is the "N/A" text, for anyone wondering const na = t("team:n-a"); -let customIcons: Record = { - 'curseforge': CurseforgeLogo, - 'modrinth': ModrinthLogo, - 'modrinth-small': ModrinthLogoSmall, -} - --- \ No newline at end of file diff --git a/src/data/TeamData.mjs b/src/data/TeamData.mjs index 8210e477..ab5e151a 100644 --- a/src/data/TeamData.mjs +++ b/src/data/TeamData.mjs @@ -6,7 +6,7 @@ export default { avatar: "https://avatars.githubusercontent.com/u/3987560", description: "Modder and software developer who has way too many ambitious projects.", - links: [{ icon: "fas fa-link", url: "https://dblsaiko.net/" }], + links: [{ icon: "mdi:link-variant", url: "https://dblsaiko.net/" }], }, ADudeCalledLeo: { name: "ADudeCalledLeo", @@ -17,11 +17,11 @@ export default { "The local project abandoning expert. Also may or may not exist.", links: [ { - icon: "fab fa-mastodon", + icon: "cib:mastodon", url: "https://tech.lgbt/@ADudeCalledLeo", }, { - icon: "custom:modrinth-small", + icon: "modrinth-small", url: "https://modrinth.com/user/ADudeCalledLeo", }, ], @@ -40,11 +40,11 @@ export default { avatar: "/assets/img/team/AlexIIL.png", links: [ { - icon: "fas fa-link", + icon: "mdi:link-variant", url: "https://alexiil.uk", }, { - icon: "custom:curseforge", + icon: "curseforge", url: "https://www.curseforge.com/members/alexiil/projects", }, ], @@ -77,7 +77,7 @@ export default { github: "Forkk", avatar: "https://avatars.githubusercontent.com/u/1300078?v=4", description: "Resident silverware expert.", - links: [{ icon: "fas fa-link", url: "https://forkk.net/" }], + links: [{ icon: "mdi:link-variant", url: "https://forkk.net/" }], }, Fusion: { name: "Fusion Flux", @@ -87,11 +87,11 @@ export default { description: "Part time speedrunner, mod developer, and game developer.", links: [ { - icon: "fab fa-youtube", + icon: "cib:youtube", url: "https://www.youtube.com/channel/UCyzsPpD0PPB7FQy93Yo6xfQ", }, { - icon: "fab fa-twitch", + icon: "cib:twitch", url: "https://www.twitch.tv/fusion_flux", }, ], @@ -122,7 +122,7 @@ export default { discord: "ix0rai", github: "ix0rai", avatar: "/assets/img/team/ix0rai.png", - links: [{ icon: "fab fa-tumblr", url: "https://ix0rai.tumblr.com/" }], + links: [{ icon: "cib:tumblr", url: "https://ix0rai.tumblr.com/" }], }, Jamalam: { name: "Jamalam", @@ -133,15 +133,15 @@ export default { "Modder and programmer trying to create cool things using Java, Kotlin, and TypeScript/Deno.", links: [ { - icon: "fas fa-link", + icon: "mdi:link-variant", url: "https://jamalam.tech/", }, { - icon: "fab fa-twitter", + icon: "cib:twitter", url: "https://twitter.com/jamalamisadev", }, { - icon: "custom:curseforge", + icon: "curseforge", url: "https://www.curseforge.com/members/Jamalam360/projects", }, ], @@ -161,7 +161,7 @@ export default { avatar: "https://avatars.githubusercontent.com/u/61744596?v=4", links: [ { - icon: "custom:modrinth-small", + icon: "modrinth-small", url: "https://modrinth.com/user/anonymous123-code", }, ], @@ -182,7 +182,7 @@ export default { description: "Shorthand enjoyer. Java, Python and bio. Chinese in the SEA.", links: [ { - icon: "fas fa-link", + icon: "mdi:link-variant", url: "https://linktr.ee/lapisliozuli", } ] @@ -201,7 +201,7 @@ export default { description: "Professional memer", links: [ { - icon: "custom:modrinth-small", + icon: "modrinth-small", url: "https://modrinth.com/user/obj-obj", }, ], @@ -215,19 +215,19 @@ export default { "Enthusiastic modder, University student, creator of Netherite Plus. Has a special interest in making items extendable and improving everything about mappings in the Quilt Toolchain.", links: [ { - icon: "fas fa-link", + icon: "mdi:link-variant", url: "https://oroarmor.com/", }, { - icon: "fab fa-twitter", + icon: "cib:twitter", url: "https://twitter.com/realOroArmor", }, { - icon: "custom:curseforge", + icon: "curseforge", url: "https://www.curseforge.com/members/oroarmor/projects", }, { - icon: "custom:modrinth-small", + icon: "modrinth-small", url: "https://modrinth.com/user/h74rYEcI", }, ], @@ -240,7 +240,7 @@ export default { systemMembers: "---", links: [ { - icon: "custom:modrinth-small", + icon: "modrinth-small", url: "https://modrinth.com/user/moehreag" } ] @@ -254,15 +254,15 @@ export default { "Java programmer and modder, passionate about Kotlin and serverside technology.", links: [ { - icon: "fal fa-globe", + icon: "mdi:link-variant", url: "https://quiltservertools.net", }, { - icon: "custom:curseforge", + icon: "curseforge", url: "https://www.curseforge.com/members/potatoboy99999/projects", }, { - icon: "custom:modrinth-small", + icon: "modrinth-small", url: "https://modrinth.com/user/Potatoboy9999", }, ], @@ -281,7 +281,7 @@ export default { avatar: "/assets/img/team/snoozestudios.png", description: "Student, Coder & Much More!", links: [ - { icon: "fab fa-twitter", url: "https://twitter.com/snoozestudios" }, + { icon: "cib:twitter", url: "https://twitter.com/snoozestudios" }, ], }, Southpaw: { @@ -293,11 +293,11 @@ export default { "Inside of Quilt I help moderate community spaces and lead the Outreach team. Outside of Quilt I tinker with things to varying degrees of failure, and write things now and then. I also like cats.", links: [ { - icon: "fal fa-globe", + icon: "mdi:link-variant", url: "https://southpaw1496.me", }, { - icon: "fab fa-mastodon", + icon: "cib:mastodon", url: "https://mastodon.southpaw1496.me", }, ], @@ -311,11 +311,11 @@ export default { "A person who used to know nothing about programming and now makes fun of himself for it. Also likes Kotlin.", links: [ { - icon: "fas fa-link", + icon: "mdi:link-variant", url: "https://concern.i.ng", }, { - icon: "fab fa-mastodon", + icon: "cib:mastodon", url: "vmst.io/@sschr15", }, ], @@ -329,7 +329,7 @@ export default { "https://gitlab.com/uploads/-/system/user/avatar/3853177/avatar.png?width=400", links: [ { - icon: "fab fa-gitlab", + icon: "cib:mastodon", url: "https://gitlab.com/supersaiyansubtlety", }, ], @@ -341,7 +341,7 @@ export default { description: "Programming enthusiast, theater and music nerd, Gradle denier.", avatar: "https://avatars.githubusercontent.com/u/37983572?v=4", - links: [{ icon: "fas fa-link", url: "https://tibinonest.me/" }], + links: [{ icon: "mdi:link-variant", url: "https://tibinonest.me/" }], }, Woodie: { name: "Woodie", @@ -351,7 +351,7 @@ export default { avatar: "https://avatars.githubusercontent.com/u/17211100?v=4", links: [ { - icon: "custom:modrinth-small", + icon: "modrinth-small", url: "https://modrinth.com/user/woodiertexas", }, ]