diff options
Diffstat (limited to 'src/features/announcements')
-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 |
3 files changed, 4 insertions, 11 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 ======== |