diff --git a/src/components/Snippets.js b/src/components/Snippets.js index 0963e08..e057458 100644 --- a/src/components/Snippets.js +++ b/src/components/Snippets.js @@ -1,7 +1,7 @@ import React from 'react'; import API from './SpreadsheetData'; import processString from 'react-process-string'; -import s from '../styles/app.style'; +import s from './app.style'; export function UnderConstruction(props) { return ( diff --git a/src/styles/app.style.js b/src/components/app.style.js similarity index 100% rename from src/styles/app.style.js rename to src/components/app.style.js diff --git a/src/components/entercode/EnterTheCode.js b/src/components/entercode/EnterTheCode.js index a874d1c..9829477 100644 --- a/src/components/entercode/EnterTheCode.js +++ b/src/components/entercode/EnterTheCode.js @@ -6,7 +6,7 @@ import Interactive from 'react-interactive'; import DigitInput from 'react-digit-input'; import API from '../SpreadsheetData'; import {Loading} from '../Snippets'; -import style from '../../styles/style'; +import style from '../style'; import './packs.scss'; const s = Object.create(style); diff --git a/src/components/entercode/PackSimulator.js b/src/components/entercode/PackSimulator.js index 0ebeb2b..a7f5833 100644 --- a/src/components/entercode/PackSimulator.js +++ b/src/components/entercode/PackSimulator.js @@ -6,7 +6,7 @@ import loki from 'lokijs'; import Interactive from 'react-interactive'; import API from '../SpreadsheetData'; import {Loading} from '../Snippets'; -import s from '../../styles/style'; +import s from '../style'; import './packs.scss'; @inject((stores, props, context) => props) @observer diff --git a/src/styles/home.style.js b/src/components/home.style.js similarity index 100% rename from src/styles/home.style.js rename to src/components/home.style.js diff --git a/src/components/index.js b/src/components/index.js index 0c6966c..4a1ed9b 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -5,10 +5,11 @@ import loadable from '@loadable/component'; import windowWidth from './windowWidth'; import Desktop from './desktop'; import Mobile from './mobile'; -import s from '../styles/app.style'; +import s from './app.style'; + /* Components */ -import {PageNotFound, UnderConstruction, Loading} from './Snippets'; +import {Loading} from './Snippets'; import Create from './create/index'; const EnterTheCode = loadable( diff --git a/src/components/portal/Category.js b/src/components/portal/Category.js index f234e0e..0ec5973 100644 --- a/src/components/portal/Category.js +++ b/src/components/portal/Category.js @@ -3,7 +3,7 @@ import Interactive from 'react-interactive'; import {Link, Route} from 'react-router-dom'; import {observable} from 'mobx'; import {observer, inject} from 'mobx-react'; -import s from '../../styles/app.style'; +import s from '../app.style'; import API from '../SpreadsheetData'; import {Loading} from '../Snippets'; diff --git a/src/components/portal/Search.js b/src/components/portal/Search.js index ca60d51..86c1d63 100644 --- a/src/components/portal/Search.js +++ b/src/components/portal/Search.js @@ -5,7 +5,7 @@ import API from '../SpreadsheetData'; import {observable} from "mobx"; import {observer, inject} from 'mobx-react'; import loki from 'lokijs'; -import s from '../../styles/app.style'; +import s from '../app.style'; import {SearchButton} from '../Snippets'; @inject((stores, props, context) => props) @observer diff --git a/src/components/portal/Single/Attack.js b/src/components/portal/Single/Attack.js index 36361f2..38514c7 100644 --- a/src/components/portal/Single/Attack.js +++ b/src/components/portal/Single/Attack.js @@ -1,6 +1,6 @@ import React from 'react'; import API from '../../SpreadsheetData'; -import s from '../../../styles/app.style'; +import s from '../../app.style'; import {observer, inject} from 'mobx-react'; import {PageNotFound} from '../../Snippets'; import Single from './_base'; diff --git a/src/components/portal/Single/Battlegear.js b/src/components/portal/Single/Battlegear.js index d430da8..0a78134 100644 --- a/src/components/portal/Single/Battlegear.js +++ b/src/components/portal/Single/Battlegear.js @@ -1,6 +1,6 @@ import React from 'react'; import API from '../../SpreadsheetData'; -import s from '../../../styles/app.style'; +import s from '../../app.style'; import {observer, inject} from 'mobx-react'; import {PageNotFound} from '../../Snippets'; import Single from './_base'; diff --git a/src/components/portal/Single/Creature.js b/src/components/portal/Single/Creature.js index 5188044..7ca1b6a 100644 --- a/src/components/portal/Single/Creature.js +++ b/src/components/portal/Single/Creature.js @@ -2,7 +2,7 @@ import React from 'react'; import Interactive from 'react-interactive'; import {Link} from 'react-router-dom'; import API from '../../SpreadsheetData'; -import s from '../../../styles/app.style'; +import s from '../../app.style'; import {observer, inject} from 'mobx-react'; import Single from './_base'; import {PageNotFound, Element, Mugic, Discipline, Ability, Tribe} from '../../Snippets'; diff --git a/src/components/portal/Single/Mugic.js b/src/components/portal/Single/Mugic.js index 4a4b400..9c70643 100644 --- a/src/components/portal/Single/Mugic.js +++ b/src/components/portal/Single/Mugic.js @@ -1,6 +1,6 @@ import React from 'react'; import API from '../../SpreadsheetData'; -import s from '../../../styles/app.style'; +import s from '../../app.style'; import {observer, inject} from 'mobx-react'; import Single from './_base'; import {PageNotFound, Mugic, Tribe} from '../../Snippets'; diff --git a/src/components/portal/Single/_base.js b/src/components/portal/Single/_base.js index 8c2ec55..b911c58 100644 --- a/src/components/portal/Single/_base.js +++ b/src/components/portal/Single/_base.js @@ -4,7 +4,7 @@ import {observer, inject} from 'mobx-react'; import {Link} from 'react-router-dom'; import API from '../../SpreadsheetData'; import {Rarity, Ability} from '../../Snippets'; -import s from '../../../styles/app.style'; +import s from '../../app.style'; // own "name" display function function Name(props) { diff --git a/src/components/portal/Tribes.js b/src/components/portal/Tribes.js index a6bec5c..ba52222 100644 --- a/src/components/portal/Tribes.js +++ b/src/components/portal/Tribes.js @@ -4,7 +4,7 @@ import {Link, Route} from 'react-router-dom'; import {observable} from 'mobx'; import {observer, inject} from 'mobx-react'; import loki from 'lokijs'; -import s from '../../styles/app.style'; +import s from '../app.style'; import API from '../SpreadsheetData'; import {Loading} from '../Snippets'; import Creature from './Single/Creature'; diff --git a/src/styles/style.js b/src/components/style.js similarity index 100% rename from src/styles/style.js rename to src/components/style.js