More Redesign
All checks were successful
/ checking (push) Successful in 14s
/ build-site (push) Successful in 1m46s
/ publish (push) Successful in 7s

This commit is contained in:
Firq 2024-07-15 17:53:42 +02:00
parent 9e61582456
commit 5da1dde6a6
Signed by: Firq
GPG key ID: 3ACC61C8CEC83C20
13 changed files with 79 additions and 20 deletions

View file

@ -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",

View file

@ -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>

View file

@ -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 {

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
},

View file

@ -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"
}

View file

@ -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"
},

View file

@ -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"
}

View file

@ -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>

View file

@ -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) => (

View file

@ -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}

View file

@ -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>