From d7387421522c7492e79d2bbecebc4b1eaf214de5 Mon Sep 17 00:00:00 2001 From: minagishl Date: Tue, 23 Jan 2024 09:20:59 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A9=B3=E7=B4=B0=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=A8=E3=82=B9=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=89=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 22 +- pnpm-lock.yaml | 335 ++++++++++---------- src/components/GeoJsonFeatureList.tsx | 44 ++- src/components/ProvideInformationButton.tsx | 17 + 4 files changed, 221 insertions(+), 197 deletions(-) create mode 100644 src/components/ProvideInformationButton.tsx diff --git a/package.json b/package.json index aa86e3f..649cdb2 100644 --- a/package.json +++ b/package.json @@ -19,39 +19,39 @@ "dependencies": { "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@mui/icons-material": "^5.15.4", - "@mui/material": "^5.15.4", + "@mui/icons-material": "^5.15.6", + "@mui/material": "^5.15.6", "@next-auth/prisma-adapter": "^1.0.7", - "@prisma/client": "^5.7.1", + "@prisma/client": "^5.8.1", "@turf/turf": "^6.5.0", "@types/geojson": "^7946.0.13", "esm": "^3.2.25", "glob": "^10.3.10", "js-yaml": "^4.1.0", "maplibre-gl": "^3.6.2", - "next": "14.0.4", + "next": "14.1.0", "next-auth": "5.0.0-beta.5", "osmtogeojson": "^3.0.0-beta.5", "react": "^18", "react-dom": "^18", - "react-icons": "^4.12.0", + "react-icons": "^5.0.1", "react-map-gl": "^7.1.7", - "sass": "^1.69.7", + "sass": "^1.70.0", "ts-md5": "^1.3.1" }, "devDependencies": { "@types/js-yaml": "^4.0.9", - "@types/node": "^20.10.6", + "@types/node": "^20.11.5", "@types/react": "^18", "@types/react-dom": "^18", - "autoprefixer": "^10.4.16", + "autoprefixer": "^10.4.17", "cssnano": "^6.0.3", "eslint": "^8", - "eslint-config-next": "14.0.4", + "eslint-config-next": "14.1.0", "postcss": "^8.4.33", - "prettier": "3.1.1", + "prettier": "3.2.4", "prettier-plugin-tailwindcss": "^0.5.11", - "prisma": "5.7.1", + "prisma": "5.8.1", "tailwindcss": "^3.4.1", "tailwindcss-patch": "^2.2.2", "ts-node": "^10.9.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4acbb7a..68bd5e5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,17 +12,17 @@ dependencies: specifier: ^11.11.0 version: 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.47)(react@18.2.0) '@mui/icons-material': - specifier: ^5.15.4 - version: 5.15.4(@mui/material@5.15.4)(@types/react@18.2.47)(react@18.2.0) + specifier: ^5.15.6 + version: 5.15.6(@mui/material@5.15.6)(@types/react@18.2.47)(react@18.2.0) '@mui/material': - specifier: ^5.15.4 - version: 5.15.4(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.15.6 + version: 5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0) '@next-auth/prisma-adapter': specifier: ^1.0.7 - version: 1.0.7(@prisma/client@5.7.1)(next-auth@5.0.0-beta.5) + version: 1.0.7(@prisma/client@5.8.1)(next-auth@5.0.0-beta.5) '@prisma/client': - specifier: ^5.7.1 - version: 5.7.1(prisma@5.7.1) + specifier: ^5.8.1 + version: 5.8.1(prisma@5.8.1) '@turf/turf': specifier: ^6.5.0 version: 6.5.0 @@ -42,11 +42,11 @@ dependencies: specifier: ^3.6.2 version: 3.6.2 next: - specifier: 14.0.4 - version: 14.0.4(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.7) + specifier: 14.1.0 + version: 14.1.0(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.70.0) next-auth: specifier: 5.0.0-beta.5 - version: 5.0.0-beta.5(next@14.0.4)(react@18.2.0) + version: 5.0.0-beta.5(next@14.1.0)(react@18.2.0) osmtogeojson: specifier: ^3.0.0-beta.5 version: 3.0.0-beta.5 @@ -57,14 +57,14 @@ dependencies: specifier: ^18 version: 18.2.0(react@18.2.0) react-icons: - specifier: ^4.12.0 - version: 4.12.0(react@18.2.0) + specifier: ^5.0.1 + version: 5.0.1(react@18.2.0) react-map-gl: specifier: ^7.1.7 version: 7.1.7(maplibre-gl@3.6.2)(react-dom@18.2.0)(react@18.2.0) sass: - specifier: ^1.69.7 - version: 1.69.7 + specifier: ^1.70.0 + version: 1.70.0 ts-md5: specifier: ^1.3.1 version: 1.3.1 @@ -74,8 +74,8 @@ devDependencies: specifier: ^4.0.9 version: 4.0.9 '@types/node': - specifier: ^20.10.6 - version: 20.10.6 + specifier: ^20.11.5 + version: 20.11.5 '@types/react': specifier: ^18 version: 18.2.47 @@ -83,8 +83,8 @@ devDependencies: specifier: ^18 version: 18.2.18 autoprefixer: - specifier: ^10.4.16 - version: 10.4.16(postcss@8.4.33) + specifier: ^10.4.17 + version: 10.4.17(postcss@8.4.33) cssnano: specifier: ^6.0.3 version: 6.0.3(postcss@8.4.33) @@ -92,20 +92,20 @@ devDependencies: specifier: ^8 version: 8.56.0 eslint-config-next: - specifier: 14.0.4 - version: 14.0.4(eslint@8.56.0)(typescript@5.3.3) + specifier: 14.1.0 + version: 14.1.0(eslint@8.56.0)(typescript@5.3.3) postcss: specifier: ^8.4.33 version: 8.4.33 prettier: - specifier: 3.1.1 - version: 3.1.1 + specifier: 3.2.4 + version: 3.2.4 prettier-plugin-tailwindcss: specifier: ^0.5.11 - version: 0.5.11(prettier@3.1.1) + version: 0.5.11(prettier@3.2.4) prisma: - specifier: 5.7.1 - version: 5.7.1 + specifier: 5.8.1 + version: 5.8.1 tailwindcss: specifier: ^3.4.1 version: 3.4.1(ts-node@10.9.2) @@ -114,7 +114,7 @@ devDependencies: version: 2.2.2(tailwindcss@3.4.1) ts-node: specifier: ^10.9.2 - version: 10.9.2(@types/node@20.10.6)(typescript@5.3.3) + version: 10.9.2(@types/node@20.11.5)(typescript@5.3.3) typescript: specifier: ^5 version: 5.3.3 @@ -427,6 +427,13 @@ packages: dependencies: regenerator-runtime: 0.14.1 + /@babel/runtime@7.23.8: + resolution: {integrity: sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.14.1 + dev: false + /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} engines: {node: '>=6.9.0'} @@ -633,8 +640,8 @@ packages: '@floating-ui/utils': 0.2.1 dev: false - /@floating-ui/react-dom@2.0.5(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-UsBK30Bg+s6+nsgblXtZmwHhgS2vmbuQK22qgt2pTQM6M3X6H1+cQcLXqgRY3ihVLcZJE6IvqDQozhsnIVqK/Q==} + /@floating-ui/react-dom@2.0.6(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-IB8aCRFxr8nFkdYZgH+Otd9EVQPJoynxeFRGTB8voPoZMRWo8XjYuCRgpI1btvuKY69XMiLnW+ym7zoBHM90Rw==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' @@ -759,8 +766,8 @@ packages: sort-object: 3.0.3 dev: false - /@mui/base@5.0.0-beta.31(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-+uNbP3OHJuZVI00WyMg7xfLZotaEY7LgvYXDfONVJbrS+K9wyjCIPNfjy8r9XJn4fbHo/5ibiZqjWnU9LMNv+A==} + /@mui/base@5.0.0-beta.33(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-WcSpoJUw/UYHXpvgtl4HyMar2Ar97illUpqiS/X1gtSBp6sdDW6kB2BJ9OlVQ+Kk/RL2GDp/WHA9sbjAYV35ow==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -770,10 +777,10 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.7 - '@floating-ui/react-dom': 2.0.5(react-dom@18.2.0)(react@18.2.0) + '@babel/runtime': 7.23.8 + '@floating-ui/react-dom': 2.0.6(react-dom@18.2.0)(react@18.2.0) '@mui/types': 7.2.13(@types/react@18.2.47) - '@mui/utils': 5.15.4(@types/react@18.2.47)(react@18.2.0) + '@mui/utils': 5.15.6(@types/react@18.2.47)(react@18.2.0) '@popperjs/core': 2.11.8 '@types/react': 18.2.47 clsx: 2.1.0 @@ -782,12 +789,12 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /@mui/core-downloads-tracker@5.15.4: - resolution: {integrity: sha512-0OZN9O6hAtBpx70mMNFOPaAIol/ytwZYPY+z7Rf9dK3+1Xlzwvj5/IeShJKvtp76S1qJyhPuvZg0+BGqQaUnUw==} + /@mui/core-downloads-tracker@5.15.6: + resolution: {integrity: sha512-0aoWS4qvk1uzm9JBs83oQmIMIQeTBUeqqu8u+3uo2tMznrB5fIKqQVCbCgq+4Tm4jG+5F7dIvnjvQ2aV7UKtdw==} dev: false - /@mui/icons-material@5.15.4(@mui/material@5.15.4)(@types/react@18.2.47)(react@18.2.0): - resolution: {integrity: sha512-q/Yk7aokN8qGMpR7bwoDpBSeaNe6Bv7vaY9yHYodP37c64TM6ime05ueb/wgksOVszrKkNXC67E/XYbRWOoUFA==} + /@mui/icons-material@5.15.6(@mui/material@5.15.6)(@types/react@18.2.47)(react@18.2.0): + resolution: {integrity: sha512-GnkxMtlhs+8ieHLmCytg00ew0vMOiXGFCw8Ra9nxMsBjBqnrOI5gmXqUm+sGggeEU/HG8HyeqC1MX/IxOBJHzA==} engines: {node: '>=12.0.0'} peerDependencies: '@mui/material': ^5.0.0 @@ -797,14 +804,14 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.7 - '@mui/material': 5.15.4(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0) + '@babel/runtime': 7.23.8 + '@mui/material': 5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0) '@types/react': 18.2.47 react: 18.2.0 dev: false - /@mui/material@5.15.4(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-T/LGRAC+M0c+D3+y67eHwIN5bSje0TxbcJCWR0esNvU11T0QwrX3jedXItPNBwMupF2F5VWCDHBVLlFnN3+ABA==} + /@mui/material@5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-rw7bDdpi2kzfmcDN78lHp8swArJ5sBCKsn+4G3IpGfu44ycyWAWX0VdlvkjcR9Yrws2KIm7c+8niXpWHUDbWoA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -820,14 +827,14 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.7 + '@babel/runtime': 7.23.8 '@emotion/react': 11.11.3(@types/react@18.2.47)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.47)(react@18.2.0) - '@mui/base': 5.0.0-beta.31(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0) - '@mui/core-downloads-tracker': 5.15.4 - '@mui/system': 5.15.4(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react@18.2.0) + '@mui/base': 5.0.0-beta.33(@types/react@18.2.47)(react-dom@18.2.0)(react@18.2.0) + '@mui/core-downloads-tracker': 5.15.6 + '@mui/system': 5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react@18.2.0) '@mui/types': 7.2.13(@types/react@18.2.47) - '@mui/utils': 5.15.4(@types/react@18.2.47)(react@18.2.0) + '@mui/utils': 5.15.6(@types/react@18.2.47)(react@18.2.0) '@types/react': 18.2.47 '@types/react-transition-group': 4.4.10 clsx: 2.1.0 @@ -839,8 +846,8 @@ packages: react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@mui/private-theming@5.15.4(@types/react@18.2.47)(react@18.2.0): - resolution: {integrity: sha512-9N5myIMEEQTM5WYWPGvvYADzjFo12LgJ7S+2iTZkBNOcJpUxQYM1tvYjkHCDV+t1ocMOEgjR2EfJ9Dus30dBlg==} + /@mui/private-theming@5.15.6(@types/react@18.2.47)(react@18.2.0): + resolution: {integrity: sha512-ZBX9E6VNUSscUOtU8uU462VvpvBS7eFl5VfxAzTRVQBHflzL+5KtnGrebgf6Nd6cdvxa1o0OomiaxSKoN2XDmg==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -849,15 +856,15 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.7 - '@mui/utils': 5.15.4(@types/react@18.2.47)(react@18.2.0) + '@babel/runtime': 7.23.8 + '@mui/utils': 5.15.6(@types/react@18.2.47)(react@18.2.0) '@types/react': 18.2.47 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/styled-engine@5.15.4(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@18.2.0): - resolution: {integrity: sha512-vtrZUXG5XI8CNiNLcxjIirW4dEbOloR+ikfm6ePBo7jXpJdpXjVzBWetrfE+5eI0cHkKWlTptnJ2voKV8pBRfw==} + /@mui/styled-engine@5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@18.2.0): + resolution: {integrity: sha512-KAn8P8xP/WigFKMlEYUpU9z2o7jJnv0BG28Qu1dhNQVutsLVIFdRf5Nb+0ijp2qgtcmygQ0FtfRuXv5LYetZTg==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -869,7 +876,7 @@ packages: '@emotion/styled': optional: true dependencies: - '@babel/runtime': 7.23.7 + '@babel/runtime': 7.23.8 '@emotion/cache': 11.11.0 '@emotion/react': 11.11.3(@types/react@18.2.47)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.47)(react@18.2.0) @@ -878,8 +885,8 @@ packages: react: 18.2.0 dev: false - /@mui/system@5.15.4(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react@18.2.0): - resolution: {integrity: sha512-KCwkHajGBXPs2TK1HJjIyab4NDk0cZoBDYN/TTlXVo1qBAmCjY0vjqrlsjeoG+wrwwcezXMLs/e6OGP66fPCog==} + /@mui/system@5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@18.2.47)(react@18.2.0): + resolution: {integrity: sha512-J01D//u8IfXvaEHMBQX5aO2l7Q+P15nt96c4NskX7yp5/+UuZP8XCQJhtBtLuj+M2LLyXHYGmCPeblsmmscP2Q==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -894,13 +901,13 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.7 + '@babel/runtime': 7.23.8 '@emotion/react': 11.11.3(@types/react@18.2.47)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@18.2.47)(react@18.2.0) - '@mui/private-theming': 5.15.4(@types/react@18.2.47)(react@18.2.0) - '@mui/styled-engine': 5.15.4(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@18.2.0) + '@mui/private-theming': 5.15.6(@types/react@18.2.47)(react@18.2.0) + '@mui/styled-engine': 5.15.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@18.2.0) '@mui/types': 7.2.13(@types/react@18.2.47) - '@mui/utils': 5.15.4(@types/react@18.2.47)(react@18.2.0) + '@mui/utils': 5.15.6(@types/react@18.2.47)(react@18.2.0) '@types/react': 18.2.47 clsx: 2.1.0 csstype: 3.1.3 @@ -919,8 +926,8 @@ packages: '@types/react': 18.2.47 dev: false - /@mui/utils@5.15.4(@types/react@18.2.47)(react@18.2.0): - resolution: {integrity: sha512-E2wLQGBcs3VR52CpMRjk46cGscC4cbf3Q2uyHNaAeL36yTTm+aVNbtsTCazXtjOP4BDd8lu6VtlTpVC8Rtl4mg==} + /@mui/utils@5.15.6(@types/react@18.2.47)(react@18.2.0): + resolution: {integrity: sha512-qfEhf+zfU9aQdbzo1qrSWlbPQhH1nCgeYgwhOVnj9Bn39shJQitEnXpSQpSNag8+uty5Od6PxmlNKPTnPySRKA==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -929,7 +936,7 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.7 + '@babel/runtime': 7.23.8 '@types/prop-types': 15.7.11 '@types/react': 18.2.47 prop-types: 15.8.1 @@ -937,28 +944,28 @@ packages: react-is: 18.2.0 dev: false - /@next-auth/prisma-adapter@1.0.7(@prisma/client@5.7.1)(next-auth@5.0.0-beta.5): + /@next-auth/prisma-adapter@1.0.7(@prisma/client@5.8.1)(next-auth@5.0.0-beta.5): resolution: {integrity: sha512-Cdko4KfcmKjsyHFrWwZ//lfLUbcLqlyFqjd/nYE2m3aZ7tjMNUjpks47iw7NTCnXf+5UWz5Ypyt1dSs1EP5QJw==} peerDependencies: '@prisma/client': '>=2.26.0 || >=3' next-auth: ^4 dependencies: - '@prisma/client': 5.7.1(prisma@5.7.1) - next-auth: 5.0.0-beta.5(next@14.0.4)(react@18.2.0) + '@prisma/client': 5.8.1(prisma@5.8.1) + next-auth: 5.0.0-beta.5(next@14.1.0)(react@18.2.0) dev: false - /@next/env@14.0.4: - resolution: {integrity: sha512-irQnbMLbUNQpP1wcE5NstJtbuA/69kRfzBrpAD7Gsn8zm/CY6YQYc3HQBz8QPxwISG26tIm5afvvVbu508oBeQ==} + /@next/env@14.1.0: + resolution: {integrity: sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==} dev: false - /@next/eslint-plugin-next@14.0.4: - resolution: {integrity: sha512-U3qMNHmEZoVmHA0j/57nRfi3AscXNvkOnxDmle/69Jz/G0o/gWjXTDdlgILZdrxQ0Lw/jv2mPW8PGy0EGIHXhQ==} + /@next/eslint-plugin-next@14.1.0: + resolution: {integrity: sha512-x4FavbNEeXx/baD/zC/SdrvkjSby8nBn8KcCREqk6UuwvwoAPZmaV8TFCAuo/cpovBRTIY67mHhe86MQQm/68Q==} dependencies: - glob: 7.1.7 + glob: 10.3.10 dev: true - /@next/swc-darwin-arm64@14.0.4: - resolution: {integrity: sha512-mF05E/5uPthWzyYDyptcwHptucf/jj09i2SXBPwNzbgBNc+XnwzrL0U6BmPjQeOL+FiB+iG1gwBeq7mlDjSRPg==} + /@next/swc-darwin-arm64@14.1.0: + resolution: {integrity: sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -966,8 +973,8 @@ packages: dev: false optional: true - /@next/swc-darwin-x64@14.0.4: - resolution: {integrity: sha512-IZQ3C7Bx0k2rYtrZZxKKiusMTM9WWcK5ajyhOZkYYTCc8xytmwSzR1skU7qLgVT/EY9xtXDG0WhY6fyujnI3rw==} + /@next/swc-darwin-x64@14.1.0: + resolution: {integrity: sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -975,8 +982,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-gnu@14.0.4: - resolution: {integrity: sha512-VwwZKrBQo/MGb1VOrxJ6LrKvbpo7UbROuyMRvQKTFKhNaXjUmKTu7wxVkIuCARAfiI8JpaWAnKR+D6tzpCcM4w==} + /@next/swc-linux-arm64-gnu@14.1.0: + resolution: {integrity: sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -984,8 +991,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-musl@14.0.4: - resolution: {integrity: sha512-8QftwPEW37XxXoAwsn+nXlodKWHfpMaSvt81W43Wh8dv0gkheD+30ezWMcFGHLI71KiWmHK5PSQbTQGUiidvLQ==} + /@next/swc-linux-arm64-musl@14.1.0: + resolution: {integrity: sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -993,8 +1000,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-gnu@14.0.4: - resolution: {integrity: sha512-/s/Pme3VKfZAfISlYVq2hzFS8AcAIOTnoKupc/j4WlvF6GQ0VouS2Q2KEgPuO1eMBwakWPB1aYFIA4VNVh667A==} + /@next/swc-linux-x64-gnu@14.1.0: + resolution: {integrity: sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1002,8 +1009,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-musl@14.0.4: - resolution: {integrity: sha512-m8z/6Fyal4L9Bnlxde5g2Mfa1Z7dasMQyhEhskDATpqr+Y0mjOBZcXQ7G5U+vgL22cI4T7MfvgtrM2jdopqWaw==} + /@next/swc-linux-x64-musl@14.1.0: + resolution: {integrity: sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -1011,8 +1018,8 @@ packages: dev: false optional: true - /@next/swc-win32-arm64-msvc@14.0.4: - resolution: {integrity: sha512-7Wv4PRiWIAWbm5XrGz3D8HUkCVDMMz9igffZG4NB1p4u1KoItwx9qjATHz88kwCEal/HXmbShucaslXCQXUM5w==} + /@next/swc-win32-arm64-msvc@14.1.0: + resolution: {integrity: sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -1020,8 +1027,8 @@ packages: dev: false optional: true - /@next/swc-win32-ia32-msvc@14.0.4: - resolution: {integrity: sha512-zLeNEAPULsl0phfGb4kdzF/cAVIfaC7hY+kt0/d+y9mzcZHsMS3hAS829WbJ31DkSlVKQeHEjZHIdhN+Pg7Gyg==} + /@next/swc-win32-ia32-msvc@14.1.0: + resolution: {integrity: sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -1029,8 +1036,8 @@ packages: dev: false optional: true - /@next/swc-win32-x64-msvc@14.0.4: - resolution: {integrity: sha512-yEh2+R8qDlDCjxVpzOTEpBLQTEFAcP2A8fUFLaWNap9GitYKkKv1//y2S6XY6zsR4rCOPRpU7plYDR+az2n30A==} + /@next/swc-win32-x64-msvc@14.1.0: + resolution: {integrity: sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -1073,8 +1080,8 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: false - /@prisma/client@5.7.1(prisma@5.7.1): - resolution: {integrity: sha512-TUSa4nUcC4nf/e7X3jyO1pEd6XcI/TLRCA0KjkA46RDIpxUaRsBYEOqITwXRW2c0bMFyKcCRXrH4f7h4q9oOlg==} + /@prisma/client@5.8.1(prisma@5.8.1): + resolution: {integrity: sha512-xQtMPfbIwLlbm0VVIVQY2yqQVOxPwRQhvIp7Z3m2900g1bu/zRHKhYZJQWELqmjl6d8YwBy0K2NvMqh47v1ubw==} engines: {node: '>=16.13'} requiresBuild: true peerDependencies: @@ -1083,35 +1090,35 @@ packages: prisma: optional: true dependencies: - prisma: 5.7.1 + prisma: 5.8.1 dev: false - /@prisma/debug@5.7.1: - resolution: {integrity: sha512-yrVSO/YZOxdeIxcBtZ5BaNqUfPrZkNsAKQIQg36cJKMxj/VYK3Vk5jMKkI+gQLl0KReo1YvX8GWKfV788SELjw==} + /@prisma/debug@5.8.1: + resolution: {integrity: sha512-tjuw7eA0Us3T42jx9AmAgL58rzwzpFGYc3R7Y4Ip75EBYrKMBA1YihuWMcBC92ILmjlQ/u3p8VxcIE0hr+fZfg==} - /@prisma/engines-version@5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5: - resolution: {integrity: sha512-dIR5IQK/ZxEoWRBDOHF87r1Jy+m2ih3Joi4vzJRP+FOj5yxCwS2pS5SBR3TWoVnEK1zxtLI/3N7BjHyGF84fgw==} + /@prisma/engines-version@5.8.1-1.78caf6feeaed953168c64e15a249c3e9a033ebe2: + resolution: {integrity: sha512-f5C3JM3l9yhGr3cr4FMqWloFaSCpNpMi58Om22rjD2DOz3owci2mFdFXMgnAGazFPKrCbbEhcxdsRfspEYRoFQ==} - /@prisma/engines@5.7.1: - resolution: {integrity: sha512-R+Pqbra8tpLP2cvyiUpx+SIKglav3nTCpA+rn6826CThviQ8yvbNG0s8jNpo51vS9FuZO3pOkARqG062vKX7uA==} + /@prisma/engines@5.8.1: + resolution: {integrity: sha512-TJgYLRrZr56uhqcXO4GmP5be+zjCIHtLDK20Cnfg+o9d905hsN065QOL+3Z0zQAy6YD31Ol4u2kzSfRmbJv/uA==} requiresBuild: true dependencies: - '@prisma/debug': 5.7.1 - '@prisma/engines-version': 5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5 - '@prisma/fetch-engine': 5.7.1 - '@prisma/get-platform': 5.7.1 + '@prisma/debug': 5.8.1 + '@prisma/engines-version': 5.8.1-1.78caf6feeaed953168c64e15a249c3e9a033ebe2 + '@prisma/fetch-engine': 5.8.1 + '@prisma/get-platform': 5.8.1 - /@prisma/fetch-engine@5.7.1: - resolution: {integrity: sha512-9ELauIEBkIaEUpMIYPRlh5QELfoC6pyHolHVQgbNxglaINikZ9w9X7r1TIePAcm05pCNp2XPY1ObQIJW5nYfBQ==} + /@prisma/fetch-engine@5.8.1: + resolution: {integrity: sha512-+bgjjoSFa6uYEbAPlklfoVSStOEfcpheOjoBoNsNNSQdSzcwE2nM4Q0prun0+P8/0sCHo18JZ9xqa8gObvgOUw==} dependencies: - '@prisma/debug': 5.7.1 - '@prisma/engines-version': 5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5 - '@prisma/get-platform': 5.7.1 + '@prisma/debug': 5.8.1 + '@prisma/engines-version': 5.8.1-1.78caf6feeaed953168c64e15a249c3e9a033ebe2 + '@prisma/get-platform': 5.8.1 - /@prisma/get-platform@5.7.1: - resolution: {integrity: sha512-eDlswr3a1m5z9D/55Iyt/nZqS5UpD+DZ9MooBB3hvrcPhDQrcf9m4Tl7buy4mvAtrubQ626ECtb8c6L/f7rGSQ==} + /@prisma/get-platform@5.8.1: + resolution: {integrity: sha512-wnA+6HTFcY+tkykMokix9GiAkaauPC5W/gg0O5JB0J8tCTNWrqpnQ7AsaGRfkYUbeOIioh6woDjQrGTTRf1Zag==} dependencies: - '@prisma/debug': 5.7.1 + '@prisma/debug': 5.8.1 /@rushstack/eslint-patch@1.6.1: resolution: {integrity: sha512-UY+FGM/2jjMkzQLn8pxcHGMaVLh9aEitG3zY2CiY7XHdLiz3bZOwa6oDxNqEMv7zZkV+cj5DOdz0cQ1BP5Hjgw==} @@ -2247,8 +2254,8 @@ packages: '@types/pbf': 3.0.5 dev: false - /@types/node@20.10.6: - resolution: {integrity: sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==} + /@types/node@20.11.5: + resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==} dependencies: undici-types: 5.26.5 dev: true @@ -2549,15 +2556,15 @@ packages: has-symbols: 1.0.3 dev: true - /autoprefixer@10.4.16(postcss@8.4.33): - resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==} + /autoprefixer@10.4.17(postcss@8.4.33): + resolution: {integrity: sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: postcss: ^8.1.0 dependencies: browserslist: 4.22.2 - caniuse-lite: 1.0.30001574 + caniuse-lite: 1.0.30001579 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -2624,7 +2631,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001574 + caniuse-lite: 1.0.30001579 electron-to-chromium: 1.4.623 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.22.2) @@ -2701,6 +2708,10 @@ packages: /caniuse-lite@1.0.30001574: resolution: {integrity: sha512-BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg==} + dev: true + + /caniuse-lite@1.0.30001579: + resolution: {integrity: sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==} /chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -3103,7 +3114,7 @@ packages: /dom-helpers@5.2.1: resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==} dependencies: - '@babel/runtime': 7.23.7 + '@babel/runtime': 7.23.8 csstype: 3.1.3 dev: false @@ -3290,8 +3301,8 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} - /eslint-config-next@14.0.4(eslint@8.56.0)(typescript@5.3.3): - resolution: {integrity: sha512-9/xbOHEQOmQtqvQ1UsTQZpnA7SlDMBtuKJ//S4JnoyK3oGLhILKXdBgu/UO7lQo/2xOykQULS1qQ6p2+EpHgAQ==} + /eslint-config-next@14.1.0(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-SBX2ed7DoRFXC6CQSLc/SbLY9Ut6HxNB2wPTcoIWjUMd7aF7O/SIE7111L8FdZ9TXsNV4pulUDnfthpyPtbFUg==} peerDependencies: eslint: ^7.23.0 || ^8.0.0 typescript: '>=3.3.1' @@ -3299,7 +3310,7 @@ packages: typescript: optional: true dependencies: - '@next/eslint-plugin-next': 14.0.4 + '@next/eslint-plugin-next': 14.1.0 '@rushstack/eslint-patch': 1.6.1 '@typescript-eslint/parser': 6.18.0(eslint@8.56.0)(typescript@5.3.3) eslint: 8.56.0 @@ -3827,10 +3838,6 @@ packages: is-glob: 4.0.3 dev: true - /glob-to-regexp@0.4.1: - resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} - dev: false - /glob@10.3.10: resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} engines: {node: '>=16 || 14 >=14.17'} @@ -3842,17 +3849,6 @@ packages: minipass: 7.0.4 path-scurry: 1.10.1 - /glob@7.1.7: - resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==} - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: true - /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} dependencies: @@ -4565,7 +4561,7 @@ packages: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true - /next-auth@5.0.0-beta.5(next@14.0.4)(react@18.2.0): + /next-auth@5.0.0-beta.5(next@14.1.0)(react@18.2.0): resolution: {integrity: sha512-tEYIPhm/i0byW4xf9Ldlsnh7ckBQfNvMjOA3B3eXQX9taAQWb8earravSn1fjk4fKfKvaOApFJkks0VeI7Vy/A==} peerDependencies: next: ^14 @@ -4576,12 +4572,12 @@ packages: optional: true dependencies: '@auth/core': 0.21.0 - next: 14.0.4(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.7) + next: 14.1.0(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.70.0) react: 18.2.0 dev: false - /next@14.0.4(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.7): - resolution: {integrity: sha512-qbwypnM7327SadwFtxXnQdGiKpkuhaRLE2uq62/nRul9cj9KhQ5LhHmlziTNqUidZotw/Q1I9OjirBROdUJNgA==} + /next@14.1.0(@babel/core@7.23.7)(react-dom@18.2.0)(react@18.2.0)(sass@1.70.0): + resolution: {integrity: sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==} engines: {node: '>=18.17.0'} hasBin: true peerDependencies: @@ -4595,27 +4591,26 @@ packages: sass: optional: true dependencies: - '@next/env': 14.0.4 + '@next/env': 14.1.0 '@swc/helpers': 0.5.2 busboy: 1.6.0 - caniuse-lite: 1.0.30001574 + caniuse-lite: 1.0.30001579 graceful-fs: 4.2.11 postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - sass: 1.69.7 + sass: 1.70.0 styled-jsx: 5.1.1(@babel/core@7.23.7)(react@18.2.0) - watchpack: 2.4.0 optionalDependencies: - '@next/swc-darwin-arm64': 14.0.4 - '@next/swc-darwin-x64': 14.0.4 - '@next/swc-linux-arm64-gnu': 14.0.4 - '@next/swc-linux-arm64-musl': 14.0.4 - '@next/swc-linux-x64-gnu': 14.0.4 - '@next/swc-linux-x64-musl': 14.0.4 - '@next/swc-win32-arm64-msvc': 14.0.4 - '@next/swc-win32-ia32-msvc': 14.0.4 - '@next/swc-win32-x64-msvc': 14.0.4 + '@next/swc-darwin-arm64': 14.1.0 + '@next/swc-darwin-x64': 14.1.0 + '@next/swc-linux-arm64-gnu': 14.1.0 + '@next/swc-linux-arm64-musl': 14.1.0 + '@next/swc-linux-x64-gnu': 14.1.0 + '@next/swc-linux-x64-musl': 14.1.0 + '@next/swc-win32-arm64-msvc': 14.1.0 + '@next/swc-win32-ia32-msvc': 14.1.0 + '@next/swc-win32-x64-msvc': 14.1.0 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros @@ -5028,7 +5023,7 @@ packages: dependencies: lilconfig: 3.0.0 postcss: 8.4.33 - ts-node: 10.9.2(@types/node@20.10.6)(typescript@5.3.3) + ts-node: 10.9.2(@types/node@20.11.5)(typescript@5.3.3) yaml: 2.3.4 dev: true @@ -5305,7 +5300,7 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-tailwindcss@0.5.11(prettier@3.1.1): + /prettier-plugin-tailwindcss@0.5.11(prettier@3.2.4): resolution: {integrity: sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==} engines: {node: '>=14.21.3'} peerDependencies: @@ -5354,11 +5349,11 @@ packages: prettier-plugin-twig-melody: optional: true dependencies: - prettier: 3.1.1 + prettier: 3.2.4 dev: true - /prettier@3.1.1: - resolution: {integrity: sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==} + /prettier@3.2.4: + resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==} engines: {node: '>=14'} hasBin: true dev: true @@ -5367,13 +5362,13 @@ packages: resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==} dev: false - /prisma@5.7.1: - resolution: {integrity: sha512-ekho7ziH0WEJvC4AxuJz+ewRTMskrebPcrKuBwcNzVDniYxx+dXOGcorNeIb9VEMO5vrKzwNYvhD271Ui2jnNw==} + /prisma@5.8.1: + resolution: {integrity: sha512-N6CpjzECnUHZ5beeYpDzkt2rYpEdAeqXX2dweu6BoQaeYkNZrC/WJHM+5MO/uidFHTak8QhkPKBWck1o/4MD4A==} engines: {node: '>=16.13'} hasBin: true requiresBuild: true dependencies: - '@prisma/engines': 5.7.1 + '@prisma/engines': 5.8.1 /prop-types@15.8.1: resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==} @@ -5433,8 +5428,8 @@ packages: scheduler: 0.23.0 dev: false - /react-icons@4.12.0(react@18.2.0): - resolution: {integrity: sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==} + /react-icons@5.0.1(react@18.2.0): + resolution: {integrity: sha512-WqLZJ4bLzlhmsvme6iFdgO8gfZP17rfjYEJ2m9RsZjZ+cc4k1hTzknEz63YS1MeT50kVzoa1Nz36f4BEx+Wigw==} peerDependencies: react: '*' dependencies: @@ -5474,7 +5469,7 @@ packages: react: '>=16.6.0' react-dom: '>=16.6.0' dependencies: - '@babel/runtime': 7.23.7 + '@babel/runtime': 7.23.8 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 @@ -5625,8 +5620,8 @@ packages: is-regex: 1.1.4 dev: true - /sass@1.69.7: - resolution: {integrity: sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==} + /sass@1.70.0: + resolution: {integrity: sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -6086,7 +6081,7 @@ packages: engines: {node: '>=12'} dev: false - /ts-node@10.9.2(@types/node@20.10.6)(typescript@5.3.3): + /ts-node@10.9.2(@types/node@20.11.5)(typescript@5.3.3): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -6105,7 +6100,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.10.6 + '@types/node': 20.11.5 acorn: 8.11.3 acorn-walk: 8.3.1 arg: 4.1.3 @@ -6284,14 +6279,6 @@ packages: pbf: 3.2.1 dev: false - /watchpack@2.4.0: - resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==} - engines: {node: '>=10.13.0'} - dependencies: - glob-to-regexp: 0.4.1 - graceful-fs: 4.2.11 - dev: false - /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} diff --git a/src/components/GeoJsonFeatureList.tsx b/src/components/GeoJsonFeatureList.tsx index 4c3b0b3..0d5e395 100644 --- a/src/components/GeoJsonFeatureList.tsx +++ b/src/components/GeoJsonFeatureList.tsx @@ -1,14 +1,14 @@ import PositionType from './PositionType'; import Icon from './Icon'; -import * as React from 'react'; import Accordion from '@mui/material/Accordion'; import AccordionSummary from '@mui/material/AccordionSummary'; import AccordionDetails from '@mui/material/AccordionDetails'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; import Grid from '@mui/material/Grid'; -import Stack from '@mui/material/Stack'; -import Typography from '@mui/material/Typography'; +import ProvideInformationButton from './ProvideInformationButton'; +import Drawer from '@mui/material/Drawer'; +import { useState, Fragment } from 'react'; interface GeoJsonFeatureListProps { emoji?: string; @@ -25,25 +25,41 @@ export default function GeoJsonFeatureList({ geoIndex, length, }: GeoJsonFeatureListProps): React.JSX.Element { + const [menuState, setMenuState] = useState(false); + if (!emoji || !feature) return

Object is Null

; const name = feature.properties?.name; const address: string = feature.properties?.['KSJ2:AdminArea'] + ' ' + feature.properties?.['KSJ2:ADS']; + const toggleDrawer = (open: boolean) => (event: React.KeyboardEvent | React.MouseEvent) => { + if ( + event.type === 'keydown' && + ((event as React.KeyboardEvent).key === 'Tab' || (event as React.KeyboardEvent).key === 'Shift') + ) { + return; + } + + setMenuState(open); + }; + return (
+ + + test + + }> - - - - - - {`${ - index + 1 - }. ${name}`} - + + + + + {`${ + index + 1 + }. ${name}`} @@ -58,6 +74,10 @@ export default function GeoJsonFeatureList({ )}
+ {/* 情報提供ボタン */} +
+ +
diff --git a/src/components/ProvideInformationButton.tsx b/src/components/ProvideInformationButton.tsx new file mode 100644 index 0000000..422ad52 --- /dev/null +++ b/src/components/ProvideInformationButton.tsx @@ -0,0 +1,17 @@ +import { FaPen } from 'react-icons/fa'; + +interface Props { + [key: string]: any; +} + +export default function ProvideInformationButton(props: Props): React.JSX.Element { + return ( + + ); +} From be8d0368a2152f1d768576189521e887835f01d3 Mon Sep 17 00:00:00 2001 From: minagishl Date: Tue, 23 Jan 2024 09:29:33 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=89=E3=83=A1?= =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92=E3=82=B3=E3=83=B3=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GeoJsonFeatureList.tsx | 10 +++------- src/components/ProvideInformationDrawer.tsx | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 src/components/ProvideInformationDrawer.tsx diff --git a/src/components/GeoJsonFeatureList.tsx b/src/components/GeoJsonFeatureList.tsx index 0d5e395..81a0e4f 100644 --- a/src/components/GeoJsonFeatureList.tsx +++ b/src/components/GeoJsonFeatureList.tsx @@ -7,8 +7,8 @@ import AccordionDetails from '@mui/material/AccordionDetails'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; import Grid from '@mui/material/Grid'; import ProvideInformationButton from './ProvideInformationButton'; -import Drawer from '@mui/material/Drawer'; -import { useState, Fragment } from 'react'; +import ProvideInformationDrawer from './ProvideInformationDrawer'; +import { useState } from 'react'; interface GeoJsonFeatureListProps { emoji?: string; @@ -45,11 +45,7 @@ export default function GeoJsonFeatureList({ return (
- - - test - - + }> diff --git a/src/components/ProvideInformationDrawer.tsx b/src/components/ProvideInformationDrawer.tsx new file mode 100644 index 0000000..d8a2cc1 --- /dev/null +++ b/src/components/ProvideInformationDrawer.tsx @@ -0,0 +1,15 @@ +import React, { Fragment } from 'react'; +import Drawer from '@mui/material/Drawer'; + +interface Props { + [key: string]: any; +} +export default function ProvideInformationDrawer(props: Props): React.JSX.Element { + return ( + + + test + + + ); +} From 801b35b5f7911c62496c454cef782f9bc1381af0 Mon Sep 17 00:00:00 2001 From: minagishl Date: Tue, 23 Jan 2024 10:45:21 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E6=83=85=E5=A0=B1=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E5=85=A5=E5=8A=9BUI=E3=81=AE=E5=AE=8C=E6=88=90=20#52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 12 ++ src/components/GeoJsonFeatureList.tsx | 10 +- src/components/ProvideInformationButton.tsx | 11 +- src/components/ProvideInformationDrawer.tsx | 127 +++++++++++++++++++- 5 files changed, 153 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 649cdb2..0ef4cbe 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "osmtogeojson": "^3.0.0-beta.5", "react": "^18", "react-dom": "^18", + "react-hook-form": "^7.49.3", "react-icons": "^5.0.1", "react-map-gl": "^7.1.7", "sass": "^1.70.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 68bd5e5..d7bea83 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,6 +56,9 @@ dependencies: react-dom: specifier: ^18 version: 18.2.0(react@18.2.0) + react-hook-form: + specifier: ^7.49.3 + version: 7.49.3(react@18.2.0) react-icons: specifier: ^5.0.1 version: 5.0.1(react@18.2.0) @@ -5428,6 +5431,15 @@ packages: scheduler: 0.23.0 dev: false + /react-hook-form@7.49.3(react@18.2.0): + resolution: {integrity: sha512-foD6r3juidAT1cOZzpmD/gOKt7fRsDhXXZ0y28+Al1CHgX+AY1qIN9VSIIItXRq1dN68QrRwl1ORFlwjBaAqeQ==} + engines: {node: '>=18', pnpm: '8'} + peerDependencies: + react: ^16.8.0 || ^17 || ^18 + dependencies: + react: 18.2.0 + dev: false + /react-icons@5.0.1(react@18.2.0): resolution: {integrity: sha512-WqLZJ4bLzlhmsvme6iFdgO8gfZP17rfjYEJ2m9RsZjZ+cc4k1hTzknEz63YS1MeT50kVzoa1Nz36f4BEx+Wigw==} peerDependencies: diff --git a/src/components/GeoJsonFeatureList.tsx b/src/components/GeoJsonFeatureList.tsx index 81a0e4f..371f95e 100644 --- a/src/components/GeoJsonFeatureList.tsx +++ b/src/components/GeoJsonFeatureList.tsx @@ -7,7 +7,7 @@ import AccordionDetails from '@mui/material/AccordionDetails'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; import Grid from '@mui/material/Grid'; import ProvideInformationButton from './ProvideInformationButton'; -import ProvideInformationDrawer from './ProvideInformationDrawer'; +import ProvideInformationDrawer, { type Content } from './ProvideInformationDrawer'; import { useState } from 'react'; interface GeoJsonFeatureListProps { @@ -32,6 +32,12 @@ export default function GeoJsonFeatureList({ const name = feature.properties?.name; const address: string = feature.properties?.['KSJ2:AdminArea'] + ' ' + feature.properties?.['KSJ2:ADS']; + // 情報提供フォームのオプション + const option: Content = { + shelterName: name, + shelterId: feature.id, + }; + const toggleDrawer = (open: boolean) => (event: React.KeyboardEvent | React.MouseEvent) => { if ( event.type === 'keydown' && @@ -45,7 +51,7 @@ export default function GeoJsonFeatureList({ return (
- + }> diff --git a/src/components/ProvideInformationButton.tsx b/src/components/ProvideInformationButton.tsx index 422ad52..d012dfe 100644 --- a/src/components/ProvideInformationButton.tsx +++ b/src/components/ProvideInformationButton.tsx @@ -2,16 +2,19 @@ import { FaPen } from 'react-icons/fa'; interface Props { [key: string]: any; + className?: string; + onClick?: (event: React.MouseEvent) => void; + message?: string; } export default function ProvideInformationButton(props: Props): React.JSX.Element { return ( ); } diff --git a/src/components/ProvideInformationDrawer.tsx b/src/components/ProvideInformationDrawer.tsx index d8a2cc1..b47c6b3 100644 --- a/src/components/ProvideInformationDrawer.tsx +++ b/src/components/ProvideInformationDrawer.tsx @@ -1,14 +1,137 @@ import React, { Fragment } from 'react'; import Drawer from '@mui/material/Drawer'; +import ProvideInformationButton from './ProvideInformationButton'; +import { useForm, SubmitHandler } from 'react-hook-form'; interface Props { [key: string]: any; + options?: Content; + onClick?: (event: React.MouseEvent) => void; } + +export interface Content { + shelterName: string; + shelterId?: string; +} + +type Inputs = { + shelterOpen: boolean; // 避難所の開設状況 + shelterState: string; // 避難所の状況 + electricityEnergies: string; // 電気の状況 + waterService: string; // 水道の状況 + toiletConditions: string; // トイレの状況 + waterSupplyConditions: string; // 給水の状況 + foodConditions: string; // 食料の状況 + sanitaryProductsConditions: string; // 生理用品の状況 + medicineConditions: string; // 薬の状況 + babyProductsConditions: string; // 粉ミルクなどの状況（子供用品） +}; + +const fields = [ + { name: 'waterSupplyConditions', label: '給水の状況', required: true }, + { name: 'foodConditions', label: '食料の状況', required: true }, + { name: 'sanitaryProductsConditions', label: '生理用品の状況', required: true }, + { name: 'medicineConditions', label: '薬の状況', required: true }, + { name: 'babyProductsConditions', label: '粉ミルクなどの状況（子供用品）', required: true }, +]; + export default function ProvideInformationDrawer(props: Props): React.JSX.Element { + const option = props.options; + + const { + register, + handleSubmit, + watch, + formState: { errors }, + } = useForm(); + const onSubmit: SubmitHandler = (data) => console.log(data); + + function InputItems(fields: any, register: any, errors: any) { + return ( + <> + {fields.map((field: any) => ( +
+ + {errors[field.name]?.message && ( +

{errors[field.name]?.message}

+ )} +
+ ))} + + ); + } + + const shelterOpen = watch('shelterOpen'); + return ( - - test + +
+
+

{option?.shelterName}

+

の情報提供

+

+ 下記内容から該当するものを選択してください +

+
+
+
+ + {errors.shelterOpen?.message && ( +

{errors.shelterOpen?.message}

+ )} +
+ {InputItems(fields, register, errors)} +
+
+
+ {/* ボタン */} +
+ + +
+
); From dbe93ece31a5c1871f11c2b83fc1701addbef52d Mon Sep 17 00:00:00 2001 From: minagishl Date: Tue, 23 Jan 2024 10:53:18 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E8=A7=A3=E6=B1=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- .tw-patch/tw-class-list.json | 30 +++++++++++++++++++++++++++++- next.config.mjs | 4 ++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bd3dcfd..d331af0 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,5 @@ next-env.d.ts postgres-data # temporary file -tmp \ No newline at end of file +tmp +.tw-patch/ \ No newline at end of file diff --git a/.tw-patch/tw-class-list.json b/.tw-patch/tw-class-list.json index ab736a5..de887fb 100644 --- a/.tw-patch/tw-class-list.json +++ b/.tw-patch/tw-class-list.json @@ -7,19 +7,27 @@ "[out:json]", "[timeout:30000]", "absolute", + "bg-black", "bg-black/70", "bg-white", + "bg-zinc-200", "bg-zinc-500", "block", + "border", "border-2", "border-b", + "border-gray-300", "border-zinc-200", "border-zinc-900", "bottom-1", "bottom-10", "bottom-7", - "container", "cursor-pointer", + "disabled:bg-zinc-200", + "disabled:hover:bg-zinc-200", + "disabled:text-zinc-900", + "duration-150", + "ease-in-out", "filter", "flex", "flex-1", @@ -37,6 +45,9 @@ "h-full", "h-screen", "hidden", + "hover:bg-zinc-300", + "hover:bg-zinc-50", + "hover:bg-zinc-900", "items-center", "items-end", "justify-center", @@ -48,19 +59,31 @@ "min-h-10", "min-h-4", "min-w-10", + "mr-2", + "mt-2", "my-2", + "my-3", "overflow-hidden", "overflow-scroll", "p-2", "p-5", + "p-8", + "pb-0", + "pb-0.5", + "pl-3", "pl-5", "pr-2", "print:h-full", "print:hidden", "pt-0", "pt-0.5", + "pt-3", + "pt-5", "px-1", "px-3", + "px-4", + "py-1", + "py-1.5", "py-2", "py-4", "relative", @@ -79,14 +102,19 @@ "sm:h-screen", "sm:max-w-sm", "sm:w-4/12", + "sm:w-fit", + "space-x-1", "text-base", "text-center", + "text-lg", + "text-red-400", "text-sm", "text-white", "text-xs", "text-zinc-400", "text-zinc-900", "top-0", + "transition-colors", "truncate", "w-10", "w-5", diff --git a/next.config.mjs b/next.config.mjs index d52bc5c..73e29b9 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -4,6 +4,10 @@ let generatedStrings = new Map(); /** @type {import('next').NextConfig} */ const nextConfig = { + experimental: { + missingSuspenseWithCSRBailout: false, + }, + // ウェブパックの設定 webpack: (config, { dev }) => { config.infrastructureLogging = { From 11d532d04050accd15495320321e9add330cbaa8 Mon Sep 17 00:00:00 2001 From: minagishl Date: Tue, 23 Jan 2024 14:38:25 +0900 Subject: [PATCH 5/7] state #52 --- src/components/ProvideInformationDrawer.tsx | 100 +++++++++++--------- 1 file changed, 56 insertions(+), 44 deletions(-) diff --git a/src/components/ProvideInformationDrawer.tsx b/src/components/ProvideInformationDrawer.tsx index b47c6b3..f1a3a19 100644 --- a/src/components/ProvideInformationDrawer.tsx +++ b/src/components/ProvideInformationDrawer.tsx @@ -1,4 +1,4 @@ -import React, { Fragment } from 'react'; +import React, { Fragment, useState, useEffect, use } from 'react'; import Drawer from '@mui/material/Drawer'; import ProvideInformationButton from './ProvideInformationButton'; import { useForm, SubmitHandler } from 'react-hook-form'; @@ -15,7 +15,7 @@ export interface Content { } type Inputs = { - shelterOpen: boolean; // 避難所の開設状況 + shelterOpen: number; // 避難所の開設状況 shelterState: string; // 避難所の状況 electricityEnergies: string; // 電気の状況 waterService: string; // 水道の状況 @@ -28,23 +28,31 @@ type Inputs = { }; const fields = [ - { name: 'waterSupplyConditions', label: '給水の状況', required: true }, - { name: 'foodConditions', label: '食料の状況', required: true }, - { name: 'sanitaryProductsConditions', label: '生理用品の状況', required: true }, - { name: 'medicineConditions', label: '薬の状況', required: true }, - { name: 'babyProductsConditions', label: '粉ミルクなどの状況（子供用品）', required: true }, + { name: 'waterSupplyConditions', label: '給水の状況', required: '入力してください' }, + { name: 'foodConditions', label: '食料の状況', required: '入力してください' }, + { name: 'sanitaryProductsConditions', label: '生理用品の状況', required: '入力してください' }, + { name: 'medicineConditions', label: '薬の状況', required: '入力してください' }, + { name: 'babyProductsConditions', label: '粉ミルクなどの状況（子供用品）', required: '入力してください' }, ]; export default function ProvideInformationDrawer(props: Props): React.JSX.Element { + const [sendData, setSendData] = useState({} as Inputs); + const [open, setOpen] = useState(false); const option = props.options; + useEffect(() => { + setOpen(props.menuState); + }, [props.menuState]); + const { register, handleSubmit, watch, formState: { errors }, } = useForm(); - const onSubmit: SubmitHandler = (data) => console.log(data); + const onSubmit: SubmitHandler = (data) => { + console.log(data), setSendData(data), setOpen(false); + }; function InputItems(fields: any, register: any, errors: any) { return ( @@ -71,59 +79,63 @@ export default function ProvideInformationDrawer(props: Props): React.JSX.Elemen ); } - const shelterOpen = watch('shelterOpen'); - return ( - +
-
+

{option?.shelterName}

の情報提供

下記内容から該当するものを選択してください

-
-
-
-