diff --git a/Dockerfile b/Dockerfile index b71ffbf..7b2943f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ FROM forgejo.neshweb.net/firq/website-serve-docker:latest AS runtime COPY --from=build /app/dist /public COPY --from=build /app/serve.json /public/serve.json -RUN rm -r /public/assets/data/ +RUN rm -r /public/data/ ENV PORT 8081 EXPOSE 8081 diff --git a/package-lock.json b/package-lock.json index 331a458..01bdf97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@firq/fgosite", - "version": "0.1.6", + "version": "0.1.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@firq/fgosite", - "version": "0.1.6", + "version": "0.1.11", "dependencies": { "@astrojs/check": "^0.3.3", "@astrojs/sitemap": "^3.0.3", diff --git a/package.json b/package.json index 3ff968f..41def1f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@firq/fgosite", "type": "module", - "version": "0.1.10", + "version": "0.1.11", "private": true, "scripts": { "dev": "astro dev", diff --git a/serve.json b/serve.json index 6f9caef..0ce65b6 100644 --- a/serve.json +++ b/serve.json @@ -21,7 +21,7 @@ "source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)", "headers" : [{ "key" : "Cache-Control", - "value" : "max-age=86400" + "value" : "max-age=31536000" }] } ] diff --git a/static/assets/atlas.png b/src/assets/atlas.png similarity index 100% rename from static/assets/atlas.png rename to src/assets/atlas.png diff --git a/src/assets/ce/2030.png b/src/assets/ce/2030.png new file mode 100644 index 0000000..e9fae8f Binary files /dev/null and b/src/assets/ce/2030.png differ diff --git a/src/assets/ce/500.png b/src/assets/ce/500.png new file mode 100644 index 0000000..9f5623c Binary files /dev/null and b/src/assets/ce/500.png differ diff --git a/src/assets/ce/black_grail.png b/src/assets/ce/black_grail.png new file mode 100644 index 0000000..990ba68 Binary files /dev/null and b/src/assets/ce/black_grail.png differ diff --git a/src/assets/ce/bond-ce/bride.png b/src/assets/ce/bond-ce/bride.png new file mode 100644 index 0000000..06e7ac1 Binary files /dev/null and b/src/assets/ce/bond-ce/bride.png differ diff --git a/src/assets/ce/bond-ce/castoria.png b/src/assets/ce/bond-ce/castoria.png new file mode 100644 index 0000000..2b2875e Binary files /dev/null and b/src/assets/ce/bond-ce/castoria.png differ diff --git a/src/assets/ce/bond-ce/chiron.png b/src/assets/ce/bond-ce/chiron.png new file mode 100644 index 0000000..4380a67 Binary files /dev/null and b/src/assets/ce/bond-ce/chiron.png differ diff --git a/src/assets/ce/bond-ce/crane.png b/src/assets/ce/bond-ce/crane.png new file mode 100644 index 0000000..f90cc92 Binary files /dev/null and b/src/assets/ce/bond-ce/crane.png differ diff --git a/src/assets/ce/bond-ce/douman.png b/src/assets/ce/bond-ce/douman.png new file mode 100644 index 0000000..b44f694 Binary files /dev/null and b/src/assets/ce/bond-ce/douman.png differ diff --git a/src/assets/ce/bond-ce/gogh.png b/src/assets/ce/bond-ce/gogh.png new file mode 100644 index 0000000..e6f5f61 Binary files /dev/null and b/src/assets/ce/bond-ce/gogh.png differ diff --git a/src/assets/ce/bond-ce/himiko.png b/src/assets/ce/bond-ce/himiko.png new file mode 100644 index 0000000..1d5dcc2 Binary files /dev/null and b/src/assets/ce/bond-ce/himiko.png differ diff --git a/src/assets/ce/bond-ce/ibaraki.png b/src/assets/ce/bond-ce/ibaraki.png new file mode 100644 index 0000000..805175f Binary files /dev/null and b/src/assets/ce/bond-ce/ibaraki.png differ diff --git a/src/assets/ce/bond-ce/jane.png b/src/assets/ce/bond-ce/jane.png new file mode 100644 index 0000000..8a54d14 Binary files /dev/null and b/src/assets/ce/bond-ce/jane.png differ diff --git a/src/assets/ce/bond-ce/koyanlight.png b/src/assets/ce/bond-ce/koyanlight.png new file mode 100644 index 0000000..b5a9e61 Binary files /dev/null and b/src/assets/ce/bond-ce/koyanlight.png differ diff --git a/src/assets/ce/bond-ce/liz.png b/src/assets/ce/bond-ce/liz.png new file mode 100644 index 0000000..495d708 Binary files /dev/null and b/src/assets/ce/bond-ce/liz.png differ diff --git a/src/assets/ce/bond-ce/merlin.png b/src/assets/ce/bond-ce/merlin.png new file mode 100644 index 0000000..d3f492f Binary files /dev/null and b/src/assets/ce/bond-ce/merlin.png differ diff --git a/src/assets/ce/bond-ce/oberon.png b/src/assets/ce/bond-ce/oberon.png new file mode 100644 index 0000000..b836b58 Binary files /dev/null and b/src/assets/ce/bond-ce/oberon.png differ diff --git a/src/assets/ce/bond-ce/reines.png b/src/assets/ce/bond-ce/reines.png new file mode 100644 index 0000000..8cdea85 Binary files /dev/null and b/src/assets/ce/bond-ce/reines.png differ diff --git a/src/assets/ce/bond-ce/santagale.png b/src/assets/ce/bond-ce/santagale.png new file mode 100644 index 0000000..0163273 Binary files /dev/null and b/src/assets/ce/bond-ce/santagale.png differ diff --git a/src/assets/ce/bond-ce/skadi.png b/src/assets/ce/bond-ce/skadi.png new file mode 100644 index 0000000..a2d445d Binary files /dev/null and b/src/assets/ce/bond-ce/skadi.png differ diff --git a/src/assets/ce/bond-ce/tamamo.png b/src/assets/ce/bond-ce/tamamo.png new file mode 100644 index 0000000..03cac41 Binary files /dev/null and b/src/assets/ce/bond-ce/tamamo.png differ diff --git a/src/assets/ce/bond-ce/waver.png b/src/assets/ce/bond-ce/waver.png new file mode 100644 index 0000000..aafd1da Binary files /dev/null and b/src/assets/ce/bond-ce/waver.png differ diff --git a/src/assets/ce/bond-ce/wu.png b/src/assets/ce/bond-ce/wu.png new file mode 100644 index 0000000..cfc46a5 Binary files /dev/null and b/src/assets/ce/bond-ce/wu.png differ diff --git a/src/assets/ce/devilish_bodhisattva.png b/src/assets/ce/devilish_bodhisattva.png new file mode 100644 index 0000000..e466954 Binary files /dev/null and b/src/assets/ce/devilish_bodhisattva.png differ diff --git a/src/assets/ce/kaleidoscope.png b/src/assets/ce/kaleidoscope.png new file mode 100644 index 0000000..351d722 Binary files /dev/null and b/src/assets/ce/kaleidoscope.png differ diff --git a/src/assets/ce/maidens_teachings.png b/src/assets/ce/maidens_teachings.png new file mode 100644 index 0000000..9d520a5 Binary files /dev/null and b/src/assets/ce/maidens_teachings.png differ diff --git a/src/assets/ce/merciless_one.png b/src/assets/ce/merciless_one.png new file mode 100644 index 0000000..5645c4b Binary files /dev/null and b/src/assets/ce/merciless_one.png differ diff --git a/src/assets/ce/mlb.png b/src/assets/ce/mlb.png new file mode 100644 index 0000000..19e92b5 Binary files /dev/null and b/src/assets/ce/mlb.png differ diff --git a/static/assets/ce/mlb.webp b/src/assets/ce/mlb.webp similarity index 100% rename from static/assets/ce/mlb.webp rename to src/assets/ce/mlb.webp diff --git a/src/assets/ce/outrage.png b/src/assets/ce/outrage.png new file mode 100644 index 0000000..2cf3b1a Binary files /dev/null and b/src/assets/ce/outrage.png differ diff --git a/src/assets/ce/ox-demon.png b/src/assets/ce/ox-demon.png new file mode 100644 index 0000000..df903c0 Binary files /dev/null and b/src/assets/ce/ox-demon.png differ diff --git a/src/assets/ce/prisma_cosmos.png b/src/assets/ce/prisma_cosmos.png new file mode 100644 index 0000000..7604f00 Binary files /dev/null and b/src/assets/ce/prisma_cosmos.png differ diff --git a/src/assets/ce/vessel.png b/src/assets/ce/vessel.png new file mode 100644 index 0000000..8b267b4 Binary files /dev/null and b/src/assets/ce/vessel.png differ diff --git a/static/assets/embed.png b/src/assets/embed.png similarity index 100% rename from static/assets/embed.png rename to src/assets/embed.png diff --git a/src/assets/favourites/scathach.png b/src/assets/favourites/scathach.png new file mode 100644 index 0000000..e2325f7 Binary files /dev/null and b/src/assets/favourites/scathach.png differ diff --git a/src/assets/favourites/skadi.png b/src/assets/favourites/skadi.png new file mode 100644 index 0000000..1585b7f Binary files /dev/null and b/src/assets/favourites/skadi.png differ diff --git a/static/assets/fedora.png b/src/assets/fedora.png similarity index 100% rename from static/assets/fedora.png rename to src/assets/fedora.png diff --git a/static/assets/logo.svg b/src/assets/logo.svg similarity index 100% rename from static/assets/logo.svg rename to src/assets/logo.svg diff --git a/static/assets/lurker.png b/src/assets/lurker.png similarity index 100% rename from static/assets/lurker.png rename to src/assets/lurker.png diff --git a/static/assets/okita.png b/src/assets/okita.png similarity index 100% rename from static/assets/okita.png rename to src/assets/okita.png diff --git a/static/assets/old.logo.svg b/src/assets/old.logo.svg similarity index 100% rename from static/assets/old.logo.svg rename to src/assets/old.logo.svg diff --git a/static/assets/padoru.png b/src/assets/padoru.png similarity index 100% rename from static/assets/padoru.png rename to src/assets/padoru.png diff --git a/src/assets/servant/bride_03.png b/src/assets/servant/bride_03.png new file mode 100644 index 0000000..78ac024 Binary files /dev/null and b/src/assets/servant/bride_03.png differ diff --git a/src/assets/servant/castoria_01.png b/src/assets/servant/castoria_01.png new file mode 100644 index 0000000..0e5967b Binary files /dev/null and b/src/assets/servant/castoria_01.png differ diff --git a/src/assets/servant/castoria_02.png b/src/assets/servant/castoria_02.png new file mode 100644 index 0000000..8ac5d39 Binary files /dev/null and b/src/assets/servant/castoria_02.png differ diff --git a/src/assets/servant/chiron_01.png b/src/assets/servant/chiron_01.png new file mode 100644 index 0000000..ee9ae6a Binary files /dev/null and b/src/assets/servant/chiron_01.png differ diff --git a/src/assets/servant/crane_01.png b/src/assets/servant/crane_01.png new file mode 100644 index 0000000..24473f3 Binary files /dev/null and b/src/assets/servant/crane_01.png differ diff --git a/src/assets/servant/douman_01.png b/src/assets/servant/douman_01.png new file mode 100644 index 0000000..53cdeeb Binary files /dev/null and b/src/assets/servant/douman_01.png differ diff --git a/src/assets/servant/gogh_01.png b/src/assets/servant/gogh_01.png new file mode 100644 index 0000000..db0cc6c Binary files /dev/null and b/src/assets/servant/gogh_01.png differ diff --git a/src/assets/servant/himiko_03.png b/src/assets/servant/himiko_03.png new file mode 100644 index 0000000..e9a73df Binary files /dev/null and b/src/assets/servant/himiko_03.png differ diff --git a/src/assets/servant/ibaraki_02.png b/src/assets/servant/ibaraki_02.png new file mode 100644 index 0000000..01e43ab Binary files /dev/null and b/src/assets/servant/ibaraki_02.png differ diff --git a/src/assets/servant/jane_02.png b/src/assets/servant/jane_02.png new file mode 100644 index 0000000..f65d96d Binary files /dev/null and b/src/assets/servant/jane_02.png differ diff --git a/src/assets/servant/koyanlight_01.png b/src/assets/servant/koyanlight_01.png new file mode 100644 index 0000000..7fe8bbd Binary files /dev/null and b/src/assets/servant/koyanlight_01.png differ diff --git a/src/assets/servant/liz_01.png b/src/assets/servant/liz_01.png new file mode 100644 index 0000000..c1d83d8 Binary files /dev/null and b/src/assets/servant/liz_01.png differ diff --git a/src/assets/servant/merlin_01.png b/src/assets/servant/merlin_01.png new file mode 100644 index 0000000..8e8ffc5 Binary files /dev/null and b/src/assets/servant/merlin_01.png differ diff --git a/src/assets/servant/merlin_03.png b/src/assets/servant/merlin_03.png new file mode 100644 index 0000000..565563a Binary files /dev/null and b/src/assets/servant/merlin_03.png differ diff --git a/src/assets/servant/oberon_02.png b/src/assets/servant/oberon_02.png new file mode 100644 index 0000000..59bb4bc Binary files /dev/null and b/src/assets/servant/oberon_02.png differ diff --git a/src/assets/servant/reines_01.png b/src/assets/servant/reines_01.png new file mode 100644 index 0000000..e2ebfd2 Binary files /dev/null and b/src/assets/servant/reines_01.png differ diff --git a/src/assets/servant/santagale_01.png b/src/assets/servant/santagale_01.png new file mode 100644 index 0000000..7a1e541 Binary files /dev/null and b/src/assets/servant/santagale_01.png differ diff --git a/src/assets/servant/skadi_01.png b/src/assets/servant/skadi_01.png new file mode 100644 index 0000000..dfd43f3 Binary files /dev/null and b/src/assets/servant/skadi_01.png differ diff --git a/src/assets/servant/skadi_02.png b/src/assets/servant/skadi_02.png new file mode 100644 index 0000000..3218553 Binary files /dev/null and b/src/assets/servant/skadi_02.png differ diff --git a/src/assets/servant/skadi_03.png b/src/assets/servant/skadi_03.png new file mode 100644 index 0000000..a9687e6 Binary files /dev/null and b/src/assets/servant/skadi_03.png differ diff --git a/src/assets/servant/tamamo_03.png b/src/assets/servant/tamamo_03.png new file mode 100644 index 0000000..167e061 Binary files /dev/null and b/src/assets/servant/tamamo_03.png differ diff --git a/src/assets/servant/waver_02.png b/src/assets/servant/waver_02.png new file mode 100644 index 0000000..1860bc6 Binary files /dev/null and b/src/assets/servant/waver_02.png differ diff --git a/src/assets/servant/wu_01.png b/src/assets/servant/wu_01.png new file mode 100644 index 0000000..6c8b774 Binary files /dev/null and b/src/assets/servant/wu_01.png differ diff --git a/static/assets/shishousad.webp b/src/assets/shishousad.webp similarity index 100% rename from static/assets/shishousad.webp rename to src/assets/shishousad.webp diff --git a/static/assets/social/custom-fgo.webp b/src/assets/social/custom-fgo.webp similarity index 100% rename from static/assets/social/custom-fgo.webp rename to src/assets/social/custom-fgo.webp diff --git a/static/assets/social/discord.webp b/src/assets/social/discord.webp similarity index 100% rename from static/assets/social/discord.webp rename to src/assets/social/discord.webp diff --git a/static/assets/social/reddit.webp b/src/assets/social/reddit.webp similarity index 100% rename from static/assets/social/reddit.webp rename to src/assets/social/reddit.webp diff --git a/static/assets/social/twitch.webp b/src/assets/social/twitch.webp similarity index 100% rename from static/assets/social/twitch.webp rename to src/assets/social/twitch.webp diff --git a/static/assets/social/twitter.webp b/src/assets/social/twitter.webp similarity index 100% rename from static/assets/social/twitter.webp rename to src/assets/social/twitter.webp diff --git a/static/assets/social/youtube.webp b/src/assets/social/youtube.webp similarity index 100% rename from static/assets/social/youtube.webp rename to src/assets/social/youtube.webp diff --git a/static/assets/ta_icons/___albion.webp b/src/assets/ta_icons/___albion.webp similarity index 100% rename from static/assets/ta_icons/___albion.webp rename to src/assets/ta_icons/___albion.webp diff --git a/static/assets/ta_icons/__albion.webp b/src/assets/ta_icons/__albion.webp similarity index 100% rename from static/assets/ta_icons/__albion.webp rename to src/assets/ta_icons/__albion.webp diff --git a/static/assets/ta_icons/abyssalworm.webp b/src/assets/ta_icons/abyssalworm.webp similarity index 100% rename from static/assets/ta_icons/abyssalworm.webp rename to src/assets/ta_icons/abyssalworm.webp diff --git a/static/assets/ta_icons/albion.webp b/src/assets/ta_icons/albion.webp similarity index 100% rename from static/assets/ta_icons/albion.webp rename to src/assets/ta_icons/albion.webp diff --git a/static/assets/ta_icons/arthur.webp b/src/assets/ta_icons/arthur.webp similarity index 100% rename from static/assets/ta_icons/arthur.webp rename to src/assets/ta_icons/arthur.webp diff --git a/static/assets/ta_icons/barghest.webp b/src/assets/ta_icons/barghest.webp similarity index 100% rename from static/assets/ta_icons/barghest.webp rename to src/assets/ta_icons/barghest.webp diff --git a/static/assets/ta_icons/caenis.webp b/src/assets/ta_icons/caenis.webp similarity index 100% rename from static/assets/ta_icons/caenis.webp rename to src/assets/ta_icons/caenis.webp diff --git a/static/assets/ta_icons/calamityofnorwich.webp b/src/assets/ta_icons/calamityofnorwich.webp similarity index 100% rename from static/assets/ta_icons/calamityofnorwich.webp rename to src/assets/ta_icons/calamityofnorwich.webp diff --git a/static/assets/ta_icons/cernnunos.webp b/src/assets/ta_icons/cernnunos.webp similarity index 100% rename from static/assets/ta_icons/cernnunos.webp rename to src/assets/ta_icons/cernnunos.webp diff --git a/static/assets/ta_icons/db.webp b/src/assets/ta_icons/db.webp similarity index 100% rename from static/assets/ta_icons/db.webp rename to src/assets/ta_icons/db.webp diff --git a/static/assets/ta_icons/dioscuri.webp b/src/assets/ta_icons/dioscuri.webp similarity index 100% rename from static/assets/ta_icons/dioscuri.webp rename to src/assets/ta_icons/dioscuri.webp diff --git a/static/assets/ta_icons/douman.webp b/src/assets/ta_icons/douman.webp similarity index 100% rename from static/assets/ta_icons/douman.webp rename to src/assets/ta_icons/douman.webp diff --git a/static/assets/ta_icons/erice.webp b/src/assets/ta_icons/erice.webp similarity index 100% rename from static/assets/ta_icons/erice.webp rename to src/assets/ta_icons/erice.webp diff --git a/static/assets/ta_icons/fuuma.webp b/src/assets/ta_icons/fuuma.webp similarity index 100% rename from static/assets/ta_icons/fuuma.webp rename to src/assets/ta_icons/fuuma.webp diff --git a/static/assets/ta_icons/galatea.webp b/src/assets/ta_icons/galatea.webp similarity index 100% rename from static/assets/ta_icons/galatea.webp rename to src/assets/ta_icons/galatea.webp diff --git a/static/assets/ta_icons/goetia.webp b/src/assets/ta_icons/goetia.webp similarity index 100% rename from static/assets/ta_icons/goetia.webp rename to src/assets/ta_icons/goetia.webp diff --git a/static/assets/ta_icons/ibuki.webp b/src/assets/ta_icons/ibuki.webp similarity index 100% rename from static/assets/ta_icons/ibuki.webp rename to src/assets/ta_icons/ibuki.webp diff --git a/static/assets/ta_icons/izumo.webp b/src/assets/ta_icons/izumo.webp similarity index 100% rename from static/assets/ta_icons/izumo.webp rename to src/assets/ta_icons/izumo.webp diff --git a/static/assets/ta_icons/kamasummer.webp b/src/assets/ta_icons/kamasummer.webp similarity index 100% rename from static/assets/ta_icons/kamasummer.webp rename to src/assets/ta_icons/kamasummer.webp diff --git a/static/assets/ta_icons/kingprotea.webp b/src/assets/ta_icons/kingprotea.webp similarity index 100% rename from static/assets/ta_icons/kingprotea.webp rename to src/assets/ta_icons/kingprotea.webp diff --git a/static/assets/ta_icons/kirschtaria.webp b/src/assets/ta_icons/kirschtaria.webp similarity index 100% rename from static/assets/ta_icons/kirschtaria.webp rename to src/assets/ta_icons/kirschtaria.webp diff --git a/static/assets/ta_icons/kiyohime.webp b/src/assets/ta_icons/kiyohime.webp similarity index 100% rename from static/assets/ta_icons/kiyohime.webp rename to src/assets/ta_icons/kiyohime.webp diff --git a/static/assets/ta_icons/koyo.webp b/src/assets/ta_icons/koyo.webp similarity index 100% rename from static/assets/ta_icons/koyo.webp rename to src/assets/ta_icons/koyo.webp diff --git a/static/assets/ta_icons/melusine.webp b/src/assets/ta_icons/melusine.webp similarity index 100% rename from static/assets/ta_icons/melusine.webp rename to src/assets/ta_icons/melusine.webp diff --git a/static/assets/ta_icons/mhxx.webp b/src/assets/ta_icons/mhxx.webp similarity index 100% rename from static/assets/ta_icons/mhxx.webp rename to src/assets/ta_icons/mhxx.webp diff --git a/static/assets/ta_icons/morgan.webp b/src/assets/ta_icons/morgan.webp similarity index 100% rename from static/assets/ta_icons/morgan.webp rename to src/assets/ta_icons/morgan.webp diff --git a/static/assets/ta_icons/moriarty.webp b/src/assets/ta_icons/moriarty.webp similarity index 100% rename from static/assets/ta_icons/moriarty.webp rename to src/assets/ta_icons/moriarty.webp diff --git a/static/assets/ta_icons/nobunaga.webp b/src/assets/ta_icons/nobunaga.webp similarity index 100% rename from static/assets/ta_icons/nobunaga.webp rename to src/assets/ta_icons/nobunaga.webp diff --git a/static/assets/ta_icons/odysseus.webp b/src/assets/ta_icons/odysseus.webp similarity index 100% rename from static/assets/ta_icons/odysseus.webp rename to src/assets/ta_icons/odysseus.webp diff --git a/static/assets/ta_icons/orion.webp b/src/assets/ta_icons/orion.webp similarity index 100% rename from static/assets/ta_icons/orion.webp rename to src/assets/ta_icons/orion.webp diff --git a/static/assets/ta_icons/penth.webp b/src/assets/ta_icons/penth.webp similarity index 100% rename from static/assets/ta_icons/penth.webp rename to src/assets/ta_icons/penth.webp diff --git a/static/assets/ta_icons/reddragon.webp b/src/assets/ta_icons/reddragon.webp similarity index 100% rename from static/assets/ta_icons/reddragon.webp rename to src/assets/ta_icons/reddragon.webp diff --git a/static/assets/ta_icons/santagale.webp b/src/assets/ta_icons/santagale.webp similarity index 100% rename from static/assets/ta_icons/santagale.webp rename to src/assets/ta_icons/santagale.webp diff --git a/static/assets/ta_icons/sei.webp b/src/assets/ta_icons/sei.webp similarity index 100% rename from static/assets/ta_icons/sei.webp rename to src/assets/ta_icons/sei.webp diff --git a/static/assets/ta_icons/shibata.webp b/src/assets/ta_icons/shibata.webp similarity index 100% rename from static/assets/ta_icons/shibata.webp rename to src/assets/ta_icons/shibata.webp diff --git a/static/assets/ta_icons/skadi.webp b/src/assets/ta_icons/skadi.webp similarity index 100% rename from static/assets/ta_icons/skadi.webp rename to src/assets/ta_icons/skadi.webp diff --git a/static/assets/ta_icons/solomon.webp b/src/assets/ta_icons/solomon.webp similarity index 100% rename from static/assets/ta_icons/solomon.webp rename to src/assets/ta_icons/solomon.webp diff --git a/src/assets/ta_icons/ta_servants/caren.png b/src/assets/ta_icons/ta_servants/caren.png new file mode 100644 index 0000000..e7cedcd Binary files /dev/null and b/src/assets/ta_icons/ta_servants/caren.png differ diff --git a/src/assets/ta_icons/ta_servants/jalter.png b/src/assets/ta_icons/ta_servants/jalter.png new file mode 100644 index 0000000..cf91568 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/jalter.png differ diff --git a/src/assets/ta_icons/ta_servants/kama.png b/src/assets/ta_icons/ta_servants/kama.png new file mode 100644 index 0000000..3a24974 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/kama.png differ diff --git a/src/assets/ta_icons/ta_servants/musashi.png b/src/assets/ta_icons/ta_servants/musashi.png new file mode 100644 index 0000000..0166148 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/musashi.png differ diff --git a/src/assets/ta_icons/ta_servants/saberalter.png b/src/assets/ta_icons/ta_servants/saberalter.png new file mode 100644 index 0000000..a93e190 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/saberalter.png differ diff --git a/src/assets/ta_icons/ta_servants/shishou.png b/src/assets/ta_icons/ta_servants/shishou.png new file mode 100644 index 0000000..9485dd9 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/shishou.png differ diff --git a/src/assets/ta_icons/ta_servants/skadi.png b/src/assets/ta_icons/ta_servants/skadi.png new file mode 100644 index 0000000..c09fc84 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/skadi.png differ diff --git a/src/assets/ta_icons/ta_servants/summerjalter.png b/src/assets/ta_icons/ta_servants/summerjalter.png new file mode 100644 index 0000000..3c896b4 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/summerjalter.png differ diff --git a/src/assets/ta_icons/ta_servants/summermusashi.png b/src/assets/ta_icons/ta_servants/summermusashi.png new file mode 100644 index 0000000..23fa917 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/summermusashi.png differ diff --git a/src/assets/ta_icons/ta_servants/summershishou.png b/src/assets/ta_icons/ta_servants/summershishou.png new file mode 100644 index 0000000..0dc2c16 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/summershishou.png differ diff --git a/src/assets/ta_icons/ta_servants/tamamocat.png b/src/assets/ta_icons/ta_servants/tamamocat.png new file mode 100644 index 0000000..da03fe6 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/tamamocat.png differ diff --git a/src/assets/ta_icons/ta_servants/tomoe.png b/src/assets/ta_icons/ta_servants/tomoe.png new file mode 100644 index 0000000..b4df46e Binary files /dev/null and b/src/assets/ta_icons/ta_servants/tomoe.png differ diff --git a/src/assets/ta_icons/ta_servants/tomoesummer.png b/src/assets/ta_icons/ta_servants/tomoesummer.png new file mode 100644 index 0000000..ab72529 Binary files /dev/null and b/src/assets/ta_icons/ta_servants/tomoesummer.png differ diff --git a/static/assets/ta_icons/taira.webp b/src/assets/ta_icons/taira.webp similarity index 100% rename from static/assets/ta_icons/taira.webp rename to src/assets/ta_icons/taira.webp diff --git a/static/assets/ta_icons/woodwose.webp b/src/assets/ta_icons/woodwose.webp similarity index 100% rename from static/assets/ta_icons/woodwose.webp rename to src/assets/ta_icons/woodwose.webp diff --git a/static/assets/ta_icons/zenobia.webp b/src/assets/ta_icons/zenobia.webp similarity index 100% rename from static/assets/ta_icons/zenobia.webp rename to src/assets/ta_icons/zenobia.webp diff --git a/static/assets/technologies/astro.webp b/src/assets/technologies/astro.webp similarity index 100% rename from static/assets/technologies/astro.webp rename to src/assets/technologies/astro.webp diff --git a/static/assets/technologies/docker.webp b/src/assets/technologies/docker.webp similarity index 100% rename from static/assets/technologies/docker.webp rename to src/assets/technologies/docker.webp diff --git a/src/assets/technologies/dockge.png b/src/assets/technologies/dockge.png new file mode 100644 index 0000000..695aeb7 Binary files /dev/null and b/src/assets/technologies/dockge.png differ diff --git a/static/assets/technologies/forgejo.webp b/src/assets/technologies/forgejo.webp similarity index 100% rename from static/assets/technologies/forgejo.webp rename to src/assets/technologies/forgejo.webp diff --git a/static/assets/technologies/nodejs.webp b/src/assets/technologies/nodejs.webp similarity index 100% rename from static/assets/technologies/nodejs.webp rename to src/assets/technologies/nodejs.webp diff --git a/static/assets/technologies/serve.webp b/src/assets/technologies/serve.webp similarity index 100% rename from static/assets/technologies/serve.webp rename to src/assets/technologies/serve.webp diff --git a/static/assets/technologies/typescript.webp b/src/assets/technologies/typescript.webp similarity index 100% rename from static/assets/technologies/typescript.webp rename to src/assets/technologies/typescript.webp diff --git a/static/assets/technologies/unlighthouse.webp b/src/assets/technologies/unlighthouse.webp similarity index 100% rename from static/assets/technologies/unlighthouse.webp rename to src/assets/technologies/unlighthouse.webp diff --git a/src/components/ceCard.astro b/src/components/ceCard.astro index 5d154d4..deed4d9 100644 --- a/src/components/ceCard.astro +++ b/src/components/ceCard.astro @@ -1,16 +1,21 @@ --- +import type { ImageMetadata } from 'astro' +import { Image } from 'astro:assets' +import mlb_ce from '../assets/ce/mlb.webp' + export interface Props { name: string - link: string + imageFile: string mlb: string } -const { mlb, link, name } = Astro.props +const { mlb, imageFile, name } = Astro.props +const imagePath = `/src/assets/ce/${imageFile}` +const images_ces = import.meta.glob<{ default: ImageMetadata }>( + '/src/assets/ce/*.{png,webp}' +) -const ce_img: string = `/assets/ce/${link}.webp` -const mlb_ce: string = `/assets/ce/mlb.webp` let mlb_image: string = 'mlbalign' - if (mlb === 'false') { mlb_image = 'hidemlb' } @@ -18,10 +23,10 @@ if (mlb === 'false') {
- {name} + {name}
- Max-limit broken + Max-limit broken
@@ -86,6 +91,7 @@ if (mlb === 'false') { .mlb { width: 5.5rem; + height: auto; margin-left: auto; margin-right: auto; } diff --git a/src/components/contactCard.astro b/src/components/contactCard.astro index 1317487..6a43077 100644 --- a/src/components/contactCard.astro +++ b/src/components/contactCard.astro @@ -1,20 +1,25 @@ --- +import type { ImageMetadata } from 'astro' +import { Image } from 'astro:assets' + export interface Props { site: string link: string - image: string + imageFile: string } -const { image, link, site } = Astro.props -const icon: string = `background-image: url('/assets/social/${image}.webp')` +const { imageFile, link, site } = Astro.props +const imagePath = `/src/assets/social/${imageFile}` +const images_logos = import.meta.glob<{ default: ImageMetadata }>( + '/src/assets/social/*.{png,webp}' +) ---
-
- -

{site}

-
+ +
+

{site}

@@ -24,18 +29,29 @@ const icon: string = `background-image: url('/assets/social/${image}.webp')` text-decoration: none; } - article div { - border-radius: 1.25rem; - background-size: contain; - display: flex; - align-items: center; - justify-content: center; + article { --size-value: 6.25rem; + border-radius: 1.25rem; + display: flex; + justify-content: center; + align-items: center; + background-color: var(--c-darkergray); + border-color: var(--c-darkgray); + padding: 10px; + text-align: center; + transition: transform var(--speed) var(--ease); + height: auto; + width: auto; + position: relative; + } + + article img { + border-radius: 1.25rem; width: var(--size-value); height: var(--size-value); } - article:hover span { + article:hover div { border-radius: 1.25rem; padding: 0 0.5rem; display: flex; @@ -43,9 +59,11 @@ const icon: string = `background-image: url('/assets/social/${image}.webp')` justify-content: center; text-align: center; background-color: var(--c-darkgray); - height: calc(var(--size-value) + 0.1rem); - width: calc(var(--size-value) + 0.1rem); + height: calc(var(--size-value)); + width: calc(var(--size-value) - 1rem); opacity: 90%; + z-index: 100; + position: absolute; } article:hover h2 { @@ -57,25 +75,14 @@ const icon: string = `background-image: url('/assets/social/${image}.webp')` } article h2 { + position: absolute; display: none; } - article span { + article div { display: none; } - article { - border-radius: 1.25rem; - display: flex; - align-items: center; - justify-content: center; - background-color: var(--c-darkergray); - border-color: var(--c-darkgray); - padding: 10px; - text-align: center; - transition: transform var(--speed) var(--ease); - height: auto; - width: auto; - } + a:hover { transform: scale(var(--hover-scale)); } diff --git a/src/components/favouriteCard.astro b/src/components/favouriteCard.astro index 9cf6c4b..897e139 100644 --- a/src/components/favouriteCard.astro +++ b/src/components/favouriteCard.astro @@ -1,19 +1,22 @@ --- +import type { ImageMetadata } from 'astro'; +import { Image } from 'astro:assets'; + export interface Props { name: string origin: string - image: string + imageFile: string link: string } -const { link, image, origin, name } = Astro.props - -const img: string = `/assets/favourites/${image}.webp` +const { link, imageFile, origin, name } = Astro.props +const imagePath = `/src/assets/favourites/${imageFile}` +const images = import.meta.glob<{ default: ImageMetadata }>('/src/assets/favourites/*.{png,webp}') ---
{name}
- {name} + {name}

{origin}

diff --git a/src/components/navbar.astro b/src/components/navbar.astro index bed56e2..d4a6971 100644 --- a/src/components/navbar.astro +++ b/src/components/navbar.astro @@ -1,9 +1,11 @@ --- +import { Image } from 'astro:assets'; +import logo from '../assets/logo.svg' ---
- + Website Logo