From 4de3c9085b2d1b60d2143081d470735166962bda Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 15 Feb 2023 11:55:38 +0100 Subject: [PATCH 01/10] PoC: initial commit --- src/lib/admin.svelte | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 src/lib/admin.svelte diff --git a/src/lib/admin.svelte b/src/lib/admin.svelte new file mode 100644 index 0000000000..3f642ecaca --- /dev/null +++ b/src/lib/admin.svelte @@ -0,0 +1,65 @@ + + +
+
+

Admin

+
+

Mode:

+ + modeOverwrite.set('self-hosted')}> + Self + + modeOverwrite.set('cloud')}> + Cloud + + +
+
+

Tier:

+ + modeTier.set('base')}> + Base + + modeTier.set('premium')}> + Premium + + modeTier.set('enterprise')}> + Enterprise + + +
+ +
+
+ + From 1c61ea1bd4bf819936ec40b3ad6bbf7a23f3a7ce Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 15 Feb 2023 11:55:51 +0100 Subject: [PATCH 02/10] PoC: initial commit --- src/lib/components/secondaryTabsItem.svelte | 2 +- src/lib/stores/admin.ts | 4 ++++ src/lib/system.ts | 6 +++++- src/routes/+layout.svelte | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/lib/stores/admin.ts diff --git a/src/lib/components/secondaryTabsItem.svelte b/src/lib/components/secondaryTabsItem.svelte index 1d46f462e4..4273de88c7 100644 --- a/src/lib/components/secondaryTabsItem.svelte +++ b/src/lib/components/secondaryTabsItem.svelte @@ -1,5 +1,5 @@ diff --git a/src/lib/stores/admin.ts b/src/lib/stores/admin.ts new file mode 100644 index 0000000000..3375ddf415 --- /dev/null +++ b/src/lib/stores/admin.ts @@ -0,0 +1,4 @@ +import { writable, type Writable } from 'svelte/store'; + +export const modeOverwrite: Writable<'cloud' | 'self-hosted'> = writable('cloud'); +export const modeTier: Writable<'base' | 'premium' | 'enterprise'> = writable('base'); diff --git a/src/lib/system.ts b/src/lib/system.ts index fc00cbd8e6..165e9fa905 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -1,3 +1,6 @@ +import { modeOverwrite } from '$lib/stores/admin.ts'; +import { get } from 'svelte/store'; + export enum Mode { CLOUD = 'cloud', SELF_HOSTED = 'self-hosted' @@ -20,4 +23,5 @@ export const ENV = { TEST: !!import.meta.env?.VITEST }; -export const MODE = VARS.CONSOLE_MODE === Mode.CLOUD ? Mode.CLOUD : Mode.SELF_HOSTED; +export const MODE = + get(modeOverwrite) ?? (VARS.CONSOLE_MODE === Mode.CLOUD ? Mode.CLOUD : Mode.SELF_HOSTED); diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 97d2b07a7e..13d39211d4 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -14,6 +14,7 @@ import { trackPageView } from '$lib/actions/analytics'; import * as Sentry from '@sentry/svelte'; import { BrowserTracing } from '@sentry/tracing'; + import Admin from '$lib/admin.svelte'; if (browser) { window.VERCEL_ANALYTICS_ID = import.meta.env.VERCEL_ANALYTICS_ID?.toString() ?? false; @@ -106,6 +107,8 @@ + + From 48fe652556e1dc6df5661814139b65c67963956f Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 15 Feb 2023 12:31:15 +0100 Subject: [PATCH 04/10] feat: change icon --- src/lib/admin.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/admin.svelte b/src/lib/admin.svelte index 5c2d186f51..b5092a279a 100644 --- a/src/lib/admin.svelte +++ b/src/lib/admin.svelte @@ -68,7 +68,7 @@ {:else} {/if} From ea8b605668d5a6c2cc91e92ddc34ac3378246f33 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 15 Feb 2023 12:39:55 +0100 Subject: [PATCH 05/10] feat: show only on prod/dev --- src/lib/system.ts | 2 +- src/routes/+layout.svelte | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/system.ts b/src/lib/system.ts index 165e9fa905..1d509c53cd 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -1,4 +1,4 @@ -import { modeOverwrite } from '$lib/stores/admin.ts'; +import { modeOverwrite } from '$lib/stores/admin'; import { get } from 'svelte/store'; export enum Mode { diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 13d39211d4..06f1e6daae 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -15,6 +15,7 @@ import * as Sentry from '@sentry/svelte'; import { BrowserTracing } from '@sentry/tracing'; import Admin from '$lib/admin.svelte'; + import { ENV } from '$lib/system'; if (browser) { window.VERCEL_ANALYTICS_ID = import.meta.env.VERCEL_ANALYTICS_ID?.toString() ?? false; @@ -107,7 +108,9 @@ - +{#if ENV.DEV || ENV.PREVIEW} + +{/if} diff --git a/src/lib/stores/admin.ts b/src/lib/stores/admin.ts index 3375ddf415..49b4beb9c9 100644 --- a/src/lib/stores/admin.ts +++ b/src/lib/stores/admin.ts @@ -1,4 +1,4 @@ import { writable, type Writable } from 'svelte/store'; export const modeOverwrite: Writable<'cloud' | 'self-hosted'> = writable('cloud'); -export const modeTier: Writable<'base' | 'premium' | 'enterprise'> = writable('base'); +export const tierOverwrite: Writable<'base' | 'premium' | 'enterprise'> = writable('base'); From c4f127b076d6102b4c977b25a555e63b9ae0c01c Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 19 May 2023 13:50:53 +0200 Subject: [PATCH 07/10] fix: copy, add console log for testing --- src/lib/admin.svelte | 26 +++++++++++++++++--------- src/routes/+layout.svelte | 4 +++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/lib/admin.svelte b/src/lib/admin.svelte index eb47a0cb65..f3af60c5cb 100644 --- a/src/lib/admin.svelte +++ b/src/lib/admin.svelte @@ -61,12 +61,12 @@ tierOverwrite.set('base')}> - Base + Free tierOverwrite.set('premium')}> - Premium + Pro - +
+

Feedback:

+ + feedback.switchType('general')}> + General + + feedback.switchType('nps')}> + NPS + + +
{:else}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index e0b31febdc..b553d3295f 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -8,7 +8,7 @@ import { Notifications, Progress } from '$lib/layout'; import { app } from '$lib/stores/app'; import { user } from '$lib/stores/user'; - import { ENV, isCloud } from '$lib/system'; + import { ENV, VARS, isCloud } from '$lib/system'; import * as Sentry from '@sentry/svelte'; import LogRocket from 'logrocket'; import { BrowserTracing } from '@sentry/tracing'; @@ -108,6 +108,8 @@ } } } + + $: console.log(VARS, ENV); From 7001ec61a04a4d770119ba7829c99ff897a35c01 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 19 May 2023 15:38:03 +0200 Subject: [PATCH 08/10] test env variable --- src/lib/system.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/system.ts b/src/lib/system.ts index b2d012b55b..04e6beadae 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -1,5 +1,6 @@ import { modeOverwrite } from '$lib/stores/admin'; import { get } from 'svelte/store'; +import { VITE_VERCEL_ENV } from '$env/static/private'; export enum Mode { CLOUD = 'cloud', @@ -12,7 +13,7 @@ export const VARS = { | string | undefined, CONSOLE_MODE: import.meta.env?.VITE_CONSOLE_MODE?.toString() as string | undefined, - VERCEL_ENV: import.meta.env?.VITE_VERCEL_ENV?.toString() as string | undefined, + VERCEL_ENV: VITE_VERCEL_ENV?.toString() as string | undefined, GOOGLE_ANALYTICS: import.meta.env?.VITE_GA_PROJECT?.toString() as string | undefined }; From fdb5642601fa6f072fb0024e9903602b5ac6f82e Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 19 May 2023 16:13:44 +0200 Subject: [PATCH 09/10] revert changes --- src/lib/system.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/system.ts b/src/lib/system.ts index 04e6beadae..b2d012b55b 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -1,6 +1,5 @@ import { modeOverwrite } from '$lib/stores/admin'; import { get } from 'svelte/store'; -import { VITE_VERCEL_ENV } from '$env/static/private'; export enum Mode { CLOUD = 'cloud', @@ -13,7 +12,7 @@ export const VARS = { | string | undefined, CONSOLE_MODE: import.meta.env?.VITE_CONSOLE_MODE?.toString() as string | undefined, - VERCEL_ENV: VITE_VERCEL_ENV?.toString() as string | undefined, + VERCEL_ENV: import.meta.env?.VITE_VERCEL_ENV?.toString() as string | undefined, GOOGLE_ANALYTICS: import.meta.env?.VITE_GA_PROJECT?.toString() as string | undefined }; From 78ad5d0a542409ded18997ea885699a9b9f438f5 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 19 May 2023 16:24:54 +0200 Subject: [PATCH 10/10]