diff options
author | Joffrey BION <joffrey.bion@gmail.com> | 2018-06-10 15:41:42 +0200 |
---|---|---|
committer | Joffrey BION <joffrey.bion@gmail.com> | 2018-06-10 15:46:50 +0200 |
commit | bd212b997b2c7293f98db6a6be2b2900da87af6f (patch) | |
tree | cd97259ebef04d63eb1c6bdf7b93e3bcfb75234d | |
parent | Remove unnecessary prop types exports (diff) | |
download | seven-wonders-bd212b997b2c7293f98db6a6be2b2900da87af6f.tar.gz seven-wonders-bd212b997b2c7293f98db6a6be2b2900da87af6f.tar.bz2 seven-wonders-bd212b997b2c7293f98db6a6be2b2900da87af6f.zip |
Finish moving components out of /scenes package
-rw-r--r-- | frontend/src/components/Application.jsx (renamed from frontend/src/scenes/index.js) | 6 | ||||
-rw-r--r-- | frontend/src/components/game-browser/GameBrowser.jsx | 2 | ||||
-rw-r--r-- | frontend/src/components/game-browser/PlayerInfo.jsx (renamed from frontend/src/components/PlayerInfo.jsx) | 4 | ||||
-rw-r--r-- | frontend/src/components/lobby/Lobby.jsx (renamed from frontend/src/scenes/Lobby/index.js) | 2 | ||||
-rw-r--r-- | frontend/src/components/lobby/PlayerList.jsx (renamed from frontend/src/components/PlayerList.jsx) | 2 | ||||
-rw-r--r-- | frontend/src/index.js | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/frontend/src/scenes/index.js b/frontend/src/components/Application.jsx index c708c9a9..d7e1738c 100644 --- a/frontend/src/scenes/index.js +++ b/frontend/src/components/Application.jsx @@ -1,8 +1,8 @@ import React from 'react'; import { Redirect, Route, Switch } from 'react-router-dom'; -import { GameBrowser } from '../components/game-browser/GameBrowser'; -import { Lobby } from './Lobby'; -import { Home } from '../components/home/Home'; +import { GameBrowser } from './game-browser/GameBrowser'; +import { Lobby } from './lobby/Lobby'; +import { Home } from './home/Home'; export const Application = () => ( <Switch> diff --git a/frontend/src/components/game-browser/GameBrowser.jsx b/frontend/src/components/game-browser/GameBrowser.jsx index 3455f429..10d823b4 100644 --- a/frontend/src/components/game-browser/GameBrowser.jsx +++ b/frontend/src/components/game-browser/GameBrowser.jsx @@ -4,7 +4,7 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; import { Flex } from 'reflexbox'; import { GameList } from './GameList'; -import { PlayerInfo } from '../PlayerInfo'; +import { PlayerInfo } from './PlayerInfo'; import { actions } from '../../redux/games'; type GameBrowserProps = { diff --git a/frontend/src/components/PlayerInfo.jsx b/frontend/src/components/game-browser/PlayerInfo.jsx index afe03055..2f29ea60 100644 --- a/frontend/src/components/PlayerInfo.jsx +++ b/frontend/src/components/game-browser/PlayerInfo.jsx @@ -2,8 +2,8 @@ import { Text } from '@blueprintjs/core'; import React from 'react'; import { connect } from 'react-redux'; -import type { Player } from '../models/players'; -import { getCurrentPlayer } from '../redux/players'; +import type { Player } from '../../models/players'; +import { getCurrentPlayer } from '../../redux/players'; type PlayerInfoProps = { player: ?Player, diff --git a/frontend/src/scenes/Lobby/index.js b/frontend/src/components/lobby/Lobby.jsx index b0b9adac..ea865025 100644 --- a/frontend/src/scenes/Lobby/index.js +++ b/frontend/src/components/lobby/Lobby.jsx @@ -3,7 +3,7 @@ import { Button } from '@blueprintjs/core'; import { List } from 'immutable'; import React, { Component } from 'react'; import { connect } from 'react-redux'; -import { PlayerList } from '../../components/PlayerList'; +import { PlayerList } from '../../components/lobby/PlayerList'; import type { Game } from '../../models/games'; import type { Player } from '../../models/players'; import { actions, getCurrentGame } from '../../redux/games'; diff --git a/frontend/src/components/PlayerList.jsx b/frontend/src/components/lobby/PlayerList.jsx index 64377476..db3d4418 100644 --- a/frontend/src/components/PlayerList.jsx +++ b/frontend/src/components/lobby/PlayerList.jsx @@ -3,7 +3,7 @@ import { Text } from '@blueprintjs/core'; import { List } from 'immutable'; import React from 'react'; import { Flex } from 'reflexbox'; -import { Player } from '../models/players'; +import { Player } from '../../models/players'; type PlayerListProps = { players: List<Player>; diff --git a/frontend/src/index.js b/frontend/src/index.js index 5b6e48a0..c7dbd5bb 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -5,7 +5,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { Provider } from 'react-redux'; import { ConnectedRouter } from 'react-router-redux'; -import { Application } from './scenes'; +import { Application } from './components/Application'; import { configureStore } from './store'; const initialState = {}; |