diff --git a/src/PhonoChangeApplier.js b/src/PhonoChangeApplier.js index 2e2726d..54ff38b 100644 --- a/src/PhonoChangeApplier.js +++ b/src/PhonoChangeApplier.js @@ -9,8 +9,8 @@ import Epochs from './components/Epochs'; import Options from './components/Options'; import Output from './components/Output'; -import {stateReducer} from './reducers/stateReducer'; -import {initState} from './reducers/stateReducer.init'; +import {stateReducer} from './reducers/reducer'; +import {initState} from './reducers/reducer.init'; const PhonoChangeApplier = () => { const [ state, dispatch ] = useReducer( diff --git a/src/components/Features.js b/src/components/Features.js index 5c6d661..658d810 100644 --- a/src/components/Features.js +++ b/src/components/Features.js @@ -2,7 +2,7 @@ import React, {useState} from 'react'; import './Features.scss'; -import type { featureAction } from '../reducers/stateReducer.features'; +import type { featureAction } from '../reducers/reducer.features'; const parsePhonesFromFeatureObject = featureObject => { diff --git a/src/reducers/stateReducer.epochs.js b/src/reducers/reducer.epochs.js similarity index 95% rename from src/reducers/stateReducer.epochs.js rename to src/reducers/reducer.epochs.js index 32d0a05..8d820b8 100644 --- a/src/reducers/stateReducer.epochs.js +++ b/src/reducers/reducer.epochs.js @@ -1,5 +1,5 @@ // @flow -import type { stateType } from './stateReducer'; +import type { stateType } from './reducer'; export type epochAction = { type: "ADD_EPOCH" | "SET_EPOCH" | "REMOVE_EPOCH", diff --git a/src/reducers/stateReducer.epochs.test.js b/src/reducers/reducer.epochs.test.js similarity index 97% rename from src/reducers/stateReducer.epochs.test.js rename to src/reducers/reducer.epochs.test.js index cc6cde4..644302f 100644 --- a/src/reducers/stateReducer.epochs.test.js +++ b/src/reducers/reducer.epochs.test.js @@ -1,4 +1,4 @@ -import {stateReducer} from './stateReducer'; +import {stateReducer} from './reducer'; describe('Epochs', () => { const state = {}; diff --git a/src/reducers/stateReducer.features.js b/src/reducers/reducer.features.js similarity index 97% rename from src/reducers/stateReducer.features.js rename to src/reducers/reducer.features.js index f984206..ade8362 100644 --- a/src/reducers/stateReducer.features.js +++ b/src/reducers/reducer.features.js @@ -1,5 +1,5 @@ // @flow -import type { stateType } from './stateReducer'; +import type { stateType } from './reducer'; export type featureAction = { type: "ADD_FEATURE", diff --git a/src/reducers/stateReducer.features.test.js b/src/reducers/reducer.features.test.js similarity index 94% rename from src/reducers/stateReducer.features.test.js rename to src/reducers/reducer.features.test.js index eba1bd0..0e59ddb 100644 --- a/src/reducers/stateReducer.features.test.js +++ b/src/reducers/reducer.features.test.js @@ -1,4 +1,4 @@ -import {stateReducer} from './stateReducer'; +import {stateReducer} from './reducer'; describe('Features', () => { const state = {} diff --git a/src/reducers/stateReducer.init.js b/src/reducers/reducer.init.js similarity index 98% rename from src/reducers/stateReducer.init.js rename to src/reducers/reducer.init.js index 3006ca0..7a9b152 100644 --- a/src/reducers/stateReducer.init.js +++ b/src/reducers/reducer.init.js @@ -1,5 +1,5 @@ // @flow -import type { stateType } from './stateReducer'; +import type { stateType } from './reducer'; export type initAction = { type: "INIT" diff --git a/src/reducers/stateReducer.js b/src/reducers/reducer.js similarity index 63% rename from src/reducers/stateReducer.js rename to src/reducers/reducer.js index 9be6d28..92de082 100644 --- a/src/reducers/stateReducer.js +++ b/src/reducers/reducer.js @@ -1,16 +1,16 @@ // @flow -import { addLexeme, setLexicon } from './stateReducer.lexicon'; -import type { lexiconAction } from './stateReducer.lexicon'; -import { addEpoch, setEpoch, removeEpoch } from './stateReducer.epochs'; -import type { epochAction } from './stateReducer.epochs'; -import { addFeature } from './stateReducer.features'; -import type { featureAction } from './stateReducer.features'; -import type { optionsAction } from './stateReducer.options'; -import { setOptions } from './stateReducer.options'; -import { run } from './stateReducer.results'; -import type { resultsAction } from './stateReducer.results' -import { initState } from './stateReducer.init'; -import type { initAction } from './stateReducer.init'; +import { addLexeme, setLexicon } from './reducer.lexicon'; +import type { lexiconAction } from './reducer.lexicon'; +import { addEpoch, setEpoch, removeEpoch } from './reducer.epochs'; +import type { epochAction } from './reducer.epochs'; +import { addFeature } from './reducer.features'; +import type { featureAction } from './reducer.features'; +import type { optionsAction } from './reducer.options'; +import { setOptions } from './reducer.options'; +import { run } from './reducer.results'; +import type { resultsAction } from './reducer.results' +import { initState } from './reducer.init'; +import type { initAction } from './reducer.init'; export type stateType = { lexicon: Array<{lexeme: string, epoch: epochType}>, diff --git a/src/reducers/stateReducer.lexicon.js b/src/reducers/reducer.lexicon.js similarity index 95% rename from src/reducers/stateReducer.lexicon.js rename to src/reducers/reducer.lexicon.js index 2d71efa..8fae84d 100644 --- a/src/reducers/stateReducer.lexicon.js +++ b/src/reducers/reducer.lexicon.js @@ -1,5 +1,5 @@ // @flow -import type { stateType } from './stateReducer'; +import type { stateType } from './reducer'; type lexemeType = { lexeme: string, diff --git a/src/reducers/stateReducer.lexicon.test.js b/src/reducers/reducer.lexicon.test.js similarity index 98% rename from src/reducers/stateReducer.lexicon.test.js rename to src/reducers/reducer.lexicon.test.js index 5b2f83e..d7256ac 100644 --- a/src/reducers/stateReducer.lexicon.test.js +++ b/src/reducers/reducer.lexicon.test.js @@ -1,4 +1,4 @@ -import {stateReducer} from './stateReducer'; +import {stateReducer} from './reducer'; describe('Lexicon', () => { const state = { diff --git a/src/reducers/stateReducer.options.js b/src/reducers/reducer.options.js similarity index 90% rename from src/reducers/stateReducer.options.js rename to src/reducers/reducer.options.js index 76263b0..49bac13 100644 --- a/src/reducers/stateReducer.options.js +++ b/src/reducers/reducer.options.js @@ -1,5 +1,5 @@ // @flow -import type { stateType } from './stateReducer'; +import type { stateType } from './reducer'; export type optionAction = { type: 'SET_OPTIONS', diff --git a/src/reducers/stateReducer.options.test.js b/src/reducers/reducer.options.test.js similarity index 90% rename from src/reducers/stateReducer.options.test.js rename to src/reducers/reducer.options.test.js index 08820b9..8a6eb7d 100644 --- a/src/reducers/stateReducer.options.test.js +++ b/src/reducers/reducer.options.test.js @@ -1,5 +1,5 @@ -import { stateReducer } from './stateReducer'; -import { initState } from './stateReducer.init'; +import { stateReducer } from './reducer'; +import { initState } from './reducer.init'; describe('Options', () => { let state = {} diff --git a/src/reducers/stateReducer.phones.test.js b/src/reducers/reducer.phones.test.js similarity index 98% rename from src/reducers/stateReducer.phones.test.js rename to src/reducers/reducer.phones.test.js index fc3e638..43ae1b1 100644 --- a/src/reducers/stateReducer.phones.test.js +++ b/src/reducers/reducer.phones.test.js @@ -1,4 +1,4 @@ -import {stateReducer} from './stateReducer'; +import {stateReducer} from './reducer'; describe('Phones', () => { const n_phone = {features: {nasal: true}, grapheme: 'n'}; diff --git a/src/reducers/stateReducer.results.js b/src/reducers/reducer.results.js similarity index 98% rename from src/reducers/stateReducer.results.js rename to src/reducers/reducer.results.js index f1b2e79..ef7a60a 100644 --- a/src/reducers/stateReducer.results.js +++ b/src/reducers/reducer.results.js @@ -1,5 +1,5 @@ // @flow -import type { stateType, epochType, phoneType } from './stateReducer'; +import type { stateType, epochType, phoneType } from './reducer'; export type resultsAction = { type: 'RUN' diff --git a/src/reducers/stateReducer.results.test.js b/src/reducers/reducer.results.test.js similarity index 88% rename from src/reducers/stateReducer.results.test.js rename to src/reducers/reducer.results.test.js index b93cc63..bd30c47 100644 --- a/src/reducers/stateReducer.results.test.js +++ b/src/reducers/reducer.results.test.js @@ -1,6 +1,6 @@ -import { stateReducer } from './stateReducer'; -import { initState } from './stateReducer.init'; -import { decomposeRules } from './stateReducer.results'; +import { stateReducer } from './reducer'; +import { initState } from './reducer.init'; +import { decomposeRules } from './reducer.results'; describe('Results', () => { let state = {}; diff --git a/src/reducers/stateReducer.test.js b/src/reducers/reducer.test.js similarity index 78% rename from src/reducers/stateReducer.test.js rename to src/reducers/reducer.test.js index a4920d8..b25cc94 100644 --- a/src/reducers/stateReducer.test.js +++ b/src/reducers/reducer.test.js @@ -1,4 +1,4 @@ -import {stateReducer} from './stateReducer'; +import {stateReducer} from './reducer'; it('default returns state unaltered', () => { const state = {data: 'example'};