Skip to content

Commit 3c0420b

Browse files
authored
Merge branch 'master' into save-lazy-mode-after-not-supported-message
2 parents 33c3bf1 + 132bdc3 commit 3c0420b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1306
-926
lines changed
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Prettier Fix
1+
name: Fix formatting
22

33
env:
44
PNPM_VERSION: "9.6.0"
@@ -13,9 +13,9 @@ on:
1313
types: [labeled]
1414

1515
jobs:
16-
prettify:
16+
format:
1717
runs-on: ubuntu-latest
18-
if: github.event.label.name == 'prettify'
18+
if: github.event.label.name == 'format'
1919
steps:
2020
- name: Checkout code
2121
uses: actions/checkout@v4
@@ -33,8 +33,8 @@ jobs:
3333
with:
3434
version: ${{ env.PNPM_VERSION }}
3535

36-
- name: Install prettier
37-
run: pnpm add -g prettier@3.6.2
36+
- name: Install formatter
37+
run: pnpm install -D -w prettier
3838

3939
- name: Get changed files
4040
id: get-changed-files
@@ -52,7 +52,7 @@ jobs:
5252
return changedFiles.filter(file=> file.status !== "removed").map(file => file.filename).join(' ');
5353
5454
55-
- name: Run Prettier fix
55+
- name: Fix formatting
5656
run: |
5757
CHANGED_FILES=$(echo ${{ steps.get-changed-files.outputs.result }})
5858
if [ -n "$CHANGED_FILES" ]; then
@@ -62,9 +62,9 @@ jobs:
6262
- name: Commit changes
6363
uses: stefanzweifel/git-auto-commit-action@v5
6464
with:
65-
commit_message: "prettier fix"
65+
commit_message: "fix formatting"
6666

6767
- name: Remove label
6868
uses: actions-ecosystem/action-remove-labels@v1
6969
with:
70-
labels: prettify
70+
labels: format
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Prettier Check
1+
name: Formatting check
22

33
env:
44
PNPM_VERSION: "9.6.0"
@@ -13,7 +13,7 @@ permissions:
1313
contents: read
1414

1515
concurrency:
16-
group: group-pretty-check-${{ github.ref }}-${{ github.workflow }}
16+
group: group-format-check-${{ github.ref }}-${{ github.workflow }}
1717
cancel-in-progress: true
1818

1919
jobs:
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
version: ${{ env.PNPM_VERSION }}
3737

38-
- name: Install Prettier deps only
38+
- name: Install formatter
3939
run: pnpm install -D -w prettier
4040

4141

@@ -54,7 +54,7 @@ jobs:
5454
);
5555
return changedFiles.filter(file=> file.status !== "removed").map(file => file.filename).join(' ');
5656
57-
- name: Check pretty (changed files)
57+
- name: Check formatting (changed files)
5858
run: |
5959
CHANGED_FILES=$(echo ${{ steps.get-changed-files.outputs.result }})
6060
if [ -n "$CHANGED_FILES" ]; then

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ node_modules_bak/
6767

6868
# dotenv environment variables file
6969
.env
70+
.env*
7071

7172
#vs code
7273
.vscode/*

backend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"gen-docs": "tsx scripts/openapi.ts dist/static/api/openapi.json && redocly build-docs -o dist/static/api/internal.html internal@v2 && redocly bundle -o dist/static/api/public.json public-filter && redocly build-docs -o dist/static/api/public.html public@v2"
2222
},
2323
"engines": {
24-
"node": "24.11.0"
24+
"node": "24.11.0 || 22.21.0"
2525
},
2626
"dependencies": {
2727
"@date-fns/utc": "1.2.0",
@@ -40,7 +40,7 @@
4040
"date-fns": "3.6.0",
4141
"dotenv": "16.4.5",
4242
"etag": "1.8.1",
43-
"express": "5.1.0",
43+
"express": "5.2.0",
4444
"express-rate-limit": "7.5.1",
4545
"firebase-admin": "12.0.0",
4646
"helmet": "4.6.0",
@@ -49,7 +49,7 @@
4949
"mjml": "4.15.0",
5050
"mongodb": "6.3.0",
5151
"mustache": "4.2.0",
52-
"nodemailer": "7.0.7",
52+
"nodemailer": "7.0.11",
5353
"object-hash": "3.0.0",
5454
"prom-client": "15.1.3",
5555
"rate-limiter-flexible": "5.0.3",

docs/CONTRIBUTING_ADVANCED.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ If you are on a UNIX system and you get a spawn error, run npm with `sudo`.
153153

154154
## Standards and Guidelines
155155

156-
Code style is enforced by [Prettier](https://prettier.io/docs/en/install.html), which automatically runs every time you make a commit.
156+
Code formatting is enforced by [Prettier](https://prettier.io/docs/en/install.html), which automatically runs every time you make a commit.
157157

158158
For guidelines on commit messages, adding themes, languages, or quotes, please refer to [CONTRIBUTING.md](./CONTRIBUTING.md). Following these guidelines will increase the chances of getting your change accepted.
159159

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"docker": "docker compose -f docker/compose.dev.yml up"
2525
},
2626
"engines": {
27-
"node": "24.11.0"
27+
"node": "24.11.0 || 22.21.0"
2828
},
2929
"browserslist": [
3030
"defaults",

frontend/src/html/pages/settings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,8 +864,8 @@
864864
<button data-config-value="bar">bar</button>
865865
<button data-config-value="text">text</button>
866866
<button data-config-value="mini">mini</button>
867-
<button data-config-value="flash text">flash text</button>
868-
<button data-config-value="flash mini">flash mini</button>
867+
<button data-config-value="flash_text">flash text</button>
868+
<button data-config-value="flash_mini">flash mini</button>
869869
</div>
870870
</div>
871871
<div class="section" data-config-name="liveSpeedStyle">

frontend/src/html/pages/test.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@
192192
<div id="premidTestMode" class="hidden"></div>
193193
<div id="premidSecondsLeft" class="hidden"></div>
194194
</div>
195+
<div class="loading hidden">
196+
<i class="fas fa-circle-notch fa-spin"></i>
197+
</div>
195198
<div id="result" class="content-grid full-width hidden" tabindex="-1">
196199
<div class="wrapper">
197200
<div class="stats">

frontend/src/html/popups.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<button class="xpBarTest">xp bar test</button>
6969
<button class="toggleFakeChartData">toggle fake chart data</button>
7070
<button class="toggleCaretDebug">toggle caret debug</button>
71+
<button class="disableSlowTimerFail">disable slow timer fail</button>
7172
</div>
7273
</dialog>
7374

frontend/src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<load src="html/warnings.html" />
88
<div id="fpsCounter" class="hidden"></div>
99
<div class="customBackground"></div>
10-
<div id="backgroundLoader" style="display: none"></div>
10+
<div id="backgroundLoader" class="hidden"></div>
1111
<div id="bannerCenter" class="focus"></div>
1212
<div id="notificationCenter">
1313
<div class="clearAll button invisible" style="display: none">

0 commit comments

Comments
 (0)