diff --git a/src/components/Card.astro b/src/components/Card.astro deleted file mode 100644 index ee57d4d..0000000 --- a/src/components/Card.astro +++ /dev/null @@ -1,62 +0,0 @@ ---- -export interface Props { - title: string; - body: string; - href: string; -} - -const { href, title, body } = Astro.props; ---- - -
  • - -

    - {title} - → -

    -

    - {body} -

    -     -
    • - diff --git a/src/components/navbar.astro b/src/components/navbar.astro index 3e4040d..3bc7221 100644 --- a/src/components/navbar.astro +++ b/src/components/navbar.astro @@ -1,28 +1,12 @@ --- -export interface Props { - currentPage: string; -} - -const {currentPage } = Astro.props; ---
    - + -
    @@ -61,23 +45,4 @@ const {currentPage } = Astro.props; margin-block-end: 0px; line-height: 1.5em; } - li { - align-items: center; - justify-content: center; - text-align: left; - display: flex; - width: 200px; - } - li > a { - color: white; - text-decoration: none; - justify-content: center; - align-items: center; - font-size: 1.4em; - height: 100%; - font-weight: bold; - } - li > a:hover{ - color: #551a8b; - } \ No newline at end of file diff --git a/src/components/navbarEntry.astro b/src/components/navbarEntry.astro new file mode 100644 index 0000000..1fb718d --- /dev/null +++ b/src/components/navbarEntry.astro @@ -0,0 +1,50 @@ +--- +export interface Props { + currentPage?: string; + link: string; + text: string; + icon: string; +} + +const {icon, text, link, currentPage } = Astro.props; + +let currPage = ""; + +if (currentPage === link.replace(new RegExp('/', 'g'), "")) { + currPage = "current" +} else if (currentPage === "home" && link === "/") { + currPage = "current" +} +--- + +
  • + + + {text} + +
    • + + \ No newline at end of file diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 121350c..ba7e0d7 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,9 +1,14 @@ --- +import Navbar from '../components/navbar.astro'; +import NavbarEntry from '../components/navbarEntry.astro'; +import navdata from '../../static/_navdata.json' + export interface Props { title: string; + currentpage: string; } -const { title } = Astro.props; +const { currentpage, title } = Astro.props; const description: string = "A reference for all esports Servants, CEs and already completed TAs that Firq can provide. Contact information available as well."; --- @@ -25,6 +30,9 @@ const description: string = "A reference for all esports Servants, CEs and alrea + + {navdata.map((item) => ())} + diff --git a/src/layouts/aboutSection.astro b/src/layouts/basicSection.astro similarity index 100% rename from src/layouts/aboutSection.astro rename to src/layouts/basicSection.astro diff --git a/src/layouts/customFooter.astro b/src/layouts/customFooter.astro index c5f81f8..a2fe612 100644 --- a/src/layouts/customFooter.astro +++ b/src/layouts/customFooter.astro @@ -31,7 +31,8 @@ \ No newline at end of file diff --git a/src/pages/experiment.astro b/src/pages/experiment.astro deleted file mode 100644 index 29feb94..0000000 --- a/src/pages/experiment.astro +++ /dev/null @@ -1,14 +0,0 @@ ---- -import Layout from '../layouts/Layout.astro'; -import Navbar from '../components/navbar.astro'; -import Hero from '../components/hero.astro'; - ---- - - - - - - - diff --git a/src/pages/index.astro b/src/pages/index.astro index ca437ab..467c42c 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,15 +1,11 @@ --- import Layout from '../layouts/Layout.astro'; -import CustomFooter from '../layouts/customFooter.astro'; -import Hometitle from '../layouts/hometitle.astro'; -import NavbuttonsTitle from '../components/navbuttonsTitle.astro'; +import Hero from '../components/hero.astro'; --- - - - - + + diff --git a/src/pages/servants.astro b/src/pages/servants.astro index f0e77d7..95b2c55 100644 --- a/src/pages/servants.astro +++ b/src/pages/servants.astro @@ -1,32 +1,23 @@ --- import Layout from '../layouts/Layout.astro'; import BaseSection from '../layouts/baseSection.astro'; -import TaSection from '../layouts/taSection.astro'; -import ContactSection from '../layouts/contactSection.astro'; import CustomFooter from '../layouts/customFooter.astro'; import ServantCard from '../components/servantCard.astro'; -import CeCard from '../components/ceCard.astro'; -import TaCard from '../components/taCard.astro'; -import ContactCard from '../components/contactCard.astro'; - import servantdata from '../../static/_servantdata.json' + +import CeCard from '../components/ceCard.astro'; import cedata from '../../static/_cedata.json' -import tadata from '../../static/_tadata.json' -import contactdata from '../../static/_contactdata.json' --- - + {servantdata.map((item) => ())} {cedata.map((item) => ())} - - {tadata.map((item) => ())} - diff --git a/src/pages/ta-collection.astro b/src/pages/ta-collection.astro new file mode 100644 index 0000000..cd65cb7 --- /dev/null +++ b/src/pages/ta-collection.astro @@ -0,0 +1,19 @@ +--- +import Layout from '../layouts/Layout.astro'; +import CustomFooter from '../layouts/customFooter.astro'; + +import TaSection from '../layouts/taSection.astro'; +import TaCard from '../components/taCard.astro'; +import tadata from '../../static/_tadata.json' + +--- + + + + {tadata.map((item) => ())} + + + + + \ No newline at end of file diff --git a/static/_navdata.json b/static/_navdata.json new file mode 100644 index 0000000..ff13d8b --- /dev/null +++ b/static/_navdata.json @@ -0,0 +1,27 @@ +[ + { + "link": "/", + "text": "Home", + "icon": "iconoir-home-alt" + }, + { + "link": "/servants", + "text": "Servants", + "icon": "iconoir-database-script" + }, + { + "link": "/ta-collection", + "text": "TA Collection", + "icon": "iconoir-db" + }, + { + "link": "/blog", + "text": "Blog", + "icon": "iconoir-bookmark-book" + }, + { + "link": "/about", + "text": "About", + "icon": "iconoir-mail" + } +] \ No newline at end of file diff --git a/static/_tadata.json b/static/_tadata.json index 3eb0263..bb62f61 100644 --- a/static/_tadata.json +++ b/static/_tadata.json @@ -28,5 +28,50 @@ "title": "MHXX 2T (No DMG CE)", "link": "https://www.youtube.com/watch?v=lz6iBZvoDuw", "image": "mhxx" + }, + { + "title": "Taira 3T (Lostbelt 5.5)", + "link": "https://www.youtube.com/watch?v=YtRvahqFA0Y", + "image": "taira" + }, + { + "title": "Douman 3T (Lostbelt 5.5)", + "link": "https://www.youtube.com/watch?v=6cstr3vTd8Y", + "image": "douman" + }, + { + "title": "Christmas 2021 Rerun CQ 5T", + "link": "https://www.youtube.com/watch?v=cpqhx9dUgTU", + "image": "santagale" + }, + { + "title": "Summer 4 Rerun CQ 3T", + "link": "https://www.youtube.com/watch?v=u72o7PDBtks", + "image": "fuuma" + }, + { + "title": "Fate/Requiem CQ 3T", + "link": "https://www.youtube.com/watch?v=k7vGC4kpEFg", + "image": "erice" + }, + { + "title": "Kirschtaria 3T (Lostbelt 5)", + "link": "https://www.youtube.com/watch?v=k7vGC4kpEFg", + "image": "kirschtaria" + }, + { + "title": "Aeaean Spring Breeze CQ 3T", + "link": "https://www.youtube.com/watch?v=uo3jI9xuVwI", + "image": "odysseus" + }, + { + "title": "Valentines 2022 CQ 4T", + "link": "https://www.youtube.com/watch?v=MOCMXZ17FkU", + "image": "sei" + }, + { + "title": "Amazoness 2021 CQ 3T", + "link": "https://www.youtube.com/watch?v=MU_Hw2KKYRU", + "image": "penth" } ] diff --git a/static/ta_icons/douman.webp b/static/ta_icons/douman.webp new file mode 100644 index 0000000..169cfb2 Binary files /dev/null and b/static/ta_icons/douman.webp differ diff --git a/static/ta_icons/erice.webp b/static/ta_icons/erice.webp new file mode 100644 index 0000000..cb3f35b Binary files /dev/null and b/static/ta_icons/erice.webp differ diff --git a/static/ta_icons/fuuma.webp b/static/ta_icons/fuuma.webp new file mode 100644 index 0000000..212b5ed Binary files /dev/null and b/static/ta_icons/fuuma.webp differ diff --git a/static/ta_icons/kirschtaria.webp b/static/ta_icons/kirschtaria.webp new file mode 100644 index 0000000..8225378 Binary files /dev/null and b/static/ta_icons/kirschtaria.webp differ diff --git a/static/ta_icons/odysseus.webp b/static/ta_icons/odysseus.webp new file mode 100644 index 0000000..8c68de4 Binary files /dev/null and b/static/ta_icons/odysseus.webp differ diff --git a/static/ta_icons/penth.webp b/static/ta_icons/penth.webp new file mode 100644 index 0000000..c4d0c4e Binary files /dev/null and b/static/ta_icons/penth.webp differ diff --git a/static/ta_icons/santagale.webp b/static/ta_icons/santagale.webp new file mode 100644 index 0000000..9d764fe Binary files /dev/null and b/static/ta_icons/santagale.webp differ diff --git a/static/ta_icons/sei.webp b/static/ta_icons/sei.webp new file mode 100644 index 0000000..1709825 Binary files /dev/null and b/static/ta_icons/sei.webp differ diff --git a/static/ta_icons/taira.webp b/static/ta_icons/taira.webp new file mode 100644 index 0000000..59e44a0 Binary files /dev/null and b/static/ta_icons/taira.webp differ