diff options
author | 2019-02-21 15:25:45 +0100 | |
---|---|---|
committer | 2019-02-21 15:25:45 +0100 | |
commit | 71e3d7310a06305c3c15685364ea8e20fc720867 (patch) | |
tree | 142ef1cc0ad793ea40cb8ea4f6d5c649cf4e0e3c /src/containers/auth | |
parent | Add pageview event (diff) | |
download | ferdium-app-71e3d7310a06305c3c15685364ea8e20fc720867.tar.gz ferdium-app-71e3d7310a06305c3c15685364ea8e20fc720867.tar.zst ferdium-app-71e3d7310a06305c3c15685364ea8e20fc720867.zip |
Simplify analytics calls
Diffstat (limited to 'src/containers/auth')
-rw-r--r-- | src/containers/auth/AuthLayoutContainer.js | 38 | ||||
-rw-r--r-- | src/containers/auth/ImportScreen.js | 5 | ||||
-rw-r--r-- | src/containers/auth/InviteScreen.js | 5 | ||||
-rw-r--r-- | src/containers/auth/LoginScreen.js | 5 | ||||
-rw-r--r-- | src/containers/auth/PasswordScreen.js | 5 | ||||
-rw-r--r-- | src/containers/auth/PricingScreen.js | 5 | ||||
-rw-r--r-- | src/containers/auth/SignupScreen.js | 5 | ||||
-rw-r--r-- | src/containers/auth/WelcomeScreen.js | 5 |
8 files changed, 24 insertions, 49 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index 762929dc6..e63f40c06 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js | |||
@@ -1,6 +1,8 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import { ThemeProvider } from 'react-jss'; | ||
5 | import { theme } from '@meetfranz/theme'; | ||
4 | 6 | ||
5 | import AuthLayout from '../../components/auth/AuthLayout'; | 7 | import AuthLayout from '../../components/auth/AuthLayout'; |
6 | import AppStore from '../../stores/AppStore'; | 8 | import AppStore from '../../stores/AppStore'; |
@@ -21,30 +23,38 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer | |||
21 | const { | 23 | const { |
22 | stores, actions, children, location, | 24 | stores, actions, children, location, |
23 | } = this.props; | 25 | } = this.props; |
24 | const { app, features, globalError } = stores; | 26 | const { |
27 | app, features, globalError, settings, | ||
28 | } = stores; | ||
25 | 29 | ||
26 | const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting | 30 | const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting |
27 | && !features.defaultFeaturesRequest.wasExecuted; | 31 | && !features.defaultFeaturesRequest.wasExecuted; |
28 | 32 | ||
33 | const themeType = theme(settings.app.darkMode ? 'dark' : 'default'); | ||
34 | |||
29 | if (isLoadingBaseFeatures) { | 35 | if (isLoadingBaseFeatures) { |
30 | return ( | 36 | return ( |
31 | <AppLoader /> | 37 | <ThemeProvider theme={theme(themeType)}> |
38 | <AppLoader /> | ||
39 | </ThemeProvider> | ||
32 | ); | 40 | ); |
33 | } | 41 | } |
34 | 42 | ||
35 | return ( | 43 | return ( |
36 | <AuthLayout | 44 | <ThemeProvider theme={theme(themeType)}> |
37 | error={globalError.response} | 45 | <AuthLayout |
38 | pathname={location.pathname} | 46 | error={globalError.response} |
39 | isOnline={app.isOnline} | 47 | pathname={location.pathname} |
40 | isAPIHealthy={!app.healthCheckRequest.isError} | 48 | isOnline={app.isOnline} |
41 | retryHealthCheck={actions.app.healthCheck} | 49 | isAPIHealthy={!app.healthCheckRequest.isError} |
42 | isHealthCheckLoading={app.healthCheckRequest.isExecuting} | 50 | retryHealthCheck={actions.app.healthCheck} |
43 | isFullScreen={app.isFullScreen} | 51 | isHealthCheckLoading={app.healthCheckRequest.isExecuting} |
44 | darkMode={app.isSystemDarkModeEnabled} | 52 | isFullScreen={app.isFullScreen} |
45 | > | 53 | darkMode={app.isSystemDarkModeEnabled} |
46 | {children} | 54 | > |
47 | </AuthLayout> | 55 | {children} |
56 | </AuthLayout> | ||
57 | </ThemeProvider> | ||
48 | ); | 58 | ); |
49 | } | 59 | } |
50 | } | 60 | } |
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js index fc46f8b54..4a93891d6 100644 --- a/src/containers/auth/ImportScreen.js +++ b/src/containers/auth/ImportScreen.js | |||
@@ -3,13 +3,8 @@ import PropTypes from 'prop-types'; | |||
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import Import from '../../components/auth/Import'; | 4 | import Import from '../../components/auth/Import'; |
5 | import UserStore from '../../stores/UserStore'; | 5 | import UserStore from '../../stores/UserStore'; |
6 | import { gaPage } from '../../lib/analytics'; | ||
7 | 6 | ||
8 | export default @inject('stores', 'actions') @observer class ImportScreen extends Component { | 7 | export default @inject('stores', 'actions') @observer class ImportScreen extends Component { |
9 | componentDidMount() { | ||
10 | gaPage('Auth/Import'); | ||
11 | } | ||
12 | |||
13 | render() { | 8 | render() { |
14 | const { actions, stores } = this.props; | 9 | const { actions, stores } = this.props; |
15 | 10 | ||
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js index 26bf97038..66afaf7e1 100644 --- a/src/containers/auth/InviteScreen.js +++ b/src/containers/auth/InviteScreen.js | |||
@@ -2,13 +2,8 @@ import React, { Component } from 'react'; | |||
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import Invite from '../../components/auth/Invite'; | 4 | import Invite from '../../components/auth/Invite'; |
5 | import { gaPage } from '../../lib/analytics'; | ||
6 | 5 | ||
7 | export default @inject('stores', 'actions') @observer class InviteScreen extends Component { | 6 | export default @inject('stores', 'actions') @observer class InviteScreen extends Component { |
8 | componentDidMount() { | ||
9 | gaPage('Auth/Invite'); | ||
10 | } | ||
11 | |||
12 | render() { | 7 | render() { |
13 | const { actions } = this.props; | 8 | const { actions } = this.props; |
14 | 9 | ||
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js index 865bd38f8..e5ee10785 100644 --- a/src/containers/auth/LoginScreen.js +++ b/src/containers/auth/LoginScreen.js | |||
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; | |||
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import Login from '../../components/auth/Login'; | 4 | import Login from '../../components/auth/Login'; |
5 | import UserStore from '../../stores/UserStore'; | 5 | import UserStore from '../../stores/UserStore'; |
6 | import { gaPage } from '../../lib/analytics'; | ||
7 | 6 | ||
8 | import { globalError as globalErrorPropType } from '../../prop-types'; | 7 | import { globalError as globalErrorPropType } from '../../prop-types'; |
9 | 8 | ||
@@ -12,10 +11,6 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends | |||
12 | error: globalErrorPropType.isRequired, | 11 | error: globalErrorPropType.isRequired, |
13 | }; | 12 | }; |
14 | 13 | ||
15 | componentDidMount() { | ||
16 | gaPage('Auth/Login'); | ||
17 | } | ||
18 | |||
19 | render() { | 14 | render() { |
20 | const { actions, stores, error } = this.props; | 15 | const { actions, stores, error } = this.props; |
21 | return ( | 16 | return ( |
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js index 236fd2031..5b238860e 100644 --- a/src/containers/auth/PasswordScreen.js +++ b/src/containers/auth/PasswordScreen.js | |||
@@ -3,13 +3,8 @@ import PropTypes from 'prop-types'; | |||
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import Password from '../../components/auth/Password'; | 4 | import Password from '../../components/auth/Password'; |
5 | import UserStore from '../../stores/UserStore'; | 5 | import UserStore from '../../stores/UserStore'; |
6 | import { gaPage } from '../../lib/analytics'; | ||
7 | 6 | ||
8 | export default @inject('stores', 'actions') @observer class PasswordScreen extends Component { | 7 | export default @inject('stores', 'actions') @observer class PasswordScreen extends Component { |
9 | componentDidMount() { | ||
10 | gaPage('Auth/Password Retrieve'); | ||
11 | } | ||
12 | |||
13 | render() { | 8 | render() { |
14 | const { actions, stores } = this.props; | 9 | const { actions, stores } = this.props; |
15 | 10 | ||
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js index 34b512e15..8d179a170 100644 --- a/src/containers/auth/PricingScreen.js +++ b/src/containers/auth/PricingScreen.js | |||
@@ -6,7 +6,6 @@ import { RouterStore } from 'mobx-react-router'; | |||
6 | import Pricing from '../../components/auth/Pricing'; | 6 | import Pricing from '../../components/auth/Pricing'; |
7 | import UserStore from '../../stores/UserStore'; | 7 | import UserStore from '../../stores/UserStore'; |
8 | import PaymentStore from '../../stores/PaymentStore'; | 8 | import PaymentStore from '../../stores/PaymentStore'; |
9 | import { gaPage } from '../../lib/analytics'; | ||
10 | 9 | ||
11 | import { globalError as globalErrorPropType } from '../../prop-types'; | 10 | import { globalError as globalErrorPropType } from '../../prop-types'; |
12 | 11 | ||
@@ -15,10 +14,6 @@ export default @inject('stores', 'actions') @observer class PricingScreen extend | |||
15 | error: globalErrorPropType.isRequired, | 14 | error: globalErrorPropType.isRequired, |
16 | }; | 15 | }; |
17 | 16 | ||
18 | componentDidMount() { | ||
19 | gaPage('Auth/Pricing'); | ||
20 | } | ||
21 | |||
22 | render() { | 17 | render() { |
23 | const { actions, stores, error } = this.props; | 18 | const { actions, stores, error } = this.props; |
24 | 19 | ||
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js index caf75de90..efc7ea4c1 100644 --- a/src/containers/auth/SignupScreen.js +++ b/src/containers/auth/SignupScreen.js | |||
@@ -4,7 +4,6 @@ import { inject, observer } from 'mobx-react'; | |||
4 | 4 | ||
5 | import Signup from '../../components/auth/Signup'; | 5 | import Signup from '../../components/auth/Signup'; |
6 | import UserStore from '../../stores/UserStore'; | 6 | import UserStore from '../../stores/UserStore'; |
7 | import { gaPage } from '../../lib/analytics'; | ||
8 | 7 | ||
9 | import { globalError as globalErrorPropType } from '../../prop-types'; | 8 | import { globalError as globalErrorPropType } from '../../prop-types'; |
10 | 9 | ||
@@ -13,10 +12,6 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends | |||
13 | error: globalErrorPropType.isRequired, | 12 | error: globalErrorPropType.isRequired, |
14 | }; | 13 | }; |
15 | 14 | ||
16 | componentDidMount() { | ||
17 | gaPage('Auth/Signup'); | ||
18 | } | ||
19 | |||
20 | render() { | 15 | render() { |
21 | const { actions, stores, error } = this.props; | 16 | const { actions, stores, error } = this.props; |
22 | return ( | 17 | return ( |
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js index 2c120f81c..75182345a 100644 --- a/src/containers/auth/WelcomeScreen.js +++ b/src/containers/auth/WelcomeScreen.js | |||
@@ -5,13 +5,8 @@ import { inject, observer } from 'mobx-react'; | |||
5 | import Welcome from '../../components/auth/Welcome'; | 5 | import Welcome from '../../components/auth/Welcome'; |
6 | import UserStore from '../../stores/UserStore'; | 6 | import UserStore from '../../stores/UserStore'; |
7 | import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; | 7 | import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; |
8 | import { gaPage } from '../../lib/analytics'; | ||
9 | 8 | ||
10 | export default @inject('stores', 'actions') @observer class LoginScreen extends Component { | 9 | export default @inject('stores', 'actions') @observer class LoginScreen extends Component { |
11 | componentDidMount() { | ||
12 | gaPage('Auth/Welcome'); | ||
13 | } | ||
14 | |||
15 | render() { | 10 | render() { |
16 | const { user, recipePreviews } = this.props.stores; | 11 | const { user, recipePreviews } = this.props.stores; |
17 | 12 | ||