Skip to content

Commit 7eced35

Browse files
Veera-mulgeVeera-mulge
authored
Merge branch 'appwrite:main' into update-competitor-blogs
2 parents b60e38e + 510c717 commit 7eced35

File tree

47 files changed

+719
-110
lines changed

Some content is hidden

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

47 files changed

+719
-110
lines changed

‎src/lib/actions/analytics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export type TrackEventArgs = { name: string; data?: object };
5959
export const trackEvent = (eventArgs?: string | TrackEventArgs): void => {
6060
if (!eventArgs || ENV.TEST) return;
6161

62-
const path = page.route.id ?? '';
62+
const path = page.route.id?.replace(/\(([^()]*)\)/g, '') ?? '';
6363
const name = typeof eventArgs === 'string' ? eventArgs : eventArgs.name;
6464
const data = typeof eventArgs === 'string' ? { path } : { ...eventArgs.data, path };
6565

‎src/lib/components/ProductsSubmenu.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,13 @@
166166
>
167167
<header class="flex items-center justify-between">
168168
<span
169-
class="font-aeonik-fono tracking-loose text-secondary block text-xs uppercase"
169+
class="font-aeonik-fono tracking-loose text-primary block text-xs uppercase"
170170
>Customer Stories<span class="text-accent">_</span></span
171171
>
172172
<a
173173
href="/blog/category/customer-stories"
174-
class="text-primary text-caption flex items-center gap-2"
175-
>Read more customer stories" <Icon
174+
class="text-secondary text-caption flex items-center"
175+
>Read more customer stories <Icon
176176
name="chevron-right"
177177
class="transition-transform group-hover:translate-x-0.5"
178178
></Icon></a

‎src/lib/components/appwrite-network/map.svelte

Lines changed: 43 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -86,75 +86,50 @@
8686
class="relative mx-auto my-10 h-fit w-full max-w-5xl origin-bottom transform-[perspective(25px)_rotateX(1deg)_scale3d(1.2,_1.2,_1)] transition-all [scrollbar-width:none] md:my-0 md:-translate-x-20"
8787
use:mousePosition
8888
>
89-
{#if browser}
90-
<svg viewBox={`0 0 ${height * 2} ${height}`}>
91-
<defs>
92-
<mask id="map">
93-
{#each points as point}
94-
<ellipse
95-
cx={point.x}
96-
cy={point.y}
97-
rx={radius}
98-
ry={radius * 1.25}
99-
fill="white"
100-
/>
101-
{/each}
102-
</mask>
103-
</defs>
104-
{#each points as point}
105-
<ellipse
106-
cx={point.x}
107-
cy={point.y}
108-
rx={radius}
109-
ry={radius * 1.25}
110-
fill={theme === 'dark' ? 'rgba(255,255,255,.1)' : '#dadadd'}
89+
<svg viewBox={`0 0 ${height * 2} ${height}`}>
90+
{#each points as point}
91+
<ellipse
92+
cx={point.x}
93+
cy={point.y}
94+
rx={radius}
95+
ry={radius * 1.25}
96+
fill={theme === 'dark' ? 'rgba(255,255,255,.1)' : '#dadadd'}
97+
/>
98+
{/each}
99+
{#each markers as marker}
100+
<g
101+
role="tooltip"
102+
class="animate-fade-in outline-none"
103+
aria-label={`${marker.city} (${marker.code})`}
104+
onmouseover={() =>
105+
handleSetActiveTooltip(
106+
marker.city,
107+
marker.code,
108+
marker.available,
109+
marker.date
110+
)}
111+
onfocus={() =>
112+
handleSetActiveTooltip(
113+
marker.city,
114+
marker.code,
115+
marker.available,
116+
marker.date
117+
)}
118+
onblur={() => handleResetActiveTooltip()}
119+
onmouseout={() => handleResetActiveTooltip()}
120+
data-region={slugify(marker.city)}
121+
>
122+
<circle cx={marker.x} cy={marker.y} r={radius * 1.25} class="fill-accent" />
123+
<circle cx={marker.x} cy={marker.y} r={radius * 0.5} class="fill-white" />
124+
<circle
125+
cx={marker.x}
126+
cy={marker.y}
127+
r={radius * 4}
128+
class="fill-transparent"
111129
/>
112-
{/each}
113-
{#each markers as marker}
114-
<g
115-
role="tooltip"
116-
class="animate-fade-in outline-none"
117-
aria-label={`${marker.city} (${marker.code})`}
118-
onmouseover={() =>
119-
handleSetActiveTooltip(
120-
marker.city,
121-
marker.code,
122-
marker.available,
123-
marker.date
124-
)}
125-
onfocus={() =>
126-
handleSetActiveTooltip(
127-
marker.city,
128-
marker.code,
129-
marker.available,
130-
marker.date
131-
)}
132-
onblur={() => handleResetActiveTooltip()}
133-
onmouseout={() => handleResetActiveTooltip()}
134-
data-region={slugify(marker.city)}
135-
>
136-
<circle
137-
cx={marker.x}
138-
cy={marker.y}
139-
r={radius * 1.25}
140-
class="fill-accent"
141-
/>
142-
<circle
143-
cx={marker.x}
144-
cy={marker.y}
145-
r={radius * 0.5}
146-
class="fill-white"
147-
/>
148-
<circle
149-
cx={marker.x}
150-
cy={marker.y}
151-
r={radius * 4}
152-
class="fill-transparent"
153-
/>
154-
</g>
155-
{/each}
156-
</svg>
157-
{/if}
130+
</g>
131+
{/each}
132+
</svg>
158133
</div>
159134
</div>
160135
</div>

‎src/markdoc/tags/Call_To_Action.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</li>
5353
{/each}
5454
</ul>
55-
<div class="flex flex-col gap-2 md:flex-row">
55+
<div class="z-[1] flex flex-col gap-2 md:flex-row">
5656
<Button href={url} class="max-sm:w-full!">{cta}</Button>
5757
</div>
5858
</div>

‎src/routes/(marketing)/(components)/bento/(animations)/auth.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</p>
6969
</div>
7070
<div
71-
class="relative flex h-85 items-center justify-between overflow-clip rounded-xl bg-black/24 px-8"
71+
class="relative mt-auto mb-0 flex h-85 items-center justify-between overflow-clip rounded-xl bg-black/24 px-8"
7272
>
7373
<div class="flex h-full w-full items-center justify-center">
7474
<div

‎src/routes/(marketing)/(components)/bento/(animations)/databases.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
</p>
166166
</div>
167167
<div
168-
class="relative flex h-85 max-h-85 flex-1 flex-col overflow-hidden rounded-xl bg-black/24 px-8"
168+
class="relative mt-auto mb-0 flex h-85 max-h-85 flex-1 flex-col overflow-hidden rounded-xl bg-black/24 px-8"
169169
>
170170
<div
171171
class="border-smooth -z-3 mt-6 flex aspect-[4/2] w-full min-w-[450px] flex-col overflow-clip rounded-2xl border bg-[#232325]/90 mask-b-from-60% mask-b-to-100% shadow-[4px_8px_20px_rgba(0,0,0,0.2)] backdrop-blur-md md:mt-12"

‎src/routes/(marketing)/(components)/bento/(animations)/functions.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</p>
112112
</div>
113113
<div
114-
class="relative flex h-85 items-center justify-between overflow-clip rounded-xl bg-black/24 px-8"
114+
class="relative mt-auto mb-0 flex h-85 items-center justify-between overflow-clip rounded-xl bg-black/24 px-8"
115115
>
116116
<div
117117
class={classNames(

‎src/routes/(marketing)/(components)/bento/(animations)/messaging.svelte

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,13 @@
7575
</p>
7676
</div>
7777
<div
78-
class="relative flex h-85 items-center justify-center overflow-clip rounded-xl bg-black/24 px-8"
78+
class="relative mt-auto mb-0 flex h-85 items-center justify-center overflow-clip rounded-xl bg-black/24 px-8"
7979
>
8080
<div
8181
class="light absolute top-14 z-10 flex h-[65px] w-[85%] items-center justify-between gap-4 rounded-[20px] bg-white/80 px-3 py-2 shadow-[-8px_4px_32px_rgba(0,0,0,0.24)] backdrop-blur-xl"
8282
style="transform: translateY(-15px); opacity: 0; filter: blur(4px);"
8383
bind:this={notification}
84+
data-theme-ignore
8485
>
8586
<div class="flex size-8 shrink-0 items-center justify-center rounded-lg bg-black">
8687
<div class="size-3 rounded-full bg-white"></div>
@@ -99,6 +100,7 @@
99100
class="light mt-20 flex h-full w-[300px] flex-col rounded-t-[42px] border-x border-t border-white/12 bg-white/8 mask-b-from-60% mask-b-to-100% backdrop-blur-2xl"
100101
style:transform="translateY(15px)"
101102
bind:this={device}
103+
data-theme-ignore
102104
>
103105
<div class="m-2 flex-1 rounded-t-[34px] bg-[#19191C]">
104106
<div class="flex items-center justify-between px-8 pt-4">

‎src/routes/(marketing)/(components)/bento/(animations)/realtime.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</p>
8383
</div>
8484
<div
85-
class="relative flex h-85 items-center justify-center overflow-hidden rounded-xl bg-black/24 px-8"
85+
class="relative mt-auto mb-0 flex h-85 items-center justify-center overflow-hidden rounded-xl bg-black/24 px-8"
8686
>
8787
<div
8888
class="relative grid aspect-square h-[240px] w-[240px] grid-cols-2 grid-rows-2 items-center justify-center"

‎src/routes/(marketing)/(components)/bento/(animations)/sites.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
</p>
123123
</div>
124124
<div
125-
class="relative flex h-85 flex-col items-center justify-center overflow-hidden rounded-xl bg-black/24 px-3 md:flex-1 md:px-8"
125+
class="relative mt-auto mb-0 flex h-85 flex-col items-center justify-center overflow-hidden rounded-xl bg-black/24 px-3 md:flex-1 md:px-8"
126126
>
127127
<div
128128
class="mx-auto mt-6 hidden w-full flex-col overflow-hidden rounded-[1.25rem] bg-[#232325]/90 mask-b-from-60% mask-b-to-100% px-1 pb-1 backdrop-blur-md md:mt-12 md:flex"

0 commit comments

Comments
 (0)