diff --git a/.github/workflows/auto-prettier.yml b/.github/workflows/auto-prettier.yml index e1476bffd..5bd2a50db 100644 --- a/.github/workflows/auto-prettier.yml +++ b/.github/workflows/auto-prettier.yml @@ -30,6 +30,9 @@ jobs: - name: Lint working-directory: view/next-project run: npm run lint:fix + - name: Check types with TypeScript + working-directory: view/next-project + run: npm run type-check - uses: stefanzweifel/git-auto-commit-action@v3.0.0 with: commit_message: formatted by workflow diff --git a/.vscode/settings.json b/.vscode/settings.json index 5c4f4648b..cceba4cfa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,13 +2,17 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "eslint.workingDirectories": ["./view/next-project"], + "editor.codeActionsOnSave": { + "source.fixAll.eslint": "always", + "source.fixAll.prettier": "always", + "source.organizeImports": "always" + }, "[go]": { "editor.defaultFormatter": "golang.go" }, "[sql]": { - "editor.defaultFormatter": "inferrinizzard.prettier-sql-vscode" + "editor.defaultFormatter": "adpyke.vscode-sql-formatter" }, - "Prettier-SQL.expressionWidth": 100, "emeraldwalk.runonsave": { "commands": [ { @@ -16,5 +20,11 @@ "cmd": "golines ${file} -w" } ] + }, + "[github-actions-workflow]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "tailwindCSS.includeLanguages": { + "plaintext": "html" } -} +} \ No newline at end of file diff --git a/view/next-project/.eslintrc.json b/view/next-project/.eslintrc.json index 88901807a..db39a9e68 100644 --- a/view/next-project/.eslintrc.json +++ b/view/next-project/.eslintrc.json @@ -5,13 +5,18 @@ "plugin:@typescript-eslint/recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:import/errors", - "plugin:storybook/recommended" + "plugin:import/typescript", + "plugin:react-hooks/recommended", + "plugin:storybook/recommended", + "plugin:tailwindcss/recommended", + "prettier" ], - "plugins": ["@typescript-eslint", "unused-imports", "import"], + "plugins": ["@typescript-eslint", "unused-imports", "import", "react-hooks", "tailwindcss"], "parser": "@typescript-eslint/parser", "env": { "node": true, - "es6": true + "es6": true, + "browser": true }, "parserOptions": { "ecmaFeatures": { @@ -27,19 +32,41 @@ "extensions": [".ts", ".tsx"] }, "typescript": {} + }, + "react": { + "version": "detect" } }, "rules": { "unused-imports/no-unused-imports": "error", + "unused-imports/no-unused-vars": [ + "warn", + { "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" } + ], "import/order": [ "error", { + "groups": [ + "builtin", + "external", + "internal", + ["parent", "sibling"], + "index", + "object", + "type" + ], + "newlines-between": "always", "alphabetize": { "caseInsensitive": true, "order": "asc" } } - ] + ], + "react-hooks/rules-of-hooks": "error", + "react-hooks/exhaustive-deps": "warn", + "@typescript-eslint/no-explicit-any": "warn", + "@typescript-eslint/no-unused-vars": "off", + "tailwindcss/classnames-order": "off" }, - "ignorePatterns": ["src/generated"] + "ignorePatterns": ["src/generated", "*.config.js", "*.config.ts"] } diff --git a/view/next-project/next-env.d.ts b/view/next-project/next-env.d.ts index 4f11a03dc..a4a7b3f5c 100644 --- a/view/next-project/next-env.d.ts +++ b/view/next-project/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. +// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information. diff --git a/view/next-project/package-lock.json b/view/next-project/package-lock.json index ec9aa58b0..910f4840a 100644 --- a/view/next-project/package-lock.json +++ b/view/next-project/package-lock.json @@ -32,7 +32,7 @@ "react-dropzone": "^14.2.3", "react-hook-form": "^7.31.1", "react-icons": "^5.4.0", - "react-pdf": "^7.7.1", + "react-pdf": "^9.2.1", "react-router-dom": "^6.0.2", "react-select": "^5.7.3", "recoil": "^0.7.6", @@ -57,9 +57,10 @@ "autoprefixer": "^10.4.7", "eslint": "^8.28.0", "eslint-config-next": "^14.2.4", - "eslint-config-prettier": "^8.3.0", + "eslint-config-prettier": "^8.10.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-storybook": "^0.8.0", + "eslint-plugin-tailwindcss": "^3.18.0", "eslint-plugin-unused-imports": "^2.0.0", "orval": "^7.3.0", "postcss": "^8.4.14", @@ -195,13 +196,14 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", - "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.25.9", + "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "picocolors": "^1.1.1" }, "engines": { "node": ">=6.9.0" @@ -496,17 +498,19 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", - "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", - "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", + "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -535,24 +539,26 @@ } }, "node_modules/@babel/helpers": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz", - "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz", + "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/template": "^7.26.9", - "@babel/types": "^7.26.9" + "@babel/template": "^7.27.1", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz", - "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz", + "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.26.9" + "@babel/types": "^7.27.1" }, "bin": { "parser": "bin/babel-parser.js" @@ -1811,24 +1817,23 @@ } }, "node_modules/@babel/runtime": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz", - "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==", - "dependencies": { - "regenerator-runtime": "^0.14.0" - }, + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz", + "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/template": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", - "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", + "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.26.2", - "@babel/parser": "^7.26.9", - "@babel/types": "^7.26.9" + "@babel/code-frame": "^7.27.1", + "@babel/parser": "^7.27.2", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -1852,12 +1857,13 @@ } }, "node_modules/@babel/types": { - "version": "7.26.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz", - "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz", + "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==", + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9" + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.27.1" }, "engines": { "node": ">=6.9.0" @@ -4368,46 +4374,6 @@ "jsep": "^0.4.0||^1.0.0" } }, - "node_modules/@mapbox/node-pre-gyp": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz", - "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==", - "optional": true, - "dependencies": { - "detect-libc": "^2.0.0", - "https-proxy-agent": "^5.0.0", - "make-dir": "^3.1.0", - "node-fetch": "^2.6.7", - "nopt": "^5.0.0", - "npmlog": "^5.0.1", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.11" - }, - "bin": { - "node-pre-gyp": "bin/node-pre-gyp" - } - }, - "node_modules/@mapbox/node-pre-gyp/node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "optional": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/@mdx-js/react": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.1.0.tgz", @@ -4426,9 +4392,10 @@ } }, "node_modules/@next/env": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.4.tgz", - "integrity": "sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==" + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.28.tgz", + "integrity": "sha512-PAmWhJfJQlP+kxZwCjrVd9QnR5x0R3u0mTXTiZDgSd4h5LdXmjxCCWbN9kq6hkZBOax8Rm3xDW5HagWyJuT37g==", + "license": "MIT" }, "node_modules/@next/eslint-plugin-next": { "version": "14.2.24", @@ -4486,12 +4453,13 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz", - "integrity": "sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.28.tgz", + "integrity": "sha512-kzGChl9setxYWpk3H6fTZXXPFFjg7urptLq5o5ZgYezCrqlemKttwMT5iFyx/p1e/JeglTwDFRtb923gTJ3R1w==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -4501,12 +4469,13 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz", - "integrity": "sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.28.tgz", + "integrity": "sha512-z6FXYHDJlFOzVEOiiJ/4NG8aLCeayZdcRSMjPDysW297Up6r22xw6Ea9AOwQqbNsth8JNgIK8EkWz2IDwaLQcw==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -4516,12 +4485,13 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz", - "integrity": "sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.28.tgz", + "integrity": "sha512-9ARHLEQXhAilNJ7rgQX8xs9aH3yJSj888ssSjJLeldiZKR4D7N08MfMqljk77fAwZsWwsrp8ohHsMvurvv9liQ==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4531,12 +4501,13 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz", - "integrity": "sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.28.tgz", + "integrity": "sha512-p6gvatI1nX41KCizEe6JkF0FS/cEEF0u23vKDpl+WhPe/fCTBeGkEBh7iW2cUM0rvquPVwPWdiUR6Ebr/kQWxQ==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4546,12 +4517,13 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz", - "integrity": "sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.28.tgz", + "integrity": "sha512-nsiSnz2wO6GwMAX2o0iucONlVL7dNgKUqt/mDTATGO2NY59EO/ZKnKEr80BJFhuA5UC1KZOMblJHWZoqIJddpA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4561,12 +4533,13 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz", - "integrity": "sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.28.tgz", + "integrity": "sha512-+IuGQKoI3abrXFqx7GtlvNOpeExUH1mTIqCrh1LGFf8DnlUcTmOOCApEnPJUSLrSbzOdsF2ho2KhnQoO0I1RDw==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4576,12 +4549,13 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz", - "integrity": "sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.28.tgz", + "integrity": "sha512-l61WZ3nevt4BAnGksUVFKy2uJP5DPz2E0Ma/Oklvo3sGj9sw3q7vBWONFRgz+ICiHpW5mV+mBrkB3XEubMrKaA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -4591,12 +4565,13 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz", - "integrity": "sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.28.tgz", + "integrity": "sha512-+Kcp1T3jHZnJ9v9VTJ/yf1t/xmtFAc/Sge4v7mVc1z+NYfYzisi8kJ9AsY8itbgq+WgEwMtOpiLLJsUy2qnXZw==", "cpu": [ "ia32" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -4606,12 +4581,13 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.4.tgz", - "integrity": "sha512-tkLrjBzqFTP8DVrAAQmZelEahfR9OxWpFR++vAI9FBhCiIxtwHwBHC23SBHCTURBtwB4kc/x44imVOnkKGNVGg==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.28.tgz", + "integrity": "sha512-1gCmpvyhz7DkB1srRItJTnmR2UwQPAUXXIg9r0/56g3O8etGmwlX68skKXJOp9EejW3hhv7nSQUJ2raFiz4MoA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -4620,6 +4596,18 @@ "node": ">= 10" } }, + "node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "license": "MIT", + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -4823,6 +4811,15 @@ "lodash.uniq": "^4.5.0" } }, + "node_modules/@paralleldrive/cuid2": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz", + "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==", + "license": "MIT", + "dependencies": { + "@noble/hashes": "^1.1.5" + } + }, "node_modules/@pdf-lib/fontkit": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@pdf-lib/fontkit/-/fontkit-1.1.1.tgz", @@ -7106,12 +7103,6 @@ "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==", "optional": true }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "optional": true - }, "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -7177,18 +7168,6 @@ "node": ">=8.9.0" } }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "optional": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -7290,7 +7269,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "devOptional": true, + "dev": true, "engines": { "node": ">=8" } @@ -7327,25 +7306,6 @@ "node": ">= 8" } }, - "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "optional": true - }, - "node_modules/are-we-there-yet": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", - "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", - "optional": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/arg": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", @@ -7950,6 +7910,43 @@ "node": ">=8" } }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "optional": true, + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bl/node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "optional": true, + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "node_modules/block-stream2": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/block-stream2/-/block-stream2-2.1.0.tgz", @@ -8335,18 +8332,18 @@ ] }, "node_modules/canvas": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz", - "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/canvas/-/canvas-3.1.0.tgz", + "integrity": "sha512-tTj3CqqukVJ9NgSahykNwtGda7V33VLObwrHfzT0vqJXu7J4d4C/7kQQW3fOEGDfZZoILPut5H00gOjyttPGyg==", "hasInstallScript": true, + "license": "MIT", "optional": true, "dependencies": { - "@mapbox/node-pre-gyp": "^1.0.0", - "nan": "^2.17.0", - "simple-get": "^3.0.3" + "node-addon-api": "^7.0.0", + "prebuild-install": "^7.1.1" }, "engines": { - "node": ">=6" + "node": "^18.12.0 || >= 20.9.0" } }, "node_modules/case-sensitive-paths-webpack-plugin": { @@ -8434,13 +8431,11 @@ } }, "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "optional": true, - "engines": { - "node": ">=10" - } + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC", + "optional": true }, "node_modules/chromatic": { "version": "11.27.0", @@ -8589,15 +8584,6 @@ "simple-swizzle": "^0.2.2" } }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "optional": true, - "bin": { - "color-support": "bin.js" - } - }, "node_modules/color2k": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/color2k/-/color2k-2.0.2.tgz", @@ -8651,12 +8637,6 @@ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", "dev": true }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "optional": true - }, "node_modules/constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", @@ -9067,15 +9047,19 @@ } }, "node_modules/decompress-response": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", - "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "license": "MIT", "optional": true, "dependencies": { - "mimic-response": "^2.0.0" + "mimic-response": "^3.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/dedent": { @@ -9093,6 +9077,16 @@ "node": ">=6" } }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -9150,12 +9144,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "optional": true - }, "node_modules/dependency-graph": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", @@ -9424,6 +9412,16 @@ "node": ">= 4" } }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", + "optional": true, + "dependencies": { + "once": "^1.4.0" + } + }, "node_modules/endent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/endent/-/endent-2.1.0.tgz", @@ -9853,6 +9851,7 @@ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", "dev": true, + "license": "MIT", "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -10165,6 +10164,23 @@ "eslint": ">=6" } }, + "node_modules/eslint-plugin-tailwindcss": { + "version": "3.18.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.18.0.tgz", + "integrity": "sha512-PQDU4ZMzFH0eb2DrfHPpbgo87Zgg2EXSMOj1NSfzdZm+aJzpuwGerfowMIaVehSREEa0idbf/eoNYAOHSJoDAQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-glob": "^3.2.5", + "postcss": "^8.4.4" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "tailwindcss": "^3.4.0" + } + }, "node_modules/eslint-plugin-unused-imports": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz", @@ -10403,6 +10419,16 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "license": "(MIT OR WTFPL)", + "optional": true, + "engines": { + "node": ">=6" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -10481,21 +10507,18 @@ ] }, "node_modules/fast-xml-parser": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz", - "integrity": "sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz", + "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/NaturalIntelligence" - }, - { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" } ], + "license": "MIT", "dependencies": { - "strnum": "^1.0.5" + "strnum": "^1.1.1" }, "bin": { "fxparser": "src/cli/cli.js" @@ -10781,14 +10804,18 @@ } }, "node_modules/formidable": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz", - "integrity": "sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz", + "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==", + "license": "MIT", "dependencies": { + "@paralleldrive/cuid2": "^2.2.2", "dezalgo": "^1.0.4", - "hexoid": "^1.0.0", "once": "^1.4.0" }, + "engines": { + "node": ">=14.0.0" + }, "funding": { "url": "https://ko-fi.com/tunnckoCore/commissions" } @@ -10878,6 +10905,13 @@ "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==" }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT", + "optional": true + }, "node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -10892,30 +10926,6 @@ "node": ">=12" } }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "optional": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/fs-monkey": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz", @@ -10964,26 +10974,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gauge": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", - "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", - "optional": true, - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.2", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.1", - "object-assign": "^4.1.1", - "signal-exit": "^3.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.2" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -11086,11 +11076,18 @@ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" } }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", + "license": "MIT", + "optional": true + }, "node_modules/glob": { "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "devOptional": true, + "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -11266,12 +11263,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "optional": true - }, "node_modules/hash-base": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.5.tgz", @@ -11315,14 +11306,6 @@ "he": "bin/he" } }, - "node_modules/hexoid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", - "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==", - "engines": { - "node": ">=8" - } - }, "node_modules/hey-listen": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/hey-listen/-/hey-listen-1.0.8.tgz", @@ -11469,19 +11452,6 @@ "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==", "dev": true }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "optional": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -11512,7 +11482,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, + "devOptional": true, "funding": [ { "type": "github", @@ -11538,10 +11508,11 @@ } }, "node_modules/image-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz", - "integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.1.tgz", + "integrity": "sha512-rH+46sQJ2dlwfjfhCyNx5thzrv+dtmBIhPHk0zgRUukHzZ/kRueTJXoYYsclBaKcSMBWuGbOFXtioLpzTb5euw==", "dev": true, + "license": "MIT", "dependencies": { "queue": "6.0.2" }, @@ -11609,6 +11580,13 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "license": "ISC", + "optional": true + }, "node_modules/internal-slot": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", @@ -11846,7 +11824,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "devOptional": true, + "dev": true, "engines": { "node": ">=8" } @@ -12630,7 +12608,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "devOptional": true, + "dev": true, "dependencies": { "semver": "^6.0.0" }, @@ -12645,7 +12623,7 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "devOptional": true, + "dev": true, "bin": { "semver": "bin/semver.js" } @@ -12750,14 +12728,15 @@ } }, "node_modules/merge-refs": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/merge-refs/-/merge-refs-1.2.2.tgz", - "integrity": "sha512-RwcT7GsQR3KbuLw1rRuodq4Nt547BKEBkliZ0qqsrpyNne9bGTFtsFIsIpx82huWhcl3kOlOlH4H0xkPk/DqVw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/merge-refs/-/merge-refs-1.3.0.tgz", + "integrity": "sha512-nqXPXbso+1dcKDpPCXvwZyJILz+vSLqGGOnDrYHQYE+B8n9JTCekVLC65AfCpR4ggVyA/45Y0iR9LDyS2iI+zA==", + "license": "MIT", "funding": { "url": "https://github.com/wojtekmaj/merge-refs?sponsor=1" }, "peerDependencies": { - "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -12839,12 +12818,13 @@ } }, "node_modules/mimic-response": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", - "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "license": "MIT", "optional": true, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -12886,7 +12866,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, + "devOptional": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -12919,32 +12899,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "devOptional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "optional": true, - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, + "dev": true, "engines": { "node": ">=8" } @@ -12955,17 +12910,12 @@ "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==", "license": "MIT" }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "optional": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT", + "optional": true }, "node_modules/ms": { "version": "2.1.3", @@ -12982,12 +12932,6 @@ "thenify-all": "^1.0.0" } }, - "node_modules/nan": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz", - "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==", - "optional": true - }, "node_modules/nanoid": { "version": "3.3.9", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.9.tgz", @@ -13005,6 +12949,13 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/napi-build-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", + "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", + "license": "MIT", + "optional": true + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -13024,11 +12975,12 @@ "dev": true }, "node_modules/next": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/next/-/next-14.2.4.tgz", - "integrity": "sha512-R8/V7vugY+822rsQGQCjoLhMuC9oFj9SOi4Cl4b2wjDrseD0LRZ10W7R6Czo4w9ZznVSshKjuIomsRjvm9EKJQ==", + "version": "14.2.28", + "resolved": "https://registry.npmjs.org/next/-/next-14.2.28.tgz", + "integrity": "sha512-QLEIP/kYXynIxtcKB6vNjtWLVs3Y4Sb+EClTC/CSVzdLD1gIuItccpu/n1lhmduffI32iPGEK2cLLxxt28qgYA==", + "license": "MIT", "dependencies": { - "@next/env": "14.2.4", + "@next/env": "14.2.28", "@swc/helpers": "0.5.5", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", @@ -13043,15 +12995,15 @@ "node": ">=18.17.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "14.2.4", - "@next/swc-darwin-x64": "14.2.4", - "@next/swc-linux-arm64-gnu": "14.2.4", - "@next/swc-linux-arm64-musl": "14.2.4", - "@next/swc-linux-x64-gnu": "14.2.4", - "@next/swc-linux-x64-musl": "14.2.4", - "@next/swc-win32-arm64-msvc": "14.2.4", - "@next/swc-win32-ia32-msvc": "14.2.4", - "@next/swc-win32-x64-msvc": "14.2.4" + "@next/swc-darwin-arm64": "14.2.28", + "@next/swc-darwin-x64": "14.2.28", + "@next/swc-linux-arm64-gnu": "14.2.28", + "@next/swc-linux-arm64-musl": "14.2.28", + "@next/swc-linux-x64-gnu": "14.2.28", + "@next/swc-linux-x64-musl": "14.2.28", + "@next/swc-win32-arm64-msvc": "14.2.28", + "@next/swc-win32-ia32-msvc": "14.2.28", + "@next/swc-win32-x64-msvc": "14.2.28" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", @@ -13101,12 +13053,32 @@ "tslib": "^2.0.3" } }, + "node_modules/node-abi": { + "version": "3.75.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz", + "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==", + "license": "MIT", + "optional": true, + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/node-abort-controller": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz", "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==", "dev": true }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "license": "MIT", + "optional": true + }, "node_modules/node-domexception": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", @@ -13233,21 +13205,6 @@ "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", "dev": true }, - "node_modules/nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "optional": true, - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -13285,18 +13242,6 @@ "node": ">=8" } }, - "node_modules/npmlog": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", - "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", - "optional": true, - "dependencies": { - "are-we-there-yet": "^2.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^3.0.0", - "set-blocking": "^2.0.0" - } - }, "node_modules/nth-check": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", @@ -14020,13 +13965,14 @@ "node": ">=8" } }, - "node_modules/path2d-polyfill": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz", - "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==", + "node_modules/path2d": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/path2d/-/path2d-0.2.2.tgz", + "integrity": "sha512-+vnG6S4dYcYxZd+CZxzXCNKdELYZSKfohrk98yajCo1PtRoDgCTrrwOvK1GT0UoAdVszagDVllQc0U1vaX4NUQ==", + "license": "MIT", "optional": true, "engines": { - "node": ">=8" + "node": ">=6" } }, "node_modules/pathval": { @@ -14071,15 +14017,16 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/pdfjs-dist": { - "version": "3.11.174", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.11.174.tgz", - "integrity": "sha512-TdTZPf1trZ8/UFu5Cx/GXB7GZM30LT+wWUNfsi6Bq8ePLnb+woNKtDymI2mxZYBpMbonNFqKmiz684DIfnd8dA==", + "version": "4.8.69", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.8.69.tgz", + "integrity": "sha512-IHZsA4T7YElCKNNXtiLgqScw4zPd3pG9do8UrznC757gMd7UPeHSL2qwNNMJo4r79fl8oj1Xx+1nh2YkzdMpLQ==", + "license": "Apache-2.0", "engines": { "node": ">=18" }, "optionalDependencies": { - "canvas": "^2.11.2", - "path2d-polyfill": "^2.0.1" + "canvas": "^3.0.0-rc2", + "path2d": "^0.2.1" } }, "node_modules/picocolors": { @@ -14476,6 +14423,33 @@ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, + "node_modules/prebuild-install": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", + "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^2.0.0", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -14599,6 +14573,17 @@ "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==", "dev": true }, + "node_modules/pump": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", + "license": "MIT", + "optional": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -14713,6 +14698,32 @@ "node": ">= 0.6" } }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "optional": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/rc/node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/react": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", @@ -14874,17 +14885,17 @@ } }, "node_modules/react-pdf": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-7.7.1.tgz", - "integrity": "sha512-cbbf/PuRtGcPPw+HLhMI1f6NSka8OJgg+j/yPWTe95Owf0fK6gmVY7OXpTxMeh92O3T3K3EzfE0ML0eXPGwR5g==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-9.2.1.tgz", + "integrity": "sha512-AJt0lAIkItWEZRA5d/mO+Om4nPCuTiQ0saA+qItO967DTjmGjnhmF+Bi2tL286mOTfBlF5CyLzJ35KTMaDoH+A==", + "license": "MIT", "dependencies": { "clsx": "^2.0.0", "dequal": "^2.0.3", "make-cancellable-promise": "^1.3.1", "make-event-props": "^1.6.0", - "merge-refs": "^1.2.1", - "pdfjs-dist": "3.11.174", - "prop-types": "^15.6.2", + "merge-refs": "^1.3.0", + "pdfjs-dist": "4.8.69", "tiny-invariant": "^1.0.0", "warning": "^4.0.0" }, @@ -14892,9 +14903,9 @@ "url": "https://github.com/wojtekmaj/react-pdf?sponsor=1" }, "peerDependencies": { - "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -15221,11 +15232,6 @@ "node": ">=4" } }, - "node_modules/regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" - }, "node_modules/regenerator-transform": { "version": "0.15.2", "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", @@ -15446,7 +15452,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "devOptional": true, + "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -15693,12 +15699,6 @@ "randombytes": "^2.1.0" } }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "optional": true - }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -15954,7 +15954,7 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "devOptional": true + "dev": true }, "node_modules/simple-concat": { "version": "1.0.1", @@ -15974,6 +15974,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "optional": true }, "node_modules/simple-eval": { @@ -15989,12 +15990,27 @@ } }, "node_modules/simple-get": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz", - "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", "optional": true, "dependencies": { - "decompress-response": "^4.2.0", + "decompress-response": "^6.0.0", "once": "^1.3.1", "simple-concat": "^1.0.0" } @@ -16161,7 +16177,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "devOptional": true, + "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -16196,7 +16212,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "devOptional": true + "dev": true }, "node_modules/string.prototype.includes": { "version": "2.0.1", @@ -16309,7 +16325,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "devOptional": true, + "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -16376,9 +16392,16 @@ } }, "node_modules/strnum": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz", + "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT" }, "node_modules/style-loader": { "version": "3.3.4", @@ -16648,21 +16671,34 @@ "node": ">=6" } }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "node_modules/tar-fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz", + "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==", + "license": "MIT", + "optional": true, + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", "optional": true, "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" }, "engines": { - "node": ">=10" + "node": ">=6" } }, "node_modules/terser": { @@ -16968,6 +17004,19 @@ "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", "dev": true }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, "node_modules/tween-functions": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/tween-functions/-/tween-functions-1.2.0.tgz", @@ -17646,15 +17695,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "optional": true, - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -17768,12 +17808,6 @@ "node": ">=10" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "optional": true - }, "node_modules/yaml": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", diff --git a/view/next-project/package.json b/view/next-project/package.json index e690f1bef..379295d67 100644 --- a/view/next-project/package.json +++ b/view/next-project/package.json @@ -11,7 +11,8 @@ "lint:fix": "next lint --dir src --fix", "format": "prettier --write --ignore-path .gitignore './**/*.{js,jsx,ts,tsx,json,css}'", "storybook": "storybook dev -p 6006", - "build-storybook": "storybook build" + "build-storybook": "storybook build", + "type-check": "tsc --noEmit" }, "dependencies": { "@chakra-ui/icons": "^2.0.12", @@ -40,7 +41,7 @@ "react-dropzone": "^14.2.3", "react-hook-form": "^7.31.1", "react-icons": "^5.4.0", - "react-pdf": "^7.7.1", + "react-pdf": "^9.2.1", "react-router-dom": "^6.0.2", "react-select": "^5.7.3", "recoil": "^0.7.6", @@ -65,9 +66,10 @@ "autoprefixer": "^10.4.7", "eslint": "^8.28.0", "eslint-config-next": "^14.2.4", - "eslint-config-prettier": "^8.3.0", + "eslint-config-prettier": "^8.10.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-storybook": "^0.8.0", + "eslint-plugin-tailwindcss": "^3.18.0", "eslint-plugin-unused-imports": "^2.0.0", "orval": "^7.3.0", "postcss": "^8.4.14", diff --git a/view/next-project/src/components/auth/SignInView.tsx b/view/next-project/src/components/auth/SignInView.tsx index 0930221ec..b6c6d249b 100644 --- a/view/next-project/src/components/auth/SignInView.tsx +++ b/view/next-project/src/components/auth/SignInView.tsx @@ -3,13 +3,14 @@ import { useState } from 'react'; import { useForm } from 'react-hook-form'; import { useRecoilState } from 'recoil'; -import { PrimaryButton } from '../common'; import { authAtom, userAtom } from '@/store/atoms'; import { get_with_token } from '@api/api_methods'; import { signIn } from '@api/signIn'; import LoadingButton from '@components/common/LoadingButton'; import { SignIn } from '@type/common'; +import { PrimaryButton } from '../common'; + export default function SignInView() { // ログイン中フラグ const [isSignInNow, setIsSignInNow] = useState(false); diff --git a/view/next-project/src/components/auth/SignUpView.tsx b/view/next-project/src/components/auth/SignUpView.tsx index 018fda66e..8e6858050 100644 --- a/view/next-project/src/components/auth/SignUpView.tsx +++ b/view/next-project/src/components/auth/SignUpView.tsx @@ -3,7 +3,6 @@ import React, { useState } from 'react'; import { useForm } from 'react-hook-form'; import { useRecoilState } from 'recoil'; -import { PrimaryButton } from '../common'; import { BUREAUS } from '@/constants/bureaus'; import { authAtom, userAtom } from '@/store/atoms'; import { get } from '@api/api_methods'; @@ -12,6 +11,8 @@ import { post } from '@api/user'; import LoadingButton from '@components/common/LoadingButton'; import { SignUp, User } from '@type/common'; +import { PrimaryButton } from '../common'; + export default function SignUpView() { const [, setAuth] = useRecoilState(authAtom); const [, setUser] = useRecoilState(userAtom); diff --git a/view/next-project/src/components/budget_managements/AddBudgetManagementModal.tsx b/view/next-project/src/components/budget_managements/AddBudgetManagementModal.tsx index 3c8c17681..f32a76e12 100644 --- a/view/next-project/src/components/budget_managements/AddBudgetManagementModal.tsx +++ b/view/next-project/src/components/budget_managements/AddBudgetManagementModal.tsx @@ -3,12 +3,15 @@ import * as React from 'react'; import { Dispatch, SetStateAction, useState } from 'react'; import { FC } from 'react'; import { RiCloseCircleLine } from 'react-icons/ri'; -import formatNumber from '../common/Formatter'; + import { usePostFestivalItems, usePostFinancialRecords, usePostDivisions } from '@/generated/hooks'; -import type { Division, FestivalItem, FinancialRecord } from '@/generated/model'; import { Year } from '@/type/common'; import { PrimaryButton, Input, Modal } from '@components/common'; +import formatNumber from '../common/Formatter'; + +import type { Division, FestivalItem, FinancialRecord } from '@/generated/model'; + interface FinancialRecordWithId extends FinancialRecord { id: number; } @@ -206,7 +209,7 @@ const AddBudgetManagementModal: FC = (props) => { {phase === 2 && '申請部門登録'} {phase === 3 && '申請物品登録'} -
+
{content}
diff --git a/view/next-project/src/components/budget_managements/BudgetManagement.tsx b/view/next-project/src/components/budget_managements/BudgetManagement.tsx index c9c1af274..87800ddab 100644 --- a/view/next-project/src/components/budget_managements/BudgetManagement.tsx +++ b/view/next-project/src/components/budget_managements/BudgetManagement.tsx @@ -1,19 +1,22 @@ import { useQueryStates, parseAsInteger } from 'nuqs'; import { useCallback, useEffect, useState } from 'react'; -import formatNumber from '../common/Formatter'; -import OpenDeleteModalButton from './OpenDeleteModalButton'; -import OpenEditModalButton from './OpenEditModalButton'; + import OpenAddModalButton from '@/components/budget_managements/OpenAddModalButton'; import { Card, Title, Loading } from '@/components/common'; import PrimaryButton from '@/components/common/OutlinePrimaryButton/OutlinePrimaryButton'; import { useGetDivisions, useGetFestivalItems, useGetFinancialRecords } from '@/generated/hooks'; +import { Year } from '@/type/common'; + +import OpenDeleteModalButton from './OpenDeleteModalButton'; +import OpenEditModalButton from './OpenEditModalButton'; +import formatNumber from '../common/Formatter'; + import type { Division, FinancialRecord, GetDivisionsParams, GetFestivalItemsParams, } from '@/generated/model'; -import { Year } from '@/type/common'; interface FinancialRecordWithId extends FinancialRecord { id: number; diff --git a/view/next-project/src/components/budget_managements/DeleteBudgetManagementModal.tsx b/view/next-project/src/components/budget_managements/DeleteBudgetManagementModal.tsx index 117d5551d..0f344af77 100644 --- a/view/next-project/src/components/budget_managements/DeleteBudgetManagementModal.tsx +++ b/view/next-project/src/components/budget_managements/DeleteBudgetManagementModal.tsx @@ -2,6 +2,7 @@ import * as React from 'react'; import { Dispatch, SetStateAction } from 'react'; import { FC } from 'react'; import { RiCloseCircleLine } from 'react-icons/ri'; + import { useDeleteFinancialRecordsId, useDeleteDivisionsId, @@ -72,7 +73,7 @@ const DeleteBudgetManagementModal: FC = (props) => { {phase === 2 && '申請部門削除'} {phase === 3 && '申請物品削除'}
-
+
{name}を削除しますか?
diff --git a/view/next-project/src/components/budget_managements/EditBudgetManagementModal.tsx b/view/next-project/src/components/budget_managements/EditBudgetManagementModal.tsx index a5171a1da..31625da17 100644 --- a/view/next-project/src/components/budget_managements/EditBudgetManagementModal.tsx +++ b/view/next-project/src/components/budget_managements/EditBudgetManagementModal.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { Dispatch, SetStateAction, useEffect, useState } from 'react'; import { FC } from 'react'; import { RiCloseCircleLine } from 'react-icons/ri'; -import formatNumber from '../common/Formatter'; + import { useGetFinancialRecordsId, useGetDivisionsId, @@ -11,9 +11,12 @@ import { usePutDivisionsId, usePutFestivalItemsId, } from '@/generated/hooks'; -import type { Division, FestivalItem, FinancialRecord } from '@/generated/model'; import { PrimaryButton, Input, Modal } from '@components/common'; +import formatNumber from '../common/Formatter'; + +import type { Division, FestivalItem, FinancialRecord } from '@/generated/model'; + export interface ModalProps { setShowModal: Dispatch>; phase: number; @@ -219,7 +222,7 @@ const EditBudgetManagementModal: FC = (props) => { {phase === 2 && '申請部門編集'} {phase === 3 && '申請物品編集'}
-
+
{content}
diff --git a/view/next-project/src/components/budget_managements/OpenAddModalButton.tsx b/view/next-project/src/components/budget_managements/OpenAddModalButton.tsx index 76437c49f..4ee116d72 100644 --- a/view/next-project/src/components/budget_managements/OpenAddModalButton.tsx +++ b/view/next-project/src/components/budget_managements/OpenAddModalButton.tsx @@ -2,11 +2,12 @@ import clsx from 'clsx'; import * as React from 'react'; import { useState } from 'react'; -import { AddButton } from '../common'; import { Division, FinancialRecord } from '@/generated/model'; import { Year } from '@/type/common'; import AddModal from '@components/budget_managements/AddBudgetManagementModal'; +import { AddButton } from '../common'; + interface FinancialRecordWithId extends FinancialRecord { id: number; } diff --git a/view/next-project/src/components/budget_managements/OpenDeleteModalButton.tsx b/view/next-project/src/components/budget_managements/OpenDeleteModalButton.tsx index 09ef1465b..9dfa61692 100644 --- a/view/next-project/src/components/budget_managements/OpenDeleteModalButton.tsx +++ b/view/next-project/src/components/budget_managements/OpenDeleteModalButton.tsx @@ -1,9 +1,10 @@ import * as React from 'react'; import { useState } from 'react'; -import { DeleteButton } from '../common'; import DeleteModal from '@components/budget_managements/DeleteBudgetManagementModal'; +import { DeleteButton } from '../common'; + interface Props { phase: number; id: number; diff --git a/view/next-project/src/components/budget_managements/OpenEditModalButton.tsx b/view/next-project/src/components/budget_managements/OpenEditModalButton.tsx index 4490ebde8..eb8a2d98e 100644 --- a/view/next-project/src/components/budget_managements/OpenEditModalButton.tsx +++ b/view/next-project/src/components/budget_managements/OpenEditModalButton.tsx @@ -1,9 +1,10 @@ import * as React from 'react'; import { useState } from 'react'; -import { EditButton } from '../common'; import EditModal from '@components/budget_managements/EditBudgetManagementModal'; +import { EditButton } from '../common'; + interface Props { phase: number; financialRecordId: number; diff --git a/view/next-project/src/components/budgets/AddModal.tsx b/view/next-project/src/components/budgets/AddModal.tsx index 4966f4b42..532aef14f 100644 --- a/view/next-project/src/components/budgets/AddModal.tsx +++ b/view/next-project/src/components/budgets/AddModal.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import { Dispatch, SetStateAction, useState } from 'react'; import { FC } from 'react'; import { RiCloseCircleLine } from 'react-icons/ri'; + import { post } from '@api/budget'; import { PrimaryButton, Input, Modal, Select } from '@components/common'; import { Budget } from '@type/common'; @@ -49,7 +50,7 @@ const BudgetAddModal: FC = (props) => {
予算の登録
-
+

年度

diff --git a/view/next-project/src/components/budgets/ExpenditureAddModal.tsx b/view/next-project/src/components/budgets/ExpenditureAddModal.tsx index 97fb125e7..7b1b45265 100644 --- a/view/next-project/src/components/budgets/ExpenditureAddModal.tsx +++ b/view/next-project/src/components/budgets/ExpenditureAddModal.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import { Dispatch, SetStateAction, useMemo, useState } from 'react'; import { FC } from 'react'; import { RiCloseCircleLine } from 'react-icons/ri'; + import { postExpenses } from '@api/budget'; import { PrimaryButton, Input, Modal, Select } from '@components/common'; import { Expense, Year } from '@type/common'; @@ -46,7 +47,7 @@ const ExpenseAddModal: FC = (props) => {
支出元の登録
-
+

年度

diff --git a/view/next-project/src/components/budgets/ExpenseEditModal.tsx b/view/next-project/src/components/budgets/ExpenseEditModal.tsx index b29a69b00..69ac00271 100644 --- a/view/next-project/src/components/budgets/ExpenseEditModal.tsx +++ b/view/next-project/src/components/budgets/ExpenseEditModal.tsx @@ -37,7 +37,7 @@ export default function ExpenseEditModal(props: ModalProps) { // 協賛スタイルの情報 const content = (data: Expense) => ( -
+

支出元名

= (props) => { const { bureauName } = props; diff --git a/view/next-project/src/components/common/DeleteButton.tsx b/view/next-project/src/components/common/DeleteButton.tsx index 680f7ec5a..e89a1762f 100644 --- a/view/next-project/src/components/common/DeleteButton.tsx +++ b/view/next-project/src/components/common/DeleteButton.tsx @@ -20,7 +20,7 @@ const DeleteButton = (props: Props) => { return (
- logo + logo
= (props) => { const { children, diff --git a/view/next-project/src/components/common/OpenModalButton.tsx b/view/next-project/src/components/common/OpenModalButton.tsx index 30615b8e0..ab1986d03 100644 --- a/view/next-project/src/components/common/OpenModalButton.tsx +++ b/view/next-project/src/components/common/OpenModalButton.tsx @@ -2,9 +2,10 @@ import { ChakraProvider, Button } from '@chakra-ui/react'; import * as React from 'react'; import { useState } from 'react'; -import RegistModal from './RegistModal'; import theme from '@assets/theme'; +import RegistModal from './RegistModal'; + interface Props { width?: string; height?: string; diff --git a/view/next-project/src/components/common/Stepper.tsx b/view/next-project/src/components/common/Stepper.tsx index 4678f9875..bebee5b0d 100644 --- a/view/next-project/src/components/common/Stepper.tsx +++ b/view/next-project/src/components/common/Stepper.tsx @@ -18,7 +18,7 @@ const ActiveContent = React.memo(function activeContent(props: ContentProps) {
{props.stepNum}
@@ -33,7 +33,7 @@ const DeActiveContent = React.memo(function activeContent(props: ContentProps) {
diff --git a/view/next-project/src/components/common/Tooltip/Tooltip.tsx b/view/next-project/src/components/common/Tooltip/Tooltip.tsx index 21b286d0f..af2df1129 100644 --- a/view/next-project/src/components/common/Tooltip/Tooltip.tsx +++ b/view/next-project/src/components/common/Tooltip/Tooltip.tsx @@ -9,11 +9,11 @@ function Tooltip(props: Props): JSX.Element { return (
{props.children} -
+
{props.text} -
+
); diff --git a/view/next-project/src/components/create_purchase_report/FileUploadField.tsx b/view/next-project/src/components/create_purchase_report/FileUploadField.tsx index c36591a07..f457312e9 100644 --- a/view/next-project/src/components/create_purchase_report/FileUploadField.tsx +++ b/view/next-project/src/components/create_purchase_report/FileUploadField.tsx @@ -46,7 +46,7 @@ const FileUploadField: React.FC = ({ onClick={handleFileUploadClick} > - + {isEditMode ? '領収書(レシート)を変更' : '領収書(レシート)をアップロード'} @@ -55,7 +55,7 @@ const FileUploadField: React.FC = ({ )} {validationError && !isEditMode ? ( - + {validationError} ) : ( diff --git a/view/next-project/src/components/create_purchase_report/usePurchaseReportForm.ts b/view/next-project/src/components/create_purchase_report/usePurchaseReportForm.ts index adc3579eb..06c71aff7 100644 --- a/view/next-project/src/components/create_purchase_report/usePurchaseReportForm.ts +++ b/view/next-project/src/components/create_purchase_report/usePurchaseReportForm.ts @@ -1,6 +1,7 @@ import { NextRouter } from 'next/router'; import { useState, useEffect } from 'react'; import { useRecoilValue } from 'recoil'; + import { useGetDivisionsUsers, useGetFestivalItemsUsers, @@ -9,9 +10,10 @@ import { usePutBuyReportsId, } from '@/generated/hooks'; import { DivisionOption, FestivalItemOption } from '@/generated/model'; -import type { BuyReport, PostBuyReportsBody, PutBuyReportsIdBody } from '@/generated/model'; import { userAtom } from '@/store/atoms'; +import type { BuyReport, PostBuyReportsBody, PutBuyReportsIdBody } from '@/generated/model'; + const API_ERROR_MESSAGES = { MISSING_ID: '更新対象のIDがありません', MISSING_FILE: 'レシート画像を選択してください', diff --git a/view/next-project/src/components/fund_information/FundInformationForm.tsx b/view/next-project/src/components/fund_information/FundInformationForm.tsx index f5eacb2ff..16c18b998 100644 --- a/view/next-project/src/components/fund_information/FundInformationForm.tsx +++ b/view/next-project/src/components/fund_information/FundInformationForm.tsx @@ -14,6 +14,7 @@ import { Text, } from '@chakra-ui/react'; import React, { useEffect, useState } from 'react'; + import { IncomeReceiveOption } from '@/generated/model/incomeReceiveOption'; import { PrimaryButton } from '@components/common'; diff --git a/view/next-project/src/components/fund_information/FundInformationHeader.tsx b/view/next-project/src/components/fund_information/FundInformationHeader.tsx index 8f5e16d40..74919d33d 100644 --- a/view/next-project/src/components/fund_information/FundInformationHeader.tsx +++ b/view/next-project/src/components/fund_information/FundInformationHeader.tsx @@ -1,5 +1,6 @@ import { useRouter } from 'next/router'; import React from 'react'; + import { Title, AddButton } from '@components/common'; interface FundInformationHeaderProps { diff --git a/view/next-project/src/components/fund_information/FundInformationTable.tsx b/view/next-project/src/components/fund_information/FundInformationTable.tsx index d5c05a0e7..eebe2b30d 100644 --- a/view/next-project/src/components/fund_information/FundInformationTable.tsx +++ b/view/next-project/src/components/fund_information/FundInformationTable.tsx @@ -1,10 +1,12 @@ import clsx from 'clsx'; import { useEffect, useState } from 'react'; -import DeleteConfirmModal from './modals/DeleteModal'; -import UncheckConfirmModal from './modals/UncheckConfirmModal'; + import { IncomeExpenditureManagement } from '@/generated/model/incomeExpenditureManagement'; import { Checkbox, DeleteButton, EditButton } from '@components/common'; +import DeleteConfirmModal from './modals/DeleteModal'; +import UncheckConfirmModal from './modals/UncheckConfirmModal'; + interface FundInformationTableProps { fundInformations: IncomeExpenditureManagement[]; onEdit?: (id: number) => void; diff --git a/view/next-project/src/components/fund_information/modals/DeleteModal.tsx b/view/next-project/src/components/fund_information/modals/DeleteModal.tsx index 5680f959f..23e701ba3 100644 --- a/view/next-project/src/components/fund_information/modals/DeleteModal.tsx +++ b/view/next-project/src/components/fund_information/modals/DeleteModal.tsx @@ -1,4 +1,5 @@ import React, { Dispatch, FC, SetStateAction } from 'react'; + import { Modal, CloseButton, OutlinePrimaryButton, PrimaryButton } from '@components/common'; interface ModalProps { diff --git a/view/next-project/src/components/fund_information/modals/UncheckConfirmModal.tsx b/view/next-project/src/components/fund_information/modals/UncheckConfirmModal.tsx index 7ad571856..add46119b 100644 --- a/view/next-project/src/components/fund_information/modals/UncheckConfirmModal.tsx +++ b/view/next-project/src/components/fund_information/modals/UncheckConfirmModal.tsx @@ -1,4 +1,5 @@ import React, { Dispatch, FC, SetStateAction } from 'react'; + import { Modal, CloseButton, OutlinePrimaryButton, PrimaryButton } from '@components/common'; interface ModalProps { diff --git a/view/next-project/src/components/fund_information/useFundInformations.ts b/view/next-project/src/components/fund_information/useFundInformations.ts index 395da323a..980398a60 100644 --- a/view/next-project/src/components/fund_information/useFundInformations.ts +++ b/view/next-project/src/components/fund_information/useFundInformations.ts @@ -1,5 +1,6 @@ import { useRouter } from 'next/router'; import { useState, useMemo, useCallback } from 'react'; + import { useGetIncomeExpenditureManagements, useGetIncomes, diff --git a/view/next-project/src/components/layout/Layout/Layout.tsx b/view/next-project/src/components/layout/Layout/Layout.tsx index 8f8c628d0..b681ec293 100644 --- a/view/next-project/src/components/layout/Layout/Layout.tsx +++ b/view/next-project/src/components/layout/Layout/Layout.tsx @@ -1,12 +1,13 @@ import React, { ReactNode } from 'react'; -import s from './Layout.module.css'; import SponsorAddModal from '@/components/sponsors/SponsorAddModal'; import PurchaseReportAddModal from '@components/purchasereports/AddModal'; import PurchaseOrderListModal from '@components/purchasereports/PurchaseOrderListModal'; import PurchaseReportItemNumModal from '@components/purchasereports/PurchaseReportItemNumModal'; import { useUI } from '@components/ui/context'; +import s from './Layout.module.css'; + const ModalView: React.FC<{ modalView: string }> = ({ modalView }) => { return ( <> diff --git a/view/next-project/src/components/layout/LoginLayout.tsx b/view/next-project/src/components/layout/LoginLayout.tsx index 2d21af12d..513b56ac6 100644 --- a/view/next-project/src/components/layout/LoginLayout.tsx +++ b/view/next-project/src/components/layout/LoginLayout.tsx @@ -10,7 +10,7 @@ function LoginLayout({ children }: LayoutProps): JSX.Element { <>
- logo + logo
{children}
diff --git a/view/next-project/src/components/layout/MainLayout/MainLayout.tsx b/view/next-project/src/components/layout/MainLayout/MainLayout.tsx index 4a611f462..e74ebddd8 100644 --- a/view/next-project/src/components/layout/MainLayout/MainLayout.tsx +++ b/view/next-project/src/components/layout/MainLayout/MainLayout.tsx @@ -3,13 +3,15 @@ import Head from 'next/head'; import { useRouter } from 'next/router'; import React, { useEffect, useState } from 'react'; import { useRecoilState } from 'recoil'; -import s from './MainLayout.module.css'; + import { authAtom, userAtom } from '@/store/atoms'; import 'tailwindcss/tailwind.css'; import { Header, SideNav } from '@components/common'; import { User } from '@type/common'; import { get_with_token_valid } from '@utils/api/api_methods'; +import s from './MainLayout.module.css'; + interface LayoutProps { children?: React.ReactNode; } @@ -66,7 +68,7 @@ export default function MainLayout(props: LayoutProps) { >
-
+
{props.children}
diff --git a/view/next-project/src/components/mypage/Status.tsx b/view/next-project/src/components/mypage/Status.tsx index 734d86618..3509c5dd7 100644 --- a/view/next-project/src/components/mypage/Status.tsx +++ b/view/next-project/src/components/mypage/Status.tsx @@ -1,4 +1,5 @@ import { GrStatusGoodSmall } from 'react-icons/gr'; + import type { BuyReportInformationStatus } from '@/generated/model'; interface StatusProps { diff --git a/view/next-project/src/components/mypage/TableSection.tsx b/view/next-project/src/components/mypage/TableSection.tsx index 093ab5dd9..7b89cbd09 100644 --- a/view/next-project/src/components/mypage/TableSection.tsx +++ b/view/next-project/src/components/mypage/TableSection.tsx @@ -1,6 +1,8 @@ import React, { useState, useCallback } from 'react'; import { VscTriangleRight, VscTriangleDown } from 'react-icons/vsc'; + import Status from './Status'; + import type { BuyReportInformation, FestivalItemsForMyPage, @@ -29,11 +31,11 @@ const convertDate = (date: string) => { const TableHeader: React.FC = () => ( - 物品名 - 予算 - 使用額 - 残高 - + 物品名 + 予算 + 使用額 + 残高 + ); @@ -62,7 +64,7 @@ const TableItem: React.FC = ({ if (hasSubitems) toggleItem(item.festivalItemName || ''); }} > - + {hasSubitems && ( @@ -78,7 +80,7 @@ const TableItem: React.FC = ({ )} {!hasSubitems && ( - + {truncateItemName(item?.festivalItemName || '')} )} @@ -110,28 +112,28 @@ const TableSubItem: React.FC = ({ items, itemsName, truncateI return ( -
+
e.stopPropagation()} > {items.map((item) => ( - - - - - @@ -182,7 +184,9 @@ const TableSection: React.FC = ({ festivalItemDetails }) => { return (
-

{festivalItemDetails.divisionName}

+

+ {festivalItemDetails.divisionName} +

+ {truncateItemName(itemsName || '')} + {convertDate(item?.reportDate ?? '')} + {item.buyReportName || '-'} + {item.amount ? item.amount.toLocaleString() : '-'} +
diff --git a/view/next-project/src/components/purchaseorders/DeleteModal.tsx b/view/next-project/src/components/purchaseorders/DeleteModal.tsx index 6cd9aeed3..48a94c00d 100644 --- a/view/next-project/src/components/purchaseorders/DeleteModal.tsx +++ b/view/next-project/src/components/purchaseorders/DeleteModal.tsx @@ -1,9 +1,10 @@ import { useRouter } from 'next/router'; import React, { Dispatch, FC, SetStateAction } from 'react'; -import { CloseButton, Modal, OutlinePrimaryButton, PrimaryButton } from '../common'; import { del } from '@api/api_methods'; +import { CloseButton, Modal, OutlinePrimaryButton, PrimaryButton } from '../common'; + interface ModalProps { setShowModal: Dispatch>; id: number | string; diff --git a/view/next-project/src/components/purchaseorders/DetailEditModal.tsx b/view/next-project/src/components/purchaseorders/DetailEditModal.tsx index 348e708ee..6c00a8a2f 100644 --- a/view/next-project/src/components/purchaseorders/DetailEditModal.tsx +++ b/view/next-project/src/components/purchaseorders/DetailEditModal.tsx @@ -1,5 +1,6 @@ import router from 'next/router'; import { useState } from 'react'; + import { Expense, PurchaseOrder, PurchaseOrderView } from '@/type/common'; import { put } from '@/utils/api/purchaseOrder'; import { @@ -50,7 +51,7 @@ export const DetailEditModal: React.FC<{

購入した局と期限日を修正

-
+

購入した局

購入申請の作成
-
+

購入期限

>; openModal: boolean; diff --git a/view/next-project/src/components/purchasereports/DetailEditModal.tsx b/view/next-project/src/components/purchasereports/DetailEditModal.tsx index 84dc90eb8..c7ada7f75 100644 --- a/view/next-project/src/components/purchasereports/DetailEditModal.tsx +++ b/view/next-project/src/components/purchasereports/DetailEditModal.tsx @@ -1,5 +1,6 @@ import router from 'next/router'; import { useState } from 'react'; + import { Expense, PurchaseOrder, PurchaseReportView } from '@/type/common'; import { put } from '@/utils/api/purchaseOrder'; import { @@ -50,7 +51,7 @@ export const DetailEditModal: React.FC<{

購入した局と期限日を修正

-
+

購入した局

-
+

割引

{isDone ? ( <> -
+

割引

void; children?: React.ReactNode; diff --git a/view/next-project/src/components/sponsoractivities/AddPdfDetailModal.tsx b/view/next-project/src/components/sponsoractivities/AddPdfDetailModal.tsx index b2d5eec41..c3c763e72 100644 --- a/view/next-project/src/components/sponsoractivities/AddPdfDetailModal.tsx +++ b/view/next-project/src/components/sponsoractivities/AddPdfDetailModal.tsx @@ -1,6 +1,5 @@ import React, { useState } from 'react'; -import { OpenEditInvoiceModalButton } from './index'; import { createSponsorActivitiesPDF } from '@/utils/createSponsorActivitiesInvoicesPDF'; import { PreviewPDF } from '@/utils/createSponsorActivitiesInvoicesPDF'; import { CloseButton, Input, Modal, PrimaryButton } from '@components/common'; @@ -11,6 +10,8 @@ import { InvoiceSponsorStyle, } from '@type/common'; +import { OpenEditInvoiceModalButton } from './index'; + interface ModalProps { setIsOpen: (isOpen: boolean) => void; sponsorActivitiesViewItem: SponsorActivityView; diff --git a/view/next-project/src/components/sponsoractivities/DetailModal.tsx b/view/next-project/src/components/sponsoractivities/DetailModal.tsx index 25d3b9a84..1d9024055 100644 --- a/view/next-project/src/components/sponsoractivities/DetailModal.tsx +++ b/view/next-project/src/components/sponsoractivities/DetailModal.tsx @@ -1,11 +1,13 @@ import { useRouter } from 'next/router'; import React, { FC, useState } from 'react'; import { RiCloseCircleLine } from 'react-icons/ri'; -import DetailPage1 from './DetailPage1'; -import DetailPage2 from './DetailPage2'; + import { Modal } from '@components/common'; import { SponsorActivityView } from '@type/common'; +import DetailPage1 from './DetailPage1'; +import DetailPage2 from './DetailPage2'; + interface ModalProps { isOpen: boolean; setIsOpen: (isOpen: boolean) => void; diff --git a/view/next-project/src/components/sponsoractivities/DetailPage1.tsx b/view/next-project/src/components/sponsoractivities/DetailPage1.tsx index 97cce2f4d..706647e6e 100644 --- a/view/next-project/src/components/sponsoractivities/DetailPage1.tsx +++ b/view/next-project/src/components/sponsoractivities/DetailPage1.tsx @@ -1,12 +1,13 @@ import { clsx } from 'clsx'; import React, { FC } from 'react'; - import { FaChevronCircleRight } from 'react-icons/fa'; -import OpenAddPdfDetailModalButton from './OpenAddPdfDetailModalButton'; -import OpenPaymentDayModalButton from './OpenPaymentDayModalButton'; + import { DESIGNERS } from '@constants/designers'; import { SponsorActivityView } from '@type/common'; +import OpenAddPdfDetailModalButton from './OpenAddPdfDetailModalButton'; +import OpenPaymentDayModalButton from './OpenPaymentDayModalButton'; + interface ModalProps { setPageNum: (isOpen: number) => void; children?: React.ReactNode; diff --git a/view/next-project/src/components/sponsoractivities/DetailPage2.tsx b/view/next-project/src/components/sponsoractivities/DetailPage2.tsx index 85bd82f34..7f4e53cdf 100644 --- a/view/next-project/src/components/sponsoractivities/DetailPage2.tsx +++ b/view/next-project/src/components/sponsoractivities/DetailPage2.tsx @@ -1,10 +1,15 @@ import { clsx } from 'clsx'; import { saveAs } from 'file-saver'; import React, { FC, useEffect, useState } from 'react'; - import { FaChevronCircleLeft, FaCheckCircle } from 'react-icons/fa'; import { FiPlusSquare } from 'react-icons/fi'; import { RiCloseCircleLine } from 'react-icons/ri'; + +import { post, del, put } from '@/utils/api/api_methods'; +import { DESIGN_PROGRESSES } from '@constants/designProgresses'; +import { SponsorActivityView, SponsorActivityInformation } from '@type/common'; + +import UplaodFileModal from './UploadFileModal'; import { DeleteButton, EditButton, @@ -14,10 +19,6 @@ import { Select, Loading, } from '../common'; -import UplaodFileModal from './UploadFileModal'; -import { post, del, put } from '@/utils/api/api_methods'; -import { DESIGN_PROGRESSES } from '@constants/designProgresses'; -import { SponsorActivityView, SponsorActivityInformation } from '@type/common'; interface ModalProps { setPageNum: (isOpen: number) => void; diff --git a/view/next-project/src/components/sponsoractivities/EditInvoiceModal.tsx b/view/next-project/src/components/sponsoractivities/EditInvoiceModal.tsx index 02ee5a672..e12739f10 100644 --- a/view/next-project/src/components/sponsoractivities/EditInvoiceModal.tsx +++ b/view/next-project/src/components/sponsoractivities/EditInvoiceModal.tsx @@ -1,5 +1,6 @@ import clsx from 'clsx'; import React, { useState } from 'react'; + import { PrimaryButton, OutlinePrimaryButton, CloseButton, Modal, Input } from '@components/common'; import { Invoice, InvoiceSponsorStyle } from '@type/common'; @@ -65,7 +66,7 @@ export default function EditInvoiceModal(props: ModalProps) {
請求書の修正
-
+

企業名

diff --git a/view/next-project/src/components/sponsoractivities/EditModal.tsx b/view/next-project/src/components/sponsoractivities/EditModal.tsx index 4fb3ba165..a4dbc2cfc 100644 --- a/view/next-project/src/components/sponsoractivities/EditModal.tsx +++ b/view/next-project/src/components/sponsoractivities/EditModal.tsx @@ -2,7 +2,6 @@ import { useRouter } from 'next/router'; import React, { useState, useEffect, useMemo } from 'react'; import { get, put, post, del } from '@/utils/api/api_methods'; - import { PrimaryButton, OutlinePrimaryButton, @@ -217,7 +216,7 @@ export default function EditModal(props: ModalProps) { // 協賛企業の情報 const content = (data: SponsorActivity) => ( -
+

年度

void; children?: React.ReactNode; diff --git a/view/next-project/src/components/sponsors/OpenDeleteModalButton.tsx b/view/next-project/src/components/sponsors/OpenDeleteModalButton.tsx index 0692d269e..721e81c45 100644 --- a/view/next-project/src/components/sponsors/OpenDeleteModalButton.tsx +++ b/view/next-project/src/components/sponsors/OpenDeleteModalButton.tsx @@ -1,8 +1,9 @@ import React, { useState } from 'react'; -import DeleteModal from './DeleteModal'; import { DeleteButton } from '@components/common'; +import DeleteModal from './DeleteModal'; + interface Props { children?: React.ReactNode; id: number; diff --git a/view/next-project/src/components/sponsors/OpenEditModalButton.tsx b/view/next-project/src/components/sponsors/OpenEditModalButton.tsx index 24e61758b..5c7a7dc8e 100644 --- a/view/next-project/src/components/sponsors/OpenEditModalButton.tsx +++ b/view/next-project/src/components/sponsors/OpenEditModalButton.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; import { useState } from 'react'; -import SponsorEditModal from './SponsorEditModal'; import { EditButton } from '@components/common'; import { Sponsor } from '@type/common'; +import SponsorEditModal from './SponsorEditModal'; + interface Props { children?: React.ReactNode; sponsor: Sponsor; diff --git a/view/next-project/src/components/sponsors/SponsorAddModal.tsx b/view/next-project/src/components/sponsors/SponsorAddModal.tsx index 2ed7b1747..9acd96a0b 100644 --- a/view/next-project/src/components/sponsors/SponsorAddModal.tsx +++ b/view/next-project/src/components/sponsors/SponsorAddModal.tsx @@ -45,7 +45,7 @@ export default function SponsorAddModal() {

企業登録

-
+

企業名

diff --git a/view/next-project/src/components/sponsors/SponsorEditModal.tsx b/view/next-project/src/components/sponsors/SponsorEditModal.tsx index bcde951f6..ad29eb394 100644 --- a/view/next-project/src/components/sponsors/SponsorEditModal.tsx +++ b/view/next-project/src/components/sponsors/SponsorEditModal.tsx @@ -47,7 +47,7 @@ export default function SponsorEditModal(props: Props) {

企業情報編集

-
+

企業名

diff --git a/view/next-project/src/components/sponsorstyles/EditModal.tsx b/view/next-project/src/components/sponsorstyles/EditModal.tsx index 94555608b..eb221edb1 100644 --- a/view/next-project/src/components/sponsorstyles/EditModal.tsx +++ b/view/next-project/src/components/sponsorstyles/EditModal.tsx @@ -41,7 +41,7 @@ export default function EditModal(props: ModalProps) { // 協賛スタイルの情報 const content = (data: SponsorStyle) => ( -
+

協賛内容

協賛スタイルの登録

-
+

協賛内容

= (props) => {
教員の登録
-
+

教員名

diff --git a/view/next-project/src/components/teacher/EditModal.tsx b/view/next-project/src/components/teacher/EditModal.tsx index 511ec5785..c7a563174 100644 --- a/view/next-project/src/components/teacher/EditModal.tsx +++ b/view/next-project/src/components/teacher/EditModal.tsx @@ -46,7 +46,7 @@ export default function FundInformationEditModal(props: ModalProps) {
教員情報の編集
-
+

教員名

diff --git a/view/next-project/src/components/teacher/OpenAddModalButton.tsx b/view/next-project/src/components/teacher/OpenAddModalButton.tsx index de6e69401..3401f4840 100644 --- a/view/next-project/src/components/teacher/OpenAddModalButton.tsx +++ b/view/next-project/src/components/teacher/OpenAddModalButton.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; import { useState } from 'react'; -import { AddButton } from '../common'; import { Department } from '@/type/common'; import AddModal from '@components/teacher/AddModal'; +import { AddButton } from '../common'; + interface Props { departments: Department[]; children?: React.ReactNode; diff --git a/view/next-project/src/components/teacher/OpenDeleteModalButton.tsx b/view/next-project/src/components/teacher/OpenDeleteModalButton.tsx index ffe09e457..dcb0dbb18 100644 --- a/view/next-project/src/components/teacher/OpenDeleteModalButton.tsx +++ b/view/next-project/src/components/teacher/OpenDeleteModalButton.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; import { useState } from 'react'; -import { DeleteButton } from '../common'; import DeleteModal from '@components/teacher/DeleteModal'; import { Teacher } from '@type/common'; +import { DeleteButton } from '../common'; + interface Props { deleteTeachers?: { teachers: Teacher[]; ids: number[] }; isDisabled: boolean; diff --git a/view/next-project/src/components/teacher/OpenEditModalButton.tsx b/view/next-project/src/components/teacher/OpenEditModalButton.tsx index d48dae6c2..ec5d42b3c 100644 --- a/view/next-project/src/components/teacher/OpenEditModalButton.tsx +++ b/view/next-project/src/components/teacher/OpenEditModalButton.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; import { useState } from 'react'; -import { EditButton } from '../common'; import EditModal from '@components/teacher/EditModal'; import { Department, Teacher } from '@type/common'; +import { EditButton } from '../common'; + interface Props { id: number; teacher: Teacher; diff --git a/view/next-project/src/components/users/DeleteModal.tsx b/view/next-project/src/components/users/DeleteModal.tsx index cfaff48e7..44ae7b282 100644 --- a/view/next-project/src/components/users/DeleteModal.tsx +++ b/view/next-project/src/components/users/DeleteModal.tsx @@ -1,5 +1,6 @@ import { useRouter } from 'next/router'; import React, { Dispatch, FC, SetStateAction } from 'react'; + import { multiDel } from '@api/api_methods'; import { Modal, CloseButton, OutlinePrimaryButton, PrimaryButton } from '@components/common'; import { User } from '@type/common'; diff --git a/view/next-project/src/components/users/EditModal.tsx b/view/next-project/src/components/users/EditModal.tsx index 5f86c9f19..bd19df554 100644 --- a/view/next-project/src/components/users/EditModal.tsx +++ b/view/next-project/src/components/users/EditModal.tsx @@ -1,11 +1,12 @@ import { useRouter } from 'next/router'; import React, { Dispatch, SetStateAction, useState } from 'react'; -import { Modal, PrimaryButton, CloseButton, Input, Select } from '../common'; import { ROLES } from '@/constants/role'; import { put } from '@api/user'; import { Bureau, User } from '@type/common'; +import { Modal, PrimaryButton, CloseButton, Input, Select } from '../common'; + interface ModalProps { setShowModal: Dispatch>; id: number | string; @@ -45,7 +46,7 @@ export default function FundInformationEditModal(props: ModalProps) { />
ユーザの編集
-
+

氏名

diff --git a/view/next-project/src/components/users/OpenDeleteModalButton.tsx b/view/next-project/src/components/users/OpenDeleteModalButton.tsx index 7e9a15c90..27220de78 100644 --- a/view/next-project/src/components/users/OpenDeleteModalButton.tsx +++ b/view/next-project/src/components/users/OpenDeleteModalButton.tsx @@ -1,8 +1,10 @@ import React, { useState, useMemo } from 'react'; import { RiDeleteBinLine } from 'react-icons/ri'; -import DeleteModal from '../users/DeleteModal'; + import { User } from '@type/common'; +import DeleteModal from '../users/DeleteModal'; + interface Props { children?: React.ReactNode; deleteUsers?: { users: User[]; ids: number[] }; @@ -27,7 +29,7 @@ const OpenDeleteModalButton: React.FC = (props) => { <>

年度の登録

-
+

年度

diff --git a/view/next-project/src/components/yearperiods/EditModal.tsx b/view/next-project/src/components/yearperiods/EditModal.tsx index 921083f20..25c9f8956 100644 --- a/view/next-project/src/components/yearperiods/EditModal.tsx +++ b/view/next-project/src/components/yearperiods/EditModal.tsx @@ -2,10 +2,11 @@ import { format } from 'date-fns'; import { useRouter } from 'next/router'; import { Dispatch, SetStateAction, useState } from 'react'; -import { Modal, Input, CloseButton, PrimaryButton } from '../common'; import { put } from '@api/api_methods'; import { YearPeriod } from '@type/common'; +import { Modal, Input, CloseButton, PrimaryButton } from '../common'; + interface ModalProps { setShowModal: Dispatch>; yearPeriod: YearPeriod; @@ -70,7 +71,7 @@ export default function EditModal(props: ModalProps) {

年度の編集

-
+

年度

- +
-
+

404

Not Found

diff --git a/view/next-project/src/pages/500.tsx b/view/next-project/src/pages/500.tsx index 2099bd5e6..8bb8d6fc5 100644 --- a/view/next-project/src/pages/500.tsx +++ b/view/next-project/src/pages/500.tsx @@ -1,4 +1,5 @@ import Image from 'next/image'; + import { PrimaryButton } from '@/components/common'; export default function Custom500() { @@ -6,10 +7,10 @@ export default function Custom500() {
- +
-
+

500

Internal Server Error

diff --git a/view/next-project/src/pages/_app.tsx b/view/next-project/src/pages/_app.tsx index c363eee33..1a0b3343c 100644 --- a/view/next-project/src/pages/_app.tsx +++ b/view/next-project/src/pages/_app.tsx @@ -1,5 +1,4 @@ import { ChakraProvider } from '@chakra-ui/react'; -import type { AppProps } from 'next/app'; import Head from 'next/head'; import { NuqsAdapter } from 'nuqs/adapters/next/pages'; import { RecoilRoot } from 'recoil'; @@ -7,6 +6,8 @@ import { RecoilRoot } from 'recoil'; import Layout from '@components/layout/Layout'; import { ManagedUIContext } from '@components/ui/context'; +import type { AppProps } from 'next/app'; + import 'tailwindcss/tailwind.css'; function MyApp({ Component, pageProps }: AppProps) { diff --git a/view/next-project/src/pages/api/advertisements.tsx b/view/next-project/src/pages/api/advertisements.tsx index 523894205..edaa97a7c 100644 --- a/view/next-project/src/pages/api/advertisements.tsx +++ b/view/next-project/src/pages/api/advertisements.tsx @@ -1,5 +1,6 @@ import fs from 'fs'; import path from 'path'; + import { formidable, Files } from 'formidable'; import { Client } from 'minio'; import { NextApiRequest, NextApiResponse } from 'next'; diff --git a/view/next-project/src/pages/api/receipts.tsx b/view/next-project/src/pages/api/receipts.tsx index 20458a62b..53c6d6df2 100644 --- a/view/next-project/src/pages/api/receipts.tsx +++ b/view/next-project/src/pages/api/receipts.tsx @@ -1,4 +1,5 @@ import fs from 'fs'; + import { formidable } from 'formidable'; import { Client } from 'minio'; import { NextApiRequest, NextApiResponse } from 'next'; diff --git a/view/next-project/src/pages/budget_managements/index.tsx b/view/next-project/src/pages/budget_managements/index.tsx index 15e1ae2f4..bb3ce48f1 100644 --- a/view/next-project/src/pages/budget_managements/index.tsx +++ b/view/next-project/src/pages/budget_managements/index.tsx @@ -1,5 +1,6 @@ import router from 'next/router'; import { useRecoilValue } from 'recoil'; + import BudgetManagement from '@/components/budget_managements/BudgetManagement'; import MainLayout from '@/components/layout/MainLayout'; import { userAtom } from '@/store/atoms'; diff --git a/view/next-project/src/pages/budgets/index.tsx b/view/next-project/src/pages/budgets/index.tsx index 7fe08150e..dcfbf2efd 100644 --- a/view/next-project/src/pages/budgets/index.tsx +++ b/view/next-project/src/pages/budgets/index.tsx @@ -3,8 +3,8 @@ import clsx from 'clsx'; import Head from 'next/head'; import { useState, useEffect } from 'react'; import { RiAddCircleLine } from 'react-icons/ri'; - import { useRecoilValue } from 'recoil'; + import OpenExpenditureAddModalButton from '@/components/budgets/OpenExpenditureAddModalButton'; import OpenExpenseAddModalButton from '@/components/budgets/OpenExpenseAddModalButton'; import OpenExpenseDeleteModalButton from '@/components/budgets/OpenExpenseDeleteModalButton'; @@ -232,8 +232,8 @@ export default function BudgetList(props: Props) { >
- + - - +
- 合計金額 + 合計金額 {budgetsTotalFee} @@ -361,8 +361,8 @@ export default function BudgetList(props: Props) { )} >
合計金額 + 合計金額 {expensesTotalFee} diff --git a/view/next-project/src/pages/create_purchase_report/index.tsx b/view/next-project/src/pages/create_purchase_report/index.tsx index b9b68da1d..86a8ec777 100644 --- a/view/next-project/src/pages/create_purchase_report/index.tsx +++ b/view/next-project/src/pages/create_purchase_report/index.tsx @@ -13,6 +13,7 @@ import { import { Noto_Sans_JP } from 'next/font/google'; import { useRouter } from 'next/router'; import React, { useRef, useState, useEffect } from 'react'; + import { PrimaryButton, Title } from '@/components/common'; import FileUploadField from '@/components/create_purchase_report/FileUploadField'; import FormField from '@/components/create_purchase_report/FormField'; diff --git a/view/next-project/src/pages/fund_informations/[id]/edit.tsx b/view/next-project/src/pages/fund_informations/[id]/edit.tsx index d48e6f821..adac8488f 100644 --- a/view/next-project/src/pages/fund_informations/[id]/edit.tsx +++ b/view/next-project/src/pages/fund_informations/[id]/edit.tsx @@ -17,6 +17,7 @@ import { import { Noto_Sans_JP } from 'next/font/google'; import { useRouter } from 'next/router'; import React, { useState, useEffect } from 'react'; + import { PrimaryButton, Title } from '@/components/common'; import { useFundInformations } from '@/components/fund_information/useFundInformations'; import MainLayout from '@/components/layout/MainLayout'; diff --git a/view/next-project/src/pages/fund_informations/create/index.tsx b/view/next-project/src/pages/fund_informations/create/index.tsx index 497db2090..52c3fd7fb 100644 --- a/view/next-project/src/pages/fund_informations/create/index.tsx +++ b/view/next-project/src/pages/fund_informations/create/index.tsx @@ -2,6 +2,7 @@ import { Box, useToast } from '@chakra-ui/react'; import { Noto_Sans_JP } from 'next/font/google'; import Head from 'next/head'; import { useState } from 'react'; + import { Title } from '@/components/common'; import { FundInformationForm } from '@/components/fund_information'; import { diff --git a/view/next-project/src/pages/fund_informations/index.tsx b/view/next-project/src/pages/fund_informations/index.tsx index b0ccda257..cfbeb7aac 100644 --- a/view/next-project/src/pages/fund_informations/index.tsx +++ b/view/next-project/src/pages/fund_informations/index.tsx @@ -1,6 +1,7 @@ import Head from 'next/head'; import router from 'next/router'; import { useRecoilValue } from 'recoil'; + import { FundInformationTable, FundInformationHeader } from '@/components/fund_information'; import { useFundInformations } from '@/components/fund_information/useFundInformations'; import { userAtom } from '@/store/atoms'; @@ -30,7 +31,7 @@ export default function FundInformations() {
-
+
diff --git a/view/next-project/src/pages/index.tsx b/view/next-project/src/pages/index.tsx index f95003d8e..52fec4495 100644 --- a/view/next-project/src/pages/index.tsx +++ b/view/next-project/src/pages/index.tsx @@ -2,7 +2,6 @@ import Image from 'next/image'; import { useState } from 'react'; import { PrimaryButton } from '@/components/common'; - import Link from '@/components/common/Link'; import SignInView from '@components/auth/SignInView'; import SignUpView from '@components/auth/SignUpView'; diff --git a/view/next-project/src/pages/my_page/index.tsx b/view/next-project/src/pages/my_page/index.tsx index d32d54ca4..6a2a38e01 100644 --- a/view/next-project/src/pages/my_page/index.tsx +++ b/view/next-project/src/pages/my_page/index.tsx @@ -3,6 +3,7 @@ import { useRouter } from 'next/router'; import { useEffect, useState } from 'react'; import { RiAddCircleLine } from 'react-icons/ri'; import { useRecoilValue } from 'recoil'; + import { Card, Loading, PrimaryButton } from '@/components/common'; import MainLayout from '@/components/layout/MainLayout'; import TableSection from '@/components/mypage/TableSection'; @@ -42,7 +43,7 @@ const MyPage = () => {
-

My Page

+

My Page

{resData && (
diff --git a/view/next-project/src/pages/purchase_report_list/index.tsx b/view/next-project/src/pages/purchase_report_list/index.tsx index c27b1409f..8369e3399 100644 --- a/view/next-project/src/pages/purchase_report_list/index.tsx +++ b/view/next-project/src/pages/purchase_report_list/index.tsx @@ -3,6 +3,7 @@ import { useRouter } from 'next/router'; import { useCallback, useState, useEffect, useMemo } from 'react'; import { TbDownload } from 'react-icons/tb'; import { useRecoilValue } from 'recoil'; + import DownloadButton from '@/components/common/DownloadButton'; import PrimaryButton from '@/components/common/OutlinePrimaryButton/OutlinePrimaryButton'; import { @@ -10,15 +11,16 @@ import { useGetYearsPeriods, usePutBuyReportStatusBuyReportId, } from '@/generated/hooks'; +import { userAtom } from '@/store/atoms'; +import { Card, Checkbox, EditButton, Loading, Title } from '@components/common'; +import MainLayout from '@components/layout/MainLayout'; +import OpenDeleteModalButton from '@components/purchasereports/OpenDeleteModalButton'; + import type { GetBuyReportsDetailsParams, BuyReportDetail, PutBuyReportStatusBuyReportIdBody, } from '@/generated/model'; -import { userAtom } from '@/store/atoms'; -import { Card, Checkbox, EditButton, Loading, Title } from '@components/common'; -import MainLayout from '@components/layout/MainLayout'; -import OpenDeleteModalButton from '@components/purchasereports/OpenDeleteModalButton'; export default function PurchaseReports() { const router = useRouter(); diff --git a/view/next-project/src/pages/purchaseorders/index.tsx b/view/next-project/src/pages/purchaseorders/index.tsx index b8a4491b1..7d55fb276 100644 --- a/view/next-project/src/pages/purchaseorders/index.tsx +++ b/view/next-project/src/pages/purchaseorders/index.tsx @@ -1,6 +1,7 @@ import Head from 'next/head'; import { useCallback, useEffect, useState, useMemo } from 'react'; import { useRecoilValue } from 'recoil'; + import PrimaryButton from '@/components/common/OutlinePrimaryButton/OutlinePrimaryButton'; import { userAtom } from '@/store/atoms'; import { put } from '@/utils/api/purchaseOrder'; @@ -301,7 +302,7 @@ export default function PurchaseOrders(props: Props) { onOpen(purchaseOrderViewItem.purchaseOrder.id || 0, purchaseOrderViewItem); }} > -
+
{purchaseOrderViewItem.purchaseItem && purchaseOrderViewItem.purchaseItem.map( (purchaseItem: PurchaseItem, index: number) => ( diff --git a/view/next-project/src/pages/reset_password/[id]/index.tsx b/view/next-project/src/pages/reset_password/[id]/index.tsx index 8c9d148f3..8f60fba34 100644 --- a/view/next-project/src/pages/reset_password/[id]/index.tsx +++ b/view/next-project/src/pages/reset_password/[id]/index.tsx @@ -1,4 +1,5 @@ import { Context } from 'vm'; + import Image from 'next/image'; import Router from 'next/router'; import React, { useState } from 'react'; @@ -98,7 +99,7 @@ export default function ResetPassword(props: Props) {
-
+

パスワード

diff --git a/view/next-project/src/pages/sponsoractivities/index.tsx b/view/next-project/src/pages/sponsoractivities/index.tsx index 11a265038..2a23a988a 100644 --- a/view/next-project/src/pages/sponsoractivities/index.tsx +++ b/view/next-project/src/pages/sponsoractivities/index.tsx @@ -1,9 +1,9 @@ import clsx from 'clsx'; import Head from 'next/head'; import { useState, useEffect, useMemo } from 'react'; - import { MdFilterList, MdCircle } from 'react-icons/md'; import { RiExternalLinkLine } from 'react-icons/ri'; + import { Loading } from '@/components/common'; import PrimaryButton from '@/components/common/OutlinePrimaryButton/OutlinePrimaryButton'; import { @@ -272,7 +272,7 @@ export default function SponsorActivities(props: Props) {