Compare commits
No commits in common. "main" and "0.1.11pre5" have entirely different histories.
main
...
0.1.11pre5
|
@ -40,14 +40,13 @@ jobs:
|
|||
runs-on: docker
|
||||
steps:
|
||||
- name: Release New Version
|
||||
uses: https://code.forgejo.org/actions/forgejo-release@v1
|
||||
uses: 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:
|
||||
|
|
|
@ -2,6 +2,9 @@ on:
|
|||
push:
|
||||
tags:
|
||||
- '[0-9]+\.[0-9]+\.[0-9]+'
|
||||
- '[0-9]+\.[0-9]+\.[0-9]+a[0-9]+'
|
||||
- '[0-9]+\.[0-9]+\.[0-9]+b[0-9]+'
|
||||
- '[0-9]+\.[0-9]+\.[0-9]+rc[0-9]+'
|
||||
|
||||
jobs:
|
||||
checking:
|
||||
|
@ -40,7 +43,7 @@ jobs:
|
|||
runs-on: docker
|
||||
steps:
|
||||
- name: Release New Version
|
||||
uses: https://code.forgejo.org/actions/forgejo-release@v1
|
||||
uses: actions/forgejo-release@v1
|
||||
with:
|
||||
direction: upload
|
||||
url: https://forgejo.neshweb.net
|
||||
|
|
|
@ -7,7 +7,7 @@ on:
|
|||
jobs:
|
||||
unlighthouse:
|
||||
runs-on: docker
|
||||
container: forgejo.neshweb.net/ci-docker-images/unlighthouse:latest
|
||||
container: forgejo.neshweb.net/firq/unlighthouse-docker:latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: https://code.forgejo.org/actions/checkout@v3
|
||||
|
@ -23,7 +23,6 @@ jobs:
|
|||
|
||||
deploy-unlighthouse-files:
|
||||
needs: [ unlighthouse ]
|
||||
if: success()
|
||||
runs-on: docker
|
||||
env:
|
||||
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
||||
|
@ -68,7 +67,6 @@ jobs:
|
|||
|
||||
deploy-unlighthouse-site:
|
||||
needs: [ deploy-unlighthouse-files ]
|
||||
if: success()
|
||||
runs-on: docker
|
||||
env:
|
||||
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
||||
|
@ -93,6 +91,5 @@ jobs:
|
|||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
script: |
|
||||
PATH="$HOME/.local/bin:$PATH"
|
||||
screen -ls | grep 'firq_dev-unlighthouse' | awk '{print $1}' | xargs -I % -t screen -X -S % quit
|
||||
cd firq_dev
|
||||
screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p ${{ secrets.UNLIGHTHOUSE_DEPLOY_PORT }}
|
||||
|
|
12
.vscode/settings.json
vendored
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
"files.exclude": {
|
||||
"**/.git": true,
|
||||
"**/.svn": true,
|
||||
"**/.hg": true,
|
||||
"**/CVS": true,
|
||||
"**/.DS_Store": true,
|
||||
"**/Thumbs.db": true,
|
||||
"**/__pycache__": true
|
||||
},
|
||||
"hide-files.files": []
|
||||
}
|
|
@ -4,7 +4,7 @@ COPY . .
|
|||
RUN npm i
|
||||
RUN npm run build
|
||||
|
||||
FROM forgejo.neshweb.net/ci-docker-images/website-serve:latest AS runtime
|
||||
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
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { defineConfig } from 'astro/config';
|
||||
|
||||
// https://astro.build/config
|
||||
import sitemap from "@astrojs/sitemap";
|
||||
import mdx from "@astrojs/mdx";
|
||||
|
||||
// https://astro.build/config
|
||||
export default defineConfig({
|
||||
|
@ -10,5 +10,5 @@ export default defineConfig({
|
|||
outDir: 'dist',
|
||||
publicDir: 'static',
|
||||
site: 'https://firq.dev/',
|
||||
integrations: [sitemap(), mdx()]
|
||||
integrations: [sitemap()]
|
||||
});
|
4510
package-lock.json
generated
16
package.json
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "@firq/fgosite",
|
||||
"type": "module",
|
||||
"version": "0.1.27",
|
||||
"version": "0.1.11",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "astro dev",
|
||||
|
@ -11,18 +11,10 @@
|
|||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"@astro-community/astro-embed-youtube": "^0.4.3",
|
||||
"@astrojs/check": "^0.3.3",
|
||||
"@astrojs/mdx": "^2.0.3",
|
||||
"@astrojs/sitemap": "^3.0.3",
|
||||
"astro": "^4.2.1",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"iconoir": "^7.2.0",
|
||||
"postcss-preset-env": "^9.3.0",
|
||||
"astro": "^4.0.7",
|
||||
"iconoir": "^6.1.0",
|
||||
"typescript": "^5.3.3"
|
||||
},
|
||||
"browserslist": [
|
||||
"last 2 versions",
|
||||
">0.5% and not dead"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
module.exports = {
|
||||
plugins: {
|
||||
"postcss-preset-env": {
|
||||
autoprefixer: { flexbox: "no-2009" },
|
||||
stage: 2,
|
||||
features: {
|
||||
"custom-properties": false,
|
||||
"custom-media-queries": true,
|
||||
"nesting-rules": true
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
|
@ -14,14 +14,14 @@
|
|||
"source" : "**/*.css",
|
||||
"headers" : [{
|
||||
"key" : "Cache-Control",
|
||||
"value" : "max-age=31536000"
|
||||
"value" : "max-age=86400"
|
||||
}]
|
||||
},
|
||||
{
|
||||
"source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
|
||||
"headers" : [{
|
||||
"key" : "Cache-Control",
|
||||
"value" : "max-age=31536000"
|
||||
"value" : "max-age=86400"
|
||||
}]
|
||||
}
|
||||
]
|
||||
|
|
Before Width: | Height: | Size: 38 KiB |
BIN
src/assets/ce/2030.webp
Normal file
After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 34 KiB |
BIN
src/assets/ce/500.webp
Normal file
After Width: | Height: | Size: 4 KiB |
BIN
src/assets/ce/bg.webp
Normal file
After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 18 KiB |
BIN
src/assets/ce/bond-ce/bride.webp
Normal file
After Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 16 KiB |
BIN
src/assets/ce/bond-ce/castoria.webp
Normal file
After Width: | Height: | Size: 8.9 KiB |
Before Width: | Height: | Size: 22 KiB |
BIN
src/assets/ce/bond-ce/chiron.webp
Normal file
After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 19 KiB |
BIN
src/assets/ce/bond-ce/crane.webp
Normal file
After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 24 KiB |
BIN
src/assets/ce/bond-ce/douman.webp
Normal file
After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 23 KiB |
BIN
src/assets/ce/bond-ce/gogh.webp
Normal file
After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 14 KiB |
BIN
src/assets/ce/bond-ce/himiko.webp
Normal file
After Width: | Height: | Size: 814 B |
Before Width: | Height: | Size: 20 KiB |
BIN
src/assets/ce/bond-ce/ibaraki.webp
Normal file
After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 22 KiB |
BIN
src/assets/ce/bond-ce/jane.webp
Normal file
After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 21 KiB |
BIN
src/assets/ce/bond-ce/koyanlight.webp
Normal file
After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 23 KiB |
BIN
src/assets/ce/bond-ce/liz.webp
Normal file
After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 20 KiB |
BIN
src/assets/ce/bond-ce/merlin.webp
Normal file
After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 18 KiB |
BIN
src/assets/ce/bond-ce/oberon.webp
Normal file
After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 20 KiB |
BIN
src/assets/ce/bond-ce/reines.webp
Normal file
After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 20 KiB |
BIN
src/assets/ce/bond-ce/santagale.webp
Normal file
After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 21 KiB |
BIN
src/assets/ce/bond-ce/skadi.webp
Normal file
After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 23 KiB |
BIN
src/assets/ce/bond-ce/tamamo.webp
Normal file
After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 17 KiB |
BIN
src/assets/ce/bond-ce/waver.webp
Normal file
After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 23 KiB |
BIN
src/assets/ce/bond-ce/wu.webp
Normal file
After Width: | Height: | Size: 15 KiB |
BIN
src/assets/ce/db.webp
Normal file
After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 35 KiB |
BIN
src/assets/ce/kaleidoscope.webp
Normal file
After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 32 KiB |
BIN
src/assets/ce/maidensteachings.webp
Normal file
After Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 38 KiB |
BIN
src/assets/ce/merciless_one.webp
Normal file
After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 36 KiB |
BIN
src/assets/ce/outrage.webp
Normal file
After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 41 KiB |
BIN
src/assets/ce/oxdemon.webp
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
src/assets/ce/prisma.webp
Normal file
After Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 36 KiB |
BIN
src/assets/ce/vessel.webp
Normal file
After Width: | Height: | Size: 5 KiB |
Before Width: | Height: | Size: 554 KiB |
BIN
src/assets/favourites/scathach.webp
Normal file
After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 565 KiB |
BIN
src/assets/favourites/skadi.webp
Normal file
After Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 97 KiB |
BIN
src/assets/servant/bride_03.webp
Normal file
After Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 63 KiB |
BIN
src/assets/servant/castoria_01.webp
Normal file
After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 70 KiB |
BIN
src/assets/servant/castoria_02.webp
Normal file
After Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 58 KiB |
BIN
src/assets/servant/chiron_01.webp
Normal file
After Width: | Height: | Size: 8.6 KiB |
Before Width: | Height: | Size: 52 KiB |
BIN
src/assets/servant/crane_01.webp
Normal file
After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 76 KiB |
BIN
src/assets/servant/douman_01.webp
Normal file
After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 75 KiB |
BIN
src/assets/servant/gogh_01.webp
Normal file
After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 93 KiB |
BIN
src/assets/servant/himiko_03.webp
Normal file
After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 72 KiB |
BIN
src/assets/servant/ibaraki_02.webp
Normal file
After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 73 KiB |
BIN
src/assets/servant/jane_03.webp
Normal file
After Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 84 KiB |