janishutz/MusicPlayer
1
0
Fork 0
mirror of https://github.com/janishutz/MusicPlayerV2.git synced 2025-11-25 13:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

some more small updates

Browse Source
This commit is contained in:
Janis Hutz
2024-06-30 17:32:42 +02:00
parent 88ecea1761
commit 361523172d
4 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MusicPlayerV2-GUI/src/components/playerView.vue
View File

@@ -74,8 +74,6 @@
<script setup lang="ts"> <script setup lang="ts">
// TODO: Handle resize, hide all non-essential controls when below 900px width
import { ref, type Ref } from 'vue'; import { ref, type Ref } from 'vue';
import playlistView from '@/components/playlistView.vue'; import playlistView from '@/components/playlistView.vue';
import MusicKitJSWrapper from '@/scripts/music-player'; import MusicKitJSWrapper from '@/scripts/music-player';

2
MusicPlayerV2-GUI/src/views/AppView.vue
View File

@@ -69,10 +69,12 @@
const selectPlaylist = ( id: string ) => { const selectPlaylist = ( id: string ) => {
player.value.selectPlaylist( id ); player.value.selectPlaylist( id );
player.value.controlUI( 'show' );
} }
const selectCustomPlaylist = ( playlist: ReadFile[] ) => { const selectCustomPlaylist = ( playlist: ReadFile[] ) => {
player.value.selectCustomPlaylist( playlist ); player.value.selectCustomPlaylist( playlist );
player.value.controlUI( 'show' );
} }
fetch( localStorage.getItem( 'url' ) + '/checkUserStatus', { credentials: 'include' } ).then( res => { fetch( localStorage.getItem( 'url' ) + '/checkUserStatus', { credentials: 'include' } ).then( res => {

1
MusicPlayerV2-GUI/src/views/RemoteView.vue
View File

@@ -172,6 +172,7 @@
text-align: justify; text-align: justify;
background-color: rgb(2, 16, 61); background-color: rgb(2, 16, 61);
color: white; color: white;
min-height: 100vh;
} }
.loaded { .loaded {

49
backend/src/app.ts
View File

@@ -68,33 +68,47 @@ const run = () => {
io.on( 'connection', ( socket ) => { io.on( 'connection', ( socket ) => {
socket.on( 'create-room', ( room: { name: string, token: string }, cb: ( res: { status: boolean, msg: string } ) => void ) => { socket.on( 'create-room', ( room: { name: string, token: string }, cb: ( res: { status: boolean, msg: string } ) => void ) => {
if ( room.token === socketData[ room.name ].roomToken ) { if ( socketData[ room.name ] ) {
socket.join( room.name ); if ( room.token === socketData[ room.name ].roomToken ) {
cb( { socket.join( room.name );
status: true, cb( {
msg: 'ADDED_TO_ROOM' status: true,
} ); msg: 'ADDED_TO_ROOM'
} );
} else {
cb( {
status: false,
msg: 'ERR_TOKEN_INVALID'
} );
}
} else { } else {
cb( { cb( {
status: false, status: false,
msg: 'ERR_TOKEN_INVALID' msg: 'ERR_NAME_INVALID'
} ); } );
} }
} ); } );
socket.on( 'delete-room', ( room: { name: string, token: string }, cb: ( res: { status: boolean, msg: string } ) => void ) => { socket.on( 'delete-room', ( room: { name: string, token: string }, cb: ( res: { status: boolean, msg: string } ) => void ) => {
if ( room.token === socketData[ room.name ].roomToken ) { if ( socketData[ room.name ] ) {
socket.leave( room.name ); if ( room.token === socketData[ room.name ].roomToken ) {
socket.to( room.name ).emit( 'delete-share', room.name ); socket.leave( room.name );
socketData[ room.name ] = undefined; socket.to( room.name ).emit( 'delete-share', room.name );
cb( { socketData[ room.name ] = undefined;
status: true, cb( {
msg: 'ROOM_DELETED' status: true,
} ); msg: 'ROOM_DELETED'
} );
} else {
cb( {
status: false,
msg: 'ERR_TOKEN_INVALID'
} );
}
} else { } else {
cb( { cb( {
status: false, status: false,
msg: 'ERR_TOKEN_INVALID' msg: 'ERR_NAME_INVALID'
} ); } );
} }
} ); } );
@@ -117,7 +131,8 @@ const run = () => {
cb( { cb( {
msg: 'ERR_NO_ROOM_WITH_THIS_ID', msg: 'ERR_NO_ROOM_WITH_THIS_ID',
status: false, status: false,
} ) } );
socket.disconnect();
} }
} ); } );