This commit is contained in:
Torsten Dittmann committed 2023-08-24 13:59:32 +02:00
commit 9303df00e0
13 files changed
+119 -109

No files matched your search

+16 -16
View File
@@ -9,8 +9,8 @@
"@analytics/google-analytics": "^1.0.5",
"@analytics/google-tag-manager": "^0.5.3",
"@appwrite.io/console": "npm:matej-appwrite-console@7.1.128",
"@appwrite.io/pink": "0.1.0-next.4",
"@appwrite.io/pink-icons": "^0.1.0-next.4",
"@appwrite.io/pink": "0.1.0-next.5",
"@appwrite.io/pink-icons": "^0.1.0-next.5",
"@popperjs/core": "^2.11.6",
"@sentry/svelte": "^7.44.2",
"@sentry/tracing": "^7.44.2",
@@ -177,19 +177,19 @@
}
},
"node_modules/@appwrite.io/pink": {
"version": "0.1.0-next.4",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.4.tgz",
"integrity": "sha512-vZEKuSiw3tFdimx7yeVOujECFT6wKWvQmFgwlkOw6sYstylUVVQD0XCioZC91vj+48xutqn/sooCVAnb1xbENQ==",
"version": "0.1.0-next.5",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.5.tgz",
"integrity": "sha512-Mwblf5mh6Mojlwc5QUVVJ+fuLl0ixEVsTVoTt7AGp9u5Gvu4yRIRXqppfjSuD/kfgjX1zP74sEM8jcwUQLL4QQ==",
"dependencies": {
"@appwrite.io/pink-icons": "0.1.0-next.4",
"@appwrite.io/pink-icons": "0.1.0-next.5",
"normalize.css": "^8.0.1",
"the-new-css-reset": "^1.7.3"
}
},
"node_modules/@appwrite.io/pink-icons": {
"version": "0.1.0-next.4",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.4.tgz",
"integrity": "sha512-DV7i69OHrV97mQYOFhiRZlgy5HtsuAUmW7Ih9CjBTU+1Je3srFFVg3msKgNIjhB4zH9xmBxUyMBFi0Lea4+irA=="
"version": "0.1.0-next.5",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.5.tgz",
"integrity": "sha512-/YGA5MKTzOA3MEgoNOkv1iT5NaKXAv2oZyq8MA6N0iWnEgskKMSX+byzooTfwDqDIJ3J5/Hxrg/j2NttyZyppQ=="
},
"node_modules/@babel/code-frame": {
"version": "7.22.5",
@@ -8917,19 +8917,19 @@
}
},
"@appwrite.io/pink": {
"version": "0.1.0-next.4",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.4.tgz",
"integrity": "sha512-vZEKuSiw3tFdimx7yeVOujECFT6wKWvQmFgwlkOw6sYstylUVVQD0XCioZC91vj+48xutqn/sooCVAnb1xbENQ==",
"version": "0.1.0-next.5",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.5.tgz",
"integrity": "sha512-Mwblf5mh6Mojlwc5QUVVJ+fuLl0ixEVsTVoTt7AGp9u5Gvu4yRIRXqppfjSuD/kfgjX1zP74sEM8jcwUQLL4QQ==",
"requires": {
"@appwrite.io/pink-icons": "0.1.0-next.4",
"@appwrite.io/pink-icons": "0.1.0-next.5",
"normalize.css": "^8.0.1",
"the-new-css-reset": "^1.7.3"
}
},
"@appwrite.io/pink-icons": {
"version": "0.1.0-next.4",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.4.tgz",
"integrity": "sha512-DV7i69OHrV97mQYOFhiRZlgy5HtsuAUmW7Ih9CjBTU+1Je3srFFVg3msKgNIjhB4zH9xmBxUyMBFi0Lea4+irA=="
"version": "0.1.0-next.5",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.5.tgz",
"integrity": "sha512-/YGA5MKTzOA3MEgoNOkv1iT5NaKXAv2oZyq8MA6N0iWnEgskKMSX+byzooTfwDqDIJ3J5/Hxrg/j2NttyZyppQ=="
},
"@babel/code-frame": {
"version": "7.22.5",
+2 -2
View File
@@ -21,8 +21,8 @@
"@analytics/google-analytics": "^1.0.5",
"@analytics/google-tag-manager": "^0.5.3",
"@appwrite.io/console": "npm:matej-appwrite-console@7.1.128",
"@appwrite.io/pink": "0.1.0-next.4",
"@appwrite.io/pink-icons": "^0.1.0-next.4",
"@appwrite.io/pink": "0.1.0-next.5",
"@appwrite.io/pink-icons": "^0.1.0-next.5",
"@popperjs/core": "^2.11.6",
"@sentry/svelte": "^7.44.2",
"@sentry/tracing": "^7.44.2",
+3 -1
View File
@@ -13,7 +13,8 @@
class="secondary-tabs-button"
class:u-width-full-line={fullWidth}
class:u-text-center={center}
disabled>
disabled
type="button">
<span class="text"><slot /></span>
</button>
{:else}
@@ -30,6 +31,7 @@
class="secondary-tabs-button"
class:u-width-full-line={fullWidth}
class:u-text-center={center}
type="button"
{disabled}
on:click>
<span class="text"><slot /></span>
+3 -3
View File
@@ -173,7 +173,7 @@
</section>
<section class="drop-section">
<ul class="u-flex u-gap-12">
<li>
<li class="u-stretch">
<label class="image-radio">
<img src={LightMode} alt="light mode" />
<input
@@ -188,7 +188,7 @@
value="light" />
</label>
</li>
<li>
<li class="u-stretch">
<label class="image-radio">
<img src={DarkMode} alt="dark mode" />
<input
@@ -203,7 +203,7 @@
value="dark" />
</label>
</li>
<li>
<li class="u-stretch">
<label class="image-radio">
<img src={SystemMode} alt="system mode" />
<input
@@ -14,7 +14,7 @@
id={appwriteVariable.name}
label={appwriteVariable.name}
placeholder={appwriteVariable.placeholder ?? 'Enter value'}
required={appwriteVariable.required}
required={appwriteVariable.required && !$templateConfig.generateKey}
bind:value={$templateConfig.appwriteApiKey}
disabled={!!$templateConfig.generateKey} />
<Helper type="neutral">
@@ -11,7 +11,10 @@
if (!variable.required) {
continue;
}
if (variable.name === 'APPWRITE_API_KEY') {
if ($templateConfig.appwriteApiKey || $templateConfig.generateKey) continue;
else throw new Error(`Please set ${variable.name} variable or generate it.`);
}
if (!$templateConfig.variables[variable.name]) {
throw new Error(`Please set ${variable.name} variable.`);
}
@@ -35,9 +35,10 @@
import EmailMagicUrlTemplate from './emailMagicUrlTemplate.svelte';
import EmailRecoveryTemplate from './emailRecoveryTemplate.svelte';
import EmailInviteTemplate from './emailInviteTemplate.svelte';
import SmsVerificationTemplate from './smsVerificationTemplate.svelte';
import SmsLoginTemplate from './smsLoginTemplate.svelte';
import { baseEmailTemplate, baseSmsTemplate, emailTemplate, smsTemplate } from './store';
// import SmsVerificationTemplate from './smsVerificationTemplate.svelte';
// import SmsLoginTemplate from './smsLoginTemplate.svelte';
// import { baseEmailTemplate, baseSmsTemplate, emailTemplate, smsTemplate } from './store';
import { baseEmailTemplate, emailTemplate } from './store';
import { Button } from '$lib/elements/forms';
export let data;
@@ -49,14 +50,14 @@
$: emailResetPassword = emailOpen === 'recovery';
$: emailInviteUser = emailOpen === 'invitation';
let smsOpen = 'verification';
$: smsVerificationOpen = smsOpen === 'verification';
$: smsLoginOpen = smsOpen === 'login';
$: smsInvitationOpen = smsOpen === 'invitation';
// let smsOpen = 'verification';
// $: smsVerificationOpen = smsOpen === 'verification';
// $: smsLoginOpen = smsOpen === 'login';
// $: smsInvitationOpen = smsOpen === 'invitation';
onMount(async () => {
openEmail('verification');
openSms('verification');
// openSms('verification');
});
async function openEmail(type: string) {
@@ -65,11 +66,11 @@
$baseEmailTemplate = { ...$emailTemplate };
}
async function openSms(type: string) {
type === smsOpen ? (smsOpen = null) : (smsOpen = type);
$smsTemplate = await loadSmsTemplate(projectId, type, 'en');
$baseSmsTemplate = { ...$smsTemplate };
}
// async function openSms(type: string) {
// type === smsOpen ? (smsOpen = null) : (smsOpen = type);
// $smsTemplate = await loadSmsTemplate(projectId, type, 'en');
// $baseSmsTemplate = { ...$smsTemplate };
// }
</script>
<Container>
@@ -170,14 +171,13 @@
</svelte:fragment>
</CardGrid>
<CardGrid>
<!-- <CardGrid>
<Heading size="7" tag="h3">SMS templates</Heading>
<p class="text">
Use templates to send and process account management mobile messages. <a
href="https://appwrite.io/docs"
class="link">
Learn more about SMS templates</a
>. <!-- TODO Docs link -->
</p>
<svelte:fragment slot="aside">
@@ -218,5 +218,5 @@
</CollapsibleItem>
</Collapsible>
</svelte:fragment>
</CardGrid>
</CardGrid>-->
</Container>
@@ -98,7 +98,7 @@
}.svg`}
alt="technology" />
</div>
<div class="u-flex-vertical u-gap-4">
<div class="u-grid-equal-row-size u-gap-4 u-line-height-1">
<p><b>Deployment ID</b></p>
<Id value={$func.deployment}>
@@ -110,7 +110,7 @@
{@const status = activeDeployment.status}
{@const fileSize = humanFileSize(activeDeployment.size)}
<div class="u-flex u-main-space-between">
<div class="u-flex-vertical u-gap-4">
<div class="u-grid-equal-row-size u-gap-4 u-line-height-1">
<p><b>Build time:</b> {calculateTime(activeDeployment.buildTime)}</p>
<p>
<b>Updated:</b>
@@ -264,7 +264,7 @@
<DropListLink
icon="terminal"
href={`/console/project-${$page.params.project}/functions/function-${$page.params.function}/deployment-${deployment.$id}`}>
Output
Logs
</DropListLink>
<DropListItem
icon="trash"
@@ -53,23 +53,19 @@
}.svg`}
alt="technology" />
</div>
<div>
<div class="u-flex u-gap-12 u-cross-center">
<p><b>Deployment ID</b></p>
</div>
<div class="u-grid-equal-row-size u-gap-4 u-line-height-1">
<p><b>Deployment ID</b></p>
<div class="u-flex u-gap-12 u-cross-center">
<Id value={$deployment.$id}>
{$deployment.$id}
</Id>
</div>
<Id value={$deployment.$id}>
{$deployment.$id}
</Id>
</div>
</div>
<svelte:fragment slot="aside">
{@const status = $deployment.status}
{@const fileSize = humanFileSize($deployment.size)}
<div class="u-flex u-main-space-between">
<div>
<div class="u-grid-equal-row-size u-gap-4 u-line-height-1">
<p>
<b>Build time:</b>
{#if ['processing', 'building'].includes($deployment.status)}
@@ -116,7 +112,7 @@
</CardGrid>
<Card>
<div class="u-stretch u-margin-block-start-32 u-overflow-hidden">
<div class="u-stretch u-overflow-hidden">
<section class="code-panel">
<header class="code-panel-header u-flex u-main-space-between u-width-full-line">
<div class="u-flex u-flex-vertical">
@@ -18,7 +18,7 @@
},
{
href: `/console/project-${$project?.$id}/functions/function-${$func?.$id}/deployment-${$deployment?.$id}`,
title: 'Deployment details'
title: 'Deployment'
}
];
</script>
@@ -11,7 +11,7 @@
<Cover>
<svelte:fragment slot="header">
<CoverTitle href={`/console/project-${projectId}/functions/function-${functionId}`}>
Deployment details
Deployment
</CoverTitle>
<Id value={$deployment.$id}>{$deployment.$id}</Id>
</svelte:fragment>
@@ -1,5 +1,6 @@
<script lang="ts">
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { SecondaryTabs, SecondaryTabsItem } from '$lib/components';
import Copy from '$lib/components/copy.svelte';
import Modal from '$lib/components/modal.svelte';
import Button from '$lib/elements/forms/button.svelte';
@@ -15,10 +16,10 @@
export let sdkUpdateVariable: (variableId: string, key: string, value: string) => Promise<any>;
export let sdkDeleteVariable: (variableId: string) => Promise<any>;
let error = '';
let envCode = variableList.variables
.map((variable) => `${variable.key}=${variable.value}`)
.join('\n');
let jsonCode = JSON.stringify(
JSON.parse(
`{${variableList.variables
@@ -28,6 +29,8 @@
null,
2
);
const baseEnvCode = envCode;
const baseJsonCode = jsonCode;
if (jsonCode === '{}') {
jsonCode = '';
@@ -76,15 +79,9 @@
});
trackEvent(Submit.VariableEditor);
} catch (error) {
showEditor = false;
addNotification({
type: 'error',
message: error.message
});
trackError(error, Submit.VariableEditor);
} catch (e) {
error = e.message;
trackError(e, Submit.VariableEditor);
}
}
@@ -108,6 +105,9 @@
document.body.removeChild(link);
window.URL.revokeObjectURL(url);
}
$: isButtonDisabled =
(tab === 'env' && baseEnvCode === envCode) || (tab === 'json' && baseJsonCode === jsonCode);
</script>
<Modal
@@ -115,6 +115,7 @@
headerDivider={false}
bind:show={showEditor}
onSubmit={handleSubmit}
bind:error
size="big">
<p>
Edit {isGlobal ? 'global' : 'environment'} variables below or download as a
@@ -122,37 +123,44 @@
</p>
<div class="editor-border">
<ul class="secondary-tabs is-large u-sep-block-end u-padding-8">
<li class="secondary-tabs-item u-stretch">
<button
type="button"
on:click={() => (tab = 'env')}
class="secondary-tabs-button u-width-full-line u-text-center"
disabled={tab === 'env'}><span class="text">ENV</span></button>
</li>
<li class="secondary-tabs-item u-stretch">
<button
type="button"
on:click={() => (tab = 'json')}
class="secondary-tabs-button u-width-full-line u-text-center"
disabled={tab === 'json'}><span class="text">JSON</span></button>
</li>
</ul>
<SecondaryTabs large class="u-sep-block-end u-padding-8">
<SecondaryTabsItem
stretch
fullWidth
center
on:click={() => (tab = 'env')}
disabled={tab === 'env'}>
ENV
</SecondaryTabsItem>
<SecondaryTabsItem
stretch
fullWidth
center
on:click={() => (tab = 'json')}
disabled={tab === 'json'}>
JSON
</SecondaryTabsItem>
</SecondaryTabs>
{#if tab === 'env'}
<textarea
placeholder={`SECRET_KEY=dQw4w9WgXcQ...`}
class="input-text u-border-width-0"
bind:value={envCode} />
{:else if tab === 'json'}
<textarea
placeholder={`{\n "SECRET_KEY": "dQw4w9WgXcQ..."\n}`}
class="input-text u-border-width-0"
bind:value={jsonCode} />
{/if}
<div class="u-flex u-width-full-line u-main-end u-padding-12">
<ul class="buttons-list">
<div class="input-text-wrapper">
{#if tab === 'env'}
<textarea
placeholder={`SECRET_KEY=dQw4w9WgXcQ...`}
class="input-text u-border-width-0"
bind:value={envCode}
style:--amount-of-buttons={0.25}
style:border-radius="var(--border-radius-small)" />
{:else if tab === 'json'}
<textarea
placeholder={`{\n "SECRET_KEY": "dQw4w9WgXcQ..."\n}`}
class="input-text u-border-width-0"
bind:value={jsonCode}
style:--amount-of-buttons={0.25}
style:border-radius="var(--border-radius-small)" />
{/if}
<ul
class="buttons-list u-gap-8 u-cross-center u-position-absolute d u-inset-block-end-1 u-inset-inline-end-1 u-padding-block-8 u-padding-inline-12"
style="border-end-end-radius:0.0625rem;">
<li class="buttons-list-item">
<div class="tooltip" aria-label={`Download .${tab} file`}>
<button
@@ -162,7 +170,9 @@
aria-label={`Download .${tab} file`}>
<span class="icon-download" aria-hidden="true" />
</button>
<span class="tooltip-popup" role="tooltip"> Download .{tab} file. </span>
<span class="tooltip-popup" role="tooltip">
Download .{tab} file.
</span>
</div>
</li>
<li class="buttons-list-item">
@@ -185,7 +195,7 @@
<svelte:fragment slot="footer">
<Button secondary on:click={() => (showEditor = false)}>Cancel</Button>
<Button submit>Save</Button>
<Button submit disabled={isButtonDisabled}>Save</Button>
</svelte:fragment>
</Modal>
@@ -193,9 +203,5 @@
.editor-border {
border: solid 0.0625rem hsl(var(--color-border));
border-radius: var(--border-radius-small);
textarea {
border-radius: var(--border-radius-small);
}
}
</style>
+10 -7
View File
@@ -17,6 +17,7 @@
import { Dependencies } from '$lib/constants';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { ID } from '@appwrite.io/console';
import { isCloud } from '$lib/system';
let name: string, mail: string, pass: string, disabled: boolean;
let terms = false;
@@ -95,13 +96,15 @@
<FormItem>
<Button fullWidth submit {disabled}>Sign up</Button>
</FormItem>
<span class="with-separators eyebrow-heading-3">or</span>
<FormItem>
<Button github fullWidth on:click={onGithubLogin} {disabled}>
<span class="icon-github" aria-hidden="true" />
<span class="text">Sign up with GitHub</span>
</Button>
</FormItem>
{#if isCloud}
<span class="with-separators eyebrow-heading-3">or</span>
<FormItem>
<Button github fullWidth on:click={onGithubLogin} {disabled}>
<span class="icon-github" aria-hidden="true" />
<span class="text">Sign up with GitHub</span>
</Button>
</FormItem>
{/if}
</FormList>
</Form>
</svelte:fragment>