Top Results
+
Albums
Playlists
@@ -33,3 +35,6 @@ const mapStateToProps = state => ({
});
export default withRouter(connect(mapStateToProps)(SearchResults));
+//
+//
Songs
+//
diff --git a/frontend/components/main/header/songs_index.jsx b/frontend/components/main/header/songs_index.jsx
index 188db40..e09b877 100644
--- a/frontend/components/main/header/songs_index.jsx
+++ b/frontend/components/main/header/songs_index.jsx
@@ -6,14 +6,17 @@ import { logout, fetchCurrentUser } from '../../../actions/session_actions';
import { selectPlaylistSongs, selectAllSavedSongs, selectAllPlaylists } from '../../../reducers/selectors';
import SongsIndexItem from './songs_index_item';
-const mapStateToProps = (state) => {
+const mapStateToProps = (state, ownProps) => {
+
const playlist = state.entities.playlists[323];
const songs = selectPlaylistSongs(state, playlist);
const playlistId = 323;
return {
songs,
playlist,
- playlistId
+ playlistId,
+ searchTerm: ownProps.searchTerm,
+ navpath: ownProps.navpath
};
};
@@ -22,22 +25,41 @@ const mapDispatchToProps = (dispatch) => {
return {
fetchPlaylist: (id) => dispatch(fetchPlaylist(id)),
fetchCurrentUser: (user) => dispatch(fetchCurrentUser(user)),
- fetchSavedSongs: () => dispatch(fetchSavedSongs()),
+ fetchSavedSongs: (props) => dispatch(fetchSavedSongs(props)),
logout: () => dispatch(logout())
};
};
class SongsIndex extends React.Component {
constructor(props){
+
super(props);
+ this.fetchSavedSongs = props.fetchSavedSongs.bind(this);
}
componentDidMount() {
- this.props.fetchPlaylist(this.props.playlistId);
+
+ let search_query = this.props.searchTerm;
+ if (search_query) {
+ this.fetchSavedSongs(
+ {search_term: search_query}
+ );
+ } else {
+ this.props.fetchPlaylist(this.props.playlistId);
+ }
// this.props.fetchCurrentUser(window.currentUser);
}
+ componentWillReceiveProps(nextProps) {
+ if (nextProps.searchTerm && this.props.searchTerm !== nextProps.searchTerm) {
+ this.fetchSavedSongs({
+ search_term: nextProps.searchTerm
+ });
+ }
+ }
+
render(){
+
const {songs, playlist } = this.props;
if (!playlist){return (
);}
if (!songs[songs.length-1]){return (
);}
diff --git a/frontend/reducers/entities/entities_reducer.js b/frontend/reducers/entities/entities_reducer.js
index a741117..4b0c130 100644
--- a/frontend/reducers/entities/entities_reducer.js
+++ b/frontend/reducers/entities/entities_reducer.js
@@ -5,6 +5,7 @@ import songsReducer from './songs_reducer';
import artistsReducer from './artists_reducer';
import albumsReducer from './albums_reducer';
import usersReducer from './users_reducer';
+// import searchReducer from './search_reducer';
export default combineReducers({
playlists: playlistsReducer,
@@ -12,3 +13,5 @@ export default combineReducers({
artists: artistsReducer,
albums: albumsReducer
});
+
+// remoteAlbums: searchReducer
diff --git a/frontend/reducers/entities/search_reducer.js b/frontend/reducers/entities/search_reducer.js
new file mode 100644
index 0000000..f0a0066
--- /dev/null
+++ b/frontend/reducers/entities/search_reducer.js
@@ -0,0 +1,18 @@
+// import { RECEIVE_ALL_ALBUMS, RECEIVE_ALBUM } from '../../actions/search_actions';
+// import { merge } from 'lodash';
+//
+// export default (state = {}, action) => {
+//
+// switch (action.type) {
+// case RECEIVE_ALL_ALBUMS:
+// const newState = merge({}, state);
+// action.albums.map((album) => newState[album.collectionName] = album );
+// return newState;
+// case RECEIVE_ALBUM:
+// const otherNewState = merge({}, state);
+// otherNewState[action.album.collectionName] = action.album;
+// return otherNewState;
+// default:
+// return state;
+// }
+// };
diff --git a/frontend/util/album_api_util.jsx b/frontend/util/album_api_util.jsx
index a74d3a1..232246f 100644
--- a/frontend/util/album_api_util.jsx
+++ b/frontend/util/album_api_util.jsx
@@ -1,4 +1,5 @@
export const fetchAlbums = (props) => {
+
return $.ajax({
method: 'GET',
url: '/api/albums',
diff --git a/frontend/util/search_api_util.jsx b/frontend/util/search_api_util.jsx
new file mode 100644
index 0000000..44c57af
--- /dev/null
+++ b/frontend/util/search_api_util.jsx
@@ -0,0 +1,39 @@
+export const fetchAllAlbums = (searchQuery) => {
+
+ return $.ajax({
+ method: 'GET',
+ url: parseSearchTerms(searchQuery)
+ });
+};
+
+export const fetchSingleAlbum = (searchQuery) => {
+ return $.ajax({
+ method: 'GET',
+ url: 'https://itunes.apple.com/search?',
+ data: {
+ country: 'US',
+ media: 'podcast',
+ limit: 10,
+ lang: 'en_us',
+ term: searchQuery
+ }
+ });
+};
+
+const parseSearchTerms = (searchQuery) => {
+
+ let query = "";
+ const searchString = searchQuery.search_term.split(" ").join("+");
+ const searchParams = {
+ country: 'US',
+ media: 'podcast',
+ limit: 10,
+ lang: 'en_us',
+ term: searchString
+ };
+ for (let key in searchParams)
+ {
+ query = query + key + "=" + searchParams[key] + "&";
+ }
+ return `https://itunes.apple.com/search?${query}`.slice(0, -1);
+};
diff --git a/frontend/util/song_api_util.jsx b/frontend/util/song_api_util.jsx
index 872b6f6..94e4291 100644
--- a/frontend/util/song_api_util.jsx
+++ b/frontend/util/song_api_util.jsx
@@ -1,6 +1,15 @@
-export const fetchSavedSongs = () => {
+export const fetchSavedSongs = (props) => {
+
return $.ajax({
method: 'GET',
- url: '/api/songs'
+ url: '/api/songs',
+ data: props
});
};
+
+// export const fetchSongs = () => {
+// return $.ajax({
+// method: 'GET',
+// url: '/api/songs'
+// });
+// };