Load More
@@ -146,4 +146,4 @@ export default class Post extends Component{
)
}
-}
\ No newline at end of file
+}
diff --git a/src/scripts/components/PostPanel/PostPanel.jsx b/src/scripts/components/PostPanel/PostPanel.jsx
index 64423fc..d72407d 100644
--- a/src/scripts/components/PostPanel/PostPanel.jsx
+++ b/src/scripts/components/PostPanel/PostPanel.jsx
@@ -1,7 +1,7 @@
import React,{ Component } from 'react'
import { Link } from 'react-router'
import {
- Col, ButtonToolbar,
+ Col, ButtonToolbar,
} from 'react-bootstrap'
import Moment from 'moment'
const _ = require('lodash')
@@ -9,7 +9,7 @@ const _ = require('lodash')
export default class PostPanel extends Component{
constructor(props) {
super(props);
-
+
this.state = {}
this.toggleRecommend = this._toggleRecommend.bind(this)
this.toggleBlock = this._toggleBlock.bind(this)
@@ -59,10 +59,10 @@ export default class PostPanel extends Component{
let skuDiv = ''
- if (this.props.post.toys !== undefined && this.props.post.toys !== null) {
+ if (this.props.post.toy !== undefined && this.props.post.toy !== null) {
skuDiv = (
-
- {this.props.post.toys.name.substring(0, 25)+'...'}
+
+ {this.props.post.toy.name.substring(0, 25)+'...'}
)
}
@@ -80,15 +80,15 @@ export default class PostPanel extends Component{
contentDiv = (
- 
+ 
{
this.props.post.photos.slice(1, this.props.post.photos.length).map(function (photo, i) {
return (
- 
)
}, this)
@@ -115,7 +115,7 @@ export default class PostPanel extends Component{
{this.props.post.tags.map(function (t) {
- return ({t.text}{" "} this.removeTag(t.id)}>);
+ return ({t.text}{" "} this.removeTag(t.id)}>);
},this)}
{skuDiv}
@@ -139,4 +139,4 @@ export default class PostPanel extends Component{
)
}
-}
\ No newline at end of file
+}
diff --git a/src/scripts/components/SkuList/index.js b/src/scripts/components/SkuList/index.js
index 98ba200..0fe3d98 100644
--- a/src/scripts/components/SkuList/index.js
+++ b/src/scripts/components/SkuList/index.js
@@ -1,23 +1,23 @@
import { connect } from 'react-redux'
-import SkuList from './SkuList'
-import { fetchSku, recommend, toggleR18, toggleRecommend, deleteSku, addSku } from '../../actions/skuAction'
+import ToyList from './ToyList'
+import { fetchToy, recommend, toggleR18, toggleRecommend, deleteToy, addToy } from '../../actions/toyAction'
const mapActionCreators = {
- fetchSku,
+ fetchToy,
recommend,
toggleR18,
toggleRecommend,
- deleteSku,
- addSku,
+ deleteToy,
+ addToy,
}
const mapStateToProps = (state) => {
- const { skus } = state.skuReducer.toJS()
- const loaded = state.skuReducer.get('loaded')
+ const { toys } = state.toyReducer.toJS()
+ const loaded = state.toyReducer.get('loaded')
return {
- skus,
+ toys,
loaded
}
}
-export default connect(mapStateToProps, mapActionCreators)(SkuList)
\ No newline at end of file
+export default connect(mapStateToProps, mapActionCreators)(ToyList)
diff --git a/src/scripts/components/SkuList/SkuList.jsx b/src/scripts/components/ToyList/ToyList.jsx
similarity index 73%
rename from src/scripts/components/SkuList/SkuList.jsx
rename to src/scripts/components/ToyList/ToyList.jsx
index 3277ef4..c145247 100644
--- a/src/scripts/components/SkuList/SkuList.jsx
+++ b/src/scripts/components/ToyList/ToyList.jsx
@@ -5,35 +5,35 @@ import {
} from 'react-bootstrap'
import { Link } from 'react-router'
-export default class SkuList extends Component{
+export default class toyList extends Component{
constructor(props) {
super(props)
-
+
this.state = {
- filter: '',
- query: '',
+ filter: '',
+ query: '',
sort: 'created'
}
this.onChangeSort = (e) => this.setState({sort:e.target.value})
this.onChangeFilter = (e) => this.setState({filter:e.target.value})
this.onChangeQuery = (e) => this.setState({query:e.target.value})
- this.search = () => this.props.fetchSku(this.state.filter,this.state.query.trim(),this.state.sort)
+ this.search = () => this.props.fetchToys(this.state.filter,this.state.query.trim(),this.state.sort)
this.recommend = this._recommend.bind(this)
this.toggleR18 = (id) => this.props.toggleR18(id)
this.toggleRecommend = (id) => this.props.toggleRecommend(id)
- this.deleteSku = this._deleteSku.bind(this)
- this.addSku = this._addSku.bind(this)
+ this.deletetoy = this._deletetoy.bind(this)
+ this.addtoy = this._addtoy.bind(this)
}
componentWillMount() {
if(!this.props.loaded){
- this.props.fetchSku(this.state.filter,this.state.query.trim(),this.state.sort)
+ this.props.fetchToys(this.state.filter,this.state.query.trim(),this.state.sort)
}
}
- _deleteSku(id) {
- if (confirm('Delete this SKU?')) {
- this.props.deleteSku(id)
+ _deletetoy(id) {
+ if (confirm('Delete this toy?')) {
+ this.props.deletetoy(id)
}
}
_recommend(id) {
@@ -41,9 +41,9 @@ export default class SkuList extends Component{
this.props.recommend(id)
}
}
- _addSku() {
+ _addtoy() {
if (confirm('创建一个新的玩具？')) {
- this.props.addSku()
+ this.props.addtoy()
}
}
render() {
@@ -53,7 +53,7 @@ export default class SkuList extends Component{
-
-
+
-
+
-@@ -116,10 +116,10 @@ export default class SkuList extends Component{{sku.name}
+{toy.name}
- {sku.company}
- {sku.release}
- {sku.money} + {toy.company}
+ {toy.release}
+ {toy.money}