From 5a98b5eaf249dc93f24f55b2484f0db2b290a789 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 31 Jan 2023 18:12:13 +0100 Subject: [PATCH 1/4] feat: update classes and imports to use pink --- package-lock.json | 63 +++++++++---------- package.json | 5 +- src/lib/components/alert.svelte | 11 ++-- src/lib/components/eventModal.svelte | 4 +- src/lib/components/feedbackGeneral.svelte | 3 +- src/lib/components/feedbackNPS.svelte | 3 +- src/lib/components/innerModal.svelte | 3 +- src/lib/components/modal.svelte | 3 +- src/lib/components/searchQuery.svelte | 6 +- src/lib/components/uploadBox.svelte | 8 +-- src/lib/elements/forms/helper.svelte | 8 +-- src/lib/elements/forms/inputFile.svelte | 3 +- src/lib/elements/forms/inputSearch.svelte | 6 +- src/lib/layout/logs.svelte | 6 +- src/lib/layout/notification.svelte | 8 ++- src/lib/layout/unauthenticated.svelte | 10 +-- src/lib/layout/wizard.svelte | 6 +- src/routes/+layout.ts | 3 +- .../project-[project]/overview/onboard.svelte | 2 +- .../webhooks/[webhook]/updateSecurity.svelte | 4 +- .../settings/webhooks/wizard/step3.svelte | 4 +- .../storage/[[page]]/+page.svelte | 4 +- 22 files changed, 99 insertions(+), 74 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a793cced6..0308842a5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,8 @@ "version": "0.0.1", "dependencies": { "@analytics/google-analytics": "^1.0.5", + "@appwrite.io/pink": "^0.0.2", "@aw-labs/appwrite-console": "^13.1.0", - "@aw-labs/icons": "0.0.0-82", - "@aw-labs/ui": "0.0.0-82", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.19.0", "@sentry/tracing": "^7.19.0", @@ -144,6 +143,21 @@ "resolved": "https://registry.npmjs.org/@analytics/type-utils/-/type-utils-0.6.0.tgz", "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, + "node_modules/@appwrite.io/pink": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.2.tgz", + "integrity": "sha512-fLrA+QWLmxXjK9tIw55S3jHHPhOzW8vAfuPgx0PQGgwt0N7mObNrx6WK5VvdEhJ2Z7fdfgPlNpu5sqoDolpetQ==", + "dependencies": { + "@appwrite.io/pink-icons": "*", + "normalize.css": "^8.0.1", + "the-new-css-reset": "^1.7.3" + } + }, + "node_modules/@appwrite.io/pink-icons": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.0.2.tgz", + "integrity": "sha512-yv8IpWzgRj+C3fMbG0PwweIKUDBFz+GQZPpsiqdQEBNuMhNSwWSkYqTj7gumO3GUiIcMl4xhSGXY+vE2itswRg==" + }, "node_modules/@aw-labs/appwrite-console": { "version": "13.1.0", "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-13.1.0.tgz", @@ -153,21 +167,6 @@ "isomorphic-form-data": "2.0.0" } }, - "node_modules/@aw-labs/icons": { - "version": "0.0.0-82", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-82.tgz", - "integrity": "sha512-TQ3abZGBjisd4WpeBVSUihY98drljdlcdw++z8icNpQVYohmUejRHU59mhmIfXCkhpA1s0tW+5xEMp0WmLNp9Q==" - }, - "node_modules/@aw-labs/ui": { - "version": "0.0.0-82", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-82.tgz", - "integrity": "sha512-zZDTP117uxMrwzAacOcpSXI77FMFcfv6+Da1R5sDWoqxhvZ0Wyx0Z6cn3dakV0M3zJfYZQ49LmSnU/5wqHPc7A==", - "dependencies": { - "@aw-labs/icons": "*", - "normalize.css": "^8.0.1", - "the-new-css-reset": "^1.7.3" - } - }, "node_modules/@babel/code-frame": { "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", @@ -7739,6 +7738,21 @@ "resolved": "https://registry.npmjs.org/@analytics/type-utils/-/type-utils-0.6.0.tgz", "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, + "@appwrite.io/pink": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.0.2.tgz", + "integrity": "sha512-fLrA+QWLmxXjK9tIw55S3jHHPhOzW8vAfuPgx0PQGgwt0N7mObNrx6WK5VvdEhJ2Z7fdfgPlNpu5sqoDolpetQ==", + "requires": { + "@appwrite.io/pink-icons": "*", + "normalize.css": "^8.0.1", + "the-new-css-reset": "^1.7.3" + } + }, + "@appwrite.io/pink-icons": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.0.2.tgz", + "integrity": "sha512-yv8IpWzgRj+C3fMbG0PwweIKUDBFz+GQZPpsiqdQEBNuMhNSwWSkYqTj7gumO3GUiIcMl4xhSGXY+vE2itswRg==" + }, "@aw-labs/appwrite-console": { "version": "13.1.0", "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-13.1.0.tgz", @@ -7748,21 +7762,6 @@ "isomorphic-form-data": "2.0.0" } }, - "@aw-labs/icons": { - "version": "0.0.0-82", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-82.tgz", - "integrity": "sha512-TQ3abZGBjisd4WpeBVSUihY98drljdlcdw++z8icNpQVYohmUejRHU59mhmIfXCkhpA1s0tW+5xEMp0WmLNp9Q==" - }, - "@aw-labs/ui": { - "version": "0.0.0-82", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-82.tgz", - "integrity": "sha512-zZDTP117uxMrwzAacOcpSXI77FMFcfv6+Da1R5sDWoqxhvZ0Wyx0Z6cn3dakV0M3zJfYZQ49LmSnU/5wqHPc7A==", - "requires": { - "@aw-labs/icons": "*", - "normalize.css": "^8.0.1", - "the-new-css-reset": "^1.7.3" - } - }, "@babel/code-frame": { "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", diff --git a/package.json b/package.json index 0ff88f4b40..78ae449194 100644 --- a/package.json +++ b/package.json @@ -20,13 +20,12 @@ }, "dependencies": { "@analytics/google-analytics": "^1.0.5", - "analytics": "^0.8.1", + "@appwrite.io/pink": "^0.0.2", "@aw-labs/appwrite-console": "^13.1.0", - "@aw-labs/icons": "0.0.0-82", - "@aw-labs/ui": "0.0.0-82", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.19.0", "@sentry/tracing": "^7.19.0", + "analytics": "^0.8.1", "echarts": "^5.4.0", "pretty-bytes": "^6.0.0", "prismjs": "^1.29.0", diff --git a/src/lib/components/alert.svelte b/src/lib/components/alert.svelte index 32351e47a5..6d67c83789 100644 --- a/src/lib/components/alert.svelte +++ b/src/lib/components/alert.svelte @@ -19,7 +19,8 @@ {#if dismissible} - + {i + 1 < eventString?.size ? '.' : ''} {/each} diff --git a/src/lib/components/feedbackGeneral.svelte b/src/lib/components/feedbackGeneral.svelte index 73669082cb..830a69dcaa 100644 --- a/src/lib/components/feedbackGeneral.svelte +++ b/src/lib/components/feedbackGeneral.svelte @@ -34,7 +34,8 @@

How can we improve?

{/if} diff --git a/src/lib/components/uploadBox.svelte b/src/lib/components/uploadBox.svelte index 0d0c1dc20b..d074bf2e0c 100644 --- a/src/lib/components/uploadBox.svelte +++ b/src/lib/components/uploadBox.svelte @@ -20,7 +20,7 @@ {$uploader.files.length} @@ -52,7 +52,7 @@ {/if} diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index ac6f8cfa39..a0dfc23220 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -50,7 +50,11 @@

Function ID: {$log.func.$id}

-
diff --git a/src/lib/layout/notification.svelte b/src/lib/layout/notification.svelte index 877283cc17..c07d4d7b80 100644 --- a/src/lib/layout/notification.svelte +++ b/src/lib/layout/notification.svelte @@ -15,7 +15,11 @@ class:is-warning={type === 'warning'} class:is-danger={type === 'error'} class:is-info={type === 'info'}> -
@@ -33,7 +37,7 @@

{#if buttons} -
+
{#each buttons as button} diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 84e164569a..e8ec15b77e 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -1,4 +1,5 @@ -import '@aw-labs/ui/src/_index.scss'; +import '@appwrite.io/pink'; +import '@appwrite.io/pink-icons'; import 'tippy.js/dist/tippy.css'; import { sdkForConsole } from '$lib/stores/sdk'; import { redirect } from '@sveltejs/kit'; diff --git a/src/routes/console/project-[project]/overview/onboard.svelte b/src/routes/console/project-[project]/overview/onboard.svelte index ca94394434..65b6578524 100644 --- a/src/routes/console/project-[project]/overview/onboard.svelte +++ b/src/routes/console/project-[project]/overview/onboard.svelte @@ -50,7 +50,7 @@

Getting Started Guide

Let's get your project up and running

-
+
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte index dc1d1d8ce3..4fb862c9c0 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte @@ -85,8 +85,8 @@ id="Security" label="Certificate verification (SSL/TLS)" bind:value={security}> - Warning: Untrusted or self-signed certificates may - not be secure. + Warning: Untrusted or self-signed + certificates may not be secure. - Warning: Untrusted or self-signed certificates may not be - secure. + Warning: Untrusted or self-signed certificates + may not be secure.