diff options
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/announcements/api.js | 4 | ||||
-rw-r--r-- | src/features/announcements/components/AnnouncementScreen.js | 7 | ||||
-rw-r--r-- | src/features/announcements/store.js | 4 | ||||
-rw-r--r-- | src/features/basicAuth/index.js | 2 | ||||
-rw-r--r-- | src/features/delayApp/Component.js | 9 | ||||
-rw-r--r-- | src/features/delayApp/index.js | 5 | ||||
-rw-r--r-- | src/features/shareFranz/Component.js | 14 | ||||
-rw-r--r-- | src/features/shareFranz/index.js | 12 | ||||
-rw-r--r-- | src/features/workspaces/api.js | 10 | ||||
-rw-r--r-- | src/features/workspaces/components/CreateWorkspaceForm.js | 4 | ||||
-rw-r--r-- | src/features/workspaces/components/EditWorkspaceForm.js | 4 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawer.js | 9 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspacesDashboard.js | 2 |
13 files changed, 21 insertions, 65 deletions
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js index a581bd8de..eadb7dfce 100644 --- a/src/features/announcements/api.js +++ b/src/features/announcements/api.js | |||
@@ -1,6 +1,6 @@ | |||
1 | import { remote } from 'electron'; | 1 | import { remote } from 'electron'; |
2 | import Request from '../../stores/lib/Request'; | 2 | import Request from '../../stores/lib/Request'; |
3 | import { API, API_VERSION } from '../../environment'; | 3 | import apiBase from '../../api/apiBase'; |
4 | 4 | ||
5 | const debug = require('debug')('Franz:feature:announcements:api'); | 5 | const debug = require('debug')('Franz:feature:announcements:api'); |
6 | 6 | ||
@@ -21,7 +21,7 @@ export const announcementsApi = { | |||
21 | 21 | ||
22 | async getAnnouncement(version) { | 22 | async getAnnouncement(version) { |
23 | debug('fetching release announcement from api'); | 23 | debug('fetching release announcement from api'); |
24 | const url = `${API}/${API_VERSION}/announcements/${version}`; | 24 | const url = `${apiBase()}/announcements/${version}`; |
25 | const response = await window.fetch(url, { method: 'GET' }); | 25 | const response = await window.fetch(url, { method: 'GET' }); |
26 | if (!response.ok) return null; | 26 | if (!response.ok) return null; |
27 | return response.json(); | 27 | return response.json(); |
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js index 03bd5ba41..38de2dbc8 100644 --- a/src/features/announcements/components/AnnouncementScreen.js +++ b/src/features/announcements/components/AnnouncementScreen.js | |||
@@ -8,7 +8,6 @@ import { Button } from '@meetfranz/forms'; | |||
8 | 8 | ||
9 | import { announcementsStore } from '../index'; | 9 | import { announcementsStore } from '../index'; |
10 | import UIStore from '../../../stores/UIStore'; | 10 | import UIStore from '../../../stores/UIStore'; |
11 | import { gaEvent } from '../../../lib/analytics'; | ||
12 | 11 | ||
13 | const renderer = new marked.Renderer(); | 12 | const renderer = new marked.Renderer(); |
14 | 13 | ||
@@ -19,7 +18,7 @@ const markedOptions = { sanitize: true, renderer }; | |||
19 | const messages = defineMessages({ | 18 | const messages = defineMessages({ |
20 | headline: { | 19 | headline: { |
21 | id: 'feature.announcements.changelog.headline', | 20 | id: 'feature.announcements.changelog.headline', |
22 | defaultMessage: '!!!Changes in Franz {version}', | 21 | defaultMessage: '!!!Changes in Ferdi {version}', |
23 | }, | 22 | }, |
24 | }); | 23 | }); |
25 | 24 | ||
@@ -228,9 +227,7 @@ class AnnouncementScreen extends Component { | |||
228 | <Button | 227 | <Button |
229 | label={announcement.main.cta.label} | 228 | label={announcement.main.cta.label} |
230 | onClick={() => { | 229 | onClick={() => { |
231 | const { analytics } = announcement.main.cta; | ||
232 | window.location.href = `#${announcement.main.cta.href}`; | 230 | window.location.href = `#${announcement.main.cta.href}`; |
233 | gaEvent(analytics.category, analytics.action, announcement.main.cta.label); | ||
234 | }} | 231 | }} |
235 | /> | 232 | /> |
236 | </div> | 233 | </div> |
@@ -253,9 +250,7 @@ class AnnouncementScreen extends Component { | |||
253 | <Button | 250 | <Button |
254 | label={announcement.spotlight.cta.label} | 251 | label={announcement.spotlight.cta.label} |
255 | onClick={() => { | 252 | onClick={() => { |
256 | const { analytics } = announcement.spotlight.cta; | ||
257 | window.location.href = `#${announcement.spotlight.cta.href}`; | 253 | window.location.href = `#${announcement.spotlight.cta.href}`; |
258 | gaEvent(analytics.category, analytics.action, announcement.spotlight.cta.label); | ||
259 | }} | 254 | }} |
260 | /> | 255 | /> |
261 | </div> | 256 | </div> |
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js index d58afbc8e..91348029f 100644 --- a/src/features/announcements/store.js +++ b/src/features/announcements/store.js | |||
@@ -7,12 +7,11 @@ import semver from 'semver'; | |||
7 | import localStorage from 'mobx-localstorage'; | 7 | import localStorage from 'mobx-localstorage'; |
8 | 8 | ||
9 | import { FeatureStore } from '../utils/FeatureStore'; | 9 | import { FeatureStore } from '../utils/FeatureStore'; |
10 | import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.'; | 10 | import { ANNOUNCEMENTS_ROUTES } from '.'; |
11 | import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api'; | 11 | import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api'; |
12 | import { announcementActions } from './actions'; | 12 | import { announcementActions } from './actions'; |
13 | import { createActionBindings } from '../utils/ActionBinding'; | 13 | import { createActionBindings } from '../utils/ActionBinding'; |
14 | import { createReactions } from '../../stores/lib/Reaction'; | 14 | import { createReactions } from '../../stores/lib/Reaction'; |
15 | import { gaEvent } from '../../lib/analytics'; | ||
16 | import { matchRoute } from '../../helpers/routing-helpers'; | 15 | import { matchRoute } from '../../helpers/routing-helpers'; |
17 | import { DEFAULT_APP_SETTINGS } from '../../config'; | 16 | import { DEFAULT_APP_SETTINGS } from '../../config'; |
18 | 17 | ||
@@ -114,7 +113,6 @@ export class AnnouncementsStore extends FeatureStore { | |||
114 | if (router.location.pathname !== targetRoute) { | 113 | if (router.location.pathname !== targetRoute) { |
115 | this.stores.router.push(targetRoute); | 114 | this.stores.router.push(targetRoute); |
116 | } | 115 | } |
117 | gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show'); | ||
118 | }; | 116 | }; |
119 | 117 | ||
120 | // ======= REACTIONS ======== | 118 | // ======= REACTIONS ======== |
diff --git a/src/features/basicAuth/index.js b/src/features/basicAuth/index.js index 89607824b..a8c93875e 100644 --- a/src/features/basicAuth/index.js +++ b/src/features/basicAuth/index.js | |||
@@ -20,7 +20,7 @@ export function resetState() { | |||
20 | export default function initialize() { | 20 | export default function initialize() { |
21 | debug('Initialize basicAuth feature'); | 21 | debug('Initialize basicAuth feature'); |
22 | 22 | ||
23 | window.franz.features.basicAuth = { | 23 | window.ferdi.features.basicAuth = { |
24 | state, | 24 | state, |
25 | }; | 25 | }; |
26 | 26 | ||
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js index 6344edb89..c61cb06c9 100644 --- a/src/features/delayApp/Component.js +++ b/src/features/delayApp/Component.js | |||
@@ -5,9 +5,6 @@ import { defineMessages, intlShape } from 'react-intl'; | |||
5 | import injectSheet from 'react-jss'; | 5 | import injectSheet from 'react-jss'; |
6 | 6 | ||
7 | import { Button } from '@meetfranz/forms'; | 7 | import { Button } from '@meetfranz/forms'; |
8 | import { gaEvent } from '../../lib/analytics'; | ||
9 | |||
10 | // import Button from '../../components/ui/Button'; | ||
11 | 8 | ||
12 | import { config } from '.'; | 9 | import { config } from '.'; |
13 | import styles from './styles'; | 10 | import styles from './styles'; |
@@ -32,7 +29,7 @@ const messages = defineMessages({ | |||
32 | }, | 29 | }, |
33 | text: { | 30 | text: { |
34 | id: 'feature.delayApp.text', | 31 | id: 'feature.delayApp.text', |
35 | defaultMessage: '!!!Franz will continue in {seconds} seconds.', | 32 | defaultMessage: '!!!Ferdi will continue in {seconds} seconds.', |
36 | }, | 33 | }, |
37 | }); | 34 | }); |
38 | 35 | ||
@@ -78,12 +75,8 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class | |||
78 | 75 | ||
79 | if (!hadSubscription) { | 76 | if (!hadSubscription) { |
80 | actions.user.activateTrial({ planId: defaultTrialPlan }); | 77 | actions.user.activateTrial({ planId: defaultTrialPlan }); |
81 | |||
82 | gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature'); | ||
83 | } else { | 78 | } else { |
84 | actions.ui.openSettings({ path: 'user' }); | 79 | actions.ui.openSettings({ path: 'user' }); |
85 | |||
86 | gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature'); | ||
87 | } | 80 | } |
88 | } | 81 | } |
89 | 82 | ||
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js index c0029873a..4f793f16c 100644 --- a/src/features/delayApp/index.js +++ b/src/features/delayApp/index.js | |||
@@ -3,7 +3,6 @@ import moment from 'moment'; | |||
3 | import DelayAppComponent from './Component'; | 3 | import DelayAppComponent from './Component'; |
4 | 4 | ||
5 | import { DEFAULT_FEATURES_CONFIG } from '../../config'; | 5 | import { DEFAULT_FEATURES_CONFIG } from '../../config'; |
6 | import { gaEvent, gaPage } from '../../lib/analytics'; | ||
7 | 6 | ||
8 | const debug = require('debug')('Franz:feature:delayApp'); | 7 | const debug = require('debug')('Franz:feature:delayApp'); |
9 | 8 | ||
@@ -28,7 +27,7 @@ export default function init(stores) { | |||
28 | let shownAfterLaunch = false; | 27 | let shownAfterLaunch = false; |
29 | let timeLastDelay = moment(); | 28 | let timeLastDelay = moment(); |
30 | 29 | ||
31 | window.franz.features.delayApp = { | 30 | window.ferdi.features.delayApp = { |
32 | state, | 31 | state, |
33 | }; | 32 | }; |
34 | 33 | ||
@@ -57,8 +56,6 @@ export default function init(stores) { | |||
57 | debug(`App will be delayed for ${config.delayDuration / 1000}s`); | 56 | debug(`App will be delayed for ${config.delayDuration / 1000}s`); |
58 | 57 | ||
59 | setVisibility(true); | 58 | setVisibility(true); |
60 | gaPage('/delayApp'); | ||
61 | gaEvent('DelayApp', 'show', 'Delay App Feature'); | ||
62 | 59 | ||
63 | timeLastDelay = moment(); | 60 | timeLastDelay = moment(); |
64 | shownAfterLaunch = true; | 61 | shownAfterLaunch = true; |
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js index a33315e17..405fb0ab5 100644 --- a/src/features/shareFranz/Component.js +++ b/src/features/shareFranz/Component.js | |||
@@ -11,17 +11,16 @@ import { | |||
11 | } from '@mdi/js'; | 11 | } from '@mdi/js'; |
12 | import Modal from '../../components/ui/Modal'; | 12 | import Modal from '../../components/ui/Modal'; |
13 | import { state } from '.'; | 13 | import { state } from '.'; |
14 | import { gaEvent } from '../../lib/analytics'; | ||
15 | import ServicesStore from '../../stores/ServicesStore'; | 14 | import ServicesStore from '../../stores/ServicesStore'; |
16 | 15 | ||
17 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
18 | headline: { | 17 | headline: { |
19 | id: 'feature.shareFranz.headline', | 18 | id: 'feature.shareFranz.headline', |
20 | defaultMessage: '!!!Franz is better together!', | 19 | defaultMessage: '!!!Ferdi is better together!', |
21 | }, | 20 | }, |
22 | text: { | 21 | text: { |
23 | id: 'feature.shareFranz.text', | 22 | id: 'feature.shareFranz.text', |
24 | defaultMessage: '!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.', | 23 | defaultMessage: '!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.', |
25 | }, | 24 | }, |
26 | actionsEmail: { | 25 | actionsEmail: { |
27 | id: 'feature.shareFranz.action.email', | 26 | id: 'feature.shareFranz.action.email', |
@@ -132,9 +131,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz | |||
132 | icon={mdiEmail} | 131 | icon={mdiEmail} |
133 | href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareTextEmail, { count: serviceCount })}}`} | 132 | href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareTextEmail, { count: serviceCount })}}`} |
134 | target="_blank" | 133 | target="_blank" |
135 | onClick={() => { | ||
136 | gaEvent('Share Franz', 'share', 'Share via email'); | ||
137 | }} | ||
138 | /> | 134 | /> |
139 | <Button | 135 | <Button |
140 | label={intl.formatMessage(messages.actionsFacebook)} | 136 | label={intl.formatMessage(messages.actionsFacebook)} |
@@ -142,9 +138,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz | |||
142 | icon={mdiFacebookBox} | 138 | icon={mdiFacebookBox} |
143 | href="https://www.facebook.com/sharer/sharer.php?u=https://www.meetfranz.com?utm_source=facebook&utm_medium=referral&utm_campaign=share-button" | 139 | href="https://www.facebook.com/sharer/sharer.php?u=https://www.meetfranz.com?utm_source=facebook&utm_medium=referral&utm_campaign=share-button" |
144 | target="_blank" | 140 | target="_blank" |
145 | onClick={() => { | ||
146 | gaEvent('Share Franz', 'share', 'Share via Facebook'); | ||
147 | }} | ||
148 | /> | 141 | /> |
149 | <Button | 142 | <Button |
150 | label={intl.formatMessage(messages.actionsTwitter)} | 143 | label={intl.formatMessage(messages.actionsTwitter)} |
@@ -152,9 +145,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz | |||
152 | icon={mdiTwitter} | 145 | icon={mdiTwitter} |
153 | href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareTextTwitter, { count: serviceCount })}`} | 146 | href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareTextTwitter, { count: serviceCount })}`} |
154 | target="_blank" | 147 | target="_blank" |
155 | onClick={() => { | ||
156 | gaEvent('Share Franz', 'share', 'Share via Twitter'); | ||
157 | }} | ||
158 | /> | 148 | /> |
159 | </div> | 149 | </div> |
160 | </Modal> | 150 | </Modal> |
diff --git a/src/features/shareFranz/index.js b/src/features/shareFranz/index.js index 87deacef4..d611a7e1d 100644 --- a/src/features/shareFranz/index.js +++ b/src/features/shareFranz/index.js | |||
@@ -2,7 +2,6 @@ import { observable, reaction } from 'mobx'; | |||
2 | import ms from 'ms'; | 2 | import ms from 'ms'; |
3 | 3 | ||
4 | import { state as delayAppState } from '../delayApp'; | 4 | import { state as delayAppState } from '../delayApp'; |
5 | import { gaEvent, gaPage } from '../../lib/analytics'; | ||
6 | 5 | ||
7 | export { default as Component } from './Component'; | 6 | export { default as Component } from './Component'; |
8 | 7 | ||
@@ -16,19 +15,16 @@ const defaultState = { | |||
16 | export const state = observable(defaultState); | 15 | export const state = observable(defaultState); |
17 | 16 | ||
18 | export default function initialize(stores) { | 17 | export default function initialize(stores) { |
19 | debug('Initialize shareFranz feature'); | 18 | debug('Initialize shareFerdi feature'); |
20 | 19 | ||
21 | window.franz.features.shareFranz = { | 20 | window.ferdi.features.shareFerdi = { |
22 | state, | 21 | state, |
23 | }; | 22 | }; |
24 | 23 | ||
25 | function showModal() { | 24 | function showModal() { |
26 | debug('Showing share window'); | 25 | debug('Would have showed share window'); |
27 | 26 | ||
28 | state.isModalVisible = true; | 27 | // state.isModalVisible = true; |
29 | |||
30 | gaEvent('Share Franz', 'show'); | ||
31 | gaPage('/share-modal'); | ||
32 | } | 28 | } |
33 | 29 | ||
34 | reaction( | 30 | reaction( |
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js index 0ec20c9ea..b8893363f 100644 --- a/src/features/workspaces/api.js +++ b/src/features/workspaces/api.js | |||
@@ -1,14 +1,14 @@ | |||
1 | import { pick } from 'lodash'; | 1 | import { pick } from 'lodash'; |
2 | import { sendAuthRequest } from '../../api/utils/auth'; | 2 | import { sendAuthRequest } from '../../api/utils/auth'; |
3 | import { API, API_VERSION } from '../../environment'; | ||
4 | import Request from '../../stores/lib/Request'; | 3 | import Request from '../../stores/lib/Request'; |
5 | import Workspace from './models/Workspace'; | 4 | import Workspace from './models/Workspace'; |
5 | import apiBase from '../../api/apiBase'; | ||
6 | 6 | ||
7 | const debug = require('debug')('Franz:feature:workspaces:api'); | 7 | const debug = require('debug')('Franz:feature:workspaces:api'); |
8 | 8 | ||
9 | export const workspaceApi = { | 9 | export const workspaceApi = { |
10 | getUserWorkspaces: async () => { | 10 | getUserWorkspaces: async () => { |
11 | const url = `${API}/${API_VERSION}/workspace`; | 11 | const url = `${apiBase()}/workspace`; |
12 | debug('getUserWorkspaces GET', url); | 12 | debug('getUserWorkspaces GET', url); |
13 | const result = await sendAuthRequest(url, { method: 'GET' }); | 13 | const result = await sendAuthRequest(url, { method: 'GET' }); |
14 | debug('getUserWorkspaces RESULT', result); | 14 | debug('getUserWorkspaces RESULT', result); |
@@ -18,7 +18,7 @@ export const workspaceApi = { | |||
18 | }, | 18 | }, |
19 | 19 | ||
20 | createWorkspace: async (name) => { | 20 | createWorkspace: async (name) => { |
21 | const url = `${API}/${API_VERSION}/workspace`; | 21 | const url = `${apiBase()}/workspace`; |
22 | const options = { | 22 | const options = { |
23 | method: 'POST', | 23 | method: 'POST', |
24 | body: JSON.stringify({ name }), | 24 | body: JSON.stringify({ name }), |
@@ -31,7 +31,7 @@ export const workspaceApi = { | |||
31 | }, | 31 | }, |
32 | 32 | ||
33 | deleteWorkspace: async (workspace) => { | 33 | deleteWorkspace: async (workspace) => { |
34 | const url = `${API}/${API_VERSION}/workspace/${workspace.id}`; | 34 | const url = `${apiBase()}/workspace/${workspace.id}`; |
35 | debug('deleteWorkspace DELETE', url); | 35 | debug('deleteWorkspace DELETE', url); |
36 | const result = await sendAuthRequest(url, { method: 'DELETE' }); | 36 | const result = await sendAuthRequest(url, { method: 'DELETE' }); |
37 | debug('deleteWorkspace RESULT', result); | 37 | debug('deleteWorkspace RESULT', result); |
@@ -40,7 +40,7 @@ export const workspaceApi = { | |||
40 | }, | 40 | }, |
41 | 41 | ||
42 | updateWorkspace: async (workspace) => { | 42 | updateWorkspace: async (workspace) => { |
43 | const url = `${API}/${API_VERSION}/workspace/${workspace.id}`; | 43 | const url = `${apiBase()}/workspace/${workspace.id}`; |
44 | const options = { | 44 | const options = { |
45 | method: 'PUT', | 45 | method: 'PUT', |
46 | body: JSON.stringify(pick(workspace, ['name', 'services'])), | 46 | body: JSON.stringify(pick(workspace, ['name', 'services'])), |
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js index cddbb2b04..15b97121d 100644 --- a/src/features/workspaces/components/CreateWorkspaceForm.js +++ b/src/features/workspaces/components/CreateWorkspaceForm.js | |||
@@ -6,8 +6,7 @@ import { Input, Button } from '@meetfranz/forms'; | |||
6 | import injectSheet from 'react-jss'; | 6 | import injectSheet from 'react-jss'; |
7 | import Form from '../../../lib/Form'; | 7 | import Form from '../../../lib/Form'; |
8 | import { required } from '../../../helpers/validation-helpers'; | 8 | import { required } from '../../../helpers/validation-helpers'; |
9 | import { gaEvent } from '../../../lib/analytics'; | 9 | import { workspaceStore } from '../index'; |
10 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index'; | ||
11 | 10 | ||
12 | const messages = defineMessages({ | 11 | const messages = defineMessages({ |
13 | submitButton: { | 12 | submitButton: { |
@@ -66,7 +65,6 @@ class CreateWorkspaceForm extends Component { | |||
66 | const { onSubmit } = this.props; | 65 | const { onSubmit } = this.props; |
67 | const values = f.values(); | 66 | const values = f.values(); |
68 | onSubmit(values); | 67 | onSubmit(values); |
69 | gaEvent(GA_CATEGORY_WORKSPACES, 'create', values.name); | ||
70 | }, | 68 | }, |
71 | }); | 69 | }); |
72 | } | 70 | } |
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js index e602ebd5a..82ea1b564 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js | |||
@@ -12,8 +12,6 @@ import Form from '../../../lib/Form'; | |||
12 | import { required } from '../../../helpers/validation-helpers'; | 12 | import { required } from '../../../helpers/validation-helpers'; |
13 | import WorkspaceServiceListItem from './WorkspaceServiceListItem'; | 13 | import WorkspaceServiceListItem from './WorkspaceServiceListItem'; |
14 | import Request from '../../../stores/lib/Request'; | 14 | import Request from '../../../stores/lib/Request'; |
15 | import { gaEvent } from '../../../lib/analytics'; | ||
16 | import { GA_CATEGORY_WORKSPACES } from '../index'; | ||
17 | 15 | ||
18 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
19 | buttonDelete: { | 17 | buttonDelete: { |
@@ -103,7 +101,6 @@ class EditWorkspaceForm extends Component { | |||
103 | const { onSave } = this.props; | 101 | const { onSave } = this.props; |
104 | const values = f.values(); | 102 | const values = f.values(); |
105 | onSave(values); | 103 | onSave(values); |
106 | gaEvent(GA_CATEGORY_WORKSPACES, 'save'); | ||
107 | }, | 104 | }, |
108 | onError: async () => {}, | 105 | onError: async () => {}, |
109 | }); | 106 | }); |
@@ -112,7 +109,6 @@ class EditWorkspaceForm extends Component { | |||
112 | delete() { | 109 | delete() { |
113 | const { onDelete } = this.props; | 110 | const { onDelete } = this.props; |
114 | onDelete(); | 111 | onDelete(); |
115 | gaEvent(GA_CATEGORY_WORKSPACES, 'delete'); | ||
116 | } | 112 | } |
117 | 113 | ||
118 | toggleService(service) { | 114 | toggleService(service) { |
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index e7bc0b157..f4ee89a14 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js | |||
@@ -10,8 +10,7 @@ import ReactTooltip from 'react-tooltip'; | |||
10 | import { mdiPlusBox, mdiSettings } from '@mdi/js'; | 10 | import { mdiPlusBox, mdiSettings } from '@mdi/js'; |
11 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; | 11 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; |
12 | import { workspaceActions } from '../actions'; | 12 | import { workspaceActions } from '../actions'; |
13 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index'; | 13 | import { workspaceStore } from '../index'; |
14 | import { gaEvent } from '../../../lib/analytics'; | ||
15 | 14 | ||
16 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
17 | headline: { | 16 | headline: { |
@@ -155,7 +154,6 @@ class WorkspaceDrawer extends Component { | |||
155 | className={classes.workspacesSettingsButton} | 154 | className={classes.workspacesSettingsButton} |
156 | onClick={() => { | 155 | onClick={() => { |
157 | workspaceActions.openWorkspaceSettings(); | 156 | workspaceActions.openWorkspaceSettings(); |
158 | gaEvent(GA_CATEGORY_WORKSPACES, 'settings', 'drawerHeadline'); | ||
159 | }} | 157 | }} |
160 | data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`} | 158 | data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`} |
161 | > | 159 | > |
@@ -177,7 +175,6 @@ class WorkspaceDrawer extends Component { | |||
177 | icon="mdiStar" | 175 | icon="mdiStar" |
178 | onClick={() => { | 176 | onClick={() => { |
179 | onUpgradeAccountClick(); | 177 | onUpgradeAccountClick(); |
180 | gaEvent('User', 'upgrade', 'workspaceDrawer'); | ||
181 | }} | 178 | }} |
182 | /> | 179 | /> |
183 | ) : ( | 180 | ) : ( |
@@ -188,7 +185,6 @@ class WorkspaceDrawer extends Component { | |||
188 | icon={mdiPlusBox} | 185 | icon={mdiPlusBox} |
189 | onClick={() => { | 186 | onClick={() => { |
190 | workspaceActions.openWorkspaceSettings(); | 187 | workspaceActions.openWorkspaceSettings(); |
191 | gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta'); | ||
192 | }} | 188 | }} |
193 | /> | 189 | /> |
194 | )} | 190 | )} |
@@ -200,7 +196,6 @@ class WorkspaceDrawer extends Component { | |||
200 | onClick={() => { | 196 | onClick={() => { |
201 | workspaceActions.deactivate(); | 197 | workspaceActions.deactivate(); |
202 | workspaceActions.toggleWorkspaceDrawer(); | 198 | workspaceActions.toggleWorkspaceDrawer(); |
203 | gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer'); | ||
204 | }} | 199 | }} |
205 | services={getServicesForWorkspace(null)} | 200 | services={getServicesForWorkspace(null)} |
206 | isActive={actualWorkspace == null} | 201 | isActive={actualWorkspace == null} |
@@ -214,7 +209,6 @@ class WorkspaceDrawer extends Component { | |||
214 | if (actualWorkspace === workspace) return; | 209 | if (actualWorkspace === workspace) return; |
215 | workspaceActions.activate({ workspace }); | 210 | workspaceActions.activate({ workspace }); |
216 | workspaceActions.toggleWorkspaceDrawer(); | 211 | workspaceActions.toggleWorkspaceDrawer(); |
217 | gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer'); | ||
218 | }} | 212 | }} |
219 | onContextMenuEditClick={() => workspaceActions.edit({ workspace })} | 213 | onContextMenuEditClick={() => workspaceActions.edit({ workspace })} |
220 | services={getServicesForWorkspace(workspace)} | 214 | services={getServicesForWorkspace(workspace)} |
@@ -224,7 +218,6 @@ class WorkspaceDrawer extends Component { | |||
224 | className={classes.addNewWorkspaceLabel} | 218 | className={classes.addNewWorkspaceLabel} |
225 | onClick={() => { | 219 | onClick={() => { |
226 | workspaceActions.openWorkspaceSettings(); | 220 | workspaceActions.openWorkspaceSettings(); |
227 | gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerAddLabel'); | ||
228 | }} | 221 | }} |
229 | > | 222 | > |
230 | <Icon | 223 | <Icon |
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index 70e213912..977b23999 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js | |||
@@ -46,7 +46,7 @@ const messages = defineMessages({ | |||
46 | }, | 46 | }, |
47 | workspaceFeatureHeadline: { | 47 | workspaceFeatureHeadline: { |
48 | id: 'settings.workspaces.workspaceFeatureHeadline', | 48 | id: 'settings.workspaces.workspaceFeatureHeadline', |
49 | defaultMessage: '!!!Less is More: Introducing Franz Workspaces', | 49 | defaultMessage: '!!!Less is More: Introducing Ferdi Workspaces', |
50 | }, | 50 | }, |
51 | }); | 51 | }); |
52 | 52 | ||