From 0e31ca6f08f5762b79da255c2dad2a1d75fb46bd Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 7 Jul 2021 02:13:40 +0200 Subject: [PATCH] . --- package.json | 4 ++ src/components/home.component.pug | 8 ---- src/components/home.component.ts | 18 +++++++++ yarn.lock | 65 ++++++++++++++++++++++++++++++- 4 files changed, 86 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 8dca051..738e258 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "@ngtools/webpack": "^12.0.4", "@tabby-gang/to-string-loader": "^1.1.7-beta.1", "@types/node": "^11.9.5", + "analytics": "^0.7.5", "apply-loader": "^2.0.0", "awesome-typescript-loader": "^5.2.1", "bootstrap": "^5.0.1", @@ -55,5 +56,8 @@ "webpack": "^5.38.1", "webpack-cli": "^4.7.2", "zone.js": "^0.11.4" + }, + "dependencies": { + "@analytics/google-analytics": "^0.5.3" } } diff --git a/src/components/home.component.pug b/src/components/home.component.pug index b6324b9..623cc48 100644 --- a/src/components/home.component.pug +++ b/src/components/home.component.pug @@ -141,11 +141,3 @@ li Simultaneous #[strong multi-pane input] li Optional PuTTY style #[strong right-click paste] and #[strong copy on select] li macOS vibrancy and Win 10 fluent background support - - -script(async, src="https://www.googletagmanager.com/gtag/js?id=UA-3278102-18") -script. - window.dataLayer = window.dataLayer || []; - function gtag(){dataLayer.push(arguments);} - gtag('js', new Date()); - gtag('config', 'UA-3278102-18'); diff --git a/src/components/home.component.ts b/src/components/home.component.ts index dcec657..3c21567 100644 --- a/src/components/home.component.ts +++ b/src/components/home.component.ts @@ -6,6 +6,24 @@ import { faCoffee, faDownload, faSignInAlt } from '@fortawesome/free-solid-svg-i import { faGithub } from '@fortawesome/free-brands-svg-icons' import { ActivatedRoute } from '@angular/router' +// TODO +import Analytics from 'analytics' +import googleAnalytics from '@analytics/google-analytics' + + +const analytics = Analytics({ + app: 'tabby-web', + plugins: [ + googleAnalytics({ + trackingId: 'UA-3278102-18' + }) + ] +}) + +/* Track a page view */ +analytics.page() + + class DemoConnector { constructor (targetWindow: Window, private version: Version) { targetWindow['tabbyWebDemoDataPath'] = `${this.getDistURL()}/${version.version}/tabby-web-demo/data` diff --git a/yarn.lock b/yarn.lock index 52a34ce..3418d83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,32 @@ # yarn lockfile v1 +"@analytics/cookie-utils@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@analytics/cookie-utils/-/cookie-utils-0.2.3.tgz#e6ab923f88d89f7b02da0cfab585ff193977052f" + integrity sha512-RiMAVpSluRbWb2hlT9wMJ0r2l+MUZzScYjY+w2iWRzjOr9Zzzs4tYzJT6Sd94PDz3LzCuf4aGOwS6pkKXTEBLw== + +"@analytics/core@^0.10.5": + version "0.10.5" + resolved "https://registry.yarnpkg.com/@analytics/core/-/core-0.10.5.tgz#655f62a77e2290750439cfcd76a840e13ca3c480" + integrity sha512-R2W8ybinHXVnWeVLsvI/+ukHzgCWSRT7EoIi6afbWcAsotneFE6vwLwGAKbWIdnGITl1ZaYU6i6wquF6nfF9sQ== + dependencies: + analytics-utils "^0.4.4" + +"@analytics/google-analytics@^0.5.3": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@analytics/google-analytics/-/google-analytics-0.5.3.tgz#08642f6e9ab9a76aceb53356ea66c53552eec9b7" + integrity sha512-5ZH3hpM8W/rhBrF+3TNjD2ZjabW4A8k/maqF4IGmWWNq31Bd8xh3KAhifDs76xn8hTWKGapTORZLfo87mB+9Dw== + dependencies: + universal-analytics "^0.4.20" + +"@analytics/storage-utils@^0.2.5": + version "0.2.5" + resolved "https://registry.yarnpkg.com/@analytics/storage-utils/-/storage-utils-0.2.5.tgz#bc82a1b5dea8e47ae18718aae687c3408ae7c504" + integrity sha512-RJdKjR4O86eB5fIfApFfhN8Be/Q709DQiRA7UyS0Ymo6w+usnPPxpm6GaKHVop5CIn3vtlMuUxRA4qZhhBrfMw== + dependencies: + "@analytics/cookie-utils" "^0.2.3" + "@angular/animations@^11.0.0": version "11.2.14" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.14.tgz#cf119ea779bf11bd3759f1355c85e4e8e9e7bb03" @@ -619,6 +645,22 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= +analytics-utils@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/analytics-utils/-/analytics-utils-0.4.4.tgz#0fc032c8d3dd8a37f6275ea47f678958204d5bf3" + integrity sha512-MJ6sT28L9RdLIxf/rrcfoDmnfWNxmDlF32q5SKbsce+KRPUPu+BuAp4IUUMgM+nYKWZAsxjI/piFXWqOv97awQ== + dependencies: + "@analytics/storage-utils" "^0.2.5" + dlv "^1.1.3" + +analytics@^0.7.5: + version "0.7.5" + resolved "https://registry.yarnpkg.com/analytics/-/analytics-0.7.5.tgz#c65deb0605e6db840415c5f371f894d3dc627919" + integrity sha512-qOQuczBCux574jxfksdVMhD0in9iw8L7PEEjZ/h/OEolbY2UBpFXqydOSyNRG+oF28bBlSPaDQDc3g8f2CwhKA== + dependencies: + "@analytics/core" "^0.10.5" + "@analytics/storage-utils" "^0.2.5" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -1290,6 +1332,13 @@ debug@^4.1.0: dependencies: ms "2.1.2" +debug@^4.1.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + decamelize@^1.0.0, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1349,6 +1398,11 @@ dependency-graph@^0.7.2: resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49" integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ== +dlv@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== + doctypes@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9" @@ -4109,6 +4163,15 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" +universal-analytics@^0.4.20: + version "0.4.23" + resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac" + integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A== + dependencies: + debug "^4.1.1" + request "^2.88.2" + uuid "^3.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -4144,7 +4207,7 @@ util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -uuid@^3.1.0, uuid@^3.3.2: +uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==