1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-25 15:41:42 +00:00

bumpup react (0.13.3->0.14.0), reacthmr work perfectly

This commit is contained in:
Rokt33r
2015-10-21 02:47:21 +09:00
parent 326c7a93fb
commit f6d2e898dc
12 changed files with 109 additions and 78 deletions

View File

@@ -92,22 +92,24 @@ function remap (state) {
let folderFilters = filters.filter(filter => filter.type === FOLDER_FILTER)
let textFilters = filters.filter(filter => filter.type === TEXT_FILTER)
let targetFolders = activeUser.Folders.filter(folder => {
return findWhere(folderFilters, {value: folder.name})
})
status.targetFolders = targetFolders
if (targetFolders.length > 0) {
articles = articles.filter(article => {
return findWhere(targetFolders, {id: article.FolderId})
if (activeUser.Folders != null) {
let targetFolders = activeUser.Folders.filter(folder => {
return findWhere(folderFilters, {value: folder.name})
})
}
if (textFilters.length > 0) {
articles = textFilters.reduce((articles, textFilter) => {
return articles.filter(article => {
return article.title.match(new RegExp(textFilter.value, 'i')) || article.content.match(new RegExp(textFilter.value, 'i'))
status.targetFolders = targetFolders
if (targetFolders.length > 0) {
articles = articles.filter(article => {
return findWhere(targetFolders, {id: article.FolderId})
})
}, articles)
}
if (textFilters.length > 0) {
articles = textFilters.reduce((articles, textFilter) => {
return articles.filter(article => {
return article.title.match(new RegExp(textFilter.value, 'i')) || article.content.match(new RegExp(textFilter.value, 'i'))
})
}, articles)
}
}
// Grab active article

View File

@@ -33,5 +33,8 @@ export default class ArticleTopBar extends React.Component {
ArticleTopBar.propTypes = {
search: PropTypes.string,
dispatch: PropTypes.func
dispatch: PropTypes.func,
status: PropTypes.shape({
search: PropTypes.string
})
}

View File

@@ -61,10 +61,13 @@
e.preventDefault()
}
})
var scriptUrl = process.env.BOOST_ENV === 'development'
? 'http://localhost:8080/assets/bundle.js'
: '../../compiled/main.js'
var scriptEl=document.createElement('script')
scriptEl.setAttribute("type","text/javascript")
scriptEl.setAttribute("src", scriptUrl)
document.getElementsByTagName("head")[0].appendChild(scriptEl)
</script>
<script type="text/javascript" src='../../compiled/main.js'></script>
<!--
<script src="http://localhost:8080/assets/main.js"></script>
-->
</body>
</html>

View File

@@ -9,6 +9,7 @@ import SignupPage from './SignupPage'
import HomePage from './HomePage'
import auth from 'boost/auth'
import store, { devToolElement } from 'boost/store'
let ReactDOM = require('react-dom')
require('../styles/main/index.styl')
function onlyUser (state, replaceState) {
@@ -28,10 +29,10 @@ let routes = (
let el = document.getElementById('content')
React.render((
ReactDOM.render((
<div>
<Provider store={store}>
{() => <Router>{routes}</Router>}
<Router>{routes}</Router>
</Provider>
{devToolElement}
</div>

View File

@@ -21,6 +21,7 @@ body
color textColor
font-size fontSize
font-weight 400
button, input, select
font-family "Lato"