diff options
author | Ricardo Cino <ricardo@cino.io> | 2022-07-07 09:31:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-07 09:31:50 +0200 |
commit | 71c52373f81cace664047edd19d9d289f45a4dff (patch) | |
tree | 69b3f1d45a8b3f1ceab9497ea3c96e9dc18e3166 /src/components/services/content | |
parent | 6.0.0-nightly.91 [skip ci] (diff) | |
download | ferdium-app-71c52373f81cace664047edd19d9d289f45a4dff.tar.gz ferdium-app-71c52373f81cace664047edd19d9d289f45a4dff.tar.zst ferdium-app-71c52373f81cace664047edd19d9d289f45a4dff.zip |
chore: Mobx & React-Router upgrade (#406)
Co-authored-by: Vijay A <vraravam@users.noreply.github.com>
Diffstat (limited to 'src/components/services/content')
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 4 | ||||
-rw-r--r-- | src/components/services/content/Services.jsx (renamed from src/components/services/content/Services.js) | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index 66dc8af41..502f87225 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } 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 { observable, reaction } from 'mobx'; | 4 | import { makeObservable, observable, reaction } from 'mobx'; |
5 | import ElectronWebView from 'react-electron-web-view'; | 5 | import ElectronWebView from 'react-electron-web-view'; |
6 | import { join } from 'path'; | 6 | import { join } from 'path'; |
7 | 7 | ||
@@ -22,6 +22,8 @@ class ServiceWebview extends Component { | |||
22 | constructor(props) { | 22 | constructor(props) { |
23 | super(props); | 23 | super(props); |
24 | 24 | ||
25 | makeObservable(this); | ||
26 | |||
25 | reaction( | 27 | reaction( |
26 | () => this.webview, | 28 | () => this.webview, |
27 | () => { | 29 | () => { |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.jsx index b38b0e3c3..da700b5b1 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.jsx | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; |
4 | import { Link } from 'react-router'; | 4 | import { Link } from 'react-router-dom'; |
5 | import { defineMessages, injectIntl } from 'react-intl'; | 5 | import { defineMessages, injectIntl } from 'react-intl'; |
6 | import Confetti from 'react-confetti'; | 6 | import Confetti from 'react-confetti'; |
7 | import ms from 'ms'; | 7 | import ms from 'ms'; |
@@ -50,6 +50,7 @@ class Services extends Component { | |||
50 | openSettings: PropTypes.func.isRequired, | 50 | openSettings: PropTypes.func.isRequired, |
51 | update: PropTypes.func.isRequired, | 51 | update: PropTypes.func.isRequired, |
52 | userHasCompletedSignup: PropTypes.bool.isRequired, | 52 | userHasCompletedSignup: PropTypes.bool.isRequired, |
53 | // eslint-disable-next-line react/forbid-prop-types | ||
53 | classes: PropTypes.object.isRequired, | 54 | classes: PropTypes.object.isRequired, |
54 | isSpellcheckerEnabled: PropTypes.bool.isRequired, | 55 | isSpellcheckerEnabled: PropTypes.bool.isRequired, |
55 | }; | 56 | }; |
@@ -58,12 +59,16 @@ class Services extends Component { | |||
58 | services: [], | 59 | services: [], |
59 | }; | 60 | }; |
60 | 61 | ||
61 | state = { | ||
62 | showConfetti: true, | ||
63 | }; | ||
64 | |||
65 | _confettiTimeout = null; | 62 | _confettiTimeout = null; |
66 | 63 | ||
64 | constructor() { | ||
65 | super(); | ||
66 | |||
67 | this.state = { | ||
68 | showConfetti: true, | ||
69 | }; | ||
70 | } | ||
71 | |||
67 | componentDidMount() { | 72 | componentDidMount() { |
68 | this._confettiTimeout = window.setTimeout(() => { | 73 | this._confettiTimeout = window.setTimeout(() => { |
69 | this.setState({ | 74 | this.setState({ |
@@ -117,10 +122,7 @@ class Services extends Component { | |||
117 | style={{ maxHeight: '50vh' }} | 122 | style={{ maxHeight: '50vh' }} |
118 | /> | 123 | /> |
119 | <Appear timeout={300} transitionName="slideUp"> | 124 | <Appear timeout={300} transitionName="slideUp"> |
120 | <Link | 125 | <Link to="/settings/recipes" className="button"> |
121 | to='/settings/recipes' | ||
122 | className="button" | ||
123 | > | ||
124 | {intl.formatMessage(messages.getStarted)} | 126 | {intl.formatMessage(messages.getStarted)} |
125 | </Link> | 127 | </Link> |
126 | </Appear> | 128 | </Appear> |