From dfac76af6e65d2e53ed264ba4b56400e7d153cc5 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Mon, 4 Dec 2017 07:57:05 +1300 Subject: [PATCH] Getting last hour for featured playlists; Minor style adjustments --- src/js/services/spotify/actions.js | 28 ++++++++++++-------- src/scss/components/_autocomplete-field.scss | 1 + src/scss/views/_discover.scss | 16 +++++++++++ 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/js/services/spotify/actions.js b/src/js/services/spotify/actions.js index 756cc3b9..49d8f7e9 100755 --- a/src/js/services/spotify/actions.js +++ b/src/js/services/spotify/actions.js @@ -35,7 +35,8 @@ const sendRequest = (dispatch, getState, endpoint, method = 'GET', data = false) cached: true, timeout: 30000, headers: { - Authorization: 'Bearer '+ response + Authorization: 'Bearer '+ response, + Accept: 'application/json' } } @@ -313,6 +314,7 @@ export function getFeaturedPlaylists(){ dispatch({ type: 'SPOTIFY_FEATURED_PLAYLISTS_LOADED', data: false }); var date = new Date(); + date.setHours(date.getHours() - 1); var year = date.getFullYear(); var month = date.getMonth(); if (month < 10 ) month = '0'+month; @@ -327,7 +329,7 @@ export function getFeaturedPlaylists(){ var timestamp = year+'-'+month+'-'+day+'T'+hour+':'+min+':'+sec; - sendRequest(dispatch, getState, 'browse/featured-playlists?timestamp='+timestamp+'&country='+getState().core.country+'&limit=50&locale='+getState().core.locale ) + sendRequest(dispatch, getState, 'browse/featured-playlists?country='+getState().core.country+'&limit=50&locale='+getState().core.locale+'×tamp='+timestamp) .then( response => { var playlists = [] @@ -944,16 +946,20 @@ export function getRecommendations(uris = [], limit = 20){ } } } + + if (albums.length > 0){ + dispatch({ + type: 'ALBUMS_LOADED', + albums: albums + }); + } - dispatch({ - type: 'ALBUMS_LOADED', - albums: albums - }); - - dispatch({ - type: 'TRACKS_LOADED', - tracks: tracks - }); + if (tracks.length > 0){ + dispatch({ + type: 'TRACKS_LOADED', + tracks: tracks + }); + } dispatch({ type: 'SPOTIFY_RECOMMENDATIONS_LOADED', diff --git a/src/scss/components/_autocomplete-field.scss b/src/scss/components/_autocomplete-field.scss index b78a7bf7..edae19fc 100755 --- a/src/scss/components/_autocomplete-field.scss +++ b/src/scss/components/_autocomplete-field.scss @@ -44,6 +44,7 @@ padding: 10px 14px 4px; margin: 0; font-size: 12px; + text-transform: uppercase; } .result { diff --git a/src/scss/views/_discover.scss b/src/scss/views/_discover.scss index 80ddc555..8b5db8ec 100755 --- a/src/scss/views/_discover.scss +++ b/src/scss/views/_discover.scss @@ -15,6 +15,11 @@ z-index: 1; } + h1 { + font-size: 3rem; + line-height: 3rem; + } + .liner { z-index: 2; position: relative; @@ -97,6 +102,17 @@ padding-bottom: 20px; } } + + @include responsive($bp_medium){ + + .intro { + padding: 40px 20px; + } + + .seeds { + padding-top: 20px; + } + } } .discover-featured-view,