diff --git a/package-lock.json b/package-lock.json index 34692ef53..b1804d97d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,6 +23,7 @@ "echarts": "^5.4.3", "logrocket": "^5.0.1", "nanoid": "^4.0.2", + "plausible-tracker": "^0.3.8", "pretty-bytes": "^6.1.1", "prismjs": "^1.29.0", "svelte-confetti": "^1.3.0", @@ -7238,6 +7239,14 @@ "pathe": "^1.1.0" } }, + "node_modules/plausible-tracker": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/plausible-tracker/-/plausible-tracker-0.3.8.tgz", + "integrity": "sha512-lmOWYQ7s9KOUJ1R+YTOR3HrjdbxIS2Z4de0P/Jx2dQPteznJl2eX3tXxKClpvbfyGP59B5bbhW8ftN59HbbFSg==", + "engines": { + "node": ">=10" + } + }, "node_modules/playwright": { "version": "1.38.1", "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz", diff --git a/package.json b/package.json index e1e775d9f..271057ead 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "echarts": "^5.4.3", "logrocket": "^5.0.1", "nanoid": "^4.0.2", + "plausible-tracker": "^0.3.8", "pretty-bytes": "^6.1.1", "prismjs": "^1.29.0", "svelte-confetti": "^1.3.0", diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 47574d0e9..462af7473 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -1,26 +1,58 @@ +import Analytics, { type AnalyticsPlugin } from 'analytics'; +import googleAnalytics from '@analytics/google-analytics'; +import googleTagManager from '@analytics/google-tag-manager'; +import Plausible from 'plausible-tracker'; +import { get } from 'svelte/store'; import { page } from '$app/stores'; import { user } from '$lib/stores/user'; import { ENV, MODE, VARS, isCloud } from '$lib/system'; -import googleAnalytics from '@analytics/google-analytics'; import { AppwriteException } from '@appwrite.io/console'; -import googleTagManager from '@analytics/google-tag-manager'; -import Analytics from 'analytics'; -import { get } from 'svelte/store'; +import { browser } from '$app/environment'; + +function plausible(domain: string): AnalyticsPlugin { + const instance = Plausible({ + domain + }); + return { + name: 'analytics-plugin-plausible', + page: ({ payload }) => { + instance.trackPageview({ + url: payload.properties.path, + referrer: payload.properties.referrer, + deviceWidth: payload.properties.width + }); + }, + track: ({ payload }) => { + instance.trackEvent( + payload.event, + { + props: payload.properties + }, + { + url: payload.properties.path, + deviceWidth: payload.properties.width + } + ); + }, + loaded: () => true + }; +} const analytics = Analytics({ app: 'appwrite', - plugins: [ - googleAnalytics({ - measurementIds: [VARS.GOOGLE_ANALYTICS || 'G-R4YJ9JN8L4'] - }), - ...(isCloud + plugins: + isCloud && browser ? [ + plausible('cloud.appwrite.io'), googleTagManager({ containerId: [VARS.GOOGLE_TAG || 'GTM-P3T9TBV'] }) ] - : []) - ] + : [ + googleAnalytics({ + measurementIds: [VARS.GOOGLE_ANALYTICS || 'G-R4YJ9JN8L4'] + }) + ] }); export function trackEvent(name: string, data: object = null): void { diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte index 86209a6e5..5056e1186 100644 --- a/src/lib/components/permissions/team.svelte +++ b/src/lib/components/permissions/team.svelte @@ -119,7 +119,7 @@

There are no teams that match your search.

-
@@ -134,7 +134,7 @@

Need a hand? Learn more in our documentationThere are no Users that match your search.

-
@@ -153,7 +153,7 @@

Need a hand? Learn more in our documentationcontext.log(). Learn morecontext.log(). Learn morecontext.log(). Learn morecontext.log(). Learn morecontext.log(). Learn more {/if} diff --git a/src/lib/pages/domains/wizard/step1.svelte b/src/lib/pages/domains/wizard/step1.svelte index 2c8a0e884..9d4f60b8c 100644 --- a/src/lib/pages/domains/wizard/step1.svelte +++ b/src/lib/pages/domains/wizard/step1.svelte @@ -37,7 +37,7 @@ Add function domain Use your self-owned domain as the endpoint of your Appwrite API. Learn more You can find a list of domain providers and their DNS setting documentation here. If your domain provider isn't listed, please contact us, and we'll include their @@ -75,7 +75,7 @@ domain. or using the CLI. Learn more Choose who can execute this function using the client API. For more information, check out the diff --git a/src/routes/auth/magic-url/+page.svelte b/src/routes/auth/magic-url/+page.svelte index 9ebcee25a..878029347 100644 --- a/src/routes/auth/magic-url/+page.svelte +++ b/src/routes/auth/magic-url/+page.svelte @@ -25,7 +25,7 @@ Missing Redirect URL

Your Magic URL login flow is missing a proper redirect URL. Please check the - Magic URL docs and send request for new session with a valid redirect URL.

diff --git a/src/routes/auth/oauth2/failure/+page.svelte b/src/routes/auth/oauth2/failure/+page.svelte index 928ad82c4..ef3317af4 100644 --- a/src/routes/auth/oauth2/failure/+page.svelte +++ b/src/routes/auth/oauth2/failure/+page.svelte @@ -38,7 +38,7 @@ Your OAuth login flow is missing a proper redirect URL. Please check the OAuth docs and send request for new session with a valid callback URL.

diff --git a/src/routes/auth/oauth2/success/+page.svelte b/src/routes/auth/oauth2/success/+page.svelte index b67ad0ce6..5712751f7 100644 --- a/src/routes/auth/oauth2/success/+page.svelte +++ b/src/routes/auth/oauth2/success/+page.svelte @@ -38,7 +38,7 @@ Your OAuth login flow is missing a proper redirect URL. Please check the OAuth docs and send request for new session with a valid callback URL.

diff --git a/src/routes/console/(migration-wizard)/step2.svelte b/src/routes/console/(migration-wizard)/step2.svelte index b875cc1d0..c65a20327 100644 --- a/src/routes/console/(migration-wizard)/step2.svelte +++ b/src/routes/console/(migration-wizard)/step2.svelte @@ -12,7 +12,7 @@ Select the resources you need to migrate to Appwrite. Some resources can be migrated, but with limitations. Learn about which resources are supported + href="https://appwrite.io/docs/references/cloud/client-web/account#createEmailSession"> Documentation diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte index bdd8d834a..cf868562e 100644 --- a/src/routes/console/project-[project]/auth/+page.svelte +++ b/src/routes/console/project-[project]/auth/+page.svelte @@ -138,7 +138,7 @@ {:else} showCreateUser.set(true)} /> {/if} diff --git a/src/routes/console/project-[project]/auth/teams/+page.svelte b/src/routes/console/project-[project]/auth/teams/+page.svelte index 2e2febfab..1894edcd3 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/+page.svelte @@ -105,7 +105,7 @@ ($showCreateTeam = true)} - href="https://appwrite.io/docs/client/teams" + href="https://appwrite.io/docs/references/cloud/client-web/teams" target="team" /> {/if} diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte index af796434d..e199fce97 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte @@ -100,7 +100,7 @@ @@ -109,7 +109,7 @@ {:else} (showCreate = true)} /> {/if} diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/console/project-[project]/auth/templates/+page.svelte index c906da7ae..ee2f79fcc 100644 --- a/src/routes/console/project-[project]/auth/templates/+page.svelte +++ b/src/routes/console/project-[project]/auth/templates/+page.svelte @@ -110,7 +110,7 @@ Email templates

Use templates to send and process account management emails. Learn more about email templates. @@ -188,7 +188,7 @@ SMS templates

Use templates to send and process account management mobile messages. Learn more about SMS templates diff --git a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte index 807253b83..d045dfacc 100644 --- a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte @@ -112,7 +112,8 @@

Click to copy variables for the fields below. Learn more herehere.

diff --git a/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte index 680c8ef36..b85ab34c6 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte @@ -70,7 +70,10 @@

No memberships available

-
diff --git a/src/routes/console/project-[project]/auth/user-[user]/sessions/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/sessions/+page.svelte index 964873996..80ce286c8 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/sessions/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/sessions/+page.svelte @@ -101,7 +101,7 @@
diff --git a/src/routes/console/project-[project]/databases/+page.svelte b/src/routes/console/project-[project]/databases/+page.svelte index 3ac66e085..2a80ab049 100644 --- a/src/routes/console/project-[project]/databases/+page.svelte +++ b/src/routes/console/project-[project]/databases/+page.svelte @@ -80,7 +80,7 @@ {:else} (showCreate = true)} /> {/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/+page.svelte index d90af082c..5c60a73bf 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/+page.svelte @@ -38,7 +38,7 @@ {:else} ($showCreate = true)} /> {/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte index 95e1436e7..60fe0cf3e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte @@ -107,7 +107,7 @@ {:else} {/if} @@ -122,7 +122,7 @@
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index f558a546d..bd48e7807 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -188,7 +188,7 @@
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte index f4b5fdc6f..1e268af4f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte @@ -117,7 +117,7 @@ {:else} (showCreateIndex = true)} /> {/if} @@ -132,7 +132,7 @@
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte index d8822331e..608d30737 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte @@ -59,7 +59,7 @@ Permissions

Choose who can access your collection and documents. For more information, check out the diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte index 7ea47a21f..2abba8752 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte @@ -10,7 +10,7 @@ Permissions Choose who can access your collection and documents. For more information, check out the diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte index 509368064..70970757f 100644 --- a/src/routes/console/project-[project]/functions/+page.svelte +++ b/src/routes/console/project-[project]/functions/+page.svelte @@ -122,7 +122,7 @@ {:else} {/if} diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte index 20e1e32d6..080d49ab8 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -171,7 +171,7 @@

@@ -300,7 +300,7 @@
@@ -319,7 +319,7 @@
diff --git a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte b/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte index 7dc455b19..efc7a48c7 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte @@ -91,7 +91,7 @@ If you did not create your function using the CLI, initialize your function by following our documentation Deploy your function from the Git provider of your choice by following the steps below. Learn more in our documentation
- + {:else} diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte index 6302f5d97..278a3ceab 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte @@ -97,7 +97,7 @@

Manually execute your function. Learn more @@ -113,7 +113,10 @@ Update your function version to make use of new features including customizable HTTP data in your executions. - diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte index a0dbefe1f..628afeb62 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte @@ -164,7 +164,7 @@

Need a hand? Learn more in our documentation

- diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte index 499c2d49f..4dac5f427 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte @@ -53,13 +53,16 @@ Update your function version to make use of new features including build commands and HTTP data in your executions. To update, follow the steps outlined in our documentation. - diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte index b4fbe5ae1..5e47e5619 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte @@ -209,7 +209,7 @@
@@ -222,7 +222,7 @@

You have no repositories.

Need a hand? Learn more in our documentation diff --git a/src/routes/console/project-[project]/functions/wizard/step2.svelte b/src/routes/console/project-[project]/functions/wizard/step2.svelte index 992ce0424..1e94afc2c 100644 --- a/src/routes/console/project-[project]/functions/wizard/step2.svelte +++ b/src/routes/console/project-[project]/functions/wizard/step2.svelte @@ -9,7 +9,7 @@ Choose which users have permission to execute this function using Client SDKs. For more information, check out the diff --git a/src/routes/console/project-[project]/functions/wizard/step3.svelte b/src/routes/console/project-[project]/functions/wizard/step3.svelte index 58c099780..65db129c3 100644 --- a/src/routes/console/project-[project]/functions/wizard/step3.svelte +++ b/src/routes/console/project-[project]/functions/wizard/step3.svelte @@ -20,7 +20,7 @@ Events Set the events that will trigger your function. Maximum 100 events allowed. @@ -64,7 +64,7 @@

Select events in your Appwrite project that will trigger your function. Learn more about Appwrite EventsSchedule Set a Cron schedule to trigger your function. Leave blank for no schedule. More details on Cron syntax hereVariables Create the environment variables or secret keys that will be passed to your function. diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/console/project-[project]/overview/keys/+page.svelte index c3a75131d..ca22e8ce0 100644 --- a/src/routes/console/project-[project]/overview/keys/+page.svelte +++ b/src/routes/console/project-[project]/overview/keys/+page.svelte @@ -61,5 +61,9 @@ {:else} - + {/if} diff --git a/src/routes/console/project-[project]/overview/realtime.svelte b/src/routes/console/project-[project]/overview/realtime.svelte index 562623189..852065d0b 100644 --- a/src/routes/console/project-[project]/overview/realtime.svelte +++ b/src/routes/console/project-[project]/overview/realtime.svelte @@ -37,7 +37,7 @@

No data to show

Get started with Realtime
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte index ca28f9d99..f27ae8758 100644 --- a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte +++ b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte @@ -57,7 +57,7 @@ Select a source platform with the project you want to migrate. Learn about which platforms are supported Learn about which resources are supported Import data from another platform or from a different Appwrite instance. Learn about which platforms are supported Export data from your project to Appwrite Cloud. Learn more in our documentation. @@ -264,7 +264,7 @@

Export data from your project to a self-hosted instance. Learn more in our documentation. diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte index a3c6d5273..116064c7c 100644 --- a/src/routes/console/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte @@ -189,7 +189,10 @@ When installing Git in a locally hosted Appwrite project, you must first configure your environment variables. - diff --git a/src/routes/console/project-[project]/settings/webhooks/+page.svelte b/src/routes/console/project-[project]/settings/webhooks/+page.svelte index a2974ec1d..d20533a1f 100644 --- a/src/routes/console/project-[project]/settings/webhooks/+page.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/+page.svelte @@ -75,7 +75,7 @@ {:else} {/if} diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte index 1f9eadd84..e81c80099 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte @@ -112,7 +112,7 @@

Select events in your Appwrite project that will trigger your webhook. Learn more about Appwrite EventsWarning: Untrusted or self-signed certificates may not be secure. diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte index 88bbec47b..aefdeba8e 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte @@ -11,7 +11,7 @@ Signature Key

Add the Signature Key to the X-Appwrite-Webhook-Signature header to validate your webhooks. Learn more about webhook validation. diff --git a/src/routes/console/project-[project]/settings/webhooks/wizard/step2.svelte b/src/routes/console/project-[project]/settings/webhooks/wizard/step2.svelte index 252899fc2..e0f4d469d 100644 --- a/src/routes/console/project-[project]/settings/webhooks/wizard/step2.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/wizard/step2.svelte @@ -58,7 +58,7 @@

Select events in your Appwrite project that will trigger your webhook. Learn more about Appwrite EventsWarning: Untrusted or self-signed certificates may not be secure. diff --git a/src/routes/console/project-[project]/storage/+page.svelte b/src/routes/console/project-[project]/storage/+page.svelte index 4b5d27e3f..204e216ae 100644 --- a/src/routes/console/project-[project]/storage/+page.svelte +++ b/src/routes/console/project-[project]/storage/+page.svelte @@ -89,7 +89,7 @@ {:else} ($showCreateBucket = true)} /> {/if} diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte index 355280e13..11261f273 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -240,7 +240,10 @@

There are no files that match your search.