-
{title}
-
{description}
+
{title}
+
{description}
diff --git a/src/layouts/taShowcaseLayout.astro b/src/layouts/taShowcaseLayout.astro
index c2f77a1..a9eb502 100644
--- a/src/layouts/taShowcaseLayout.astro
+++ b/src/layouts/taShowcaseLayout.astro
@@ -17,6 +17,7 @@ const { collection, collectionKey, baseurl } = Astro.props
const taEntry = await plsLoadTAEntry(collectionKey, collection)
const pagetitle = `${taEntry.info.title} - FGO TA`
const displaystate = taEntry.quests[0].data.length > 0 ? 'none' : 'flex'
+const hidetitle = taEntry.quests.length <= 1
---
0 ? 'none' : 'flex'
/>
{
taEntry.quests.map((item) => (
-
+
{item.data
.sort((a, b) => b.date.valueOf() - a.date.valueOf())
.map((item) => (
diff --git a/src/pages/database/[...slug].astro b/src/pages/database/[...slug].astro
index 9dad6f4..e425539 100644
--- a/src/pages/database/[...slug].astro
+++ b/src/pages/database/[...slug].astro
@@ -78,6 +78,12 @@ export async function getStaticPaths() {
}
const { key, group, questinfo, pageinfo } = Astro.props
+
+let baseurl_return = "database"
+if (key.includes("/")) {
+ baseurl_return = baseurl_return + "/" + key.split("/", 1)[0]
+}
+
---
{
@@ -85,7 +91,7 @@ const { key, group, questinfo, pageinfo } = Astro.props
)
}
diff --git a/src/pages/teslafest/[...slug].astro b/src/pages/teslafest/[...slug].astro
new file mode 100644
index 0000000..2527418
--- /dev/null
+++ b/src/pages/teslafest/[...slug].astro
@@ -0,0 +1,122 @@
+---
+import { getCollection } from 'astro:content'
+import TaShowcaseLayout from '../../layouts/taShowcaseLayout.astro'
+import Layout from '../../layouts/Layout.astro'
+import DatabaseSection from '../../layouts/databaseSection.astro'
+import QuestListing from '../../components/listings/questListingCard.astro'
+import SmallTitle from '../../components/smallTitle.astro'
+
+interface store {
+ slug: string
+ group: boolean
+ questinfo:
+ | undefined
+ | {
+ slug: string
+ info: {
+ title: string
+ releaseDate: Date
+ shortdescription: string
+ releaseNumber: number
+ }
+ }[]
+ pageinfo:
+ | undefined
+ | {
+ title: string
+ shortdescription: string
+ }
+}
+
+export async function getStaticPaths() {
+ const fulldata = await getCollection('teslafest')
+ const slugdata: store[] = fulldata.map((data) => {
+ return {
+ slug: data.id,
+ group: false,
+ questinfo: undefined,
+ pageinfo: undefined,
+ }
+ })
+
+ const groupdata = await getCollection('teslafestgroups')
+ const groups: store[] = groupdata.map((data) => {
+ return {
+ slug: data.id,
+ group: true,
+ questinfo: undefined,
+ pageinfo: undefined,
+ }
+ })
+
+ const full = slugdata.concat(groups as any)
+ full.map((data) => {
+ if (data.group) {
+ const coll = fulldata.filter((d) => d.id.split("/", 1)[0] == data.slug)
+ data.questinfo = coll.map((d) => {
+ return { slug: d.id, info: d.data.info }
+ })
+ data.questinfo.sort(
+ (a, b) =>
+ b.info.releaseDate.valueOf() - a.info.releaseDate.valueOf() ||
+ b.info.releaseNumber - a.info.releaseNumber
+ )
+ const page = groupdata.find((d) => d.id === data.slug)
+ data.pageinfo = page?.data.info
+ }
+ })
+
+ return full.map((data) => ({
+ params: { slug: data.slug },
+ props: {
+ key: data.slug,
+ group: data.group,
+ questinfo: data.questinfo,
+ pageinfo: data.pageinfo,
+ },
+ }))
+}
+
+const { key, group, questinfo, pageinfo } = Astro.props
+
+let baseurl_return = "teslafest"
+if (key.includes("/")) {
+ baseurl_return = baseurl_return + "/" + key.split("/", 1)[0]
+}
+
+---
+
+{
+ !group && (
+
+ )
+}
+{
+ group && (
+
+
+
+ {questinfo!.map((quest) => (
+
+ ))}
+
+
+ )
+}
diff --git a/src/pages/teslafest/[slug].astro b/src/pages/teslafest/[slug].astro
deleted file mode 100644
index efc33a1..0000000
--- a/src/pages/teslafest/[slug].astro
+++ /dev/null
@@ -1,13 +0,0 @@
----
-import { getCollection } from 'astro:content';
-import TaShowcaseLayout from '../../layouts/taShowcaseLayout.astro'
-
-export async function getStaticPaths() {
- const fulldata = (await getCollection('teslafest')).map((data) => data.id)
- return fulldata.map((slug) => ({ params: { slug } }))
-}
-
-const { slug } = Astro.params
----
-
-
diff --git a/src/pages/teslafest/index.astro b/src/pages/teslafest/index.astro
index 4314c3a..3d576b8 100644
--- a/src/pages/teslafest/index.astro
+++ b/src/pages/teslafest/index.astro
@@ -1,23 +1,28 @@
---
-import { getCollection } from 'astro:content';
+import { getCollection } from 'astro:content'
import Layout from '../../layouts/Layout.astro'
-import QuestListing from '../../components/listings/questListingCard.astro'
+import QuestListing from '../../components/listings/questListingLine.astro'
import DatabaseSection from '../../layouts/databaseSection.astro'
-import SmallTitle from '../../components/smallTitle.astro';
+import SmallTitle from '../../components/smallTitle.astro'
-const description = 'One of the most anticipated events of 2024 - Teslafest. Were the two weeks of time enough for all those quests, even with a parallel lottery?'
+const description =
+ 'One of the most anticipated events of 2024 - Teslafest. Were the two weeks of time enough for all those quests, even with a parallel lottery?'
const fulldata = await getCollection('teslafest')
+const groups = await getCollection('teslafestgroups')
-fulldata.sort(
- (a, b) => b.data.info.releaseDate.valueOf() - a.data.info.releaseDate.valueOf() || b.data.info.releaseNumber - a.data.info.releaseNumber
+let combined = fulldata
+for (const group of groups) {
+ combined = combined.filter((data) => !data.id.startsWith(group.id))
+}
+combined = combined.concat(groups as any)
+
+combined.sort(
+ (a, b) =>
+ b.data.info.releaseDate.valueOf() - a.data.info.releaseDate.valueOf() ||
+ b.data.info.releaseNumber - a.data.info.releaseNumber
)
-const gc = fulldata.filter((value) => value.id.startsWith("gc-"))
-const mc = fulldata.filter((value) => value.id.startsWith("mc-"))
-const cq = fulldata.filter((value) => value.id.startsWith("cq-"))
-const eq_2021 = fulldata.filter((value) => value.id.startsWith("eq-2021"))
-const eq_2020 = fulldata.filter((value) => value.id.startsWith("eq-2020"))
-
+console.log(combined)
---
value.id.startsWith("eq-2020"))
currentpage="teslafest"
descriptionOverride={description}
>
-
-
- {cq.map((quest) => )}
-
-
- {gc.map((quest) => )}
-
-
- {mc.map((quest) => )}
-
-
- {eq_2020.map((quest) => )}
-
-
- {eq_2021.map((quest) => )}
+
+
+ {
+ combined.map((quest) => { return ()})
+ }