From fcba38ba66f112a89022d402443c76ce8803d14f Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 15 Feb 2023 15:02:41 +0100 Subject: [PATCH 01/18] fix: file name alignment --- .../storage/bucket-[bucket]/[[page]]/+page.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte index 69bd8ab00..cb1716eb5 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte @@ -97,7 +97,7 @@ {#if file.chunksTotal / file.chunksUploaded !== 1} -
+
{file.name} @@ -136,7 +136,7 @@ -
+
{file.name}
From 7b0679c8ae7e62548890ac4505a615d6209ea3ac Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 16 Feb 2023 13:15:18 +0100 Subject: [PATCH 02/18] fix: membership and sessions empty state --- .../memberships/[[page]]/+page.svelte | 22 +++++++--------- .../sessions/[[page]]/+page.svelte | 25 +++++++++---------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.svelte index 0b594b862..ec4f5c800 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.svelte @@ -1,7 +1,7 @@ From 7bcb0c7a5f14e0a86519c37d1fca9e46887d67fe Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Feb 2023 18:03:19 +0530 Subject: [PATCH 07/18] feat: lr for cloud --- package-lock.json | 6 ++++++ package.json | 1 + src/lib/elements/table/cell.svelte | 3 ++- src/lib/elements/table/cellLink.svelte | 2 +- src/lib/elements/table/cellText.svelte | 3 ++- src/lib/system.ts | 6 ++++-- src/routes/+layout.svelte | 16 +++++++++++++--- src/routes/+layout.ts | 6 ++++++ .../auth/user-[user]/dangerZone.svelte | 4 ++-- .../auth/user-[user]/updateName.svelte | 2 +- .../auth/user-[user]/updateStatus.svelte | 4 ++-- 11 files changed, 40 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21a276c80..61530ef93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "@sentry/tracing": "^7.36.0", "analytics": "^0.8.1", "echarts": "^5.4.1", + "logrocket": "^3.0.1", "pretty-bytes": "^6.1.0", "prismjs": "^1.29.0", "tippy.js": "^6.3.7", @@ -6261,6 +6262,11 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/logrocket": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/logrocket/-/logrocket-3.0.1.tgz", + "integrity": "sha512-jOWG+jEzobKVxGytzZ+4KGm2kiMQMRTHab2uDWQyVZcHfEF38BlCH1yjQVY4LCmuQUwZitP9biMzJZnyUQ0dtQ==" + }, "node_modules/loupe": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", diff --git a/package.json b/package.json index c468dff23..0d0865856 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "@sentry/tracing": "^7.36.0", "analytics": "^0.8.1", "echarts": "^5.4.1", + "logrocket": "^3.0.1", "pretty-bytes": "^6.1.0", "prismjs": "^1.29.0", "tippy.js": "^6.3.7", diff --git a/src/lib/elements/table/cell.svelte b/src/lib/elements/table/cell.svelte index 4c778d31a..b8353646a 100644 --- a/src/lib/elements/table/cell.svelte +++ b/src/lib/elements/table/cell.svelte @@ -11,6 +11,7 @@ class:u-overflow-visible={showOverflow} class:is-only-desktop={onlyDesktop} data-title={title} - role="cell"> + role="cell" + data-private>
diff --git a/src/lib/elements/table/cellLink.svelte b/src/lib/elements/table/cellLink.svelte index 17892db57..839949f73 100644 --- a/src/lib/elements/table/cellLink.svelte +++ b/src/lib/elements/table/cellLink.svelte @@ -3,6 +3,6 @@ export let title: string; -
+
diff --git a/src/lib/elements/table/cellText.svelte b/src/lib/elements/table/cellText.svelte index 59dcba6e4..e2fb71b6d 100644 --- a/src/lib/elements/table/cellText.svelte +++ b/src/lib/elements/table/cellText.svelte @@ -10,6 +10,7 @@ class:is-only-desktop={onlyDesktop} class:u-overflow-visible={showOverflow} data-title={title} - role="cell"> + role="cell" + data-private>
diff --git a/src/lib/system.ts b/src/lib/system.ts index 596e4faca..9c08603eb 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -1,3 +1,5 @@ +import { dev } from '$app/environment'; + export enum Mode { CLOUD = 'cloud', SELF_HOSTED = 'self-hosted' @@ -14,8 +16,8 @@ export const VARS = { }; export const ENV = { - DEV: import.meta.env.DEV, - PROD: import.meta.env.PROD, + DEV: dev, + PROD: !dev, PREVIEW: VARS.VERCEL_ENV === 'preview', TEST: !!import.meta.env?.VITEST }; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 65fc7b03d..cefc6eef2 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,5 +1,5 @@ -
+
{#if $user.email || $user.phone} {#if $user.name} @@ -92,7 +92,7 @@
-
+
{#if $user.email}

{$user.email}

{/if} From 407c9a86a618329a0b0bef6b6438d2ab56802099 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Feb 2023 18:05:55 +0530 Subject: [PATCH 08/18] fix: respect dnt --- src/lib/actions/analytics.ts | 2 +- src/routes/+layout.svelte | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 0d00ef17c..c33302f87 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -88,7 +88,7 @@ function sendEventToGrowth(event: string, path: string, data: object = null): vo }); } -function isTrackingAllowed() { +export function isTrackingAllowed() { if (ENV.TEST) { return; } diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index cefc6eef2..4c8074bdc 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -3,7 +3,7 @@ import { afterNavigate, goto } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { trackPageView } from '$lib/actions/analytics'; + import { isTrackingAllowed, trackPageView } from '$lib/actions/analytics'; import { reportWebVitals } from '$lib/helpers/vitals'; import { Notifications, Progress } from '$lib/layout'; import { app } from '$lib/stores/app'; @@ -45,7 +45,7 @@ }); } - if (isCloud) { + if (isCloud && isTrackingAllowed()) { LogRocket.init('rgthvf/appwrite', { dom: { inputSanitizer: true From fbb91b588b31de66a8b275738abc414a33f91520 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Feb 2023 20:47:21 +0530 Subject: [PATCH 09/18] remove unused import --- src/lib/system.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/system.ts b/src/lib/system.ts index 9c08603eb..596e4faca 100644 --- a/src/lib/system.ts +++ b/src/lib/system.ts @@ -1,5 +1,3 @@ -import { dev } from '$app/environment'; - export enum Mode { CLOUD = 'cloud', SELF_HOSTED = 'self-hosted' @@ -16,8 +14,8 @@ export const VARS = { }; export const ENV = { - DEV: dev, - PROD: !dev, + DEV: import.meta.env.DEV, + PROD: import.meta.env.PROD, PREVIEW: VARS.VERCEL_ENV === 'preview', TEST: !!import.meta.env?.VITEST }; From 88983ee821a83cb64a150a722f30fe681c0fbe7c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Sun, 26 Feb 2023 13:48:10 +0530 Subject: [PATCH 10/18] fix: footer github link --- src/lib/layout/footer.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/layout/footer.svelte b/src/lib/layout/footer.svelte index fd8a77b59..e7ecd1b6e 100644 --- a/src/lib/layout/footer.svelte +++ b/src/lib/layout/footer.svelte @@ -43,7 +43,7 @@ ⓒ {currentYear} Appwrite. All rights reserved.
  • - + From a247231fa511980e7eff780c7b8bfa5ce4abee71 Mon Sep 17 00:00:00 2001 From: saurabh Date: Tue, 28 Feb 2023 10:30:47 +0530 Subject: [PATCH 11/18] docs: add steps for project development setup --- CONTRIBUTING.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 512e71552..827dedc8c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,19 @@ If you are worried about or don’t know where to start, check out the next sect ## Development -Once you've created a project and installed dependencies with `npm install`, create a `.env` file using `.env.example` as a template. +### 1. Clone the repository with git +```bash +git clone https://github.com/appwrite/console.git appwrite-console +``` + +### 2. Install dependencies with npm +```bash +npm install +``` + +### 3. Setup environment variables + +add .env file using .env.example file as a template in project root directory Finally, start a development server: From b7cab43020a383997d0746ad2c50e1c09b31d865 Mon Sep 17 00:00:00 2001 From: Saurabh <57309205+saurabhmehta1601@users.noreply.github.com> Date: Tue, 28 Feb 2023 21:44:17 +0530 Subject: [PATCH 12/18] Update CONTRIBUTING.md Co-authored-by: Vincent (Wen Yu) Ge --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 827dedc8c..de572975b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,7 +45,7 @@ npm install ### 3. Setup environment variables -add .env file using .env.example file as a template in project root directory +Add a `.env` file by copying the `.env.example` file as a template in the project's root directory. Finally, start a development server: From a085d75134bf65569de9ab0a654c5cb1ed13e6f0 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Thu, 2 Mar 2023 12:48:06 +0530 Subject: [PATCH 13/18] feat: auto fill invite code --- CONTRIBUTING.md | 8 +++++--- src/routes/register/invite/[slug]/+page.svelte | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de572975b..a723620ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,17 +33,19 @@ If you are worried about or don’t know where to start, check out the next sect ## Development -### 1. Clone the repository with git +### 1. Clone the repository with git + ```bash git clone https://github.com/appwrite/console.git appwrite-console ``` ### 2. Install dependencies with npm + ```bash -npm install +npm install ``` -### 3. Setup environment variables +### 3. Setup environment variables Add a `.env` file by copying the `.env.example` file as a template in the project's root directory. diff --git a/src/routes/register/invite/[slug]/+page.svelte b/src/routes/register/invite/[slug]/+page.svelte index 023350aec..c781e3135 100644 --- a/src/routes/register/invite/[slug]/+page.svelte +++ b/src/routes/register/invite/[slug]/+page.svelte @@ -28,6 +28,7 @@ onMount(async () => { if (isCloud) { + code = slug; switch (slug) { case 'mlh': imgDark = (await import('./mlh-dark.svg')).default; @@ -38,8 +39,11 @@ imgDark = (await import('$lib/images/appwrite.svg')).default; imgLight = (await import('$lib/images/appwrite.svg')).default; title = 'Welcome Appwriters!'; - break; + case 'cloud_beta': + break; + default: + code = ''; } } }); From a0dfd89382ef55a5c8457bb965d1cc8c28d05746 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 6 Mar 2023 22:14:04 +0530 Subject: [PATCH 14/18] fix: env condition --- src/lib/actions/analytics.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 0d00ef17c..779261c57 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -10,7 +10,7 @@ const analytics = Analytics({ app: 'appwrite', plugins: [ googleAnalytics({ - measurementIds: [VARS.GOOGLE_ANALYTICS ?? 'G-R4YJ9JN8L4'] + measurementIds: [VARS.GOOGLE_ANALYTICS || 'G-R4YJ9JN8L4'] }) ] }); From b81ae52225f81e4f46fe57e9fcdb89dbfaee7f50 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 9 Mar 2023 14:25:13 +0530 Subject: [PATCH 15/18] hide stuff --- src/lib/components/alert.svelte | 2 +- src/lib/components/cardContainer.svelte | 3 ++- src/lib/components/secret.svelte | 2 +- src/lib/elements/table/cell.svelte | 3 +-- src/lib/elements/table/table.svelte | 3 ++- src/lib/elements/table/tableList.svelte | 2 +- src/lib/elements/table/tableScroll.svelte | 2 +- src/lib/layout/breadcrumbs.svelte | 2 +- src/lib/layout/coverTitle.svelte | 2 +- src/routes/+layout.svelte | 23 +++++++++++-------- .../deleteMember.svelte | 2 +- .../teams/team-[team]/deleteMembership.svelte | 2 +- .../auth/teams/team-[team]/deleteTeam.svelte | 3 +-- .../auth/user-[user]/deleteAllSessions.svelte | 2 +- .../auth/user-[user]/deleteMembership.svelte | 2 +- .../auth/user-[user]/deleteUser.svelte | 2 +- .../attributes/deleteAttribute.svelte | 2 +- .../document-[document]/delete.svelte | 2 +- .../indexes/deleteIndex.svelte | 2 +- .../settings/deleteCollection.svelte | 2 +- .../database-[database]/delete.svelte | 2 +- .../function-[function]/delete.svelte | 2 +- .../settings/delete.svelte | 2 +- .../overview/platforms/+page.svelte | 3 ++- .../settings/domains/delete.svelte | 2 +- .../settings/webhooks/[webhook]/delete.svelte | 4 +++- .../bucket-[bucket]/deleteBucket.svelte | 2 +- .../storage/bucket-[bucket]/deleteFile.svelte | 2 +- .../bucket-[bucket]/file-[file]/+page.svelte | 4 ++-- .../file-[file]/deleteFile.svelte | 2 +- 30 files changed, 48 insertions(+), 42 deletions(-) diff --git a/src/lib/components/alert.svelte b/src/lib/components/alert.svelte index 6d67c8378..599d6b9e9 100644 --- a/src/lib/components/alert.svelte +++ b/src/lib/components/alert.svelte @@ -32,7 +32,7 @@ class:icon-exclamation={type === 'warning'} class:icon-exclamation-circle={type === 'error'} aria-hidden="true" /> -
    +
    {#if $$slots.title}
    diff --git a/src/lib/components/cardContainer.svelte b/src/lib/components/cardContainer.svelte index ca00145ba..106479447 100644 --- a/src/lib/components/cardContainer.svelte +++ b/src/lib/components/cardContainer.svelte @@ -10,7 +10,8 @@