Skip to content

Commit

Permalink
Merge 8a7e856 into 937ffee
Browse files Browse the repository at this point in the history
  • Loading branch information
mcrowder65 committed Mar 30, 2019
2 parents 937ffee + 8a7e856 commit 5fea8dc
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 21 deletions.
23 changes: 22 additions & 1 deletion .babelrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
module.exports = {
presets: ["@babel/env", "@babel/preset-react"],
plugins: ["@babel/plugin-proposal-class-properties"],
plugins: [
"@babel/plugin-proposal-class-properties",
[
"import",

{
libraryName: "@material-ui/core",
libraryDirectory: "",
camel2DashComponentName: false,
},
"@material-ui/core",
],
[
"import",
{
libraryName: "@material-ui/styles",
libraryDirectory: "",
camel2DashComponentName: false,
},
"@material-ui/styles",
],
],
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"@material-ui/core": "3.9.2",
"babel-jest": "24.0.0",
"babel-loader": "8.0.5",
"babel-plugin-import": "1.11.0",
"babel-polyfill": "6.26.0",
"coveralls": "3.0.2",
"eslint-config-mcrowder65": "0.0.46",
Expand Down
5 changes: 2 additions & 3 deletions src/LoaderButton.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React from "react";
import PropTypes from "prop-types";
import Button from "@material-ui/core/Button";
import CircularProgress from "@material-ui/core/CircularProgress";
import withStyles from "@material-ui/core/styles/withStyles";
import { Button, CircularProgress } from "@material-ui/core";
import { withStyles } from "@material-ui/core/styles";

function LoaderButton(props) {
const { children, isLoading, classes, circleSize, ...otherProps } = props;
Expand Down
18 changes: 10 additions & 8 deletions src/Login.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React from "react";
import PropTypes from "prop-types";
import FormControl from "@material-ui/core/FormControl";
import Input from "@material-ui/core/Input";
import InputLabel from "@material-ui/core/InputLabel";
import Button from "@material-ui/core/Button";
import Typography from "@material-ui/core/Typography";
import Card from "@material-ui/core/Card";
import Grid from "@material-ui/core/Grid";
import withStyles from "@material-ui/core/styles/withStyles";
import {
FormControl,
Input,
InputLabel,
Button,
Typography,
Card,
Grid,
} from "@material-ui/core";
import { withStyles } from "@material-ui/core/styles";

import compose from "./compose";

Expand Down
18 changes: 10 additions & 8 deletions src/Signup.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React from "react";
import PropTypes from "prop-types";
import FormControl from "@material-ui/core/FormControl";
import Input from "@material-ui/core/Input";
import InputLabel from "@material-ui/core/InputLabel";
import Button from "@material-ui/core/Button";
import Grid from "@material-ui/core/Grid";
import Typography from "@material-ui/core/Typography";
import Card from "@material-ui/core/Card";
import withStyles from "@material-ui/core/styles/withStyles";
import {
FormControl,
Input,
InputLabel,
Button,
Grid,
Typography,
Card,
} from "@material-ui/core";
import { withStyles } from "@material-ui/core/styles";

const styles = {
content: {
Expand Down
2 changes: 1 addition & 1 deletion src/Snackbar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import Snackbar from "@material-ui/core/Snackbar";
import { Snackbar } from "@material-ui/core";

const SnackbarContext = React.createContext();
export const SnackbarProvider = (() => {
Expand Down
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1711,6 +1711,14 @@ babel-loader@8.0.5:
mkdirp "^0.5.1"
util.promisify "^1.0.0"

babel-plugin-import@1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.11.0.tgz#78ac908e6b225206babb734e19eae5f78d6d1035"
integrity sha512-de9dWdU1YjmWRPYurlHRKD2hTd24z0bIQ0/JgyXqLMXML+TsvEkVhtqzOsNtu9MmCuvwBiTTTjZBbZXA1Xu7TQ==
dependencies:
"@babel/helper-module-imports" "^7.0.0"
"@babel/runtime" "^7.0.0"

babel-plugin-istanbul@^5.1.0:
version "5.1.1"
resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.1.tgz#7981590f1956d75d67630ba46f0c22493588c893"
Expand Down

0 comments on commit 5fea8dc

Please sign in to comment.