diff options
25 files changed, 40 insertions, 84 deletions
diff --git a/package-lock.json b/package-lock.json index 6dc24c638..3b71bdba0 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -5299,14 +5299,6 @@ | |||
5299 | "color": "4.0.1" | 5299 | "color": "4.0.1" |
5300 | } | 5300 | } |
5301 | }, | 5301 | }, |
5302 | "@meetfranz/ui": { | ||
5303 | "version": "file:packages/ui", | ||
5304 | "requires": { | ||
5305 | "@mdi/react": "1.5.0", | ||
5306 | "@meetfranz/theme": "file:packages/theme", | ||
5307 | "react-loader": "2.4.7" | ||
5308 | } | ||
5309 | }, | ||
5310 | "@nodelib/fs.scandir": { | 5302 | "@nodelib/fs.scandir": { |
5311 | "version": "2.1.5", | 5303 | "version": "2.1.5", |
5312 | "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", | 5304 | "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", |
@@ -16485,7 +16477,17 @@ | |||
16485 | "dev": true, | 16477 | "dev": true, |
16486 | "optional": true, | 16478 | "optional": true, |
16487 | "requires": { | 16479 | "requires": { |
16488 | "cli-truncate": "^1.1.0" | 16480 | "cli-truncate": "^1.1.0", |
16481 | "node-addon-api": "^1.6.3" | ||
16482 | }, | ||
16483 | "dependencies": { | ||
16484 | "node-addon-api": { | ||
16485 | "version": "1.7.2", | ||
16486 | "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", | ||
16487 | "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", | ||
16488 | "dev": true, | ||
16489 | "optional": true | ||
16490 | } | ||
16489 | } | 16491 | } |
16490 | }, | 16492 | }, |
16491 | "iconv-lite": { | 16493 | "iconv-lite": { |
diff --git a/package.json b/package.json index 1733c0e24..e7388eec9 100644 --- a/package.json +++ b/package.json | |||
@@ -66,7 +66,6 @@ | |||
66 | "@mdi/js": "6.2.95", | 66 | "@mdi/js": "6.2.95", |
67 | "@meetfranz/forms": "file:packages/forms", | 67 | "@meetfranz/forms": "file:packages/forms", |
68 | "@meetfranz/theme": "file:packages/theme", | 68 | "@meetfranz/theme": "file:packages/theme", |
69 | "@meetfranz/ui": "file:packages/ui", | ||
70 | "@sentry/electron": "2.5.3", | 69 | "@sentry/electron": "2.5.3", |
71 | "auto-launch": "5.0.5", | 70 | "auto-launch": "5.0.5", |
72 | "btoa": "1.2.1", | 71 | "btoa": "1.2.1", |
diff --git a/packages/ui/.gitignore b/packages/ui/.gitignore deleted file mode 100644 index d01826a6b..000000000 --- a/packages/ui/.gitignore +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | node_modules/ | ||
2 | lib | ||
diff --git a/packages/ui/package.json b/packages/ui/package.json deleted file mode 100644 index 0de76a98b..000000000 --- a/packages/ui/package.json +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | { | ||
2 | "name": "@meetfranz/ui", | ||
3 | "version": "1.1.0", | ||
4 | "description": "React UI 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": "Stefan Malzner <stefan@adlk.io>", | ||
24 | "license": "Apache-2.0", | ||
25 | "dependencies": { | ||
26 | "@mdi/react": "1.5.0", | ||
27 | "@meetfranz/theme": "file:../theme", | ||
28 | "react-loader": "2.4.7" | ||
29 | }, | ||
30 | "gitHead": "254da30f801169fac376bda1439b46cabbb491ad" | ||
31 | } | ||
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts deleted file mode 100644 index bab3fc27b..000000000 --- a/packages/ui/src/index.ts +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | export { Icon } from './icon'; | ||
2 | export { Infobox } from './infobox'; | ||
3 | export { H1, H2, H3, H4 } from './headline'; | ||
4 | export { Loader } from './loader'; | ||
5 | export { Badge } from './badge'; | ||
6 | export { ProBadge } from './badge/ProBadge'; | ||
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json deleted file mode 100644 index 015581136..000000000 --- a/packages/ui/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 d0efd6361..d009a2878 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js | |||
@@ -6,7 +6,7 @@ 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, Button } from '@meetfranz/forms'; |
9 | import { Badge } from '@meetfranz/ui'; | 9 | import { Badge } from '../ui/badge'; |
10 | import Modal from '../ui/Modal'; | 10 | import Modal from '../ui/Modal'; |
11 | import Infobox from '../ui/Infobox'; | 11 | import Infobox from '../ui/Infobox'; |
12 | import Appear from '../ui/effects/Appear'; | 12 | import Appear from '../ui/effects/Appear'; |
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js index 236d2739b..5111a081a 100644 --- a/src/components/services/content/ConnectionLostBanner.js +++ b/src/components/services/content/ConnectionLostBanner.js | |||
@@ -2,12 +2,11 @@ import { createRef, 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 injectSheet from 'react-jss'; | 4 | import injectSheet from 'react-jss'; |
5 | import { Icon } from '@meetfranz/ui'; | ||
6 | import { defineMessages, injectIntl } from 'react-intl'; | 5 | import { defineMessages, injectIntl } from 'react-intl'; |
7 | 6 | ||
8 | import { mdiAlert } from '@mdi/js'; | 7 | import { mdiAlert } from '@mdi/js'; |
9 | import { LIVE_API_FERDI_WEBSITE } from '../../../config'; | 8 | import { LIVE_API_FERDI_WEBSITE } from '../../../config'; |
10 | // import { Button } from '@meetfranz/forms'; | 9 | import { Icon } from '../../ui/icon'; |
11 | 10 | ||
12 | const messages = defineMessages({ | 11 | const messages = defineMessages({ |
13 | text: { | 12 | text: { |
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 686501267..6c489e64b 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -3,7 +3,7 @@ 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 ReactTooltip from 'react-tooltip'; | 5 | import ReactTooltip from 'react-tooltip'; |
6 | import { H1, H2 } from '@meetfranz/ui'; | 6 | import { H1, H2 } from '../../ui/headline'; |
7 | 7 | ||
8 | import Loader from '../../ui/Loader'; | 8 | import Loader from '../../ui/Loader'; |
9 | import Button from '../../ui/Button'; | 9 | import Button from '../../ui/Button'; |
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 0c521319a..8ab726eb3 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js | |||
@@ -6,7 +6,8 @@ import { Link } from 'react-router'; | |||
6 | 6 | ||
7 | import { Button, Input } from '@meetfranz/forms'; | 7 | import { Button, Input } from '@meetfranz/forms'; |
8 | import injectSheet from 'react-jss'; | 8 | import injectSheet from 'react-jss'; |
9 | import { H3, H2 } from '@meetfranz/ui'; | 9 | |
10 | import { H3, H2 } from '../../ui/headline'; | ||
10 | import SearchInput from '../../ui/SearchInput'; | 11 | import SearchInput from '../../ui/SearchInput'; |
11 | import Infobox from '../../ui/Infobox'; | 12 | import Infobox from '../../ui/Infobox'; |
12 | import RecipeItem from './RecipeItem'; | 13 | import RecipeItem from './RecipeItem'; |
diff --git a/src/components/ui/Modal/index.tsx b/src/components/ui/Modal/index.tsx index 0bb0aaa61..f2f4461b8 100644 --- a/src/components/ui/Modal/index.tsx +++ b/src/components/ui/Modal/index.tsx | |||
@@ -2,9 +2,9 @@ import { Component, ReactChildren } from 'react'; | |||
2 | import ReactModal from 'react-modal'; | 2 | import ReactModal from 'react-modal'; |
3 | import classnames from 'classnames'; | 3 | import classnames from 'classnames'; |
4 | import injectCSS from 'react-jss'; | 4 | import injectCSS from 'react-jss'; |
5 | import { Icon } from '@meetfranz/ui'; | ||
6 | |||
7 | import { mdiClose } from '@mdi/js'; | 5 | import { mdiClose } from '@mdi/js'; |
6 | |||
7 | import { Icon } from '../icon'; | ||
8 | import styles from './styles'; | 8 | import styles from './styles'; |
9 | 9 | ||
10 | type Props = { | 10 | type Props = { |
diff --git a/packages/ui/src/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx index be7ed8e58..cb6bc4c98 100644 --- a/packages/ui/src/badge/ProBadge.tsx +++ b/src/components/ui/badge/ProBadge.tsx | |||
@@ -3,8 +3,9 @@ import classnames from 'classnames'; | |||
3 | import { Component } from 'react'; | 3 | import { Component } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle from 'react-jss'; |
5 | 5 | ||
6 | import { Badge, Icon } from '..'; | 6 | import { Theme } from '@meetfranz/theme'; |
7 | import { Theme } from '../../../theme'; | 7 | import { Icon } from '../icon'; |
8 | import { Badge } from './index'; | ||
8 | import { IWithStyle } from '../typings/generic'; | 9 | import { IWithStyle } from '../typings/generic'; |
9 | 10 | ||
10 | interface IProps extends IWithStyle { | 11 | interface IProps extends IWithStyle { |
diff --git a/packages/ui/src/badge/index.tsx b/src/components/ui/badge/index.tsx index a8f3ebcbf..6495036ff 100644 --- a/packages/ui/src/badge/index.tsx +++ b/src/components/ui/badge/index.tsx | |||
@@ -2,7 +2,7 @@ import classnames from 'classnames'; | |||
2 | import { Component, ReactNode } from 'react'; | 2 | import { Component, ReactNode } from 'react'; |
3 | import injectStyle from 'react-jss'; | 3 | import injectStyle from 'react-jss'; |
4 | 4 | ||
5 | import { Theme } from '../../../theme'; | 5 | import { Theme } from '@meetfranz/theme'; |
6 | import { IWithStyle } from '../typings/generic'; | 6 | import { IWithStyle } from '../typings/generic'; |
7 | 7 | ||
8 | interface IProps extends IWithStyle { | 8 | interface IProps extends IWithStyle { |
diff --git a/packages/ui/src/headline/index.tsx b/src/components/ui/headline/index.tsx index b534a6298..3a3654f02 100644 --- a/packages/ui/src/headline/index.tsx +++ b/src/components/ui/headline/index.tsx | |||
@@ -2,7 +2,7 @@ import classnames from 'classnames'; | |||
2 | import { Component, createElement, ReactNode } from 'react'; | 2 | import { Component, createElement, ReactNode } from 'react'; |
3 | import injectStyle from 'react-jss'; | 3 | import injectStyle from 'react-jss'; |
4 | 4 | ||
5 | import { Theme } from '../../../theme'; | 5 | import { Theme } from '@meetfranz/theme'; |
6 | import { IWithStyle, Omit } from '../typings/generic'; | 6 | import { IWithStyle, Omit } from '../typings/generic'; |
7 | 7 | ||
8 | interface IProps extends IWithStyle { | 8 | interface IProps extends IWithStyle { |
diff --git a/packages/ui/src/icon/index.tsx b/src/components/ui/icon/index.tsx index 9753b399c..fdc48d14a 100644 --- a/packages/ui/src/icon/index.tsx +++ b/src/components/ui/icon/index.tsx | |||
@@ -3,7 +3,7 @@ import classnames from 'classnames'; | |||
3 | import { Component } from 'react'; | 3 | import { Component } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle from 'react-jss'; |
5 | 5 | ||
6 | import { Theme } from '../../../theme'; | 6 | import { Theme } from '@meetfranz/theme'; |
7 | import { IWithStyle } from '../typings/generic'; | 7 | import { IWithStyle } from '../typings/generic'; |
8 | 8 | ||
9 | interface IProps extends IWithStyle { | 9 | interface IProps extends IWithStyle { |
diff --git a/packages/ui/src/infobox/index.tsx b/src/components/ui/infobox/index.tsx index 7bad4a1f2..e6be83556 100644 --- a/packages/ui/src/infobox/index.tsx +++ b/src/components/ui/infobox/index.tsx | |||
@@ -3,8 +3,8 @@ import classnames from 'classnames'; | |||
3 | import { Component, ReactNode } from 'react'; | 3 | import { Component, ReactNode } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle from 'react-jss'; |
5 | 5 | ||
6 | import { Icon } from '..'; | 6 | import { Theme } from '@meetfranz/theme'; |
7 | import { Theme } from '../../../theme'; | 7 | import { Icon } from '../icon'; |
8 | import { IWithStyle } from '../typings/generic'; | 8 | import { IWithStyle } from '../typings/generic'; |
9 | 9 | ||
10 | interface IProps extends IWithStyle { | 10 | interface IProps extends IWithStyle { |
diff --git a/packages/ui/src/loader/index.tsx b/src/components/ui/loader/index.tsx index 0607bd48b..0607bd48b 100644 --- a/packages/ui/src/loader/index.tsx +++ b/src/components/ui/loader/index.tsx | |||
diff --git a/packages/ui/src/typings/generic.ts b/src/components/ui/typings/generic.ts index a2b9c041c..ddce3f7c7 100644 --- a/packages/ui/src/typings/generic.ts +++ b/src/components/ui/typings/generic.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Classes } from 'jss'; | 1 | import { Classes } from 'jss'; |
2 | 2 | ||
3 | import { Theme } from '../../../theme'; | 3 | import { Theme } from '@meetfranz/theme'; |
4 | 4 | ||
5 | export interface IWithStyle { | 5 | export interface IWithStyle { |
6 | classes: Classes; | 6 | classes: Classes; |
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js index 98a7cb5a2..64f782c8f 100644 --- a/src/features/nightlyBuilds/Component.js +++ b/src/features/nightlyBuilds/Component.js | |||
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; | |||
3 | import { observer, inject } from 'mobx-react'; | 3 | import { observer, inject } from 'mobx-react'; |
4 | import injectSheet from 'react-jss'; | 4 | import injectSheet from 'react-jss'; |
5 | import { defineMessages, injectIntl } from 'react-intl'; | 5 | import { defineMessages, injectIntl } from 'react-intl'; |
6 | import { H1 } from '@meetfranz/ui'; | 6 | import { H1 } from '../../components/ui/headline'; |
7 | 7 | ||
8 | import Modal from '../../components/ui/Modal'; | 8 | import Modal from '../../components/ui/Modal'; |
9 | import Button from '../../components/ui/Button'; | 9 | import Button from '../../components/ui/Button'; |
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js index d3751b63d..30bdc13b6 100644 --- a/src/features/publishDebugInfo/Component.js +++ b/src/features/publishDebugInfo/Component.js | |||
@@ -1,10 +1,11 @@ | |||
1 | import { H1 } from '@meetfranz/ui'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
3 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
4 | import { Component } from 'react'; | 3 | import { Component } from 'react'; |
5 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
6 | import injectSheet from 'react-jss'; | 5 | import injectSheet from 'react-jss'; |
7 | import { state as ModalState } from './store'; | 6 | import { state as ModalState } from './store'; |
7 | |||
8 | import { H1 } from '../../components/ui/headline'; | ||
8 | import { sendAuthRequest } from '../../api/utils/auth'; | 9 | import { sendAuthRequest } from '../../api/utils/auth'; |
9 | import Button from '../../components/ui/Button'; | 10 | import Button from '../../components/ui/Button'; |
10 | import Input from '../../components/ui/Input'; | 11 | import Input from '../../components/ui/Input'; |
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js index 76b3c9b4b..ced047a93 100644 --- a/src/features/quickSwitch/Component.js +++ b/src/features/quickSwitch/Component.js | |||
@@ -6,9 +6,9 @@ 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'; | 8 | import { Input } from '@meetfranz/forms'; |
9 | import { H1 } from '@meetfranz/ui'; | ||
10 | |||
11 | import { compact, invoke } from 'lodash'; | 9 | import { compact, invoke } from 'lodash'; |
10 | |||
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'; |
14 | import ServicesStore from '../../stores/ServicesStore'; | 14 | import ServicesStore from '../../stores/ServicesStore'; |
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js index 8261ede2b..5650d4cd1 100644 --- a/src/features/webControls/components/WebControls.js +++ b/src/features/webControls/components/WebControls.js | |||
@@ -2,7 +2,6 @@ import { createRef, 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 injectSheet from 'react-jss'; | 4 | import injectSheet from 'react-jss'; |
5 | import { Icon } from '@meetfranz/ui'; | ||
6 | import { defineMessages, injectIntl } from 'react-intl'; | 5 | import { defineMessages, injectIntl } from 'react-intl'; |
7 | 6 | ||
8 | import { | 7 | import { |
@@ -13,6 +12,8 @@ import { | |||
13 | mdiEarth, | 12 | mdiEarth, |
14 | } from '@mdi/js'; | 13 | } from '@mdi/js'; |
15 | 14 | ||
15 | import { Icon } from '../../../components/ui/icon'; | ||
16 | |||
16 | const messages = defineMessages({ | 17 | const messages = defineMessages({ |
17 | goHome: { | 18 | goHome: { |
18 | id: 'webControls.goHome', | 19 | id: 'webControls.goHome', |
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index 54e74fdf5..590efacd0 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js | |||
@@ -3,10 +3,12 @@ import PropTypes from 'prop-types'; | |||
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import injectSheet from 'react-jss'; | 4 | import injectSheet from 'react-jss'; |
5 | import { defineMessages, injectIntl } from 'react-intl'; | 5 | import { defineMessages, injectIntl } from 'react-intl'; |
6 | import { H1, Icon } from '@meetfranz/ui'; | ||
7 | import ReactTooltip from 'react-tooltip'; | 6 | import ReactTooltip from 'react-tooltip'; |
8 | 7 | ||
9 | import { mdiPlusBox, mdiCog } from '@mdi/js'; | 8 | import { mdiPlusBox, mdiCog } from '@mdi/js'; |
9 | |||
10 | import { H1 } from '../../../components/ui/headline'; | ||
11 | import { Icon } from '../../../components/ui/icon'; | ||
10 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; | 12 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; |
11 | import { workspaceActions } from '../actions'; | 13 | import { workspaceActions } from '../actions'; |
12 | import { workspaceStore } from '../index'; | 14 | import { workspaceStore } from '../index'; |
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js index 187b6a516..ff4e9475a 100644 --- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js +++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js | |||
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; | |||
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import injectSheet from 'react-jss'; | 4 | import injectSheet from 'react-jss'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | import { Loader } from '@meetfranz/ui'; | ||
7 | import { defineMessages, injectIntl } from 'react-intl'; | 6 | import { defineMessages, injectIntl } from 'react-intl'; |
8 | 7 | ||
8 | import { Loader } from '../../../components/ui/loader/index'; | ||
9 | import { workspaceStore } from '../index'; | 9 | import { workspaceStore } from '../index'; |
10 | 10 | ||
11 | const messages = defineMessages({ | 11 | const messages = defineMessages({ |
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index 8ab9174d3..6e0d98ffb 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js | |||
@@ -3,9 +3,10 @@ import PropTypes from 'prop-types'; | |||
3 | import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; |
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | import injectSheet from 'react-jss'; | 5 | import injectSheet from 'react-jss'; |
6 | import { Infobox } from '@meetfranz/ui'; | ||
7 | 6 | ||
8 | import { mdiCheckboxMarkedCircleOutline } from '@mdi/js'; | 7 | import { mdiCheckboxMarkedCircleOutline } from '@mdi/js'; |
8 | |||
9 | import { Infobox } from '../../../components/ui/infobox/index'; | ||
9 | import Loader from '../../../components/ui/Loader'; | 10 | import Loader from '../../../components/ui/Loader'; |
10 | import WorkspaceItem from './WorkspaceItem'; | 11 | import WorkspaceItem from './WorkspaceItem'; |
11 | import CreateWorkspaceForm from './CreateWorkspaceForm'; | 12 | import CreateWorkspaceForm from './CreateWorkspaceForm'; |