Skip to content

Commit dc3beb6

Browse files
committed
Merge branch 'main' into '1.8.x'.
2 parents e65a4f7 + eaf8fc8 commit dc3beb6

File tree

189 files changed

+2667
-4653
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+2667
-4653
lines changed

docker/nginx.conf

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ server {
44

55
gzip_static on;
66

7-
# Set root for all locations
87
root /usr/share/nginx/html;
98

109
# Security headers for all locations
@@ -22,10 +21,20 @@ server {
2221
add_header Cache-Control "public";
2322
}
2423

24+
# Cache, but revalidate, for images, css, fonts, and icons folders
25+
location ~* ^/console/(images|css|fonts|icons)/ {
26+
expires 1d;
27+
add_header Cache-Control "public, must-revalidate";
28+
}
29+
2530
# All other /console requests (no cache)
2631
location /console {
2732
index index.html index.html;
2833
try_files $uri /console/index.html;
34+
35+
expires 0;
36+
add_header Cache-Control "no-cache, no-store";
37+
add_header Pragma "no-cache";
2938
}
3039

3140
location / {

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@appwrite.io/pink-icons": "0.25.0",
2727
"@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
2828
"@appwrite.io/pink-legacy": "^1.0.3",
29-
"@appwrite.io/pink-svelte": "https://try-module.cloud/-/@appwrite/@appwrite.io/pink-svelte@063404f",
29+
"@appwrite.io/pink-svelte": "https://try-module.cloud/-/@appwrite/@appwrite.io/pink-svelte@d74b893",
3030
"@popperjs/core": "^2.11.8",
3131
"@sentry/sveltekit": "^8.38.0",
3232
"@stripe/stripe-js": "^3.5.0",
@@ -65,6 +65,7 @@
6565
"@typescript-eslint/eslint-plugin": "^8.28.0",
6666
"@typescript-eslint/parser": "^8.28.0",
6767
"@vitest/ui": "^3.0.9",
68+
"color": "^5.0.0",
6869
"eslint": "^9.23.0",
6970
"eslint-config-prettier": "^10.1.0",
7071
"eslint-plugin-svelte": "^3.3.3",

pnpm-lock.yaml

Lines changed: 43 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/commandCenter/panels/template.svelte

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import { IconArrowSmRight } from '@appwrite.io/pink-icons-svelte';
1212
import { Icon, Keyboard, Layout } from '@appwrite.io/pink-svelte';
1313
import { Submit, trackEvent } from '$lib/actions/analytics';
14+
import type { Action } from 'svelte/action';
1415
1516
/* eslint no-undef: "off" */
1617
type Option = $$Generic<Omit<Command, 'group'> & { group?: string }>;
@@ -247,6 +248,10 @@
247248
248249
return isGroup(nextItem) || !nextItem?.nested;
249250
};
251+
252+
const autofocus: Action<HTMLInputElement> = (node) => {
253+
if (node) node.focus();
254+
};
250255
</script>
251256

252257
<svelte:window on:keydown={handleKeyDown} />
@@ -271,8 +276,11 @@
271276

272277
<slot name="search">
273278
<div class="u-flex default-search u-width-full-line">
274-
<!-- svelte-ignore a11y-autofocus -->
275-
<input type="text" placeholder={searchPlaceholder} autofocus bind:value={search} />
279+
<input
280+
type="text"
281+
placeholder={searchPlaceholder}
282+
use:autofocus
283+
bind:value={search} />
276284
</div>
277285
</slot>
278286
</div>
@@ -305,7 +313,7 @@
305313
on:mouseleave={getOptionBlurHandler()}
306314
on:focus={getOptionFocusHandler(item)}>
307315
<slot name="option" option={castOption(item)}>
308-
<Layout.Stack direction="column" gap="s">
316+
<Layout.Stack direction="row" gap="s" alignItems="center">
309317
{#if item.icon}
310318
<Icon
311319
icon={item.icon}
@@ -448,8 +456,9 @@
448456
449457
.default-search {
450458
input {
451-
margin: -1rem;
452-
padding: 1rem;
459+
width: 100%;
460+
margin: 0rem;
461+
padding: 0rem;
453462
border: none;
454463
background-color: transparent;
455464
}

src/lib/components/billing/alerts/newDevUpgradePro.svelte

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import { organization } from '$lib/stores/organization';
88
import { activeHeaderAlert } from '$routes/(console)/store';
99
import GradientBanner from '../gradientBanner.svelte';
10+
import { isSmallViewport } from '$lib/stores/viewport';
11+
import { Layout, Typography } from '@appwrite.io/pink-svelte';
1012
1113
let show = true;
1214
@@ -23,8 +25,13 @@
2325

2426
{#if show && $organization?.$id && $organization?.billingPlan === BillingPlan.FREE && !page.url.pathname.includes('/console/account')}
2527
<GradientBanner on:close={handleClose}>
26-
<div class="u-flex u-gap-24 u-main-center u-cross-center u-flex-vertical-mobile">
27-
<span class="body-text-1">Get $50 Cloud credits for Appwrite Pro.</span>
28+
<Layout.Stack
29+
gap="m"
30+
alignItems="center"
31+
alignContent="center"
32+
direction={$isSmallViewport ? 'column' : 'row'}>
33+
<Typography.Text>Get $50 Cloud credits for Appwrite Pro.</Typography.Text>
34+
2835
<Button
2936
secondary
3037
fullWidthMobile
@@ -39,6 +46,6 @@
3946
}}>
4047
Claim credits
4148
</Button>
42-
</div>
49+
</Layout.Stack>
4350
</GradientBanner>
4451
{/if}

src/lib/components/billing/discountsApplied.svelte

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)