Merge remote-tracking branch 'origin/main'
# Conflicts: # src/components/MusicAlbumView.vue
No related branches found
No related tags found
Showing
- package-lock.json 11 additions, 0 deletionspackage-lock.json
- package.json 1 addition, 0 deletionspackage.json
- src/api/resolve.js 9 additions, 1 deletionsrc/api/resolve.js
- src/api/song.js 14 additions, 1 deletionsrc/api/song.js
- src/api/user.js 51 additions, 17 deletionssrc/api/user.js
- src/assets/videos/3.mp4 0 additions, 0 deletionssrc/assets/videos/3.mp4
- src/components/ArtistView.vue 7 additions, 24 deletionssrc/components/ArtistView.vue
- src/components/EpisodeView.vue 41 additions, 1 deletionsrc/components/EpisodeView.vue
- src/components/MusicAlbumView.vue 39 additions, 28 deletionssrc/components/MusicAlbumView.vue
- src/components/NotificationToast.vue 135 additions, 0 deletionssrc/components/NotificationToast.vue
- src/components/NowPlayingView.vue 18 additions, 21 deletionssrc/components/NowPlayingView.vue
- src/components/SearchView.vue 326 additions, 23 deletionssrc/components/SearchView.vue
- src/router/index.js 19 additions, 0 deletionssrc/router/index.js
- src/views/HomePage.vue 124 additions, 27 deletionssrc/views/HomePage.vue
- src/views/LoginPage.vue 649 additions, 434 deletionssrc/views/LoginPage.vue
Loading
Please register or sign in to comment