diff --git a/.eslintrc.json b/.eslintrc.json index 3552568dd..9c8aa5fd6 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -169,7 +169,13 @@ "space-before-function-paren": "off", "spaced-comment": "error", "use-isnan": "error", - "valid-typeof": "off" + "valid-typeof": "off", + "no-restricted-imports": [ + "error", + { + "paths": ["lodash"] + } + ] }, "ignorePatterns": ["node_modules/", "**/types/**/*"] } diff --git a/package-lock.json b/package-lock.json index 0bea490ec..c36ae3d46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2807,6 +2807,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -2852,6 +2853,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2" } @@ -2861,6 +2863,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -3995,6 +3998,12 @@ "@octokit/openapi-types": "^6.0.0" } }, + "@polka/url": { + "version": "1.0.0-next.12", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz", + "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==", + "dev": true + }, "@pollyjs/adapter": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@pollyjs/adapter/-/adapter-5.0.0.tgz", @@ -20412,6 +20421,12 @@ "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==", "dev": true }, + "opener": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", + "dev": true + }, "opn": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", @@ -25108,6 +25123,25 @@ "simplebar": "^4.2.3" } }, + "sirv": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz", + "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==", + "dev": true, + "requires": { + "@polka/url": "^1.0.0-next.9", + "mime": "^2.3.1", + "totalist": "^1.0.0" + }, + "dependencies": { + "mime": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==", + "dev": true + } + } + }, "sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -25445,6 +25479,42 @@ } } }, + "speed-measure-webpack-plugin": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.5.0.tgz", + "integrity": "sha512-Re0wX5CtM6gW7bZA64ONOfEPEhwbiSF/vz6e2GvadjuaPrQcHTQdRGsD8+BE7iUOysXH8tIenkPCQBEcspXsNg==", + "dev": true, + "requires": { + "chalk": "^4.1.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "split": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", @@ -26748,6 +26818,12 @@ "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", "dev": true }, + "totalist": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz", + "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==", + "dev": true + }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", @@ -27841,6 +27917,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -27886,6 +27963,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2" } @@ -27895,6 +27973,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -28121,6 +28200,83 @@ } } }, + "webpack-bundle-analyzer": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.1.tgz", + "integrity": "sha512-j5m7WgytCkiVBoOGavzNokBOqxe6Mma13X1asfVYtKWM3wxBiRRu1u1iG0Iol5+qp9WgyhkMmBAcvjEfJ2bdDw==", + "dev": true, + "requires": { + "acorn": "^8.0.4", + "acorn-walk": "^8.0.0", + "chalk": "^4.1.0", + "commander": "^6.2.0", + "gzip-size": "^6.0.0", + "lodash": "^4.17.20", + "opener": "^1.5.2", + "sirv": "^1.0.7", + "ws": "^7.3.1" + }, + "dependencies": { + "acorn": { + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz", + "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==", + "dev": true + }, + "acorn-walk": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz", + "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==", + "dev": true + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "dev": true + }, + "gzip-size": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", + "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", + "dev": true, + "requires": { + "duplexer": "^0.1.2" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "ws": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", + "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==", + "dev": true + } + } + }, "webpack-cli": { "version": "3.3.12", "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz", diff --git a/package.json b/package.json index 7cf9955e5..5f60a5d11 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "jss": "^9.8.7", "keycode": "^2.2.0", "lodash": "^4.17.20", - "lodash-es": "^4.17.14", "moment-timezone": "^0.5.32", "qs": "^6.9.0", "react": "^16.12.0", @@ -161,14 +160,17 @@ "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.12.0", "regenerator-runtime": "^0.11.1", + "register-service-worker": "^1.7.2", "release-it": "^14.5.0", "require-context.macro": "^1.1.1", "rimraf": "^3.0.0", "setup-polly-jest": "^0.9.1", + "speed-measure-webpack-plugin": "^1.5.0", "start-server-and-test": "^1.11.0", "ts-jest": "^24.2.0", "tsconfig-paths-webpack-plugin": "^3.2.0", "webpack": "^4.35.3", + "webpack-bundle-analyzer": "^4.4.1", "webpack-cli": "^3.3.6", "webpack-dev-server": "^3.11.0", "webpack-manifest-plugin": "2.2.0", @@ -177,8 +179,7 @@ "workbox-precaching": "^6.1.2", "workbox-routing": "^6.1.2", "workbox-strategies": "^6.1.2", - "workbox-webpack-plugin": "^6.1.2", - "register-service-worker": "^1.7.2" + "workbox-webpack-plugin": "^6.1.2" }, "optionalDependencies": { "fsevents": "^1.2.9" @@ -204,8 +205,7 @@ "@assets(.*)$": "/assets/$1", "@locale(.*)$": "/locale/$1", "@saleor(?!.*macaw)(.*)$": "/src/$1", - "@test/(.*)$": "/testUtils/$1", - "^lodash-es(.*)$": "lodash/$1" + "@test/(.*)$": "/testUtils/$1" } }, "husky": { diff --git a/src/Baseline.tsx b/src/Baseline.tsx index 7e4ca2185..72b6b882d 100644 --- a/src/Baseline.tsx +++ b/src/Baseline.tsx @@ -1,4 +1,4 @@ -import CssBaseline from "@material-ui/core/CssBaseline"; +import { CssBaseline } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; import { createStyles, SaleorTheme, withStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/apps/components/AppActivateDialog/AppActivateDialog.tsx b/src/apps/components/AppActivateDialog/AppActivateDialog.tsx index b4f6d2d1c..cc5bbaa4a 100644 --- a/src/apps/components/AppActivateDialog/AppActivateDialog.tsx +++ b/src/apps/components/AppActivateDialog/AppActivateDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { getStringOrPlaceholder } from "@saleor/misc"; diff --git a/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx b/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx index a7228d979..c8805c0aa 100644 --- a/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx +++ b/src/apps/components/AppDeactivateDialog/AppDeactivateDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { getStringOrPlaceholder } from "@saleor/misc"; diff --git a/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx b/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx index fa5708368..49cb73296 100644 --- a/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx +++ b/src/apps/components/AppDeleteDialog/AppDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { getStringOrPlaceholder } from "@saleor/misc"; diff --git a/src/apps/components/AppDetailsPage/AppDetailsPage.tsx b/src/apps/components/AppDetailsPage/AppDetailsPage.tsx index a01299701..756e5d346 100644 --- a/src/apps/components/AppDetailsPage/AppDetailsPage.tsx +++ b/src/apps/components/AppDetailsPage/AppDetailsPage.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/apps/components/AppDetailsSettingsPage/AppDetailsSettingsPage.tsx b/src/apps/components/AppDetailsSettingsPage/AppDetailsSettingsPage.tsx index 86672606e..2ccf98d73 100644 --- a/src/apps/components/AppDetailsSettingsPage/AppDetailsSettingsPage.tsx +++ b/src/apps/components/AppDetailsSettingsPage/AppDetailsSettingsPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Typography from "@material-ui/core/Typography"; +import { Button, Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import CardSpacer from "@saleor/components/CardSpacer"; import Container from "@saleor/components/Container"; diff --git a/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx b/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx index 272a4fac8..0712d6e25 100644 --- a/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx +++ b/src/apps/components/AppInProgressDeleteDialog/AppInProgressDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { getStringOrPlaceholder } from "@saleor/misc"; diff --git a/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx b/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx index ef26b4f0a..f72020e21 100644 --- a/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx +++ b/src/apps/components/AppInstallErrorPage/AppInstallErrorPage.tsx @@ -1,7 +1,5 @@ import errorImg from "@assets/images/app-install-error.svg"; -import Button from "@material-ui/core/Button"; -import Grid from "@material-ui/core/Grid"; -import Typography from "@material-ui/core/Typography"; +import { Button, Grid, Typography } from "@material-ui/core"; import Container from "@saleor/components/Container"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/apps/components/AppInstallPage/AppInstallPage.tsx b/src/apps/components/AppInstallPage/AppInstallPage.tsx index b6ca74f80..241ee433a 100644 --- a/src/apps/components/AppInstallPage/AppInstallPage.tsx +++ b/src/apps/components/AppInstallPage/AppInstallPage.tsx @@ -1,10 +1,6 @@ import saleorDarkLogoSmall from "@assets/images/logo-dark-small.svg"; import plusIcon from "@assets/images/plus-icon.svg"; -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Grid from "@material-ui/core/Grid"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Grid, Typography } from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import Container from "@saleor/components/Container"; diff --git a/src/apps/components/AppsInProgress/AppsInProgress.tsx b/src/apps/components/AppsInProgress/AppsInProgress.tsx index 0d1ed27df..a6baf331d 100644 --- a/src/apps/components/AppsInProgress/AppsInProgress.tsx +++ b/src/apps/components/AppsInProgress/AppsInProgress.tsx @@ -1,11 +1,13 @@ -import Button from "@material-ui/core/Button"; -import Progress from "@material-ui/core/CircularProgress"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Tooltip from "@material-ui/core/Tooltip"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + CircularProgress as Progress, + IconButton, + TableBody, + TableCell, + TableRow, + Tooltip, + Typography +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ErrorIcon from "@material-ui/icons/Error"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/apps/components/AppsSkeleton/AppsSkeleton.tsx b/src/apps/components/AppsSkeleton/AppsSkeleton.tsx index 21fdb5ba2..9f8ee6566 100644 --- a/src/apps/components/AppsSkeleton/AppsSkeleton.tsx +++ b/src/apps/components/AppsSkeleton/AppsSkeleton.tsx @@ -1,5 +1,4 @@ -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; +import { TableCell, TableRow } from "@material-ui/core"; import Skeleton from "@saleor/components/Skeleton"; import React from "react"; diff --git a/src/apps/components/CardContainer/CardContainer.tsx b/src/apps/components/CardContainer/CardContainer.tsx index 81444808e..f0e815e2d 100644 --- a/src/apps/components/CardContainer/CardContainer.tsx +++ b/src/apps/components/CardContainer/CardContainer.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import React from "react"; diff --git a/src/apps/components/CustomAppDefaultToken/CustomAppDefaultToken.tsx b/src/apps/components/CustomAppDefaultToken/CustomAppDefaultToken.tsx index 38b7433fd..ab12bfad1 100644 --- a/src/apps/components/CustomAppDefaultToken/CustomAppDefaultToken.tsx +++ b/src/apps/components/CustomAppDefaultToken/CustomAppDefaultToken.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import IconButton from "@material-ui/core/IconButton"; -import Paper from "@material-ui/core/Paper"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + IconButton, + Paper, + Typography +} from "@material-ui/core"; import CloseIcon from "@material-ui/icons/Close"; import Link from "@saleor/components/Link"; import useClipboard from "@saleor/hooks/useClipboard"; diff --git a/src/apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx b/src/apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx index 3f03dc2a8..10c2f591a 100644 --- a/src/apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx +++ b/src/apps/components/CustomAppDetailsPage/CustomAppDetailsPage.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import AccountPermissions from "@saleor/components/AccountPermissions"; import AppHeader from "@saleor/components/AppHeader"; import CardSpacer from "@saleor/components/CardSpacer"; diff --git a/src/apps/components/CustomAppInformation/CustomAppInformation.tsx b/src/apps/components/CustomAppInformation/CustomAppInformation.tsx index dc4e84603..44380ce06 100644 --- a/src/apps/components/CustomAppInformation/CustomAppInformation.tsx +++ b/src/apps/components/CustomAppInformation/CustomAppInformation.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { AppErrorFragment } from "@saleor/fragments/types/AppErrorFragment"; import { FormChange } from "@saleor/hooks/useForm"; diff --git a/src/apps/components/CustomAppTokens/CustomAppTokens.tsx b/src/apps/components/CustomAppTokens/CustomAppTokens.tsx index 9f96dcfc0..782612018 100644 --- a/src/apps/components/CustomAppTokens/CustomAppTokens.tsx +++ b/src/apps/components/CustomAppTokens/CustomAppTokens.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/apps/components/CustomApps/CustomApps.tsx b/src/apps/components/CustomApps/CustomApps.tsx index cb564600f..4215004b0 100644 --- a/src/apps/components/CustomApps/CustomApps.tsx +++ b/src/apps/components/CustomApps/CustomApps.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import CardHeader from "@material-ui/core/CardHeader"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + CardHeader, + IconButton, + TableBody, + TableCell, + TableRow, + Typography +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import { commonMessages } from "@saleor/intl"; import { renderCollection, stopPropagation } from "@saleor/misc"; diff --git a/src/apps/components/DeactivatedText/DeactivatedText.tsx b/src/apps/components/DeactivatedText/DeactivatedText.tsx index 4327fb911..04a7bd220 100644 --- a/src/apps/components/DeactivatedText/DeactivatedText.tsx +++ b/src/apps/components/DeactivatedText/DeactivatedText.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/apps/components/HorizontalSpacer/HorizontalSpacer.tsx b/src/apps/components/HorizontalSpacer/HorizontalSpacer.tsx index ae844663f..ee7da1f6a 100644 --- a/src/apps/components/HorizontalSpacer/HorizontalSpacer.tsx +++ b/src/apps/components/HorizontalSpacer/HorizontalSpacer.tsx @@ -1,4 +1,4 @@ -import { makeStyles } from "@material-ui/core"; +import { makeStyles } from "@saleor/theme"; import React from "react"; export interface HorizontalSpacerProps { diff --git a/src/apps/components/InstalledApps/InstalledApps.tsx b/src/apps/components/InstalledApps/InstalledApps.tsx index 8c307cbf1..0df7afaa7 100644 --- a/src/apps/components/InstalledApps/InstalledApps.tsx +++ b/src/apps/components/InstalledApps/InstalledApps.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + IconButton, + TableBody, + TableCell, + TableFooter, + TableRow, + Typography +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import TablePagination from "@saleor/components/TablePagination"; diff --git a/src/apps/components/Marketplace/Marketplace.tsx b/src/apps/components/Marketplace/Marketplace.tsx index 7ad75851d..55e9afb81 100644 --- a/src/apps/components/Marketplace/Marketplace.tsx +++ b/src/apps/components/Marketplace/Marketplace.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/apps/components/TokenCreateDialog/TokenCreateDialog.tsx b/src/apps/components/TokenCreateDialog/TokenCreateDialog.tsx index f7a571eed..eeac95d18 100644 --- a/src/apps/components/TokenCreateDialog/TokenCreateDialog.tsx +++ b/src/apps/components/TokenCreateDialog/TokenCreateDialog.tsx @@ -1,11 +1,13 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import Paper from "@material-ui/core/Paper"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + Paper, + TextField, + Typography +} from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/apps/components/TokenDeleteDialog/TokenDeleteDialog.tsx b/src/apps/components/TokenDeleteDialog/TokenDeleteDialog.tsx index 422b2f759..fe49227e2 100644 --- a/src/apps/components/TokenDeleteDialog/TokenDeleteDialog.tsx +++ b/src/apps/components/TokenDeleteDialog/TokenDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/attributes/components/AttributeBulkDeleteDialog/AttributeBulkDeleteDialog.tsx b/src/attributes/components/AttributeBulkDeleteDialog/AttributeBulkDeleteDialog.tsx index 480dfeda4..8aabc897b 100644 --- a/src/attributes/components/AttributeBulkDeleteDialog/AttributeBulkDeleteDialog.tsx +++ b/src/attributes/components/AttributeBulkDeleteDialog/AttributeBulkDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/attributes/components/AttributeDeleteDialog/AttributeDeleteDialog.tsx b/src/attributes/components/AttributeDeleteDialog/AttributeDeleteDialog.tsx index 4ab30c283..9369e3c8a 100644 --- a/src/attributes/components/AttributeDeleteDialog/AttributeDeleteDialog.tsx +++ b/src/attributes/components/AttributeDeleteDialog/AttributeDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/attributes/components/AttributeDetails/AttributeDetails.tsx b/src/attributes/components/AttributeDetails/AttributeDetails.tsx index 9ff1a46c4..59685c520 100644 --- a/src/attributes/components/AttributeDetails/AttributeDetails.tsx +++ b/src/attributes/components/AttributeDetails/AttributeDetails.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import { NumericUnits } from "@saleor/attributes/components/AttributeDetails/NumericUnits"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; diff --git a/src/attributes/components/AttributeList/AttributeList.tsx b/src/attributes/components/AttributeList/AttributeList.tsx index cf0b255ab..a456f263f 100644 --- a/src/attributes/components/AttributeList/AttributeList.tsx +++ b/src/attributes/components/AttributeList/AttributeList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import { AttributeListUrlSortField } from "@saleor/attributes/urls"; import Checkbox from "@saleor/components/Checkbox"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/attributes/components/AttributeListPage/AttributeListPage.tsx b/src/attributes/components/AttributeListPage/AttributeListPage.tsx index 4bcbe0051..09b588644 100644 --- a/src/attributes/components/AttributeListPage/AttributeListPage.tsx +++ b/src/attributes/components/AttributeListPage/AttributeListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import { AttributeListUrlSortField } from "@saleor/attributes/urls"; import AppHeader from "@saleor/components/AppHeader"; import FilterBar from "@saleor/components/FilterBar"; diff --git a/src/attributes/components/AttributeOrganization/AttributeOrganization.tsx b/src/attributes/components/AttributeOrganization/AttributeOrganization.tsx index 476abeec4..b66d1db6b 100644 --- a/src/attributes/components/AttributeOrganization/AttributeOrganization.tsx +++ b/src/attributes/components/AttributeOrganization/AttributeOrganization.tsx @@ -1,9 +1,7 @@ -import { makeStyles } from "@material-ui/core"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import RadioGroupField from "@saleor/components/RadioGroupField"; +import { makeStyles } from "@saleor/theme"; import { AttributeTypeEnum } from "@saleor/types/globalTypes"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/attributes/components/AttributeProperties/AttributeProperties.tsx b/src/attributes/components/AttributeProperties/AttributeProperties.tsx index 41004ba4b..1bd98386a 100644 --- a/src/attributes/components/AttributeProperties/AttributeProperties.tsx +++ b/src/attributes/components/AttributeProperties/AttributeProperties.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import { ATTRIBUTE_TYPES_WITH_DEDICATED_VALUES } from "@saleor/attributes/utils/data"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/attributes/components/AttributeValueDeleteDialog/AttributeValueDeleteDialog.tsx b/src/attributes/components/AttributeValueDeleteDialog/AttributeValueDeleteDialog.tsx index 7554862d6..7d07edd4d 100644 --- a/src/attributes/components/AttributeValueDeleteDialog/AttributeValueDeleteDialog.tsx +++ b/src/attributes/components/AttributeValueDeleteDialog/AttributeValueDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx b/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx index e39d03ad3..29bf64e18 100644 --- a/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx +++ b/src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField +} from "@material-ui/core"; import { getAttributeValueErrorMessage } from "@saleor/attributes/errors"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/attributes/components/AttributeValues/AttributeValues.tsx b/src/attributes/components/AttributeValues/AttributeValues.tsx index b6eb1f071..1e369da32 100644 --- a/src/attributes/components/AttributeValues/AttributeValues.tsx +++ b/src/attributes/components/AttributeValues/AttributeValues.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/attributes/views/AttributeList/AttributeList.tsx b/src/attributes/views/AttributeList/AttributeList.tsx index 2013b1533..b3aa785ba 100644 --- a/src/attributes/views/AttributeList/AttributeList.tsx +++ b/src/attributes/views/AttributeList/AttributeList.tsx @@ -1,4 +1,4 @@ -import IconButton from "@material-ui/core/IconButton"; +import { IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import { areFiltersApplied, diff --git a/src/auth/components/LoginLoading/LoginLoading.tsx b/src/auth/components/LoginLoading/LoginLoading.tsx index b30e04e18..3b3bf365b 100644 --- a/src/auth/components/LoginLoading/LoginLoading.tsx +++ b/src/auth/components/LoginLoading/LoginLoading.tsx @@ -1,4 +1,4 @@ -import CircularProgress from "@material-ui/core/CircularProgress"; +import { CircularProgress } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/auth/components/LoginPage/LoginPage.stories.tsx b/src/auth/components/LoginPage/LoginPage.stories.tsx index a1d05ccdb..b9151e0ad 100644 --- a/src/auth/components/LoginPage/LoginPage.stories.tsx +++ b/src/auth/components/LoginPage/LoginPage.stories.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import CardDecorator from "@saleor/storybook/CardDecorator"; import Decorator from "@saleor/storybook/Decorator"; import { storiesOf } from "@storybook/react"; diff --git a/src/auth/components/LoginPage/LoginPage.tsx b/src/auth/components/LoginPage/LoginPage.tsx index 17960d317..ffd9aba72 100644 --- a/src/auth/components/LoginPage/LoginPage.tsx +++ b/src/auth/components/LoginPage/LoginPage.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Divider from "@material-ui/core/Divider"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + CircularProgress, + Divider, + TextField, + Typography +} from "@material-ui/core"; import { AvailableExternalAuthentications_shop_availableExternalAuthentications } from "@saleor/auth/types/AvailableExternalAuthentications"; import { FormSpacer } from "@saleor/components/FormSpacer"; import { SubmitPromise } from "@saleor/hooks/useForm"; diff --git a/src/auth/components/NewPasswordPage/NewPasswordPage.tsx b/src/auth/components/NewPasswordPage/NewPasswordPage.tsx index f11b70d24..3e1fbe65c 100644 --- a/src/auth/components/NewPasswordPage/NewPasswordPage.tsx +++ b/src/auth/components/NewPasswordPage/NewPasswordPage.tsx @@ -1,6 +1,4 @@ -import Button from "@material-ui/core/Button"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Button, TextField, Typography } from "@material-ui/core"; import { SetPassword_setPassword_errors } from "@saleor/auth/types/SetPassword"; import Form from "@saleor/components/Form"; import FormSpacer from "@saleor/components/FormSpacer"; diff --git a/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx b/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx index 4d9252ca7..45f23557f 100644 --- a/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx +++ b/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx @@ -1,6 +1,4 @@ -import Button from "@material-ui/core/Button"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Button, TextField, Typography } from "@material-ui/core"; import Form from "@saleor/components/Form"; import FormSpacer from "@saleor/components/FormSpacer"; import { commonMessages } from "@saleor/intl"; diff --git a/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.tsx b/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.tsx index b49ae56f2..ed40cdc75 100644 --- a/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.tsx +++ b/src/auth/components/ResetPasswordSuccessPage/ResetPasswordSuccessPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Typography from "@material-ui/core/Typography"; +import { Button, Typography } from "@material-ui/core"; import FormSpacer from "@saleor/components/FormSpacer"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/categories/components/CategoryBackground/CategoryBackground.tsx b/src/categories/components/CategoryBackground/CategoryBackground.tsx index e9a4b66cd..12a53fec0 100644 --- a/src/categories/components/CategoryBackground/CategoryBackground.tsx +++ b/src/categories/components/CategoryBackground/CategoryBackground.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Button, Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Hr from "@saleor/components/Hr"; import ImageUpload from "@saleor/components/ImageUpload"; diff --git a/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx b/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx index 43618a508..162f70ae7 100644 --- a/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx +++ b/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle +} from "@material-ui/core"; import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx b/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx index 037426539..07263b05a 100644 --- a/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx +++ b/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx @@ -1,7 +1,5 @@ import { OutputData } from "@editorjs/editorjs"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; import RichTextEditor, { diff --git a/src/categories/components/CategoryList/CategoryList.tsx b/src/categories/components/CategoryList/CategoryList.tsx index 98ab10475..e4fe80f32 100644 --- a/src/categories/components/CategoryList/CategoryList.tsx +++ b/src/categories/components/CategoryList/CategoryList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import { CategoryListUrlSortField } from "@saleor/categories/urls"; import Checkbox from "@saleor/components/Checkbox"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/categories/components/CategoryListPage/CategoryListPage.tsx b/src/categories/components/CategoryListPage/CategoryListPage.tsx index 877e57ce9..c06474fce 100644 --- a/src/categories/components/CategoryListPage/CategoryListPage.tsx +++ b/src/categories/components/CategoryListPage/CategoryListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import { CategoryListUrlSortField } from "@saleor/categories/urls"; import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/categories/components/CategoryProductList/CategoryProductList.tsx b/src/categories/components/CategoryProductList/CategoryProductList.tsx index 3eff4ada7..223908f34 100644 --- a/src/categories/components/CategoryProductList/CategoryProductList.tsx +++ b/src/categories/components/CategoryProductList/CategoryProductList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; import Checkbox from "@saleor/components/Checkbox"; import MoneyRange from "@saleor/components/MoneyRange"; diff --git a/src/categories/components/CategoryProducts/CategoryProducts.tsx b/src/categories/components/CategoryProducts/CategoryProducts.tsx index 4c309cc13..807655b5b 100644 --- a/src/categories/components/CategoryProducts/CategoryProducts.tsx +++ b/src/categories/components/CategoryProducts/CategoryProducts.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; import React from "react"; diff --git a/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx b/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx index 9d6ac3979..66f6b5d14 100644 --- a/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx +++ b/src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import { CardSpacer } from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/categories/views/CategoryDetails.tsx b/src/categories/views/CategoryDetails.tsx index c182126ac..b413a056e 100644 --- a/src/categories/views/CategoryDetails.tsx +++ b/src/categories/views/CategoryDetails.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; diff --git a/src/categories/views/CategoryList/CategoryList.tsx b/src/categories/views/CategoryList/CategoryList.tsx index 1127fc601..3c9d91934 100644 --- a/src/categories/views/CategoryList/CategoryList.tsx +++ b/src/categories/views/CategoryList/CategoryList.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; diff --git a/src/channels/ChannelsWithVariantsAvailabilityCard/ChannelWithVariantAvailabilityItemWrapper.tsx b/src/channels/ChannelsWithVariantsAvailabilityCard/ChannelWithVariantAvailabilityItemWrapper.tsx index 31d82aa7f..9bbc25a46 100644 --- a/src/channels/ChannelsWithVariantsAvailabilityCard/ChannelWithVariantAvailabilityItemWrapper.tsx +++ b/src/channels/ChannelsWithVariantsAvailabilityCard/ChannelWithVariantAvailabilityItemWrapper.tsx @@ -1,7 +1,6 @@ import { ExpansionPanel, ExpansionPanelSummary, - makeStyles, Typography } from "@material-ui/core"; import { ChannelData } from "@saleor/channels/utils"; @@ -12,6 +11,7 @@ import { getById } from "@saleor/orders/components/OrderReturnPage/utils"; import { ProductDetails_product_variants } from "@saleor/products/types/ProductDetails"; import { ChannelsWithVariantsData } from "@saleor/products/views/ProductUpdate/types"; import { areAllChannelVariantsSelected } from "@saleor/products/views/ProductUpdate/utils"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { useIntl } from "react-intl"; import { defineMessages } from "react-intl"; diff --git a/src/channels/components/ChannelDeleteDialog/ChannelDeleteDialog.tsx b/src/channels/components/ChannelDeleteDialog/ChannelDeleteDialog.tsx index 87e9ad9ae..c457650d1 100644 --- a/src/channels/components/ChannelDeleteDialog/ChannelDeleteDialog.tsx +++ b/src/channels/components/ChannelDeleteDialog/ChannelDeleteDialog.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { diff --git a/src/channels/components/ChannelForm/ChannelForm.tsx b/src/channels/components/ChannelForm/ChannelForm.tsx index 81014378d..31ee8ca2a 100644 --- a/src/channels/components/ChannelForm/ChannelForm.tsx +++ b/src/channels/components/ChannelForm/ChannelForm.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import InputAdornment from "@material-ui/core/InputAdornment"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + InputAdornment, + TextField, + Typography +} from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; diff --git a/src/channels/components/ChannelStatus/ChannelStatus.tsx b/src/channels/components/ChannelStatus/ChannelStatus.tsx index b2b5cc7ac..8ea37c629 100644 --- a/src/channels/components/ChannelStatus/ChannelStatus.tsx +++ b/src/channels/components/ChannelStatus/ChannelStatus.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/channels/components/ChannelsWithVariantsAvailabilityDialog/ChannelsWithVariantsAvailabilityDialogContent.tsx b/src/channels/components/ChannelsWithVariantsAvailabilityDialog/ChannelsWithVariantsAvailabilityDialogContent.tsx index b8fdf427b..916d3b646 100644 --- a/src/channels/components/ChannelsWithVariantsAvailabilityDialog/ChannelsWithVariantsAvailabilityDialogContent.tsx +++ b/src/channels/components/ChannelsWithVariantsAvailabilityDialog/ChannelsWithVariantsAvailabilityDialogContent.tsx @@ -3,7 +3,6 @@ import { Divider, ExpansionPanel, ExpansionPanelSummary, - makeStyles, Typography } from "@material-ui/core"; import { ChannelData } from "@saleor/channels/utils"; @@ -15,7 +14,8 @@ import { getById } from "@saleor/orders/components/OrderReturnPage/utils"; import { ProductDetails_product_variants } from "@saleor/products/types/ProductDetails"; import { ChannelsWithVariantsData } from "@saleor/products/views/ProductUpdate/types"; import { areAllChannelVariantsSelected } from "@saleor/products/views/ProductUpdate/utils"; -import map from "lodash-es/map"; +import { makeStyles } from "@saleor/theme"; +import map from "lodash/map"; import React, { ChangeEvent } from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx b/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx index d962c0013..bbd3d73fb 100644 --- a/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx +++ b/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx @@ -2,11 +2,11 @@ import { Card, CardContent, Divider, - makeStyles, + ExpansionPanel, Typography } from "@material-ui/core"; -import ExpansionPanel from "@material-ui/core/ExpansionPanel"; import CardTitle from "@saleor/components/CardTitle"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx b/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx index 2de342674..03c701459 100644 --- a/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx +++ b/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx @@ -1,8 +1,8 @@ import { ExpansionPanelSummary, Typography } from "@material-ui/core"; -import { makeStyles } from "@material-ui/core/styles"; import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; import { ChannelShippingZones } from "@saleor/channels/pages/ChannelDetailsPage/types"; import IconChevronDown from "@saleor/icons/ChevronDown"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/channels/pages/ChannelDetailsPage/utils.ts b/src/channels/pages/ChannelDetailsPage/utils.ts index af220502c..90cc92ccb 100644 --- a/src/channels/pages/ChannelDetailsPage/utils.ts +++ b/src/channels/pages/ChannelDetailsPage/utils.ts @@ -1,4 +1,4 @@ -import uniq from "lodash-es/uniq"; +import uniq from "lodash/uniq"; export const getUpdatedIdsWithNewId = (ids: string[], newId: string) => uniq([...ids, newId]); diff --git a/src/channels/pages/ChannelsListPage/ChannelsListPage.tsx b/src/channels/pages/ChannelsListPage/ChannelsListPage.tsx index f23b0db19..47af2ed02 100644 --- a/src/channels/pages/ChannelsListPage/ChannelsListPage.tsx +++ b/src/channels/pages/ChannelsListPage/ChannelsListPage.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import Alert from "@saleor/components/Alert/Alert"; import AppHeader from "@saleor/components/AppHeader"; diff --git a/src/channels/utils.ts b/src/channels/utils.ts index 930d51d7b..598378e72 100644 --- a/src/channels/utils.ts +++ b/src/channels/utils.ts @@ -13,7 +13,7 @@ import { ShippingZone_shippingZone_shippingMethods_channelListings } from "@saleor/shipping/types/ShippingZone"; import { mapNodeToChoice } from "@saleor/utils/maps"; -import uniqBy from "lodash-es/uniqBy"; +import uniqBy from "lodash/uniqBy"; export interface Channel { id: string; diff --git a/src/collections/components/CollectionDetails/CollectionDetails.tsx b/src/collections/components/CollectionDetails/CollectionDetails.tsx index c52bd4c26..248e86630 100644 --- a/src/collections/components/CollectionDetails/CollectionDetails.tsx +++ b/src/collections/components/CollectionDetails/CollectionDetails.tsx @@ -1,7 +1,5 @@ import { OutputData } from "@editorjs/editorjs"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; import RichTextEditor, { diff --git a/src/collections/components/CollectionImage/CollectionImage.tsx b/src/collections/components/CollectionImage/CollectionImage.tsx index 251320f52..e7ecef40a 100644 --- a/src/collections/components/CollectionImage/CollectionImage.tsx +++ b/src/collections/components/CollectionImage/CollectionImage.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Button, Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Hr from "@saleor/components/Hr"; import ImageUpload from "@saleor/components/ImageUpload"; diff --git a/src/collections/components/CollectionList/CollectionList.tsx b/src/collections/components/CollectionList/CollectionList.tsx index ccb7a43d2..9c4435fd1 100644 --- a/src/collections/components/CollectionList/CollectionList.tsx +++ b/src/collections/components/CollectionList/CollectionList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import { CollectionListUrlSortField } from "@saleor/collections/urls"; import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/collections/components/CollectionListPage/CollectionListPage.tsx b/src/collections/components/CollectionListPage/CollectionListPage.tsx index ddb5d1e78..6a8a8d0cc 100644 --- a/src/collections/components/CollectionListPage/CollectionListPage.tsx +++ b/src/collections/components/CollectionListPage/CollectionListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import { CollectionListUrlSortField } from "@saleor/collections/urls"; import { Container } from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/collections/components/CollectionProducts/CollectionProducts.tsx b/src/collections/components/CollectionProducts/CollectionProducts.tsx index 0d09ad1e0..d6e05dbc7 100644 --- a/src/collections/components/CollectionProducts/CollectionProducts.tsx +++ b/src/collections/components/CollectionProducts/CollectionProducts.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableFooter, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; diff --git a/src/collections/views/CollectionDetails.tsx b/src/collections/views/CollectionDetails.tsx index b6bf931dc..8d7305165 100644 --- a/src/collections/views/CollectionDetails.tsx +++ b/src/collections/views/CollectionDetails.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import DialogContentText from "@material-ui/core/DialogContentText"; +import { Button, DialogContentText } from "@material-ui/core"; import { useChannelsList } from "@saleor/channels/queries"; import { createCollectionChannels, diff --git a/src/collections/views/CollectionList/CollectionList.tsx b/src/collections/views/CollectionList/CollectionList.tsx index 829a1ba20..baead7734 100644 --- a/src/collections/views/CollectionList/CollectionList.tsx +++ b/src/collections/views/CollectionList/CollectionList.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; diff --git a/src/components/Accordion/Accordion.tsx b/src/components/Accordion/Accordion.tsx index da770eeca..152473695 100644 --- a/src/components/Accordion/Accordion.tsx +++ b/src/components/Accordion/Accordion.tsx @@ -1,5 +1,4 @@ -import IconButton from "@material-ui/core/IconButton"; -import Typography from "@material-ui/core/Typography"; +import { IconButton, Typography } from "@material-ui/core"; import AddIcon from "@material-ui/icons/Add"; import RemoveIcon from "@material-ui/icons/Remove"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx b/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx index c3aa9c813..269915e01 100644 --- a/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx +++ b/src/components/AccountPermissionGroups/AccountPermissionGroups.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { StaffErrorFragment } from "@saleor/fragments/types/StaffErrorFragment"; import { FormChange } from "@saleor/hooks/useForm"; import { SearchPermissionGroups_search_edges_node } from "@saleor/searches/types/SearchPermissionGroups"; diff --git a/src/components/AccountPermissions/AccountPermissions.tsx b/src/components/AccountPermissions/AccountPermissions.tsx index 6e66585ce..348f49772 100644 --- a/src/components/AccountPermissions/AccountPermissions.tsx +++ b/src/components/AccountPermissions/AccountPermissions.tsx @@ -1,13 +1,13 @@ import { + Card, + CardContent, Checkbox, List, ListItem, ListItemIcon, - ListItemText + ListItemText, + Typography } from "@material-ui/core"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; import CardTitle from "@saleor/components/CardTitle"; import Skeleton from "@saleor/components/Skeleton"; import useUser from "@saleor/hooks/useUser"; diff --git a/src/components/ActionDialog/ActionDialog.tsx b/src/components/ActionDialog/ActionDialog.tsx index d59808d39..fadd4c5d1 100644 --- a/src/components/ActionDialog/ActionDialog.tsx +++ b/src/components/ActionDialog/ActionDialog.tsx @@ -1,6 +1,4 @@ -import Dialog from "@material-ui/core/Dialog"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { Dialog, DialogContent, DialogTitle } from "@material-ui/core"; import { DialogProps } from "@saleor/types"; import React from "react"; diff --git a/src/components/ActionDialog/DialogButtons.tsx b/src/components/ActionDialog/DialogButtons.tsx index 0ee246412..ddf73354f 100644 --- a/src/components/ActionDialog/DialogButtons.tsx +++ b/src/components/ActionDialog/DialogButtons.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import DialogActions from "@material-ui/core/DialogActions"; +import { Button, DialogActions } from "@material-ui/core"; import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; diff --git a/src/components/AddressEdit/AddressEdit.tsx b/src/components/AddressEdit/AddressEdit.tsx index 1ea464d1d..427a47b12 100644 --- a/src/components/AddressEdit/AddressEdit.tsx +++ b/src/components/AddressEdit/AddressEdit.tsx @@ -1,4 +1,4 @@ -import TextField from "@material-ui/core/TextField"; +import { TextField } from "@material-ui/core"; import { AddressTypeInput } from "@saleor/customers/types"; import { AccountErrorFragment } from "@saleor/fragments/types/AccountErrorFragment"; import { OrderErrorFragment } from "@saleor/fragments/types/OrderErrorFragment"; diff --git a/src/components/AddressFormatter/AddressFormatter.tsx b/src/components/AddressFormatter/AddressFormatter.tsx index 86db5e226..5e340e7e8 100644 --- a/src/components/AddressFormatter/AddressFormatter.tsx +++ b/src/components/AddressFormatter/AddressFormatter.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import React from "react"; import { AddressType } from "../../customers/types"; diff --git a/src/components/Alert/Alert.tsx b/src/components/Alert/Alert.tsx index 88d30c3ae..f4dd2ce8f 100644 --- a/src/components/Alert/Alert.tsx +++ b/src/components/Alert/Alert.tsx @@ -1,9 +1,6 @@ import alertIconDark from "@assets/images/alert-dark.svg"; import alertIcon from "@assets/images/alert.svg"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import IconButton from "@material-ui/core/IconButton"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, IconButton, Typography } from "@material-ui/core"; import CloseIcon from "@material-ui/icons/Close"; import useStateFromProps from "@saleor/hooks/useStateFromProps"; import useTheme from "@saleor/hooks/useTheme"; diff --git a/src/components/Alert/InlineAlert.tsx b/src/components/Alert/InlineAlert.tsx index 05b60d8d5..a1deed47e 100644 --- a/src/components/Alert/InlineAlert.tsx +++ b/src/components/Alert/InlineAlert.tsx @@ -1,4 +1,4 @@ -import Card from "@material-ui/core/Card"; +import { Card } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/AppHeader/AppHeader.tsx b/src/components/AppHeader/AppHeader.tsx index 37271f291..bb890ffd4 100644 --- a/src/components/AppHeader/AppHeader.tsx +++ b/src/components/AppHeader/AppHeader.tsx @@ -1,5 +1,4 @@ -import Portal from "@material-ui/core/Portal"; -import Typography from "@material-ui/core/Typography"; +import { Portal, Typography } from "@material-ui/core"; import ArrowBackIcon from "@material-ui/icons/ArrowBack"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/AppLayout/AppLayout.tsx b/src/components/AppLayout/AppLayout.tsx index ea1495d65..7a9717637 100644 --- a/src/components/AppLayout/AppLayout.tsx +++ b/src/components/AppLayout/AppLayout.tsx @@ -1,5 +1,4 @@ -import LinearProgress from "@material-ui/core/LinearProgress"; -import useMediaQuery from "@material-ui/core/useMediaQuery"; +import { LinearProgress, useMediaQuery } from "@material-ui/core"; import { createConfigurationMenu } from "@saleor/configuration"; import useAppState from "@saleor/hooks/useAppState"; import useNavigator from "@saleor/hooks/useNavigator"; diff --git a/src/components/AppLayout/MenuList.tsx b/src/components/AppLayout/MenuList.tsx index 6ded8bc72..793e34451 100644 --- a/src/components/AppLayout/MenuList.tsx +++ b/src/components/AppLayout/MenuList.tsx @@ -1,5 +1,5 @@ import configureIcon from "@assets/images/menu-configure-icon.svg"; -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { User } from "@saleor/fragments/types/User"; import useTheme from "@saleor/hooks/useTheme"; import { sectionNames } from "@saleor/intl"; diff --git a/src/components/AppLayout/MenuNested.tsx b/src/components/AppLayout/MenuNested.tsx index 26f88d3db..d74434ee0 100644 --- a/src/components/AppLayout/MenuNested.tsx +++ b/src/components/AppLayout/MenuNested.tsx @@ -1,6 +1,5 @@ import menuArrowIcon from "@assets/images/menu-arrow-icon.svg"; -import Hidden from "@material-ui/core/Hidden"; -import Typography from "@material-ui/core/Typography"; +import { Hidden, Typography } from "@material-ui/core"; import useTheme from "@saleor/hooks/useTheme"; import { createHref } from "@saleor/misc"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/AppStatus/AppStatus.tsx b/src/components/AppStatus/AppStatus.tsx index 9e989a9a2..d2cf31769 100644 --- a/src/components/AppStatus/AppStatus.tsx +++ b/src/components/AppStatus/AppStatus.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import React from "react"; diff --git a/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx b/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx index b511bb5e0..be592339b 100644 --- a/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx +++ b/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx @@ -1,15 +1,17 @@ -import Button from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + CircularProgress, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle, + TableBody, + TableCell, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/components/AssignContainerDialog/AssignContainerDialog.tsx b/src/components/AssignContainerDialog/AssignContainerDialog.tsx index 474d0f06c..bb8646635 100644 --- a/src/components/AssignContainerDialog/AssignContainerDialog.tsx +++ b/src/components/AssignContainerDialog/AssignContainerDialog.tsx @@ -1,13 +1,15 @@ -import Button from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + CircularProgress, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TableBody, + TableCell, + TableRow, + TextField +} from "@material-ui/core"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import useSearchQuery from "@saleor/hooks/useSearchQuery"; import { buttonMessages } from "@saleor/intl"; diff --git a/src/components/AssignProductDialog/AssignProductDialog.tsx b/src/components/AssignProductDialog/AssignProductDialog.tsx index e51ae5ecf..05f77db41 100644 --- a/src/components/AssignProductDialog/AssignProductDialog.tsx +++ b/src/components/AssignProductDialog/AssignProductDialog.tsx @@ -1,13 +1,15 @@ -import Button from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + CircularProgress, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TableBody, + TableCell, + TableRow, + TextField +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/components/AttributeUnassignDialog/AttributeUnassignDialog.tsx b/src/components/AttributeUnassignDialog/AttributeUnassignDialog.tsx index 1d552fe29..ca4ed6844 100644 --- a/src/components/AttributeUnassignDialog/AttributeUnassignDialog.tsx +++ b/src/components/AttributeUnassignDialog/AttributeUnassignDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/components/Attributes/Attributes.tsx b/src/components/Attributes/Attributes.tsx index f2bab1ede..3af15082b 100644 --- a/src/components/Attributes/Attributes.tsx +++ b/src/components/Attributes/Attributes.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import IconButton from "@material-ui/core/IconButton"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, IconButton, Typography } from "@material-ui/core"; import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; import { AttributeReference } from "@saleor/attributes/utils/data"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/components/Attributes/BasicAttributeRow.tsx b/src/components/Attributes/BasicAttributeRow.tsx index 9a5c4efb8..08d3a8deb 100644 --- a/src/components/Attributes/BasicAttributeRow.tsx +++ b/src/components/Attributes/BasicAttributeRow.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import Grid from "@saleor/components/Grid"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/Attributes/ExtendedAttributeRow.tsx b/src/components/Attributes/ExtendedAttributeRow.tsx index 531a59c0c..56ec065bb 100644 --- a/src/components/Attributes/ExtendedAttributeRow.tsx +++ b/src/components/Attributes/ExtendedAttributeRow.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Typography from "@material-ui/core/Typography"; +import { Button, Typography } from "@material-ui/core"; import Grid from "@saleor/components/Grid"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/AutocompleteSelectMenu/AutocompleteSelectMenu.tsx b/src/components/AutocompleteSelectMenu/AutocompleteSelectMenu.tsx index 5f0f86c33..24d3dbb8c 100644 --- a/src/components/AutocompleteSelectMenu/AutocompleteSelectMenu.tsx +++ b/src/components/AutocompleteSelectMenu/AutocompleteSelectMenu.tsx @@ -1,7 +1,9 @@ -import CircularProgress from "@material-ui/core/CircularProgress"; -import MenuItem from "@material-ui/core/MenuItem"; -import Paper from "@material-ui/core/Paper"; -import TextField from "@material-ui/core/TextField"; +import { + CircularProgress, + MenuItem, + Paper, + TextField +} from "@material-ui/core"; import ArrowBack from "@material-ui/icons/ArrowBack"; import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/BulkAttributeUnassignDialog/BulkAttributeUnassignDialog.tsx b/src/components/BulkAttributeUnassignDialog/BulkAttributeUnassignDialog.tsx index 18da355b7..009233ece 100644 --- a/src/components/BulkAttributeUnassignDialog/BulkAttributeUnassignDialog.tsx +++ b/src/components/BulkAttributeUnassignDialog/BulkAttributeUnassignDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/components/CardMenu/CardMenu.tsx b/src/components/CardMenu/CardMenu.tsx index 6aa33e671..7376db274 100644 --- a/src/components/CardMenu/CardMenu.tsx +++ b/src/components/CardMenu/CardMenu.tsx @@ -1,10 +1,12 @@ -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import Grow from "@material-ui/core/Grow"; -import IconButton from "@material-ui/core/IconButton"; -import MenuItem from "@material-ui/core/MenuItem"; -import MenuList from "@material-ui/core/MenuList"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; +import { + ClickAwayListener, + Grow, + IconButton, + MenuItem, + MenuList, + Paper, + Popper +} from "@material-ui/core"; import MoreVertIcon from "@material-ui/icons/MoreVert"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/CardTitle/CardTitle.tsx b/src/components/CardTitle/CardTitle.tsx index 63e9ea7d0..91d4fd6a8 100644 --- a/src/components/CardTitle/CardTitle.tsx +++ b/src/components/CardTitle/CardTitle.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx index b6903368e..69d8d24e7 100644 --- a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx +++ b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx @@ -1,5 +1,4 @@ -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { TextField, Typography } from "@material-ui/core"; import { ChannelData } from "@saleor/channels/utils"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import Hr from "@saleor/components/Hr"; diff --git a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx index 7d6150611..a26cf5792 100644 --- a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx +++ b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx @@ -1,11 +1,11 @@ import { ExpansionPanel, ExpansionPanelSummary, - makeStyles + Typography } from "@material-ui/core"; -import Typography from "@material-ui/core/Typography"; import { ChannelData } from "@saleor/channels/utils"; import IconChevronDown from "@saleor/icons/ChevronDown"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { Messages } from "../types"; diff --git a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.tsx b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.tsx index 86e00f9fa..cd5331279 100644 --- a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.tsx +++ b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { Channel as ChannelList, ChannelData } from "@saleor/channels/utils"; import Hr from "@saleor/components/Hr"; import useDateLocalize from "@saleor/hooks/useDateLocalize"; diff --git a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCardWrapper.tsx b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCardWrapper.tsx index fdd84e410..006a13a6b 100644 --- a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCardWrapper.tsx +++ b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCardWrapper.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Hr from "@saleor/components/Hr"; import RequirePermissions from "@saleor/components/RequirePermissions"; diff --git a/src/components/ChannelsAvailabilityContent/ChannelsAvailabilityContent.tsx b/src/components/ChannelsAvailabilityContent/ChannelsAvailabilityContent.tsx index 8e799215f..799206ca5 100644 --- a/src/components/ChannelsAvailabilityContent/ChannelsAvailabilityContent.tsx +++ b/src/components/ChannelsAvailabilityContent/ChannelsAvailabilityContent.tsx @@ -1,5 +1,4 @@ -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { TextField, Typography } from "@material-ui/core"; import { Channel } from "@saleor/channels/utils"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import Hr from "@saleor/components/Hr"; diff --git a/src/components/ChannelsAvailabilityDialogChannelsList/ChannelsAvailabilityDialogChannelsList.tsx b/src/components/ChannelsAvailabilityDialogChannelsList/ChannelsAvailabilityDialogChannelsList.tsx index b2925177b..5b29f4697 100644 --- a/src/components/ChannelsAvailabilityDialogChannelsList/ChannelsAvailabilityDialogChannelsList.tsx +++ b/src/components/ChannelsAvailabilityDialogChannelsList/ChannelsAvailabilityDialogChannelsList.tsx @@ -1,8 +1,8 @@ -import { makeStyles } from "@material-ui/core"; -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { Channel } from "@saleor/channels/utils"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import Hr from "@saleor/components/Hr"; +import { makeStyles } from "@saleor/theme"; import React from "react"; export const useStyles = makeStyles( diff --git a/src/components/ChannelsAvailabilityDialogWrapper/ChannelsAvailabilityDialogWrapper.tsx b/src/components/ChannelsAvailabilityDialogWrapper/ChannelsAvailabilityDialogWrapper.tsx index faa118841..200f1c468 100644 --- a/src/components/ChannelsAvailabilityDialogWrapper/ChannelsAvailabilityDialogWrapper.tsx +++ b/src/components/ChannelsAvailabilityDialogWrapper/ChannelsAvailabilityDialogWrapper.tsx @@ -1,9 +1,8 @@ -import { makeStyles } from "@material-ui/core"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { TextField, Typography } from "@material-ui/core"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import Hr from "@saleor/components/Hr"; import Label from "@saleor/orders/components/OrderHistory/Label"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { useIntl } from "react-intl"; import { defineMessages, FormattedMessage } from "react-intl"; diff --git a/src/components/ChannelsAvailabilityDropdown/ChannelsAvailabilityDropdown.tsx b/src/components/ChannelsAvailabilityDropdown/ChannelsAvailabilityDropdown.tsx index 2f47908bb..ce7e44e64 100644 --- a/src/components/ChannelsAvailabilityDropdown/ChannelsAvailabilityDropdown.tsx +++ b/src/components/ChannelsAvailabilityDropdown/ChannelsAvailabilityDropdown.tsx @@ -1,6 +1,4 @@ -import Menu from "@material-ui/core/Menu"; -import MenuItem from "@material-ui/core/MenuItem"; -import Typography from "@material-ui/core/Typography"; +import { Menu, MenuItem, Typography } from "@material-ui/core"; import { CollectionList_collections_edges_node_channelListings } from "@saleor/collections/types/CollectionList"; import Hr from "@saleor/components/Hr"; import StatusLabel from "@saleor/components/StatusLabel"; diff --git a/src/components/Checkbox/Checkbox.tsx b/src/components/Checkbox/Checkbox.tsx index 772800f6b..2761bcb7f 100644 --- a/src/components/Checkbox/Checkbox.tsx +++ b/src/components/Checkbox/Checkbox.tsx @@ -1,6 +1,5 @@ -import MuiCheckbox, { - CheckboxProps as MuiCheckboxProps -} from "@material-ui/core/Checkbox"; +import { Checkbox as MuiCheckbox } from "@material-ui/core"; +import { CheckboxProps as MuiCheckboxProps } from "@material-ui/core/Checkbox"; import React from "react"; export type CheckboxProps = Omit< diff --git a/src/components/Chip/Chip.tsx b/src/components/Chip/Chip.tsx index c90ec80ce..b6f4760df 100644 --- a/src/components/Chip/Chip.tsx +++ b/src/components/Chip/Chip.tsx @@ -1,5 +1,5 @@ +import { Typography } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import Typography from "@material-ui/core/Typography"; import CloseIcon from "@material-ui/icons/Close"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; diff --git a/src/components/CollectionWithDividers/CollectionWithDividers.tsx b/src/components/CollectionWithDividers/CollectionWithDividers.tsx index 3f1fbb9f3..2e4d09662 100644 --- a/src/components/CollectionWithDividers/CollectionWithDividers.tsx +++ b/src/components/CollectionWithDividers/CollectionWithDividers.tsx @@ -1,5 +1,5 @@ -import Divider from "@material-ui/core/Divider"; -import initial from "lodash-es/initial"; +import { Divider } from "@material-ui/core"; +import initial from "lodash/initial"; import React from "react"; interface CollectionWithDividersProps { diff --git a/src/components/ColumnPicker/ColumnPicker.tsx b/src/components/ColumnPicker/ColumnPicker.tsx index bb34ffa64..b1da45dc6 100644 --- a/src/components/ColumnPicker/ColumnPicker.tsx +++ b/src/components/ColumnPicker/ColumnPicker.tsx @@ -1,6 +1,4 @@ -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import Grow from "@material-ui/core/Grow"; -import Popper from "@material-ui/core/Popper"; +import { ClickAwayListener, Grow, Popper } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; import useStateFromProps from "@saleor/hooks/useStateFromProps"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/ColumnPicker/ColumnPickerButton.tsx b/src/components/ColumnPicker/ColumnPickerButton.tsx index a6c962b2f..1d6bba26d 100644 --- a/src/components/ColumnPicker/ColumnPickerButton.tsx +++ b/src/components/ColumnPicker/ColumnPickerButton.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/ColumnPicker/ColumnPickerContent.tsx b/src/components/ColumnPicker/ColumnPickerContent.tsx index 4f42c6b50..d0e35d805 100644 --- a/src/components/ColumnPicker/ColumnPickerContent.tsx +++ b/src/components/ColumnPicker/ColumnPickerContent.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + CircularProgress, + Typography +} from "@material-ui/core"; import useElementScroll from "@saleor/hooks/useElementScroll"; import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/CompanyAddressInput/CompanyAddressForm.tsx b/src/components/CompanyAddressInput/CompanyAddressForm.tsx index 0c24ec2e1..486c0e1d4 100644 --- a/src/components/CompanyAddressInput/CompanyAddressForm.tsx +++ b/src/components/CompanyAddressInput/CompanyAddressForm.tsx @@ -1,4 +1,4 @@ -import TextField from "@material-ui/core/TextField"; +import { TextField } from "@material-ui/core"; import FormSpacer from "@saleor/components/FormSpacer"; import Grid from "@saleor/components/Grid"; import SingleAutocompleteSelectField, { diff --git a/src/components/CompanyAddressInput/CompanyAddressInput.tsx b/src/components/CompanyAddressInput/CompanyAddressInput.tsx index fecc51166..e93b73f33 100644 --- a/src/components/CompanyAddressInput/CompanyAddressInput.tsx +++ b/src/components/CompanyAddressInput/CompanyAddressInput.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/ConfirmButton/ConfirmButton.tsx b/src/components/ConfirmButton/ConfirmButton.tsx index 99f13eef0..450f617c9 100644 --- a/src/components/ConfirmButton/ConfirmButton.tsx +++ b/src/components/ConfirmButton/ConfirmButton.tsx @@ -1,5 +1,5 @@ -import Button, { ButtonProps } from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; +import { Button, CircularProgress } from "@material-ui/core"; +import { ButtonProps } from "@material-ui/core/Button"; import CheckIcon from "@material-ui/icons/Check"; import { DEFAULT_NOTIFICATION_SHOW_TIME } from "@saleor/config"; import { buttonMessages } from "@saleor/intl"; diff --git a/src/components/ControlledCheckbox.tsx b/src/components/ControlledCheckbox.tsx index 3d60f76f0..081c203ff 100644 --- a/src/components/ControlledCheckbox.tsx +++ b/src/components/ControlledCheckbox.tsx @@ -1,5 +1,4 @@ -import Checkbox from "@material-ui/core/Checkbox"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; +import { Checkbox, FormControlLabel } from "@material-ui/core"; import React from "react"; interface ControlledCheckboxProps { diff --git a/src/components/ControlledSwitch.tsx b/src/components/ControlledSwitch.tsx index d38bcda2b..0f24b2e22 100644 --- a/src/components/ControlledSwitch.tsx +++ b/src/components/ControlledSwitch.tsx @@ -1,6 +1,5 @@ -import { makeStyles } from "@material-ui/core"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Switch from "@material-ui/core/Switch"; +import { FormControlLabel, Switch } from "@material-ui/core"; +import { makeStyles } from "@saleor/theme"; import React from "react"; const useStyles = makeStyles( diff --git a/src/components/CountryList/CountryList.tsx b/src/components/CountryList/CountryList.tsx index eef523fe8..2418f2bc9 100644 --- a/src/components/CountryList/CountryList.tsx +++ b/src/components/CountryList/CountryList.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + CardContent, + IconButton, + TableBody, + TableCell, + TableRow +} from "@material-ui/core"; import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/components/CreatorSteps/CreatorSteps.tsx b/src/components/CreatorSteps/CreatorSteps.tsx index a35e35b76..7500cf25f 100644 --- a/src/components/CreatorSteps/CreatorSteps.tsx +++ b/src/components/CreatorSteps/CreatorSteps.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/Date/Date.tsx b/src/components/Date/Date.tsx index 07e002f6b..0b799ee39 100644 --- a/src/components/Date/Date.tsx +++ b/src/components/Date/Date.tsx @@ -1,4 +1,4 @@ -import Tooltip from "@material-ui/core/Tooltip"; +import { Tooltip } from "@material-ui/core"; import useDateLocalize from "@saleor/hooks/useDateLocalize"; import moment from "moment-timezone"; import React from "react"; diff --git a/src/components/Date/DateTime.tsx b/src/components/Date/DateTime.tsx index 3c08f0443..3e71f78e0 100644 --- a/src/components/Date/DateTime.tsx +++ b/src/components/Date/DateTime.tsx @@ -1,4 +1,4 @@ -import Tooltip from "@material-ui/core/Tooltip"; +import { Tooltip } from "@material-ui/core"; import moment from "moment-timezone"; import React from "react"; import ReactMoment from "react-moment"; diff --git a/src/components/DeleteButton/DeleteButton.tsx b/src/components/DeleteButton/DeleteButton.tsx index 196eac147..63789a37d 100644 --- a/src/components/DeleteButton/DeleteButton.tsx +++ b/src/components/DeleteButton/DeleteButton.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/DeleteFilterTabDialog/DeleteFilterTabDialog.tsx b/src/components/DeleteFilterTabDialog/DeleteFilterTabDialog.tsx index c18663cba..ed731f4ee 100644 --- a/src/components/DeleteFilterTabDialog/DeleteFilterTabDialog.tsx +++ b/src/components/DeleteFilterTabDialog/DeleteFilterTabDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/EditableTableCell/EditableTableCell.tsx b/src/components/EditableTableCell/EditableTableCell.tsx index 3a2206a80..7c24d07c8 100644 --- a/src/components/EditableTableCell/EditableTableCell.tsx +++ b/src/components/EditableTableCell/EditableTableCell.tsx @@ -1,8 +1,11 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TableCell from "@material-ui/core/TableCell"; -import TextField, { TextFieldProps } from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + TableCell, + TextField, + Typography +} from "@material-ui/core"; +import { TextFieldProps } from "@material-ui/core/TextField"; import useForm from "@saleor/hooks/useForm"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; diff --git a/src/components/ErrorMessageCard/ErrorMessageCard.tsx b/src/components/ErrorMessageCard/ErrorMessageCard.tsx index 423976bea..17040fcd2 100644 --- a/src/components/ErrorMessageCard/ErrorMessageCard.tsx +++ b/src/components/ErrorMessageCard/ErrorMessageCard.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import React from "react"; import { FormattedMessage } from "react-intl"; interface ErrorMessageCardProps { diff --git a/src/components/ErrorPage/ErrorPage.tsx b/src/components/ErrorPage/ErrorPage.tsx index cf0373516..e65d38327 100644 --- a/src/components/ErrorPage/ErrorPage.tsx +++ b/src/components/ErrorPage/ErrorPage.tsx @@ -1,6 +1,5 @@ import notFoundImage from "@assets/images/what.svg"; -import Button from "@material-ui/core/Button"; -import Typography from "@material-ui/core/Typography"; +import { Button, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; import SVG from "react-inlinesvg"; diff --git a/src/components/ExternalLink/ExternalLink.tsx b/src/components/ExternalLink/ExternalLink.tsx index f7322edbb..ba32de58e 100644 --- a/src/components/ExternalLink/ExternalLink.tsx +++ b/src/components/ExternalLink/ExternalLink.tsx @@ -1,4 +1,5 @@ -import Typography, { TypographyProps } from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; +import { TypographyProps } from "@material-ui/core/Typography"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/FileUploadField/FileUploadField.tsx b/src/components/FileUploadField/FileUploadField.tsx index b807cf400..b7446df6b 100644 --- a/src/components/FileUploadField/FileUploadField.tsx +++ b/src/components/FileUploadField/FileUploadField.tsx @@ -1,10 +1,8 @@ -import { makeStyles } from "@material-ui/core"; -import Button from "@material-ui/core/Button"; -import IconButton from "@material-ui/core/IconButton"; -import Typography from "@material-ui/core/Typography"; +import { Button, IconButton, Typography } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import { FileFragment } from "@saleor/fragments/types/FileFragment"; import { commonMessages } from "@saleor/intl"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/Filter/Filter.tsx b/src/components/Filter/Filter.tsx index 78abbef0b..288738fe1 100644 --- a/src/components/Filter/Filter.tsx +++ b/src/components/Filter/Filter.tsx @@ -1,9 +1,11 @@ -import ButtonBase from "@material-ui/core/ButtonBase"; -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import Grow from "@material-ui/core/Grow"; -import Popper from "@material-ui/core/Popper"; +import { + ButtonBase, + ClickAwayListener, + Grow, + Popper, + Typography +} from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import Typography from "@material-ui/core/Typography"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React, { useState } from "react"; diff --git a/src/components/Filter/FilterAutocompleteField.tsx b/src/components/Filter/FilterAutocompleteField.tsx index d756c6653..dfd87e325 100644 --- a/src/components/Filter/FilterAutocompleteField.tsx +++ b/src/components/Filter/FilterAutocompleteField.tsx @@ -1,6 +1,4 @@ -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { FormControlLabel, TextField, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import { toggle } from "@saleor/utils/lists"; import React from "react"; diff --git a/src/components/Filter/FilterContent/FilterContent.tsx b/src/components/Filter/FilterContent/FilterContent.tsx index 3d587e465..7a467a7fa 100644 --- a/src/components/Filter/FilterContent/FilterContent.tsx +++ b/src/components/Filter/FilterContent/FilterContent.tsx @@ -1,5 +1,4 @@ -import { Typography } from "@material-ui/core"; -import Paper from "@material-ui/core/Paper"; +import { Paper, Typography } from "@material-ui/core"; import CollectionWithDividers from "@saleor/components/CollectionWithDividers"; import Hr from "@saleor/components/Hr"; import useStateFromProps from "@saleor/hooks/useStateFromProps"; diff --git a/src/components/Filter/FilterContent/FilterContentBody.tsx b/src/components/Filter/FilterContent/FilterContentBody.tsx index 651e86414..3372d29a9 100644 --- a/src/components/Filter/FilterContent/FilterContentBody.tsx +++ b/src/components/Filter/FilterContent/FilterContentBody.tsx @@ -1,13 +1,9 @@ -import { - fade, - FormControlLabel, - makeStyles, - Radio, - TextField -} from "@material-ui/core"; +import { FormControlLabel, Radio, TextField } from "@material-ui/core"; +import { fade } from "@material-ui/core/styles/colorManipulator"; import FormSpacer from "@saleor/components/FormSpacer"; import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; import SingleSelectField from "@saleor/components/SingleSelectField"; +import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/Filter/FilterContent/FilterContentBodyNameField.tsx b/src/components/Filter/FilterContent/FilterContentBodyNameField.tsx index 6bd6849de..8f78d0887 100644 --- a/src/components/Filter/FilterContent/FilterContentBodyNameField.tsx +++ b/src/components/Filter/FilterContent/FilterContentBodyNameField.tsx @@ -1,4 +1,5 @@ -import { Checkbox, FormControlLabel, makeStyles } from "@material-ui/core"; +import { Checkbox, FormControlLabel } from "@material-ui/core"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { FilterReducerAction } from "../reducer"; diff --git a/src/components/Filter/FilterContent/FilterContentHeader.tsx b/src/components/Filter/FilterContent/FilterContentHeader.tsx index 7b704ea95..544acfbe9 100644 --- a/src/components/Filter/FilterContent/FilterContentHeader.tsx +++ b/src/components/Filter/FilterContent/FilterContentHeader.tsx @@ -1,5 +1,6 @@ -import { Button, makeStyles, Typography } from "@material-ui/core"; +import { Button, Typography } from "@material-ui/core"; import { buttonMessages } from "@saleor/intl"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/Filter/FilterContent/FilterErrorsList.tsx b/src/components/Filter/FilterContent/FilterErrorsList.tsx index 1d8e57525..07ef5415e 100644 --- a/src/components/Filter/FilterContent/FilterErrorsList.tsx +++ b/src/components/Filter/FilterContent/FilterErrorsList.tsx @@ -1,5 +1,5 @@ +import { Typography } from "@material-ui/core"; import { fade, makeStyles } from "@material-ui/core/styles"; -import Typography from "@material-ui/core/Typography"; import InlineAlert from "@saleor/components/Alert/InlineAlert"; import { useStyles as useDotStyles } from "@saleor/components/StatusLabel"; import classNames from "classnames"; diff --git a/src/components/Filter/FilterOptionField.tsx b/src/components/Filter/FilterOptionField.tsx index bca691a73..3c39a06ce 100644 --- a/src/components/Filter/FilterOptionField.tsx +++ b/src/components/Filter/FilterOptionField.tsx @@ -1,5 +1,4 @@ -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Radio from "@material-ui/core/Radio"; +import { FormControlLabel, Radio } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import { toggle } from "@saleor/utils/lists"; import classNames from "classnames"; diff --git a/src/components/Filter/utils.ts b/src/components/Filter/utils.ts index 371fb3b7d..739d52e9d 100644 --- a/src/components/Filter/utils.ts +++ b/src/components/Filter/utils.ts @@ -1,4 +1,4 @@ -import compact from "lodash-es/compact"; +import compact from "lodash/compact"; import { FieldType, IFilterElement } from "./types"; diff --git a/src/components/FilterBar/FilterBar.tsx b/src/components/FilterBar/FilterBar.tsx index 8405825c9..16d7c250b 100644 --- a/src/components/FilterBar/FilterBar.tsx +++ b/src/components/FilterBar/FilterBar.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/FilterCard/FilterCard.tsx b/src/components/FilterCard/FilterCard.tsx index f4293f3a5..f8b85bccc 100644 --- a/src/components/FilterCard/FilterCard.tsx +++ b/src/components/FilterCard/FilterCard.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import CardHeader from "@material-ui/core/CardHeader"; -import IconButton from "@material-ui/core/IconButton"; +import { Card, CardContent, CardHeader, IconButton } from "@material-ui/core"; import RefreshIcon from "@material-ui/icons/Refresh"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/components/IconButtonTableCell/IconButtonTableCell.tsx b/src/components/IconButtonTableCell/IconButtonTableCell.tsx index 749e6d2fe..577223148 100644 --- a/src/components/IconButtonTableCell/IconButtonTableCell.tsx +++ b/src/components/IconButtonTableCell/IconButtonTableCell.tsx @@ -1,5 +1,4 @@ -import IconButton from "@material-ui/core/IconButton"; -import TableCell from "@material-ui/core/TableCell"; +import { IconButton, TableCell } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/ImageUpload/ImageUpload.tsx b/src/components/ImageUpload/ImageUpload.tsx index c5c7f2a03..fa7d1c00b 100644 --- a/src/components/ImageUpload/ImageUpload.tsx +++ b/src/components/ImageUpload/ImageUpload.tsx @@ -1,5 +1,5 @@ +import { Typography } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import Typography from "@material-ui/core/Typography"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/LanguageSwitch/LanguageSwitch.tsx b/src/components/LanguageSwitch/LanguageSwitch.tsx index 0c53b9ab1..26c853cb6 100644 --- a/src/components/LanguageSwitch/LanguageSwitch.tsx +++ b/src/components/LanguageSwitch/LanguageSwitch.tsx @@ -1,11 +1,13 @@ -import Card from "@material-ui/core/Card"; -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import Grow from "@material-ui/core/Grow"; -import MenuItem from "@material-ui/core/MenuItem"; -import Menu from "@material-ui/core/MenuList"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + ClickAwayListener, + Grow, + MenuItem, + MenuList as Menu, + Paper, + Popper, + Typography +} from "@material-ui/core"; import ArrowDropDown from "@material-ui/icons/ArrowDropDown"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; diff --git a/src/components/Link.tsx b/src/components/Link.tsx index 7fa855df0..35b684ecf 100644 --- a/src/components/Link.tsx +++ b/src/components/Link.tsx @@ -1,4 +1,5 @@ -import Typography, { TypographyProps } from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; +import { TypographyProps } from "@material-ui/core/Typography"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/LinkChoice/LinkChoice.tsx b/src/components/LinkChoice/LinkChoice.tsx index 9eb79ed0f..6cb732939 100644 --- a/src/components/LinkChoice/LinkChoice.tsx +++ b/src/components/LinkChoice/LinkChoice.tsx @@ -1,7 +1,4 @@ -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import MenuItem from "@material-ui/core/MenuItem"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; +import { ClickAwayListener, MenuItem, Paper, Popper } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; import { FormChange } from "@saleor/hooks/useForm"; import ArrowDropdown from "@saleor/icons/ArrowDropdown"; diff --git a/src/components/ListField/ListField.tsx b/src/components/ListField/ListField.tsx index e298e3519..126a8c831 100644 --- a/src/components/ListField/ListField.tsx +++ b/src/components/ListField/ListField.tsx @@ -1,5 +1,5 @@ -import Button from "@material-ui/core/Button"; -import TextField, { StandardTextFieldProps } from "@material-ui/core/TextField"; +import { Button, TextField } from "@material-ui/core"; +import { StandardTextFieldProps } from "@material-ui/core/TextField"; import { createStyles, SaleorTheme, diff --git a/src/components/MediaTile/MediaTile.tsx b/src/components/MediaTile/MediaTile.tsx index f242dd2b4..f3c34a05e 100644 --- a/src/components/MediaTile/MediaTile.tsx +++ b/src/components/MediaTile/MediaTile.tsx @@ -1,5 +1,4 @@ -import CircularProgress from "@material-ui/core/CircularProgress"; -import IconButton from "@material-ui/core/IconButton"; +import { CircularProgress, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import EditIcon from "@material-ui/icons/Edit"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/Metadata/MetadataCard.tsx b/src/components/Metadata/MetadataCard.tsx index 63b520c77..e2dabd4de 100644 --- a/src/components/Metadata/MetadataCard.tsx +++ b/src/components/Metadata/MetadataCard.tsx @@ -1,16 +1,18 @@ import emptyMetadata from "@assets/images/empty-metadata.svg"; -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardActions from "@material-ui/core/CardActions"; -import CardContent from "@material-ui/core/CardContent"; -import IconButton from "@material-ui/core/IconButton"; -import Table from "@material-ui/core/Table"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardActions, + CardContent, + IconButton, + Table, + TableBody, + TableCell, + TableHead, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import ToggleIcon from "@material-ui/icons/ArrowDropDown"; import DeleteIcon from "@material-ui/icons/Delete"; import { FormChange } from "@saleor/hooks/useForm"; diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx index a54b5bfd7..3dd326e72 100644 --- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx +++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx @@ -1,7 +1,5 @@ -import IconButton from "@material-ui/core/IconButton"; +import { IconButton, TextField, Typography } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; import CloseIcon from "@material-ui/icons/Close"; import Debounce, { DebounceProps } from "@saleor/components/Debounce"; import ArrowDropdownIcon from "@saleor/icons/ArrowDropdown"; diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx index 9487ef55e..008d928ec 100644 --- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx +++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx @@ -1,8 +1,10 @@ import chevronDown from "@assets/images/ChevronDown.svg"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import MenuItem from "@material-ui/core/MenuItem"; -import Paper from "@material-ui/core/Paper"; -import Typography from "@material-ui/core/Typography"; +import { + CircularProgress, + MenuItem, + Paper, + Typography +} from "@material-ui/core"; import AddIcon from "@material-ui/icons/Add"; import Checkbox from "@saleor/components/Checkbox"; import useElementScroll, { diff --git a/src/components/MultiSelectField/MultiSelectField.tsx b/src/components/MultiSelectField/MultiSelectField.tsx index 49c43d583..d360c18e2 100644 --- a/src/components/MultiSelectField/MultiSelectField.tsx +++ b/src/components/MultiSelectField/MultiSelectField.tsx @@ -1,9 +1,12 @@ -import FilledInput from "@material-ui/core/FilledInput"; -import FormControl from "@material-ui/core/FormControl"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import InputLabel from "@material-ui/core/InputLabel"; -import MenuItem from "@material-ui/core/MenuItem"; -import Select, { SelectProps } from "@material-ui/core/Select"; +import { + FilledInput, + FormControl, + FormHelperText, + InputLabel, + MenuItem, + Select +} from "@material-ui/core"; +import { SelectProps } from "@material-ui/core/Select"; import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/Navigator/Navigator.tsx b/src/components/Navigator/Navigator.tsx index fd39dfc67..f6acde56d 100644 --- a/src/components/Navigator/Navigator.tsx +++ b/src/components/Navigator/Navigator.tsx @@ -1,6 +1,4 @@ -import Fade from "@material-ui/core/Fade"; -import Modal from "@material-ui/core/Modal"; -import Paper from "@material-ui/core/Paper"; +import { Fade, Modal, Paper } from "@material-ui/core"; import { APP_VERSION } from "@saleor/config"; import useLocalStorage from "@saleor/hooks/useLocalStorage"; import useNotifier from "@saleor/hooks/useNotifier"; diff --git a/src/components/Navigator/NavigatorSection.tsx b/src/components/Navigator/NavigatorSection.tsx index c2e4037bd..d2d1df1c7 100644 --- a/src/components/Navigator/NavigatorSection.tsx +++ b/src/components/Navigator/NavigatorSection.tsx @@ -1,5 +1,4 @@ -import MenuItem from "@material-ui/core/MenuItem"; -import Typography from "@material-ui/core/Typography"; +import { MenuItem, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import { GetItemPropsOptions } from "downshift"; import React from "react"; diff --git a/src/components/NavigatorButton/NavigatorButton.tsx b/src/components/NavigatorButton/NavigatorButton.tsx index 014acc27e..c36b0e22a 100644 --- a/src/components/NavigatorButton/NavigatorButton.tsx +++ b/src/components/NavigatorButton/NavigatorButton.tsx @@ -1,8 +1,6 @@ import navigatorIcon from "@assets/images/navigator.svg"; -import Grow from "@material-ui/core/Grow"; -import IconButton, { IconButtonProps } from "@material-ui/core/IconButton"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; +import { Grow, IconButton, Paper, Popper } from "@material-ui/core"; +import { IconButtonProps } from "@material-ui/core/IconButton"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/NotFoundPage/NotFoundPage.tsx b/src/components/NotFoundPage/NotFoundPage.tsx index 2ed765568..291307ee0 100644 --- a/src/components/NotFoundPage/NotFoundPage.tsx +++ b/src/components/NotFoundPage/NotFoundPage.tsx @@ -1,6 +1,5 @@ import notFoundImage from "@assets/images/not-found-404.svg"; -import Button from "@material-ui/core/Button"; -import Typography from "@material-ui/core/Typography"; +import { Button, Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; import SVG from "react-inlinesvg"; diff --git a/src/components/PageHeader/PageHeader.tsx b/src/components/PageHeader/PageHeader.tsx index ab75ab517..87d0238fa 100644 --- a/src/components/PageHeader/PageHeader.tsx +++ b/src/components/PageHeader/PageHeader.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { LimitInfoFragment } from "@saleor/fragments/types/LimitInfoFragment"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/PhoneField/PhoneField.tsx b/src/components/PhoneField/PhoneField.tsx index 5525d6209..3fc57ffca 100644 --- a/src/components/PhoneField/PhoneField.tsx +++ b/src/components/PhoneField/PhoneField.tsx @@ -1,4 +1,4 @@ -import TextField from "@material-ui/core/TextField"; +import { TextField } from "@material-ui/core"; import SingleSelectField from "@saleor/components/SingleSelectField"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/PriceField/PriceField.tsx b/src/components/PriceField/PriceField.tsx index 3bb72e5e0..14d6c79be 100644 --- a/src/components/PriceField/PriceField.tsx +++ b/src/components/PriceField/PriceField.tsx @@ -1,6 +1,5 @@ +import { InputAdornment, TextField } from "@material-ui/core"; import { InputProps } from "@material-ui/core/Input"; -import InputAdornment from "@material-ui/core/InputAdornment"; -import TextField from "@material-ui/core/TextField"; import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/RadioGroupField/RadioGroupField.tsx b/src/components/RadioGroupField/RadioGroupField.tsx index 0aa23339f..55e3e446d 100644 --- a/src/components/RadioGroupField/RadioGroupField.tsx +++ b/src/components/RadioGroupField/RadioGroupField.tsx @@ -1,10 +1,12 @@ -import FormControl from "@material-ui/core/FormControl"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import FormLabel from "@material-ui/core/FormLabel"; -import MenuItem from "@material-ui/core/MenuItem"; -import Radio from "@material-ui/core/Radio"; -import RadioGroup from "@material-ui/core/RadioGroup"; +import { + FormControl, + FormControlLabel, + FormHelperText, + FormLabel, + MenuItem, + Radio, + RadioGroup +} from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/RadioSwitchField/RadioSwitchField.tsx b/src/components/RadioSwitchField/RadioSwitchField.tsx index ce76176e5..57e74b482 100644 --- a/src/components/RadioSwitchField/RadioSwitchField.tsx +++ b/src/components/RadioSwitchField/RadioSwitchField.tsx @@ -1,7 +1,9 @@ -import FormControl from "@material-ui/core/FormControl"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Radio from "@material-ui/core/Radio"; -import RadioGroup from "@material-ui/core/RadioGroup"; +import { + FormControl, + FormControlLabel, + Radio, + RadioGroup +} from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/ResponsiveTable/ResponsiveTable.tsx b/src/components/ResponsiveTable/ResponsiveTable.tsx index ec01ecebb..b0523e096 100644 --- a/src/components/ResponsiveTable/ResponsiveTable.tsx +++ b/src/components/ResponsiveTable/ResponsiveTable.tsx @@ -1,4 +1,4 @@ -import Table from "@material-ui/core/Table"; +import { Table } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/RichTextEditor/RichTextEditor.tsx b/src/components/RichTextEditor/RichTextEditor.tsx index eec6523b9..83f52608f 100644 --- a/src/components/RichTextEditor/RichTextEditor.tsx +++ b/src/components/RichTextEditor/RichTextEditor.tsx @@ -1,7 +1,5 @@ import EditorJS, { LogLevels, OutputData } from "@editorjs/editorjs"; -import FormControl from "@material-ui/core/FormControl"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import InputLabel from "@material-ui/core/InputLabel"; +import { FormControl, FormHelperText, InputLabel } from "@material-ui/core"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/RowNumberSelect/RowNumberSelect.tsx b/src/components/RowNumberSelect/RowNumberSelect.tsx index 674b414d3..8a24f4554 100644 --- a/src/components/RowNumberSelect/RowNumberSelect.tsx +++ b/src/components/RowNumberSelect/RowNumberSelect.tsx @@ -1,5 +1,4 @@ -import MenuItem from "@material-ui/core/MenuItem"; -import Select from "@material-ui/core/Select"; +import { MenuItem, Select } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/components/SaveButtonBar/SaveButtonBar.tsx b/src/components/SaveButtonBar/SaveButtonBar.tsx index d843c4bc3..6808e55da 100644 --- a/src/components/SaveButtonBar/SaveButtonBar.tsx +++ b/src/components/SaveButtonBar/SaveButtonBar.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Portal from "@material-ui/core/Portal"; +import { Button, Card, CardContent, Portal } from "@material-ui/core"; import useWindowScroll from "@saleor/hooks/useWindowScroll"; import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx b/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx index 5b116531b..ed0d243fa 100644 --- a/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx +++ b/src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField +} from "@material-ui/core"; import { buttonMessages } from "@saleor/intl"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx index 741fce316..26c017be0 100644 --- a/src/components/SearchBar/SearchBar.tsx +++ b/src/components/SearchBar/SearchBar.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import { SearchPageProps, TabPageProps } from "@saleor/types"; import React from "react"; diff --git a/src/components/SearchBar/SearchInput.tsx b/src/components/SearchBar/SearchInput.tsx index c3d531d3e..178f8ce8f 100644 --- a/src/components/SearchBar/SearchInput.tsx +++ b/src/components/SearchBar/SearchInput.tsx @@ -1,4 +1,4 @@ -import TextField from "@material-ui/core/TextField"; +import { TextField } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/SeoForm/SeoForm.tsx b/src/components/SeoForm/SeoForm.tsx index 90b8b4dff..702caae74 100644 --- a/src/components/SeoForm/SeoForm.tsx +++ b/src/components/SeoForm/SeoForm.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + TextField, + Typography +} from "@material-ui/core"; import { CollectionErrorFragment } from "@saleor/fragments/types/CollectionErrorFragment"; import { PageErrorFragment } from "@saleor/fragments/types/PageErrorFragment"; import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment"; diff --git a/src/components/SideBar/MenuItem.tsx b/src/components/SideBar/MenuItem.tsx index e38b7d371..c43b408d2 100644 --- a/src/components/SideBar/MenuItem.tsx +++ b/src/components/SideBar/MenuItem.tsx @@ -1,8 +1,10 @@ -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; +import { + ClickAwayListener, + Paper, + Popper, + Typography +} from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import Typography from "@material-ui/core/Typography"; import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; diff --git a/src/components/SideBarDrawer/MenuItemBtn.tsx b/src/components/SideBarDrawer/MenuItemBtn.tsx index 9013d5f36..f703542b7 100644 --- a/src/components/SideBarDrawer/MenuItemBtn.tsx +++ b/src/components/SideBarDrawer/MenuItemBtn.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; import React from "react"; import SVG from "react-inlinesvg"; diff --git a/src/components/SideBarDrawer/SideBarDrawer.tsx b/src/components/SideBarDrawer/SideBarDrawer.tsx index e7963401c..a1fb78ded 100644 --- a/src/components/SideBarDrawer/SideBarDrawer.tsx +++ b/src/components/SideBarDrawer/SideBarDrawer.tsx @@ -1,6 +1,5 @@ import logoLight from "@assets/images/logo-sidebar-light.svg"; -import { Typography } from "@material-ui/core"; -import Drawer from "@material-ui/core/Drawer"; +import { Drawer, Typography } from "@material-ui/core"; import ArrowLeftIcon from "@material-ui/icons/ArrowLeft"; import MenuIcon from "@material-ui/icons/Menu"; import classNames from "classnames"; diff --git a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx index be27d6b8a..b88c0730d 100644 --- a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx +++ b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx @@ -1,6 +1,5 @@ +import { InputBase, TextField } from "@material-ui/core"; import { InputProps } from "@material-ui/core/Input"; -import InputBase from "@material-ui/core/InputBase"; -import TextField from "@material-ui/core/TextField"; import { ExtendedFormHelperTextProps } from "@saleor/channels/components/ChannelForm/types"; import { makeStyles } from "@saleor/theme"; import { FetchMoreProps } from "@saleor/types"; diff --git a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx index 3e9460bbf..5304112fe 100644 --- a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx +++ b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectFieldContent.tsx @@ -1,8 +1,10 @@ import chevronDown from "@assets/images/ChevronDown.svg"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import MenuItem from "@material-ui/core/MenuItem"; -import Paper from "@material-ui/core/Paper"; -import Typography from "@material-ui/core/Typography"; +import { + CircularProgress, + MenuItem, + Paper, + Typography +} from "@material-ui/core"; import Add from "@material-ui/icons/Add"; import useElementScroll, { isScrolledToBottom diff --git a/src/components/SingleSelectField/SingleSelectField.tsx b/src/components/SingleSelectField/SingleSelectField.tsx index 25de8186c..8acb4877e 100644 --- a/src/components/SingleSelectField/SingleSelectField.tsx +++ b/src/components/SingleSelectField/SingleSelectField.tsx @@ -1,10 +1,13 @@ -import FormControl from "@material-ui/core/FormControl"; -import FormHelperText from "@material-ui/core/FormHelperText"; +import { + FormControl, + FormHelperText, + InputLabel, + MenuItem, + OutlinedInput, + Select +} from "@material-ui/core"; import { InputProps } from "@material-ui/core/Input"; -import InputLabel from "@material-ui/core/InputLabel"; -import MenuItem from "@material-ui/core/MenuItem"; -import OutlinedInput from "@material-ui/core/OutlinedInput"; -import Select, { SelectProps } from "@material-ui/core/Select"; +import { SelectProps } from "@material-ui/core/Select"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/SortableChip/SortableChip.tsx b/src/components/SortableChip/SortableChip.tsx index bd987ed98..904fdf65f 100644 --- a/src/components/SortableChip/SortableChip.tsx +++ b/src/components/SortableChip/SortableChip.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import CloseIcon from "@material-ui/icons/Close"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; diff --git a/src/components/SortableChipsField/SortableChipsField.tsx b/src/components/SortableChipsField/SortableChipsField.tsx index da00bceae..abe688e1f 100644 --- a/src/components/SortableChipsField/SortableChipsField.tsx +++ b/src/components/SortableChipsField/SortableChipsField.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import { ReorderAction } from "@saleor/types"; import React from "react"; diff --git a/src/components/SortableTable/SortableHandle.tsx b/src/components/SortableTable/SortableHandle.tsx index bc3dcef78..56a61a082 100644 --- a/src/components/SortableTable/SortableHandle.tsx +++ b/src/components/SortableTable/SortableHandle.tsx @@ -1,4 +1,4 @@ -import TableCell from "@material-ui/core/TableCell"; +import { TableCell } from "@material-ui/core"; import Draggable from "@saleor/icons/Draggable"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/SortableTable/SortableTableBody.tsx b/src/components/SortableTable/SortableTableBody.tsx index 19b12be81..e28c718b6 100644 --- a/src/components/SortableTable/SortableTableBody.tsx +++ b/src/components/SortableTable/SortableTableBody.tsx @@ -1,4 +1,5 @@ -import TableBody, { TableBodyProps } from "@material-ui/core/TableBody"; +import { TableBody } from "@material-ui/core"; +import { TableBodyProps } from "@material-ui/core/TableBody"; import { makeStyles } from "@saleor/theme"; import { ReorderAction } from "@saleor/types"; import React from "react"; diff --git a/src/components/SortableTable/SortableTableRow.tsx b/src/components/SortableTable/SortableTableRow.tsx index 48a77dad1..c5f09a459 100644 --- a/src/components/SortableTable/SortableTableRow.tsx +++ b/src/components/SortableTable/SortableTableRow.tsx @@ -1,4 +1,5 @@ -import TableRow, { TableRowProps } from "@material-ui/core/TableRow"; +import { TableRow } from "@material-ui/core"; +import { TableRowProps } from "@material-ui/core/TableRow"; import React from "react"; import { SortableElement } from "react-sortable-hoc"; diff --git a/src/components/SquareButton/SquareButton.tsx b/src/components/SquareButton/SquareButton.tsx index a66edc14b..7b64cfe16 100644 --- a/src/components/SquareButton/SquareButton.tsx +++ b/src/components/SquareButton/SquareButton.tsx @@ -1,4 +1,5 @@ -import ButtonBase, { ButtonBaseProps } from "@material-ui/core/ButtonBase"; +import { ButtonBase } from "@material-ui/core"; +import { ButtonBaseProps } from "@material-ui/core/ButtonBase"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/StatusChip/StatusChip.tsx b/src/components/StatusChip/StatusChip.tsx index 599356837..268abcad5 100644 --- a/src/components/StatusChip/StatusChip.tsx +++ b/src/components/StatusChip/StatusChip.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/StatusLabel/StatusLabel.tsx b/src/components/StatusLabel/StatusLabel.tsx index f11ab37d5..9db03a493 100644 --- a/src/components/StatusLabel/StatusLabel.tsx +++ b/src/components/StatusLabel/StatusLabel.tsx @@ -1,6 +1,6 @@ +import { Typography } from "@material-ui/core"; import grey from "@material-ui/core/colors/grey"; import yellow from "@material-ui/core/colors/yellow"; -import Typography from "@material-ui/core/Typography"; import Label from "@saleor/orders/components/OrderHistory/Label"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; diff --git a/src/components/Tab/Tab.tsx b/src/components/Tab/Tab.tsx index 6fb2fca0e..b88b25040 100644 --- a/src/components/Tab/Tab.tsx +++ b/src/components/Tab/Tab.tsx @@ -1,5 +1,5 @@ +import { Typography } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import Typography from "@material-ui/core/Typography"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/TableCellAvatar/Avatar.tsx b/src/components/TableCellAvatar/Avatar.tsx index b6847ec55..99e0bdf84 100644 --- a/src/components/TableCellAvatar/Avatar.tsx +++ b/src/components/TableCellAvatar/Avatar.tsx @@ -1,6 +1,6 @@ -import { makeStyles } from "@material-ui/core"; -import MuiAvatar from "@material-ui/core/Avatar"; +import { Avatar as MuiAvatar } from "@material-ui/core"; import Cached from "@material-ui/icons/Cached"; +import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/TableCellAvatar/TableCellAvatar.tsx b/src/components/TableCellAvatar/TableCellAvatar.tsx index bee967026..9b3f21bb7 100644 --- a/src/components/TableCellAvatar/TableCellAvatar.tsx +++ b/src/components/TableCellAvatar/TableCellAvatar.tsx @@ -1,4 +1,5 @@ -import TableCell, { TableCellProps } from "@material-ui/core/TableCell"; +import { TableCell } from "@material-ui/core"; +import { TableCellProps } from "@material-ui/core/TableCell"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/TableCellHeader/TableCellHeader.stories.tsx b/src/components/TableCellHeader/TableCellHeader.stories.tsx index bf6148f4f..4c5be3cc5 100644 --- a/src/components/TableCellHeader/TableCellHeader.stories.tsx +++ b/src/components/TableCellHeader/TableCellHeader.stories.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Card, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/components/TableCellHeader/TableCellHeader.tsx b/src/components/TableCellHeader/TableCellHeader.tsx index aa46cf34c..d7033aa0d 100644 --- a/src/components/TableCellHeader/TableCellHeader.tsx +++ b/src/components/TableCellHeader/TableCellHeader.tsx @@ -1,4 +1,5 @@ -import TableCell, { TableCellProps } from "@material-ui/core/TableCell"; +import { TableCell } from "@material-ui/core"; +import { TableCellProps } from "@material-ui/core/TableCell"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/TableFilter/FilterTab.tsx b/src/components/TableFilter/FilterTab.tsx index 4e2b5283b..488d45dff 100644 --- a/src/components/TableFilter/FilterTab.tsx +++ b/src/components/TableFilter/FilterTab.tsx @@ -1,4 +1,4 @@ -import Tab from "@material-ui/core/Tab"; +import { Tab } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/TableFilter/FilterTabs.tsx b/src/components/TableFilter/FilterTabs.tsx index fea3b21d1..69220297b 100644 --- a/src/components/TableFilter/FilterTabs.tsx +++ b/src/components/TableFilter/FilterTabs.tsx @@ -1,4 +1,4 @@ -import Tabs from "@material-ui/core/Tabs"; +import { Tabs } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/TableHead/TableHead.tsx b/src/components/TableHead/TableHead.tsx index 340460843..77508c0e3 100644 --- a/src/components/TableHead/TableHead.tsx +++ b/src/components/TableHead/TableHead.tsx @@ -1,10 +1,11 @@ +import { + TableCell, + TableHead as MuiTableHead, + TableRow, + Typography +} from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import TableCell from "@material-ui/core/TableCell"; -import MuiTableHead, { - TableHeadProps as MuiTableHeadProps -} from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { TableHeadProps as MuiTableHeadProps } from "@material-ui/core/TableHead"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; import React from "react"; diff --git a/src/components/TablePagination/TablePagination.tsx b/src/components/TablePagination/TablePagination.tsx index 82598f52b..d4cfbdc28 100644 --- a/src/components/TablePagination/TablePagination.tsx +++ b/src/components/TablePagination/TablePagination.tsx @@ -1,6 +1,5 @@ +import { TableCell, Toolbar } from "@material-ui/core"; import { IconButtonProps } from "@material-ui/core/IconButton"; -import TableCell from "@material-ui/core/TableCell"; -import Toolbar from "@material-ui/core/Toolbar"; import RowNumberSelect from "@saleor/components/RowNumberSelect"; import { maybe } from "@saleor/misc"; import { makeStyles } from "@saleor/theme"; diff --git a/src/components/TablePagination/TablePaginationActions.tsx b/src/components/TablePagination/TablePaginationActions.tsx index 43a7f7673..f1b33c57d 100644 --- a/src/components/TablePagination/TablePaginationActions.tsx +++ b/src/components/TablePagination/TablePaginationActions.tsx @@ -1,4 +1,4 @@ -import IconButton from "@material-ui/core/IconButton"; +import { IconButton } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; import ArrowLeft from "@material-ui/icons/ArrowLeft"; import ArrowRight from "@material-ui/icons/ArrowRight"; diff --git a/src/components/TextFieldWithChoice/TextFieldWithChoice.tsx b/src/components/TextFieldWithChoice/TextFieldWithChoice.tsx index abf8e6697..563546b40 100644 --- a/src/components/TextFieldWithChoice/TextFieldWithChoice.tsx +++ b/src/components/TextFieldWithChoice/TextFieldWithChoice.tsx @@ -1,11 +1,14 @@ -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import Grow from "@material-ui/core/Grow"; -import MenuItem from "@material-ui/core/MenuItem"; -import Menu from "@material-ui/core/MenuList"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; -import TextField, { TextFieldProps } from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + ClickAwayListener, + Grow, + MenuItem, + MenuList as Menu, + Paper, + Popper, + TextField, + Typography +} from "@material-ui/core"; +import { TextFieldProps } from "@material-ui/core/TextField"; import DropdownIcon from "@material-ui/icons/ArrowDropDown"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/Timeline/Timeline.tsx b/src/components/Timeline/Timeline.tsx index 674cc56f3..f8219951b 100644 --- a/src/components/Timeline/Timeline.tsx +++ b/src/components/Timeline/Timeline.tsx @@ -1,8 +1,5 @@ -import Avatar from "@material-ui/core/Avatar"; -import Button from "@material-ui/core/Button"; -import CardContent from "@material-ui/core/CardContent"; +import { Avatar, Button, CardContent, TextField } from "@material-ui/core"; import deepPurple from "@material-ui/core/colors/deepPurple"; -import TextField from "@material-ui/core/TextField"; import PersonIcon from "@material-ui/icons/Person"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/Timeline/TimelineEvent.tsx b/src/components/Timeline/TimelineEvent.tsx index 112fccb2c..a3bd1cff5 100644 --- a/src/components/Timeline/TimelineEvent.tsx +++ b/src/components/Timeline/TimelineEvent.tsx @@ -1,7 +1,9 @@ -import ExpansionPanel from "@material-ui/core/ExpansionPanel"; -import ExpansionPanelDetails from "@material-ui/core/ExpansionPanelDetails"; -import ExpansionPanelSummary from "@material-ui/core/ExpansionPanelSummary"; -import Typography from "@material-ui/core/Typography"; +import { + ExpansionPanel, + ExpansionPanelDetails, + ExpansionPanelSummary, + Typography +} from "@material-ui/core"; import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/Timeline/TimelineEventHeader.tsx b/src/components/Timeline/TimelineEventHeader.tsx index e1fc50cc1..5911cd37a 100644 --- a/src/components/Timeline/TimelineEventHeader.tsx +++ b/src/components/Timeline/TimelineEventHeader.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import useNavigator from "@saleor/hooks/useNavigator"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/components/Timeline/TimelineNote.tsx b/src/components/Timeline/TimelineNote.tsx index 507edfe32..8a96801c0 100644 --- a/src/components/Timeline/TimelineNote.tsx +++ b/src/components/Timeline/TimelineNote.tsx @@ -1,8 +1,5 @@ -import Avatar from "@material-ui/core/Avatar"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Avatar, Card, CardContent, Typography } from "@material-ui/core"; import * as colors from "@material-ui/core/colors"; -import Typography from "@material-ui/core/Typography"; import PersonIcon from "@material-ui/icons/Person"; import { makeStyles } from "@saleor/theme"; import CRC from "crc-32"; diff --git a/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialog.tsx b/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialog.tsx index 59b582e0c..f11c0b6fe 100644 --- a/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialog.tsx +++ b/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialog.tsx @@ -1,7 +1,4 @@ -import { CardContent } from "@material-ui/core"; -import Card from "@material-ui/core/Card"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Modal from "@material-ui/core/Modal"; +import { Card, CardContent, CircularProgress, Modal } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import ModalTitle from "@saleor/orders/components/OrderDiscountCommonModal/ModalTitle"; import { getById } from "@saleor/orders/components/OrderReturnPage/utils"; diff --git a/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialogContent.tsx b/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialogContent.tsx index 6c2b19a6c..9645a0018 100644 --- a/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialogContent.tsx +++ b/src/components/TypeDeleteWarningDialog/TypeDeleteWarningDialogContent.tsx @@ -1,5 +1,4 @@ -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { CardContent, Typography } from "@material-ui/core"; import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; import CardSpacer from "@saleor/components/CardSpacer"; import ConfirmButton from "@saleor/components/ConfirmButton"; diff --git a/src/components/UserChip/UserChip.tsx b/src/components/UserChip/UserChip.tsx index d148651ba..9cb95556a 100644 --- a/src/components/UserChip/UserChip.tsx +++ b/src/components/UserChip/UserChip.tsx @@ -1,14 +1,16 @@ -import Avatar from "@material-ui/core/Avatar"; -import Chip from "@material-ui/core/Chip"; -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Grow from "@material-ui/core/Grow"; -import Hidden from "@material-ui/core/Hidden"; -import MenuItem from "@material-ui/core/MenuItem"; -import Menu from "@material-ui/core/MenuList"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; -import Switch from "@material-ui/core/Switch"; +import { + Avatar, + Chip, + ClickAwayListener, + FormControlLabel, + Grow, + Hidden, + MenuItem, + MenuList as Menu, + Paper, + Popper, + Switch +} from "@material-ui/core"; import { User } from "@saleor/fragments/types/User"; import ArrowDropdown from "@saleor/icons/ArrowDropdown"; import { getUserInitials, getUserName } from "@saleor/misc"; diff --git a/src/components/VisibilityCard/VisibilityCard.tsx b/src/components/VisibilityCard/VisibilityCard.tsx index 597425f87..e065dda0e 100644 --- a/src/components/VisibilityCard/VisibilityCard.tsx +++ b/src/components/VisibilityCard/VisibilityCard.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import Hr from "@saleor/components/Hr"; diff --git a/src/components/messages/MessageManager.tsx b/src/components/messages/MessageManager.tsx index 3ebe96cc7..130f60dcf 100644 --- a/src/components/messages/MessageManager.tsx +++ b/src/components/messages/MessageManager.tsx @@ -1,7 +1,9 @@ -import Button from "@material-ui/core/Button"; -import IconButton from "@material-ui/core/IconButton"; -import SnackbarContent from "@material-ui/core/SnackbarContent"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + IconButton, + SnackbarContent, + Typography +} from "@material-ui/core"; import CloseIcon from "@material-ui/icons/Close"; import classNames from "classnames"; import React, { useState } from "react"; diff --git a/src/configuration/ConfigurationPage.tsx b/src/configuration/ConfigurationPage.tsx index d55fdd67d..677e5c7da 100644 --- a/src/configuration/ConfigurationPage.tsx +++ b/src/configuration/ConfigurationPage.tsx @@ -1,7 +1,5 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent, Typography } from "@material-ui/core"; import { IconProps } from "@material-ui/core/Icon"; -import Typography from "@material-ui/core/Typography"; import { User } from "@saleor/fragments/types/User"; import { sectionNames } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; diff --git a/src/customers/components/CustomerAddress/CustomerAddress.tsx b/src/customers/components/CustomerAddress/CustomerAddress.tsx index 15fd0c145..76d9931ba 100644 --- a/src/customers/components/CustomerAddress/CustomerAddress.tsx +++ b/src/customers/components/CustomerAddress/CustomerAddress.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import AddressFormatter from "@saleor/components/AddressFormatter"; import CardMenu from "@saleor/components/CardMenu"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/customers/components/CustomerAddressChoiceCard/CustomerAddressChoiceCard.tsx b/src/customers/components/CustomerAddressChoiceCard/CustomerAddressChoiceCard.tsx index 88aa79f12..b4bc4090e 100644 --- a/src/customers/components/CustomerAddressChoiceCard/CustomerAddressChoiceCard.tsx +++ b/src/customers/components/CustomerAddressChoiceCard/CustomerAddressChoiceCard.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import AddressFormatter from "@saleor/components/AddressFormatter"; import classNames from "classnames"; import React from "react"; diff --git a/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx b/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx index b98d2e1fb..13114da02 100644 --- a/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx +++ b/src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle +} from "@material-ui/core"; import AddressEdit from "@saleor/components/AddressEdit"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx b/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx index fdbe09feb..adb5ca936 100644 --- a/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx +++ b/src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Typography from "@material-ui/core/Typography"; +import { Button, Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/customers/components/CustomerAddresses/CustomerAddresses.tsx b/src/customers/components/CustomerAddresses/CustomerAddresses.tsx index e3c38c128..6d619b6d2 100644 --- a/src/customers/components/CustomerAddresses/CustomerAddresses.tsx +++ b/src/customers/components/CustomerAddresses/CustomerAddresses.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import AddressFormatter from "@saleor/components/AddressFormatter"; import CardTitle from "@saleor/components/CardTitle"; import { Hr } from "@saleor/components/Hr"; diff --git a/src/customers/components/CustomerCreateAddress/CustomerCreateAddress.tsx b/src/customers/components/CustomerCreateAddress/CustomerCreateAddress.tsx index 686dbe8be..7e1dba784 100644 --- a/src/customers/components/CustomerCreateAddress/CustomerCreateAddress.tsx +++ b/src/customers/components/CustomerCreateAddress/CustomerCreateAddress.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import AddressEdit from "@saleor/components/AddressEdit"; import CardTitle from "@saleor/components/CardTitle"; import { FormSpacer } from "@saleor/components/FormSpacer"; diff --git a/src/customers/components/CustomerCreateDetails/CustomerCreateDetails.tsx b/src/customers/components/CustomerCreateDetails/CustomerCreateDetails.tsx index 9b48d9346..2e749c321 100644 --- a/src/customers/components/CustomerCreateDetails/CustomerCreateDetails.tsx +++ b/src/customers/components/CustomerCreateDetails/CustomerCreateDetails.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { AccountErrorFragment } from "@saleor/fragments/types/AccountErrorFragment"; import { commonMessages } from "@saleor/intl"; diff --git a/src/customers/components/CustomerCreateNote/CustomerCreateNote.tsx b/src/customers/components/CustomerCreateNote/CustomerCreateNote.tsx index b04b0496c..5f67a492a 100644 --- a/src/customers/components/CustomerCreateNote/CustomerCreateNote.tsx +++ b/src/customers/components/CustomerCreateNote/CustomerCreateNote.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { FormSpacer } from "@saleor/components/FormSpacer"; import { AccountErrorFragment } from "@saleor/fragments/types/AccountErrorFragment"; diff --git a/src/customers/components/CustomerDetails/CustomerDetails.tsx b/src/customers/components/CustomerDetails/CustomerDetails.tsx index 5039626c8..aebf42761 100644 --- a/src/customers/components/CustomerDetails/CustomerDetails.tsx +++ b/src/customers/components/CustomerDetails/CustomerDetails.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/customers/components/CustomerInfo/CustomerInfo.tsx b/src/customers/components/CustomerInfo/CustomerInfo.tsx index 9dfdbd7f2..9292f2c02 100644 --- a/src/customers/components/CustomerInfo/CustomerInfo.tsx +++ b/src/customers/components/CustomerInfo/CustomerInfo.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Grid from "@saleor/components/Grid"; import Hr from "@saleor/components/Hr"; diff --git a/src/customers/components/CustomerList/CustomerList.tsx b/src/customers/components/CustomerList/CustomerList.tsx index 8b72865ac..1317ee827 100644 --- a/src/customers/components/CustomerList/CustomerList.tsx +++ b/src/customers/components/CustomerList/CustomerList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/customers/components/CustomerListPage/CustomerListPage.tsx b/src/customers/components/CustomerListPage/CustomerListPage.tsx index 787e0e576..65c4c2fb6 100644 --- a/src/customers/components/CustomerListPage/CustomerListPage.tsx +++ b/src/customers/components/CustomerListPage/CustomerListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import Container from "@saleor/components/Container"; import FilterBar from "@saleor/components/FilterBar"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/customers/components/CustomerOrders/CustomerOrders.tsx b/src/customers/components/CustomerOrders/CustomerOrders.tsx index 18bd339e9..db916fcda 100644 --- a/src/customers/components/CustomerOrders/CustomerOrders.tsx +++ b/src/customers/components/CustomerOrders/CustomerOrders.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { DateTime } from "@saleor/components/Date"; import Money from "@saleor/components/Money"; diff --git a/src/customers/components/CustomerStats/CustomerStats.tsx b/src/customers/components/CustomerStats/CustomerStats.tsx index bc92964fc..699e320f0 100644 --- a/src/customers/components/CustomerStats/CustomerStats.tsx +++ b/src/customers/components/CustomerStats/CustomerStats.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { DateTime } from "@saleor/components/Date"; import { Hr } from "@saleor/components/Hr"; diff --git a/src/customers/views/CustomerAddresses.tsx b/src/customers/views/CustomerAddresses.tsx index e6da862a2..08fb5a700 100644 --- a/src/customers/views/CustomerAddresses.tsx +++ b/src/customers/views/CustomerAddresses.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { WindowTitle } from "@saleor/components/WindowTitle"; import useNavigator from "@saleor/hooks/useNavigator"; diff --git a/src/customers/views/CustomerDetails.tsx b/src/customers/views/CustomerDetails.tsx index 5f535d3b8..4d631b484 100644 --- a/src/customers/views/CustomerDetails.tsx +++ b/src/customers/views/CustomerDetails.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import NotFoundPage from "@saleor/components/NotFoundPage"; import { WindowTitle } from "@saleor/components/WindowTitle"; diff --git a/src/customers/views/CustomerList/CustomerList.tsx b/src/customers/views/CustomerList/CustomerList.tsx index 39b6736da..9d8e72066 100644 --- a/src/customers/views/CustomerList/CustomerList.tsx +++ b/src/customers/views/CustomerList/CustomerList.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; diff --git a/src/discounts/components/DiscountCategories/DiscountCategories.tsx b/src/discounts/components/DiscountCategories/DiscountCategories.tsx index d01b56144..0bc04990b 100644 --- a/src/discounts/components/DiscountCategories/DiscountCategories.tsx +++ b/src/discounts/components/DiscountCategories/DiscountCategories.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableFooter, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/discounts/components/DiscountCollections/DiscountCollections.tsx b/src/discounts/components/DiscountCollections/DiscountCollections.tsx index ea797316a..a6df42221 100644 --- a/src/discounts/components/DiscountCollections/DiscountCollections.tsx +++ b/src/discounts/components/DiscountCollections/DiscountCollections.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableFooter, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx b/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx index dfcdcb125..b73699d85 100644 --- a/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx +++ b/src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx @@ -1,13 +1,15 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TableBody, + TableCell, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/discounts/components/DiscountDates/DiscountDates.tsx b/src/discounts/components/DiscountDates/DiscountDates.tsx index b75dd66fd..b551808fc 100644 --- a/src/discounts/components/DiscountDates/DiscountDates.tsx +++ b/src/discounts/components/DiscountDates/DiscountDates.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import Grid from "@saleor/components/Grid"; diff --git a/src/discounts/components/DiscountProducts/DiscountProducts.tsx b/src/discounts/components/DiscountProducts/DiscountProducts.tsx index 19e917e99..dd40edb88 100644 --- a/src/discounts/components/DiscountProducts/DiscountProducts.tsx +++ b/src/discounts/components/DiscountProducts/DiscountProducts.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableFooter, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; diff --git a/src/discounts/components/SaleInfo/SaleInfo.tsx b/src/discounts/components/SaleInfo/SaleInfo.tsx index dad0ffc23..5bb7dcf93 100644 --- a/src/discounts/components/SaleInfo/SaleInfo.tsx +++ b/src/discounts/components/SaleInfo/SaleInfo.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { DiscountErrorFragment } from "@saleor/fragments/types/DiscountErrorFragment"; import { commonMessages } from "@saleor/intl"; diff --git a/src/discounts/components/SaleList/SaleList.tsx b/src/discounts/components/SaleList/SaleList.tsx index 8040121d4..adb11c9b1 100644 --- a/src/discounts/components/SaleList/SaleList.tsx +++ b/src/discounts/components/SaleList/SaleList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import Date from "@saleor/components/Date"; import Money from "@saleor/components/Money"; diff --git a/src/discounts/components/SaleListPage/SaleListPage.tsx b/src/discounts/components/SaleListPage/SaleListPage.tsx index 247465d21..0488d23f7 100644 --- a/src/discounts/components/SaleListPage/SaleListPage.tsx +++ b/src/discounts/components/SaleListPage/SaleListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import Container from "@saleor/components/Container"; import FilterBar from "@saleor/components/FilterBar"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/discounts/components/SaleSummary/SaleSummary.tsx b/src/discounts/components/SaleSummary/SaleSummary.tsx index bf77c571d..44ab1b5b5 100644 --- a/src/discounts/components/SaleSummary/SaleSummary.tsx +++ b/src/discounts/components/SaleSummary/SaleSummary.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import Date from "@saleor/components/Date"; diff --git a/src/discounts/components/SaleType/SaleType.tsx b/src/discounts/components/SaleType/SaleType.tsx index 8b4d9e634..7cdeb8e08 100644 --- a/src/discounts/components/SaleType/SaleType.tsx +++ b/src/discounts/components/SaleType/SaleType.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import RadioGroupField, { RadioGroupFieldChoice diff --git a/src/discounts/components/SaleValue/SaleValue.tsx b/src/discounts/components/SaleValue/SaleValue.tsx index 007e8d1d5..882eb763c 100644 --- a/src/discounts/components/SaleValue/SaleValue.tsx +++ b/src/discounts/components/SaleValue/SaleValue.tsx @@ -1,10 +1,12 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + TableBody, + TableCell, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/discounts/components/VoucherDates/VoucherDates.tsx b/src/discounts/components/VoucherDates/VoucherDates.tsx index 9bec1f4c9..9070f3ca8 100644 --- a/src/discounts/components/VoucherDates/VoucherDates.tsx +++ b/src/discounts/components/VoucherDates/VoucherDates.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import Grid from "@saleor/components/Grid"; diff --git a/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx b/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx index 7744973d8..ac11e98d4 100644 --- a/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx +++ b/src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { ChannelVoucherData } from "@saleor/channels/utils"; import AppHeader from "@saleor/components/AppHeader"; import CardSpacer from "@saleor/components/CardSpacer"; diff --git a/src/discounts/components/VoucherInfo/VoucherInfo.tsx b/src/discounts/components/VoucherInfo/VoucherInfo.tsx index 3e2dccf3e..34e36a3d1 100644 --- a/src/discounts/components/VoucherInfo/VoucherInfo.tsx +++ b/src/discounts/components/VoucherInfo/VoucherInfo.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Button, Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { DiscountErrorFragment } from "@saleor/fragments/types/DiscountErrorFragment"; import { commonMessages } from "@saleor/intl"; diff --git a/src/discounts/components/VoucherLimits/VoucherLimits.tsx b/src/discounts/components/VoucherLimits/VoucherLimits.tsx index 970a3529e..1b19433cf 100644 --- a/src/discounts/components/VoucherLimits/VoucherLimits.tsx +++ b/src/discounts/components/VoucherLimits/VoucherLimits.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import { DiscountErrorFragment } from "@saleor/fragments/types/DiscountErrorFragment"; diff --git a/src/discounts/components/VoucherList/VoucherList.tsx b/src/discounts/components/VoucherList/VoucherList.tsx index eb8b2c5cd..0ca931d46 100644 --- a/src/discounts/components/VoucherList/VoucherList.tsx +++ b/src/discounts/components/VoucherList/VoucherList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import Date from "@saleor/components/Date"; import Money from "@saleor/components/Money"; diff --git a/src/discounts/components/VoucherListPage/VoucherListPage.tsx b/src/discounts/components/VoucherListPage/VoucherListPage.tsx index 47253834c..624127792 100644 --- a/src/discounts/components/VoucherListPage/VoucherListPage.tsx +++ b/src/discounts/components/VoucherListPage/VoucherListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import Container from "@saleor/components/Container"; import FilterBar from "@saleor/components/FilterBar"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx b/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx index 050739422..3275386e8 100644 --- a/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx +++ b/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx @@ -1,10 +1,12 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + TableBody, + TableCell, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { FormSpacer } from "@saleor/components/FormSpacer"; import PriceField from "@saleor/components/PriceField"; diff --git a/src/discounts/components/VoucherSummary/VoucherSummary.tsx b/src/discounts/components/VoucherSummary/VoucherSummary.tsx index 2e1233191..ce8e0fc41 100644 --- a/src/discounts/components/VoucherSummary/VoucherSummary.tsx +++ b/src/discounts/components/VoucherSummary/VoucherSummary.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import Date from "@saleor/components/Date"; diff --git a/src/discounts/components/VoucherTypes/VoucherTypes.tsx b/src/discounts/components/VoucherTypes/VoucherTypes.tsx index 35d5d1e5b..33fbf66f6 100644 --- a/src/discounts/components/VoucherTypes/VoucherTypes.tsx +++ b/src/discounts/components/VoucherTypes/VoucherTypes.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Grid from "@saleor/components/Grid"; import RadioGroupField from "@saleor/components/RadioGroupField"; diff --git a/src/discounts/components/VoucherValue/VoucherValue.tsx b/src/discounts/components/VoucherValue/VoucherValue.tsx index 4b6105a28..935546f06 100644 --- a/src/discounts/components/VoucherValue/VoucherValue.tsx +++ b/src/discounts/components/VoucherValue/VoucherValue.tsx @@ -1,9 +1,11 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + TableBody, + TableCell, + TableRow, + Typography +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import { FormSpacer } from "@saleor/components/FormSpacer"; diff --git a/src/discounts/views/SaleDetails/SaleDetails.tsx b/src/discounts/views/SaleDetails/SaleDetails.tsx index 0617b7f73..7828ec77d 100644 --- a/src/discounts/views/SaleDetails/SaleDetails.tsx +++ b/src/discounts/views/SaleDetails/SaleDetails.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import DialogContentText from "@material-ui/core/DialogContentText"; +import { Button, DialogContentText } from "@material-ui/core"; import { categoryUrl } from "@saleor/categories/urls"; import { useChannelsList } from "@saleor/channels/queries"; import { diff --git a/src/discounts/views/SaleList/SaleList.tsx b/src/discounts/views/SaleList/SaleList.tsx index 4f9253661..3e24d5ab1 100644 --- a/src/discounts/views/SaleList/SaleList.tsx +++ b/src/discounts/views/SaleList/SaleList.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; diff --git a/src/discounts/views/VoucherDetails/VoucherDetails.tsx b/src/discounts/views/VoucherDetails/VoucherDetails.tsx index 82d201c1a..9cf108a24 100644 --- a/src/discounts/views/VoucherDetails/VoucherDetails.tsx +++ b/src/discounts/views/VoucherDetails/VoucherDetails.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import DialogContentText from "@material-ui/core/DialogContentText"; +import { Button, DialogContentText } from "@material-ui/core"; import { useChannelsList } from "@saleor/channels/queries"; import { ChannelVoucherData, diff --git a/src/discounts/views/VoucherList/VoucherList.tsx b/src/discounts/views/VoucherList/VoucherList.tsx index 43d24dd40..1992b6e3d 100644 --- a/src/discounts/views/VoucherList/VoucherList.tsx +++ b/src/discounts/views/VoucherList/VoucherList.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; diff --git a/src/home/components/HomeActivityCard/HomeActivityCard.tsx b/src/home/components/HomeActivityCard/HomeActivityCard.tsx index ec0324622..aaba7fd66 100644 --- a/src/home/components/HomeActivityCard/HomeActivityCard.tsx +++ b/src/home/components/HomeActivityCard/HomeActivityCard.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import List from "@material-ui/core/List"; -import ListItem from "@material-ui/core/ListItem"; -import ListItemText from "@material-ui/core/ListItemText"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + List, + ListItem, + ListItemText, + Typography +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { DateTime } from "@saleor/components/Date"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/home/components/HomeAnalyticsCard/HomeAnalyticsCard.tsx b/src/home/components/HomeAnalyticsCard/HomeAnalyticsCard.tsx index 9ca3bbaf1..315acf725 100644 --- a/src/home/components/HomeAnalyticsCard/HomeAnalyticsCard.tsx +++ b/src/home/components/HomeAnalyticsCard/HomeAnalyticsCard.tsx @@ -1,7 +1,5 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent, Typography } from "@material-ui/core"; import { IconProps } from "@material-ui/core/Icon"; -import Typography from "@material-ui/core/Typography"; import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/home/components/HomeHeader/HomeHeader.tsx b/src/home/components/HomeHeader/HomeHeader.tsx index 9aeef7865..5f6b41a7e 100644 --- a/src/home/components/HomeHeader/HomeHeader.tsx +++ b/src/home/components/HomeHeader/HomeHeader.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import Skeleton from "@saleor/components/Skeleton"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx b/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx index 761586a9e..8cc93a5e2 100644 --- a/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx +++ b/src/home/components/HomeNotificationTable/HomeNotificationTable.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + TableBody, + TableCell, + TableRow, + Typography +} from "@material-ui/core"; import KeyboardArrowRight from "@material-ui/icons/KeyboardArrowRight"; import RequirePermissions from "@saleor/components/RequirePermissions"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/home/components/HomeProductListCard/HomeProductListCard.tsx b/src/home/components/HomeProductListCard/HomeProductListCard.tsx index 0e8197a5c..935520209 100644 --- a/src/home/components/HomeProductListCard/HomeProductListCard.tsx +++ b/src/home/components/HomeProductListCard/HomeProductListCard.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + TableBody, + TableCell, + TableRow, + Typography +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Money from "@saleor/components/Money"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/home/components/HomeScreen.tsx b/src/home/components/HomeScreen.tsx index 8035d9c14..d37e8009f 100644 --- a/src/home/components/HomeScreen.tsx +++ b/src/home/components/HomeScreen.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/hooks/useChannelsSearchWithLoadMore.ts b/src/hooks/useChannelsSearchWithLoadMore.ts index 9100415b1..5cd198988 100644 --- a/src/hooks/useChannelsSearchWithLoadMore.ts +++ b/src/hooks/useChannelsSearchWithLoadMore.ts @@ -1,7 +1,7 @@ import { useBaseChannelsList } from "@saleor/channels/queries"; -import chunk from "lodash-es/chunk"; -import compact from "lodash-es/compact"; -import concat from "lodash-es/concat"; +import chunk from "lodash/chunk"; +import compact from "lodash/compact"; +import concat from "lodash/concat"; import { useEffect, useState } from "react"; import { diff --git a/src/hooks/useElementScroll.ts b/src/hooks/useElementScroll.ts index fa4156ced..f9df93b45 100644 --- a/src/hooks/useElementScroll.ts +++ b/src/hooks/useElementScroll.ts @@ -1,4 +1,4 @@ -import throttle from "lodash-es/throttle"; +import throttle from "lodash/throttle"; import { MutableRefObject, useEffect, useState } from "react"; export type Position = Record<"x" | "y", number>; diff --git a/src/hooks/useForm.ts b/src/hooks/useForm.ts index 5fb19376d..6118a2e8a 100644 --- a/src/hooks/useForm.ts +++ b/src/hooks/useForm.ts @@ -1,5 +1,5 @@ import { toggle } from "@saleor/utils/lists"; -import isEqual from "lodash-es/isEqual"; +import isEqual from "lodash/isEqual"; import omit from "lodash/omit"; import React from "react"; import { useState } from "react"; diff --git a/src/hooks/useScroll.ts b/src/hooks/useScroll.ts index 6e871b8c2..b9521ed90 100644 --- a/src/hooks/useScroll.ts +++ b/src/hooks/useScroll.ts @@ -1,4 +1,4 @@ -import throttle from "lodash-es/throttle"; +import throttle from "lodash/throttle"; import { useEffect, useState } from "react"; function getPosition() { diff --git a/src/hooks/useStateFromProps.ts b/src/hooks/useStateFromProps.ts index b70bbb2a5..afcc18cc0 100644 --- a/src/hooks/useStateFromProps.ts +++ b/src/hooks/useStateFromProps.ts @@ -1,4 +1,4 @@ -import isEqual from "lodash-es/isEqual"; +import isEqual from "lodash/isEqual"; import { Dispatch, SetStateAction, useState } from "react"; export interface UseStateFromPropsOpts { diff --git a/src/hooks/useWindowScroll.ts b/src/hooks/useWindowScroll.ts index 5218d58c9..ccafe9e2e 100644 --- a/src/hooks/useWindowScroll.ts +++ b/src/hooks/useWindowScroll.ts @@ -1,4 +1,4 @@ -import throttle from "lodash-es/throttle"; +import throttle from "lodash/throttle"; import { useEffect, useState } from "react"; function getPosition() { diff --git a/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx b/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx index 200a9ed0b..08cae0086 100644 --- a/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx +++ b/src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx b/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx index 9d0a6ae06..f7c28f379 100644 --- a/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx +++ b/src/navigation/components/MenuDetailsPage/MenuDetailsPage.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import CardSpacer from "@saleor/components/CardSpacer"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx b/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx index 394c2ec46..4eaebcb67 100644 --- a/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx +++ b/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField, + Typography +} from "@material-ui/core"; import AutocompleteSelectMenu from "@saleor/components/AutocompleteSelectMenu"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/navigation/components/MenuItems/MenuItems.tsx b/src/navigation/components/MenuItems/MenuItems.tsx index 1f30790bd..f8793cc51 100644 --- a/src/navigation/components/MenuItems/MenuItems.tsx +++ b/src/navigation/components/MenuItems/MenuItems.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardActions from "@material-ui/core/CardActions"; -import IconButton from "@material-ui/core/IconButton"; -import Paper from "@material-ui/core/Paper"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardActions, + IconButton, + Paper, + Typography +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import EditIcon from "@material-ui/icons/Edit"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/navigation/components/MenuList/MenuList.tsx b/src/navigation/components/MenuList/MenuList.tsx index 158ec1472..6e14b18b1 100644 --- a/src/navigation/components/MenuList/MenuList.tsx +++ b/src/navigation/components/MenuList/MenuList.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { + Card, + TableBody, + TableCell, + TableFooter, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import Checkbox from "@saleor/components/Checkbox"; import IconButtonTableCell from "@saleor/components/IconButtonTableCell"; diff --git a/src/navigation/components/MenuListPage/MenuListPage.tsx b/src/navigation/components/MenuListPage/MenuListPage.tsx index 457424ca6..9f09a6d73 100644 --- a/src/navigation/components/MenuListPage/MenuListPage.tsx +++ b/src/navigation/components/MenuListPage/MenuListPage.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/navigation/components/MenuProperties/MenuProperties.tsx b/src/navigation/components/MenuProperties/MenuProperties.tsx index 8182a95b7..c30e97f55 100644 --- a/src/navigation/components/MenuProperties/MenuProperties.tsx +++ b/src/navigation/components/MenuProperties/MenuProperties.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { MenuErrorFragment } from "@saleor/fragments/types/MenuErrorFragment"; import { commonMessages } from "@saleor/intl"; diff --git a/src/navigation/views/MenuDetails/index.tsx b/src/navigation/views/MenuDetails/index.tsx index 8b69de55b..ddc319d76 100644 --- a/src/navigation/views/MenuDetails/index.tsx +++ b/src/navigation/views/MenuDetails/index.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config"; import useNavigator from "@saleor/hooks/useNavigator"; diff --git a/src/navigation/views/MenuList/MenuList.tsx b/src/navigation/views/MenuList/MenuList.tsx index 0974162d5..46165bffd 100644 --- a/src/navigation/views/MenuList/MenuList.tsx +++ b/src/navigation/views/MenuList/MenuList.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import DialogContentText from "@material-ui/core/DialogContentText"; +import { Button, DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { configurationMenuUrl } from "@saleor/configuration"; import useBulkActions from "@saleor/hooks/useBulkActions"; diff --git a/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx b/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx index 6f6e73ed9..d709aadea 100644 --- a/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx +++ b/src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle +} from "@material-ui/core"; import AddressEdit from "@saleor/components/AddressEdit"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.tsx b/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.tsx index dca9ac17a..e0f28f86d 100644 --- a/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.tsx +++ b/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx b/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx index 393c78591..52fbdbebc 100644 --- a/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx +++ b/src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/orders/components/OrderCannotCancelOrderDialog/OrderCannotCancelOrderDialog.tsx b/src/orders/components/OrderCannotCancelOrderDialog/OrderCannotCancelOrderDialog.tsx index 80dcb16d4..5f7401a05 100644 --- a/src/orders/components/OrderCannotCancelOrderDialog/OrderCannotCancelOrderDialog.tsx +++ b/src/orders/components/OrderCannotCancelOrderDialog/OrderCannotCancelOrderDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle +} from "@material-ui/core"; import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; import { DialogProps } from "@saleor/types"; diff --git a/src/orders/components/OrderCustomer/OrderCustomer.tsx b/src/orders/components/OrderCustomer/OrderCustomer.tsx index 55ee02ff8..0d0621ebf 100644 --- a/src/orders/components/OrderCustomer/OrderCustomer.tsx +++ b/src/orders/components/OrderCustomer/OrderCustomer.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ExternalLink from "@saleor/components/ExternalLink"; import Form from "@saleor/components/Form"; diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx index e81f4f747..1ca43f29a 100644 --- a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx +++ b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressEdit.tsx @@ -1,6 +1,4 @@ -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Radio from "@material-ui/core/Radio"; -import RadioGroup from "@material-ui/core/RadioGroup"; +import { FormControlLabel, Radio, RadioGroup } from "@material-ui/core"; import AddressEdit from "@saleor/components/AddressEdit"; import CardSpacer from "@saleor/components/CardSpacer"; import FormSpacer from "@saleor/components/FormSpacer"; diff --git a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx index fb4c7eddb..95425a12c 100644 --- a/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx +++ b/src/orders/components/OrderCustomerAddressesEditDialog/OrderCustomerAddressesEditDialog.tsx @@ -1,10 +1,12 @@ -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import Divider from "@material-ui/core/Divider"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Typography from "@material-ui/core/Typography"; +import { + Dialog, + DialogActions, + DialogContent, + DialogTitle, + Divider, + FormControlLabel, + Typography +} from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog.tsx b/src/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog.tsx index bbb830173..a1e957970 100644 --- a/src/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog.tsx +++ b/src/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog.tsx @@ -1,11 +1,13 @@ -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Radio from "@material-ui/core/Radio"; -import RadioGroup from "@material-ui/core/RadioGroup"; -import Typography from "@material-ui/core/Typography"; +import { + Dialog, + DialogActions, + DialogContent, + DialogTitle, + FormControlLabel, + Radio, + RadioGroup, + Typography +} from "@material-ui/core"; import ConfirmButton from "@saleor/components/ConfirmButton"; import FormSpacer from "@saleor/components/FormSpacer"; import { buttonMessages } from "@saleor/intl"; diff --git a/src/orders/components/OrderCustomerNote/OrderCustomerNote.tsx b/src/orders/components/OrderCustomerNote/OrderCustomerNote.tsx index f6a96cb52..23e4daa1f 100644 --- a/src/orders/components/OrderCustomerNote/OrderCustomerNote.tsx +++ b/src/orders/components/OrderCustomerNote/OrderCustomerNote.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Skeleton from "@saleor/components/Skeleton"; import React from "react"; diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index dd69e58a4..28b7b5539 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import CardMenu from "@saleor/components/CardMenu"; import { CardSpacer } from "@saleor/components/CardSpacer"; diff --git a/src/orders/components/OrderDiscountCommonModal/ModalTitle.tsx b/src/orders/components/OrderDiscountCommonModal/ModalTitle.tsx index cec6f6f6d..cffb80e05 100644 --- a/src/orders/components/OrderDiscountCommonModal/ModalTitle.tsx +++ b/src/orders/components/OrderDiscountCommonModal/ModalTitle.tsx @@ -1,5 +1,4 @@ -import Divider from "@material-ui/core/Divider"; -import Typography from "@material-ui/core/Typography"; +import { Divider, Typography } from "@material-ui/core"; import CloseIcon from "@material-ui/icons/Close"; import CardSpacer from "@saleor/components/CardSpacer"; import { makeStyles } from "@saleor/theme"; diff --git a/src/orders/components/OrderDiscountCommonModal/OrderDiscountCommonModal.tsx b/src/orders/components/OrderDiscountCommonModal/OrderDiscountCommonModal.tsx index c6c03ee7e..4cad81ba5 100644 --- a/src/orders/components/OrderDiscountCommonModal/OrderDiscountCommonModal.tsx +++ b/src/orders/components/OrderDiscountCommonModal/OrderDiscountCommonModal.tsx @@ -1,4 +1,3 @@ -/* eslint-disable sort-keys */ import { Card, CardContent, diff --git a/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx b/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx index 403d07f32..b8a63dd38 100644 --- a/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx +++ b/src/orders/components/OrderDraftCancelDialog/OrderDraftCancelDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import FormSpacer from "@saleor/components/FormSpacer"; diff --git a/src/orders/components/OrderDraftDetails/OrderDraftDetails.tsx b/src/orders/components/OrderDraftDetails/OrderDraftDetails.tsx index 4b9bcf5eb..65e40a50a 100644 --- a/src/orders/components/OrderDraftDetails/OrderDraftDetails.tsx +++ b/src/orders/components/OrderDraftDetails/OrderDraftDetails.tsx @@ -1,6 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Button, Card, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { OrderDiscountContext, diff --git a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx index 872e5ad68..6e7716bd0 100644 --- a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableHead, TableRow } from "@material-ui/core"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar/Avatar"; import { diff --git a/src/orders/components/OrderDraftDetailsProducts/TableLine.tsx b/src/orders/components/OrderDraftDetailsProducts/TableLine.tsx index 997466061..ce7230275 100644 --- a/src/orders/components/OrderDraftDetailsProducts/TableLine.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/TableLine.tsx @@ -1,7 +1,4 @@ -import IconButton from "@material-ui/core/IconButton"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { IconButton, TableCell, TableRow, Typography } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import Link from "@saleor/components/Link"; import Money from "@saleor/components/Money"; diff --git a/src/orders/components/OrderDraftDetailsProducts/TableLineForm.tsx b/src/orders/components/OrderDraftDetailsProducts/TableLineForm.tsx index 128b0d72e..568d65e95 100644 --- a/src/orders/components/OrderDraftDetailsProducts/TableLineForm.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/TableLineForm.tsx @@ -1,7 +1,8 @@ -import { makeStyles, TextField } from "@material-ui/core"; +import { TextField } from "@material-ui/core"; import DebounceForm from "@saleor/components/DebounceForm"; import Form from "@saleor/components/Form"; import { OrderDetails_order_lines } from "@saleor/orders/types/OrderDetails"; +import { makeStyles } from "@saleor/theme"; import createNonNegativeValueChangeHandler from "@saleor/utils/handlers/nonNegativeValueChangeHandler"; import React from "react"; diff --git a/src/orders/components/OrderDraftList/OrderDraftList.tsx b/src/orders/components/OrderDraftList/OrderDraftList.tsx index 515fedd8b..c5c09b184 100644 --- a/src/orders/components/OrderDraftList/OrderDraftList.tsx +++ b/src/orders/components/OrderDraftList/OrderDraftList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import { DateTime } from "@saleor/components/Date"; import Money from "@saleor/components/Money"; diff --git a/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx b/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx index 382bd5305..1fc5396e4 100644 --- a/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx +++ b/src/orders/components/OrderDraftListPage/OrderDraftListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import Container from "@saleor/components/Container"; import FilterBar from "@saleor/components/FilterBar"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/orders/components/OrderDraftPage/OrderDraftPage.tsx b/src/orders/components/OrderDraftPage/OrderDraftPage.tsx index b024e67e9..ec637ad3b 100644 --- a/src/orders/components/OrderDraftPage/OrderDraftPage.tsx +++ b/src/orders/components/OrderDraftPage/OrderDraftPage.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import CardMenu from "@saleor/components/CardMenu"; import CardSpacer from "@saleor/components/CardSpacer"; diff --git a/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx b/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx index 62837d078..36f724627 100644 --- a/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx +++ b/src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx @@ -1,11 +1,13 @@ -import Card from "@material-ui/core/Card"; -import CardActions from "@material-ui/core/CardActions"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardActions, + TableBody, + TableCell, + TableHead, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import { CSSProperties } from "@material-ui/styles"; import AppHeader from "@saleor/components/AppHeader"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx b/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx index 69813e9cc..2acbb9646 100644 --- a/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx +++ b/src/orders/components/OrderFulfilledProductsCard/ExtraInfoLines.tsx @@ -1,5 +1,6 @@ -import { makeStyles, TableCell, TableRow, Typography } from "@material-ui/core"; +import { TableCell, TableRow, Typography } from "@material-ui/core"; import { getStringOrPlaceholder } from "@saleor/misc"; +import { makeStyles } from "@saleor/theme"; import { FulfillmentStatus } from "@saleor/types/globalTypes"; import classNames from "classnames"; import React from "react"; diff --git a/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx b/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx index a6dbb746c..28c7d9c47 100644 --- a/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx +++ b/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; +import { Card, TableBody } from "@material-ui/core"; import CardMenu from "@saleor/components/CardMenu"; import CardSpacer from "@saleor/components/CardSpacer"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx b/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx index 5fc3c0dd2..a3acdc256 100644 --- a/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx +++ b/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx b/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx index 99a4a4202..79ec50072 100644 --- a/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx +++ b/src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx @@ -1,14 +1,16 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle, + TableBody, + TableCell, + TableHead, + TableRow, + TextField +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx index 93a119b2f..ad290fba7 100644 --- a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx +++ b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle, + TextField +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx b/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx index 2a0356685..400e36ac7 100644 --- a/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx +++ b/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx @@ -1,6 +1,7 @@ -import { makeStyles, Typography } from "@material-ui/core"; +import { Typography } from "@material-ui/core"; import Money from "@saleor/components/Money"; import { TimelineEvent } from "@saleor/components/Timeline"; +import { makeStyles } from "@saleor/theme"; import { OrderEventsEnum } from "@saleor/types/globalTypes"; import camelCase from "lodash/camelCase"; import React from "react"; diff --git a/src/orders/components/OrderHistory/OrderHistory.tsx b/src/orders/components/OrderHistory/OrderHistory.tsx index 2a9e14984..2c7039bf8 100644 --- a/src/orders/components/OrderHistory/OrderHistory.tsx +++ b/src/orders/components/OrderHistory/OrderHistory.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import Form from "@saleor/components/Form"; import Hr from "@saleor/components/Hr"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx b/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx index 639c79e94..188dbd688 100644 --- a/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx +++ b/src/orders/components/OrderInvoiceEmailSendDialog/OrderInvoiceEmailSendDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx index c9f18c254..8c1f4d722 100644 --- a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx +++ b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + TableBody, + TableCell, + TableRow, + Typography +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Date from "@saleor/components/Date"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/orders/components/OrderList/OrderList.tsx b/src/orders/components/OrderList/OrderList.tsx index 193c27a71..aa6ccaa25 100644 --- a/src/orders/components/OrderList/OrderList.tsx +++ b/src/orders/components/OrderList/OrderList.tsx @@ -1,8 +1,10 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + TableBody, + TableCell, + TableFooter, + TableHead, + TableRow +} from "@material-ui/core"; import { CSSProperties } from "@material-ui/styles"; import { DateTime } from "@saleor/components/Date"; import Money from "@saleor/components/Money"; diff --git a/src/orders/components/OrderListPage/OrderListPage.tsx b/src/orders/components/OrderListPage/OrderListPage.tsx index b4e642234..e96272dca 100644 --- a/src/orders/components/OrderListPage/OrderListPage.tsx +++ b/src/orders/components/OrderListPage/OrderListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import Alert from "@saleor/components/Alert/Alert"; import CardMenu from "@saleor/components/CardMenu"; import Container from "@saleor/components/Container"; diff --git a/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx b/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx index c9ae2f1c4..33aaa28d0 100644 --- a/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx +++ b/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import TextField from "@material-ui/core/TextField"; +import { DialogContentText, TextField } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import FormSpacer from "@saleor/components/FormSpacer"; diff --git a/src/orders/components/OrderPayment/OrderPayment.tsx b/src/orders/components/OrderPayment/OrderPayment.tsx index b03383247..67866df8f 100644 --- a/src/orders/components/OrderPayment/OrderPayment.tsx +++ b/src/orders/components/OrderPayment/OrderPayment.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardActions from "@material-ui/core/CardActions"; -import CardContent from "@material-ui/core/CardContent"; +import { Button, Card, CardActions, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { Hr } from "@saleor/components/Hr"; import Money, { subtractMoney } from "@saleor/components/Money"; diff --git a/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx b/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx index 1c9638095..b5637afb4 100644 --- a/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx +++ b/src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle, + TextField +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx b/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx index eed639a95..e852d4d27 100644 --- a/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx +++ b/src/orders/components/OrderPaymentVoidDialog/OrderPaymentVoidDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx index 75f2b9188..da78da99e 100644 --- a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx +++ b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx @@ -1,14 +1,16 @@ -import Button from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + CircularProgress, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle, + TableBody, + TableCell, + TableRow, + TextField +} from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/orders/components/OrderProductsCardElements/OrderProductsCardHeader.tsx b/src/orders/components/OrderProductsCardElements/OrderProductsCardHeader.tsx index 2dc8e7f39..acf09dcd3 100644 --- a/src/orders/components/OrderProductsCardElements/OrderProductsCardHeader.tsx +++ b/src/orders/components/OrderProductsCardElements/OrderProductsCardHeader.tsx @@ -1,4 +1,5 @@ -import { makeStyles, TableCell, TableHead, TableRow } from "@material-ui/core"; +import { TableCell, TableHead, TableRow } from "@material-ui/core"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/components/OrderProductsCardElements/OrderProductsTableRow.tsx b/src/orders/components/OrderProductsCardElements/OrderProductsTableRow.tsx index 4075d3348..864bb0f66 100644 --- a/src/orders/components/OrderProductsCardElements/OrderProductsTableRow.tsx +++ b/src/orders/components/OrderProductsCardElements/OrderProductsTableRow.tsx @@ -1,4 +1,4 @@ -import { makeStyles, TableCell, TableRow } from "@material-ui/core"; +import { TableCell, TableRow } from "@material-ui/core"; import Money from "@saleor/components/Money"; import Skeleton from "@saleor/components/Skeleton"; import TableCellAvatar from "@saleor/components/TableCellAvatar"; @@ -8,6 +8,7 @@ import { OrderDetails_order_fulfillments_lines, OrderDetails_order_lines } from "@saleor/orders/types/OrderDetails"; +import { makeStyles } from "@saleor/theme"; import React from "react"; const useStyles = makeStyles( diff --git a/src/orders/components/OrderRefund/OrderRefund.tsx b/src/orders/components/OrderRefund/OrderRefund.tsx index 48b89657b..aad8fbc74 100644 --- a/src/orders/components/OrderRefund/OrderRefund.tsx +++ b/src/orders/components/OrderRefund/OrderRefund.tsx @@ -1,8 +1,7 @@ -import { makeStyles } from "@material-ui/core"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import RadioGroupField from "@saleor/components/RadioGroupField"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx b/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx index 4d8279826..c8c7d816b 100644 --- a/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx +++ b/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx @@ -1,14 +1,15 @@ -import { makeStyles } from "@material-ui/core"; -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Table from "@material-ui/core/Table"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + Table, + TableBody, + TableCell, + TableHead, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Money from "@saleor/components/Money"; import Skeleton from "@saleor/components/Skeleton"; @@ -16,6 +17,7 @@ import TableCellAvatar from "@saleor/components/TableCellAvatar"; import { FormsetChange } from "@saleor/hooks/useFormset"; import { renderCollection } from "@saleor/misc"; import { OrderRefundData_order_fulfillments } from "@saleor/orders/types/OrderRefundData"; +import { makeStyles } from "@saleor/theme"; import { FulfillmentStatus } from "@saleor/types/globalTypes"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx index 7c0404c15..57e7e04b5 100644 --- a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx +++ b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmount.tsx @@ -1,10 +1,12 @@ -import { makeStyles, RadioGroup } from "@material-ui/core"; -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Radio from "@material-ui/core/Radio"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + FormControlLabel, + Radio, + RadioGroup, + Typography +} from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; @@ -12,6 +14,7 @@ import Hr from "@saleor/components/Hr"; import { OrderErrorFragment } from "@saleor/fragments/types/OrderErrorFragment"; import { OrderDetails_order } from "@saleor/orders/types/OrderDetails"; import { OrderRefundData_order } from "@saleor/orders/types/OrderRefundData"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmountValues.tsx b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmountValues.tsx index 97b76a08f..ee4cf0467 100644 --- a/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmountValues.tsx +++ b/src/orders/components/OrderRefundReturnAmount/OrderRefundReturnAmountValues.tsx @@ -1,8 +1,8 @@ -import { makeStyles } from "@material-ui/core"; import Money, { IMoney } from "@saleor/components/Money"; import Skeleton from "@saleor/components/Skeleton"; +import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; -import { reduce } from "lodash"; +import reduce from "lodash/reduce"; import React from "react"; import { useIntl } from "react-intl"; import { defineMessages } from "react-intl"; diff --git a/src/orders/components/OrderRefundReturnAmount/RefundAmountInput.tsx b/src/orders/components/OrderRefundReturnAmount/RefundAmountInput.tsx index 9dfe9e450..b2b50ec14 100644 --- a/src/orders/components/OrderRefundReturnAmount/RefundAmountInput.tsx +++ b/src/orders/components/OrderRefundReturnAmount/RefundAmountInput.tsx @@ -1,7 +1,7 @@ -import { makeStyles } from "@material-ui/core"; import { IMoney } from "@saleor/components/Money"; import PriceField from "@saleor/components/PriceField"; import { OrderErrorFragment } from "@saleor/fragments/types/OrderErrorFragment"; +import { makeStyles } from "@saleor/theme"; import { getFormErrors } from "@saleor/utils/errors"; import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; diff --git a/src/orders/components/OrderRefundUnfulfilledProducts/OrderRefundUnfulfilledProducts.tsx b/src/orders/components/OrderRefundUnfulfilledProducts/OrderRefundUnfulfilledProducts.tsx index 67a7db7e4..8159e2047 100644 --- a/src/orders/components/OrderRefundUnfulfilledProducts/OrderRefundUnfulfilledProducts.tsx +++ b/src/orders/components/OrderRefundUnfulfilledProducts/OrderRefundUnfulfilledProducts.tsx @@ -1,14 +1,15 @@ -import { makeStyles } from "@material-ui/core"; -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Table from "@material-ui/core/Table"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + Table, + TableBody, + TableCell, + TableHead, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Money from "@saleor/components/Money"; import Skeleton from "@saleor/components/Skeleton"; @@ -16,6 +17,7 @@ import TableCellAvatar from "@saleor/components/TableCellAvatar"; import { FormsetChange } from "@saleor/hooks/useFormset"; import { renderCollection } from "@saleor/misc"; import { OrderRefundData_order_lines } from "@saleor/orders/types/OrderRefundData"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/CardTitle.tsx b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/CardTitle.tsx index 0b3942b47..ac2dc77f8 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/CardTitle.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/CardTitle.tsx @@ -1,7 +1,8 @@ -import { makeStyles, Typography } from "@material-ui/core"; +import { Typography } from "@material-ui/core"; import DefaultCardTitle from "@saleor/components/CardTitle"; import { StatusType } from "@saleor/components/StatusChip/types"; import StatusLabel from "@saleor/components/StatusLabel"; +import { makeStyles } from "@saleor/theme"; import { FulfillmentStatus } from "@saleor/types/globalTypes"; import camelCase from "lodash/camelCase"; import React from "react"; diff --git a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/MaximalButton.tsx b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/MaximalButton.tsx index 9fd5b1a57..02d196361 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/MaximalButton.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/MaximalButton.tsx @@ -1,4 +1,5 @@ -import { Button, makeStyles } from "@material-ui/core"; +import { Button } from "@material-ui/core"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ProductErrorCell.tsx b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ProductErrorCell.tsx index a66d319ef..37855dbf5 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ProductErrorCell.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ProductErrorCell.tsx @@ -1,6 +1,4 @@ -import Popper from "@material-ui/core/Popper"; -import TableCell from "@material-ui/core/TableCell"; -import Typography from "@material-ui/core/Typography"; +import { Popper, TableCell, Typography } from "@material-ui/core"; import ErrorExclamationCircleIcon from "@saleor/icons/ErrorExclamationCircle"; import { makeStyles } from "@saleor/theme"; import React, { useState } from "react"; diff --git a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ReturnItemsCard.tsx b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ReturnItemsCard.tsx index ac13c0cc8..a0e40cc5e 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ReturnItemsCard.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnRefundItemsCard/ReturnItemsCard.tsx @@ -2,7 +2,6 @@ import { Card, CardContent, Checkbox, - makeStyles, Table, TableBody, TableCell, @@ -20,6 +19,7 @@ import { OrderDetails_order, OrderDetails_order_lines } from "@saleor/orders/types/OrderDetails"; +import { makeStyles } from "@saleor/theme"; import React, { CSSProperties } from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; diff --git a/src/orders/components/OrderSettings/OrderSettings.tsx b/src/orders/components/OrderSettings/OrderSettings.tsx index 6c1ebe1f2..fc17ade6e 100644 --- a/src/orders/components/OrderSettings/OrderSettings.tsx +++ b/src/orders/components/OrderSettings/OrderSettings.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import React from "react"; diff --git a/src/orders/components/OrderSettingsPage/OrderSettingsPage.tsx b/src/orders/components/OrderSettingsPage/OrderSettingsPage.tsx index 577a1d150..f8e34d478 100644 --- a/src/orders/components/OrderSettingsPage/OrderSettingsPage.tsx +++ b/src/orders/components/OrderSettingsPage/OrderSettingsPage.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import Container from "@saleor/components/Container"; diff --git a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx index 15fd09703..7713527ff 100644 --- a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx +++ b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx b/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx index 0a7697bfa..aad536452 100644 --- a/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx +++ b/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx @@ -1,10 +1,8 @@ -import { makeStyles, TableBody } from "@material-ui/core"; -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardActions from "@material-ui/core/CardActions"; +import { Button, Card, CardActions, TableBody } from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import { renderCollection } from "@saleor/misc"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; diff --git a/src/orders/views/OrderDraftList/OrderDraftList.tsx b/src/orders/views/OrderDraftList/OrderDraftList.tsx index c42118585..e021fdb5e 100644 --- a/src/orders/views/OrderDraftList/OrderDraftList.tsx +++ b/src/orders/views/OrderDraftList/OrderDraftList.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ChannelPickerDialog from "@saleor/channels/components/ChannelPickerDialog"; import ActionDialog from "@saleor/components/ActionDialog"; diff --git a/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx b/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx index 31ec3b183..5009eb254 100644 --- a/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx +++ b/src/pageTypes/components/PageTypeAttributes/PageTypeAttributes.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableCell, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/pageTypes/components/PageTypeBulkDeleteDialog/PageTypeBulkDeleteDialog.tsx b/src/pageTypes/components/PageTypeBulkDeleteDialog/PageTypeBulkDeleteDialog.tsx index 34635bae0..d52edc5bb 100644 --- a/src/pageTypes/components/PageTypeBulkDeleteDialog/PageTypeBulkDeleteDialog.tsx +++ b/src/pageTypes/components/PageTypeBulkDeleteDialog/PageTypeBulkDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.stories.tsx b/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.stories.tsx index 528b63c21..71fda9d22 100644 --- a/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.stories.tsx +++ b/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.stories.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { PageErrorCode } from "@saleor/types/globalTypes"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.tsx b/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.tsx index 3b3f7b2a7..731df2a8e 100644 --- a/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.tsx +++ b/src/pageTypes/components/PageTypeCreatePage/PageTypeCreatePage.tsx @@ -1,5 +1,4 @@ -import { makeStyles } from "@material-ui/core"; -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import Container from "@saleor/components/Container"; @@ -11,6 +10,7 @@ import PageHeader from "@saleor/components/PageHeader"; import SaveButtonBar from "@saleor/components/SaveButtonBar"; import { PageErrorFragment } from "@saleor/fragments/types/PageErrorFragment"; import { commonMessages, sectionNames } from "@saleor/intl"; +import { makeStyles } from "@saleor/theme"; import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/pageTypes/components/PageTypeDetails/PageTypeDetails.tsx b/src/pageTypes/components/PageTypeDetails/PageTypeDetails.tsx index b1a6bc32c..1041c94a6 100644 --- a/src/pageTypes/components/PageTypeDetails/PageTypeDetails.tsx +++ b/src/pageTypes/components/PageTypeDetails/PageTypeDetails.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { PageErrorFragment } from "@saleor/fragments/types/PageErrorFragment"; import { commonMessages } from "@saleor/intl"; diff --git a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.stories.tsx b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.stories.tsx index 828c4d38f..4d415c3c1 100644 --- a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.stories.tsx +++ b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.stories.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { listActionsProps } from "@saleor/fixtures"; import { PageErrorCode } from "@saleor/types/globalTypes"; import { storiesOf } from "@storybook/react"; diff --git a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx index 33cc2723b..c63135460 100644 --- a/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx +++ b/src/pageTypes/components/PageTypeDetailsPage/PageTypeDetailsPage.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import Container from "@saleor/components/Container"; diff --git a/src/pageTypes/components/PageTypeList/PageTypeList.tsx b/src/pageTypes/components/PageTypeList/PageTypeList.tsx index bd84226d1..f8c560751 100644 --- a/src/pageTypes/components/PageTypeList/PageTypeList.tsx +++ b/src/pageTypes/components/PageTypeList/PageTypeList.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/pageTypes/components/PageTypeListPage/PageTypeListPage.tsx b/src/pageTypes/components/PageTypeListPage/PageTypeListPage.tsx index 9d7260f40..029c08656 100644 --- a/src/pageTypes/components/PageTypeListPage/PageTypeListPage.tsx +++ b/src/pageTypes/components/PageTypeListPage/PageTypeListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/pageTypes/views/PageTypeDetails.tsx b/src/pageTypes/views/PageTypeDetails.tsx index e47afb6d8..53ed9928e 100644 --- a/src/pageTypes/views/PageTypeDetails.tsx +++ b/src/pageTypes/views/PageTypeDetails.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { attributeUrl } from "@saleor/attributes/urls"; import AssignAttributeDialog from "@saleor/components/AssignAttributeDialog"; import AttributeUnassignDialog from "@saleor/components/AttributeUnassignDialog"; diff --git a/src/pageTypes/views/PageTypeList/PageTypeList.tsx b/src/pageTypes/views/PageTypeList/PageTypeList.tsx index 0736d854d..c5223b072 100644 --- a/src/pageTypes/views/PageTypeList/PageTypeList.tsx +++ b/src/pageTypes/views/PageTypeList/PageTypeList.tsx @@ -1,4 +1,4 @@ -import IconButton from "@material-ui/core/IconButton"; +import { IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { diff --git a/src/pages/components/PageInfo/PageInfo.tsx b/src/pages/components/PageInfo/PageInfo.tsx index 36e2027d6..c298f513e 100644 --- a/src/pages/components/PageInfo/PageInfo.tsx +++ b/src/pages/components/PageInfo/PageInfo.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; import RichTextEditor, { diff --git a/src/pages/components/PageList/PageList.tsx b/src/pages/components/PageList/PageList.tsx index 394eace59..7510e032d 100644 --- a/src/pages/components/PageList/PageList.tsx +++ b/src/pages/components/PageList/PageList.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { + Card, + TableBody, + TableCell, + TableFooter, + TableRow +} from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/pages/components/PageListPage/PageListPage.tsx b/src/pages/components/PageListPage/PageListPage.tsx index aaf488cc7..4a1b519cb 100644 --- a/src/pages/components/PageListPage/PageListPage.tsx +++ b/src/pages/components/PageListPage/PageListPage.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/pages/components/PageOrganizeContent/PageOrganizeContent.tsx b/src/pages/components/PageOrganizeContent/PageOrganizeContent.tsx index 868ea4958..6d35bfb28 100644 --- a/src/pages/components/PageOrganizeContent/PageOrganizeContent.tsx +++ b/src/pages/components/PageOrganizeContent/PageOrganizeContent.tsx @@ -1,12 +1,10 @@ -import { makeStyles } from "@material-ui/core"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; import { PageErrorFragment } from "@saleor/fragments/types/PageErrorFragment"; import { PageTypeFragment } from "@saleor/fragments/types/PageTypeFragment"; import { FormChange } from "@saleor/hooks/useForm"; +import { makeStyles } from "@saleor/theme"; import { FetchMoreProps } from "@saleor/types"; import { getFormErrors } from "@saleor/utils/errors"; import getPageErrorMessage from "@saleor/utils/errors/page"; diff --git a/src/pages/views/PageDetails.tsx b/src/pages/views/PageDetails.tsx index 93dcc58a7..14249e8fb 100644 --- a/src/pages/views/PageDetails.tsx +++ b/src/pages/views/PageDetails.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import { useAttributeValueDeleteMutation } from "@saleor/attributes/mutations"; import { getAttributesAfterFileAttributesUpdate, diff --git a/src/pages/views/PageList/PageList.tsx b/src/pages/views/PageList/PageList.tsx index 8d876ae4b..214c25eb1 100644 --- a/src/pages/views/PageList/PageList.tsx +++ b/src/pages/views/PageList/PageList.tsx @@ -1,6 +1,4 @@ -import Button from "@material-ui/core/Button"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { Button, DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import { configurationMenuUrl } from "@saleor/configuration"; diff --git a/src/permissionGroups/components/AssignMembersDialog/AssignMembersDialog.tsx b/src/permissionGroups/components/AssignMembersDialog/AssignMembersDialog.tsx index 9d05956d5..da74a4cdf 100644 --- a/src/permissionGroups/components/AssignMembersDialog/AssignMembersDialog.tsx +++ b/src/permissionGroups/components/AssignMembersDialog/AssignMembersDialog.tsx @@ -1,14 +1,17 @@ -import { Checkbox, Typography } from "@material-ui/core"; -import Button from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Checkbox, + CircularProgress, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TableBody, + TableCell, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx b/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx index 496f637ae..10e688c1c 100644 --- a/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx +++ b/src/permissionGroups/components/MembersErrorDialog/MembersErrorDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/permissionGroups/components/PermissionGroupDeleteDialog/PermissionGroupDeleteDialog.tsx b/src/permissionGroups/components/PermissionGroupDeleteDialog/PermissionGroupDeleteDialog.tsx index a1193db15..1325b665e 100644 --- a/src/permissionGroups/components/PermissionGroupDeleteDialog/PermissionGroupDeleteDialog.tsx +++ b/src/permissionGroups/components/PermissionGroupDeleteDialog/PermissionGroupDeleteDialog.tsx @@ -1,5 +1,4 @@ -import { Typography } from "@material-ui/core"; -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText, Typography } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { PermissionGroupErrorFragment } from "@saleor/fragments/types/PermissionGroupErrorFragment"; diff --git a/src/permissionGroups/components/PermissionGroupInfo/PermissionGroupInfo.tsx b/src/permissionGroups/components/PermissionGroupInfo/PermissionGroupInfo.tsx index ec64abc6f..ef773d435 100644 --- a/src/permissionGroups/components/PermissionGroupInfo/PermissionGroupInfo.tsx +++ b/src/permissionGroups/components/PermissionGroupInfo/PermissionGroupInfo.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { PermissionGroupErrorFragment } from "@saleor/fragments/types/PermissionGroupErrorFragment"; import { FormChange } from "@saleor/hooks/useForm"; diff --git a/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx b/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx index 33b544545..672f5e3a2 100644 --- a/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx +++ b/src/permissionGroups/components/PermissionGroupList/PermissionGroupList.tsx @@ -1,9 +1,11 @@ -import { TableHead } from "@material-ui/core"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { + IconButton, + TableBody, + TableCell, + TableFooter, + TableHead, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import EditIcon from "@material-ui/icons/Edit"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx b/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx index e022a7e83..844a8d59d 100644 --- a/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx +++ b/src/permissionGroups/components/PermissionGroupListPage/PermissionGroupListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx b/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx index f4bdfcca5..cfcba8787 100644 --- a/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx +++ b/src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx @@ -1,9 +1,12 @@ -import { Button, IconButton } from "@material-ui/core"; -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableRow, + Typography +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/permissionGroups/components/UnassignMembersDialog/UnassignMembersDialog.tsx b/src/permissionGroups/components/UnassignMembersDialog/UnassignMembersDialog.tsx index 568c77bab..44a61b98d 100644 --- a/src/permissionGroups/components/UnassignMembersDialog/UnassignMembersDialog.tsx +++ b/src/permissionGroups/components/UnassignMembersDialog/UnassignMembersDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/permissionGroups/utils.ts b/src/permissionGroups/utils.ts index b924f1cd9..ce80d54b0 100644 --- a/src/permissionGroups/utils.ts +++ b/src/permissionGroups/utils.ts @@ -1,6 +1,6 @@ import { ShopInfo_shop_permissions } from "@saleor/components/Shop/types/ShopInfo"; import { User } from "@saleor/fragments/types/User"; -import difference from "lodash-es/difference"; +import difference from "lodash/difference"; import { PermissionGroupDetailsPageFormData } from "./components/PermissionGroupDetailsPage"; import { PermissionGroupDetails_permissionGroup } from "./types/PermissionGroupDetails"; diff --git a/src/plugins/components/PluginAuthorization/PluginAuthorization.tsx b/src/plugins/components/PluginAuthorization/PluginAuthorization.tsx index 912006049..d99e4cb85 100644 --- a/src/plugins/components/PluginAuthorization/PluginAuthorization.tsx +++ b/src/plugins/components/PluginAuthorization/PluginAuthorization.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Hr from "@saleor/components/Hr"; import { PluginConfigurationFragment_configuration } from "@saleor/fragments/types/PluginConfigurationFragment"; diff --git a/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCardContent.tsx b/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCardContent.tsx index 2fa9877dd..ce97b3230 100644 --- a/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCardContent.tsx +++ b/src/plugins/components/PluginDetailsChannelsCard/PluginDetailsChannelsCardContent.tsx @@ -1,8 +1,8 @@ -import { CardContent, makeStyles, Typography } from "@material-ui/core"; import CollectionWithDividers from "@saleor/components/CollectionWithDividers"; import Skeleton from "@saleor/components/Skeleton"; import { Plugin_plugin } from "@saleor/plugins/types/Plugin"; import { isPluginGlobal } from "@saleor/plugins/views/utils"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { FormattedMessage } from "react-intl"; @@ -29,6 +29,8 @@ export interface PluginDetailsChannelsCardProps { plugin: Plugin_plugin; } +import { CardContent, Typography } from "@material-ui/core"; + import { pluginDetailsChannelsCardMessages as messages } from "./messages"; const PluginDetailsChannelsCardContent: React.FC = ({ diff --git a/src/plugins/components/PluginInfo/PluginInfo.tsx b/src/plugins/components/PluginInfo/PluginInfo.tsx index 69586164a..ef4ba04b7 100644 --- a/src/plugins/components/PluginInfo/PluginInfo.tsx +++ b/src/plugins/components/PluginInfo/PluginInfo.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import FormSpacer from "@saleor/components/FormSpacer"; diff --git a/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx b/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx index 30fd08383..f0ef5d2e4 100644 --- a/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx +++ b/src/plugins/components/PluginSecretFieldDialog/PluginSecretFieldDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/plugins/components/PluginSettings/PluginSettings.tsx b/src/plugins/components/PluginSettings/PluginSettings.tsx index ef2a903bd..46ddefda8 100644 --- a/src/plugins/components/PluginSettings/PluginSettings.tsx +++ b/src/plugins/components/PluginSettings/PluginSettings.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Tooltip from "@material-ui/core/Tooltip"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + TextField, + Tooltip, + Typography +} from "@material-ui/core"; import InfoIcon from "@material-ui/icons/Info"; import CardTitle from "@saleor/components/CardTitle"; import ControlledSwitch from "@saleor/components/ControlledSwitch"; diff --git a/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/PluginAvailabilityStatusPopup.tsx b/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/PluginAvailabilityStatusPopup.tsx index 185b3eff4..e91fdfa6d 100644 --- a/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/PluginAvailabilityStatusPopup.tsx +++ b/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/PluginAvailabilityStatusPopup.tsx @@ -1,6 +1,7 @@ -import { Card, makeStyles, Popper } from "@material-ui/core"; +import { Card, Popper } from "@material-ui/core"; import { Plugin_plugin } from "@saleor/plugins/types/Plugin"; import { isPluginGlobal } from "@saleor/plugins/views/utils"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import ChannelConfigPluginPopupBody from "./ChannelConfigPluginPopupBody"; diff --git a/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/ScrollableContent.tsx b/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/ScrollableContent.tsx index ec7968ec3..33e48c47d 100644 --- a/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/ScrollableContent.tsx +++ b/src/plugins/components/PluginsList/PluginAvailabilityStatusPopup/ScrollableContent.tsx @@ -1,4 +1,4 @@ -import List from "@material-ui/core/List"; +import { List } from "@material-ui/core"; import { makeStyles } from "@saleor/theme"; import React from "react"; diff --git a/src/plugins/components/PluginsList/PluginsList.tsx b/src/plugins/components/PluginsList/PluginsList.tsx index 8bea96534..e07985cd4 100644 --- a/src/plugins/components/PluginsList/PluginsList.tsx +++ b/src/plugins/components/PluginsList/PluginsList.tsx @@ -1,14 +1,11 @@ -import { makeStyles } from "@material-ui/core"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableFooter, TableRow } from "@material-ui/core"; import EditIcon from "@material-ui/icons/Edit"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TablePagination from "@saleor/components/TablePagination"; import { renderCollection } from "@saleor/misc"; import { PluginListUrlSortField } from "@saleor/plugins/urls"; +import { makeStyles } from "@saleor/theme"; import { ListProps, SortPage } from "@saleor/types"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/plugins/components/PluginsListPage/PluginsListPage.tsx b/src/plugins/components/PluginsListPage/PluginsListPage.tsx index 5fec3ef02..ecd1d01d2 100644 --- a/src/plugins/components/PluginsListPage/PluginsListPage.tsx +++ b/src/plugins/components/PluginsListPage/PluginsListPage.tsx @@ -1,4 +1,4 @@ -import Card from "@material-ui/core/Card"; +import { Card } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; import FilterBar from "@saleor/components/FilterBar"; diff --git a/src/plugins/views/PluginsDetails.tsx b/src/plugins/views/PluginsDetails.tsx index a2534ec74..89b92c692 100644 --- a/src/plugins/views/PluginsDetails.tsx +++ b/src/plugins/views/PluginsDetails.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { WindowTitle } from "@saleor/components/WindowTitle"; import { PluginConfigurationFragment_configuration } from "@saleor/fragments/types/PluginConfigurationFragment"; diff --git a/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx b/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx index 311c40a85..6c4ea54e2 100644 --- a/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx +++ b/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableCell, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/productTypes/components/ProductTypeDetails/ProductTypeDetails.tsx b/src/productTypes/components/ProductTypeDetails/ProductTypeDetails.tsx index fdc6c8dee..383f3de9c 100644 --- a/src/productTypes/components/ProductTypeDetails/ProductTypeDetails.tsx +++ b/src/productTypes/components/ProductTypeDetails/ProductTypeDetails.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { commonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; diff --git a/src/productTypes/components/ProductTypeList/ProductTypeList.tsx b/src/productTypes/components/ProductTypeList/ProductTypeList.tsx index d79b203cb..062bf89a4 100644 --- a/src/productTypes/components/ProductTypeList/ProductTypeList.tsx +++ b/src/productTypes/components/ProductTypeList/ProductTypeList.tsx @@ -1,8 +1,10 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + TableBody, + TableCell, + TableFooter, + TableRow, + Typography +} from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.tsx b/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.tsx index 495dafe05..2ff2194d0 100644 --- a/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.tsx +++ b/src/productTypes/components/ProductTypeListPage/ProductTypeListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; import FilterBar from "@saleor/components/FilterBar"; diff --git a/src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx b/src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx index 4d054524b..732ee1963 100644 --- a/src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx +++ b/src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox"; import React from "react"; diff --git a/src/productTypes/components/ProductTypeTaxes/ProductTypeTaxes.tsx b/src/productTypes/components/ProductTypeTaxes/ProductTypeTaxes.tsx index 22e888b8b..3f0b4e3ee 100644 --- a/src/productTypes/components/ProductTypeTaxes/ProductTypeTaxes.tsx +++ b/src/productTypes/components/ProductTypeTaxes/ProductTypeTaxes.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import SingleAutocompleteSelectField from "@saleor/components/SingleAutocompleteSelectField"; import { ProductTypeDetails_taxTypes } from "@saleor/productTypes/types/ProductTypeDetails"; diff --git a/src/productTypes/views/ProductTypeList/ProductTypeList.tsx b/src/productTypes/views/ProductTypeList/ProductTypeList.tsx index 57017b806..963b89e26 100644 --- a/src/productTypes/views/ProductTypeList/ProductTypeList.tsx +++ b/src/productTypes/views/ProductTypeList/ProductTypeList.tsx @@ -1,4 +1,4 @@ -import IconButton from "@material-ui/core/IconButton"; +import { IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog"; import SaveFilterTabDialog, { diff --git a/src/productTypes/views/ProductTypeUpdate/index.tsx b/src/productTypes/views/ProductTypeUpdate/index.tsx index 2994f6fe8..bcbce53ba 100644 --- a/src/productTypes/views/ProductTypeUpdate/index.tsx +++ b/src/productTypes/views/ProductTypeUpdate/index.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { attributeUrl } from "@saleor/attributes/urls"; import AssignAttributeDialog from "@saleor/components/AssignAttributeDialog"; import AttributeUnassignDialog from "@saleor/components/AttributeUnassignDialog"; diff --git a/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.tsx b/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.tsx index 03a0b30cb..9e5147796 100644 --- a/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.tsx +++ b/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import FormSpacer from "@saleor/components/FormSpacer"; import MultiSelectField from "@saleor/components/MultiSelectField"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/products/components/ProductDetailsForm/ProductDetailsForm.tsx b/src/products/components/ProductDetailsForm/ProductDetailsForm.tsx index 5b6af5fe8..e5afd12f0 100644 --- a/src/products/components/ProductDetailsForm/ProductDetailsForm.tsx +++ b/src/products/components/ProductDetailsForm/ProductDetailsForm.tsx @@ -1,7 +1,5 @@ import { OutputData } from "@editorjs/editorjs"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; import Grid from "@saleor/components/Grid"; diff --git a/src/products/components/ProductExportDialog/ProductExportDialog.tsx b/src/products/components/ProductExportDialog/ProductExportDialog.tsx index 16d608598..978c67ae9 100644 --- a/src/products/components/ProductExportDialog/ProductExportDialog.tsx +++ b/src/products/components/ProductExportDialog/ProductExportDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + Typography +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx b/src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx index e751010f8..7b152c8e9 100644 --- a/src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx +++ b/src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + CircularProgress, + FormControlLabel, + TextField, + Typography +} from "@material-ui/core"; import Accordion, { AccordionProps } from "@saleor/components/Accordion"; import { useChannelsSearch } from "@saleor/components/ChannelsAvailabilityDialog/utils"; import ChannelsAvailabilityDialogChannelsList from "@saleor/components/ChannelsAvailabilityDialogChannelsList"; diff --git a/src/products/components/ProductExternalMediaDialog/ProductExternalMediaDialog.tsx b/src/products/components/ProductExternalMediaDialog/ProductExternalMediaDialog.tsx index 68b29c96f..9da81b0f4 100644 --- a/src/products/components/ProductExternalMediaDialog/ProductExternalMediaDialog.tsx +++ b/src/products/components/ProductExternalMediaDialog/ProductExternalMediaDialog.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField, + Typography +} from "@material-ui/core"; import Form from "@saleor/components/Form"; import FormSpacer from "@saleor/components/FormSpacer"; import { buttonMessages } from "@saleor/intl"; diff --git a/src/products/components/ProductList/ProductList.tsx b/src/products/components/ProductList/ProductList.tsx index 7c1fc9d58..4e0aa9ab2 100644 --- a/src/products/components/ProductList/ProductList.tsx +++ b/src/products/components/ProductList/ProductList.tsx @@ -1,8 +1,10 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + TableBody, + TableCell, + TableFooter, + TableRow, + Typography +} from "@material-ui/core"; import { ChannelsAvailabilityDropdown } from "@saleor/components/ChannelsAvailabilityDropdown"; import Checkbox from "@saleor/components/Checkbox"; import MoneyRange from "@saleor/components/MoneyRange"; diff --git a/src/products/components/ProductListPage/ProductListPage.tsx b/src/products/components/ProductListPage/ProductListPage.tsx index ad6193847..4d1487075 100644 --- a/src/products/components/ProductListPage/ProductListPage.tsx +++ b/src/products/components/ProductListPage/ProductListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import Alert from "@saleor/components/Alert/Alert"; import CardMenu from "@saleor/components/CardMenu"; import ColumnPicker, { diff --git a/src/products/components/ProductMedia/ProductMedia.tsx b/src/products/components/ProductMedia/ProductMedia.tsx index 96879e3e8..0e886d376 100644 --- a/src/products/components/ProductMedia/ProductMedia.tsx +++ b/src/products/components/ProductMedia/ProductMedia.tsx @@ -1,6 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Button, Card, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ImageUpload from "@saleor/components/ImageUpload"; import MediaTile from "@saleor/components/MediaTile"; diff --git a/src/products/components/ProductMediaNavigation/ProductMediaNavigation.tsx b/src/products/components/ProductMediaNavigation/ProductMediaNavigation.tsx index c42522869..5da1f23a7 100644 --- a/src/products/components/ProductMediaNavigation/ProductMediaNavigation.tsx +++ b/src/products/components/ProductMediaNavigation/ProductMediaNavigation.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Skeleton from "@saleor/components/Skeleton"; import { makeStyles } from "@saleor/theme"; diff --git a/src/products/components/ProductMediaPage/ProductMediaPage.tsx b/src/products/components/ProductMediaPage/ProductMediaPage.tsx index 9c0f2048a..bbd936a10 100644 --- a/src/products/components/ProductMediaPage/ProductMediaPage.tsx +++ b/src/products/components/ProductMediaPage/ProductMediaPage.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import CardTitle from "@saleor/components/CardTitle"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/products/components/ProductMediaPopper/ProductMediaPopper.tsx b/src/products/components/ProductMediaPopper/ProductMediaPopper.tsx index 686991f65..6c3f8cf97 100644 --- a/src/products/components/ProductMediaPopper/ProductMediaPopper.tsx +++ b/src/products/components/ProductMediaPopper/ProductMediaPopper.tsx @@ -1,9 +1,11 @@ -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import Grow from "@material-ui/core/Grow"; -import MenuItem from "@material-ui/core/MenuItem"; -import Menu from "@material-ui/core/MenuList"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; +import { + ClickAwayListener, + Grow, + MenuItem, + MenuList as Menu, + Paper, + Popper +} from "@material-ui/core"; import React from "react"; import { defineMessages, useIntl } from "react-intl"; diff --git a/src/products/components/ProductOrganization/ProductOrganization.tsx b/src/products/components/ProductOrganization/ProductOrganization.tsx index 685cde9c3..9a072eb44 100644 --- a/src/products/components/ProductOrganization/ProductOrganization.tsx +++ b/src/products/components/ProductOrganization/ProductOrganization.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import { FormSpacer } from "@saleor/components/FormSpacer"; diff --git a/src/products/components/ProductShipping/ProductShipping.tsx b/src/products/components/ProductShipping/ProductShipping.tsx index 1ce534eb6..d39735cf9 100644 --- a/src/products/components/ProductShipping/ProductShipping.tsx +++ b/src/products/components/ProductShipping/ProductShipping.tsx @@ -1,7 +1,9 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import InputAdornment from "@material-ui/core/InputAdornment"; -import TextField from "@material-ui/core/TextField"; +import { + Card, + CardContent, + InputAdornment, + TextField +} from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Grid from "@saleor/components/Grid"; import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment"; diff --git a/src/products/components/ProductStocks/CardAddItemsFooter.tsx b/src/products/components/ProductStocks/CardAddItemsFooter.tsx index b3379c997..4881a0431 100644 --- a/src/products/components/ProductStocks/CardAddItemsFooter.tsx +++ b/src/products/components/ProductStocks/CardAddItemsFooter.tsx @@ -1,7 +1,7 @@ import { IconButton } from "@material-ui/core"; -import { makeStyles } from "@material-ui/core"; import AddIcon from "@material-ui/icons/Add"; import Link from "@saleor/components/Link"; +import { makeStyles } from "@saleor/theme"; import React, { MutableRefObject } from "react"; import { MessageDescriptor, useIntl } from "react-intl"; diff --git a/src/products/components/ProductStocks/ProductStocks.tsx b/src/products/components/ProductStocks/ProductStocks.tsx index 326e72334..bb294539a 100644 --- a/src/products/components/ProductStocks/ProductStocks.tsx +++ b/src/products/components/ProductStocks/ProductStocks.tsx @@ -1,19 +1,21 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import ClickAwayListener from "@material-ui/core/ClickAwayListener"; -import Grow from "@material-ui/core/Grow"; -import IconButton from "@material-ui/core/IconButton"; -import MenuItem from "@material-ui/core/MenuItem"; -import Paper from "@material-ui/core/Paper"; -import Popper from "@material-ui/core/Popper"; +import { + Card, + CardContent, + ClickAwayListener, + Grow, + IconButton, + MenuItem, + Paper, + Popper, + Table, + TableBody, + TableCell, + TableHead, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import Table from "@material-ui/core/Table"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; import AddIcon from "@material-ui/icons/Add"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/products/components/ProductTaxes/ProductTaxes.tsx b/src/products/components/ProductTaxes/ProductTaxes.tsx index d5c4e518b..e37032c24 100644 --- a/src/products/components/ProductTaxes/ProductTaxes.tsx +++ b/src/products/components/ProductTaxes/ProductTaxes.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import Hr from "@saleor/components/Hr"; diff --git a/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx b/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx index 061174d4f..70327c4e6 100644 --- a/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx +++ b/src/products/components/ProductVariantAttributes/ProductVariantAttributes.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; import Grid from "@saleor/components/Grid"; diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorPage.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorPage.tsx index db5051163..287541f67 100644 --- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorPage.tsx +++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Typography from "@material-ui/core/Typography"; +import { Button, Typography } from "@material-ui/core"; import Container from "@saleor/components/Container"; import Hr from "@saleor/components/Hr"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorPrices.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorPrices.tsx index e6174f9ad..422220af6 100644 --- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorPrices.tsx +++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorPrices.tsx @@ -1,9 +1,11 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Radio from "@material-ui/core/Radio"; -import RadioGroup from "@material-ui/core/RadioGroup"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + FormControlLabel, + Radio, + RadioGroup, + Typography +} from "@material-ui/core"; import { ChannelPriceData } from "@saleor/channels/utils"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorStock.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorStock.tsx index 39e864a9c..4428f12e9 100644 --- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorStock.tsx +++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorStock.tsx @@ -1,10 +1,12 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Radio from "@material-ui/core/Radio"; -import RadioGroup from "@material-ui/core/RadioGroup"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + FormControlLabel, + Radio, + RadioGroup, + TextField, + Typography +} from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorSummary.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorSummary.tsx index d5bb298fc..7ad2751a4 100644 --- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorSummary.tsx +++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorSummary.tsx @@ -1,11 +1,9 @@ -import Card from "@material-ui/core/Card"; +import { Card, IconButton, TextField } from "@material-ui/core"; import blue from "@material-ui/core/colors/blue"; import cyan from "@material-ui/core/colors/cyan"; import green from "@material-ui/core/colors/green"; import purple from "@material-ui/core/colors/purple"; import yellow from "@material-ui/core/colors/yellow"; -import IconButton from "@material-ui/core/IconButton"; -import TextField from "@material-ui/core/TextField"; import DeleteIcon from "@material-ui/icons/Delete"; import { ChannelPriceData } from "@saleor/channels/utils"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx index 689be7b2e..1b9af2d2b 100644 --- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx +++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import Alert from "@saleor/components/Alert/Alert"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx b/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx index dab61d374..7229014f6 100644 --- a/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx +++ b/src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogContentText, + DialogTitle +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/products/components/ProductVariantImageSelectDialog/ProductVariantMediaSelectDialog.tsx b/src/products/components/ProductVariantImageSelectDialog/ProductVariantMediaSelectDialog.tsx index 6a257b741..98f871050 100644 --- a/src/products/components/ProductVariantImageSelectDialog/ProductVariantMediaSelectDialog.tsx +++ b/src/products/components/ProductVariantImageSelectDialog/ProductVariantMediaSelectDialog.tsx @@ -1,8 +1,10 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle +} from "@material-ui/core"; import { ProductMediaFragment } from "@saleor/fragments/types/ProductMediaFragment"; import { buttonMessages } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; diff --git a/src/products/components/ProductVariantMedia/ProductVariantMedia.tsx b/src/products/components/ProductVariantMedia/ProductVariantMedia.tsx index 5e0c05b95..b57daad49 100644 --- a/src/products/components/ProductVariantMedia/ProductVariantMedia.tsx +++ b/src/products/components/ProductVariantMedia/ProductVariantMedia.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Skeleton from "@saleor/components/Skeleton"; import { ProductMediaFragment } from "@saleor/fragments/types/ProductMediaFragment"; diff --git a/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx b/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx index 5c51f962d..879fc3436 100644 --- a/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx +++ b/src/products/components/ProductVariantNavigation/ProductVariantNavigation.tsx @@ -1,8 +1,5 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card, TableCell, TableRow } from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; import CardTitle from "@saleor/components/CardTitle"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/products/components/ProductVariantPage/VariantDetailsChannelsAvailabilityCard/index.tsx b/src/products/components/ProductVariantPage/VariantDetailsChannelsAvailabilityCard/index.tsx index 8d200f8fa..35a7558d3 100644 --- a/src/products/components/ProductVariantPage/VariantDetailsChannelsAvailabilityCard/index.tsx +++ b/src/products/components/ProductVariantPage/VariantDetailsChannelsAvailabilityCard/index.tsx @@ -3,13 +3,13 @@ import { Divider, ExpansionPanel, ExpansionPanelSummary, - makeStyles, Typography } from "@material-ui/core"; import Skeleton from "@saleor/components/Skeleton"; import { ProductVariant } from "@saleor/fragments/types/ProductVariant"; import useDateLocalize from "@saleor/hooks/useDateLocalize"; import IconChevronDown from "@saleor/icons/ChevronDown"; +import { makeStyles } from "@saleor/theme"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx b/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx index e04c0343b..f98b924d2 100644 --- a/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx +++ b/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx @@ -1,12 +1,12 @@ import { + Card, + CardContent, TableBody, TableCell, TableHead, TableRow, Typography } from "@material-ui/core"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; import { ChannelData, ChannelPriceArgs } from "@saleor/channels/utils"; import CardTitle from "@saleor/components/CardTitle"; import PriceField from "@saleor/components/PriceField"; diff --git a/src/products/components/ProductVariants/ProductVariants.tsx b/src/products/components/ProductVariants/ProductVariants.tsx index 7420bc2b4..f81d49e82 100644 --- a/src/products/components/ProductVariants/ProductVariants.tsx +++ b/src/products/components/ProductVariants/ProductVariants.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Hidden from "@material-ui/core/Hidden"; +import { + Button, + Card, + CardContent, + Hidden, + TableCell, + Typography +} from "@material-ui/core"; import { fade } from "@material-ui/core/styles/colorManipulator"; -import TableCell from "@material-ui/core/TableCell"; -import Typography from "@material-ui/core/Typography"; import Alert from "@saleor/components/Alert/Alert"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/products/views/ProductImage.tsx b/src/products/views/ProductImage.tsx index 974ad253a..fa8ede1a1 100644 --- a/src/products/views/ProductImage.tsx +++ b/src/products/views/ProductImage.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import NotFoundPage from "@saleor/components/NotFoundPage"; import useNavigator from "@saleor/hooks/useNavigator"; diff --git a/src/products/views/ProductList/ProductList.tsx b/src/products/views/ProductList/ProductList.tsx index 264c409d7..b49441a5c 100644 --- a/src/products/views/ProductList/ProductList.tsx +++ b/src/products/views/ProductList/ProductList.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; diff --git a/src/products/views/ProductList/filters.ts b/src/products/views/ProductList/filters.ts index 9b5a69214..1ad7eff89 100644 --- a/src/products/views/ProductList/filters.ts +++ b/src/products/views/ProductList/filters.ts @@ -21,7 +21,7 @@ import { SearchProductTypesVariables } from "@saleor/searches/types/SearchProductTypes"; import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; -import isArray from "lodash-es/isArray"; +import isArray from "lodash/isArray"; import { IFilterElement } from "../../../components/Filter"; import { diff --git a/src/products/views/ProductUpdate/ProductUpdate.tsx b/src/products/views/ProductUpdate/ProductUpdate.tsx index 7fa2322a4..3b294700c 100644 --- a/src/products/views/ProductUpdate/ProductUpdate.tsx +++ b/src/products/views/ProductUpdate/ProductUpdate.tsx @@ -1,6 +1,5 @@ import placeholderImg from "@assets/images/placeholder255x255.png"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import { useAttributeValueDeleteMutation } from "@saleor/attributes/mutations"; import ChannelsWithVariantsAvailabilityDialog from "@saleor/channels/components/ChannelsWithVariantsAvailabilityDialog"; diff --git a/src/products/views/ProductUpdate/useChannelsWithProductVariants.ts b/src/products/views/ProductUpdate/useChannelsWithProductVariants.ts index 2eae15ade..5f2a70330 100644 --- a/src/products/views/ProductUpdate/useChannelsWithProductVariants.ts +++ b/src/products/views/ProductUpdate/useChannelsWithProductVariants.ts @@ -1,6 +1,6 @@ import useStateFromProps from "@saleor/hooks/useStateFromProps"; -import isEmpty from "lodash-es/isEmpty"; -import reduce from "lodash-es/reduce"; +import isEmpty from "lodash/isEmpty"; +import reduce from "lodash/reduce"; import { useEffect, useRef, useState } from "react"; import { diff --git a/src/products/views/ProductUpdate/utils.ts b/src/products/views/ProductUpdate/utils.ts index db4dccc5f..28b3be4bf 100644 --- a/src/products/views/ProductUpdate/utils.ts +++ b/src/products/views/ProductUpdate/utils.ts @@ -4,8 +4,8 @@ import { } from "@saleor/channels/pages/ChannelDetailsPage/utils"; import { ChannelData } from "@saleor/channels/utils"; import { ProductDetails_product_variants } from "@saleor/products/types/ProductDetails"; -import { reduce } from "lodash"; -import every from "lodash-es/every"; +import every from "lodash/every"; +import reduce from "lodash/reduce"; import { ChannelsWithVariantsData, diff --git a/src/shipping/components/DeleteShippingRateDialog/DeleteShippingRateDialog.tsx b/src/shipping/components/DeleteShippingRateDialog/DeleteShippingRateDialog.tsx index 1476c57c0..dd5fa0980 100644 --- a/src/shipping/components/DeleteShippingRateDialog/DeleteShippingRateDialog.tsx +++ b/src/shipping/components/DeleteShippingRateDialog/DeleteShippingRateDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { getStringOrPlaceholder } from "@saleor/misc"; diff --git a/src/shipping/components/OrderValue/OrderValue.tsx b/src/shipping/components/OrderValue/OrderValue.tsx index 2d1e12467..670f241d8 100644 --- a/src/shipping/components/OrderValue/OrderValue.tsx +++ b/src/shipping/components/OrderValue/OrderValue.tsx @@ -1,9 +1,11 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + TableBody, + TableCell, + TableRow, + Typography +} from "@material-ui/core"; import { ChannelShippingData } from "@saleor/channels/utils"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; diff --git a/src/shipping/components/OrderWeight/OrderWeight.tsx b/src/shipping/components/OrderWeight/OrderWeight.tsx index 69e680410..bad24c7dd 100644 --- a/src/shipping/components/OrderWeight/OrderWeight.tsx +++ b/src/shipping/components/OrderWeight/OrderWeight.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import { ShippingErrorFragment } from "@saleor/fragments/types/ShippingErrorFragment"; diff --git a/src/shipping/components/PricingCard/PricingCard.tsx b/src/shipping/components/PricingCard/PricingCard.tsx index 922df602e..962cec3db 100644 --- a/src/shipping/components/PricingCard/PricingCard.tsx +++ b/src/shipping/components/PricingCard/PricingCard.tsx @@ -1,9 +1,11 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Card, + CardContent, + TableBody, + TableCell, + TableRow, + Typography +} from "@material-ui/core"; import { ChannelShippingData } from "@saleor/channels/utils"; import CardTitle from "@saleor/components/CardTitle"; import PriceField from "@saleor/components/PriceField"; diff --git a/src/shipping/components/ShippingMethodProducts/ShippingMethodProducts.tsx b/src/shipping/components/ShippingMethodProducts/ShippingMethodProducts.tsx index 135322bcb..47222b02e 100644 --- a/src/shipping/components/ShippingMethodProducts/ShippingMethodProducts.tsx +++ b/src/shipping/components/ShippingMethodProducts/ShippingMethodProducts.tsx @@ -1,11 +1,13 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableFooter, + TableRow, + Typography +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx b/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx index 5fcb832d9..a8584431b 100644 --- a/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx +++ b/src/shipping/components/ShippingMethodProductsAddDialog/ShippingMethodProductsAddDialog.tsx @@ -1,13 +1,15 @@ -import Button from "@material-ui/core/Button"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + CircularProgress, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TableBody, + TableCell, + TableRow, + TextField +} from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx b/src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx index 867b89900..0e36aaf85 100644 --- a/src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx +++ b/src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx @@ -1,7 +1,5 @@ import { OutputData } from "@editorjs/editorjs"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import RichTextEditor, { diff --git a/src/shipping/components/ShippingWeightUnitForm/ShippingWeightUnitForm.tsx b/src/shipping/components/ShippingWeightUnitForm/ShippingWeightUnitForm.tsx index 4d7dec6c5..4843fb38b 100644 --- a/src/shipping/components/ShippingWeightUnitForm/ShippingWeightUnitForm.tsx +++ b/src/shipping/components/ShippingWeightUnitForm/ShippingWeightUnitForm.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardActions from "@material-ui/core/CardActions"; -import CardContent from "@material-ui/core/CardContent"; +import { Button, Card, CardActions, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Form from "@saleor/components/Form"; import Hr from "@saleor/components/Hr"; diff --git a/src/shipping/components/ShippingZoneAddWarehouseDialog/ShippingZoneAddWarehouseDialog.tsx b/src/shipping/components/ShippingZoneAddWarehouseDialog/ShippingZoneAddWarehouseDialog.tsx index e85e76527..1468d7830 100644 --- a/src/shipping/components/ShippingZoneAddWarehouseDialog/ShippingZoneAddWarehouseDialog.tsx +++ b/src/shipping/components/ShippingZoneAddWarehouseDialog/ShippingZoneAddWarehouseDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField +} from "@material-ui/core"; import CompanyAddressForm from "@saleor/components/CompanyAddressInput/CompanyAddressForm"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx b/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx index af49b8bec..303844462 100644 --- a/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx +++ b/src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx @@ -1,13 +1,15 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow from "@material-ui/core/TableRow"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TableBody, + TableCell, + TableRow, + TextField, + Typography +} from "@material-ui/core"; import Checkbox from "@saleor/components/Checkbox"; import ConfirmButton, { ConfirmButtonTransitionState diff --git a/src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx b/src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx index 95c579fc7..e13a72ad0 100644 --- a/src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx +++ b/src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardSpacer from "@saleor/components/CardSpacer"; import CardTitle from "@saleor/components/CardTitle"; import { ShippingErrorFragment } from "@saleor/fragments/types/ShippingErrorFragment"; diff --git a/src/shipping/components/ShippingZonePostalCodeRangeDialog/ShippingZonePostalCodeRangeDialog.tsx b/src/shipping/components/ShippingZonePostalCodeRangeDialog/ShippingZonePostalCodeRangeDialog.tsx index bd91ec06c..04b8db6a3 100644 --- a/src/shipping/components/ShippingZonePostalCodeRangeDialog/ShippingZonePostalCodeRangeDialog.tsx +++ b/src/shipping/components/ShippingZonePostalCodeRangeDialog/ShippingZonePostalCodeRangeDialog.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField, + Typography +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx b/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx index 0a46ef8dc..88fa9ad56 100644 --- a/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx +++ b/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx @@ -1,12 +1,14 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + IconButton, + TableBody, + TableCell, + TableHead, + TableRow, + Typography +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import RadioGroupField from "@saleor/components/RadioGroupField"; diff --git a/src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx b/src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx index feba5d26b..11e7f88a8 100644 --- a/src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx +++ b/src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import EditIcon from "@material-ui/icons/Edit"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx b/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx index 7fe76d417..393918cb5 100644 --- a/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx +++ b/src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx @@ -1,6 +1,4 @@ -import { Divider } from "@material-ui/core"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent, Divider } from "@material-ui/core"; import { Channels_channels } from "@saleor/channels/types/Channels"; import CardTitle from "@saleor/components/CardTitle"; import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; diff --git a/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx b/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx index 4bee8f5da..f2aee671a 100644 --- a/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx +++ b/src/shipping/components/ShippingZonesList/ShippingZonesList.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableFooter, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import CardTitle from "@saleor/components/CardTitle"; import Checkbox from "@saleor/components/Checkbox"; diff --git a/src/shipping/components/UnassignDialog/UnassignDialog.tsx b/src/shipping/components/UnassignDialog/UnassignDialog.tsx index ca2f71a5a..eb69a4634 100644 --- a/src/shipping/components/UnassignDialog/UnassignDialog.tsx +++ b/src/shipping/components/UnassignDialog/UnassignDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/shipping/handlers.ts b/src/shipping/handlers.ts index 33ca7e27f..1a3ee4f02 100644 --- a/src/shipping/handlers.ts +++ b/src/shipping/handlers.ts @@ -14,7 +14,7 @@ import { ShippingPostalCodeRulesCreateInputRange } from "@saleor/types/globalTypes"; import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc"; -import { differenceBy } from "lodash"; +import differenceBy from "lodash/differenceBy"; import { useIntl } from "react-intl"; import { diff --git a/src/shipping/views/PriceRatesUpdate/PriceRatesUpdate.tsx b/src/shipping/views/PriceRatesUpdate/PriceRatesUpdate.tsx index 33e1a4691..2e0c4de25 100644 --- a/src/shipping/views/PriceRatesUpdate/PriceRatesUpdate.tsx +++ b/src/shipping/views/PriceRatesUpdate/PriceRatesUpdate.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { createShippingChannelsFromRate, createSortedShippingChannels diff --git a/src/shipping/views/ShippingZoneDetails/index.tsx b/src/shipping/views/ShippingZoneDetails/index.tsx index 3077b70e0..067d28443 100644 --- a/src/shipping/views/ShippingZoneDetails/index.tsx +++ b/src/shipping/views/ShippingZoneDetails/index.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import { useChannelsList } from "@saleor/channels/queries"; import ActionDialog from "@saleor/components/ActionDialog"; import useAppChannel from "@saleor/components/AppLayout/AppChannelContext"; diff --git a/src/shipping/views/ShippingZonesList.tsx b/src/shipping/views/ShippingZonesList.tsx index b6ee8c11c..db0d4fc52 100644 --- a/src/shipping/views/ShippingZonesList.tsx +++ b/src/shipping/views/ShippingZonesList.tsx @@ -1,5 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; -import IconButton from "@material-ui/core/IconButton"; +import { DialogContentText, IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import ActionDialog from "@saleor/components/ActionDialog"; import { configurationMenuUrl } from "@saleor/configuration"; diff --git a/src/shipping/views/WeightRatesUpdate/WeightRatesUpdate.tsx b/src/shipping/views/WeightRatesUpdate/WeightRatesUpdate.tsx index b7978e156..f678d2de4 100644 --- a/src/shipping/views/WeightRatesUpdate/WeightRatesUpdate.tsx +++ b/src/shipping/views/WeightRatesUpdate/WeightRatesUpdate.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { createShippingChannelsFromRate, createSortedShippingChannels diff --git a/src/siteSettings/components/SiteSettingsDetails/SiteSettingsDetails.tsx b/src/siteSettings/components/SiteSettingsDetails/SiteSettingsDetails.tsx index 111c3e71b..c25da371c 100644 --- a/src/siteSettings/components/SiteSettingsDetails/SiteSettingsDetails.tsx +++ b/src/siteSettings/components/SiteSettingsDetails/SiteSettingsDetails.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; import { ShopErrorFragment } from "@saleor/fragments/types/ShopErrorFragment"; diff --git a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx index 82af939fc..48201774d 100644 --- a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx +++ b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx @@ -1,4 +1,4 @@ -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import CompanyAddressInput from "@saleor/components/CompanyAddressInput"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx b/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx index cdbb03e0a..78f037453 100644 --- a/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx +++ b/src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/staff/components/StaffDetailsPage/StaffDetailsPage.stories.tsx b/src/staff/components/StaffDetailsPage/StaffDetailsPage.stories.tsx index 734a55718..c3275d04e 100644 --- a/src/staff/components/StaffDetailsPage/StaffDetailsPage.stories.tsx +++ b/src/staff/components/StaffDetailsPage/StaffDetailsPage.stories.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { userPermissionGroups } from "@saleor/permissionGroups/fixtures"; import StaffDetailsPage, { StaffDetailsPageProps diff --git a/src/staff/components/StaffList/StaffList.tsx b/src/staff/components/StaffList/StaffList.tsx index 012a97943..f61d3cfb4 100644 --- a/src/staff/components/StaffList/StaffList.tsx +++ b/src/staff/components/StaffList/StaffList.tsx @@ -1,9 +1,11 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; -import Typography from "@material-ui/core/Typography"; +import { + TableBody, + TableCell, + TableFooter, + TableHead, + TableRow, + Typography +} from "@material-ui/core"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TableCellHeader from "@saleor/components/TableCellHeader"; diff --git a/src/staff/components/StaffListPage/StaffListPage.tsx b/src/staff/components/StaffListPage/StaffListPage.tsx index 93f4fb1e1..1c8bbe55c 100644 --- a/src/staff/components/StaffListPage/StaffListPage.tsx +++ b/src/staff/components/StaffListPage/StaffListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import Alert from "@saleor/components/Alert/Alert"; import AppHeader from "@saleor/components/AppHeader"; import { Container } from "@saleor/components/Container"; diff --git a/src/staff/components/StaffPassword/StaffPassword.tsx b/src/staff/components/StaffPassword/StaffPassword.tsx index fe51fbc2b..092cb04fd 100644 --- a/src/staff/components/StaffPassword/StaffPassword.tsx +++ b/src/staff/components/StaffPassword/StaffPassword.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Button, Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx b/src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx index 429984bdf..a74b90dc4 100644 --- a/src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx +++ b/src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx @@ -1,9 +1,11 @@ -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { + Button, + Dialog, + DialogActions, + DialogContent, + DialogTitle, + TextField +} from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/staff/components/StaffPreferences/StaffPreferences.tsx b/src/staff/components/StaffPreferences/StaffPreferences.tsx index 8191098ed..170e0bec1 100644 --- a/src/staff/components/StaffPreferences/StaffPreferences.tsx +++ b/src/staff/components/StaffPreferences/StaffPreferences.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; import { Locale, localeNames } from "@saleor/components/Locale"; diff --git a/src/staff/components/StaffProperties/StaffProperties.tsx b/src/staff/components/StaffProperties/StaffProperties.tsx index eeb7c39c7..f9c5a8088 100644 --- a/src/staff/components/StaffProperties/StaffProperties.tsx +++ b/src/staff/components/StaffProperties/StaffProperties.tsx @@ -1,8 +1,5 @@ import photoIcon from "@assets/images/photo-icon.svg"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { StaffErrorFragment } from "@saleor/fragments/types/StaffErrorFragment"; import { commonMessages } from "@saleor/intl"; diff --git a/src/staff/utils.ts b/src/staff/utils.ts index a2d427a48..dbe92eaab 100644 --- a/src/staff/utils.ts +++ b/src/staff/utils.ts @@ -1,4 +1,4 @@ -import difference from "lodash-es/difference"; +import difference from "lodash/difference"; import { StaffDetailsFormData } from "./components/StaffDetailsPage"; import { StaffMemberDetails_user } from "./types/StaffMemberDetails"; diff --git a/src/staff/views/StaffDetails.tsx b/src/staff/views/StaffDetails.tsx index 5f89100a3..5034d0210 100644 --- a/src/staff/views/StaffDetails.tsx +++ b/src/staff/views/StaffDetails.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import NotFoundPage from "@saleor/components/NotFoundPage"; import { WindowTitle } from "@saleor/components/WindowTitle"; diff --git a/src/storybook/CardDecorator.tsx b/src/storybook/CardDecorator.tsx index 6f113a514..850171ab1 100644 --- a/src/storybook/CardDecorator.tsx +++ b/src/storybook/CardDecorator.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import React from "react"; const CardDecorator = storyFn => ( diff --git a/src/storybook/stories/categories/CategoryUpdatePage.tsx b/src/storybook/stories/categories/CategoryUpdatePage.tsx index ec5a824ba..416129ce8 100644 --- a/src/storybook/stories/categories/CategoryUpdatePage.tsx +++ b/src/storybook/stories/categories/CategoryUpdatePage.tsx @@ -1,5 +1,4 @@ import placeholderImage from "@assets/images/placeholder255x255.png"; -import { Omit } from "@material-ui/core"; import { ProductErrorCode } from "@saleor/types/globalTypes"; import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps"; import { storiesOf } from "@storybook/react"; diff --git a/src/storybook/stories/collections/CollectionCreatePage.tsx b/src/storybook/stories/collections/CollectionCreatePage.tsx index 50715681e..cd0c57e03 100644 --- a/src/storybook/stories/collections/CollectionCreatePage.tsx +++ b/src/storybook/stories/collections/CollectionCreatePage.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { channelsList } from "@saleor/channels/fixtures"; import { createCollectionChannels } from "@saleor/channels/utils"; import { CollectionErrorCode } from "@saleor/types/globalTypes"; diff --git a/src/storybook/stories/collections/CollectionDetailsPage.tsx b/src/storybook/stories/collections/CollectionDetailsPage.tsx index 7a6429f80..2fbae68f0 100644 --- a/src/storybook/stories/collections/CollectionDetailsPage.tsx +++ b/src/storybook/stories/collections/CollectionDetailsPage.tsx @@ -1,6 +1,5 @@ import placeholderCollectionImage from "@assets/images/block1.jpg"; import placeholderProductImage from "@assets/images/placeholder60x60.png"; -import { Omit } from "@material-ui/core"; import { createCollectionChannelsData } from "@saleor/channels/utils"; import { CollectionErrorCode } from "@saleor/types/globalTypes"; import { storiesOf } from "@storybook/react"; diff --git a/src/storybook/stories/components/AddressEdit.tsx b/src/storybook/stories/components/AddressEdit.tsx index c5b8ed4ca..3ccd18664 100644 --- a/src/storybook/stories/components/AddressEdit.tsx +++ b/src/storybook/stories/components/AddressEdit.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import AddressEdit from "@saleor/components/AddressEdit"; import { mapCountriesToChoices } from "@saleor/utils/maps"; import { storiesOf } from "@storybook/react"; diff --git a/src/storybook/stories/components/AutocompleteSelectMenu.tsx b/src/storybook/stories/components/AutocompleteSelectMenu.tsx index 2cfd33d72..0a9baccd5 100644 --- a/src/storybook/stories/components/AutocompleteSelectMenu.tsx +++ b/src/storybook/stories/components/AutocompleteSelectMenu.tsx @@ -1,5 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; +import { Card, CardContent } from "@material-ui/core"; import AutocompleteSelectMenu, { AutocompleteSelectMenuProps } from "@saleor/components/AutocompleteSelectMenu"; diff --git a/src/storybook/stories/components/EditableTableCell.tsx b/src/storybook/stories/components/EditableTableCell.tsx index c67d4a16a..b5519555e 100644 --- a/src/storybook/stories/components/EditableTableCell.tsx +++ b/src/storybook/stories/components/EditableTableCell.tsx @@ -1,7 +1,4 @@ -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { TableBody, TableCell, TableHead, TableRow } from "@material-ui/core"; import EditableTableCell from "@saleor/components/EditableTableCell"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import { storiesOf } from "@storybook/react"; diff --git a/src/storybook/stories/components/ErrorPage.tsx b/src/storybook/stories/components/ErrorPage.tsx index a9b66f288..16ddfa64f 100644 --- a/src/storybook/stories/components/ErrorPage.tsx +++ b/src/storybook/stories/components/ErrorPage.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import ErrorPage, { ErrorPageProps } from "@saleor/components/ErrorPage"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/storybook/stories/components/PageHeader.tsx b/src/storybook/stories/components/PageHeader.tsx index 58105fcb6..a23a2ebf7 100644 --- a/src/storybook/stories/components/PageHeader.tsx +++ b/src/storybook/stories/components/PageHeader.tsx @@ -1,4 +1,4 @@ -import IconButton from "@material-ui/core/IconButton"; +import { IconButton } from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import PageHeader from "@saleor/components/PageHeader"; import { storiesOf } from "@storybook/react"; diff --git a/src/storybook/stories/components/messages.tsx b/src/storybook/stories/components/messages.tsx index f661e09b7..24ab6346c 100644 --- a/src/storybook/stories/components/messages.tsx +++ b/src/storybook/stories/components/messages.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import { IMessage } from "@saleor/components/messages"; import useNotifier from "@saleor/hooks/useNotifier"; import { storiesOf } from "@storybook/react"; diff --git a/src/storybook/stories/customers/CustomerCreatePage.tsx b/src/storybook/stories/customers/CustomerCreatePage.tsx index 9d3f32d9d..2d3dda87f 100644 --- a/src/storybook/stories/customers/CustomerCreatePage.tsx +++ b/src/storybook/stories/customers/CustomerCreatePage.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { AccountErrorCode } from "@saleor/types/globalTypes"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/storybook/stories/customers/CustomerDetailsPage.tsx b/src/storybook/stories/customers/CustomerDetailsPage.tsx index b0d01c917..6557eadc1 100644 --- a/src/storybook/stories/customers/CustomerDetailsPage.tsx +++ b/src/storybook/stories/customers/CustomerDetailsPage.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { AccountErrorCode } from "@saleor/types/globalTypes"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/storybook/stories/home/HomePage.tsx b/src/storybook/stories/home/HomePage.tsx index 54f3fe485..551b46067 100644 --- a/src/storybook/stories/home/HomePage.tsx +++ b/src/storybook/stories/home/HomePage.tsx @@ -1,5 +1,4 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; -import { Omit } from "@material-ui/core"; import { adminUserPermissions } from "@saleor/fixtures"; import { PermissionEnum } from "@saleor/types/globalTypes"; import { mapEdgesToItems } from "@saleor/utils/maps"; diff --git a/src/storybook/stories/orders/OrderCustomer.tsx b/src/storybook/stories/orders/OrderCustomer.tsx index 10a8f911a..ea34b40c9 100644 --- a/src/storybook/stories/orders/OrderCustomer.tsx +++ b/src/storybook/stories/orders/OrderCustomer.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { adminUserPermissions } from "@saleor/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/storybook/stories/orders/OrderDetailsPage.tsx b/src/storybook/stories/orders/OrderDetailsPage.tsx index 3cf372bb8..bd100dfb2 100644 --- a/src/storybook/stories/orders/OrderDetailsPage.tsx +++ b/src/storybook/stories/orders/OrderDetailsPage.tsx @@ -1,5 +1,4 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; -import { Omit } from "@material-ui/core"; import { adminUserPermissions } from "@saleor/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/storybook/stories/orders/OrderDraftPage/OrderDraftPage.tsx b/src/storybook/stories/orders/OrderDraftPage/OrderDraftPage.tsx index 9611b645f..65e3fc61f 100644 --- a/src/storybook/stories/orders/OrderDraftPage/OrderDraftPage.tsx +++ b/src/storybook/stories/orders/OrderDraftPage/OrderDraftPage.tsx @@ -1,5 +1,4 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; -import { Omit } from "@material-ui/core"; import { adminUserPermissions, fetchMoreProps } from "@saleor/fixtures"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/storybook/stories/orders/OrderFulfillmentDialog.tsx b/src/storybook/stories/orders/OrderFulfillmentDialog.tsx index 5b91a2996..8592005d6 100644 --- a/src/storybook/stories/orders/OrderFulfillmentDialog.tsx +++ b/src/storybook/stories/orders/OrderFulfillmentDialog.tsx @@ -1,5 +1,4 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; -import { Omit } from "@material-ui/core"; import { OrderErrorCode } from "@saleor/types/globalTypes"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/storybook/stories/productTypes/ProductTypeCreatePage.tsx b/src/storybook/stories/productTypes/ProductTypeCreatePage.tsx index a8e84a1f6..fd53d7716 100644 --- a/src/storybook/stories/productTypes/ProductTypeCreatePage.tsx +++ b/src/storybook/stories/productTypes/ProductTypeCreatePage.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { formError } from "@saleor/storybook/misc"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/storybook/stories/productTypes/ProductTypeDetailsPage.tsx b/src/storybook/stories/productTypes/ProductTypeDetailsPage.tsx index 8f82d30bd..7e5deeb0a 100644 --- a/src/storybook/stories/productTypes/ProductTypeDetailsPage.tsx +++ b/src/storybook/stories/productTypes/ProductTypeDetailsPage.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { listActionsProps } from "@saleor/fixtures"; import { formError } from "@saleor/storybook/misc"; import { storiesOf } from "@storybook/react"; diff --git a/src/storybook/stories/siteSettings/SiteSettingsPage.tsx b/src/storybook/stories/siteSettings/SiteSettingsPage.tsx index 4cc3cc362..5ea7eb96f 100644 --- a/src/storybook/stories/siteSettings/SiteSettingsPage.tsx +++ b/src/storybook/stories/siteSettings/SiteSettingsPage.tsx @@ -1,4 +1,3 @@ -import { Omit } from "@material-ui/core"; import { ShopErrorCode } from "@saleor/types/globalTypes"; import { storiesOf } from "@storybook/react"; import React from "react"; diff --git a/src/taxes/components/CountryList/CountryList.tsx b/src/taxes/components/CountryList/CountryList.tsx index 06832f785..32dd8e77b 100644 --- a/src/taxes/components/CountryList/CountryList.tsx +++ b/src/taxes/components/CountryList/CountryList.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Card, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import { makeStyles } from "@saleor/theme"; diff --git a/src/taxes/components/CountryTaxesPage/CountryTaxesPage.tsx b/src/taxes/components/CountryTaxesPage/CountryTaxesPage.tsx index c2666f3a2..81e44fae3 100644 --- a/src/taxes/components/CountryTaxesPage/CountryTaxesPage.tsx +++ b/src/taxes/components/CountryTaxesPage/CountryTaxesPage.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Card, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import { Container } from "@saleor/components/Container"; import Grid from "@saleor/components/Grid"; diff --git a/src/taxes/components/TaxConfiguration/TaxConfiguration.tsx b/src/taxes/components/TaxConfiguration/TaxConfiguration.tsx index 2aede4076..08c3a4cf8 100644 --- a/src/taxes/components/TaxConfiguration/TaxConfiguration.tsx +++ b/src/taxes/components/TaxConfiguration/TaxConfiguration.tsx @@ -1,7 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardActions from "@material-ui/core/CardActions"; -import CardContent from "@material-ui/core/CardContent"; +import { Button, Card, CardActions, CardContent } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import FormSpacer from "@saleor/components/FormSpacer"; diff --git a/src/translations/components/TranslationFields/TranslationFields.tsx b/src/translations/components/TranslationFields/TranslationFields.tsx index 587b273f1..5ce528380 100644 --- a/src/translations/components/TranslationFields/TranslationFields.tsx +++ b/src/translations/components/TranslationFields/TranslationFields.tsx @@ -1,9 +1,11 @@ import { OutputData } from "@editorjs/editorjs"; -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import IconButton from "@material-ui/core/IconButton"; -import Typography from "@material-ui/core/Typography"; +import { + Button, + Card, + CardContent, + IconButton, + Typography +} from "@material-ui/core"; import ArrowIcon from "@material-ui/icons/ArrowDropDown"; import CardTitle from "@saleor/components/CardTitle"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/translations/components/TranslationFields/TranslationFieldsLong.tsx b/src/translations/components/TranslationFields/TranslationFieldsLong.tsx index f24e0e694..8b4366447 100644 --- a/src/translations/components/TranslationFields/TranslationFieldsLong.tsx +++ b/src/translations/components/TranslationFields/TranslationFieldsLong.tsx @@ -1,5 +1,4 @@ -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { TextField, Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import Form from "@saleor/components/Form"; import React from "react"; diff --git a/src/translations/components/TranslationFields/TranslationFieldsRich.tsx b/src/translations/components/TranslationFields/TranslationFieldsRich.tsx index 51dde46b7..1f303131a 100644 --- a/src/translations/components/TranslationFields/TranslationFieldsRich.tsx +++ b/src/translations/components/TranslationFields/TranslationFieldsRich.tsx @@ -1,5 +1,5 @@ import { OutputData } from "@editorjs/editorjs"; -import Typography from "@material-ui/core/Typography"; +import { Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import RichTextEditor from "@saleor/components/RichTextEditor"; import RichTextEditorContent from "@saleor/components/RichTextEditor/RichTextEditorContent"; diff --git a/src/translations/components/TranslationFields/TranslationFieldsSave.tsx b/src/translations/components/TranslationFields/TranslationFieldsSave.tsx index 9848c4bde..0c4ae5d99 100644 --- a/src/translations/components/TranslationFields/TranslationFieldsSave.tsx +++ b/src/translations/components/TranslationFields/TranslationFieldsSave.tsx @@ -1,4 +1,4 @@ -import Button from "@material-ui/core/Button"; +import { Button } from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; diff --git a/src/translations/components/TranslationFields/TranslationFieldsShort.tsx b/src/translations/components/TranslationFields/TranslationFieldsShort.tsx index 5eda9f293..204e1a508 100644 --- a/src/translations/components/TranslationFields/TranslationFieldsShort.tsx +++ b/src/translations/components/TranslationFields/TranslationFieldsShort.tsx @@ -1,5 +1,4 @@ -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { TextField, Typography } from "@material-ui/core"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import Form from "@saleor/components/Form"; import React from "react"; diff --git a/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx b/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx index 052f3da63..c4e23c8b1 100644 --- a/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx +++ b/src/translations/components/TranslationsEntitiesList/TranslationsEntitiesList.tsx @@ -1,9 +1,10 @@ -import { Omit } from "@material-ui/core"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + TableBody, + TableCell, + TableFooter, + TableHead, + TableRow +} from "@material-ui/core"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; import TablePagination from "@saleor/components/TablePagination"; diff --git a/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx b/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx index 06de22e79..f18184678 100644 --- a/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx +++ b/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx @@ -1,4 +1,4 @@ -import Card from "@material-ui/core/Card"; +import { Card } from "@material-ui/core"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; diff --git a/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx b/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx index 153aaa8eb..707528003 100644 --- a/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx +++ b/src/translations/components/TranslationsLanguageList/TranslationsLanguageList.tsx @@ -1,8 +1,10 @@ -import Card from "@material-ui/core/Card"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Card, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import { ShopInfo_shop_languages } from "@saleor/components/Shop/types/ShopInfo"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/utils/filters/filters.ts b/src/utils/filters/filters.ts index e57367ddb..f229de27e 100644 --- a/src/utils/filters/filters.ts +++ b/src/utils/filters/filters.ts @@ -1,6 +1,6 @@ import { IFilter, IFilterElement } from "@saleor/components/Filter"; import { findValueInEnum } from "@saleor/misc"; -import isArray from "lodash-es/isArray"; +import isArray from "lodash/isArray"; function createFilterUtils< TQueryParams extends {}, diff --git a/src/utils/urls.ts b/src/utils/urls.ts index 1a25d6468..ac41b7c27 100644 --- a/src/utils/urls.ts +++ b/src/utils/urls.ts @@ -1,4 +1,4 @@ -import isArray from "lodash-es/isArray"; +import isArray from "lodash/isArray"; import { stringify } from "qs"; export function stringifyQs(params: {}): string { diff --git a/src/warehouses/components/WarehouseDeleteDialog/WarehouseDeleteDialog.tsx b/src/warehouses/components/WarehouseDeleteDialog/WarehouseDeleteDialog.tsx index df8e450a7..2a6f34d85 100644 --- a/src/warehouses/components/WarehouseDeleteDialog/WarehouseDeleteDialog.tsx +++ b/src/warehouses/components/WarehouseDeleteDialog/WarehouseDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import React from "react"; diff --git a/src/warehouses/components/WarehouseInfo/WarehouseInfo.tsx b/src/warehouses/components/WarehouseInfo/WarehouseInfo.tsx index fa071979a..1eadbe2b2 100644 --- a/src/warehouses/components/WarehouseInfo/WarehouseInfo.tsx +++ b/src/warehouses/components/WarehouseInfo/WarehouseInfo.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; +import { Card, CardContent, TextField } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import { WarehouseErrorFragment } from "@saleor/fragments/types/WarehouseErrorFragment"; import { FormChange } from "@saleor/hooks/useForm"; diff --git a/src/warehouses/components/WarehouseList/WarehouseList.tsx b/src/warehouses/components/WarehouseList/WarehouseList.tsx index ccde14284..720802af3 100644 --- a/src/warehouses/components/WarehouseList/WarehouseList.tsx +++ b/src/warehouses/components/WarehouseList/WarehouseList.tsx @@ -1,9 +1,11 @@ -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableFooter from "@material-ui/core/TableFooter"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + IconButton, + TableBody, + TableCell, + TableFooter, + TableHead, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import EditIcon from "@material-ui/icons/Edit"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; diff --git a/src/warehouses/components/WarehouseListPage/WarehouseListPage.tsx b/src/warehouses/components/WarehouseListPage/WarehouseListPage.tsx index d4225598f..d5424c827 100644 --- a/src/warehouses/components/WarehouseListPage/WarehouseListPage.tsx +++ b/src/warehouses/components/WarehouseListPage/WarehouseListPage.tsx @@ -1,5 +1,4 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; +import { Button, Card } from "@material-ui/core"; import Alert from "@saleor/components/Alert/Alert"; import AppHeader from "@saleor/components/AppHeader"; import Container from "@saleor/components/Container"; diff --git a/src/warehouses/components/WarehouseZones/WarehouseZones.tsx b/src/warehouses/components/WarehouseZones/WarehouseZones.tsx index e60b4d7e8..18b7bf10f 100644 --- a/src/warehouses/components/WarehouseZones/WarehouseZones.tsx +++ b/src/warehouses/components/WarehouseZones/WarehouseZones.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import Link from "@saleor/components/Link"; import Skeleton from "@saleor/components/Skeleton"; diff --git a/src/webhooks/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx b/src/webhooks/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx index de9ce5d50..a01509ec7 100644 --- a/src/webhooks/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx +++ b/src/webhooks/components/WebhookDeleteDialog/WebhookDeleteDialog.tsx @@ -1,4 +1,4 @@ -import DialogContentText from "@material-ui/core/DialogContentText"; +import { DialogContentText } from "@material-ui/core"; import ActionDialog from "@saleor/components/ActionDialog"; import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; import { getStringOrPlaceholder } from "@saleor/misc"; diff --git a/src/webhooks/components/WebhookEvents/WebhookEvents.tsx b/src/webhooks/components/WebhookEvents/WebhookEvents.tsx index 2c62b6cfc..2fde9a8d4 100644 --- a/src/webhooks/components/WebhookEvents/WebhookEvents.tsx +++ b/src/webhooks/components/WebhookEvents/WebhookEvents.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import Hr from "@saleor/components/Hr"; diff --git a/src/webhooks/components/WebhookInfo/WebhookInfo.tsx b/src/webhooks/components/WebhookInfo/WebhookInfo.tsx index 9c801403c..859a24c90 100644 --- a/src/webhooks/components/WebhookInfo/WebhookInfo.tsx +++ b/src/webhooks/components/WebhookInfo/WebhookInfo.tsx @@ -1,7 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import TextField from "@material-ui/core/TextField"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, TextField, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import FormSpacer from "@saleor/components/FormSpacer"; import Hr from "@saleor/components/Hr"; diff --git a/src/webhooks/components/WebhookStatus/WebhookStatus.tsx b/src/webhooks/components/WebhookStatus/WebhookStatus.tsx index ffbead75f..eaf6e0c97 100644 --- a/src/webhooks/components/WebhookStatus/WebhookStatus.tsx +++ b/src/webhooks/components/WebhookStatus/WebhookStatus.tsx @@ -1,6 +1,4 @@ -import Card from "@material-ui/core/Card"; -import CardContent from "@material-ui/core/CardContent"; -import Typography from "@material-ui/core/Typography"; +import { Card, CardContent, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import { ChangeEvent } from "@saleor/hooks/useForm"; diff --git a/src/webhooks/components/WebhooksList/WebhooksList.tsx b/src/webhooks/components/WebhooksList/WebhooksList.tsx index 830ac80db..ca4ce2583 100644 --- a/src/webhooks/components/WebhooksList/WebhooksList.tsx +++ b/src/webhooks/components/WebhooksList/WebhooksList.tsx @@ -1,10 +1,12 @@ -import Button from "@material-ui/core/Button"; -import Card from "@material-ui/core/Card"; -import IconButton from "@material-ui/core/IconButton"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableHead from "@material-ui/core/TableHead"; -import TableRow from "@material-ui/core/TableRow"; +import { + Button, + Card, + IconButton, + TableBody, + TableCell, + TableHead, + TableRow +} from "@material-ui/core"; import DeleteIcon from "@material-ui/icons/Delete"; import { App_app_webhooks } from "@saleor/apps/types/App"; import CardTitle from "@saleor/components/CardTitle"; diff --git a/testUtils/filters.ts b/testUtils/filters.ts index d26d998a6..48c6679a6 100644 --- a/testUtils/filters.ts +++ b/testUtils/filters.ts @@ -1,5 +1,5 @@ import { IFilter } from "@saleor/components/Filter"; -import clone from "lodash-es/clone"; +import clone from "lodash/clone"; export function getExistingKeys(o: {}): string[] { return Object.keys(o).filter(key => o[key] !== undefined && o[key] !== null); diff --git a/tslint.json b/tslint.json deleted file mode 100644 index 1f133a0e2..000000000 --- a/tslint.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": ["tslint:latest", "tslint-config-prettier"], - "rules": { - "interface-name": false, - "max-classes-per-file": false, - "member-access": [true, "no-public"], - "no-console": [true, "log"], - "no-implicit-dependencies": false, - "no-shadowed-variable": false, - "no-submodule-imports": [ - true, - "@material-ui", - "lodash-es", - "@assets", - "@locale", - "@saleor" - ] - } -} diff --git a/webpack.config.js b/webpack.config.js index 04b6db9f9..5870b8644 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,11 +6,23 @@ const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin"); const { InjectManifest } = require("workbox-webpack-plugin"); const SentryWebpackPlugin = require("@sentry/webpack-plugin"); +const BundleAnalyzerPlugin = require("webpack-bundle-analyzer") + .BundleAnalyzerPlugin; +const SpeedMeasurePlugin = require("speed-measure-webpack-plugin"); require("dotenv").config(); const resolve = path.resolve.bind(path, __dirname); +let bundleAnalyzerPlugin; +let speedMeasureWrapper = fn => fn; +const analyze = process.env.ANALYZE; +if (!!analyze) { + const smp = new SpeedMeasurePlugin(); + speedMeasureWrapper = smp.wrap; + bundleAnalyzerPlugin = new BundleAnalyzerPlugin(); +} + const pathsPlugin = new TsconfigPathsPlugin({ configFile: "./tsconfig.json" }); @@ -36,7 +48,7 @@ const environmentPlugin = new webpack.EnvironmentPlugin({ const dashboardBuildPath = "build/dashboard/"; -module.exports = (env, argv) => { +module.exports = speedMeasureWrapper((env, argv) => { const devMode = argv.mode !== "production"; let fileLoaderPath; @@ -135,11 +147,12 @@ module.exports = (env, argv) => { environmentPlugin, htmlWebpackPlugin, sentryPlugin, - manifestPlugin + manifestPlugin, + bundleAnalyzerPlugin ].filter(Boolean), resolve: { extensions: [".js", ".jsx", ".ts", ".tsx"], plugins: [pathsPlugin] } }; -}; +});