Firq/firq-dev-website
Firq/firq-dev-website
1
0
Fork 0
Code Issues Pull requests Projects Releases 119 Packages Wiki Activity Actions

Mergin dev - new header, updated servants #29

Merged
Firq merged 7 commits from dev into main 2024-06-15 17:20:52 +00:00
Conversation 0 Commits 7 Files changed 16 +1672 -884
16 changed files with 1672 additions and 884 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.forgejo/workflows/build_preview.yml
View file

@ -22,10 +22,6 @@ jobs:
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
config-inline: |
[registry."docker.io"]
mirrors = ["https://docker-cache.neshweb.net"]
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
@ -44,13 +40,14 @@ jobs:
runs-on: docker
steps:
- name: Release New Version
uses: actions/forgejo-release@v1
uses: https://code.forgejo.org/actions/forgejo-release@v1
with:
direction: upload
url: https://forgejo.neshweb.net
release-dir: release
token: ${{ secrets.FORGEJO_TOKEN }}
tag: ${{ github.ref_name }}
prerelease: true
# doesn't work atm
# unlighthouse:

6
.forgejo/workflows/build_release.yml
View file

@ -22,10 +22,6 @@ jobs:
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
config-inline: |
[registry."docker.io"]
mirrors = ["https://docker-cache.neshweb.net"]
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
@ -44,7 +40,7 @@ jobs:
runs-on: docker
steps:
- name: Release New Version
uses: actions/forgejo-release@v1
uses: https://code.forgejo.org/actions/forgejo-release@v1
with:
direction: upload
url: https://forgejo.neshweb.net

2
.forgejo/workflows/unlighthouse.yml
View file

@ -23,6 +23,7 @@ jobs:
deploy-unlighthouse-files:
needs: [ unlighthouse ]
if: success()
runs-on: docker
env:
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
@ -67,6 +68,7 @@ jobs:
deploy-unlighthouse-site:
needs: [ deploy-unlighthouse-files ]
if: success()
runs-on: docker
env:
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}

2371
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
package.json
View file

@ -1,7 +1,7 @@
{
"name": "@firq/fgosite",
"type": "module",
"version": "0.1.24",
"version": "0.1.27",
"private": true,
"scripts": {
"dev": "astro dev",
@ -15,7 +15,7 @@
"@astrojs/check": "^0.3.3",
"@astrojs/mdx": "^2.0.3",
"@astrojs/sitemap": "^3.0.3",
"astro": "^4.0.7",
"astro": "^4.2.1",
"autoprefixer": "^10.4.16",
"iconoir": "^7.2.0",
"postcss-preset-env": "^9.3.0",

BIN
src/assets/ce/bond-ce/scathach.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
src/assets/ce/bond-ce/sherlock.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
src/assets/ce/bond-ce/taigong.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
src/assets/servant/scathach_03.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 KiB

BIN
src/assets/servant/sherlock_03.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
src/assets/servant/taigong_03.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 68 KiB

41
src/components/favouriteCard.astro
View file

@ -1,5 +1,5 @@
---
import { Image } from 'astro:assets';
import { Image } from 'astro:assets'
import type { GlobImage } from '../types/generic'
import { plsLoadImage } from '../utils/tools'
@ -12,11 +12,18 @@ export interface Props {
const { link, imageFile, origin, name } = Astro.props
const imagePath = `/src/assets/favourites/${imageFile}`
const images = import.meta.glob<GlobImage>('/src/assets/favourites/*.{png,webp}')
const images = import.meta.glob<GlobImage>(
'/src/assets/favourites/*.{png,webp}'
)
const loadedImage = plsLoadImage(images, imagePath)
---
<a href={link} target="_blank" rel="noopener noreferrer" aria-label=`${name} - new window`>
<a
href={link}
target="_blank"
rel="noopener noreferrer"
aria-label=`${name} - new window`
>
<div class="heading">{name}</div>
<Image src={loadedImage} alt={name} />
<h2 class="subtext">
@ -38,10 +45,6 @@ const loadedImage = plsLoadImage(images, imagePath)
align-items: center;
}
a:hover {
transform: scale(var(--hover-scale));
}
a {
border-radius: 1rem;
display: flex;
@ -57,12 +60,16 @@ const loadedImage = plsLoadImage(images, imagePath)
text-align: center;
transition: transform var(--speed) var(--ease);
text-decoration: none;
}
a > img {
padding: 0px 0.25em;
width: 90%;
height: auto;
&:hover {
transform: scale(var(--hover-scale));
}
img {
padding: 0px 0.25em;
width: 90%;
height: auto;
}
}
@media (min-width: 512px) {
@ -70,12 +77,10 @@ const loadedImage = plsLoadImage(images, imagePath)
padding: 10px 10px;
width: auto;
height: auto;
}
a > img {
padding: 0px 1.5em;
width: 200px;
height: auto;
img {
padding: 0px 1.5em;
width: 200px;
}
}
}

27
src/components/fgotaHero.astro Normal file
View file

@ -0,0 +1,27 @@
---
---
<div>
<span>
I am currently working on a site to catalogue past and future TAs.<br/>
Check it out at <a href="https://fgo-ta.com">fgo-ta.com</a>
</span>
</div>
<style>
div {
display: flex;
width: 100%;
height: 5em;
background-color: var(--c-gray);
text-align: center;
align-items: center;
justify-content: center;
color: white;
font-size: 1.5em;
}
a {
color: var(--c-darkpurple);
text-decoration: none;
}
</style>

8
src/pages/404.astro
View file

@ -17,7 +17,7 @@ const description = "Error. This shouldn't happen :/"
<Image src={sadshishou} alt="Sad Shishou" />
<h2>Well ... you were not supposed to end up here.</h2>
<a href="/" aria-label="Home" rel="noopener noreferrer">
<i class="iconoir-fast-arrow-left"></i>Go back home
&lt;&lt; Go back home
</a>
</div>
</BaseSection>
@ -50,10 +50,10 @@ const description = "Error. This shouldn't happen :/"
text-decoration: none;
font-size: 1.5rem;
font-weight: bold;
}
a:hover {
color: var(--c-darkpurple);
&:hover {
color: var(--c-darkpurple);
}
}
img {

2
src/pages/ta-collection.astro
View file

@ -11,6 +11,7 @@ import TaSection from '../layouts/taSection.astro'
import TaCard from '../components/taCard.astro'
import tadata from '../../static/data/_tadata.json'
import featured_data from '../../static/data/_featureddata.json'
import FgotaHero from '../components/fgotaHero.astro'
const important_data = tadata.filter(function (el) {
return [
@ -36,6 +37,7 @@ const description = 'A collection of TAs previously completed be Firq.'
currentpage="ta-collection"
descriptionOverride={description}
>
<FgotaHero />
<TaSection title="Notable TAs" abovetext="My most notable TAs">
{important_data.map((item) => <TaCard {...item} />)}
</TaSection>

88
static/data/_servantdata.json
View file

@ -1,9 +1,19 @@
[
{
"name": "Scathach",
"level": "120",
"np": "5",
"skills": "10 / 10 / 10",
"ml": "10",
"servantImageFile": "scathach_03.png",
"bondceImageFile": "scathach.png",
"bond10": true
},
{
"name": "Skadi",
"level": "120",
"np": "5",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "10",
"servantImageFile": "skadi_03.png",
"bondceImageFile": "skadi.png",
@ -13,7 +23,7 @@
"name": "Skadi",
"level": "70",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "1",
"servantImageFile": "skadi_02.png",
"bondceImageFile": "skadi.png",
@ -23,7 +33,7 @@
"name": "Skadi",
"level": "1",
"np": "1",
"skills": "10 / X / X ",
"skills": "10 / X / X",
"ml": "1",
"servantImageFile": "skadi_01.png",
"bondceImageFile": "skadi.png",
@ -33,18 +43,18 @@
"name": "Koyanskaya of Light",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "koyanlight_01.png",
"bondceImageFile": "koyanlight.png",
"bond10": false
"bond10": true
},
{
"name": "Castoria",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"ml": "7",
"skills": "10 / 10 / 10",
"ml": "10",
"servantImageFile": "castoria_02.png",
"bondceImageFile": "castoria.png",
"bond10": true
@ -53,7 +63,7 @@
"name": "Castoria",
"level": "70",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "1",
"servantImageFile": "castoria_01.png",
"bondceImageFile": "castoria.png",
@ -63,17 +73,17 @@
"name": "Oberon",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"ml": "Not Unlocked",
"skills": "10 / 10 / 10",
"ml": "1",
"servantImageFile": "oberon_02.png",
"bondceImageFile": "oberon.png",
"bond10": false
"bond10": true
},
{
"name": "Merlin",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "merlin_03.png",
"bondceImageFile": "merlin.png",
@ -83,7 +93,7 @@
"name": "Merlin",
"level": "70",
"np": "1",
"skills": "9 / 1 / 9 ",
"skills": "9 / 1 / 9",
"ml": "Not Unlocked",
"servantImageFile": "merlin_01.png",
"bondceImageFile": "merlin.png",
@ -93,7 +103,7 @@
"name": "Waver",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "waver_02.png",
"bondceImageFile": "waver.png",
@ -103,7 +113,7 @@
"name": "Reines",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "9",
"servantImageFile": "reines_01.png",
"bondceImageFile": "reines.png",
@ -113,7 +123,7 @@
"name": "Tamamo-no-Mae",
"level": "90",
"np": "2",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "tamamo_03.png",
"bondceImageFile": "tamamo.png",
@ -123,7 +133,7 @@
"name": "Van Gogh",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "10",
"servantImageFile": "gogh_01.png",
"bondceImageFile": "gogh.png",
@ -133,7 +143,7 @@
"name": "Miss Crane",
"level": "90",
"np": "1",
"skills": "10 / 10 / 10 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "crane_01.png",
"bondceImageFile": "crane.png",
@ -143,8 +153,8 @@
"name": "Ashiya Douman",
"level": "90",
"np": "1",
"skills": "9 / 9 / 10 ",
"ml": "Not Unlocked",
"skills": "9 / 9 / 10",
"ml": "10",
"servantImageFile": "douman_01.png",
"bondceImageFile": "douman.png",
"bond10": false
@ -153,27 +163,47 @@
"name": "Himiko",
"level": "90",
"np": "1",
"skills": "9 / 9 / 9 ",
"skills": "9 / 9 / 9",
"ml": "Not Unlocked",
"servantImageFile": "himiko_03.png",
"bondceImageFile": "himiko.png",
"bond10": false
},
{
"name": "Sherlock Holmes",
"level": "90",
"np": "1",
"skills": "9 / 10 / 9",
"ml": "Not Unlocked",
"servantImageFile": "sherlock_03.png",
"bondceImageFile": "sherlock.png",
"bond10": false
},
{
"name": "Nero (Bride)",
"level": "90",
"np": "1",
"skills": "10 / 10 / 9 ",
"skills": "10 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "bride_03.png",
"bondceImageFile": "bride.png",
"bond10": false
},
{
"name": "Taigon Wang",
"level": "70",
"np": "1",
"skills": "10 / 9 / 10",
"ml": "Not Unlocked",
"servantImageFile": "taigong_03.png",
"bondceImageFile": "taigong.png",
"bond10": false
},
{
"name": "Nightingale (Santa)",
"level": "80",
"np": "5",
"skills": "9 / 10 / 10 ",
"skills": "9 / 10 / 9",
"ml": "Not Unlocked",
"servantImageFile": "santagale_01.png",
"bondceImageFile": "santagale.png",
@ -183,7 +213,7 @@
"name": "Nightingale (Santa)",
"level": "60",
"np": "1",
"skills": "1 / 10 / 10 ",
"skills": "1 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "santagale_01.png",
"bondceImageFile": "santagale.png",
@ -193,7 +223,7 @@
"name": "Elisabeth Báthory",
"level": "40",
"np": "1",
"skills": "9 / 9 / X ",
"skills": "9 / 9 / X",
"ml": "Not Unlocked",
"servantImageFile": "liz_01.png",
"bondceImageFile": "liz.png",
@ -203,7 +233,7 @@
"name": "Wu Zetian",
"level": "60",
"np": "1",
"skills": "9 / 1 / 9 ",
"skills": "10 / 9 / 10",
"ml": "Not Unlocked",
"servantImageFile": "wu_01.png",
"bondceImageFile": "wu.png",
@ -213,7 +243,7 @@
"name": "Ibaraki-Douji",
"level": "40",
"np": "1",
"skills": "8 / 8 / X ",
"skills": "9 / 10 / X ",
"ml": "Not Unlocked",
"servantImageFile": "ibaraki_02.png",
"bondceImageFile": "ibaraki.png",
@ -223,7 +253,7 @@
"name": "Calamity Jane",
"level": "60",
"np": "1",
"skills": "1 / 9 / 9 ",
"skills": "1 / 9 / 9",
"ml": "Not Unlocked",
"servantImageFile": "jane_02.png",
"bondceImageFile": "jane.png",
@ -233,7 +263,7 @@
"name": "Chiron",
"level": "60",
"np": "1",
"skills": "1 / 9 / 9 ",
"skills": "1 / 10 / 10",
"ml": "Not Unlocked",
"servantImageFile": "chiron_01.png",
"bondceImageFile": "chiron.png",