Compare commits

..

1 Commits

Author SHA1 Message Date
Viktor Rådberg
ca4e3edb5f Feature/game score tracking (#48) 2025-11-17 19:53:17 +01:00
17 changed files with 423 additions and 524 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "life-trinket",
"private": true,
"version": "1.0.1",
"version": "1.0.2",
"type": "commonjs",
"engines": {
"node": ">=20",
@@ -19,8 +19,6 @@
"dependencies": {
"firebase": "^10.14.1",
"ga-4-react": "^0.1.281",
"pako": "^2.1.0",
"qrcode": "^1.5.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-screen-wake-lock": "^3.0.2",
@@ -34,8 +32,6 @@
"@emotion/styled": "^11.14.0",
"@savvywombat/tailwindcss-grid-areas": "^4.0.0",
"@svgr/cli": "^8.1.0",
"@types/pako": "^2.0.4",
"@types/qrcode": "^1.5.6",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@types/semver": "^7.5.8",

159
pnpm-lock.yaml generated
View File

@@ -14,12 +14,6 @@ importers:
ga-4-react:
specifier: ^0.1.281
version: 0.1.281
pako:
specifier: ^2.1.0
version: 2.1.0
qrcode:
specifier: ^1.5.4
version: 1.5.4
react:
specifier: ^18.3.1
version: 18.3.1
@@ -54,12 +48,6 @@ importers:
'@svgr/cli':
specifier: ^8.1.0
version: 8.1.0(typescript@5.7.3)
'@types/pako':
specifier: ^2.0.4
version: 2.0.4
'@types/qrcode':
specifier: ^1.5.6
version: 1.5.6
'@types/react':
specifier: ^18.3.18
version: 18.3.18
@@ -1563,18 +1551,12 @@ packages:
'@types/node@22.13.5':
resolution: {integrity: sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==}
'@types/pako@2.0.4':
resolution: {integrity: sha512-VWDCbrLeVXJM9fihYodcLiIv0ku+AlOa/TQ1SvYOaBuyrSKgEcro95LJyIsJ4vSo6BXIxOKxiJAat04CmST9Fw==}
'@types/parse-json@4.0.2':
resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
'@types/prop-types@15.7.14':
resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==}
'@types/qrcode@1.5.6':
resolution: {integrity: sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==}
'@types/react-dom@18.3.5':
resolution: {integrity: sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==}
peerDependencies:
@@ -1956,10 +1938,6 @@ packages:
resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
engines: {node: '>= 6'}
camelcase@5.3.1:
resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
engines: {node: '>=6'}
camelcase@6.3.0:
resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
engines: {node: '>=10'}
@@ -2026,9 +2004,6 @@ packages:
resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
engines: {node: '>= 10'}
cliui@6.0.0:
resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
cliui@7.0.4:
resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
@@ -2276,10 +2251,6 @@ packages:
supports-color:
optional: true
decamelize@1.2.0:
resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
engines: {node: '>=0.10.0'}
deep-equal-in-any-order@2.0.6:
resolution: {integrity: sha512-RfnWHQzph10YrUjvWwhd15Dne8ciSJcZ3U6OD7owPwiVwsdE5IFSoZGg8rlwJD11ES+9H5y8j3fCofviRHOqLQ==}
@@ -2327,9 +2298,6 @@ packages:
didyoumean@1.2.2:
resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
dijkstrajs@1.0.3:
resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
dir-glob@3.0.1:
resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
engines: {node: '>=8'}
@@ -2645,10 +2613,6 @@ packages:
find-root@1.1.0:
resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
find-up@4.1.0:
resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
engines: {node: '>=8'}
find-up@5.0.0:
resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
engines: {node: '>=10'}
@@ -3345,10 +3309,6 @@ packages:
lines-and-columns@1.2.4:
resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
locate-path@5.0.0:
resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
engines: {node: '>=8'}
locate-path@6.0.0:
resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
engines: {node: '>=10'}
@@ -3730,18 +3690,10 @@ packages:
resolution: {integrity: sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==}
engines: {node: '>=8'}
p-limit@2.3.0:
resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
engines: {node: '>=6'}
p-limit@3.1.0:
resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
engines: {node: '>=10'}
p-locate@4.1.0:
resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
engines: {node: '>=8'}
p-locate@5.0.0:
resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
engines: {node: '>=10'}
@@ -3754,10 +3706,6 @@ packages:
resolution: {integrity: sha512-aio0v+S0QVkH1O+9x4dHtD4dgCExACcL+3EtNaGqC01GBudS9ijMuUsmN8OVScyV4OOp0jqdLShZFuSlbL/AsA==}
engines: {node: '>=18'}
p-try@2.2.0:
resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
engines: {node: '>=6'}
pac-proxy-agent@7.2.0:
resolution: {integrity: sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==}
engines: {node: '>= 14'}
@@ -3769,9 +3717,6 @@ packages:
package-json-from-dist@1.0.1:
resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
pako@2.1.0:
resolution: {integrity: sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==}
parent-module@1.0.1:
resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
engines: {node: '>=6'}
@@ -3879,10 +3824,6 @@ packages:
resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
engines: {node: '>= 6'}
pngjs@5.0.0:
resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
engines: {node: '>=10.13.0'}
portfinder@1.0.32:
resolution: {integrity: sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==}
engines: {node: '>= 0.12.0'}
@@ -4020,11 +3961,6 @@ packages:
resolution: {integrity: sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==}
engines: {node: '>=8'}
qrcode@1.5.4:
resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==}
engines: {node: '>=10.13.0'}
hasBin: true
qs@6.13.0:
resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
engines: {node: '>=0.6'}
@@ -4156,9 +4092,6 @@ packages:
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
require-main-filename@2.0.0:
resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
resolve-from@4.0.0:
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
engines: {node: '>=4'}
@@ -4273,9 +4206,6 @@ packages:
resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
engines: {node: '>= 0.8.0'}
set-blocking@2.0.0:
resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
set-function-length@1.2.2:
resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
engines: {node: '>= 0.4'}
@@ -4372,7 +4302,6 @@ packages:
source-map@0.8.0-beta.0:
resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
engines: {node: '>= 8'}
deprecated: The work that was done in this beta branch won't be included in future versions
sourcemap-codec@1.4.8:
resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
@@ -4840,9 +4769,6 @@ packages:
resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
engines: {node: '>= 0.4'}
which-module@2.0.1:
resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
which-typed-array@1.1.18:
resolution: {integrity: sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==}
engines: {node: '>= 0.4'}
@@ -4960,9 +4886,6 @@ packages:
resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
engines: {node: '>=0.4'}
y18n@4.0.3:
resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
y18n@5.0.8:
resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
engines: {node: '>=10'}
@@ -4982,10 +4905,6 @@ packages:
engines: {node: '>= 14'}
hasBin: true
yargs-parser@18.1.3:
resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
engines: {node: '>=6'}
yargs-parser@20.2.9:
resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
engines: {node: '>=10'}
@@ -4994,10 +4913,6 @@ packages:
resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
engines: {node: '>=12'}
yargs@15.4.1:
resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
engines: {node: '>=8'}
yargs@16.2.0:
resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
engines: {node: '>=10'}
@@ -6675,16 +6590,10 @@ snapshots:
dependencies:
undici-types: 6.20.0
'@types/pako@2.0.4': {}
'@types/parse-json@4.0.2': {}
'@types/prop-types@15.7.14': {}
'@types/qrcode@1.5.6':
dependencies:
'@types/node': 22.13.5
'@types/react-dom@18.3.5(@types/react@18.3.18)':
dependencies:
'@types/react': 18.3.18
@@ -7133,8 +7042,6 @@ snapshots:
camelcase-css@2.0.1: {}
camelcase@5.3.1: {}
camelcase@6.3.0: {}
caniuse-lite@1.0.30001700: {}
@@ -7198,12 +7105,6 @@ snapshots:
cli-width@3.0.0: {}
cliui@6.0.0:
dependencies:
string-width: 4.2.3
strip-ansi: 6.0.1
wrap-ansi: 6.2.0
cliui@7.0.4:
dependencies:
string-width: 4.2.3
@@ -7445,8 +7346,6 @@ snapshots:
dependencies:
ms: 2.1.3
decamelize@1.2.0: {}
deep-equal-in-any-order@2.0.6:
dependencies:
lodash.mapvalues: 4.6.0
@@ -7490,8 +7389,6 @@ snapshots:
didyoumean@1.2.2: {}
dijkstrajs@1.0.3: {}
dir-glob@3.0.1:
dependencies:
path-type: 4.0.0
@@ -7952,11 +7849,6 @@ snapshots:
find-root@1.1.0: {}
find-up@4.1.0:
dependencies:
locate-path: 5.0.0
path-exists: 4.0.0
find-up@5.0.0:
dependencies:
locate-path: 6.0.0
@@ -8826,10 +8718,6 @@ snapshots:
lines-and-columns@1.2.4: {}
locate-path@5.0.0:
dependencies:
p-locate: 4.1.0
locate-path@6.0.0:
dependencies:
p-locate: 5.0.0
@@ -9216,18 +9104,10 @@ snapshots:
p-defer@3.0.0: {}
p-limit@2.3.0:
dependencies:
p-try: 2.2.0
p-limit@3.1.0:
dependencies:
yocto-queue: 0.1.0
p-locate@4.1.0:
dependencies:
p-limit: 2.3.0
p-locate@5.0.0:
dependencies:
p-limit: 3.1.0
@@ -9239,8 +9119,6 @@ snapshots:
p-throttle@7.0.0: {}
p-try@2.2.0: {}
pac-proxy-agent@7.2.0:
dependencies:
'@tootallnate/quickjs-emscripten': 0.23.0
@@ -9261,8 +9139,6 @@ snapshots:
package-json-from-dist@1.0.1: {}
pako@2.1.0: {}
parent-module@1.0.1:
dependencies:
callsites: 3.1.0
@@ -9352,8 +9228,6 @@ snapshots:
pirates@4.0.6: {}
pngjs@5.0.0: {}
portfinder@1.0.32:
dependencies:
async: 2.6.4
@@ -9489,12 +9363,6 @@ snapshots:
dependencies:
escape-goat: 2.1.1
qrcode@1.5.4:
dependencies:
dijkstrajs: 1.0.3
pngjs: 5.0.0
yargs: 15.4.1
qs@6.13.0:
dependencies:
side-channel: 1.1.0
@@ -9664,8 +9532,6 @@ snapshots:
require-from-string@2.0.2: {}
require-main-filename@2.0.0: {}
resolve-from@4.0.0: {}
resolve@1.22.10:
@@ -9816,8 +9682,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
set-blocking@2.0.0: {}
set-function-length@1.2.2:
dependencies:
define-data-property: 1.1.4
@@ -10487,8 +10351,6 @@ snapshots:
is-weakmap: 2.0.2
is-weakset: 2.0.4
which-module@2.0.1: {}
which-typed-array@1.1.18:
dependencies:
available-typed-arrays: 1.0.7
@@ -10679,8 +10541,6 @@ snapshots:
xtend@4.0.2: {}
y18n@4.0.3: {}
y18n@5.0.8: {}
yallist@3.1.1: {}
@@ -10691,29 +10551,10 @@ snapshots:
yaml@2.7.0: {}
yargs-parser@18.1.3:
dependencies:
camelcase: 5.3.1
decamelize: 1.2.0
yargs-parser@20.2.9: {}
yargs-parser@21.1.1: {}
yargs@15.4.1:
dependencies:
cliui: 6.0.0
decamelize: 1.2.0
find-up: 4.1.0
get-caller-file: 2.0.5
require-directory: 2.1.1
require-main-filename: 2.0.0
set-blocking: 2.0.0
string-width: 4.2.3
which-module: 2.0.1
y18n: 4.0.3
yargs-parser: 18.1.3
yargs@16.2.0:
dependencies:
cliui: 7.0.4

View File

@@ -1,4 +1,3 @@
import { useRef } from 'react';
import { twc } from 'react-twc';
import { useAnalytics } from '../../Hooks/useAnalytics';
import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
@@ -8,7 +7,6 @@ import { Separator } from '../Misc/Separator';
import { Paragraph } from '../Misc/TextComponents';
import { ToggleButton } from '../Misc/ToggleButton';
import { Dialog } from './Dialog';
import { ShareGameDialog } from './ShareGameDialog';
const SettingContainer = twc.div`w-full flex flex-col mb-2`;
@@ -26,7 +24,6 @@ export const SettingsDialog = ({
}) => {
const { settings, setSettings, isPWA, version } = useGlobalSettings();
const analytics = useAnalytics();
const shareGameDialogRef = useRef<HTMLDialogElement | null>(null);
return (
<Dialog id="settings" title="⚙️ Settings ⚙️" dialogRef={dialogRef}>
@@ -245,17 +242,25 @@ export const SettingsDialog = ({
</ul>
</Description>
</SettingContainer>
<SettingContainer>
<ToggleContainer>
<label>Show Match Score</label>
<ToggleButton
checked={settings.showMatchScore}
onChange={() => {
setSettings({
...settings,
showMatchScore: !settings.showMatchScore,
});
}}
/>
</ToggleContainer>
<Description>
Shows a score badge on each player's card to track wins across multiple games.
</Description>
</SettingContainer>
<Separator height="1px" />
<div className="flex w-full justify-center gap-3">
<button
className="mt-1 mb-1 bg-secondary-main px-3 py-1 rounded-md duration-200 ease-in-out shadow-[1px_2px_4px_0px_rgba(0,0,0,0.3)] hover:bg-secondary-dark font-bold"
onClick={() => {
analytics.trackEvent('share_game_button_clicked');
shareGameDialogRef.current?.showModal();
}}
>
<span className="text-sm">Share Game</span>
</button>
<div className="flex w-full justify-center">
<button
className="mt-1 mb-1 bg-primary-main px-3 py-1 rounded-md duration-200 ease-in-out shadow-[1px_2px_4px_0px_rgba(0,0,0,0.3)] hover:bg-primary-dark font-bold"
onClick={() => {
@@ -266,7 +271,6 @@ export const SettingsDialog = ({
<span className="text-sm">Save and Close</span>
</button>
</div>
<ShareGameDialog dialogRef={shareGameDialogRef} />
{!isPWA && (
<>
{window.isIOS && (

View File

@@ -1,138 +0,0 @@
import { useEffect, useState } from 'react';
import QRCode from 'qrcode';
import { Dialog } from './Dialog';
import { generateShareableUrl } from '../../Utils/gameStateSharing';
import { useAnalytics } from '../../Hooks/useAnalytics';
export const ShareGameDialog = ({
dialogRef,
}: {
dialogRef: React.MutableRefObject<HTMLDialogElement | null>;
}) => {
const [qrCodeUrl, setQrCodeUrl] = useState<string>('');
const [shareableUrl, setShareableUrl] = useState<string>('');
const [isLoading, setIsLoading] = useState(false);
const [error, setError] = useState<string>('');
const [copied, setCopied] = useState(false);
const analytics = useAnalytics();
useEffect(() => {
// Generate QR code when dialog opens
const dialog = dialogRef.current;
if (!dialog) return;
const handleOpen = async () => {
setIsLoading(true);
setError('');
setCopied(false);
try {
// Small delay to ensure all localStorage writes from useEffect have completed
await new Promise((resolve) => setTimeout(resolve, 50));
// Generate the shareable URL
const url = generateShareableUrl();
setShareableUrl(url);
// Generate QR code with lower error correction for less detail
const qrDataUrl = await QRCode.toDataURL(url, {
width: 300,
margin: 2,
errorCorrectionLevel: 'L', // Low error correction = simpler QR code
color: {
dark: '#000000',
light: '#FFFFFF',
},
});
setQrCodeUrl(qrDataUrl);
analytics.trackEvent('share_game_qr_generated');
} catch (err) {
console.error('Error generating QR code:', err);
setError('Failed to generate QR code. Please try again.');
analytics.trackEvent('share_game_qr_error');
} finally {
setIsLoading(false);
}
};
// Listen for dialog open events
const observer = new MutationObserver(() => {
if (dialog.open) {
handleOpen();
}
});
observer.observe(dialog, { attributes: true, attributeFilter: ['open'] });
return () => observer.disconnect();
}, [dialogRef, analytics]);
const handleCopyUrl = async () => {
try {
await navigator.clipboard.writeText(shareableUrl);
setCopied(true);
analytics.trackEvent('share_game_url_copied');
setTimeout(() => setCopied(false), 2000);
} catch (err) {
console.error('Failed to copy URL:', err);
analytics.trackEvent('share_game_url_copy_error');
}
};
return (
<Dialog id="share-game" title="Share Game" dialogRef={dialogRef}>
<div className="flex flex-col items-center gap-4 py-4">
{isLoading && (
<div className="text-text-secondary">Generating QR code...</div>
)}
{error && (
<div className="text-red-500 text-sm text-center">{error}</div>
)}
{!isLoading && !error && qrCodeUrl && (
<>
<div className="bg-white p-4 rounded-lg">
<img src={qrCodeUrl} alt="QR Code" className="w-full h-auto" />
</div>
<div className="text-text-secondary text-sm text-center max-w-full">
Scan this QR code to share the current game state
</div>
<div className="w-full flex flex-col gap-2">
<div className="text-xs text-text-secondary text-center">
Or copy the link:
</div>
<div className="flex gap-2 items-center w-full">
<input
type="text"
value={shareableUrl}
readOnly
className="flex-1 bg-secondary-main text-text-primary text-xs px-2 py-1 rounded-md border-none outline-none overflow-hidden text-ellipsis"
onClick={(e) => e.currentTarget.select()}
/>
<button
onClick={handleCopyUrl}
className="bg-primary-main px-3 py-1 rounded-md text-sm font-semibold hover:bg-primary-dark transition-colors"
>
{copied ? 'Copied!' : 'Copy'}
</button>
</div>
</div>
</>
)}
<button
className="mt-2 bg-primary-main px-4 py-2 rounded-md font-semibold hover:bg-primary-dark transition-colors"
onClick={() => {
analytics.trackEvent('share_game_dialog_closed');
dialogRef.current?.close();
}}
>
Close
</button>
</div>
</Dialog>
);
};

View File

@@ -0,0 +1,85 @@
import { twc } from 'react-twc';
import { Player } from '../../Types/Player';
const Overlay = twc.div`
fixed top-0 left-0 w-[100dvmax] h-[100dvmin]
bg-black/80 backdrop-blur-sm
flex items-center justify-center
z-50
`;
const Modal = twc.div`
bg-background-default
rounded-2xl p-8
max-w-md w-[90%]
shadow-2xl
flex flex-col gap-6
`;
const Title = twc.h2`
text-[7vmin] font-bold text-center
text-text-primary
-mb-4
`;
const ButtonContainer = twc.div`
flex flex-col gap-3
`;
const WinnerName = twc.div`
text-[6vmin] font-bold text-center
py-[2vmin] px-[3vmin] rounded-xl
text-white
mb-0
`;
const PrimaryButton = twc.button`
py-[2vmin] px-[3vmin] rounded-xl
text-[4vmin] font-semibold
bg-interface-primary
text-white
transition-all duration-200
hover:scale-105 active:scale-95
border-3 border-white/50
shadow-lg shadow-interface-primary/50
`;
const SecondaryButton = twc.button`
py-[2vmin] px-[3vmin] rounded-xl
text-[4vmin] font-semibold
bg-secondary-main
text-text-primary
transition-all duration-200
hover:scale-105 active:scale-95
border-3 border-primary-main
shadow-lg shadow-secondary-main/50
`;
type GameOverProps = {
winner: Player;
onStartNextGame: () => void;
onStay: () => void;
};
export const GameOver = ({
winner,
onStartNextGame,
onStay,
}: GameOverProps) => {
return (
<Overlay>
<Modal>
<Title>Winner</Title>
<WinnerName style={{ backgroundColor: winner.color }}>
{winner.name || `Player ${winner.index + 1}`}
</WinnerName>
<ButtonContainer>
<SecondaryButton onClick={onStartNextGame}>
Start Next Game
</SecondaryButton>
<PrimaryButton onClick={onStay}>Close</PrimaryButton>
</ButtonContainer>
</Modal>
</Overlay>
);
};

View File

@@ -24,6 +24,27 @@ const SettingsButtonTwc = twc.button<RotationButtonProps>((props) => [
: 'top-1/4 right-[1vmax]',
]);
type MatchScoreBadgeProps = RotationDivProps & {
$useCommanderDamage: boolean;
};
const MatchScoreBadge = twc.div<MatchScoreBadgeProps>((props) => [
'absolute flex items-center justify-center',
'bg-black/70 backdrop-blur-sm',
'rounded-full',
'w-[5vmin] h-[5vmin]',
'text-white font-bold',
'text-[3vmin]',
'z-[1]',
'pointer-events-none',
'select-none webkit-user-select-none',
props.$rotation === Rotation.Side || props.$rotation === Rotation.SideFlipped
? `left-[6.5vmax] bottom-[1vmax]`
: props.$useCommanderDamage
? 'left-[0.5vmax] top-[11.5vmin]'
: 'left-[0.5vmax] top-[1vmax]',
]);
type SettingsButtonProps = {
onClick: () => void;
rotation: Rotation;
@@ -98,11 +119,12 @@ type LifeCounterProps = {
player: Player;
opponents: Player[];
isStartingPlayer?: boolean;
matchScore?: number;
};
const RECENT_DIFFERENCE_TTL = 3_000;
const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
const LifeCounter = ({ player, opponents, matchScore }: LifeCounterProps) => {
const { updatePlayer, updateLifeTotal } = usePlayers();
const { settings, playing } = useGlobalSettings();
const recentDifferenceTimerRef = useRef<NodeJS.Timeout | undefined>(
@@ -215,6 +237,21 @@ const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
key={player.index}
handleLifeChange={handleLifeChange}
/>
{matchScore !== undefined && matchScore > 0 && (
<MatchScoreBadge
$rotation={player.settings.rotation}
$useCommanderDamage={player.settings.useCommanderDamage}
style={{
rotate:
player.settings.rotation === Rotation.Side ||
player.settings.rotation === Rotation.SideFlipped
? `-90deg`
: '0deg',
}}
>
{matchScore}
</MatchScoreBadge>
)}
{settings.showPlayerMenuCog && (
<SettingsButton
onClick={() => {
@@ -244,6 +281,8 @@ const LifeCounter = ({ player, opponents }: LifeCounterProps) => {
isShown={showPlayerMenu}
player={player}
setShowPlayerMenu={setShowPlayerMenu}
onForfeit={toggleGameLost}
totalPlayers={opponents.length + 1}
/>
</LifeCounterWrapper>
</LifeCounterContentWrapper>

View File

@@ -1,7 +1,5 @@
import { useEffect, useState } from 'react';
import { twc } from 'react-twc';
import { useGlobalSettings } from '../Hooks/useGlobalSettings';
import { importGameState } from '../Utils/gameStateSharing';
import { Play } from './Views/Play';
import StartMenu from './Views/StartMenu/StartMenu';
@@ -28,88 +26,8 @@ const EmergencyResetButton = () => {
export const LifeTrinket = () => {
const { showPlay, initialGameSettings } = useGlobalSettings();
// Check for query parameter immediately on every render
const urlParams = new URLSearchParams(window.location.search);
const gameStateParam = urlParams.get('gameStateToLoad');
const [showImportDialog, setShowImportDialog] = useState(!!gameStateParam);
const [importSuccess, setImportSuccess] = useState<boolean | null>(null);
useEffect(() => {
// Update dialog visibility if query parameter changes
if (gameStateParam && !showImportDialog) {
setShowImportDialog(true);
}
}, [gameStateParam, showImportDialog]);
const handleImportConfirm = () => {
const urlParams = new URLSearchParams(window.location.search);
const gameStateParam = urlParams.get('gameStateToLoad');
if (gameStateParam) {
// Import game state to localStorage
const success = importGameState(gameStateParam);
if (success) {
// Remove query parameter and reload the page
// This ensures providers pick up the new localStorage values
window.location.href =
window.location.origin + window.location.pathname;
} else {
// Show error and remove query parameter
setImportSuccess(false);
window.history.replaceState({}, '', window.location.pathname);
setShowImportDialog(false);
}
}
};
const handleImportCancel = () => {
// Remove the query parameter from URL
const newUrl = window.location.pathname;
window.history.replaceState({}, '', newUrl);
setShowImportDialog(false);
};
// If import dialog is shown, only render the dialog and nothing else
if (showImportDialog) {
return (
<div className="fixed inset-0 bg-background-backdrop backdrop-blur-sm z-[9999] flex items-center justify-center">
<div className="bg-background-default rounded-2xl p-8 max-w-md mx-4">
<h2 className="text-2xl text-text-primary font-bold mb-4 text-center">
Load Shared Game?
</h2>
<p className="text-text-secondary mb-6 text-center">
A shared game state has been detected. Would you like to load it?
This will replace your current game state.
</p>
<div className="flex gap-4 justify-center">
<button
onClick={handleImportCancel}
className="px-4 py-2 bg-secondary-main text-text-primary rounded-md font-semibold hover:bg-secondary-dark transition-colors"
>
Cancel
</button>
<button
onClick={handleImportConfirm}
className="px-4 py-2 bg-primary-main text-text-primary rounded-md font-semibold hover:bg-primary-dark transition-colors"
>
Load Game
</button>
</div>
</div>
</div>
);
}
return (
<>
{importSuccess === false && (
<div className="fixed top-4 left-1/2 transform -translate-x-1/2 bg-red-500 text-white px-6 py-3 rounded-md z-[9999]">
Failed to load game state. The link may be corrupted.
</div>
)}
{showPlay && initialGameSettings ? (
<PlayWrapper>
<Play />

View File

@@ -16,6 +16,7 @@ import {
PartnerTax,
Poison,
ResetGame,
Skull,
} from '../../Icons/generated';
import { Player, Rotation } from '../../Types/Player';
import { PreStartMode } from '../../Types/Settings';
@@ -90,16 +91,21 @@ type PlayerMenuProps = {
player: Player;
setShowPlayerMenu: (showPlayerMenu: boolean) => void;
isShown: boolean;
onForfeit?: () => void;
totalPlayers: number;
};
const PlayerMenu = ({
player,
setShowPlayerMenu,
isShown,
onForfeit,
totalPlayers,
}: PlayerMenuProps) => {
const settingsContainerRef = useRef<HTMLDivElement | null>(null);
const resetGameDialogRef = useRef<HTMLDialogElement | null>(null);
const endGameDialogRef = useRef<HTMLDialogElement | null>(null);
const forfeitGameDialogRef = useRef<HTMLDialogElement | null>(null);
const { isSide } = useSafeRotate({
rotation: player.settings.rotation,
@@ -117,6 +123,7 @@ const PlayerMenu = ({
saveCurrentGame,
initialGameSettings,
setPreStartCompleted,
gameScore,
} = useGlobalSettings();
const analytics = useAnalytics();
@@ -159,7 +166,7 @@ const PlayerMenu = ({
};
const handleGoToStart = () => {
saveCurrentGame({ players, initialGameSettings });
saveCurrentGame({ players, initialGameSettings, gameScore });
goToStart();
setRandomizingPlayer(true);
};
@@ -479,6 +486,32 @@ const PlayerMenu = ({
>
<ResetGame size={iconSize} />
</button>
<button
style={{
cursor: 'pointer',
userSelect: 'none',
fontSize: buttonFontSize,
padding: '2px',
}}
className="text-red-500"
onClick={() => {
if (totalPlayers === 2) {
forfeitGameDialogRef.current?.show();
} else {
if (onForfeit) {
analytics.trackEvent('forfeit_game', {
player: player.index,
});
onForfeit();
setShowPlayerMenu(false);
}
}
}}
aria-label="Forfeit Game"
>
<Skull size={iconSize} />
</button>
</ButtonsSections>
</BetterRowContainer>
@@ -559,6 +592,48 @@ const PlayerMenu = ({
</div>
</div>
</dialog>
<dialog
ref={forfeitGameDialogRef}
className="z-[999] size-full bg-background-settings overflow-y-scroll"
onClick={() => forfeitGameDialogRef.current?.close()}
>
<div className="flex size-full items-center justify-center">
<div className="flex flex-col justify-center p-4 gap-2 bg-background-default rounded-xl border-none">
<h1
className="text-center text-text-primary"
style={{ fontSize: extraCountersSize }}
>
Forfeit Game?
</h1>
<div className="flex justify-evenly gap-2">
<button
className="bg-primary-main border border-primary-dark text-text-primary rounded-lg flex-grow"
style={{ fontSize: iconSize }}
onClick={() => forfeitGameDialogRef.current?.close()}
>
No
</button>
<button
className="bg-primary-main border border-primary-dark text-text-primary rounded-lg flex-grow"
onClick={() => {
if (onForfeit) {
analytics.trackEvent('forfeit_game', {
player: player.index,
});
onForfeit();
setShowPlayerMenu(false);
forfeitGameDialogRef.current?.close();
}
}}
style={{ fontSize: iconSize }}
>
Yes
</button>
</div>
</div>
</div>
</dialog>
</SettingsContainer>
</PlayerMenuWrapper>
);

View File

@@ -31,7 +31,7 @@ const PlayersWrapper = twc.div`w-full h-full bg-black`;
export const Players = ({ gridLayout }: { gridLayout: GridLayout }) => {
const { players } = usePlayers();
const { playing, settings, preStartCompleted } = useGlobalSettings();
const { playing, settings, preStartCompleted, gameScore } = useGlobalSettings();
return (
<PlayersWrapper>
@@ -48,6 +48,11 @@ export const Players = ({ gridLayout }: { gridLayout: GridLayout }) => {
opponents={players.filter(
(opponent) => opponent.index !== player.index
)}
matchScore={
settings.showMatchScore
? gameScore[player.index]
: undefined
}
/>
{settings.preStartMode === PreStartMode.RandomKing &&

View File

@@ -0,0 +1,71 @@
import { twc } from 'react-twc';
import { Player } from '../../Types/Player';
import { GameScore } from '../../Contexts/GlobalSettingsContext';
const ScoreContainer = twc.div`
absolute bottom-4 left-1/2 -translate-x-1/2
bg-background-default/90 backdrop-blur-sm
rounded-lg p-4
shadow-lg
z-40
min-w-[200px]
`;
const Title = twc.h3`
text-sm font-semibold text-text-secondary
uppercase tracking-wide mb-3
`;
const ScoreList = twc.div`
flex flex-col gap-2
`;
const ScoreItem = twc.div`
flex items-center justify-between gap-4
`;
const PlayerInfo = twc.div`
flex items-center gap-2
`;
const PlayerColor = twc.div`
w-4 h-4 rounded-full
`;
const PlayerName = twc.span`
text-text-primary font-medium
`;
const Score = twc.span`
text-text-primary font-bold text-lg
`;
type ScoreDisplayProps = {
players: Player[];
gameScore: GameScore;
};
export const ScoreDisplay = ({ players, gameScore }: ScoreDisplayProps) => {
const hasAnyScore = Object.values(gameScore).some((score) => score > 0);
if (!hasAnyScore) {
return null;
}
return (
<ScoreContainer>
<Title>Match Score</Title>
<ScoreList>
{players.map((player) => (
<ScoreItem key={player.index}>
<PlayerInfo>
<PlayerColor style={{ backgroundColor: player.color }} />
<PlayerName>{player.name || `Player ${player.index + 1}`}</PlayerName>
</PlayerInfo>
<Score>{gameScore[player.index] || 0}</Score>
</ScoreItem>
))}
</ScoreList>
</ScoreContainer>
);
};

View File

@@ -1,4 +1,4 @@
import { useEffect } from 'react';
import { useEffect, useState } from 'react';
import { twc } from 'react-twc';
import { twGridTemplateAreas } from '../../../tailwind.config';
import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
@@ -6,6 +6,7 @@ import { usePlayers } from '../../Hooks/usePlayers';
import { Orientation, PreStartMode } from '../../Types/Settings';
import { Players } from '../Players/Players';
import { PreStart } from '../PreStartGame/PreStart';
import { GameOver } from '../GameOver/GameOver';
const MainWrapper = twc.div`w-[100dvmax] h-[100dvmin] overflow-hidden, setPlayers`;
@@ -14,9 +15,10 @@ type GridTemplateAreasKeys = keyof typeof twGridTemplateAreas;
export type GridLayout = `grid-areas-${GridTemplateAreasKeys}`;
export const Play = () => {
const { players, setPlayers } = usePlayers();
const { initialGameSettings, playing, settings, preStartCompleted } =
const { players, setPlayers, resetCurrentGame, setStartingPlayerIndex } = usePlayers();
const { initialGameSettings, playing, settings, preStartCompleted, gameScore, setGameScore } =
useGlobalSettings();
const [winner, setWinner] = useState<number | null>(null);
let gridLayout: GridLayout;
switch (players.length) {
@@ -94,6 +96,57 @@ export const Play = () => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
// Check for game over when only one player remains
useEffect(() => {
if (players.length < 2 || winner !== null || !settings.showMatchScore) {
return;
}
const activePlayers = players.filter((p) => !p.hasLost);
// If only one player is alive, they are the winner
if (activePlayers.length === 1) {
setWinner(activePlayers[0].index);
}
}, [players, winner, settings.showMatchScore]);
const handleStartNextGame = () => {
if (winner === null) return;
// Update score
const newScore = { ...gameScore };
newScore[winner] = (newScore[winner] || 0) + 1;
setGameScore(newScore);
// Set the loser as the starting player for next game
const loserIndex = players.find((p) => p.index !== winner)?.index ?? 0;
setStartingPlayerIndex(loserIndex);
// Reset game
resetCurrentGame();
setWinner(null);
};
const handleStay = () => {
if (winner === null) return;
// Update score
const newScore = { ...gameScore };
newScore[winner] = (newScore[winner] || 0) + 1;
setGameScore(newScore);
// Reset hasLost state for all players
setPlayers(
players.map((p) => ({
...p,
hasLost: false,
}))
);
// Clear winner to allow new game over detection
setWinner(null);
};
return (
<MainWrapper>
{players.length > 1 &&
@@ -103,6 +156,14 @@ export const Play = () => {
settings.showStartingPlayer && <PreStart />}
<Players gridLayout={gridLayout} />
{winner !== null && (
<GameOver
winner={players[winner]}
onStartNextGame={handleStartNextGame}
onStay={handleStay}
/>
)}
</MainWrapper>
);
};

View File

@@ -64,6 +64,7 @@ const Start = () => {
setPlaying,
savedGame,
saveCurrentGame,
setGameScore,
} = useGlobalSettings();
const infoDialogRef = useRef<HTMLDialogElement | null>(null);
@@ -213,6 +214,9 @@ const Start = () => {
setInitialGameSettings(savedGame.initialGameSettings);
setPlayers(savedGame.players);
if (savedGame.gameScore) {
setGameScore(savedGame.gameScore);
}
saveCurrentGame(null);
setRandomizingPlayer(false);
setShowPlay(true);
@@ -411,11 +415,27 @@ const Start = () => {
duration-200 ease-in-out shadow-[1px_2px_4px_0px_rgba(0,0,0,0.3)] hover:bg-secondary-dark font-bold"
onClick={doResumeGame}
>
RESUME&nbsp;
<span className="text-xs">
({savedGame.players.length}&nbsp;
{savedGame.players.length > 1 ? 'players' : 'player'})
</span>
<div className="flex flex-col items-center">
<div>
RESUME&nbsp;
<span className="text-xs">
({savedGame.players.length}&nbsp;
{savedGame.players.length > 1 ? 'players' : 'player'})
</span>
</div>
{savedGame.gameScore && Object.keys(savedGame.gameScore).length > 0 && (
<div className="text-xs opacity-75">
Score: {Object.entries(savedGame.gameScore)
.map(([playerIndex, score]) => {
const player = savedGame.players.find(
(p) => p.index === Number(playerIndex)
);
return `${player?.name || `P${Number(playerIndex) + 1}`}: ${score}`;
})
.join(' | ')}
</div>
)}
</div>
</button>
)}
</StartButtonFooter>

View File

@@ -12,8 +12,13 @@ type Version = {
export type SavedGame = {
initialGameSettings: InitialGameSettings;
players: Player[];
gameScore?: GameScore;
} | null;
export type GameScore = {
[playerIndex: number]: number;
};
export type GlobalSettingsContextType = {
fullscreen: {
isFullscreen: boolean;
@@ -45,6 +50,9 @@ export type GlobalSettingsContextType = {
version: Version;
savedGame: SavedGame;
saveCurrentGame: (currentGame: SavedGame) => void;
gameScore: GameScore;
setGameScore: (score: GameScore) => void;
resetGameScore: () => void;
};
export const GlobalSettingsContext =

View File

@@ -1,6 +1,7 @@
import { ReactNode, useEffect, useMemo, useState } from 'react';
import { useWakeLock } from 'react-screen-wake-lock';
import {
GameScore,
GlobalSettingsContext,
GlobalSettingsContextType,
SavedGame,
@@ -94,6 +95,19 @@ export const GlobalSettingsProvider = ({
);
};
const savedGameScore = localStorage.getItem('gameScore');
const [gameScore, setGameScore] = useState<GameScore>(
savedGameScore ? JSON.parse(savedGameScore) : {}
);
const setGameScoreAndLocalStorage = (score: GameScore) => {
setGameScore(score);
localStorage.setItem('gameScore', JSON.stringify(score));
};
const resetGameScore = () => {
setGameScore({});
localStorage.removeItem('gameScore');
};
// Set settings if they are not valid
useEffect(() => {
// If there are no saved settings, set default settings
@@ -171,11 +185,13 @@ export const GlobalSettingsProvider = ({
localStorage.removeItem('playing');
localStorage.removeItem('showPlay');
localStorage.removeItem('preStartComplete');
localStorage.removeItem('gameScore');
setPlaying(false);
setShowPlay(false);
setPreStartCompleted(false);
setSettings({ ...settings, useMonarch: false });
setGameScore({});
};
const goToStart = async () => {
@@ -299,6 +315,9 @@ export const GlobalSettingsProvider = ({
isLatest: isLatestVersion,
checkForNewVersion,
},
gameScore,
setGameScore: setGameScoreAndLocalStorage,
resetGameScore,
};
}, [
isFullscreen,
@@ -317,6 +336,7 @@ export const GlobalSettingsProvider = ({
remoteVersion,
isLatestVersion,
analytics,
gameScore,
]);
return (

View File

@@ -61,7 +61,11 @@ export const PlayersProvider = ({ children }: { children: ReactNode }) => {
return;
}
const newStartingPlayerIndex = Math.floor(Math.random() * players.length);
// Use the saved starting player index if available, otherwise random
const newStartingPlayerIndex =
startingPlayerIndex >= 0
? startingPlayerIndex
: Math.floor(Math.random() * players.length);
players.forEach((player: Player) => {
player.commanderDamage.map((damage) => {

View File

@@ -27,6 +27,7 @@ export type Settings = {
preStartMode: PreStartMode;
showAnimations: boolean;
useMonarch: boolean;
showMatchScore: boolean;
};
export type InitialGameSettings = {
@@ -61,6 +62,7 @@ export const settingsSchema = z.object({
preStartMode: z.nativeEnum(PreStartMode),
showAnimations: z.boolean(),
useMonarch: z.boolean().default(false),
showMatchScore: z.boolean().default(true),
});
export const defaultSettings: Settings = {
@@ -71,4 +73,5 @@ export const defaultSettings: Settings = {
preStartMode: PreStartMode.None,
showAnimations: true,
useMonarch: false,
showMatchScore: true,
};

View File

@@ -1,113 +0,0 @@
import pako from 'pako';
export interface GameStateExport {
settings: string | null;
initialGameSettings: string | null;
players: string | null;
playing: string | null;
showPlay: string | null;
preStartComplete: string | null;
savedGame: string | null;
startingPlayerIndex: string | null;
}
/**
* Export all game state from localStorage, compress it, and encode for URL
*/
export function exportGameState(): string {
try {
// Only export essential data with very short keys
const compactState: Record<string, string> = {};
const s = localStorage.getItem('settings');
const i = localStorage.getItem('initialGameSettings');
const p = localStorage.getItem('players');
const si = localStorage.getItem('startingPlayerIndex');
// Only include non-null values
if (s) compactState.s = s;
if (i) compactState.i = i;
if (p) compactState.p = p;
if (si) compactState.si = si;
// Convert to JSON string
const jsonString = JSON.stringify(compactState);
// Compress using pako (gzip) with maximum compression
const compressed = pako.deflate(jsonString, { level: 9 });
// Convert to base64 for URL safety
const base64 = btoa(String.fromCharCode(...compressed));
// Make URL-safe by replacing characters
const urlSafe = base64
.replace(/\+/g, '-')
.replace(/\//g, '_')
.replace(/=/g, '');
return urlSafe;
} catch (error) {
console.error('Error exporting game state:', error);
throw new Error('Failed to export game state');
}
}
/**
* Import game state from compressed URL parameter and load into localStorage
*/
export function importGameState(encodedData: string): boolean {
try {
// Restore base64 characters
let base64 = encodedData.replace(/-/g, '+').replace(/_/g, '/');
// Add padding if needed
while (base64.length % 4) {
base64 += '=';
}
// Decode from base64
const binaryString = atob(base64);
const bytes = new Uint8Array(binaryString.length);
for (let i = 0; i < binaryString.length; i++) {
bytes[i] = binaryString.charCodeAt(i);
}
// Decompress
const decompressed = pako.inflate(bytes, { to: 'string' });
// Parse JSON
const compactState: Record<string, string> = JSON.parse(decompressed);
// Validate that we have some data
if (!compactState || typeof compactState !== 'object') {
throw new Error('Invalid game state format');
}
// Map short keys back to full localStorage keys and load
if (compactState.s) localStorage.setItem('settings', compactState.s);
if (compactState.i)
localStorage.setItem('initialGameSettings', compactState.i);
if (compactState.p) localStorage.setItem('players', compactState.p);
if (compactState.si)
localStorage.setItem('startingPlayerIndex', compactState.si);
// Always set playing and showPlay to false after loading
// This ensures the user starts at the main menu and can review the state
localStorage.setItem('playing', 'false');
localStorage.setItem('showPlay', 'false');
return true;
} catch (error) {
console.error('Error importing game state:', error);
return false;
}
}
/**
* Generate shareable URL with game state
*/
export function generateShareableUrl(): string {
const encodedState = exportGameState();
const currentUrl = window.location.origin + window.location.pathname;
return `${currentUrl}?gameStateToLoad=${encodedState}`;
}