Minor bug fixes

Author: likethemammal

src/components/Audio/Audio.reducer.js

@@ -4,7 +4,7 @@ import _ from 'lodash'
 
 const audio = new Audio()
 
-audio.volume = 0.4
+audio.volume = 0.3
 
 export const initialState = {
     visualizerLoaded: false,

src/components/Player/Controls.component.js

@@ -52,7 +52,8 @@ const iconContainer = {
     '&:hover': {
         background: localColors.ICON_HOVER_BACKGROUND,
     },
-    boxSizing: 'content-box'
+    boxSizing: 'content-box',
+    color: localColors.ICON,
 }
 
 export const styles = {

src/components/SoundCloud/SoundCloud.reducer.js

@@ -44,11 +44,12 @@ export const reducer = {
         }
     },
     [types.SC__GET_SONGS_SUCCESS]: (state, action) => {
-        const { nextHref } = action
+        const { nextHref, paginationIndex } = action
 
         return {
             ...state,
             nextHref,
+            paginationIndex,
             error: false,
         }
     },

src/components/SoundCloud/SoundCloud.sagas.js

@@ -47,7 +47,6 @@ function* onGetSoundCloudSongs() {
     const limit = yield select(_limit)
     const url = yield select(songUrl)
 
-
     const opts = {
         tags: currentGenreFormatted,
         //bug in SC sdk causes it to only return a few unless limit is set
@@ -63,9 +62,10 @@ function* onGetSoundCloudSongs() {
 
         yield put({
             type: types.SC__GET_SONGS_SUCCESS,
+            ...rest,
             ...{
-                ...rest,
                 nextHref: next_href,
+                paginationIndex: nextPaginationIndex,
             }
         })
     } catch (e) {
@@ -136,6 +136,7 @@ function* onSetAudioSrc() {
     const { streamUrl } = currentSongFormatted
 
     audio.pause()
+    //bug with audio src settings and then playing a new song
     audio.src = streamUrl
     audio.crossOrigin = 'anonymous'
 

src/components/SoundCloud/SoundCloud.units.js

@@ -20,7 +20,9 @@ export const songsNotListenedTo = (collection, listenedToIds) => {
     })
 }
 
-export const songsNotListenedToLength = (songsNotListenedTo) => songsNotListenedTo.length
+export const songsNotListenedToLength = (songsNotListenedTo) => {
+    return songsNotListenedTo.length
+}
 
 export const hasNextSong = (songsNotListenedToLength) => songsNotListenedToLength > 0
 export const nextSongIndex = (songsNotListenedToLength) => Math.floor(songsNotListenedToLength * Math.random())
@@ -57,7 +59,7 @@ export const currentSongFormatted = (
         titleName: title,
         titleUrl: permalink_url,
         artistName: user.username,
-        albumSrc: artwork_url.replace('large.jpg', 'crop.jpg'),
+        albumSrc: artwork_url && artwork_url.replace('large.jpg', 'crop.jpg'),
     }
 }
 
@@ -79,13 +81,13 @@ export const limit = (nextPaginationIndex) => {
 }
 
 export const getAPIUrl = (nextHref) => {
-
-    if (nextHref) {
-
-        const { pathname, search } = new URL(nextHref)
-
-        return `${pathname}${search}`
-    }
+    //
+    // if (nextHref) {
+    //
+    //     const { pathname, search } = new URL(nextHref)
+    //
+    //     return `${pathname}${search}`
+    // }
 
     return '/tracks'
 }