858/frontend
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

add topic count in random topic component #7

Merged
sanj merged 2 commits from feature/add-topic-count into develop 2018-12-07 17:44:24 +00:00
Conversation 0 Commits 2 Files Changed 5 +5 -4
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69c2181afa - Show all commits

3
src/containers/Home.js
View File

@ -18,7 +18,6 @@ class Home extends React.Component {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
console.log('nextProps', nextProps);
// This is slightly awkward - we need to check that we have all topics, // This is slightly awkward - we need to check that we have all topics,
// But don't have a random topic yet (or at not already loading a random topic) // But don't have a random topic yet (or at not already loading a random topic)
if ((this.props.allTopics || nextProps.allTopics) && !this.props.loadingRandomTopic && !nextProps.loadingRandomTopic && !this.props.randomTopic) { if ((this.props.allTopics || nextProps.allTopics) && !this.props.loadingRandomTopic && !nextProps.loadingRandomTopic && !this.props.randomTopic) {
@ -31,6 +30,7 @@ class Home extends React.Component {
<div> <div>
<RandomTopic <RandomTopic
topicName={ this.props.randomTopic || ''} topicName={ this.props.randomTopic || ''}
topicCount={ this.props.randomTopicCount }
videos = { this.props.randomTopicVideos || [] } videos = { this.props.randomTopicVideos || [] }
loading = { this.props.loadingAllTopics || this.props.loadingRandomTopic } loading = { this.props.loadingAllTopics || this.props.loadingRandomTopic }
/> />
@ -45,6 +45,7 @@ const mapStateToProps = state => ({
allTopics: state.topics.allTopics, allTopics: state.topics.allTopics,
loadingAllTopics: state.topics.loadingAllTopics, loadingAllTopics: state.topics.loadingAllTopics,
randomTopic: state.topics.randomTopic, randomTopic: state.topics.randomTopic,
randomTopicCount: static.topics.randomTopicCount,
loadingRandomTopic: state.topics.loadingRandomTopic, loadingRandomTopic: state.topics.loadingRandomTopic,
randomTopicVideos: state.topics.randomTopicVideos randomTopicVideos: state.topics.randomTopicVideos
}); });

3
src/reducers/topics.js
View File

@ -25,7 +25,8 @@ export default function(state={}, action) {
case LOADED_RANDOM_TOPIC: case LOADED_RANDOM_TOPIC:
return Object.assign({}, state, { return Object.assign({}, state, {
loadingRandomTopic: false, loadingRandomTopic: false,
randomTopic: action.payload.topic, randomTopic: action.payload.topic.name,
randomTopicCount: action.payload.topic.items,
randomTopicVideos: action.payload.videos randomTopicVideos: action.payload.videos
}); });

3
src/utils/get-random-topic.js
View File

@ -1,6 +1,5 @@
export default function getRandomTopic(allTopics, minVideos=4) { export default function getRandomTopic(allTopics, minVideos=4) {
const validTopics = allTopics.filter(topic => topic.items >= minVideos); const validTopics = allTopics.filter(topic => topic.items >= minVideos);
console.log('valid topics', validTopics); return validTopics[Math.floor(Math.random() * validTopics.length)];
return validTopics[Math.floor(Math.random() * validTopics.length)].name;
} }