Skip to content
This repository was archived by the owner on Dec 9, 2021. It is now read-only.

Commit 9032340

Browse files
author
rsavian
committedAug 28, 2017
Merge branch 'typescript' into feature/typescript-code-splitting
# Conflicts: # src/RouterWrapper.tsx
2 parents 9d80935 + 1c8bd17 commit 9032340

24 files changed

+32
-32
lines changed
 

Diff for: ‎src/RouterWrapper.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import Contact from './views/contact/Contact';
88
import FooterAsync from './views/landmarks/FooterAsync';
99
import Header from './views/landmarks/Header';
1010
import NotFoundAsync from './views/errors/NotFoundAsync';
11-
import IStore from './interfaces/store/IStore';
12-
import ISagaStore from './interfaces/store/ISagaStore';
11+
import IStore from './interfaces/stores/IStore';
12+
import ISagaStore from './interfaces/stores/ISagaStore';
1313

1414
interface IProviderWrapperProps {
1515
store: ISagaStore<IStore>;

Diff for: ‎src/client.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import * as React from 'react';
88
import * as ReactDOM from 'react-dom';
99
import RouterWrapper from './RouterWrapper';
1010
import ProviderService from './services/ProviderService';
11-
import IStore from './interfaces/store/IStore';
12-
import ISagaStore from './interfaces/store/ISagaStore';
11+
import IStore from './interfaces/stores/IStore';
12+
import ISagaStore from './interfaces/stores/ISagaStore';
1313

1414
const rehydrateState = window.__ASYNC_COMPONENTS_STATE__;
1515
const initialState: IStore = {

Diff for: ‎src/interfaces/store/IAction.ts renamed to ‎src/interfaces/stores/IAction.ts

File renamed without changes.

Diff for: ‎src/interfaces/store/ISagaStore.ts renamed to ‎src/interfaces/stores/ISagaStore.ts

File renamed without changes.

Diff for: ‎src/interfaces/store/IStore.ts renamed to ‎src/interfaces/stores/IStore.ts

File renamed without changes.

Diff for: ‎src/server/controllers/ReactController.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import * as Hapi from 'hapi';
99
import RouterWrapper from '../../RouterWrapper';
1010
import ProviderService from '../../services/ProviderService';
1111
import rootSaga from '../../stores/rootSaga';
12-
import ISagaStore from '../../interfaces/store/ISagaStore';
13-
import IStore from '../../interfaces/store/IStore';
12+
import ISagaStore from '../../interfaces/stores/ISagaStore';
13+
import IStore from '../../interfaces/stores/IStore';
1414
import IController from '../../interfaces/server/IController';
1515

1616
class ReactController implements IController {

Diff for: ‎src/services/ProviderService.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import rootReducer from '../stores/rootReducer';
33
import {composeWithDevTools} from 'redux-devtools-extension/developmentOnly';
44
import createSagaMiddleware, {END, SagaMiddleware} from 'redux-saga';
55
import rootSaga from '../stores/rootSaga';
6-
import IStore from '../interfaces/store/IStore';
7-
import ISagaStore from '../interfaces/store/ISagaStore';
6+
import IStore from '../interfaces/stores/IStore';
7+
import ISagaStore from '../interfaces/stores/ISagaStore';
88

99
class ProviderService {
1010

Diff for: ‎src/stores/loading/LoadingAction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import IAction from '../../interfaces/store/IAction';
1+
import IAction from '../../interfaces/stores/IAction';
22

33
class LoadingAction {
44

Diff for: ‎src/stores/loading/LoadingReducer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import LoadingAction from './LoadingAction';
2-
import ILoadingReducerState from '../../interfaces/store/reducers/ILoadingReducerState';
3-
import IAction from '../../interfaces/store/IAction';
2+
import ILoadingReducerState from '../../interfaces/stores/reducers/ILoadingReducerState';
3+
import IAction from '../../interfaces/stores/IAction';
44

55
class LoadingReducer {
66

Diff for: ‎src/stores/meta/MetaAction.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
2-
import IAction from '../../interfaces/store/IAction';
1+
import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
2+
import IAction from '../../interfaces/stores/IAction';
33

44
class MetaAction {
55

Diff for: ‎src/stores/meta/MetaReducer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import MetaAction from './MetaAction';
2-
import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
3-
import IAction from '../../interfaces/store/IAction';
2+
import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
3+
import IAction from '../../interfaces/stores/IAction';
44

55
class MetaReducer {
66

Diff for: ‎src/stores/render/RenderReducer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import IRenderReducerState from '../../interfaces/store/reducers/IRenderReducerState';
2-
import IAction from '../../interfaces/store/IAction';
1+
import IRenderReducerState from '../../interfaces/stores/reducers/IRenderReducerState';
2+
import IAction from '../../interfaces/stores/IAction';
33

44
class RenderReducer {
55

Diff for: ‎src/stores/rootSaga.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {all, fork, takeLatest, select, ForkEffect} from 'redux-saga/effects';
22
import UserSaga from './user/UserSaga';
33
import UserAction from './user/UserAction';
4-
import IStore from '../interfaces/store/IStore';
4+
import IStore from '../interfaces/stores/IStore';
55

66
export default function* rootSaga() {
77
const store: IStore = yield select();

Diff for: ‎src/stores/user/UserAction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import IAction from '../../interfaces/store/IAction';
1+
import IAction from '../../interfaces/stores/IAction';
22

33
class UserAction {
44

Diff for: ‎src/stores/user/UserReducer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import UserAction from './UserAction';
2-
import IUserReducerState from '../../interfaces/store/reducers/IUserReducerState';
3-
import IAction from '../../interfaces/store/IAction';
2+
import IUserReducerState from '../../interfaces/stores/reducers/IUserReducerState';
3+
import IAction from '../../interfaces/stores/IAction';
44

55
class UserReducer {
66

Diff for: ‎src/stores/user/UserSaga.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {put} from 'redux-saga/effects';
22
import UserAction from './UserAction';
33
import LoadingAction from '../loading/LoadingAction';
4-
import IAction from '../../interfaces/store/IAction';
5-
import IUserReducerState from '../../interfaces/store/reducers/IUserReducerState';
4+
import IAction from '../../interfaces/stores/IAction';
5+
import IUserReducerState from '../../interfaces/stores/reducers/IUserReducerState';
66

77
class UserSaga {
88

Diff for: ‎src/views/about/About.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as React from 'react';
22
import {connect} from 'react-redux';
33
import MetaAction from '../../stores/meta/MetaAction';
4-
import IStore from '../../interfaces/store/IStore';
4+
import IStore from '../../interfaces/stores/IStore';
55
import {Dispatch} from 'redux';
6-
import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
6+
import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
77

88
interface IStateToProps {}
99

Diff for: ‎src/views/contact/Contact.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import * as React from 'react';
22
import {connect} from 'react-redux';
33
import MetaAction from '../../stores/meta/MetaAction';
44
import {Dispatch} from 'redux';
5-
import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
6-
import IStore from '../../interfaces/store/IStore';
5+
import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
6+
import IStore from '../../interfaces/stores/IStore';
77
import ContactForm from './ContactForm';
88

99
interface IStateToProps {}

Diff for: ‎src/views/errors/NotFound.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as React from 'react';
22
import {connect} from 'react-redux';
33
import MetaAction from '../../stores/meta/MetaAction';
4-
import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
5-
import IStore from '../../interfaces/store/IStore';
4+
import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
5+
import IStore from '../../interfaces/stores/IStore';
66
import {Dispatch} from 'redux';
77

88
interface IStateToProps {}

Diff for: ‎src/views/home/Home.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import * as React from 'react';
22
import {connect} from 'react-redux';
33
import UserAction from '../../stores/user/UserAction';
44
import MetaAction from '../../stores/meta/MetaAction';
5-
import IStore from '../../interfaces/store/IStore';
5+
import IStore from '../../interfaces/stores/IStore';
66
import {Dispatch} from 'redux';
7-
import IMetaReducerState from '../../interfaces/store/reducers/IMetaReducerState';
8-
import IUserReducerState from '../../interfaces/store/reducers/IUserReducerState';
7+
import IMetaReducerState from '../../interfaces/stores/reducers/IMetaReducerState';
8+
import IUserReducerState from '../../interfaces/stores/reducers/IUserReducerState';
99

1010
interface IStateToProps {
1111
readonly user: IUserReducerState;

0 commit comments

Comments
 (0)