+
+ {#if isCloud}
+
+
+ {/if}
+
+
+
@@ -195,11 +201,6 @@
}
}
- .full-height {
- block-size: 100vh;
- block-size: 100lvh;
- }
-
.cloud-section {
background: var(--url);
background-repeat: no-repeat;
@@ -274,13 +275,13 @@
}
.mobile-logo {
- margin-block-start: 5rem;
+ margin-block-start: 1rem;
margin-block-end: 0.5rem;
}
.mobile-beta {
font-size: 0.75rem;
- margin-block-end: 2rem;
+ margin-block-end: 6rem;
> span {
background: hsl(var(--color-neutral-120));
@@ -292,7 +293,32 @@
justify-content: center;
}
+ .heading-level-2 {
+ .cloud-1,
+ .cloud-2 {
+ display: none;
+ }
+ }
+
@media (max-width: 767px) {
+ .heading-level-2 {
+ position: relative;
+ .cloud-1,
+ .cloud-2 {
+ display: block;
+ position: absolute;
+ }
+
+ .cloud-1 {
+ left: 32px;
+ top: -40px;
+ }
+
+ .cloud-2 {
+ right: 0;
+ top: 10px;
+ }
+ }
.main-cloud {
background-color: hsl(var(--color-neutral-500));
}
@@ -302,8 +328,9 @@
}
.is-cloud {
- background: var(--url);
- background-position: center -150px;
+ background: var(--url-mobile);
+ background-position: 0px calc(30px - 5vw);
+ background-size: 100vw;
background-repeat: no-repeat;
}
@@ -311,5 +338,21 @@
.cloud-section {
display: none;
}
+
+ section:last-child {
+ padding-block-end: 32px;
+ }
+ }
+
+ @media (min-width: 530px) and (max-width: 767px) {
+ .heading-level-2 {
+ .cloud-1 {
+ display: none;
+ }
+ }
+
+ .is-cloud {
+ background-position: 0px calc(30px - 15vw);
+ }
}
diff --git a/src/lib/system.ts b/src/lib/system.ts
index 596e4faca..984788285 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 4a075f587..37c4267e6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -60,12 +60,20 @@
* Handle initial load.
*/
if (!$page.url.pathname.startsWith('/auth')) {
- const acceptedRoutes = ['/login', '/register', '/recover', '/invite', '/card'];
+ 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('/card')
+ !$page.url.pathname.startsWith('/card') &&
+ !$page.url.pathname.startsWith('/hackathon')
) {
await goto(`${base}/console`, {
replaceState: true
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index d16bd6216..72d08d69e 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -32,7 +32,8 @@ export const load: LayoutLoad = async ({ depends, url }) => {
'/auth/magic-url',
'/auth/oauth2/success',
'/auth/oauth2/failure',
- '/card'
+ '/card',
+ '/hackathon'
];
if (!acceptedRoutes.some((n) => url.pathname.startsWith(n))) {
diff --git a/src/routes/card/+page.ts b/src/routes/card/+page.ts
index bbeeb2f69..209eeb5aa 100644
--- a/src/routes/card/+page.ts
+++ b/src/routes/card/+page.ts
@@ -5,4 +5,6 @@ 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
index 1f7e18564..d89854f82 100644
--- a/src/routes/card/Card.svelte
+++ b/src/routes/card/Card.svelte
@@ -12,14 +12,11 @@
import { windowFocusStore } from '$lib/stores/windowFocus';
import { spring } from 'svelte/motion';
- import { getCardImgUrls } from './helpers';
- import { VARS } from '$lib/system';
- import { page } from '$app/stores';
let cardEl: HTMLDivElement | undefined;
export let active = false;
export let isFlipped = false;
- export let userId: string;
+ export let base64: { front: string; back: string };
let interacting = false;
@@ -128,9 +125,9 @@
if (!cardEl) return;
const rect = cardEl.getBoundingClientRect(); // get element's size/position
let delay = 100;
- let scaleW = (window.innerWidth / rect.width) * 0.9;
- let scaleH = (window.innerHeight / rect.height) * 0.9;
- let scaleF = 1.75;
+ let scaleW = (window.innerWidth / rect.width) * 0.65;
+ let scaleH = (window.innerHeight / rect.height) * 0.65;
+ let scaleF = 1.5;
setCenter();
delay = 1000;
@@ -229,9 +226,6 @@
--angle: ${angle}deg;
--center: ${$centerProximity};
`;
-
- const endpoint = VARS.APPWRITE_ENDPOINT ?? `${$page.url.origin}/v1`;
- const { frontImg, backImg } = getCardImgUrls(userId, endpoint);
@@ -250,7 +244,15 @@
}}>

+

{/each}
@@ -270,6 +273,9 @@
diff --git a/src/routes/card/[uid]/+page.ts b/src/routes/card/[uid]/+page.ts
index 77c11504b..5ed45e219 100644
--- a/src/routes/card/[uid]/+page.ts
+++ b/src/routes/card/[uid]/+page.ts
@@ -1,20 +1,53 @@
import { VARS } from '$lib/system.js';
import { redirect } from '@sveltejs/kit';
-import { getCardImgUrls } from '../helpers.js';
-export const ssr = true;
+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();
-export async function load({ params, url }) {
const userId = params.uid;
const endpoint = VARS.APPWRITE_ENDPOINT ?? `${url.origin}/v1`;
- const { frontImg } = getCardImgUrls(userId, endpoint);
+ const { frontImg, backImg } = getCardImgUrls(userId, endpoint);
const res = await fetch(frontImg);
+
if (!res.ok) {
throw redirect(303, '/');
}
return {
- userId: params.uid
+ 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 c8d8ff27c..761b9515e 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -14,19 +14,19 @@
import { onMount } from 'svelte';
import { loading } from '../store';
import Create from './createOrganization.svelte';
- import { isCloud } from '$lib/system';
+ export let data;
onMount(() => {
loading.set(false);
- // Check if user already viewed cloud card
- if (isCloud) {
- const viewed = localStorage.getItem('cloud-card-viewed');
- if (!viewed) {
- localStorage.setItem('cloud-card-viewed', 'true');
- goto('/card');
- }
- }
+ // 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);
diff --git a/src/routes/console/account/organizations/[[page]]/+page.ts b/src/routes/console/account/organizations/[[page]]/+page.ts
index e51c4b146..f0f5c57cf 100644
--- a/src/routes/console/account/organizations/[[page]]/+page.ts
+++ b/src/routes/console/account/organizations/[[page]]/+page.ts
@@ -12,8 +12,7 @@ export const load: PageLoad = async ({ params }) => {
offset,
organizations: await sdkForConsole.teams.list([
Query.offset(offset),
- Query.limit(CARD_LIMIT),
- Query.orderDesc('$createdAt')
+ Query.limit(CARD_LIMIT)
])
};
};
diff --git a/src/routes/console/organization-[organization]/[[page]]/+page.ts b/src/routes/console/organization-[organization]/[[page]]/+page.ts
index e6f6520c3..b302f4fb1 100644
--- a/src/routes/console/organization-[organization]/[[page]]/+page.ts
+++ b/src/routes/console/organization-[organization]/[[page]]/+page.ts
@@ -13,8 +13,7 @@ export const load: PageLoad = async ({ params }) => {
projects: await sdkForConsole.projects.list([
Query.offset(offset),
Query.limit(CARD_LIMIT),
- Query.equal('teamId', params.organization),
- Query.orderDesc('$createdAt')
+ Query.equal('teamId', params.organization)
])
};
};
diff --git a/src/routes/console/project-[project]/auth/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/[[page]]/+page.ts
index 132a73b2e..7774ad520 100644
--- a/src/routes/console/project-[project]/auth/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/auth/[[page]]/+page.ts
@@ -15,7 +15,7 @@ export const load: PageLoad = async ({ params, parent, url }) => {
search,
page,
users: await sdkForProject.users.list(
- [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')],
+ [Query.limit(PAGE_LIMIT), Query.offset(offset)],
search
)
};
diff --git a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts
index dfd5d40df..f687ec0f7 100644
--- a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts
@@ -15,7 +15,7 @@ export const load: PageLoad = async ({ params, parent, url }) => {
search,
page,
teams: await sdkForProject.teams.list(
- [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')],
+ [Query.limit(PAGE_LIMIT), Query.offset(offset)],
search
)
};
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts
index 38c6fd930..646165c70 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts
@@ -17,7 +17,7 @@ export const load: PageLoad = async ({ params, parent, depends, url }) => {
search,
memberships: await sdkForProject.teams.listMemberships(
teamId,
- [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')],
+ [Query.limit(PAGE_LIMIT), Query.offset(offset)],
search
)
};
diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts
index 47cc014c6..f854f6f19 100644
--- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts
@@ -13,8 +13,7 @@ export const load: PageLoad = async ({ params, parent }) => {
offset,
databases: await sdkForProject.databases.list([
Query.limit(CARD_LIMIT),
- Query.offset(offset),
- Query.orderDesc('$createdAt')
+ Query.offset(offset)
])
};
};
diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts
index d7c69f3ca..eba0b24b9 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts
@@ -13,8 +13,7 @@ export const load: PageLoad = async ({ params, parent }) => {
offset,
collections: await sdkForProject.databases.listCollections(params.database, [
Query.limit(CARD_LIMIT),
- Query.offset(offset),
- Query.orderDesc('$createdAt')
+ Query.offset(offset)
])
};
};
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts
index 7c19bb9dc..56ff066f3 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts
@@ -14,8 +14,7 @@ export const load: PageLoad = async ({ params, parent, depends }) => {
offset,
documents: await sdkForProject.databases.listDocuments(params.database, params.collection, [
Query.limit(PAGE_LIMIT),
- Query.offset(offset),
- Query.orderDesc('$createdAt')
+ Query.offset(offset)
])
};
};
diff --git a/src/routes/console/project-[project]/functions/[[page]]/+page.ts b/src/routes/console/project-[project]/functions/[[page]]/+page.ts
index 3c3b826a6..19f53a6b0 100644
--- a/src/routes/console/project-[project]/functions/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/functions/[[page]]/+page.ts
@@ -14,8 +14,7 @@ export const load: PageLoad = async ({ params, parent, depends }) => {
offset,
functions: await sdkForProject.functions.list([
Query.limit(CARD_LIMIT),
- Query.offset(offset),
- Query.orderDesc('$createdAt')
+ Query.offset(offset)
])
};
};
diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
index af41f1d46..7d05f312e 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
@@ -29,17 +29,18 @@
import { log } from '$lib/stores/logs';
import { invalidate } from '$app/navigation';
import { Dependencies, PAGE_LIMIT } from '$lib/constants';
- import type { Models } from '@aw-labs/appwrite-console';
+ import { Query, type Models } from '@aw-labs/appwrite-console';
import type { PageData } from './$types';
import Delete from '../delete.svelte';
import Create from '../create.svelte';
import Activate from '../activate.svelte';
import { browser } from '$app/environment';
- import { sdkForConsole } from '$lib/stores/sdk';
+ import { sdkForConsole, sdkForProject } from '$lib/stores/sdk';
import { page } from '$app/stores';
import Output from '$lib/components/output.svelte';
import { calculateTime } from '$lib/helpers/timeConversion';
import { timer } from '$lib/actions/timer';
+ import { onMount } from 'svelte';
export let data: PageData;
@@ -49,13 +50,23 @@
let showActivate = false;
let selectedDeployment: Models.Deployment = null;
+ let activeDeployment: Models.Deployment = null;
+
+ onMount(async () => {
+ activeDeployment = await getActiveDeployment();
+ });
+
+ async function getActiveDeployment() {
+ const list = await sdkForProject.functions.listDeployments($page.params.function, [
+ Query.equal('$id', $func?.deployment)
+ ]);
+ return list?.deployments?.[0];
+ }
const handleActivate = () => {
invalidate(Dependencies.DEPLOYMENTS);
};
- $: activeDeployment = data.deployments.deployments.find((d) => d.$id === $func?.deployment);
-
if (browser) {
sdkForConsole.client.subscribe('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 9472fd6af..3160a7260 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 5d5c50f05..5a1b64c05 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 7de023426..b762f22da 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 30ed7b167..8384dd85e 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 0c15a026e..23abe1ae5 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 000000000..9a0263a42
--- /dev/null
+++ b/src/routes/hackathon/+layout.svelte
@@ -0,0 +1,13 @@
+
+
+