moved components to new folders

mrt123 · Sep 10, 2017 · a762f4c · a762f4c
1 parent dc8bc6c
commit a762f4c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/src/App/App.js b/src/App/App.js
@@ -8,10 +8,10 @@ import {
 import styled from 'styled-components';
 import NavBarContainer from './NavBarContainer';
 
-import Search from '../routes/search/Search';
-import CardsContainer from '../routes/cards/CardsContainer';
+import Search from '../routes/Search';
+import CardsContainer from '../routes/CardsContainer';
 import MyWordsContainer from '../routes/MyWordsContainer';
-import WordContainer from '../common/WordContainer';
+import WordContainer from '../common/word/WordContainer';
 import Logout from '../routes/LogOut';
 import Login from '../routes/Login';
 import SetLogged from '../routes/SetLogged';

diff --git a/src/routes/cards/Card.js → src/common/Card.js b/src/routes/cards/Card.js → src/common/Card.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import styled from 'styled-components'
-import WordContainer from './../../common/WordContainer.js'
+import WordContainer from './word/WordContainer.js'
 
 const Perspective = styled.div`
   display: flex;

diff --git a/src/routes/cards/Cards.js → src/common/Cards.js b/src/routes/cards/Cards.js → src/common/Cards.js
@@ -1,7 +1,7 @@
 import React from 'react'
-import {RouteWrapper, BigSpinner} from '../../common/routeComponents';
+import {RouteWrapper, BigSpinner} from './routeComponents';
 import Card from './Card'
-import Button1 from '../../common/buttons/Button1.js'
+import Button1 from './buttons/Button1.js'
 import styled from 'styled-components'
 
 const Footer = styled.div`

diff --git a/src/routes/search/SearchBar.js → src/common/SearchBar.js b/src/routes/search/SearchBar.js → src/common/SearchBar.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import styled from 'styled-components';
-import createHistory from 'history/createBrowserHistory'
+import createHistory from '../../node_modules/history/createBrowserHistory'
 const history = createHistory();
 
 const Wrapper = styled.div`

diff --git a/src/common/LexicalEntries.js → src/common/word/LexicalEntries.js b/src/common/LexicalEntries.js → src/common/word/LexicalEntries.js
diff --git a/src/common/LexicalEntry.js → src/common/word/LexicalEntry.js b/src/common/LexicalEntry.js → src/common/word/LexicalEntry.js
diff --git a/src/common/Sense.js → src/common/word/Sense.js b/src/common/Sense.js → src/common/word/Sense.js
diff --git a/src/common/Word.js → src/common/word/Word.js b/src/common/Word.js → src/common/word/Word.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
-import {BigSpinner} from '../common/routeComponents';
+import {BigSpinner} from '../routeComponents';
 import LexicalEntries from './LexicalEntries';
-import FavoriteContainer from './FavoriteContainer.js';
+import FavoriteContainer from './../FavoriteContainer.js';
 
 const WordWrapper = styled.div`
   margin: 30px 10px;

diff --git a/src/common/WordContainer.js → src/common/word/WordContainer.js b/src/common/WordContainer.js → src/common/word/WordContainer.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import * as api from './../api/api';
+import * as api from './../../api/api';
 import Word from './Word';
 
 class WordContainer extends Component {

diff --git a/src/routes/cards/CardsContainer.js → src/routes/CardsContainer.js b/src/routes/cards/CardsContainer.js → src/routes/CardsContainer.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import * as api from './../../api/api'
-import Cards from './Cards'
+import * as api from './../api/api'
+import Cards from './../common/Cards'
 
 export default class extends React.Component {  // TODO: remove duplication with myWordsContainer.
   constructor() {

diff --git a/src/routes/search/Search.js → src/routes/Search.js b/src/routes/search/Search.js → src/routes/Search.js
@@ -1,7 +1,7 @@
 import React, {Component} from 'react';
-import {RouteWrapper} from '../../common/routeComponents';
-import SearchBar from './SearchBar';
-import WordContainer from './../../common/WordContainer';
+import {RouteWrapper} from '../common/routeComponents';
+import SearchBar from './../common/SearchBar';
+import WordContainer from './../common/word/WordContainer';
 
 export default class Home extends Component {