#12 Change folder structure for redux states

src/api/persistenceApi.test.ts

@@ -1,8 +1,8 @@
 import FileSaver from "file-saver";
 import JSZip from "jszip";
 
-import { initialAnalysisState } from "../states/analysisSlice";
-import { initialProjectState } from "../states/projectSlice";
+import { initialAnalysisState } from "../states/analysis/analysisSlice";
+import { initialProjectState } from "../states/project/projectSlice";
 import { PersistedState } from "../states/store";
 import PersistenceApi from "./persistenceApi";
 

src/components/app/app.tsx

@@ -24,9 +24,9 @@ import GuitarPage from "../../pages/guitar/guitarPage";
 import HarmonyPage from "../../pages/harmony/harmonyPage";
 import PrintPage from "../../pages/print/printPage";
 import StructurePage from "../../pages/structure/structurePage";
-import { DialogType, openedDialog } from "../../states/dialogsSlice";
-import { LoadingStatus } from "../../states/projectSlice";
-import { Page, switchedPage } from "../../states/projectSlice";
+import { DialogType, openedDialog } from "../../states/dialog/dialogsSlice";
+import { LoadingStatus } from "../../states/project/projectSlice";
+import { Page, switchedPage } from "../../states/project/projectSlice";
 import { ApplicationState } from "../../states/store";
 import { stylesForApp } from "../../styles/styles";
 import Log from "../log/log";

src/components/audioManagement/audioManagement.tsx

@@ -4,9 +4,16 @@ import { connect } from "react-redux";
 import Tone from "tone";
 
 import PersistenceApi from "../../api/persistenceApi";
-import { Measure, Section, updatedRhythm } from "../../states/analysisSlice";
-import { triggeredPause } from "../../states/audioSlice";
-import { initializedProject, LoadingStatus } from "../../states/projectSlice";
+import {
+  Measure,
+  Section,
+  updatedRhythm
+} from "../../states/analysis/analysisSlice";
+import { triggeredPause } from "../../states/audio/audioSlice";
+import {
+  initializedProject,
+  LoadingStatus
+} from "../../states/project/projectSlice";
 import { ApplicationState, NormalizedObjects } from "../../states/store";
 import Log from "../log/log";
 import AudioPlayer from "./audioPlayer";

src/components/audioManagement/peaksConfig.ts

@@ -1,6 +1,10 @@
 import { PointAddOptions, SegmentAddOptions } from "peaks.js";
 
-import { Measure, Section, SectionType } from "../../states/analysisSlice";
+import {
+  Measure,
+  Section,
+  SectionType
+} from "../../states/analysis/analysisSlice";
 import { NormalizedObjects } from "../../states/store";
 
 export const AUDIO_DOM_ELEMENT = "audio_dom_element";

src/components/dialogManagement/dialogManagement.stories.tsx

@@ -5,7 +5,7 @@ import { createStore } from "redux";
 import { composeWithDevTools } from "redux-devtools-extension";
 
 import DialogManagement from "../../components/dialogManagement/dialogManagement";
-import { DialogType, openedDialog } from "../../states/dialogsSlice";
+import { DialogType, openedDialog } from "../../states/dialog/dialogsSlice";
 import { createRootReducer } from "../../states/store";
 
 export default {

src/components/dialogManagement/dialogManagement.tsx

@@ -9,14 +9,14 @@ import {
   addedSection,
   initialAnalysisState,
   SectionType
-} from "../../states/analysisSlice";
-import { closedDialog, DialogType } from "../../states/dialogsSlice";
+} from "../../states/analysis/analysisSlice";
+import { closedDialog, DialogType } from "../../states/dialog/dialogsSlice";
 import {
   createdProject,
   initialProjectState,
   Page,
   switchedPage
-} from "../../states/projectSlice";
+} from "../../states/project/projectSlice";
 import store, { ApplicationState } from "../../states/store";
 import ArrayUtil from "../../util/ArrayUtil";
 import FileInput, { FileType } from "../fileInput/fileInput";

src/components/sectionOverview/sectionOverview.stories.tsx

@@ -3,13 +3,16 @@ import { Provider } from "react-redux";
 import { createStore } from "redux";
 import { composeWithDevTools } from "redux-devtools-extension";
 
-import { SectionType, TimeSignatureType } from "../../states/analysisSlice";
+import {
+  SectionType,
+  TimeSignatureType
+} from "../../states/analysis/analysisSlice";
 import {
   createdProject,
   initializedProject,
   LoadingStatus,
   Page
-} from "../../states/projectSlice";
+} from "../../states/project/projectSlice";
 import { createRootReducer, PersistedState } from "../../states/store";
 import ArrayUtil from "../../util/ArrayUtil";
 import SectionOverview from "./sectionOverview";

src/components/sectionOverview/sectionOverview.tsx

@@ -2,7 +2,7 @@ import { Button, ButtonGroup, Grid, Typography } from "@material-ui/core";
 import React from "react";
 import { connect } from "react-redux";
 
-import { Measure, Section } from "../../states/analysisSlice";
+import { Measure, Section } from "../../states/analysis/analysisSlice";
 import { ApplicationState, NormalizedObjects } from "../../states/store";
 import PeaksConfig from "../audioManagement/peaksConfig";
 

src/components/sectionSelect/sectionSelect.stories.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 
-import { SectionType } from "../../states/analysisSlice";
+import { SectionType } from "../../states/analysis/analysisSlice";
 import SectionSelect from "./sectionSelect";
 
 export default {

src/components/sectionSelect/sectionSelect.test.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { SectionType } from "../../states/analysisSlice";
+import { SectionType } from "../../states/analysis/analysisSlice";
 import TestEnvironment from "../../tests/TestEnvironment";
 import SectionSelect from "./sectionSelect";
 

src/components/sectionSelect/sectionSelect.tsx

@@ -2,7 +2,7 @@ import { MenuItem } from "@material-ui/core";
 import Select from "@material-ui/core/Select/Select";
 import React, { FunctionComponent } from "react";
 
-import { SectionType } from "../../states/analysisSlice";
+import { SectionType } from "../../states/analysis/analysisSlice";
 import PeaksConfig from "../audioManagement/peaksConfig";
 
 const SectionSelect: FunctionComponent<{

src/pages/structure/structurePage.tsx

@@ -11,10 +11,10 @@ import { connect } from "react-redux";
 import ContentLayout from "../../components/contentLayout/contentLayout";
 import Log from "../../components/log/log";
 import View from "../../components/view/view";
-import { triggeredPause, triggeredPlay } from "../../states/audioSlice";
-import { LoadingStatus } from "../../states/projectSlice";
+import { triggeredPause, triggeredPlay } from "../../states/audio/audioSlice";
+import { LoadingStatus } from "../../states/project/projectSlice";
 import { ApplicationState } from "../../states/store";
-import { zoomedIn, zoomedOut } from "../../states/waveSlice";
+import { zoomedIn, zoomedOut } from "../../states/wave/waveSlice";
 import StructureView from "../../views/structure/structureView";
 import StructureNavigationView from "../../views/structureNavigation/structureNavigationView";
 import WaveContainer from "../../views/wave/waveContainer";

src/states/analysisSlice.test.ts → src/states/analysis/analysisSlice.test.ts

@@ -1,4 +1,6 @@
-import ArrayUtil from "../util/ArrayUtil";
+import ArrayUtil from "../../util/ArrayUtil";
+import { createdProject, LoadingStatus, Page } from "../project/projectSlice";
+import { PersistedState } from "../store";
 import reducer, {
   addedSection,
   AnalysisState,
@@ -8,8 +10,6 @@ import reducer, {
   TimeSignatureType,
   updatedRhythm
 } from "./analysisSlice";
-import { createdProject, LoadingStatus, Page } from "./projectSlice";
-import { PersistedState } from "./store";
 
 const initialState: AnalysisState = {
   sections: { allIds: [], byId: {} },

src/states/analysisSlice.ts → src/states/analysis/analysisSlice.ts

@@ -1,7 +1,9 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { PointAddOptions } from "peaks.js";
 
-import ArrayUtil from "../util/ArrayUtil";
+import ArrayUtil from "../../util/ArrayUtil";
+import { createdProject, initializedProject } from "../project/projectSlice";
+import { NormalizedObjects } from "../store";
 import {
   distributeMeasures,
   enclosingSectionOf,
@@ -10,8 +12,6 @@ import {
   sectionInvalid,
   undefinedSection
 } from "./analysisUtil";
-import { createdProject, initializedProject } from "./projectSlice";
-import { NormalizedObjects } from "./store";
 
 export interface AnalysisState {
   readonly sections: NormalizedObjects<Section>;

src/states/analysisUtil.ts → src/states/analysis/analysisUtil.ts

@@ -1,11 +1,11 @@
-import ArrayUtil from "../util/ArrayUtil";
+import ArrayUtil from "../../util/ArrayUtil";
+import { NormalizedObjects } from "../store";
 import {
   Measure,
   Section,
   SectionType,
   TimeSignatureType
 } from "./analysisSlice";
-import { NormalizedObjects } from "./store";
 
 export const toTimeSignature = (type: TimeSignatureType) => {
   switch (type) {

src/states/projectSlice.ts → src/states/project/projectSlice.ts

@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 
-import { PersistedState } from "./store";
+import { PersistedState } from "../store";
 
 export interface ProjectState {
   readonly status: LoadingStatus;

src/states/store.ts

@@ -1,11 +1,11 @@
 import { configureStore, createAction } from "@reduxjs/toolkit";
 import { AnyAction, combineReducers, Reducer } from "redux";
 
-import analysisReducer, { AnalysisState } from "./analysisSlice";
-import audioReducer, { AudioState } from "./audioSlice";
-import dialogReducer, { DialogState } from "./dialogsSlice";
-import projectReducer, { ProjectState } from "./projectSlice";
-import waveReducer, { WaveState } from "./waveSlice";
+import analysisReducer, { AnalysisState } from "./analysis/analysisSlice";
+import audioReducer, { AudioState } from "./audio/audioSlice";
+import dialogReducer, { DialogState } from "./dialog/dialogsSlice";
+import projectReducer, { ProjectState } from "./project/projectSlice";
+import waveReducer, { WaveState } from "./wave/waveSlice";
 
 /** The top-level application state object. */
 export interface ApplicationState {

src/views/structure/structureView.stories.tsx

@@ -2,13 +2,16 @@ import { CssBaseline, ThemeProvider } from "@material-ui/core";
 import React from "react";
 import { Provider } from "react-redux";
 
-import { SectionType, TimeSignatureType } from "../../states/analysisSlice";
+import {
+  SectionType,
+  TimeSignatureType
+} from "../../states/analysis/analysisSlice";
 import {
   createdProject,
   initializedProject,
   LoadingStatus,
   Page
-} from "../../states/projectSlice";
+} from "../../states/project/projectSlice";
 import store, { PersistedState } from "../../states/store";
 import theme from "../../styles/theme";
 import StructureView from "./structureView";

src/views/structure/structureView.tsx

@@ -22,8 +22,8 @@ import {
   Section,
   SectionType,
   updatedSection
-} from "../../states/analysisSlice";
-import { DialogType, openedDialog } from "../../states/dialogsSlice";
+} from "../../states/analysis/analysisSlice";
+import { DialogType, openedDialog } from "../../states/dialog/dialogsSlice";
 import { ApplicationState, NormalizedObjects } from "../../states/store";
 import ArrayUtil from "../../util/ArrayUtil";
 

src/views/structureNavigation/structureNavigationView.stories.tsx

@@ -2,13 +2,16 @@ import { CssBaseline, ThemeProvider } from "@material-ui/core";
 import React from "react";
 import { Provider } from "react-redux";
 
-import { SectionType, TimeSignatureType } from "../../states/analysisSlice";
+import {
+  SectionType,
+  TimeSignatureType
+} from "../../states/analysis/analysisSlice";
 import {
   createdProject,
   initializedProject,
   LoadingStatus,
   Page
-} from "../../states/projectSlice";
+} from "../../states/project/projectSlice";
 import store, { PersistedState } from "../../states/store";
 import theme from "../../styles/theme";
 import StructureNavigationView from "./structureNavigationView";

src/views/wave/waveContainer.tsx

@@ -3,7 +3,7 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 
 import Log from "../../components/log/log";
-import { hotReloaded, LoadingStatus } from "../../states/projectSlice";
+import { hotReloaded, LoadingStatus } from "../../states/project/projectSlice";
 import { ApplicationState } from "../../states/store";
 import WaveView from "./waveView";
 

src/views/waveControl/waveControlView.tsx

@@ -14,9 +14,12 @@ import ToggleButton from "@material-ui/lab/ToggleButton";
 import React, { Component } from "react";
 import { connect } from "react-redux";
 
-import { TimeSignatureType, updatedRhythm } from "../../states/analysisSlice";
-import { updatedPlaybackSettings } from "../../states/audioSlice";
-import { enabledSyncFirstMeasureStart } from "../../states/projectSlice";
+import {
+  TimeSignatureType,
+  updatedRhythm
+} from "../../states/analysis/analysisSlice";
+import { updatedPlaybackSettings } from "../../states/audio/audioSlice";
+import { enabledSyncFirstMeasureStart } from "../../states/project/projectSlice";
 import { ApplicationState } from "../../states/store";
 
 interface PropsFromState {