diff --git a/.gitignore b/.gitignore
index 4d29575..680c904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
+package-lock.json
diff --git a/package-lock.json b/package-lock.json
index 11e980d..be1bb07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,8 +39,9 @@
}
},
"node_modules/@adobe/css-tools": {
- "version": "4.0.1",
- "license": "MIT"
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
+ "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="
},
"node_modules/@ampproject/remapping": {
"version": "2.2.0",
@@ -54,10 +55,12 @@
}
},
"node_modules/@babel/code-frame": {
- "version": "7.18.6",
- "license": "MIT",
+ "version": "7.22.13",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+ "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
"dependencies": {
- "@babel/highlight": "^7.18.6"
+ "@babel/highlight": "^7.22.13",
+ "chalk": "^2.4.2"
},
"engines": {
"node": ">=6.9.0"
@@ -138,11 +141,13 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.20.4",
- "license": "MIT",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+ "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
"dependencies": {
- "@babel/types": "^7.20.2",
+ "@babel/types": "^7.23.0",
"@jridgewell/gen-mapping": "^0.3.2",
+ "@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
},
"engines": {
@@ -263,8 +268,9 @@
}
},
"node_modules/@babel/helper-environment-visitor": {
- "version": "7.18.9",
- "license": "MIT",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+ "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
"engines": {
"node": ">=6.9.0"
}
@@ -280,21 +286,23 @@
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.19.0",
- "license": "MIT",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
"dependencies": {
- "@babel/template": "^7.18.10",
- "@babel/types": "^7.19.0"
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-hoist-variables": {
- "version": "7.18.6",
- "license": "MIT",
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+ "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
"dependencies": {
- "@babel/types": "^7.18.6"
+ "@babel/types": "^7.22.5"
},
"engines": {
"node": ">=6.9.0"
@@ -405,25 +413,28 @@
}
},
"node_modules/@babel/helper-split-export-declaration": {
- "version": "7.18.6",
- "license": "MIT",
+ "version": "7.22.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+ "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
"dependencies": {
- "@babel/types": "^7.18.6"
+ "@babel/types": "^7.22.5"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-string-parser": {
- "version": "7.19.4",
- "license": "MIT",
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+ "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.19.1",
- "license": "MIT",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
"engines": {
"node": ">=6.9.0"
}
@@ -461,11 +472,12 @@
}
},
"node_modules/@babel/highlight": {
- "version": "7.18.6",
- "license": "MIT",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+ "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
"dependencies": {
- "@babel/helper-validator-identifier": "^7.18.6",
- "chalk": "^2.0.0",
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "chalk": "^2.4.2",
"js-tokens": "^4.0.0"
},
"engines": {
@@ -473,8 +485,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.20.3",
- "license": "MIT",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+ "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -1711,29 +1724,31 @@
}
},
"node_modules/@babel/template": {
- "version": "7.18.10",
- "license": "MIT",
+ "version": "7.22.15",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+ "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
"dependencies": {
- "@babel/code-frame": "^7.18.6",
- "@babel/parser": "^7.18.10",
- "@babel/types": "^7.18.10"
+ "@babel/code-frame": "^7.22.13",
+ "@babel/parser": "^7.22.15",
+ "@babel/types": "^7.22.15"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/traverse": {
- "version": "7.20.1",
- "license": "MIT",
- "dependencies": {
- "@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.20.1",
- "@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.19.0",
- "@babel/helper-hoist-variables": "^7.18.6",
- "@babel/helper-split-export-declaration": "^7.18.6",
- "@babel/parser": "^7.20.1",
- "@babel/types": "^7.20.0",
+ "version": "7.23.2",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+ "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+ "dependencies": {
+ "@babel/code-frame": "^7.22.13",
+ "@babel/generator": "^7.23.0",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
+ "@babel/helper-hoist-variables": "^7.22.5",
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/parser": "^7.23.0",
+ "@babel/types": "^7.23.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -1742,11 +1757,12 @@
}
},
"node_modules/@babel/types": {
- "version": "7.20.2",
- "license": "MIT",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+ "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
"dependencies": {
- "@babel/helper-string-parser": "^7.19.4",
- "@babel/helper-validator-identifier": "^7.19.1",
+ "@babel/helper-string-parser": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
},
"engines": {
@@ -5958,14 +5974,19 @@
"license": "MIT"
},
"node_modules/daisyui": {
- "version": "2.41.0",
- "license": "MIT",
+ "version": "2.52.0",
+ "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-2.52.0.tgz",
+ "integrity": "sha512-LQTA5/IVXAJHBMFoeaEMfd7/akAFPPcdQPR3O9fzzcFiczneJFM73CFPnScmW2sOgn/D83cvkP854ep2T9OfTg==",
"dependencies": {
"color": "^4.2",
"css-selector-tokenizer": "^0.8.0",
"postcss-js": "^4.0.0",
"tailwindcss": "^3"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/daisyui"
+ },
"peerDependencies": {
"autoprefixer": "^10.0.2",
"postcss": "^8.1.6"
@@ -11161,8 +11182,15 @@
}
},
"node_modules/nanoid": {
- "version": "3.3.4",
- "license": "MIT",
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -11739,7 +11767,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.19",
+ "version": "8.4.31",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+ "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"funding": [
{
"type": "opencollective",
@@ -11748,11 +11778,14 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
}
],
- "license": "MIT",
"dependencies": {
- "nanoid": "^3.3.4",
+ "nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
@@ -15942,7 +15975,9 @@
},
"dependencies": {
"@adobe/css-tools": {
- "version": "4.0.1"
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz",
+ "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="
},
"@ampproject/remapping": {
"version": "2.2.0",
@@ -15952,9 +15987,12 @@
}
},
"@babel/code-frame": {
- "version": "7.18.6",
+ "version": "7.22.13",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+ "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
"requires": {
- "@babel/highlight": "^7.18.6"
+ "@babel/highlight": "^7.22.13",
+ "chalk": "^2.4.2"
}
},
"@babel/compat-data": {
@@ -16006,10 +16044,13 @@
}
},
"@babel/generator": {
- "version": "7.20.4",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+ "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
"requires": {
- "@babel/types": "^7.20.2",
+ "@babel/types": "^7.23.0",
"@jridgewell/gen-mapping": "^0.3.2",
+ "@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
},
"dependencies": {
@@ -16090,7 +16131,9 @@
}
},
"@babel/helper-environment-visitor": {
- "version": "7.18.9"
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+ "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
},
"@babel/helper-explode-assignable-expression": {
"version": "7.18.6",
@@ -16099,16 +16142,20 @@
}
},
"@babel/helper-function-name": {
- "version": "7.19.0",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
"requires": {
- "@babel/template": "^7.18.10",
- "@babel/types": "^7.19.0"
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
}
},
"@babel/helper-hoist-variables": {
- "version": "7.18.6",
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+ "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
"requires": {
- "@babel/types": "^7.18.6"
+ "@babel/types": "^7.22.5"
}
},
"@babel/helper-member-expression-to-functions": {
@@ -16177,16 +16224,22 @@
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.18.6",
+ "version": "7.22.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+ "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
"requires": {
- "@babel/types": "^7.18.6"
+ "@babel/types": "^7.22.5"
}
},
"@babel/helper-string-parser": {
- "version": "7.19.4"
+ "version": "7.22.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+ "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
},
"@babel/helper-validator-identifier": {
- "version": "7.19.1"
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
},
"@babel/helper-validator-option": {
"version": "7.18.6"
@@ -16209,15 +16262,19 @@
}
},
"@babel/highlight": {
- "version": "7.18.6",
+ "version": "7.22.20",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+ "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
"requires": {
- "@babel/helper-validator-identifier": "^7.18.6",
- "chalk": "^2.0.0",
+ "@babel/helper-validator-identifier": "^7.22.20",
+ "chalk": "^2.4.2",
"js-tokens": "^4.0.0"
}
},
"@babel/parser": {
- "version": "7.20.3"
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+ "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
"version": "7.18.6",
@@ -16899,33 +16956,39 @@
}
},
"@babel/template": {
- "version": "7.18.10",
+ "version": "7.22.15",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+ "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
"requires": {
- "@babel/code-frame": "^7.18.6",
- "@babel/parser": "^7.18.10",
- "@babel/types": "^7.18.10"
+ "@babel/code-frame": "^7.22.13",
+ "@babel/parser": "^7.22.15",
+ "@babel/types": "^7.22.15"
}
},
"@babel/traverse": {
- "version": "7.20.1",
- "requires": {
- "@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.20.1",
- "@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.19.0",
- "@babel/helper-hoist-variables": "^7.18.6",
- "@babel/helper-split-export-declaration": "^7.18.6",
- "@babel/parser": "^7.20.1",
- "@babel/types": "^7.20.0",
+ "version": "7.23.2",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+ "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+ "requires": {
+ "@babel/code-frame": "^7.22.13",
+ "@babel/generator": "^7.23.0",
+ "@babel/helper-environment-visitor": "^7.22.20",
+ "@babel/helper-function-name": "^7.23.0",
+ "@babel/helper-hoist-variables": "^7.22.5",
+ "@babel/helper-split-export-declaration": "^7.22.6",
+ "@babel/parser": "^7.23.0",
+ "@babel/types": "^7.23.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
},
"@babel/types": {
- "version": "7.20.2",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+ "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
"requires": {
- "@babel/helper-string-parser": "^7.19.4",
- "@babel/helper-validator-identifier": "^7.19.1",
+ "@babel/helper-string-parser": "^7.22.5",
+ "@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
}
},
@@ -19478,7 +19541,9 @@
"version": "3.1.1"
},
"daisyui": {
- "version": "2.41.0",
+ "version": "2.52.0",
+ "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-2.52.0.tgz",
+ "integrity": "sha512-LQTA5/IVXAJHBMFoeaEMfd7/akAFPPcdQPR3O9fzzcFiczneJFM73CFPnScmW2sOgn/D83cvkP854ep2T9OfTg==",
"requires": {
"color": "^4.2",
"css-selector-tokenizer": "^0.8.0",
@@ -22635,7 +22700,9 @@
}
},
"nanoid": {
- "version": "3.3.4"
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
},
"natural-compare": {
"version": "1.4.0"
@@ -22960,9 +23027,11 @@
}
},
"postcss": {
- "version": "8.4.19",
+ "version": "8.4.31",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+ "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"requires": {
- "nanoid": "^3.3.4",
+ "nanoid": "^3.3.6",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
}
diff --git a/src/App.js b/src/App.js
index 43c63d3..fbeff4b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,9 +1,11 @@
-import React, { lazy, useEffect } from 'react'
import './App.css';
-import { BrowserRouter as Router, Route, Routes, Navigate } from 'react-router-dom'
-import { themeChange } from 'theme-change'
+
+import { Navigate, Route, BrowserRouter as Router, Routes } from 'react-router-dom'
+import React, { lazy, useEffect } from 'react'
+
import checkAuth from './app/auth';
import initializeApp from './app/init';
+import { themeChange } from 'theme-change'
// Importing pages
const Layout = lazy(() => import('./containers/Layout'))
@@ -20,6 +22,7 @@ initializeApp()
// Check for login and initialize axios
const token = checkAuth()
+console.log('dang o app');
function App() {
@@ -37,11 +40,11 @@ function App() {
{labelTitle}
-
)
}
diff --git a/src/components/Input/SelectBox.js b/src/components/Input/SelectBox.js
index 2bf1474..967c24a 100644
--- a/src/components/Input/SelectBox.js
+++ b/src/components/Input/SelectBox.js
@@ -1,19 +1,16 @@
+import React, { useEffect, useState } from 'react'
+import InformationCircleIcon from '@heroicons/react/24/outline/InformationCircleIcon'
import axios from 'axios'
import capitalize from 'capitalize-the-first-letter'
-import React, { useState, useEffect } from 'react'
-import InformationCircleIcon from '@heroicons/react/24/outline/InformationCircleIcon'
-
function SelectBox(props) {
const { labelTitle, labelDescription, defaultValue, containerStyle, placeholder, labelStyle, options, updateFormValue, nameKey } = props
- const [value, setValue] = useState(defaultValue || (options.length > 0 ? options[0][nameKey] : '2222'))
+ const [value, setValue] = useState(defaultValue || (options.length > 0 ? options[0][nameKey] : 'PLACEHOLDER'))
useEffect(() => {
- console.log(labelTitle);
- console.log(options);
updateFormValue(value)
}, [])
diff --git a/src/containers/ModalLayout.js b/src/containers/ModalLayout.js
index 36dd96f..6bc8771 100644
--- a/src/containers/ModalLayout.js
+++ b/src/containers/ModalLayout.js
@@ -1,12 +1,16 @@
-import { useEffect } from 'react'
-import { MODAL_BODY_TYPES } from '../utils/globalConstantUtil'
-import { useSelector, useDispatch } from 'react-redux'
-import { closeModal } from '../features/common/modalSlice'
+import { useDispatch, useSelector } from 'react-redux'
+
+import AddCommuneModalBody from '../features/commune/components/AddCommuneModalBody'
+import AddDistrictModalBody from '../features/district/components/AddDistrictModalBody'
import AddLeadModalBody from '../features/leads/components/AddLeadModalBody'
-import ConfirmationModalBody from '../features/common/components/ConfirmationModalBody'
+import AddManagerModalBody from '../features/detailOrganization/components/AddManagerModalBody'
+import AddMemberModalBody from '../features/members/components/addMemberModalBody'
+import AddMemberToOrg from '../features/detailOrganization/components/AddMemberToOrg'
import AddProvinceModalBody from '../features/transactions/components/AddProvinceModalBody'
-import AddDistrictModalBody from '../features/district/components/AddDistrictModalBody'
-
+import ConfirmationModalBody from '../features/common/components/ConfirmationModalBody'
+import { MODAL_BODY_TYPES } from '../utils/globalConstantUtil'
+import { closeModal } from '../features/common/modalSlice'
+import { useEffect } from 'react'
function ModalLayout() {
@@ -39,6 +43,10 @@ function ModalLayout() {
[MODAL_BODY_TYPES.PROVINCE_ADD_NEW]:
}[bodyType]
}
diff --git a/src/features/common/components/ConfirmationModalBody.js b/src/features/common/components/ConfirmationModalBody.js
index 2537d72..a9dde96 100644
--- a/src/features/common/components/ConfirmationModalBody.js
+++ b/src/features/common/components/ConfirmationModalBody.js
@@ -1,15 +1,18 @@
+import { CONFIRMATION_MODAL_CLOSE_TYPES, MODAL_CLOSE_TYPES } from '../../../utils/globalConstantUtil'
+import { deleteMember, updateMember } from '../../members/memberSlice'
import { useDispatch, useSelector } from 'react-redux'
+
import axios from 'axios'
-import { CONFIRMATION_MODAL_CLOSE_TYPES, MODAL_CLOSE_TYPES } from '../../../utils/globalConstantUtil'
import { deleteLead } from '../../leads/leadSlice'
-import { showNotification } from '../headerSlice'
+import { deleteManager } from '../../detailOrganization/managerSlice'
import { deleteOrganization } from '../../transactions/OrganizationSlice'
+import { showNotification } from '../headerSlice'
function ConfirmationModalBody({ extraObject, closeModal }) {
const dispatch = useDispatch()
- const { message, type, _id, index } = extraObject
+ const { message, type, _id, index, updateObject } = extraObject
const proceedWithYes = async () => {
@@ -43,6 +46,78 @@ function ConfirmationModalBody({ extraObject, closeModal }) {
);
}
}
+ else if (type === CONFIRMATION_MODAL_CLOSE_TYPES.MEMBER_DELETE) {
+ try {
+
+ await dispatch(deleteMember(index));
+ dispatch(
+ showNotification({
+ message: 'Xóa thành viên thành công',
+ status: 1,
+ })
+ );
+ }
+ catch (err) {
+ console.log(err);
+ dispatch(
+ showNotification({
+ message: 'Xóa thành viên không thành công',
+ status: 0,
+ })
+ );
+ }
+ }
+ else if (type === CONFIRMATION_MODAL_CLOSE_TYPES.MEMBER_OUT_ORGANIZATION) {
+
+ dispatch(deleteManager(index)).unwrap()
+ .catch(err => {
+ dispatch(
+ showNotification({
+ message: 'Có lỗi khi xóa quyền quản lý của thành viên này',
+ status: 0,
+ })
+ );
+ return;
+ })
+ dispatch(updateMember({ memberID: index, member: updateObject })).unwrap()
+ .then((res) => {
+ dispatch(
+ showNotification({
+ message: 'Xóa thành viên khỏi hội thành công',
+ status: 1,
+ })
+ );
+ })
+ .catch(err => {
+ console.log(err);
+ dispatch(
+ showNotification({
+ message: 'Xóa thành viên không thành công',
+ status: 0,
+ })
+ );
+ })
+ }
+ else if (type === CONFIRMATION_MODAL_CLOSE_TYPES.MANAGER_DELETE) {
+ dispatch(deleteManager(index)).unwrap()
+ .then(() => {
+ dispatch(
+ showNotification({
+ message: 'Xóa quyền quản lý thành công',
+ status: 1,
+ })
+ );
+ })
+ .catch(err => {
+ console.log(err);
+ dispatch(
+ showNotification({
+ message: 'Xóa quyền quản lý không thành công',
+ status: 0,
+ })
+ );
+ })
+ }
closeModal()
}
diff --git a/src/features/commune/SelectedDistrictSlice.js b/src/features/commune/SelectedDistrictSlice.js
new file mode 100644
index 0000000..0d3453d
--- /dev/null
+++ b/src/features/commune/SelectedDistrictSlice.js
@@ -0,0 +1,16 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const SelectedDistrictSlice = createSlice({
+ name: 'SelectedDistrict',
+ initialState: {
+ selectedDistrict: null
+ },
+ reducers: {
+ setSelectedDistrict: (state, action) => {
+ state.selectedDistrict = action.payload;
+ }
+ }
+})
+
+export const { setSelectedDistrict } = SelectedDistrictSlice.actions;
+export default SelectedDistrictSlice.reducer;
\ No newline at end of file
diff --git a/src/features/commune/components/AddCommuneModalBody.js b/src/features/commune/components/AddCommuneModalBody.js
new file mode 100644
index 0000000..51cf86d
--- /dev/null
+++ b/src/features/commune/components/AddCommuneModalBody.js
@@ -0,0 +1,90 @@
+import React, { useEffect } from 'react'
+import { createOrganization, getOrganization } from '../../transactions/OrganizationSlice';
+import { useDispatch, useSelector } from 'react-redux'
+
+import ErrorText from '../../../components/Typography/ErrorText';
+import InputText from '../../../components/Input/InputText';
+import SelectBox from '../../../components/Input/SelectBox';
+import { closeModal } from '../../common/modalSlice';
+import organizationApi from '../../../api/OrganizationAPI';
+import { showNotification } from '../../common/headerSlice';
+import { useState } from 'react';
+
+const INITIAL_COMMUNE_OBJ = {
+ parentID: '',
+ name: ''
+}
+const AddCommuneModalBody = ({ closeModal }) => {
+ const dispatch = useDispatch();
+ const [errorMessage, setErrorMessage] = useState("")
+ const [communeObj, setCommuneObj] = useState(INITIAL_COMMUNE_OBJ)
+ const [selectedProvince, setSelectedProvince] = useState(null)
+ const { orgs } = useSelector(state => state.org)
+ const provs = orgs.filter(t => t.type === 'tinh')
+ const districts = orgs.filter(t => t.parentID === selectedProvince)
+
+ console.log(communeObj);
+ useEffect(() => {
+ dispatch(getOrganization())
+ }, [])
+ const saveNewCommune = () => {
+ if (communeObj.name.trim() === "") return setErrorMessage("Hãy điền tên xã")
+ else if (communeObj.parentID === "PLACEHOLDER" && selectedProvince === "PLACEHOLDER") return setErrorMessage("Hãy chọn đầy đủ các trường")
+ else {
+ //Call API to Add Province Organization
+ console.log(communeObj.parentID);
+ let newCommuneObj = {
+ ...communeObj,
+ type: "xa"
+ }
+ dispatch(createOrganization(newCommuneObj))
+ dispatch(showNotification({ message: "Thêm xã mới thành công", status: 1 }))
+ closeModal()
+
+
+ }
+ }
+
+ const updateFormValue = ({ updateType, value }) => {
+ setErrorMessage("");
+ setCommuneObj({ ...communeObj, [updateType]: value });
+ }
+
+ const updateDistrictValue = (value) => {
+ setCommuneObj({ ...communeObj, parentID: value })
+ }
+ const updateProvinceValue = (value) => {
+
+ setSelectedProvince(value)
+
+ }
+
+ return (
+ <>
+ {errorMessage}
+
+ closeModal()}>Cancel
+ saveNewCommune()}>Save
+
+
+ )
+}
+
+export default AddCommuneModalBody
\ No newline at end of file
diff --git a/src/features/commune/index.js b/src/features/commune/index.js
index 7180782..60b1d5f 100644
--- a/src/features/commune/index.js
+++ b/src/features/commune/index.js
@@ -1,8 +1,151 @@
+import { useDispatch, useSelector } from 'react-redux';
+
+import { CONFIRMATION_MODAL_CLOSE_TYPES } from '../../utils/globalConstantUtil';
+import { Link } from 'react-router-dom';
+import { MODAL_BODY_TYPES } from '../../utils/globalConstantUtil';
import React from 'react'
+import SearchBar from '../../components/Input/SearchBar';
+import SelectBox from '../../components/Input/SelectBox';
+import TitleCard from '../../components/Cards/TitleCard';
+import TrashIcon from '@heroicons/react/24/outline/TrashIcon';
+import { getMember } from '../members/memberSlice';
+import { getOrganization } from '../transactions/OrganizationSlice';
+import { openModal } from '../common/modalSlice';
+import { setSelectedDistrict } from './SelectedDistrictSlice';
+import { useEffect } from 'react';
+import { useState } from 'react';
+
+const TopSideButtons = ({ removeFilter, applyFilter, applySearch }) => {
+ const dispatch = useDispatch();
+ const { orgs, isLoading } = useSelector(state => state.org)
+ const [selectedProvince, setSelectedProvince] = useState(null)
+ const provs = orgs.filter(org => org.type === 'tinh')
+ const districts = orgs.filter(org => org.parentID === selectedProvince)
+ const [searchText, setSearchText] = useState("")
+
+ console.log(selectedProvince);
+ useEffect(() => {
+ dispatch(getOrganization())
+ }, [])
+
+ const handleSearchChange = (searchText) => {
+ setSearchText(searchText)
+ applySearch(searchText)
+ }
+
+ const AddNewDistrictModal = () => {
+ dispatch(openModal({ title: 'Thêm đơn vị xã', bodyType: MODAL_BODY_TYPES.COMMUNE_ADD_NEW }))
+ }
+
+ const handleSelectProvince = (value) => {
+ setSelectedProvince(value);
+ };
+
+ const handleSelectDistrict = value => {
+ dispatch(setSelectedDistrict(value))
+ }
+
+
+
+
+ return (
+
+ AddNewDistrictModal()}>Thêm đơn vị xã
+
+ )
+}
const Commune = () => {
+
+ const dispatch = useDispatch()
+ const { selectedDistrict } = useSelector(state => state.selectedDistrict)
+ const { orgs, isLoading } = useSelector(state => state.org)
+ const communes = orgs.filter(org => org.parentID === selectedDistrict)
+ const { members } = useSelector(state => state.member)
+ const [searchText, setSearchText] = useState("")
+
+
+ useEffect(() => {
+ dispatch(getOrganization())
+ dispatch(getMember())
+ }, [])
+
+ const countChild = (orgId) => {
+ return orgs.filter(o => o.parentID === orgId).length
+ }
+
+ const countMember = (orgId) => {
+ return members.filter(m => m.currentOrganizationID === orgId).length
+ }
+
+ isLoading ? document.body.classList.add('loading-indicator') : document.body.classList.remove('loading-indicator')
+
+ const deleteCurrentOrganization = (index) => {
+ dispatch(openModal({
+ title: "Xác nhận", bodyType: MODAL_BODY_TYPES.CONFIRMATION,
+ extraObject: { message: `Xóa hội này cũng sẽ xóa các hội trực thuộc nó, bạn có muốn xóa không ?`, type: CONFIRMATION_MODAL_CLOSE_TYPES.ORGANIZATION_DELETE, index: index }
+ }))
+ }
+
+ const applySearch = (searchText) => {
+ setSearchText(searchText)
+ }
return (
- This is fkin COMMUNES
+ <>
+
+
+
+
+ Tên huyện
+ Số hội con
+ Số thành viên
+
+
+
+ {
+ communes.filter((t) => { return searchText === "" || t.name.toLowerCase().includes(searchText.toLowerCase()) }).map((l, k) => {
+ return (
+
+
+
+ {countChild(l.orgID)}
+ {countMember(l.orgID)}
+ deleteCurrentOrganization(l.orgID)}>
+ )
+ })
+ }
+
+
+
+ return (
+
-
{icon}
+
{icon}
{title}
-
{value}
+
{value}
{description}
diff --git a/src/features/detailOrganization/components/AddManagerModalBody.js b/src/features/detailOrganization/components/AddManagerModalBody.js
new file mode 100644
index 0000000..7717b04
--- /dev/null
+++ b/src/features/detailOrganization/components/AddManagerModalBody.js
@@ -0,0 +1,72 @@
+import ErrorText from '../../../components/Typography/ErrorText';
+import React from 'react'
+import SearchBar from '../../../components/Input/SearchBar';
+import SelectBox from '../../../components/Input/SelectBox';
+import { createManager } from '../managerSlice';
+import organizationApi from '../../../api/OrganizationAPI';
+import { showNotification } from '../../common/headerSlice';
+import { useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
+import { useState } from 'react';
+
+export const AddManagerModalBody = ({ extraObject, closeModal }) => {
+
+ const dispatch = useDispatch();
+ const { index } = extraObject;
+ const { members } = useSelector(state => state.member)
+ const memberInOrg = members.filter(m => m.currentOrganizationID === index)
+ const [selectedMember, setSelectedMember] = useState(null);
+ const [searchText, setSearchText] = useState("");
+ const [errorMessage, setErrorMessage] = useState("");
+
+
+ const handleSearchChange = (value) => {
+ setSearchText(value);
+ }
+ const updateFormValue = (value) => {
+ setSelectedMember(value)
+ }
+
+ const addManager = () => {
+ dispatch(createManager({ memberId: selectedMember, orgId: index })).unwrap()
+ .then((res) => {
+ closeModal();
+ dispatch(
+ showNotification({
+ message: 'Thêm quản lý thành công',
+ status: 1,
+ })
+ );
+ })
+ .catch((err) => {
+ setErrorMessage(err.error.errors[0].errorMessage)
+ dispatch(
+ showNotification({
+ message: 'Thêm quản lý không thành công',
+ status: 0,
+ })
+ );
+ })
+ }
+ return (
+ <>
+
+
{ return searchText === "" || m.name.toLowerCase().includes(searchText.toLowerCase()) })}
+ labelTitle="Các thành viên thuộc hội"
+ placeholder="Chọn thành viên"
+ containerStyle="w-full mt-4"
+ updateFormValue={updateFormValue}
+ nameKey='memberID'
+ />
+
+ {errorMessage}
+
+ closeModal()}>Hủy
+ addManager()}>LƯU
+
+
+
+ )
+}
+export default AddManagerModalBody;
\ No newline at end of file
diff --git a/src/features/detailOrganization/components/AddMemberToOrg.js b/src/features/detailOrganization/components/AddMemberToOrg.js
new file mode 100644
index 0000000..197ec96
--- /dev/null
+++ b/src/features/detailOrganization/components/AddMemberToOrg.js
@@ -0,0 +1,78 @@
+import React from 'react'
+import SelectBox from '../../../components/Input/SelectBox';
+import { useDispatch, useSelector } from 'react-redux';
+import { useState } from 'react';
+import SearchBar from '../../../components/Input/SearchBar';
+import ErrorText from '../../../components/Typography/ErrorText';
+import { updateMember } from '../../members/memberSlice';
+import { showNotification } from '../../common/headerSlice';
+
+export const AddMemberToOrg = ({ extraObject, closeModal }) => {
+
+ const dispatch = useDispatch();
+
+ const { index } = extraObject;
+ const { members } = useSelector(state => state.member)
+ const memberNotInOrg = members.filter(m => m.currentOrganizationID === null)
+ const [selectedMember, setSelectedMember] = useState(null);
+ const [searchText, setSearchText] = useState("");
+ const [errorMessage, setErrorMessage] = useState("");
+
+ const handleSearchChange = (value) => {
+ setSearchText(value);
+ }
+ const updateFormValue = (value) => {
+ setSelectedMember(value)
+ }
+
+ const saveNewMember = () => {
+ if (selectedMember === 'PLACEHOLDER') return setErrorMessage("Hãy chọn người muốn thêm")
+ else {
+ let updateObject = {
+ ...memberNotInOrg.find(m => m.memberID === selectedMember),
+ currentOrganizationID: index
+ }
+ dispatch(updateMember({ memberID: selectedMember, member: updateObject })).unwrap()
+ .then((res) => {
+ closeModal();
+ dispatch(
+ showNotification({
+ message: 'Thêm thành viên thành công',
+ status: 1,
+ })
+ );
+ })
+ .catch(err => {
+ closeModal();
+ console.log(err);
+ dispatch(
+ showNotification({
+ message: 'Thêm thành viên không thành công',
+ status: 0,
+ })
+ );
+ })
+ }
+ }
+ return (
+ <>
+ { return searchText === "" || m.name.toLowerCase().includes(searchText.toLowerCase()) })}
+ labelTitle="Các thành viên chưa có hội"
+ placeholder="Chọn thành viên"
+ containerStyle="w-full mt-4"
+ updateFormValue={updateFormValue}
+ nameKey='memberID'
+ />
+
+ {errorMessage}
+
+ closeModal()}>Hủy
+ saveNewMember()}>LƯU
+
+
+ )
+
+}
+export default AddMemberToOrg
diff --git a/src/features/detailOrganization/index.js b/src/features/detailOrganization/index.js
new file mode 100644
index 0000000..b5e4d36
--- /dev/null
+++ b/src/features/detailOrganization/index.js
@@ -0,0 +1,169 @@
+import { CONFIRMATION_MODAL_CLOSE_TYPES, MODAL_BODY_TYPES } from '../../utils/globalConstantUtil'
+import { getMember, updateMember } from '../members/memberSlice'
+import { useDispatch, useSelector } from 'react-redux'
+import { useParams, useSearchParams } from 'react-router-dom'
+
+import ArrowDownTrayIcon from '@heroicons/react/24/outline/ArrowDownTrayIcon'
+import CheckIcon from '@heroicons/react/24/outline/CheckIcon'
+import DashboardStats from '../dashboard/components/DashboardStats'
+import HandRaisedIcon from '@heroicons/react/24/outline/HandRaisedIcon'
+import { ORGANIZATION_TYPE } from '../../utils/globalConstantUtil'
+import React from 'react'
+import TitleCard from '../../components/Cards/TitleCard'
+import TrashIcon from '@heroicons/react/24/outline/TrashIcon'
+import User from '@heroicons/react/24/outline/UserIcon'
+import UserGroupIcon from '@heroicons/react/24/outline/UserGroupIcon'
+import { getManagerById } from './managerSlice'
+import { getOrganization } from '../transactions/OrganizationSlice'
+import { openModal } from '../common/modalSlice'
+import organizationApi from '../../api/OrganizationAPI'
+import { useEffect } from 'react'
+import { useState } from 'react'
+
+export const DetailOrganization = () => {
+
+ const dispatch = useDispatch()
+ const param = useParams();
+ var typeInTitle = ""
+
+ const { orgs, isLoading } = useSelector(state => state.org)
+ const { members } = useSelector(state => state.member)
+ const { managers } = useSelector(state => state.manager)
+ const org = orgs.find(o => o.orgID === param.id)
+ const memberList = members.filter(mem => mem.currentOrganizationID === param.id)
+ switch (param.type) {
+ case ORGANIZATION_TYPE.PROVINCE:
+ typeInTitle = "tỉnh"
+ break;
+ case ORGANIZATION_TYPE.DISTRICT:
+ typeInTitle = "huyện"
+ break;
+ case ORGANIZATION_TYPE.COMMUNE:
+ typeInTitle = "xã"
+ break;
+ default:
+ break;
+ }
+ useEffect(() => {
+ dispatch(getOrganization());
+ dispatch(getMember());
+ dispatch(getManagerById(param.id));
+ }, [])
+
+ isLoading ? document.body.classList.add('loading-indicator') : document.body.classList.remove('loading-indicator')
+
+
+ const deleteCurrentMember = (memberID, member) => {
+ let updateMember = { ...member, currentOrganizationID: null }
+ dispatch(openModal({
+ title: "Xác nhận", bodyType: MODAL_BODY_TYPES.CONFIRMATION,
+ extraObject: { message: `Bạn có chắc muốn xóa thành viên này khỏi hội không ?`, type: CONFIRMATION_MODAL_CLOSE_TYPES.MEMBER_OUT_ORGANIZATION, index: memberID, updateObject: updateMember }
+ }))
+
+ }
+
+ const AddNewMemberToOrg = () => {
+ dispatch(openModal({
+ title: 'Thêm thành viên vào hội', bodyType: MODAL_BODY_TYPES.MEMBER_ADD_ORGANIZATION,
+ extraObject: { index: param.id }
+ }))
+ }
+
+ const addManager = () => {
+ dispatch(openModal({
+ title: 'Cấp quyền quản lý cho thành viên', bodyType: MODAL_BODY_TYPES.MANAGER_ADD_NEW,
+ extraObject: { index: param.id }
+ }))
+ }
+
+ const deleterManager = (managerId) => {
+ dispatch(openModal({
+ title: "Xác nhận", bodyType: MODAL_BODY_TYPES.CONFIRMATION,
+ extraObject: { message: `Bạn có chắc muốn xóa quyền quản lý của thành viên này không ?`, type: CONFIRMATION_MODAL_CLOSE_TYPES.MANAGER_DELETE, index: managerId }
+ }))
+ }
+
+ const checkManagerIsMember = (managerId) => {
+ return memberList.find(m => m.memberID === managerId)
+ }
+ return (
+ <>
+
+
+
+
+ AddNewMemberToOrg()}>Thêm thành viên
+
+ addManager()}>Thêm quản lý
+
+
+
+
+
+
+ {/* head */}
+
+
+ Tên
+ SĐT
+ Xóa khỏi hội
+
+
+
+ {
+ memberList.map((m, index) => {
+ return (
+
+ {index + 1}
+ {m.name}
+ {m.phoneNumber}
+ deleteCurrentMember(m.memberID, m)}>
+ )
+ })
+ }
+
+
+
+
+ {/* head */}
+
+
+ Tên
+ Quản lý gián tiếp
+ Xóa quyền quản lý
+
+
+
+ {
+
+ managers.map((m, index) => {
+ let isMember = checkManagerIsMember(m.memberID)
+ return (
+
+ {index + 1}
+ {m.name}
+ {!isMember &&
+ deleterManager(m.memberID)}>
+ )
+ })
+ }
+
+
+
+
+
+
+ )
+}
+
+export default DetailOrganization
\ No newline at end of file
diff --git a/src/features/detailOrganization/managerSlice.js b/src/features/detailOrganization/managerSlice.js
new file mode 100644
index 0000000..33c0c7c
--- /dev/null
+++ b/src/features/detailOrganization/managerSlice.js
@@ -0,0 +1,91 @@
+import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
+
+import organizationApi from "../../api/OrganizationAPI";
+
+export const getManagerById = createAsyncThunk('manager/contents', async (orgId, thunkAPI) => {
+
+ try {
+ const response = await organizationApi.getManagerList(orgId);
+ return response.data;
+ } catch (error) {
+ return thunkAPI.rejectWithValue(error);
+ }
+})
+
+export const createManager = createAsyncThunk('manager/create', async (value, thunkAPI) => {
+ try {
+ const response = await organizationApi.createManager(value.orgId, value.memberId)
+ return response.data;
+ } catch (error) {
+ return thunkAPI.rejectWithValue(error.response.data);
+ }
+})
+
+export const deleteManager = createAsyncThunk('manager/delete', async (value, thunkAPI) => {
+ try {
+ const response = await organizationApi.deleteManager(value)
+ return value;
+ } catch (error) {
+ return thunkAPI.rejectWithValue(error.response.data);
+ }
+})
+// export const createManager = createAsyncThunk('manager/create', async(value,thunkAPI) => {
+// try {
+// const response = await organizationApi.(value.orgId, value.memberId)
+// return response.data;
+// } catch (error) {
+// thunkAPI.rejectWithValue(error);
+// }
+// })
+
+export const managerSlice = createSlice({
+ name: 'manager',
+ initialState: {
+ isLoading: false,
+ managers: []
+ },
+ extraReducers: {
+
+ [getManagerById.pending]: (state, action) => {
+ state.isLoading = true
+ },
+ [getManagerById.rejected]: (state, action) => {
+ state.isLoading = false
+ },
+ [getManagerById.fulfilled]: (state, action) => {
+ state.isLoading = false
+ state.managers = action.payload
+ },
+
+
+
+ [createManager.pending]: (state, action) => {
+ state.isLoading = true
+ },
+ [createManager.rejected]: (state, action) => {
+ state.isLoading = false
+ },
+ [createManager.fulfilled]: (state, action) => {
+ state.isLoading = false
+ state.managers.push(action.payload)
+ },
+
+
+
+
+ [deleteManager.pending]: (state, action) => {
+ state.isLoading = true
+ },
+ [deleteManager.rejected]: (state, action) => {
+ state.isLoading = false
+ },
+ [deleteManager.fulfilled]: (state, action) => {
+ state.isLoading = false
+ state.managers = state.managers.filter(m => m.memberID !== action.payload)
+ },
+ }
+
+
+})
+
+export default managerSlice.reducer;
\ No newline at end of file
diff --git a/src/features/district/index.js b/src/features/district/index.js
index bc79350..4ac94f2 100644
--- a/src/features/district/index.js
+++ b/src/features/district/index.js
@@ -1,17 +1,19 @@
-import React from 'react'
-import { useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
-import { openModal } from '../common/modalSlice';
+
+import { CONFIRMATION_MODAL_CLOSE_TYPES } from '../../utils/globalConstantUtil';
+import { Link } from 'react-router-dom';
import { MODAL_BODY_TYPES } from '../../utils/globalConstantUtil';
-import { useEffect } from 'react';
+import React from 'react'
import SearchBar from '../../components/Input/SearchBar';
-import TitleCard from '../../components/Cards/TitleCard';
import SelectBox from '../../components/Input/SelectBox';
+import TitleCard from '../../components/Cards/TitleCard';
+import TrashIcon from '@heroicons/react/24/outline/TrashIcon';
+import { getMember } from '../members/memberSlice';
import { getOrganization } from '../transactions/OrganizationSlice';
+import { openModal } from '../common/modalSlice';
import { setSelectedProvince } from './SelectedProvSlice';
-import TrashIcon from '@heroicons/react/24/outline/TrashIcon';
-import { CONFIRMATION_MODAL_CLOSE_TYPES } from '../../utils/globalConstantUtil';
-
+import { useEffect } from 'react';
+import { useState } from 'react';
const TopSideButtons = ({ removeFilter, applyFilter, applySearch }) => {
const dispatch = useDispatch();
@@ -22,12 +24,13 @@ const TopSideButtons = ({ removeFilter, applyFilter, applySearch }) => {
useEffect(() => {
dispatch(getOrganization())
+ dispatch(getMember())
}, [])
-
- useEffect(() => {
+ const handleSearchChange = (searchText) => {
+ setSearchText(searchText)
applySearch(searchText)
- }, [searchText])
+ }
const AddNewDistrictModal = () => {
dispatch(openModal({ title: 'Thêm đơn vị huyện', bodyType: MODAL_BODY_TYPES.DISTRICT_ADD_NEW }))
@@ -51,7 +54,7 @@ const TopSideButtons = ({ removeFilter, applyFilter, applySearch }) => {
/>
AddNewDistrictModal()}>Thêm đơn vị huyện
-
Tên huyện
- Người quản lý
+ Số hội con
+ Số thành viên
{
- filterdSearchDistrictOrg.map((l, k) => {
+ districtOrg.filter((t) => { return searchText === "" || t.name.toLowerCase().includes(searchText.toLowerCase()) }).map((l, k) => {
return (
-
- {l.name}
+
+
- {l.type}
+ {countChild(l.orgID)}
+ {countMember(l.orgID)}
deleteCurrentOrganization(l.orgID)}>
)
diff --git a/src/features/integration/index.js b/src/features/integration/index.js
index 22c8e87..f0233e3 100644
--- a/src/features/integration/index.js
+++ b/src/features/integration/index.js
@@ -5,16 +5,16 @@ import { showNotification } from "../common/headerSlice"
const INITIAL_INTEGRATION_LIST = [
- {name : "Slack", icon : "https://cdn-icons-png.flaticon.com/512/2111/2111615.png", isActive : true, description : "Slack is an instant messaging program designed by Slack Technologies and owned by Salesforce."},
- {name : "Facebook", icon : "https://cdn-icons-png.flaticon.com/512/124/124010.png", isActive : false, description : "Meta Platforms, Inc., doing business as Meta and formerly named Facebook, Inc., and TheFacebook."},
- {name : "Linkedin", icon : "https://cdn-icons-png.flaticon.com/512/174/174857.png", isActive : true, description : "LinkedIn is a business and employment-focused social media platform that works through websites and mobile apps."},
- {name : "Google Ads", icon : "https://cdn-icons-png.flaticon.com/512/2301/2301145.png", isActive : false, description : "Google Ads is an online advertising platform developed by Google, where advertisers bid to display brief advertisements, service offerings"},
- {name : "Gmail", icon : "https://cdn-icons-png.flaticon.com/512/5968/5968534.png", isActive : false, description : "Gmail is a free email service provided by Google. As of 2019, it had 1.5 billion active users worldwide."},
- {name : "Salesforce", icon : "https://cdn-icons-png.flaticon.com/512/5968/5968880.png", isActive : false, description : "It provides customer relationship management software and applications focused on sales, customer service, marketing automation."},
- {name : "Hubspot", icon : "https://cdn-icons-png.flaticon.com/512/5968/5968872.png", isActive : false, description : "American developer and marketer of software products for inbound marketing, sales, and customer service."},
+ { name: "Slack", icon: "https://cdn-icons-png.flaticon.com/512/2111/2111615.png", isActive: true, description: "Slack is an instant messaging program designed by Slack Technologies and owned by Salesforce." },
+ { name: "Facebook", icon: "https://cdn-icons-png.flaticon.com/512/124/124010.png", isActive: false, description: "Meta Platforms, Inc., doing business as Meta and formerly named Facebook, Inc., and TheFacebook." },
+ { name: "Linkedin", icon: "https://cdn-icons-png.flaticon.com/512/174/174857.png", isActive: true, description: "LinkedIn is a business and employment-focused social media platform that works through websites and mobile apps." },
+ { name: "Google Ads", icon: "https://cdn-icons-png.flaticon.com/512/2301/2301145.png", isActive: false, description: "Google Ads is an online advertising platform developed by Google, where advertisers bid to display brief advertisements, service offerings" },
+ { name: "Gmail", icon: "https://cdn-icons-png.flaticon.com/512/5968/5968534.png", isActive: false, description: "Gmail is a free email service provided by Google. As of 2019, it had 1.5 billion active users worldwide." },
+ { name: "Salesforce", icon: "https://cdn-icons-png.flaticon.com/512/5968/5968880.png", isActive: false, description: "It provides customer relationship management software and applications focused on sales, customer service, marketing automation." },
+ { name: "Hubspot", icon: "https://cdn-icons-png.flaticon.com/512/5968/5968872.png", isActive: false, description: "American developer and marketer of software products for inbound marketing, sales, and customer service." },
]
-function Integration(){
+function Integration() {
const dispatch = useDispatch()
@@ -24,34 +24,34 @@ function Integration(){
const updateIntegrationStatus = (index) => {
let integration = integrationList[index]
setIntegrationList(integrationList.map((i, k) => {
- if(k===index)return {...i, isActive : !i.isActive}
+ if (k === index) return { ...i, isActive: !i.isActive }
return i
}))
- dispatch(showNotification({message : `${integration.name} ${integration.isActive ? "disabled" : "enabled"}` , status : 1}))
+ dispatch(showNotification({ message: `${integration.name} ${integration.isActive ? "disabled" : "enabled"}`, status: 1 }))
}
- return(
+ return (
<>
- {
- integrationList.map((i, k) => {
- return(
-
-
-
-
-
-
-
-
- )
-
- })
- }
+ {
+ integrationList.map((i, k) => {
+ return (
+
+
+
+
+
+
+
+
+ )
+
+ })
+ }
+
+ Thêm vào hội
+
+
+
+ {
+ isAddToOrg && (
+
+
+
+ )
+
+
+ }
+
+ {
+ isAddToOrg && {
+ 1:
+ }[activeButton]
+ }
+
+
+
+
+
+
+
+
+ {errorMessage}
+
+
+
+ closeModal()}>Cancel
+ saveNewMember()}>Save
+
+
+ )
+}
+export default AddMemberModalBody;
\ No newline at end of file
diff --git a/src/features/members/index.js b/src/features/members/index.js
new file mode 100644
index 0000000..ee5c9aa
--- /dev/null
+++ b/src/features/members/index.js
@@ -0,0 +1,114 @@
+import moment from "moment"
+import { useEffect } from "react"
+import { useDispatch, useSelector } from "react-redux"
+import TitleCard from "../../components/Cards/TitleCard"
+import { openModal } from "../common/modalSlice"
+import { CONFIRMATION_MODAL_CLOSE_TYPES, MODAL_BODY_TYPES } from '../../utils/globalConstantUtil'
+import TrashIcon from '@heroicons/react/24/outline/TrashIcon'
+import { showNotification } from '../common/headerSlice'
+import { getMember } from "./memberSlice"
+import { formatDateTime } from "./util"
+import { getOrganization } from "../transactions/OrganizationSlice"
+import { Await } from "react-router-dom"
+
+const sourceImg = "https://vnn-imgs-a1.vgcloud.vn/icdn.dantri.com.vn/2021/05/26/ngo-ngang-voi-ve-dep-cua-hot-girl-anh-the-chua-tron-18-docx-1622043349706.jpeg"
+
+const TopSideButtons = () => {
+
+ const dispatch = useDispatch()
+
+ const openAddNewMemberModal = () => {
+ dispatch(openModal({ title: 'Thêm thành viên', bodyType: MODAL_BODY_TYPES.MEMBER_ADD_NEW }))
+ }
+
+ return (
+
+ openAddNewMemberModal()}>Thêm thành viên
+
+ )
+}
+
+
+
+const Members = () => {
+
+ const dispatch = useDispatch()
+ const { members, isLoading } = useSelector(state => state.member)
+ const { orgs } = useSelector(state => state.org)
+ useEffect(() => {
+ dispatch(getOrganization())
+ dispatch(getMember())
+ }, [])
+
+
+
+ isLoading ? document.body.classList.add('loading-indicator') : document.body.classList.remove('loading-indicator')
+ const getMemberOrganization = (currentOrganization) => {
+ if (orgs) {
+ return orgs.find(org => org.orgID === currentOrganization).name;
+
+ }
+ }
+
+ const deleteCurrentMember = (index) => {
+ dispatch(openModal({
+ title: "Xác nhận", bodyType: MODAL_BODY_TYPES.CONFIRMATION,
+ extraObject: { message: `Bạn có chắc muốn xóa thành viên này không ?`, type: CONFIRMATION_MODAL_CLOSE_TYPES.MEMBER_DELETE, index: index }
+ }))
+ }
+
+
+ return (
+ <>
+
+
+
+
+ Tên
+ Ngày tham gia
+ Trạng thái
+ Hội
+
+
+
+ {
+ members.map((l, k) => {
+ return (
+
+
+
+
+
+
+
+
+
+
+ {formatDateTime(l.joinDate)}
+
+
+ {
+ l.currentOrganizationID === null ? Chưa có hội
+ : Đã có hội
+ }
+
+ {l.currentOrganizationID === null ? "" : getMemberOrganization(l.currentOrganizationID)}
+ deleteCurrentMember(l.memberID)}>
+ )
+ })
+ }
+
+
+
Tên tỉnh
- Người quản lý
+ Số hội con
+ Số thành viên
@@ -99,21 +104,26 @@ function Transactions() {
{
filteredProvs.map((l, k) => {
return (
-
-
- {l.name}
-
+
+
+ {l.type}
- deleteCurrentOrganization(l.orgID)}> {countChild(l.orgID)}
+ {countMember(l.orgID)}
+ deleteCurrentOrganization(l.orgID)}>
+
)
})
}
-
+
)
}
diff --git a/src/features/user/Login.js b/src/features/user/Login.js
index cc480c3..48f065d 100644
--- a/src/features/user/Login.js
+++ b/src/features/user/Login.js
@@ -1,9 +1,9 @@
-import { useState, useRef } from 'react'
-import { Link } from 'react-router-dom'
-import LandingIntro from './LandingIntro'
+import { useRef, useState } from 'react'
+
import ErrorText from '../../components/Typography/ErrorText'
import InputText from '../../components/Input/InputText'
-
+import LandingIntro from './LandingIntro'
+import { Link } from 'react-router-dom'
import userApi from '../../api/userApi'
function Login() {
@@ -27,8 +27,8 @@ function Login() {
var myData;
e.preventDefault()
setErrorMessage("")
- if (loginObj.emailId.trim() === "") return setErrorMessage("Email Id is required! (use any value)")
- if (loginObj.password.trim() === "") return setErrorMessage("Password is required! (use any value)")
+ if (loginObj.emailId.trim() === "") return setErrorMessage("Hãy nhập tài khoản")
+ if (loginObj.password.trim() === "") return setErrorMessage("Hãy nhập mật khẩu")
checkCredential().then(res => {
if (res.data.success === false) {
return setErrorMessage("Tài khoản và mật khẩu không hợp lệ")
@@ -37,6 +37,7 @@ function Login() {
setLoading(true)
// Call API to check user credentials and save token in localstorage
localStorage.setItem("token", res.data.data)
+ console.log(res.data.data);
setLoading(false)
window.location.href = '/app/welcome'
}
diff --git a/src/index.js b/src/index.js
index c6c53d9..df50b52 100644
--- a/src/index.js
+++ b/src/index.js
@@ -15,7 +15,7 @@ root.render(