Skip to content

Commit 58030fe

Browse files
thejessewintonthejessewinton
authored
Merge branch 'main' into feat-add-cookie-banner
2 parents 39be0ae + 7418a13 commit 58030fe

File tree

109 files changed

+2100
-790
lines changed

Some content is hidden

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

109 files changed

+2100
-790
lines changed

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-bullseye as base
1+
FROM node:20-bullseye AS base
22

33
ARG PUBLIC_APPWRITE_ENDPOINT
44
ENV PUBLIC_APPWRITE_ENDPOINT ${PUBLIC_APPWRITE_ENDPOINT}
@@ -60,13 +60,13 @@ COPY pnpm-lock.yaml pnpm-lock.yaml
6060
RUN npm i -g corepack@latest
6161
RUN corepack enable
6262

63-
FROM base as build
63+
FROM base AS build
6464

6565
COPY . .
6666
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
6767
RUN NODE_OPTIONS=--max_old_space_size=16384 pnpm run build
6868

69-
FROM base as final
69+
FROM base AS final
7070

7171
# Install fontconfig
7272
COPY ./local-fonts /usr/share/fonts

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
"pnpm": {
116116
"onlyBuiltDependencies": [
117117
"@parcel/watcher",
118+
"@tailwindcss/oxide",
118119
"core-js",
119120
"esbuild",
120121
"sharp",

‎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/MultiCodeContextless.svelte

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { getCodeHtml, type Language } from '$lib/utils/code';
44
import { copy } from '$lib/utils/copy';
55
import { platformMap } from '$lib/utils/references';
6-
import { writable } from 'svelte/store';
6+
import { SvelteSet } from 'svelte/reactivity';
77
88
interface Props {
99
selected?: Language;
@@ -14,18 +14,26 @@
1414
1515
let { selected = $bindable('js'), data = [], width = null, height = null }: Props = $props();
1616
17-
let snippets = $derived(writable(new Set(data.map((d) => d.language))));
18-
const getSnippets = () => {
19-
return snippets;
20-
};
21-
22-
let content = $derived(data.find((d) => d.language === selected)?.content ?? '');
23-
24-
let platform = $derived(data.find((d) => d.language === selected)?.platform ?? '');
17+
const snippets = $derived(new SvelteSet(data.map((d) => d.language)));
18+
const content = $derived(data.find((d) => d.language === selected)?.content ?? '');
19+
const platform = $derived(data.find((d) => d.language === selected)?.platform ?? '');
20+
const result = $derived(
21+
getCodeHtml({
22+
content,
23+
language: selected ?? 'sh',
24+
withLineNumbers: true
25+
})
26+
);
27+
const options = $derived(
28+
Array.from(snippets).map((language) => ({
29+
value: language,
30+
label: platformMap[language]
31+
}))
32+
);
2533
26-
getSnippets().subscribe((n) => {
27-
if (selected === null && n.size > 0) {
28-
selected = Array.from(n)[0] as Language;
34+
$effect(() => {
35+
if (selected === null && snippets.size > 0) {
36+
selected = Array.from(snippets)[0] as Language;
2937
}
3038
});
3139
@@ -35,9 +43,7 @@
3543
} as const;
3644
type CopyStatusType = keyof typeof CopyStatus;
3745
type CopyStatusValue = (typeof CopyStatus)[CopyStatusType];
38-
39-
let copyText = $state<CopyStatusValue>(CopyStatus.Copy);
40-
46+
let copyText: CopyStatusValue = $state(CopyStatus.Copy);
4147
async function handleCopy() {
4248
await copy(content);
4349
@@ -46,28 +52,13 @@
4652
copyText = CopyStatus.Copy;
4753
}, 1000);
4854
}
49-
50-
let result = $derived(
51-
getCodeHtml({
52-
content,
53-
language: selected ?? 'sh',
54-
withLineNumbers: true
55-
})
56-
);
57-
let options = $derived(
58-
Array.from($snippets).map((language) => ({
59-
value: language,
60-
label: platformMap[language]
61-
}))
62-
);
6355
</script>
6456

6557
<section
6658
class="dark web-code-snippet mx-auto w-full lg:!max-w-[90vw]"
6759
aria-label="code-snippet panel"
68-
style={`width: ${width ? width / 16 + 'rem' : 'inherit'}; height: ${
69-
height ? height / 16 + 'rem' : 'inherit'
70-
}`}
60+
style:width={width ? width / 16 + 'rem' : 'inherit'}
61+
style:height={height ? height / 16 + 'rem' : 'inherit'}
7162
>
7263
<header class="web-code-snippet-header">
7364
<div class="web-code-snippet-header-start">
@@ -79,9 +70,9 @@
7970
</div>
8071
<div class="web-code-snippet-header-end">
8172
<ul class="buttons-list flex gap-3">
82-
{#if $snippets.entries.length}
73+
{#if snippets.size}
8374
<li class="buttons-list-item flex self-center">
84-
<Select bind:value={selected} bind:options />
75+
<Select bind:value={selected} {options} />
8576
</li>
8677
{/if}
8778
<li class="buttons-list-item" style="padding-inline-start: 13px">
@@ -104,7 +95,7 @@
10495
</header>
10596
<div
10697
class="web-code-snippet-content overflow-auto"
107-
style={`height: ${height ? height / 16 + 'rem' : 'inherit'}`}
98+
style:height={height ? height / 16 + 'rem' : 'inherit'}
10899
>
109100
<!-- eslint-disable-next-line svelte/no-at-html-tags -->
110101
{@html result}

‎src/lib/components/PreFooter.svelte

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
{plan.description}
117117
</p>
118118
<Button
119+
href={plan.buttonLink}
119120
event={plan.eventName}
120121
variant={plan.buttonVariant}
121122
class="w-full! flex-3 self-end md:w-fit"
@@ -135,29 +136,16 @@
135136
flex-basis: 5rem !important;
136137
}
137138
138-
.web-strip-plans-item-wrapper {
139-
gap: 2.65rem;
140-
}
141-
142139
@media (min-width: 1024px) and (max-width: 1224px) {
143140
.web-strip-plans-info {
144141
flex-basis: 1rem !important;
145142
}
146-
147-
.web-strip-plans-item-wrapper {
148-
gap: 1.25rem !important;
149-
inline-size: 100% !important;
150-
}
151143
}
152144
153145
@media (max-width: 1024px) {
154146
.web-strip-plans-info {
155147
flex-basis: 3rem !important;
156148
}
157-
158-
.web-strip-plans-item-wrapper {
159-
gap: 1.25rem !important;
160-
}
161149
}
162150
163151
.web-pre-footer-bg {

‎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/lib/components/shared/button.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { classNames } from '$lib/utils/classnames';
33
import type { HTMLButtonAttributes, HTMLAnchorAttributes } from 'svelte/elements';
44
import { cva, type VariantProps } from 'cva';
5-
import InlineTag from '../ui/InlineTag.svelte';
5+
import InlineTag from '../ui/inline-tag.svelte';
66
77
const button = cva(
88
[

‎src/lib/components/shared/dialog.svelte

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import { fade, scale } from 'svelte/transition';
33
import { createDialog, melt } from '@melt-ui/svelte';
44
import type { Snippet } from 'svelte';
5-
import { browser } from '$app/environment';
65
76
type Props = {
87
url: string;
@@ -12,7 +11,7 @@
1211
};
1312
1413
const {
15-
elements: { portalled, trigger, content, overlay },
14+
elements: { trigger, content, overlay },
1615
states: { open }
1716
} = createDialog({
1817
forceVisible: true,
@@ -27,14 +26,9 @@
2726
{@render children()}
2827
</div>
2928
{:else}
30-
<button
31-
class="contents cursor-pointer"
32-
onclick={() => {
33-
if (browser && window) window.open(url, '_blank');
34-
}}
35-
>
29+
<a href={url} target="_blank" rel="noopener noreferrer" class="contents cursor-pointer">
3630
{@render children()}
37-
</button>
31+
</a>
3832
{/if}
3933

4034
{#if $open}

‎src/lib/components/ui/icon/icon.svelte

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<script lang="ts">
2-
import { classNames } from '$lib/utils/classnames';
3-
import type { SvelteHTMLElements } from 'svelte/elements';
2+
import type { SVGAttributes } from 'svelte/elements';
43
import type { IconType } from './types';
54
6-
type Props = SvelteHTMLElements['svg'] & {
5+
type Props = SVGAttributes<SVGElement> & {
76
class?: string;
8-
name: IconType;
7+
name?: IconType;
98
};
10-
119
const {
1210
xmlns = 'http://www.w3.org/2000/svg',
1311
viewBox = '0 0 24 24',

0 commit comments

Comments
 (0)