Skip to content

Commit

Permalink
Merge branch 'main' into dependecy-redujxtoolkit-2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Arnei committed Jan 3, 2025
2 parents 28589c5 + 401b202 commit 394e52c
Show file tree
Hide file tree
Showing 35 changed files with 741 additions and 327 deletions.
807 changes: 528 additions & 279 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"homepage": "/admin-ui",
"dependencies": {
"@hello-pangea/dnd": "^17.0.0",
"@mui/material": "^6.1.6",
"@mui/x-date-pickers": "^7.18.0",
"@mui/material": "^6.3.0",
"@mui/x-date-pickers": "^7.23.1",
"@reduxjs/toolkit": "^2.5.0",
"@types/dompurify": "^3.0.5",
"@types/react-router-dom": "^5.3.3",
"array-move": "^4.0.0",
"axios": "^1.7.7",
"axios": "^1.7.9",
"bourbon": "^7.3.0",
"classnames": "^2.5.1",
"date-fns": "^3.6.0",
Expand All @@ -21,7 +21,7 @@
"formik": "^2.4.6",
"http-proxy-middleware": "^3.0.3",
"i18next": "^23.16.4",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-browser-languagedetector": "^8.0.2",
"i18next-http-backend": "^2.6.1",
"lodash": "^4.17.21",
"moment": "^2.30.1",
Expand All @@ -30,18 +30,18 @@
"react-chartjs-2": "^5.2.0",
"react-datepicker": "^7.5.0",
"react-dom": "^18.3.1",
"react-hotkeys-hook": "^4.5.1",
"react-i18next": "^15.1.0",
"react-hotkeys-hook": "^4.6.1",
"react-i18next": "^15.4.0",
"react-icons": "^5.3.0",
"react-redux": "^9.1.2",
"react-redux": "^9.2.0",
"react-router-dom": "^6.27.0",
"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.13",
"yup": "^1.4.0"
"yup": "^1.6.1"
},
"scripts": {
"start": "vite",
Expand All @@ -63,25 +63,25 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@eslint/eslintrc": "^3.1.0",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.9.1",
"@redux-devtools/extension": "^3.3.0",
"@types/lodash": "^4.17.13",
"@types/node": "^22.5.1",
"@types/react-dom": "^18.3.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@vitejs/plugin-react-swc": "^3.7.1",
"@vitejs/plugin-react-swc": "^3.7.2",
"eslint": "^8.57.0",
"eslint-config-react-app": "^7.0.1",
"prop-types": "^15.8.1",
"rollup-preserve-directives": "^1.1.1",
"sass": "^1.79.4",
"rollup-preserve-directives": "^1.1.3",
"sass": "^1.83.0",
"typescript": "^5.6.3",
"uuid": "^11.0.2",
"uuid": "^11.0.3",
"vite": "^5.4.10",
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^5.0.1",
"vitest": "^2.1.4"
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^2.1.8"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
"GROUP": "The following group will be deleted",
"USER": "The following user will be deleted",
"THEME": "The following theme will be deleted",
"LOCATION": "The following location will be deleted"
"LOCATION": "The following location will be deleted",
"TOBIRA_PATH": "The series will be removed from the following path in Tobira:"
},
"NAME": "Name"
},
Expand Down Expand Up @@ -169,7 +170,9 @@
"SERIES_ADDED": "The series has been created",
"SERIES_NOT_SAVED": "The series could not be saved",
"SERIES_PATH_UPDATED": "The series path has been updated",
"SERIES_PATH_REMOVED": "The series path has been removed",
"SERIES_PATH_NOT_UPDATED": "The series path could not be updated",
"SERIES_PATH_NOT_REMOVED": "The series path could not be removed",
"EVENTS_CREATED": "The event has been created",
"EVENTS_UPLOAD_STARTED": "The event is being uploaded… {{ progress }}%",
"EVENTS_NOT_CREATED": "The event could not be created",
Expand Down Expand Up @@ -1143,6 +1146,7 @@
"HOMEPAGE": "Homepage",
"SELECTED_PAGE": "Series will be mounted under the following path",
"NO_PAGE_SELECTED": "No page selected. Series will not be mounted in Tobira.",
"NO_PAGE_SELECTED_EDIT": "No page selected. Series path will not be changed.",
"PATH": "Path",
"DIRECT_LINK": "A direct link will be available.",
"MOUNT_DISCLAIMER": "Series can only be mounted in empty pages"
Expand Down Expand Up @@ -1231,6 +1235,7 @@
"PAGES": "Pages in Tobira that contain this series",
"SHOW_PAGES": "Show all pages",
"EDIT_PATH": "Edit path",
"REMOVE_PATH": "Remove path",
"MOUNT_SERIES": "Mount series",
"DESCRIPTION": "You may edit the path of pages containing this series if the page has no other content."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
"GROUP": "The following group will be deleted",
"USER": "The following user will be deleted",
"THEME": "The following theme will be deleted",
"LOCATION": "The following location will be deleted"
"LOCATION": "The following location will be deleted",
"TOBIRA_PATH": "The series will be removed from the following path in Tobira:"
},
"NAME": "Name"
},
Expand Down Expand Up @@ -169,7 +170,9 @@
"SERIES_ADDED": "The series has been created",
"SERIES_NOT_SAVED": "The series could not be saved",
"SERIES_PATH_UPDATED": "The series path has been updated",
"SERIES_PATH_REMOVED": "The series path has been removed",
"SERIES_PATH_NOT_UPDATED": "The series path could not be updated",
"SERIES_PATH_NOT_REMOVED": "The series path could not be removed",
"EVENTS_CREATED": "The event has been created",
"EVENTS_UPLOAD_STARTED": "The event is being uploaded…",
"EVENTS_NOT_CREATED": "The event could not be created",
Expand Down Expand Up @@ -1143,6 +1146,7 @@
"HOMEPAGE": "Homepage",
"SELECTED_PAGE": "Series will be mounted under the following path",
"NO_PAGE_SELECTED": "No page selected. Series will not be mounted in Tobira.",
"NO_PAGE_SELECTED_EDIT": "No page selected. Series path will not be changed.",
"PATH": "Path",
"DIRECT_LINK": "A direct link will be available.",
"MOUNT_DISCLAIMER": "Series can only be mounted in empty pages"
Expand Down Expand Up @@ -1231,6 +1235,7 @@
"PAGES": "Pages in Tobira that contain this series",
"SHOW_PAGES": "Show all pages",
"EDIT_PATH": "Edit path",
"REMOVE_PATH": "Remove path",
"MOUNT_SERIES": "Mount series",
"DESCRIPTION": "You may edit the path of pages containing this series if the page has no other content."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
"GROUP": "The following group will be deleted",
"USER": "The following user will be deleted",
"THEME": "The following theme will be deleted",
"LOCATION": "The following location will be deleted"
"LOCATION": "The following location will be deleted",
"TOBIRA_PATH": "The series will be removed from the following path in Tobira:"
},
"NAME": "Name"
},
Expand Down Expand Up @@ -169,7 +170,9 @@
"SERIES_ADDED": "The series has been created",
"SERIES_NOT_SAVED": "The series could not be saved",
"SERIES_PATH_UPDATED": "The series path has been updated",
"SERIES_PATH_REMOVED": "The series path has been removed",
"SERIES_PATH_NOT_UPDATED": "The series path could not be updated",
"SERIES_PATH_NOT_REMOVED": "The series path could not be removed",
"EVENTS_CREATED": "The event has been created",
"EVENTS_UPLOAD_STARTED": "The event is being uploaded… {{ progress }}%",
"EVENTS_NOT_CREATED": "The event could not be created",
Expand Down Expand Up @@ -1143,6 +1146,7 @@
"HOMEPAGE": "Homepage",
"SELECTED_PAGE": "Series will be mounted under the following path",
"NO_PAGE_SELECTED": "No page selected. Series will not be mounted in Tobira.",
"NO_PAGE_SELECTED_EDIT": "No page selected. Series path will not be changed.",
"PATH": "Path",
"DIRECT_LINK": "A direct link will be available.",
"MOUNT_DISCLAIMER": "Series can only be mounted in empty pages"
Expand Down Expand Up @@ -1231,6 +1235,7 @@
"PAGES": "Pages in Tobira that contain this series",
"SHOW_PAGES": "Show all pages",
"EDIT_PATH": "Edit path",
"REMOVE_PATH": "Remove path",
"MOUNT_SERIES": "Mount series",
"DESCRIPTION": "You may edit the path of pages containing this series if the page has no other content."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
"GROUP": "Die folgende Gruppe wird gelöscht",
"USER": "Der folgende Benutzer wird gelöscht",
"THEME": "Das folgende Branding wird gelöscht",
"LOCATION": "Folgender Standort wird entfernt"
"LOCATION": "Folgender Standort wird entfernt",
"TOBIRA_PATH": "The series will be removed from the following path in Tobira:"
},
"NAME": "Name"
},
Expand Down Expand Up @@ -169,7 +170,9 @@
"SERIES_ADDED": "Die Serie wurde angelegt",
"SERIES_NOT_SAVED": "Die Serie konnte nicht gespeichert werden",
"SERIES_PATH_UPDATED": "The series path has been updated",
"SERIES_PATH_REMOVED": "The series path has been removed",
"SERIES_PATH_NOT_UPDATED": "The series path could not be updated",
"SERIES_PATH_NOT_REMOVED": "The series path could not be removed",
"EVENTS_CREATED": "Das Video wurde angelegt",
"EVENTS_UPLOAD_STARTED": "Das Video wird hochgeladen… {{ progress }}%",
"EVENTS_NOT_CREATED": "Das Video konnte nicht angelegt werden",
Expand Down Expand Up @@ -1143,6 +1146,7 @@
"HOMEPAGE": "Startseite",
"SELECTED_PAGE": "Serie wird in folgendem Pfad eingebunden",
"NO_PAGE_SELECTED": "Keine Seite ausgewählt. Serie wird nicht im Videoportal eingebunden.",
"NO_PAGE_SELECTED_EDIT": "No page selected. Series path will not be changed.",
"PATH": "Pfad",
"DIRECT_LINK": "A direct link will be available.",
"MOUNT_DISCLAIMER": "Series can only be mounted in empty pages"
Expand Down Expand Up @@ -1231,6 +1235,7 @@
"PAGES": "Seiten im Videoportal, die diese Serie einbinden",
"SHOW_PAGES": "Show all pages",
"EDIT_PATH": "Edit path",
"REMOVE_PATH": "Remove path",
"MOUNT_SERIES": "Mount series",
"DESCRIPTION": "You may edit the path of pages containing this series if the page has no other content."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
"GROUP": "Η παρακάτω ομάδα θα διαγραφεί",
"USER": "Ο παρακάτω χρήστης θα διαγραφεί",
"THEME": "Το ακόλουθο θέμα θα διαγραφεί",
"LOCATION": "Η ακόλουθη τοποθεσία θα διαγραφεί"
"LOCATION": "Η ακόλουθη τοποθεσία θα διαγραφεί",
"TOBIRA_PATH": "The series will be removed from the following path in Tobira:"
},
"NAME": "Όνομα"
},
Expand Down Expand Up @@ -169,7 +170,9 @@
"SERIES_ADDED": "Η σειρά έχει δημιουργηθεί",
"SERIES_NOT_SAVED": "Δεν ήταν δυνατή η αποθήκευση της σειράς",
"SERIES_PATH_UPDATED": "The series path has been updated",
"SERIES_PATH_REMOVED": "The series path has been removed",
"SERIES_PATH_NOT_UPDATED": "The series path could not be updated",
"SERIES_PATH_NOT_REMOVED": "The series path could not be removed",
"EVENTS_CREATED": "Η εκδήλωση έχει δημιουργηθεί",
"EVENTS_UPLOAD_STARTED": "Μια εκδήλωση ανέβηκε…",
"EVENTS_NOT_CREATED": "Δεν ήταν δυνατή η δημιουργία της εκδήλωσης",
Expand Down Expand Up @@ -1143,6 +1146,7 @@
"HOMEPAGE": "Homepage",
"SELECTED_PAGE": "Series will be mounted under the following path",
"NO_PAGE_SELECTED": "No page selected. Series will not be mounted in Tobira.",
"NO_PAGE_SELECTED_EDIT": "No page selected. Series path will not be changed.",
"PATH": "Path",
"DIRECT_LINK": "A direct link will be available.",
"MOUNT_DISCLAIMER": "Series can only be mounted in empty pages"
Expand Down Expand Up @@ -1231,6 +1235,7 @@
"PAGES": "Pages in Tobira that contain this series",
"SHOW_PAGES": "Show all pages",
"EDIT_PATH": "Edit path",
"REMOVE_PATH": "Remove path",
"MOUNT_SERIES": "Mount series",
"DESCRIPTION": "You may edit the path of pages containing this series if the page has no other content."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
"GROUP": "The following group will be deleted",
"USER": "The following user will be deleted",
"THEME": "The following theme will be deleted",
"LOCATION": "The following location will be deleted"
"LOCATION": "The following location will be deleted",
"TOBIRA_PATH": "The series will be removed from the following path in Tobira:"
},
"NAME": "Name"
},
Expand Down Expand Up @@ -169,7 +170,9 @@
"SERIES_ADDED": "The series has been created",
"SERIES_NOT_SAVED": "The series could not be saved",
"SERIES_PATH_UPDATED": "The series path has been updated",
"SERIES_PATH_REMOVED": "The series path has been removed",
"SERIES_PATH_NOT_UPDATED": "The series path could not be updated",
"SERIES_PATH_NOT_REMOVED": "The series path could not be removed",
"EVENTS_CREATED": "The event has been created",
"EVENTS_UPLOAD_STARTED": "The event is being uploaded… {{ progress }}%",
"EVENTS_NOT_CREATED": "The event could not be created",
Expand Down Expand Up @@ -1143,6 +1146,7 @@
"HOMEPAGE": "Homepage",
"SELECTED_PAGE": "Series will be mounted under the following path",
"NO_PAGE_SELECTED": "No page selected. Series will not be mounted in Tobira.",
"NO_PAGE_SELECTED_EDIT": "No page selected. Series path will not be changed.",
"PATH": "Path",
"DIRECT_LINK": "A direct link will be available.",
"MOUNT_DISCLAIMER": "Series can only be mounted in empty pages"
Expand Down Expand Up @@ -1231,6 +1235,7 @@
"PAGES": "Pages in Tobira that contain this series",
"SHOW_PAGES": "Show all pages",
"EDIT_PATH": "Edit path",
"REMOVE_PATH": "Remove path",
"MOUNT_SERIES": "Mount series",
"DESCRIPTION": "You may edit the path of pages containing this series if the page has no other content."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
"GROUP": "The following group will be deleted",
"USER": "The following user will be deleted",
"THEME": "The following theme will be deleted",
"LOCATION": "The following location will be deleted"
"LOCATION": "The following location will be deleted",
"TOBIRA_PATH": "The series will be removed from the following path in Tobira:"
},
"NAME": "Name"
},
Expand Down Expand Up @@ -169,7 +170,9 @@
"SERIES_ADDED": "The series has been created",
"SERIES_NOT_SAVED": "The series could not be saved",
"SERIES_PATH_UPDATED": "The series path has been updated",
"SERIES_PATH_REMOVED": "The series path has been removed",
"SERIES_PATH_NOT_UPDATED": "The series path could not be updated",
"SERIES_PATH_NOT_REMOVED": "The series path could not be removed",
"EVENTS_CREATED": "The event has been created",
"EVENTS_UPLOAD_STARTED": "The event is being uploaded… {{ progress }}%",
"EVENTS_NOT_CREATED": "The event could not be created",
Expand Down Expand Up @@ -1143,6 +1146,7 @@
"HOMEPAGE": "Homepage",
"SELECTED_PAGE": "Series will be mounted under the following path",
"NO_PAGE_SELECTED": "No page selected. Series will not be mounted in Tobira.",
"NO_PAGE_SELECTED_EDIT": "No page selected. Series path will not be changed.",
"PATH": "Path",
"DIRECT_LINK": "A direct link will be available.",
"MOUNT_DISCLAIMER": "Series can only be mounted in empty pages"
Expand Down Expand Up @@ -1231,6 +1235,7 @@
"PAGES": "Pages in Tobira that contain this series",
"SHOW_PAGES": "Show all pages",
"EDIT_PATH": "Edit path",
"REMOVE_PATH": "Remove path",
"MOUNT_SERIES": "Mount series",
"DESCRIPTION": "You may edit the path of pages containing this series if the page has no other content."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
"GROUP": "The following group will be deleted",
"USER": "The following user will be deleted",
"THEME": "The following theme will be deleted",
"LOCATION": "The following location will be deleted"
"LOCATION": "The following location will be deleted",
"TOBIRA_PATH": "The series will be removed from the following path in Tobira:"
},
"NAME": "Name"
},
Expand Down Expand Up @@ -169,7 +170,9 @@
"SERIES_ADDED": "The series has been created",
"SERIES_NOT_SAVED": "The series could not be saved",
"SERIES_PATH_UPDATED": "The series path has been updated",
"SERIES_PATH_REMOVED": "The series path has been removed",
"SERIES_PATH_NOT_UPDATED": "The series path could not be updated",
"SERIES_PATH_NOT_REMOVED": "The series path could not be removed",
"EVENTS_CREATED": "The event has been created",
"EVENTS_UPLOAD_STARTED": "The event is being uploaded… {{ progress }}%",
"EVENTS_NOT_CREATED": "The event could not be created",
Expand Down Expand Up @@ -1143,6 +1146,7 @@
"HOMEPAGE": "Homepage",
"SELECTED_PAGE": "Series will be mounted under the following path",
"NO_PAGE_SELECTED": "No page selected. Series will not be mounted in Tobira.",
"NO_PAGE_SELECTED_EDIT": "No page selected. Series path will not be changed.",
"PATH": "Path",
"DIRECT_LINK": "A direct link will be available.",
"MOUNT_DISCLAIMER": "Series can only be mounted in empty pages"
Expand Down Expand Up @@ -1231,6 +1235,7 @@
"PAGES": "Pages in Tobira that contain this series",
"SHOW_PAGES": "Show all pages",
"EDIT_PATH": "Edit path",
"REMOVE_PATH": "Remove path",
"MOUNT_SERIES": "Mount series",
"DESCRIPTION": "You may edit the path of pages containing this series if the page has no other content."
},
Expand Down
Loading

0 comments on commit 394e52c

Please sign in to comment.