Merge branch 'release/2.36.0' into main

Author: Lakeyzer

.env.dist

@@ -12,5 +12,17 @@ VUE_APP_FIREBASE_PROJECT_ID=PROJECT_ID
 VUE_APP_FIREBASE_STORAGE_BUCKET=storage_bucket.domain
 VUE_APP_FIREBASE_MESSAGING_SENDER_ID=SENDER_ID
 
+# Patreon
+VUE_APP_PATREON_CLIENT_ID=PATREON_KEY
+VUE_APP_PATREON_CLIENT_SECRET=PATREON_SECRET
+
+# AI Monster Generator
+MONSTER_GENERATOR_URL=https://ai.shieldmaiden.app
+MONSTER_GENERATOR_API_KEY=AI_API_KEY
+
 # If developing Character Sync locally add:
 # LOCAL_CHARACTER_SYNC_ID="extension-id"
+
+# Generate Monster API KEY
+MONSTER_GENERATOR_URL="http://localhost:8000/api"
+MONSTER_GENERATOR_API_KEY=insecure

.github/dependabot.yml

@@ -6,5 +6,8 @@ updates:
       interval: "monthly"
     target-branch: "develop"
     ignore:
+      - dependency-name: "vue"
+        versions: [">=3.0.0"]
       - dependency-name: "@quasar/app"
-        versions: [">=2.4.3"]
+        versions: [">=3.0.0"]
+

.github/workflows/build_main.yml

@@ -31,28 +31,18 @@ jobs:
 
       - run: quasar build -m ssr --if-present
 
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry Docker Hub
-        # if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+      - # Login against GitHub Container Registry
+        name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+      - # Build and push Docker image
+        name: Build and push
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          tags: harmlesskey/harmlesskey
+          tags: ghcr.io/harmlesskey/harmlesskey

.github/workflows/build_master.yml

@@ -24,37 +24,26 @@ jobs:
       - run: npm i -g @quasar/cli@latest
       - run: npm ci
 
-      - name: Create env file
+      - name: Create public env file
         run: |
           cat << EOF >> .env.production.local
           ${{ secrets.STAGING_ENV_FILE }}
           EOF
 
-      # - run: npm run build in debug mode --if-present
       - run: quasar build -m ssr -d --if-present
 
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry Docker Hub
-        # if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+      - # Login against GitHub Container Registry
+        name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+      - # Build and push Docker image
+        name: Build and push
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          tags: harmlesskey/harmlesskey_staging
+          tags: ghcr.io/harmlesskey/harmlesskey_staging

.github/workflows/build_staging.yml

@@ -66,3 +66,5 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
+
+firebaseServiceAccountKey.json