优化代码 | jslint format

3lang3 · Jul 17, 2017 · 513c0d8 · 513c0d8
1 parent 6e8b927
commit 513c0d8
Show file tree

Hide file tree

Showing 127 changed files with 7,607 additions and 2,810 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,3 @@
 node_modules
 build
+config
diff --git a/config/domain.js b/config/domain.js
@@ -1 +1 @@
-export default 'http://localhost';
+export default 'http://localhost';
diff --git a/config/index.js b/config/index.js
@@ -1,7 +1,7 @@
 import domain from './domain.js';
 
 export default {
-    HOST: `${domain}`,
-    ENDHOST: `${domain}:3000`,
-    ChatHOST: `${domain}:3001`,
-}
+  HOST: `${domain}`,
+  ENDHOST: `${domain}:3000`,
+  ChatHOST: `${domain}:3001`,
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "classnames": "^2.2.5",
     "eslint-config-airbnb": "^14.1.0",
     "isomorphic-fetch": "^2.2.1",
     "lodash": "^4.16.4",

diff --git a/src/actions/alertActions.js b/src/actions/alertActions.js
@@ -1,14 +1,14 @@
 const OPEN = 'ALERT/OPEN';
 
 export const alertActions = {
-    OPEN: OPEN
-}
+  OPEN,
+};
 
-const alertOpen = (payload) => ({
+const alertOpen = payload => ({
   type: OPEN,
-  payload
+  payload,
 });
 
 export {
-    alertOpen
-}
+    alertOpen,
+};
diff --git a/src/actions/categoryActions.js b/src/actions/categoryActions.js
@@ -2,7 +2,7 @@
 import fetch from 'isomorphic-fetch';
 import config from '../../config';
 
-const API_HOST = `${config.ENDHOST}`
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/categorys';
 
 const REQUEST = 'category/REQUEST';

diff --git a/src/actions/categorysActions.js b/src/actions/categorysActions.js
@@ -1,8 +1,8 @@
 /* global API_HOST */
 import fetch from 'isomorphic-fetch';
-import {layoutsOpen} from 'actions';
 import config from '../../config';
-const API_HOST = `${config.ENDHOST}`
+
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/categorys/';
 
 const REQUEST = 'categorys/REQUEST';
@@ -34,9 +34,9 @@ const getCategorysError = payload => ({
 const filterCategorys = payload => ({
   type: FILTER,
   payload,
-})
+});
 
-const getCategorys = (name) => (dispatch) => {
+const getCategorys = name => (dispatch) => {
   dispatch(getCategorysRequest());
   dispatch(filterCategorys(''));
   return fetch(`${API_HOST}${url}${name}`)
@@ -47,5 +47,5 @@ const getCategorys = (name) => (dispatch) => {
 
 export {
   getCategorys,
-  filterCategorys
+  filterCategorys,
 };
diff --git a/src/actions/cheeseActions.js b/src/actions/cheeseActions.js
@@ -2,7 +2,7 @@
 import fetch from 'isomorphic-fetch';
 import config from '../../config';
 
-const API_HOST = `${config.ENDHOST}`
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/cheese';
 
 const REQUEST = 'cheese/REQUEST';

diff --git a/src/actions/emojiActions.js b/src/actions/emojiActions.js
@@ -5,8 +5,8 @@ export const emojiActions = {
   TOGGLE,
 };
 
-const emojiToggle = payload => ({
-  type: TOGGLE
+const emojiToggle = () => ({
+  type: TOGGLE,
 });
 
 export {

diff --git a/src/actions/favoriteActions.js b/src/actions/favoriteActions.js
@@ -1,7 +1,3 @@
-/* global API_HOST */
-
-const GET = 'favorite/GET';
-const SET = 'favorite/SET';
 const ADD = 'favorite/ADD';
 const REMOVE = 'favorite/REMOVE';
 
@@ -23,5 +19,5 @@ const removeFavorite = payload => ({
 
 export {
   addFavorite,
-  removeFavorite
+  removeFavorite,
 };
diff --git a/src/actions/index.js b/src/actions/index.js
@@ -12,4 +12,4 @@ export * from './cheeseActions';
 export * from './favoriteActions';
 export * from './onlineActions';
 export * from './recommendActions';
-export * from './randomActions';
+export * from './randomActions';
diff --git a/src/actions/inviteActions.js b/src/actions/inviteActions.js
@@ -1,8 +1,8 @@
 /* global API_HOST */
 import fetch from 'isomorphic-fetch';
-
 import config from '../../config';
-const API_HOST = `${config.ENDHOST}`
+
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/invite/';
 
 const REQUEST = 'invite/REQUEST';
@@ -29,7 +29,7 @@ const getInviteError = payload => ({
   payload,
 });
 
-const getInvite = (code) => (dispatch) => {
+const getInvite = code => (dispatch) => {
   dispatch(getInviteRequest());
   return fetch(`${API_HOST}${url}${code}`)
     .then(res => res.json())

diff --git a/src/actions/layoutsActions.js b/src/actions/layoutsActions.js
@@ -25,7 +25,6 @@ const layoutsChat = payload => ({
 });
 
 
-
 export {
   layoutsOpen,
   layoutsWidth,

diff --git a/src/actions/metadataActions.js b/src/actions/metadataActions.js
@@ -1,9 +1,8 @@
 /* global API_HOST */
 import fetch from 'isomorphic-fetch';
-import {layoutsOpen} from 'actions';
-
 import config from '../../config';
-const API_HOST = `${config.ENDHOST}`
+
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/metadata';
 
 const REQUEST = 'metadata/REQUEST';
@@ -31,7 +30,7 @@ const getMetadataError = payload => ({
 });
 
 export const getMetadata = (host = API_HOST) => (dispatch) => {
-  dispatch(getMetadataRequest())
+  dispatch(getMetadataRequest());
   return fetch(`${host}${url}`, { credentials: 'include' })
   .then(response => response.json())
   .then(json => dispatch(getMetadataOk(json)))

diff --git a/src/actions/onlineActions.js b/src/actions/onlineActions.js
@@ -2,7 +2,7 @@
 import fetch from 'isomorphic-fetch';
 import config from '../../config';
 
-const API_HOST = `${config.ENDHOST}`
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/online';
 
 const REQUEST = 'online/REQUEST';
@@ -30,16 +30,16 @@ const getOnlineError = payload => ({
 });
 
 
-const getOnline = (data) => (dispatch) => {
+const getOnline = data => (dispatch) => {
   dispatch(getOnlineRequest());
 
-  let form = new FormData();
-  form.append( "json", JSON.stringify(data) );
+  const form = new FormData();
+  form.append('json', JSON.stringify(data));
 
   return fetch(`${API_HOST}${url}`, {
-      method: 'POST',
-      body: form,
-    })
+    method: 'POST',
+    body: form,
+  })
     .then(res => res.json())
     .then(json => dispatch(getOnlineOk(json)))
     .catch(err => dispatch(getOnlineError(err)));

diff --git a/src/actions/randomActions.js b/src/actions/randomActions.js
@@ -2,7 +2,7 @@
 import fetch from 'isomorphic-fetch';
 import config from '../../config';
 
-const API_HOST = `${config.ENDHOST}`
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/random';
 
 const REQUEST = 'random/REQUEST';
@@ -33,11 +33,11 @@ const getRandomError = payload => ({
 
 const getRandom = () => (dispatch) => {
   dispatch(getRandomRequest());
-  
+
   return fetch(`${API_HOST}${url}`)
     .then(res => res.json())
-    .then(json => {
-      dispatch(getRandomOk(json))
+    .then((json) => {
+      dispatch(getRandomOk(json));
     })
     .catch(err => dispatch(getRandomError(err)));
 };

diff --git a/src/actions/recommendActions.js b/src/actions/recommendActions.js
@@ -2,7 +2,7 @@
 import fetch from 'isomorphic-fetch';
 import config from '../../config';
 
-const API_HOST = `${config.ENDHOST}`
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/recommend';
 
 const REQUEST = 'recommend/REQUEST';
@@ -32,11 +32,11 @@ const getRecommendError = payload => ({
 
 const getRecommend = () => (dispatch) => {
   dispatch(getRecommendRequest());
-  
+
   return fetch(`${API_HOST}${url}`)
     .then(res => res.json())
-    .then(json => {
-      dispatch(getRecommendOk(json))
+    .then((json) => {
+      dispatch(getRecommendOk(json));
     })
     .catch(err => dispatch(getRecommendError(err)));
 };

diff --git a/src/actions/screenItemsActions.js b/src/actions/screenItemsActions.js
@@ -1,10 +1,10 @@
-import { Link, browserHistory } from 'react-router';
-import store from '../store';
-
 import fetch from 'isomorphic-fetch';
+import { browserHistory } from 'react-router';
+import store from '../store';
 import config from '../../config';
 
-const API_HOST = `${config.ENDHOST}`
+
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/screen/';
 
 const ADD = 'screenItems/ADD';
@@ -24,38 +24,38 @@ export const screenItemsActions = {
 };
 
 const preUrlHandler = (items) => {
-  let _preUrl = '?rooms=';
+  let preUrl = '?rooms=';
 
-  if(!items.length) return '';
+  if (!items.length) return '';
 
-  items.forEach((el, index) => {
-    let _id = el.roomId;
+  items.forEach((el) => {
+    let id = el.roomId;
 
-    if(typeof _id == 'object') _id = JSON.stringify(_id);
-    _preUrl += `${el.platform}_${_id}--`;
-  })
+    if (typeof id === 'object') id = JSON.stringify(id);
+    preUrl += `${el.platform}_${id}--`;
+  });
 
-  return _preUrl;
-}
+  return preUrl;
+};
 
 const getPreUrl = () => {
-  let items = store.getState().screenItems.data;
+  const items = store.getState().screenItems.data;
   return preUrlHandler(items);
-}
+};
 
 const replaceLocationHandler = () => {
-  let preUrl = getPreUrl();
+  const preUrl = getPreUrl();
 
   browserHistory.push(`/live${preUrl}`);
-}
+};
 
 const screenItemsUrl = () => {
-  let payload = getPreUrl();
+  const payload = getPreUrl();
 
   return {
     type: URL,
     payload,
-  }
+  };
 };
 
 const screenItemsAddHander = payload => ({
@@ -82,24 +82,24 @@ const getScreenItemsError = payload => ({
   payload,
 });
 
-const getScreenItems = (par) => (dispatch) => {
+const getScreenItems = par => (dispatch) => {
   dispatch(getScreenItemsRequest());
   return fetch(`${API_HOST}${url}${par}`)
     .then(res => res.json())
-    .then(json => {
-      dispatch(getScreenItemsOk(json))
+    .then((json) => {
+      dispatch(getScreenItemsOk(json));
       dispatch(screenItemsUrl());
     })
     .catch(err => dispatch(getScreenItemsError(err)));
 };
 
-const screenItemsAdd = (payload) => (dispatch) => {
+const screenItemsAdd = payload => (dispatch) => {
   dispatch(screenItemsAddHander(payload));
   dispatch(screenItemsUrl());
   replaceLocationHandler();
 };
 
-const screenItemsRemove = (payload) => (dispatch) => {
+const screenItemsRemove = payload => (dispatch) => {
   dispatch(screenItemsRemoveHander(payload));
   dispatch(screenItemsUrl());
   replaceLocationHandler();

diff --git a/src/actions/screensActions.js b/src/actions/screensActions.js
@@ -3,8 +3,8 @@
 const OK = 'screens/OK';
 
 export const screensActions = {
-  OK
-}
+  OK,
+};
 
 const screensActive = payload => ({
   type: OK,

diff --git a/src/actions/searchActions.js b/src/actions/searchActions.js
@@ -1,7 +1,8 @@
 /* global API_HOST */
 import fetch from 'isomorphic-fetch';
 import config from '../../config';
-const API_HOST = `${config.ENDHOST}`
+
+const API_HOST = `${config.ENDHOST}`;
 const url = '/api/search/';
 
 const REQUEST = 'search/REQUEST';
@@ -29,7 +30,7 @@ const getSearchError = payload => ({
 });
 
 
-const getSearch = (keyword) => (dispatch) => {
+const getSearch = keyword => (dispatch) => {
   dispatch(getSearchRequest());
   return fetch(`${API_HOST}${url}${keyword}`)
     .then(res => res.json())