diff --git a/samples/react/MusicStore/ReactApp/components/NavMenu.tsx b/samples/react/MusicStore/ReactApp/components/NavMenu.tsx index 372677b552..69d0f60c99 100644 --- a/samples/react/MusicStore/ReactApp/components/NavMenu.tsx +++ b/samples/react/MusicStore/ReactApp/components/NavMenu.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { Navbar, Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap'; import { Link } from 'react-router'; import { LinkContainer } from 'react-router-bootstrap'; -import { provide } from '../TypedRedux'; +import { provide } from '../fx/TypedRedux'; import { ApplicationState } from '../store'; import * as GenreList from '../store/GenreList'; diff --git a/samples/react/MusicStore/ReactApp/components/public/AlbumDetails.tsx b/samples/react/MusicStore/ReactApp/components/public/AlbumDetails.tsx index 16c7a33ec0..5cf7312d39 100644 --- a/samples/react/MusicStore/ReactApp/components/public/AlbumDetails.tsx +++ b/samples/react/MusicStore/ReactApp/components/public/AlbumDetails.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Link } from 'react-router'; -import { provide } from '../../TypedRedux'; +import { provide } from '../../fx/TypedRedux'; import { ApplicationState } from '../../store'; import * as AlbumDetailsState from '../../store/AlbumDetails'; diff --git a/samples/react/MusicStore/ReactApp/components/public/GenreDetails.tsx b/samples/react/MusicStore/ReactApp/components/public/GenreDetails.tsx index 4fb83e2207..237a8a1997 100644 --- a/samples/react/MusicStore/ReactApp/components/public/GenreDetails.tsx +++ b/samples/react/MusicStore/ReactApp/components/public/GenreDetails.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Link } from 'react-router'; -import { provide } from '../../TypedRedux'; +import { provide } from '../../fx/TypedRedux'; import { ApplicationState } from '../../store'; import * as GenreDetailsStore from '../../store/GenreDetails'; import { AlbumTile } from './AlbumTile'; diff --git a/samples/react/MusicStore/ReactApp/components/public/Genres.tsx b/samples/react/MusicStore/ReactApp/components/public/Genres.tsx index f8b47c3d6f..26572d56c9 100644 --- a/samples/react/MusicStore/ReactApp/components/public/Genres.tsx +++ b/samples/react/MusicStore/ReactApp/components/public/Genres.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Link } from 'react-router'; -import { provide } from '../../TypedRedux'; +import { provide } from '../../fx/TypedRedux'; import { ApplicationState } from '../../store'; import * as GenreList from '../../store/GenreList'; diff --git a/samples/react/MusicStore/ReactApp/components/public/Home.tsx b/samples/react/MusicStore/ReactApp/components/public/Home.tsx index 9f8d1ebaf9..157052df1b 100644 --- a/samples/react/MusicStore/ReactApp/components/public/Home.tsx +++ b/samples/react/MusicStore/ReactApp/components/public/Home.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Link } from 'react-router'; -import { provide } from '../../TypedRedux'; +import { provide } from '../../fx/TypedRedux'; import { ApplicationState } from '../../store'; import { actionCreators } from '../../store/FeaturedAlbums'; import { AlbumTile } from './AlbumTile'; diff --git a/samples/react/MusicStore/ReactApp/configureStore.ts b/samples/react/MusicStore/ReactApp/configureStore.ts index 1c6bedeef1..410cac2e7f 100644 --- a/samples/react/MusicStore/ReactApp/configureStore.ts +++ b/samples/react/MusicStore/ReactApp/configureStore.ts @@ -2,7 +2,7 @@ import { createStore, applyMiddleware, compose, combineReducers } from 'redux'; import * as thunkModule from 'redux-thunk'; import { syncHistory, routeReducer } from 'react-router-redux'; import * as Store from './store'; -import { typedToPlain } from './TypedRedux'; +import { typedToPlain } from './fx/TypedRedux'; export default function configureStore(history: HistoryModule.History, initialState?: Store.ApplicationState) { // Build middleware diff --git a/samples/react/MusicStore/ReactApp/TypedRedux.ts b/samples/react/MusicStore/ReactApp/fx/TypedRedux.ts similarity index 100% rename from samples/react/MusicStore/ReactApp/TypedRedux.ts rename to samples/react/MusicStore/ReactApp/fx/TypedRedux.ts diff --git a/samples/react/MusicStore/ReactApp/domain-tasks.ts b/samples/react/MusicStore/ReactApp/fx/domain-tasks.ts similarity index 100% rename from samples/react/MusicStore/ReactApp/domain-tasks.ts rename to samples/react/MusicStore/ReactApp/fx/domain-tasks.ts diff --git a/samples/react/MusicStore/ReactApp/isomorphic-fetch.d.ts b/samples/react/MusicStore/ReactApp/fx/isomorphic-fetch.d.ts similarity index 100% rename from samples/react/MusicStore/ReactApp/isomorphic-fetch.d.ts rename to samples/react/MusicStore/ReactApp/fx/isomorphic-fetch.d.ts diff --git a/samples/react/MusicStore/ReactApp/render-server.js b/samples/react/MusicStore/ReactApp/fx/render-server.js similarity index 98% rename from samples/react/MusicStore/ReactApp/render-server.js rename to samples/react/MusicStore/ReactApp/fx/render-server.js index a10356c547..7e4b00b8a1 100644 --- a/samples/react/MusicStore/ReactApp/render-server.js +++ b/samples/react/MusicStore/ReactApp/fx/render-server.js @@ -23,7 +23,7 @@ function loadViaBabel(module, filename) { } var domainTasks = require('./domain-tasks.js'); -var bootServer = require('./boot-server.jsx').default; +var bootServer = require('../boot-server.jsx').default; function render(requestUrl, callback) { var store; diff --git a/samples/react/MusicStore/ReactApp/tracked-fetch.ts b/samples/react/MusicStore/ReactApp/fx/tracked-fetch.ts similarity index 100% rename from samples/react/MusicStore/ReactApp/tracked-fetch.ts rename to samples/react/MusicStore/ReactApp/fx/tracked-fetch.ts diff --git a/samples/react/MusicStore/ReactApp/store/AlbumDetails.ts b/samples/react/MusicStore/ReactApp/store/AlbumDetails.ts index a29b4b0802..2e10f5bfa7 100644 --- a/samples/react/MusicStore/ReactApp/store/AlbumDetails.ts +++ b/samples/react/MusicStore/ReactApp/store/AlbumDetails.ts @@ -1,5 +1,5 @@ -import { fetch } from '../tracked-fetch'; -import { typeName, isActionType, Action, Reducer } from '../TypedRedux'; +import { fetch } from '../fx/tracked-fetch'; +import { typeName, isActionType, Action, Reducer } from '../fx/TypedRedux'; import { ActionCreator } from './'; import { Genre } from './GenreList'; diff --git a/samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts b/samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts index 1d003225d7..a2a3ebd1b4 100644 --- a/samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts +++ b/samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts @@ -1,5 +1,5 @@ -import { fetch } from '../tracked-fetch'; -import { typeName, isActionType, Action, Reducer } from '../TypedRedux'; +import { fetch } from '../fx/tracked-fetch'; +import { typeName, isActionType, Action, Reducer } from '../fx/TypedRedux'; import { ActionCreator } from './'; // ----------------- diff --git a/samples/react/MusicStore/ReactApp/store/GenreDetails.ts b/samples/react/MusicStore/ReactApp/store/GenreDetails.ts index 56b33b8337..d6f3ef0e8e 100644 --- a/samples/react/MusicStore/ReactApp/store/GenreDetails.ts +++ b/samples/react/MusicStore/ReactApp/store/GenreDetails.ts @@ -1,5 +1,5 @@ -import { fetch } from '../tracked-fetch'; -import { typeName, isActionType, Action, Reducer } from '../TypedRedux'; +import { fetch } from '../fx/tracked-fetch'; +import { typeName, isActionType, Action, Reducer } from '../fx/TypedRedux'; import { ActionCreator } from './'; import { Album } from './FeaturedAlbums'; diff --git a/samples/react/MusicStore/ReactApp/store/GenreList.ts b/samples/react/MusicStore/ReactApp/store/GenreList.ts index df9be7188a..2742e2bb1e 100644 --- a/samples/react/MusicStore/ReactApp/store/GenreList.ts +++ b/samples/react/MusicStore/ReactApp/store/GenreList.ts @@ -1,5 +1,5 @@ -import { fetch } from '../tracked-fetch'; -import { typeName, isActionType, Action, Reducer } from '../TypedRedux'; +import { fetch } from '../fx/tracked-fetch'; +import { typeName, isActionType, Action, Reducer } from '../fx/TypedRedux'; import { ActionCreator } from './'; // ----------------- diff --git a/samples/react/MusicStore/ReactApp/store/index.ts b/samples/react/MusicStore/ReactApp/store/index.ts index 5c9c8ff883..4e99de5692 100644 --- a/samples/react/MusicStore/ReactApp/store/index.ts +++ b/samples/react/MusicStore/ReactApp/store/index.ts @@ -1,4 +1,4 @@ -import { ActionCreatorGeneric } from '../TypedRedux'; +import { ActionCreatorGeneric } from '../fx/TypedRedux'; import * as FeaturedAlbums from './FeaturedAlbums'; import * as GenreList from './GenreList'; import * as GenreDetails from './GenreDetails';