From 6a87f6ca33e81b431d61dda778962ef27b9383ff Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 14 Oct 2024 14:35:53 +0300 Subject: [PATCH 01/13] Add mock identity alias to home page list --- packages/frontend/src/app/home/Home.js | 9 ++++++--- packages/frontend/src/components/ui/lists/index.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/app/home/Home.js b/packages/frontend/src/app/home/Home.js index 08943d7ef..c359de4f3 100644 --- a/packages/frontend/src/app/home/Home.js +++ b/packages/frontend/src/app/home/Home.js @@ -191,12 +191,15 @@ function Home () { .map((identitiy, i) => ({ columns: [ { - value: identitiy.identifier, + // value: identitiy.identifier, + value: 'alias', // identitiy.alias || identitiy.identifier avatar: true, + avatarSource: identitiy.identifier, mono: true, - dim: true, + // dim: identitiy.alias ? false : true, ellipsis: true, - format: 'identifier' + // format: 'identifier' + format: 'alias' // identitiy.alias ? 'alias' : 'identifier' }, { value: identitiy.totalTxs, diff --git a/packages/frontend/src/components/ui/lists/index.js b/packages/frontend/src/components/ui/lists/index.js index 72e70062d..a5a0ed533 100644 --- a/packages/frontend/src/components/ui/lists/index.js +++ b/packages/frontend/src/components/ui/lists/index.js @@ -87,7 +87,7 @@ function SimpleListItem ({ item }) { {column?.avatar && Date: Mon, 14 Oct 2024 14:36:37 +0300 Subject: [PATCH 02/13] Add mock identities alias to /identities page --- .../components/identities/IdentitiesList.js | 22 +++++----- .../identities/IdentitiesListItem.js | 37 +++++++++++----- .../identities/IdentitiesListItem.scss | 44 ++++++++++--------- 3 files changed, 60 insertions(+), 43 deletions(-) diff --git a/packages/frontend/src/components/identities/IdentitiesList.js b/packages/frontend/src/components/identities/IdentitiesList.js index c1f6feeb0..846e9cf6c 100644 --- a/packages/frontend/src/components/identities/IdentitiesList.js +++ b/packages/frontend/src/components/identities/IdentitiesList.js @@ -4,18 +4,18 @@ import './IdentitiesList.scss' function IdentitiesList ({ identities }) { return ( -
- {identities.map((identity, key) => - - )} +
+ {identities.map((identity, key) => + + )} - {identities.length === 0 && - There are no identities created yet. - } -
+ {identities.length === 0 && + There are no identities created yet. + } +
) } diff --git a/packages/frontend/src/components/identities/IdentitiesListItem.js b/packages/frontend/src/components/identities/IdentitiesListItem.js index c1325bad1..fb2a2a5d3 100644 --- a/packages/frontend/src/components/identities/IdentitiesListItem.js +++ b/packages/frontend/src/components/identities/IdentitiesListItem.js @@ -1,27 +1,40 @@ import Link from 'next/link' import ImageGenerator from '../imageGenerator' +import { Identifier } from '../data' import './IdentitiesListItem.scss' function IdentitiesListItem ({ identity }) { const { identifier, timestamp, isSystem } = identity + const alias = Math.floor(Math.random() * 2) ? 'alias' : null + return ( -
- -
{identifier}
-
- - {isSystem &&
SYSTEM
} +
+ - {(typeof timestamp === 'string') && -
- {new Date(timestamp).toLocaleString()} -
+ {alias + ?
{alias}
+ : + {identifier} + } +
+ + {isSystem &&
SYSTEM
} + + {(typeof timestamp === 'string') && +
+ {new Date(timestamp).toLocaleString()} +
+ } ) } diff --git a/packages/frontend/src/components/identities/IdentitiesListItem.scss b/packages/frontend/src/components/identities/IdentitiesListItem.scss index 5e71795be..4a115f85a 100644 --- a/packages/frontend/src/components/identities/IdentitiesListItem.scss +++ b/packages/frontend/src/components/identities/IdentitiesListItem.scss @@ -2,31 +2,35 @@ @import '../../styles/variables.scss'; .IdentitiesListItem { - @include mixins.DefListItem; + @include mixins.DefListItem; - justify-content: space-between; + justify-content: space-between; - &__Identifier { - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - margin-right: 16px; - } + &__Identifier, &__Alias { + font-size: 0.75rem; + margin-right: 16px; + } + + &__Alias { + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } - &__Timestamp { - white-space: nowrap; - } + &__Timestamp { + white-space: nowrap; + } - @media screen and (max-width: $breakpoint-sm) { - flex-wrap: wrap; + @media screen and (max-width: $breakpoint-sm) { + flex-wrap: wrap; - &__Identifier { - width: 100%; - margin-right: 0; - } + &__Identifier { + width: 100%; + margin-right: 0; + } - &__Timestamp { - white-space: wrap; - } + &__Timestamp { + white-space: wrap; } + } } \ No newline at end of file From 2af6817f17dd4c31adbd7bf0186c93e87aa27303 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 14 Oct 2024 14:39:03 +0300 Subject: [PATCH 03/13] Add alias field to identity page --- .../frontend/src/app/identity/[identifier]/Identity.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/frontend/src/app/identity/[identifier]/Identity.js b/packages/frontend/src/app/identity/[identifier]/Identity.js index f7770d6c4..267aa4159 100644 --- a/packages/frontend/src/app/identity/[identifier]/Identity.js +++ b/packages/frontend/src/app/identity/[identifier]/Identity.js @@ -139,6 +139,16 @@ function Identity ({ identifier }) { + {identity?.alias && + + Name + + + {identity.alias} + + + + } Balance From 6c6479448e842b3cd73002f03decf74f3cac3239 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 15 Oct 2024 11:03:43 +0700 Subject: [PATCH 04/13] Uncomment alias --- packages/frontend/src/app/home/Home.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/app/home/Home.js b/packages/frontend/src/app/home/Home.js index c359de4f3..0e92c068c 100644 --- a/packages/frontend/src/app/home/Home.js +++ b/packages/frontend/src/app/home/Home.js @@ -191,15 +191,13 @@ function Home () { .map((identitiy, i) => ({ columns: [ { - // value: identitiy.identifier, - value: 'alias', // identitiy.alias || identitiy.identifier + value: identitiy.alias || identitiy.identifier, avatar: true, avatarSource: identitiy.identifier, mono: true, - // dim: identitiy.alias ? false : true, + dim: !!identitiy.alias, ellipsis: true, - // format: 'identifier' - format: 'alias' // identitiy.alias ? 'alias' : 'identifier' + format: identitiy.alias ? 'alias' : 'identifier' }, { value: identitiy.totalTxs, From 232a897145e5ae0642a0963b005cfa5475b33037 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 15 Oct 2024 11:25:20 +0700 Subject: [PATCH 05/13] Remove hardcoded alias in IdentitiesListItem.js --- .../frontend/src/components/identities/IdentitiesListItem.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/frontend/src/components/identities/IdentitiesListItem.js b/packages/frontend/src/components/identities/IdentitiesListItem.js index fb2a2a5d3..5312449e7 100644 --- a/packages/frontend/src/components/identities/IdentitiesListItem.js +++ b/packages/frontend/src/components/identities/IdentitiesListItem.js @@ -4,9 +4,7 @@ import { Identifier } from '../data' import './IdentitiesListItem.scss' function IdentitiesListItem ({ identity }) { - const { identifier, timestamp, isSystem } = identity - - const alias = Math.floor(Math.random() * 2) ? 'alias' : null + const { alias, identifier, timestamp, isSystem } = identity return ( Date: Tue, 15 Oct 2024 13:17:03 +0700 Subject: [PATCH 06/13] Fix identity name --- packages/frontend/src/app/identity/[identifier]/Identity.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/app/identity/[identifier]/Identity.js b/packages/frontend/src/app/identity/[identifier]/Identity.js index 267aa4159..d1c483c6d 100644 --- a/packages/frontend/src/app/identity/[identifier]/Identity.js +++ b/packages/frontend/src/app/identity/[identifier]/Identity.js @@ -65,6 +65,7 @@ function Identity ({ identifier }) { ]) .catch(console.error) + Api.getRate() .then(res => fetchHandlerSuccess(setRate, res)) .catch(err => fetchHandlerError(setRate, err)) @@ -139,12 +140,12 @@ function Identity ({ identifier }) { - {identity?.alias && + { identity?.data.alias && Name - {identity.alias} + {identity?.data.alias} From 558aff714f1fe7264f4293a18e7ba4a21f1c053d Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 15 Oct 2024 11:53:37 +0300 Subject: [PATCH 07/13] Add alias display to richlist on the Home page --- packages/frontend/src/app/home/Home.js | 9 +++++---- .../frontend/src/components/identities/IdentityCard.scss | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/app/home/Home.js b/packages/frontend/src/app/home/Home.js index 0e92c068c..bd34cdaef 100644 --- a/packages/frontend/src/app/home/Home.js +++ b/packages/frontend/src/app/home/Home.js @@ -195,7 +195,7 @@ function Home () { avatar: true, avatarSource: identitiy.identifier, mono: true, - dim: !!identitiy.alias, + dim: !identitiy.alias, ellipsis: true, format: identitiy.alias ? 'alias' : 'identifier' }, @@ -230,12 +230,13 @@ function Home () { .map((identitiy, i) => ({ columns: [ { - value: identitiy.identifier, + value: identitiy.alias || identitiy.identifier, avatar: true, + avatarSource: identitiy.identifier, mono: true, - dim: true, + dim: !identitiy.alias, ellipsis: true, - format: 'identifier' + format: identitiy.alias ? 'alias' : 'identifier' }, { value: identitiy.balance, diff --git a/packages/frontend/src/components/identities/IdentityCard.scss b/packages/frontend/src/components/identities/IdentityCard.scss index 8639090d7..2a07b7800 100644 --- a/packages/frontend/src/components/identities/IdentityCard.scss +++ b/packages/frontend/src/components/identities/IdentityCard.scss @@ -17,6 +17,7 @@ display: flex; align-items: center; overflow: hidden; + flex-grow: 1; } &__Alias { From f2786f17eeda8895866747ad3abc8ba1444f2362 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 15 Oct 2024 11:54:26 +0300 Subject: [PATCH 08/13] fix linter error --- packages/frontend/src/app/identity/[identifier]/Identity.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend/src/app/identity/[identifier]/Identity.js b/packages/frontend/src/app/identity/[identifier]/Identity.js index d1c483c6d..21f35b974 100644 --- a/packages/frontend/src/app/identity/[identifier]/Identity.js +++ b/packages/frontend/src/app/identity/[identifier]/Identity.js @@ -65,7 +65,6 @@ function Identity ({ identifier }) { ]) .catch(console.error) - Api.getRate() .then(res => fetchHandlerSuccess(setRate, res)) .catch(err => fetchHandlerError(setRate, err)) From cda767c192c08d0db7e23b2e0fe79f86a280d473 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 15 Oct 2024 12:15:05 +0300 Subject: [PATCH 09/13] Implement Alias component --- .../frontend/src/components/data/Alias.js | 22 +++++++++++++++++++ .../frontend/src/components/data/Alias.scss | 11 ++++++++++ .../frontend/src/components/data/index.js | 4 +++- .../identities/IdentitiesListItem.js | 4 ++-- .../frontend/src/components/ui/lists/index.js | 3 ++- 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 packages/frontend/src/components/data/Alias.js create mode 100644 packages/frontend/src/components/data/Alias.scss diff --git a/packages/frontend/src/components/data/Alias.js b/packages/frontend/src/components/data/Alias.js new file mode 100644 index 000000000..532e9b1bc --- /dev/null +++ b/packages/frontend/src/components/data/Alias.js @@ -0,0 +1,22 @@ +import './Alias.scss' + +export default function Alias ({ children, className }) { + const dashIndex = children.lastIndexOf('.dash') + + return ( +
+ + {dashIndex !== -1 + ? children.slice(0, dashIndex) + : children + } + + + {dashIndex !== -1 && + + {children.slice(dashIndex)} + + } +
+ ) +} diff --git a/packages/frontend/src/components/data/Alias.scss b/packages/frontend/src/components/data/Alias.scss new file mode 100644 index 000000000..d59e54919 --- /dev/null +++ b/packages/frontend/src/components/data/Alias.scss @@ -0,0 +1,11 @@ +@use '../../styles/mixins.scss'; +@import '../../styles/variables.scss'; + +.Alias { + font-family: $font-mono; + color: #fff; + + &__Domain { + opacity: .5; + } +} \ No newline at end of file diff --git a/packages/frontend/src/components/data/index.js b/packages/frontend/src/components/data/index.js index 0e0f0ed49..d0d908aab 100644 --- a/packages/frontend/src/components/data/index.js +++ b/packages/frontend/src/components/data/index.js @@ -1,7 +1,9 @@ import Identifier from './Identifier' import Credits from './Credits' +import Alias from './Alias' export { Identifier, - Credits + Credits, + Alias } diff --git a/packages/frontend/src/components/identities/IdentitiesListItem.js b/packages/frontend/src/components/identities/IdentitiesListItem.js index 5312449e7..07fa856a4 100644 --- a/packages/frontend/src/components/identities/IdentitiesListItem.js +++ b/packages/frontend/src/components/identities/IdentitiesListItem.js @@ -1,6 +1,6 @@ import Link from 'next/link' import ImageGenerator from '../imageGenerator' -import { Identifier } from '../data' +import { Identifier, Alias } from '../data' import './IdentitiesListItem.scss' function IdentitiesListItem ({ identity }) { @@ -15,7 +15,7 @@ function IdentitiesListItem ({ identity }) { {alias - ?
{alias}
+ ? {alias} : {children} + if (column.format === 'alias') return {children} return {children} } From 49d9000046462919285f1c464ffd9676c432fc87 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 21 Oct 2024 12:11:15 +0300 Subject: [PATCH 10/13] Update identities alias render on the home page --- packages/frontend/src/app/home/Home.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/frontend/src/app/home/Home.js b/packages/frontend/src/app/home/Home.js index bd34cdaef..70fad1bfc 100644 --- a/packages/frontend/src/app/home/Home.js +++ b/packages/frontend/src/app/home/Home.js @@ -191,13 +191,13 @@ function Home () { .map((identitiy, i) => ({ columns: [ { - value: identitiy.alias || identitiy.identifier, + value: identitiy?.aliases[0] || identitiy.identifier, avatar: true, avatarSource: identitiy.identifier, mono: true, - dim: !identitiy.alias, + dim: !identitiy?.aliases[0], ellipsis: true, - format: identitiy.alias ? 'alias' : 'identifier' + format: identitiy?.aliases[0] ? 'alias' : 'identifier' }, { value: identitiy.totalTxs, @@ -230,13 +230,13 @@ function Home () { .map((identitiy, i) => ({ columns: [ { - value: identitiy.alias || identitiy.identifier, + value: identitiy?.aliases[0] || identitiy.identifier, avatar: true, avatarSource: identitiy.identifier, mono: true, - dim: !identitiy.alias, + dim: !identitiy?.aliases[0], ellipsis: true, - format: identitiy.alias ? 'alias' : 'identifier' + format: identitiy?.aliases[0] ? 'alias' : 'identifier' }, { value: identitiy.balance, From b2442678de3a1aa5954bed637670f90553b5c030 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 21 Oct 2024 12:36:36 +0300 Subject: [PATCH 11/13] Update alias render in Identities list and identity page --- .../src/app/identity/[identifier]/Identity.js | 16 +++++--- .../app/identity/[identifier]/Identity.scss | 41 +++++++++++-------- .../identities/IdentitiesListItem.js | 6 +-- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/packages/frontend/src/app/identity/[identifier]/Identity.js b/packages/frontend/src/app/identity/[identifier]/Identity.js index 21f35b974..b95ea1429 100644 --- a/packages/frontend/src/app/identity/[identifier]/Identity.js +++ b/packages/frontend/src/app/identity/[identifier]/Identity.js @@ -12,7 +12,7 @@ import { LoadingLine, LoadingList } from '../../../components/loading' import { ErrorMessageBlock } from '../../../components/Errors' import ImageGenerator from '../../../components/imageGenerator' import { usePathname, useRouter, useSearchParams } from 'next/navigation' -import { Credits } from '../../../components/data' +import { Credits, Alias } from '../../../components/data' import { RateTooltip } from '../../../components/ui/Tooltips' import './Identity.scss' import { @@ -97,7 +97,7 @@ function Identity ({ identifier }) { }, [activeTab, router, pathname]) return ( -
+
Identifier - {identity.data?.identifier} + {identity.data?.identifier} - { identity?.data.alias && + { identity?.data?.aliases?.length && - Name + Names - {identity?.data.alias} +
+ {identity?.data.aliases.map((alias, i) => ( + {alias} + ))} +
diff --git a/packages/frontend/src/app/identity/[identifier]/Identity.scss b/packages/frontend/src/app/identity/[identifier]/Identity.scss index 23f896b2e..c8e3fe3d1 100644 --- a/packages/frontend/src/app/identity/[identifier]/Identity.scss +++ b/packages/frontend/src/app/identity/[identifier]/Identity.scss @@ -1,29 +1,36 @@ @use '../../../styles/mixins.scss'; .IdentityInfo { - height: min-content; + height: min-content; - &__Avatar { - margin-left: auto; - width: 32px; - height: 32px; - } + &__Avatar { + margin-left: auto; + width: 32px; + height: 32px; + } + + &__AliasesContainer { + max-height: 110px; + min-height: 21px; + height: 100%; + overflow-y: auto; + } } .IdentityData { - &__Tabs { - flex-wrap: wrap; - } + &__Tabs { + flex-wrap: wrap; + } - @media screen and (max-width: 530px) { - &__Tab { - width: 50%; - } + @media screen and (max-width: 530px) { + &__Tab { + width: 50%; } + } - @media screen and (max-width: 320px) { - &__Tab { - width: 100%; - } + @media screen and (max-width: 320px) { + &__Tab { + width: 100%; } + } } \ No newline at end of file diff --git a/packages/frontend/src/components/identities/IdentitiesListItem.js b/packages/frontend/src/components/identities/IdentitiesListItem.js index 07fa856a4..f00d64650 100644 --- a/packages/frontend/src/components/identities/IdentitiesListItem.js +++ b/packages/frontend/src/components/identities/IdentitiesListItem.js @@ -4,7 +4,7 @@ import { Identifier, Alias } from '../data' import './IdentitiesListItem.scss' function IdentitiesListItem ({ identity }) { - const { alias, identifier, timestamp, isSystem } = identity + const { aliases, identifier, timestamp, isSystem } = identity return ( - {alias - ? {alias} + {aliases?.length + ? {aliases[0]} : Date: Mon, 21 Oct 2024 12:57:52 +0300 Subject: [PATCH 12/13] remove excess space --- packages/frontend/src/app/identity/[identifier]/Identity.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/app/identity/[identifier]/Identity.js b/packages/frontend/src/app/identity/[identifier]/Identity.js index b95ea1429..44094c883 100644 --- a/packages/frontend/src/app/identity/[identifier]/Identity.js +++ b/packages/frontend/src/app/identity/[identifier]/Identity.js @@ -139,7 +139,7 @@ function Identity ({ identifier }) { - { identity?.data?.aliases?.length && + {identity?.data?.aliases?.length && Names From 967134bb73f9a96d53fe244db4d84e2f4033325c Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 21 Oct 2024 16:02:10 +0300 Subject: [PATCH 13/13] Fix render of alias on Identity page --- packages/frontend/src/app/identity/[identifier]/Identity.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/app/identity/[identifier]/Identity.js b/packages/frontend/src/app/identity/[identifier]/Identity.js index 44094c883..39367af9b 100644 --- a/packages/frontend/src/app/identity/[identifier]/Identity.js +++ b/packages/frontend/src/app/identity/[identifier]/Identity.js @@ -139,7 +139,7 @@ function Identity ({ identifier }) { - {identity?.data?.aliases?.length && + {identity?.data?.aliases?.length > 0 && Names