diff --git a/ui/package-lock.json b/ui/package-lock.json index a1f74c99..b8fb8bee 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -21,6 +21,7 @@ "jwt-decode": "^3.1.2", "lodash.pick": "^4.4.0", "lodash.throttle": "^4.1.1", + "navidrome-music-player": "4.25.0", "prop-types": "^15.7.2", "ra-data-json-server": "^3.18.3", "ra-i18n-polyglot": "^3.18.3", @@ -34,7 +35,6 @@ "react-hotkeys": "^2.0.0", "react-icons": "^4.4.0", "react-image-lightbox": "^5.1.4", - "react-jinke-music-player": "^4.24.2", "react-measure": "^2.5.2", "react-redux": "^7.2.9", "react-router-dom": "^5.3.0", @@ -3177,7 +3177,10 @@ "node_modules/@react-icons/all-files": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/@react-icons/all-files/-/all-files-4.1.0.tgz", - "integrity": "sha512-hxBI2UOuVaI3O/BhQfhtb4kcGn9ft12RWAFVMUeNjqqhLsHvFtzIkFaptBJpFDANTKoDfdVoHTKZDlwKCACbMQ==" + "integrity": "sha512-hxBI2UOuVaI3O/BhQfhtb4kcGn9ft12RWAFVMUeNjqqhLsHvFtzIkFaptBJpFDANTKoDfdVoHTKZDlwKCACbMQ==", + "peerDependencies": { + "react": "*" + } }, "node_modules/@redux-saga/core": { "version": "1.1.3", @@ -12983,6 +12986,31 @@ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, + "node_modules/navidrome-music-player": { + "version": "4.25.0", + "resolved": "https://registry.npmjs.org/navidrome-music-player/-/navidrome-music-player-4.25.0.tgz", + "integrity": "sha512-NAXXtc9wRG5JrRRvCRLLxc4Xp4N5U5A9Yn9VoWP8VNnUe+qRmHeWbIhpWmdLL5F1ebIDl5MMo7mIbU3TMhVGmw==", + "dependencies": { + "@react-icons/all-files": "^4.1.0", + "classnames": "^2.3.1", + "downloadjs": "^1.4.7", + "is-mobile": "^2.2.2", + "prop-types": "^15.7.2", + "rc-slider": "^9.7.2", + "rc-switch": "^3.2.2", + "react-draggable": "^4.4.3", + "sortablejs": "^1.13.0" + }, + "peerDependencies": { + "react": ">=16.9.0", + "react-dom": ">=16.9.0" + } + }, + "node_modules/navidrome-music-player/node_modules/classnames": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -15766,31 +15794,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" }, - "node_modules/react-jinke-music-player": { - "version": "4.24.2", - "resolved": "https://registry.npmjs.org/react-jinke-music-player/-/react-jinke-music-player-4.24.2.tgz", - "integrity": "sha512-E1ipg12CpIF2C54vnAD7Q14yr4UiwbQJo60DoF9dkU0gWRLgo60oLhjw4mRxlbERurkeR/9Ml1a9hUnIa8el/Q==", - "dependencies": { - "@react-icons/all-files": "^4.1.0", - "classnames": "^2.3.1", - "downloadjs": "^1.4.7", - "is-mobile": "^2.2.2", - "prop-types": "^15.7.2", - "rc-slider": "^9.7.2", - "rc-switch": "^3.2.2", - "react-draggable": "^4.4.3", - "sortablejs": "^1.13.0" - }, - "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" - } - }, - "node_modules/react-jinke-music-player/node_modules/classnames": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz", - "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" - }, "node_modules/react-lifecycles-compat": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", @@ -17060,9 +17063,9 @@ } }, "node_modules/sortablejs": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz", - "integrity": "sha512-RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg==" + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" }, "node_modules/source-list-map": { "version": "2.0.1", @@ -21593,7 +21596,8 @@ "@react-icons/all-files": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/@react-icons/all-files/-/all-files-4.1.0.tgz", - "integrity": "sha512-hxBI2UOuVaI3O/BhQfhtb4kcGn9ft12RWAFVMUeNjqqhLsHvFtzIkFaptBJpFDANTKoDfdVoHTKZDlwKCACbMQ==" + "integrity": "sha512-hxBI2UOuVaI3O/BhQfhtb4kcGn9ft12RWAFVMUeNjqqhLsHvFtzIkFaptBJpFDANTKoDfdVoHTKZDlwKCACbMQ==", + "requires": {} }, "@redux-saga/core": { "version": "1.1.3", @@ -29091,6 +29095,29 @@ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, + "navidrome-music-player": { + "version": "4.25.0", + "resolved": "https://registry.npmjs.org/navidrome-music-player/-/navidrome-music-player-4.25.0.tgz", + "integrity": "sha512-NAXXtc9wRG5JrRRvCRLLxc4Xp4N5U5A9Yn9VoWP8VNnUe+qRmHeWbIhpWmdLL5F1ebIDl5MMo7mIbU3TMhVGmw==", + "requires": { + "@react-icons/all-files": "^4.1.0", + "classnames": "^2.3.1", + "downloadjs": "^1.4.7", + "is-mobile": "^2.2.2", + "prop-types": "^15.7.2", + "rc-slider": "^9.7.2", + "rc-switch": "^3.2.2", + "react-draggable": "^4.4.3", + "sortablejs": "^1.13.0" + }, + "dependencies": { + "classnames": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + } + } + }, "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -30975,29 +31002,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" }, - "react-jinke-music-player": { - "version": "4.24.2", - "resolved": "https://registry.npmjs.org/react-jinke-music-player/-/react-jinke-music-player-4.24.2.tgz", - "integrity": "sha512-E1ipg12CpIF2C54vnAD7Q14yr4UiwbQJo60DoF9dkU0gWRLgo60oLhjw4mRxlbERurkeR/9Ml1a9hUnIa8el/Q==", - "requires": { - "@react-icons/all-files": "^4.1.0", - "classnames": "^2.3.1", - "downloadjs": "^1.4.7", - "is-mobile": "^2.2.2", - "prop-types": "^15.7.2", - "rc-slider": "^9.7.2", - "rc-switch": "^3.2.2", - "react-draggable": "^4.4.3", - "sortablejs": "^1.13.0" - }, - "dependencies": { - "classnames": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz", - "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==" - } - } - }, "react-lifecycles-compat": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", @@ -31933,9 +31937,9 @@ } }, "sortablejs": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz", - "integrity": "sha512-RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg==" + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" }, "source-list-map": { "version": "2.0.1", diff --git a/ui/package.json b/ui/package.json index a4732a2c..4f37acb1 100644 --- a/ui/package.json +++ b/ui/package.json @@ -16,6 +16,7 @@ "jwt-decode": "^3.1.2", "lodash.pick": "^4.4.0", "lodash.throttle": "^4.1.1", + "navidrome-music-player": "4.25.0", "prop-types": "^15.7.2", "ra-data-json-server": "^3.18.3", "ra-i18n-polyglot": "^3.18.3", @@ -29,7 +30,6 @@ "react-hotkeys": "^2.0.0", "react-icons": "^4.4.0", "react-image-lightbox": "^5.1.4", - "react-jinke-music-player": "^4.24.2", "react-measure": "^2.5.2", "react-redux": "^7.2.9", "react-router-dom": "^5.3.0", diff --git a/ui/src/audioplayer/Player.js b/ui/src/audioplayer/Player.js index 5131ce97..4df031ae 100644 --- a/ui/src/audioplayer/Player.js +++ b/ui/src/audioplayer/Player.js @@ -10,8 +10,8 @@ import { } from 'react-admin' import ReactGA from 'react-ga' import { GlobalHotKeys } from 'react-hotkeys' -import ReactJkMusicPlayer from 'react-jinke-music-player' -import 'react-jinke-music-player/assets/index.css' +import ReactJkMusicPlayer from 'navidrome-music-player' +import 'navidrome-music-player/assets/index.css' import useCurrentTheme from '../themes/useCurrentTheme' import config from '../config' import useStyle from './styles'