Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue in…

…to finish-glaive-rush

.env

@@ -1,3 +1,6 @@
 VITE_BYPASS_LOGIN=0
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=http://localhost:8001
+VITE_SERVER_URL=http://localhost:8001
+VITE_DISCORD_CLIENT_ID=1248062921129459756
+VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
+VITE_I18N_DEBUG=0

.env.beta

@@ -1,3 +1,6 @@
 VITE_BYPASS_LOGIN=0
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=https://api.beta.pokerogue.net
+VITE_SERVER_URL=https://api.beta.pokerogue.net
+VITE_DISCORD_CLIENT_ID=1248062921129459756
+VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
+VITE_I18N_DEBUG=1

.env.development

@@ -1,3 +1,7 @@
 VITE_BYPASS_LOGIN=1
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=http://localhost:8001
+VITE_SERVER_URL=http://localhost:8001
+VITE_DISCORD_CLIENT_ID=1234567890
+VITE_GOOGLE_CLIENT_ID=1234567890
+VITE_I18N_DEBUG=1
+VITE_PORT=8000

.env.production

@@ -1,3 +1,6 @@
 VITE_BYPASS_LOGIN=0
 VITE_BYPASS_TUTORIAL=0
-VITE_SERVER_URL=https://api.pokerogue.net
+VITE_SERVER_URL=https://api.pokerogue.net
+VITE_DISCORD_CLIENT_ID=1248062921129459756
+VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
+VITE_I18N_DEBUG=0

.env.test

@@ -0,0 +1 @@
+VITE_I18N_DEBUG=0

.github/workflows/deploy-beta.yml

@@ -1,8 +1,9 @@
 name: Deploy Beta
 
 on:
-  push: {}
-  pull_request: {}
+  push:
+    branches:
+      - beta
 
 jobs:
   deploy:
@@ -20,14 +21,12 @@ jobs:
         env:
           NODE_ENV: production
       - name: Set up SSH
-        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
         run: |
           mkdir ~/.ssh
           echo "${{ secrets.BETA_SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
           echo "${{ secrets.BETA_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/*
           ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
       - name: Deploy build on server
-        if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
         run: | 
           rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}

.github/workflows/eslint.yml

@@ -6,9 +6,11 @@ on:
   push:
     branches:
       - main  # Trigger on push events to the main branch
+      - beta # Trigger on push events to the beta branch
   pull_request:
     branches:
       - main  # Trigger on pull request events targeting the main branch
+      - beta # Trigger on pull request events targeting the beta branch
 
 jobs:
   run-linters:  # Define a job named "run-linters"

.github/workflows/github-pages.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - main
+      - beta
 
 jobs:
   pages:
@@ -52,7 +53,7 @@ jobs:
         working-directory: ${{env.api-dir}}
         run: |
           cd pokerogue_docs
-          npx typedoc --out /tmp/docs --githubPages false --entryPoints ./src/
+          npm run docs -- --out /tmp/docs --githubPages false --entryPoints ./src/
 
       - name: Commit & Push docs
         if: github.event_name == 'push'

.github/workflows/tests.yml

@@ -6,9 +6,11 @@ on:
   push:
     branches:
       - main  # Trigger on push events to the main branch
+      - beta # Trigger on push events to the beta branch
   pull_request:
     branches:
       - main  # Trigger on pull request events targeting the main branch
+      - beta # Trigger on pull request events targeting the beta branch
 
 jobs:
   run-tests:  # Define a job named "run-tests"