summaryrefslogtreecommitdiff
path: root/frontend/src
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src')
-rw-r--r--frontend/src/components/errors/errorToastContainer.js7
-rw-r--r--frontend/src/components/modals/username.js25
-rw-r--r--frontend/src/redux/errors.js5
-rw-r--r--frontend/src/redux/players.js6
-rw-r--r--frontend/src/routes.js5
-rw-r--r--frontend/src/sagas/errors.js6
-rw-r--r--frontend/src/sagas/gameBrowser.js33
-rw-r--r--frontend/src/sagas/home.js16
-rw-r--r--frontend/src/sagas/lobby.js12
-rw-r--r--frontend/src/store.js6
10 files changed, 21 insertions, 100 deletions
diff --git a/frontend/src/components/errors/errorToastContainer.js b/frontend/src/components/errors/errorToastContainer.js
index 073b6038..65711073 100644
--- a/frontend/src/components/errors/errorToastContainer.js
+++ b/frontend/src/components/errors/errorToastContainer.js
@@ -3,12 +3,7 @@ import ReduxToastr from 'react-redux-toastr';
import './react-redux-toastr.min.css';
const ErrorToastContainer = props => (
- <ReduxToastr
- timeOut={4000}
- preventDuplicates
- position="bottom-left"
- progressBar
- />
+ <ReduxToastr timeOut={4000} preventDuplicates position="bottom-left" progressBar />
);
export default ErrorToastContainer;
diff --git a/frontend/src/components/modals/username.js b/frontend/src/components/modals/username.js
index bec890b2..c00262a7 100644
--- a/frontend/src/components/modals/username.js
+++ b/frontend/src/components/modals/username.js
@@ -1,14 +1,5 @@
import React from 'react';
-import {
- Overlay,
- Panel,
- PanelHeader,
- PanelFooter,
- Button,
- Input,
- Close,
- Space,
-} from 'rebass';
+import { Overlay, Panel, PanelHeader, PanelFooter, Button, Input, Close, Space } from 'rebass';
const Modal = ({ modalOpen, toggleModal }) => (
<Overlay open={modalOpen} onDismiss={toggleModal('usernameModal')}>
@@ -18,20 +9,10 @@ const Modal = ({ modalOpen, toggleModal }) => (
<Space auto />
<Close onClick={toggleModal('usernameModal')} />
</PanelHeader>
- <Input
- label="Username"
- name="username"
- placeholder="Cesar92"
- rounded
- type="text"
- />
+ <Input label="Username" name="username" placeholder="Cesar92" rounded type="text" />
<PanelFooter>
<Space auto />
- <Button
- theme="success"
- onClick={toggleModal('usernameModal')}
- children="Ok"
- />
+ <Button theme="success" onClick={toggleModal('usernameModal')} children="Ok" />
</PanelFooter>
</Panel>
</Overlay>
diff --git a/frontend/src/redux/errors.js b/frontend/src/redux/errors.js
index fdc2242d..ec1e30b6 100644
--- a/frontend/src/redux/errors.js
+++ b/frontend/src/redux/errors.js
@@ -19,10 +19,7 @@ const initialState = Immutable.from({
export default (state = initialState, action) => {
switch (action.type) {
case types.ERROR_RECEIVED_ON_WS:
- let error = Object.assign(
- { id: state.nextId, timestamp: new Date() },
- action.error
- );
+ let error = Object.assign({ id: state.nextId, timestamp: new Date() }, action.error);
let newState = state.set('nextId', state.nextId + 1);
newState = addErrorToHistory(newState, error);
return newState;
diff --git a/frontend/src/redux/players.js b/frontend/src/redux/players.js
index db9f1416..b11e920f 100644
--- a/frontend/src/redux/players.js
+++ b/frontend/src/redux/players.js
@@ -39,8 +39,6 @@ export default (state = initialState, action) => {
}
};
-export const getCurrentPlayer = state =>
- state.players.all && state.players.all[state.players.current];
+export const getCurrentPlayer = state => state.players.all && state.players.all[state.players.current];
export const getPlayer = (state, username) => state.players.all[username];
-export const getPlayers = (state, usernames) =>
- usernames.map(u => getPlayer(state, u));
+export const getPlayers = (state, usernames) => usernames.map(u => getPlayer(state, u));
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index e8400a90..29894c3a 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -30,10 +30,7 @@ export const routes = [
{
path: '/',
component: LobbyLayout,
- childRoutes: [
- { path: '/games', component: GameBrowser },
- { path: '/lobby/*', component: Lobby },
- ],
+ childRoutes: [{ path: '/games', component: GameBrowser }, { path: '/lobby/*', component: Lobby }],
},
{
path: '*',
diff --git a/frontend/src/sagas/errors.js b/frontend/src/sagas/errors.js
index 4fd704a3..41eb6902 100644
--- a/frontend/src/sagas/errors.js
+++ b/frontend/src/sagas/errors.js
@@ -6,11 +6,7 @@ import { actions } from '../redux/errors';
import { toastr } from 'react-redux-toastr';
export default function* errorHandlingSaga({ socket }) {
- const errorChannel = yield call(
- createSubscriptionChannel,
- socket,
- '/user/queue/errors'
- );
+ const errorChannel = yield call(createSubscriptionChannel, socket, '/user/queue/errors');
try {
while (true) {
const error = yield take(errorChannel);
diff --git a/frontend/src/sagas/gameBrowser.js b/frontend/src/sagas/gameBrowser.js
index dd916df9..5492107a 100644
--- a/frontend/src/sagas/gameBrowser.js
+++ b/frontend/src/sagas/gameBrowser.js
@@ -3,28 +3,19 @@ import { createSubscriptionChannel } from '../utils/websocket';
import { push } from 'react-router-redux';
import { normalize } from 'normalizr';
-import {
- game as gameSchema,
- gameList as gameListSchema,
-} from '../schemas/games';
+import { game as gameSchema, gameList as gameListSchema } from '../schemas/games';
import { actions as gameActions, types } from '../redux/games';
import { actions as playerActions } from '../redux/players';
function* watchGames({ socket }) {
- const gamesChannel = yield call(
- createSubscriptionChannel,
- socket,
- '/topic/games'
- );
+ const gamesChannel = yield call(createSubscriptionChannel, socket, '/topic/games');
try {
while (true) {
const gameList = yield take(gamesChannel);
const normGameList = normalize(gameList, gameListSchema);
// for an empty game array, there is no players/games entity maps
- yield put(
- playerActions.updatePlayers(normGameList.entities.players || {})
- );
+ yield put(playerActions.updatePlayers(normGameList.entities.players || {}));
yield put(gameActions.updateGames(normGameList.entities.games || {}));
}
} finally {
@@ -33,11 +24,7 @@ function* watchGames({ socket }) {
}
function* watchLobbyJoined({ socket }) {
- const joinedLobbyChannel = yield call(
- createSubscriptionChannel,
- socket,
- '/user/queue/lobby/joined'
- );
+ const joinedLobbyChannel = yield call(createSubscriptionChannel, socket, '/user/queue/lobby/joined');
try {
const joinedLobby = yield take(joinedLobbyChannel);
const normalized = normalize(joinedLobby, gameSchema);
@@ -54,22 +41,14 @@ function* watchLobbyJoined({ socket }) {
function* createGame({ socket }) {
while (true) {
const { gameName } = yield take(types.REQUEST_CREATE_GAME);
- yield apply(socket, socket.send, [
- '/app/lobby/create',
- JSON.stringify({ gameName }),
- {},
- ]);
+ yield apply(socket, socket.send, ['/app/lobby/create', JSON.stringify({ gameName }), {}]);
}
}
function* joinGame({ socket }) {
while (true) {
const { gameId } = yield take(types.REQUEST_JOIN_GAME);
- yield apply(socket, socket.send, [
- '/app/lobby/join',
- JSON.stringify({ gameId }),
- {},
- ]);
+ yield apply(socket, socket.send, ['/app/lobby/join', JSON.stringify({ gameId }), {}]);
}
}
diff --git a/frontend/src/sagas/home.js b/frontend/src/sagas/home.js
index 3f06e8f3..579c7fd6 100644
--- a/frontend/src/sagas/home.js
+++ b/frontend/src/sagas/home.js
@@ -7,19 +7,12 @@ import { actions, types } from '../redux/players';
function* sendUsername({ socket }) {
while (true) {
const { username } = yield take(types.REQUEST_CHOOSE_USERNAME);
- yield apply(socket, socket.send, [
- '/app/chooseName',
- JSON.stringify({ playerName: username }),
- ]);
+ yield apply(socket, socket.send, ['/app/chooseName', JSON.stringify({ playerName: username })]);
}
}
function* validateUsername({ socket }) {
- const usernameChannel = yield call(
- createSubscriptionChannel,
- socket,
- '/user/queue/nameChoice'
- );
+ const usernameChannel = yield call(createSubscriptionChannel, socket, '/user/queue/nameChoice');
while (true) {
const user = yield take(usernameChannel);
yield put(actions.setCurrentPlayer(user));
@@ -30,10 +23,7 @@ function* validateUsername({ socket }) {
function* usernameChoiceSaga(wsConnection) {
// TODO: Run sendUsername in loop when we have the ability to cancel saga on route change
- yield [
- call(sendUsername, wsConnection),
- call(validateUsername, wsConnection),
- ];
+ yield [call(sendUsername, wsConnection), call(validateUsername, wsConnection)];
}
export default usernameChoiceSaga;
diff --git a/frontend/src/sagas/lobby.js b/frontend/src/sagas/lobby.js
index 7b52ad29..d11511e8 100644
--- a/frontend/src/sagas/lobby.js
+++ b/frontend/src/sagas/lobby.js
@@ -15,11 +15,7 @@ function getCurrentGameId() {
function* watchLobbyUpdates({ socket }) {
const currentGameId = getCurrentGameId();
- const lobbyUpdatesChannel = yield call(
- createSubscriptionChannel,
- socket,
- `/topic/lobby/${currentGameId}/updated`
- );
+ const lobbyUpdatesChannel = yield call(createSubscriptionChannel, socket, `/topic/lobby/${currentGameId}/updated`);
try {
while (true) {
const lobby = yield take(lobbyUpdatesChannel);
@@ -34,11 +30,7 @@ function* watchLobbyUpdates({ socket }) {
function* watchGameStart({ socket }) {
const currentGameId = getCurrentGameId();
- const gameStartedChannel = yield call(
- createSubscriptionChannel,
- socket,
- `/topic/lobby/${currentGameId}/started`
- );
+ const gameStartedChannel = yield call(createSubscriptionChannel, socket, `/topic/lobby/${currentGameId}/started`);
try {
yield take(gameStartedChannel);
yield put(gameActions.enterGame());
diff --git a/frontend/src/store.js b/frontend/src/store.js
index a5d9a34a..4bd22184 100644
--- a/frontend/src/store.js
+++ b/frontend/src/store.js
@@ -21,11 +21,7 @@ export default function configureStore(initialState = {}) {
? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
: compose;
- const store = createStore(
- createReducer(),
- Immutable.from(initialState),
- composeEnhancers(...enhancers)
- );
+ const store = createStore(createReducer(), Immutable.from(initialState), composeEnhancers(...enhancers));
sagaMiddleware.run(rootSaga, browserHistory);
bgstack15