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

Ci integration & ESLint Setup #1

Merged
merged 5 commits into from
Mar 28, 2018
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
18 changes: 17 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
{
"extends": "react-app"
"env": {
"browser": true,
"es6": true,
"jest": true
},
"parser": "babel-eslint",
"extends": "airbnb",
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"plugins": [
"react"
]
}
19 changes: 19 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"env": {
"browser": true,
"es6": true,
"jest": true
},
"parser": "babel-eslint",
"extends": "airbnb",
"parserOptions": {
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"plugins": [
"react"
]
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

.idea/

.coveralls.yml

# production
/build

Expand Down
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: node_js
node_js:
- 9.4.0
script:
- yarn lint && yarn test:coverage
2,432 changes: 2 additions & 2,430 deletions README.md

Large diffs are not rendered by default.

33 changes: 27 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
"name": "untitled",
"version": "0.1.0",
"private": true,
"jest": {
"collectCoverageFrom": [
"src/**/*.{js,jsx}",
"!src/**/registerServiceWorker.js",
"!src/**/index.jsx"
]
},
"dependencies": {
"axios": "^0.18.0",
"immutable": "^3.8.2",
Expand All @@ -13,17 +20,31 @@
"redux": "^3.7.2",
"redux-immutable": "^4.0.0",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.2.0"
"redux-thunk": "^2.2.0",
"prop-types": "latest",
"jest-localstorage-mock": "^2.2.0"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom --verbose",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"test:coverage": "react-scripts test --env=jsdom --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"lint": "(eslint --ext=js --ext=jsx . ) && echo Lint Passed! ALL Clear! ❤"
},
"devDependencies": {
"jest-localstorage-mock": "^2.2.0",
"prop-types": "latest",
"redux-devtools-extension": "^2.13.2"
}
"coveralls": "^3.0.0",
"redux-devtools-extension": "^2.13.2",
"eslint": "^4.19.1",
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-import": "^2.9.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.7.0"
},
"eslintIgnore": [
"index.js",
"registerServiceWorker.js",
"coverage/*",
"*__mocks__*"
]
}
23 changes: 0 additions & 23 deletions src/App.js

This file was deleted.

20 changes: 20 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from 'react';
import { Route } from 'react-router-dom';

import './App.css';
import Home from './components/Home';
import Callback from './components/Callback';
import Header from './containers/Header';

export default function App() {
return (
<React.Fragment>
<Header />
<div className="container">
<Route path="/" exact component={Home} />
<Route path="/callback" exact component={Callback} />
</div>
</React.Fragment>
);
}

25 changes: 0 additions & 25 deletions src/App.test.js

This file was deleted.

18 changes: 18 additions & 0 deletions src/App.test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { BrowserRouter as Router } from 'react-router-dom';
import { Provider } from 'react-redux';
import { createStore } from 'redux';
import App from './App';
import rootReducer from './reducers';

jest.mock('./service/httpFetch');

const store = createStore(rootReducer);
describe('App Component', () => {
it('==> renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<Provider store={store}><Router><App /></Router></Provider>, div);
ReactDOM.unmountComponentAtNode(div);
});
});
99 changes: 48 additions & 51 deletions src/actions/index.js
Original file line number Diff line number Diff line change
@@ -1,63 +1,60 @@
import {getAuthToken, getUserDetails} from "../service/httpFetch";
import { getAuthToken, getUserDetails } from '../service/httpFetch';

export const SIGNIN_REQUEST = "SIGNIN_REQUEST";
export const SIGNED_IN = "SIGNED_IN";
export const SIGN_OUT = "SIGN_OUT";
export const USER_DATA = "USER_DATA";
export const SIGNIN_REQUEST = 'SIGNIN_REQUEST';
export const SIGNED_IN = 'SIGNED_IN';
export const SIGN_OUT = 'SIGN_OUT';
export const USER_DATA = 'USER_DATA';

export function beginSignIn(authCode, stateCode) {

return dispatch => {

dispatch(start());

getAuthToken(authCode, stateCode).then(res => {
// console.log(res.data);
let authToken = res.data.token;
localStorage.setItem('auth-token', authToken);
dispatch(success(authToken));
export function beginSignIn(authCode) {
function start() {
return {
type: SIGNIN_REQUEST,
};
}

});

function success(token) {
return {
type: SIGNED_IN,
token,
};

function start() {
return {
type: SIGNIN_REQUEST,
}
}

function success(token) {
return {
type: SIGNED_IN,
token
}
}
}
return (dispatch) => {
dispatch(start());

getAuthToken(authCode).then((res) => {
// console.log(res.data);
const authToken = res.data.token;
localStorage.setItem('auth-token', authToken);
dispatch(success(authToken));
}).catch((err) => {
console.log(err);
});
};
}

export function getUserInfo() {
return dispatch => {
getUserDetails().then(res => {
// console.log(res.data);
dispatch(success(res.data))
}, err => {
console.error(err);
}).catch(err => {
console.error(err);

});
function success(user) {
return {
type: USER_DATA,
user,
};

function success(user) {
return {
type: USER_DATA,
user
}
}
}

return (dispatch) => {
getUserDetails().then((res) => {
// console.log(res.data);
dispatch(success(res.data));
}, (err) => {
console.error(err);
}).catch((err) => {
console.error(err);
});
};
}

export function signOut() {
return {
type: SIGN_OUT
}
}
return {
type: SIGN_OUT,
};
}
Loading