diff --git a/.eslintrc.json b/.eslintrc.json
index 938f6f49b..6391c1326 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -51,6 +51,7 @@
{
"files": ["*.ts", "*.tsx"],
"extends": [
+ "plugin:import/typescript",
"xo-typescript"
],
"rules": {
diff --git a/package-lock.json b/package-lock.json
index b90f21228..e9c91ec21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -423,9 +423,9 @@
}
},
"@popperjs/core": {
- "version": "2.9.3",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz",
- "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ=="
+ "version": "2.10.1",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.1.tgz",
+ "integrity": "sha512-HnUhk1Sy9IuKrxEMdIRCxpIqPw6BFsbYSEUO9p/hNw5sMld/+3OLMWQP80F8/db9qsv3qUjs7ZR5bS/R+iinXw=="
},
"@rollup/plugin-typescript": {
"version": "8.2.5",
@@ -519,13 +519,13 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
- "version": "4.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz",
- "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==",
+ "version": "4.30.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz",
+ "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "4.29.0",
- "@typescript-eslint/scope-manager": "4.29.0",
+ "@typescript-eslint/experimental-utils": "4.30.0",
+ "@typescript-eslint/scope-manager": "4.30.0",
"debug": "^4.3.1",
"functional-red-black-tree": "^1.0.1",
"regexpp": "^3.1.0",
@@ -534,55 +534,55 @@
}
},
"@typescript-eslint/experimental-utils": {
- "version": "4.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz",
- "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==",
+ "version": "4.30.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz",
+ "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.7",
- "@typescript-eslint/scope-manager": "4.29.0",
- "@typescript-eslint/types": "4.29.0",
- "@typescript-eslint/typescript-estree": "4.29.0",
+ "@typescript-eslint/scope-manager": "4.30.0",
+ "@typescript-eslint/types": "4.30.0",
+ "@typescript-eslint/typescript-estree": "4.30.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
}
},
"@typescript-eslint/parser": {
- "version": "4.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz",
- "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==",
+ "version": "4.30.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz",
+ "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "4.29.0",
- "@typescript-eslint/types": "4.29.0",
- "@typescript-eslint/typescript-estree": "4.29.0",
+ "@typescript-eslint/scope-manager": "4.30.0",
+ "@typescript-eslint/types": "4.30.0",
+ "@typescript-eslint/typescript-estree": "4.30.0",
"debug": "^4.3.1"
}
},
"@typescript-eslint/scope-manager": {
- "version": "4.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz",
- "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==",
+ "version": "4.30.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz",
+ "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "4.29.0",
- "@typescript-eslint/visitor-keys": "4.29.0"
+ "@typescript-eslint/types": "4.30.0",
+ "@typescript-eslint/visitor-keys": "4.30.0"
}
},
"@typescript-eslint/types": {
- "version": "4.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz",
- "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==",
+ "version": "4.30.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz",
+ "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "4.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz",
- "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==",
+ "version": "4.30.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz",
+ "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "4.29.0",
- "@typescript-eslint/visitor-keys": "4.29.0",
+ "@typescript-eslint/types": "4.30.0",
+ "@typescript-eslint/visitor-keys": "4.30.0",
"debug": "^4.3.1",
"globby": "^11.0.3",
"is-glob": "^4.0.1",
@@ -591,12 +591,12 @@
}
},
"@typescript-eslint/visitor-keys": {
- "version": "4.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz",
- "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==",
+ "version": "4.30.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz",
+ "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "4.29.0",
+ "@typescript-eslint/types": "4.30.0",
"eslint-visitor-keys": "^2.0.0"
}
},
@@ -931,23 +931,54 @@
"dev": true
},
"autoprefixer": {
- "version": "10.3.1",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.1.tgz",
- "integrity": "sha512-L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A==",
+ "version": "10.3.4",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.4.tgz",
+ "integrity": "sha512-EKjKDXOq7ug+jagLzmnoTRpTT0q1KVzEJqrJd0hCBa7FiG0WbFOBCcJCy2QkW1OckpO3qgttA1aWjVbeIPAecw==",
"dev": true,
"requires": {
- "browserslist": "^4.16.6",
- "caniuse-lite": "^1.0.30001243",
- "colorette": "^1.2.2",
+ "browserslist": "^4.16.8",
+ "caniuse-lite": "^1.0.30001252",
+ "colorette": "^1.3.0",
"fraction.js": "^4.1.1",
"normalize-range": "^0.1.2",
"postcss-value-parser": "^4.1.0"
},
"dependencies": {
+ "browserslist": {
+ "version": "4.16.8",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
+ "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
+ "dev": true,
+ "requires": {
+ "caniuse-lite": "^1.0.30001251",
+ "colorette": "^1.3.0",
+ "electron-to-chromium": "^1.3.811",
+ "escalade": "^3.1.1",
+ "node-releases": "^1.1.75"
+ }
+ },
"caniuse-lite": {
- "version": "1.0.30001245",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz",
- "integrity": "sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==",
+ "version": "1.0.30001254",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001254.tgz",
+ "integrity": "sha512-GxeHOvR0LFMYPmFGA+NiTOt9uwYDxB3h154tW2yBYwfz2EMX3i1IBgr6gmJGfU0K8KQsqPa5XqLD8zVdP5lUzA==",
+ "dev": true
+ },
+ "colorette": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+ "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==",
+ "dev": true
+ },
+ "electron-to-chromium": {
+ "version": "1.3.830",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz",
+ "integrity": "sha512-gBN7wNAxV5vl1430dG+XRcQhD4pIeYeak6p6rjdCtlz5wWNwDad8jwvphe5oi1chL5MV6RNRikfffBBiFuj+rQ==",
+ "dev": true
+ },
+ "node-releases": {
+ "version": "1.1.75",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+ "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==",
"dev": true
}
}
@@ -1299,32 +1330,6 @@
"get-intrinsic": "^1.0.2"
}
},
- "caller-callsite": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
- "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
- "dev": true,
- "requires": {
- "callsites": "^2.0.0"
- },
- "dependencies": {
- "callsites": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
- "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
- "dev": true
- }
- }
- },
- "caller-path": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
- "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
- "dev": true,
- "requires": {
- "caller-callsite": "^2.0.0"
- }
- },
"callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -1375,9 +1380,9 @@
"dev": true
},
"chart.js": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.0.tgz",
- "integrity": "sha512-J1a4EAb1Gi/KbhwDRmoovHTRuqT8qdF0kZ4XgwxpGethJHUdDrkqyPYwke0a+BuvSeUxPf8Cos6AX2AB8H8GLA=="
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz",
+ "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ=="
},
"chokidar": {
"version": "3.5.2",
@@ -1710,46 +1715,6 @@
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true
},
- "cosmiconfig": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
- "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
- "dev": true,
- "requires": {
- "import-fresh": "^2.0.0",
- "is-directory": "^0.3.1",
- "js-yaml": "^3.13.1",
- "parse-json": "^4.0.0"
- },
- "dependencies": {
- "import-fresh": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
- "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
- "dev": true,
- "requires": {
- "caller-path": "^2.0.0",
- "resolve-from": "^3.0.0"
- }
- },
- "parse-json": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
- "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
- "dev": true,
- "requires": {
- "error-ex": "^1.3.1",
- "json-parse-better-errors": "^1.0.1"
- }
- },
- "resolve-from": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
- "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
- "dev": true
- }
- }
- },
"cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -2406,54 +2371,48 @@
}
},
"eslint-config-xo": {
- "version": "0.37.0",
- "resolved": "https://registry.npmjs.org/eslint-config-xo/-/eslint-config-xo-0.37.0.tgz",
- "integrity": "sha512-aOCZ4fDELnhdojORvV5GcyxrjOzDH75UMkRlRD5/eGVekA5PfTiQjW0/E3Tqa4zCnEgB77PO7JCRWhB8dEv7xg==",
+ "version": "0.38.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-xo/-/eslint-config-xo-0.38.0.tgz",
+ "integrity": "sha512-G2jL+VyfkcZW8GoTmqLsExvrWssBedSoaQQ11vyhflDeT3csMdBVp0On+AVijrRuvgmkWeDwwUL5Rj0qDRHK6g==",
"dev": true,
"requires": {
"confusing-browser-globals": "1.0.10"
}
},
"eslint-config-xo-typescript": {
- "version": "0.43.0",
- "resolved": "https://registry.npmjs.org/eslint-config-xo-typescript/-/eslint-config-xo-typescript-0.43.0.tgz",
- "integrity": "sha512-8T4O7Dy4c5/TeOPxBOTw7DI8fgS+u5ni0xA6alcJDyiMCuBq7O+FUMsOkz2vAOQ3C3HMkYmkpAXA/gZFX4QUrg==",
+ "version": "0.44.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-xo-typescript/-/eslint-config-xo-typescript-0.44.0.tgz",
+ "integrity": "sha512-/mRj2KHHwnl3ZyM8vn68NSfRoEunkSYagWERGmNnU5UOLo4AY9jjBNZW+/sDOaPYuc5xzYmLxYspDCVCXKLGNQ==",
"dev": true,
"requires": {
"typescript": ">=4.3"
}
},
"eslint-import-resolver-node": {
- "version": "0.3.4",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
- "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+ "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
"dev": true,
"requires": {
- "debug": "^2.6.9",
- "resolve": "^1.13.1"
+ "debug": "^3.2.7",
+ "resolve": "^1.20.0"
},
"dependencies": {
"debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dev": true,
"requires": {
- "ms": "2.0.0"
+ "ms": "^2.1.1"
}
- },
- "ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "dev": true
}
}
},
"eslint-module-utils": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
- "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz",
+ "integrity": "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==",
"dev": true,
"requires": {
"debug": "^3.2.7",
@@ -2472,26 +2431,26 @@
}
},
"eslint-plugin-import": {
- "version": "2.23.4",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
- "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
+ "version": "2.24.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz",
+ "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
"dev": true,
"requires": {
"array-includes": "^3.1.3",
"array.prototype.flat": "^1.2.4",
"debug": "^2.6.9",
"doctrine": "^2.1.0",
- "eslint-import-resolver-node": "^0.3.4",
- "eslint-module-utils": "^2.6.1",
+ "eslint-import-resolver-node": "^0.3.6",
+ "eslint-module-utils": "^2.6.2",
"find-up": "^2.0.0",
"has": "^1.0.3",
- "is-core-module": "^2.4.0",
+ "is-core-module": "^2.6.0",
"minimatch": "^3.0.4",
- "object.values": "^1.1.3",
+ "object.values": "^1.1.4",
"pkg-up": "^2.0.0",
"read-pkg-up": "^3.0.0",
"resolve": "^1.20.0",
- "tsconfig-paths": "^3.9.0"
+ "tsconfig-paths": "^3.11.0"
},
"dependencies": {
"debug": {
@@ -2521,6 +2480,15 @@
"locate-path": "^2.0.0"
}
},
+ "is-core-module": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+ "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
+ "dev": true,
+ "requires": {
+ "has": "^1.0.3"
+ }
+ },
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -4094,14 +4062,14 @@
"dev": true
},
"gulp-postcss": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.0.tgz",
- "integrity": "sha512-5mSQ9CK8salSagrXgrVyILfEMy6I5rUGPRiR9rVjgJV9m/rwdZYUhekMr+XxDlApfc5ZdEJ8gXNZrU/TsgT5dQ==",
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz",
+ "integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==",
"dev": true,
"requires": {
"fancy-log": "^1.3.3",
"plugin-error": "^1.0.1",
- "postcss-load-config": "^2.1.1",
+ "postcss-load-config": "^3.0.0",
"vinyl-sourcemaps-apply": "^0.2.1"
}
},
@@ -4482,12 +4450,12 @@
"dev": true
},
"import-cwd": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
- "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
+ "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
"dev": true,
"requires": {
- "import-from": "^2.1.0"
+ "import-from": "^3.0.0"
}
},
"import-fresh": {
@@ -4501,18 +4469,18 @@
}
},
"import-from": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
- "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz",
+ "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==",
"dev": true,
"requires": {
- "resolve-from": "^3.0.0"
+ "resolve-from": "^5.0.0"
},
"dependencies": {
"resolve-from": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
- "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
"dev": true
}
}
@@ -4732,12 +4700,6 @@
}
}
},
- "is-directory": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
- "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
- "dev": true
- },
"is-extendable": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -5085,6 +5047,12 @@
"resolve": "^1.1.7"
}
},
+ "lilconfig": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.3.tgz",
+ "integrity": "sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg==",
+ "dev": true
+ },
"limiter": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
@@ -6591,13 +6559,14 @@
}
},
"postcss-load-config": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
- "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz",
+ "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==",
"dev": true,
"requires": {
- "cosmiconfig": "^5.0.0",
- "import-cwd": "^2.0.0"
+ "import-cwd": "^3.0.0",
+ "lilconfig": "^2.0.3",
+ "yaml": "^1.10.2"
}
},
"postcss-media-query-parser": {
@@ -7383,9 +7352,9 @@
}
},
"rollup": {
- "version": "2.56.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.56.0.tgz",
- "integrity": "sha512-weEafgbjbHCnrtJPNyCrhYnjP62AkF04P0BcV/1mofy1+gytWln4VVB1OK462cq2EAyWzRDpTMheSP/o+quoiA==",
+ "version": "2.56.3",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz",
+ "integrity": "sha512-Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg==",
"dev": true,
"requires": {
"fsevents": "~2.3.2"
@@ -7517,9 +7486,9 @@
"dev": true
},
"sass": {
- "version": "1.37.5",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz",
- "integrity": "sha512-Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA==",
+ "version": "1.39.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz",
+ "integrity": "sha512-F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0"
@@ -9120,9 +9089,9 @@
"dev": true
},
"tsconfig-paths": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
- "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+ "version": "3.11.0",
+ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz",
+ "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==",
"dev": true,
"requires": {
"@types/json5": "^0.0.29",
@@ -9183,9 +9152,9 @@
}
},
"typescript": {
- "version": "4.3.5",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
- "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz",
+ "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==",
"dev": true
},
"ua-parser-js": {
diff --git a/package.json b/package.json
index 3ccb84304..eb78b084c 100644
--- a/package.json
+++ b/package.json
@@ -36,23 +36,23 @@
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.4",
- "@popperjs/core": "^2.9.3",
+ "@popperjs/core": "^2.10.1",
"bootstrap": "^5.1.0",
- "chart.js": "^3.5.0",
+ "chart.js": "^3.5.1",
"overlayscrollbars": "^1.13.1"
},
"devDependencies": {
"@rollup/plugin-typescript": "^8.2.5",
- "@typescript-eslint/eslint-plugin": "^4.29.0",
- "@typescript-eslint/parser": "^4.29.0",
- "autoprefixer": "^10.3.1",
+ "@typescript-eslint/eslint-plugin": "^4.30.0",
+ "@typescript-eslint/parser": "^4.30.0",
+ "autoprefixer": "^10.3.4",
"browser-sync": "^2.27.5",
"bundlewatch": "^0.3.2",
"del": "^6.0.0",
"eslint": "^7.32.0",
- "eslint-config-xo": "^0.37.0",
- "eslint-config-xo-typescript": "^0.43.0",
- "eslint-plugin-import": "^2.23.4",
+ "eslint-config-xo": "^0.38.0",
+ "eslint-config-xo-typescript": "^0.44.0",
+ "eslint-plugin-import": "^2.24.2",
"eslint-plugin-unicorn": "^35.0.0",
"gulp": "^4.0.2",
"gulp-clean-css": "^4.3.0",
@@ -60,18 +60,18 @@
"gulp-file-include": "^2.3.0",
"gulp-if": "^3.0.0",
"gulp-npm-dist": "^1.0.3",
- "gulp-postcss": "^9.0.0",
+ "gulp-postcss": "^9.0.1",
"gulp-rename": "^2.0.0",
"gulp-sass": "^5.0.0",
"gulp-stylelint": "^13.0.0",
"lockfile-lint": "^4.6.2",
"npm-run-all": "^4.1.5",
"postcss": "^8.3.6",
- "rollup": "^2.56.0",
+ "rollup": "^2.56.3",
"rtlcss": "^3.3.0",
- "sass": "^1.37.5",
+ "sass": "^1.39.0",
"stylelint": "^13.13.1",
"stylelint-config-twbs-bootstrap": "^2.2.3",
- "typescript": "^4.3.5"
+ "typescript": "^4.4.2"
}
}
diff --git a/src/partials/dashboard/_topbar.html b/src/partials/dashboard/_topbar.html
index 03292f94d..09fae677c 100644
--- a/src/partials/dashboard/_topbar.html
+++ b/src/partials/dashboard/_topbar.html
@@ -6,10 +6,10 @@
-
+
Home
-
+
Contact
diff --git a/src/scss/_dropdown.scss b/src/scss/_dropdown.scss
index 346d5b6ea..0f4e28a0f 100644
--- a/src/scss/_dropdown.scss
+++ b/src/scss/_dropdown.scss
@@ -238,7 +238,7 @@
border-radius: 50%;
float: left;
height: $lte-sidebar-user-image-width;
- margin-right: 10px;
+ // margin-right: 10px;
margin-top: -2px;
width: $lte-sidebar-user-image-width;
}
diff --git a/src/ts/adminlte.ts b/src/ts/adminlte.ts
index 503bd55ed..8a3312c66 100644
--- a/src/ts/adminlte.ts
+++ b/src/ts/adminlte.ts
@@ -1,6 +1,5 @@
import Layout from './layout'
import PushMenu from './push-menu'
-import SidebarOverlay from './sidebar-overlay'
import Treeview from './treeview'
import DirectChat from './direct-chat'
import CardWidget from './card-widget'
@@ -8,7 +7,6 @@ import CardWidget from './card-widget'
export {
Layout,
PushMenu,
- SidebarOverlay,
Treeview,
DirectChat,
CardWidget,
diff --git a/src/ts/layout.ts b/src/ts/layout.ts
index 6ce5e4f45..b068d7d5a 100644
--- a/src/ts/layout.ts
+++ b/src/ts/layout.ts
@@ -58,8 +58,10 @@ class Layout {
domReady(() => {
const data = new Layout(document.body, Default)
data.holdTransition()
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
if (typeof OverlayScrollbars !== 'undefined') {
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
OverlayScrollbars(document.querySelectorAll(SELECTOR_SIDEBAR), { // eslint-disable-line new-cap
diff --git a/src/ts/push-menu.ts b/src/ts/push-menu.ts
index ce65b28ea..ad85a338e 100644
--- a/src/ts/push-menu.ts
+++ b/src/ts/push-menu.ts
@@ -25,6 +25,7 @@ const CLASS_NAME_SIDEBAR_OPENING = 'sidebar-is-opening'
const CLASS_NAME_SIDEBAR_COLLAPSING = 'sidebar-is-collapsing'
const CLASS_NAME_SIDEBAR_IS_HOVER = 'sidebar-is-hover'
const CLASS_NAME_MENU_OPEN = 'menu-open'
+const CLASS_NAME_LAYOUT_MOBILE = 'layout-mobile'
const SELECTOR_SIDEBAR = '.sidebar'
const SELECTOR_NAV_SIDEBAR = '.nav-sidebar'
@@ -32,6 +33,12 @@ const SELECTOR_NAV_ITEM = '.nav-item'
const SELECTOR_NAV_TREEVIEW = '.nav-treeview'
const SELECTOR_MINI_TOGGLE = '[data-lte-toggle="sidebar-mini"]'
const SELECTOR_FULL_TOGGLE = '[data-lte-toggle="sidebar-full"]'
+const SELECTOR_SIDEBAR_SM = `.${CLASS_NAME_LAYOUT_MOBILE}`
+const SELECTOR_CONTENT_WRAPPER = '.content-wrapper'
+
+const Defaults = {
+ onLayouMobile: 992,
+}
/**
* Class Definition
@@ -121,6 +128,32 @@ class PushMenu {
}
}
+ addSidebaBreakPoint(): void {
+ const bodyClass = document.body.classList
+ const widthOutput: number = window.innerWidth
+ if (widthOutput >= Defaults.onLayouMobile) {
+ bodyClass.remove(CLASS_NAME_LAYOUT_MOBILE)
+ } else {
+ bodyClass.add(CLASS_NAME_LAYOUT_MOBILE)
+ }
+ }
+
+ removeOverlaySidebar(): void {
+ const bodyClass = document.body.classList
+ if (bodyClass.contains(CLASS_NAME_LAYOUT_MOBILE)) {
+ bodyClass.remove(CLASS_NAME_SIDEBAR_OPEN)
+ bodyClass.remove(CLASS_NAME_SIDEBAR_COLLAPSE)
+ bodyClass.add(CLASS_NAME_SIDEBAR_CLOSE)
+ }
+ }
+
+ closeSidebar(): void {
+ const widthOutput: number = window.innerWidth
+ if (widthOutput < Defaults.onLayouMobile) {
+ document.body.classList.add(CLASS_NAME_SIDEBAR_CLOSE)
+ }
+ }
+
toggleFull(): void {
if (this._bodyClass.contains(CLASS_NAME_SIDEBAR_CLOSE)) {
this.expand()
@@ -148,7 +181,18 @@ class PushMenu {
}
init() {
+ this.addSidebaBreakPoint()
this.sidebarHover()
+
+ const selSidebarSm = document.querySelector(SELECTOR_SIDEBAR_SM)
+ const selContentWrapper = selSidebarSm?.querySelector(SELECTOR_CONTENT_WRAPPER)
+
+ if (selContentWrapper) {
+ selContentWrapper.addEventListener('touchstart', this.removeOverlaySidebar)
+ selContentWrapper.addEventListener('click', this.removeOverlaySidebar)
+ }
+
+ this.closeSidebar()
}
}
@@ -162,6 +206,10 @@ domReady(() => {
const data = new PushMenu(null, null)
data.init()
+ window.addEventListener('resize', () => {
+ data.init()
+ })
+
const fullBtn = document.querySelectorAll(SELECTOR_FULL_TOGGLE)
for (const btn of fullBtn) {
diff --git a/src/ts/sidebar-overlay.ts b/src/ts/sidebar-overlay.ts
deleted file mode 100644
index f30b475f7..000000000
--- a/src/ts/sidebar-overlay.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * --------------------------------------------
- * AdminLTE sidebar-overlay.ts
- * License MIT
- * --------------------------------------------
- */
-
-import {
- domReady,
-} from './util/index'
-
-/**
- * ------------------------------------------------------------------------
- * Constants
- * ------------------------------------------------------------------------
- */
-
-const CLASS_NAME_SIDEBAR_COLLAPSE = 'sidebar-collapse'
-const CLASS_NAME_SIDEBAR_CLOSE = 'sidebar-close'
-const CLASS_NAME_SIDEBAR_OPEN = 'sidebar-open'
-const CLASS_NAME_LAYOUT_MOBILE = 'layout-mobile'
-const CLASS_NAME_HEADER_MOBILE_OPEN = 'header-mobile-open'
-
-const SELECTOR_SIDEBAR_SM = `.${CLASS_NAME_LAYOUT_MOBILE}`
-const SELECTOR_CONTENT_WRAPPER = '.content-wrapper'
-
-const Defaults = {
- onLayouMobile: 992,
-}
-
-class SidebarOverlay {
- addSidebaBreakPoint(): void {
- const bodyClass = document.body.classList
- const widthOutput: number = window.innerWidth
- if (widthOutput >= Defaults.onLayouMobile) {
- bodyClass.remove(CLASS_NAME_LAYOUT_MOBILE)
- } else {
- bodyClass.add(CLASS_NAME_LAYOUT_MOBILE)
- }
- }
-
- removeOverlaySidebar(): void {
- const bodyClass = document.body.classList
- if (bodyClass.contains(CLASS_NAME_LAYOUT_MOBILE)) {
- bodyClass.remove(CLASS_NAME_SIDEBAR_OPEN)
- bodyClass.remove(CLASS_NAME_SIDEBAR_COLLAPSE)
- bodyClass.remove(CLASS_NAME_HEADER_MOBILE_OPEN)
- bodyClass.add(CLASS_NAME_SIDEBAR_CLOSE)
- }
- }
-
- closeSidebar(): void {
- const widthOutput: number = window.innerWidth
- if (widthOutput < Defaults.onLayouMobile) {
- document.body.classList.add(CLASS_NAME_SIDEBAR_CLOSE)
- }
- }
-
- init(): void {
- const selSidebarSm = document.querySelector(SELECTOR_SIDEBAR_SM)
- const selContentWrapper = selSidebarSm?.querySelector(SELECTOR_CONTENT_WRAPPER)
-
- if (selContentWrapper) {
- selContentWrapper.addEventListener('touchstart', this.removeOverlaySidebar)
- selContentWrapper.addEventListener('click', this.removeOverlaySidebar)
- }
- }
-}
-
-domReady(() => {
- const data = new SidebarOverlay()
-
- data.addSidebaBreakPoint()
- data.init()
- data.closeSidebar()
-
- window.addEventListener('resize', () => {
- data.addSidebaBreakPoint()
- data.init()
- })
-})
-
-export default SidebarOverlay