diff --git a/package.json b/package.json index 6992870..b404945 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "devDependencies": { "eslint": "^8.57.0", "prettier": "^3.2.5", - "sass": "^1.71.1", + "sass": "^1.72.0", "typescript": "^5.4.2" }, "resolutions": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 731bc0a..948f84f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ specifier: ^3.2.5 version: 3.2.5 sass: - specifier: ^1.71.1 - version: 1.71.1 + specifier: ^1.72.0 + version: 1.72.0 typescript: specifier: ^5.4.2 version: 5.4.2 @@ -76,7 +76,7 @@ version: 6.22.3(react-dom@18.2.0)(react@18.2.0) react-scripts: specifier: ^5.0.1 - version: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.57.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.2) + version: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.57.0)(react@18.2.0)(sass@1.72.0)(typescript@5.4.2) react-spinners: specifier: ^0.13.8 version: 0.13.8(react-dom@18.2.0)(react@18.2.0) @@ -106,8 +106,8 @@ specifier: ^29.5.12 version: 29.5.12 '@types/node': - specifier: ^20.11.26 - version: 20.11.26 + specifier: ^20.11.27 + version: 20.11.27 '@types/react': specifier: ^18.2.65 version: 18.2.65 @@ -173,7 +173,7 @@ version: 6.22.3(react-dom@18.2.0)(react@18.2.0) react-scripts: specifier: 5.0.1 - version: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.57.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.2) + version: 5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.57.0)(react@18.2.0)(sass@1.72.0)(typescript@5.4.2) react-textarea-autosize: specifier: ^8.5.3 version: 8.5.3(@types/react@18.2.65)(react@18.2.0) @@ -203,8 +203,8 @@ specifier: ^29.5.12 version: 29.5.12 '@types/node': - specifier: ^20.11.26 - version: 20.11.26 + specifier: ^20.11.27 + version: 20.11.27 '@types/react': specifier: ^18.2.65 version: 18.2.65 @@ -2307,7 +2307,7 @@ engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 jest-message-util: 27.5.1 jest-util: 27.5.1 @@ -2319,7 +2319,7 @@ engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 jest-message-util: 28.1.3 jest-util: 28.1.3 @@ -2340,7 +2340,7 @@ '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.8.1 @@ -2377,7 +2377,7 @@ dependencies: '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 jest-mock: 27.5.1 dev: false @@ -2394,7 +2394,7 @@ dependencies: '@jest/types': 27.5.1 '@sinonjs/fake-timers': 8.1.0 - '@types/node': 20.11.26 + '@types/node': 20.11.27 jest-message-util: 27.5.1 jest-mock: 27.5.1 jest-util: 27.5.1 @@ -2423,7 +2423,7 @@ '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -2531,7 +2531,7 @@ dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 '@types/yargs': 16.0.5 chalk: 4.1.2 dev: false @@ -2543,7 +2543,7 @@ '@jest/schemas': 28.1.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 '@types/yargs': 17.0.24 chalk: 4.1.2 dev: false @@ -2555,7 +2555,7 @@ '@jest/schemas': 29.6.0 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 '@types/yargs': 17.0.24 chalk: 4.1.2 dev: true @@ -3047,7 +3047,7 @@ /@types/accepts@1.3.5: resolution: {integrity: sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 /@types/babel__core@7.20.1: resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==} @@ -3082,18 +3082,18 @@ resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 20.11.26 + '@types/node': 20.11.27 /@types/bonjour@3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 dev: false /@types/co-body@6.1.0: resolution: {integrity: sha512-3e0q2jyDAnx/DSZi0z2H0yoZ2wt5yRDZ+P7ymcMObvq0ufWRT4tsajyO+Q1VwVWiv9PRR4W3YEjEzBjeZlhF+w==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 '@types/qs': 6.9.12 dev: false @@ -3101,13 +3101,13 @@ resolution: {integrity: sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==} dependencies: '@types/express-serve-static-core': 4.17.35 - '@types/node': 20.11.26 + '@types/node': 20.11.27 dev: false /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 /@types/content-disposition@0.5.5: resolution: {integrity: sha512-v6LCdKfK6BwcqMo+wYW05rLS12S0ZO0Fl4w1h4aaZMD7bqT3gVUns6FvLJKGZHQmYn3SX55JWGpziwJRwVgutA==} @@ -3118,7 +3118,7 @@ '@types/connect': 3.4.35 '@types/express': 4.17.17 '@types/keygrip': 1.0.2 - '@types/node': 20.11.26 + '@types/node': 20.11.27 /@types/crypto-js@4.2.2: resolution: {integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==} @@ -3158,7 +3158,7 @@ /@types/express-serve-static-core@4.17.35: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 '@types/qs': 6.9.12 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 @@ -3174,7 +3174,7 @@ /@types/formidable@2.0.6: resolution: {integrity: sha512-L4HcrA05IgQyNYJj6kItuIkXrInJvsXTPC5B1i64FggWKKqSL+4hgt7asiSNva75AoLQjq29oPxFfU4GAQ6Z2w==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 dev: false /@types/geojson@7946.0.10: @@ -3184,7 +3184,7 @@ /@types/graceful-fs@4.1.6: resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 dev: false /@types/history@4.7.11: @@ -3204,7 +3204,7 @@ /@types/http-proxy@1.17.11: resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 /@types/istanbul-lib-coverage@2.0.4: resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==} @@ -3258,7 +3258,7 @@ '@types/http-errors': 2.0.1 '@types/keygrip': 1.0.2 '@types/koa-compose': 3.2.5 - '@types/node': 20.11.26 + '@types/node': 20.11.27 /@types/mime@1.3.2: resolution: {integrity: sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==} @@ -3270,8 +3270,8 @@ resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} dev: false - /@types/node@20.11.26: - resolution: {integrity: sha512-YwOMmyhNnAWijOBQweOJnQPl068Oqd4K3OFbTc6AHJwzweUwwWG3GIFY74OKks2PJUDkQPeddOQES9mLn1CTEQ==} + /@types/node@20.11.27: + resolution: {integrity: sha512-qyUZfMnCg1KEz57r7pzFtSGt49f6RPkPBis3Vo4PbS7roQEDn22hiHzl/Lo1q4i4hDEgBJmBF/NTNg2XR0HbFg==} dependencies: undici-types: 5.26.5 @@ -3327,7 +3327,7 @@ /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 dev: false /@types/retry@0.12.0: @@ -3345,7 +3345,7 @@ resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 20.11.26 + '@types/node': 20.11.27 /@types/serve-index@1.9.1: resolution: {integrity: sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==} @@ -3358,7 +3358,7 @@ dependencies: '@types/http-errors': 2.0.1 '@types/mime': 3.0.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 /@types/showdown@2.0.6: resolution: {integrity: sha512-pTvD/0CIeqe4x23+YJWlX2gArHa8G0J0Oh6GKaVXV7TAeickpkkZiNOgFcFcmLQ5lB/K0qBJL1FtRYltBfbGCQ==} @@ -3367,7 +3367,7 @@ /@types/sockjs@0.3.33: resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 dev: false /@types/sprintf-js@1.1.4: @@ -3391,7 +3391,7 @@ /@types/ws@8.5.5: resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 dev: false /@types/yargs-parser@21.0.0: @@ -5903,7 +5903,7 @@ engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/expect-utils': 29.6.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 jest-get-type: 29.4.3 jest-matcher-utils: 29.6.1 jest-message-util: 29.6.1 @@ -7035,7 +7035,7 @@ '@jest/environment': 27.5.1 '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -7170,7 +7170,7 @@ '@jest/environment': 27.5.1 '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 jest-mock: 27.5.1 jest-util: 27.5.1 jsdom: 16.7.0 @@ -7188,7 +7188,7 @@ '@jest/environment': 27.5.1 '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 jest-mock: 27.5.1 jest-util: 27.5.1 dev: false @@ -7209,7 +7209,7 @@ dependencies: '@jest/types': 27.5.1 '@types/graceful-fs': 4.1.6 - '@types/node': 20.11.26 + '@types/node': 20.11.27 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -7231,7 +7231,7 @@ '@jest/source-map': 27.5.1 '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 co: 4.6.0 expect: 27.5.1 @@ -7326,7 +7326,7 @@ engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 dev: false /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1): @@ -7387,7 +7387,7 @@ '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 emittery: 0.8.1 graceful-fs: 4.2.11 @@ -7444,7 +7444,7 @@ resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 graceful-fs: 4.2.11 dev: false @@ -7483,7 +7483,7 @@ engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -7495,7 +7495,7 @@ engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -7507,7 +7507,7 @@ engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -7548,7 +7548,7 @@ dependencies: '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.11.26 + '@types/node': 20.11.27 ansi-escapes: 4.3.2 chalk: 4.1.2 jest-util: 27.5.1 @@ -7561,7 +7561,7 @@ dependencies: '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.11.26 + '@types/node': 20.11.27 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.10.2 @@ -7573,7 +7573,7 @@ resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 merge-stream: 2.0.0 supports-color: 7.2.0 dev: false @@ -7582,7 +7582,7 @@ resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 merge-stream: 2.0.0 supports-color: 8.1.1 dev: false @@ -7591,7 +7591,7 @@ resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: - '@types/node': 20.11.26 + '@types/node': 20.11.27 merge-stream: 2.0.0 supports-color: 8.1.1 dev: false @@ -9692,7 +9692,7 @@ '@remix-run/router': 1.15.3 react: 18.2.0 - /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.57.0)(react@18.2.0)(sass@1.71.1)(typescript@5.4.2): + /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.23.4)(eslint@8.57.0)(react@18.2.0)(sass@1.72.0)(typescript@5.4.2): resolution: {integrity: sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==} engines: {node: '>=14.0.0'} hasBin: true @@ -9742,7 +9742,7 @@ react-refresh: 0.11.0 resolve: 1.22.2 resolve-url-loader: 4.0.0 - sass-loader: 12.6.0(sass@1.71.1)(webpack@5.88.1) + sass-loader: 12.6.0(sass@1.72.0)(webpack@5.88.1) semver: 7.5.4 source-map-loader: 3.0.2(webpack@5.88.1) style-loader: 3.3.3(webpack@5.88.1) @@ -10149,7 +10149,7 @@ resolution: {integrity: sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==} dev: false - /sass-loader@12.6.0(sass@1.71.1)(webpack@5.88.1): + /sass-loader@12.6.0(sass@1.72.0)(webpack@5.88.1): resolution: {integrity: sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -10170,12 +10170,12 @@ dependencies: klona: 2.0.6 neo-async: 2.6.2 - sass: 1.71.1 + sass: 1.72.0 webpack: 5.88.1 dev: false - /sass@1.71.1: - resolution: {integrity: sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==} + /sass@1.72.0: + resolution: {integrity: sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==} engines: {node: '>=14.0.0'} hasBin: true dependencies: diff --git a/qwilight-fe/package.json b/qwilight-fe/package.json index f2c0025..6735483 100644 --- a/qwilight-fe/package.json +++ b/qwilight-fe/package.json @@ -31,7 +31,7 @@ "@types/crypto-js": "^4.2.2", "@types/dompurify": "^3.0.5", "@types/jest": "^29.5.12", - "@types/node": "^20.11.26", + "@types/node": "^20.11.27", "@types/react": "^18.2.65", "@types/react-dom": "^18.2.22", "@types/react-router-dom": "^5.3.3", diff --git a/qwilight-fe/src/etc/useGetEtc.ts b/qwilight-fe/src/etc/useGetEtc.ts index eb3c364..ce5138b 100644 --- a/qwilight-fe/src/etc/useGetEtc.ts +++ b/qwilight-fe/src/etc/useGetEtc.ts @@ -1,5 +1,6 @@ import { useQuery } from "@tanstack/react-query"; import { useLocation } from "react-router-dom"; +import { getLanguage } from "taehui-ts/language"; import { wwwAXIOS } from "src/Www"; import { GetEtcAPI } from "src/wwwAPI"; @@ -7,11 +8,14 @@ export default function useGetEtc() { const { pathname } = useLocation(); + const language = getLanguage(); return useQuery({ enabled: pathname.startsWith("/qwilight/etc"), queryKey: ["etc"], queryFn: async () => { - const { data } = await wwwAXIOS.get("/etc"); + const { data } = await wwwAXIOS.get("/etc", { + params: { language }, + }); return data; }, initialData: { diff --git a/taehui-fe/package.json b/taehui-fe/package.json index 117237e..05bb749 100644 --- a/taehui-fe/package.json +++ b/taehui-fe/package.json @@ -30,7 +30,7 @@ "@types/crypto-js": "^4.2.2", "@types/dompurify": "^3.0.5", "@types/jest": "^29.5.12", - "@types/node": "^20.11.26", + "@types/node": "^20.11.27", "@types/react": "^18.2.65", "@types/react-dom": "^18.2.22", "@types/showdown": "^2.0.6", diff --git a/taehui-fe/src/index.tsx b/taehui-fe/src/index.tsx index 0dc5441..5ba5323 100644 --- a/taehui-fe/src/index.tsx +++ b/taehui-fe/src/index.tsx @@ -23,8 +23,7 @@ lng: "ko-KR", }); - const language = getLanguage(); - await i18n.changeLanguage(language); + await i18n.changeLanguage(getLanguage()); const queryClient = new QueryClient();