diff --git a/package-lock.json b/package-lock.json index 9154b0d..c91eab0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,8 +36,8 @@ "@types/pg": "^8.11.10", "@types/qrcode-svg": "^1.1.5", "@types/unist": "^3.0.3", - "aplayer-ts": "^2.5.1", - "astro-uploader": "^1.2.2", + "astro-netease-player": "^1.0.1", + "astro-uploader": "^1.2.3", "bootstrap": "^5.3.3", "photoswipe": "^5.4.4", "photoswipe-dynamic-caption-plugin": "^1.2.7", @@ -2595,14 +2595,24 @@ "sharp": "^0.33.3" } }, - "node_modules/astro-uploader": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/astro-uploader/-/astro-uploader-1.2.2.tgz", - "integrity": "sha512-VmXJu8YPWW596G4SBJUry8mp3ojq5QSGZuGWLQjXJPpWEVK1aqxKsjuxT+tsMn3Xa1jkX/sIaTMbgy87PlzTAg==", + "node_modules/astro-netease-player": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/astro-netease-player/-/astro-netease-player-1.0.1.tgz", + "integrity": "sha512-k+5erGNLHyy/GRKLqUOuKiN7d2HeX6KHzbPKEa/oL0tda4s09Eu4Zzt29P05bO/QNs5EGJbsz9UGiUGeVevVmA==", "dev": true, "license": "MIT", "dependencies": { - "mime": "^4.0.4", + "aplayer-ts": "^2.5.1" + } + }, + "node_modules/astro-uploader": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/astro-uploader/-/astro-uploader-1.2.3.tgz", + "integrity": "sha512-5pdtx0kHa+qX1mcobt7S5DnB+mOJUehw1Sep0H5fiZ/ztVX63VY/Tn0CDdO0WeKYnCiurPheEkxV6f06TRu5rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime": "^4.0.6", "opendal": "^0.47.7", "rimraf": "^6.0.1" } diff --git a/package.json b/package.json index 4bd8def..40a1613 100644 --- a/package.json +++ b/package.json @@ -69,8 +69,8 @@ "@types/pg": "^8.11.10", "@types/qrcode-svg": "^1.1.5", "@types/unist": "^3.0.3", - "aplayer-ts": "^2.5.1", - "astro-uploader": "^1.2.2", + "astro-netease-player": "^1.0.1", + "astro-uploader": "^1.2.3", "bootstrap": "^5.3.3", "photoswipe": "^5.4.4", "photoswipe-dynamic-caption-plugin": "^1.2.7", diff --git a/src/assets/scripts/globals.js b/src/assets/scripts/globals.js index 62e94db..ac59a51 100644 --- a/src/assets/scripts/globals.js +++ b/src/assets/scripts/globals.js @@ -1,6 +1,5 @@ import PhotoSwipeSlideshow from '@/assets/scripts/photoswipe-slideshow.js'; import stickySidebar from '@/assets/scripts/sticky-sidebar.js'; -import APlayer from 'aplayer-ts'; import { actions, isInputError } from 'astro:actions'; import PhotoSwipe from 'photoswipe'; import PhotoSwipeDynamicCaption from 'photoswipe-dynamic-caption-plugin'; @@ -135,23 +134,6 @@ for (const dialog of document.querySelectorAll('.nice-dialog')) { }); } -// Netease music player. -const ps = document.querySelectorAll('.aplayer'); -for (const p of ps) { - APlayer().init({ - container: p, - audio: [ - { - name: p.dataset.name, - artist: p.dataset.artist, - url: p.dataset.url, - cover: p.dataset.cover, - theme: '#ebd0c2', - }, - ], - }); -} - // Search Bar. const searchSidebar = document.querySelector('.search-sidebar'); if (typeof searchSidebar !== 'undefined' && searchSidebar !== null) { diff --git a/src/assets/styles/globals.css b/src/assets/styles/globals.css index 696fb4d..93be4b2 100644 --- a/src/assets/styles/globals.css +++ b/src/assets/styles/globals.css @@ -1,5 +1,4 @@ @import 'bootstrap/dist/css/bootstrap.min.css'; -@import 'aplayer-ts/src/css/base.css'; @import '@/assets/styles/reset.css'; @import '@/assets/styles/iconfont/iconfont.css'; @import 'photoswipe/style.css'; diff --git a/src/components/page/post/PostContent.astro b/src/components/page/post/PostContent.astro index 431f251..8632dc5 100644 --- a/src/components/page/post/PostContent.astro +++ b/src/components/page/post/PostContent.astro @@ -1,8 +1,8 @@ --- import UnstyledAlbum from '@/components/album/UnstyledAlbum.astro'; import UnstyledImage from '@/components/image/UnstyledImage.astro'; -import UnstyledMusicPlayer from '@/components/player/UnstyledMusicPlayer.astro'; import { posts } from '@/helpers/schema'; +import UnstyledMusicPlayer from 'astro-netease-player/UnstyledMusicPlayer.astro'; interface Props { slug: string; diff --git a/src/components/player/MusicPlayer.astro b/src/components/player/MusicPlayer.astro deleted file mode 100644 index bed42d3..0000000 --- a/src/components/player/MusicPlayer.astro +++ /dev/null @@ -1,17 +0,0 @@ ---- -import { resolveSong, type MusicPlayerProps } from '@/components/player/resolver'; - -interface Props extends MusicPlayerProps {} - -const { name, artist, url, pic } = await resolveSong(Astro.props); ---- - -{ - url === '' ? ( -

歌曲加载失败

- ) : ( -
- 音乐正在加载中 ... -
- ) -} diff --git a/src/components/player/UnstyledMusicPlayer.astro b/src/components/player/UnstyledMusicPlayer.astro deleted file mode 100644 index 41e3aae..0000000 --- a/src/components/player/UnstyledMusicPlayer.astro +++ /dev/null @@ -1,9 +0,0 @@ ---- -import { resolveSong, type MusicPlayerProps } from '@/components/player/resolver'; - -interface Props extends MusicPlayerProps {} - -const { url } = await resolveSong(Astro.props); ---- - -{url !== '' &&