summaryrefslogtreecommitdiff
path: root/frontend/src
diff options
context:
space:
mode:
authorJoffrey BION <joffrey.bion@gmail.com>2018-06-08 20:49:20 +0200
committerJoffrey BION <joffrey.bion@gmail.com>2018-06-09 12:49:52 +0200
commitfdffc7e26ffc4af07aa8c0e5fc76e85901f1031b (patch)
tree1d881922e5ca6a9e688ad5b7aa27be9ded45472a /frontend/src
parentHistory entry about Livedoc (diff)
downloadseven-wonders-fdffc7e26ffc4af07aa8c0e5fc76e85901f1031b.tar.gz
seven-wonders-fdffc7e26ffc4af07aa8c0e5fc76e85901f1031b.tar.bz2
seven-wonders-fdffc7e26ffc4af07aa8c0e5fc76e85901f1031b.zip
Cleanup the mess
Diffstat (limited to 'frontend/src')
-rw-r--r--frontend/src/api/websocket.js2
-rw-r--r--frontend/src/components/errors/Error404.js11
-rw-r--r--frontend/src/components/errors/errorToastContainer.js2
-rw-r--r--frontend/src/components/modals/username.js19
-rw-r--r--frontend/src/scenes/Lobby/index.js1
5 files changed, 3 insertions, 32 deletions
diff --git a/frontend/src/api/websocket.js b/frontend/src/api/websocket.js
index 5adae17b..6813676c 100644
--- a/frontend/src/api/websocket.js
+++ b/frontend/src/api/websocket.js
@@ -1,7 +1,7 @@
// @flow
import SockJS from 'sockjs-client';
import type { Client, Frame, Message, Options, Subscription } from 'webstomp-client';
-import Stomp from 'webstomp-client';
+import * as Stomp from 'webstomp-client';
const DEFAULT_DEBUG_OPTIONS = {
debug: process.env.NODE_ENV !== 'production',
diff --git a/frontend/src/components/errors/Error404.js b/frontend/src/components/errors/Error404.js
deleted file mode 100644
index 07046632..00000000
--- a/frontend/src/components/errors/Error404.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-export const Error404 = () => (
- <div>
- <h1>No Match</h1>
- <Link to="/">
- Take me back home ! <span role="img" aria-label="home">🏠</span>
- </Link>
- </div>
-);
diff --git a/frontend/src/components/errors/errorToastContainer.js b/frontend/src/components/errors/errorToastContainer.js
index d8da6af6..794d3d3f 100644
--- a/frontend/src/components/errors/errorToastContainer.js
+++ b/frontend/src/components/errors/errorToastContainer.js
@@ -2,6 +2,6 @@ import React from 'react';
import ReduxToastr from 'react-redux-toastr';
import './react-redux-toastr.min.css';
-export const ErrorToastContainer = props => (
+export const ErrorToastContainer = () => (
<ReduxToastr timeOut={4000} preventDuplicates position="bottom-left" progressBar />
);
diff --git a/frontend/src/components/modals/username.js b/frontend/src/components/modals/username.js
deleted file mode 100644
index f6127667..00000000
--- a/frontend/src/components/modals/username.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { Button, Close, Input, Overlay, Panel, PanelFooter, PanelHeader, Space } from 'rebass';
-
-export const Modal = ({ modalOpen, toggleModal }) => (
- <Overlay open={modalOpen} onDismiss={toggleModal('usernameModal')}>
- <Panel theme="info">
- <PanelHeader>
- What's your username ?
- <Space auto />
- <Close onClick={toggleModal('usernameModal')} />
- </PanelHeader>
- <Input label="Username" name="username" placeholder="Cesar92" rounded type="text" />
- <PanelFooter>
- <Space auto />
- <Button theme="success" onClick={toggleModal('usernameModal')} children="Ok" />
- </PanelFooter>
- </Panel>
- </Overlay>
-);
diff --git a/frontend/src/scenes/Lobby/index.js b/frontend/src/scenes/Lobby/index.js
index 88021fbe..ad39d09e 100644
--- a/frontend/src/scenes/Lobby/index.js
+++ b/frontend/src/scenes/Lobby/index.js
@@ -11,6 +11,7 @@ import { getPlayers } from '../../redux/players';
export type LobbyProps = {
currentGame: Game,
players: List<Player>,
+ startGame: () => void,
}
class LobbyPresenter extends Component<LobbyProps> {
bgstack15