Skip to content
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.

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

smtp update #384

Merged
merged 45 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a948cb0
smtp update
lohanidamodar Apr 10, 2023
2116a7f
auth templates component
lohanidamodar Apr 10, 2023
48a8a03
Merge branch 'main' of https://github.com/appwrite/console into feat-…
lohanidamodar Apr 13, 2023
e24bd15
basic flow setup
lohanidamodar Apr 13, 2023
ea4fee2
basic working version of email templates
lohanidamodar Apr 17, 2023
8b52804
feat: add inputSearchSelect, add modal on textareaclick, small fixes
ArmanNik Apr 17, 2023
df4879d
Merge pull request #409 from appwrite/feat-custom-smpt-arman
lohanidamodar Apr 18, 2023
a0c8eec
improvements
lohanidamodar Apr 18, 2023
2a2eb7f
use SDK from github
lohanidamodar Apr 18, 2023
b8d2483
trying to get collapsible to work
lohanidamodar Apr 18, 2023
f7044ce
cleanup
lohanidamodar Apr 18, 2023
ceed967
more templates implementation
lohanidamodar Apr 27, 2023
2001c0e
fix: small chagens
ArmanNik Apr 27, 2023
fa21777
Merge branch 'main' of github.com:appwrite/console into feat-custom-smtp
ArmanNik Apr 27, 2023
e518553
refactor: email templates functions
ArmanNik Apr 27, 2023
5c95ea1
fix: sms layout
ArmanNik Apr 27, 2023
c72fdc1
feat: smpt small refactor, disabled button, sms fix
ArmanNik Apr 28, 2023
b9cb702
feat: loading state and fixes
ArmanNik Apr 28, 2023
d5f08ae
chore: add new sdk package as alias
ArmanNik May 3, 2023
28eb65b
empty commit
ArmanNik May 3, 2023
1b7447d
empty commit
ArmanNik May 3, 2023
8369b94
empty commit
ArmanNik May 3, 2023
7e91411
empty commit
ArmanNik May 3, 2023
3a27a00
fix: Chen's review
ArmanNik May 4, 2023
4466cdd
testing layout
ArmanNik May 9, 2023
84679cc
fix: templates layout
ArmanNik May 9, 2023
532dfe0
fix: design review
ArmanNik May 12, 2023
b43632d
fix: small design fixes
ArmanNik May 17, 2023
fcee6f8
fix: add title to template page
ArmanNik May 29, 2023
aba9aea
feat: reset modal, fix loading, design fixes, update sdk
ArmanNik May 31, 2023
8b7fe92
fix: remove superfluos code
ArmanNik May 31, 2023
ac13072
Merge branch 'main' of github.com:appwrite/console into feat-custom-smtp
ArmanNik May 31, 2023
b5ecedc
Merge branch 'main' of github.com:appwrite/console into feat-custom-smtp
ArmanNik Jul 25, 2023
d2088cf
fix: review
ArmanNik Aug 7, 2023
ae33ba1
Merge branch 'main' of github.com:appwrite/console into feat-custom-smtp
ArmanNik Aug 7, 2023
e719ea8
fix: fixes from review
ArmanNik Aug 7, 2023
603323b
fix: from review
ArmanNik Aug 8, 2023
3797364
Merge branch 'main' of github.com:appwrite/console into feat-custom-smtp
ArmanNik Aug 9, 2023
8911b89
chore: upgrade package
ArmanNik Aug 9, 2023
2bd9dcc
chore : update packages
ArmanNik Aug 9, 2023
9ba4cf1
fix: review, add tracking
ArmanNik Aug 9, 2023
d1edc8c
fix: name store correctly
ArmanNik Aug 9, 2023
a0da0f0
Merge branch '1.4.x' of github.com:appwrite/console into feat-custom-…
ArmanNik Aug 9, 2023
0fa7a1d
Merge branch '1.4.x' of https://github.com/appwrite/console into feat…
christyjacob4 Aug 9, 2023
f2ed6d1
fix: api call
ArmanNik Aug 9, 2023
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
2,627 changes: 794 additions & 1,833 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@analytics/google-analytics": "^1.0.5",
"@appwrite.io/console": "npm:christy-console@^0.3.0",
"@appwrite.io/console": "npm:christy-console@^0.4.0",
"@appwrite.io/pink": "^0.0.6-rc.14",
"@analytics/google-tag-manager": "^0.5.3",
"@popperjs/core": "^2.11.6",
Expand Down
14 changes: 13 additions & 1 deletion src/lib/actions/analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ export enum Submit {
ProjectUpdateName = 'submit_project_update_name',
ProjectUpdateTeam = 'submit_project_update_team',
ProjectService = 'submit_project_service',
ProjectUpdateSMTP = 'submit_project_update_smtp',
MemberCreate = 'submit_member_create',
MemberDelete = 'submit_member_delete',
MembershipUpdateStatus = 'submit_membership_update_status',
Expand Down Expand Up @@ -221,5 +222,16 @@ export enum Submit {
BucketUpdateExtensions = 'submit_bucket_update_extensions',
FileCreate = 'submit_file_create',
FileDelete = 'submit_file_delete',
FileUpdatePermissions = 'submit_file_update_permissions'
FileUpdatePermissions = 'submit_file_update_permissions',
EmailChangeLocale = 'submit_email_change_locale',
EmailResetTemplate = 'submit_email_reset_template',
EmailUpdateInviteTemplate = 'submit_email_update_invite_template',
EmailUpdateMagicUrlTemplate = 'submit_email_update_magic_url_template',
EmailUpdateRecoveryTemplate = 'submit_email_update_recovery_template',
EmailUpdateVerificationTemplate = 'submit_email_update_verification_template',
SmsChangeLocale = 'submit_sms_change_locale',
SmsResetTemplate = 'submit_sms_reset_template',
SmsUpdateInviteTemplate = 'submit_sms_update_invite_template',
SmsUpdateLoginTemplate = 'submit_sms_update_login_template',
SmsUpdateVerificationTemplate = 'submit_sms_update_verification_template'
}
15 changes: 14 additions & 1 deletion src/lib/components/alert.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
export let dismissible = false;
export let type: 'info' | 'success' | 'warning' | 'error' = 'info';
export let buttons: Buttons[] = [];
export let isAction = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this? I don't see where it's used. Also, it might not be clear to have two ways to control whether the action buttons show.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We needed it in some initial design but now is not needed for this specific branch :)

export let isStandalone = false;

const dispatch = createEventDispatcher();
</script>

<section
class="alert"
class:is-action={isAction}
class:is-standalone={isStandalone}
class:is-success={type === 'success'}
class:is-warning={type === 'warning'}
class:is-danger={type === 'error'}
Expand Down Expand Up @@ -39,7 +43,7 @@
</h6>
{/if}
<p class="alert-message"><slot /></p>
{#if buttons?.length}
{#if buttons?.length && !isAction}
<div class="alert-buttons u-flex">
{#each buttons as button}
<button class="button is-text" on:click={button.method}>
Expand All @@ -49,5 +53,14 @@
</div>
{/if}
</div>
{#if buttons?.length && isAction}
<div class="alert-buttons u-flex u-gap-16 u-cross-child-center">
{#each buttons as button}
<button class="button is-text" on:click={button.method}>
<span class="text">{button.name}</span>
</button>
{/each}
</div>
{/if}
</div>
</section>
4 changes: 3 additions & 1 deletion src/lib/components/collapsibleItem.svelte
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<script lang="ts">
import { clickOnEnter } from '$lib/helpers/a11y';

export let withIndentation = false;
export let open = false;
</script>

<li class="collapsible-item">
<details class="collapsible-wrapper" {open}>
<summary class="collapsible-button">
<summary class="collapsible-button" on:keyup={clickOnEnter} on:click>
<slot name="beforetitle" />
<div>
<span class="text"><slot name="title" /></span>
Expand Down
2 changes: 2 additions & 0 deletions src/lib/components/id.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

export let value: string;
export let event: string = null;
export let centered = true;

function truncateText(node: HTMLElement) {
const MAX_TRIES = 100;
Expand Down Expand Up @@ -49,6 +50,7 @@
<Copy {value} {event}>
<div
class="interactive-text-output is-buttons-on-top"
class:u-text-center={centered}
style:min-inline-size="0"
style:display="inline-flex">
<span
Expand Down
16 changes: 12 additions & 4 deletions src/lib/elements/forms/inputSelectSearch.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
export let placeholder = '';
export let required = false;
export let disabled = false;
export let fullWidth = false;
export let autofocus = false;
export let interactiveOutput = false;
// Input value
// stretch is used inside of a flex container to give the element flex:1
export let stretch = true;
export let search = '';
// The actual selected value
export let value: Option['value'];
Expand Down Expand Up @@ -82,9 +84,12 @@
value = option.value;
search = option.label;
// It's not working without this line.
!$$slots.output && (element.value = search);
if ($$slots.output) {
search = '';
} else {
element.value = search;
}
hasFocus = false;
search = '';
dispatch('select', option);
}

Expand All @@ -99,7 +104,10 @@
$: showClearBtn = (hasFocus && search) || value;
</script>

<li class="u-position-relative form-item u-stretch">
<li
class="u-position-relative form-item"
class:u-width-full-line={fullWidth}
class:u-stretch={stretch}>
<DropList
bind:show={hasFocus}
noStyle
Expand Down
3 changes: 2 additions & 1 deletion src/lib/elements/forms/inputTextarea.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { FormItem, Helper, Label } from '.';
import NullCheckbox from './nullCheckbox.svelte';
import TextCounter from './textCounter.svelte';
import { clickOnEnter } from '$lib/helpers/a11y';

export let label: string;
export let showLabel = true;
Expand Down Expand Up @@ -60,7 +61,7 @@
{label}
</Label>

<div class="input-text-wrapper">
<div class="input-text-wrapper" on:click on:keyup={clickOnEnter}>
<textarea
{id}
{placeholder}
Expand Down
16 changes: 11 additions & 5 deletions src/routes/console/project-[project]/auth/header.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,23 @@
hasChildren: true,
event: 'teams'
},
{
href: `${path}/security`,
title: 'Security',
event: 'security'
},
{
href: `${path}/templates`,
title: 'Templates',
hasChildren: false,
event: 'templates'
},
{
href: `${path}/usage`,
title: 'Usage',
hasChildren: true,
event: 'usage'
},
{
href: `${path}/security`,
title: 'Security',
event: 'security'
},
{
href: `${path}/settings`,
title: 'Settings',
Expand Down
Loading