aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/services
diff options
context:
space:
mode:
authorLibravatar Ricardo Cino <ricardo@cino.io>2022-07-07 09:31:50 +0200
committerLibravatar GitHub <noreply@github.com>2022-07-07 09:31:50 +0200
commit71c52373f81cace664047edd19d9d289f45a4dff (patch)
tree69b3f1d45a8b3f1ceab9497ea3c96e9dc18e3166 /src/components/services
parent6.0.0-nightly.91 [skip ci] (diff)
downloadferdium-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')
-rw-r--r--src/components/services/content/ServiceWebview.js4
-rw-r--r--src/components/services/content/Services.jsx (renamed from src/components/services/content/Services.js)20
-rw-r--r--src/components/services/tabs/TabItem.js5
3 files changed, 18 insertions, 11 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 @@
1import { Component } from 'react'; 1import { Component } from 'react';
2import PropTypes from 'prop-types'; 2import PropTypes from 'prop-types';
3import { observer } from 'mobx-react'; 3import { observer } from 'mobx-react';
4import { observable, reaction } from 'mobx'; 4import { makeObservable, observable, reaction } from 'mobx';
5import ElectronWebView from 'react-electron-web-view'; 5import ElectronWebView from 'react-electron-web-view';
6import { join } from 'path'; 6import { 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 @@
1import { Component } from 'react'; 1import { Component } from 'react';
2import PropTypes from 'prop-types'; 2import PropTypes from 'prop-types';
3import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; 3import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
4import { Link } from 'react-router'; 4import { Link } from 'react-router-dom';
5import { defineMessages, injectIntl } from 'react-intl'; 5import { defineMessages, injectIntl } from 'react-intl';
6import Confetti from 'react-confetti'; 6import Confetti from 'react-confetti';
7import ms from 'ms'; 7import 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>
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 9d2b6b333..a996990b5 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -8,7 +8,7 @@ import { SortableElement } from 'react-sortable-hoc';
8import injectSheet from 'react-jss'; 8import injectSheet from 'react-jss';
9import ms from 'ms'; 9import ms from 'ms';
10 10
11import { observable, autorun, reaction } from 'mobx'; 11import { observable, autorun, reaction, makeObservable } from 'mobx';
12import { mdiExclamation } from '@mdi/js'; 12import { mdiExclamation } from '@mdi/js';
13import ServiceModel from '../../../models/Service'; 13import ServiceModel from '../../../models/Service';
14import { cmdOrCtrlShortcutKey, shiftKey, altKey } from '../../../environment'; 14import { cmdOrCtrlShortcutKey, shiftKey, altKey } from '../../../environment';
@@ -144,6 +144,9 @@ class TabItem extends Component {
144 144
145 constructor(props) { 145 constructor(props) {
146 super(props); 146 super(props);
147
148 makeObservable(this);
149
147 this.state = { 150 this.state = {
148 showShortcutIndex: false, 151 showShortcutIndex: false,
149 }; 152 };