gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(navigate): gatsby depricated navigateTo -> navigate

Browse Source
This commit is contained in:
Bouncey
2018-09-07 13:33:32 +01:00
committed by Stuart Taylor
parent c5c4f3aa41
commit 56494ffc32
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/pages/accept-privacy-terms.js
View File

@ -17,7 +17,7 @@ import Layout from '../components/Layout';
import { ButtonSpacer, Spacer } from '../components/helpers'; import { ButtonSpacer, Spacer } from '../components/helpers';
import { acceptTerms, userSelector } from '../redux'; import { acceptTerms, userSelector } from '../redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { navigateTo } from 'gatsby'; import { navigate } from 'gatsby';
const propTypes = { const propTypes = {
acceptTerms: PropTypes.func.isRequired, acceptTerms: PropTypes.func.isRequired,
@ -66,7 +66,7 @@ class AcceptPrivacyTerms extends Component {
render() { render() {
const { acceptedPrivacyTerms } = this.props; const { acceptedPrivacyTerms } = this.props;
if (acceptedPrivacyTerms) { if (acceptedPrivacyTerms) {
navigateTo('/welcome'); navigate('/welcome');
return null; return null;
} }
const { privacyPolicy, termsOfService, quincyEmail } = this.state; const { privacyPolicy, termsOfService, quincyEmail } = this.state;

8
client/src/pages/welcome.js
View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { navigateTo } from 'gatsby'; import { navigate } from 'gatsby';
import { bindActionCreators } from 'redux'; import { bindActionCreators } from 'redux';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
@ -52,13 +52,15 @@ function Welcome({
if (pending && !complete) { if (pending && !complete) {
return ( return (
<Layout> <Layout>
<Loader /> <div className='loader-wrapper'>
<Loader />
</div>
</Layout> </Layout>
); );
} }
if (!acceptedPrivacyTerms) { if (!acceptedPrivacyTerms) {
navigateTo('/accept-privacy-terms'); navigate('/accept-privacy-terms');
return null; return null;
} }

4
client/src/redux/accept-terms-saga.js
View File

@ -1,5 +1,5 @@
import { call, put, takeEvery } from 'redux-saga/effects'; import { call, put, takeEvery } from 'redux-saga/effects';
import { navigateTo } from 'gatsby'; import { navigate } from 'gatsby';
import { acceptTermsComplete, acceptTermsError } from './'; import { acceptTermsComplete, acceptTermsError } from './';
import { createFlashMessage } from '../components/Flash/redux'; import { createFlashMessage } from '../components/Flash/redux';
@ -18,7 +18,7 @@ function* acceptTermsSaga({ payload: quincyEmails }) {
} }
function* acceptCompleteSaga() { function* acceptCompleteSaga() {
yield call(navigateTo, '/welcome'); yield call(navigate, '/welcome');
} }
export function createAcceptTermsSaga(types) { export function createAcceptTermsSaga(types) {

4
client/src/redux/show-cert-saga.js
View File

@ -1,5 +1,5 @@
import { put, takeEvery, call } from 'redux-saga/effects'; import { put, takeEvery, call } from 'redux-saga/effects';
import { navigateTo } from 'gatsby'; import { navigate } from 'gatsby';
import { createFlashMessage } from '../components/Flash/redux'; import { createFlashMessage } from '../components/Flash/redux';
import { getShowCert } from '../utils/ajax'; import { getShowCert } from '../utils/ajax';
@ -13,7 +13,7 @@ function* getShowCertSaga({ payload: { username, certName: cert } }) {
for (let i = 0; i < messages.length; i++) { for (let i = 0; i < messages.length; i++) {
yield put(createFlashMessage(messages[i])); yield put(createFlashMessage(messages[i]));
} }
yield call(navigateTo, '/'); yield call(navigate, '/');
return; return;
} }
yield put(showCertComplete(response)); yield put(showCertComplete(response));