From 11c992b04f3cad6badf0ae86da65f490e31dd359 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Sat, 4 Dec 2021 10:51:16 +0100 Subject: chore: upgrade react-jss to latest (#2302) --- src/I18n.tsx | 4 +--- src/components/auth/AuthLayout.js | 3 +-- src/components/auth/ChangeServer.js | 3 +-- src/components/auth/Import.js | 3 +-- src/components/auth/Invite.js | 3 +-- src/components/auth/Locked.js | 3 +-- src/components/auth/Login.js | 4 +--- src/components/auth/Password.js | 3 +-- src/components/auth/SetupAssistant.js | 6 ++--- src/components/auth/Signup.js | 4 +--- src/components/auth/Welcome.js | 4 +--- src/components/layout/AppLayout.js | 6 ++--- src/components/layout/Sidebar.js | 4 +--- .../services/content/ConnectionLostBanner.js | 4 +--- .../content/ErrorHandlers/WebviewErrorHandler.js | 6 ++--- src/components/services/content/ServiceDisabled.js | 3 +-- src/components/services/content/ServiceView.js | 4 +--- src/components/services/content/ServiceWebview.js | 3 +-- src/components/services/content/Services.js | 9 +++---- .../services/content/WebviewCrashHandler.js | 3 +-- src/components/services/tabs/TabBarSortableList.js | 3 +-- src/components/services/tabs/TabItem.js | 11 +++++---- src/components/services/tabs/Tabbar.js | 3 +-- src/components/settings/SettingsLayout.js | 3 +-- .../settings/account/AccountDashboard.js | 3 +-- .../settings/navigation/SettingsNavigation.js | 4 +--- src/components/settings/recipes/RecipeItem.js | 3 +-- .../settings/recipes/RecipesDashboard.js | 28 ++++++++++++---------- .../settings/services/EditServiceForm.js | 3 +-- src/components/settings/services/ServiceError.js | 3 +-- src/components/settings/services/ServiceItem.js | 3 +-- .../settings/services/ServicesDashboard.js | 3 +-- .../settings/settings/EditSettingsForm.js | 3 +-- src/components/settings/team/TeamDashboard.js | 6 ++--- src/components/settings/user/EditUserForm.js | 3 +-- src/components/ui/AppLoader/index.tsx | 6 ++--- src/components/ui/Button.js | 4 +--- src/components/ui/FAB.tsx | 3 +-- src/components/ui/FullscreenLoader/index.js | 9 ++++--- src/components/ui/ImageUpload.tsx | 3 +-- src/components/ui/InfoBar.js | 3 +-- src/components/ui/Infobox.js | 3 +-- src/components/ui/Input.js | 12 +++++----- src/components/ui/Link.js | 8 +++---- src/components/ui/Loader.tsx | 4 +--- src/components/ui/Modal/index.tsx | 3 +-- src/components/ui/Radio.tsx | 3 +-- src/components/ui/SearchInput.tsx | 3 +-- src/components/ui/Select.js | 3 +-- src/components/ui/ServiceIcon.js | 6 ++--- src/components/ui/Slider.js | 3 +-- src/components/ui/StatusBarTargetUrl.js | 3 +-- src/components/ui/Tabs/Tabs.js | 3 +-- src/components/ui/Toggle.js | 3 +-- src/components/ui/ToggleRaw.js | 3 +-- src/components/ui/WebviewLoader/index.js | 6 ++--- src/components/ui/badge/ProBadge.tsx | 9 +++---- src/components/ui/badge/index.tsx | 7 +++--- src/components/ui/button/index.tsx | 14 ++++++----- src/components/ui/error/index.tsx | 2 +- src/components/ui/headline/index.tsx | 10 ++++---- src/components/ui/icon/index.tsx | 7 +++--- src/components/ui/infobox/index.tsx | 9 +++---- src/components/ui/input/index.tsx | 8 +++---- src/components/ui/label/index.tsx | 13 +++++----- src/components/ui/loader/index.tsx | 18 +++++++------- src/components/ui/select/index.tsx | 11 +++++---- src/components/ui/textarea/index.tsx | 10 ++++---- src/components/ui/toggle/index.tsx | 10 ++++---- src/components/ui/typings/generic.ts | 9 ------- src/components/ui/wrapper/index.tsx | 9 +++---- src/components/util/ErrorBoundary/index.js | 5 ++-- src/containers/auth/AuthLayoutContainer.js | 6 ++--- src/containers/auth/ChangeServerScreen.js | 6 ++--- src/containers/auth/ImportScreen.js | 6 ++--- src/containers/auth/InviteScreen.js | 6 ++--- src/containers/auth/LockedScreen.js | 6 ++--- src/containers/auth/LoginScreen.js | 6 ++--- src/containers/auth/PasswordScreen.js | 6 ++--- src/containers/auth/SetupAssistantScreen.js | 6 ++--- src/containers/auth/SignupScreen.js | 6 ++--- src/containers/auth/WelcomeScreen.js | 6 ++--- src/containers/layout/AppLayoutContainer.js | 6 ++--- src/containers/settings/AccountScreen.js | 6 ++--- src/containers/settings/EditServiceScreen.js | 8 +++---- src/containers/settings/EditSettingsScreen.js | 8 +++---- src/containers/settings/EditUserScreen.js | 8 +++---- src/containers/settings/InviteScreen.js | 6 ++--- src/containers/settings/RecipesScreen.js | 6 ++--- src/containers/settings/ServicesScreen.js | 6 ++--- src/containers/settings/SettingsWindow.js | 6 ++--- src/containers/settings/SupportScreen.js | 5 ++-- src/containers/settings/TeamScreen.js | 6 ++--- src/electron/ipc-api/download.ts | 2 +- src/features/basicAuth/Component.js | 6 ++--- src/features/nightlyBuilds/Component.js | 15 ++++++------ src/features/publishDebugInfo/Component.js | 16 ++++++------- src/features/quickSwitch/Component.js | 12 ++++++---- src/features/todos/components/TodosWebview.js | 7 +++--- src/features/todos/containers/TodosScreen.js | 6 ++--- src/features/todos/store.js | 4 ---- src/features/webControls/components/WebControls.js | 6 ++--- .../webControls/containers/WebControlsScreen.js | 6 ++--- .../workspaces/components/CreateWorkspaceForm.js | 10 ++++---- .../workspaces/components/EditWorkspaceForm.js | 10 ++++---- .../workspaces/components/WorkspaceDrawer.js | 6 ++--- .../workspaces/components/WorkspaceDrawerItem.js | 6 ++--- .../workspaces/components/WorkspaceItem.tsx | 6 ++--- .../components/WorkspaceServiceListItem.tsx | 6 ++--- .../components/WorkspaceSwitchingIndicator.js | 8 ++++--- .../workspaces/components/WorkspacesDashboard.js | 15 ++++++------ .../workspaces/containers/EditWorkspaceScreen.tsx | 4 +--- .../workspaces/containers/WorkspacesScreen.tsx | 4 +--- src/lib/Form.ts | 7 ++++++ src/routes.tsx | 4 +--- src/stores/ServicesStore.js | 2 -- 116 files changed, 310 insertions(+), 398 deletions(-) (limited to 'src') diff --git a/src/I18n.tsx b/src/I18n.tsx index 39b5273c1..5d969da1f 100644 --- a/src/I18n.tsx +++ b/src/I18n.tsx @@ -16,8 +16,6 @@ type Props = { children: ReactNode; }; -@inject('stores') -@observer class I18N extends Component { componentDidUpdate() { window['ferdi'].menu.rebuild(); @@ -39,4 +37,4 @@ class I18N extends Component { } } -export default I18N; +export default inject('stores')(observer(I18N)); diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index f26282cfc..94ff5d54d 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -19,7 +19,6 @@ import AppUpdateInfoBar from '../AppUpdateInfoBar'; import { GITHUB_FERDI_URL } from '../../config'; import { Icon } from '../ui/icon'; -@observer class AuthLayout extends Component { static propTypes = { children: oneOrManyChildElements.isRequired, @@ -107,4 +106,4 @@ class AuthLayout extends Component { } } -export default injectIntl(AuthLayout); +export default injectIntl(observer(AuthLayout)); diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 9aeebc5c8..c284c0d19 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js @@ -34,7 +34,6 @@ const messages = defineMessages({ }, }); -@observer class ChangeServer extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, @@ -131,4 +130,4 @@ class ChangeServer extends Component { } } -export default injectIntl(ChangeServer); +export default injectIntl(observer(ChangeServer)); diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index fe2fe9872..8f70318ed 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js @@ -28,7 +28,6 @@ const messages = defineMessages({ }, }); -@observer class Import extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -166,4 +165,4 @@ class Import extends Component { } } -export default injectIntl(Import); +export default injectIntl(observer(Import)); diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index dd71c2450..a23af7c6b 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js @@ -43,7 +43,6 @@ const messages = defineMessages({ }, }); -@observer class Invite extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, @@ -198,4 +197,4 @@ class Invite extends Component { } } -export default injectIntl(Invite); +export default injectIntl(observer(Invite)); diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 5b36b9fc2..2ed429199 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js @@ -48,7 +48,6 @@ const messages = defineMessages({ }, }); -@observer class Locked extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, @@ -149,4 +148,4 @@ class Locked extends Component { } } -export default injectIntl(Locked); +export default injectIntl(observer(Locked)); diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 0c327d67e..c1602a047 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -71,8 +71,6 @@ const messages = defineMessages({ }, }); -@inject('actions') -@observer class Login extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, @@ -215,4 +213,4 @@ class Login extends Component { } } -export default injectIntl(Login); +export default injectIntl(inject('actions')(observer(Login))); diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index d5bc7fa80..b4d51f43d 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js @@ -38,7 +38,6 @@ const messages = defineMessages({ }, }); -@observer class Password extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, @@ -119,4 +118,4 @@ class Password extends Component { } } -export default injectIntl(Password); +export default injectIntl(observer(Password)); diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index 47fe88f43..a24f4e4d5 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js @@ -131,8 +131,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class SetupAssistant extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -327,4 +325,6 @@ class SetupAssistant extends Component { } } -export default injectIntl(SetupAssistant); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(SetupAssistant)), +); diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 00625a3ac..ac86dcdc3 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -75,8 +75,6 @@ const messages = defineMessages({ }, }); -@inject('actions') -@observer class Signup extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, @@ -217,4 +215,4 @@ class Signup extends Component { } } -export default injectIntl(Signup); +export default injectIntl(inject('actions')(observer(Signup))); diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 809ec67a7..794c78987 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js @@ -22,8 +22,6 @@ const messages = defineMessages({ }, }); -@inject('actions') -@observer class Login extends Component { static propTypes = { loginRoute: PropTypes.string.isRequired, @@ -93,4 +91,4 @@ class Login extends Component { } } -export default injectIntl(Login); +export default injectIntl(inject('actions')(observer(Login))); diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index a31419a5e..084d93ecd 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -74,8 +74,6 @@ const toggleFullScreen = () => { ipcRenderer.send('window.toolbar-double-clicked'); }; -@injectSheet(styles) -@observer class AppLayout extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -208,4 +206,6 @@ class AppLayout extends Component { } } -export default injectIntl(AppLayout); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(AppLayout)), +); diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 728613f42..4f67a8719 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -66,8 +66,6 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') -@observer class Sidebar extends Component { static propTypes = { openSettings: PropTypes.func.isRequired, @@ -262,4 +260,4 @@ class Sidebar extends Component { } } -export default injectIntl(Sidebar); +export default injectIntl(inject('stores', 'actions')(observer(Sidebar))); diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js index b9e7eca53..5adb22c84 100644 --- a/src/components/services/content/ConnectionLostBanner.js +++ b/src/components/services/content/ConnectionLostBanner.js @@ -68,8 +68,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class ConnectionLostBanner extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -103,4 +101,4 @@ class ConnectionLostBanner extends Component { } } -export default injectIntl(ConnectionLostBanner); +export default injectIntl(injectSheet(styles)(observer(ConnectionLostBanner))); diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js index 5c93de80f..d605b3a52 100644 --- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js +++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js @@ -31,8 +31,6 @@ const messages = defineMessages({ }, }); -@injectSheet(styles) -@observer class WebviewErrorHandler extends Component { static propTypes = { name: PropTypes.string.isRequired, @@ -71,4 +69,6 @@ class WebviewErrorHandler extends Component { } } -export default injectIntl(WebviewErrorHandler); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(WebviewErrorHandler)), +); diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js index f60d4bca6..b4658618e 100644 --- a/src/components/services/content/ServiceDisabled.js +++ b/src/components/services/content/ServiceDisabled.js @@ -16,7 +16,6 @@ const messages = defineMessages({ }, }); -@observer class ServiceDisabled extends Component { static propTypes = { name: PropTypes.string.isRequired, @@ -40,4 +39,4 @@ class ServiceDisabled extends Component { } } -export default injectIntl(ServiceDisabled); +export default injectIntl(observer(ServiceDisabled)); diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 1ffdd2153..6fc1f1400 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js @@ -16,8 +16,6 @@ import SettingsStore from '../../../stores/SettingsStore'; import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config'; -@inject('stores', 'actions') -@observer class ServiceView extends Component { static propTypes = { service: PropTypes.instanceOf(ServiceModel).isRequired, @@ -163,4 +161,4 @@ class ServiceView extends Component { } } -export default ServiceView; +export default inject('stores', 'actions')(observer(ServiceView)); diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index c70494edd..713a0c21d 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js @@ -9,7 +9,6 @@ import ServiceModel from '../../../models/Service'; const debug = require('debug')('Ferdi:Services'); -@observer class ServiceWebview extends Component { static propTypes = { service: PropTypes.instanceOf(ServiceModel).isRequired, @@ -116,4 +115,4 @@ class ServiceWebview extends Component { } } -export default ServiceWebview; +export default observer(ServiceWebview); diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 1edf31bd3..0587b553f 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js @@ -44,9 +44,6 @@ const styles = { }, }; -@injectSheet(styles) -@inject('actions') -@observer class Services extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray, @@ -197,4 +194,8 @@ class Services extends Component { } } -export default injectIntl(Services); +export default injectIntl( + injectSheet(styles, { injectTheme: true })( + inject('actions')(observer(Services)), + ), +); diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index 3607435b3..1ca5ba415 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js @@ -26,7 +26,6 @@ const messages = defineMessages({ }, }); -@observer class WebviewCrashHandler extends Component { static propTypes = { name: PropTypes.string.isRequired, @@ -81,4 +80,4 @@ class WebviewCrashHandler extends Component { } } -export default injectIntl(WebviewCrashHandler); +export default injectIntl(observer(WebviewCrashHandler)); diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index 3049b6efa..e01461e5c 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js @@ -5,7 +5,6 @@ import { SortableContainer } from 'react-sortable-hoc'; import TabItem from './TabItem'; -@observer class TabBarSortableList extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -75,4 +74,4 @@ class TabBarSortableList extends Component { } } -export default SortableContainer(TabBarSortableList); +export default SortableContainer(observer(TabBarSortableList)); diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 14be37153..8e163bce6 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js @@ -114,9 +114,6 @@ const styles = { }, }; -@injectSheet(styles) -@inject('stores') -@observer class TabItem extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -402,4 +399,10 @@ class TabItem extends Component { } } -export default injectIntl(SortableElement(TabItem)); +export default injectIntl( + SortableElement( + injectSheet(styles, { injectTheme: true })( + inject('stores')(observer(TabItem)), + ), + ), +); diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index 94d6f33c1..d9e11df41 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js @@ -4,7 +4,6 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import TabBarSortableList from './TabBarSortableList'; -@observer class TabBar extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -120,4 +119,4 @@ class TabBar extends Component { } } -export default TabBar; +export default observer(TabBar); diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js index e9119a944..de13e95ab 100644 --- a/src/components/settings/SettingsLayout.js +++ b/src/components/settings/SettingsLayout.js @@ -16,7 +16,6 @@ const messages = defineMessages({ }, }); -@observer class SettingsLayout extends Component { static propTypes = { navigation: PropTypes.element.isRequired, @@ -78,4 +77,4 @@ class SettingsLayout extends Component { } } -export default injectIntl(SettingsLayout); +export default injectIntl(observer(SettingsLayout)); diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 6c489e64b..d0c56af05 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -64,7 +64,6 @@ const messages = defineMessages({ }, }); -@observer class AccountDashboard extends Component { static propTypes = { user: MobxPropTypes.observableObject.isRequired, @@ -229,4 +228,4 @@ class AccountDashboard extends Component { } } -export default injectIntl(AccountDashboard); +export default injectIntl(observer(AccountDashboard)); diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index dbb1365b0..2fdb6e574 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js @@ -42,8 +42,6 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') -@observer class SettingsNavigation extends Component { static propTypes = { stores: PropTypes.shape({ @@ -175,4 +173,4 @@ class SettingsNavigation extends Component { } } -export default injectIntl(SettingsNavigation); +export default injectIntl(inject('stores', 'actions')(observer(SettingsNavigation))); diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js index 1e910e6dc..df5b42222 100644 --- a/src/components/settings/recipes/RecipeItem.js +++ b/src/components/settings/recipes/RecipeItem.js @@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; import RecipePreviewModel from '../../../models/RecipePreview'; -@observer class RecipeItem extends Component { static propTypes = { recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired, @@ -31,4 +30,4 @@ class RecipeItem extends Component { } } -export default RecipeItem; +export default observer(RecipeItem); diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 7ec285431..d9f53d74e 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js @@ -105,8 +105,6 @@ const styles = { }, }; -@injectSheet(styles) -@observer class RecipesDashboard extends Component { static propTypes = { recipes: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -247,16 +245,18 @@ class RecipesDashboard extends Component { {intl.formatMessage(messages.nothingFound)}

- - isLoggedIn && - showAddServiceInterface({ - recipeId: customWebsiteRecipe.id, - }) - } - /> + {customWebsiteRecipe && customWebsiteRecipe.id && ( + + isLoggedIn && + showAddServiceInterface({ + recipeId: customWebsiteRecipe.id, + }) + } + /> + )} )} {communityRecipes.map(recipe => ( @@ -295,4 +295,6 @@ class RecipesDashboard extends Component { } } -export default injectIntl(RecipesDashboard); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(RecipesDashboard)), +); diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 6b4cc721d..f0e791b87 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -134,7 +134,6 @@ const messages = defineMessages({ }, }); -@observer class EditServiceForm extends Component { static propTypes = { recipe: PropTypes.instanceOf(Recipe).isRequired, @@ -500,4 +499,4 @@ class EditServiceForm extends Component { } } -export default injectIntl(EditServiceForm); +export default injectIntl(observer(EditServiceForm)); diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js index 6dd53a102..bcbbca3de 100644 --- a/src/components/settings/services/ServiceError.js +++ b/src/components/settings/services/ServiceError.js @@ -25,7 +25,6 @@ const messages = defineMessages({ }, }); -@observer class ServiceError extends Component { render() { const { intl } = this.props; @@ -60,4 +59,4 @@ class ServiceError extends Component { } } -export default injectIntl(ServiceError); +export default injectIntl(observer(ServiceError)); diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index d83e5fd56..23250ad09 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js @@ -24,7 +24,6 @@ const messages = defineMessages({ }, }); -@observer class ServiceItem extends Component { static propTypes = { service: PropTypes.instanceOf(ServiceModel).isRequired, @@ -91,4 +90,4 @@ class ServiceItem extends Component { } } -export default injectIntl(ServiceItem); +export default injectIntl(observer(ServiceItem)); diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index aae6eb855..81c5faa70 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js @@ -51,7 +51,6 @@ const messages = defineMessages({ }, }); -@observer class ServicesDashboard extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -188,4 +187,4 @@ class ServicesDashboard extends Component { } } -export default injectIntl(ServicesDashboard); +export default injectIntl(observer(ServicesDashboard)); diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 9f51b54d5..d9df9c41c 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -188,7 +188,6 @@ const messages = defineMessages({ const Hr = () =>
; -@observer class EditSettingsForm extends Component { static propTypes = { checkForUpdates: PropTypes.func.isRequired, @@ -847,4 +846,4 @@ class EditSettingsForm extends Component { } } -export default injectIntl(EditSettingsForm); +export default injectIntl(observer(EditSettingsForm)); diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 38d124266..802284051 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js @@ -90,8 +90,6 @@ const styles = { }, }; -@injectSheet(styles) -@observer class TeamDashboard extends Component { static propTypes = { isLoading: PropTypes.bool.isRequired, @@ -197,4 +195,6 @@ class TeamDashboard extends Component { } } -export default injectIntl(TeamDashboard); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(TeamDashboard)), +); diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index 1b8a4f25a..95498d9bb 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js @@ -37,7 +37,6 @@ const messages = defineMessages({ }, }); -@observer class EditUserForm extends Component { static propTypes = { status: MobxPropTypes.observableArray.isRequired, @@ -128,4 +127,4 @@ class EditUserForm extends Component { } } -export default injectIntl(EditUserForm); +export default injectIntl(observer(EditUserForm)); diff --git a/src/components/ui/AppLoader/index.tsx b/src/components/ui/AppLoader/index.tsx index c7c290a57..0bb9cb50f 100644 --- a/src/components/ui/AppLoader/index.tsx +++ b/src/components/ui/AppLoader/index.tsx @@ -1,7 +1,7 @@ import { Component } from 'react'; -import injectSheet, { withTheme } from 'react-jss'; import classnames from 'classnames'; +import injectStyle from 'react-jss'; import FullscreenLoader from '../FullscreenLoader'; import { shuffleArray } from '../../../helpers/array-helpers'; @@ -24,8 +24,6 @@ type Props = { texts: string[]; }; -@injectSheet(styles) -@withTheme class AppLoader extends Component { static defaultProps = { texts: textList, @@ -77,4 +75,4 @@ class AppLoader extends Component { } } -export default AppLoader; +export default injectStyle(styles, { injectTheme: true })(AppLoader); diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js index d90a8d62d..a52f1cadb 100644 --- a/src/components/ui/Button.js +++ b/src/components/ui/Button.js @@ -4,8 +4,6 @@ import { observer, inject } from 'mobx-react'; import Loader from 'react-loader'; import classnames from 'classnames'; -@inject('stores') -@observer class Button extends Component { static propTypes = { className: PropTypes.string, @@ -90,4 +88,4 @@ class Button extends Component { } } -export default Button; +export default inject('stores')(observer(Button)); diff --git a/src/components/ui/FAB.tsx b/src/components/ui/FAB.tsx index 0d871e948..cb9c5f126 100644 --- a/src/components/ui/FAB.tsx +++ b/src/components/ui/FAB.tsx @@ -14,7 +14,6 @@ type Props = { htmlForm: string; }; -@observer class Button extends Component { static defaultProps = { disabled: false, @@ -46,4 +45,4 @@ class Button extends Component { } } -export default Button; +export default observer(Button); diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js index f5943f3f3..39b6c5a4c 100644 --- a/src/components/ui/FullscreenLoader/index.js +++ b/src/components/ui/FullscreenLoader/index.js @@ -1,16 +1,13 @@ import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; -import injectSheet, { withTheme } from 'react-jss'; +import injectStyle from 'react-jss'; import classnames from 'classnames'; import Loader from '../Loader'; import styles from './styles'; -@withTheme -@injectSheet(styles) -@observer class FullscreenLoader extends Component { static propTypes = { className: PropTypes.string, @@ -48,4 +45,6 @@ class FullscreenLoader extends Component { } } -export default FullscreenLoader; +export default injectStyle(styles, { injectTheme: true })( + observer(FullscreenLoader), +); diff --git a/src/components/ui/ImageUpload.tsx b/src/components/ui/ImageUpload.tsx index 52c097ef0..b07e211c2 100644 --- a/src/components/ui/ImageUpload.tsx +++ b/src/components/ui/ImageUpload.tsx @@ -15,7 +15,6 @@ type Props = { textUpload: string; }; -@observer class ImageUpload extends Component { static defaultProps = { multiple: false, @@ -102,4 +101,4 @@ class ImageUpload extends Component { } } -export default ImageUpload; +export default observer(ImageUpload); diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js index 89b085907..c1a6013c2 100644 --- a/src/components/ui/InfoBar.js +++ b/src/components/ui/InfoBar.js @@ -16,7 +16,6 @@ const messages = defineMessages({ }, }); -@observer class InfoBar extends Component { static propTypes = { // eslint-disable-next-line react/forbid-prop-types @@ -102,4 +101,4 @@ class InfoBar extends Component { } } -export default injectIntl(InfoBar); +export default injectIntl(observer(InfoBar)); diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js index c0ba8f13c..6634a6808 100644 --- a/src/components/ui/Infobox.js +++ b/src/components/ui/Infobox.js @@ -19,7 +19,6 @@ const messages = defineMessages({ }, }); -@observer class Infobox extends Component { static propTypes = { // eslint-disable-next-line react/forbid-prop-types @@ -112,4 +111,4 @@ class Infobox extends Component { } } -export default injectIntl(Infobox); +export default injectIntl(observer(Infobox)); diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js index 8d37d7a05..fa1b44699 100644 --- a/src/components/ui/Input.js +++ b/src/components/ui/Input.js @@ -5,7 +5,9 @@ import { Field } from 'mobx-react-form'; import classnames from 'classnames'; import { defineMessages, injectIntl } from 'react-intl'; +import { mdiEye, mdiEyeOff } from '@mdi/js'; import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers'; +import { Icon } from './icon'; const messages = defineMessages({ passwordToggle: { @@ -14,7 +16,6 @@ const messages = defineMessages({ }, }); -@observer class Input extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, @@ -115,9 +116,6 @@ class Input extends Component { type="button" className={classnames({ 'franz-form__input-modifier': true, - mdi: true, - 'mdi-eye': !this.state.showPassword, - 'mdi-eye-off': this.state.showPassword, })} onClick={() => this.setState(prevState => ({ @@ -126,7 +124,9 @@ class Input extends Component { } tabIndex={-1} aria-label={intl.formatMessage(messages.passwordToggle)} - /> + > + + )} {scorePassword && (
@@ -152,4 +152,4 @@ class Input extends Component { } } -export default injectIntl(Input); +export default injectIntl(observer(Input)); diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js index 40766c984..565547736 100644 --- a/src/components/ui/Link.js +++ b/src/components/ui/Link.js @@ -9,8 +9,6 @@ import { matchRoute } from '../../helpers/routing-helpers'; import { openExternalUrl } from '../../helpers/url-helpers'; // TODO: create container component for this component -@inject('stores') -@observer class Link extends Component { onClick(e) { if (this.props.disabled) { @@ -60,7 +58,7 @@ class Link extends Component { } } -Link.wrappedComponent.propTypes = { +Link.propTypes = { stores: PropTypes.shape({ router: PropTypes.instanceOf(RouterStore).isRequired, }).isRequired, @@ -75,7 +73,7 @@ Link.wrappedComponent.propTypes = { disabled: PropTypes.bool, }; -Link.wrappedComponent.defaultProps = { +Link.defaultProps = { className: '', activeClassName: '', strictFilter: false, @@ -84,4 +82,4 @@ Link.wrappedComponent.defaultProps = { style: {}, }; -export default Link; +export default inject('stores')(observer(Link)); diff --git a/src/components/ui/Loader.tsx b/src/components/ui/Loader.tsx index 1173c11e7..171d0e290 100644 --- a/src/components/ui/Loader.tsx +++ b/src/components/ui/Loader.tsx @@ -12,8 +12,6 @@ type Props = { stores: FerdiStores; }; -@inject('stores') -@observer class LoaderComponent extends Component { static defaultProps = { loaded: false, @@ -43,4 +41,4 @@ class LoaderComponent extends Component { } } -export default LoaderComponent; +export default inject('stores')(observer(LoaderComponent)); diff --git a/src/components/ui/Modal/index.tsx b/src/components/ui/Modal/index.tsx index f2f4461b8..c3c78b419 100644 --- a/src/components/ui/Modal/index.tsx +++ b/src/components/ui/Modal/index.tsx @@ -18,7 +18,6 @@ type Props = { showClose: boolean; }; -@injectCSS(styles) class Modal extends Component { static defaultProps = { className: null, @@ -64,4 +63,4 @@ class Modal extends Component { } } -export default Modal; +export default injectCSS(styles)(Modal); diff --git a/src/components/ui/Radio.tsx b/src/components/ui/Radio.tsx index 594ea70e4..a033a5fe0 100644 --- a/src/components/ui/Radio.tsx +++ b/src/components/ui/Radio.tsx @@ -10,7 +10,6 @@ type Props = { showLabel: boolean; }; -@observer class Radio extends Component { static defaultProps = { focus: false, @@ -74,4 +73,4 @@ class Radio extends Component { } } -export default Radio; +export default observer(Radio); diff --git a/src/components/ui/SearchInput.tsx b/src/components/ui/SearchInput.tsx index 49a50a4a0..6a6a1692e 100644 --- a/src/components/ui/SearchInput.tsx +++ b/src/components/ui/SearchInput.tsx @@ -17,7 +17,6 @@ type Props = { autoFocus: boolean; }; -@observer class SearchInput extends Component { static defaultProps = { value: '', @@ -115,4 +114,4 @@ class SearchInput extends Component { } } -export default SearchInput; +export default observer(SearchInput); diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js index a560da332..0fc32e573 100644 --- a/src/components/ui/Select.js +++ b/src/components/ui/Select.js @@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; import { Field } from 'mobx-react-form'; import classnames from 'classnames'; -@observer class Select extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, @@ -98,4 +97,4 @@ class Select extends Component { } } -export default Select; +export default observer(Select); diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js index f067f8955..d403d107d 100644 --- a/src/components/ui/ServiceIcon.js +++ b/src/components/ui/ServiceIcon.js @@ -24,8 +24,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class ServiceIcon extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -56,4 +54,6 @@ class ServiceIcon extends Component { } } -export default ServiceIcon; +export default injectSheet(styles, { injectTheme: true })( + observer(ServiceIcon), +); diff --git a/src/components/ui/Slider.js b/src/components/ui/Slider.js index dea6e0563..a581e7a65 100644 --- a/src/components/ui/Slider.js +++ b/src/components/ui/Slider.js @@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; import classnames from 'classnames'; import { Field } from 'mobx-react-form'; -@observer class Slider extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, @@ -64,4 +63,4 @@ class Slider extends Component { } } -export default Slider; +export default observer(Slider); diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js index 38b436742..d8d329d52 100644 --- a/src/components/ui/StatusBarTargetUrl.js +++ b/src/components/ui/StatusBarTargetUrl.js @@ -5,7 +5,6 @@ import classnames from 'classnames'; import Appear from './effects/Appear'; -@observer class StatusBarTargetUrl extends Component { static propTypes = { className: PropTypes.string, @@ -33,4 +32,4 @@ class StatusBarTargetUrl extends Component { } } -export default StatusBarTargetUrl; +export default observer(StatusBarTargetUrl); diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js index 77803974b..5d2da6293 100644 --- a/src/components/ui/Tabs/Tabs.js +++ b/src/components/ui/Tabs/Tabs.js @@ -5,7 +5,6 @@ import classnames from 'classnames'; import { oneOrManyChildElements } from '../../../prop-types'; -@observer class Tab extends Component { constructor(props) { super(props); @@ -69,4 +68,4 @@ class Tab extends Component { } } -export default Tab; +export default observer(Tab); diff --git a/src/components/ui/Toggle.js b/src/components/ui/Toggle.js index dfc319735..a82be690e 100644 --- a/src/components/ui/Toggle.js +++ b/src/components/ui/Toggle.js @@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; import classnames from 'classnames'; import { Field } from 'mobx-react-form'; -@observer class Toggle extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, @@ -69,4 +68,4 @@ class Toggle extends Component { } } -export default Toggle; +export default observer(Toggle); diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js index 74292a870..e482b97b4 100644 --- a/src/components/ui/ToggleRaw.js +++ b/src/components/ui/ToggleRaw.js @@ -6,7 +6,6 @@ import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import classnames from 'classnames'; -@observer class ToggleRaw extends Component { static propTypes = { onChange: PropTypes.func.isRequired, @@ -74,4 +73,4 @@ class ToggleRaw extends Component { } } -export default ToggleRaw; +export default observer(ToggleRaw); diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js index 8d4513172..20945d191 100644 --- a/src/components/ui/WebviewLoader/index.js +++ b/src/components/ui/WebviewLoader/index.js @@ -14,8 +14,6 @@ const messages = defineMessages({ }, }); -@injectSheet(styles) -@observer class WebviewLoader extends Component { static propTypes = { name: PropTypes.string.isRequired, @@ -34,4 +32,6 @@ class WebviewLoader extends Component { } } -export default injectIntl(WebviewLoader); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(WebviewLoader)), +); diff --git a/src/components/ui/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx index dc1e76f7f..410748a64 100644 --- a/src/components/ui/badge/ProBadge.tsx +++ b/src/components/ui/badge/ProBadge.tsx @@ -1,14 +1,13 @@ import { mdiStar } from '@mdi/js'; import classnames from 'classnames'; import { Component } from 'react'; -import injectStyle from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import { Theme } from '../../../themes'; import { Icon } from '../icon'; import { Badge } from './index'; -import { IWithStyle } from '../typings/generic'; -interface IProps extends IWithStyle { +interface IProps extends WithStylesProps { badgeClasses?: string; iconClasses?: string; inverted?: boolean; @@ -61,4 +60,6 @@ class ProBadgeComponent extends Component { } } -export const ProBadge = injectStyle(styles)(ProBadgeComponent); +export const ProBadge = injectStyle(styles, { injectTheme: true })( + ProBadgeComponent, +); diff --git a/src/components/ui/badge/index.tsx b/src/components/ui/badge/index.tsx index 61bede937..a7ed866a5 100644 --- a/src/components/ui/badge/index.tsx +++ b/src/components/ui/badge/index.tsx @@ -1,11 +1,10 @@ import classnames from 'classnames'; import { Component, ReactNode } from 'react'; -import injectStyle from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import { Theme } from '../../../themes'; -import { IWithStyle } from '../typings/generic'; -interface IProps extends IWithStyle { +interface IProps extends WithStylesProps { type: string; className?: string; children: ReactNode; @@ -68,4 +67,4 @@ class BadgeComponent extends Component { } } -export const Badge = injectStyle(styles)(BadgeComponent); +export const Badge = injectStyle(styles, { injectTheme: true })(BadgeComponent); diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx index 12e5e4449..d91b1ee19 100644 --- a/src/components/ui/button/index.tsx +++ b/src/components/ui/button/index.tsx @@ -2,11 +2,11 @@ import Icon from '@mdi/react'; import classnames from 'classnames'; import { Property } from 'csstype'; import { Component, MouseEvent } from 'react'; -import injectStyle, { withTheme } from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import Loader from 'react-loader'; import { Theme } from '../../../themes'; -import { IFormField, IWithStyle } from '../typings/generic'; +import { IFormField } from '../typings/generic'; type ButtonType = | 'primary' @@ -16,7 +16,7 @@ type ButtonType = | 'warning' | 'inverted'; -interface IProps extends IFormField, IWithStyle { +interface IProps extends IFormField, WithStylesProps { className?: string; disabled?: boolean; id?: string; @@ -179,7 +179,7 @@ class ButtonComponent extends Component { const { classes, className, - theme, + // theme, disabled, id, label, @@ -213,7 +213,7 @@ class ButtonComponent extends Component { loaded={false} width={4} scale={0.45} - color={theme.buttonLoaderColor[buttonType!]} + // color={theme.buttonLoaderColor[buttonType!]} parentClassName={classes.loader} /> )} @@ -262,4 +262,6 @@ class ButtonComponent extends Component { } } -export const Button = injectStyle(styles)(withTheme(ButtonComponent)); +export const Button = injectStyle(styles, { injectTheme: true })( + ButtonComponent, +); diff --git a/src/components/ui/error/index.tsx b/src/components/ui/error/index.tsx index 8439bfc8b..ff3bc31c6 100644 --- a/src/components/ui/error/index.tsx +++ b/src/components/ui/error/index.tsx @@ -17,4 +17,4 @@ class ErrorComponent extends Component { } } -export const Error = injectSheet(styles)(ErrorComponent); +export const Error = injectSheet(styles, { injectTheme: true })(ErrorComponent); diff --git a/src/components/ui/headline/index.tsx b/src/components/ui/headline/index.tsx index ea2949102..d9954c38f 100644 --- a/src/components/ui/headline/index.tsx +++ b/src/components/ui/headline/index.tsx @@ -1,11 +1,11 @@ import classnames from 'classnames'; import { Component, createElement, ReactNode } from 'react'; -import injectStyle from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import { Theme } from '../../../themes'; -import { IWithStyle, Omit } from '../typings/generic'; +import { Omit } from '../typings/generic'; -interface IProps extends IWithStyle { +interface IProps extends WithStylesProps { level?: number; className?: string; children: string | ReactNode; @@ -55,9 +55,9 @@ class HeadlineComponent extends Component { } } -const Headline = injectStyle(styles)(HeadlineComponent); +const Headline = injectStyle(styles, { injectTheme: true })(HeadlineComponent); -const createH = (level: number) => (props: Omit) => +const createH = (level: number) => (props: Omit) => ( {props.children} diff --git a/src/components/ui/icon/index.tsx b/src/components/ui/icon/index.tsx index 85bb61d13..52f61d2d7 100644 --- a/src/components/ui/icon/index.tsx +++ b/src/components/ui/icon/index.tsx @@ -1,12 +1,11 @@ import MdiIcon from '@mdi/react'; import classnames from 'classnames'; import { Component } from 'react'; -import injectStyle from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import { Theme } from '../../../themes'; -import { IWithStyle } from '../typings/generic'; -interface IProps extends IWithStyle { +interface IProps extends WithStylesProps { icon: string; size?: number; className?: string; @@ -43,4 +42,4 @@ class IconComponent extends Component { } } -export const Icon = injectStyle(styles)(IconComponent); +export const Icon = injectStyle(styles, { injectTheme: true })(IconComponent); diff --git a/src/components/ui/infobox/index.tsx b/src/components/ui/infobox/index.tsx index 87940c4d4..7b2ce527b 100644 --- a/src/components/ui/infobox/index.tsx +++ b/src/components/ui/infobox/index.tsx @@ -1,13 +1,12 @@ import { mdiClose } from '@mdi/js'; import classnames from 'classnames'; import { Component, ReactNode } from 'react'; -import injectStyle from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import { Theme } from '../../../themes'; import { Icon } from '../icon'; -import { IWithStyle } from '../typings/generic'; -interface IProps extends IWithStyle { +interface IProps extends WithStylesProps { icon?: string; type?: string; dismissable?: boolean; @@ -202,4 +201,6 @@ class InfoboxComponent extends Component { } } -export const Infobox = injectStyle(styles)(InfoboxComponent); +export const Infobox = injectStyle(styles, { injectTheme: true })( + InfoboxComponent, +); diff --git a/src/components/ui/input/index.tsx b/src/components/ui/input/index.tsx index c46cafc5c..bfbee33b9 100644 --- a/src/components/ui/input/index.tsx +++ b/src/components/ui/input/index.tsx @@ -2,9 +2,9 @@ import { mdiEye, mdiEyeOff } from '@mdi/js'; import Icon from '@mdi/react'; import classnames from 'classnames'; import { Component, createRef, InputHTMLAttributes } from 'react'; -import injectSheet from 'react-jss'; +import injectSheet, { WithStylesProps } from 'react-jss'; -import { IFormField, IWithStyle } from '../typings/generic'; +import { IFormField } from '../typings/generic'; import { Error } from '../error'; import { Label } from '../label'; @@ -20,7 +20,7 @@ interface IData { interface IProps extends InputHTMLAttributes, IFormField, - IWithStyle { + WithStylesProps { focus?: boolean; prefix?: string; suffix?: string; @@ -205,4 +205,4 @@ class InputComponent extends Component { } } -export const Input = injectSheet(styles)(InputComponent); +export const Input = injectSheet(styles, { injectTheme: true })(InputComponent); diff --git a/src/components/ui/label/index.tsx b/src/components/ui/label/index.tsx index 4d86f23f7..dcc14bff4 100644 --- a/src/components/ui/label/index.tsx +++ b/src/components/ui/label/index.tsx @@ -1,15 +1,16 @@ import classnames from 'classnames'; -import { Classes } from 'jss'; import { Component, LabelHTMLAttributes } from 'react'; -import injectSheet from 'react-jss'; +import injectSheet, { WithStylesProps } from 'react-jss'; import { IFormField } from '../typings/generic'; import styles from './styles'; -interface ILabel extends IFormField, LabelHTMLAttributes { - classes: Classes; - isRequired: boolean; +interface ILabel + extends IFormField, + LabelHTMLAttributes, + WithStylesProps { + isRequired?: boolean; } class LabelComponent extends Component { @@ -49,4 +50,4 @@ class LabelComponent extends Component { } } -export const Label = injectSheet(styles)(LabelComponent); +export const Label = injectSheet(styles, { injectTheme: true })(LabelComponent); diff --git a/src/components/ui/loader/index.tsx b/src/components/ui/loader/index.tsx index 0607bd48b..d56995ccc 100644 --- a/src/components/ui/loader/index.tsx +++ b/src/components/ui/loader/index.tsx @@ -1,25 +1,25 @@ import classnames from 'classnames'; import { Component } from 'react'; -import injectStyle, { withTheme } from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import ReactLoader from 'react-loader'; -import { IWithStyle } from '../typings/generic'; - -interface IProps extends IWithStyle { +interface IProps extends WithStylesProps { className?: string; color?: string; } -const styles = () => ({ +const styles = theme => ({ container: { position: 'relative', height: 60, }, + loader: {}, + color: theme.colorText, }); class LoaderComponent extends Component { render() { - const { classes, className, color, theme } = this.props; + const { classes, className, color } = this.props; return (
{ loaded={false} width={4} scale={0.75} - color={color || theme.colorText} + color={color || classes.color} parentClassName={classes.loader} />
@@ -41,4 +41,6 @@ class LoaderComponent extends Component { } } -export const Loader = injectStyle(styles)(withTheme(LoaderComponent)); +export const Loader = injectStyle(styles, { injectTheme: true })( + LoaderComponent, +); diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx index 2605503a3..ac509aa7c 100644 --- a/src/components/ui/select/index.tsx +++ b/src/components/ui/select/index.tsx @@ -6,10 +6,10 @@ import { import Icon from '@mdi/react'; import classnames from 'classnames'; import { ChangeEvent, Component, createRef } from 'react'; -import injectStyle from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import { Theme } from '../../../themes'; -import { IFormField, IWithStyle } from '../typings/generic'; +import { IFormField } from '../typings/generic'; import { Error } from '../error'; import { Label } from '../label'; @@ -23,7 +23,7 @@ interface IData { [index: string]: string; } -interface IProps extends IFormField, IWithStyle { +interface IProps extends IFormField, WithStylesProps { actionText: string; className?: string; inputClassName?: string; @@ -146,6 +146,7 @@ const styles = (theme: Theme) => ({ disabled: { opacity: theme.selectDisabledOpacity, }, + input: {}, }); class SelectComponent extends Component { @@ -457,4 +458,6 @@ class SelectComponent extends Component { } } -export const Select = injectStyle(styles)(SelectComponent); +export const Select = injectStyle(styles, { injectTheme: true })( + SelectComponent, +); diff --git a/src/components/ui/textarea/index.tsx b/src/components/ui/textarea/index.tsx index 1b16698eb..a47465806 100644 --- a/src/components/ui/textarea/index.tsx +++ b/src/components/ui/textarea/index.tsx @@ -1,8 +1,8 @@ import classnames from 'classnames'; import { Component, createRef, TextareaHTMLAttributes } from 'react'; -import injectSheet from 'react-jss'; +import injectSheet, { WithStylesProps } from 'react-jss'; -import { IFormField, IWithStyle } from '../typings/generic'; +import { IFormField } from '../typings/generic'; import { Error } from '../error'; import { Label } from '../label'; @@ -17,7 +17,7 @@ interface IData { interface IProps extends TextareaHTMLAttributes, IFormField, - IWithStyle { + WithStylesProps { focus?: boolean; data: IData; textareaClassName?: string; @@ -123,4 +123,6 @@ class TextareaComponent extends Component { } } -export const Textarea = injectSheet(styles)(TextareaComponent); +export const Textarea = injectSheet(styles, { injectTheme: true })( + TextareaComponent, +); diff --git a/src/components/ui/toggle/index.tsx b/src/components/ui/toggle/index.tsx index 7b6ba147f..856581a21 100644 --- a/src/components/ui/toggle/index.tsx +++ b/src/components/ui/toggle/index.tsx @@ -1,10 +1,10 @@ import classnames from 'classnames'; import { Property } from 'csstype'; import { Component, InputHTMLAttributes } from 'react'; -import injectStyle from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import { Theme } from '../../../themes'; -import { IFormField, IWithStyle } from '../typings/generic'; +import { IFormField } from '../typings/generic'; import { Error } from '../error'; import { Label } from '../label'; @@ -13,7 +13,7 @@ import { Wrapper } from '../wrapper'; interface IProps extends InputHTMLAttributes, IFormField, - IWithStyle { + WithStylesProps { className?: string; } @@ -122,4 +122,6 @@ class ToggleComponent extends Component { } } -export const Toggle = injectStyle(styles)(ToggleComponent); +export const Toggle = injectStyle(styles, { injectTheme: true })( + ToggleComponent, +); diff --git a/src/components/ui/typings/generic.ts b/src/components/ui/typings/generic.ts index 65b996d59..3aec0bc40 100644 --- a/src/components/ui/typings/generic.ts +++ b/src/components/ui/typings/generic.ts @@ -1,7 +1,3 @@ -import { Classes } from 'jss'; - -import { Theme } from '../../../themes'; - export interface IFormField { showLabel?: boolean; label?: string; @@ -10,10 +6,5 @@ export interface IFormField { noMargin?: boolean; } -export interface IWithStyle { - classes: Classes; - theme: Theme; -} - export type Merge = Omit> & N; export type Omit = Pick>; diff --git a/src/components/ui/wrapper/index.tsx b/src/components/ui/wrapper/index.tsx index ffcd6fe0b..bc385d319 100644 --- a/src/components/ui/wrapper/index.tsx +++ b/src/components/ui/wrapper/index.tsx @@ -1,9 +1,8 @@ import classnames from 'classnames'; import { Component, ReactNode } from 'react'; -import injectStyle from 'react-jss'; -import { IWithStyle } from '../typings/generic'; +import injectStyle, { WithStylesProps } from 'react-jss'; -interface IProps extends IWithStyle { +interface IProps extends WithStylesProps { children: ReactNode; className?: string; identifier: string; @@ -34,4 +33,6 @@ class WrapperComponent extends Component { } } -export const Wrapper = injectStyle(styles)(WrapperComponent); +export const Wrapper = injectStyle(styles, { injectTheme: true })( + WrapperComponent, +); diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.js index cddcd91c2..6a8b126f1 100644 --- a/src/components/util/ErrorBoundary/index.js +++ b/src/components/util/ErrorBoundary/index.js @@ -18,7 +18,6 @@ const messages = defineMessages({ }, }); -@injectSheet(styles) class ErrorBoundary extends Component { state = { hasError: false, @@ -56,4 +55,6 @@ class ErrorBoundary extends Component { } } -export default injectIntl(ErrorBoundary); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(ErrorBoundary), +); diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index aa36e3969..e6d6dcf8a 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js @@ -14,8 +14,6 @@ import AppLoader from '../../components/ui/AppLoader'; import { oneOrManyChildElements } from '../../prop-types'; import FeaturesStore from '../../stores/FeaturesStore'; -@inject('stores', 'actions') -@observer class AuthLayoutContainer extends Component { static propTypes = { children: oneOrManyChildElements.isRequired, @@ -71,7 +69,7 @@ class AuthLayoutContainer extends Component { } } -AuthLayoutContainer.wrappedComponent.propTypes = { +AuthLayoutContainer.propTypes = { stores: PropTypes.shape({ app: PropTypes.instanceOf(AppStore).isRequired, features: PropTypes.instanceOf(FeaturesStore).isRequired, @@ -85,4 +83,4 @@ AuthLayoutContainer.wrappedComponent.propTypes = { }).isRequired, }; -export default AuthLayoutContainer; +export default inject('stores', 'actions')(observer(AuthLayoutContainer)); diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js index dcc913c39..60bfde088 100644 --- a/src/containers/auth/ChangeServerScreen.js +++ b/src/containers/auth/ChangeServerScreen.js @@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router'; import ChangeServer from '../../components/auth/ChangeServer'; import SettingsStore from '../../stores/SettingsStore'; -@inject('stores', 'actions') -@observer class ChangeServerScreen extends Component { constructor(props) { super(props); @@ -34,7 +32,7 @@ class ChangeServerScreen extends Component { } } -ChangeServerScreen.wrappedComponent.propTypes = { +ChangeServerScreen.propTypes = { actions: PropTypes.shape({ settings: PropTypes.instanceOf(SettingsStore).isRequired, }).isRequired, @@ -44,4 +42,4 @@ ChangeServerScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default ChangeServerScreen; +export default inject('stores', 'actions')(observer(ChangeServerScreen)); diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js index 46e2d41f0..c01c3d355 100644 --- a/src/containers/auth/ImportScreen.js +++ b/src/containers/auth/ImportScreen.js @@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router'; import Import from '../../components/auth/Import'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class ImportScreen extends Component { render() { const { actions, stores } = this.props; @@ -26,7 +24,7 @@ class ImportScreen extends Component { } } -ImportScreen.wrappedComponent.propTypes = { +ImportScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -36,4 +34,4 @@ ImportScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default ImportScreen; +export default inject('stores', 'actions')(observer(ImportScreen)); diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js index e252242ae..fc66227cc 100644 --- a/src/containers/auth/InviteScreen.js +++ b/src/containers/auth/InviteScreen.js @@ -3,8 +3,6 @@ import PropTypes from 'prop-types'; import { inject, observer } from 'mobx-react'; import Invite from '../../components/auth/Invite'; -@inject('stores', 'actions') -@observer class InviteScreen extends Component { render() { const { actions } = this.props; @@ -13,7 +11,7 @@ class InviteScreen extends Component { } } -InviteScreen.wrappedComponent.propTypes = { +InviteScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.shape({ invite: PropTypes.func.isRequired, @@ -21,4 +19,4 @@ InviteScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default InviteScreen; +export default inject('stores', 'actions')(observer(InviteScreen)); diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js index 945e41284..87a00800f 100644 --- a/src/containers/auth/LockedScreen.js +++ b/src/containers/auth/LockedScreen.js @@ -7,8 +7,6 @@ import SettingsStore from '../../stores/SettingsStore'; import { hash } from '../../helpers/password-helpers'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class LockedScreen extends Component { state = { error: false, @@ -76,7 +74,7 @@ class LockedScreen extends Component { } } -LockedScreen.wrappedComponent.propTypes = { +LockedScreen.propTypes = { actions: PropTypes.shape({ settings: PropTypes.instanceOf(SettingsStore).isRequired, }).isRequired, @@ -86,4 +84,4 @@ LockedScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default LockedScreen; +export default inject('stores', 'actions')(observer(LockedScreen)); diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js index 3f8c67fa8..572a38ea1 100644 --- a/src/containers/auth/LoginScreen.js +++ b/src/containers/auth/LoginScreen.js @@ -6,8 +6,6 @@ import UserStore from '../../stores/UserStore'; import { globalError as globalErrorPropType } from '../../prop-types'; -@inject('stores', 'actions') -@observer class LoginScreen extends Component { static propTypes = { error: globalErrorPropType.isRequired, @@ -32,7 +30,7 @@ class LoginScreen extends Component { } } -LoginScreen.wrappedComponent.propTypes = { +LoginScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -41,4 +39,4 @@ LoginScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default LoginScreen; +export default inject('stores', 'actions')(observer(LoginScreen)); diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js index 836d4cc88..4b2c1b4a2 100644 --- a/src/containers/auth/PasswordScreen.js +++ b/src/containers/auth/PasswordScreen.js @@ -4,8 +4,6 @@ import { inject, observer } from 'mobx-react'; import Password from '../../components/auth/Password'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class PasswordScreen extends Component { render() { const { actions, stores } = this.props; @@ -22,7 +20,7 @@ class PasswordScreen extends Component { } } -PasswordScreen.wrappedComponent.propTypes = { +PasswordScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -31,4 +29,4 @@ PasswordScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default PasswordScreen; +export default inject('stores', 'actions')(observer(PasswordScreen)); diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js index 8cdd95a88..f6392712d 100644 --- a/src/containers/auth/SetupAssistantScreen.js +++ b/src/containers/auth/SetupAssistantScreen.js @@ -14,8 +14,6 @@ import ServicesStore from '../../stores/ServicesStore'; import RecipesStore from '../../stores/RecipesStore'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class SetupAssistantScreen extends Component { constructor(props) { super(props); @@ -120,7 +118,7 @@ class SetupAssistantScreen extends Component { } } -SetupAssistantScreen.wrappedComponent.propTypes = { +SetupAssistantScreen.propTypes = { stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore), router: PropTypes.instanceOf(RouterStore).isRequired, @@ -134,4 +132,4 @@ SetupAssistantScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default SetupAssistantScreen; +export default inject('stores', 'actions')(observer(SetupAssistantScreen)); diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js index 3b19f3c50..1dd8d0772 100644 --- a/src/containers/auth/SignupScreen.js +++ b/src/containers/auth/SignupScreen.js @@ -8,8 +8,6 @@ import FeaturesStore from '../../stores/FeaturesStore'; import { globalError as globalErrorPropType } from '../../prop-types'; -@inject('stores', 'actions') -@observer class SignupScreen extends Component { static propTypes = { error: globalErrorPropType.isRequired, @@ -36,7 +34,7 @@ class SignupScreen extends Component { } } -SignupScreen.wrappedComponent.propTypes = { +SignupScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -46,4 +44,4 @@ SignupScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default SignupScreen; +export default inject('stores', 'actions')(observer(SignupScreen)); diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js index 7a23d9ba9..18b6b2eda 100644 --- a/src/containers/auth/WelcomeScreen.js +++ b/src/containers/auth/WelcomeScreen.js @@ -6,8 +6,6 @@ import Welcome from '../../components/auth/Welcome'; import UserStore from '../../stores/UserStore'; import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; -@inject('stores', 'actions') -@observer class LoginScreen extends Component { render() { const { user, recipePreviews } = this.props.stores; @@ -23,11 +21,11 @@ class LoginScreen extends Component { } } -LoginScreen.wrappedComponent.propTypes = { +LoginScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, }).isRequired, }; -export default LoginScreen; +export default inject('stores', 'actions')(observer(LoginScreen)); diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 50a28803f..9b0edc85e 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js @@ -24,8 +24,6 @@ import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawe import { workspaceStore } from '../../features/workspaces'; import WorkspacesStore from '../../features/workspaces/store'; -@inject('stores', 'actions') -@observer class AppLayoutContainer extends Component { static defaultProps = { children: null, @@ -171,7 +169,7 @@ class AppLayoutContainer extends Component { } } -AppLayoutContainer.wrappedComponent.propTypes = { +AppLayoutContainer.propTypes = { stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore).isRequired, features: PropTypes.instanceOf(FeaturesStore).isRequired, @@ -194,4 +192,4 @@ AppLayoutContainer.wrappedComponent.propTypes = { children: oneOrManyChildElements, }; -export default AppLayoutContainer; +export default inject('stores', 'actions')(observer(AppLayoutContainer)); diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index f7c9b8164..aae230577 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js @@ -12,8 +12,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary'; import { LIVE_FRANZ_API } from '../../config'; import { WEBSITE } from '../../environment-remote'; -@inject('stores', 'actions') -@observer class AccountScreen extends Component { onCloseWindow() { const { user, features } = this.props.stores; @@ -74,7 +72,7 @@ class AccountScreen extends Component { } } -AccountScreen.wrappedComponent.propTypes = { +AccountScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, features: PropTypes.instanceOf(FeaturesStore).isRequired, @@ -87,4 +85,4 @@ AccountScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default AccountScreen; +export default inject('stores', 'actions')(observer(AccountScreen)); diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index ddf7fab36..24b827993 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js @@ -111,8 +111,6 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') -@observer class EditServiceScreen extends Component { onSubmit(data) { const { action } = this.props.router.params; @@ -438,7 +436,7 @@ class EditServiceScreen extends Component { } } -EditServiceScreen.wrappedComponent.propTypes = { +EditServiceScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, recipes: PropTypes.instanceOf(RecipesStore).isRequired, @@ -451,4 +449,6 @@ EditServiceScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default injectIntl(EditServiceScreen); +export default injectIntl( + inject('stores', 'actions')(observer(EditServiceScreen)), +); diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 720f2c8a1..ddf6876b9 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -245,8 +245,6 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') -@observer class EditSettingsScreen extends Component { constructor(props) { super(props); @@ -753,7 +751,7 @@ class EditSettingsScreen extends Component { } } -EditSettingsScreen.wrappedComponent.propTypes = { +EditSettingsScreen.propTypes = { stores: PropTypes.shape({ app: PropTypes.instanceOf(AppStore).isRequired, user: PropTypes.instanceOf(UserStore).isRequired, @@ -771,4 +769,6 @@ EditSettingsScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default injectIntl(EditSettingsScreen); +export default injectIntl( + inject('stores', 'actions')(observer(EditSettingsScreen)), +); diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index 1dc0aa8e6..baa2d7b71 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js @@ -49,8 +49,6 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') -@observer class EditUserScreen extends Component { componentWillUnmount() { this.props.actions.user.resetStatus(); @@ -150,7 +148,7 @@ class EditUserScreen extends Component { } } -EditUserScreen.wrappedComponent.propTypes = { +EditUserScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -159,4 +157,6 @@ EditUserScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default injectIntl(EditUserScreen); +export default injectIntl( + inject('stores', 'actions')(observer(EditUserScreen)), +); diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js index 592b4b11c..86723554c 100644 --- a/src/containers/settings/InviteScreen.js +++ b/src/containers/settings/InviteScreen.js @@ -6,8 +6,6 @@ import Invite from '../../components/auth/Invite'; import ErrorBoundary from '../../components/util/ErrorBoundary'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class InviteScreen extends Component { componentWillUnmount() { this.props.stores.user.inviteRequest.reset(); @@ -32,7 +30,7 @@ class InviteScreen extends Component { } } -InviteScreen.wrappedComponent.propTypes = { +InviteScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -41,4 +39,4 @@ InviteScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default InviteScreen; +export default inject('stores', 'actions')(observer(InviteScreen)); diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index 7f55e54c5..6b629d3d8 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js @@ -19,8 +19,6 @@ import RecipePreview from '../../models/RecipePreview'; import AppStore from '../../stores/AppStore'; import { openPath } from '../../helpers/url-helpers'; -@inject('stores', 'actions') -@observer class RecipesScreen extends Component { static propTypes = { params: PropTypes.shape({ @@ -182,7 +180,7 @@ class RecipesScreen extends Component { } } -RecipesScreen.wrappedComponent.propTypes = { +RecipesScreen.propTypes = { stores: PropTypes.shape({ recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, recipes: PropTypes.instanceOf(RecipeStore).isRequired, @@ -198,4 +196,4 @@ RecipesScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default RecipesScreen; +export default inject('stores', 'actions')(observer(RecipesScreen)); diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js index a657b6e6c..2970b2a54 100644 --- a/src/containers/settings/ServicesScreen.js +++ b/src/containers/settings/ServicesScreen.js @@ -10,8 +10,6 @@ import ServiceStore from '../../stores/ServicesStore'; import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; -@inject('stores', 'actions') -@observer class ServicesScreen extends Component { componentWillUnmount() { this.props.actions.service.resetFilter(); @@ -57,7 +55,7 @@ class ServicesScreen extends Component { } } -ServicesScreen.wrappedComponent.propTypes = { +ServicesScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, services: PropTypes.instanceOf(ServiceStore).isRequired, @@ -68,4 +66,4 @@ ServicesScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default ServicesScreen; +export default inject('stores', 'actions')(observer(ServicesScreen)); diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js index 35db3a434..0e6ce4df3 100644 --- a/src/containers/settings/SettingsWindow.js +++ b/src/containers/settings/SettingsWindow.js @@ -11,8 +11,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary'; import { workspaceStore } from '../../features/workspaces'; import UIStore from '../../stores/UIStore'; -@inject('stores', 'actions') -@observer class SettingsContainer extends Component { portalRoot = document.querySelector('#portalContainer'); @@ -48,7 +46,7 @@ class SettingsContainer extends Component { } } -SettingsContainer.wrappedComponent.propTypes = { +SettingsContainer.propTypes = { children: PropTypes.element.isRequired, stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore).isRequired, @@ -58,4 +56,4 @@ SettingsContainer.wrappedComponent.propTypes = { }).isRequired, }; -export default SettingsContainer; +export default inject('stores', 'actions')(observer(SettingsContainer)); diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js index d3600f8ea..b4ad952b2 100644 --- a/src/containers/settings/SupportScreen.js +++ b/src/containers/settings/SupportScreen.js @@ -6,7 +6,6 @@ import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDas import ErrorBoundary from '../../components/util/ErrorBoundary'; import AppStore from '../../stores/AppStore'; -@inject('actions') class SupportScreen extends Component { constructor(props) { super(props); @@ -27,10 +26,10 @@ class SupportScreen extends Component { } } -SupportScreen.wrappedComponent.propTypes = { +SupportScreen.propTypes = { actions: PropTypes.shape({ app: PropTypes.instanceOf(AppStore).isRequired, }).isRequired, }; -export default SupportScreen; +export default inject('actions')(SupportScreen); diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js index 928262a59..0a8b92b47 100644 --- a/src/containers/settings/TeamScreen.js +++ b/src/containers/settings/TeamScreen.js @@ -10,8 +10,6 @@ import TeamDashboard from '../../components/settings/team/TeamDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; import { DEV_API_FRANZ_WEBSITE } from '../../config'; -@inject('stores', 'actions') -@observer class TeamScreen extends Component { handleWebsiteLink(route) { const { actions, stores } = this.props; @@ -44,7 +42,7 @@ class TeamScreen extends Component { } } -TeamScreen.wrappedComponent.propTypes = { +TeamScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, app: PropTypes.instanceOf(AppStore).isRequired, @@ -56,4 +54,4 @@ TeamScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default TeamScreen; +export default inject('stores', 'actions')(observer(TeamScreen)); diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts index af15b157e..95f211e52 100644 --- a/src/electron/ipc-api/download.ts +++ b/src/electron/ipc-api/download.ts @@ -48,7 +48,7 @@ export default (params: { mainWindow: BrowserWindow }) => { debug('File blob saved to', saveDialog.filePath); } catch (error) { - console.log(error); + console.error(error); } } } catch (error) { diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js index 652233e55..89b0a4e72 100644 --- a/src/features/basicAuth/Component.js +++ b/src/features/basicAuth/Component.js @@ -22,8 +22,6 @@ const messages = defineMessages({ }, }); -@injectSheet(styles) -@observer class BasicAuthModal extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -97,4 +95,6 @@ class BasicAuthModal extends Component { ); } } -export default injectIntl(BasicAuthModal); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(BasicAuthModal)), +); diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js index 64f782c8f..0966480d0 100644 --- a/src/features/nightlyBuilds/Component.js +++ b/src/features/nightlyBuilds/Component.js @@ -29,7 +29,7 @@ const messages = defineMessages({ }, }); -const styles = () => ({ +const styles = { info: { paddingTop: 20, paddingBottom: 20, @@ -51,11 +51,8 @@ const styles = () => ({ background: '#c45a5a !important', color: '#ffffff !important', }, -}); +}; -@injectSheet(styles) -@inject('stores', 'actions') -@observer class NightlyBuildsModal extends Component { close() { ModalState.isModalVisible = false; @@ -119,7 +116,7 @@ class NightlyBuildsModal extends Component { } } -NightlyBuildsModal.wrappedComponent.propTypes = { +NightlyBuildsModal.propTypes = { stores: PropTypes.shape({ settings: PropTypes.instanceOf(SettingsStore).isRequired, }).isRequired, @@ -131,4 +128,8 @@ NightlyBuildsModal.wrappedComponent.propTypes = { classes: PropTypes.object.isRequired, }; -export default injectIntl(NightlyBuildsModal); +export default injectIntl( + injectSheet(styles)( + inject('stores', 'actions')(observer(NightlyBuildsModal)), + ), +); diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js index 30bdc13b6..953fc7c21 100644 --- a/src/features/publishDebugInfo/Component.js +++ b/src/features/publishDebugInfo/Component.js @@ -85,14 +85,7 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@inject('stores', 'actions') -@observer class PublishDebugLogModal extends Component { - static propTypes = { - classes: PropTypes.object.isRequired, - }; - state = { log: null, error: false, @@ -221,13 +214,18 @@ class PublishDebugLogModal extends Component { } } -PublishDebugLogModal.wrappedComponent.propTypes = { +PublishDebugLogModal.propTypes = { stores: PropTypes.shape({ app: PropTypes.instanceOf(AppStore).isRequired, }).isRequired, actions: PropTypes.shape({ service: PropTypes.instanceOf(ServicesStore).isRequired, }).isRequired, + classes: PropTypes.object.isRequired, }; -export default injectIntl(PublishDebugLogModal); +export default injectIntl( + injectSheet(styles, { injectTheme: true })( + inject('stores', 'actions')(observer(PublishDebugLogModal)), + ), +); diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js index 75587cc1d..7f9424b6d 100644 --- a/src/features/quickSwitch/Component.js +++ b/src/features/quickSwitch/Component.js @@ -81,9 +81,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@inject('stores', 'actions') -@observer class QuickSwitchModal extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -349,13 +346,18 @@ class QuickSwitchModal extends Component { } } -QuickSwitchModal.wrappedComponent.propTypes = { +QuickSwitchModal.propTypes = { stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore).isRequired, }).isRequired, actions: PropTypes.shape({ service: PropTypes.instanceOf(ServicesStore).isRequired, }).isRequired, + classes: PropTypes.object.isRequired, }; -export default injectIntl(QuickSwitchModal); +export default injectIntl( + injectSheet(styles, { injectTheme: true })( + inject('stores', 'actions')(observer(QuickSwitchModal)), + ), +); diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js index 1d423544b..780864b91 100644 --- a/src/features/todos/components/TodosWebview.js +++ b/src/features/todos/components/TodosWebview.js @@ -48,8 +48,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class TodosWebview extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -128,7 +126,6 @@ class TodosWebview extends Component { const { handleClientMessage } = this.props; if (!this.webview) return; this.webview.addEventListener('ipc-message', e => { - // console.log(e); handleClientMessage({ channel: e.channel, message: e.args[0] }); }); } @@ -201,4 +198,6 @@ class TodosWebview extends Component { } } -export default TodosWebview; +export default injectSheet(styles, { injectTheme: true })( + observer(TodosWebview), +); diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js index 536810d2d..b97506767 100644 --- a/src/features/todos/containers/TodosScreen.js +++ b/src/features/todos/containers/TodosScreen.js @@ -10,8 +10,6 @@ import { TODOS_MIN_WIDTH } from '../../../config'; import { todoActions } from '../actions'; import ServicesStore from '../../../stores/ServicesStore'; -@inject('stores', 'actions') -@observer class TodosScreen extends Component { render() { if ( @@ -44,9 +42,9 @@ class TodosScreen extends Component { } } -export default TodosScreen; +export default inject('stores', 'actions')(observer(TodosScreen)); -TodosScreen.wrappedComponent.propTypes = { +TodosScreen.propTypes = { stores: PropTypes.shape({ features: PropTypes.instanceOf(FeaturesStore).isRequired, services: PropTypes.instanceOf(ServicesStore).isRequired, diff --git a/src/features/todos/store.js b/src/features/todos/store.js index d158ed480..2bf4e8fab 100644 --- a/src/features/todos/store.js +++ b/src/features/todos/store.js @@ -187,10 +187,6 @@ export default class TodoStore extends FeatureStore { break; default: debug('Other message received', channel, message); - console.log( - 'this.stores.services.isTodosServiceAdded', - this.stores.services.isTodosServiceAdded, - ); if (this.stores.services.isTodosServiceAdded) { this.actions.service.handleIPCMessage({ serviceId: this.stores.services.isTodosServiceAdded.id, diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js index 5650d4cd1..99d78eda0 100644 --- a/src/features/webControls/components/WebControls.js +++ b/src/features/webControls/components/WebControls.js @@ -94,8 +94,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class WebControls extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -238,4 +236,6 @@ class WebControls extends Component { } } -export default injectIntl(WebControls); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(WebControls)), +); diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js index 6fba5db86..3dac6997c 100644 --- a/src/features/webControls/containers/WebControlsScreen.js +++ b/src/features/webControls/containers/WebControlsScreen.js @@ -16,8 +16,6 @@ const URL_EVENTS = [ 'did-navigate-in-page', ]; -@inject('stores', 'actions') -@observer class WebControlsScreen extends Component { @observable url = ''; @@ -125,9 +123,9 @@ class WebControlsScreen extends Component { } } -export default WebControlsScreen; +export default inject('stores', 'actions')(observer(WebControlsScreen)); -WebControlsScreen.wrappedComponent.propTypes = { +WebControlsScreen.propTypes = { service: PropTypes.instanceOf(Service).isRequired, stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore).isRequired, diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js index 75f6d9f4a..54475eccb 100644 --- a/src/features/workspaces/components/CreateWorkspaceForm.js +++ b/src/features/workspaces/components/CreateWorkspaceForm.js @@ -21,7 +21,7 @@ const messages = defineMessages({ }, }); -const styles = () => ({ +const styles = { form: { display: 'flex', }, @@ -32,10 +32,8 @@ const styles = () => ({ submitButton: { height: 'inherit', }, -}); +}; -@injectSheet(styles) -@observer class CreateWorkspaceForm extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -94,4 +92,6 @@ class CreateWorkspaceForm extends Component { } } -export default injectIntl(CreateWorkspaceForm); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(CreateWorkspaceForm)), +); diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js index fa3ea4289..e8bd9d60c 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js @@ -58,7 +58,7 @@ const messages = defineMessages({ }, }); -const styles = () => ({ +const styles = { nameInput: { height: 'auto', }, @@ -68,10 +68,8 @@ const styles = () => ({ keepLoadedInfo: { marginBottom: '2rem !important', }, -}); +}; -@injectSheet(styles) -@observer class EditWorkspaceForm extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -230,4 +228,6 @@ class EditWorkspaceForm extends Component { } } -export default injectIntl(EditWorkspaceForm); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(EditWorkspaceForm)), +); diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index d66e0f10d..4fd2b1153 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js @@ -88,8 +88,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class WorkspaceDrawer extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -175,4 +173,6 @@ class WorkspaceDrawer extends Component { } } -export default injectIntl(WorkspaceDrawer); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(WorkspaceDrawer)), +); diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js index d3c9fa767..22c0a39d9 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.js +++ b/src/features/workspaces/components/WorkspaceDrawerItem.js @@ -65,8 +65,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class WorkspaceDrawerItem extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -150,4 +148,6 @@ class WorkspaceDrawerItem extends Component { } } -export default injectIntl(WorkspaceDrawerItem); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(WorkspaceDrawerItem)), +); diff --git a/src/features/workspaces/components/WorkspaceItem.tsx b/src/features/workspaces/components/WorkspaceItem.tsx index 6fb02d2f5..f46375c7a 100644 --- a/src/features/workspaces/components/WorkspaceItem.tsx +++ b/src/features/workspaces/components/WorkspaceItem.tsx @@ -22,8 +22,6 @@ type Props = { onItemClick: (workspace) => void; }; -@injectSheet(styles) -@observer class WorkspaceItem extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -42,4 +40,6 @@ class WorkspaceItem extends Component { } } -export default WorkspaceItem; +export default injectSheet(styles, { injectTheme: true })( + observer(WorkspaceItem), +); diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx index 6e012eb1e..46fda0103 100644 --- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx +++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx @@ -36,8 +36,6 @@ type Props = { service: any; }; -@injectSheet(styles) -@observer class WorkspaceServiceListItem extends Component { render() { const { classes, isInWorkspace, onToggle, service } = this.props; @@ -63,4 +61,6 @@ class WorkspaceServiceListItem extends Component { } } -export default WorkspaceServiceListItem; +export default injectSheet(styles, { injectTheme: true })( + observer(WorkspaceServiceListItem), +); diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js index ff4e9475a..b2e0adfe7 100644 --- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js +++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js @@ -53,8 +53,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class WorkspaceSwitchingIndicator extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -85,4 +83,8 @@ class WorkspaceSwitchingIndicator extends Component { } } -export default injectIntl(WorkspaceSwitchingIndicator); +export default injectIntl( + injectSheet(styles, { injectTheme: true })( + observer(WorkspaceSwitchingIndicator), + ), +); diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index 1087580b1..9c2f65731 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js @@ -49,7 +49,7 @@ const messages = defineMessages({ }, }); -const styles = () => ({ +const styles = { table: { width: '100%', '& td': { @@ -67,11 +67,8 @@ const styles = () => ({ margin: [-8, 0, 0, 20], alignSelf: 'center', }, -}); +}; -@inject('stores') -@injectSheet(styles) -@observer class WorkspacesDashboard extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -190,9 +187,13 @@ class WorkspacesDashboard extends Component { } } -export default injectIntl(WorkspacesDashboard); +export default injectIntl( + inject('stores')( + injectSheet(styles, { injectTheme: true })(observer(WorkspacesDashboard)), + ), +); -WorkspacesDashboard.wrappedComponent.propTypes = { +WorkspacesDashboard.propTypes = { stores: PropTypes.shape({ ui: PropTypes.instanceOf(UIStore).isRequired, }).isRequired, diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.tsx b/src/features/workspaces/containers/EditWorkspaceScreen.tsx index 8e8f8179d..0351ddafb 100644 --- a/src/features/workspaces/containers/EditWorkspaceScreen.tsx +++ b/src/features/workspaces/containers/EditWorkspaceScreen.tsx @@ -17,8 +17,6 @@ type Props = { }; }; -@inject('stores', 'actions') -@observer class EditWorkspaceScreen extends Component { // @ts-expect-error Not all code paths return a value. onDelete = () => { @@ -58,4 +56,4 @@ class EditWorkspaceScreen extends Component { } } -export default EditWorkspaceScreen; +export default inject('stores', 'actions')(observer(EditWorkspaceScreen)); diff --git a/src/features/workspaces/containers/WorkspacesScreen.tsx b/src/features/workspaces/containers/WorkspacesScreen.tsx index a07e92439..33808b69d 100644 --- a/src/features/workspaces/containers/WorkspacesScreen.tsx +++ b/src/features/workspaces/containers/WorkspacesScreen.tsx @@ -17,8 +17,6 @@ type Props = { }; }; -@inject('stores', 'actions') -@observer class WorkspacesScreen extends Component { render() { const { actions } = this.props; @@ -38,4 +36,4 @@ class WorkspacesScreen extends Component { } } -export default WorkspacesScreen; +export default inject('stores', 'actions')(observer(WorkspacesScreen)); diff --git a/src/lib/Form.ts b/src/lib/Form.ts index 9b8321948..14ea82948 100644 --- a/src/lib/Form.ts +++ b/src/lib/Form.ts @@ -1,4 +1,5 @@ import Form from 'mobx-react-form'; +import vjf from 'mobx-react-form/lib/validators/VJF'; export default class DefaultForm extends Form { bindings() { @@ -29,4 +30,10 @@ export default class DefaultForm extends Form { // // }, }; } + + plugins() { + return { + vjf: vjf(), + }; + } } diff --git a/src/routes.tsx b/src/routes.tsx index 569da06a7..192090737 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -36,8 +36,6 @@ type Props = { history: any; }; -@inject('stores', 'actions') -@observer class Routes extends Component { render() { const { locked } = this.props.stores.settings.app; @@ -94,4 +92,4 @@ class Routes extends Component { } } -export default Routes; +export default inject('stores', 'actions')(observer(Routes)); diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 3d418c4c5..09ee8890a 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -799,8 +799,6 @@ export default class ServicesStore extends Store { options.icon = '/assets/img/notification-badge.gif'; } - console.log(title, options); - this.actions.app.notify({ notificationId: args[0].notificationId, title, -- cgit v1.2.3-70-g09d2