diff --git a/src/routes/(console)/project-[project]/overview/keys/checkbox.svelte b/src/routes/(console)/project-[project]/overview/(components)/checkbox.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/checkbox.svelte
rename to src/routes/(console)/project-[project]/overview/(components)/checkbox.svelte
diff --git a/src/routes/(console)/project-[project]/overview/(components)/create.svelte b/src/routes/(console)/project-[project]/overview/(components)/create.svelte
new file mode 100644
index 000000000..a5ccdf3db
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/(components)/create.svelte
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/(console)/project-[project]/overview/(components)/delete.svelte b/src/routes/(console)/project-[project]/overview/(components)/delete.svelte
new file mode 100644
index 000000000..74d068bde
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/(components)/delete.svelte
@@ -0,0 +1,49 @@
+
+
+
+ Are you sure you want to delete this key?
+
diff --git a/src/routes/(console)/project-[project]/overview/(components)/deleteBatch.svelte b/src/routes/(console)/project-[project]/overview/(components)/deleteBatch.svelte
new file mode 100644
index 000000000..e7ce88b45
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/(components)/deleteBatch.svelte
@@ -0,0 +1,59 @@
+
+
+
+
+ Are you sure you want to delete {keyIds.length}
+ {label} key{keyIds.length > 1 ? 's' : ''}?
+
+
diff --git a/src/lib/components/expirationInput.svelte b/src/routes/(console)/project-[project]/overview/(components)/expirationInput.svelte
similarity index 69%
rename from src/lib/components/expirationInput.svelte
rename to src/routes/(console)/project-[project]/overview/(components)/expirationInput.svelte
index 3e8286e04..0f92c7742 100644
--- a/src/lib/components/expirationInput.svelte
+++ b/src/routes/(console)/project-[project]/overview/(components)/expirationInput.svelte
@@ -19,7 +19,7 @@
return date.toISOString();
}
- const options = [
+ const defaultOptions = [
{
label: 'Never',
value: null
@@ -46,13 +46,30 @@
}
];
+ const limitedOptions = [
+ {
+ label: '1 Day',
+ value: incrementToday(1, 'day')
+ },
+ {
+ label: '7 Days',
+ value: incrementToday(7, 'day')
+ },
+ {
+ label: '30 days',
+ value: incrementToday(30, 'day')
+ }
+ ];
+
export let value: string | null = null;
- export let dateSelectorLabel: string | undefined = undefined;
- export let selectorLabel: string | undefined = 'Expiration Date';
- export let resourceType: string | 'key' | 'token' | undefined = 'key';
+ export let keyType: 'api' | 'dev' = 'api';
+
+ const options = keyType === 'api' ? defaultOptions : limitedOptions;
function initExpirationSelect() {
- if (value === null || !isValidDate(value)) return null;
+ if (value === null || !isValidDate(value)) {
+ return options[0]?.value ?? null;
+ }
let result = 'custom';
for (const option of options) {
@@ -68,20 +85,27 @@
}
let expirationSelect = initExpirationSelect();
let expirationCustom: string | null = value ?? null;
- $: helper =
- expirationSelect !== 'custom' && expirationSelect !== null
- ? `Your ${resourceType} will expire in ${toLocaleDate(value)}`
- : null;
$: {
if (!isSameDay(new Date(expirationSelect), new Date(value))) {
value = expirationSelect === 'custom' ? expirationCustom : expirationSelect;
}
}
+
+ $: helper =
+ expirationSelect !== 'custom' && expirationSelect !== null
+ ? `Your key will expire in ${toLocaleDate(value)}`
+ : undefined;
-
-
+
+
{#if expirationSelect === 'custom'}
-
+
{/if}
diff --git a/src/routes/(console)/project-[project]/overview/(components)/keyDetails.svelte b/src/routes/(console)/project-[project]/overview/(components)/keyDetails.svelte
new file mode 100644
index 000000000..570abf8a1
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/(components)/keyDetails.svelte
@@ -0,0 +1,205 @@
+
+
+
+ {label} key - Appwrite
+
+
+
+ {@const accessedAt = key.accessedAt ? toLocaleDate(key.accessedAt) : 'never'}
+
+ Key details
+
+
+ {#each Object.entries(tiles) as [label, value]}
+
+
+ {label}
+
+
+ {#if label === 'Secret'}
+
+ {:else}
+ {value}
+ {/if}
+
+
+ {/each}
+
+
+
+
+
+
+ {#if isApiKey}
+
+ {/if}
+
+
+
+
+ Delete {label} key
+ The Dev key will be permanently deleted. This action is irreversible.
+
+
+
+
+
{key.name}
+
Last accessed: {accessedAt}
+
+
+
+
diff --git a/src/routes/(console)/project-[project]/overview/(components)/table.svelte b/src/routes/(console)/project-[project]/overview/(components)/table.svelte
new file mode 100644
index 000000000..e879facb8
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/(components)/table.svelte
@@ -0,0 +1,127 @@
+
+
+{#if keys.total}
+
+
+ {#each columns as column}
+ {column.title}
+ {/each}
+
+ {#each getKeys() as key (key.$id)}
+
+
+ {key.name}
+
+
+ {key.accessedAt ? toLocaleDate(key.accessedAt) : 'never'}
+
+
+ {@const expiration = getExpiryDetails(key)}
+
+ {key.expire ? toLocaleDateTime(key.expire) : 'never'}
+
+ {#if expiration.status}
+
+ {/if}
+
+
+ {#if isApiKey}
+
+ {asApiKey(key).scopes.length} Scopes
+
+ {/if}
+
+ {/each}
+
+{:else}
+
{
+ if (isApiKey) {
+ goto(`${base}/project-${page.params.project}/overview/${slug}/create`);
+ } else {
+ $showDevKeysCreateModal = true;
+ }
+ }} />
+{/if}
+
+{#if selectedRows.length > 0}
+
+
+
+
+ {capitalize(label)}
+ {selectedRows.length > 1 ? 'keys' : 'key'}
+ selected
+
+
+
+
+
+
+
+{/if}
+
+
diff --git a/src/routes/(console)/project-[project]/overview/(components)/updateExpirationDate.svelte b/src/routes/(console)/project-[project]/overview/(components)/updateExpirationDate.svelte
new file mode 100644
index 000000000..c0d21dd97
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/(components)/updateExpirationDate.svelte
@@ -0,0 +1,100 @@
+
+
+
diff --git a/src/routes/(console)/project-[project]/overview/+layout.svelte b/src/routes/(console)/project-[project]/overview/+layout.svelte
index 1d1f9e73e..69c4534ce 100644
--- a/src/routes/(console)/project-[project]/overview/+layout.svelte
+++ b/src/routes/(console)/project-[project]/overview/+layout.svelte
@@ -52,6 +52,10 @@
return usage.load(dates.start, dates.end, dates.period);
}
+ function isTabSelected(key: string) {
+ return page.url.pathname === `${path}/${key}`;
+ }
+
$: $registerCommands([
{
label: 'Add platform',
@@ -67,11 +71,21 @@
label: 'Create API Key',
icon: IconPlus,
callback() {
- goto(`${base}/project-[project]/overview/keys/create`);
+ goto(`${base}/project-${projectId}/overview/keys/create`);
},
keys: ['c', 'k'],
group: 'integrations',
disabled: !$canWriteProjects
+ },
+ {
+ label: 'Create Dev Key',
+ icon: IconPlus,
+ callback() {
+ goto(`${base}/project-${projectId}/overview/dev-keys/create`);
+ },
+ keys: ['c', 'd', 'k'],
+ group: 'integrations',
+ disabled: !$canWriteProjects
}
]);
@@ -205,28 +219,31 @@
{/if}
-
-
- Integrations
-
-
- Platforms
- API keys
-
- {#if $action}
-
- {/if}
-
-
+
+ Integrations
+
+
+ Platforms
+ API keys
+ Dev keys
+
+ {#if $action}
+
+ {/if}
-
+
+
diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/+page.svelte b/src/routes/(console)/project-[project]/overview/dev-keys/+page.svelte
new file mode 100644
index 000000000..35382191b
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/dev-keys/+page.svelte
@@ -0,0 +1,12 @@
+
+
+
diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/+page.ts b/src/routes/(console)/project-[project]/overview/dev-keys/+page.ts
new file mode 100644
index 000000000..5f7e3e623
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/dev-keys/+page.ts
@@ -0,0 +1,13 @@
+import { Dependencies } from '$lib/constants';
+import { sdk } from '$lib/stores/sdk';
+import { selectedTab } from '../store';
+import type { PageLoad } from './$types';
+
+selectedTab.set('dev-keys');
+
+export const load: PageLoad = async ({ params, depends }) => {
+ depends(Dependencies.DEV_KEYS);
+ return {
+ devKeys: await sdk.forConsole.projects.listDevKeys(params.project)
+ };
+};
diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page.ts b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page.ts
new file mode 100644
index 000000000..d54a142ca
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page.ts
@@ -0,0 +1,22 @@
+import Header from './header.svelte';
+import Breadcrumbs from './breadcrumbs.svelte';
+import { sdk } from '$lib/stores/sdk';
+import { Dependencies } from '$lib/constants';
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({ params, depends }) => {
+ depends(Dependencies.DEV_KEY);
+
+ const key = await sdk.forConsole.projects.getDevKey(params.project, params.key);
+ if (key.expire) {
+ key.expire = new Date(key.expire).toISOString().slice(0, 23);
+ } else {
+ key.expire = undefined;
+ }
+
+ return {
+ header: Header,
+ breadcrumbs: Breadcrumbs,
+ key
+ };
+};
diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page@project-[project].svelte b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page@project-[project].svelte
new file mode 100644
index 000000000..9e16d83b5
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/+page@project-[project].svelte
@@ -0,0 +1,6 @@
+
+
+
diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/breadcrumbs.svelte
new file mode 100644
index 000000000..a1a2f9f7c
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/breadcrumbs.svelte
@@ -0,0 +1,28 @@
+
+
+
diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/header.svelte b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/header.svelte
new file mode 100644
index 000000000..f2a19f346
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/header.svelte
@@ -0,0 +1,17 @@
+
+
+
+
+
+ {$devKey?.name}
+
+
+
diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/[key]/store.ts b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/store.ts
new file mode 100644
index 000000000..baf2031a7
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/dev-keys/[key]/store.ts
@@ -0,0 +1,5 @@
+import { page } from '$app/stores';
+import { derived } from 'svelte/store';
+import type { Models } from '@appwrite.io/console';
+
+export const devKey = derived(page, ($page) => $page.data.key as Models.DevKey);
diff --git a/src/routes/(console)/project-[project]/overview/dev-keys/action.svelte b/src/routes/(console)/project-[project]/overview/dev-keys/action.svelte
new file mode 100644
index 000000000..306188b52
--- /dev/null
+++ b/src/routes/(console)/project-[project]/overview/dev-keys/action.svelte
@@ -0,0 +1,80 @@
+
+
+{#if $canWriteKeys}
+
+
+
+{/if}
diff --git a/src/routes/(console)/project-[project]/overview/keys/+page.svelte b/src/routes/(console)/project-[project]/overview/keys/+page.svelte
index 561364ae7..f9f98b736 100644
--- a/src/routes/(console)/project-[project]/overview/keys/+page.svelte
+++ b/src/routes/(console)/project-[project]/overview/keys/+page.svelte
@@ -1,50 +1,12 @@
-{#if data.keys.total}
-
-
- Name
- Last accessed
- Expiration date
- Scopes
-
- {#each data.keys.keys as key}
-
-
- {key.name}
-
-
- {key.accessedAt ? toLocaleDate(key.accessedAt) : 'never'}
-
-
- {key.expire ? toLocaleDateTime(key.expire) : 'never'}
-
-
- {key.scopes.length} Scopes
-
-
- {/each}
-
-{:else}
- goto(`${base}/project-${page.params.project}/overview/keys/create`)} />
-{/if}
+
diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/(console)/project-[project]/overview/keys/[key]/+page@project-[project].svelte
index b9dbf675e..82d29d955 100644
--- a/src/routes/(console)/project-[project]/overview/keys/[key]/+page@project-[project].svelte
+++ b/src/routes/(console)/project-[project]/overview/keys/[key]/+page@project-[project].svelte
@@ -1,165 +1,6 @@
-
- API key - Appwrite
-
-
-
- {@const accessedAt = $key.accessedAt ? toLocaleDate($key.accessedAt) : 'never'}
-
- {$key.name}
-
-
- Last accessed: {accessedAt}
- Scopes granted: {$key.scopes.length}
-
-
-
-
-
- API key secret
-
-
-
-
-
-
-
-
-
-
-
- Delete API key
- The API key will be permanently deleted. This action is irreversible.
-
-
-
-
-
{$key.name}
-
Last accessed: {accessedAt}
-
-