Merge branch 'main' of github.com:appwrite/console into billing

This commit is contained in:
Arman committed 2023-06-15 16:48:34 +02:00
commit 50c376e558
11 files changed
+191 -24

No files matched your search

+6 -3
View File
@@ -21,7 +21,8 @@
{#if single}
<article class="card u-grid u-cross-center u-width-full-line common-section">
<div class="u-flex u-flex-vertical u-cross-center u-gap-24">
<div
class="u-flex u-flex-vertical u-cross-center u-gap-24 u-width-full-line u-overflow-hidden">
<button
type="button"
on:click|preventDefault
@@ -40,12 +41,14 @@
</button>
<slot>
<div class="u-text-center">
<Heading size="7" tag="h2">Create your first {target} to get started.</Heading>
<Heading size="7" tag="h2" trimmed={false}>
Create your first {target} to get started.
</Heading>
<p class="body-text-2 u-bold u-margin-block-start-4">
Need a hand? Learn more in our documentation.
</p>
</div>
<div class="u-flex u-gap-16 u-main-center">
<div class="u-flex u-flex-wrap u-gap-16 u-main-center">
<Button
external
{href}
+20 -5
View File
@@ -2,11 +2,28 @@
import type { Action } from 'svelte/action';
export let isSticky = false;
let isOverflowing = false;
const hasOverflow: Action<HTMLDivElement, (value: boolean) => void> = (node, callback) => {
const hasOverflow: Action<HTMLDivElement> = (node) => {
const observer = new ResizeObserver((entries) => {
for (const entry of entries) {
callback(entry.contentRect.width < entry.target.scrollWidth);
let overflowing = false;
if (entry.contentRect.width < entry.target.scrollWidth) {
overflowing = true;
}
const cols = entry.target.querySelectorAll('.table-thead-col');
for (let i = 0; i < cols.length; i++) {
const col = cols[i];
const cs = getComputedStyle(col);
const innerWidth =
col.clientWidth - parseFloat(cs.paddingLeft) - parseFloat(cs.paddingRight);
if (innerWidth < 32) {
overflowing = true;
}
}
isOverflowing = overflowing;
}
});
@@ -18,12 +35,10 @@
}
};
};
let isOverflowing = false;
</script>
<div class="table-with-scroll u-margin-block-start-32" data-private>
<div class="table-wrapper" use:hasOverflow={(v) => (isOverflowing = v)}>
<div class="table-wrapper" use:hasOverflow>
<table class="table" class:is-sticky-scroll={isSticky && isOverflowing}>
<slot />
</table>
+2
View File
@@ -7,6 +7,7 @@ import Okta from '../../routes/console/project-[project]/auth/oktaOAuth.svelte';
import Auth0 from '../../routes/console/project-[project]/auth/auth0OAuth.svelte';
import Authentik from '../../routes/console/project-[project]/auth/authentikOAuth.svelte';
import GitLab from '../../routes/console/project-[project]/auth/gitlabOAuth.svelte';
import Google from '../../routes/console/project-[project]/auth/googleOAuth.svelte';
import Main from '../../routes/console/project-[project]/auth/mainOAuth.svelte';
export type Provider = Models.Provider & {
@@ -81,6 +82,7 @@ const setProviders = (project: Models.Project): Provider[] => {
break;
case 'google':
docs = 'https://support.google.com/googleapi/answer/6158849';
component = Google;
break;
case 'linkedin':
docs = 'https://developer.linkedin.com/';
@@ -0,0 +1,82 @@
<script lang="ts">
import { page } from '$app/stores';
import { Alert, CopyInput, Modal } from '$lib/components';
import { Button, FormList, InputPassword, InputSwitch, InputText } from '$lib/elements/forms';
import type { Provider } from '$lib/stores/oauth-providers';
import { sdk } from '$lib/stores/sdk';
import { onMount } from 'svelte';
import { updateOAuth } from './updateOAuth';
export let provider: Provider;
const projectId = $page.params.project;
let enabled: boolean = null;
let appId: string = null;
let secret: string = null;
onMount(() => {
enabled ??= provider.enabled;
appId ??= provider.appId;
secret ??= provider.secret;
});
let error: string;
const update = async () => {
const result = await updateOAuth({ projectId, provider, secret, appId, enabled });
if (result.status === 'error') {
error = result.message;
} else {
provider = null;
}
};
</script>
<Modal {error} size="big" show onSubmit={update} on:close>
<svelte:fragment slot="header">{provider.name} OAuth2 Settings</svelte:fragment>
<FormList>
<p>
To use {provider.name} authentication in your application, first fill in this form. For more
info you can
<a class="link" href={provider.docs} target="_blank" rel="noopener noreferrer"
>visit the docs.</a>
</p>
<InputSwitch id="state" bind:value={enabled} label={enabled ? 'Enabled' : 'Disabled'} />
<InputText
id="appID"
label="App ID"
autofocus={true}
placeholder="Enter ID"
bind:value={appId} />
<InputPassword
id="secret"
label="App Secret"
placeholder="Enter App Secret"
minlength={0}
showPasswordButton
bind:value={secret} />
<Alert type="info">
To complete the setup, create an OAuth2 client ID with "Web application" as the
application type, then add this redirect URI to your {provider.name} configuration.
</Alert>
<div>
<p>URI</p>
<CopyInput
value={`${
sdk.forConsole.client.config.endpoint
}/account/sessions/oauth2/callback/${provider.name.toLocaleLowerCase()}/${projectId}`} />
</div>
</FormList>
<svelte:fragment slot="footer">
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
<Button
disabled={!appId ||
!secret ||
(appId === provider.appId &&
secret === provider.secret &&
enabled === provider.enabled)}
submit>Update</Button>
</svelte:fragment>
</Modal>
@@ -1,17 +1,17 @@
<script lang="ts">
import { page } from '$app/stores';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { CardGrid, Heading } from '$lib/components';
import { Pill } from '$lib/elements';
import { InputSwitch } from '$lib/elements/forms';
import { Container } from '$lib/layout';
import { app } from '$lib/stores/app';
import { authMethods, type AuthMethod } from '$lib/stores/auth-methods';
import { addNotification } from '$lib/stores/notifications';
import type { Provider } from '$lib/stores/oauth-providers';
import { OAuthProviders } from '$lib/stores/oauth-providers';
import { sdk } from '$lib/stores/sdk';
import { project } from '../../store';
import { authMethods, type AuthMethod } from '$lib/stores/auth-methods';
import { OAuthProviders } from '$lib/stores/oauth-providers';
import { app } from '$lib/stores/app';
import { page } from '$app/stores';
import type { Provider } from '$lib/stores/oauth-providers';
import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
const projectId = $page.params.project;
@@ -78,7 +78,7 @@
provider: provider.name.toLowerCase()
});
}}>
<div class="image-item">
<div class="avatar">
<img
height="20"
width="20"
@@ -15,6 +15,7 @@
try {
await sdk.forProject.users.deleteSession($page.params.user, selectedSessionId);
await invalidate(Dependencies.SESSIONS);
showDelete = false;
addNotification({
type: 'success',
message: 'Session has been deleted'
@@ -1,16 +1,16 @@
<script lang="ts">
import { EmptySearch } from '$lib/components';
import { Pill } from '$lib/elements';
import { Button } from '$lib/elements/forms';
import {
Table,
TableBody,
TableHeader,
TableRow,
TableCellHead,
TableCell,
TableCellText
TableCellHead,
TableCellText,
TableHeader,
TableRow
} from '$lib/elements/table';
import { Pill } from '$lib/elements';
import { Button } from '$lib/elements/forms';
import { Container } from '$lib/layout';
import { sdk } from '$lib/stores/sdk';
import DeleteAllSessions from '../deleteAllSessions.svelte';
@@ -47,7 +47,7 @@
<TableRow>
<TableCell title="Client">
<div class="u-flex u-gap-12 u-cross-center">
<div class="image-item">
<div class="avatar">
<img
height="20"
width="20"
@@ -32,6 +32,7 @@
import type { PageData } from './$types';
import Delete from './delete.svelte';
import Create from './create.svelte';
import Rebuild from './rebuild.svelte';
import Activate from './activate.svelte';
import { browser } from '$app/environment';
import { sdk } from '$lib/stores/sdk';
@@ -44,6 +45,7 @@
let showDropdown = [];
let showDelete = false;
let showActivate = false;
let showRebuild = false;
let selectedDeployment: Models.Deployment = null;
@@ -51,6 +53,10 @@
invalidate(Dependencies.DEPLOYMENTS);
}
function handleRebuild() {
invalidate(Dependencies.DEPLOYMENTS);
}
$: activeDeployment = data.deployments.deployments.find((d) => d.$id === $func?.deployment);
if (browser) {
@@ -215,6 +221,17 @@
}}>
Activate
</DropListItem>
{#if 'failed' === deployment.status}
<DropListItem
icon="refresh"
on:click={() => {
selectedDeployment = deployment;
showRebuild = true;
showDropdown = [];
}}>
Retry Build
</DropListItem>
{/if}
<DropListItem
icon="terminal"
on:click={() => {
@@ -281,4 +298,5 @@
{#if selectedDeployment}
<Delete {selectedDeployment} bind:showDelete />
<Activate {selectedDeployment} bind:showActivate on:activated={handleActivate} />
<Rebuild {selectedDeployment} bind:showRebuild on:rebuild={handleRebuild} />
{/if}
@@ -0,0 +1,46 @@
<script lang="ts">
import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
import { Modal } from '$lib/components';
import { Button } from '$lib/elements/forms';
import { addNotification } from '$lib/stores/notifications';
import { sdk } from '$lib/stores/sdk';
import type { Models } from '@appwrite.io/console';
import { createEventDispatcher } from 'svelte';
export let showRebuild = false;
export let selectedDeployment: Models.Deployment = null;
const dispatch = createEventDispatcher();
const handleSubmit = async () => {
try {
await sdk.forProject.functions.createBuild(
selectedDeployment.resourceId,
selectedDeployment.$id,
selectedDeployment.buildId
);
showRebuild = false;
addNotification({
type: 'success',
message: `Retrying build`
});
dispatch('rebuild');
trackEvent(Submit.DeploymentUpdate);
} catch (error) {
addNotification({
type: 'error',
message: error.message
});
trackError(error, Submit.DeploymentUpdate);
}
};
</script>
<Modal bind:show={showRebuild} onSubmit={handleSubmit}>
<svelte:fragment slot="header">Retry build</svelte:fragment>
<p>Are you sure you want to retry building this deployment?</p>
<svelte:fragment slot="footer">
<Button text on:click={() => (showRebuild = false)}>Cancel</Button>
<Button secondary submit>Retry build</Button>
</svelte:fragment>
</Modal>
@@ -49,7 +49,7 @@
<Heading tag="h6" size="7">Schedule</Heading>
<p>
Set a Cron schedule to trigger your function. Leave blank for no schedule. <a
href="https://en.wikipedia.org/wiki/Cron"
href="https://appwrite.io/docs/functions#scheduled-execution"
target="_blank"
rel="noopener noreferrer"
class="link">
@@ -65,7 +65,7 @@
},
[Platform.Web]: {
name: 'My Web App',
hostname: 'com.company.appname',
hostname: 'localhost',
tooltip:
'The hostname that your website will use to interact with the Appwrite APIs in production or development environments. No protocol or port number required.'
},