-
+ );
+};
-const mapStateToProps = (state, ownProps) => ({
+const mapStateToProps = state => ({
chat: state.layouts.chat,
-})
-
+});
-export default connect(mapStateToProps)(App);
\ No newline at end of file
+export default connect(mapStateToProps)(App);
diff --git a/src/components/App/index.js b/src/components/App/index.js
index 0ce8d3c..f1f2a24 100644
--- a/src/components/App/index.js
+++ b/src/components/App/index.js
@@ -1,3 +1,3 @@
import App from './App';
-export default App;
\ No newline at end of file
+export default App;
diff --git a/src/components/Background/SolarStystem.jsx b/src/components/Background/SolarStystem.jsx
index 9cc96b8..eba0167 100644
--- a/src/components/Background/SolarStystem.jsx
+++ b/src/components/Background/SolarStystem.jsx
@@ -1,20 +1,20 @@
import React from 'react';
import styles from './SolarStystem.css';
-export default () => (
-
-
-
-
- )
- }
-}
+
-
-
-
- {this.props.children}
-
+
+
+
+
+
+
+
+
+
-
+ {props.children}
-
-
-
{
isOnline
?
- )
+ );
}
}
Barrage.contextTypes = {
- socket: React.PropTypes.object.isRequired
-}
+ socket: React.PropTypes.object.isRequired,
+};
-const mapStateToProps = (state, ownProps) => ({
- data: state.metadata.data
-})
+const mapStateToProps = state => ({
+ data: state.metadata.data,
+});
-export default connect(mapStateToProps)(Barrage)
\ No newline at end of file
+export default connect(mapStateToProps)(Barrage);
diff --git a/src/components/Barrage/BarrageItem.jsx b/src/components/Barrage/BarrageItem.jsx
index d7a333f..ea803de 100644
--- a/src/components/Barrage/BarrageItem.jsx
+++ b/src/components/Barrage/BarrageItem.jsx
@@ -1,50 +1,50 @@
import React from 'react';
-import styles from './Barrage.css';
-import EmojiItem from 'components/Emoji/EmojiItem.jsx';
+import EmojiItem from 'components/Emoji/EmojiItem';
import CategoryItem from 'components/CategoryItem';
+import styles from './Barrage.css';
const getBarrage = (props) => {
- switch (props.type) {
- case 'emoji':
- const asi = props.content.split('+') ;
- return (
-
- {/*{props.mmr ? {props.mmr} : ''}*/}
+ return (
+
+ {/* {props.mmr ? {props.mmr} : ''}*/}
- {
- typeTitle ? '' : {props.nickname}{typeText}:
+ {
+ typeTitle ? '' : {props.nickname}{typeText}:
}
-
- { barrage }
-
- )
-}
\ No newline at end of file
+
+ { barrage }
+
+ );
+};
diff --git a/src/components/Barrage/index.js b/src/components/Barrage/index.js
index 2cda94f..eaaad26 100644
--- a/src/components/Barrage/index.js
+++ b/src/components/Barrage/index.js
@@ -1,3 +1,3 @@
-import Barrage from './Barrage.jsx';
+import Barrage from './Barrage';
-export default Barrage;
\ No newline at end of file
+export default Barrage;
diff --git a/src/components/Category/Category.jsx b/src/components/Category/Category.jsx
index e7e346b..53f4270 100644
--- a/src/components/Category/Category.jsx
+++ b/src/components/Category/Category.jsx
@@ -1,64 +1,53 @@
import React from 'react';
import { connect } from 'react-redux';
-import { Link, browserHistory } from 'react-router';
-import styles from './Category.css';
-import { Scrollbars } from 'react-custom-scrollbars';
+import { Link } from 'react-router';
import { getCategory } from 'actions';
import Spinner from 'components/Spinner';
import Error from 'components/Error';
+import styles from './Category.css';
import config from '../../../config';
-class Category extends React.Component {
- constructor(props) {
- super(props)
- }
-
- componentDidMount() {
- // this.props.getCategory();
- }
+const Category = (props) => {
+ const { error, loading, done, data } = props.category;
+ const itemHtml = [];
- render() {
+ !!data.length && data.forEach((el, index) => {
+ const item = (
- ;;
- default:
- return
- ;
- }
-}
+ const item = props.item;
+
+ switch (props.type) {
+ case 'random':
+ const title = smallTitleHandler(props);
+
+ return (
+ );
+ default:
+ return (
+ );
+ }
+};
-const smallTitleHandler = (props) => {
- let result;
+class CategoryItem extends React.Component {
- props.category.data.forEach((el, index) => {
- if(props.item.type == el.name ) result = `${el.name_cn} | ${el.name_en}`
- });
+ constructor(props) {
+ super(props);
+ this.imageLoad = this.imageLoad.bind(this);
+ }
- return result;
-}
+ imageLoad(e) {
+ e.target.className = styles.imgFadeIn;
+ return false;
+ }
-const preUrlHandler = (items) => {
- let _preUrl = '?';
+ render() {
+ const filterSwitch = this.props.filterSwitch;
+ const item = this.props.item;
+ const styleType = this.props.type;
- if(!items.length) return '';
+ const notShow = (!filterSwitch || !this.props.filter || this.props.filter === item.platform) ? '' : 'notShow';
- items.forEach((el, index) => {
- _preUrl += `--${el.platform}+${JSON.stringify(el.roomId)}`;
- })
+ const online = this.props.online === true;
+ const onlineClass = online ? 'online' : '';
- return _preUrl;
-}
+ const outSide = item.platform === 'panda';
+ const outSideHtml = outSide ? 站外资源 : '';
+ const outSidId = item.roomId;
-class CategoryItem extends React.Component {
+ const typeHtml = typeHtmlHandler(this.props);
+
+ return (
+ {
+ !outSide ? this.props.addItem(item) : window.open(`http://panda.tv/${outSidId}`);
+ }}
+ className={classnames(styles[styleType], styles[notShow], styles[onlineClass])}
+ >
- constructor(props) {
- super(props)
- this.imageLoad = this.imageLoad.bind(this)
- }
-
- imageLoad(e) {
- e.target.className = styles.imgFadeIn;
- return false
- }
-
- render() {
-
- const filterSwitch = this.props.filterSwitch;
- const item = this.props.item;
- const styleType = this.props.type;
-
- const notShow = (!filterSwitch || !this.props.filter || this.props.filter == item.platform ) ? '' : 'notShow';
-
- const online = this.props.online == true ? true : false;
- const onlineClass = online ? 'online' : '';
-
- const outSide = item.platform === 'panda';
- const outSideHtml = outSide ? 站外资源 : '';
- const outSidId = item.roomId;
-
- const typeHtml = typeHtmlHandler(this.props);
-
- return (
- {
- !outSide ? this.props.addItem(item) : window.open(`http://panda.tv/${outSidId}`)
- }}
- className={classnames(styles[styleType], styles[notShow], styles[onlineClass])}
- >
-
- {/*
- {
- this.props.type == 'search' || this.props.type == 'random'
+ {/*
+ {
+ this.props.type == 'search' || this.props.type === 'random'
? item.anchor.substr(0, 1)
:
-
- 
-
+
+
+
}
-
- {outSideHtml}
- {typeHtml}
-
- )
- }
+
+ {outSideHtml}
+ {typeHtml}
+
+ );
+ }
}
-const mapStateToProps = (state, ownProps) => ({
- filter: state.categorys.filter,
- category: state.category,
- screenItems: state.screenItems,
-})
-
-const mapDispatchToProps = (dispatch, ownProps) => ({
- addItem: (item) => dispatch(screenItemsAdd(item)),
-})
+const mapStateToProps = state => ({
+ filter: state.categorys.filter,
+ category: state.category,
+ screenItems: state.screenItems,
+});
+const mapDispatchToProps = dispatch => ({
+ addItem: item => dispatch(screenItemsAdd(item)),
+});
-export default connect(mapStateToProps, mapDispatchToProps)(CategoryItem)
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(CategoryItem);
diff --git a/src/components/CategoryItem/index.js b/src/components/CategoryItem/index.js
index 76d1d7e..6e71b96 100644
--- a/src/components/CategoryItem/index.js
+++ b/src/components/CategoryItem/index.js
@@ -1,3 +1,3 @@
-import CategoryItem from './CategoryItem.jsx';
+import CategoryItem from './CategoryItem';
-export default CategoryItem;
\ No newline at end of file
+export default CategoryItem;
diff --git a/src/components/Categorys/Categorys.jsx b/src/components/Categorys/Categorys.jsx
index 7e332a8..1529da1 100644
--- a/src/components/Categorys/Categorys.jsx
+++ b/src/components/Categorys/Categorys.jsx
@@ -1,128 +1,117 @@
import React from 'react';
import { connect } from 'react-redux';
-import { findDOMNode } from 'react-dom';
import classnames from 'classnames';
-import styles from './Categorys.css';
import CategoryItem from 'components/CategoryItem';
import Error from 'components/Error';
import Spinner from 'components/Spinner';
-import { IconZoom, IconMini } from 'components/Icons';
import { forceCheck } from 'react-lazyload';
-
-import { Scrollbars } from 'react-custom-scrollbars';
-import IconButton from 'material-ui/IconButton';
-import CloseIco from 'material-ui/svg-icons/navigation/close';
-
-import {getCategorys, filterCategorys} from 'actions';
+import { getCategorys, filterCategorys } from 'actions';
+import styles from './Categorys.css';
const getData = (props) => {
props.getCategorys(props.params.name);
-}
-
+};
const preTypeTitle = (props) => {
+ let title;
- let _title;
+ !!props.category.data.length && props.category.data.forEach((el) => {
+ if (el.name === props.params.name) return title =
- {loading ?
-
+
+
+
+
+ {loading ?
+
- )
+ );
}
}
-const mapStateToProps = (state, ownProps) => ({
- data: state.categorys,
- category: state.category,
- filter: state.categorys.filter,
-})
+const mapStateToProps = state => ({
+ data: state.categorys,
+ category: state.category,
+ filter: state.categorys.filter,
+});
-const mapDispatchToProps = (dispatch, ownProps) => ({
- filterCategorys: (clas) => dispatch(filterCategorys(clas)),
- getCategorys: (clas) => dispatch(getCategorys(clas)),
-})
+const mapDispatchToProps = dispatch => ({
+ filterCategorys: clas => dispatch(filterCategorys(clas)),
+ getCategorys: clas => dispatch(getCategorys(clas)),
+});
-export default connect(mapStateToProps, mapDispatchToProps)(Categorys)
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(Categorys);
diff --git a/src/components/Categorys/index.js b/src/components/Categorys/index.js
index 2a64589..df66e32 100644
--- a/src/components/Categorys/index.js
+++ b/src/components/Categorys/index.js
@@ -1,3 +1,3 @@
-import Categorys from './Categorys.jsx';
+import Categorys from './Categorys';
-export default Categorys;
\ No newline at end of file
+export default Categorys;
diff --git a/src/components/Changelog/Changelog.jsx b/src/components/Changelog/Changelog.jsx
index 75c201a..4d42caa 100644
--- a/src/components/Changelog/Changelog.jsx
+++ b/src/components/Changelog/Changelog.jsx
@@ -1,90 +1,88 @@
import React from 'react';
import { connect } from 'react-redux';
-import { browserHistory, Redirect } from 'react-router';
-
import Dialog from 'material-ui/Dialog';
import FlatButton from 'material-ui/FlatButton';
import styles from './Changelog.css';
class ChangeLog extends React.Component {
- constructor(props) {
- super(props)
- this.closeHandler = this.closeHandler.bind(this)
- this.state = {
- open: false,
- }
- }
+ constructor(props) {
+ super(props);
+ this.closeHandler = this.closeHandler.bind(this);
+ this.state = {
+ open: false,
+ };
+ }
- componentDidUpdate() {
- const needShowChangeLog = localStorage.getItem('needShowChangeLog');
- const version = this.props.metadata.version;
+ componentDidUpdate() {
+ const needShowChangeLog = localStorage.getItem('needShowChangeLog');
+ const version = this.props.metadata.version;
- if ( version !== undefined && (needShowChangeLog !== version || needShowChangeLog === null)) {
- localStorage.setItem('needShowChangeLog', version);
- this.closeHandler()
- }
+ if (version !== undefined && (needShowChangeLog !== version || needShowChangeLog === null)) {
+ localStorage.setItem('needShowChangeLog', version);
+ this.closeHandler();
}
+ }
- closeHandler() {
- this.setState({
- open: true,
- })
- }
+ closeHandler() {
+ this.setState({
+ open: true,
+ });
+ }
- render() {
-
-
- return (
-
+ );
+ }
}
-const mapStateToProps = (state, ownProps) => ({
+const mapStateToProps = state => ({
metadata: state.metadata.data,
-})
+});
-export default connect(mapStateToProps)(ChangeLog);
\ No newline at end of file
+export default connect(mapStateToProps)(ChangeLog);
diff --git a/src/components/Changelog/index.js b/src/components/Changelog/index.js
index b7ef1ec..badbee5 100644
--- a/src/components/Changelog/index.js
+++ b/src/components/Changelog/index.js
@@ -1,3 +1,3 @@
import Changelog from './Changelog';
-export default Changelog;
\ No newline at end of file
+export default Changelog;
diff --git a/src/components/Chat/Chat.jsx b/src/components/Chat/Chat.jsx
index 8b232e5..6a849ed 100644
--- a/src/components/Chat/Chat.jsx
+++ b/src/components/Chat/Chat.jsx
@@ -7,34 +7,30 @@ import ChatInput from 'components/Chat/ChatInput.jsx';
import ChatSetting from 'components/Chat/ChatSetting.jsx';
import config from '../../../config';
-const API_HOST = `${config.ChatHOST}`
+const API_HOST = `${config.ChatHOST}`;
import styles from './Chat.css';
-const Chat = (props) =>{
+const Chat = (props) => {
+ const toggleClass = props.chatToggle ? '' : 'chatClose';
- const toggleClass = props.chatToggle ? '' : 'chatClose';
+ return (
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+export default () => (
+
+
+);
diff --git a/src/components/Background/index.js b/src/components/Background/index.js
index 24b2cd0..9a6ad3c 100644
--- a/src/components/Background/index.js
+++ b/src/components/Background/index.js
@@ -1,5 +1,5 @@
import BgSolarStystem from './SolarStystem';
export {
- BgSolarStystem
-}
\ No newline at end of file
+ BgSolarStystem,
+};
diff --git a/src/components/Barrage/Barrage.jsx b/src/components/Barrage/Barrage.jsx
index 6387938..fe63389 100644
--- a/src/components/Barrage/Barrage.jsx
+++ b/src/components/Barrage/Barrage.jsx
@@ -1,23 +1,22 @@
import React from 'react';
import { connect } from 'react-redux';
-import { Socket, Event } from 'react-socket-io';
+import { Event } from 'react-socket-io';
import { Scrollbars } from 'react-custom-scrollbars';
-import BarrageItem from './BarrageItem';
import Error from 'components/Error';
-
+import BarrageItem from './BarrageItem';
import styles from './Barrage.css';
const barrageSplit = (barrages, barrage) => {
- let newBarrage = barrages.concat();
+ const newBarrage = barrages.concat();
- if(newBarrage.length > 100) {
- newBarrage.shift()
+ if (newBarrage.length > 100) {
+ newBarrage.shift();
}
- newBarrage.push(barrage)
+ newBarrage.push(barrage);
return newBarrage;
-}
+};
class Barrage extends React.Component {
constructor(props, context) {
@@ -29,7 +28,7 @@ class Barrage extends React.Component {
this.state = {
barrages: [],
online: false,
- }
+ };
}
componentWillUpdate() {
@@ -37,29 +36,26 @@ class Barrage extends React.Component {
}
onMessage(message) {
- console.log(message)
- this.setState({
- barrages: barrageSplit(this.state.barrages, message),
- })
+ this.setState({
+ barrages: barrageSplit(this.state.barrages, message),
+ });
this.refs.barrageScroll.scrollToBottom();
}
onMessageLogin(message) {
-
this.setState({
barrages: barrageSplit(this.state.barrages, message),
- })
+ });
}
-
+
connectError() {
this.setState({
online: false,
- })
+ });
}
connectSuccess() {
-
this.context.socket.emit('login', {
nickname: `${this.props.data.user ? this.props.data.user.nickname : '弹幕大神'}`,
color: localStorage.getItem('__barrage_name_color'),
@@ -67,47 +63,46 @@ class Barrage extends React.Component {
this.setState({
online: true,
- })
-
+ });
}
render() {
const isOnline = this.state.online;
- let barragesHtml = [];
+ const barragesHtml = [];
this.state.barrages.forEach((barrage, key) => {
- barragesHtml.push(
+
+
+
+
+
+
+
+
+
+
+
-)
\ No newline at end of file
+ -
- {barragesHtml}
-
{ items }
;
-
- case 'log':
- let ip = props.user.ip ? props.user.ip.city : '';
-
- return 欢迎{` ${props.user.nickname}` }!
-
- default:
- return props.content
- }
-}
+ switch (props.type) {
+ case 'emoji':
+ const asi = props.content.split('+');
+ return (
+ { items }
;
+
+ case 'log':
+ // const ip = props.user.ip ? props.user.ip.city : '';
+
+ return 欢迎{` ${props.user.nickname}` }!;
+
+ default:
+ return props.content;
+ }
+};
export default (props) => {
- const namecolor = props.color || '#6f6f6f';
- const barrage = getBarrage(props);
- const typeText = props.type == 'screen' ? '正在看' : '';
- const typeTitle = props.type == 'log' ? true : false;
+ const namecolor = props.color || '#6f6f6f';
+ const barrage = getBarrage(props);
+ const typeText = props.type === 'screen' ? '正在看' : '';
+ const typeTitle = props.type === 'log';
- return (
-
+
);
+ itemHtml.push(item);
+ });
- const {error: error, loading: loading, done: done, data: data} = this.props.category;
- let itemHtml = [];
+ for (let k = 0; k < 10; k++) {
+ itemHtml.push();
+ }
- !!data.length && data.forEach((el, index) => {
- let _item =
+
+ 
+ {el.name_cn} | {el.name_en}
+{el.count} 名主播
+ +
-
- itemHtml.push(_item)
- });
+ return (
+
-
-
- {el.name_cn} | {el.name_en}
-{el.count} 名主播
- -
- for (let k = 0; k < 10; k++) {
- itemHtml.push()
- }
+
- )
- }
-}
-const mapStateToProps = (state, ownProps) => ({
- category: state.category,
-})
+const mapStateToProps = state => ({
+ category: state.category,
+});
-const mapDispatchToProps = (dispatch, ownProps) => ({
- getCategory: () => dispatch(getCategory())
-})
+const mapDispatchToProps = dispatch => ({
+ getCategory: () => dispatch(getCategory()),
+});
-export default connect(mapStateToProps, mapDispatchToProps)(Category);
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(Category);
diff --git a/src/components/Category/index.js b/src/components/Category/index.js
index de55532..af24760 100644
--- a/src/components/Category/index.js
+++ b/src/components/Category/index.js
@@ -1,3 +1,3 @@
-import Category from './Category.jsx';
+import Category from './Category';
-export default Category;
\ No newline at end of file
+export default Category;
diff --git a/src/components/CategoryItem/CategoryItem.jsx b/src/components/CategoryItem/CategoryItem.jsx
index dc374da..28b5f9d 100644
--- a/src/components/CategoryItem/CategoryItem.jsx
+++ b/src/components/CategoryItem/CategoryItem.jsx
@@ -1,137 +1,121 @@
import React from 'react';
import { connect } from 'react-redux';
-import { Link, browserHistory } from 'react-router';
import LazyLoad from 'react-lazyload';
-import styles from './CategoryItem.css';
import classnames from 'classnames';
import ActionEye from 'material-ui/svg-icons/action/visibility';
-import PlayAdd from 'material-ui/svg-icons/av/playlist-add';
-import { IconUser, IconGame, } from '../Icons';
+import { screenItemsAdd } from 'actions';
+import { IconUser } from '../Icons';
+import styles from './CategoryItem.css';
-import {screenItemsAdd} from 'actions';
+
+const smallTitleHandler = (props) => {
+ let result;
+
+ props.category.data.forEach((el) => {
+ if (props.item.type == el.name) result = `${el.name_cn} | ${el.name_en}`;
+ });
+
+ return result;
+};
const typeHtmlHandler = (props) => {
- let item = props.item;
-
- switch(props.type) {
- case 'random':
- let _title = smallTitleHandler(props);
-
- return
+ {loading ?
- return (
-
-
-
+ );
+};
-
- {loading ?
+
- {item.anchor}
-
-
- {_title}
-
-
- {item.title}
-
-
-
-
+ {item.anchor}
+
+
+ {title}
+
+
+ {item.title}
+
+
+
+ 离线
- 离线
+ {el.name_cn}{el.name_en}
; + }); - !!props.category.data.length && props.category.data.forEach((el, index) => { - if(el.name == props.params.name) return _title ={el.name_cn}{el.name_en}
- }) - - return _title; -} + return title; +}; const isFavorite = (item, favoriteList) => { - let _target = false; + let target = false; - if(favoriteList instanceof Array) { - favoriteList.forEach((list, index) => { - if(item.roomId == list.roomId && item.anchor == list.anchor) { - _target = true; + if (favoriteList instanceof Array) { + favoriteList.forEach((list) => { + if (item.roomId === list.roomId && item.anchor === list.anchor) { + target = true; } - }) - }else { - _target = false; + }); + } else { + target = false; } - return _target; -} + return target; +}; class Categorys extends React.Component { constructor(props) { - super(props) - this.filterHander = this.filterHander.bind(this) - } - - filterHander(clas) { - this.props.filterCategorys(clas) + super(props); + this.filterHander = this.filterHander.bind(this); } componentDidMount() { - getData(this.props) + getData(this.props); } componentDidUpdate() { - forceCheck() + forceCheck(); + } + + filterHander(clas) { + this.props.filterCategorys(clas); } render() { // const typeName = preTypeTitle(this.props); - const typeName = preTypeTitle(this.props) ; + const typeName = preTypeTitle(this.props); const loading = this.props.data.loading; const isError = this.props.data.error; const items = this.props.data.data; const filterName = this.props.data.filter; - let itemsHtml = []; - let itemsPlatform = ['']; - let favoriteList = this.props.favorite; + const itemsHtml = []; + const itemsPlatform = ['']; + const favoriteList = this.props.favorite; - if(items instanceof Array) { + if (items instanceof Array) { items.forEach((item, key) => { - if(itemsPlatform.indexOf(item.platform) == -1 ) itemsPlatform.push(item.platform); + if (itemsPlatform.indexOf(item.platform) === -1) itemsPlatform.push(item.platform); - itemsHtml.push(
- {typeName}
-
- {
- itemsPlatform.length > 1 && itemsPlatform.map((platform, key) => {
- return this.filterHander(platform)} key={key}>{platform || 'All'}
- })
+ {typeName}
+
+ {
+ itemsPlatform.length > 1 && itemsPlatform.map((platform, key) => this.filterHander(platform)} key={key}>{platform || 'All'})
}
-
-
-
-
-
-
-
+
+
-
-
-
-
-
- {colorsHtml}
-
- {/*
+ return (
+
+
+
+ );
+ }
}
-const mapDispatchToProps = (dispatch, ownProps) => ({
- alertOpen: (message) => dispatch(alertOpen(message)),
-})
+const mapDispatchToProps = dispatch => ({
+ alertOpen: message => dispatch(alertOpen(message)),
+});
-export default connect(null, mapDispatchToProps)(ChatSetting);
\ No newline at end of file
+export default connect(null, mapDispatchToProps)(ChatSetting);
diff --git a/src/components/Chat/index.js b/src/components/Chat/index.js
index 67c59fb..19fedf9 100644
--- a/src/components/Chat/index.js
+++ b/src/components/Chat/index.js
@@ -1,3 +1,3 @@
-import Chat from './Chat.jsx';
+import Chat from './Chat';
-export default Chat;
\ No newline at end of file
+export default Chat;
diff --git a/src/components/Emoji/Emoji.jsx b/src/components/Emoji/Emoji.jsx
index cf400bf..2cd8676 100644
--- a/src/components/Emoji/Emoji.jsx
+++ b/src/components/Emoji/Emoji.jsx
@@ -2,99 +2,99 @@ import React from 'react';
import { connect } from 'react-redux';
import { findDOMNode } from 'react-dom';
import { Scrollbars } from 'react-custom-scrollbars';
-import styles from './Emoji.css';
import classnames from 'classnames';
-import EmojiItem from './EmojiItem.jsx'
+import EmojiItem from './EmojiItem';
+import styles from './Emoji.css';
class Emoji extends React.Component {
- constructor(props, context) {
- super(props, context)
- this.handleDocumentClick = this.handleDocumentClick.bind(this)
- this.toggleOpen = this.toggleOpen.bind(this)
- this.sendMessage = this.sendMessage.bind(this)
- this.state = {
- isOpen: false,
- }
- }
-
- componentDidMount() {
- document.addEventListener('click', this.handleDocumentClick, false)
+ constructor(props, context) {
+ super(props, context);
+ this.handleDocumentClick = this.handleDocumentClick.bind(this);
+ this.toggleOpen = this.toggleOpen.bind(this);
+ this.sendMessage = this.sendMessage.bind(this);
+ this.state = {
+ isOpen: false,
+ };
+ }
+
+ componentDidMount() {
+ document.addEventListener('click', this.handleDocumentClick, false);
+ }
+
+ componentWillUnmount() {
+ document.removeEventListener('click', this.handleDocumentClick);
+ }
+
+ handleDocumentClick(event) {
+ if (!findDOMNode(this).contains(event.target)) {
+ this.setState({ isOpen: false });
}
+ }
- componentWillUnmount() {
- document.removeEventListener('click', this.handleDocumentClick)
- }
+ toggleOpen() {
+ return this.setState({ isOpen: !this.state.isOpen });
+ }
- handleDocumentClick (event) {
- if (!findDOMNode(this).contains(event.target)) {
- this.setState({ isOpen: false })
- }
+ sendMessage(ais) {
+ if (!this.context.socket || this.context.socket.status !== 'connected') {
+ console.warn('Socket is unavailable!');
+ return;
}
- toggleOpen() {
- return this.setState({isOpen: !this.state.isOpen})
+ const message = {
+ content: ais,
+ color: localStorage.getItem('__barrage_name_color'),
+ nickname: `${this.props.data.user ? this.props.data.user.nickname : '弹幕大神'}`,
+ mmr: this.props.mmr,
+ };
+
+ this.context.socket.emit('message:send:emoji', message);
+ }
+
+ render() {
+ const activeClass = this.state.isOpen ? 'open' : '';
+ const x = 42;
+ const y = 31;
+ const items = [];
+ let count = 0;
+
+ for (let yais = 0; yais < y; yais++) {
+ for (let xais = 0; xais < x; xais++) {
+ count++;
+ items.push(
+ 名称颜色
-
+ return (
+
+
+
+
+
+ 名称颜色
+
+ {colorsHtml}
+
+ {/*
{
console.log(isInputChecked)
@@ -105,19 +100,19 @@ class ChatSetting extends React.Component {
}}
labelStyle={{
color:'#888',
- }}
- label="夜间模式"
+ }}
+ label="夜间模式"
/>
*/}
-
-
-
- )
- }
+
名称颜色
+
{
console.log(isInputChecked)
@@ -105,19 +100,19 @@ class ChatSetting extends React.Component {
}}
labelStyle={{
color:'#888',
- }}
- label="夜间模式"
+ }}
+ label="夜间模式"
/>
*/}
-
-
-
- {items}
-
-
-
- )
- }
+ return (
+ this.toggleOpen() } className={styles.style}>
-
-
+
- { loading ?
- )
- }
+ return (
+
+ { loading ?
+ );
+ }
}
-const mapStateToProps = (state, ownProps) => ({
- metadata: state.metadata,
- screenItems: state.screenItems.data,
-})
-
-const mapDispatchToProps = (dispatch) => ({
+const mapStateToProps = state => ({
+ metadata: state.metadata,
+ screenItems: state.screenItems.data,
+});
-})
-export default connect(mapStateToProps, mapDispatchToProps)(Header)
\ No newline at end of file
+export default connect(mapStateToProps)(Header);
diff --git a/src/components/Header/index.js b/src/components/Header/index.js
index be30249..a9ce105 100644
--- a/src/components/Header/index.js
+++ b/src/components/Header/index.js
@@ -1,3 +1,3 @@
-import Header from './Header.jsx';
+import Header from './Header';
-export default Header;
\ No newline at end of file
+export default Header;
diff --git a/src/components/Hot/Hot.jsx b/src/components/Hot/Hot.jsx
index 3f49d77..68dba4c 100644
--- a/src/components/Hot/Hot.jsx
+++ b/src/components/Hot/Hot.jsx
@@ -1,72 +1,64 @@
import React from 'react';
import { connect } from 'react-redux';
import { browserHistory } from 'react-router';
-import classnames from 'classnames';
import CategoryItem from 'components/CategoryItem';
import Spinner from 'components/Spinner';
-import { Scrollbars } from 'react-custom-scrollbars';
-import { forceCheck } from 'react-lazyload';
-import {getRecommend } from 'actions';
-
+import { getRecommend } from 'actions';
import styles from './Hot.css';
class Hot extends React.Component {
- constructor(props) {
- super(props)
+ constructor(props) {
+ super(props);
+ }
- this.moreCategory = this.moreCategory.bind(this)
- }
+ componentDidMount() {
+ this.props.getRecommend();
+ }
- componentDidMount() {
- this.props.getRecommend();
- }
-
- moreCategory(clas) {
- browserHistory.push(`/categorys/${clas}`)
- }
+ moreCategory(clas) {
+ browserHistory.push(`/categorys/${clas}`);
+ }
- render() {
+ render() {
+ const { loading, error, done, data } = this.props.recommend;
+ const itemsHtml = [];
- const {loading: loading, error: error, done: done, data: data } = this.props.recommend;
- let itemsHtml = [];
+ for (const key in data) {
+ const items = data[key];
+ itemsHtml.push(
-
this.toggleOpen()} className={styles.style} />
+
+
+
+ {items}
+
+
+
+ );
+ }
}
Emoji.contextTypes = {
- socket: React.PropTypes.object.isRequired
-}
+ socket: React.PropTypes.object.isRequired,
+};
-const mapStateToProps = (state, ownProps) => ({
- data: state.metadata.data
-})
+const mapStateToProps = state => ({
+ data: state.metadata.data,
+});
-export default connect(mapStateToProps)(Emoji)
\ No newline at end of file
+export default connect(mapStateToProps)(Emoji);
diff --git a/src/components/Emoji/EmojiItem.jsx b/src/components/Emoji/EmojiItem.jsx
index f5bc1a5..a40f325 100644
--- a/src/components/Emoji/EmojiItem.jsx
+++ b/src/components/Emoji/EmojiItem.jsx
@@ -1,16 +1,16 @@
import React from 'react';
-import styles from './EmojiItem.css';
import classnames from 'classnames';
+import styles from './EmojiItem.css';
export default (props) => {
- const clickEvent = props.e ? props.e : null;
- const barrageClass = !clickEvent ? 'barrage' : '';
+ const clickEvent = props.e ? props.e : null;
+ const barrageClass = !clickEvent ? 'barrage' : '';
- return (
-
- )
-}
\ No newline at end of file
+ return (
+
+ );
+};
diff --git a/src/components/Emoji/index.js b/src/components/Emoji/index.js
index 4d5bd51..2985671 100644
--- a/src/components/Emoji/index.js
+++ b/src/components/Emoji/index.js
@@ -1,3 +1,3 @@
import Emoji from './Emoji';
-export default Emoji;
\ No newline at end of file
+export default Emoji;
diff --git a/src/components/Error/Error.jsx b/src/components/Error/Error.jsx
index f74e995..4d75b3f 100644
--- a/src/components/Error/Error.jsx
+++ b/src/components/Error/Error.jsx
@@ -1,9 +1,9 @@
import React from 'react';
import styles from './Error.css';
-export default (props) => (
-
- 
-
-)
\ No newline at end of file
+export default props => (
+ {props.content}
-
+
+
+);
diff --git a/src/components/Error/index.js b/src/components/Error/index.js
index 116ac99..591ec17 100644
--- a/src/components/Error/index.js
+++ b/src/components/Error/index.js
@@ -1,2 +1,3 @@
-import Error from './Error.jsx';
-export default Error;
\ No newline at end of file
+import Error from './Error';
+
+export default Error;
diff --git a/src/components/Favorite/Favorite.jsx b/src/components/Favorite/Favorite.jsx
index b1f502a..8e40868 100644
--- a/src/components/Favorite/Favorite.jsx
+++ b/src/components/Favorite/Favorite.jsx
@@ -1,87 +1,78 @@
import React from 'react';
import { connect } from 'react-redux';
-import { findDOMNode } from 'react-dom';
-import { forceCheck } from 'react-lazyload';
-import styles from './Favorite.css';
-import classnames from 'classnames';
import CategoryItem from 'components/CategoryItem';
import Spinner from 'components/Spinner';
import Error from 'components/Error';
import Random from 'components/Random';
import { Scrollbars } from 'react-custom-scrollbars';
-
-import IconButton from 'material-ui/IconButton';
-import FavoriteBroIco from 'material-ui/svg-icons/action/favorite-border';
-
import { getOnline } from 'actions';
+import styles from './Favorite.css';
const onlineFiter = (item, onlines) => {
- let _target = false;
+ let target = false;
- onlines.forEach((online, index) => {
- if(online.anchor == item.anchor && online.roomId == item.roomId) _target = true;
- })
+ onlines.forEach((online, index) => {
+ if (online.anchor === item.anchor && online.roomId === item.roomId) target = true;
+ });
- return _target;
-}
+ return target;
+};
class Favorite extends React.Component {
- constructor(props) {
- super(props)
- }
-
- componentWillMount() {
- let data = this.props.favorite;
- this.props.getOnline(data)
- }
+ constructor(props) {
+ super(props);
+ }
- render() {
+ componentWillMount() {
+ const data = this.props.favorite;
+ this.props.getOnline(data);
+ }
- let favoriteList = this.props.favorite;
- let onlineFavoriteList = this.props.online.data;
- const {loading: loading, error: error, done: done } = this.props.online;
- let favoriteHtml = [];
+ render() {
+ const favoriteList = this.props.favorite;
+ const onlineFavoriteList = this.props.online.data;
+ const { loading, error, done } = this.props.online;
+ const favoriteHtml = [];
- if(favoriteList instanceof Array) {
- favoriteList.forEach((item, index) => {
- let online = onlineFiter(item, onlineFavoriteList);
- if(online) {
- favoriteHtml.unshift({props.content}
+
-
+ const html = favoriteHtml.length > 0
+ ? favoriteHtml
+ : (
+
);
- return (
-
-
- )
- }
+ return (
+ 正在关注
-
- {loading ?
- { done || error ? _html : ''}
-
-
-
+
+ );
+ }
}
-const mapStateToProps = (state, ownProps) => ({
- online: state.online,
- favorite: state.favorite.data,
-})
+const mapStateToProps = state => ({
+ online: state.online,
+ favorite: state.favorite.data,
+});
-const mapDispatchToProps = (dispatch, ownProps) => ({
- getOnline: (data) => dispatch(getOnline(data)),
-})
+const mapDispatchToProps = dispatch => ({
+ getOnline: data => dispatch(getOnline(data)),
+});
-export default connect(mapStateToProps, mapDispatchToProps)(Favorite);
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(Favorite);
diff --git a/src/components/Favorite/index.js b/src/components/Favorite/index.js
index d8c37c8..50c4628 100644
--- a/src/components/Favorite/index.js
+++ b/src/components/Favorite/index.js
@@ -1,3 +1,3 @@
import Favorite from './Favorite';
-export default Favorite;
\ No newline at end of file
+export default Favorite;
diff --git a/src/components/Footer/Bug.jsx b/src/components/Footer/Bug.jsx
deleted file mode 100644
index 4184bf7..0000000
--- a/src/components/Footer/Bug.jsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react';
-import Dialog from 'material-ui/Dialog';
-import FlatButton from 'material-ui/FlatButton';
-import IconButton from 'material-ui/IconButton';
-import styles from './Footer.css';
-
-import IconBug from 'material-ui/svg-icons/action/bug-report';
-/**
- * Dialog with action buttons. The actions are passed in as an array of React objects,
- * in this example [FlatButtons](/#/components/flat-button).
- *
- * You can also close this dialog by clicking outside the dialog, or with the 'Esc' key.
- */
-export default class Cheese extends React.Component {
- constructor(props) {
- super(props)
- this.handleOpen = this.handleOpen.bind(this)
- this.handleClose = this.handleClose.bind(this)
-
- this.state = {
- open: false,
- };
- }
-
- handleOpen() {
- this.setState({open: true});
- };
-
- handleClose() {
- this.setState({open: false});
- };
-
- render() {
- const actions = [
- 正在关注
+
+ {loading ?
+ { done || error ? html : ''}
+
+
+
- this.handleOpen()}
- >
-
-
-
- );
- }
-}
\ No newline at end of file
diff --git a/src/components/Footer/Cheese.jsx b/src/components/Footer/Cheese.jsx
deleted file mode 100644
index de07096..0000000
--- a/src/components/Footer/Cheese.jsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import React from 'react';
-import {connect} from 'react-redux';
-import Dialog from 'material-ui/Dialog';
-import FlatButton from 'material-ui/FlatButton';
-import IconButton from 'material-ui/IconButton';
-import styles from './Footer.css';3
-import TextField from 'material-ui/TextField';
-
-import {
- alertOpen,
- getCheese,
- } from 'actions';
-import {IconCheese} from '../Icons';
-
-/**
- * Dialog with action buttons. The actions are passed in as an array of React objects,
- * in this example [FlatButtons](/#/components/flat-button).
- *
- * You can also close this dialog by clicking outside the dialog, or with the 'Esc' key.
- */
-class Cheese extends React.Component {
- constructor(props) {
- super(props)
- this.handleOpen = this.handleOpen.bind(this)
- this.handleClose = this.handleClose.bind(this)
- this.handleCheese = this.handleCheese.bind(this)
- this.handleSubmit = this.handleSubmit.bind(this)
-
- this.state = {
- open: false,
- };
- }
-
- handleOpen() {
- this.setState({open: true});
- };
-
- handleClose() {
- this.setState({open: false});
- };
-
- handleSubmit() {
- this.props.alertOpen('RUARUA.live有您的支持甚感荣幸, 24小时之内您将出现在赞助榜单中.')
- //this.props.getCheese() 等待cheese接口
- this.handleClose()
- }
-
- handleCheese() {
- this.setState({
- cheese: true,
- })
- }
-
- render() {
- const submitText = '扫码赞助之后请点这里';
- const submitAction = this.handleSubmit;
-
- const actions = [
-
- this.handleOpen()}
- >
-
-
-
- );
- }
-}
-
-const mapDispatchToProps = (dispatch, ownProps) => ({
- alertOpen: (clas) => dispatch(alertOpen(clas)),
- getCheese: (body) => dispatch(getCheese(body)),
-})
-
-export default connect(null, mapDispatchToProps)(Cheese)
\ No newline at end of file
diff --git a/src/components/Footer/Footer.css b/src/components/Footer/Footer.css
deleted file mode 100644
index a3ed3fd..0000000
--- a/src/components/Footer/Footer.css
+++ /dev/null
@@ -1,76 +0,0 @@
-.btn {
-
- & svg {
- opacity: .3;
- color:#fff !important;
- }
-
- & button:hover {
-
- & svg {
- opacity: 1;
- }
- }
-}
-.outerClass {
- padding: 0 !important;
-}
-
-.contentClass {
- max-width: 568px !important;
-}
-
-.overlayClass {
- background:rgba(0, 0, 0, .9) !important;
-}
-
-.cheeseContent {
-
- & .payContent {
- position: relative;
- margin: 20px 0;
-
- & .payBox {
- position: absolute;
- bottom: 0;
- right: 0;
-
- & div {
- display: inline-block;
- }
-
- & p {
- font-size: 12px;
- margin: 2px 0;
- text-align: center;
- }
-
- & img {
- width: 100px;
- margin-left: 10px;
- }
- }
- }
-
- & .cheeseSvgBox {
- padding: 15px;
- border: 2px solid #ffce4d;
- border-radius: 50%;
- width: 48px;
-
- & svg {
- width: 45px;
- height: 45px;
- fill:#ffce4d;
- }
- }
-
- & p {
- margin-bottom: 0;
- font-size: 12px;
- }
- padding: 20px;
- display: flex;
- justify-content: center;
- flex-direction: column;
-}
diff --git a/src/components/Footer/Github.jsx b/src/components/Footer/Github.jsx
deleted file mode 100644
index 1dd50c4..0000000
--- a/src/components/Footer/Github.jsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import {IconGithub} from '../Icons';
-import IconButton from 'material-ui/IconButton';
-import styles from './Footer.css';
-/**
- * Dialog with action buttons. The actions are passed in as an array of React objects,
- * in this example [FlatButtons](/#/components/flat-button).
- *
- * You can also close this dialog by clicking outside the dialog, or with the 'Esc' key.
- */
-export default class Github extends React.Component {
-
- render() {
-
- return (
-
- window.open('https://github.com/EthanOrange/tv')}
- >
-
-
- );
- }
-}
\ No newline at end of file
diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
deleted file mode 100644
index 733bf76..0000000
--- a/src/components/Footer/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Github from './Github';
-import Cheese from './Cheese';
-import Bug from './Bug';
-
-export {
- Github,
- Cheese,
- Bug,
-}
\ No newline at end of file
diff --git a/src/components/FourohFour/FourohFour.jsx b/src/components/FourohFour/FourohFour.jsx
index 06b5d27..abd2f99 100644
--- a/src/components/FourohFour/FourohFour.jsx
+++ b/src/components/FourohFour/FourohFour.jsx
@@ -1,5 +1,5 @@
import React from 'react';
export default () => (
- 404 page!
-)
\ No newline at end of file
+ 404 page!
+);
diff --git a/src/components/FourohFour/index.js b/src/components/FourohFour/index.js
index 895fd76..224c3a3 100644
--- a/src/components/FourohFour/index.js
+++ b/src/components/FourohFour/index.js
@@ -1,3 +1,3 @@
-import FourohFour from './FourohFour'
+import FourohFour from './FourohFour';
-export default FourohFour
\ No newline at end of file
+export default FourohFour;
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
index efeaf54..ff9aad7 100644
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@@ -1,83 +1,68 @@
import React from 'react';
import { connect } from 'react-redux';
-
import Spinner from 'components/Spinner';
-import Search from 'components/Search';
-import styles from './Header.css';
-import {
- IconNotice,
- IconChatBubbleClose,
- IconFdj,
- IconProfile,
- IconChatBubble
-} from '../Icons';
import FlatButton from 'material-ui/FlatButton';
-import ToggleIco from 'material-ui/svg-icons/communication/clear-all';
-
import Register from 'components/Register';
import Profile from 'components/Profile';
-import Favorite from 'components/Favorite';
+import styles from './Header.css';
class Header extends React.Component {
- constructor(props) {
- super(props)
- this.handleOpen = this.handleOpen.bind(this)
- this.handleClose = this.handleClose.bind(this)
+ constructor(props) {
+ super(props);
+ this.handleOpen = this.handleOpen.bind(this);
+ this.handleClose = this.handleClose.bind(this);
+
+ this.state = {
+ open: !!window.location.href.includes('false'),
+ };
+ }
- this.state = {
- open: window.location.href.includes('false') ? true : false,
- };
- }
-
- handleOpen() {
- this.setState({open: true});
- }
+ handleOpen() {
+ this.setState({ open: true });
+ }
- handleClose() {
- this.setState({open: false});
- }
+ handleClose() {
+ this.setState({ open: false });
+ }
- render() {
- const RegisterDialogStatus = this.state.open;
- const {loading: loading, error: isError, done: isDone, data: userInfo } = this.props.metadata;
- const isLogin = userInfo.status ? true : false;
- const user = userInfo.user;
- const afterLoginProfile = isLogin
- ?
- 
-
- :
-
- {user.nickname}
- { this.props.screenItems.length > 0 ? `观看 ${this.props.screenItems[0].anchor} 直播 ${this.props.screenItems[0].type}` : '空闲' } -
-
+ render() {
+ const RegisterDialogStatus = this.state.open;
+ const { loading, error: isError, done: isDone, data: userInfo } = this.props.metadata;
+ const isLogin = !!userInfo.status;
+ const user = userInfo.user;
+ const afterLoginProfile = isLogin
+ ? (
+
);
+ const afterLoginProfileDialog = isLogin
?
+
+
)
+ : (
+
+ {user.nickname}
+ { this.props.screenItems.length > 0 ? `观看 ${this.props.screenItems[0].anchor} 直播 ${this.props.screenItems[0].type}` : '空闲' } +
+
登录
-
-
;
- const afterLoginProfileDialog = isLogin
+ {key}热门主播 this.moreCategory(key)} className={styles.more}>more
); - for(let key in data) { - - let items = data[key]; - itemsHtml.push({key}热门主播 this.moreCategory(key)} className={styles.more}>more
) + items && items.forEach((item, key) => { + itemsHtml.push(
- { !loading && done
+ return (
+
+ );
+ }
}
const mapStateToProps = (state, ownProps) => ({
- recommend: state.recommend,
-})
+ recommend: state.recommend,
+});
const mapDispatchToProps = (dispatch, ownProps) => ({
- getRecommend: () => dispatch(getRecommend()),
-})
+ getRecommend: () => dispatch(getRecommend()),
+});
-export default connect(mapStateToProps, mapDispatchToProps)(Hot);
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(Hot);
diff --git a/src/components/Hot/index.js b/src/components/Hot/index.js
index cd807d3..9ccaa95 100644
--- a/src/components/Hot/index.js
+++ b/src/components/Hot/index.js
@@ -1,3 +1,3 @@
import Hot from './Hot';
-export default Hot;
\ No newline at end of file
+export default Hot;
diff --git a/src/components/Icons/ChatBubble.jsx b/src/components/Icons/ChatBubble.jsx
index 29c07f8..e0804c7 100644
--- a/src/components/Icons/ChatBubble.jsx
+++ b/src/components/Icons/ChatBubble.jsx
@@ -1,12 +1,12 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/ChatBubbleClose.jsx b/src/components/Icons/ChatBubbleClose.jsx
index 006b54d..0406429 100644
--- a/src/components/Icons/ChatBubbleClose.jsx
+++ b/src/components/Icons/ChatBubbleClose.jsx
@@ -1,13 +1,13 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/Cheese.jsx b/src/components/Icons/Cheese.jsx
index 544dc7b..fa1f86d 100644
--- a/src/components/Icons/Cheese.jsx
+++ b/src/components/Icons/Cheese.jsx
@@ -1,16 +1,19 @@
import React from 'react';
export default props => (
-
-)
+ C789,484.2,758.5,517,720.8,517z"
+ />
+
+);
diff --git a/src/components/Icons/Fdj.jsx b/src/components/Icons/Fdj.jsx
index 94553fd..c89040f 100644
--- a/src/components/Icons/Fdj.jsx
+++ b/src/components/Icons/Fdj.jsx
@@ -1,14 +1,22 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/Game.jsx b/src/components/Icons/Game.jsx
index d49f7c3..611cf42 100644
--- a/src/components/Icons/Game.jsx
+++ b/src/components/Icons/Game.jsx
@@ -1,12 +1,12 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/Github.jsx b/src/components/Icons/Github.jsx
index 451cebf..4924f60 100644
--- a/src/components/Icons/Github.jsx
+++ b/src/components/Icons/Github.jsx
@@ -1,11 +1,23 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/Logo.jsx b/src/components/Icons/Logo.jsx
index b7f47fa..2c3161c 100644
--- a/src/components/Icons/Logo.jsx
+++ b/src/components/Icons/Logo.jsx
@@ -1,14 +1,48 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/Mini.jsx b/src/components/Icons/Mini.jsx
index 57b5323..a476e1d 100644
--- a/src/components/Icons/Mini.jsx
+++ b/src/components/Icons/Mini.jsx
@@ -1,12 +1,12 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/Name.jsx b/src/components/Icons/Name.jsx
index 5b8aa77..9ac6a9e 100644
--- a/src/components/Icons/Name.jsx
+++ b/src/components/Icons/Name.jsx
@@ -1,10 +1,29 @@
import React from 'react';
export default props => (
-
-)
\ No newline at end of file
+
+);
diff --git a/src/components/Icons/Notice.jsx b/src/components/Icons/Notice.jsx
index fdbbd0a..79d7e76 100644
--- a/src/components/Icons/Notice.jsx
+++ b/src/components/Icons/Notice.jsx
@@ -1,10 +1,15 @@
import React from 'react';
export default props => (
-
-)
\ No newline at end of file
+
+);
diff --git a/src/components/Icons/Profile.jsx b/src/components/Icons/Profile.jsx
index 9f9c8c3..7b019dc 100644
--- a/src/components/Icons/Profile.jsx
+++ b/src/components/Icons/Profile.jsx
@@ -1,12 +1,16 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/Steam.jsx b/src/components/Icons/Steam.jsx
index 3cad056..4abab52 100644
--- a/src/components/Icons/Steam.jsx
+++ b/src/components/Icons/Steam.jsx
@@ -1,10 +1,19 @@
import React from 'react';
export default props => (
-
-)
\ No newline at end of file
+
+);
diff --git a/src/components/Icons/User.jsx b/src/components/Icons/User.jsx
index 82ddd65..894397e 100644
--- a/src/components/Icons/User.jsx
+++ b/src/components/Icons/User.jsx
@@ -1,12 +1,12 @@
import React from 'react';
export default props => (
-
-)
+
+);
diff --git a/src/components/Icons/Zoom.jsx b/src/components/Icons/Zoom.jsx
index d861207..29a089f 100644
--- a/src/components/Icons/Zoom.jsx
+++ b/src/components/Icons/Zoom.jsx
@@ -1,11 +1,11 @@
import React from 'react';
export default props => (
-
-)
\ No newline at end of file
+
+);
diff --git a/src/components/Icons/index.js b/src/components/Icons/index.js
index 2654c69..5f43738 100644
--- a/src/components/Icons/index.js
+++ b/src/components/Icons/index.js
@@ -28,4 +28,4 @@ export {
IconSteam,
IconGithub,
IconCheese,
-}
\ No newline at end of file
+};
diff --git a/src/components/Login/Login.jsx b/src/components/Login/Login.jsx
index 3f4b1e8..ca85632 100644
--- a/src/components/Login/Login.jsx
+++ b/src/components/Login/Login.jsx
@@ -1,94 +1,82 @@
import React from 'react';
-import fetch from 'isomorphic-fetch';
-import styles from './Login.css';
-
-import Checkbox from 'material-ui/Checkbox';
-import ActionFavorite from 'material-ui/svg-icons/action/favorite';
-import ActionFavoriteBorder from 'material-ui/svg-icons/action/favorite-border';
import Dialog from 'material-ui/Dialog';
import FlatButton from 'material-ui/FlatButton';
-import RaisedButton from 'material-ui/RaisedButton';
import TextField from 'material-ui/TextField';
import config from '../../../config';
-const API_HOST = `${config.ENDHOST}`
+import styles from './Login.css';
-const convertFormdataToJson = (formData) => {
- let objData = {};
- formData.forEach((value, key) => objData[key] = value);
-
- return JSON.stringify(objData);
-}
+const API_HOST = `${config.ENDHOST}`;
class Register extends React.Component {
- constructor(props) {
- super(props)
- this.submit = this.submit.bind(this)
- }
+ constructor(props) {
+ super(props);
+ this.submit = this.submit.bind(this);
+ }
+
+ submit() {
+ const form = document.querySelector('#formLogin');
+ form.submit();
+ }
- submit(e) {
- var form = document.querySelector('#formLogin');
- form.submit()
- }
+ render() {
+ const open = this.props.open;
- render() {
- const open = this.props.open;
-
- return (
-
+ );
+ }
}
-export default Register;
\ No newline at end of file
+export default Register;
diff --git a/src/components/Login/index.js b/src/components/Login/index.js
index 68d80c8..dbe484f 100644
--- a/src/components/Login/index.js
+++ b/src/components/Login/index.js
@@ -1,3 +1,3 @@
import Login from './Login';
-export default Login;
\ No newline at end of file
+export default Login;
diff --git a/src/components/Logo/Logo.jsx b/src/components/Logo/Logo.jsx
index 27de34d..c076b8e 100644
--- a/src/components/Logo/Logo.jsx
+++ b/src/components/Logo/Logo.jsx
@@ -1,18 +1,18 @@
import React from 'react';
-import styles from './Logo.css'
+import styles from './Logo.css';
-import {
+import {
IconLogo,
- IconName
+ IconName,
} from '../Icons';
export default () => (
-
+ { !loading && done
?
- )
- }
+
+
-
:
- {itemsHtml}
-
+
+ {itemsHtml}
+
-
- {/*
+
+
-)
\ No newline at end of file
+
+);
diff --git a/src/components/Logo/index.js b/src/components/Logo/index.js
index 5dbd79f..72acb33 100644
--- a/src/components/Logo/index.js
+++ b/src/components/Logo/index.js
@@ -1,3 +1,3 @@
-import Logo from './Logo.jsx';
+import Logo from './Logo';
-export default Logo;
\ No newline at end of file
+export default Logo;
diff --git a/src/components/Nav/Nav.jsx b/src/components/Nav/Nav.jsx
index af84360..ca73a00 100644
--- a/src/components/Nav/Nav.jsx
+++ b/src/components/Nav/Nav.jsx
@@ -1,60 +1,39 @@
import React from 'react';
-import {connect} from 'react-redux';
-import { Provider } from 'react-redux';
-import { Link, browserHistory } from 'react-router';
-
-import styles from './Nav.css'
-import classnames from 'classnames';
+import { connect } from 'react-redux';
+import { Link } from 'react-router';
import Search from 'components/Search';
-
import Toggle from 'material-ui/Toggle';
-
-import { IconChatBubble } from '../Icons';
-
-import {layoutsChat} from 'actions'
-
-const returnFetchingLink = (name) => {
-
-}
-
-class Nav extends React.Component {
- constructor(props) {
- super(props)
-
- }
-
- render() {
-
- return (
-
+
+ {/*
- 游戏
- 流行
- 正在观看
- {/*资讯待开放*/}
-
- )
- }
-}
-
-const mapStateToProps = (state, ownProps) => ({
+import { layoutsChat } from 'actions';
+
+import styles from './Nav.css';
+
+const Nav = (props) => (
+
- {
- this.props.layoutsChat()
- }}
- />
-
-
+ 游戏
+ 流行
+ 正在观看
+ {/* 资讯待开放*/}
+
+);
+
+const mapStateToProps = state => ({
layouts: state.layouts,
screenItemsUrl: state.screenItems.url,
-})
-
-const dispatchStateToProps = (dispatch, ownProps) => ({
- layoutsChat: (clas) => dispatch(layoutsChat(clas)),
-})
+});
+const dispatchStateToProps = dispatch => ({
+ layoutsChat: clas => dispatch(layoutsChat(clas)),
+});
-export default connect(mapStateToProps, dispatchStateToProps)(Nav);
\ No newline at end of file
+export default connect(mapStateToProps, dispatchStateToProps)(Nav);
diff --git a/src/components/Nav/index.js b/src/components/Nav/index.js
index 4f01550..9ac514a 100644
--- a/src/components/Nav/index.js
+++ b/src/components/Nav/index.js
@@ -1,3 +1,3 @@
-import Nav from './Nav.jsx';
+import Nav from './Nav';
-export default Nav;
\ No newline at end of file
+export default Nav;
diff --git a/src/components/Profile/Profile.jsx b/src/components/Profile/Profile.jsx
index 789a74b..34d991a 100644
--- a/src/components/Profile/Profile.jsx
+++ b/src/components/Profile/Profile.jsx
@@ -1,74 +1,70 @@
import React from 'react';
-
-import styles from './Profile.css';
import Dialog from 'material-ui/Dialog';
import FlatButton from 'material-ui/FlatButton';
import IconButton from 'material-ui/IconButton';
-import RaisedButton from 'material-ui/RaisedButton';
-import TextField from 'material-ui/TextField';
-
import EmailIco from 'material-ui/svg-icons/communication/email';
import GiftIco from 'material-ui/svg-icons/action/card-giftcard';
-import { IconSteam } from '../Icons';
import { browserHistory } from 'react-router';
-
import config from '../../../config';
-const API_HOST = `${config.ENDHOST}`
+import styles from './Profile.css';
+
+const API_HOST = `${config.ENDHOST}`;
class Profile extends React.Component {
- constructor(props) {
- super(props)
- }
+ constructor(props) {
+ super(props);
+ }
- render() {
- const open = this.props.open;
- const data = this.props.data;
- const steamInfo = data.steamInfo ? data.steamInfo : null;
- const avatar = data.avatar ? data.avatar : require('../../../assets/avatar.png');
+ render() {
+ const open = this.props.open;
+ const data = this.props.data;
+ const steamInfo = data.steamInfo ? data.steamInfo : null;
+ const avatar = data.avatar ? data.avatar : require('../../../assets/avatar.png');
- const actions = [
-
+ {
+ props.layoutsChat();
+ }}
+ />
+
+