diff --git a/app/index.html b/app/index.html index b886b017..e41ad227 100644 --- a/app/index.html +++ b/app/index.html @@ -158,10 +158,10 @@

Main

- + -

-

+

+

diff --git a/app/public/js/player/playerCtrl.js b/app/public/js/player/playerCtrl.js index 6baec249..42c622fb 100644 --- a/app/public/js/player/playerCtrl.js +++ b/app/public/js/player/playerCtrl.js @@ -1,6 +1,6 @@ 'use strict'; -app.controller('PlayerCtrl', function ($scope, $rootScope, playerService, hotkeys, $log, $timeout) { +app.controller('PlayerCtrl', function ($scope, $rootScope, playerService, queueService, hotkeys, $state, $log, $timeout) { $scope.imgPath = 'public/img/temp-playing.png'; $timeout(function() { @@ -99,6 +99,16 @@ app.controller('PlayerCtrl', function ($scope, $rootScope, playerService, hotkey document.querySelector('.queueList').classList.toggle('active'); }; + $scope.goToSong = function ($event) { + var trackObj = queueService.getTrack(); + $state.go('track', { id: trackObj.songId }); + }; + + $scope.goToUser = function ($event) { + var trackObj = queueService.getTrack(); + $state.go('profile', { id: trackObj.songUserId }); + }; + /* * Add native media shortcuts diff --git a/app/public/stylesheets/sass/_components/_player.scss b/app/public/stylesheets/sass/_components/_player.scss index 0d9e97dc..870ebd82 100644 --- a/app/public/stylesheets/sass/_components/_player.scss +++ b/app/public/stylesheets/sass/_components/_player.scss @@ -16,6 +16,7 @@ width: 50px; margin: 5px 0; float: left; + cursor: pointer; } .player_title { @@ -24,6 +25,7 @@ overflow: hidden; text-overflow: ellipsis; padding: 13px 10px 0; + cursor: pointer; } .player_details { @@ -41,6 +43,7 @@ overflow: hidden; text-overflow: ellipsis; font-weight: 300; + cursor: pointer; } .player_currentSong { diff --git a/app/views/common/tracks.html b/app/views/common/tracks.html index b17789be..8708e6a7 100644 --- a/app/views/common/tracks.html +++ b/app/views/common/tracks.html @@ -9,6 +9,7 @@ data-song-thumbnail="{{ data.artwork_url }}" data-song-title="{{ data.title }}" data-song-user="{{ data.user.username }}" + data-song-user-id="{{ data.user.id }}" data-song-id="{{ data.id }}" > diff --git a/app/views/playlists/playlists.html b/app/views/playlists/playlists.html index 67f259a9..96f7e60c 100644 --- a/app/views/playlists/playlists.html +++ b/app/views/playlists/playlists.html @@ -35,6 +35,7 @@

{{ data.title }} playlist -