8000 feat: improve api keys by ArmanNik · Pull Request #460 · appwrite/console · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat: improve api keys #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat: improve api keys #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/lib/helpers/date.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const toLocaleDate = (datetime: string) => {
export const toLocaleDate = (datetime: string | number) => {
const date = new Date(datetime);
const options: Intl.DateTimeFormatOptions = {
year: 'numeric',
Expand Down Expand Up @@ -35,7 +35,22 @@ export const isValidDate = (date: string) => {
return !isNaN(new Date(date).getTime());
};

export const diffDays = (date1: Date, date2: Date) => {
const diffTime = Math.abs(date2.getTime() - date1.getTime());
export const diffDays = (date1: Date, date2: Date, absoluteValue = true) => {
const diffTime = absoluteValue
? Math.abs(date2.getTime() - date1.getTime())
: date2.getTime() - date1.getTime();
return Math.floor(diffTime / (1000 * 60 * 60 * 24));
};

export const readableDateString = (datetime: string | number) => {
const today = new Date();
const yesterday = new Date(today.getTime() - 24 * 60 * 60 * 1000);
const date = new Date(datetime);
if (isSameDay(today, date)) {
return 'Today';
} else if (isSameDay(yesterday, date)) {
return 'Yesterday';
} else {
return toLocaleDate(datetime);
}
};
40 changes: 33 additions & 7 deletions src/routes/console/project-[project]/overview/keys/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,42 @@
<script lang="ts">
import { Empty, Heading } from '$lib/components';
import { Pill } from '$lib/elements';
import { Button } from '$lib/elements/forms';
import {
Table,
TableBody,
TableCell,
TableCellHead,
TableCellText,
TableHeader,
TableRowLink
} from '$lib/elements/table';
import { toLocaleDateTime } from '$lib/helpers/date';
import { diffDays, readableDateString, toLocaleDateTime } from '$lib/helpers/date';
import { wizard } from '$lib/stores/wizard';
import type { PageData } from './$types';
import Wizard from './wizard.svelte';

export let data: PageData;

const today = new Date();

function create() {
wizard.start(Wizard);
}

const keys = [
{
$id: '63e28c0c91e9263384f6',
$createdAt: '2023-02-07T17:36:12.597+00:00',
$updatedAt: '2023-02-07T17:36:12.597+00:00',
name: 'Never',
expire: '2023-06-11T17:36:12.597+00:00',
scopes: [],
secret: 'ecb58b47b3d2eaf6f91ac8e67e7e9681abbe93ad5f3cd86b4748c275f1c1a631eccf5cc9de1e96ba00d705f847e65b2ee36486f4bfdcf08e4e841ec2bb784900a087932cc8aab03d30cd01fef45ced6c127f875ac34a0edbce910a26b28896bac8d73057dc78908a2bfaf4527e00f58d41fc0125b7aa35acb38e3c178aa91299',
accessedAt: '2023-06-04T17:36:12.597+00:00',
sdks: []
}
];
</script>

<div class="common-section u-flex u-gap-12">
Expand All @@ -34,23 +52,31 @@
{#if data.keys.total}
<Table>
<TableHeader>
<TableCellHead>Name</TableCellHead>
<TableCellHead width={150}>Name</TableCellHead>
<TableCellHead onlyDesktop>last accessed</TableCellHead>
<TableCellHead onlyDesktop>expiration date</TableCellHead>
<TableCellHead onlyDesktop>scopes</TableCellHead>
</TableHeader>
<TableBody>
{#each data.keys.keys as key}
{#each keys as key}
{@const diff = diffDays(today, new Date(key.expire), false)}
<TableRowLink href={`keys/${key.$id}`}>
<TableCellText title="Name">
{key.name}
</TableCellText>
<TableCellText onlyDesktop title="Last Accessed">
{key.accessedAt ? toLocaleDateTime(key.accessedAt) : 'never'}
</TableCellText>
<TableCellText onlyDesktop title="Expiration Date">
{key.expire ? toLocaleDateTime(key.expire) : 'never'}
{key.accessedAt ? readableDateString(key.accessedAt) : 'never'}
</TableCellText>
<TableCell onlyDesktop title="Expiration Date">
<span class="u-flex u-gap-12 u-cross-center">
{key.expire ? toLocaleDateTime(key.expire) : 'never'}
{#if diff <= 0}
<Pill warning>Expired</Pill>
{:else if diff <= 7}
<Pill warning>Expiring Soon</Pill>
{/if}
</span>
</TableCell>
<TableCellText onlyDesktop title="Expiration Date">
{key.scopes.length} Scopes
</TableCellText>
Expand Down
0