Skip to content

Commit b8c3e9d

Browse files
Veera-mulgeVeera-mulge
authored
Merge branch 'appwrite:main' into australia-incubators
2 parents d21a5d7 + bb11ddc commit b8c3e9d

File tree

63 files changed

+1360
-165
lines changed

Some content is hidden

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

63 files changed

+1360
-165
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"optimize": "node ./scripts/optimize-assets.js",
2525
"optimize:all": "node ./scripts/optimize-all.js"
2626
},
27-
"packageManager": "pnpm@10.11.1",
27+
"packageManager": "pnpm@10.12.1",
2828
"dependencies": {
2929
"h3": "^1.14.0",
3030
"posthog-js": "^1.210.2",

‎pnpm-lock.yaml

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

‎src/app.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
type="font/woff2"
1414
crossorigin
1515
/>
16-
1716
%sveltekit.head%
1817
</head>
19-
2018
<body class="dark group/body antialiased" data-sveltekit-preload-data="hover">
2119
<script>
2220
// Theme

‎src/hooks.server.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ const securityheaders: Handle = async ({ event, resolve }) => {
5454
'https://*.reo.dev',
5555
'https://plausible.io',
5656
'https://js.zi-scripts.com',
57-
'https://ws.zoominfo.com'
57+
'https://ws.zoominfo.com',
58+
'https://*.cookieyes.com',
59+
'https://cdn-cookieyes.com'
5860
]),
5961
'style-src': "'self' 'unsafe-inline'",
6062
'img-src': "'self' data: https:",
@@ -77,15 +79,18 @@ const securityheaders: Handle = async ({ event, resolve }) => {
7779
'https://js.zi-scripts.com',
7880
'https://aorta.clickagy.com',
7981
'https://hemsync.clickagy.com',
80-
'https://ws.zoominfo.com '
82+
'https://ws.zoominfo.com ',
83+
'https://*.cookieyes.com',
84+
'https://cdn-cookieyes.com'
8185
]),
8286
'frame-src': join([
8387
"'self'",
8488
'https://www.youtube.com',
8589
'https://status.appwrite.online',
8690
'https://www.youtube-nocookie.com',
8791
'https://player.vimeo.com',
88-
'https://hemsync.clickagy.com'
92+
'https://hemsync.clickagy.com',
93+
'https://cdn-cookieyes.com'
8994
])
9095
};
9196

‎src/lib/components/FooterNav.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
rel: 'noopener noreferrer'
9292
},
9393
{ label: 'Contact us', href: '/contact-us' },
94-
{ label: 'Assets', href: '/assets' }
94+
{ label: 'Assets', href: '/assets' },
95+
{ label: 'Security', href: '/docs/advanced/security' }
9596
]
9697
};
9798
</script>

‎src/lib/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export const partnerCategoryDescriptions: SearchableCategory[] = [
122122
{
123123
slug: 'agency',
124124
heading: 'Agency',
125-
description: 'Agencies that build software for their clients using Appwrite'
125+
description: 'Find an Appwrite Partner agency for your project'
126126
}
127127
];
128128

‎src/lib/layouts/SidebarNavButton.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
class:is-selected={page.url?.pathname === groupItem.href}
1111
href={groupItem.href}
1212
target={groupItem.openInNewTab ? '_blank' : undefined}
13-
data-sveltekit-reload
1413
>
1514
{#if groupItem.icon}
1615
<span class="icon {groupItem.icon}" aria-hidden="true"></span>

‎src/markdoc/layouts/Partner.svelte

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,28 @@
77
import { classNames } from '$lib/utils/classnames';
88
import type { Partner } from '$routes/partners/catalog/+page';
99
import ContactPartner from '$routes/partners/catalog/(components)/contact-partner.svelte';
10+
import Icon from '$lib/components/ui/icon';
11+
import type { Snippet } from 'svelte';
12+
import Button from '$lib/components/ui/button.svelte';
1013
11-
export let title: Partner['title'];
12-
export let partnerLevel: Partner['partnerLevel'];
13-
export let category: Partner['category'];
14-
export let description: Partner['description'];
15-
export let cover: Partner['cover'];
16-
export let capabilities: Partner['capabilities'];
17-
export let frameworks: Partner['frameworks'];
18-
export let regions: Partner['regions'];
19-
export let languages: Partner['languages'];
20-
export let website: Partner['website'];
14+
interface Props extends Partner {
15+
children?: Snippet;
16+
}
17+
18+
let {
19+
title,
20+
partnerLevel,
21+
category,
22+
description,
23+
cover,
24+
services,
25+
technologies,
26+
regions,
27+
languages,
28+
website,
29+
email,
30+
children
31+
}: Props = $props();
2132
2233
const ogImage = DEFAULT_HOST + cover;
2334
</script>
@@ -48,8 +59,8 @@
4859
>
4960
<div class="relative container w-full pb-0">
5061
<div class="flex flex-col gap-7">
51-
<a href="/partners" class="text-caption text-primary group flex gap-2">
52-
<span class="web-icon-arrow-left transition group-hover:-translate-x-1" />
62+
<a href="/partners/catalog" class="text-caption text-primary group flex gap-2">
63+
<Icon name="arrow-left" class="transition group-hover:-translate-x-1" />
5364
Back to Partners Catalog
5465
</a>
5566
<h1 class="text-headline font-aeonik-pro text-primary">{title}</h1>
@@ -64,39 +75,41 @@
6475
<div class="md:col-span-7">
6576
<div class="web-article">
6677
<div class="web-article-content">
67-
<slot />
78+
{@render children?.()}
6879
</div>
69-
<ContactPartner />
80+
{#if email}
81+
<Button href={email}>Contact {title}</Button>
82+
{/if}
7083
</div>
7184
</div>
7285
<div class="md:col-span-5">
7386
<h2 class="text-label text-primary font-aeonik-pro">About {title}</h2>
7487
<dl class="divide-smooth sticky top-32 mt-10 flex flex-col gap-7 divide-y">
7588
<div class="flex flex-col justify-between gap-7 pb-7">
7689
<dt class="text-micro font-aeonik-fono tracking-loose uppercase">
77-
Frameworks
90+
Technologies
7891
</dt>
7992
<dd class="flex flex-wrap gap-2">
80-
{#each frameworks as framework}
93+
{#each technologies as technology}
8194
<div
8295
class="text-primary text-caption bg-smooth rounded-full px-3 py-1"
8396
>
84-
{framework}
97+
{technology}
8598
</div>
8699
{/each}
87100
</dd>
88101
</div>
89102

90103
<div class="flex flex-col justify-between gap-7 pb-7">
91104
<dt class="text-micro font-aeonik-fono tracking-loose uppercase">
92-
Capabilities
105+
Services
93106
</dt>
94107
<dd class="flex flex-wrap gap-2">
95-
{#each capabilities as capability}
108+
{#each services as service}
96109
<div
97110
class="text-primary text-caption bg-smooth rounded-full px-3 py-1"
98111
>
99-
{capability}
112+
{service}
100113
</div>
101114
{/each}
102115
</dd>
@@ -116,7 +129,7 @@
116129
<dd
117130
class="text-primary text-caption font-medium underline underline-offset-4"
118131
>
119-
{website}
132+
<a href={website} target="_blank">{website}</a>
120133
</dd>
121134
</div>
122135

‎src/routes/(marketing)/(components)/platforms.svelte

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,20 @@
145145
</div>
146146
</a>
147147
</Tooltip.Trigger>
148-
<Tooltip.Content
149-
sideOffset={8}
150-
side="top"
151-
class={classNames(
152-
'text-primary bg-greyscale-900 relative rounded-md border-0! px-2.5 py-1 text-sm',
153-
'data-[state="closed"]:animate-menu-out data-[state="instant-open"]:animate-menu-in data-[state="delayed-open"]:animate-menu-in'
154-
)}
155-
>{platform.name}
156-
<div
157-
class="absolute inset-0 rounded-md bg-gradient-to-tl from-(--primary-color,_#fff)/4 to-(--secondary-color,_transparent)/10"
158-
></div>
159-
<Tooltip.Arrow class="text-(--primary-color)/4" />
160-
</Tooltip.Content>
148+
<Tooltip.Portal>
149+
<Tooltip.Content
150+
sideOffset={8}
151+
side="top"
152+
class={classNames(
153+
'text-primary bg-greyscale-900 relative rounded-md border-0! px-2.5 py-1 text-sm',
154+
'data-[state="closed"]:animate-menu-out data-[state="instant-open"]:animate-menu-in data-[state="delayed-open"]:animate-menu-in'
155+
)}
156+
>{platform.name}
157+
<div
158+
class="absolute inset-0 rounded-md bg-gradient-to-tl from-(--primary-color,_#fff)/4 to-(--secondary-color,_transparent)/10"
159+
></div>
160+
</Tooltip.Content>
161+
</Tooltip.Portal>
161162
</div>
162163
</Tooltip.Root>
163164
{/each}

‎src/routes/(marketing)/(components)/scale.svelte

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@
2525
children,
2626
stats = [
2727
{
28-
number: 12,
29-
suffix: '+',
30-
description: 'Regions served'
28+
number: 50,
29+
suffix: 'K+',
30+
description: 'GitHub stars'
3131
},
3232
{
33-
number: 1000,
34-
suffix: '+ TB',
35-
description: 'of data served'
33+
number: 300,
34+
suffix: '+',
35+
description: 'PoP locations'
3636
},
3737
{
38-
number: 50,
39-
suffix: 'B',
40-
description: 'requests'
38+
number: 300,
39+
suffix: 'K+',
40+
description: 'developers'
4141
},
4242
{
43-
number: 300,
44-
suffix: 'K',
45-
description: 'projects'
43+
number: 200,
44+
suffix: 'B+',
45+
description: 'monthly database operations'
4646
}
4747
]
4848
}: Props = $props();

0 commit comments

Comments
 (0)