diff --git a/.eslintrc.json b/.eslintrc.json
index 701e7ae..9be5a0b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -22,6 +22,7 @@
"react/display-name": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"react/prop-types": "off",
- "no-unused-vars": "warn"
+ "no-unused-vars": "warn",
+ "react/react-in-jsx-scope": "off"
}
}
diff --git a/src/client/App.tsx b/src/client/App.tsx
index d49ed5d..eb79d3b 100644
--- a/src/client/App.tsx
+++ b/src/client/App.tsx
@@ -1,6 +1,5 @@
import { StoreProvider } from 'client/contexts/storeContext';
import theme from 'client/UIKit/theme';
-import React from 'react';
import { BrowserRouter } from 'react-router-dom';
import { ThemeProvider } from 'styled-components';
import './App.less';
diff --git a/src/client/Components/Result.jsx b/src/client/Components/Result.jsx
index e2686f2..93c3d0c 100644
--- a/src/client/Components/Result.jsx
+++ b/src/client/Components/Result.jsx
@@ -1,5 +1,4 @@
import { Result } from 'antd';
-import React from 'react';
export default {
404: () => ,
diff --git a/src/client/Components/Spinner.jsx b/src/client/Components/Spinner.jsx
index 65238a4..28e712f 100644
--- a/src/client/Components/Spinner.jsx
+++ b/src/client/Components/Spinner.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { Box, Flex } from 'client/UIKit/grid';
import { Spin } from 'antd';
diff --git a/src/client/Containers/Calculation/Info/index.jsx b/src/client/Containers/Calculation/Info/index.jsx
index 11e27ba..fc98b5b 100644
--- a/src/client/Containers/Calculation/Info/index.jsx
+++ b/src/client/Containers/Calculation/Info/index.jsx
@@ -1,6 +1,5 @@
import { renderGroups } from 'client/Containers/Calculation/lib/renderSections';
import Background from 'client/Elements/Background';
-import React from 'react';
import { controlsList } from './infoList';
const Results = props => (
diff --git a/src/client/Containers/Calculation/Results/index.jsx b/src/client/Containers/Calculation/Results/index.jsx
index 68cee8b..e4c5a13 100644
--- a/src/client/Containers/Calculation/Results/index.jsx
+++ b/src/client/Containers/Calculation/Results/index.jsx
@@ -1,7 +1,6 @@
import { renderGroups } from 'client/Containers/Calculation/lib/renderSections';
import Background from 'client/Elements/Background';
import { Flex } from 'client/UIKit/grid';
-import React from 'react';
import { calculationResults } from './resultsList';
const Results = props => (
diff --git a/src/client/Containers/Calculation/ResultsTable/index.jsx b/src/client/Containers/Calculation/ResultsTable/index.jsx
index 1db7f5f..e1e68fd 100644
--- a/src/client/Containers/Calculation/ResultsTable/index.jsx
+++ b/src/client/Containers/Calculation/ResultsTable/index.jsx
@@ -1,7 +1,6 @@
import { renderGroups } from 'client/Containers/Calculation/lib/renderSections';
import Background from 'client/Elements/Background';
import { Flex } from 'client/UIKit/grid';
-import React from 'react';
import { resultsTable } from './resultsTableList';
const Results = props => (
diff --git a/src/client/Containers/Calculation/Sections/index.jsx b/src/client/Containers/Calculation/Sections/index.jsx
index 1acbb12..76d3d43 100644
--- a/src/client/Containers/Calculation/Sections/index.jsx
+++ b/src/client/Containers/Calculation/Sections/index.jsx
@@ -1,5 +1,4 @@
import Background from 'client/Elements/Background';
-import React from 'react';
import { renderSections } from '../lib/renderSections';
import sectionsList from './sectionsList';
diff --git a/src/client/Containers/Calculation/index.jsx b/src/client/Containers/Calculation/index.jsx
index 85eef56..cfbe520 100644
--- a/src/client/Containers/Calculation/index.jsx
+++ b/src/client/Containers/Calculation/index.jsx
@@ -4,7 +4,6 @@ import Modal from 'client/Elements/Modal';
import withModal from 'client/hocs/Calculation/withModal';
import { useFetch } from 'client/hooks/Calculation/useFetch';
import { Flex } from 'client/UIKit/grid';
-import React from 'react';
import Info from './Info';
import fetchData from './lib/fetchData';
import Results from './Results';
diff --git a/src/client/Containers/Calculation/lib/renderSections.js b/src/client/Containers/Calculation/lib/renderSections.js
index d6504d5..e785758 100644
--- a/src/client/Containers/Calculation/lib/renderSections.js
+++ b/src/client/Containers/Calculation/lib/renderSections.js
@@ -2,7 +2,7 @@ import { Divider as AntDivider, Tabs } from 'antd';
import { SecondaryColoredText } from 'client/Elements/Text';
import colors from 'client/UIKit/colors';
import { Flex } from 'client/UIKit/grid';
-import React from 'react';
+import { Fragment } from 'react';
import styled from 'styled-components';
import { buildElement } from '../lib/buildElement';
import elementsTitles from './elements/titles';
@@ -41,7 +41,7 @@ const renderBlocks = ({ blocks }) => {
const newLine = layout && layout.newLine;
const width = (layout && layout.width) || '33%';
return (
-
+
{newLine && }
{
{/* {!isSingleElement && blocks.length > 1 && ib < blocks.length - 2 && (
)} */}
-
+
);
});
};
@@ -77,7 +77,7 @@ export const renderGroups = ({ groups }) => {
return groups.map((group, ig) => {
const { title: blocksTitle, blocks } = group;
return (
-
+
{blocksTitle && (
{
{renderBlocks({ blocks })}
-
+
);
});
};
diff --git a/src/client/Containers/NotFound.jsx b/src/client/Containers/NotFound.jsx
index 2c28fa7..3874ced 100644
--- a/src/client/Containers/NotFound.jsx
+++ b/src/client/Containers/NotFound.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
import Result from 'client/Components/Result';
const NotFound = () => {
diff --git a/src/client/Elements/Button.jsx b/src/client/Elements/Button.jsx
index b8ce2d6..13b8913 100644
--- a/src/client/Elements/Button.jsx
+++ b/src/client/Elements/Button.jsx
@@ -1,6 +1,5 @@
import { Button as AntButton } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const Button = ({ status, action, text, ...props }) => {
return (
diff --git a/src/client/Elements/Checkbox.jsx b/src/client/Elements/Checkbox.jsx
index c8b9505..6e87c98 100644
--- a/src/client/Elements/Checkbox.jsx
+++ b/src/client/Elements/Checkbox.jsx
@@ -1,6 +1,5 @@
import { Checkbox as AntCheckbox, Form } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const Checkbox = ({
value,
diff --git a/src/client/Elements/Download.jsx b/src/client/Elements/Download.jsx
index 34d6b96..82706a8 100644
--- a/src/client/Elements/Download.jsx
+++ b/src/client/Elements/Download.jsx
@@ -1,6 +1,5 @@
import { Button as AntButton } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const Download = ({ status, url, text, icon: Icon, ...props }) => {
return (
diff --git a/src/client/Elements/Input.jsx b/src/client/Elements/Input.jsx
index 4c13627..9c50182 100644
--- a/src/client/Elements/Input.jsx
+++ b/src/client/Elements/Input.jsx
@@ -1,6 +1,5 @@
import { Form, Input as AntInput } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const Input = ({
value,
diff --git a/src/client/Elements/InputNumber.jsx b/src/client/Elements/InputNumber.jsx
index acfa4d1..364e666 100644
--- a/src/client/Elements/InputNumber.jsx
+++ b/src/client/Elements/InputNumber.jsx
@@ -1,6 +1,5 @@
import { Form, InputNumber as AntInputNumber } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const InputNumber = ({
value,
diff --git a/src/client/Elements/Label.jsx b/src/client/Elements/Label.jsx
index 5510983..ff8ec2d 100644
--- a/src/client/Elements/Label.jsx
+++ b/src/client/Elements/Label.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
import styled from 'styled-components';
const TextWrapper = styled.div`
diff --git a/src/client/Elements/Modal.jsx b/src/client/Elements/Modal.jsx
index d8981eb..5a2baeb 100644
--- a/src/client/Elements/Modal.jsx
+++ b/src/client/Elements/Modal.jsx
@@ -1,5 +1,4 @@
import { Modal as AntModal } from 'antd';
-import React from 'react';
const Modal = ({ visible, text, closeModal, ...props }) => {
return (
diff --git a/src/client/Elements/Radio.jsx b/src/client/Elements/Radio.jsx
index 5b11b55..23d386d 100644
--- a/src/client/Elements/Radio.jsx
+++ b/src/client/Elements/Radio.jsx
@@ -1,6 +1,5 @@
import { Form, Radio as AntRadio } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const Radio = ({
value,
diff --git a/src/client/Elements/Select.jsx b/src/client/Elements/Select.jsx
index 614a3f2..e7dab69 100644
--- a/src/client/Elements/Select.jsx
+++ b/src/client/Elements/Select.jsx
@@ -1,6 +1,5 @@
import { Form, Select as AntSelect } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const Select = ({
value,
diff --git a/src/client/Elements/Switch.jsx b/src/client/Elements/Switch.jsx
index f0278d4..854721a 100644
--- a/src/client/Elements/Switch.jsx
+++ b/src/client/Elements/Switch.jsx
@@ -1,6 +1,5 @@
import { Form, Switch as AntSwitch } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const Switch = ({
value,
diff --git a/src/client/Elements/Table.jsx b/src/client/Elements/Table.jsx
index 21dcb6d..042c944 100644
--- a/src/client/Elements/Table.jsx
+++ b/src/client/Elements/Table.jsx
@@ -1,7 +1,6 @@
import { withTableValue } from 'client/hocs/Calculation/withTable';
import colors from 'client/UIKit/colors';
import { Box } from 'client/UIKit/grid';
-import React from 'react';
import styled from 'styled-components';
import mq from 'client/UIKit/mq';
diff --git a/src/client/Elements/TextArea.jsx b/src/client/Elements/TextArea.jsx
index 3ff087c..863a593 100644
--- a/src/client/Elements/TextArea.jsx
+++ b/src/client/Elements/TextArea.jsx
@@ -1,6 +1,5 @@
import { Form, Input as AntInput } from 'antd';
import { ElementStatus } from 'core/types/statuses';
-import React from 'react';
const TextArea = ({
value,
diff --git a/src/client/Elements/Title.jsx b/src/client/Elements/Title.jsx
index 61b1380..171c448 100644
--- a/src/client/Elements/Title.jsx
+++ b/src/client/Elements/Title.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
import styled from 'styled-components';
const TitleText = styled.div`
diff --git a/src/client/Layout/Auth.jsx b/src/client/Layout/Auth.jsx
index 8bc70b0..5595136 100644
--- a/src/client/Layout/Auth.jsx
+++ b/src/client/Layout/Auth.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
import Cookies from 'js-cookie';
import styled from 'styled-components';
import mq from 'client/UIKit/mq';
diff --git a/src/client/Layout/Header.jsx b/src/client/Layout/Header.jsx
index f5c0b7f..5b7bb61 100644
--- a/src/client/Layout/Header.jsx
+++ b/src/client/Layout/Header.jsx
@@ -1,7 +1,6 @@
import colors from 'client/UIKit/colors';
import { Flex } from 'client/UIKit/grid';
import mq from 'client/UIKit/mq';
-import React from 'react';
import styled from 'styled-components';
import Logo from './Logo';
import Auth from './Auth';
diff --git a/src/client/Layout/Logo.jsx b/src/client/Layout/Logo.jsx
index f2b9519..b513ab2 100644
--- a/src/client/Layout/Logo.jsx
+++ b/src/client/Layout/Logo.jsx
@@ -1,5 +1,4 @@
import mq from 'client/UIKit/mq';
-import React from 'react';
import styled from 'styled-components';
import { Flex } from 'client/UIKit/grid';
import colors from 'client/UIKit/colors';
diff --git a/src/client/Layout/index.jsx b/src/client/Layout/index.jsx
index 0a59d93..d60448e 100644
--- a/src/client/Layout/index.jsx
+++ b/src/client/Layout/index.jsx
@@ -1,5 +1,4 @@
import { Flex } from 'client/UIKit/grid';
-import React from 'react';
import Header from './Header';
import Routes from './routes';
diff --git a/src/client/Layout/routes.jsx b/src/client/Layout/routes.jsx
index 59cf0f7..377f63b 100644
--- a/src/client/Layout/routes.jsx
+++ b/src/client/Layout/routes.jsx
@@ -1,6 +1,6 @@
import paths from 'core/common/paths';
import Spinner from 'client/Components/Spinner';
-import React, { Suspense } from 'react';
+import { Suspense } from 'react';
import { Route, Switch } from 'react-router-dom';
import { container as resolveContainer } from 'core/tools/resolve';
diff --git a/src/client/contexts/storeContext.js b/src/client/contexts/storeContext.js
index 4469702..db8f0a1 100644
--- a/src/client/contexts/storeContext.js
+++ b/src/client/contexts/storeContext.js
@@ -1,4 +1,4 @@
-import React, { createContext } from "react";
+import { createContext } from "react";
import RootStore from "client/stores";
export const StoreContext = createContext();
diff --git a/src/client/hocs/Calculation/withButton.jsx b/src/client/hocs/Calculation/withButton.jsx
index 4db1307..e232294 100644
--- a/src/client/hocs/Calculation/withButton.jsx
+++ b/src/client/hocs/Calculation/withButton.jsx
@@ -1,7 +1,6 @@
import { observer } from 'mobx-react-lite';
import { useStatus } from 'client/hooks/Calculation/useStatus';
import { useAction } from 'client/hooks/Calculation/useAction';
-import React from 'react';
export default Button => ({ name, actionName, ...props }) =>
observer(() => {
diff --git a/src/client/hocs/Calculation/withComputedValue.jsx b/src/client/hocs/Calculation/withComputedValue.jsx
index f74ada3..a618008 100644
--- a/src/client/hocs/Calculation/withComputedValue.jsx
+++ b/src/client/hocs/Calculation/withComputedValue.jsx
@@ -1,7 +1,6 @@
import { observer } from 'mobx-react-lite';
import { useComputedValue } from 'client/hooks/Calculation/useValue';
import { useStatus } from 'client/hooks/Calculation/useStatus';
-import React from 'react';
export default Component => ({
name,
diff --git a/src/client/hocs/Calculation/withLink.jsx b/src/client/hocs/Calculation/withLink.jsx
index 7a1425c..67cd187 100644
--- a/src/client/hocs/Calculation/withLink.jsx
+++ b/src/client/hocs/Calculation/withLink.jsx
@@ -1,7 +1,6 @@
import { useStatus } from 'client/hooks/Calculation/useStatus';
import { useUrl } from 'client/hooks/Calculation/useUrl';
import { observer } from 'mobx-react-lite';
-import React from 'react';
export default Button => ({ name, urlName, ...props }) =>
observer(() => {
diff --git a/src/client/hocs/Calculation/withModal.jsx b/src/client/hocs/Calculation/withModal.jsx
index 7b61ac7..0bc1ef6 100644
--- a/src/client/hocs/Calculation/withModal.jsx
+++ b/src/client/hocs/Calculation/withModal.jsx
@@ -1,5 +1,4 @@
import { observer } from 'mobx-react-lite';
-import React from 'react';
import { useModal } from 'client/hooks/Calculation/useModal';
export default Modal =>
diff --git a/src/client/hocs/Calculation/withTable.jsx b/src/client/hocs/Calculation/withTable.jsx
index 6033bf3..19c3738 100644
--- a/src/client/hocs/Calculation/withTable.jsx
+++ b/src/client/hocs/Calculation/withTable.jsx
@@ -4,7 +4,6 @@ import { useTableValidation } from 'client/hooks/Calculation/useValidation';
import { useTableValue } from 'client/hooks/Calculation/useValue';
import { useStores } from 'client/hooks/useStores';
import { observer } from 'mobx-react-lite';
-import React from 'react';
export default Table => props => {
const { name: tableName } = props;
diff --git a/src/client/hocs/Calculation/withValue.jsx b/src/client/hocs/Calculation/withValue.jsx
index 801030b..62d9031 100644
--- a/src/client/hocs/Calculation/withValue.jsx
+++ b/src/client/hocs/Calculation/withValue.jsx
@@ -3,7 +3,6 @@ import { useStoreValue } from 'client/hooks/Calculation/useValue';
import { useStatus } from 'client/hooks/Calculation/useStatus';
import { useValidation } from 'client/hooks/Calculation/useValidation';
import { useOptions } from 'client/hooks/Calculation/useOptions';
-import React from 'react';
export default Component => ({ name, valueName, validation, ...props }) =>
observer(() => {
diff --git a/src/index.tsx b/src/index.tsx
index 8b27c95..9153e04 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import ReactDOM from 'react-dom';
import App from './client/App';
import * as serviceWorker from './client/serviceWorker';
diff --git a/tsconfig.json b/tsconfig.json
index 7e37103..2cb5c08 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,5 +21,5 @@
"noFallthroughCasesInSwitch": true
},
"include": ["src", "src/client"],
- "exclude": ["src/server", "./node_modules/**/*"]
+ "exclude": ["./node_modules/**/*"]
}