Converted some javascript files to typescript

5 files changed, 59 insertions, 70 deletions

diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.tsx
index c01c3d355..756a2e59c 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.tsx
@@ -1,11 +1,20 @@
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import { RouterStore } from 'mobx-react-router';
 import Import from '../../components/auth/Import';
 import UserStore from '../../stores/UserStore';
 
-class ImportScreen extends Component {
+interface IProps {
+  actions: {
+    user: UserStore,
+  },
+  stores: {
+    user: UserStore,
+    router: RouterStore,
+  }
+}
+
+class ImportScreen extends Component<IProps> {
   render() {
     const { actions, stores } = this.props;
 
@@ -24,14 +33,4 @@ class ImportScreen extends Component {
   }
 }
 
-ImportScreen.propTypes = {
-  actions: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    router: PropTypes.instanceOf(RouterStore).isRequired,
-  }).isRequired,
-};
-
 export default inject('stores', 'actions')(observer(ImportScreen));
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.tsx
index d99a4051b..e6bb5e8e4 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.tsx
@@ -1,5 +1,4 @@
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Locked from '../../components/auth/Locked';
 import SettingsStore from '../../stores/SettingsStore';
@@ -7,7 +6,17 @@ import SettingsStore from '../../stores/SettingsStore';
 import { hash } from '../../helpers/password-helpers';
 import UserStore from '../../stores/UserStore';
 
-class LockedScreen extends Component {
+interface IProps {
+  actions: {
+    settings: SettingsStore,
+  },
+  stores: {
+    settings: SettingsStore,
+    user: UserStore,
+  }
+};
+
+class LockedScreen extends Component<IProps> {
   state = {
     error: false,
   };
@@ -72,14 +81,4 @@ class LockedScreen extends Component {
   }
 }
 
-LockedScreen.propTypes = {
-  actions: PropTypes.shape({
-    settings: PropTypes.instanceOf(SettingsStore).isRequired,
-  }).isRequired,
-  stores: PropTypes.shape({
-    settings: PropTypes.instanceOf(SettingsStore).isRequired,
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-};
-
 export default inject('stores', 'actions')(observer(LockedScreen));
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.tsx
index 4b2c1b4a2..864a11fa7 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.tsx
@@ -1,10 +1,18 @@
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Password from '../../components/auth/Password';
 import UserStore from '../../stores/UserStore';
 
-class PasswordScreen extends Component {
+interface IProps {
+  actions: {
+    user: UserStore,
+  },
+  stores: {
+    user: UserStore,
+  }
+};
+
+class PasswordScreen extends Component<IProps> {
   render() {
     const { actions, stores } = this.props;
 
@@ -20,13 +28,4 @@ class PasswordScreen extends Component {
   }
 }
 
-PasswordScreen.propTypes = {
-  actions: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-};
-
 export default inject('stores', 'actions')(observer(PasswordScreen));
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.tsx
index 42c3d6019..44bd32772 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.tsx
@@ -1,6 +1,5 @@
 /* eslint-disable no-await-in-loop */
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
 import { RouterStore } from 'mobx-react-router';
@@ -10,12 +9,23 @@ import ServicesStore from '../../stores/ServicesStore';
 import RecipesStore from '../../stores/RecipesStore';
 import UserStore from '../../stores/UserStore';
 
-class SetupAssistantScreen extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      isSettingUpServices: false,
-    };
+interface IProps {
+  stores: {
+    services?: ServicesStore,
+    router: RouterStore,
+    recipes?: RecipesStore,
+    user?: UserStore,
+  },
+  actions: {
+    user: UserStore,
+    service: ServicesStore,
+    recipe: RecipesStore,
+  },
+};
+
+class SetupAssistantScreen extends Component<IProps> {
+  state = {
+    isSettingUpServices: false,
   }
 
   // TODO: Why are these hardcoded here? Do they need to conform to specific services in the packaged recipes? If so, its more important to fix this
@@ -69,12 +79,9 @@ class SetupAssistantScreen extends Component {
     for (const config of serviceConfig) {
       const serviceData = {
         name: this.services[config.id].name,
+        team: config.team
       };
 
-      if (config.team) {
-        serviceData.team = config.team;
-      }
-
       await services._createService({
         recipeId: config.id,
         serviceData,
@@ -91,7 +98,7 @@ class SetupAssistantScreen extends Component {
 
     await sleep(100);
 
-    router.push("/");
+    router.push('/');
   }
 
   render() {
@@ -106,18 +113,4 @@ class SetupAssistantScreen extends Component {
   }
 }
 
-SetupAssistantScreen.propTypes = {
-  stores: PropTypes.shape({
-    services: PropTypes.instanceOf(ServicesStore),
-    router: PropTypes.instanceOf(RouterStore).isRequired,
-    recipes: PropTypes.instanceOf(RecipesStore),
-    user: PropTypes.instanceOf(UserStore),
-  }).isRequired,
-  actions: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    service: PropTypes.instanceOf(ServicesStore).isRequired,
-    recipe: PropTypes.instanceOf(RecipesStore).isRequired,
-  }).isRequired,
-};
-
 export default inject('stores', 'actions')(observer(SetupAssistantScreen));
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.tsx
index 7e1a7a83e..944d288ad 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.tsx
@@ -1,12 +1,18 @@
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
 import Welcome from '../../components/auth/Welcome';
 import UserStore from '../../stores/UserStore';
 import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
 
-class WelcomeScreen extends Component {
+interface IProps {
+  stores: {
+    user: UserStore,
+    recipePreviews: RecipePreviewsStore,
+  },
+};
+
+class WelcomeScreen extends Component<IProps> {
   render() {
     const { user, recipePreviews } = this.props.stores;
 
@@ -21,11 +27,4 @@ class WelcomeScreen extends Component {
   }
 }
 
-WelcomeScreen.propTypes = {
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired,
-  }).isRequired,
-};
-
 export default inject('stores', 'actions')(observer(WelcomeScreen));