Skip to content
Open
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: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
"axios": "^0.13.0",
"bootstrap": "^4.0.0-alpha.6",
"eslint": "^3.19.0",
"moment": "^2.18.1",
"node-localstorage": "^1.3.0",
"node-sass": "^4.5.2",
"prop-types": "^15.5.10",
"react": "^15.5.4",
"react-bootstrap": "^0.30.10",
"react-dom": "^15.5.4",
Expand Down Expand Up @@ -56,7 +58,7 @@
"react-dev-utils": "^0.5.2",
"style-loader": "0.13.1",
"url-loader": "0.5.7",
"webpack": "1.14.0",
"webpack": "^1.14.0",
"webpack-dev-server": "1.16.2",
"webpack-manifest-plugin": "1.1.0"
},
Expand Down
8 changes: 6 additions & 2 deletions src/actions/account-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ export const createSession = (googleOauthJWT) => {

return (dispatch) => {
axios(requestConfig)
.then(response => dispatch({ type: CREATE_SESSION, payload: response.data.user_info }))
.catch(error => dispatch({ type: NETWORK_ERROR, payload: error }));
.then((response) => {
dispatch({ type: CREATE_SESSION, payload: response.data.user_info });
})
.catch((error) => {
dispatch({ type: NETWORK_ERROR, payload: error });
});
};
};

Expand Down
3 changes: 2 additions & 1 deletion src/components/Avatar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';

const Avatar = ({ picture, credibility }) => (
<div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Challenge.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import { Button } from 'react-bootstrap';
import ReactMarkdown from 'react-markdown';

Expand Down
3 changes: 2 additions & 1 deletion src/components/ChallengesList.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import Challenge from './Challenge';

const ChallengesList = ({ challenges }) => (
Expand Down
3 changes: 2 additions & 1 deletion src/components/CredTransaction/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import moment from 'moment';

const CredTransaction = ({ credTransaction }) => (
<div className="col-md-8">
<div className="card transactionCard">
<p>{credTransaction.timestamp}</p>
<p>{moment(credTransaction.timestamp).format('LLLL')}</p>
<h2>{credTransaction.action}</h2>
<p className={`credibility delta_${credTransaction.delta_type}`}>{credTransaction.delta}<span className="uom">pts</span></p>

Expand Down
3 changes: 2 additions & 1 deletion src/components/ReposList/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import Repo from '../Repo';

const ReposList = ({ repos, changeRepo }) => (
Expand Down
3 changes: 2 additions & 1 deletion src/components/Standings/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import Standing from '../Standing';

const StandingsList = ({ standings }) => (
Expand Down
3 changes: 2 additions & 1 deletion src/containers/ProtectedRoute.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import {
Route,
Expand All @@ -15,7 +16,7 @@ const ProtectedRoute = (props) => {


ProtectedRoute.propTypes = {
isAuthenticated: React.PropTypes.bool.isRequired,
isAuthenticated: PropTypes.bool.isRequired,
};

function mapStateToProps(state) {
Expand Down