diff options
-rw-r--r-- | package-lock.json | 17 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | packages/forms/.gitignore | 2 | ||||
-rw-r--r-- | packages/forms/package.json | 33 | ||||
-rw-r--r-- | packages/forms/src/index.ts | 5 | ||||
-rw-r--r-- | packages/forms/src/typings/generic.ts | 19 | ||||
-rw-r--r-- | packages/forms/tsconfig.json | 12 | ||||
-rw-r--r-- | src/components/auth/SetupAssistant.js | 3 | ||||
-rw-r--r-- | src/components/settings/recipes/RecipesDashboard.js | 3 | ||||
-rw-r--r-- | src/components/settings/user/EditUserForm.js | 3 | ||||
-rw-r--r-- | src/components/ui/button/index.tsx (renamed from packages/forms/src/button/index.tsx) | 2 | ||||
-rw-r--r-- | src/components/ui/error/index.tsx (renamed from packages/forms/src/error/index.tsx) | 0 | ||||
-rw-r--r-- | src/components/ui/error/styles.ts (renamed from packages/forms/src/error/styles.ts) | 2 | ||||
-rw-r--r-- | src/components/ui/input/index.tsx (renamed from packages/forms/src/input/index.tsx) | 0 | ||||
-rw-r--r-- | src/components/ui/input/scorePassword.ts (renamed from packages/forms/src/input/scorePassword.ts) | 0 | ||||
-rw-r--r-- | src/components/ui/input/styles.ts (renamed from packages/forms/src/input/styles.ts) | 2 | ||||
-rw-r--r-- | src/components/ui/label/index.tsx (renamed from packages/forms/src/label/index.tsx) | 0 | ||||
-rw-r--r-- | src/components/ui/label/styles.ts (renamed from packages/forms/src/label/styles.ts) | 2 | ||||
-rw-r--r-- | src/components/ui/select/index.tsx (renamed from packages/forms/src/select/index.tsx) | 3 | ||||
-rw-r--r-- | src/components/ui/textarea/index.tsx (renamed from packages/forms/src/textarea/index.tsx) | 0 | ||||
-rw-r--r-- | src/components/ui/textarea/styles.ts (renamed from packages/forms/src/textarea/styles.ts) | 2 | ||||
-rw-r--r-- | src/components/ui/toggle/index.tsx (renamed from packages/forms/src/toggle/index.tsx) | 2 | ||||
-rw-r--r-- | src/components/ui/typings/generic.ts | 8 | ||||
-rw-r--r-- | src/components/ui/wrapper/index.tsx (renamed from packages/forms/src/wrapper/index.tsx) | 0 | ||||
-rw-r--r-- | src/features/quickSwitch/Component.js | 2 | ||||
-rw-r--r-- | src/features/workspaces/components/CreateWorkspaceForm.js | 4 | ||||
-rw-r--r-- | src/features/workspaces/components/EditWorkspaceForm.js | 5 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceServiceListItem.tsx | 2 |
28 files changed, 30 insertions, 105 deletions
diff --git a/package-lock.json b/package-lock.json index 3b71bdba0..f6742cca4 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -5276,23 +5276,6 @@ | |||
5276 | "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.5.0.tgz", | 5276 | "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.5.0.tgz", |
5277 | "integrity": "sha512-NztRgUxSYD+ImaKN94Tg66VVVqXj4SmlDGzZoz48H9riJ+Awha56sfXH2fegw819NWo7KI3oeS1Es0lNQqwr0w==" | 5277 | "integrity": "sha512-NztRgUxSYD+ImaKN94Tg66VVVqXj4SmlDGzZoz48H9riJ+Awha56sfXH2fegw819NWo7KI3oeS1Es0lNQqwr0w==" |
5278 | }, | 5278 | }, |
5279 | "@meetfranz/forms": { | ||
5280 | "version": "file:packages/forms", | ||
5281 | "requires": { | ||
5282 | "@mdi/js": "3.3.92", | ||
5283 | "@mdi/react": "1.5.0", | ||
5284 | "@meetfranz/theme": "file:packages/theme", | ||
5285 | "csstype": "3.0.8", | ||
5286 | "react-loader": "2.4.7" | ||
5287 | }, | ||
5288 | "dependencies": { | ||
5289 | "@mdi/js": { | ||
5290 | "version": "3.3.92", | ||
5291 | "resolved": "https://registry.npmjs.org/@mdi/js/-/js-3.3.92.tgz", | ||
5292 | "integrity": "sha512-l+12IwTycHlijWMiRWBAssm0RSgkQiwMthIy/EcBAdSqtnsHnFjHq+aI2MBZ8/AYX0QBxNUv4+EN0SXZgNkWDg==" | ||
5293 | } | ||
5294 | } | ||
5295 | }, | ||
5296 | "@meetfranz/theme": { | 5279 | "@meetfranz/theme": { |
5297 | "version": "file:packages/theme", | 5280 | "version": "file:packages/theme", |
5298 | "requires": { | 5281 | "requires": { |
diff --git a/package.json b/package.json index e7388eec9..248a96ef9 100644 --- a/package.json +++ b/package.json | |||
@@ -64,7 +64,7 @@ | |||
64 | "@electron/remote": "1.2.1", | 64 | "@electron/remote": "1.2.1", |
65 | "@mdi/font": "6.2.95", | 65 | "@mdi/font": "6.2.95", |
66 | "@mdi/js": "6.2.95", | 66 | "@mdi/js": "6.2.95", |
67 | "@meetfranz/forms": "file:packages/forms", | 67 | "@mdi/react": "1.5.0", |
68 | "@meetfranz/theme": "file:packages/theme", | 68 | "@meetfranz/theme": "file:packages/theme", |
69 | "@sentry/electron": "2.5.3", | 69 | "@sentry/electron": "2.5.3", |
70 | "auto-launch": "5.0.5", | 70 | "auto-launch": "5.0.5", |
diff --git a/packages/forms/.gitignore b/packages/forms/.gitignore deleted file mode 100644 index d01826a6b..000000000 --- a/packages/forms/.gitignore +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | node_modules/ | ||
2 | lib | ||
diff --git a/packages/forms/package.json b/packages/forms/package.json deleted file mode 100644 index f073221bc..000000000 --- a/packages/forms/package.json +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | { | ||
2 | "name": "@meetfranz/forms", | ||
3 | "version": "1.2.1", | ||
4 | "description": "React form components for Franz", | ||
5 | "main": "lib/index.js", | ||
6 | "scripts": { | ||
7 | "dev": "tsc -w", | ||
8 | "build": "tsc" | ||
9 | }, | ||
10 | "publishConfig": { | ||
11 | "access": "public" | ||
12 | }, | ||
13 | "repository": { | ||
14 | "type": "git", | ||
15 | "url": "git+https://github.com/meetfranz/franz.git" | ||
16 | }, | ||
17 | "keywords": [ | ||
18 | "Franz", | ||
19 | "Forms", | ||
20 | "React", | ||
21 | "UI" | ||
22 | ], | ||
23 | "author": "Amine Mouafik <amine@mouafik.fr>", | ||
24 | "license": "Apache-2.0", | ||
25 | "dependencies": { | ||
26 | "@mdi/js": "3.3.92", | ||
27 | "@mdi/react": "1.5.0", | ||
28 | "@meetfranz/theme": "file:../theme", | ||
29 | "csstype": "3.0.8", | ||
30 | "react-loader": "2.4.7" | ||
31 | }, | ||
32 | "gitHead": "00db2bddccb8bb8ad7d29b8d032876c798b8bbf3" | ||
33 | } | ||
diff --git a/packages/forms/src/index.ts b/packages/forms/src/index.ts deleted file mode 100644 index 45a9ed8e3..000000000 --- a/packages/forms/src/index.ts +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | export { Input } from './input'; | ||
2 | export { Textarea } from './textarea'; | ||
3 | export { Toggle } from './toggle'; | ||
4 | export { Button } from './button'; | ||
5 | export { Select } from './select'; | ||
diff --git a/packages/forms/src/typings/generic.ts b/packages/forms/src/typings/generic.ts deleted file mode 100644 index 0fd0cdbf3..000000000 --- a/packages/forms/src/typings/generic.ts +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | import { Classes } from 'jss'; | ||
2 | |||
3 | import { Theme } from '../../../theme'; | ||
4 | |||
5 | export interface IFormField { | ||
6 | showLabel?: boolean; | ||
7 | label?: string; | ||
8 | error?: string; | ||
9 | required?: boolean; | ||
10 | noMargin?: boolean; | ||
11 | } | ||
12 | |||
13 | export interface IWithStyle { | ||
14 | classes: Classes; | ||
15 | theme: Theme; | ||
16 | } | ||
17 | |||
18 | export type Merge<M, N> = Omit<M, Extract<keyof M, keyof N>> & N; | ||
19 | export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; | ||
diff --git a/packages/forms/tsconfig.json b/packages/forms/tsconfig.json deleted file mode 100644 index 015581136..000000000 --- a/packages/forms/tsconfig.json +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | { | ||
2 | "extends": "../../tsconfig.json", | ||
3 | "compilerOptions": { | ||
4 | "outDir": "lib", | ||
5 | "rootDir": "src" | ||
6 | }, | ||
7 | "references": [ | ||
8 | { | ||
9 | "path": "../theme" | ||
10 | } | ||
11 | ] | ||
12 | } | ||
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index d009a2878..1665bf837 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js | |||
@@ -5,7 +5,8 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
5 | import injectSheet from 'react-jss'; | 5 | import injectSheet from 'react-jss'; |
6 | import classnames from 'classnames'; | 6 | import classnames from 'classnames'; |
7 | 7 | ||
8 | import { Input, Button } from '@meetfranz/forms'; | 8 | import { Input } from '../ui/input/index'; |
9 | import { Button } from '../ui/button/index'; | ||
9 | import { Badge } from '../ui/badge'; | 10 | import { Badge } from '../ui/badge'; |
10 | import Modal from '../ui/Modal'; | 11 | import Modal from '../ui/Modal'; |
11 | import Infobox from '../ui/Infobox'; | 12 | import Infobox from '../ui/Infobox'; |
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 8ab726eb3..bdb6f3ca0 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js | |||
@@ -4,9 +4,10 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | |||
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | import { Link } from 'react-router'; | 5 | import { Link } from 'react-router'; |
6 | 6 | ||
7 | import { Button, Input } from '@meetfranz/forms'; | ||
8 | import injectSheet from 'react-jss'; | 7 | import injectSheet from 'react-jss'; |
9 | 8 | ||
9 | import { Button } from '../../ui/button/index'; | ||
10 | import { Input } from '../../ui/input/index'; | ||
10 | import { H3, H2 } from '../../ui/headline'; | 11 | import { H3, H2 } from '../../ui/headline'; |
11 | import SearchInput from '../../ui/SearchInput'; | 12 | import SearchInput from '../../ui/SearchInput'; |
12 | import Infobox from '../../ui/Infobox'; | 13 | import Infobox from '../../ui/Infobox'; |
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index 55883e65f..1b8a4f25a 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js | |||
@@ -3,10 +3,9 @@ import PropTypes from 'prop-types'; | |||
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | import { Link } from 'react-router'; | 5 | import { Link } from 'react-router'; |
6 | import { Input } from '@meetfranz/forms'; | ||
7 | 6 | ||
7 | import { Input } from '../../ui/input/index'; | ||
8 | import Form from '../../../lib/Form'; | 8 | import Form from '../../../lib/Form'; |
9 | // import Input from '../../ui/Input'; | ||
10 | import Button from '../../ui/Button'; | 9 | import Button from '../../ui/Button'; |
11 | import Radio from '../../ui/Radio'; | 10 | import Radio from '../../ui/Radio'; |
12 | import Infobox from '../../ui/Infobox'; | 11 | import Infobox from '../../ui/Infobox'; |
diff --git a/packages/forms/src/button/index.tsx b/src/components/ui/button/index.tsx index d9f372c4b..5b8927b51 100644 --- a/packages/forms/src/button/index.tsx +++ b/src/components/ui/button/index.tsx | |||
@@ -4,9 +4,9 @@ import { Property } from 'csstype'; | |||
4 | import { Component, MouseEvent } from 'react'; | 4 | import { Component, MouseEvent } from 'react'; |
5 | import injectStyle, { withTheme } from 'react-jss'; | 5 | import injectStyle, { withTheme } from 'react-jss'; |
6 | import Loader from 'react-loader'; | 6 | import Loader from 'react-loader'; |
7 | import { Theme } from '@meetfranz/theme'; | ||
7 | 8 | ||
8 | import { IFormField, IWithStyle } from '../typings/generic'; | 9 | import { IFormField, IWithStyle } from '../typings/generic'; |
9 | import { Theme } from '../../../theme'; | ||
10 | 10 | ||
11 | type ButtonType = | 11 | type ButtonType = |
12 | | 'primary' | 12 | | 'primary' |
diff --git a/packages/forms/src/error/index.tsx b/src/components/ui/error/index.tsx index 8439bfc8b..8439bfc8b 100644 --- a/packages/forms/src/error/index.tsx +++ b/src/components/ui/error/index.tsx | |||
diff --git a/packages/forms/src/error/styles.ts b/src/components/ui/error/styles.ts index 4c0c7e2c0..ed993ddd5 100644 --- a/packages/forms/src/error/styles.ts +++ b/src/components/ui/error/styles.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Theme } from '../../../theme'; | 1 | import { Theme } from '@meetfranz/theme'; |
2 | 2 | ||
3 | export default (theme: Theme) => ({ | 3 | export default (theme: Theme) => ({ |
4 | message: { | 4 | message: { |
diff --git a/packages/forms/src/input/index.tsx b/src/components/ui/input/index.tsx index 0b16fe688..0b16fe688 100644 --- a/packages/forms/src/input/index.tsx +++ b/src/components/ui/input/index.tsx | |||
diff --git a/packages/forms/src/input/scorePassword.ts b/src/components/ui/input/scorePassword.ts index 59502e2b0..59502e2b0 100644 --- a/packages/forms/src/input/scorePassword.ts +++ b/src/components/ui/input/scorePassword.ts | |||
diff --git a/packages/forms/src/input/styles.ts b/src/components/ui/input/styles.ts index 6d56e93b3..27426152e 100644 --- a/packages/forms/src/input/styles.ts +++ b/src/components/ui/input/styles.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Property } from 'csstype'; | 1 | import { Property } from 'csstype'; |
2 | 2 | ||
3 | import { Theme } from '../../../theme'; | 3 | import { Theme } from '@meetfranz/theme'; |
4 | 4 | ||
5 | const prefixStyles = (theme: Theme) => ({ | 5 | const prefixStyles = (theme: Theme) => ({ |
6 | background: theme.inputPrefixBackground, | 6 | background: theme.inputPrefixBackground, |
diff --git a/packages/forms/src/label/index.tsx b/src/components/ui/label/index.tsx index 4d86f23f7..4d86f23f7 100644 --- a/packages/forms/src/label/index.tsx +++ b/src/components/ui/label/index.tsx | |||
diff --git a/packages/forms/src/label/styles.ts b/src/components/ui/label/styles.ts index 7c62b6b4c..0c9cef8bf 100644 --- a/packages/forms/src/label/styles.ts +++ b/src/components/ui/label/styles.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Theme } from '../../../theme'; | 1 | import { Theme } from '@meetfranz/theme'; |
2 | 2 | ||
3 | export default (theme: Theme) => ({ | 3 | export default (theme: Theme) => ({ |
4 | content: {}, | 4 | content: {}, |
diff --git a/packages/forms/src/select/index.tsx b/src/components/ui/select/index.tsx index d965d3c93..41cab7818 100644 --- a/packages/forms/src/select/index.tsx +++ b/src/components/ui/select/index.tsx | |||
@@ -8,8 +8,9 @@ import classnames from 'classnames'; | |||
8 | import { ChangeEvent, Component, createRef } from 'react'; | 8 | import { ChangeEvent, Component, createRef } from 'react'; |
9 | import injectStyle from 'react-jss'; | 9 | import injectStyle from 'react-jss'; |
10 | 10 | ||
11 | import { Theme } from '@meetfranz/theme'; | ||
12 | |||
11 | import { IFormField, IWithStyle } from '../typings/generic'; | 13 | import { IFormField, IWithStyle } from '../typings/generic'; |
12 | import { Theme } from '../../../theme'; | ||
13 | 14 | ||
14 | import { Error } from '../error'; | 15 | import { Error } from '../error'; |
15 | import { Label } from '../label'; | 16 | import { Label } from '../label'; |
diff --git a/packages/forms/src/textarea/index.tsx b/src/components/ui/textarea/index.tsx index 1b16698eb..1b16698eb 100644 --- a/packages/forms/src/textarea/index.tsx +++ b/src/components/ui/textarea/index.tsx | |||
diff --git a/packages/forms/src/textarea/styles.ts b/src/components/ui/textarea/styles.ts index ff3a3202b..f2267e000 100644 --- a/packages/forms/src/textarea/styles.ts +++ b/src/components/ui/textarea/styles.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Property } from 'csstype'; | 1 | import { Property } from 'csstype'; |
2 | 2 | ||
3 | import { Theme } from '../../../theme'; | 3 | import { Theme } from '@meetfranz/theme'; |
4 | 4 | ||
5 | export default (theme: Theme) => ({ | 5 | export default (theme: Theme) => ({ |
6 | label: { | 6 | label: { |
diff --git a/packages/forms/src/toggle/index.tsx b/src/components/ui/toggle/index.tsx index f9ef5775a..67b6c3835 100644 --- a/packages/forms/src/toggle/index.tsx +++ b/src/components/ui/toggle/index.tsx | |||
@@ -2,9 +2,9 @@ import classnames from 'classnames'; | |||
2 | import { Property } from 'csstype'; | 2 | import { Property } from 'csstype'; |
3 | import { Component, InputHTMLAttributes } from 'react'; | 3 | import { Component, InputHTMLAttributes } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle from 'react-jss'; |
5 | import { Theme } from '@meetfranz/theme'; | ||
5 | 6 | ||
6 | import { IFormField, IWithStyle } from '../typings/generic'; | 7 | import { IFormField, IWithStyle } from '../typings/generic'; |
7 | import { Theme } from '../../../theme'; | ||
8 | 8 | ||
9 | import { Error } from '../error'; | 9 | import { Error } from '../error'; |
10 | import { Label } from '../label'; | 10 | import { Label } from '../label'; |
diff --git a/src/components/ui/typings/generic.ts b/src/components/ui/typings/generic.ts index ddce3f7c7..084e0e0a5 100644 --- a/src/components/ui/typings/generic.ts +++ b/src/components/ui/typings/generic.ts | |||
@@ -2,6 +2,14 @@ import { Classes } from 'jss'; | |||
2 | 2 | ||
3 | import { Theme } from '@meetfranz/theme'; | 3 | import { Theme } from '@meetfranz/theme'; |
4 | 4 | ||
5 | export interface IFormField { | ||
6 | showLabel?: boolean; | ||
7 | label?: string; | ||
8 | error?: string; | ||
9 | required?: boolean; | ||
10 | noMargin?: boolean; | ||
11 | } | ||
12 | |||
5 | export interface IWithStyle { | 13 | export interface IWithStyle { |
6 | classes: Classes; | 14 | classes: Classes; |
7 | theme: Theme; | 15 | theme: Theme; |
diff --git a/packages/forms/src/wrapper/index.tsx b/src/components/ui/wrapper/index.tsx index ffcd6fe0b..ffcd6fe0b 100644 --- a/packages/forms/src/wrapper/index.tsx +++ b/src/components/ui/wrapper/index.tsx | |||
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js index ced047a93..d5cb9179f 100644 --- a/src/features/quickSwitch/Component.js +++ b/src/features/quickSwitch/Component.js | |||
@@ -5,9 +5,9 @@ import { observer, inject } from 'mobx-react'; | |||
5 | import { reaction } from 'mobx'; | 5 | import { reaction } from 'mobx'; |
6 | import injectSheet from 'react-jss'; | 6 | import injectSheet from 'react-jss'; |
7 | import { defineMessages, injectIntl } from 'react-intl'; | 7 | import { defineMessages, injectIntl } from 'react-intl'; |
8 | import { Input } from '@meetfranz/forms'; | ||
9 | import { compact, invoke } from 'lodash'; | 8 | import { compact, invoke } from 'lodash'; |
10 | 9 | ||
10 | import { Input } from '../../components/ui/input/index'; | ||
11 | import { H1 } from '../../components/ui/headline'; | 11 | import { H1 } from '../../components/ui/headline'; |
12 | import Modal from '../../components/ui/Modal'; | 12 | import Modal from '../../components/ui/Modal'; |
13 | import { state as ModalState } from './store'; | 13 | import { state as ModalState } from './store'; |
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js index c93f8f6f7..75f6d9f4a 100644 --- a/src/features/workspaces/components/CreateWorkspaceForm.js +++ b/src/features/workspaces/components/CreateWorkspaceForm.js | |||
@@ -2,8 +2,10 @@ import { Component } from 'react'; | |||
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | import { Input, Button } from '@meetfranz/forms'; | ||
6 | import injectSheet from 'react-jss'; | 5 | import injectSheet from 'react-jss'; |
6 | |||
7 | import { Input } from '../../../components/ui/input/index'; | ||
8 | import { Button } from '../../../components/ui/button/index'; | ||
7 | import Form from '../../../lib/Form'; | 9 | import Form from '../../../lib/Form'; |
8 | import { required } from '../../../helpers/validation-helpers'; | 10 | import { required } from '../../../helpers/validation-helpers'; |
9 | import { workspaceStore } from '../index'; | 11 | import { workspaceStore } from '../index'; |
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js index 1bd06c4b2..fa3ea4289 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js | |||
@@ -1,11 +1,12 @@ | |||
1 | import { Component, Fragment } from 'react'; | 1 | import { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | import { Link } from 'react-router'; | 5 | import { Link } from 'react-router'; |
6 | import { Input, Button } from '@meetfranz/forms'; | ||
7 | import injectSheet from 'react-jss'; | 6 | import injectSheet from 'react-jss'; |
8 | 7 | ||
8 | import { Input } from '../../../components/ui/input/index'; | ||
9 | import { Button } from '../../../components/ui/button/index'; | ||
9 | import Workspace from '../models/Workspace'; | 10 | import Workspace from '../models/Workspace'; |
10 | import Service from '../../../models/Service'; | 11 | import Service from '../../../models/Service'; |
11 | import Form from '../../../lib/Form'; | 12 | import Form from '../../../lib/Form'; |
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx index b6faaf4ce..6e012eb1e 100644 --- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx +++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx | |||
@@ -2,8 +2,8 @@ import { Component } from 'react'; | |||
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import injectSheet from 'react-jss'; | 3 | import injectSheet from 'react-jss'; |
4 | import classnames from 'classnames'; | 4 | import classnames from 'classnames'; |
5 | import { Toggle } from '@meetfranz/forms'; | ||
6 | 5 | ||
6 | import { Toggle } from '../../../components/ui/toggle/index'; | ||
7 | import ServiceIcon from '../../../components/ui/ServiceIcon'; | 7 | import ServiceIcon from '../../../components/ui/ServiceIcon'; |
8 | 8 | ||
9 | const styles = theme => ({ | 9 | const styles = theme => ({ |