diff options
author | 2024-03-22 02:33:33 +0530 | |
---|---|---|
committer | 2024-03-21 21:24:35 +0000 | |
commit | 2f3f2ae7f098376f535e5aa993c9eedc14e36f5d (patch) | |
tree | d919bda212744493a7b66c2e91a75455421d62cc /src/containers/settings | |
parent | Upgrade electron to '29.1.5' (diff) | |
download | ferdium-app-2f3f2ae7f098376f535e5aa993c9eedc14e36f5d.tar.gz ferdium-app-2f3f2ae7f098376f535e5aa993c9eedc14e36f5d.tar.zst ferdium-app-2f3f2ae7f098376f535e5aa993c9eedc14e36f5d.zip |
Upgrade node modules
Diffstat (limited to 'src/containers/settings')
-rw-r--r-- | src/containers/settings/AccountScreen.tsx | 4 | ||||
-rw-r--r-- | src/containers/settings/EditServiceScreen.tsx | 32 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.tsx | 36 | ||||
-rw-r--r-- | src/containers/settings/EditUserScreen.tsx | 12 | ||||
-rw-r--r-- | src/containers/settings/InviteScreen.tsx | 4 | ||||
-rw-r--r-- | src/containers/settings/RecipesScreen.tsx | 16 | ||||
-rw-r--r-- | src/containers/settings/ReleaseNotesScreen.tsx | 2 | ||||
-rw-r--r-- | src/containers/settings/ReleaseNotesWindow.tsx | 4 | ||||
-rw-r--r-- | src/containers/settings/ServicesScreen.tsx | 4 | ||||
-rw-r--r-- | src/containers/settings/SettingsWindow.tsx | 6 | ||||
-rw-r--r-- | src/containers/settings/SupportScreen.tsx | 2 | ||||
-rw-r--r-- | src/containers/settings/TeamScreen.tsx | 4 |
12 files changed, 67 insertions, 59 deletions
diff --git a/src/containers/settings/AccountScreen.tsx b/src/containers/settings/AccountScreen.tsx index 55aa1e5c9..f1ef1ae3e 100644 --- a/src/containers/settings/AccountScreen.tsx +++ b/src/containers/settings/AccountScreen.tsx | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
2 | import { Component, type ReactElement } from 'react'; | ||
3 | 3 | ||
4 | import { StoresProps } from '../../@types/ferdium-components.types'; | 4 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
5 | 5 | ||
6 | import AccountDashboard from '../../components/settings/account/AccountDashboard'; | 6 | import AccountDashboard from '../../components/settings/account/AccountDashboard'; |
7 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 7 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
diff --git a/src/containers/settings/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx index 3c65877c8..dde69ef2d 100644 --- a/src/containers/settings/EditServiceScreen.tsx +++ b/src/containers/settings/EditServiceScreen.tsx | |||
@@ -1,23 +1,27 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 2 | import { Component, type ReactElement } from 'react'; |
4 | import { Params } from 'react-router-dom'; | 3 | import { |
5 | import { StoresProps } from '../../@types/ferdium-components.types'; | 4 | type WrappedComponentProps, |
6 | import { IRecipe } from '../../models/Recipe'; | 5 | defineMessages, |
7 | import Service from '../../models/Service'; | 6 | injectIntl, |
8 | import { FormFields } from '../../@types/mobx-form.types'; | 7 | } from 'react-intl'; |
9 | import Form from '../../lib/Form'; | 8 | import type { Params } from 'react-router-dom'; |
10 | import ServiceError from '../../components/settings/services/ServiceError'; | 9 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
10 | import type { FormFields } from '../../@types/mobx-form.types'; | ||
11 | import EditServiceForm from '../../components/settings/services/EditServiceForm'; | 11 | import EditServiceForm from '../../components/settings/services/EditServiceForm'; |
12 | import ServiceError from '../../components/settings/services/ServiceError'; | ||
12 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 13 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
13 | import { required, url, oneRequired } from '../../helpers/validation-helpers'; | 14 | import withParams from '../../components/util/WithParams'; |
14 | import { getSelectOptions } from '../../helpers/i18n-helpers'; | 15 | import { DEFAULT_APP_SETTINGS, DEFAULT_SERVICE_SETTINGS } from '../../config'; |
15 | import { config as proxyFeature } from '../../features/serviceProxy'; | 16 | import { config as proxyFeature } from '../../features/serviceProxy'; |
16 | import { SPELLCHECKER_LOCALES } from '../../i18n/languages'; | 17 | import { getSelectOptions } from '../../helpers/i18n-helpers'; |
18 | import { url, oneRequired, required } from '../../helpers/validation-helpers'; | ||
17 | import globalMessages from '../../i18n/globalMessages'; | 19 | import globalMessages from '../../i18n/globalMessages'; |
18 | import { DEFAULT_APP_SETTINGS, DEFAULT_SERVICE_SETTINGS } from '../../config'; | 20 | import { SPELLCHECKER_LOCALES } from '../../i18n/languages'; |
19 | import withParams from '../../components/util/WithParams'; | ||
20 | import { ifUndefined } from '../../jsUtils'; | 21 | import { ifUndefined } from '../../jsUtils'; |
22 | import Form from '../../lib/Form'; | ||
23 | import type { IRecipe } from '../../models/Recipe'; | ||
24 | import type Service from '../../models/Service'; | ||
21 | 25 | ||
22 | const messages = defineMessages({ | 26 | const messages = defineMessages({ |
23 | name: { | 27 | name: { |
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx index 5d1b09296..b731ad50a 100644 --- a/src/containers/settings/EditSettingsScreen.tsx +++ b/src/containers/settings/EditSettingsScreen.tsx | |||
@@ -1,32 +1,36 @@ | |||
1 | import { ipcRenderer } from 'electron'; | 1 | import { ipcRenderer } from 'electron'; |
2 | import { Component, ReactElement } from 'react'; | ||
3 | import { inject, observer } from 'mobx-react'; | 2 | import { inject, observer } from 'mobx-react'; |
4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import { Component, type ReactElement } from 'react'; |
4 | import { | ||
5 | type WrappedComponentProps, | ||
6 | defineMessages, | ||
7 | injectIntl, | ||
8 | } from 'react-intl'; | ||
5 | 9 | ||
6 | import { FormFields } from '../../@types/mobx-form.types'; | 10 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
7 | import { StoresProps } from '../../@types/ferdium-components.types'; | 11 | import type { FormFields } from '../../@types/mobx-form.types'; |
8 | import Form from '../../lib/Form'; | ||
9 | import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; | ||
10 | import { | 12 | import { |
11 | DEFAULT_APP_SETTINGS, | 13 | DEFAULT_APP_SETTINGS, |
14 | GOOGLE_TRANSLATOR_LANGUAGES, | ||
12 | HIBERNATION_STRATEGIES, | 15 | HIBERNATION_STRATEGIES, |
13 | SIDEBAR_WIDTH, | ||
14 | SIDEBAR_SERVICES_LOCATION, | ||
15 | ICON_SIZES, | 16 | ICON_SIZES, |
17 | LIBRETRANSLATE_TRANSLATOR_LANGUAGES, | ||
16 | NAVIGATION_BAR_BEHAVIOURS, | 18 | NAVIGATION_BAR_BEHAVIOURS, |
17 | SEARCH_ENGINE_NAMES, | 19 | SEARCH_ENGINE_NAMES, |
18 | TRANSLATOR_ENGINE_NAMES, | 20 | SIDEBAR_SERVICES_LOCATION, |
19 | GOOGLE_TRANSLATOR_LANGUAGES, | 21 | SIDEBAR_WIDTH, |
20 | TRANSLATOR_ENGINE_GOOGLE, | 22 | SPLIT_COLUMNS_MAX, |
21 | LIBRETRANSLATE_TRANSLATOR_LANGUAGES, | 23 | SPLIT_COLUMNS_MIN, |
22 | TODO_APPS, | 24 | TODO_APPS, |
23 | WAKE_UP_STRATEGIES, | 25 | TRANSLATOR_ENGINE_GOOGLE, |
26 | TRANSLATOR_ENGINE_NAMES, | ||
24 | WAKE_UP_HIBERNATION_STRATEGIES, | 27 | WAKE_UP_HIBERNATION_STRATEGIES, |
25 | SPLIT_COLUMNS_MIN, | 28 | WAKE_UP_STRATEGIES, |
26 | SPLIT_COLUMNS_MAX, | ||
27 | WEBRTC_IP_HANDLING_POLICY, | 29 | WEBRTC_IP_HANDLING_POLICY, |
28 | } from '../../config'; | 30 | } from '../../config'; |
29 | import { isMac } from '../../environment'; | 31 | import { isMac } from '../../environment'; |
32 | import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; | ||
33 | import Form from '../../lib/Form'; | ||
30 | 34 | ||
31 | import { getSelectOptions } from '../../helpers/i18n-helpers'; | 35 | import { getSelectOptions } from '../../helpers/i18n-helpers'; |
32 | import { hash } from '../../helpers/password-helpers'; | 36 | import { hash } from '../../helpers/password-helpers'; |
@@ -35,8 +39,8 @@ import defaultUserAgent from '../../helpers/userAgent-helpers'; | |||
35 | import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; | 39 | import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; |
36 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 40 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
37 | 41 | ||
38 | import globalMessages from '../../i18n/globalMessages'; | ||
39 | import { importExportURL } from '../../api/apiBase'; | 42 | import { importExportURL } from '../../api/apiBase'; |
43 | import globalMessages from '../../i18n/globalMessages'; | ||
40 | import { ifUndefined } from '../../jsUtils'; | 44 | import { ifUndefined } from '../../jsUtils'; |
41 | 45 | ||
42 | const debug = require('../../preload-safe-debug')('Ferdium:EditSettingsScreen'); | 46 | const debug = require('../../preload-safe-debug')('Ferdium:EditSettingsScreen'); |
diff --git a/src/containers/settings/EditUserScreen.tsx b/src/containers/settings/EditUserScreen.tsx index 62df170fc..27fe87988 100644 --- a/src/containers/settings/EditUserScreen.tsx +++ b/src/containers/settings/EditUserScreen.tsx | |||
@@ -1,14 +1,14 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
3 | import { IntlShape, defineMessages, injectIntl } from 'react-intl'; | 2 | import { Component, type ReactElement } from 'react'; |
3 | import { type IntlShape, defineMessages, injectIntl } from 'react-intl'; | ||
4 | 4 | ||
5 | import { StoresProps } from '../../@types/ferdium-components.types'; | 5 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
6 | import { FormFields } from '../../@types/mobx-form.types'; | 6 | import type { FormFields } from '../../@types/mobx-form.types'; |
7 | import Form from '../../lib/Form'; | ||
8 | import EditUserForm from '../../components/settings/user/EditUserForm'; | 7 | import EditUserForm from '../../components/settings/user/EditUserForm'; |
9 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 8 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
9 | import Form from '../../lib/Form'; | ||
10 | 10 | ||
11 | import { required, email, minLength } from '../../helpers/validation-helpers'; | 11 | import { email, minLength, required } from '../../helpers/validation-helpers'; |
12 | 12 | ||
13 | const messages = defineMessages({ | 13 | const messages = defineMessages({ |
14 | firstname: { | 14 | firstname: { |
diff --git a/src/containers/settings/InviteScreen.tsx b/src/containers/settings/InviteScreen.tsx index c67b892bd..057c36c86 100644 --- a/src/containers/settings/InviteScreen.tsx +++ b/src/containers/settings/InviteScreen.tsx | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component, ReactNode } from 'react'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
2 | import { Component, type ReactNode } from 'react'; | ||
3 | 3 | ||
4 | import { StoresProps } from '../../@types/ferdium-components.types'; | 4 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
5 | import Invite from '../../components/auth/Invite'; | 5 | import Invite from '../../components/auth/Invite'; |
6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
7 | 7 | ||
diff --git a/src/containers/settings/RecipesScreen.tsx b/src/containers/settings/RecipesScreen.tsx index a46510d54..5540b602c 100644 --- a/src/containers/settings/RecipesScreen.tsx +++ b/src/containers/settings/RecipesScreen.tsx | |||
@@ -1,20 +1,20 @@ | |||
1 | import { readJsonSync } from 'fs-extra'; | 1 | import { readJsonSync } from 'fs-extra'; |
2 | import { Component, ReactElement } from 'react'; | 2 | import { type IReactionDisposer, autorun } from 'mobx'; |
3 | import { autorun, IReactionDisposer } from 'mobx'; | ||
4 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import { Component, type ReactElement } from 'react'; | ||
5 | 5 | ||
6 | import { Params } from 'react-router-dom'; | 6 | import type { Params } from 'react-router-dom'; |
7 | import Recipe from '../../models/Recipe'; | 7 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
8 | import { StoresProps } from '../../@types/ferdium-components.types'; | ||
9 | import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard'; | 8 | import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard'; |
10 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 9 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
10 | import withParams from '../../components/util/WithParams'; | ||
11 | import { CUSTOM_WEBSITE_RECIPE_ID, FERDIUM_DEV_DOCS } from '../../config'; | 11 | import { CUSTOM_WEBSITE_RECIPE_ID, FERDIUM_DEV_DOCS } from '../../config'; |
12 | import { userDataRecipesPath } from '../../environment-remote'; | 12 | import { userDataRecipesPath } from '../../environment-remote'; |
13 | import { asarRecipesPath } from '../../helpers/asar-helpers'; | ||
14 | import { communityRecipesStore } from '../../features/communityRecipes'; | 13 | import { communityRecipesStore } from '../../features/communityRecipes'; |
15 | import RecipePreview from '../../models/RecipePreview'; | 14 | import { asarRecipesPath } from '../../helpers/asar-helpers'; |
16 | import { openPath } from '../../helpers/url-helpers'; | 15 | import { openPath } from '../../helpers/url-helpers'; |
17 | import withParams from '../../components/util/WithParams'; | 16 | import type Recipe from '../../models/Recipe'; |
17 | import RecipePreview from '../../models/RecipePreview'; | ||
18 | 18 | ||
19 | interface IProps extends Partial<StoresProps> { | 19 | interface IProps extends Partial<StoresProps> { |
20 | params: Params; | 20 | params: Params; |
diff --git a/src/containers/settings/ReleaseNotesScreen.tsx b/src/containers/settings/ReleaseNotesScreen.tsx index c3014d187..482364817 100644 --- a/src/containers/settings/ReleaseNotesScreen.tsx +++ b/src/containers/settings/ReleaseNotesScreen.tsx | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { Component, type ReactElement } from 'react'; |
2 | 2 | ||
3 | import ReleaseNotes from '../../components/settings/releaseNotes/ReleaseNotesDashboard'; | 3 | import ReleaseNotes from '../../components/settings/releaseNotes/ReleaseNotesDashboard'; |
4 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 4 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
diff --git a/src/containers/settings/ReleaseNotesWindow.tsx b/src/containers/settings/ReleaseNotesWindow.tsx index 8215c9f36..a12c821e7 100644 --- a/src/containers/settings/ReleaseNotesWindow.tsx +++ b/src/containers/settings/ReleaseNotesWindow.tsx | |||
@@ -1,9 +1,9 @@ | |||
1 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
2 | import { Component, ReactPortal } from 'react'; | 2 | import { Component, type ReactPortal } from 'react'; |
3 | import ReactDOM from 'react-dom'; | 3 | import ReactDOM from 'react-dom'; |
4 | import { Outlet } from 'react-router-dom'; | 4 | import { Outlet } from 'react-router-dom'; |
5 | 5 | ||
6 | import { StoresProps } from '../../@types/ferdium-components.types'; | 6 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
7 | import Layout from '../../components/settings/releaseNotes/ReleaseNotesLayout'; | 7 | import Layout from '../../components/settings/releaseNotes/ReleaseNotesLayout'; |
8 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 8 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
9 | 9 | ||
diff --git a/src/containers/settings/ServicesScreen.tsx b/src/containers/settings/ServicesScreen.tsx index 6b648f038..b8f115e9a 100644 --- a/src/containers/settings/ServicesScreen.tsx +++ b/src/containers/settings/ServicesScreen.tsx | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
3 | import { StoresProps } from '../../@types/ferdium-components.types'; | 2 | import { Component, type ReactElement } from 'react'; |
3 | import type { StoresProps } from '../../@types/ferdium-components.types'; | ||
4 | import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; | 4 | import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; |
5 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 5 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
6 | 6 | ||
diff --git a/src/containers/settings/SettingsWindow.tsx b/src/containers/settings/SettingsWindow.tsx index d2cdf3eb3..67d6c8969 100644 --- a/src/containers/settings/SettingsWindow.tsx +++ b/src/containers/settings/SettingsWindow.tsx | |||
@@ -1,10 +1,10 @@ | |||
1 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
2 | import { Component, ReactElement, ReactPortal } from 'react'; | 2 | import { Component, type ReactElement, type ReactPortal } from 'react'; |
3 | import ReactDOM from 'react-dom'; | 3 | import ReactDOM from 'react-dom'; |
4 | import { Outlet } from 'react-router-dom'; | 4 | import { Outlet } from 'react-router-dom'; |
5 | import { StoresProps } from '../../@types/ferdium-components.types'; | 5 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
6 | import Navigation from '../../components/settings/navigation/SettingsNavigation'; | ||
7 | import Layout from '../../components/settings/SettingsLayout'; | 6 | import Layout from '../../components/settings/SettingsLayout'; |
7 | import Navigation from '../../components/settings/navigation/SettingsNavigation'; | ||
8 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 8 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
9 | import { workspaceStore } from '../../features/workspaces'; | 9 | import { workspaceStore } from '../../features/workspaces'; |
10 | 10 | ||
diff --git a/src/containers/settings/SupportScreen.tsx b/src/containers/settings/SupportScreen.tsx index c2f25ad8c..4c50869bb 100644 --- a/src/containers/settings/SupportScreen.tsx +++ b/src/containers/settings/SupportScreen.tsx | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { Component, type ReactElement } from 'react'; |
2 | 2 | ||
3 | import SupportFerdium from '../../components/settings/supportFerdium/SupportFerdiumDashboard'; | 3 | import SupportFerdium from '../../components/settings/supportFerdium/SupportFerdiumDashboard'; |
4 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 4 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
diff --git a/src/containers/settings/TeamScreen.tsx b/src/containers/settings/TeamScreen.tsx index 9d155f01c..ff2a1fb43 100644 --- a/src/containers/settings/TeamScreen.tsx +++ b/src/containers/settings/TeamScreen.tsx | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
2 | import { Component, type ReactElement } from 'react'; | ||
3 | 3 | ||
4 | import { StoresProps } from '../../@types/ferdium-components.types'; | 4 | import type { StoresProps } from '../../@types/ferdium-components.types'; |
5 | 5 | ||
6 | import TeamDashboard from '../../components/settings/team/TeamDashboard'; | 6 | import TeamDashboard from '../../components/settings/team/TeamDashboard'; |
7 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 7 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |