+ 
-
+ {#if variant === 'owner'}
+
+
+ 
+ 
+
-
- Cloud is Live
+
- {#if $app.themeInUse === 'dark'}
- 
- {:else}
- 
- {/if}
-
+ Now in public beta
+ + + +
+
+
+ Integrate with your favourite technologies
+-
+ {#each technologies as tech}
+
- + + + {/each} +
+
+ 
+
+
+
+
+
+
+
+ {#if $app.themeInUse === 'dark'}
+
+ {:else}
+
+ {/if}
+
-
-
-
-
-
-
- Integrate with your favourite technologies
--
- {#each technologies as tech}
-
- - - - {/each} -
+
+
+
+
+
+
+ {/if}
+ Integrate with your favourite technologies
+-
+ {#each technologies as tech}
+
- + + + {/each} +
+ {#if isCloud}
+
+ 
+
+
+ {
+ const visibility = readable(isCurrentWindowFocused(), (set) => {
+ function handler() {
+ set(isCurrentWindowFocused());
+ }
+
+ if (window) {
+ window.addEventListener('focus', handler);
+ window.addEventListener('blur', handler);
+
+ return () => {
+ window.removeEventListener('focus', handler);
+ window.removeEventListener('blur', handler);
+ };
+ }
+ });
+
+ return visibility;
+}
diff --git a/src/lib/system.ts b/src/lib/system.ts
index 596e4faca8..9847882851 100644
--- a/src/lib/system.ts
+++ b/src/lib/system.ts
@@ -10,7 +10,8 @@ export const VARS = {
| undefined,
CONSOLE_MODE: import.meta.env?.VITE_CONSOLE_MODE?.toString() as string | undefined,
VERCEL_ENV: import.meta.env?.VITE_VERCEL_ENV?.toString() as string | undefined,
- GOOGLE_ANALYTICS: import.meta.env?.VITE_GA_PROJECT?.toString() as string | undefined
+ GOOGLE_ANALYTICS: import.meta.env?.VITE_GA_PROJECT?.toString() as string | undefined,
+ GOOGLE_TAG: import.meta.env?.VITE_GTM_PROJECT?.toString() as string | undefined
};
export const ENV = {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index fcc41255ea..37c4267e67 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -60,11 +60,20 @@
* Handle initial load.
*/
if (!$page.url.pathname.startsWith('/auth')) {
- const acceptedRoutes = ['/login', '/register', '/recover', '/invite'];
+ const acceptedRoutes = [
+ '/login',
+ '/register',
+ '/recover',
+ '/invite',
+ '/card',
+ '/hackathon'
+ ];
if ($user) {
if (
!$page.url.pathname.startsWith('/console') &&
- !$page.url.pathname.startsWith('/invite')
+ !$page.url.pathname.startsWith('/invite') &&
+ !$page.url.pathname.startsWith('/card') &&
+ !$page.url.pathname.startsWith('/hackathon')
) {
await goto(`${base}/console`, {
replaceState: true
@@ -142,4 +151,37 @@
border-right-color: hsl(var(--p-tooltip--bg-color));
}
}
+
+ .theme-dark .with-separators {
+ --separator-color: hsl(var(--color-neutral-200));
+ --separator-text: hsl(var(--color-neutral-100));
+ }
+
+ .with-separators {
+ --separator-color: hsl(var(--color-neutral-5));
+ --separator-text: hsl(var(--color-neutral-50));
+ }
+
+ .with-separators {
+ display: flex;
+ align-items: center;
+ gap: 1rem;
+
+ text-transform: uppercase;
+ width: 100%;
+
+ color: var(--separator-text);
+
+ &::before,
+ &::after {
+ content: '';
+ flex: 1;
+ height: 1px;
+ background: var(--separator-color);
+ }
+ }
+
+ [type='checkbox']:where(:checked)::before {
+ content: '\ea38';
+ }
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 9d628c7ead..72d08d69e3 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -31,7 +31,9 @@ export const load: LayoutLoad = async ({ depends, url }) => {
'/invite',
'/auth/magic-url',
'/auth/oauth2/success',
- '/auth/oauth2/failure'
+ '/auth/oauth2/failure',
+ '/card',
+ '/hackathon'
];
if (!acceptedRoutes.some((n) => url.pathname.startsWith(n))) {
diff --git a/src/routes/card/+layout.svelte b/src/routes/card/+layout.svelte
new file mode 100644
index 0000000000..9a0263a423
--- /dev/null
+++ b/src/routes/card/+layout.svelte
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/routes/card/+page.ts b/src/routes/card/+page.ts
new file mode 100644
index 0000000000..209eeb5aa0
--- /dev/null
+++ b/src/routes/card/+page.ts
@@ -0,0 +1,10 @@
+import { isCloud } from '$lib/system';
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ parent }) {
+ if (!isCloud) throw redirect(303, '/');
+ const { account } = await parent();
+ if (!account) throw redirect(303, '/login');
+
+ throw redirect(303, `/card/${account.$id}`);
+}
diff --git a/src/routes/card/Card.svelte b/src/routes/card/Card.svelte
new file mode 100644
index 0000000000..d89854f824
--- /dev/null
+++ b/src/routes/card/Card.svelte
@@ -0,0 +1,458 @@
+
+
+
+
+
+
+ {seo.title}
+
+
+
+
+
+
+
+
diff --git a/src/routes/hackathon/+page.svelte b/src/routes/hackathon/+page.svelte
new file mode 100644
index 0000000000..e7b73713c2
--- /dev/null
+++ b/src/routes/hackathon/+page.svelte
@@ -0,0 +1,260 @@
+
+
+
+
+ Appwrite Cloud - Join Our Hackathon
+
+
+
@@ -66,6 +75,13 @@
+ or
+
+
+
diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte
index 03657a94b6..61f11b7555 100644
--- a/src/routes/register/+page.svelte
+++ b/src/routes/register/+page.svelte
@@ -15,7 +15,7 @@
import { Unauthenticated } from '$lib/layout';
import FormList from '$lib/elements/forms/formList.svelte';
import { Dependencies } from '$lib/constants';
- import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+ import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { ID } from '@aw-labs/appwrite-console';
let name: string, mail: string, pass: string, disabled: boolean;
@@ -38,6 +38,15 @@
trackError(error, Submit.AccountCreate);
}
}
+
+ function onGithubLogin() {
+ sdkForConsole.account.createOAuth2Session(
+ 'github',
+ window.location.origin,
+ window.location.origin,
+ ['read:user', 'user:email']
+ );
+ }
@@ -53,20 +62,21 @@
id="name"
label="Name"
placeholder="Your name"
- autofocus={true}
+ autofocus
+ required
bind:value={name} />
By registering, you agree that you have read, understand, and acknowledge our
+ or
+
+
+
diff --git a/static/images/cloud-beta-hoodies.png b/static/images/cloud-beta-hoodies.png
new file mode 100644
index 0000000000..a076484074
Binary files /dev/null and b/static/images/cloud-beta-hoodies.png differ
diff --git a/static/images/hoodie-1.png b/static/images/hoodie-1.png
new file mode 100644
index 0000000000..6d2547e37e
Binary files /dev/null and b/static/images/hoodie-1.png differ
diff --git a/static/images/hoodie-2.png b/static/images/hoodie-2.png
new file mode 100644
index 0000000000..5735f48bc9
Binary files /dev/null and b/static/images/hoodie-2.png differ
diff --git a/static/images/hoodies-bg.png b/static/images/hoodies-bg.png
new file mode 100644
index 0000000000..37a8803534
Binary files /dev/null and b/static/images/hoodies-bg.png differ
+
+ {/if}
+
Public beta
+
-
-
+
+
diff --git a/src/lib/stores/windowFocus.ts b/src/lib/stores/windowFocus.ts
new file mode 100644
index 0000000000..b0c28abca4
--- /dev/null
+++ b/src/lib/stores/windowFocus.ts
@@ -0,0 +1,29 @@
+import { readable, type Readable } from 'svelte/store';
+
+function isCurrentWindowFocused(): boolean {
+ if (!window) return false;
+ if (!window.document) return false;
+ if (typeof window.document.hasFocus !== 'function') return false;
+
+ return window.document.hasFocus();
+}
+
+export function windowFocusStore(): Readable
+
+ {#if isCloud}
+
+
-
-
-
+ {#if isCloud}
+
+
+ {/if}
+
+ - -
-
+
+
+
diff --git a/src/routes/card/[uid]/+page.svelte b/src/routes/card/[uid]/+page.svelte
new file mode 100644
index 0000000000..dc6332a5c9
--- /dev/null
+++ b/src/routes/card/[uid]/+page.svelte
@@ -0,0 +1,430 @@
+
+
+
+
+
+
+
+ Get Embed Code
+
+
+
+
+
+
diff --git a/src/routes/card/[uid]/+page.ts b/src/routes/card/[uid]/+page.ts
new file mode 100644
index 0000000000..5ed45e219f
--- /dev/null
+++ b/src/routes/card/[uid]/+page.ts
@@ -0,0 +1,53 @@
+import { VARS } from '$lib/system.js';
+import { redirect } from '@sveltejs/kit';
+
+function getCardImgUrls(userId: string, endpoint: string) {
+ const resolved = endpoint;
+
+ const frontImg = `${resolved}/cards/cloud?userId=${userId}`;
+ const backImg = `${resolved}/cards/cloud-back?userId=${userId}`;
+ const ogImg = `${resolved}/cards/cloud-og?userId=${userId}`;
+
+ return { frontImg, backImg, ogImg };
+}
+
+async function urlContentToDataUri(url: string): Promise {
+ const res = await fetch(url);
+ const blob = await res.blob();
+
+ return await new Promise((callback) => {
+ const reader = new FileReader();
+ reader.onload = function () {
+ if (typeof this.result !== 'string') return '';
+ callback(this.result);
+ };
+ reader.readAsDataURL(blob);
+ });
+}
+
+export async function load({ params, url, parent }) {
+ const { account } = await parent();
+
+ const userId = params.uid;
+ const endpoint = VARS.APPWRITE_ENDPOINT ?? `${url.origin}/v1`;
+ const { frontImg, backImg } = getCardImgUrls(userId, endpoint);
+
+ const res = await fetch(frontImg);
+
+ if (!res.ok) {
+ throw redirect(303, '/');
+ }
+
+ return {
+ userId: params.uid,
+ base64: {
+ front: await urlContentToDataUri(frontImg),
+ back: await urlContentToDataUri(backImg)
+ },
+ isOwner: account && account.$id === userId,
+ imgUrls: {
+ frontImg,
+ backImg
+ }
+ };
+}
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index 870794b406..ba9f9d1c55 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -14,10 +14,20 @@
import { onMount } from 'svelte';
import { loading } from '../store';
import Create from './createOrganization.svelte';
+ export let data;
onMount(() => {
loading.set(false);
+ // Check if user already viewed cloud hackathon page
+ // if (isCloud) {
+ // const viewed = localStorage.getItem('cloud-hackathon-viewed');
+ // if (viewed !== data.account.$id) {
+ // localStorage.setItem('cloud-hackathon-viewed', data.account.$id);
+ // goto('/hackathon');
+ // }
+ // }
+
setInterval(() => {
checkForFeedback(INTERVAL);
}, INTERVAL);
@@ -50,6 +60,7 @@
showSideNavigation={$page.url.pathname !== '/console' &&
!$page?.params.organization &&
!$page.url.pathname.includes('/console/account') &&
+ !$page.url.pathname.includes('/console/card') &&
!$page.url.pathname.includes('/console/onboarding')}>
('console', (message) => {
if (message.events.includes('functions.*.deployments.*.create')) {
diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts
index 9472fd6af1..3160a72605 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts
@@ -14,8 +14,7 @@ export const load: PageLoad = async ({ params, parent, depends }) => {
offset,
deployments: await sdkForProject.functions.listDeployments(params.function, [
Query.limit(PAGE_LIMIT),
- Query.offset(offset),
- Query.orderDesc('$createdAt')
+ Query.offset(offset)
])
};
};
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.ts
index 5d5c50f056..5a1b64c054 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.ts
@@ -14,8 +14,7 @@ export const load: PageLoad = async ({ params, parent, depends }) => {
offset,
executions: await sdkForProject.functions.listExecutions(params.function, [
Query.limit(PAGE_LIMIT),
- Query.offset(offset),
- Query.orderDesc('$createdAt')
+ Query.offset(offset)
])
};
};
diff --git a/src/routes/console/project-[project]/overview/requests.svelte b/src/routes/console/project-[project]/overview/requests.svelte
index 30e6509863..762861054a 100644
--- a/src/routes/console/project-[project]/overview/requests.svelte
+++ b/src/routes/console/project-[project]/overview/requests.svelte
@@ -54,7 +54,7 @@
series={[
{
name: 'Requests',
- data: [...requests.map((e) => [e.date, e.value])]
+ data: [...(requests?.map((e) => [e.date, e.value]) ?? [])]
}
]} />
diff --git a/src/routes/console/project-[project]/storage/[[page]]/+page.ts b/src/routes/console/project-[project]/storage/[[page]]/+page.ts
index 30ed7b167c..8384dd85eb 100644
--- a/src/routes/console/project-[project]/storage/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/storage/[[page]]/+page.ts
@@ -13,8 +13,7 @@ export const load: PageLoad = async ({ params, parent }) => {
offset,
buckets: await sdkForProject.storage.listBuckets([
Query.limit(CARD_LIMIT),
- Query.offset(offset),
- Query.orderDesc('$createdAt')
+ Query.offset(offset)
])
};
};
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts
index 0c15a026ef..23abe1ae59 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts
@@ -16,7 +16,7 @@ export const load: PageLoad = async ({ params, parent, depends, url }) => {
search,
files: await sdkForProject.storage.listFiles(
params.bucket,
- [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')],
+ [Query.limit(PAGE_LIMIT), Query.offset(offset)],
search
)
};
diff --git a/src/routes/hackathon/+layout.svelte b/src/routes/hackathon/+layout.svelte
new file mode 100644
index 0000000000..9a0263a423
--- /dev/null
+++ b/src/routes/hackathon/+layout.svelte
@@ -0,0 +1,13 @@
+
+
+
+ 
+
+
+
+ + {title} + +
+ +
+
+
+ {#if !cardActive}
+
+ {#if cardActive}
+
+
+
+
+ {/if}
+ {#if browser}
+
+
+
+
+
+ Join Our
+
+
+
+
+
+
+
diff --git a/src/routes/hackathon/+page.ts b/src/routes/hackathon/+page.ts
new file mode 100644
index 0000000000..bbeeb2f696
--- /dev/null
+++ b/src/routes/hackathon/+page.ts
@@ -0,0 +1,8 @@
+import { isCloud } from '$lib/system';
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ parent }) {
+ if (!isCloud) throw redirect(303, '/');
+ const { account } = await parent();
+ if (!account) throw redirect(303, '/login');
+}
diff --git a/src/routes/hackathon/cloud-dark.svg b/src/routes/hackathon/cloud-dark.svg
new file mode 100644
index 0000000000..e90b2fa6b8
--- /dev/null
+++ b/src/routes/hackathon/cloud-dark.svg
@@ -0,0 +1,22 @@
+
diff --git a/src/routes/hackathon/cloud-light.svg b/src/routes/hackathon/cloud-light.svg
new file mode 100644
index 0000000000..901a6eafdb
--- /dev/null
+++ b/src/routes/hackathon/cloud-light.svg
@@ -0,0 +1,22 @@
+
diff --git a/src/routes/hackathon/hackathon-badge.svg b/src/routes/hackathon/hackathon-badge.svg
new file mode 100644
index 0000000000..adfbc82f1b
--- /dev/null
+++ b/src/routes/hackathon/hackathon-badge.svg
@@ -0,0 +1,154 @@
+
diff --git a/src/routes/hackathon/hashnode-dark.svg b/src/routes/hackathon/hashnode-dark.svg
new file mode 100644
index 0000000000..0fa043ce23
--- /dev/null
+++ b/src/routes/hackathon/hashnode-dark.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/routes/hackathon/hashnode-light.svg b/src/routes/hackathon/hashnode-light.svg
new file mode 100644
index 0000000000..e85da8ba45
--- /dev/null
+++ b/src/routes/hackathon/hashnode-light.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index b2f488a901..0b563cdfd4 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -37,6 +37,15 @@
trackError(error, Submit.AccountCreate);
}
}
+
+ function onGithubLogin() {
+ sdkForConsole.account.createOAuth2Session(
+ 'github',
+ window.location.origin,
+ window.location.origin,
+ ['read:user', 'user:email']
+ );
+ }
+ Join Our
+
+ Cloud Hackathon
+
+ -
+
- + Build an open-source app using Appwrite Cloud + +
- + Publish an article on your Hashnode blog + +
- + + Submit your project on Built with Appwrite + + +
+
+
+
+
+
+
+ -
+
-
+ ++
+
+++
+ -
+ ++
+
+++
+
+ 
+
+
+
+
+ Grand winner
+
+ + 5,000USD +
+ +
+
+ + Appwrite swag
++ Hashnode T-shirt & mug
+
+
+
+ 5 Runner-ups Each
+
+ + 1,000USD +
+
+
+ + Appwrite swag
++ Hashnode T-shirt
+