Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate Redux in Settings, Remove Flux #2129

Merged
merged 1 commit into from
May 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
# testing
/coverage

# docker
.dockerignore
.8.dockerfile

# production
/build

Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"contrast": "1.0.1",
"country-data": "0.0.31",
"dateformat": "2.0.0",
"flux": "3.1.3",
"font-awesome": "4.7.0",
"google-maps-react": "2.0.2",
"history": "4.7.2",
Expand Down
14 changes: 11 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import appActions from './redux/actions/app';
import uiActions from './redux/actions/ui';
import ProtectedRoute from './components/ProtectedRoute';
import DialogSection from '../src/components/Dialog/DialogSection.react';
import settingActions from './redux/actions/settings';

const muiTheme = getMuiTheme({
toggle: {
Expand All @@ -43,12 +44,16 @@ class App extends Component {
};

componentDidMount = () => {
const { actions, accessToken } = this.props;
const { accessToken, actions } = this.props;

window.addEventListener('offline', this.onUserOffline);
window.addEventListener('online', this.onUserOnline);

actions.getApiKeys();
accessToken && actions.getAdmin();
if (accessToken) {
actions.getAdmin();
actions.getUserSettings();
}
};

componentWillUnmount = () => {
Expand Down Expand Up @@ -109,7 +114,10 @@ class App extends Component {

function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({ ...appActions, ...uiActions }, dispatch),
actions: bindActionCreators(
{ ...appActions, ...uiActions, ...settingActions },
dispatch,
),
};
}

Expand Down
55 changes: 0 additions & 55 deletions src/ChatDataServer.js

This file was deleted.

17 changes: 17 additions & 0 deletions src/__tests__/components/ChatApp/Settings/AccountTab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import AccountTab from '../../../../components/ChatApp/Settings/AccountTab.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<AccountTab />', () => {
it('render AccountTab without crashing', () => {
shallow(
<Provider store={store}>
<AccountTab />
</Provider>,
);
});
});
17 changes: 17 additions & 0 deletions src/__tests__/components/ChatApp/Settings/ChatAppTab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import ChatAppTab from '../../../../components/ChatApp/Settings/ChatAppTab.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<ChatAppTab />', () => {
it('render ChatAppTab without crashing', () => {
shallow(
<Provider store={store}>
<ChatAppTab />
</Provider>,
);
});
});
17 changes: 17 additions & 0 deletions src/__tests__/components/ChatApp/Settings/DevicesTab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import DevicesTab from '../../../../components/ChatApp/Settings/DevicesTab.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<DevicesTab />', () => {
it('render DevicesTab without crashing', () => {
shallow(
<Provider store={store}>
<DevicesTab />
</Provider>,
);
});
});
17 changes: 17 additions & 0 deletions src/__tests__/components/ChatApp/Settings/MicrophoneTab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import MicrophoneTab from '../../../../components/ChatApp/Settings/MicrophoneTab.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<MicrophoneTab />', () => {
it('render MicrophoneTab without crashing', () => {
shallow(
<Provider store={store}>
<MicrophoneTab />
</Provider>,
);
});
});
17 changes: 17 additions & 0 deletions src/__tests__/components/ChatApp/Settings/MobileTab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import MobileTab from '../../../../components/ChatApp/Settings/MobileTab.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<MobileTab />', () => {
it('render MobileTab without crashing', () => {
shallow(
<Provider store={store}>
<MobileTab />
</Provider>,
);
});
});
9 changes: 9 additions & 0 deletions src/__tests__/components/ChatApp/Settings/PasswordTab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react';
import PasswordTab from '../../../../components/ChatApp/Settings/PasswordTab.react';
import { shallow } from 'enzyme';

describe('<PasswordTab />', () => {
it('render PasswordTab without crashing', () => {
shallow(<PasswordTab />);
});
});
17 changes: 17 additions & 0 deletions src/__tests__/components/ChatApp/Settings/SpeechTab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import SpeechTab from '../../../../components/ChatApp/Settings/SpeechTab.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<SpeechTab />', () => {
it('render SpeechTab without crashing', () => {
shallow(
<Provider store={store}>
<SpeechTab />
</Provider>,
);
});
});
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
import React from 'react';
import TextToSpeechSettings from '../../../../components/ChatApp/Settings/TextToSpeechSettings.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<TextToSpeechSettings />', () => {
it('render TextToSpeechSettings without crashing', () => {
shallow(<TextToSpeechSettings />);
shallow(
<Provider store={store}>
<TextToSpeechSettings />
</Provider>,
);
});
});
17 changes: 17 additions & 0 deletions src/__tests__/components/ChatApp/Settings/ThemeChangeTab.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import ThemeChangeTab from '../../../../components/ChatApp/Settings/ThemeChangeTab.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<ThemeChangeTab />', () => {
it('render ThemeChangeTab without crashing', () => {
shallow(
<Provider store={store}>
<ThemeChangeTab />
</Provider>,
);
});
});
17 changes: 17 additions & 0 deletions src/__tests__/components/ChatApp/Settings/ThemeChanger.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import ThemeChanger from '../../../../components/ChatApp/Settings/ThemeChanger';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<ThemeChanger />', () => {
it('render ThemeChanger without crashing', () => {
shallow(
<Provider store={store}>
<ThemeChanger />
</Provider>,
);
});
});
9 changes: 0 additions & 9 deletions src/__tests__/components/ChatApp/ThreadListItem.js

This file was deleted.

9 changes: 0 additions & 9 deletions src/__tests__/components/ChatApp/ThreadSection.js

This file was deleted.

15 changes: 11 additions & 4 deletions src/__tests__/components/Translate/Translate.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
import React from 'react';
import ReactDOM from 'react-dom';
import Translate from '../../../components/Translate/Translate.react';
import { shallow } from 'enzyme';
import { Provider } from 'react-redux';
import configureMockStore from 'redux-mock-store';
const mockStore = configureMockStore();
const store = mockStore({});

describe('<Translate />', () => {
it('renders Translate without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<Translate />, div);
it('render Translate without crashing', () => {
shallow(
<Provider store={store}>
<Translate />
</Provider>,
);
});
});
Loading