Skip to content
This repository has been archived by the owner on Jun 25, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
June Domingo committed Nov 9, 2016
2 parents 08e107c + b8bec5e commit 9563dfb
Show file tree
Hide file tree
Showing 35 changed files with 395 additions and 373 deletions.
71 changes: 52 additions & 19 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": [
"eslint:recommended",
"plugin:import/errors",
"plugin:import/warnings"
"plugin:import/warnings",
"airbnb"
],
"plugins": [
"react"
Expand All @@ -15,42 +16,68 @@
}
},
"env": {
"es6": true,
"browser": true,
"node": true,
"es6": true,
"jquery": true,
"mocha": true
"mocha": true,
"node": true
},
"rules": {
"quotes": 0,
"no-console": 1,
"no-debugger": 1,
"no-var": 1,
"semi": [1, "always"],
"no-trailing-spaces": 0,
"arrow-body-style": [1, "as-needed"],
"arrow-parens": [1, "as-needed"],
"comma-dangle": [1, "never"],
"consistent-return": 0,
"eol-last": 0,
"no-unused-vars": 0,
"no-underscore-dangle": 0,
"func-names": 0,
"import/extensions": 0,
"react/require-extension": 0,
"import/imports-first": 0,
"import/no-extraneous-dependencies": 0,
"import/no-unresolved": 0,
"indent": [1, "tab", { "SwitchCase": 1, "VariableDeclarator": 1 }],
"jsx-a11y/href-no-hash": 0,
"jsx-quotes": 1,
"linebreak-style": 0,
"max-len": 0,
"no-alert": 0,
"no-console": 1,
"no-debugger": 1,
"no-global-assign": 0,
"no-lone-blocks": 0,
"jsx-quotes": 1,
"react/display-name": [ 1, {"ignoreTranspilerName": false }],
"react/forbid-prop-types": [1, {"forbid": ["any"]}],
"no-multi-spaces": 1,
"no-shadow": 0,
"no-trailing-spaces": 1,
"no-underscore-dangle": 0,
"no-unsafe-negation": 0,
"no-unused-vars": [1, { "varsIgnorePattern": "(bindActionCreators|colors|chalk|dotenv|PropTypes)", "args": "none" }],
"no-use-before-define": 0,
"no-useless-constructor": 0,
"no-var": 1,
"no-tabs": 0,
"object-curly-spacing": 1,
"one-var": 0,
"quotes": 0,
"react/display-name": [ 1, { "ignoreTranspilerName": false }],
"react/forbid-prop-types": [1, { "forbid": ["any"] }],
"react/jsx-boolean-value": 1,
"react/jsx-closing-bracket-location": 0,
"react/jsx-closing-bracket-location": [1, { "selfClosing": "tag-aligned", "nonEmpty": "after-props" }],
"react/jsx-curly-spacing": 1,
"react/jsx-filename-extension": 0,
"react/jsx-indent": [1, "tab"],
"react/jsx-indent-props": 0,
"react/jsx-key": 1,
"react/jsx-max-props-per-line": 0,
"react/jsx-max-props-per-line": [1, { "maximum": 5 }],
"react/jsx-no-bind": 0,
"react/jsx-no-duplicate-props": 1,
"react/jsx-no-literals": 0,
"react/jsx-no-undef": 1,
"react/jsx-pascal-case": 1,
"react/jsx-sort-prop-types": 0,
"react/jsx-sort-props": 0,
"react/jsx-space-before-closing": [1, "always"],
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
"react/jsx-wrap-multilines": 1,
"react/no-danger": 1,
"react/no-did-mount-set-state": 1,
"react/no-did-update-set-state": 1,
Expand All @@ -59,11 +86,17 @@
"react/no-set-state": 0,
"react/no-unknown-property": 1,
"react/prefer-es6-class": 1,
"react/prefer-stateless-function": 0,
"react/prop-types": 1,
"react/react-in-jsx-scope": 1,
"react/require-extension": 1,
"react/self-closing-comp": 1,
"react/sort-comp": 1,
"react/wrap-multilines": 1
"semi": [1, "always"]
},
"settings": {
"react": {
"pragma": "React",
"version": "15.0"
}
}
}
93 changes: 48 additions & 45 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-starter-kit",
"version": "1.0.0",
"version": "1.0.1",
"description": "Build project using ReactJS, Redux, Webpack and Babel",
"scripts": {
"postinstall": "bower install",
Expand All @@ -16,7 +16,6 @@
"switch-dist": "npm run remove-dist && mv dist2 dist",
"check-dist": "babel-node utils/checkDist.js",
"create-dist2": "mkdir ./dist2",
"remove-dist": "rimraf ./dist",
"prebuild": "npm-run-all lint check-dist create-dist2 build:html check-dotenv",
"build": "babel-node utils/build.js",
"postbuild": "npm-run-all switch-dist post:message",
Expand All @@ -26,59 +25,63 @@
"author": "June Domingo <[email protected]>",
"license": "MIT",
"dependencies": {
"autoprefixer": "^6.3.7",
"autoprefixer": "^6.5.2",
"axios": "^0.12.0",
"babel-cli": "6.8.0",
"babel-core": "6.8.0",
"babel-loader": "6.2.4",
"babel-plugin-react-display-name": "2.0.0",
"babel-polyfill": "^6.8.0",
"babel-preset-es2015": "6.6.0",
"babel-preset-react": "6.5.0",
"babel-preset-react-hmre": "1.1.1",
"babel-register": "6.8.0",
"colors": "1.1.2",
"compression": "^1.6.1",
"css-loader": "0.23.1",
"enzyme": "2.2.0",
"eslint": "2.9.0",
"eslint-plugin-import": "1.6.1",
"eslint-plugin-react": "5.0.1",
"eslint-watch": "2.1.11",
"expect": "1.19.0",
"express": "4.13.4",
"extract-text-webpack-plugin": "1.0.1",
"file-loader": "0.8.5",
"jquery": "^3.0.0",
"mocha": "2.4.5",
"npm-run-all": "1.8.0",
"babel-cli": "^6.8.0",
"babel-core": "^6.8.0",
"babel-loader": "^6.2.4",
"babel-plugin-react-display-name": "^2.0.0",
"babel-polyfill": "^6.16.0",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"babel-preset-react-hmre": "^1.1.1",
"babel-register": "^6.8.0",
"colors": "^1.1.2",
"compression": "^1.6.2",
"css-loader": "^0.23.1",
"enzyme": "^2.2.0",
"eslint": "^3.9.1",
"eslint-config-airbnb": "^13.0.0",
"eslint-plugin-import": "^2.1.0",
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.6.0",
"eslint-watch": "^2.1.14",
"expect": "^1.19.0",
"express": "^4.13.4",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.5",
"jquery": "^3.1.1",
"lodash": "^4.16.6",
"mocha": "^2.4.5",
"npm-run-all": "^1.8.0",
"open": "0.0.5",
"poststylus": "^0.2.3",
"progress-bar-webpack-plugin": "^1.9.0",
"react": "^15.0.2",
"react-addons-test-utils": "15.0.2",
"react": "^15.3.2",
"react-addons-test-utils": "^15.0.2",
"react-document-title": "^2.0.2",
"react-dom": "^15.0.2",
"react-dom": "^15.3.2",
"react-redux": "^4.4.5",
"react-router": "^2.4.0",
"react-router-redux": "4.0.4",
"redux": "^3.5.2",
"redux-logger": "^2.6.1",
"redux-thunk": "^2.0.1",
"rimraf": "2.5.2",
"style-loader": "0.13.1",
"react-router": "^2.8.1",
"react-router-redux": "^4.0.4",
"redux": "^3.6.0",
"redux-logger": "^2.7.4",
"redux-thunk": "^2.1.0",
"rimraf": "^2.5.2",
"style-loader": "^0.13.1",
"stylus": "^0.54.5",
"stylus-loader": "^2.1.1",
"stylus-loader": "^2.3.1",
"toaster": "^0.1.2",
"toastr": "^2.1.2",
"url-loader": "0.5.7",
"webpack": "1.13.0",
"webpack-dotenv-plugin": "^1.3.2"
"url-loader": "^0.5.7",
"webpack": "^1.13.0",
"webpack-dotenv-plugin": "^1.4.0"
},
"devDependencies": {
"eventsource-polyfill": "0.9.6",
"redux-immutable-state-invariant": "1.2.3",
"webpack-dev-middleware": "1.6.1",
"webpack-hot-middleware": "2.10.0"
"eventsource-polyfill": "^0.9.6",
"redux-immutable-state-invariant": "^1.2.3",
"webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.10.0"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/constants/actionTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export const LOAD_POSTS_SUCCESS = 'LOAD_POSTS_SUCCESS';
export const LOAD_POST_SUCCESS = 'LOAD_POST_SUCCESS';
export const UPDATE_POST_SUCCESS = 'UPDATE_POST_SUCCESS';
export const CREATE_POST_SUCCESS = 'CREATE_POST_SUCCESS';
export const DELETE_POST_SUCCESS = 'DELETE_POST_SUCCESS';
export const DELETE_POST_SUCCESS = 'DELETE_POST_SUCCESS';
3 changes: 2 additions & 1 deletion src/constants/api.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export const URL = process.env.API_URL;
/* eslint-disable import/prefer-default-export */ // remove this line if you have more than 2 variables
export const URL = process.env.API_URL;
13 changes: 7 additions & 6 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/*eslint-disable import/default*/

/* eslint-disable import/default */
/* eslint-disable import/first */
import 'babel-polyfill';
import React from 'react';
import {render} from 'react-dom';
import { Provider } from 'react-redux';
import { render } from 'react-dom';
import { Router, browserHistory } from 'react-router';
import configureStore from './store/configureStore';
import {Provider} from 'react-redux';
import {Router, browserHistory} from 'react-router';
import routes from './routes';

import 'toastr/build/toastr.min.css';
import '../bower_components/bootstrap/dist/css/bootstrap.min.css';
import '../bower_components/Ionicons/css/ionicons.min.css';
Expand All @@ -18,4 +19,4 @@ render(
<Provider store={store}>
<Router history={browserHistory} routes={routes} />
</Provider>, document.getElementById('app')
);
);
13 changes: 7 additions & 6 deletions src/modules/Layout.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, {PropTypes} from 'react';
import Header from './_global/Header';
import {browserHistory} from 'react-router';
/* eslint-disable class-methods-use-this */
import React, { PropTypes } from 'react';
import { browserHistory } from 'react-router';
import DocumentTitle from 'react-document-title';
import Header from './_global/Header';

class Layout extends React.Component {
constructor(props, context) {
Expand All @@ -18,9 +19,9 @@ class Layout extends React.Component {
render() {
return (
<div>
<DocumentTitle title="React Starterkit"/>
<DocumentTitle title="React Starterkit" />
<div className="container">
<Header redirectToIndex={this.onClickLogo}/>
<Header redirectToIndex={this.onClickLogo} />
{this.props.children}
</div>
</div>
Expand All @@ -31,4 +32,4 @@ Layout.propTypes = {
children: PropTypes.object.isRequired
};

export default Layout;
export default Layout;
44 changes: 21 additions & 23 deletions src/modules/_global/Header.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
import React, {PropTypes} from 'react';
import {Link, IndexLink} from 'react-router';
/* eslint-disable jsx-a11y/no-static-element-interactions */
import React, { PropTypes } from 'react';
import { Link, IndexLink } from 'react-router';

const Header = ({redirectToIndex}) => {
return (
<div className="header">
<div className="header__logo">
<i onClick={redirectToIndex} className="ion-ios-bolt-outline"></i>
</div>
<ul className="header__nav-list">
<li className="header__nav-item">
<IndexLink to="/" className="header__nav-link" activeClassName="active-nav"> Home </IndexLink>
</li>
<li className="header__nav-item">
<Link to="/posts" className="header__nav-link" activeClassName="active-nav"> Example</Link>
</li>
<li className="header__nav-item">
<a href="https://github.com/JuneDomingo/react-starterkit" className="header__nav-link"> Github</a>
</li>
</ul>
const Header = ({ redirectToIndex }) => (
<div className="header">
<div className="header__logo">
<i onClick={redirectToIndex} className="ion-ios-bolt-outline" />
</div>
);
};

<ul className="header__nav-list">
<li className="header__nav-item">
<IndexLink to="/" className="header__nav-link" activeClassName="active-nav"> Home </IndexLink>
</li>
<li className="header__nav-item">
<Link to="/posts" className="header__nav-link" activeClassName="active-nav"> Example</Link>
</li>
<li className="header__nav-item">
<a href="https://github.com/JuneDomingo/react-starterkit" className="header__nav-link"> Github</a>
</li>
</ul>
</div>
);

Header.propTypes = {
redirectToIndex: PropTypes.func.isRequired
};


export default Header;
export default Header;
21 changes: 10 additions & 11 deletions src/modules/_global/PageNotFound.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
/* eslint-disable global-require */
import React from 'react';

const PageNotFound = () => {
return (
<div>
<div className="example">
<h1 className="section-title"> Error 404: Noodles not found</h1>
<img src={require('assets/img/noodlesnotfound.jpg')} className="img-fluid"/>
<p> Hinalungkat ko....wala talaga eh</p>
</div>
const PageNotFound = () => (
<div>
<div className="example">
<h1 className="section-title"> Error 404: Noodles not found</h1>
<img src={require('assets/img/noodlesnotfound.jpg')} className="img-fluid" alt="noodlesnotfound" />
<p> Hinalungkat ko....wala talaga eh</p>
</div>
);
};
</div>
);

export default PageNotFound;
export default PageNotFound;
Loading

0 comments on commit 9563dfb

Please sign in to comment.