diff options
author | 2022-05-18 23:33:07 +0530 | |
---|---|---|
committer | 2022-05-18 13:03:07 -0500 | |
commit | 3c9f6f1f9d44ac484e0e76f5cd0563f76461ca9b (patch) | |
tree | e39a37a28846cda6ca30baf0a74663b97932751e /src | |
parent | 6.0.0-nightly.40 [skip ci] (diff) | |
download | ferdium-app-3c9f6f1f9d44ac484e0e76f5cd0563f76461ca9b.tar.gz ferdium-app-3c9f6f1f9d44ac484e0e76f5cd0563f76461ca9b.tar.zst ferdium-app-3c9f6f1f9d44ac484e0e76f5cd0563f76461ca9b.zip |
Remove duplicated Button.js component (#176)
Diffstat (limited to 'src')
25 files changed, 34 insertions, 120 deletions
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index a7aa33ab1..61e0aed68 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js | |||
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
5 | import Form from '../../lib/Form'; | 5 | import Form from '../../lib/Form'; |
6 | import Input from '../ui/Input'; | 6 | import Input from '../ui/Input'; |
7 | import Select from '../ui/Select'; | 7 | import Select from '../ui/Select'; |
8 | import Button from '../ui/Button'; | 8 | import Button from '../ui/button'; |
9 | import Link from '../ui/Link'; | 9 | import Link from '../ui/Link'; |
10 | import Infobox from '../ui/Infobox'; | 10 | import Infobox from '../ui/Infobox'; |
11 | import { url, required } from '../../helpers/validation-helpers'; | 11 | import { url, required } from '../../helpers/validation-helpers'; |
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index e7d5731f9..e43be07a8 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js | |||
@@ -7,7 +7,7 @@ import classnames from 'classnames'; | |||
7 | 7 | ||
8 | import Form from '../../lib/Form'; | 8 | import Form from '../../lib/Form'; |
9 | import Toggle from '../ui/Toggle'; | 9 | import Toggle from '../ui/Toggle'; |
10 | import Button from '../ui/Button'; | 10 | import Button from '../ui/button'; |
11 | import { H1 } from '../ui/headline'; | 11 | import { H1 } from '../ui/headline'; |
12 | 12 | ||
13 | const messages = defineMessages({ | 13 | const messages = defineMessages({ |
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index 84adb320f..8e1ab514e 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -10,7 +10,7 @@ import Appear from '../ui/effects/Appear'; | |||
10 | import Form from '../../lib/Form'; | 10 | import Form from '../../lib/Form'; |
11 | import { email } from '../../helpers/validation-helpers'; | 11 | import { email } from '../../helpers/validation-helpers'; |
12 | import Input from '../ui/Input'; | 12 | import Input from '../ui/Input'; |
13 | import Button from '../ui/Button'; | 13 | import Button from '../ui/button'; |
14 | import { H1 } from '../ui/headline'; | 14 | import { H1 } from '../ui/headline'; |
15 | 15 | ||
16 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 710810f2b..90ee46722 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js | |||
@@ -6,7 +6,7 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
6 | 6 | ||
7 | import Form from '../../lib/Form'; | 7 | import Form from '../../lib/Form'; |
8 | import Input from '../ui/Input'; | 8 | import Input from '../ui/Input'; |
9 | import Button from '../ui/Button'; | 9 | import Button from '../ui/button'; |
10 | import { H1 } from '../ui/headline'; | 10 | import { H1 } from '../ui/headline'; |
11 | import { isMac } from '../../environment'; | 11 | import { isMac } from '../../environment'; |
12 | 12 | ||
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index f1c58a020..c6b26a21d 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -9,7 +9,7 @@ import { API_VERSION } from '../../environment-remote'; | |||
9 | import Form from '../../lib/Form'; | 9 | import Form from '../../lib/Form'; |
10 | import { required, email } from '../../helpers/validation-helpers'; | 10 | import { required, email } from '../../helpers/validation-helpers'; |
11 | import Input from '../ui/Input'; | 11 | import Input from '../ui/Input'; |
12 | import Button from '../ui/Button'; | 12 | import Button from '../ui/button'; |
13 | import Link from '../ui/Link'; | 13 | import Link from '../ui/Link'; |
14 | 14 | ||
15 | import { globalError as globalErrorPropType } from '../../prop-types'; | 15 | import { globalError as globalErrorPropType } from '../../prop-types'; |
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index 0e87cb028..0daa4c77a 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js | |||
@@ -6,7 +6,7 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
6 | import Form from '../../lib/Form'; | 6 | import Form from '../../lib/Form'; |
7 | import { required, email } from '../../helpers/validation-helpers'; | 7 | import { required, email } from '../../helpers/validation-helpers'; |
8 | import Input from '../ui/Input'; | 8 | import Input from '../ui/Input'; |
9 | import Button from '../ui/Button'; | 9 | import Button from '../ui/button'; |
10 | import Link from '../ui/Link'; | 10 | import Link from '../ui/Link'; |
11 | import Infobox from '../ui/Infobox'; | 11 | import Infobox from '../ui/Infobox'; |
12 | import globalMessages from '../../i18n/globalMessages'; | 12 | import globalMessages from '../../i18n/globalMessages'; |
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index 90f6733a6..7658eb1ff 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 } from '../ui/input/index'; | 8 | import { Input } from '../ui/input/index'; |
9 | import { Button } from '../ui/button/index'; | 9 | import Button from '../ui/button'; |
10 | import { Badge } from '../ui/badge'; | 10 | import { Badge } from '../ui/badge'; |
11 | import Modal from '../ui/Modal'; | 11 | import Modal from '../ui/Modal'; |
12 | import * as Infobox from '../ui/Infobox'; | 12 | import * as Infobox from '../ui/Infobox'; |
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 930b24491..05b6576fa 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -7,7 +7,7 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
7 | import Form from '../../lib/Form'; | 7 | import Form from '../../lib/Form'; |
8 | import { required, email, minLength } from '../../helpers/validation-helpers'; | 8 | import { required, email, minLength } from '../../helpers/validation-helpers'; |
9 | import Input from '../ui/Input'; | 9 | import Input from '../ui/Input'; |
10 | import Button from '../ui/Button'; | 10 | import Button from '../ui/button'; |
11 | import Link from '../ui/Link'; | 11 | import Link from '../ui/Link'; |
12 | 12 | ||
13 | import { globalError as globalErrorPropType } from '../../prop-types'; | 13 | import { globalError as globalErrorPropType } from '../../prop-types'; |
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js index cdc12b01b..a658bec8b 100644 --- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js +++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js | |||
@@ -4,7 +4,7 @@ import { observer } 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 | 6 | ||
7 | import Button from '../../../ui/Button'; | 7 | import Button from '../../../ui/button'; |
8 | 8 | ||
9 | import styles from './styles'; | 9 | import styles from './styles'; |
10 | import { H1 } from '../../../ui/headline'; | 10 | import { H1 } from '../../../ui/headline'; |
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js index da5357bf2..d874a354e 100644 --- a/src/components/services/content/ServiceDisabled.js +++ b/src/components/services/content/ServiceDisabled.js | |||
@@ -3,7 +3,7 @@ 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 | 5 | ||
6 | import Button from '../../ui/Button'; | 6 | import Button from '../../ui/button'; |
7 | import { H1 } from '../../ui/headline'; | 7 | import { H1 } from '../../ui/headline'; |
8 | 8 | ||
9 | const messages = defineMessages({ | 9 | const messages = defineMessages({ |
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index 7e635e9ab..0e6e61be8 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js | |||
@@ -4,7 +4,7 @@ import { observer } from 'mobx-react'; | |||
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | import ms from 'ms'; | 5 | import ms from 'ms'; |
6 | 6 | ||
7 | import Button from '../../ui/Button'; | 7 | import Button from '../../ui/button'; |
8 | import { H1 } from '../../ui/headline'; | 8 | import { H1 } from '../../ui/headline'; |
9 | 9 | ||
10 | const messages = defineMessages({ | 10 | const messages = defineMessages({ |
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 1d2d7a207..32e82940d 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -6,7 +6,7 @@ import ReactTooltip from 'react-tooltip'; | |||
6 | import { H1, H2 } from '../../ui/headline'; | 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'; |
10 | import Infobox from '../../ui/Infobox'; | 10 | import Infobox from '../../ui/Infobox'; |
11 | import { LOCAL_SERVER, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../../config'; | 11 | import { LOCAL_SERVER, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../../config'; |
12 | 12 | ||
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index ef41119c1..ba363ffa9 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js | |||
@@ -7,7 +7,7 @@ import { Link } from 'react-router'; | |||
7 | import injectSheet from 'react-jss'; | 7 | import injectSheet from 'react-jss'; |
8 | 8 | ||
9 | import { mdiOpenInNew } from '@mdi/js'; | 9 | import { mdiOpenInNew } from '@mdi/js'; |
10 | import { Button } from '../../ui/button/index'; | 10 | import Button from '../../ui/button'; |
11 | import { Input } from '../../ui/input/index'; | 11 | import { Input } from '../../ui/input/index'; |
12 | import { H3, H2, H1 } from '../../ui/headline'; | 12 | import { H3, H2, H1 } from '../../ui/headline'; |
13 | import SearchInput from '../../ui/SearchInput'; | 13 | import SearchInput from '../../ui/SearchInput'; |
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 8e2696e6b..42e21dbc8 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -14,7 +14,7 @@ import { TabItem } from '../../ui/Tabs/TabItem'; | |||
14 | import Input from '../../ui/Input'; | 14 | import Input from '../../ui/Input'; |
15 | import Toggle from '../../ui/Toggle'; | 15 | import Toggle from '../../ui/Toggle'; |
16 | import Slider from '../../ui/Slider'; | 16 | import Slider from '../../ui/Slider'; |
17 | import Button from '../../ui/Button'; | 17 | import Button from '../../ui/button'; |
18 | import ImageUpload from '../../ui/ImageUpload'; | 18 | import ImageUpload from '../../ui/ImageUpload'; |
19 | import Select from '../../ui/Select'; | 19 | import Select from '../../ui/Select'; |
20 | 20 | ||
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js index bcbbca3de..991817175 100644 --- a/src/components/settings/services/ServiceError.js +++ b/src/components/settings/services/ServiceError.js | |||
@@ -4,7 +4,7 @@ import { Link } from 'react-router'; | |||
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | 5 | ||
6 | import Infobox from '../../ui/Infobox'; | 6 | import Infobox from '../../ui/Infobox'; |
7 | import Button from '../../ui/Button'; | 7 | import Button from '../../ui/button'; |
8 | 8 | ||
9 | const messages = defineMessages({ | 9 | const messages = defineMessages({ |
10 | headline: { | 10 | headline: { |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index a59314eb7..3a4a48177 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -8,7 +8,7 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
8 | import { mdiGithub, mdiOpenInNew, mdiPowerPlug } from '@mdi/js'; | 8 | import { mdiGithub, mdiOpenInNew, mdiPowerPlug } from '@mdi/js'; |
9 | 9 | ||
10 | import Form from '../../../lib/Form'; | 10 | import Form from '../../../lib/Form'; |
11 | import Button from '../../ui/Button'; | 11 | import Button from '../../ui/button'; |
12 | import Toggle from '../../ui/Toggle'; | 12 | import Toggle from '../../ui/Toggle'; |
13 | import Select from '../../ui/Select'; | 13 | import Select from '../../ui/Select'; |
14 | import Input from '../../ui/Input'; | 14 | import Input from '../../ui/Input'; |
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 228796ad9..538a9a10c 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js | |||
@@ -7,7 +7,7 @@ import injectSheet from 'react-jss'; | |||
7 | import classnames from 'classnames'; | 7 | import classnames from 'classnames'; |
8 | 8 | ||
9 | import Loader from '../../ui/Loader'; | 9 | import Loader from '../../ui/Loader'; |
10 | import Button from '../../ui/Button'; | 10 | import Button from '../../ui/button'; |
11 | import Infobox from '../../ui/Infobox'; | 11 | import Infobox from '../../ui/Infobox'; |
12 | import { H1 } from '../../ui/headline'; | 12 | import { H1 } from '../../ui/headline'; |
13 | import { LIVE_FRANZ_API } from '../../../config'; | 13 | import { LIVE_FRANZ_API } from '../../../config'; |
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index 4d101730f..fb9ef5c9a 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js | |||
@@ -6,7 +6,7 @@ import { Link } from 'react-router'; | |||
6 | 6 | ||
7 | import { Input } from '../../ui/input/index'; | 7 | import { Input } from '../../ui/input/index'; |
8 | import Form from '../../../lib/Form'; | 8 | import Form from '../../../lib/Form'; |
9 | import Button from '../../ui/Button'; | 9 | import Button from '../../ui/button'; |
10 | import Radio from '../../ui/Radio'; | 10 | import Radio from '../../ui/Radio'; |
11 | import Infobox from '../../ui/Infobox'; | 11 | import Infobox from '../../ui/Infobox'; |
12 | import { H2 } from '../../ui/headline'; | 12 | import { H2 } from '../../ui/headline'; |
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js deleted file mode 100644 index 882b39e69..000000000 --- a/src/components/ui/Button.js +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | import { Component } from 'react'; | ||
2 | import PropTypes from 'prop-types'; | ||
3 | import { observer, inject } from 'mobx-react'; | ||
4 | import Loader from 'react-loader'; | ||
5 | import classnames from 'classnames'; | ||
6 | |||
7 | // Can this file be merged into the './/button/index.tsx' file? | ||
8 | class Button extends Component { | ||
9 | static propTypes = { | ||
10 | className: PropTypes.string, | ||
11 | label: PropTypes.string.isRequired, | ||
12 | disabled: PropTypes.bool, | ||
13 | onClick: PropTypes.func, | ||
14 | type: PropTypes.string, | ||
15 | buttonType: PropTypes.string, | ||
16 | loaded: PropTypes.bool, | ||
17 | htmlForm: PropTypes.string, | ||
18 | stores: PropTypes.shape({ | ||
19 | settings: PropTypes.shape({ | ||
20 | app: PropTypes.shape({ | ||
21 | accentColor: PropTypes.string.isRequired, | ||
22 | }).isRequired, | ||
23 | }).isRequired, | ||
24 | }).isRequired, | ||
25 | }; | ||
26 | |||
27 | static defaultProps = { | ||
28 | className: null, | ||
29 | disabled: false, | ||
30 | onClick: () => {}, | ||
31 | type: 'button', | ||
32 | buttonType: '', | ||
33 | loaded: true, | ||
34 | htmlForm: '', | ||
35 | }; | ||
36 | |||
37 | render() { | ||
38 | const { | ||
39 | label, | ||
40 | className, | ||
41 | disabled, | ||
42 | onClick, | ||
43 | type, | ||
44 | buttonType, | ||
45 | loaded, | ||
46 | htmlForm, | ||
47 | } = this.props; | ||
48 | |||
49 | const buttonProps = { | ||
50 | className: classnames({ | ||
51 | 'franz-form__button': true, | ||
52 | [`franz-form__button--${buttonType}`]: buttonType, | ||
53 | [`${className}`]: className, | ||
54 | }), | ||
55 | type, | ||
56 | }; | ||
57 | |||
58 | if (disabled) { | ||
59 | buttonProps.disabled = true; | ||
60 | } | ||
61 | |||
62 | if (onClick) { | ||
63 | buttonProps.onClick = onClick; | ||
64 | } | ||
65 | |||
66 | if (htmlForm) { | ||
67 | buttonProps.form = htmlForm; | ||
68 | } | ||
69 | |||
70 | return ( | ||
71 | // disabling rule as button has type defined in `buttonProps` | ||
72 | /* eslint-disable react/button-has-type */ | ||
73 | <button {...buttonProps}> | ||
74 | <Loader | ||
75 | loaded={loaded} | ||
76 | lines={10} | ||
77 | scale={0.4} | ||
78 | color={ | ||
79 | buttonType !== 'secondary' | ||
80 | ? '#FFF' | ||
81 | : this.props.stores.settings.app.accentColor | ||
82 | } | ||
83 | component="span" | ||
84 | /> | ||
85 | {label} | ||
86 | </button> | ||
87 | /* eslint-enable react/button-has-type */ | ||
88 | ); | ||
89 | } | ||
90 | } | ||
91 | |||
92 | export default inject('stores')(observer(Button)); | ||
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx index 11369dcbd..9c64e909a 100644 --- a/src/components/ui/button/index.tsx +++ b/src/components/ui/button/index.tsx | |||
@@ -30,12 +30,17 @@ interface IProps extends IFormField, WithStylesProps<typeof styles> { | |||
30 | icon?: string; | 30 | icon?: string; |
31 | href?: string; | 31 | href?: string; |
32 | target?: string; | 32 | target?: string; |
33 | htmlForm?: string; | ||
33 | } | 34 | } |
34 | 35 | ||
35 | let buttonTransition: string = 'none'; | 36 | let buttonTransition: string = 'none'; |
36 | let loaderContainerTransition: string = 'none'; | 37 | let loaderContainerTransition: string = 'none'; |
37 | 38 | ||
38 | if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { | 39 | if ( |
40 | typeof window !== 'undefined' && | ||
41 | window && | ||
42 | window.matchMedia('(prefers-reduced-motion: no-preference)') | ||
43 | ) { | ||
39 | buttonTransition = 'background .5s, opacity 0.3s'; | 44 | buttonTransition = 'background .5s, opacity 0.3s'; |
40 | loaderContainerTransition = 'all 0.3s'; | 45 | loaderContainerTransition = 'all 0.3s'; |
41 | } | 46 | } |
@@ -187,10 +192,10 @@ class ButtonComponent extends Component<IProps> { | |||
187 | icon, | 192 | icon, |
188 | href, | 193 | href, |
189 | target, | 194 | target, |
195 | htmlForm, | ||
190 | } = this.props; | 196 | } = this.props; |
191 | 197 | ||
192 | const { busy } = this.state; | 198 | const { busy } = this.state; |
193 | |||
194 | let showLoader = false; | 199 | let showLoader = false; |
195 | if (loaded) { | 200 | if (loaded) { |
196 | showLoader = !loaded; | 201 | showLoader = !loaded; |
@@ -235,6 +240,7 @@ class ButtonComponent extends Component<IProps> { | |||
235 | })} | 240 | })} |
236 | disabled={disabled} | 241 | disabled={disabled} |
237 | data-type="franz-button" | 242 | data-type="franz-button" |
243 | {...(htmlForm && { form: htmlForm })} | ||
238 | > | 244 | > |
239 | {content} | 245 | {content} |
240 | </button> | 246 | </button> |
@@ -259,6 +265,6 @@ class ButtonComponent extends Component<IProps> { | |||
259 | } | 265 | } |
260 | } | 266 | } |
261 | 267 | ||
262 | export const Button = injectStyle(styles, { injectTheme: true })( | 268 | const Button = injectStyle(styles, { injectTheme: true })(ButtonComponent); |
263 | ButtonComponent, | 269 | |
264 | ); | 270 | export default Button; |
diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.js index 8687cc09f..c1861e5f7 100644 --- a/src/components/util/ErrorBoundary/index.js +++ b/src/components/util/ErrorBoundary/index.js | |||
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; | |||
3 | import injectSheet from 'react-jss'; | 3 | import injectSheet from 'react-jss'; |
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | 5 | ||
6 | import Button from '../../ui/Button'; | 6 | import Button from '../../ui/button'; |
7 | import { H1 } from '../../ui/headline'; | 7 | import { H1 } from '../../ui/headline'; |
8 | 8 | ||
9 | import styles from './styles'; | 9 | import styles from './styles'; |
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js index ab5c518f8..acba5a90d 100644 --- a/src/features/basicAuth/Component.js +++ b/src/features/basicAuth/Component.js | |||
@@ -7,7 +7,7 @@ import classnames from 'classnames'; | |||
7 | 7 | ||
8 | import Modal from '../../components/ui/Modal'; | 8 | import Modal from '../../components/ui/Modal'; |
9 | import Input from '../../components/ui/Input'; | 9 | import Input from '../../components/ui/Input'; |
10 | import Button from '../../components/ui/Button'; | 10 | import Button from '../../components/ui/button'; |
11 | 11 | ||
12 | import { state, resetState, sendCredentials, cancelLogin } from './store'; | 12 | import { state, resetState, sendCredentials, cancelLogin } from './store'; |
13 | import Form from './Form'; | 13 | import Form from './Form'; |
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js index ff052a050..c40f8559f 100644 --- a/src/features/publishDebugInfo/Component.js +++ b/src/features/publishDebugInfo/Component.js | |||
@@ -7,7 +7,7 @@ import { state as ModalState } from './store'; | |||
7 | 7 | ||
8 | import { H1 } from '../../components/ui/headline'; | 8 | import { H1 } from '../../components/ui/headline'; |
9 | import { sendAuthRequest } from '../../api/utils/auth'; | 9 | import { sendAuthRequest } from '../../api/utils/auth'; |
10 | import Button from '../../components/ui/Button'; | 10 | import Button from '../../components/ui/button'; |
11 | import { Input } from '../../components/ui/input/index'; | 11 | import { Input } from '../../components/ui/input/index'; |
12 | import Modal from '../../components/ui/Modal'; | 12 | import Modal from '../../components/ui/Modal'; |
13 | import { DEBUG_API } from '../../config'; | 13 | import { DEBUG_API } from '../../config'; |
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js index 898afb22e..aebe740d0 100644 --- a/src/features/workspaces/components/CreateWorkspaceForm.js +++ b/src/features/workspaces/components/CreateWorkspaceForm.js | |||
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
5 | import injectSheet from 'react-jss'; | 5 | import injectSheet from 'react-jss'; |
6 | 6 | ||
7 | import { Input } from '../../../components/ui/input/index'; | 7 | import { Input } from '../../../components/ui/input/index'; |
8 | import { Button } from '../../../components/ui/button/index'; | 8 | import Button from '../../../components/ui/button'; |
9 | import Form from '../../../lib/Form'; | 9 | import Form from '../../../lib/Form'; |
10 | import { required } from '../../../helpers/validation-helpers'; | 10 | import { required } from '../../../helpers/validation-helpers'; |
11 | 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 6829fddaa..9baa80e98 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js | |||
@@ -7,7 +7,7 @@ import injectSheet from 'react-jss'; | |||
7 | 7 | ||
8 | import { Infobox } from '../../../components/ui/infobox/index'; | 8 | import { Infobox } from '../../../components/ui/infobox/index'; |
9 | import { Input } from '../../../components/ui/input/index'; | 9 | import { Input } from '../../../components/ui/input/index'; |
10 | import { Button } from '../../../components/ui/button/index'; | 10 | import Button from '../../../components/ui/button'; |
11 | import Workspace from '../models/Workspace'; | 11 | import Workspace from '../models/Workspace'; |
12 | import Service from '../../../models/Service'; | 12 | import Service from '../../../models/Service'; |
13 | import Form from '../../../lib/Form'; | 13 | import Form from '../../../lib/Form'; |