Move analytics out of redux folder #881

Merged
liamcardenas merged 2 commits from update-analytics into master 2017-12-19 07:36:19 +01:00
2 changed files with 16 additions and 7 deletions
Showing only changes of commit f407cd91a1 - Show all commits

View file

@ -19,8 +19,10 @@ const contextMenu = remote.require("./main.js").contextMenu;
const app = require("./app"); const app = require("./app");
// Workaround for https://github.com/electron-userland/electron-webpack/issues/52 // Workaround for https://github.com/electron-userland/electron-webpack/issues/52
if (process.env.NODE_ENV !== 'development') { if (process.env.NODE_ENV !== "development") {
window.staticResourcesPath = require("path").join(remote.app.getAppPath(), "../static").replace(/\\/g, "\\\\"); window.staticResourcesPath = require("path")
.join(remote.app.getAppPath(), "../static")
.replace(/\\/g, "\\\\");
} else { } else {
window.staticResourcesPath = ""; window.staticResourcesPath = "";
} }
@ -55,6 +57,16 @@ ipcRenderer.on("window-is-focused", (event, data) => {
dock.setBadge(""); dock.setBadge("");
}); });
(function(history) {
var replaceState = history.replaceState;
history.replaceState = function(_, __, path) {
amplitude
.getInstance()
.logEvent("NAVIGATION", { destination: path ? path.slice(1) : path });
return replaceState.apply(history, arguments);
};
})(window.history);
document.addEventListener("click", event => { document.addEventListener("click", event => {
var target = event.target; var target = event.target;
while (target && target !== document) { while (target && target !== document) {
@ -110,7 +122,7 @@ var init = function() {
<SnackBar /> <SnackBar />
</div> </div>
</Provider>, </Provider>,
document.getElementById('app') document.getElementById("app")
); );
} }
); );
@ -124,7 +136,7 @@ var init = function() {
<Provider store={store}> <Provider store={store}>
<SplashScreen onReadyToLaunch={onDaemonReady} /> <SplashScreen onReadyToLaunch={onDaemonReady} />
</Provider>, </Provider>,
document.getElementById('app') document.getElementById("app")
); );
} }
}; };

View file

@ -9,7 +9,6 @@ import {
} from "redux/selectors/navigation"; } from "redux/selectors/navigation";
import { doSearch } from "redux/actions/search"; import { doSearch } from "redux/actions/search";
import { toQueryString } from "util/query_params"; import { toQueryString } from "util/query_params";
import amplitude from "amplitude-js";
export function doNavigate(path, params = {}, options = {}) { export function doNavigate(path, params = {}, options = {}) {
return function(dispatch, getState) { return function(dispatch, getState) {
@ -24,8 +23,6 @@ export function doNavigate(path, params = {}, options = {}) {
const scrollY = options.scrollY; const scrollY = options.scrollY;
amplitude.getInstance().logEvent("NAVIGATION", { destination: url });
dispatch({ dispatch({
type: types.HISTORY_NAVIGATE, type: types.HISTORY_NAVIGATE,
data: { url, index: options.index, scrollY }, data: { url, index: options.index, scrollY },