.forgejo/workflows/build_preview.yml

@@ -1,97 +0,0 @@
-on:
-  push:
-    tags:
-      - '[0-9]+\.[0-9]+\.[0-9]+-pre\.[0-9]+'
-
-jobs:
-  check-tag:
-    runs-on: docker
-    steps:
-      - name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      - name: Check if Version in package.json matches Tag
-        run: |
-          VERSION=$(npm pkg get version --workspaces=false | tr -d \")
-          if test $VERSION != "${{ github.ref_name }}"; then 
-            echo "Expected Version is: '${{  github.ref_name }}' actual Version is: '$VERSION'"; 
-            exit 1
-          else 
-            echo "Version is: '$VERSION'"; 
-          fi 
-
-  checking:
-    needs: [ check-tag ]
-    runs-on: docker
-    container: forgejo.neshweb.net/ci-docker-images/node-alpine-git:latest
-    steps:
-      - name: Checkout source code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      - name: Install packages
-        run: npm i
-      - name: Run astro check (linting +  static analysis)
-        run: npm run astro check
-
-  build-site:
-    needs: [ checking ]
-    if: success()
-    runs-on: dind
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Log into Docker Package Registry
-        uses: docker/login-action@v3
-        with:
-          registry: forgejo.neshweb.net
-          username: ${{ secrets.FORGEJO_USERNAME }}
-          password: ${{ secrets.FORGEJO_TOKEN }}
-      - name: Build and push to Docker Package Registry
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          tags: forgejo.neshweb.net/firq/fgo-ta-com-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/fgo-ta-com-website:preview
-
-  create-release:
-    needs: [ build-site ]
-    if: success()
-    runs-on: docker
-    steps:
-      - name: Release New Version
-        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
-
-  auto-deploy-dockge:
-    needs: [ build-site ]
-    if: success()
-    runs-on: docker
-    container: forgejo.neshweb.net/firq/dockge-cli:0.1.2
-    steps:
-      - name: Configure Dockge CLI
-        run: |
-          dockge host '${{ vars.DOCKGE_HOST }}'
-          dockge login --user '${{ secrets.DOCKGE_USER }}' --password '${{ secrets.DOCKGE_CREDENTIAL }}'
-      - name: Check status and redeploy
-        run: |
-          dockge status fgo-ta-com-preview
-          dockge update fgo-ta-com-preview
-          dockge status fgo-ta-com-preview
-
-  run-unlighthouse:
-    needs: [ build-site ]
-    if: success()
-    runs-on: docker
-    steps:
-      - name: Launch workflow
-        run: |
-          payload="{\"ref\": \"${GITHUB_REF_NAME}\", \"inputs\": { \"containertag\": \"${GITHUB_REF_NAME}\" }}"
-          curl -X "POST" \
-          -H "accept: application/json" \
-          -H "Content-Type: application/json" \
-          -H "Authorization: token ${GITHUB_TOKEN}" \
-          -d "${payload}" \
-          "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/actions/workflows/unlighthouse.yml/dispatches" -v

.forgejo/workflows/build_release.yml

@@ -2,32 +2,19 @@ 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:
-  check-tag:
-    runs-on: docker
-    steps:
-      - name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      - name: Check if Version in package.json matches Tag
-        run: |
-          VERSION=$(npm pkg get version --workspaces=false | tr -d \")
-          if test $VERSION != "${{ github.ref_name }}"; then 
-            echo "Expected Version is: '${{  github.ref_name }}' actual Version is: '$VERSION'"; 
-            exit 1
-          else 
-            echo "Version is: '$VERSION'"; 
-          fi 
-
   checking:
-    needs: [ check-tag ]
     runs-on: docker
-    container: forgejo.neshweb.net/ci-docker-images/node-alpine-git:latest
+    container: node:lts
     steps:
       - name: Checkout source code
         uses: https://code.forgejo.org/actions/checkout@v3
       - name: Install packages
-        run: npm i
+        run: npm install
       - name: Run astro check (linting +  static analysis)
         run: npm run astro check
 
@@ -38,44 +25,28 @@ jobs:
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Log into Docker Package Registry
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           registry: forgejo.neshweb.net
           username: ${{ secrets.FORGEJO_USERNAME }}
           password: ${{ secrets.FORGEJO_TOKEN }}
-      - name: Build and push to Docker Package Registry
+      - name: Push to Package Registry
         uses: docker/build-push-action@v5
         with:
           push: true
           tags: forgejo.neshweb.net/firq/fgo-ta-com-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/fgo-ta-com-website:latest
 
-  create-release:
+  release:
     needs: [build-site]
     if: success()
     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 }}
-
-  auto-deploy-dockge:
-    needs: [ build-site ]
-    if: success()
-    runs-on: docker
-    container: forgejo.neshweb.net/firq/dockge-cli:0.1.2
-    steps:
-      - name: Configure Dockge CLI
-        run: |
-          dockge host '${{ vars.DOCKGE_HOST }}'
-          dockge login --user '${{ secrets.DOCKGE_USER }}' --password '${{ secrets.DOCKGE_CREDENTIAL }}'
-      - name: Check status and redeploy
-        run: |
-          dockge status fgo-ta-com
-          dockge update fgo-ta-com
-          dockge status fgo-ta-com

.forgejo/workflows/linting.yml

@@ -1,25 +1,16 @@
 on:
   push:
     branches:
-      - '**'
+      - "**"
 
 jobs:
-  get-version:
+  checking:
     runs-on: docker
-    steps:
+    container: node:lts
-      - name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      - name: Check if Version in package.json matches Tag
-        run: |
-          VERSION=$(npm pkg get version --workspaces=false | tr -d \")
-          echo "Version is: '$VERSION'"; 
-  astro-check:
-    runs-on: docker
-    container: forgejo.neshweb.net/ci-docker-images/node-alpine-git:latest
     steps:
       - name: Checkout source code
         uses: https://code.forgejo.org/actions/checkout@v3
       - name: Install packages
-        run: npm i
+        run: npm install
       - name: Run astro check (linting +  static analysis)
         run: npm run astro check

.forgejo/workflows/unlighthouse.yml

@@ -1,91 +0,0 @@
-name: Run unlighthouse-tests [Downstream pipeline]
-run-name: Run unlighthouse-tests [Downstream pipeline] for version ${{ inputs.containertag }}
-on:
-  workflow_dispatch:
-    inputs:
-      containertag:
-        description: "Tag of the container to test"
-        default: "preview"
-        type: "string"
-
-jobs:
-  unlighthouse:
-    runs-on: docker
-    container: 
-      image: forgejo.neshweb.net/ci-docker-images/unlighthouse:0.3.0
-    services:
-      website:
-        image: forgejo.neshweb.net/firq/fgo-ta-com-website:${{ inputs.containertag }}
-        options: >-
-          --workdir /
-    steps:
-      - name: Checkout repository
-        uses: https://code.forgejo.org/actions/checkout@v3 
-      - name: Check availability
-        run: |
-          while [ "$(curl -o /dev/null -s -w '%{http_code}' http://localhost:8081/)" -ne 200 ];
-            do echo "Waiting...";
-            sleep 5;
-          done;
-      - name: Run unlighthouse
-        run: unlighthouse-ci --site "http://localhost:8081/"
-      - name: Replace URLs
-        run: find ./unlighthouse-reports -type f | xargs sed -i "s|http://localhost:8081|https://preview.fgo-ta.com|g";
-      - name: Prepare artifacts
-        run: cp serve.json unlighthouse-reports
-      - name: Upload reports
-        uses: actions/upload-artifact@v3
-        with:
-          name: unlighthouse-reports
-          path: unlighthouse-reports/
-      - name: Upload Dockerfile
-        uses: actions/upload-artifact@v3
-        with:
-          name: dockerfile
-          path: Dockerfile.reports
-
-  build-site:
-    needs: [ unlighthouse ]
-    if: success()
-    runs-on: dind
-    steps:
-      - name: Downloading static site artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: dockerfile
-      - name: Downloading static site artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: unlighthouse-reports
-          path: reports
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Log into Docker Package Registry
-        uses: docker/login-action@v3
-        with:
-          registry: forgejo.neshweb.net
-          username: ${{ secrets.FORGEJO_USERNAME }}
-          password: ${{ secrets.FORGEJO_TOKEN }}
-      - name: Build and push to Docker Package Registry
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: Dockerfile.reports
-          push: true
-          tags: forgejo.neshweb.net/firq/fgo-ta-com-website-unlighthouse:latest
-
-  auto-deploy-dockge:
-    needs: [ build-site ]
-    if: success()
-    runs-on: docker
-    container: forgejo.neshweb.net/firq/dockge-cli:0.1.2
-    steps:
-      - name: Configure Dockge CLI
-        run: |
-          dockge host '${{ vars.DOCKGE_HOST }}'
-          dockge login --user '${{ secrets.DOCKGE_USER }}' --password '${{ secrets.DOCKGE_CREDENTIAL }}'
-      - name: Check status and redeploy
-        run: |
-          dockge status fgo-ta-com-unlighthouse
-          dockge update fgo-ta-com-unlighthouse
-          dockge status fgo-ta-com-unlighthouse

.gitignore

@@ -19,6 +19,3 @@ pnpm-debug.log*
 
 # macOS-specific files
 .DS_Store
-
-# Temporary files
-.temp/

.gitlab-ci.yml

@@ -66,6 +66,7 @@ deploy-site:
     - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd fgo-ta_com; find public -maxdepth 1 -printf "%p\n"; screen -S fgo-ta_com-public -dm serve public/ -p 9200'
     - echo "Website is up on https://fgo-ta.com"
 
+
 redeploy-site:
   stage: scripts
   when: manual

.prettierignore

@@ -1,5 +0,0 @@
-**/.git
-**/node_modules
-**/.vscode
-**/public
-**/dist

.prettierrc

@@ -1,6 +0,0 @@
-{
-  "trailingComma": "es5",
-  "tabWidth": 2,
-  "semi": false,
-  "singleQuote": true
-}

.vscode/settings.json

@@ -7,7 +7,7 @@
         "**/.DS_Store": true,
         "**/Thumbs.db": true,
         "**/__pycache__": true,
-        "**/node_modules": true
+        "**/node_modules": false
     },
     "hide-files.files": []
 }

Dockerfile

@@ -1,16 +1,15 @@
-FROM node:22-alpine AS build
+FROM node:lts AS build
-WORKDIR /site
+WORKDIR /app
 COPY . .
 RUN npm i
-RUN npm run astro telemetry disable
 RUN npm run build
 
-FROM forgejo.neshweb.net/ci-docker-images/website-serve:2 AS runtime
+FROM forgejo.neshweb.net/ci-docker-images/website-serve-docker:latest AS runtime
 
-COPY --from=build /site/dist /public
+COPY --from=build /app/dist /public
-COPY --from=build /site/serve.json /public/serve.json
+COPY --from=build /app/serve.json /public/serve.json
 
-ENV PORT=8081
+ENV PORT 8081
 EXPOSE 8081
 
-CMD serve public/ -p ${PORT}
+CMD [ "serve", "public/", "-p", "8081" ]

Dockerfile.reports

@@ -1,6 +0,0 @@
-FROM forgejo.neshweb.net/ci-docker-images/website-serve:2 AS runtime
-
-ADD reports /public
-
-EXPOSE 8081
-CMD serve public/ -p 8081

README.md

@@ -1,6 +1,42 @@
-# FGO TA Astro Site
+# Astro Starter Kit: Basics
 
-## Commands
+```
+npm create astro@latest -- --template basics
+```
+
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics)
+[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/basics)
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/basics/devcontainer.json)
+
+> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
+
+![basics](https://user-images.githubusercontent.com/4677417/186188965-73453154-fdec-4d6b-9c34-cb35c248ae5b.png)
+
+## 🚀 Project Structure
+
+Inside of your Astro project, you'll see the following folders and files:
+
+```
+/
+├── public/
+│   └── favicon.svg
+├── src/
+│   ├── components/
+│   │   └── Card.astro
+│   ├── layouts/
+│   │   └── Layout.astro
+│   └── pages/
+│       └── index.astro
+└── package.json
+```
+
+Astro looks for `.astro` or `.md` files in the `src/pages/` directory. Each page is exposed as a route based on its file name.
+
+There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components.
+
+Any static assets, like images, can be placed in the `public/` directory.
+
+## 🧞 Commands
 
 All commands are run from the root of the project, from a terminal:
 
@@ -12,3 +48,7 @@ All commands are run from the root of the project, from a terminal:
 | `npm run preview`         | Preview your build locally, before deploying     |
 | `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |
 | `npm run astro -- --help` | Get help using the Astro CLI                     |
+
+## 👀 Want to learn more?
+
+Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).

astro.config.mjs

@@ -1,13 +1,11 @@
-import sitemap from '@astrojs/sitemap';
-import metaTags from "astro-meta-tags";
 import { defineConfig } from 'astro/config';
+import sitemap from "@astrojs/sitemap";
 
 export default defineConfig({
   sitemap: true,
   base: '/',
   outDir: 'dist',
-  publicDir: 'public',
+  publicDir: 'static',
   site: 'https://fgo-ta.com/',
-  integrations: [sitemap(), metaTags()],
+  integrations: [sitemap()]
-  trailingSlash: "never"
 });

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fgo-ta-com-website",
   "type": "module",
-  "version": "0.2.2-pre.22",
+  "version": "0.1.4",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
@@ -10,23 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astro-community/astro-embed-youtube": "^0.5.2",
+    "@astrojs/sitemap": "^3.0.3",
-    "@astrojs/check": "^0.9.3",
+    "astro": "^4.0.7"
-    "@astrojs/sitemap": "^3.1.6",
-    "@fontsource/work-sans": "^5.0.18",
-    "astro": "^4.14.3",
-    "astro-meta-tags": "^0.3.0",
-    "autoprefixer": "^10.4.19",
-    "iconoir": "^7.7.0",
-    "postcss-preset-env": "^9.6.0",
-    "typescript": "^5.5.3"
-  },
-  "browserslist": [
-    "last 2 versions",
-    ">0.5% and not dead"
-  ],
-  "devDependencies": {
-    "prettier": "^3.1.1",
-    "prettier-plugin-astro": "^0.12.3"
   }
 }

postcss.config.cjs

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

public/robots.txt

@@ -1,7 +0,0 @@
-user-agent:*
-Disallow: /assets/data/
-
-User-agent: GPTBot
-Disallow: /
-
-Sitemap: https://fgo-ta.com/sitemap-index.xml

serve.json

@@ -5,30 +5,16 @@
   "headers": [
     {
       "source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
-      "headers": [
+      "headers" : [{
-        {
         "key" : "Cache-Control",
         "value" : "no-cache"
-        }
+      }]
-      ]
+    }, {
-    },
-    {
-      "source": "**/*.woff2",
-      "headers": [
-        {
-          "key": "Cache-Control",
-          "value": "no-cache"
-        }
-      ]
-    },
-    {
       "source" : "404.html",
-      "headers": [
+      "headers" : [{
-        {
         "key" : "Cache-Control",
         "value" : "no-cache"
-        }
+      }]
-      ]
     }
   ]
 }