diff --git a/.storybook/config.js b/.storybook/config.js index dcb2a36a9..bc3c57f25 100755 --- a/.storybook/config.js +++ b/.storybook/config.js @@ -7,6 +7,7 @@ import { withI18next } from 'storybook-addon-i18next'; import i18n from '../src/i18n'; +import 'antd/dist/antd.css'; import '../src/index.css'; addDecorator(withNotes); diff --git a/package-lock.json b/package-lock.json index 27e1169a3..a2f75d0a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4107,6 +4107,16 @@ } } }, + "aphrodite": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/aphrodite/-/aphrodite-2.3.1.tgz", + "integrity": "sha512-hwRxpYarrHLRti62RlWplK3A1bDkh4dw5jjDh4Xvra6z45B5yx9Rqsiaw3duELCI/FLOYxlxVe1bysRpIw5X1Q==", + "requires": { + "asap": "^2.0.3", + "inline-style-prefixer": "^5.0.4", + "string-hash": "^1.1.3" + } + }, "app-root-dir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz", @@ -7047,6 +7057,15 @@ } } }, + "css-in-js-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz", + "integrity": "sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==", + "requires": { + "hyphenate-style-name": "^1.0.2", + "isobject": "^3.0.1" + } + }, "css-loader": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.0.tgz", @@ -9866,7 +9885,8 @@ }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", @@ -11143,6 +11163,11 @@ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" }, + "hyphenate-style-name": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz", + "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==" + }, "i18next": { "version": "15.0.2", "resolved": "https://registry.npmjs.org/i18next/-/i18next-15.0.2.tgz", @@ -11290,6 +11315,14 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, + "inline-style-prefixer": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-5.1.0.tgz", + "integrity": "sha512-giteQHPMrApQOSjNSjteO5ZGSGMRf9gas14fRy2lg2buSc1nRnj6o6xuNds5cMTKrkncyrTu3gJn/yflFMVdmg==", + "requires": { + "css-in-js-utils": "^2.0.0" + } + }, "inquirer": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz", @@ -21192,6 +21225,11 @@ "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz", "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c=" }, + "string-hash": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz", + "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=" + }, "string-length": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz", diff --git a/package.json b/package.json index 95a4489d0..678215315 100755 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "homepage": "https://agentlab.ru/rdf-scheme-editor", "dependencies": { + "aphrodite": "^2.3.1", "antd": "^3.14.1", "i18next": "^15.0.2", "i18next-browser-languagedetector": "^3.0.0", diff --git a/src/components/App.js b/src/App.js old mode 100644 new mode 100755 similarity index 100% rename from src/components/App.js rename to src/App.js diff --git a/src/AddRDF.stories.js b/src/components/AddRDF.stories.js old mode 100644 new mode 100755 similarity index 98% rename from src/AddRDF.stories.js rename to src/components/AddRDF.stories.js index bd6d64189..2c6213b2e --- a/src/AddRDF.stories.js +++ b/src/components/AddRDF.stories.js @@ -1,8 +1,5 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; -import 'antd/dist/antd.css'; -import './index.css'; - import { Form, Input, Button, Upload, Checkbox,Select, Radio, Layout, Icon } from 'antd'; diff --git a/src/Explore.stories.js b/src/components/Explore.stories.js old mode 100644 new mode 100755 similarity index 98% rename from src/Explore.stories.js rename to src/components/Explore.stories.js index 70a706423..bfb647235 --- a/src/Explore.stories.js +++ b/src/components/Explore.stories.js @@ -1,7 +1,6 @@ import { storiesOf } from '@storybook/react'; import React from 'react'; -import 'antd/dist/antd.css'; -import './index.css'; + import { Form, Select, Input, Button, Table, Checkbox } from 'antd'; diff --git a/src/ExportRepository.stories.js b/src/components/ExportRepository.stories.js old mode 100644 new mode 100755 similarity index 98% rename from src/ExportRepository.stories.js rename to src/components/ExportRepository.stories.js index c3fa8f760..1e1ec9436 --- a/src/ExportRepository.stories.js +++ b/src/components/ExportRepository.stories.js @@ -2,8 +2,6 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; import ReactDOM from 'react-dom'; -import 'antd/dist/antd.css'; -import './index.css'; import { Form, Input, Select, Button, Table } from 'antd'; diff --git a/src/Hello.stories.js b/src/components/Hello.stories.js old mode 100644 new mode 100755 similarity index 100% rename from src/Hello.stories.js rename to src/components/Hello.stories.js diff --git a/src/Lab1_Sobolev.stories.js b/src/components/Lab1_Sobolev.stories.js old mode 100644 new mode 100755 similarity index 99% rename from src/Lab1_Sobolev.stories.js rename to src/components/Lab1_Sobolev.stories.js index 8469f14e7..c03b5265b --- a/src/Lab1_Sobolev.stories.js +++ b/src/components/Lab1_Sobolev.stories.js @@ -1,7 +1,5 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; -import 'antd/dist/antd.css'; -import './index.css'; import { StyleSheet, css } from 'aphrodite'; import { Form, Icon, Input, Button, Checkbox, diff --git a/src/Repositories.stories.js b/src/components/Repositories.stories.js old mode 100644 new mode 100755 similarity index 93% rename from src/Repositories.stories.js rename to src/components/Repositories.stories.js index 0cb9e2a30..28cde208f --- a/src/Repositories.stories.js +++ b/src/components/Repositories.stories.js @@ -1,10 +1,8 @@ import { storiesOf } from "@storybook/react"; import React, { useEffect, useState } from "react"; -import "antd/dist/antd.css"; -import "./index.css"; import { Table } from "antd"; -import { executeGet, executeSelect, executeUpdate } from './sparql'; +import { executeGet, executeSelect, executeUpdate } from './../sparql'; const columns = [{ title: 'Id', diff --git a/src/Summary.stories.js b/src/components/Summary.stories.js old mode 100644 new mode 100755 similarity index 97% rename from src/Summary.stories.js rename to src/components/Summary.stories.js index 83049e521..d1231f0b8 --- a/src/Summary.stories.js +++ b/src/components/Summary.stories.js @@ -1,8 +1,6 @@ import { storiesOf } from '@storybook/react'; import React from 'react'; -import 'antd/dist/antd.css'; -import './index.css'; import { Form, Input, } from 'antd'; diff --git a/src/SystemInformation.stories.js b/src/components/SystemInformation.stories.js old mode 100644 new mode 100755 similarity index 97% rename from src/SystemInformation.stories.js rename to src/components/SystemInformation.stories.js index f64600b32..4d5a58593 --- a/src/SystemInformation.stories.js +++ b/src/components/SystemInformation.stories.js @@ -1,8 +1,6 @@ import { storiesOf } from "@storybook/react"; import React from "react"; import ReactDOM from "react-dom"; -import "antd/dist/antd.css"; -import "./index.css"; import { Form, Input } from "antd"; class LockedLayout extends React.Component { diff --git a/src/TableColumnsCustomization.stories.js b/src/components/TableColumnsCustomization.stories.js old mode 100644 new mode 100755 similarity index 99% rename from src/TableColumnsCustomization.stories.js rename to src/components/TableColumnsCustomization.stories.js index 8469f14e7..c03b5265b --- a/src/TableColumnsCustomization.stories.js +++ b/src/components/TableColumnsCustomization.stories.js @@ -1,7 +1,5 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; -import 'antd/dist/antd.css'; -import './index.css'; import { StyleSheet, css } from 'aphrodite'; import { Form, Icon, Input, Button, Checkbox, diff --git a/src/newRepository.stories.js b/src/components/newRepository.stories.js old mode 100644 new mode 100755 similarity index 100% rename from src/newRepository.stories.js rename to src/components/newRepository.stories.js