From 5da1dde6a62763da893c9e8432013928e9790224 Mon Sep 17 00:00:00 2001
From: Firq <firelp42@gmail.com>
Date: Mon, 15 Jul 2024 17:53:42 +0200
Subject: [PATCH] More Redesign

---
 package.json                                  |  2 +-
 .../listings/eventListingLine.astro           |  2 +-
 src/components/smallTitle.astro               | 23 +++++++++++++++----
 src/content/changes/appends-120.json          | 11 +++++++++
 src/content/changes/castoria.json             | 11 +++++++++
 src/content/changes/koyan.json                |  2 +-
 src/content/changes/oberon.json               | 11 +++++++++
 src/content/changes/skadi.json                |  2 +-
 src/content/groups/lostbelt-6.json            |  4 ++--
 src/layouts/taShowcaseLayout.astro            | 22 ++++++++++++++----
 src/pages/database/[...slug].astro            |  1 +
 src/pages/database/index.astro                |  4 ++--
 src/pages/teslafest/index.astro               |  4 ++--
 13 files changed, 79 insertions(+), 20 deletions(-)
 create mode 100644 src/content/changes/appends-120.json
 create mode 100644 src/content/changes/castoria.json
 create mode 100644 src/content/changes/oberon.json

diff --git a/package.json b/package.json
index 47ddf88..4ef5a06 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fgo-ta-com-website",
   "type": "module",
-  "version": "0.2.2-pre.4",
+  "version": "0.2.2-pre.5",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
diff --git a/src/components/listings/eventListingLine.astro b/src/components/listings/eventListingLine.astro
index 8922b74..3685de1 100644
--- a/src/components/listings/eventListingLine.astro
+++ b/src/components/listings/eventListingLine.astro
@@ -22,7 +22,7 @@ const render_date = releaseDate.toLocaleDateString('en-GB', options_date)
   <article>
     <h2>{title}</h2>
     <h3>{render_date}</h3>
-    <p>{shortdescription}</p>
+    <!-- <p>{shortdescription}</p> -->
   </article>
 </a>
 
diff --git a/src/components/smallTitle.astro b/src/components/smallTitle.astro
index c548afd..279cc44 100644
--- a/src/components/smallTitle.astro
+++ b/src/components/smallTitle.astro
@@ -6,16 +6,18 @@ export interface Props {
   subtext: string
   fadeout?: boolean
   baseurl?: string
+  returnbutton?: boolean
 }
-const { maintext, subtext, fadeout, baseurl } = Astro.props
-const display = fadeout ? "": "display: none"
+const { maintext, subtext, fadeout, baseurl, returnbutton } = Astro.props
+const displayFadeout = fadeout ? "": "display: none"
+const displayBackButton = returnbutton ? "": "display: none"
 ---
 
 <div class="wrap">
   <div class="head">{maintext}</div>
   <div class="sub">{subtext}</div>
-  <a href=`/${baseurl}`>&lt&lt Back to database</a>
-  <div class="fade" style={display}></div>
+  <a href=`/${baseurl}` style={displayBackButton}>&lt&lt Back to {baseurl}</a>
+  <div class="fade" style={displayFadeout}></div>
 </div>
 
 <style>
@@ -23,8 +25,19 @@ const display = fadeout ? "": "display: none"
     font-weight: 600;
     font-family: 'Work Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial, sans-serif;
     color: white;
-    padding: 0.5rem 0px;
+    margin: 1rem 0px 0px;
+    padding: 0.5rem 0.75rem;
     text-decoration: none;
+    background-color: var(--c-lightgray);
+    border-radius: 10px;
+    border-style: solid;
+    border-width: 2px;
+    border-color: var(--c-lightgray);
+    text-transform: capitalize;
+  }
+
+  a:hover {
+    border-color: var(--c-darkpurple);
   }
 
   .wrap {
diff --git a/src/content/changes/appends-120.json b/src/content/changes/appends-120.json
new file mode 100644
index 0000000..499b0bd
--- /dev/null
+++ b/src/content/changes/appends-120.json
@@ -0,0 +1,11 @@
+{
+  "info": {
+    "title": "Appends and Level 120",
+    "releaseDate": "2022-05-23",
+    "shortdescription": "Release of Append Skills and increased level cap of 120 with the Servant Coins Update",
+    "releaseNumber": 1,
+    "type": "event"
+  },
+  "link": "https://fategrandorder.fandom.com/wiki/FGO_Summer_2021_Event_Revival_(US)#Game_Updates",
+  "color": "#d4af37"
+}
diff --git a/src/content/changes/castoria.json b/src/content/changes/castoria.json
new file mode 100644
index 0000000..7977e58
--- /dev/null
+++ b/src/content/changes/castoria.json
@@ -0,0 +1,11 @@
+{
+  "info": {
+    "title": "Castoria",
+    "releaseDate": "2022-07-04",
+    "shortdescription": "Release of Castoria during the 5rd Anniversary of the game",
+    "releaseNumber": 1,
+    "type": "event"
+  },
+  "link": "https://apps.atlasacademy.io/db/NA/servant/284/",
+  "color": "#0b67fb"
+}
diff --git a/src/content/changes/koyan.json b/src/content/changes/koyan.json
index 2c93a5a..828231c 100644
--- a/src/content/changes/koyan.json
+++ b/src/content/changes/koyan.json
@@ -2,7 +2,7 @@
   "info": {
     "title": "Koyanskaya of Light",
     "releaseDate": "2023-07-03",
-    "shortdescription": "Release of Koyanskaya of Light during 6th Anniversary of the game",
+    "shortdescription": "Release of Koyanskaya of Light during the 6th Anniversary of the game",
     "releaseNumber": 1,
     "type": "event"
   },
diff --git a/src/content/changes/oberon.json b/src/content/changes/oberon.json
new file mode 100644
index 0000000..0d74a01
--- /dev/null
+++ b/src/content/changes/oberon.json
@@ -0,0 +1,11 @@
+{
+  "info": {
+    "title": "Oberon",
+    "releaseDate": "2023-07-10",
+    "shortdescription": "Release of Oberon during the Lostbelt 6 Conclusion Campaign",
+    "releaseNumber": 1,
+    "type": "event"
+  },
+  "link": "https://apps.atlasacademy.io/db/NA/servant/316/",
+  "color": "#f7281f"
+}
diff --git a/src/content/changes/skadi.json b/src/content/changes/skadi.json
index 7923425..447f3e7 100644
--- a/src/content/changes/skadi.json
+++ b/src/content/changes/skadi.json
@@ -2,7 +2,7 @@
   "info": {
     "title": "Scathach-Skadi",
     "releaseDate": "2020-07-06",
-    "shortdescription": "Release of Scathach-Skadi during 3rd Anniversary of the game",
+    "shortdescription": "Release of Scathach-Skadi during the 3rd Anniversary of the game",
     "releaseNumber": 1,
     "type": "event"
   },
diff --git a/src/content/groups/lostbelt-6.json b/src/content/groups/lostbelt-6.json
index 3494f8b..5f1dd63 100644
--- a/src/content/groups/lostbelt-6.json
+++ b/src/content/groups/lostbelt-6.json
@@ -1,8 +1,8 @@
 {
   "info": {
-    "title": "Lostbelt 6",
+    "title": "Lostbelt 6 - Avalon le Fae",
     "releaseDate": "2023-06-06",
-    "shortdescription": "Lostbelt 6",
+    "shortdescription": "The 6th Lostbelt, the journey into the Fairy Kingdom of Queen Morgan - do you have what it takes for some of the most difficult content of this game?",
     "releaseNumber": 1,
     "type": "group"
   }
diff --git a/src/layouts/taShowcaseLayout.astro b/src/layouts/taShowcaseLayout.astro
index 4bb7ff8..f95739d 100644
--- a/src/layouts/taShowcaseLayout.astro
+++ b/src/layouts/taShowcaseLayout.astro
@@ -5,17 +5,18 @@ import TACard from '../components/taCard.astro'
 import { plsLoadTAEntry } from '../utils/tools'
 import { Image } from 'astro:assets'
 import lizsad from '../assets/lizsad.png'
+import SmallTitle from '../components/smallTitle.astro'
 
 export interface Props {
-  collection: "teslafest" | "taInfoData"
+  collection: 'teslafest' | 'taInfoData'
   collectionKey: string
-  baseurl: "database" | "teslafest"
+  baseurl: 'database' | 'teslafest'
 }
 
 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 displaystate = taEntry.quests[0].data.length > 0 ? 'none' : 'flex'
 ---
 
 <Layout
@@ -23,7 +24,13 @@ const displaystate = taEntry.quests[0].data.length > 0 ? "none" : "flex"
   currentpage="database-entry"
   descriptionOverride={taEntry.info.shortdescription}
 >
-  <a href=`/${baseurl}`>&lt&lt Back to database</a>
+  <SmallTitle
+    maintext={taEntry.info.title}
+    subtext={taEntry.info.shortdescription}
+    fadeout={true}
+    baseurl={baseurl}
+    returnbutton={true}
+  />
   {
     taEntry.quests.map((item) => (
       <BaseSection title={item.questTitle} description={item.description}>
@@ -36,7 +43,12 @@ const displaystate = taEntry.quests[0].data.length > 0 ? "none" : "flex"
     ))
   }
   <div style=`display: ${displaystate}` class="overridewrapper">
-    <Image class="overrideimage" src={lizsad} alt="Sad override if there are no runs" loading="eager"></Image>
+    <Image
+      class="overrideimage"
+      src={lizsad}
+      alt="Sad override if there are no runs"
+      loading="eager"
+    />
   </div>
   <div class="placeholder"></div>
 </Layout>
diff --git a/src/pages/database/[...slug].astro b/src/pages/database/[...slug].astro
index 597615c..c71d40f 100644
--- a/src/pages/database/[...slug].astro
+++ b/src/pages/database/[...slug].astro
@@ -101,6 +101,7 @@ const { key, group, questinfo, pageinfo } = Astro.props
         subtext={pageinfo!.shortdescription}
         fadeout={true}
         baseurl="database"
+        returnbutton={true}
       />
       <DatabaseSection title="" titlehidden={true}>
         {questinfo!.map((quest) => (
diff --git a/src/pages/database/index.astro b/src/pages/database/index.astro
index 5b4516d..7085571 100644
--- a/src/pages/database/index.astro
+++ b/src/pages/database/index.astro
@@ -4,7 +4,7 @@ import Layout from '../../layouts/Layout.astro'
 import QuestListing from '../../components/listings/questListingLine.astro'
 import EventListing from '../../components/listings/eventListingLine.astro'
 import DatabaseSection from '../../layouts/databaseSection.astro'
-import Title from '../../components/title.astro'
+import SmallTitle from '../../components/smallTitle.astro'
 
 const description = 'FGO NA TA Database'
 const fulldata = await getCollection('taInfoData')
@@ -29,7 +29,7 @@ combined.sort(
   currentpage="database"
   descriptionOverride={description}
 >
-  <Title
+  <SmallTitle
     maintext="TA DATA­BASE"
     subtext="A mostly up-to-date list of NA TA runs"
     fadeout={true}
diff --git a/src/pages/teslafest/index.astro b/src/pages/teslafest/index.astro
index c822f20..c1d07f6 100644
--- a/src/pages/teslafest/index.astro
+++ b/src/pages/teslafest/index.astro
@@ -4,7 +4,7 @@ import Layout from '../../layouts/Layout.astro'
 import QuestListing from '../../components/listings/questListingCard.astro'
 import DatabaseSection from '../../layouts/databaseSection.astro'
 import GenericHero from '../../components/genericHero.astro';
-import Title from '../../components/title.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 fulldata = await getCollection('teslafest')
@@ -26,7 +26,7 @@ const eq_2020 = fulldata.filter((value) => value.id.startsWith("eq-2020"))
   currentpage="teslafest"
   descriptionOverride={description}
 >
-  <Title maintext='TESLA&shy;FEST' subtext='' fadeout={true}/>
+  <SmallTitle maintext='TESLA&shy;FEST' subtext='' fadeout={true}/>
   <DatabaseSection title="Challenge Quest">
     {cq.map((quest) => <QuestListing { ...{...quest.data.info, slug: quest.id} } baseurl="teslafest" />)}
   </DatabaseSection>