Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into typing-many-ts-expect…
Browse files Browse the repository at this point in the history
…-errors
  • Loading branch information
Arnei committed Sep 5, 2024
2 parents 356a727 + 0e4796f commit c92f425
Show file tree
Hide file tree
Showing 41 changed files with 578 additions and 395 deletions.
427 changes: 166 additions & 261 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@
"homepage": "/admin-ui",
"dependencies": {
"@hello-pangea/dnd": "^16.5.0",
"@mui/material": "^5.15.21",
"@mui/material": "^5.16.6",
"@mui/x-date-pickers": "^7.11.1",
"@reduxjs/toolkit": "^2.2.6",
"@types/dompurify": "^3.0.5",
"@types/react-router-dom": "^5.3.3",
"array-move": "^4.0.0",
"axios": "^1.7.2",
"axios": "^1.7.7",
"bourbon": "^7.3.0",
"classnames": "^2.5.1",
"date-fns": "^3.6.0",
"dompurify": "^3.1.6",
"font-awesome": "^4.7.0",
"formik": "^2.4.6",
"http-proxy-middleware": "^2.0.6",
"i18next": "^23.11.5",
"http-proxy-middleware": "^3.0.1",
"i18next": "^23.14.0",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-http-backend": "^2.5.2",
"i18next-http-backend": "^2.6.1",
"lodash": "^4.17.21",
"moment": "^2.30.1",
"moment-timezone": "^0.5.45",
"react": "^18.3.1",
"react-chartjs-2": "^5.2.0",
"react-datepicker": "^7.2.0",
"react-datepicker": "^7.3.0",
"react-dom": "^18.3.1",
"react-hotkeys-hook": "^4.4.4",
"react-i18next": "^15.0.0",
"react-i18next": "^15.0.1",
"react-icons": "^5.2.1",
"react-redux": "^7.2.9",
"react-router-dom": "^6.24.0",
"react-router-dom": "^6.26.1",
"react-select": "^5.8.0",
"redux": "^5.0.1",
"redux-persist": "^6.0.0",
"redux-thunk": "^3.1.0",
"reselect": "^5.1.1",
"styled-components": "^6.1.12",
"styled-components": "^6.1.13",
"yup": "^1.4.0"
},
"scripts": {
Expand All @@ -64,10 +64,10 @@
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.8.0",
"@eslint/js": "^9.9.1",
"@redux-devtools/extension": "^3.3.0",
"@types/lodash": "^4.17.7",
"@types/node": "^22.0.2",
"@types/node": "^22.5.1",
"@types/react-dom": "^18.3.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
Expand All @@ -77,11 +77,11 @@
"prop-types": "^15.8.1",
"rollup-preserve-directives": "^1.1.1",
"sass": "^1.77.8",
"typescript": "^5.5.2",
"typescript": "^5.5.4",
"uuid": "^10.0.0",
"vite": "^5.3.5",
"vite": "^5.4.2",
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^4.3.2",
"vite-tsconfig-paths": "^5.0.1",
"vitest": "^2.0.5"
}
}
2 changes: 1 addition & 1 deletion src/components/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const About: React.FC = () => {

useEffect(() => {
const getURL = (language: string) => {
return `ui/config/admin-ui/${location.pathname.split("/").pop()}.${language}.html`;
return `/ui/config/admin-ui/${location.pathname.split("/").pop()}.${language}.html`;
};

axios.get(getURL(i18n.language))
Expand Down
Loading

0 comments on commit c92f425

Please sign in to comment.