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

redesign #44

Closed
wants to merge 1 commit into from
Closed
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
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"new-cap": 0,
"newline-per-chained-call": 1,
"no-mixed-operators": 0,
"no-param-reassign": 0,
"radix": 1,
"no-use-before-define": 0,
"import/no-extraneous-dependencies": 0,
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
},
"license": "MIT",
"devDependencies": {
"babel-eslint": "^7.1.1",
"eslint": "^3.10.2",
"eslint-config-airbnb": "^13.0.0",
"eslint-config-airbnb-base": "^10.0.1",
"babel-eslint": "^7.2.3",
"eslint": "^3.19.0",
"eslint-config-airbnb": "^15.0.1",
"eslint-config-airbnb-base": "^11.2.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.7.1",
"eslint-plugin-jsx-a11y": "^5.0.3",
"eslint-plugin-react": "^7.0.1",
"flow-bin": "^0.38.0",
"lerna": "2.0.0-beta.38"
"lerna": "^2.0.0-rc.4"
}
}
15 changes: 7 additions & 8 deletions packages/material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,24 @@
"jest": "^18.1.0",
"material-ui": "^0.17.3",
"mocha": "^3.1.2",
"react": "^15.4.0",
"react-dom": "^15.4.0",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"sinon": "^1.17.6",
"sinon-chai": "^2.8.0",
"storybook-addon-material-ui": "^0.7.3",
"webpack": "^1.13.3",
"webpack-node-externals": "^1.5.4"
},
"peerDependencies": {
"@accounts/react": "^0.0.14",
"@accounts/client": "^0.0.15",
"@accounts/common": "^0.0.15",
"material-ui": "^0.16.4"
"material-ui": "^0.16.4",
"prop-types": "^15.5.8",
"react": "^15.4.0",
"react-dom": "^15.4.0"
},
"dependencies": {
"@accounts/react": "^0.0.13",
"flexbox-react": "^4.1.0",
"prop-types": "^15.5.8",
"react-dom": "^15.4.0",
"react-redux": "^4.4.6",
"recompose": "^0.23.1"
}
}
34 changes: 0 additions & 34 deletions packages/material-ui/src/Accounts.js

This file was deleted.

14 changes: 0 additions & 14 deletions packages/material-ui/src/Container.js

This file was deleted.

38 changes: 0 additions & 38 deletions packages/material-ui/src/Content.js

This file was deleted.

22 changes: 0 additions & 22 deletions packages/material-ui/src/FormError.js

This file was deleted.

12 changes: 0 additions & 12 deletions packages/material-ui/src/components/avatar.js

This file was deleted.

18 changes: 0 additions & 18 deletions packages/material-ui/src/components/email.js

This file was deleted.

20 changes: 0 additions & 20 deletions packages/material-ui/src/components/header.js

This file was deleted.

19 changes: 0 additions & 19 deletions packages/material-ui/src/components/password.js

This file was deleted.

21 changes: 0 additions & 21 deletions packages/material-ui/src/components/submitButton.js

This file was deleted.

22 changes: 22 additions & 0 deletions packages/material-ui/src/error-message.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from 'react';
import PropTypes from 'prop-types';
import { red500 } from 'material-ui/styles/colors';

const ErrorMessage = ({ children }) => (
<div
style={{
marginTop: 20,
color: red500,
fontFamily: 'Roboto',
textAlign: 'center',
}}
>
{children}
</div>
);

ErrorMessage.propTypes = {
children: PropTypes.node.isRequired,
};

export default ErrorMessage;
1 change: 0 additions & 1 deletion packages/material-ui/src/font.css

This file was deleted.

58 changes: 0 additions & 58 deletions packages/material-ui/src/forgotPasswordComponents.js

This file was deleted.

20 changes: 4 additions & 16 deletions packages/material-ui/src/index.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
import Accounts from './Accounts';
import loginComponents from './loginComponents';
import signupComponents from './signupComponents';
import forgotPasswordComponents from './forgotPasswordComponents';
import Container from './Container';
import Content from './Content';
import FormError from './FormError';

export default Accounts;
import LogInForm from './log-in-form';
import SignUpForm from './sign-up-form';

export {
Container,
Content,
FormError,
Accounts,
loginComponents,
signupComponents,
forgotPasswordComponents,
LogInForm,
SignUpForm,
};
1 change: 0 additions & 1 deletion packages/material-ui/src/index.story.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { storiesOf } from '@kadira/storybook';
import AccountsClient from '@accounts/client';
import { PasswordSignupFields } from '@accounts/common';
import { Accounts } from './index';
import './font.css';

AccountsClient.config({
passwordSignupFields: PasswordSignupFields.USERNAME_AND_EMAIL,
Expand Down
Loading