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

Arman educational #3

Merged
merged 27 commits into from
May 9, 2022
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4f138b4
Created Avatar component
ArmanNik Apr 8, 2022
212a799
Changed 'size' prop type from string to number in Avatar
ArmanNik Apr 8, 2022
e631891
inputSeach now updates on clear
ArmanNik Apr 11, 2022
b6248d7
better name for change function
ArmanNik Apr 11, 2022
d1368dd
fix valueChange not getting called & typescript
ArmanNik Apr 11, 2022
6e80088
InputSearch unit testing
ArmanNik Apr 11, 2022
6d28168
Created switchBox + test, added it to users settings
ArmanNik Apr 11, 2022
bd4b068
added option to disable autocomplete in inputText
ArmanNik Apr 13, 2022
8305c37
added option to disable meter in inputText
ArmanNik Apr 13, 2022
5d2b465
fixed small typo in footer
ArmanNik Apr 13, 2022
692363f
created switchBoxes component
ArmanNik Apr 13, 2022
43e71ff
modified switchBox tests
ArmanNik Apr 13, 2022
362b77a
WIP created oauth modal, logic for auth methods user setting page
ArmanNik Apr 13, 2022
61abb31
updated todo format
ArmanNik Apr 13, 2022
4398558
created authLimit component and logic
ArmanNik Apr 13, 2022
2727ff7
cleaned up code in setting page
ArmanNik Apr 13, 2022
cbdba8a
created elementCount component and test
ArmanNik Apr 19, 2022
2c5860c
added elementCount to various pages
ArmanNik Apr 19, 2022
e3381e1
created infoSection component added it to modals
ArmanNik Apr 22, 2022
facc384
Merge branch 'main' of github.com:appwrite/appwrite-console-poc into …
ArmanNik Apr 22, 2022
56399f4
small fix: added missing type to variables
ArmanNik Apr 22, 2022
25bb844
feat: added transition between pages and tabs still WIP
ArmanNik Apr 22, 2022
368815b
fixed problems pull/3#pullrequestreview-951018491
ArmanNik Apr 26, 2022
e11df8b
removed transitionts, moved to new branch
ArmanNik Apr 26, 2022
665473e
removed missed transition
ArmanNik Apr 26, 2022
4687e1d
fix: lint errors in toggleOAuth & switchBox test
ArmanNik Apr 27, 2022
e37216a
implemented suggested change pull/3#pullrequestreview-954657054
ArmanNik Apr 27, 2022
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
14 changes: 14 additions & 0 deletions src/lib/components/avatar.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<script lang="ts">
export let size: number;
export let src: string;
export let name: string;
</script>

<img
width={size}
height={size}
class="avatar"
style="--size: {size}px"
{src}
title={name}
alt={name} />
4 changes: 4 additions & 0 deletions src/lib/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ export { default as DropList } from './dropList.svelte';
export { default as DropListItem } from './dropListItem.svelte';
export { default as DropListLink } from './dropListLink.svelte';
export { default as Collapsible } from './collapsible.svelte';
export { default as Avatar } from './avatar.svelte';
export { default as SwitchBox } from './switchBox.svelte';
export { default as SwitchBoxes } from './switchBoxes.svelte';
export { default as InfoSection } from './infoSection.svelte';
4 changes: 4 additions & 0 deletions src/lib/components/infoSection.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<div>
<i class="icon-info-circled" />
<slot />
</div>
48 changes: 48 additions & 0 deletions src/lib/components/switchBox.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte';

type SwitchBox = {
label: string;
id: string;
src: string;
alt: string;
href: string;
linkText: string;
value: boolean;
required: boolean;
disabled: boolean;
wip: boolean;
};

export let box: SwitchBox;

let { label, id, src, alt, href, linkText, disabled, required, value, wip } = box;

const dispatch = createEventDispatcher();

//TODO: move SwitchBox type outside component
</script>

<li class="card">
<label class="switch-box" for={id}>
<div class="switch-box-image">
<img height="50" width="50" src={src || 'https://via.placeholder.com/50'} {alt} />
</div>
<span class="switch-box-title">{label}</span>
{#if !wip}
<a {href} class="link" target="_blank">
<span class="text">{linkText || 'Docs'} </span>
<span class="icon-link-ext" aria-hidden="true" />
</a>
<input
{id}
{disabled}
{required}
type="checkbox"
class="switch"
role="switch"
bind:checked={value}
on:change={() => dispatch('updated', { value, id })} />
{/if}
</label>
</li>
13 changes: 13 additions & 0 deletions src/lib/components/switchBoxes.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<script>
import SwitchBox from './switchBox.svelte';
import { createEventDispatcher } from 'svelte';
const dispatch = createEventDispatcher();

export let boxes;
</script>

<ul class="grid-box">
{#each boxes as box}
<SwitchBox {box} on:updated={(e) => dispatch('updated', e.detail)} />
{/each}
</ul>
21 changes: 12 additions & 9 deletions src/lib/elements/forms/inputPassword.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
export let required = false;
export let disabled = false;
export let autofocus = false;
export let meter = true;

let element: HTMLInputElement;

Expand All @@ -33,14 +34,16 @@
class="input-text"
bind:value
bind:this={element} />
<meter
value={strength > 100 ? 100 : strength}
min="0"
max="100"
class="password-meter"
class:is-weak={strength !== 0 && strength <= 33}
class:is-medium={strength > 33 && strength <= 66}
class:is-strong={strength > 66 && strength <= 100}
aria-label="Password strength week" />
{#if meter}
<meter
value={strength > 100 ? 100 : strength}
min="0"
max="100"
class="password-meter"
class:is-weak={strength !== 0 && strength <= 33}
class:is-medium={strength > 33 && strength <= 66}
class:is-strong={strength > 66 && strength <= 100}
aria-label="Password strength weak" />
{/if}
</div>
</FormItem>
4 changes: 2 additions & 2 deletions src/lib/elements/forms/inputSearch.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
});

const onKeyUp = (event: KeyboardEvent) => {
const valueChange = (event: Event) => {
clearTimeout(timer);
timer = setTimeout(() => {
const target = event.target as HTMLInputElement;
Expand All @@ -32,5 +32,5 @@
{required}
type="search"
class="input-text"
on:keyup={onKeyUp}
on:input={valueChange}
bind:this={element} />
2 changes: 2 additions & 0 deletions src/lib/elements/forms/inputText.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
export let required = false;
export let disabled = false;
export let autofocus = false;
export let autocomplete = true;
export let maxlength: number = null;

let element: HTMLInputElement;
Expand All @@ -29,6 +30,7 @@
{disabled}
{required}
{maxlength}
autocomplete={autocomplete ? 'on' : 'off'}
type="text"
class="input-text"
bind:value
Expand Down
2 changes: 1 addition & 1 deletion src/lib/layout/footer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<li class="inline-links-item">
<a class="link" href="https://github.com/appwrite/appwrite" target="_blank">
<span class="icon-github-circled" aria-hidden="true" />
<span class="text">GitHun</span>
<span class="text">GitHub</span>
</a>
</li>
<li class="inline-links-item">
Expand Down
12 changes: 5 additions & 7 deletions src/lib/layout/header.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { goto } from '$app/navigation';
import { base } from '$app/paths';
import { page } from '$app/stores';
import { DropList, DropListItem, DropListLink } from '$lib/components';
import { DropList, DropListItem, DropListLink, Avatar } from '$lib/components';
import { app } from '$lib/stores/app';
import { sdkForConsole } from '$lib/stores/sdk';
import { user } from '$lib/stores/user';
Expand Down Expand Up @@ -46,12 +46,10 @@
<DropList bind:show={showDropdown} position="bottom" horizontal="left">
<button class="transparent-button" on:click={() => (showDropdown = !showDropdown)}>
<span class="is-only-desktop">{$user.name}</span>
<img
width="40"
height="40"
class="user-image"
src={sdkForConsole.avatars.getInitials($user.name, 40, 40).toString()}
alt="" />
<Avatar
size={50}
name={$user.name}
src={sdkForConsole.avatars.getInitials($user.name, 50, 50).toString()} />
</button>
<svelte:fragment slot="list">
<DropListLink href="/console/$me" icon="user">Your Account</DropListLink>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/[project]/database/__layout.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script>
import { base } from '$app/paths';

import { page } from '$app/stores';
import { Back } from '$lib/components';
import { Cover } from '$lib/layout';
Expand All @@ -22,4 +21,5 @@
<Tabs />
</Cover>
{/if}

<slot />
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<div aria-busy="true" />
{:then response}
{#if response.total}
<p>{response.total} documents found</p>
<Table>
<TableHeader>
{#each columns as column}
Expand Down
1 change: 0 additions & 1 deletion src/routes/console/[project]/functions/__layout.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script>
import { base } from '$app/paths';

import { page } from '$app/stores';
import { Back } from '$lib/components';
import { Cover } from '$lib/layout';
Expand Down
1 change: 1 addition & 0 deletions src/routes/console/[project]/functions/index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<div aria-busy="true" />
{:then response}
{#if response.total}
<p>{response.total} functions found</p>
<Tiles>
{#each response.functions as func}
<Tile
Expand Down
2 changes: 0 additions & 2 deletions src/routes/console/[project]/keys/__layout.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<script>
import { base } from '$app/paths';

import { page } from '$app/stores';

import { Back } from '$lib/components';
import { Cover } from '$lib/layout';
const projectId = $page.params.project;
Expand Down
2 changes: 0 additions & 2 deletions src/routes/console/[project]/settings/__layout.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script>
import { base } from '$app/paths';

import { page } from '$app/stores';
import { Back } from '$lib/components';
import { Cover } from '$lib/layout';
Expand All @@ -20,5 +19,4 @@
<svelte:fragment slot="title">Settings</svelte:fragment>
<Tabs />
</Cover>

<slot />
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<div aria-busy="true" />
{:then response}
{#if response.total}
<p>{response.total} files found</p>
<Table>
<TableHeader>
<TableCellHead width={30} />
Expand Down
2 changes: 0 additions & 2 deletions src/routes/console/[project]/users/__layout.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script lang="ts">
import { base } from '$app/paths';

import { page } from '$app/stores';
import { Back } from '$lib/components';
import { Cover } from '$lib/layout';
Expand All @@ -21,5 +20,4 @@
<Tabs />
</Cover>
{/if}

<slot />
49 changes: 49 additions & 0 deletions src/routes/console/[project]/users/_setUserLimit.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<script lang="ts">
import { Modal, InfoSection } from '$lib/components';
import { Button, InputNumber, Form } from '$lib/elements/forms';
import { addNotification } from '$lib/stores/notifications';
import { sdkForConsole } from '$lib/stores/sdk';
import { project } from '../store';

const projectId = $project.$id;
let userLimit: number = $project.authLimit;
export let showUserLimitModal = false;
export let authLimit: number;
ArmanNik marked this conversation as resolved.
Show resolved Hide resolved

const update = async () => {
try {
const oauth = await sdkForConsole.projects.updateAuthLimit(projectId, userLimit);
console.log(oauth);
authLimit = userLimit;
showUserLimitModal = false;
addNotification({
type: 'success',
message: 'Updated project users limit successfully'
});
} catch (error) {
addNotification({
type: 'error',
message: error.message
});
}
};
</script>

<Form on:submit={update}>
<Modal bind:show={showUserLimitModal}>
<svelte:fragment slot="header">Max Allowed Users</svelte:fragment>
<InputNumber id="userLimit" label="User Limit" autofocus={true} bind:value={userLimit} />
<InfoSection>
<p>
This limit will prevent new users from signing up for your project, no matter what
auth method has been used. You will still be able to create users and team
memberships from your Appwrite console. For an unlimited amount of users, set the
limit to 0. Max limit is 10,000.
</p>
</InfoSection>
<svelte:fragment slot="footer">
<Button submit>Update</Button>
<Button secondary on:click={() => (showUserLimitModal = false)}>Cancel</Button>
</svelte:fragment>
</Modal>
</Form>
56 changes: 56 additions & 0 deletions src/routes/console/[project]/users/_toggleOAuth.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<script lang="ts">
import { page } from '$app/stores';
import { Modal, Copy, InfoSection } from '$lib/components';
import { Button, InputPassword, InputText, Form } from '$lib/elements/forms';
import { addNotification } from '$lib/stores/notifications';
import { sdkForConsole } from '$lib/stores/sdk';

export let showModal = false;
export let provider: string;
let appId: string, secret: string;
const projectId = $page.params.project;
let redirectURI: string = `${
sdkForConsole.config.endpoint
}/account/session/oauth2/callback/${provider.toLocaleLowerCase()}/${projectId}`;

const update = async () => {
try {
const oauth = await sdkForConsole.projects.updateOAuth2(
projectId,
provider,
appId,
secret
);
console.log(oauth);
showModal = false;
} catch (error) {
addNotification({
type: 'error',
message: error.message
});
}
};
</script>

<Form on:submit={update}>
<Modal bind:show={showModal}>
<svelte:fragment slot="header">{provider} OAuth2 Settings</svelte:fragment>
<InputText
id="appId"
label="App Id"
autofocus={true}
autocomplete={false}
bind:value={appId} />
<InputPassword id="secret" label="App Secret" meter={false} bind:value={secret} />
<InfoSection>
<p>
To complete set up, add this OAuth2 redirect URI to your {provider} app configuration.
</p>
<Copy bind:value={redirectURI} />
</InfoSection>
<svelte:fragment slot="footer">
<Button submit>Update</Button>
<Button secondary on:click={() => (showModal = false)}>Cancel</Button>
</svelte:fragment>
</Modal>
</Form>
1 change: 1 addition & 0 deletions src/routes/console/[project]/users/index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<div aria-busy="true" />
{:then response}
{#if response.total}
<p>{response.total} users found</p>
<Table>
<TableHeader>
<TableCellHead width={30} />
Expand Down
Loading