Refactor data folder structure

zoltantothcom · zoltantothcom · commit 5f9ed80352ac · 2019-03-02T10:31:59.000-05:00
diff --git a/__tests__/actions/actions.test.js b/__tests__/actions/actions.test.js
@@ -1,7 +1,13 @@
 import { restart } from '../../src/actions/restart';
 import { submitAnswer } from '../../src/actions/submitAnswer';
 import { toggle, toggleJS, toggleMode } from '../../src/actions/toggle';
-import { SUBMIT, TOGGLE, TOGGLE_JS, TOGGLE_MODE, RESTART } from '../../src/data/constants';
+import {
+  SUBMIT,
+  TOGGLE,
+  TOGGLE_JS,
+  TOGGLE_MODE,
+  RESTART
+} from '../../src/static/constants/actions';
 
 describe('Action Creators', () => {
   it('should dispatch RESTART action', () => {
diff --git a/__tests__/components/ButtonContainer.test.js b/__tests__/components/ButtonContainer.test.js
@@ -8,7 +8,7 @@ import ButtonContainer, {
   ButtonContainer as NotConnectedButtonContainer
 } from '../../src/components/ButtonContainer';
 import { answers } from '../../src/store';
-import { SUBMIT } from '../../src/data/constants';
+import { SUBMIT } from '../../src/static/constants/actions';
 
 describe('<ButtonContainer /> connected', () => {
   const mockStore = configureMockStore();
diff --git a/__tests__/components/Toggle.test.js b/__tests__/components/Toggle.test.js
@@ -8,7 +8,7 @@ import { themeLight } from '../../src/styles/themes/theme.light';
 import { themeDark } from '../../src/styles/themes/theme.dark';
 import 'jest-styled-components';
 import Toggle from '../../src/components/Toggle';
-import { TOGGLE } from '../../src/data/constants';
+import { TOGGLE } from '../../src/static/constants/actions';
 
 const mockClick = jest.fn();
 const mockStore = configureMockStore();
diff --git a/__tests__/middleware/submit.test.js b/__tests__/middleware/submit.test.js
@@ -1,6 +1,6 @@
 import configureMockStore from 'redux-mock-store';
 import { submitMiddleware } from '../../src/middleware/submit';
-import { SUBMIT } from '../../src/data/constants';
+import { SUBMIT } from '../../src/static/constants/actions';
 
 const next = jest.fn();
 const mockStore = configureMockStore();
diff --git a/__tests__/middleware/toggle.test.js b/__tests__/middleware/toggle.test.js
@@ -1,6 +1,6 @@
 import configureMockStore from 'redux-mock-store';
 import { toggleMiddleware } from '../../src/middleware/toggle';
-import { TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../../src/data/constants';
+import { TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../../src/static/constants/actions';
 
 const next = jest.fn();
 const mockStore = configureMockStore();
diff --git a/__tests__/pages/Game.test.js b/__tests__/pages/Game.test.js
@@ -9,7 +9,7 @@ import { themeDark } from '../../src/styles/themes/theme.dark';
 import styleLight from '../../src/styles/hljs/hljs.light';
 import styleDark from '../../src/styles/hljs/hljs.dark';
 import Game from '../../src/pages/Game';
-import { RESTART } from '../../src/data/constants';
+import { RESTART } from '../../src/static/constants/actions';
 
 const patterns = [
   {
diff --git a/__tests__/reducers/reducers.test.js b/__tests__/reducers/reducers.test.js
@@ -1,5 +1,5 @@
 import reducer from '../../src/reducers';
-import { SUBMIT, TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../../src/data/constants';
+import { SUBMIT, TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../../src/static/constants/actions';
 
 const answers = [
   {
diff --git a/src/actions/restart.js b/src/actions/restart.js
@@ -1,4 +1,4 @@
-import { RESTART } from '../data/constants';
+import { RESTART } from '../static/constants/actions';
 
 export const restart = payload => ({
   type: RESTART,
diff --git a/src/actions/submitAnswer.js b/src/actions/submitAnswer.js
@@ -1,4 +1,4 @@
-import { SUBMIT } from '../data/constants';
+import { SUBMIT } from '../static/constants/actions';
 
 export const submitAnswer = payload => ({
   type: SUBMIT,
diff --git a/src/actions/toggle.js b/src/actions/toggle.js
@@ -1,4 +1,4 @@
-import { TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../data/constants';
+import { TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../static/constants/actions';
 
 export const toggle = payload => ({
   type: TOGGLE,
diff --git a/src/components/Svg.jsx b/src/components/Svg.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { getMode } from '../selectors';
-import { JS, SUN_OUTLINED, SUN_FILLED } from '../data/icons';
+import { JS, SUN_OUTLINED, SUN_FILLED } from '../static/icons';
 
 const SVG = ({ control, mode }) => {
   let icon = JS;
diff --git a/src/middleware/submit.js b/src/middleware/submit.js
@@ -1,4 +1,4 @@
-import { SUBMIT } from '../data/constants';
+import { SUBMIT } from '../static/constants/actions';
 import { randomFromRange } from '../helpers/randomFromRange';
 
 export const submitMiddleware = ({ getState }) => next => action => {
diff --git a/src/middleware/toggle.js b/src/middleware/toggle.js
@@ -1,4 +1,4 @@
-import { TOGGLE } from '../data/constants';
+import { TOGGLE } from '../static/constants/actions';
 import { toggleJS, toggleMode } from '../actions/toggle';
 
 export const toggleMiddleware = ({ dispatch, getState }) => next => action => {
diff --git a/src/reducers/index.js b/src/reducers/index.js
@@ -1,4 +1,4 @@
-import { SUBMIT, TOGGLE, TOGGLE_JS, TOGGLE_MODE, RESTART } from '../data/constants';
+import { SUBMIT, TOGGLE, TOGGLE_JS, TOGGLE_MODE, RESTART } from '../static/constants/actions';
 import { randomFromRange } from '../helpers/randomFromRange';
 
 const rootReducer = (state, action) => {
diff --git a/src/static/constants/actions.js b/src/static/constants/actions.js
diff --git a/src/static/constants/colors.js b/src/static/constants/colors.js
diff --git a/src/static/constants/themes.js b/src/static/constants/themes.js
@@ -0,0 +1,2 @@
+export const THEME_LIGHT = 'LIGHT';
+export const THEME_DARK = 'DARK';
diff --git a/src/static/icons/index.js b/src/static/icons/index.js
diff --git a/src/static/patterns/index.js b/src/static/patterns/index.js
diff --git a/src/store/index.js b/src/store/index.js
@@ -1,7 +1,7 @@
 import { createStore, applyMiddleware, compose } from 'redux';
 const uuid = require('uuid/v4');
 import reducer from '../reducers/index';
-import patterns from '../data/patterns';
+import patterns from '../static/patterns';
 import middleware from '../middleware';
 
 export const answers = patterns.map(pattern => ({
diff --git a/src/styles/themes/theme.light.js b/src/styles/themes/theme.light.js
@@ -1,5 +1,7 @@
+import { THEME_LIGHT } from '../../static/constants/themes';
+
 export const themeLight = {
-  name: 'LIGHT',
+  name: THEME_LIGHT,
   background: '#f4f4f4',
 
   buttonBackground: '#e8e8e8',

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import { themeDark } from '../../src/styles/themes/theme.dark';`
`9`	`9`	`import styleLight from '../../src/styles/hljs/hljs.light';`
`10`	`10`	`import styleDark from '../../src/styles/hljs/hljs.dark';`
`11`	`11`	`import Game from '../../src/pages/Game';`
`12`		`-import { RESTART } from '../../src/data/constants';`
	`12`	`+import { RESTART } from '../../src/static/constants/actions';`
`13`	`13`
`14`	`14`	`const patterns = [`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import reducer from '../../src/reducers';`
`2`		`-import { SUBMIT, TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../../src/data/constants';`
	`2`	`+import { SUBMIT, TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../../src/static/constants/actions';`
`3`	`3`
`4`	`4`	`const answers = [`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { RESTART } from '../data/constants';`
	`1`	`+import { RESTART } from '../static/constants/actions';`
`2`	`2`
`3`	`3`	`export const restart = payload => ({`
`4`	`4`	`type: RESTART,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { SUBMIT } from '../data/constants';`
	`1`	`+import { SUBMIT } from '../static/constants/actions';`
`2`	`2`
`3`	`3`	`export const submitAnswer = payload => ({`
`4`	`4`	`type: SUBMIT,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../data/constants';`
	`1`	`+import { TOGGLE, TOGGLE_JS, TOGGLE_MODE } from '../static/constants/actions';`
`2`	`2`
`3`	`3`	`export const toggle = payload => ({`
`4`	`4`	`type: TOGGLE,`