From 9f60071e480593e227b1567172b171af411e3a08 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Wed, 1 Jan 2025 17:08:55 +0100 Subject: [PATCH] Some (alot) of fixes --- package.json | 2 +- pnpm-lock.yaml | 162 ++++++++++-------- .../admin/pages/event/FightCard.svelte | 21 ++- .../admin/pages/event/FightList.svelte | 13 +- .../pages/event/modals/FightEditModal.svelte | 5 +- src/components/repo/fight.ts | 2 +- 6 files changed, 119 insertions(+), 86 deletions(-) diff --git a/package.json b/package.json index 7fc0fb0..4034171 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "eslint-plugin-svelte": "^2.46.0", "postcss-nesting": "^13.0.1", "sass": "^1.81.0", - "svelte": "^5.2.7", + "svelte": "^5.16.0", "tailwind-merge": "^2.5.5", "tailwindcss": "^3.4.15", "three": "^0.170.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5284584..e417390 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,10 +55,10 @@ dependencies: version: 2.5.2 flowbite-svelte: specifier: ^0.47.3 - version: 0.47.3(svelte@5.2.7) + version: 0.47.3(svelte@5.16.0) flowbite-svelte-icons: specifier: ^2.0.2 - version: 2.0.2(svelte@5.2.7)(tailwind-merge@2.5.5)(tailwindcss@3.4.15) + version: 2.0.2(svelte@5.16.0)(tailwind-merge@2.5.5)(tailwindcss@3.4.15) qs: specifier: ^6.13.1 version: 6.13.1 @@ -67,10 +67,10 @@ dependencies: version: 0.33.5 svelte-awesome: specifier: ^3.3.5 - version: 3.3.5(svelte@5.2.7) + version: 3.3.5(svelte@5.16.0) svelte-codemirror-editor: specifier: ^1.4.1 - version: 1.4.1(codemirror@6.0.1)(svelte@5.2.7) + version: 1.4.1(codemirror@6.0.1)(svelte@5.16.0) svelte-spa-router: specifier: ^4.0.1 version: 4.0.1 @@ -81,7 +81,7 @@ dependencies: devDependencies: '@astrojs/svelte': specifier: ^6.0.2 - version: 6.0.2(@types/node@22.9.3)(astro@4.16.14)(sass@1.81.0)(svelte@5.2.7)(typescript@5.7.2) + version: 6.0.2(@types/node@22.9.3)(astro@4.16.14)(sass@1.81.0)(svelte@5.16.0)(typescript@5.7.2) '@astrojs/tailwind': specifier: ^5.1.2 version: 5.1.2(astro@4.16.14)(tailwindcss@3.4.15) @@ -123,7 +123,7 @@ devDependencies: version: 6.10.2(eslint@9.15.0) eslint-plugin-svelte: specifier: ^2.46.0 - version: 2.46.0(eslint@9.15.0)(svelte@5.2.7) + version: 2.46.0(eslint@9.15.0)(svelte@5.16.0) postcss-nesting: specifier: ^13.0.1 version: 13.0.1(postcss@8.4.49) @@ -131,8 +131,8 @@ devDependencies: specifier: ^1.81.0 version: 1.81.0 svelte: - specifier: ^5.2.7 - version: 5.2.7 + specifier: ^5.16.0 + version: 5.16.0 tailwind-merge: specifier: ^2.5.5 version: 2.5.5 @@ -279,7 +279,7 @@ packages: zod: 3.23.8 dev: false - /@astrojs/svelte@6.0.2(@types/node@22.9.3)(astro@4.16.14)(sass@1.81.0)(svelte@5.2.7)(typescript@5.7.2): + /@astrojs/svelte@6.0.2(@types/node@22.9.3)(astro@4.16.14)(sass@1.81.0)(svelte@5.16.0)(typescript@5.7.2): resolution: {integrity: sha512-Jn60LLH+AbjtLIOQuL0SUI0fxMwpT89VraoGkEwF33ZgCT59H8fMQOj9eNf632P/SHRbKpD+Q+PJjODn5OcKoQ==} engines: {node: ^18.17.1 || ^20.3.0 || >=21.0.0} peerDependencies: @@ -287,10 +287,10 @@ packages: svelte: ^5.1.16 typescript: ^5.3.3 dependencies: - '@sveltejs/vite-plugin-svelte': 4.0.1(svelte@5.2.7)(vite@5.4.11) + '@sveltejs/vite-plugin-svelte': 4.0.1(svelte@5.16.0)(vite@5.4.11) astro: 4.16.14(@types/node@22.9.3)(sass@1.81.0)(typescript@5.7.2) - svelte: 5.2.7 - svelte2tsx: 0.7.28(svelte@5.2.7)(typescript@5.7.2) + svelte: 5.16.0 + svelte2tsx: 0.7.28(svelte@5.16.0)(typescript@5.7.2) typescript: 5.7.2 vite: 5.4.11(@types/node@22.9.3)(sass@1.81.0) transitivePeerDependencies: @@ -513,26 +513,21 @@ packages: '@babel/helper-string-parser': 7.25.9 '@babel/helper-validator-identifier': 7.25.9 - /@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.4)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3): - resolution: {integrity: sha512-1dNIOmiM0z4BIBwxmxEfA1yoxh1MF/6KPBbh20a5vphGV0ictKlgQsbJs6D6SkR6iJpGbpwRsa6PFMNlg9T9pQ==} - peerDependencies: - '@codemirror/language': ^6.0.0 - '@codemirror/state': ^6.0.0 - '@codemirror/view': ^6.0.0 - '@lezer/common': ^1.0.0 + /@codemirror/autocomplete@6.18.4: + resolution: {integrity: sha512-sFAphGQIqyQZfP2ZBsSHV7xQvo9Py0rV0dW7W3IMRdS+zDuNb2l3no78CvUaWKGfzFjI4FTrLdUSj86IGb2hRA==} dependencies: - '@codemirror/language': 6.10.4 - '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/language': 6.10.8 + '@codemirror/state': 6.5.0 + '@codemirror/view': 6.36.1 '@lezer/common': 1.2.3 dev: false /@codemirror/commands@6.7.1: resolution: {integrity: sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==} dependencies: - '@codemirror/language': 6.10.4 - '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/language': 6.10.8 + '@codemirror/state': 6.5.0 + '@codemirror/view': 6.36.1 '@lezer/common': 1.2.3 dev: false @@ -554,19 +549,30 @@ packages: style-mod: 4.1.2 dev: false - /@codemirror/lint@6.8.3: - resolution: {integrity: sha512-GSGfKxCo867P7EX1k2LoCrjuQFeqVgPGRRsSl4J4c0KMkD+k1y6WYvTQkzv0iZ8JhLJDujEvlnMchv4CZQLh3Q==} + /@codemirror/language@6.10.8: + resolution: {integrity: sha512-wcP8XPPhDH2vTqf181U8MbZnW+tDyPYy0UzVOa+oHORjyT+mhhom9vBd7dApJwoDz9Nb/a8kHjJIsuA/t8vNFw==} dependencies: - '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/state': 6.5.0 + '@codemirror/view': 6.36.1 + '@lezer/common': 1.2.3 + '@lezer/highlight': 1.2.1 + '@lezer/lr': 1.4.2 + style-mod: 4.1.2 + dev: false + + /@codemirror/lint@6.8.4: + resolution: {integrity: sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A==} + dependencies: + '@codemirror/state': 6.5.0 + '@codemirror/view': 6.36.1 crelt: 1.0.6 dev: false /@codemirror/search@6.5.8: resolution: {integrity: sha512-PoWtZvo7c1XFeZWmmyaOp2G0XVbOnm+fJzvghqGAktBW3cufwJUWvSCcNG0ppXiBEM05mZu6RhMtXPv2hpllig==} dependencies: - '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/state': 6.5.0 + '@codemirror/view': 6.36.1 crelt: 1.0.6 dev: false @@ -574,6 +580,12 @@ packages: resolution: {integrity: sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==} dev: false + /@codemirror/state@6.5.0: + resolution: {integrity: sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==} + dependencies: + '@marijn/find-cluster-break': 1.0.2 + dev: false + /@codemirror/view@6.35.0: resolution: {integrity: sha512-I0tYy63q5XkaWsJ8QRv5h6ves7kvtrBWjBcnf/bzohFJQc5c14a1AQRdE8QpPF9eMp5Mq2FMm59TCj1gDfE7kw==} dependencies: @@ -582,6 +594,14 @@ packages: w3c-keyname: 2.2.8 dev: false + /@codemirror/view@6.36.1: + resolution: {integrity: sha512-miD1nyT4m4uopZaDdO2uXU/LLHliKNYL9kB1C1wJHrunHLm/rpkb5QVSokqgw9hFqEZakrdlb/VGWX8aYZTslQ==} + dependencies: + '@codemirror/state': 6.5.0 + style-mod: 4.1.2 + w3c-keyname: 2.2.8 + dev: false + /@csstools/selector-resolve-nested@3.0.0(postcss-selector-parser@7.0.0): resolution: {integrity: sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==} engines: {node: '>=18'} @@ -1364,6 +1384,10 @@ packages: '@lezer/common': 1.2.3 dev: false + /@marijn/find-cluster-break@1.0.2: + resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==} + dev: false + /@mdx-js/mdx@3.1.0(acorn@8.14.0): resolution: {integrity: sha512-/QxEhPAvGwbQmy1Px8F899L5Uc2KZ6JtXwlCgJmjSTBedwOZkByYcBG4GceIGPXRDsmfxhHazuS+hlOShRLeDw==} dependencies: @@ -1796,7 +1820,7 @@ packages: /@shikijs/vscode-textmate@9.3.0: resolution: {integrity: sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==} - /@sveltejs/vite-plugin-svelte-inspector@3.0.1(@sveltejs/vite-plugin-svelte@4.0.1)(svelte@5.2.7)(vite@5.4.11): + /@sveltejs/vite-plugin-svelte-inspector@3.0.1(@sveltejs/vite-plugin-svelte@4.0.1)(svelte@5.16.0)(vite@5.4.11): resolution: {integrity: sha512-2CKypmj1sM4GE7HjllT7UKmo4Q6L5xFRd7VMGEWhYnZ+wc6AUVU01IBd7yUi6WnFndEwWoMNOd6e8UjoN0nbvQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22} peerDependencies: @@ -1804,27 +1828,27 @@ packages: svelte: ^5.0.0-next.96 || ^5.0.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 4.0.1(svelte@5.2.7)(vite@5.4.11) + '@sveltejs/vite-plugin-svelte': 4.0.1(svelte@5.16.0)(vite@5.4.11) debug: 4.3.7 - svelte: 5.2.7 + svelte: 5.16.0 vite: 5.4.11(@types/node@22.9.3)(sass@1.81.0) transitivePeerDependencies: - supports-color dev: true - /@sveltejs/vite-plugin-svelte@4.0.1(svelte@5.2.7)(vite@5.4.11): + /@sveltejs/vite-plugin-svelte@4.0.1(svelte@5.16.0)(vite@5.4.11): resolution: {integrity: sha512-prXoAE/GleD2C4pKgHa9vkdjpzdYwCSw/kmjw6adIyu0vk5YKCfqIztkLg10m+kOYnzZu3bb0NaPTxlWre2a9Q==} engines: {node: ^18.0.0 || ^20.0.0 || >=22} peerDependencies: svelte: ^5.0.0-next.96 || ^5.0.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 3.0.1(@sveltejs/vite-plugin-svelte@4.0.1)(svelte@5.2.7)(vite@5.4.11) + '@sveltejs/vite-plugin-svelte-inspector': 3.0.1(@sveltejs/vite-plugin-svelte@4.0.1)(svelte@5.16.0)(vite@5.4.11) debug: 4.3.7 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.13 - svelte: 5.2.7 + svelte: 5.16.0 vite: 5.4.11(@types/node@22.9.3)(sass@1.81.0) vitefu: 1.0.3(vite@5.4.11) transitivePeerDependencies: @@ -2762,18 +2786,16 @@ packages: resolution: {integrity: sha512-Gaz4gHnkbHMGgahNt3CA5HBk5lLQBqmD/pBgeB4kQU6OedZmqMBjlRF0LSrp2tJ4wlLNPm2FfaUd1pDy0mdlpA==} dev: false - /codemirror@6.0.1(@lezer/common@1.2.3): + /codemirror@6.0.1: resolution: {integrity: sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==} dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.4)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3) + '@codemirror/autocomplete': 6.18.4 '@codemirror/commands': 6.7.1 - '@codemirror/language': 6.10.4 - '@codemirror/lint': 6.8.3 + '@codemirror/language': 6.10.8 + '@codemirror/lint': 6.8.4 '@codemirror/search': 6.5.8 - '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 - transitivePeerDependencies: - - '@lezer/common' + '@codemirror/state': 6.5.0 + '@codemirror/view': 6.36.1 dev: false /collapse-white-space@2.1.0: @@ -3404,7 +3426,7 @@ packages: string.prototype.includes: 2.0.1 dev: true - /eslint-plugin-svelte@2.46.0(eslint@9.15.0)(svelte@5.2.7): + /eslint-plugin-svelte@2.46.0(eslint@9.15.0)(svelte@5.16.0): resolution: {integrity: sha512-1A7iEMkzmCZ9/Iz+EAfOGYL8IoIG6zeKEq1SmpxGeM5SXmoQq+ZNnCpXFVJpsxPWYx8jIVGMerQMzX20cqUl0g==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: @@ -3425,8 +3447,8 @@ packages: postcss-safe-parser: 6.0.0(postcss@8.4.49) postcss-selector-parser: 6.1.2 semver: 7.6.3 - svelte: 5.2.7 - svelte-eslint-parser: 0.43.0(svelte@5.2.7) + svelte: 5.16.0 + svelte-eslint-parser: 0.43.0(svelte@5.16.0) transitivePeerDependencies: - ts-node dev: true @@ -3505,8 +3527,8 @@ packages: - supports-color dev: true - /esm-env@1.1.4: - resolution: {integrity: sha512-oO82nKPHKkzIj/hbtuDYy/JHqBHFlMIW36SDiPCVsj87ntDLcWN+sJ1erdVryd4NxODacFTsdrIE3b7IamqbOg==} + /esm-env@1.2.1: + resolution: {integrity: sha512-U9JedYYjCnadUlXk7e1Kr+aENQhtUaoaV9+gZm1T8LC/YBAPJx3NSPIAurFOC0U5vrdSevnUJS2/wUVxGwPhng==} /espree@10.3.0: resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==} @@ -3538,11 +3560,10 @@ packages: estraverse: 5.3.0 dev: true - /esrap@1.2.2: - resolution: {integrity: sha512-F2pSJklxx1BlQIQgooczXCPHmcWpn6EsP5oo73LQfonG9fIlIENQ8vMmfGXeojP9MrkzUNAfyU5vdFlR9shHAw==} + /esrap@1.3.2: + resolution: {integrity: sha512-C4PXusxYhFT98GjLSmb20k9PREuUdporer50dhzGuJu9IJXktbMddVCMLAERl5dAHyAi73GWWCE4FVHGP1794g==} dependencies: '@jridgewell/sourcemap-codec': 1.5.0 - '@types/estree': 1.0.6 /esrecurse@4.3.0: resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} @@ -3724,7 +3745,7 @@ packages: - rollup dev: false - /flowbite-svelte-icons@2.0.2(svelte@5.2.7)(tailwind-merge@2.5.5)(tailwindcss@3.4.15): + /flowbite-svelte-icons@2.0.2(svelte@5.16.0)(tailwind-merge@2.5.5)(tailwindcss@3.4.15): resolution: {integrity: sha512-Vkmduy2867Rk8R7TziPirsWkixJnToFBEXRaN4ouJabOx62NQjiBbHFe+HTaMOQmdp4FNMI2Nhtk2I2CQ8r3RQ==} engines: {node: '>=18.0.0', npm: '>=7.0.0'} peerDependencies: @@ -3732,12 +3753,12 @@ packages: tailwind-merge: ^2.3.0 tailwindcss: ^3.4.3 dependencies: - svelte: 5.2.7 + svelte: 5.16.0 tailwind-merge: 2.5.5 tailwindcss: 3.4.15 dev: false - /flowbite-svelte@0.47.3(svelte@5.2.7): + /flowbite-svelte@0.47.3(svelte@5.16.0): resolution: {integrity: sha512-1Wdbx+YV6S20dnnMERr/XFNjO+sb22QOrZtIK0Wa8SXxxuYPmbkT3b4mR4TYwUWvWheXsWvlcPLSlV8YGJgItw==} engines: {node: '>=18.0.0', pnpm: '>=8.0.0'} peerDependencies: @@ -3746,7 +3767,7 @@ packages: '@floating-ui/dom': 1.6.12 apexcharts: 3.54.1 flowbite: 2.5.2 - svelte: 5.2.7 + svelte: 5.16.0 tailwind-merge: 2.5.5 transitivePeerDependencies: - rollup @@ -6542,25 +6563,25 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - /svelte-awesome@3.3.5(svelte@5.2.7): + /svelte-awesome@3.3.5(svelte@5.16.0): resolution: {integrity: sha512-RIi+OI6CEn+fTdYy7UOgImEUWvdQSwP9SiMC44UKyFO+8+gjj+NgTG67hI8j2rTHQVvCP820Uj+4UoZG8CCUfA==} peerDependencies: svelte: '>= 3.43.1 < 6' dependencies: - svelte: 5.2.7 + svelte: 5.16.0 dev: false - /svelte-codemirror-editor@1.4.1(codemirror@6.0.1)(svelte@5.2.7): + /svelte-codemirror-editor@1.4.1(codemirror@6.0.1)(svelte@5.16.0): resolution: {integrity: sha512-Pv350iro0Y/AZTT/y2OLaonheQqAwl50Hdfipa2Jv1Z04TSP5kPUyxQnRjqxeRW7DXOX9s5Nd11tHdBl9iYSzw==} peerDependencies: codemirror: ^6.0.0 svelte: ^3.0.0 || ^4.0.0 || ^5.0.0 dependencies: - codemirror: 6.0.1(@lezer/common@1.2.3) - svelte: 5.2.7 + codemirror: 6.0.1 + svelte: 5.16.0 dev: false - /svelte-eslint-parser@0.43.0(svelte@5.2.7): + /svelte-eslint-parser@0.43.0(svelte@5.16.0): resolution: {integrity: sha512-GpU52uPKKcVnh8tKN5P4UZpJ/fUDndmq7wfsvoVXsyP+aY0anol7Yqo01fyrlaWGMFfm4av5DyrjlaXdLRJvGA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -6574,7 +6595,7 @@ packages: espree: 9.6.1 postcss: 8.4.49 postcss-scss: 4.0.9(postcss@8.4.49) - svelte: 5.2.7 + svelte: 5.16.0 dev: true /svelte-spa-router@4.0.1: @@ -6583,7 +6604,7 @@ packages: regexparam: 2.0.2 dev: false - /svelte2tsx@0.7.28(svelte@5.2.7)(typescript@5.7.2): + /svelte2tsx@0.7.28(svelte@5.16.0)(typescript@5.7.2): resolution: {integrity: sha512-TJjA+kU8AnkyoprZPgQACMfTX8N0MA5NsIL//h9IuHOxmmaCLluqhcZU+fCkWipi5c/pooHLFOMpqjhq4v7JLQ==} peerDependencies: svelte: ^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0 @@ -6591,12 +6612,12 @@ packages: dependencies: dedent-js: 1.0.1 pascal-case: 3.1.2 - svelte: 5.2.7 + svelte: 5.16.0 typescript: 5.7.2 dev: true - /svelte@5.2.7: - resolution: {integrity: sha512-cEhPGuLHiH2+Z8B1FwQgiZJgA39uUmJR4516TKrM5zrp0/cuwJkfhUfcTxhAkznanAF5fXUKzvYR4o+Ksx3ZCQ==} + /svelte@5.16.0: + resolution: {integrity: sha512-Ygqsiac6UogVED2ruKclU+pOeMThxWtp9LG+li7BXeDKC2paVIsRTMkNmcON4Zejerd1s5sZHWx6ZtU85xklVg==} engines: {node: '>=18'} dependencies: '@ampproject/remapping': 2.3.0 @@ -6606,8 +6627,9 @@ packages: acorn-typescript: 1.4.13(acorn@8.14.0) aria-query: 5.3.2 axobject-query: 4.1.0 - esm-env: 1.1.4 - esrap: 1.2.2 + clsx: 2.1.1 + esm-env: 1.2.1 + esrap: 1.3.2 is-reference: 3.0.3 locate-character: 3.0.0 magic-string: 0.30.13 diff --git a/src/components/admin/pages/event/FightCard.svelte b/src/components/admin/pages/event/FightCard.svelte index f2360be..68f7026 100644 --- a/src/components/admin/pages/event/FightCard.svelte +++ b/src/components/admin/pages/event/FightCard.svelte @@ -19,7 +19,7 @@ -