scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 08:31:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Travis and Other Stuffs

Browse source
This commit is contained in:
The_Grits 2016-10-31 10:19:35 -04:00 committed by GitHub
parent 9f2cda0eaa
commit 8be3e11486
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/navigation/www/navigation.jsx
View file

@ -38,7 +38,8 @@ var Navigation = React.createClass({
},
getDefaultProps: function () {
return {
session: {}
session: {},
searchTerm: ''
};
},
componentDidMount: function () {
@ -223,6 +224,7 @@ var Navigation = React.createClass({
<Form onSubmit={this.onSearchSubmit}>
<Button type="submit" className="btn-search" />
<Input type="text"
value={this.props.searchTerm}
aria-label={formatMessage({id: 'general.search'})}
placeholder={formatMessage({id: 'general.search'})}
name="q" />
@ -347,7 +349,8 @@ var Navigation = React.createClass({
var mapStateToProps = function (state) {
return {
session: state.session,
permissions: state.permissions
permissions: state.permissions,
searchTerm: state.searchTerm
};
};

8
src/redux/navigation.js
View file

@ -9,10 +9,10 @@ module.exports.navigationReducer = function (state, action) {
state = '';
}
switch (action.type) {
case Types.SET_SEARCH_TERM:
return searchTerm;
default:
return state;
case Types.SET_SEARCH_TERM:
return action.searchTerm;
default:
return state;
}
};

3
src/views/search/search.jsx
View file

@ -1,6 +1,7 @@
var injectIntl = require('react-intl').injectIntl;
var FormattedMessage = require('react-intl').FormattedMessage;
var React = require('react');
var connect = require('react-redux').connect;
var render = require('../../lib/render.jsx');
var api = require('../../lib/api');
@ -149,6 +150,6 @@ var mapStateToProps = function (state) {
};
};
var ConnectedDetails = connect(mapStateToProps)(NavigationDetails);
var ConnectedDetails = connect(mapStateToProps)(Search);
render(<Page><ConnectedDetails /></Page>, document.getElementById('app'));