Skip to content

Commit bf829ed

Browse files
stnguyen90stnguyen90
authored
Merge branch 'main' into EVDOG4LIFE-Abuse
2 parents 1205ddb + e807197 commit bf829ed

File tree

64 files changed

+983
-610
lines changed

Some content is hidden

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

64 files changed

+983
-610
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,35 @@ on:
77
permissions: read-all
88

99
jobs:
10+
format:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
with:
15+
ref: ${{ github.event.pull_request.head.sha }}
16+
- uses: actions/setup-node@v4
17+
with:
18+
node-version: 20
19+
- name: Install corepack
20+
run: npm i -g corepack@latest
21+
- name: Install pnpm
22+
run: corepack enable
23+
- name: Get pnpm store directory
24+
shell: bash
25+
run: |
26+
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
27+
- uses: actions/cache@v4
28+
name: Setup pnpm cache
29+
with:
30+
path: ${{ env.STORE_PATH }}
31+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
32+
restore-keys: |
33+
${{ runner.os }}-pnpm-store-
34+
- name: Install dependencies
35+
run: pnpm install --frozen-lockfile
36+
- name: Check formatting
37+
run: pnpm format:check
38+
1039
build:
1140
runs-on: ubuntu-latest
1241
steps:

‎CONTENT.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ Create ordered (numbered) and unordered (bulleted) lists using 1., \*, or -.
4949
**Unordered List**:
5050

5151
```md
52-
- Apple
53-
- Banana
54-
- Cherry
52+
- Apple
53+
- Banana
54+
- Cherry
5555
```
5656

5757
#### Links
@@ -130,18 +130,18 @@ Alternatively, use markdoc tables.
130130
```md
131131
{% table %}
132132

133-
- Heading 1
134-
- Heading 2
133+
- Heading 1
134+
- Heading 2
135135

136136
---
137137

138-
- Row 1 Cell 1
139-
- Row 1 Cell 2
138+
- Row 1 Cell 1
139+
- Row 1 Cell 2
140140

141141
---
142142

143-
- Row 2 Cell 1
144-
- Row 2 cell 2
143+
- Row 2 Cell 1
144+
- Row 2 cell 2
145145

146146
{% /table %}
147147
```

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ doc-548-submit-a-pull-request-section-to-contribution-guide
6060

6161
When `TYPE` can be:
6262

63-
- **feat** - is a new feature
64-
- **doc** - documentation only changes
65-
- **cicd** - changes related to CI/CD system
66-
- **fix** - a bug fix
67-
- **refactor** - code change that neither fixes a bug nor adds a feature
63+
- **feat** - is a new feature
64+
- **doc** - documentation only changes
65+
- **cicd** - changes related to CI/CD system
66+
- **fix** - a bug fix
67+
- **refactor** - code change that neither fixes a bug nor adds a feature
6868

6969
**All PRs must include a commit message with a description of the changes made!**
7070

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ The Appwrite Website repo features the main Appwrite website, including our [hom
1010

1111
The Appwrite Website has been built with the following frameworks:
1212

13-
- [Svelte](https://svelte.dev/)
14-
- [SvelteKit](https://kit.svelte.dev/)
13+
- [Svelte](https://svelte.dev/)
14+
- [SvelteKit](https://kit.svelte.dev/)
1515

1616
## Development
1717

‎STYLE.md‎

Lines changed: 96 additions & 96 deletions
Large diffs are not rendered by default.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"dev": "vite dev",
1212
"download-contributors": "node ./scripts/download-contributor-data.js",
1313
"format": "prettier --write .",
14+
"format:check": "prettier --check .",
1415
"icons:build": "node ./src/icons/build.js",
1516
"icons:generate": "node ./src/icons/optimize.js && node ./src/icons/build.js",
1617
"icons:optimize": "node ./src/icons/optimize.js",

‎src/lib/components/CommunitySupportChat.svelte‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<ul class="web-chat-list">
2+
<li class="web-chat-item is-user-a">
3+
<div class="web-chat-message">
4+
<div class="web-user-box">
5+
<img
6+
class="web-user-box-image"
7+
src="/images/community/avatars/walter.avif"
8+
height="40"
9+
width="40"
10+
alt="Avatar of Walter"
11+
/>
12+
<div class="web-user-box-name flex gap-2">
13+
<span class="text-sub-body font-medium">Walter O'Brien</span>
14+
<time class="text-caption web-u-color-text-tertiary">8:32 AM</time>
15+
</div>
16+
<div class="web-user-box-content text-caption text-primary">
17+
Hello devs! I am getting a CORS error when sending a request to the backend. Can
18+
you help me?
19+
</div>
20+
</div>
21+
</div>
22+
</li>
23+
<li class="web-chat-item is-user-b">
24+
<div class="web-chat-message reply">
25+
<div class="web-user-box">
26+
<img
27+
class="web-user-box-image"
28+
src="/images/avatars/steven.avif"
29+
width="48"
30+
height="48"
31+
alt="Avatar of Steven"
32+
/>
33+
<div class="web-user-box-name flex gap-2">
34+
<span class="text-sub-body font-medium">Steven</span>
35+
<time class="text-caption web-u-color-text-tertiary">8:38 AM</time>
36+
</div>
37+
<div class="web-user-box-content text-caption text-primary">
38+
Hey Walter! Is this the message you get
39+
<a class="web-link is-pink" href="/blog/post/cors-error" target="_blank"
40+
>"Access blocked by CORS policy"</a
41+
>?
42+
</div>
43+
</div>
44+
</div>
45+
</li>
46+
<li class="web-chat-item is-user-a">
47+
<div class="web-chat-message">
48+
<div class="web-user-box">
49+
<img
50+
class="web-user-box-image"
51+
src="/images/community/avatars/walter.avif"
52+
height="40"
53+
width="40"
54+
alt="Avatar of Walter"
55+
/>
56+
<div class="web-user-box-name flex gap-2">
57+
<span class="text-sub-body font-medium">Walter O'Brien</span>
58+
<time class="text-caption web-u-color-text-tertiary">9:05 AM</time>
59+
</div>
60+
<div class="web-user-box-content text-caption text-primary">Yes!</div>
61+
</div>
62+
</div>
63+
</li>
64+
<li class="web-chat-item is-user-b">
65+
<div class="web-chat-message reply">
66+
<div class="web-user-box">
67+
<img
68+
class="web-user-box-image"
69+
src="/images/avatars/steven.avif"
70+
width="48"
71+
height="48"
72+
alt="Avatar of Steven"
73+
/>
74+
<div class="web-user-box-name flex gap-2">
75+
<span class="text-sub-body font-medium">Steven</span>
76+
<time class="text-caption web-u-color-text-tertiary">9:08 AM</time>
77+
</div>
78+
<div class="web-user-box-content text-caption text-primary">
79+
You should be able to debug this with a few steps. Just follow this blog:
80+
<a class="web-link is-pink" href="/blog/post/cors-error" target="_blank"
81+
>https://appwrite.io/blog/post/cors-error</a
82+
>. Let me know if this helps 🙂
83+
</div>
84+
</div>
85+
</div>
86+
</li>
87+
</ul>
88+
89+
<style>
90+
@media (max-width: 768px) {
91+
.web-chat-list {
92+
gap: 2rem;
93+
}
94+
}
95+
</style>

‎src/lib/components/MainNav.svelte‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<script lang="ts" context="module">
2+
import type { ComponentType } from 'svelte';
3+
24
export type NavLink = {
35
label: string;
46
href?: string;
@@ -10,7 +12,7 @@
1012

1113
<script lang="ts">
1214
import { classNames } from '$lib/utils/classnames';
13-
import type { ComponentType } from 'svelte';
15+
import { trackEvent } from '$lib/actions/analytics';
1416
1517
export let initialized = false;
1618
@@ -39,6 +41,12 @@
3941
href={link.href}
4042
data-initialized={initialized ? '' : undefined}
4143
data-badge={link.showBadge ? '' : undefined}
44+
on:click={() => {
45+
trackEvent({
46+
plausible: { name: `${link.label} in header` },
47+
posthog: { name: `${link.label.toLowerCase()}_nav_click` }
48+
});
49+
}}
4250
>{link.label}
4351
</a>
4452
{/if}

‎src/lib/components/PreFooter.svelte‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
}
5555
})}
5656
>
57-
<span class="text">Get started</span>
57+
<span class="text" style:padding-inline="0.5rem">Get started</span>
5858
</a>
5959
</div>
6060
</li>
@@ -112,7 +112,7 @@
112112
</p>
113113
<a
114114
href={`${PUBLIC_APPWRITE_DASHBOARD}/console?type=create&plan=tier-2`}
115-
class="web-button is-full-width-mobile web-u-cross-child-end"
115+
class="web-button is-secondary is-full-width-mobile web-u-cross-child-end"
116116
target="_blank"
117117
rel="noopener noreferrer"
118118
on:click={() =>
@@ -140,8 +140,8 @@
140140
For enterprises that need more power and premium support.
141141
</p>
142142
<a
143-
href={`${PUBLIC_APPWRITE_DASHBOARD}/console?type=create&plan=tier-2`}
144-
class="web-button is-full-width-mobile web-u-cross-child-end"
143+
href="/contact-us/enterprise"
144+
class="web-button is-secondary is-full-width-mobile web-u-cross-child-end"
145145
target="_blank"
146146
rel="noopener noreferrer"
147147
on:click={() =>
@@ -151,7 +151,7 @@
151151
}
152152
})}
153153
>
154-
<span class="text">Start building</span>
154+
<span class="text" style:padding-inline="0.5rem">Contact us</span>
155155
</a>
156156
</div>
157157
</li>

‎src/lib/components/ProductsMobileSubmenu.svelte‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import { slide } from 'svelte/transition';
55
import { products, sublinks } from './ProductsSubmenu.svelte';
66
import { dev } from '$app/environment';
7+
import { trackEvent } from '$lib/actions/analytics';
78
89
export let label: string;
910
@@ -35,6 +36,12 @@
3536
<a
3637
href={product.href}
3738
class="group flex gap-3 rounded-xl p-2 text-white outline-none transition-colors focus:bg-white/8"
39+
on:click={() =>
40+
trackEvent({
41+
plausible: {
42+
name: `${product.name} in products submenu`
43+
}
44+
})}
3845
>
3946
<div
4047
class="flex size-12 shrink-0 items-center justify-center rounded-lg border border-white/12 bg-white/6"

0 commit comments

Comments
 (0)