diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/project-[project]/authentication/index.svelte
similarity index 91%
rename from src/routes/console/[project]/users/index.svelte
rename to src/routes/console/project-[project]/authentication/index.svelte
index 61a8d0f07..83e6162c1 100644
--- a/src/routes/console/[project]/users/index.svelte
+++ b/src/routes/console/project-[project]/authentication/index.svelte
@@ -21,20 +21,20 @@
import { base } from '$app/paths';
import { usersList } from './store';
import type { Models } from '@aw-labs/appwrite-console';
+ import { pageLimit } from '$lib/stores/layout';
let showCreate = false;
let search = '';
let offset = 0;
- const limit = 5;
const project = $page.params.project;
const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 32, 32).toString();
const userCreated = async (event: CustomEvent>>) => {
- await goto(`${base}/console/${project}/users/user/${event.detail.$id}`);
+ await goto(`${base}/console/project-${project}/authentication/user/${event.detail.$id}`);
};
$: if (search) offset = 0;
- $: usersList.load(search, limit, offset ?? 0);
+ $: usersList.load(search, $pageLimit, offset ?? 0);
@@ -63,7 +63,8 @@
{#each $usersList.users as user}
-
+
@@ -98,7 +99,7 @@
Total results: {$usersList.total}
-
+
{:else if search}
@@ -114,7 +115,7 @@
Total results: {$usersList.total}
-
+
{:else}
diff --git a/src/routes/console/[project]/users/security.svelte b/src/routes/console/project-[project]/authentication/security.svelte
similarity index 92%
rename from src/routes/console/[project]/users/security.svelte
rename to src/routes/console/project-[project]/authentication/security.svelte
index d65672589..aa7246cf2 100644
--- a/src/routes/console/[project]/users/security.svelte
+++ b/src/routes/console/project-[project]/authentication/security.svelte
@@ -72,8 +72,9 @@
Users Limit
- This limits new users from signing up for your project, regardless of authentication
- method. You can still create users from your Appwrite console.
+ Limit new users from signing up for your project, regardless of authentication method.
+ You can still create users and team memberships from your Appwrite console.
+ The maximum limit is 10,000 users.
@@ -135,7 +136,7 @@
- Session Length
+ Session Length (Coming Soon)
If you reduce the limit, users who are currently logged in will be logged out of the
application.
@@ -143,8 +144,9 @@
{/if}
-
+
Total results: {response.total}
-
+
{/await}
diff --git a/src/routes/console/project-[project]/authentication/user/[user]/index.svelte b/src/routes/console/project-[project]/authentication/user/[user]/index.svelte
new file mode 100644
index 000000000..a43453202
--- /dev/null
+++ b/src/routes/console/project-[project]/authentication/user/[user]/index.svelte
@@ -0,0 +1,474 @@
+
+
+{#if $user}
+
+
+
+
+
+
+ {#if $user.email}
+
{$user.email}
+ {/if}
+ {#if $user.phone}
+
{$user.phone}
+ {/if}
+
Joined: {toLocaleDateTime($user.registration)}
+
+ {#if !$user.status}
+
blocked
+ {:else if $user.email && $user.phone}
+
+ {$user.emailVerification && $user.phoneVerification
+ ? 'verified'
+ : $user.emailVerification
+ ? 'verified email'
+ : $user.phoneVerification
+ ? 'verified phone'
+ : 'unverified'}
+
+ {:else}
+
+ {$user.emailVerification
+ ? 'verified '
+ : $user.phoneVerification
+ ? 'verified '
+ : 'unverified'}
+
+ {/if}
+
+
Danger Zone
+
+
+ The user will be permanently deleted, including all data associated with this user.
+ This action is irreversible.
+
+
+
+
+
+
+
+ {$user.name}
+
+ {$user.email}
+
+
+
+
+
+
+
+
+{/if}
+
diff --git a/src/routes/console/[project]/users/user/[user]/memberships.svelte b/src/routes/console/project-[project]/authentication/user/[user]/memberships.svelte
similarity index 92%
rename from src/routes/console/[project]/users/user/[user]/memberships.svelte
rename to src/routes/console/project-[project]/authentication/user/[user]/memberships.svelte
index db1ec6dea..4e85213fe 100644
--- a/src/routes/console/[project]/users/user/[user]/memberships.svelte
+++ b/src/routes/console/project-[project]/authentication/user/[user]/memberships.svelte
@@ -51,14 +51,14 @@
{#each response.memberships as membership}
+ href={`${base}/console/project-${project}/authentication/teams/${membership.teamId}`}>
-
{membership.userName ? membership.userName : 'n/a'}
+ src={getAvatar(membership.teamName)}
+ name={membership.teamName} />
+
{membership.teamName ? membership.teamName : 'n/a'}
{membership.roles}
@@ -87,7 +87,7 @@
diff --git a/src/routes/console/project-[project]/authentication/user/[user]/sessions.svelte b/src/routes/console/project-[project]/authentication/user/[user]/sessions.svelte
new file mode 100644
index 000000000..509ee9a82
--- /dev/null
+++ b/src/routes/console/project-[project]/authentication/user/[user]/sessions.svelte
@@ -0,0 +1,116 @@
+
+
+
+ {#if sessionList?.total}
+
+
+
+
+
+ Browser and Device
+ Session
+ Location
+ IP
+
+
+
+ {#each sessionList.sessions as session}
+
+
+
+
+
.toString()})
+
+
+ {session.clientName}
+ {session.clientVersion} on {session.osName}
+ {session.osVersion}
+
+ {#if session.current}
+
current session
+ {/if}
+
+ {:else}
+
+
+
+ {/if}
+
+
Total results: {sessionList?.total}
+
+
Create Document
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/__layout.svelte
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/_attribute.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_attribute.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/_attribute.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_attribute.svelte
diff --git a/src/routes/console/[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
similarity index 93%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte
index a72aa3ddf..12d6014fd 100644
--- a/src/routes/console/[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
@@ -33,12 +33,10 @@
id="read"
label="Read Permissions"
bind:tags={$doc.$read}
- helper="Add 'role:all' for wildcard access"
placeholder="User ID, Team ID or Role" />
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/activity.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/activity.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/activity.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/activity.svelte
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_boolean.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_boolean.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_boolean.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_boolean.svelte
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_enum.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_enum.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_enum.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_enum.svelte
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_integer.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_integer.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_integer.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_integer.svelte
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_string.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_string.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_string.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/attributes/_string.svelte
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/store.ts b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/store.ts
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/document/[document]/store.ts
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/store.ts
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte
similarity index 94%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte
index 04cb02f3b..aee2d612d 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/index.svelte
+++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte
@@ -54,7 +54,7 @@
{#each columns as column}
{document[column.key] ?? 'n/a'}
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/indexes.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/indexes.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/indexes.svelte
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/settings.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte
similarity index 96%
rename from src/routes/console/[project]/databases/database/[database]/collection/[collection]/settings.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte
index 3b2a6b879..cf8dab742 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/settings.svelte
+++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte
@@ -64,13 +64,11 @@
bind:tags={$collection.$read}
label="Read Access"
id="read"
- helper="Add 'role:all' for wildcard access"
placeholder="User ID, Team ID or Role" />
{/if}
) => {
- await goto(`${base}/console/${projectId}/databases/collection/${event.detail.$id}`);
+ await goto(`${base}/console/project-${projectId}/databases/collection/${event.detail.$id}`);
};
$: request = sdkForProject.databases.listCollections(search, limit, offset);
@@ -40,7 +40,7 @@
{#each response.collections as collection}
{/each}
diff --git a/src/routes/console/[project]/databases/database/[database]/store.ts b/src/routes/console/project-[project]/databases/database/[database]/store.ts
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/store.ts
rename to src/routes/console/project-[project]/databases/database/[database]/store.ts
diff --git a/src/routes/console/[project]/databases/database/[database]/usage.svelte b/src/routes/console/project-[project]/databases/database/[database]/usage.svelte
similarity index 100%
rename from src/routes/console/[project]/databases/database/[database]/usage.svelte
rename to src/routes/console/project-[project]/databases/database/[database]/usage.svelte
diff --git a/src/routes/console/[project]/databases/index.svelte b/src/routes/console/project-[project]/databases/index.svelte
similarity index 90%
rename from src/routes/console/[project]/databases/index.svelte
rename to src/routes/console/project-[project]/databases/index.svelte
index 202e9c389..f86139d2b 100644
--- a/src/routes/console/[project]/databases/index.svelte
+++ b/src/routes/console/project-[project]/databases/index.svelte
@@ -16,7 +16,7 @@
const limit = 25;
const project = $page.params.project;
const databaseCreated = async (event: CustomEvent) => {
- await goto(`${base}/console/${project}/databases/database/${event.detail.$id}`);
+ await goto(`${base}/console/project-${project}/databases/database/${event.detail.$id}`);
};
$: request = sdkForProject.databases.list(search, limit, offset);
$: if (search) offset = 0;
@@ -36,7 +36,7 @@
{#each response.databases as database}
{/each}
diff --git a/src/routes/console/[project]/functions/__layout.svelte b/src/routes/console/project-[project]/functions/__layout.svelte
similarity index 100%
rename from src/routes/console/[project]/functions/__layout.svelte
rename to src/routes/console/project-[project]/functions/__layout.svelte
diff --git a/src/routes/console/[project]/functions/_create.svelte b/src/routes/console/project-[project]/functions/_create.svelte
similarity index 100%
rename from src/routes/console/[project]/functions/_create.svelte
rename to src/routes/console/project-[project]/functions/_create.svelte
diff --git a/src/routes/console/[project]/functions/function/[function]/__layout.svelte b/src/routes/console/project-[project]/functions/function/[function]/__layout.svelte
similarity index 100%
rename from src/routes/console/[project]/functions/function/[function]/__layout.svelte
rename to src/routes/console/project-[project]/functions/function/[function]/__layout.svelte
diff --git a/src/routes/console/[project]/functions/function/[function]/_create.svelte b/src/routes/console/project-[project]/functions/function/[function]/_create.svelte
similarity index 100%
rename from src/routes/console/[project]/functions/function/[function]/_create.svelte
rename to src/routes/console/project-[project]/functions/function/[function]/_create.svelte
diff --git a/src/routes/console/[project]/functions/function/[function]/index.svelte b/src/routes/console/project-[project]/functions/function/[function]/index.svelte
similarity index 94%
rename from src/routes/console/[project]/functions/function/[function]/index.svelte
rename to src/routes/console/project-[project]/functions/function/[function]/index.svelte
index 6e68b3ff6..b94ce59f4 100644
--- a/src/routes/console/[project]/functions/function/[function]/index.svelte
+++ b/src/routes/console/project-[project]/functions/function/[function]/index.svelte
@@ -58,7 +58,7 @@
+ href={`${base}/console/project-${project}/storage/bucket/${functionId}/${deployment.$id}`}>
{deployment.$id}
{deployment.activate}
diff --git a/src/routes/console/[project]/functions/function/[function]/logs.svelte b/src/routes/console/project-[project]/functions/function/[function]/logs.svelte
similarity index 100%
rename from src/routes/console/[project]/functions/function/[function]/logs.svelte
rename to src/routes/console/project-[project]/functions/function/[function]/logs.svelte
diff --git a/src/routes/console/[project]/functions/function/[function]/monitors.svelte b/src/routes/console/project-[project]/functions/function/[function]/monitors.svelte
similarity index 100%
rename from src/routes/console/[project]/functions/function/[function]/monitors.svelte
rename to src/routes/console/project-[project]/functions/function/[function]/monitors.svelte
diff --git a/src/routes/console/[project]/functions/function/[function]/settings.svelte b/src/routes/console/project-[project]/functions/function/[function]/settings.svelte
similarity index 100%
rename from src/routes/console/[project]/functions/function/[function]/settings.svelte
rename to src/routes/console/project-[project]/functions/function/[function]/settings.svelte
diff --git a/src/routes/console/[project]/functions/function/[function]/store.ts b/src/routes/console/project-[project]/functions/function/[function]/store.ts
similarity index 100%
rename from src/routes/console/[project]/functions/function/[function]/store.ts
rename to src/routes/console/project-[project]/functions/function/[function]/store.ts
diff --git a/src/routes/console/[project]/functions/function/[function]/usage.svelte b/src/routes/console/project-[project]/functions/function/[function]/usage.svelte
similarity index 100%
rename from src/routes/console/[project]/functions/function/[function]/usage.svelte
rename to src/routes/console/project-[project]/functions/function/[function]/usage.svelte
diff --git a/src/routes/console/[project]/functions/index.svelte b/src/routes/console/project-[project]/functions/index.svelte
similarity index 94%
rename from src/routes/console/[project]/functions/index.svelte
rename to src/routes/console/project-[project]/functions/index.svelte
index c77c62a26..623fcd87b 100644
--- a/src/routes/console/[project]/functions/index.svelte
+++ b/src/routes/console/project-[project]/functions/index.svelte
@@ -32,7 +32,7 @@
{#each response.functions as func}
{/each}
diff --git a/src/routes/console/[project]/index.svelte b/src/routes/console/project-[project]/index.svelte
similarity index 90%
rename from src/routes/console/[project]/index.svelte
rename to src/routes/console/project-[project]/index.svelte
index 5a0e7566b..2a2413d70 100644
--- a/src/routes/console/[project]/index.svelte
+++ b/src/routes/console/project-[project]/index.svelte
@@ -28,19 +28,19 @@
-
-
+
Settings
-
-
+
API Keys
-
-
+
Webhooks
diff --git a/src/routes/console/[project]/keys/__layout.svelte b/src/routes/console/project-[project]/keys/__layout.svelte
similarity index 100%
rename from src/routes/console/[project]/keys/__layout.svelte
rename to src/routes/console/project-[project]/keys/__layout.svelte
diff --git a/src/routes/console/[project]/keys/_create.svelte b/src/routes/console/project-[project]/keys/_create.svelte
similarity index 100%
rename from src/routes/console/[project]/keys/_create.svelte
rename to src/routes/console/project-[project]/keys/_create.svelte
diff --git a/src/routes/console/[project]/keys/index.svelte b/src/routes/console/project-[project]/keys/index.svelte
similarity index 94%
rename from src/routes/console/[project]/keys/index.svelte
rename to src/routes/console/project-[project]/keys/index.svelte
index b74d95636..7a35ca087 100644
--- a/src/routes/console/[project]/keys/index.svelte
+++ b/src/routes/console/project-[project]/keys/index.svelte
@@ -37,7 +37,7 @@
{#each $project.keys as key}
{key.name}
diff --git a/src/routes/console/[project]/keys/key/[key]/index.svelte b/src/routes/console/project-[project]/keys/key/[key]/index.svelte
similarity index 94%
rename from src/routes/console/[project]/keys/key/[key]/index.svelte
rename to src/routes/console/project-[project]/keys/key/[key]/index.svelte
index 195067163..691763677 100644
--- a/src/routes/console/[project]/keys/key/[key]/index.svelte
+++ b/src/routes/console/project-[project]/keys/key/[key]/index.svelte
@@ -19,7 +19,7 @@
type: 'success'
});
project.load(projectId);
- await goto(`${base}/console/${projectId}/keys`);
+ await goto(`${base}/console/project-${projectId}/keys`);
};
diff --git a/src/routes/console/[project]/settings/__layout.svelte b/src/routes/console/project-[project]/settings/__layout.svelte
similarity index 100%
rename from src/routes/console/[project]/settings/__layout.svelte
rename to src/routes/console/project-[project]/settings/__layout.svelte
diff --git a/src/routes/console/[project]/settings/_createDomain.svelte b/src/routes/console/project-[project]/settings/_createDomain.svelte
similarity index 100%
rename from src/routes/console/[project]/settings/_createDomain.svelte
rename to src/routes/console/project-[project]/settings/_createDomain.svelte
diff --git a/src/routes/console/[project]/settings/domains.svelte b/src/routes/console/project-[project]/settings/domains.svelte
similarity index 100%
rename from src/routes/console/[project]/settings/domains.svelte
rename to src/routes/console/project-[project]/settings/domains.svelte
diff --git a/src/routes/console/[project]/settings/index.svelte b/src/routes/console/project-[project]/settings/index.svelte
similarity index 100%
rename from src/routes/console/[project]/settings/index.svelte
rename to src/routes/console/project-[project]/settings/index.svelte
diff --git a/src/routes/console/[project]/settings/members.svelte b/src/routes/console/project-[project]/settings/members.svelte
similarity index 100%
rename from src/routes/console/[project]/settings/members.svelte
rename to src/routes/console/project-[project]/settings/members.svelte
diff --git a/src/routes/console/[project]/settings/services.svelte b/src/routes/console/project-[project]/settings/services.svelte
similarity index 100%
rename from src/routes/console/[project]/settings/services.svelte
rename to src/routes/console/project-[project]/settings/services.svelte
diff --git a/src/routes/console/[project]/storage/__layout.svelte b/src/routes/console/project-[project]/storage/__layout.svelte
similarity index 100%
rename from src/routes/console/[project]/storage/__layout.svelte
rename to src/routes/console/project-[project]/storage/__layout.svelte
diff --git a/src/routes/console/[project]/storage/_create.svelte b/src/routes/console/project-[project]/storage/_create.svelte
similarity index 79%
rename from src/routes/console/[project]/storage/_create.svelte
rename to src/routes/console/project-[project]/storage/_create.svelte
index 1e4511130..f4b926da8 100644
--- a/src/routes/console/[project]/storage/_create.svelte
+++ b/src/routes/console/project-[project]/storage/_create.svelte
@@ -2,8 +2,6 @@
import { Modal, InnerModal } from '$lib/components';
import { Pill } from '$lib/elements';
import { Button, InputText, Form, FormList } from '$lib/elements/forms';
- import { addNotification } from '$lib/stores/notifications';
-
import { sdkForProject } from '$lib/stores/sdk';
import { createEventDispatcher } from 'svelte';
@@ -14,6 +12,7 @@
let name = '';
let id: string = null;
let showDropdown = false;
+ let error: string;
const create = async () => {
try {
@@ -25,11 +24,8 @@
name = null;
showCreate = false;
dispatch('created', bucket);
- } catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ } catch ({ message }) {
+ error = message;
}
};
@@ -38,11 +34,12 @@
}
$: if (!showCreate) {
showDropdown = false;
+ error = null;
}