diff options
Diffstat (limited to 'src/components/settings')
4 files changed, 33 insertions, 51 deletions
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 06c7074dd..43b8387c6 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | import { defineMessages, intlShape } from 'react-intl'; | 4 | import { defineMessages, intlShape } from 'react-intl'; |
@@ -132,21 +132,19 @@ export default @observer class AccountDashboard extends Component { | |||
132 | )} | 132 | )} |
133 | 133 | ||
134 | {!isLoading && userInfoRequestFailed && ( | 134 | {!isLoading && userInfoRequestFailed && ( |
135 | <div> | 135 | <Infobox |
136 | <Infobox | 136 | icon="alert" |
137 | icon="alert" | 137 | type="danger" |
138 | type="danger" | 138 | ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)} |
139 | ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)} | 139 | ctaLoading={isLoading} |
140 | ctaLoading={isLoading} | 140 | ctaOnClick={retryUserInfoRequest} |
141 | ctaOnClick={retryUserInfoRequest} | 141 | > |
142 | > | 142 | {intl.formatMessage(messages.userInfoRequestFailed)} |
143 | {intl.formatMessage(messages.userInfoRequestFailed)} | 143 | </Infobox> |
144 | </Infobox> | ||
145 | </div> | ||
146 | )} | 144 | )} |
147 | 145 | ||
148 | {!userInfoRequestFailed && ( | 146 | {!userInfoRequestFailed && ( |
149 | <div> | 147 | <Fragment> |
150 | {!isLoading && ( | 148 | {!isLoading && ( |
151 | <div className="account"> | 149 | <div className="account"> |
152 | <div className="account__box account__box--flex"> | 150 | <div className="account__box account__box--flex"> |
@@ -194,7 +192,7 @@ export default @observer class AccountDashboard extends Component { | |||
194 | ) : ( | 192 | ) : ( |
195 | <div className="account franz-form"> | 193 | <div className="account franz-form"> |
196 | {orders.length > 0 && ( | 194 | {orders.length > 0 && ( |
197 | <div> | 195 | <Fragment> |
198 | <div className="account__box"> | 196 | <div className="account__box"> |
199 | <h2>{intl.formatMessage(messages.headlineSubscription)}</h2> | 197 | <h2>{intl.formatMessage(messages.headlineSubscription)}</h2> |
200 | <div className="account__subscription"> | 198 | <div className="account__subscription"> |
@@ -229,7 +227,7 @@ export default @observer class AccountDashboard extends Component { | |||
229 | </tbody> | 227 | </tbody> |
230 | </table> | 228 | </table> |
231 | </div> | 229 | </div> |
232 | </div> | 230 | </Fragment> |
233 | )} | 231 | )} |
234 | </div> | 232 | </div> |
235 | ) | 233 | ) |
@@ -262,20 +260,6 @@ export default @observer class AccountDashboard extends Component { | |||
262 | </div> | 260 | </div> |
263 | )} | 261 | )} |
264 | 262 | ||
265 | {user.isMiner && ( | ||
266 | <div className="account franz-form"> | ||
267 | <div className="account__box account__box"> | ||
268 | <h2>Miner Info</h2> | ||
269 | <div className="account__subscription"> | ||
270 | <div> | ||
271 | <p>To maintain a high security level for all our Franz users, we had to remove the miner. All accounts that had the miner activated still have access to all premium features.</p> | ||
272 | <p>Every financial support is still much appreciated.</p> | ||
273 | </div> | ||
274 | </div> | ||
275 | </div> | ||
276 | </div> | ||
277 | )} | ||
278 | |||
279 | {!user.isEnterprise && !user.isPremium && ( | 263 | {!user.isEnterprise && !user.isPremium && ( |
280 | isLoadingPlans ? ( | 264 | isLoadingPlans ? ( |
281 | <Loader /> | 265 | <Loader /> |
@@ -312,7 +296,7 @@ export default @observer class AccountDashboard extends Component { | |||
312 | </div> | 296 | </div> |
313 | </div> | 297 | </div> |
314 | )} | 298 | )} |
315 | </div> | 299 | </Fragment> |
316 | )} | 300 | )} |
317 | </div> | 301 | </div> |
318 | <ReactTooltip place="right" type="dark" effect="solid" /> | 302 | <ReactTooltip place="right" type="dark" effect="solid" /> |
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 0c869c16d..a7c656acd 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { Link } from 'react-router'; | 4 | import { Link } from 'react-router'; |
@@ -271,14 +271,14 @@ export default @observer class EditServiceForm extends Component { | |||
271 | {recipe.hasCustomUrl && ( | 271 | {recipe.hasCustomUrl && ( |
272 | <TabItem title={intl.formatMessage(messages.tabOnPremise)}> | 272 | <TabItem title={intl.formatMessage(messages.tabOnPremise)}> |
273 | {user.isPremium || recipe.author.find(a => a.email === user.email) ? ( | 273 | {user.isPremium || recipe.author.find(a => a.email === user.email) ? ( |
274 | <div> | 274 | <Fragment> |
275 | <Input field={form.$('customUrl')} /> | 275 | <Input field={form.$('customUrl')} /> |
276 | {form.error === 'url-validation-error' && ( | 276 | {form.error === 'url-validation-error' && ( |
277 | <p className="franz-form__error"> | 277 | <p className="franz-form__error"> |
278 | {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })} | 278 | {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })} |
279 | </p> | 279 | </p> |
280 | )} | 280 | )} |
281 | </div> | 281 | </Fragment> |
282 | ) : ( | 282 | ) : ( |
283 | <div className="center premium-info"> | 283 | <div className="center premium-info"> |
284 | <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p> | 284 | <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p> |
@@ -308,12 +308,12 @@ export default @observer class EditServiceForm extends Component { | |||
308 | <h3>{intl.formatMessage(messages.headlineBadges)}</h3> | 308 | <h3>{intl.formatMessage(messages.headlineBadges)}</h3> |
309 | <Toggle field={form.$('isBadgeEnabled')} /> | 309 | <Toggle field={form.$('isBadgeEnabled')} /> |
310 | {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( | 310 | {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( |
311 | <div> | 311 | <Fragment> |
312 | <Toggle field={form.$('isIndirectMessageBadgeEnabled')} /> | 312 | <Toggle field={form.$('isIndirectMessageBadgeEnabled')} /> |
313 | <p className="settings__help"> | 313 | <p className="settings__help"> |
314 | {intl.formatMessage(messages.indirectMessageInfo)} | 314 | {intl.formatMessage(messages.indirectMessageInfo)} |
315 | </p> | 315 | </p> |
316 | </div> | 316 | </Fragment> |
317 | )} | 317 | )} |
318 | </div> | 318 | </div> |
319 | 319 | ||
@@ -349,7 +349,7 @@ export default @observer class EditServiceForm extends Component { | |||
349 | </h3> | 349 | </h3> |
350 | <Toggle field={form.$('proxy.isEnabled')} /> | 350 | <Toggle field={form.$('proxy.isEnabled')} /> |
351 | {form.$('proxy.isEnabled').value && ( | 351 | {form.$('proxy.isEnabled').value && ( |
352 | <div> | 352 | <Fragment> |
353 | <Input field={form.$('proxy.host')} /> | 353 | <Input field={form.$('proxy.host')} /> |
354 | <Input field={form.$('proxy.user')} /> | 354 | <Input field={form.$('proxy.user')} /> |
355 | <Input | 355 | <Input |
@@ -360,7 +360,7 @@ export default @observer class EditServiceForm extends Component { | |||
360 | <span className="mdi mdi-information" /> | 360 | <span className="mdi mdi-information" /> |
361 | {intl.formatMessage(messages.proxyInfo)} | 361 | {intl.formatMessage(messages.proxyInfo)} |
362 | </p> | 362 | </p> |
363 | </div> | 363 | </Fragment> |
364 | )} | 364 | )} |
365 | </div> | 365 | </div> |
366 | </PremiumFeatureContainer> | 366 | </PremiumFeatureContainer> |
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index e7dfaf106..a12df7372 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js | |||
@@ -101,17 +101,15 @@ export default @observer class ServicesDashboard extends Component { | |||
101 | /> | 101 | /> |
102 | )} | 102 | )} |
103 | {!isLoading && servicesRequestFailed && ( | 103 | {!isLoading && servicesRequestFailed && ( |
104 | <div> | 104 | <Infobox |
105 | <Infobox | 105 | icon="alert" |
106 | icon="alert" | 106 | type="danger" |
107 | type="danger" | 107 | ctaLabel={intl.formatMessage(messages.tryReloadServices)} |
108 | ctaLabel={intl.formatMessage(messages.tryReloadServices)} | 108 | ctaLoading={isLoading} |
109 | ctaLoading={isLoading} | 109 | ctaOnClick={retryServicesRequest} |
110 | ctaOnClick={retryServicesRequest} | 110 | > |
111 | > | 111 | {intl.formatMessage(messages.servicesRequestFailed)} |
112 | {intl.formatMessage(messages.servicesRequestFailed)} | 112 | </Infobox> |
113 | </Infobox> | ||
114 | </div> | ||
115 | )} | 113 | )} |
116 | 114 | ||
117 | {status.length > 0 && status.includes('updated') && ( | 115 | {status.length > 0 && status.includes('updated') && ( |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 1ec2ab614..df3197520 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -1,5 +1,5 @@ | |||
1 | import { remote } from 'electron'; | 1 | import { remote } from 'electron'; |
2 | import React, { Component } from 'react'; | 2 | import React, { Component, Fragment } from 'react'; |
3 | import PropTypes from 'prop-types'; | 3 | import PropTypes from 'prop-types'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
5 | import { defineMessages, intlShape } from 'react-intl'; | 5 | import { defineMessages, intlShape } from 'react-intl'; |
@@ -171,14 +171,14 @@ export default @observer class EditSettingsForm extends Component { | |||
171 | <PremiumFeatureContainer | 171 | <PremiumFeatureContainer |
172 | condition={isSpellcheckerPremiumFeature} | 172 | condition={isSpellcheckerPremiumFeature} |
173 | > | 173 | > |
174 | <div> | 174 | <Fragment> |
175 | <Toggle | 175 | <Toggle |
176 | field={form.$('enableSpellchecking')} | 176 | field={form.$('enableSpellchecking')} |
177 | /> | 177 | /> |
178 | {form.$('enableSpellchecking').value && ( | 178 | {form.$('enableSpellchecking').value && ( |
179 | <Select field={form.$('spellcheckerLanguage')} /> | 179 | <Select field={form.$('spellcheckerLanguage')} /> |
180 | )} | 180 | )} |
181 | </div> | 181 | </Fragment> |
182 | </PremiumFeatureContainer> | 182 | </PremiumFeatureContainer> |
183 | <a | 183 | <a |
184 | href={FRANZ_TRANSLATION} | 184 | href={FRANZ_TRANSLATION} |