diff options
author | 2023-10-27 02:19:31 +0200 | |
---|---|---|
committer | 2023-10-27 01:19:31 +0100 | |
commit | 78cb67c641e5723af59e0cf8a172a443aafa6f33 (patch) | |
tree | ec121e8efecf027717ce4e58b29c72fa93ed3315 /src/components/settings | |
parent | 6.5.3-nightly.4 [skip ci] (diff) | |
download | ferdium-app-78cb67c641e5723af59e0cf8a172a443aafa6f33.tar.gz ferdium-app-78cb67c641e5723af59e0cf8a172a443aafa6f33.tar.zst ferdium-app-78cb67c641e5723af59e0cf8a172a443aafa6f33.zip |
feat: change loader component (#1410)
* CHANGED react-loater to react-loader-spinner
* CHANGED brandColor to primary
* feat: change loader component
- remove redundant /index path from Loader imports in multiple files
- remove commented out braces in RecipesDashboard
- remove redundant color which is default from Loader in InfoBar
- update size of Loader in InfoBar to be the same as InfoBox
- change passed size prop from string to number in Button component
- add slight gap for FullscreenLoader to styles.ts
- fix Loader to check for color primary which is passed rather than brandColor
- remove hardcoded width and height from WorkspaceSwitchingIndicator which lead to elements not being vertically centered
- remove color prop from Loader in WorkspaceSwitchingIndicator since white is already the default
- remove switchingIndicator.spinnerColor from default theme since white is already the default
* implement PR feedback
* re-add color to WorkspaceSwitchingIndicator
---------
Co-authored-by: MCMXC <16797721+mcmxcdev@users.noreply.github.com>
Diffstat (limited to 'src/components/settings')
4 files changed, 7 insertions, 7 deletions
diff --git a/src/components/settings/account/AccountDashboard.tsx b/src/components/settings/account/AccountDashboard.tsx index de323c06e..ffa684458 100644 --- a/src/components/settings/account/AccountDashboard.tsx +++ b/src/components/settings/account/AccountDashboard.tsx | |||
@@ -4,7 +4,7 @@ import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | |||
4 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | 4 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
5 | import { H1, H2 } from '../../ui/headline'; | 5 | import { H1, H2 } from '../../ui/headline'; |
6 | 6 | ||
7 | import Loader from '../../ui/Loader'; | 7 | import Loader from '../../ui/loader'; |
8 | import Button from '../../ui/button'; | 8 | import Button from '../../ui/button'; |
9 | import Infobox from '../../ui/infobox/index'; | 9 | import Infobox from '../../ui/infobox/index'; |
10 | import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config'; | 10 | import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config'; |
@@ -123,7 +123,7 @@ class AccountDashboard extends Component<IProp> { | |||
123 | )} | 123 | )} |
124 | {!isUsingWithoutAccount && ( | 124 | {!isUsingWithoutAccount && ( |
125 | <> | 125 | <> |
126 | {isLoading && <Loader />} | 126 | {isLoading && <Loader color="#FFFFFF" />} |
127 | 127 | ||
128 | {!isLoading && userInfoRequestFailed && ( | 128 | {!isLoading && userInfoRequestFailed && ( |
129 | <Infobox | 129 | <Infobox |
diff --git a/src/components/settings/recipes/RecipesDashboard.tsx b/src/components/settings/recipes/RecipesDashboard.tsx index 7b7ba19b1..c7aeaa9b3 100644 --- a/src/components/settings/recipes/RecipesDashboard.tsx +++ b/src/components/settings/recipes/RecipesDashboard.tsx | |||
@@ -10,7 +10,7 @@ import { H1, H2, H3 } from '../../ui/headline'; | |||
10 | import SearchInput from '../../ui/SearchInput'; | 10 | import SearchInput from '../../ui/SearchInput'; |
11 | import Infobox from '../../ui/infobox/index'; | 11 | import Infobox from '../../ui/infobox/index'; |
12 | import RecipeItem from './RecipeItem'; | 12 | import RecipeItem from './RecipeItem'; |
13 | import Loader from '../../ui/Loader'; | 13 | import Loader from '../../ui/loader'; |
14 | import Appear from '../../ui/effects/Appear'; | 14 | import Appear from '../../ui/effects/Appear'; |
15 | import { FERDIUM_SERVICE_REQUEST } from '../../../config'; | 15 | import { FERDIUM_SERVICE_REQUEST } from '../../../config'; |
16 | import RecipePreview from '../../../models/RecipePreview'; | 16 | import RecipePreview from '../../../models/RecipePreview'; |
@@ -219,7 +219,7 @@ class RecipesDashboard extends Component<IProps, IState> { | |||
219 | <Icon icon={mdiOpenInNew} /> | 219 | <Icon icon={mdiOpenInNew} /> |
220 | </a> | 220 | </a> |
221 | </div> | 221 | </div> |
222 | {/* )} */} | 222 | |
223 | {isLoading ? ( | 223 | {isLoading ? ( |
224 | <Loader /> | 224 | <Loader /> |
225 | ) : ( | 225 | ) : ( |
diff --git a/src/components/settings/services/ServicesDashboard.tsx b/src/components/settings/services/ServicesDashboard.tsx index d64779a36..b8c3ce3f0 100644 --- a/src/components/settings/services/ServicesDashboard.tsx +++ b/src/components/settings/services/ServicesDashboard.tsx | |||
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | |||
5 | import { To } from 'history'; | 5 | import { To } from 'history'; |
6 | import SearchInput from '../../ui/SearchInput'; | 6 | import SearchInput from '../../ui/SearchInput'; |
7 | import Infobox from '../../ui/Infobox'; | 7 | import Infobox from '../../ui/Infobox'; |
8 | import Loader from '../../ui/Loader'; | 8 | import Loader from '../../ui/loader'; |
9 | import FAB from '../../ui/FAB'; | 9 | import FAB from '../../ui/FAB'; |
10 | import ServiceItem from './ServiceItem'; | 10 | import ServiceItem from './ServiceItem'; |
11 | import Appear from '../../ui/effects/Appear'; | 11 | import Appear from '../../ui/effects/Appear'; |
diff --git a/src/components/settings/team/TeamDashboard.tsx b/src/components/settings/team/TeamDashboard.tsx index 77bccb8c3..406656160 100644 --- a/src/components/settings/team/TeamDashboard.tsx +++ b/src/components/settings/team/TeamDashboard.tsx | |||
@@ -6,7 +6,7 @@ import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | |||
6 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | 6 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
7 | import withStyles, { WithStylesProps } from 'react-jss'; | 7 | import withStyles, { WithStylesProps } from 'react-jss'; |
8 | import classnames from 'classnames'; | 8 | import classnames from 'classnames'; |
9 | import Loader from '../../ui/Loader'; | 9 | import Loader from '../../ui/loader'; |
10 | import Button from '../../ui/button'; | 10 | import Button from '../../ui/button'; |
11 | import Infobox from '../../ui/Infobox'; | 11 | import Infobox from '../../ui/Infobox'; |
12 | import { H1 } from '../../ui/headline'; | 12 | import { H1 } from '../../ui/headline'; |
@@ -128,7 +128,7 @@ class TeamDashboard extends Component<IProps> { | |||
128 | </span> | 128 | </span> |
129 | </div> | 129 | </div> |
130 | <div className="settings__body"> | 130 | <div className="settings__body"> |
131 | {isLoading && <Loader />} | 131 | {isLoading && <Loader color="#FFFFFF" />} |
132 | 132 | ||
133 | {!isLoading && userInfoRequestFailed && ( | 133 | {!isLoading && userInfoRequestFailed && ( |
134 | <Infobox | 134 | <Infobox |