+ {#if $app.themeInUse === 'dark'}
+
+ {:else}
+
+ {/if}
+
+
Integrate with your favourite technologies
+
+ {#each technologies as tech}
+ -
+
+
+ {/each}
+
+
+ {#if isCloud}
+
+ 
+
+
+
+ {/if}
+
-
-
+
+ {#if isCloud}
+ 
+ 
+ {/if}
+
+
+
@@ -83,12 +178,181 @@
-
-
-
-
-
-
+
+
diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte
index f4240c357..3e2b5c872 100644
--- a/src/lib/layout/usage.svelte
+++ b/src/lib/layout/usage.svelte
@@ -13,9 +13,8 @@
@@ -72,76 +62,6 @@
{createdMetadata.title}
-
-
- [e.date, e.value])],
- color: Colors.Secondary
- }
- ]} />
-
- {/if}
-
-
- {#if read}
- {total(read)}
- {readMetadata.title}
-
-
- [e.date, e.value])],
- color: Colors.Tertiary
- }
- ]} />
-
- {/if}
-
-
- {#if updated}
- {total(updated)}
- {updatedMetadata.title}
-
-
- [e.date, e.value])],
- color: Colors.Quaternary
- }
- ]} />
-
- {/if}
-
-
- {#if deleted}
- {total(deleted)}
- {deletedMetadata.title}
-
-
- [e.date, e.value])],
- color: Colors.Quinary
- }
- ]} />
-
- {/if}
-
-
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index e27abf83e..32ec2895f 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -39,7 +39,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 000000000..9a0263a42
--- /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 000000000..209eeb5aa
--- /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 000000000..d89854f82
--- /dev/null
+++ b/src/routes/card/Card.svelte
@@ -0,0 +1,458 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {title}
+
+
+
+
+
+ {#if variant === 'owner'}
+
Share your card
+ {:else if variant === 'external'}
+
Share card
+ {/if}
+ {#if variant === 'external'}
+
Claim your card
+ {/if}
+
+
+
+
+
+
+
+ {#if !cardActive}
+
+
+
+ {/if}
+ {#if browser}
+
+ {/if}
+
+ {#if cardActive}
+
(cardActive = false)}
+ on:keydown={() => {
+ /* no-op */
+ }}
+ transition:fade|local />
+ {/if}
+
+
+
+
+
+
+ Get Embed Code
+
+
+
+
+
+
+
+
diff --git a/src/routes/card/[uid]/+page.ts b/src/routes/card/[uid]/+page.ts
new file mode 100644
index 000000000..83535bd2e
--- /dev/null
+++ b/src/routes/card/[uid]/+page.ts
@@ -0,0 +1,58 @@
+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);
+
+ try {
+ 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
+ }
+ };
+ } catch (e) {
+ console.error(e);
+ throw redirect(303, '/');
+ }
+}
diff --git a/src/routes/card/helpers.ts b/src/routes/card/helpers.ts
new file mode 100644
index 000000000..e59c305f9
--- /dev/null
+++ b/src/routes/card/helpers.ts
@@ -0,0 +1,9 @@
+export 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 };
+}
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index db2ffad3b..37080eb23 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -173,6 +173,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')}>
diff --git a/src/routes/console/account/organizations/+page.ts b/src/routes/console/account/organizations/+page.ts
index f3cef11bb..0b89b1d30 100644
--- a/src/routes/console/account/organizations/+page.ts
+++ b/src/routes/console/account/organizations/+page.ts
@@ -15,7 +15,7 @@ export const load: PageLoad = async ({ url, route }) => {
organizations: await sdk.forConsole.teams.list([
Query.offset(offset),
Query.limit(limit),
- Query.orderDesc('$createdAt')
+ Query.orderDesc('')
])
};
};
diff --git a/src/routes/console/organization-[organization]/+page.ts b/src/routes/console/organization-[organization]/+page.ts
index 279a55084..fab93a7b4 100644
--- a/src/routes/console/organization-[organization]/+page.ts
+++ b/src/routes/console/organization-[organization]/+page.ts
@@ -14,9 +14,9 @@ export const load: PageLoad = async ({ params, url, route }) => {
limit,
projects: await sdk.forConsole.projects.list([
Query.offset(offset),
- Query.limit(limit),
Query.equal('teamId', params.organization),
- Query.orderDesc('$createdAt')
+ Query.limit(CARD_LIMIT),
+ Query.orderDesc('')
])
};
};
diff --git a/src/routes/console/project-[project]/auth/+page.ts b/src/routes/console/project-[project]/auth/+page.ts
index af35b625b..737521d2d 100644
--- a/src/routes/console/project-[project]/auth/+page.ts
+++ b/src/routes/console/project-[project]/auth/+page.ts
@@ -20,7 +20,7 @@ export const load: PageLoad = async ({ url, route }) => {
search,
page,
users: await sdk.forProject.users.list(
- [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')],
+ [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
search
)
};
diff --git a/src/routes/console/project-[project]/auth/teams/+page.ts b/src/routes/console/project-[project]/auth/teams/+page.ts
index e54ff32e6..869168532 100644
--- a/src/routes/console/project-[project]/auth/teams/+page.ts
+++ b/src/routes/console/project-[project]/auth/teams/+page.ts
@@ -16,7 +16,7 @@ export const load: PageLoad = async ({ url, route }) => {
search,
page,
teams: await sdk.forProject.teams.list(
- [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')],
+ [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
search
)
};
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts
index 2350d7f61..dede7fe00 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts
+++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts
@@ -18,7 +18,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => {
limit,
memberships: await sdk.forProject.teams.listMemberships(
teamId,
- [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')],
+ [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
search
)
};
diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte
index 879419d72..33ef1bac0 100644
--- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte
+++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte
@@ -5,38 +5,14 @@
export let data: PageData;
- $: count = data.count;
- $: created = data.created;
- $: read = data.read;
- $: updated = data.updated;
- $: deleted = data.deleted;
+ $: count = data.usersTotal;
diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts
index 6ba6fec31..b4a930690 100644
--- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts
@@ -8,11 +8,7 @@ export const load: PageLoad = async ({ params }) => {
try {
const response = await sdk.forProject.users.getUsage(period ?? '30d');
return {
- count: response.usersCount as unknown as Models.Metric[],
- created: response.usersCreate as unknown as Models.Metric[],
- read: response.usersRead as unknown as Models.Metric[],
- updated: response.usersUpdate as unknown as Models.Metric[],
- deleted: response.usersDelete as unknown as Models.Metric[]
+ usersTotal: response.usersTotal as unknown as Models.Metric[]
};
} catch (e) {
throw error(e.code, e.message);
diff --git a/src/routes/console/project-[project]/databases/+page.svelte b/src/routes/console/project-[project]/databases/+page.svelte
index 14871f104..11d772971 100644
--- a/src/routes/console/project-[project]/databases/+page.svelte
+++ b/src/routes/console/project-[project]/databases/+page.svelte
@@ -40,7 +40,12 @@
-
+
+ Are you sure you want to delete the document from {$collection.name}?
+
{/if}
+
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
index c2a85e9a5..2c0f7faa7 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
@@ -65,7 +65,7 @@
trackEvent(Submit.DocumentUpdate);
disableUpdate = true;
addNotification({
- message: 'Document was updated!',
+ message: 'Document has been updated',
type: 'success'
});
} catch (error) {
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
index 51f5f0a45..2fe829bef 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
@@ -51,7 +51,9 @@
{$collection?.name}
- {$collection?.$id}
+ {#key $collection?.$id}
+ {$collection?.$id}
+ {/key}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
index 3bf7b6776..344598a7a 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
@@ -77,7 +77,7 @@
);
addNotification({
- message: 'Index has been created',
+ message: 'Creating index',
type: 'success'
});
trackEvent(Submit.IndexCreate);
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
index f2576dd6a..a0917e087 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
@@ -12,7 +12,10 @@
const databaseId = $page.params.database;
const limit = 10;
- $: args = preferences.getDisplayNames()?.[selectedRelationship?.relatedCollection] ?? [];
+ $: args =
+ preferences
+ .getDisplayNames()
+ ?.[selectedRelationship?.relatedCollection]?.filter((p) => p !== '$id') ?? [];
$: if (!show) {
data = null;
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
index 3a5f76957..ae13e4629 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
@@ -37,10 +37,7 @@
$: options = ($attributes as Models.AttributeString[])
.filter(
(attr) =>
- attr.type === 'string' &&
- attr?.size <= 50 &&
- !attr?.array &&
- !names?.some((name) => name === attr.key)
+ attr.type === 'string' && !attr?.array && !names?.some((name) => name === attr.key)
)
.map((attr) => {
return {
@@ -60,19 +57,28 @@
Display Name
- Set string attributes with maximum 50 characters to be used as a display name in the
- Appwrite console. Maximum 5 names.
+ Select string attributes as display names for your documents. The selected names will be
+ used as short forms to identify documents in the Appwrite console, like when creating
+ database relationships. You can specify up to 5 names.
-
-
+
+ -
+
+
+
+
+
{#if names?.length}
{#each names as name, i}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
index 953a3d392..63a39c64d 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
@@ -28,6 +28,7 @@
import { isRelationship, isRelationshipToMany } from './document-[document]/attributes/store';
import RelationshipsModal from './relationshipsModal.svelte';
import { attributes, collection, columns } from './store';
+ import { clickOnEnter } from '$lib/helpers/a11y';
export let data: PageData;
@@ -170,22 +171,26 @@
{#if !isRelationshipToMany(attr)}
{#if document[column.id]}
{@const related = document[column.id]}
-
+
Errors
-
- [e.date, e.value])]
- }
- ]} />
-
- {/if}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
index ba0a4b097..eabe89bed 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
@@ -11,8 +11,7 @@ export const load: PageLoad = async ({ params }) => {
);
return {
- count: response.executionsTotal as unknown as Models.Metric[],
- errors: response.buildsFailure as unknown as Models.Metric[]
+ executionsTotal: response.executionsTotal as unknown as Models.Metric[]
};
} catch (e) {
throw error(e.code, e.message);
diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte
index 1b2357deb..8c7559701 100644
--- a/src/routes/console/project-[project]/overview/+layout.svelte
+++ b/src/routes/console/project-[project]/overview/+layout.svelte
@@ -47,7 +47,7 @@
afterNavigate(handle);
async function handle() {
- const promise = usage.load(projectId, period);
+ const promise = usage.load(period);
if ($usage) {
await promise;
@@ -56,7 +56,7 @@
function changePeriod(newPeriod: UsagePeriods) {
period = newPeriod;
- usage.load(projectId, period);
+ usage.load(period);
}
$: $registerCommands([
@@ -95,7 +95,7 @@
{:else}
{#if $usage}
- {@const storage = humanFileSize(total($usage.storage) ?? 0)}
+ {@const storage = humanFileSize(total($usage.filesStorage) ?? 0)}
@@ -119,14 +119,14 @@
- {format(total($usage.documents) ?? 0)}
+ {format(total($usage.documentsTotal) ?? 0)}
Documents
- Databases: {format(total($usage.databases) ?? 0)}
+ Databases: {format(total($usage.databasesTotal) ?? 0)}
@@ -154,7 +154,7 @@
- Buckets: {format(total($usage.buckets) ?? 0)}
+ Buckets: {format(total($usage.bucketsTotal) ?? 0)}
@@ -174,7 +174,7 @@
- {format(total($usage.users) ?? 0)}
+ {format(total($usage.usersTotal) ?? 0)}
Users
@@ -195,7 +195,7 @@
- {format(total($usage.executions) ?? 0)}
+ {format(total($usage.executionsTotal) ?? 0)}
Executions
diff --git a/src/routes/console/project-[project]/overview/bandwith.svelte b/src/routes/console/project-[project]/overview/bandwith.svelte
index 1a0747d7b..defadb90c 100644
--- a/src/routes/console/project-[project]/overview/bandwith.svelte
+++ b/src/routes/console/project-[project]/overview/bandwith.svelte
@@ -17,7 +17,7 @@
date: number;
value: number;
}>;
- $: bandwith = humanFileSize(total($usage.network));
+ $: bandwith = humanFileSize(total($usage?.network));
$: if (period) {
showPeriod = false;
diff --git a/src/routes/console/project-[project]/overview/onboard.svelte b/src/routes/console/project-[project]/overview/onboard.svelte
index 65b657852..9d16fbabc 100644
--- a/src/routes/console/project-[project]/overview/onboard.svelte
+++ b/src/routes/console/project-[project]/overview/onboard.svelte
@@ -14,22 +14,22 @@
const platforms = [
{
- title: 'Web App',
+ title: 'Web',
icon: 'grayscale/code',
platform: Platform.Web
},
{
- title: 'Flutter App',
+ title: 'Flutter',
icon: 'color/flutter',
platform: Platform.Flutter
},
{
- title: 'Apple App',
+ title: 'Apple',
icon: 'color/apple',
platform: Platform.Apple
},
{
- title: 'Android App',
+ title: 'Android',
icon: 'color/android',
platform: Platform.Android
}
@@ -48,7 +48,9 @@