diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/Sidebar.js | 9 | ||||
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 4 | ||||
-rw-r--r-- | src/components/subscription/SubscriptionPopup.js | 1 | ||||
-rw-r--r-- | src/components/ui/ActivateTrialButton/index.js | 5 | ||||
-rw-r--r-- | src/components/ui/FAB.js | 14 | ||||
-rw-r--r-- | src/components/ui/FullscreenLoader/index.js | 3 | ||||
-rw-r--r-- | src/components/ui/PremiumFeatureContainer/index.js | 5 | ||||
-rw-r--r-- | src/components/ui/Tabs/Tabs.js | 4 | ||||
-rw-r--r-- | src/components/ui/ToggleRaw.js | 1 | ||||
-rw-r--r-- | src/components/ui/UpgradeButton/index.js | 5 |
10 files changed, 27 insertions, 24 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index ee5699a83..802538eba 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -10,6 +10,8 @@ import { ctrlKey, isMac } from '../../environment'; | |||
10 | import { workspaceStore } from '../../features/workspaces'; | 10 | import { workspaceStore } from '../../features/workspaces'; |
11 | import { todosStore } from '../../features/todos'; | 11 | import { todosStore } from '../../features/todos'; |
12 | import { todoActions } from '../../features/todos/actions'; | 12 | import { todoActions } from '../../features/todos/actions'; |
13 | import AppStore from '../../stores/AppStore'; | ||
14 | import SettingsStore from '../../stores/SettingsStore'; | ||
13 | 15 | ||
14 | // Platform specific shortcut keys | 16 | // Platform specific shortcut keys |
15 | const settingsShortcutKey = isMac ? ',' : 'P'; | 17 | const settingsShortcutKey = isMac ? ',' : 'P'; |
@@ -61,6 +63,13 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp | |||
61 | isWorkspaceDrawerOpen: PropTypes.bool.isRequired, | 63 | isWorkspaceDrawerOpen: PropTypes.bool.isRequired, |
62 | toggleWorkspaceDrawer: PropTypes.func.isRequired, | 64 | toggleWorkspaceDrawer: PropTypes.func.isRequired, |
63 | isTodosServiceActive: PropTypes.bool.isRequired, | 65 | isTodosServiceActive: PropTypes.bool.isRequired, |
66 | stores: PropTypes.shape({ | ||
67 | app: PropTypes.instanceOf(AppStore).isRequired, | ||
68 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | ||
69 | }).isRequired, | ||
70 | actions: PropTypes.shape({ | ||
71 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | ||
72 | }).isRequired, | ||
64 | }; | 73 | }; |
65 | 74 | ||
66 | static contextTypes = { | 75 | static contextTypes = { |
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index 616c8c587..cebab2f12 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -57,9 +57,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e | |||
57 | router: PropTypes.instanceOf(RouterStore).isRequired, | 57 | router: PropTypes.instanceOf(RouterStore).isRequired, |
58 | }).isRequired, | 58 | }).isRequired, |
59 | actions: PropTypes.shape({ | 59 | actions: PropTypes.shape({ |
60 | settings: PropTypes.shape({ | 60 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
61 | update: PropTypes.func.isRequired, | ||
62 | }).isRequired, | ||
63 | }).isRequired, | 61 | }).isRequired, |
64 | serviceCount: PropTypes.number.isRequired, | 62 | serviceCount: PropTypes.number.isRequired, |
65 | workspaceCount: PropTypes.number.isRequired, | 63 | workspaceCount: PropTypes.number.isRequired, |
diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js index 12a51ad7b..0df43fd4b 100644 --- a/src/components/subscription/SubscriptionPopup.js +++ b/src/components/subscription/SubscriptionPopup.js | |||
@@ -57,7 +57,6 @@ export default @observer class SubscriptionPopup extends Component { | |||
57 | <div className="subscription-popup__content"> | 57 | <div className="subscription-popup__content"> |
58 | <Webview | 58 | <Webview |
59 | className="subscription-popup__webview" | 59 | className="subscription-popup__webview" |
60 | |||
61 | autosize | 60 | autosize |
62 | allowpopups | 61 | allowpopups |
63 | src={encodeURI(url)} | 62 | src={encodeURI(url)} |
diff --git a/src/components/ui/ActivateTrialButton/index.js b/src/components/ui/ActivateTrialButton/index.js index 340123c2f..8f4d21f64 100644 --- a/src/components/ui/ActivateTrialButton/index.js +++ b/src/components/ui/ActivateTrialButton/index.js | |||
@@ -7,6 +7,7 @@ import classnames from 'classnames'; | |||
7 | import { Button } from '@meetfranz/forms'; | 7 | import { Button } from '@meetfranz/forms'; |
8 | 8 | ||
9 | import UserStore from '../../../stores/UserStore'; | 9 | import UserStore from '../../../stores/UserStore'; |
10 | import UIStore from '../../../stores/UIStore'; | ||
10 | 11 | ||
11 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
12 | action: { | 13 | action: { |
@@ -101,8 +102,6 @@ ActivateTrialButton.wrappedComponent.propTypes = { | |||
101 | user: PropTypes.instanceOf(UserStore).isRequired, | 102 | user: PropTypes.instanceOf(UserStore).isRequired, |
102 | }).isRequired, | 103 | }).isRequired, |
103 | actions: PropTypes.shape({ | 104 | actions: PropTypes.shape({ |
104 | ui: PropTypes.shape({ | 105 | ui: PropTypes.instanceOf(UIStore).isRequired, |
105 | openSettings: PropTypes.func.isRequired, | ||
106 | }).isRequired, | ||
107 | }).isRequired, | 106 | }).isRequired, |
108 | }; | 107 | }; |
diff --git a/src/components/ui/FAB.js b/src/components/ui/FAB.js index 9359a3c6c..633edbe2c 100644 --- a/src/components/ui/FAB.js +++ b/src/components/ui/FAB.js | |||
@@ -3,23 +3,19 @@ | |||
3 | */ | 3 | */ |
4 | import React, { Component } from 'react'; | 4 | import React, { Component } from 'react'; |
5 | import PropTypes from 'prop-types'; | 5 | import PropTypes from 'prop-types'; |
6 | import { observer, inject } from 'mobx-react'; | 6 | import { observer } from 'mobx-react'; |
7 | import classnames from 'classnames'; | 7 | import classnames from 'classnames'; |
8 | 8 | ||
9 | export default @inject('stores') @observer class Button extends Component { | 9 | import { oneOrManyChildElements } from '../../prop-types'; |
10 | |||
11 | export default @observer class Button extends Component { | ||
10 | static propTypes = { | 12 | static propTypes = { |
11 | className: PropTypes.string, | 13 | className: PropTypes.string, |
12 | disabled: PropTypes.bool, | 14 | disabled: PropTypes.bool, |
13 | onClick: PropTypes.func, | 15 | onClick: PropTypes.func, |
14 | type: PropTypes.string, | 16 | type: PropTypes.string, |
17 | children: oneOrManyChildElements.isRequired, | ||
15 | htmlForm: PropTypes.string, | 18 | htmlForm: PropTypes.string, |
16 | stores: PropTypes.shape({ | ||
17 | settings: PropTypes.shape({ | ||
18 | app: PropTypes.shape({ | ||
19 | accentColor: PropTypes.string.isRequired, | ||
20 | }).isRequired, | ||
21 | }).isRequired, | ||
22 | }).isRequired, | ||
23 | }; | 19 | }; |
24 | 20 | ||
25 | static defaultProps = { | 21 | static defaultProps = { |
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js index d8cdc2e8a..97ab93dcf 100644 --- a/src/components/ui/FullscreenLoader/index.js +++ b/src/components/ui/FullscreenLoader/index.js | |||
@@ -17,6 +17,9 @@ export default @inject('stores') @withTheme @injectSheet(styles) @observer class | |||
17 | spinnerColor: PropTypes.string, | 17 | spinnerColor: PropTypes.string, |
18 | children: PropTypes.node, | 18 | children: PropTypes.node, |
19 | stores: PropTypes.shape({ | 19 | stores: PropTypes.shape({ |
20 | app: PropTypes.shape({ | ||
21 | accentColor: PropTypes.string.isRequired, | ||
22 | }).isRequired, | ||
20 | settings: PropTypes.shape({ | 23 | settings: PropTypes.shape({ |
21 | app: PropTypes.shape({ | 24 | app: PropTypes.shape({ |
22 | accentColor: PropTypes.string.isRequired, | 25 | accentColor: PropTypes.string.isRequired, |
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js index 36bf38c98..1e100f9d8 100644 --- a/src/components/ui/PremiumFeatureContainer/index.js +++ b/src/components/ui/PremiumFeatureContainer/index.js | |||
@@ -10,6 +10,7 @@ import UserStore from '../../../stores/UserStore'; | |||
10 | 10 | ||
11 | import styles from './styles'; | 11 | import styles from './styles'; |
12 | import FeaturesStore from '../../../stores/FeaturesStore'; | 12 | import FeaturesStore from '../../../stores/FeaturesStore'; |
13 | import UIStore from '../../../stores/UIStore'; | ||
13 | 14 | ||
14 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
15 | action: { | 16 | action: { |
@@ -93,9 +94,7 @@ PremiumFeatureContainer.wrappedComponent.propTypes = { | |||
93 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 94 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
94 | }).isRequired, | 95 | }).isRequired, |
95 | actions: PropTypes.shape({ | 96 | actions: PropTypes.shape({ |
96 | ui: PropTypes.shape({ | 97 | ui: PropTypes.instanceOf(UIStore).isRequired, |
97 | openSettings: PropTypes.func.isRequired, | ||
98 | }).isRequired, | ||
99 | }).isRequired, | 98 | }).isRequired, |
100 | }; | 99 | }; |
101 | 100 | ||
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js index 12f650ffd..196cddc66 100644 --- a/src/components/ui/Tabs/Tabs.js +++ b/src/components/ui/Tabs/Tabs.js | |||
@@ -36,7 +36,7 @@ export default @observer class Tab extends Component { | |||
36 | <div className="content-tabs__tabs"> | 36 | <div className="content-tabs__tabs"> |
37 | {React.Children.map(children, (child, i) => ( | 37 | {React.Children.map(children, (child, i) => ( |
38 | <button | 38 | <button |
39 | key={i} | 39 | key="{i}" |
40 | className={classnames({ | 40 | className={classnames({ |
41 | 'content-tabs__item': true, | 41 | 'content-tabs__item': true, |
42 | 'is-active': this.state.active === i, | 42 | 'is-active': this.state.active === i, |
@@ -51,7 +51,7 @@ export default @observer class Tab extends Component { | |||
51 | <div className="content-tabs__content"> | 51 | <div className="content-tabs__content"> |
52 | {React.Children.map(children, (child, i) => ( | 52 | {React.Children.map(children, (child, i) => ( |
53 | <div | 53 | <div |
54 | key={i} | 54 | key="{i}" |
55 | className={classnames({ | 55 | className={classnames({ |
56 | 'content-tabs__item': true, | 56 | 'content-tabs__item': true, |
57 | 'is-active': this.state.active === i, | 57 | 'is-active': this.state.active === i, |
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js index ee817356b..dcaf664e1 100644 --- a/src/components/ui/ToggleRaw.js +++ b/src/components/ui/ToggleRaw.js | |||
@@ -14,6 +14,7 @@ export default @observer class ToggleRaw extends Component { | |||
14 | id: PropTypes.string, | 14 | id: PropTypes.string, |
15 | name: PropTypes.string, | 15 | name: PropTypes.string, |
16 | label: PropTypes.string, | 16 | label: PropTypes.string, |
17 | error: PropTypes.string, | ||
17 | }).isRequired, | 18 | }).isRequired, |
18 | className: PropTypes.string, | 19 | className: PropTypes.string, |
19 | showLabel: PropTypes.bool, | 20 | showLabel: PropTypes.bool, |
diff --git a/src/components/ui/UpgradeButton/index.js b/src/components/ui/UpgradeButton/index.js index 1b764bd90..eade46cfd 100644 --- a/src/components/ui/UpgradeButton/index.js +++ b/src/components/ui/UpgradeButton/index.js | |||
@@ -7,6 +7,7 @@ import { Button } from '@meetfranz/forms'; | |||
7 | 7 | ||
8 | import UserStore from '../../../stores/UserStore'; | 8 | import UserStore from '../../../stores/UserStore'; |
9 | import ActivateTrialButton from '../ActivateTrialButton'; | 9 | import ActivateTrialButton from '../ActivateTrialButton'; |
10 | import UIStore from '../../../stores/UIStore'; | ||
10 | 11 | ||
11 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
12 | upgradeToPro: { | 13 | upgradeToPro: { |
@@ -77,8 +78,6 @@ UpgradeButton.wrappedComponent.propTypes = { | |||
77 | user: PropTypes.instanceOf(UserStore).isRequired, | 78 | user: PropTypes.instanceOf(UserStore).isRequired, |
78 | }).isRequired, | 79 | }).isRequired, |
79 | actions: PropTypes.shape({ | 80 | actions: PropTypes.shape({ |
80 | ui: PropTypes.shape({ | 81 | ui: PropTypes.instanceOf(UIStore).isRequired, |
81 | openSettings: PropTypes.func.isRequired, | ||
82 | }).isRequired, | ||
83 | }).isRequired, | 82 | }).isRequired, |
84 | }; | 83 | }; |