Skip to content

Develop #13

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

Merged
merged 10 commits into from
Jan 31, 2017
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: 3 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"presets": ["es2015", "stage-0", "react"],
"plugins": ["transform-decorators-legacy", "transform-runtime"]
"plugins": ["transform-decorators-legacy", "transform-runtime"],
"sourceMaps": "inline",
"retainLines": true
}
16 changes: 14 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
{
"extends": "eslint-config-airbnb",
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"parser": "babel-eslint",
"parserOptions": {
"ecmaFeatures": {
"jsx": true,
"modules": true
}
},
"plugins": [ "react" ],
"rules": {
"indent": [ 2, 2 ],
"quotes": [ 2, "single" ],
Expand All @@ -19,6 +30,7 @@
"env": {
"es6": true,
"node": true,
"browser": true
"browser": true,
"mocha": true
}
}
5 changes: 0 additions & 5 deletions app/client/actions/index.js

This file was deleted.

15 changes: 2 additions & 13 deletions app/client/main.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { compose, createStore, combineReducers } from 'redux';
import { Provider } from 'react-redux';
import App from './containers/App';
import reducers from './reducers';
import actionCreators from './actions';
import configureStore from './store/default';

const initialState = {};

const composeEnhancers = (() => {
const compose_ = window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__;
if(process.env.NODE_ENV === 'development' && compose_) {
return compose_({ actionCreators });
}
return compose;
})();

const store = createStore(combineReducers(reducers), initialState, composeEnhancers());
const store = configureStore(initialState);
const rootElement = document.querySelector(document.currentScript.getAttribute('data-container'));

ReactDOM.render(
Expand Down
5 changes: 0 additions & 5 deletions app/client/reducers/index.js

This file was deleted.

30 changes: 30 additions & 0 deletions app/client/store/default.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { createStore, applyMiddleware, combineReducers, compose } from 'redux';
import thunk from 'redux-thunk';

import user from '../reducers/user';
import userActions from '../actions/user';

const actionCreators = {
...userActions
};

const reducers = {
user
};

const middlewares = [thunk];

const composeEnhancers = (() => {
const compose_ = window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__;
if(process.env.NODE_ENV === 'development' && compose_) {
return compose_({ actionCreators });
}
return compose;
})();

const enhancer = composeEnhancers(applyMiddleware(...middlewares));
const rootReducer = combineReducers(reducers);

export default function configureStore(initialState) {
return createStore(rootReducer, initialState, enhancer);
}
6 changes: 4 additions & 2 deletions app/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {app, crashReporter, BrowserWindow, Menu} from 'electron';
import path from 'path';
import url from 'url';
import {app, crashReporter, BrowserWindow, Menu} from 'electron';

const isDevelopment = (process.env.NODE_ENV === 'development');

Expand All @@ -17,7 +17,9 @@ const installExtensions = async () => {
for (const name of extensions) {
try {
await installer.default(installer[name], forceDownload);
} catch (e) {}
} catch (e) {
console.log(`Error installing ${name} extension: ${e.message}`);
}
}
};

Expand Down
2 changes: 0 additions & 2 deletions init.js
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
var path = require('path');

require('electron-compile').init(__dirname, './app/main');
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"react-dom": "^15.4.2",
"react-redux": "^5.0.2",
"redux": "^3.0.0",
"redux-actions": "^1.2.1"
"redux-actions": "^1.2.1",
"redux-thunk": "^2.2.0"
},
"devDependencies": {
"babel-cli": "^6.22.2",
Expand All @@ -30,15 +31,13 @@
"electron-devtools-installer": "^2.1.0",
"electron-packager": "^8.5.1",
"eslint": "^3.14.1",
"eslint-config-airbnb": "^14.0.0",
"eslint-plugin-react": "^6.9.0",
"mocha": "^3.2.0",
"redux-devtools-dock-monitor": "^1.1.1",
"redux-devtools-log-monitor": "^1.2.0"
"mocha": "^3.2.0"
},
"scripts": {
"serve": "babel-node scripts/serve.js",
"pack": "babel-node scripts/pack.js",
"test": "mocha -R spec --compilers js:babel-core/register"
"test": "mocha -R spec --compilers js:babel-core/register",
"lint": "eslint --no-ignore scripts app test *.js"
}
}
4 changes: 2 additions & 2 deletions scripts/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bsync.init({
}, (err, bs) => {
if (err) return console.error(err);

const proc = spawn(electron, ['.'], {
const child = spawn(electron, ['.'], {
env: {
...{
NODE_ENV: 'development',
Expand All @@ -42,7 +42,7 @@ bsync.init({
stdio: 'inherit'
});

proc.on('close', (code) => {
child.on('close', () => {
process.exit();
});

Expand Down