From baa77d4269721ffaa8edbbb13d230096fdd34d81 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Sat, 12 Jun 2021 16:53:29 -0300 Subject: [PATCH 1/9] Add User View Route Signed-off-by: Sebastian Martinez --- src/Address.svelte | 28 +++++----- src/App.svelte | 2 + src/base/users/Routes.svelte | 11 ++++ src/base/users/View.svelte | 99 ++++++++++++++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 16 deletions(-) create mode 100644 src/base/users/Routes.svelte create mode 100644 src/base/users/View.svelte diff --git a/src/Address.svelte b/src/Address.svelte index b9f8e31f2..411f9fad9 100644 --- a/src/Address.svelte +++ b/src/Address.svelte @@ -2,8 +2,7 @@ import { onMount } from 'svelte'; import { link } from 'svelte-routing'; import { ethers } from 'ethers'; - import { explorerLink, safeLink } from '@app/utils'; - import Blockies from '@app/Blockies.svelte'; + import { safeLink } from '@app/utils'; import Loading from '@app/Loading.svelte'; import type { Config } from '@app/config'; import { identifyAddress, formatAddress, AddressType } from '@app/utils'; @@ -17,14 +16,16 @@ let checksumAddress = compact ? formatAddress(address) : ethers.utils.getAddress(address); + let loading: boolean = true; let addressType: AddressType | null = null; let addressName: string | null = null; - onMount(() => { - identifyAddress(address, config).then(typ => addressType = typ); + onMount(async () => { if (resolve) { - config.provider.lookupAddress(address).then(name => addressName = name); + addressName = await config.provider.lookupAddress(address); } + addressType = await identifyAddress(address, config); + loading = false; }); $: addressLabel = addressName || checksumAddress; @@ -38,14 +39,6 @@ .address.no-badge .badge { display: none; } - .icon { - display: inline-block; - width: 1rem; - height: 1rem; - margin-right: 0.5rem; - min-width: 1rem; - min-height: 1rem; - } .address a { color: var(--color-foreground-90); } @@ -58,8 +51,10 @@ } -
- +{#if loading} + +{:else} +
{#if addressType === AddressType.Org} {addressLabel} org @@ -67,7 +62,7 @@ {addressLabel} safe {:else} - {addressLabel} + {addressLabel} {#if addressType === AddressType.Contract} contract {:else if addressType === AddressType.EOA} @@ -77,3 +72,4 @@ {/if} {/if}
+{/if} diff --git a/src/App.svelte b/src/App.svelte index e2149ab15..0726f1569 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -7,6 +7,7 @@ import Vesting from '@app/base/vesting/Index.svelte'; import Registrations from '@app/base/registrations/Routes.svelte'; import Orgs from '@app/base/orgs/Routes.svelte'; + import Users from '@app/base/users/Routes.svelte'; import Projects from '@app/base/projects/Routes.svelte'; import Resolver from '@app/base/resolver/Routes.svelte'; import Header from '@app/Header.svelte'; @@ -61,6 +62,7 @@ + diff --git a/src/base/users/Routes.svelte b/src/base/users/Routes.svelte new file mode 100644 index 000000000..c611f349f --- /dev/null +++ b/src/base/users/Routes.svelte @@ -0,0 +1,11 @@ + + + + + diff --git a/src/base/users/View.svelte b/src/base/users/View.svelte new file mode 100644 index 000000000..c7b1a5ed0 --- /dev/null +++ b/src/base/users/View.svelte @@ -0,0 +1,99 @@ + + + + +{#if loading} + +{:else} +
+
+
+ {#if registration && registration.avatar} + avatar + {:else} + + {/if} +
+
+
+ +
+
+
+{/if} \ No newline at end of file From d5ed28c62c71e83ce196246782d6ad778f781ca5 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 14 Jun 2021 01:03:48 -0300 Subject: [PATCH 2/9] Create new Avatar component Signed-off-by: Sebastian Martinez --- src/Avatar.svelte | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/Avatar.svelte diff --git a/src/Avatar.svelte b/src/Avatar.svelte new file mode 100644 index 000000000..96027e3aa --- /dev/null +++ b/src/Avatar.svelte @@ -0,0 +1,50 @@ + + + + +{#if isAddress(source)} +
+{:else} + avatar +{/if} \ No newline at end of file From a9eebfa033bc4d53e6692e86e8caf46f30e8b5cf Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 14 Jun 2021 01:04:54 -0300 Subject: [PATCH 3/9] Resolve ENS name in Address component Signed-off-by: Sebastian Martinez --- src/Address.svelte | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Address.svelte b/src/Address.svelte index 411f9fad9..681a2d2b8 100644 --- a/src/Address.svelte +++ b/src/Address.svelte @@ -5,6 +5,8 @@ import { safeLink } from '@app/utils'; import Loading from '@app/Loading.svelte'; import type { Config } from '@app/config'; + import type { Registration } from '@app/base/registrations/registrar'; + import { getRegistration } from '@app/base/registrations/registrar'; import { identifyAddress, formatAddress, AddressType } from '@app/utils'; export let address: string; @@ -17,12 +19,14 @@ ? formatAddress(address) : ethers.utils.getAddress(address); let loading: boolean = true; + let registration: Registration | null = null; let addressType: AddressType | null = null; let addressName: string | null = null; onMount(async () => { if (resolve) { addressName = await config.provider.lookupAddress(address); + if (addressName) registration = await getRegistration(addressName, config); } addressType = await identifyAddress(address, config); loading = false; From 488b5b91360f0be894f6e76b126f3c5edfb4fa56 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 14 Jun 2021 01:06:15 -0300 Subject: [PATCH 4/9] Use new avatar in User View Signed-off-by: Sebastian Martinez --- src/Address.svelte | 6 ++++++ src/base/users/View.svelte | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Address.svelte b/src/Address.svelte index 681a2d2b8..ee768536d 100644 --- a/src/Address.svelte +++ b/src/Address.svelte @@ -6,6 +6,7 @@ import Loading from '@app/Loading.svelte'; import type { Config } from '@app/config'; import type { Registration } from '@app/base/registrations/registrar'; + import Avatar from "@app/Avatar.svelte"; import { getRegistration } from '@app/base/registrations/registrar'; import { identifyAddress, formatAddress, AddressType } from '@app/utils'; @@ -13,6 +14,7 @@ export let config: Config; export let resolve = false; export let noBadge = false; + export let noAvatar = false; export let compact = false; let checksumAddress = compact @@ -39,6 +41,7 @@ .address { display: flex; align-items: center; + height: 100%; } .address.no-badge .badge { display: none; @@ -59,6 +62,9 @@ {:else}
+ {#if !noAvatar} + + {/if} {#if addressType === AddressType.Org} {addressLabel} org diff --git a/src/base/users/View.svelte b/src/base/users/View.svelte index c7b1a5ed0..abc0d22ca 100644 --- a/src/base/users/View.svelte +++ b/src/base/users/View.svelte @@ -7,6 +7,7 @@ import Blockies from '@app/Blockies.svelte'; import Loading from '@app/Loading.svelte'; import Address from '@app/Address.svelte'; + import Avatar from '@app/Avatar.svelte'; export let address: string; export let config: Config; @@ -48,9 +49,6 @@ width: 64px; height: 64px; } - .avatar img { - border-radius: 50%; /* Allowing to maintain the circular design of the avatars */ - } .links { display: flex; align-items: center; @@ -68,11 +66,7 @@
- {#if registration && registration.avatar} - avatar - {:else} - - {/if} +
From b040fad02c86ef159ff0b4288a544498cd23ad89 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 14 Jun 2021 01:06:42 -0300 Subject: [PATCH 5/9] Improve state handling in User View Signed-off-by: Sebastian Martinez --- src/base/users/View.svelte | 78 +++++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 18 deletions(-) diff --git a/src/base/users/View.svelte b/src/base/users/View.svelte index abc0d22ca..4a5cecac4 100644 --- a/src/base/users/View.svelte +++ b/src/base/users/View.svelte @@ -1,25 +1,49 @@ @@ -60,34 +84,52 @@ } -{#if loading} +{#if state.status === Status.Loading} -{:else} +{:else if state.status === Status.Failed} + navigate('/')}> + {state.error} + +{:else if state.status === Status.NotFound} + + + {address} + + + +

The address {address} is not registered.

+
+ + + Back to home → + +
+{:else if state.status === Status.Found}
-
+
-
+
-
+
{/if} \ No newline at end of file From b74943609d78a5b21fef02993e25b38d03b9b5ed Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 14 Jun 2021 22:17:13 -0300 Subject: [PATCH 6/9] Refactor await in Userview and Address Signed-off-by: Sebastian Martinez --- src/Address.svelte | 31 +++++++------ src/base/users/View.svelte | 89 ++++++++++---------------------------- 2 files changed, 38 insertions(+), 82 deletions(-) diff --git a/src/Address.svelte b/src/Address.svelte index ee768536d..54866130d 100644 --- a/src/Address.svelte +++ b/src/Address.svelte @@ -1,14 +1,15 @@ -{#if loading} - -{:else} +{#await getInfo} + +{:then info}
{#if !noAvatar} - + {/if} {#if addressType === AddressType.Org} {addressLabel} @@ -80,6 +78,7 @@ {:else if !noBadge}
{/if} - {/if}
-{/if} +{:catch error} + navigate('/')} /> +{/await} diff --git a/src/base/users/View.svelte b/src/base/users/View.svelte index 4a5cecac4..d6ea04d35 100644 --- a/src/base/users/View.svelte +++ b/src/base/users/View.svelte @@ -5,45 +5,20 @@ import type { Registration } from '@app/base/registrations/registrar'; import { getRegistration } from '@app/base/registrations/registrar'; import Icon from '@app/Icon.svelte'; - import Modal from '@app/Modal.svelte'; import Loading from '@app/Loading.svelte'; import Address from '@app/Address.svelte'; - import Link from '@app/Link.svelte'; import Avatar from '@app/Avatar.svelte'; import Error from '@app/Error.svelte'; - enum Status { - Loading, - Found, - NotFound, - Failed, - } - - type State = - { status: Status.Loading } - | { status: Status.NotFound } - | { status: Status.Found, registration: Registration } - | { status: Status.Failed, error: string }; - export let address: string; export let config: Config; - - let name: string | null = null; - let state: State = { status: Status.Loading }; + + let addressName: string | null = null; + let getInfo: Promise; onMount(async () => { - name = await config.provider.lookupAddress(address); - getRegistration(name, config) - .then(r => { - if (r) { - state = { status: Status.Found, registration: r }; - } else { - state = { status: Status.NotFound }; - } - return r; - }).catch(err => { - state = { status: Status.Failed, error: err }; - }); + addressName = await config.provider.lookupAddress(address); + getInfo = getRegistration(addressName, config); }); @@ -84,52 +59,34 @@ } -{#if state.status === Status.Loading} +{#await getInfo} -{:else if state.status === Status.Failed} - navigate('/')}> - {state.error} - -{:else if state.status === Status.NotFound} - - - {address} - - - -

The address {address} is not registered.

-
- - - Back to home → - -
-{:else if state.status === Status.Found} +{:then info}
- +
-{/if} \ No newline at end of file +{:catch error} + navigate('/')} /> +{/await} From 947583a7c199e07a6ca0d4d9090c4a51e760f4a1 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 14 Jun 2021 22:17:59 -0300 Subject: [PATCH 7/9] Add inline property to Avatar component Signed-off-by: Sebastian Martinez --- src/Avatar.svelte | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Avatar.svelte b/src/Avatar.svelte index 96027e3aa..cf0b1b75c 100644 --- a/src/Avatar.svelte +++ b/src/Avatar.svelte @@ -1,16 +1,16 @@ @@ -59,16 +56,13 @@ } -{#await getInfo} - -{:then info} -
-
-
- -
-
-
+
+
+
+ +
+
+
-{:catch error} - navigate('/')} /> -{/await}