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 @@
 import { remote } from 'electron';
 import Request from '../../stores/lib/Request';
-import { API, API_VERSION } from '../../environment';
+import apiBase from '../../api/apiBase';
 
 const debug = require('debug')('Franz:feature:announcements:api');
 
@@ -21,7 +21,7 @@ export const announcementsApi = {
 
   async getAnnouncement(version) {
     debug('fetching release announcement from api');
-    const url = `${API}/${API_VERSION}/announcements/${version}`;
+    const url = `${apiBase()}/announcements/${version}`;
     const response = await window.fetch(url, { method: 'GET' });
     if (!response.ok) return null;
     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';
 
 import { announcementsStore } from '../index';
 import UIStore from '../../../stores/UIStore';
-import { gaEvent } from '../../../lib/analytics';
 
 const renderer = new marked.Renderer();
 
@@ -19,7 +18,7 @@ const markedOptions = { sanitize: true, renderer };
 const messages = defineMessages({
   headline: {
     id: 'feature.announcements.changelog.headline',
-    defaultMessage: '!!!Changes in Franz {version}',
+    defaultMessage: '!!!Changes in Ferdi {version}',
   },
 });
 
@@ -228,9 +227,7 @@ class AnnouncementScreen extends Component {
                     <Button
                       label={announcement.main.cta.label}
                       onClick={() => {
-                        const { analytics } = announcement.main.cta;
                         window.location.href = `#${announcement.main.cta.href}`;
-                        gaEvent(analytics.category, analytics.action, announcement.main.cta.label);
                       }}
                     />
                   </div>
@@ -253,9 +250,7 @@ class AnnouncementScreen extends Component {
                     <Button
                       label={announcement.spotlight.cta.label}
                       onClick={() => {
-                        const { analytics } = announcement.spotlight.cta;
                         window.location.href = `#${announcement.spotlight.cta.href}`;
-                        gaEvent(analytics.category, analytics.action, announcement.spotlight.cta.label);
                       }}
                     />
                   </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';
 import localStorage from 'mobx-localstorage';
 
 import { FeatureStore } from '../utils/FeatureStore';
-import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.';
+import { ANNOUNCEMENTS_ROUTES } from '.';
 import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
 import { announcementActions } from './actions';
 import { createActionBindings } from '../utils/ActionBinding';
 import { createReactions } from '../../stores/lib/Reaction';
-import { gaEvent } from '../../lib/analytics';
 import { matchRoute } from '../../helpers/routing-helpers';
 import { DEFAULT_APP_SETTINGS } from '../../config';
 
@@ -114,7 +113,6 @@ export class AnnouncementsStore extends FeatureStore {
     if (router.location.pathname !== targetRoute) {
       this.stores.router.push(targetRoute);
     }
-    gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show');
   };
 
   // ======= 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() {
 export default function initialize() {
   debug('Initialize basicAuth feature');
 
-  window.franz.features.basicAuth = {
+  window.ferdi.features.basicAuth = {
     state,
   };
 
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';
 import injectSheet from 'react-jss';
 
 import { Button } from '@meetfranz/forms';
-import { gaEvent } from '../../lib/analytics';
-
-// import Button from '../../components/ui/Button';
 
 import { config } from '.';
 import styles from './styles';
@@ -32,7 +29,7 @@ const messages = defineMessages({
   },
   text: {
     id: 'feature.delayApp.text',
-    defaultMessage: '!!!Franz will continue in {seconds} seconds.',
+    defaultMessage: '!!!Ferdi will continue in {seconds} seconds.',
   },
 });
 
@@ -78,12 +75,8 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class
 
     if (!hadSubscription) {
       actions.user.activateTrial({ planId: defaultTrialPlan });
-
-      gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature');
     } else {
       actions.ui.openSettings({ path: 'user' });
-
-      gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature');
     }
   }
 
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';
 import DelayAppComponent from './Component';
 
 import { DEFAULT_FEATURES_CONFIG } from '../../config';
-import { gaEvent, gaPage } from '../../lib/analytics';
 
 const debug = require('debug')('Franz:feature:delayApp');
 
@@ -28,7 +27,7 @@ export default function init(stores) {
   let shownAfterLaunch = false;
   let timeLastDelay = moment();
 
-  window.franz.features.delayApp = {
+  window.ferdi.features.delayApp = {
     state,
   };
 
@@ -57,8 +56,6 @@ export default function init(stores) {
             debug(`App will be delayed for ${config.delayDuration / 1000}s`);
 
             setVisibility(true);
-            gaPage('/delayApp');
-            gaEvent('DelayApp', 'show', 'Delay App Feature');
 
             timeLastDelay = moment();
             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 {
 } from '@mdi/js';
 import Modal from '../../components/ui/Modal';
 import { state } from '.';
-import { gaEvent } from '../../lib/analytics';
 import ServicesStore from '../../stores/ServicesStore';
 
 const messages = defineMessages({
   headline: {
     id: 'feature.shareFranz.headline',
-    defaultMessage: '!!!Franz is better together!',
+    defaultMessage: '!!!Ferdi is better together!',
   },
   text: {
     id: 'feature.shareFranz.text',
-    defaultMessage: '!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.',
+    defaultMessage: '!!!Tell your friends and colleagues how awesome Ferdi is and help us to spread the word.',
   },
   actionsEmail: {
     id: 'feature.shareFranz.action.email',
@@ -132,9 +131,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
             icon={mdiEmail}
             href={`mailto:?subject=Meet the cool app Franz&body=${intl.formatMessage(messages.shareTextEmail, { count: serviceCount })}}`}
             target="_blank"
-            onClick={() => {
-              gaEvent('Share Franz', 'share', 'Share via email');
-            }}
           />
           <Button
             label={intl.formatMessage(messages.actionsFacebook)}
@@ -142,9 +138,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
             icon={mdiFacebookBox}
             href="https://www.facebook.com/sharer/sharer.php?u=https://www.meetfranz.com?utm_source=facebook&utm_medium=referral&utm_campaign=share-button"
             target="_blank"
-            onClick={() => {
-              gaEvent('Share Franz', 'share', 'Share via Facebook');
-            }}
           />
           <Button
             label={intl.formatMessage(messages.actionsTwitter)}
@@ -152,9 +145,6 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
             icon={mdiTwitter}
             href={`http://twitter.com/intent/tweet?status=${intl.formatMessage(messages.shareTextTwitter, { count: serviceCount })}`}
             target="_blank"
-            onClick={() => {
-              gaEvent('Share Franz', 'share', 'Share via Twitter');
-            }}
           />
         </div>
       </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';
 import ms from 'ms';
 
 import { state as delayAppState } from '../delayApp';
-import { gaEvent, gaPage } from '../../lib/analytics';
 
 export { default as Component } from './Component';
 
@@ -16,19 +15,16 @@ const defaultState = {
 export const state = observable(defaultState);
 
 export default function initialize(stores) {
-  debug('Initialize shareFranz feature');
+  debug('Initialize shareFerdi feature');
 
-  window.franz.features.shareFranz = {
+  window.ferdi.features.shareFerdi = {
     state,
   };
 
   function showModal() {
-    debug('Showing share window');
+    debug('Would have showed share window');
 
-    state.isModalVisible = true;
-
-    gaEvent('Share Franz', 'show');
-    gaPage('/share-modal');
+    // state.isModalVisible = true;
   }
 
   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 @@
 import { pick } from 'lodash';
 import { sendAuthRequest } from '../../api/utils/auth';
-import { API, API_VERSION } from '../../environment';
 import Request from '../../stores/lib/Request';
 import Workspace from './models/Workspace';
+import apiBase from '../../api/apiBase';
 
 const debug = require('debug')('Franz:feature:workspaces:api');
 
 export const workspaceApi = {
   getUserWorkspaces: async () => {
-    const url = `${API}/${API_VERSION}/workspace`;
+    const url = `${apiBase()}/workspace`;
     debug('getUserWorkspaces GET', url);
     const result = await sendAuthRequest(url, { method: 'GET' });
     debug('getUserWorkspaces RESULT', result);
@@ -18,7 +18,7 @@ export const workspaceApi = {
   },
 
   createWorkspace: async (name) => {
-    const url = `${API}/${API_VERSION}/workspace`;
+    const url = `${apiBase()}/workspace`;
     const options = {
       method: 'POST',
       body: JSON.stringify({ name }),
@@ -31,7 +31,7 @@ export const workspaceApi = {
   },
 
   deleteWorkspace: async (workspace) => {
-    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const url = `${apiBase()}/workspace/${workspace.id}`;
     debug('deleteWorkspace DELETE', url);
     const result = await sendAuthRequest(url, { method: 'DELETE' });
     debug('deleteWorkspace RESULT', result);
@@ -40,7 +40,7 @@ export const workspaceApi = {
   },
 
   updateWorkspace: async (workspace) => {
-    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const url = `${apiBase()}/workspace/${workspace.id}`;
     const options = {
       method: 'PUT',
       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';
 import injectSheet from 'react-jss';
 import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
-import { gaEvent } from '../../../lib/analytics';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   submitButton: {
@@ -66,7 +65,6 @@ class CreateWorkspaceForm extends Component {
         const { onSubmit } = this.props;
         const values = f.values();
         onSubmit(values);
-        gaEvent(GA_CATEGORY_WORKSPACES, 'create', values.name);
       },
     });
   }
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';
 import { required } from '../../../helpers/validation-helpers';
 import WorkspaceServiceListItem from './WorkspaceServiceListItem';
 import Request from '../../../stores/lib/Request';
-import { gaEvent } from '../../../lib/analytics';
-import { GA_CATEGORY_WORKSPACES } from '../index';
 
 const messages = defineMessages({
   buttonDelete: {
@@ -103,7 +101,6 @@ class EditWorkspaceForm extends Component {
         const { onSave } = this.props;
         const values = f.values();
         onSave(values);
-        gaEvent(GA_CATEGORY_WORKSPACES, 'save');
       },
       onError: async () => {},
     });
@@ -112,7 +109,6 @@ class EditWorkspaceForm extends Component {
   delete() {
     const { onDelete } = this.props;
     onDelete();
-    gaEvent(GA_CATEGORY_WORKSPACES, 'delete');
   }
 
   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';
 import { mdiPlusBox, mdiSettings } from '@mdi/js';
 import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import { workspaceActions } from '../actions';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
-import { gaEvent } from '../../../lib/analytics';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   headline: {
@@ -155,7 +154,6 @@ class WorkspaceDrawer extends Component {
             className={classes.workspacesSettingsButton}
             onClick={() => {
               workspaceActions.openWorkspaceSettings();
-              gaEvent(GA_CATEGORY_WORKSPACES, 'settings', 'drawerHeadline');
             }}
             data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`}
           >
@@ -177,7 +175,6 @@ class WorkspaceDrawer extends Component {
                 icon="mdiStar"
                 onClick={() => {
                   onUpgradeAccountClick();
-                  gaEvent('User', 'upgrade', 'workspaceDrawer');
                 }}
               />
             ) : (
@@ -188,7 +185,6 @@ class WorkspaceDrawer extends Component {
                 icon={mdiPlusBox}
                 onClick={() => {
                   workspaceActions.openWorkspaceSettings();
-                  gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta');
                 }}
               />
             )}
@@ -200,7 +196,6 @@ class WorkspaceDrawer extends Component {
               onClick={() => {
                 workspaceActions.deactivate();
                 workspaceActions.toggleWorkspaceDrawer();
-                gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
               }}
               services={getServicesForWorkspace(null)}
               isActive={actualWorkspace == null}
@@ -214,7 +209,6 @@ class WorkspaceDrawer extends Component {
                   if (actualWorkspace === workspace) return;
                   workspaceActions.activate({ workspace });
                   workspaceActions.toggleWorkspaceDrawer();
-                  gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
                 }}
                 onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
                 services={getServicesForWorkspace(workspace)}
@@ -224,7 +218,6 @@ class WorkspaceDrawer extends Component {
               className={classes.addNewWorkspaceLabel}
               onClick={() => {
                 workspaceActions.openWorkspaceSettings();
-                gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerAddLabel');
               }}
             >
               <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({
   },
   workspaceFeatureHeadline: {
     id: 'settings.workspaces.workspaceFeatureHeadline',
-    defaultMessage: '!!!Less is More: Introducing Franz Workspaces',
+    defaultMessage: '!!!Less is More: Introducing Ferdi Workspaces',
   },
 });