diff --git a/src/components/contactCard.astro b/src/components/contactCard.astro index c35b78c..407c7d8 100644 --- a/src/components/contactCard.astro +++ b/src/components/contactCard.astro @@ -9,7 +9,7 @@ const { image, link, site } = Astro.props const icon: string = `background-image: url('/social/${image}.webp')` --- - +

{site}

diff --git a/src/components/taCard.astro b/src/components/taCard.astro index 2e7e13a..0f5b0c8 100644 --- a/src/components/taCard.astro +++ b/src/components/taCard.astro @@ -4,9 +4,10 @@ export interface Props { title: string link: string image: string + user?: string } -const { date, image, link, title } = Astro.props +const { user, date, image, link, title } = Astro.props const options_date: Intl.DateTimeFormatOptions = { year: 'numeric', @@ -16,6 +17,11 @@ const options_date: Intl.DateTimeFormatOptions = { const formatted_date = new Date(date).toLocaleDateString('de-DE', options_date) const icon: string = `background: url('/ta_icons/${image}.webp')` + +let hasuser = '' +if (user !== undefined) { + hasuser = 'hasuser' +} --- @@ -24,12 +30,21 @@ const icon: string = `background: url('/ta_icons/${image}.webp')`

{title}

+ + By {user}
• + {formatted_date}

diff --git a/src/layouts/basicSection.astro b/src/layouts/aboutSection.astro similarity index 93% rename from src/layouts/basicSection.astro rename to src/layouts/aboutSection.astro index 0ed8b5c..8915cd5 100644 --- a/src/layouts/basicSection.astro +++ b/src/layouts/aboutSection.astro @@ -16,7 +16,7 @@ const { title } = Astro.props diff --git a/src/pages/ta-collection.astro b/src/pages/ta-collection.astro index 69eb6c3..0e21515 100644 --- a/src/pages/ta-collection.astro +++ b/src/pages/ta-collection.astro @@ -10,6 +10,7 @@ import Layout from '../layouts/Layout.astro' import TaSection from '../layouts/taSection.astro' import TaCard from '../components/taCard.astro' import tadata from '../../static/_tadata.json' +import featured_data from '../../static/_featureddata.json' const important_data = tadata.filter(function (el) { return [ @@ -21,6 +22,7 @@ const important_data = tadata.filter(function (el) { tadata.sort((a, b) => Date.parse(b.date) - Date.parse(a.date)) important_data.sort((a, b) => Date.parse(b.date) - Date.parse(a.date)) +featured_data.sort((a, b) => Date.parse(b.date) - Date.parse(a.date)) const description = 'A collection of TAs previously completed be Firq.' --- @@ -36,6 +38,12 @@ const description = 'A collection of TAs previously completed be Firq.' {tadata.map((item) => )} + + {featured_data.map((item) => )} + diff --git a/static/_featureddata.json b/static/_featureddata.json new file mode 100644 index 0000000..d9f2139 --- /dev/null +++ b/static/_featureddata.json @@ -0,0 +1,135 @@ +[ + { + "title": "DB 7T", + "link": "https://www.youtube.com/watch?v=nYV4jwgpuR0", + "image": "db", + "date": "2022-07-14", + "user": "KOG" + }, + { + "title": "DB 7T", + "link": "https://www.youtube.com/watch?v=jKoSw1XM6-c", + "image": "db", + "date": "2022-07-07", + "user": "Requiem" + }, + { + "title": "Valentines 2023 CQ 5T SC", + "link": "https://www.youtube.com/watch?v=AkDFyJ98GDQ", + "image": "orion", + "date": "2023-02-23", + "user": "Requiem" + }, + { + "title": "Ibuki 3T (Lostbelt 5.5)", + "link": "https://www.youtube.com/watch?v=zHGvHC0CUu0", + "image": "ibuki", + "date": "2022-11-22", + "user": "Requiem" + }, + { + "title": "Kingprotea 1T", + "link": "https://www.youtube.com/watch?v=iAhwqIGWsG4", + "image": "kingprotea", + "date": "2022-09-13", + "user": "Requiem" + }, + { + "title": "Golden Caenis 3T (LB5.2)", + "link": "https://www.youtube.com/watch?v=_yZYgdr6XA4", + "image": "caenis", + "date": "2022-04-22", + "user": "Requiem" + }, + { + "title": "GudaGuda 4 CQ 3T [No DMG CE]", + "link": "https://www.youtube.com/watch?v=oCT7ngip82U", + "image": "shibata", + "date": "2022-04-26", + "user": "Requiem" + }, + { + "title": "Valentines 2023 CQ 4T", + "link": "https://www.youtube.com/watch?v=6WyPFYT8h1c", + "image": "orion", + "date": "2023-02-25", + "user": "KOG" + }, + { + "title": "Ooku Rerun CQ 4T", + "link": "https://www.youtube.com/watch?v=EU2THj6GnhQ", + "image": "kiyohime", + "date": "2022-08-12", + "user": "KOG" + }, + { + "title": "Amazoness 2021 CQ 3T", + "link": "https://www.youtube.com/watch?v=l2cmlS9LKSU", + "image": "penth", + "date": "2022-01-22", + "user": "KOG" + }, + { + "title": "Christmas 2021 CQ 4T", + "link": "https://www.youtube.com/watch?v=PrJvjo3fvVc", + "image": "santagale", + "date": "2021-12-20", + "user": "KOG" + }, + { + "title": "GudaGuda 4 CQ 3T", + "link": "https://www.youtube.com/watch?v=e9H37cnW160", + "image": "shibata", + "date": "2021-06-29", + "user": "KOG" + }, + { + "title": "GudaGuda 5 CQ 4T", + "link": "https://www.youtube.com/watch?v=HmrWnxp8Qz0", + "image": "nobunaga", + "date": "2022-09-24", + "user": "Ray" + }, + { + "title": "GudaGuda 5 CQ 4T", + "link": "https://www.youtube.com/watch?v=pcvhCQq5gFE", + "image": "nobunaga", + "date": "2022-09-23", + "user": "Ray" + }, + { + "title": "Ibuki 3T (Lostbelt 5.5)", + "link": "https://www.youtube.com/watch?v=pcvhCQq5gFE", + "image": "ibuki", + "date": "2022-11-26", + "user": "Ray" + }, + { + "title": "Douman 3T (Lostbelt 5.5)", + "link": "https://www.youtube.com/watch?v=CIoNRC4tDrY", + "image": "douman", + "date": "2022-11-27", + "user": "Ray" + }, + { + "title": "Boxing 3T (Xmas 5)", + "link": "https://www.youtube.com/watch?v=0ErT8Qbzuw8", + "image": "dioscuri", + "date": "2022-12-18", + "user": "Ray" + }, + { + "title": "Slapstick Museum CQ 5T", + "link": "https://www.youtube.com/watch?v=QtthHB6rk7k", + "image": "moriarty", + "date": "2023-03-10", + "user": "Ray" + }, + { + "title": "Little Big Tengu CQ 4T", + "link": "https://www.youtube.com/watch?v=50Adjx4owhg", + "image": "taira", + "date": "2023-01-29", + "user": "Ray" + } +] diff --git a/static/_othertadata.json b/static/_othertadata.json deleted file mode 100644 index 74476fe..0000000 --- a/static/_othertadata.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "kog": { - "site": "Youtube: @Kog", - "link": "https://www.youtube.com/@KOGtxt", - "image": "youtube" - }, - "requiem": { - "site": "Youtube: @Requiem", - "link": "https://www.youtube.com/@requiemTA", - "image": "youtube" - } -} diff --git a/static/ta_icons/caenis.webp b/static/ta_icons/caenis.webp new file mode 100644 index 0000000..392d08f Binary files /dev/null and b/static/ta_icons/caenis.webp differ diff --git a/static/ta_icons/kiyohime.webp b/static/ta_icons/kiyohime.webp new file mode 100644 index 0000000..83390ba Binary files /dev/null and b/static/ta_icons/kiyohime.webp differ