Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

2

2024-HCI-Mirror
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

3cf07c8c

Commit 3cf07c8c authored 3 months ago by 杭羽凡

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/components/MusicAlbumView.vue
#	src/views/HomePage.vue

parents f7a531c2 7fca645f

No related branches found

No related tags found

Loading

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/api/playlist.js 21 additions, 4 deletions

src/api/playlist.js
src/api/song.js 11 additions, 0 deletions

src/api/song.js
src/assets/icons/disk.png 0 additions, 0 deletions

src/assets/icons/disk.png
src/components/EpisodeView.vue 691 additions, 0 deletions

src/components/EpisodeView.vue
src/components/Header.vue 133 additions, 128 deletions

src/components/Header.vue
src/components/LeftSideBar.vue 49 additions, 37 deletions

src/components/LeftSideBar.vue
src/components/MainView.vue 5 additions, 1 deletion

src/components/MainView.vue
src/components/MusicAlbumView.vue 298 additions, 287 deletions

src/components/MusicAlbumView.vue
src/views/HomePage.vue 276 additions, 159 deletions

src/views/HomePage.vue
src/views/a.vue 0 additions, 412 deletions

src/views/a.vue

with 1484 additions and 1028 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment