From 9db43d5b320122b60455c625dd4fa0d7f4418351 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 20 Feb 2025 14:31:21 +0100 Subject: [PATCH] fix: various things --- package.json | 4 +- pnpm-lock.yaml | 28 +-- src/lib/charts/base.json | 201 +++++++++------- src/lib/charts/base.svelte | 6 +- src/lib/charts/dark.json | 6 +- src/lib/charts/light.json | 109 ++------- src/lib/components/empty.svelte | 4 +- src/lib/components/filters/filters.svelte | 2 +- src/lib/components/permissions/actions.svelte | 62 ++--- .../components/permissions/permissions.svelte | 15 +- src/lib/components/permissions/roles.svelte | 12 +- src/lib/components/roles/upgrade.svelte | 2 +- src/lib/components/secret.svelte | 33 +-- src/lib/components/sidebar.svelte | 1 + src/lib/layout/wizardStep.svelte | 25 +- src/lib/layout/wizardWithSteps.svelte | 63 ++--- .../members/+page.svelte | 4 +- .../attributes/+page.svelte | 31 +-- .../attributes/createAttributeDropdown.svelte | 26 +- .../messaging/actions.svelte | 23 +- .../messaging/wizard/step2.svelte | 13 +- .../project-[project]/overview/+layout.svelte | 15 -- .../overview/bandwidth.svelte | 24 +- .../keys/[key]/updateExpirationDate.svelte | 4 +- .../overview/keys/action.svelte | 4 +- .../overview/keys/create/+page.svelte | 101 ++++++++ .../overview/keys/expirationInput.svelte | 2 +- .../overview/keys/scopes.svelte | 66 +++-- .../overview/keys/wizard/step1.svelte | 14 +- .../overview/keys/wizard/step2.svelte | 5 +- .../overview/platforms/+page.svelte | 37 +-- .../platforms/[platform]/android.svelte | 14 +- .../[platform]/flutterAndroid.svelte | 14 +- .../overview/requests.svelte | 31 ++- .../project-[project]/overview/store.ts | 225 ++++++++++++++++++ .../site-[site]/settings/deleteModal.svelte | 2 - 36 files changed, 727 insertions(+), 501 deletions(-) create mode 100644 src/routes/(console)/project-[project]/overview/keys/create/+page.svelte diff --git a/package.json b/package.json index 771e3a4f2..f83b6c58e 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "dependencies": { "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@d13e864", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@2ff4e332", + "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c2131", "@appwrite.io/pink-legacy": "^1.0.1", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@134aa5d", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@011c2131", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c19429a8f..85b8a35ec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,14 +15,14 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@2ff4e332 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@2ff4e332(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c2131 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c2131(svelte@4.2.19) '@appwrite.io/pink-legacy': specifier: ^1.0.1 version: 1.0.1 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@134aa5d - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@134aa5d(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@011c2131 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@011c2131(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -215,14 +215,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@d13e864} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@134aa5d0d1920f2524d866d213e1134cb62f8962': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@134aa5d0d1920f2524d866d213e1134cb62f8962} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c2131': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c2131} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@2ff4e332': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@2ff4e332} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c21311ddfbacaa53563f02a1dcba32db8b595': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c21311ddfbacaa53563f02a1dcba32db8b595} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.1': resolution: {integrity: sha512-e5IZx2drqSxgl2WXvmr0eLfg/WiOCzuqQE8oksD+9GoFBkcL9HWvXul5GjFni3RBAN9XFRL3nUExGk4T0H8sFw==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@134aa5d': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@134aa5d} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@011c2131': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@011c2131} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4099,11 +4099,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@d13e864': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@134aa5d0d1920f2524d866d213e1134cb62f8962(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c2131(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@2ff4e332(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c21311ddfbacaa53563f02a1dcba32db8b595(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4116,9 +4116,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@134aa5d(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@011c2131(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@134aa5d0d1920f2524d866d213e1134cb62f8962(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@011c21311ddfbacaa53563f02a1dcba32db8b595(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) diff --git a/src/lib/charts/base.json b/src/lib/charts/base.json index 0cbfc0897..ff3d8fbcc 100644 --- a/src/lib/charts/base.json +++ b/src/lib/charts/base.json @@ -1,5 +1,121 @@ { - "backgroundColor": "rgba(255,255,255,0)", + "backgroundColor": "var(--color-bgcolor-neutral-primary)", + "categoryAxis": { + "axisLine": { + "lineStyle": { + "color": "var(--color-fgcolor-neutral-tertiary)" + }, + "show": true + }, + "axisTick": { + "lineStyle": { + "color": "var(--color-fgcolor-neutral-tertiary)" + }, + "show": true + }, + "axisLabel": { + "color": "var(--color-fgcolor-neutral-tertiary)", + "show": true + }, + "splitLine": { + "show": false + }, + "splitArea": { + "show": false + } + }, + "valueAxis": { + "axisLabel": { + "color": "var(--color-fgcolor-neutral-tertiary)", + "show": true + }, + "splitLine": { + "lineStyle": { + "color": ["var(--color-border-neutral)"] + }, + "show": true + }, + "axisLine": { + "show": false + }, + "axisTick": { + "show": false + }, + "splitArea": { + "show": false + } + }, + "logAxis": { + "axisLine": { + "lineStyle": { + "color": "var(--color-fgcolor-neutral-tertiary)" + }, + "show": true + }, + "axisTick": { + "lineStyle": { + "color": "var(--color-fgcolor-neutral-tertiary)" + }, + "show": true + }, + "axisLabel": { + "color": "var(--color-fgcolor-neutral-tertiary)", + "show": true + }, + "splitLine": { + "lineStyle": { + "color": ["var(--color-border-neutral)"] + }, + "show": true + }, + "splitArea": { + "show": false + } + }, + "timeAxis": { + "axisLine": { + "lineStyle": { + "color": "var(--color-fgcolor-neutral-tertiary)" + }, + "show": true + }, + "axisTick": { + "lineStyle": { + "color": "var(--color-fgcolor-neutral-tertiary)" + }, + "show": true + }, + "axisLabel": { + "color": "var(--color-fgcolor-neutral-tertiary)", + "show": true + }, + "splitLine": { + "lineStyle": { + "color": ["var(--color-border-neutral)"] + }, + "show": true + }, + "splitArea": { + "show": false + } + }, + "tooltip": { + "backgroundColor": "var(--color-bgcolor-neutral-primary)", + "borderColor": "var(--color-border-neutral)", + "textStyle": { + "color": "var(--color-fgcolor-neutral-secondary)" + }, + "axisPointer": { + "lineStyle": { + "color": "var(--color-border-neutral-strong)", + "width": 1 + }, + "crossStyle": { + "color": "var(--color-border-neutral-strong)", + "width": 1 + } + } + }, "textStyle": {}, "line": { "itemStyle": { @@ -12,89 +128,6 @@ "symbol": "emptyCircle", "smooth": true }, - "bar": { - "itemStyle": { - "barBorderColor": "#ccc" - } - }, - "categoryAxis": { - "axisLine": { - "show": true - }, - "axisTick": { - "show": true - }, - "axisLabel": { - "show": true - }, - "splitLine": { - "show": false - }, - "splitArea": { - "show": false - } - }, - "valueAxis": { - "axisLine": { - "show": false - }, - "axisTick": { - "show": false - }, - "axisLabel": { - "show": true - }, - "splitLine": { - "show": true - }, - "splitArea": { - "show": false - } - }, - "logAxis": { - "axisLine": { - "show": true - }, - "axisTick": { - "show": true - }, - "axisLabel": { - "show": true - }, - "splitLine": { - "show": true - }, - "splitArea": { - "show": false - } - }, - "timeAxis": { - "axisLine": { - "show": true - }, - "axisTick": { - "show": true - }, - "axisLabel": { - "show": true - }, - "splitLine": { - "show": true - }, - "splitArea": { - "show": false - } - }, - "tooltip": { - "axisPointer": { - "lineStyle": { - "width": 1 - }, - "crossStyle": { - "width": 1 - } - } - }, "timeline": { "lineStyle": { "width": 1 diff --git a/src/lib/charts/base.svelte b/src/lib/charts/base.svelte index 3c25fedde..64cfd8a20 100644 --- a/src/lib/charts/base.svelte +++ b/src/lib/charts/base.svelte @@ -4,15 +4,13 @@ import { app } from '$lib/stores/app'; import { dailyFormat, hourlyFormat, defaultConfig } from './config'; import base from './base.json'; - import light from './light.json'; - import dark from './dark.json'; import type { ECharts } from 'echarts/core'; import type { BarSeriesOption, LineSeriesOption } from 'echarts/charts'; import type { EChartsOption } from 'echarts'; import { wizard } from '$lib/stores/wizard'; - registerTheme('light', { ...base, ...light }); - registerTheme('dark', { ...base, ...dark }); + registerTheme('light', base); + registerTheme('dark', base); export let options: EChartsOption; export let series: (BarSeriesOption | LineSeriesOption)[]; diff --git a/src/lib/charts/dark.json b/src/lib/charts/dark.json index ec07fda73..9d09ce2ef 100644 --- a/src/lib/charts/dark.json +++ b/src/lib/charts/dark.json @@ -120,10 +120,10 @@ "color": "#444444" } }, - "backgroundColor": "#373B4D", - "borderColor": "#373B4D", + "backgroundColor": "var(--color-bgcolor-neutral-primary)", + "borderColor": "var(--color-border-neutral)", "textStyle": { - "color": "#F2F2F8" + "color": "var(--color-fgcolor-neutral-secondary)" } }, "timeline": { diff --git a/src/lib/charts/light.json b/src/lib/charts/light.json index e6ddb057a..d81dd9f85 100644 --- a/src/lib/charts/light.json +++ b/src/lib/charts/light.json @@ -1,149 +1,82 @@ { - "backgroundColor": "rgba(255,255,255,0)", - "title": { - "textStyle": { - "color": "#373b4d" - }, - "subtextStyle": { - "color": "#616b7c" - } - }, - "bar": { - "itemStyle": { - "barBorderColor": "#ccc" - } - }, + "backgroundColor": "var(--color-bgcolor-neutral-primary)", "categoryAxis": { "axisLine": { "lineStyle": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" } }, "axisTick": { "lineStyle": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" } }, "axisLabel": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" } }, "valueAxis": { "axisLabel": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" }, "splitLine": { "lineStyle": { - "color": ["#E8E9F0"] + "color": ["var(--color-border-neutral)"] } } }, "logAxis": { "axisLine": { "lineStyle": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" } }, "axisTick": { "lineStyle": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" } }, "axisLabel": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" }, "splitLine": { "lineStyle": { - "color": ["#E0E6F1"] + "color": ["var(--color-border-neutral)"] } } }, "timeAxis": { "axisLine": { "lineStyle": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" } }, "axisTick": { "lineStyle": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" } }, "axisLabel": { - "color": "#6E7079" + "color": "var(--color-fgcolor-neutral-tertiary)" }, "splitLine": { "lineStyle": { - "color": ["#E0E6F1"] + "color": ["var(--color-border-neutral)"] } } }, - "toolbox": { - "iconStyle": { - "borderColor": "#999" - }, - "emphasis": { - "iconStyle": { - "borderColor": "#666" - } - } - }, - "legend": { - "textStyle": { - "color": "#333" - } - }, "tooltip": { + "backgroundColor": "var(--color-bgcolor-neutral-primary)", + "borderColor": "var(--color-border-neutral)", + "textStyle": { + "color": "var(--color-fgcolor-neutral-secondary)" + }, "axisPointer": { "lineStyle": { - "color": "#ccc" + "color": "var(--color-border-neutral-strong)" }, "crossStyle": { - "color": "#ccc" - } - } - }, - "timeline": { - "lineStyle": { - "color": "#DAE1F5" - }, - "itemStyle": { - "color": "#A4B1D7" - }, - "controlStyle": { - "color": "#A4B1D7", - "borderColor": "#A4B1D7" - }, - "checkpointStyle": { - "color": "#316bf3", - "borderColor": "#fff" - }, - "label": { - "color": "#A4B1D7" - }, - "emphasis": { - "itemStyle": { - "color": "#FFF" - }, - "controlStyle": { - "color": "#A4B1D7", - "borderColor": "#A4B1D7" - }, - "label": { - "color": "#A4B1D7" - } - } - }, - "visualMap": { - "color": ["#bf444c", "#d88273", "#f6efa6"] - }, - "markPoint": { - "label": { - "color": "#eee" - }, - "emphasis": { - "label": { - "color": "#eee" + "color": "var(--color-border-neutral-strong)" } } } diff --git a/src/lib/components/empty.svelte b/src/lib/components/empty.svelte index dc8cd1374..5b6a3cb2c 100644 --- a/src/lib/components/empty.svelte +++ b/src/lib/components/empty.svelte @@ -27,7 +27,7 @@ {#if single} - + - + {:else} diff --git a/src/lib/components/filters/filters.svelte b/src/lib/components/filters/filters.svelte index 7c83db052..dac3f5b23 100644 --- a/src/lib/components/filters/filters.svelte +++ b/src/lib/components/filters/filters.svelte @@ -14,7 +14,7 @@ ValidOperators } from './store'; import { createEventDispatcher } from 'svelte'; - import { Icon } from '@appwrite.io/pink-svelte'; + import { Icon, Popover } from '@appwrite.io/pink-svelte'; import { IconFilter } from '@appwrite.io/pink-icons-svelte'; export let query = '[]'; diff --git a/src/lib/components/permissions/actions.svelte b/src/lib/components/permissions/actions.svelte index 3a5a04613..e28460fea 100644 --- a/src/lib/components/permissions/actions.svelte +++ b/src/lib/components/permissions/actions.svelte @@ -1,14 +1,13 @@ - - - - dispatch('create', ['any'])}> - Any - - dispatch('create', ['guests'])}> - All guests - - dispatch('create', ['users'])}> - All users - - (showUser = true)}>Select users - (showTeam = true)}>Select teams - (showLabel = true)}>Label - (showCustom = true)}>Custom permission + + + + + dispatch('create', ['any'])}> + Any + + dispatch('create', ['any'])}> + Any + + dispatch('create', ['guests'])}> + All guests + + dispatch('create', ['users'])}> + All users + + (showUser = true)} + >Select users + (showTeam = true)} + >Select teams + (showLabel = true)} + >Label + (showCustom = true)} + >Custom permission + - + >(new Map()); @@ -71,8 +70,6 @@ return n; }); - - showDropdown = false; } function fromPermissionString(permission: string): void { @@ -212,12 +209,12 @@ - @@ -229,12 +226,12 @@ - diff --git a/src/lib/components/permissions/roles.svelte b/src/lib/components/permissions/roles.svelte index f9b040d53..02b06f4e1 100644 --- a/src/lib/components/permissions/roles.svelte +++ b/src/lib/components/permissions/roles.svelte @@ -117,12 +117,12 @@ - @@ -134,12 +134,12 @@ - diff --git a/src/lib/components/roles/upgrade.svelte b/src/lib/components/roles/upgrade.svelte index e482387c8..d3dcf861b 100644 --- a/src/lib/components/roles/upgrade.svelte +++ b/src/lib/components/roles/upgrade.svelte @@ -9,7 +9,7 @@ - + {#if isCloud} {#if $organization?.billingPlan !== BillingPlan.FREE} Roles diff --git a/src/lib/components/secret.svelte b/src/lib/components/secret.svelte index c9e328a8c..4717a874b 100644 --- a/src/lib/components/secret.svelte +++ b/src/lib/components/secret.svelte @@ -1,37 +1,16 @@ -
- {#if show} - {value} - {:else} - •••••••••••• - {/if} -
- - - {show ? 'Hide secret' : 'Show secret'} - + +
- +
-
+ diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index 0f1b3ecca..74ab11d61 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -279,6 +279,7 @@
+ {#if subNavigation}
diff --git a/src/lib/layout/wizardStep.svelte b/src/lib/layout/wizardStep.svelte index cddb57463..5a3a5dae3 100644 --- a/src/lib/layout/wizardStep.svelte +++ b/src/lib/layout/wizardStep.svelte @@ -1,6 +1,7 @@ -
- - - - {#if $$slots.subtitle} -

- -

- {/if} -
+ +
+ + + + {#if $$slots.subtitle} +

+ +

+ {/if} +
- + +