diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-11-12 03:59:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-12 08:29:35 +0530 |
commit | 53937fd58023ef800bd8ca1cd2b6d2d7bc891834 (patch) | |
tree | ea70778761addfaba1732dcb515dabd9f37f09ea /src/components/settings | |
parent | Use forked version of 'node-mac-permissions' till the PR gets merged (#2216) (diff) | |
download | ferdium-app-53937fd58023ef800bd8ca1cd2b6d2d7bc891834.tar.gz ferdium-app-53937fd58023ef800bd8ca1cd2b6d2d7bc891834.tar.zst ferdium-app-53937fd58023ef800bd8ca1cd2b6d2d7bc891834.zip |
chore: update eslint deps to latest (#2213)
- update eslint deps to latest
- disable new react/function-component-definition rule
- fix/disable newly reported issues
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 | ||||
-rw-r--r-- | src/components/settings/team/TeamDashboard.js | 60 |
2 files changed, 29 insertions, 37 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 7e86ea79a..9e8fb3cf5 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -412,10 +412,8 @@ class EditSettingsForm extends Component { | |||
412 | 412 | ||
413 | <Hr /> | 413 | <Hr /> |
414 | 414 | ||
415 | <> | 415 | <Toggle field={form.$('keepAllWorkspacesLoaded')} /> |
416 | <Toggle field={form.$('keepAllWorkspacesLoaded')} /> | 416 | <Hr /> |
417 | <Hr /> | ||
418 | </> | ||
419 | 417 | ||
420 | {!hasAddedTodosAsService && ( | 418 | {!hasAddedTodosAsService && ( |
421 | <> | 419 | <> |
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 4a1a02571..38d124266 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js | |||
@@ -136,40 +136,34 @@ class TeamDashboard extends Component { | |||
136 | </Infobox> | 136 | </Infobox> |
137 | )} | 137 | )} |
138 | 138 | ||
139 | {!userInfoRequestFailed && ( | 139 | {!userInfoRequestFailed && !isLoading && ( |
140 | <> | 140 | <> |
141 | {!isLoading && ( | 141 | <h1 |
142 | <> | 142 | className={classnames({ |
143 | <> | 143 | [classes.headline]: true, |
144 | <h1 | 144 | [classes.headlineWithSpacing]: true, |
145 | className={classnames({ | 145 | })} |
146 | [classes.headline]: true, | 146 | > |
147 | [classes.headlineWithSpacing]: true, | 147 | {intl.formatMessage(messages.contentHeadline)} |
148 | })} | 148 | </h1> |
149 | > | 149 | <div className={classes.container}> |
150 | {intl.formatMessage(messages.contentHeadline)} | 150 | <div className={classes.content}> |
151 | </h1> | 151 | <p>{intl.formatMessage(messages.intro)}</p> |
152 | <div className={classes.container}> | 152 | <p>{intl.formatMessage(messages.copy)}</p> |
153 | <div className={classes.content}> | 153 | </div> |
154 | <p>{intl.formatMessage(messages.intro)}</p> | 154 | <img |
155 | <p>{intl.formatMessage(messages.copy)}</p> | 155 | className={classes.image} |
156 | </div> | 156 | src="https://cdn.franzinfra.com/announcements/assets/teams.png" |
157 | <img | 157 | alt="Ferdi for Teams" |
158 | className={classes.image} | 158 | /> |
159 | src="https://cdn.franzinfra.com/announcements/assets/teams.png" | 159 | </div> |
160 | alt="Ferdi for Teams" | 160 | <div className={classes.buttonContainer}> |
161 | /> | 161 | <Button |
162 | </div> | 162 | label={intl.formatMessage(messages.manageButton)} |
163 | <div className={classes.buttonContainer}> | 163 | onClick={openTeamManagement} |
164 | <Button | 164 | className={classes.cta} |
165 | label={intl.formatMessage(messages.manageButton)} | 165 | /> |
166 | onClick={openTeamManagement} | 166 | </div> |
167 | className={classes.cta} | ||
168 | /> | ||
169 | </div> | ||
170 | </> | ||
171 | </> | ||
172 | )} | ||
173 | </> | 167 | </> |
174 | )} | 168 | )} |
175 | </div> | 169 | </div> |