diff --git a/.vs/2024-DEV-BUT3/config/applicationhost.config b/.vs/2024-DEV-BUT3/config/applicationhost.config
new file mode 100644
index 0000000..269dc55
--- /dev/null
+++ b/.vs/2024-DEV-BUT3/config/applicationhost.config
@@ -0,0 +1,1021 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.vs/2024-DEV-BUT3/v17/.wsuo b/.vs/2024-DEV-BUT3/v17/.wsuo
new file mode 100644
index 0000000..c4df42a
Binary files /dev/null and b/.vs/2024-DEV-BUT3/v17/.wsuo differ
diff --git a/.vs/2024-DEV-BUT3/v17/DocumentLayout.json b/.vs/2024-DEV-BUT3/v17/DocumentLayout.json
new file mode 100644
index 0000000..96ad025
--- /dev/null
+++ b/.vs/2024-DEV-BUT3/v17/DocumentLayout.json
@@ -0,0 +1,23 @@
+{
+ "Version": 1,
+ "WorkspaceRootPath": "C:\\Users\\Admin\\source\\repos\\2024-DEV-BUT3\\",
+ "Documents": [],
+ "DocumentGroupContainers": [
+ {
+ "Orientation": 0,
+ "VerticalTabListWidth": 256,
+ "DocumentGroups": [
+ {
+ "DockedWidth": 200,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:1:0:{d212f56b-c48a-434c-a121-1c5d80b59b9f}"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
new file mode 100644
index 0000000..f8b4888
--- /dev/null
+++ b/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+ "CurrentProjectSetting": null
+}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..b3ea067
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+ "ExpandedNodes": [
+ ""
+ ],
+ "SelectedNode": "\\C:\\Users\\Admin\\Source\\Repos\\2024-DEV-BUT3",
+ "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000..0d4de0c
Binary files /dev/null and b/.vs/slnx.sqlite differ
diff --git a/package-lock.json b/package-lock.json
index 00d3eea..a6039d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "0.0.0",
"license": "ISC",
"dependencies": {
- "antd": "^5.15.4",
+ "@ant-design/icons": "^5.3.7",
"axios": "^1.6.7",
"bootstrap": "^5.3.3",
"react": "^18.2.0",
@@ -18,13 +18,13 @@
"react-router-dom": "^6.21.3"
},
"devDependencies": {
- "antd": "^5.15.4",
"@playwright/test": "^1.42.1",
"@testing-library/react": "^14.1.2",
"@types/node": "^20.11.9",
- "@types/react": "^18.2.43",
- "@types/react-dom": "^18.2.17",
+ "@types/react": "^18.3.1",
+ "@types/react-dom": "^18.3.0",
"@vitejs/plugin-react-swc": "^3.5.0",
+ "antd": "^5.17.0",
"eslint": "^8.55.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
@@ -55,9 +55,10 @@
}
},
"node_modules/@ant-design/cssinjs": {
- "version": "1.18.5",
- "resolved": "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-1.18.5.tgz",
- "integrity": "sha512-Ub4n3d+MAX/qtE5S9PM8iOn5ocU7GUAIC4Adc2X8UCMXnsRRfpJBHsBdtQ1qoAuaQ7lU2M1BTCuJ+fkv4fOWiw==",
+ "version": "1.20.0",
+ "resolved": "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-1.20.0.tgz",
+ "integrity": "sha512-uG3iWzJxgNkADdZmc6W0Ci3iQAUOvLMcM8SnnmWq3r6JeocACft4ChnY/YWvI2Y+rG/68QBla/O+udke1yH3vg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.11.1",
"@emotion/hash": "^0.8.0",
@@ -73,9 +74,9 @@
}
},
"node_modules/@ant-design/icons": {
- "version": "5.3.5",
- "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.3.5.tgz",
- "integrity": "sha512-Vyv/OsKz56BsKBtcRlLP6G8RGaRW43f7G5dK3XNPCaeV4YyehLVaITuNKi2YJG9hMVURkBdzdGhveNQlnKTFqw==",
+ "version": "5.3.7",
+ "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.3.7.tgz",
+ "integrity": "sha512-bCPXTAg66f5bdccM4TT21SQBDO1Ek2gho9h3nO9DAKXJP4sq+5VBjrQMSxMVXSB3HyEz+cUbHQ5+6ogxCOpaew==",
"dependencies": {
"@ant-design/colors": "^7.0.0",
"@ant-design/icons-svg": "^4.4.0",
@@ -97,9 +98,10 @@
"integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA=="
},
"node_modules/@ant-design/react-slick": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.0.2.tgz",
- "integrity": "sha512-Wj8onxL/T8KQLFFiCA4t8eIRGpRR+UPgOdac2sYzonv+i0n3kXHmvHLLiOYL655DQx2Umii9Y9nNgL7ssu5haQ==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-1.1.2.tgz",
+ "integrity": "sha512-EzlvzE6xQUBrZuuhSAFTdsr4P2bBBHGZwKFemEfq8gIGyIQCxalYfZW/T2ORbtQx5rU69o+WycP3exY/7T1hGA==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.4",
"classnames": "^2.2.5",
@@ -290,9 +292,9 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.24.1",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz",
- "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==",
+ "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"
},
@@ -311,12 +313,14 @@
"node_modules/@emotion/hash": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
- "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
+ "dev": true
},
"node_modules/@emotion/unitless": {
"version": "0.7.5",
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
- "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
+ "dev": true
},
"node_modules/@esbuild/aix-ppc64": {
"version": "0.19.12",
@@ -853,10 +857,23 @@
"url": "https://opencollective.com/popperjs"
}
},
+ "node_modules/@rc-component/async-validator": {
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@rc-component/async-validator/-/async-validator-5.0.2.tgz",
+ "integrity": "sha512-ukdSere8wCNa5MpymNOYvOuHDODHlwBeaYEm0TtG91M7i72T7/cOVZhmDg9QcNe5+VP1YHJQEvquqA1bN5pTsg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/runtime": "^7.24.4"
+ },
+ "engines": {
+ "node": ">=14.x"
+ }
+ },
"node_modules/@rc-component/color-picker": {
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/@rc-component/color-picker/-/color-picker-1.5.3.tgz",
"integrity": "sha512-+tGGH3nLmYXTalVe0L8hSZNs73VTP5ueSHwUlDC77KKRaN7G4DS4wcpG5DTDzdcV/Yas+rzA6UGgIyzd8fS4cw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.23.6",
"@ctrl/tinycolor": "^3.6.1",
@@ -872,6 +889,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@rc-component/context/-/context-1.4.0.tgz",
"integrity": "sha512-kFcNxg9oLRMoL3qki0OMxK+7g5mypjgaaJp/pkOis/6rVxma9nJBF/8kCIuTYHUQNr0ii7MxqE33wirPZLJQ2w==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"rc-util": "^5.27.0"
@@ -885,6 +903,7 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@rc-component/mini-decimal/-/mini-decimal-1.1.0.tgz",
"integrity": "sha512-jS4E7T9Li2GuYwI6PyiVXmxTiM6b07rlD9Ge8uGZSCz3WlzcG5ZK7g5bbuKNeZ9pgUuPK/5guV781ujdVpm4HQ==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.18.0"
},
@@ -896,6 +915,7 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@rc-component/mutate-observer/-/mutate-observer-1.1.0.tgz",
"integrity": "sha512-QjrOsDXQusNwGZPf4/qRQasg7UFEj06XiCJ8iuiq/Io7CrHrgVi6Uuetw60WAMG1799v+aM8kyc+1L/GBbHSlw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.18.0",
"classnames": "^2.3.2",
@@ -913,6 +933,7 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.2.tgz",
"integrity": "sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.18.0",
"classnames": "^2.3.2",
@@ -930,6 +951,7 @@
"version": "1.14.2",
"resolved": "https://registry.npmjs.org/@rc-component/tour/-/tour-1.14.2.tgz",
"integrity": "sha512-A75DZ8LVvahBIvxooj3Gvf2sxe+CGOkmzPNX7ek0i0AJHyKZ1HXe5ieIGo3m0FMdZfVOlbCJ952Duq8VKAHk6g==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.18.0",
"@rc-component/portal": "^1.0.0-9",
@@ -946,9 +968,10 @@
}
},
"node_modules/@rc-component/trigger": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.0.0.tgz",
- "integrity": "sha512-niwKADPdY5dhdIblV6uwSayVivwo2uUISfJqri+/ovYQcH/omxDYBJKo755QKeoIIsWptxnRpgr7reEnNEZGFg==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.1.1.tgz",
+ "integrity": "sha512-UjHkedkgtEcgQu87w1VuWug1idoDJV7VUt0swxHXRcmei2uu1AuUzGBPEUlmOmXGJ+YtTgZfVLi7kuAUKoZTMA==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.23.2",
"@rc-component/portal": "^1.1.0",
@@ -1468,29 +1491,23 @@
"integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
},
"node_modules/@types/react": {
- "version": "18.2.48",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.48.tgz",
- "integrity": "sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==",
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz",
+ "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==",
"dependencies": {
"@types/prop-types": "*",
- "@types/scheduler": "*",
"csstype": "^3.0.2"
}
},
"node_modules/@types/react-dom": {
- "version": "18.2.18",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz",
- "integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==",
+ "version": "18.3.0",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+ "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
"dev": true,
"dependencies": {
"@types/react": "*"
}
},
- "node_modules/@types/scheduler": {
- "version": "0.16.8",
- "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
- "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
- },
"node_modules/@ungap/structured-clone": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -1703,54 +1720,55 @@
}
},
"node_modules/antd": {
- "version": "5.15.4",
- "resolved": "https://registry.npmjs.org/antd/-/antd-5.15.4.tgz",
- "integrity": "sha512-79eLOQW1DG92yzulx+ValfHFjvPnaaI41BffGquAnzx42Ws3eEcKofsa2jNRyJN5NWr9I5wqvABDq9rRRfGGsg==",
+ "version": "5.17.0",
+ "resolved": "https://registry.npmjs.org/antd/-/antd-5.17.0.tgz",
+ "integrity": "sha512-jrzMIcaTJIy12/GJ2PfgchgZGuAlDodlaOKd05/TxEtFilRHnv8oaf0qfqNGG3slvvuy4J/57xn21jM4cLl7Hw==",
+ "dev": true,
"dependencies": {
"@ant-design/colors": "^7.0.2",
- "@ant-design/cssinjs": "^1.18.5",
- "@ant-design/icons": "^5.3.5",
- "@ant-design/react-slick": "~1.0.2",
- "@babel/runtime": "^7.24.1",
+ "@ant-design/cssinjs": "^1.19.1",
+ "@ant-design/icons": "^5.3.6",
+ "@ant-design/react-slick": "~1.1.2",
+ "@babel/runtime": "^7.24.5",
"@ctrl/tinycolor": "^3.6.1",
"@rc-component/color-picker": "~1.5.3",
"@rc-component/mutate-observer": "^1.1.0",
"@rc-component/tour": "~1.14.2",
- "@rc-component/trigger": "^2.0.0",
+ "@rc-component/trigger": "^2.1.1",
"classnames": "^2.5.1",
"copy-to-clipboard": "^3.3.3",
"dayjs": "^1.11.10",
"qrcode.react": "^3.1.0",
- "rc-cascader": "~3.24.0",
+ "rc-cascader": "~3.25.0",
"rc-checkbox": "~3.2.0",
"rc-collapse": "~3.7.3",
"rc-dialog": "~9.4.0",
"rc-drawer": "~7.1.0",
"rc-dropdown": "~4.2.0",
- "rc-field-form": "~1.42.1",
+ "rc-field-form": "~2.0.0",
"rc-image": "~7.6.0",
"rc-input": "~1.4.5",
"rc-input-number": "~9.0.0",
"rc-mentions": "~2.11.1",
"rc-menu": "~9.13.0",
"rc-motion": "^2.9.0",
- "rc-notification": "~5.3.0",
+ "rc-notification": "~5.4.0",
"rc-pagination": "~4.0.4",
- "rc-picker": "~4.3.0",
- "rc-progress": "~3.5.1",
+ "rc-picker": "~4.5.0",
+ "rc-progress": "~4.0.0",
"rc-rate": "~2.12.0",
"rc-resize-observer": "^1.4.0",
"rc-segmented": "~2.3.0",
- "rc-select": "~14.13.0",
- "rc-slider": "~10.5.0",
+ "rc-select": "~14.13.1",
+ "rc-slider": "~10.6.2",
"rc-steps": "~6.0.1",
"rc-switch": "~4.1.0",
- "rc-table": "~7.42.0",
- "rc-tabs": "~14.1.1",
+ "rc-table": "~7.45.5",
+ "rc-tabs": "~15.0.0 ",
"rc-textarea": "~1.6.3",
"rc-tooltip": "~6.2.0",
"rc-tree": "~5.8.5",
- "rc-tree-select": "~5.19.0",
+ "rc-tree-select": "~5.20.0",
"rc-upload": "~4.5.2",
"rc-util": "^5.39.1",
"scroll-into-view-if-needed": "^3.1.0",
@@ -1815,7 +1833,8 @@
"node_modules/array-tree-filter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
- "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
+ "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==",
+ "dev": true
},
"node_modules/array.prototype.flat": {
"version": "1.3.2",
@@ -1896,11 +1915,6 @@
"node": "*"
}
},
- "node_modules/async-validator": {
- "version": "4.2.5",
- "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz",
- "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
- },
"node_modules/asynciterator.prototype": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz",
@@ -2144,7 +2158,8 @@
"node_modules/compute-scroll-into-view": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz",
- "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg=="
+ "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==",
+ "dev": true
},
"node_modules/concat-map": {
"version": "0.0.1",
@@ -2164,6 +2179,7 @@
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz",
"integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==",
+ "dev": true,
"dependencies": {
"toggle-selection": "^1.0.6"
}
@@ -2188,9 +2204,10 @@
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
},
"node_modules/dayjs": {
- "version": "1.11.10",
- "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
- "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
+ "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==",
+ "dev": true
},
"node_modules/debug": {
"version": "4.3.4",
@@ -3708,6 +3725,7 @@
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
"integrity": "sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==",
+ "dev": true,
"dependencies": {
"string-convert": "^0.2.0"
}
@@ -4569,6 +4587,7 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-3.1.0.tgz",
"integrity": "sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==",
+ "dev": true,
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
}
@@ -4594,9 +4613,10 @@
]
},
"node_modules/rc-cascader": {
- "version": "3.24.0",
- "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.24.0.tgz",
- "integrity": "sha512-NwkYsVULA61S085jbOYbq8Z7leyIxVmLwf+71mWLjA3kCfUf/rAKC0WfjQbqBDaLGlU9d4z1EzyPaHBKLYWv6A==",
+ "version": "3.25.0",
+ "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.25.0.tgz",
+ "integrity": "sha512-mBY6/CykOvzAYnIye0rpt5JkMAXJaX8zZawOwSndbKuFakYE+leqBQWIZoN9HIgAptPpTi2Aty3RvbaBmk8SKQ==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.12.5",
"array-tree-filter": "^2.1.0",
@@ -4614,6 +4634,7 @@
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-3.2.0.tgz",
"integrity": "sha512-8inzw4y9dAhZmv/Ydl59Qdy5tdp9CKg4oPVcRigi+ga/yKPZS5m5SyyQPtYSgbcqHRYOdUhiPSeKfktc76du1A==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "^2.3.2",
@@ -4628,6 +4649,7 @@
"version": "3.7.3",
"resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.7.3.tgz",
"integrity": "sha512-60FJcdTRn0X5sELF18TANwtVi7FtModq649H11mYF1jh83DniMoM4MqY627sEKRCTm4+WXfGDcB7hY5oW6xhyw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "2.x",
@@ -4643,6 +4665,7 @@
"version": "9.4.0",
"resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.4.0.tgz",
"integrity": "sha512-AScCexaLACvf8KZRqCPz12BJ8olszXOS4lKlkMyzDQHS1m0zj1KZMYgmMCh39ee0Dcv8kyrj8mTqxuLyhH+QuQ==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"@rc-component/portal": "^1.0.0-8",
@@ -4659,6 +4682,7 @@
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-7.1.0.tgz",
"integrity": "sha512-nBE1rF5iZvpavoyqhSSz2mk/yANltA7g3aF0U45xkx381n3we/RKs9cJfNKp9mSWCedOKWt9FLEwZDaAaOGn2w==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.23.9",
"@rc-component/portal": "^1.1.1",
@@ -4675,6 +4699,7 @@
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-4.2.0.tgz",
"integrity": "sha512-odM8Ove+gSh0zU27DUj5cG1gNKg7mLWBYzB5E4nNLrLwBmYEgYP43vHKDGOVZcJSVElQBI0+jTQgjnq0NfLjng==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.18.3",
"@rc-component/trigger": "^2.0.0",
@@ -4687,12 +4712,13 @@
}
},
"node_modules/rc-field-form": {
- "version": "1.42.1",
- "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.42.1.tgz",
- "integrity": "sha512-SqiEmWNP+I61Lt80+ofPvT+3l8Ij6vb35IS+x14gheVnCJN0SRnOwEgsqCEB5FslT7xqjUqDnU845hRZ1jzlAA==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-2.0.0.tgz",
+ "integrity": "sha512-Xwp8SoSbWQOsz3s7IwEkDj/fF73Wa+vVPtP+gnaq6wVvPX8aPhx1vrHpFcgmiIOKdKIdezGLFsTyU3kNXn+IEA==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.18.0",
- "async-validator": "^4.1.0",
+ "@rc-component/async-validator": "^5.0.1",
"rc-util": "^5.32.2"
},
"engines": {
@@ -4707,6 +4733,7 @@
"version": "7.6.0",
"resolved": "https://registry.npmjs.org/rc-image/-/rc-image-7.6.0.tgz",
"integrity": "sha512-tL3Rvd1sS+frZQ01i+tkeUPaOeFz2iG9/scAt/Cfs0hyCRVA/w0Pu1J/JxIX8blalvmHE0bZQRYdOmRAzWu4Hg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.11.2",
"@rc-component/portal": "^1.0.2",
@@ -4724,6 +4751,7 @@
"version": "1.4.5",
"resolved": "https://registry.npmjs.org/rc-input/-/rc-input-1.4.5.tgz",
"integrity": "sha512-AjzykhwnwYTRSwwgCu70CGKBIAv6bP2nqnFptnNTprph/TF1BAs0Qxl91mie/BR6n827WIJB6ZjaRf9iiMwAfw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.11.1",
"classnames": "^2.2.1",
@@ -4738,6 +4766,7 @@
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-9.0.0.tgz",
"integrity": "sha512-RfcDBDdWFFetouWFXBA+WPEC8LzBXyngr9b+yTLVIygfFu7HiLRGn/s/v9wwno94X7KFvnb28FNynMGj9XJlDQ==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"@rc-component/mini-decimal": "^1.0.1",
@@ -4754,6 +4783,7 @@
"version": "2.11.1",
"resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-2.11.1.tgz",
"integrity": "sha512-upb4AK1SRFql7qGnbLEvJqLMugVVIyjmwBJW9L0eLoN9po4JmJZaBzmKA4089fNtsU8k6l/tdZiVafyooeKnLw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.22.5",
"@rc-component/trigger": "^2.0.0",
@@ -4772,6 +4802,7 @@
"version": "9.13.0",
"resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-9.13.0.tgz",
"integrity": "sha512-1l8ooCB3HcYJKCltC/s7OxRKRjgymdl9htrCeGZcXNaMct0RxZRK6OPV3lPhVksIvAGMgzPd54ClpZ5J4b8cZA==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"@rc-component/trigger": "^2.0.0",
@@ -4789,6 +4820,7 @@
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.0.tgz",
"integrity": "sha512-XIU2+xLkdIr1/h6ohPZXyPBMvOmuyFZQ/T0xnawz+Rh+gh4FINcnZmMT5UTIj6hgI0VLDjTaPeRd+smJeSPqiQ==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.11.1",
"classnames": "^2.2.1",
@@ -4800,9 +4832,10 @@
}
},
"node_modules/rc-notification": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.3.0.tgz",
- "integrity": "sha512-WCf0uCOkZ3HGfF0p1H4Sgt7aWfipxORWTPp7o6prA3vxwtWhtug3GfpYls1pnBp4WA+j8vGIi5c2/hQRpGzPcQ==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.4.0.tgz",
+ "integrity": "sha512-li19y9RoYJciF3WRFvD+DvWS70jdL8Fr+Gfb/OshK+iY6iTkwzoigmSIp76/kWh5tF5i/i9im12X3nsF85GYdA==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "2.x",
@@ -4821,6 +4854,7 @@
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/rc-overflow/-/rc-overflow-1.3.2.tgz",
"integrity": "sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.11.1",
"classnames": "^2.2.1",
@@ -4836,6 +4870,7 @@
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-4.0.4.tgz",
"integrity": "sha512-GGrLT4NgG6wgJpT/hHIpL9nELv27A1XbSZzECIuQBQTVSf4xGKxWr6I/jhpRPauYEWEbWVw22ObG6tJQqwJqWQ==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "^2.3.2",
@@ -4847,9 +4882,10 @@
}
},
"node_modules/rc-picker": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-4.3.0.tgz",
- "integrity": "sha512-bQNB/+NdW55jlQ5lPnNqF5J90Tq4SihLbAF7tzPBvGDJyoYmDgwLm4FN0ZB3Ot9i1v6vJY/1mgqZZTT9jbYc5w==",
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-4.5.0.tgz",
+ "integrity": "sha512-suqz9bzuhBQlf7u+bZd1bJLPzhXpk12w6AjQ9BTPTiFwexVZgUKViG1KNLyfFvW6tCUZZK0HmCCX7JAyM+JnCg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"@rc-component/trigger": "^2.0.0",
@@ -4885,9 +4921,10 @@
}
},
"node_modules/rc-progress": {
- "version": "3.5.1",
- "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-3.5.1.tgz",
- "integrity": "sha512-V6Amx6SbLRwPin/oD+k1vbPrO8+9Qf8zW1T8A7o83HdNafEVvAxPV5YsgtKFP+Ud5HghLj33zKOcEHrcrUGkfw==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-4.0.0.tgz",
+ "integrity": "sha512-oofVMMafOCokIUIBnZLNcOZFsABaUw8PPrf1/y0ZBvKZNpOiu5h4AO9vv11Sw0p4Hb3D0yGWuEattcQGtNJ/aw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "^2.2.6",
@@ -4902,6 +4939,7 @@
"version": "2.12.0",
"resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.12.0.tgz",
"integrity": "sha512-g092v5iZCdVzbjdn28FzvWebK2IutoVoiTeqoLTj9WM7SjA/gOJIw5/JFZMRyJYYVe1jLAU2UhAfstIpCNRozg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "^2.2.5",
@@ -4919,6 +4957,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-1.4.0.tgz",
"integrity": "sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.20.7",
"classnames": "^2.2.1",
@@ -4934,6 +4973,7 @@
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/rc-segmented/-/rc-segmented-2.3.0.tgz",
"integrity": "sha512-I3FtM5Smua/ESXutFfb8gJ8ZPcvFR+qUgeeGFQHBOvRiRKyAk4aBE5nfqrxXx+h8/vn60DQjOt6i4RNtrbOobg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.11.1",
"classnames": "^2.2.1",
@@ -4946,12 +4986,13 @@
}
},
"node_modules/rc-select": {
- "version": "14.13.0",
- "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.13.0.tgz",
- "integrity": "sha512-ew34FsaqHokK4dxVrcIxSYrgWJ2XJYlkk32eiOIiEo3GkHUExdCzmozMYaUc2P67c5QJRUvvY0uqCs3QG67h5A==",
+ "version": "14.13.1",
+ "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.13.1.tgz",
+ "integrity": "sha512-A1VHqjIOemxLnUGRxLGVqXBs8jGcJemI5NXxOJwU5PQc1wigAu1T4PRLgMkTPDOz8gPhlY9dwsPzMgakMc2QjQ==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
- "@rc-component/trigger": "^2.0.0",
+ "@rc-component/trigger": "^2.1.1",
"classnames": "2.x",
"rc-motion": "^2.0.1",
"rc-overflow": "^1.3.1",
@@ -4967,13 +5008,14 @@
}
},
"node_modules/rc-slider": {
- "version": "10.5.0",
- "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-10.5.0.tgz",
- "integrity": "sha512-xiYght50cvoODZYI43v3Ylsqiw14+D7ELsgzR40boDZaya1HFa1Etnv9MDkQE8X/UrXAffwv2AcNAhslgYuDTw==",
+ "version": "10.6.2",
+ "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-10.6.2.tgz",
+ "integrity": "sha512-FjkoFjyvUQWcBo1F3RgSglky3ar0+qHLM41PlFVYB4Bj3RD8E/Mv7kqMouLFBU+3aFglMzzctAIWRwajEuueSw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "^2.2.5",
- "rc-util": "^5.27.0"
+ "rc-util": "^5.36.0"
},
"engines": {
"node": ">=8.x"
@@ -4987,6 +5029,7 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-6.0.1.tgz",
"integrity": "sha512-lKHL+Sny0SeHkQKKDJlAjV5oZ8DwCdS2hFhAkIjuQt1/pB81M0cA0ErVFdHq9+jmPmFw1vJB2F5NBzFXLJxV+g==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.16.7",
"classnames": "^2.2.3",
@@ -5004,6 +5047,7 @@
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-4.1.0.tgz",
"integrity": "sha512-TI8ufP2Az9oEbvyCeVE4+90PDSljGyuwix3fV58p7HV2o4wBnVToEyomJRVyTaZeqNPAp+vqeo4Wnj5u0ZZQBg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.21.0",
"classnames": "^2.2.1",
@@ -5015,9 +5059,10 @@
}
},
"node_modules/rc-table": {
- "version": "7.42.0",
- "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.42.0.tgz",
- "integrity": "sha512-GwHV9Zs3HvWxBkoXatO/IeKoElzy3Ojf3dcyw1Rj3cyQVb+ZHtexslKdyzsrKRPJ0mUa62BoX+ZAg3zgTEql8w==",
+ "version": "7.45.5",
+ "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.45.5.tgz",
+ "integrity": "sha512-R5sOfToOk7CalSkebZpqM8lkKWOJR7uXPGEhjjTSoj5egyHBwMxaACoPj2oI+6qLSll9yZrG5K+8HTN57b2Ahg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"@rc-component/context": "^1.4.0",
@@ -5035,9 +5080,10 @@
}
},
"node_modules/rc-tabs": {
- "version": "14.1.1",
- "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-14.1.1.tgz",
- "integrity": "sha512-5nOr9PVpJy2SWHTLgv1+kESDOb0tFzl0cYU9r9d8LfL0Wg9i/n1B558rmkxdQHgBwMqxmwoyPSAbQROxMQe8nw==",
+ "version": "15.0.0",
+ "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-15.0.0.tgz",
+ "integrity": "sha512-7m541VcEiJSpHZmosMZNMIhemxtIN+f0WDhZNyXQ1/cZ40aaWsknlbj0FH6HryLoKEQvBnCI89hgQuT7MBSOBA==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.11.2",
"classnames": "2.x",
@@ -5059,6 +5105,7 @@
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/rc-textarea/-/rc-textarea-1.6.3.tgz",
"integrity": "sha512-8k7+8Y2GJ/cQLiClFMg8kUXOOdvcFQrnGeSchOvI2ZMIVvX5a3zQpLxoODL0HTrvU63fPkRmMuqaEcOF9dQemA==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "^2.2.1",
@@ -5075,6 +5122,7 @@
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.2.0.tgz",
"integrity": "sha512-iS/3iOAvtDh9GIx1ulY7EFUXUtktFccNLsARo3NPgLf0QW9oT0w3dA9cYWlhqAKmD+uriEwdWz1kH0Qs4zk2Aw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.11.2",
"@rc-component/trigger": "^2.0.0",
@@ -5089,6 +5137,7 @@
"version": "5.8.5",
"resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.8.5.tgz",
"integrity": "sha512-PRfcZtVDNkR7oh26RuNe1hpw11c1wfgzwmPFL0lnxGnYefe9lDAO6cg5wJKIAwyXFVt5zHgpjYmaz0CPy1ZtKg==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "2.x",
@@ -5105,9 +5154,10 @@
}
},
"node_modules/rc-tree-select": {
- "version": "5.19.0",
- "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-5.19.0.tgz",
- "integrity": "sha512-f4l5EsmSGF3ggj76YTzKNPY9SnXfFaer7ZccTSGb3urUf54L+cCqyT+UsPr+S5TAr8mZSxJ7g3CgkCe+cVQ6sw==",
+ "version": "5.20.0",
+ "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-5.20.0.tgz",
+ "integrity": "sha512-zFtkHx5/6PnXSi3oSbBSFbIPiJJQdpSU3qz/joLe75URgvxmTHi989O8MtMgpwyZwrCMOJpGi6L1uy+13uzZPw==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.10.1",
"classnames": "2.x",
@@ -5124,6 +5174,7 @@
"version": "4.5.2",
"resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-4.5.2.tgz",
"integrity": "sha512-QO3ne77DwnAPKFn0bA5qJM81QBjQi0e0NHdkvpFyY73Bea2NfITiotqJqVjHgeYPOJu5lLVR32TNGP084aSoXA==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.18.3",
"classnames": "^2.2.5",
@@ -5153,9 +5204,10 @@
"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
},
"node_modules/rc-virtual-list": {
- "version": "3.11.4",
- "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.11.4.tgz",
- "integrity": "sha512-NbBi0fvyIu26gP69nQBiWgUMTPX3mr4FcuBQiVqagU0BnuX8WQkiivnMs105JROeuUIFczLrlgUhLQwTWV1XDA==",
+ "version": "3.11.5",
+ "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.11.5.tgz",
+ "integrity": "sha512-iZRW99m5jAxtwKNPLwUrPryurcnKpXBdTyhuBp6ythf7kg/otKO5cCiIvL55GQwU0QGSlouQS0tnkciRMJUwRQ==",
+ "dev": true,
"dependencies": {
"@babel/runtime": "^7.20.0",
"classnames": "^2.2.6",
@@ -5286,7 +5338,8 @@
"node_modules/resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
- "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+ "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
+ "dev": true
},
"node_modules/resolve": {
"version": "2.0.0-next.5",
@@ -5493,6 +5546,7 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.1.0.tgz",
"integrity": "sha512-49oNpRjWRvnU8NyGVmUaYG4jtTkNonFZI86MmGRDqBphEK2EXT9gdEUoQPZhuBM8yWHxCWbobltqYO5M4XrUvQ==",
+ "dev": true,
"dependencies": {
"compute-scroll-into-view": "^3.0.2"
}
@@ -5662,7 +5716,8 @@
"node_modules/string-convert": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
- "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A=="
+ "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==",
+ "dev": true
},
"node_modules/string-width": {
"version": "7.1.0",
@@ -5822,9 +5877,10 @@
}
},
"node_modules/stylis": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz",
- "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ=="
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz",
+ "integrity": "sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==",
+ "dev": true
},
"node_modules/supports-color": {
"version": "7.2.0",
@@ -5860,6 +5916,7 @@
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.0.tgz",
"integrity": "sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==",
+ "dev": true,
"engines": {
"node": ">=12.22"
}
@@ -5903,7 +5960,8 @@
"node_modules/toggle-selection": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
- "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="
+ "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==",
+ "dev": true
},
"node_modules/type-check": {
"version": "0.4.0",
diff --git a/package.json b/package.json
index e201860..d4c1252 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"prepare": "husky install"
},
"dependencies": {
- "antd": "^5.15.4",
+ "@ant-design/icons": "^5.3.7",
"axios": "^1.6.7",
"bootstrap": "^5.3.3",
"react": "^18.2.0",
@@ -24,13 +24,13 @@
"react-router-dom": "^6.21.3"
},
"devDependencies": {
- "antd": "^5.15.4",
"@playwright/test": "^1.42.1",
"@testing-library/react": "^14.1.2",
"@types/node": "^20.11.9",
- "@types/react": "^18.2.43",
- "@types/react-dom": "^18.2.17",
+ "@types/react": "^18.3.1",
+ "@types/react-dom": "^18.3.0",
"@vitejs/plugin-react-swc": "^3.5.0",
+ "antd": "^5.17.0",
"eslint": "^8.55.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
diff --git a/src/App.jsx b/src/App.jsx
index f5dd98f..3b636e6 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -4,12 +4,18 @@ import { Authenticated } from "./components";
import { Router } from "./router";
import Navbar from "./components/nav/Navbar";
+import AppLayout from "./components/app-layout";
+import { PageTitleProvider } from "./hooks/page-title-context";
const App = () => (
-
-
- {/* */}
-
+
+
+
+
+
+
+
+
);
export default App;
diff --git a/src/api/room.js b/src/api/room.js
index 2e10903..dbecae2 100644
--- a/src/api/room.js
+++ b/src/api/room.js
@@ -1,10 +1,14 @@
import axios from "axios";
+
+
export const getRoom = async () => {
- try {
- const response = await axios.get("/room", {});
- return response.data;
- } catch (error) {
- return error.response.data;
- }
+ try {
+ const response = await axios.get("/room", {});
+ console.log(response.data)
+ return response.data;
+ } catch (error) {
+ console.log("ERROR", error.response.data)
+ return error.response.data;
+ }
};
diff --git a/src/components/app-layout.jsx b/src/components/app-layout.jsx
new file mode 100644
index 0000000..71e9da2
--- /dev/null
+++ b/src/components/app-layout.jsx
@@ -0,0 +1,49 @@
+import React, { useState } from 'react';
+import { Layout, Menu, theme, Button } from 'antd';
+import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons';
+import { Router } from '../router';
+import { usePageTitle } from '../hooks/page-title-context';
+import Navbar from './nav/Navbar';
+const { Header, Content, Footer, Sider } = Layout;
+
+
+
+
+
+
+
+
+const AppLayout = ({ navbar, footer }) => {
+ const [collapsed, setCollapsed] = useState(false);
+ const { pageTitle } = usePageTitle();
+ const {
+ token: { colorBgContainer, borderRadiusLG },
+ } = theme.useToken();
+
+ return (
+
+
+
+
+
+
+
+ : } onClick={() => setCollapsed(!collapsed)} style={{fontSize: '16px', width: 64, height: 64}}/>
+ {pageTitle}
+
+
+
+
+
+
+
+
+
+
+ );
+};
+export default AppLayout;
\ No newline at end of file
diff --git a/src/components/nav/Navbar.jsx b/src/components/nav/Navbar.jsx
index 9fb8914..767cecb 100644
--- a/src/components/nav/Navbar.jsx
+++ b/src/components/nav/Navbar.jsx
@@ -1,83 +1,55 @@
-import React, { useState } from "react";
-import { Authenticated } from "..";
-import { Router } from "../../router";
-
-import {
- AppstoreOutlined,
- ContainerOutlined,
- DesktopOutlined,
- MailOutlined,
- MenuFoldOutlined,
- MenuUnfoldOutlined,
- PieChartOutlined,
-} from "@ant-design/icons";
-import { Button, Menu } from "antd";
+import React, { useState, useEffect } from "react";
+import { HomeOutlined } from '@ant-design/icons-svg';
+import { Menu } from "antd";
import { Home } from "../../pages";
import { getRoom } from "../../api/room";
-import { getAuth, useAuth } from "../../hooks";
-function getItem(label, key, icon, children, type) {
+function getItem(label, key, type, icon, children) {
return {
- key,
- icon,
- children,
- label,
- type,
+ key: String(key),
+ icon,
+ children,
+ label,
+ type,
};
}
// Component
const Navbar = () => {
//Hook calls
- const [collapsed, setCollapsed] = useState(false);
- const toggleCollapsed = () => {
- setCollapsed(!collapsed);
- };
- const [rooms, setRooms] = useState([]);
+ const [rooms, setRooms] = useState([]);
useEffect(() => {
- if (user) {
- getRoom().then((result) => {
+ if (true) {
+ getRoom().then((result) => {
setRooms(result);
});
}
}, []);
- const items = [
- getItem("Menu principal", "1", ),
- getItem("Vue d'ensemble", "2", ),
- getItem("Chambres", "3", , [
- rooms.forEach((room, i = 0) => {
- i++;
- getItem(room.name, `sub${i}`, );
- }),
- ]),
- ];
+ const roomItems = rooms.map((room, index) => (
+ getItem(room.name, `sub${index}`, )
+ ));
- // Rendering
- return (
-
-
-
-
- );
+ const items = [
+ getItem("Menu principal", "1", ),
+ getItem("Vue d'ensemble", "2", ),
+ {
+ key: "3",
+ label: "Chambres",
+ icon: "",
+ children: roomItems, // Utilisation des éléments de menu des chambres
+ },
+ ];
+
+ // Rendu du composant Navbar
+ return (
+
+ );
};
export default Navbar;
diff --git a/src/hooks/index.js b/src/hooks/index.js
index b15186c..3b24088 100644
--- a/src/hooks/index.js
+++ b/src/hooks/index.js
@@ -1,2 +1,3 @@
export * from "./use-auth";
export * from "./use-query";
+export * from "./page-title-context";
diff --git a/src/hooks/page-title-context.jsx b/src/hooks/page-title-context.jsx
new file mode 100644
index 0000000..0ca13e6
--- /dev/null
+++ b/src/hooks/page-title-context.jsx
@@ -0,0 +1,23 @@
+import { createContext, useContext, useState } from 'react';
+
+const PageTitleContext = createContext();
+
+// Composant de fournisseur de titre de page
+export const PageTitleProvider = ({ children }) => {
+ const [pageTitle, setPageTitle] = useState("");
+
+ return (
+
+ {children}
+
+ );
+};
+
+// Hook pour récupérer le titre de la page
+export const usePageTitle = () => {
+ const context = useContext(PageTitleContext);
+ if (!context) {
+ throw new Error('usePageTitle must be used within a PageTitleProvider');
+ }
+ return context;
+};
diff --git a/src/hooks/use-auth.js b/src/hooks/use-auth.js
index aef1ae6..15ec11f 100644
--- a/src/hooks/use-auth.js
+++ b/src/hooks/use-auth.js
@@ -6,6 +6,6 @@ export function useAuth() {
return React.useContext(AuthenticationContext);
}
-export function getAuth() {
- return React.useContext(AuthenticationContext).user;
-}
+//export function getAuth() {
+// return React.useContext(AuthenticationContext).user;
+//}
diff --git a/src/pages/test.jsx b/src/pages/test.jsx
index 83a12c0..dee0bb7 100644
--- a/src/pages/test.jsx
+++ b/src/pages/test.jsx
@@ -1,14 +1,19 @@
-import React from "react";
+import React, { useEffect } from 'react';
import { useAuth } from "../hooks";
import { ItemPage } from "../components/item/ItemPage";
+import { usePageTitle } from '../hooks/page-title-context';
export const Test = () => {
const { user } = useAuth();
+ const { setPageTitle } = usePageTitle();
+ // Mettre à jour le titre de la page dans le contexte
+ useEffect(() => {
+ setPageTitle("Vive la macronie à bat montjoie saint dennis");
+ }, [setPageTitle]);
return (
-
Vive la macronie à bat montjoie saint dennis
);