Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
foxhound87 committed Aug 5, 2016
1 parent 7703cbd commit 246f71e
Show file tree
Hide file tree
Showing 35 changed files with 124 additions and 72 deletions.
7 changes: 4 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"parser": "babel-eslint",
"extends": ["airbnb"],
"plugins": [
"jsx-a11y"
],
"plugins": ["jsx-a11y"],
"globals": {
"navigator": true,
"document": true,
"window": true,
"If": true,
"Else": true,
"For": true
Expand Down
51 changes: 26 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"feathers": "~2.0.1",
"feathers-authentication": "~0.7.9",
"feathers-configuration": "~0.3.0",
"feathers-errors": "2.4.0",
"feathers-hooks": "~1.5.4",
"feathers-mongoose": "~3.5.1",
"feathers-rest": "~1.4.3",
Expand All @@ -77,7 +78,7 @@
"match-media-mock": "~0.1.0",
"material-ui": "~0.15.2",
"mobx": "~2.4.0",
"mobx-ajv-form": "~1.7.0",
"mobx-ajv-form": "1.7.2",
"mobx-react": "~3.5.1",
"mobx-react-devtools": "~4.2.3",
"mobx-react-matchmedia": "~1.0.2",
Expand All @@ -92,10 +93,11 @@
"postcss-import": "~8.1.2",
"postcss-url": "~5.1.2",
"precss": "~1.4.0",
"react": "~15.2.1",
"react": "~15.3.0",
"react-css-modules": "~3.7.8",
"react-dom": "~15.2.1",
"react-dom": "~15.3.0",
"react-helmet": "~3.1.0",
"react-hot-loader": "~3.0.0-beta.2",
"react-modal": "~1.4.0",
"react-pagify": "~2.1.1",
"react-parallax": "~0.4.3",
Expand All @@ -105,54 +107,53 @@
"safe-access": "~0.1.0",
"serve-static": "~1.11.1",
"socket.io-client": "~1.4.8",
"webpack": "~1.13.1",
"webpack-merge": "~0.14.1",
"webpack-dev-middleware": "~1.6.1",
"webpack-hot-middleware": "~2.12.1",
"whatwg-fetch": "~1.0.0",
"winston": "~2.2.0"
},
"peerDependencies": {
"react": "~15.2.1",
"react-dom": "~15.2.1"
"react": "~15.3.0",
"react-dom": "~15.3.0"
},
"devDependencies": {
"autoprefixer": "~6.3.7",
"babel-core": "~6.11.4",
"autoprefixer": "~6.4.0",
"babel-core": "~6.13.2",
"babel-eslint": "~6.1.2",
"babel-loader": "~6.2.4",
"babel-plugin-transform-class-properties": "~6.11.5",
"babel-plugin-transform-decorators": "~6.8.0",
"babel-plugin-transform-decorators": "~6.13.0",
"babel-plugin-transform-decorators-legacy": "~1.3.4",
"babel-plugin-transform-runtime": "~6.9.0",
"babel-polyfill": "~6.9.1",
"babel-preset-es2015": "~6.9.0",
"babel-plugin-transform-runtime": "~6.12.0",
"babel-polyfill": "~6.13.0",
"babel-preset-es2015": "~6.13.2",
"babel-preset-react": "~6.11.1",
"babel-preset-stage-0": "~6.5.0",
"babel-root-import": "~4.0.1",
"browser-sync": "~2.13.0",
"browser-sync": "~2.14.0",
"browser-sync-webpack-plugin": "~1.1.0",
"connect-history-api-fallback": "~1.2.0",
"css-loader": "~0.23.1",
"cssnano": "~3.7.3",
"eslint": "~3.1.1",
"eslint-config-airbnb": "~9.0.1",
"eslint-loader": "~1.4.1",
"eslint-plugin-import": "~1.11.1",
"eslint": "~3.2.2",
"eslint-config-airbnb": "~10.0.0",
"eslint-loader": "~1.5.0",
"eslint-plugin-import": "~1.12.0",
"eslint-plugin-jsx-a11y": "~2.0.1",
"eslint-plugin-jsx-control-statements": "~2.1.1",
"eslint-plugin-react": "~5.2.2",
"eslint-plugin-react": "~6.0.0",
"extract-text-webpack-plugin": "~1.0.1",
"file-loader": "~0.9.0",
"imports-loader": "~0.6.5",
"isomorphic-style-loader": "~1.0.0",
"json-loader": "~0.5.4",
"jsx-control-statements": "~3.1.2",
"nodemon": "~1.9.2",
"nodemon": "~1.10.0",
"postcss-loader": "~0.9.1",
"progress-bar-webpack-plugin": "~1.8.0",
"react-hot-loader": "~3.0.0-beta.2",
"progress-bar-webpack-plugin": "~1.9.0",
"style-loader": "~0.13.1",
"url-loader": "~0.5.7",
"webpack": "~1.13.1",
"webpack-dev-middleware": "~1.6.1",
"webpack-hot-middleware": "~2.12.1",
"webpack-merge": "~0.14.1"
"url-loader": "~0.5.7"
}
}
1 change: 1 addition & 0 deletions src/api/autoloader.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint import/prefer-default-export: 0 */
/* eslint global-require: 0 */
import { log } from '~/src/utils/logger';

Expand Down
1 change: 1 addition & 0 deletions src/api/connector.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint import/prefer-default-export: 0 */
import mongoose from 'mongoose';

export function connector(config) {
Expand Down
2 changes: 2 additions & 0 deletions src/api/hooks/addDelay.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint import/prefer-default-export: 0 */

// Add a delay to test slower connections
export function addDelay(delay) {
return (hook, next) => {
Expand Down
1 change: 1 addition & 0 deletions src/api/hooks/setUUID.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint import/prefer-default-export: 0 */
import uuid from 'node-uuid';

function assignUUID(item) {
Expand Down
2 changes: 2 additions & 0 deletions src/api/hooks/timestamp.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint import/prefer-default-export: 0 */

export function timestamp(name) {
return (hook, next) => {
const data = hook.data;
Expand Down
2 changes: 1 addition & 1 deletion src/api/middleware/api/after.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import handler from 'feathers-errors/handler';
import { log } from '~/src/utils/logger';
import notFound from '../notFound';
import logger from '../logger';
import { log } from '~/src/utils/logger';

export default function () {
log.info('Init API Middleware: After');
Expand Down
10 changes: 5 additions & 5 deletions src/api/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ import configuration from 'feathers-configuration';
import hooks from 'feathers-hooks';
import rest from 'feathers-rest';
import socketio from 'feathers-socketio';
import adapter from 'feathers-mongoose';

const Dir = global.DIR;
import { setupServices, initServices } from '~/src/utils/services.autoload';
import { setupServer, startServer } from '~/src/utils/server.start';
import { logServerConfig } from '~/src/utils/logger';

import apiBeforeMiddleware from './middleware/api/before';
import apiAfterMiddleware from './middleware/api/after';

import auth from './auth';
import adapter from 'feathers-mongoose';
import { connector } from './connector';
import { autoloader } from './autoloader';

import { setupServices, initServices } from '~/src/utils/services.autoload';
import { setupServer, startServer } from '~/src/utils/server.start';
import { logServerConfig } from '~/src/utils/logger';
const Dir = global.DIR;

setupServer({
namespace: 'api',
Expand Down
1 change: 1 addition & 0 deletions src/api/services/post/model.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import mongoose from 'mongoose';

const Schema = mongoose.Schema;

export default mongoose.model('post',
Expand Down
1 change: 1 addition & 0 deletions src/api/services/user/model.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import mongoose from 'mongoose';

const Schema = mongoose.Schema;

export default mongoose.model('user',
Expand Down
4 changes: 3 additions & 1 deletion src/electron/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const electron = require('electron');
/* eslint global-require: 0 */
const electron = require('electron'); // eslint-disable-line import/no-extraneous-dependencies

const app = electron.app; // Module to control application life.
const BrowserWindow = electron.BrowserWindow; // Module to create native browser window.
let mainWindow = null;
Expand Down
1 change: 1 addition & 0 deletions src/seeds/handlers/development.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint import/prefer-default-export: 0 */
import { userSeederDevelopment as userSeeder } from '../factories/user';
import { postSeederDevelopment as postSeeder } from '../factories/post';

Expand Down
8 changes: 4 additions & 4 deletions src/shared/components/AppBar.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import React from 'react';
import { connect, dispatch } from '~/src/utils/state';
import cx from 'classnames';
import { connect, dispatch } from '~/src/utils/state';

// components
import MenuLinksSX from '../components/MenuLinksSX';
import MenuLinksDX from '../components/MenuLinksDX';

// styles
import styles from '../styles/app.bar.css';

const button = cx('btn', 'inline-block', 'py2', 'm0');
const appBar = cx('clearfix', 'fixed', 'animated', 'fadeIn', 'top-0', 'right-0');

Expand Down Expand Up @@ -47,9 +48,8 @@ const AppBar = ({ authCheck, user, accountMenuIsOpen, layoutIsShifted }) => (
</div>
</div>
</div>
<div className={cx('clearfix', 'sm-hide')}></div>
<div className={cx('overflow-hidden', 'px2')}>
</div>
<div className={cx('clearfix', 'sm-hide')} />
<div className={cx('overflow-hidden', 'px2')} />
</div>
);

Expand Down
6 changes: 3 additions & 3 deletions src/shared/components/AuthFormLogin.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React from 'react';
import { connect } from '~/src/utils/state';
import cx from 'classnames';

// styles
const errorMessage = cx('red', 'm2');

// components
import TextField from 'material-ui/TextField';

// styles
const errorMessage = cx('red', 'm2');

const AuthModal = ({ form }) => (
<form>
<TextField
Expand Down
6 changes: 3 additions & 3 deletions src/shared/components/AuthFormRegister.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React from 'react';
import { connect } from '~/src/utils/state';
import cx from 'classnames';

// styles
const errorMessage = cx('red', 'm1');

// components
import TextField from 'material-ui/TextField';

// styles
const errorMessage = cx('red', 'm1');

const AuthModal = ({ form }) => (
<form>
<TextField
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/AuthModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import AuthFormRegister from './AuthFormRegister';

// styles
import modalBaseStyle from '../styles/_.modal.js';

const styles = _.cloneDeep(modalBaseStyle);
const buttonGroup = cx('btn', 'left', 'x-group-item');
const authSection = cx('center', 'fit', 'col-8', 'px2', 'mb3', 'mx-auto');
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/MenuLinksDX.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import cx from 'classnames';

// styles
import styles from '../styles/menu.link.dx.css';

const ul = cx('list-reset', 'mb0');
const menuAccount = cx('absolute', 'right-0', 'nowrap', 'rounded');
const btnBlock = cx('btn', 'block', 'py2', 'm0');
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/PostCreateModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Toggle from 'material-ui/Toggle';

// styles
import modalBaseStyle from '../styles/_.modal.js';

const styles = _.cloneDeep(modalBaseStyle);
const errorMessage = cx('red', 'm1');

Expand Down
18 changes: 10 additions & 8 deletions src/shared/forms/auth.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import Form from 'mobx-ajv-form';
import schema from '~/src/shared/schemas/auth';
import { dispatch } from '~/src/utils/state';
import { action } from 'mobx';

class AuthForm extends Form {

@action
handleOnSubmit = (e) => {
e.preventDefault();
if (!this.validate()) return;
Expand All @@ -19,12 +21,12 @@ class AuthForm extends Form {
export default
new AuthForm({
schema,
fields: {
email: {
label: 'Email',
},
password: {
label: 'Password',
},
},
// fields: {
// email: {
// label: 'Email',
// },
// password: {
// label: 'Password',
// },
// },
});
4 changes: 2 additions & 2 deletions src/shared/stores/ui.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import _ from 'lodash';
import { observable, autorun } from 'mobx';
import { extend, toggle } from '~/src/utils/decorators';
import getMuiTheme from 'material-ui/styles/getMuiTheme';
import darkBaseTheme from 'material-ui/styles/baseThemes/darkBaseTheme';
import injectTapEventPlugin from 'react-tap-event-plugin';
import materialOverrideStyles from '../styles/_.material.js';
import _ from 'lodash';

// ui classes
import appBar from './ui/AppBar.js';
Expand Down Expand Up @@ -84,7 +84,7 @@ export default class UIStore {

injectTapEventPlugin() {
if (process.env.NODE_ENV === 'development') {
return console.warn([
return console.warn([ // eslint-disable-line no-console
'The react-tap-event-plugin is enabled only in production, ',
'due to a issue with Hot-Reloadable MobX Stores.',
].join(''));
Expand Down
21 changes: 21 additions & 0 deletions src/shared/stores/ui/Material.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import getMuiTheme from 'material-ui/styles/getMuiTheme';
import darkBaseTheme from 'material-ui/styles/baseThemes/darkBaseTheme';
import materialOverrideStyles from '~/src/shared/styles/_.material.js';
import _ from 'lodash';

export default class Material {

mui = {};

getMui() {
const mui = (global.TYPE === 'CLIENT')
? { userAgent: navigator.userAgent }
: {};

return getMuiTheme(this.mui, _.merge(
mui,
darkBaseTheme,
materialOverrideStyles,
));
}
}
1 change: 1 addition & 0 deletions src/utils/decorators/extend.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint import/prefer-default-export: 0 */
export function extend(...args) {
const $extend = args[0] || null;
return (target) => {
Expand Down
1 change: 1 addition & 0 deletions src/utils/decorators/toggle.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint import/prefer-default-export: 0 */
import { action } from 'mobx';

export function toggle(...args) {
Expand Down
6 changes: 4 additions & 2 deletions src/utils/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ class Request {
const requestParams = (!_.isEmpty(params) && method === 'get')
? (['?', this.querystring(params)].join('')) : '';
const requestURL = this.url(path) + requestParams;
return fetch(requestURL, options).then(this.handleResponse);

return fetch(requestURL, options) // eslint-disable-line no-undef
.then(this.handleResponse);
};
}

Expand Down Expand Up @@ -60,7 +62,7 @@ class Request {
}
}

const request = new Request;
const request = new Request();

export default {
get: request.handle('get'),
Expand Down

0 comments on commit 246f71e

Please sign in to comment.