From edca98d3278c32a3b8015f1d26fa6a6eb17edcd6 Mon Sep 17 00:00:00 2001 From: ChaituVR Date: Fri, 30 Aug 2024 19:29:33 +0530 Subject: [PATCH 1/3] feat: Remove mixpanel --- .env | 1 - .eslintrc-auto-import.json | 1 - package.json | 1 - src/composables/useClient.ts | 44 ---------------------------------- src/composables/useMixpanel.ts | 12 ---------- src/router/index.ts | 9 ------- yarn.lock | 5 ---- 7 files changed, 73 deletions(-) delete mode 100644 src/composables/useMixpanel.ts diff --git a/.env b/.env index 6115058b4aa6..4db151cc8fba 100644 --- a/.env +++ b/.env @@ -10,5 +10,4 @@ VITE_DEFAULT_NETWORK=1 VITE_PUSHER_BEAMS_INSTANCE_ID=2e080021-d495-456d-b2cf-84f9fd718442 VITE_SHUTTER_EON_PUBKEY=0x0e6493bbb4ee8b19aa9b70367685049ff01dc9382c46aed83f8bc07d2a5ba3e6030bd83b942c1fd3dff5b79bef3b40bf6b666e51e7f0be14ed62daaffad47435265f5c9403b1a801921981f7d8659a9bd91fe92fb1cf9afdb16178a532adfaf51a237103874bb03afafe9cab2118dae1be5f08a0a28bf488c1581e9db4bc23ca VITE_ENV=develop -VITE_MIXPANEL_TOKEN=2ec6cd1b19e790f45cc9a9bb83980c8d VITE_ALCHEMY_API_KEY=ombBQyf580z-jx2EVQgJu4eTjePU-a2z \ No newline at end of file diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index 7311b5668c15..2ce457d1e597 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -119,7 +119,6 @@ "useEmailSubscription": true, "useEmailFetchClient": true, "useStatement": true, - "useMixpanel": true, "useBalances": true, "useAccount": true, "usePayment": true, diff --git a/package.json b/package.json index 11900d04add5..a8aad25a8c50 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "kubo-rpc-client": "^3.0.2", "lodash": "^4.17.21", "minisearch": "^6.2.0", - "mixpanel-browser": "^2.48.1", "remarkable": "^2.0.1", "remove-markdown": "^0.5.0", "typescript": "^5.2.2", diff --git a/src/composables/useClient.ts b/src/composables/useClient.ts index 089b34c6a782..ea706ff4e65f 100644 --- a/src/composables/useClient.ts +++ b/src/composables/useClient.ts @@ -6,7 +6,6 @@ export function useClient() { const { notify } = useFlashNotification(); const { notifyModal } = useModalNotification(); const { isGnosisSafe } = useGnosis(); - const { mixpanel } = useMixpanel(); const { web3 } = useWeb3(); const auth = getInstance(); const route = useRoute(); @@ -60,10 +59,6 @@ export function useClient() { app: DEFINED_APP }); - mixpanel.track('Propose', { - space: space.id - }); - return receipt; } else if (type === 'update-proposal') { const receipt = await client.updateProposal( @@ -80,12 +75,6 @@ export function useClient() { plugins: JSON.stringify(plugins) } ); - - mixpanel.track('Update proposal', { - space: space.id, - proposalId: payload.id - }); - return receipt; } else if (type === 'vote') { const receipt = await client.vote(auth.web3, web3.value.account, { @@ -97,12 +86,6 @@ export function useClient() { app: DEFINED_APP, reason: payload.reason }); - - mixpanel.track('Vote', { - space: space.id, - proposalId: payload.proposal.id - }); - return receipt; } else if (type === 'delete-proposal') { const receipt = await client.cancelProposal( @@ -113,33 +96,17 @@ export function useClient() { proposal: payload.proposal.id } ); - - mixpanel.track('Delete proposal', { - space: space.id, - proposalId: payload.proposal.id - }); - return receipt; } else if (type === 'settings') { const receipt = await client.space(auth.web3, web3.value.account, { space: space.id, settings: JSON.stringify(payload) }); - - mixpanel.track('Update space settings', { - space: space.id - }); - return receipt; } else if (type === 'delete-space') { const receipt = await client.deleteSpace(auth.web3, web3.value.account, { space: space.id }); - - mixpanel.track('Delete space', { - space: space.id - }); - return receipt; } else if (type === 'set-statement') { const receipt = await client.statement(auth.web3, web3.value.account, { @@ -147,23 +114,12 @@ export function useClient() { about: payload.about, statement: payload.statement }); - - mixpanel.track('Set statement', { - space: space.id - }); - return receipt; } else if (type === 'flag-proposal') { const receipt = await client.flagProposal(auth.web3, web3.value.account, { space: space.id, proposal: payload.proposal.id }); - - mixpanel.track('Flag proposal', { - space: space.id, - proposalId: payload.proposal.id - }); - return receipt; } } diff --git a/src/composables/useMixpanel.ts b/src/composables/useMixpanel.ts deleted file mode 100644 index 9b570d0e7182..000000000000 --- a/src/composables/useMixpanel.ts +++ /dev/null @@ -1,12 +0,0 @@ -import mixpanel from 'mixpanel-browser'; - -const MIXPANEL_PROXY_DOMAIN = 'https://t.snapshot.org'; - -export function useMixpanel() { - mixpanel.init(import.meta.env.VITE_MIXPANEL_TOKEN, { - ip: false, - api_host: MIXPANEL_PROXY_DOMAIN - }); - - return { mixpanel }; -} diff --git a/src/router/index.ts b/src/router/index.ts index 57d51d6e677c..f3f8dab9039d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,5 +1,4 @@ import { createRouter, createWebHashHistory, RouteLocation } from 'vue-router'; -import { useMixpanel } from '@/composables/useMixpanel'; import DelegateView from '@/views/DelegateView.vue'; import ExploreView from '@/views/ExploreView.vue'; @@ -29,7 +28,6 @@ import TermsView from '@/views/TermsView.vue'; // The frontend shows all spaces or just a single one, when being accessed // through that space's custom domain. const { domain, domainAlias } = useApp(); -const { mixpanel } = useMixpanel(); const routes: any[] = []; @@ -189,13 +187,6 @@ const router = createRouter({ } }); -router.afterEach(to => { - mixpanel.track_pageview({ - page_name: to.name, - page_path: to.path - }); -}); - export { routes }; export default router; diff --git a/yarn.lock b/yarn.lock index c02e2ba5ac41..e7cbada562df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6757,11 +6757,6 @@ minisearch@^6.2.0: resolved "https://registry.yarnpkg.com/minisearch/-/minisearch-6.2.0.tgz#310b50508551f22e10815f5baedeeeded03a6b5d" integrity sha512-BECkorDF1TY2rGKt9XHdSeP9TP29yUbrAaCh/C03wpyf1vx3uYcP/+8XlMcpTkgoU0rBVnHMAOaP83Rc9Tm+TQ== -mixpanel-browser@^2.48.1: - version "2.48.1" - resolved "https://registry.yarnpkg.com/mixpanel-browser/-/mixpanel-browser-2.48.1.tgz#0fec03d87f57fe2e72c6a4b1df5924436840ece7" - integrity sha512-vXTuUzZMg+ht7sRqyjtc3dUDy/81Z/H6FLFgFkUZJqKFaAqcx1JSXmOdY/2kmsxCkUdy5JN5zW9m9TMCk+rxGQ== - mlly@^1.1.1, mlly@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.2.0.tgz#f0f6c2fc8d2d12ea6907cd869066689b5031b613" From 1062ef9b6118d65ff4400b3e5932f80e21f12527 Mon Sep 17 00:00:00 2001 From: ChaituVR Date: Mon, 2 Sep 2024 16:50:01 +0530 Subject: [PATCH 2/3] Return without assigning --- src/composables/useClient.ts | 57 +++++++++++++----------------------- 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/src/composables/useClient.ts b/src/composables/useClient.ts index ea706ff4e65f..fcd5e99302af 100644 --- a/src/composables/useClient.ts +++ b/src/composables/useClient.ts @@ -45,7 +45,7 @@ export function useClient() { plugins = payload.metadata.plugins; if (type === 'create-proposal') { - const receipt = await client.proposal(auth.web3, web3.value.account, { + return await client.proposal(auth.web3, web3.value.account, { space: space.id, type: payload.type, title: payload.name, @@ -58,26 +58,19 @@ export function useClient() { plugins: JSON.stringify(plugins), app: DEFINED_APP }); - - return receipt; } else if (type === 'update-proposal') { - const receipt = await client.updateProposal( - auth.web3, - web3.value.account, - { - proposal: payload.id, - space: space.id, - type: payload.type, - title: payload.name, - body: payload.body, - discussion: payload.discussion, - choices: payload.choices, - plugins: JSON.stringify(plugins) - } - ); - return receipt; + return await client.updateProposal(auth.web3, web3.value.account, { + proposal: payload.id, + space: space.id, + type: payload.type, + title: payload.name, + body: payload.body, + discussion: payload.discussion, + choices: payload.choices, + plugins: JSON.stringify(plugins) + }); } else if (type === 'vote') { - const receipt = await client.vote(auth.web3, web3.value.account, { + return await client.vote(auth.web3, web3.value.account, { space: space.id, proposal: payload.proposal.id, type: payload.proposal.type, @@ -86,41 +79,31 @@ export function useClient() { app: DEFINED_APP, reason: payload.reason }); - return receipt; } else if (type === 'delete-proposal') { - const receipt = await client.cancelProposal( - auth.web3, - web3.value.account, - { - space: space.id, - proposal: payload.proposal.id - } - ); - return receipt; + return await client.cancelProposal(auth.web3, web3.value.account, { + space: space.id, + proposal: payload.proposal.id + }); } else if (type === 'settings') { - const receipt = await client.space(auth.web3, web3.value.account, { + return await client.space(auth.web3, web3.value.account, { space: space.id, settings: JSON.stringify(payload) }); - return receipt; } else if (type === 'delete-space') { - const receipt = await client.deleteSpace(auth.web3, web3.value.account, { + return await client.deleteSpace(auth.web3, web3.value.account, { space: space.id }); - return receipt; } else if (type === 'set-statement') { - const receipt = await client.statement(auth.web3, web3.value.account, { + return await client.statement(auth.web3, web3.value.account, { space: space.id, about: payload.about, statement: payload.statement }); - return receipt; } else if (type === 'flag-proposal') { - const receipt = await client.flagProposal(auth.web3, web3.value.account, { + return await client.flagProposal(auth.web3, web3.value.account, { space: space.id, proposal: payload.proposal.id }); - return receipt; } } From 464ccee07a8478956e35c3008b7143ce706a535f Mon Sep 17 00:00:00 2001 From: ChaituVR Date: Mon, 2 Sep 2024 16:58:40 +0530 Subject: [PATCH 3/3] remove await --- src/composables/useClient.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/composables/useClient.ts b/src/composables/useClient.ts index fcd5e99302af..fe4931a9c6f4 100644 --- a/src/composables/useClient.ts +++ b/src/composables/useClient.ts @@ -45,7 +45,7 @@ export function useClient() { plugins = payload.metadata.plugins; if (type === 'create-proposal') { - return await client.proposal(auth.web3, web3.value.account, { + return client.proposal(auth.web3, web3.value.account, { space: space.id, type: payload.type, title: payload.name, @@ -59,7 +59,7 @@ export function useClient() { app: DEFINED_APP }); } else if (type === 'update-proposal') { - return await client.updateProposal(auth.web3, web3.value.account, { + return client.updateProposal(auth.web3, web3.value.account, { proposal: payload.id, space: space.id, type: payload.type, @@ -70,7 +70,7 @@ export function useClient() { plugins: JSON.stringify(plugins) }); } else if (type === 'vote') { - return await client.vote(auth.web3, web3.value.account, { + return client.vote(auth.web3, web3.value.account, { space: space.id, proposal: payload.proposal.id, type: payload.proposal.type, @@ -80,27 +80,27 @@ export function useClient() { reason: payload.reason }); } else if (type === 'delete-proposal') { - return await client.cancelProposal(auth.web3, web3.value.account, { + return client.cancelProposal(auth.web3, web3.value.account, { space: space.id, proposal: payload.proposal.id }); } else if (type === 'settings') { - return await client.space(auth.web3, web3.value.account, { + return client.space(auth.web3, web3.value.account, { space: space.id, settings: JSON.stringify(payload) }); } else if (type === 'delete-space') { - return await client.deleteSpace(auth.web3, web3.value.account, { + return client.deleteSpace(auth.web3, web3.value.account, { space: space.id }); } else if (type === 'set-statement') { - return await client.statement(auth.web3, web3.value.account, { + return client.statement(auth.web3, web3.value.account, { space: space.id, about: payload.about, statement: payload.statement }); } else if (type === 'flag-proposal') { - return await client.flagProposal(auth.web3, web3.value.account, { + return client.flagProposal(auth.web3, web3.value.account, { space: space.id, proposal: payload.proposal.id });