From ca2d338cfe16274e32116c4ba31c21e6f65e6ef6 Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Fri, 26 Jul 2024 15:05:25 -0700 Subject: [PATCH 01/11] removed padding on y-axis label --- .../charts/BarAnimationDelayChart/BarAnimationDelayChart.tsx | 1 - .../medical-dashboard/activityCard/ActivityChart.tsx | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/charts/BarAnimationDelayChart/BarAnimationDelayChart.tsx b/src/components/charts/BarAnimationDelayChart/BarAnimationDelayChart.tsx index 35ad4e2..ebc03df 100644 --- a/src/components/charts/BarAnimationDelayChart/BarAnimationDelayChart.tsx +++ b/src/components/charts/BarAnimationDelayChart/BarAnimationDelayChart.tsx @@ -110,7 +110,6 @@ export const BarAnimationDelayChart: React.FC = () => { yAxis: { name: noData ? '' : t('charts.gigabytes'), nameTextStyle: { - padding: noData ? [0, 0] : [0, -24], align: 'left', }, axisLabel: { diff --git a/src/components/medical-dashboard/activityCard/ActivityChart.tsx b/src/components/medical-dashboard/activityCard/ActivityChart.tsx index df5bcca..51644ce 100644 --- a/src/components/medical-dashboard/activityCard/ActivityChart.tsx +++ b/src/components/medical-dashboard/activityCard/ActivityChart.tsx @@ -252,6 +252,9 @@ export const ActivityChart: React.FC = () => { name: noData ? '' : t('charts.gigabytes'), type: 'value', min: 0, + nameTextStyle: { + align: 'left', + }, axisLabel: { formatter: '{value} GB', color: themeObject[theme].textLight, From 4ba8e52902e31adbb1b49a507346ece1f2f57aed Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Sat, 27 Jul 2024 14:17:35 -0700 Subject: [PATCH 02/11] updated labels --- src/pages/RelaySettingsPage.tsx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pages/RelaySettingsPage.tsx b/src/pages/RelaySettingsPage.tsx index 8383dd7..0e957e3 100644 --- a/src/pages/RelaySettingsPage.tsx +++ b/src/pages/RelaySettingsPage.tsx @@ -69,31 +69,31 @@ const RelaySettingsPage: React.FC = () => { const { isDesktop } = useResponsive(); const categories = [ - { id: 1, name: 'Basic Features' }, - { id: 2, name: 'Extra Features' }, - { id: 3, name: 'Git Features' }, + { id: 1, name: 'Basic Nostr Features' }, + { id: 2, name: 'Extra Nostr Features' }, + { id: 3, name: 'GitNestr Features' }, ]; const noteOptions = [ { kind: 0, kindString: 'kind0', description: 'Metadata', category: 1 }, { kind: 1, kindString: 'kind1', description: 'Text Note', category: 1 }, { kind: 2, kindString: 'kind2', description: 'Recommend Relay', category: 1 }, - { kind: 3, kindString: 'kind3', description: 'Contacts', category: 1 }, + { kind: 3, kindString: 'kind3', description: 'Follow List', category: 1 }, { kind: 5, kindString: 'kind5', description: 'Event Deletion', category: 1 }, { kind: 6, kindString: 'kind6', description: 'Repost', category: 1 }, { kind: 7, kindString: 'kind7', description: 'Reaction', category: 1 }, { kind: 8, kindString: 'kind8', description: 'Badge Award', category: 2 }, { kind: 16, kindString: 'kind16', description: 'Generic Repost', category: 1 }, { kind: 10000, kindString: 'kind10000', description: 'Mute List', category: 1 }, - { kind: 10001, kindString: 'kind10001', description: 'Pin List', category: 1 }, - { kind: 10002, kindString: 'kind10002', description: 'Relay List Metadata', category: 1 }, + { kind: 10001, kindString: 'kind10001', description: 'Pinned Note', category: 1 }, + { kind: 10002, kindString: 'kind10002', description: 'Tiny Relay List', category: 1 }, { kind: 1984, kindString: 'kind1984', description: 'Reporting', category: 1 }, - { kind: 30000, kindString: 'kind30000', description: 'Follow List', category: 1 }, + { kind: 30000, kindString: 'kind30000', description: 'Custom Follow List', category: 1 }, { kind: 30008, kindString: 'kind30008', description: 'Profile Badge', category: 2 }, { kind: 30009, kindString: 'kind30009', description: 'Badge Definition', category: 2 }, - { kind: 30023, kindString: 'kind30023', description: 'Long-Form Content', category: 1 }, + { kind: 30023, kindString: 'kind30023', description: 'Formatted Articles', category: 1 }, { kind: 30079, kindString: 'kind30079', description: 'Event Paths', category: 1 }, - { kind: 9734, kindString: 'kind9734', description: 'Lightning Zap Request', category: 2 }, + //{ kind: 9734, kindString: 'kind9734', description: 'Lightning Zap Request', category: 2 }, { kind: 9735, kindString: 'kind9735', description: 'Lightning Zap Invoice Receipts', category: 2 }, { kind: 10011, kindString: 'kind10011', description: 'Issue Notes', category: 3 }, { kind: 10022, kindString: 'kind10022', description: 'PR Notes', category: 3 }, @@ -553,7 +553,7 @@ const RelaySettingsPage: React.FC = () => { @@ -950,7 +950,7 @@ const RelaySettingsPage: React.FC = () => { From 5465db9fa89cee99882c1e0ba6698c7d3b49ec5e Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Sat, 27 Jul 2024 14:18:20 -0700 Subject: [PATCH 03/11] fix auto scroll speed --- .../nft-dashboard/trending-creators/TrendingCreators.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/nft-dashboard/trending-creators/TrendingCreators.tsx b/src/components/nft-dashboard/trending-creators/TrendingCreators.tsx index 1eef07f..9cae126 100644 --- a/src/components/nft-dashboard/trending-creators/TrendingCreators.tsx +++ b/src/components/nft-dashboard/trending-creators/TrendingCreators.tsx @@ -44,7 +44,7 @@ export const TrendingCreators: React.FC = () => { profile11, ], }; - const { isTablet: isTabletOrHigher, isDesktop } = useResponsive(); + const { isTablet: isTabletOrHigher } = useResponsive(); const { t } = useTranslation(); const goPrev = () => { @@ -72,7 +72,7 @@ export const TrendingCreators: React.FC = () => { drag="free" gap=".2rem" snap="false" - autoSpeed={isDesktop ? 0.7 : 0.8} + autoSpeed={isTabletOrHigher ? 0.7 : 0.8} flickPower="500" breakpoints={{ 8000: { From bb56f368ec26febc7fea48b5bc75198a594d06af Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Sat, 27 Jul 2024 15:30:32 -0700 Subject: [PATCH 04/11] more label changes --- src/pages/RelaySettingsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/RelaySettingsPage.tsx b/src/pages/RelaySettingsPage.tsx index 0e957e3..5ffe4f1 100644 --- a/src/pages/RelaySettingsPage.tsx +++ b/src/pages/RelaySettingsPage.tsx @@ -94,7 +94,7 @@ const RelaySettingsPage: React.FC = () => { { kind: 30023, kindString: 'kind30023', description: 'Formatted Articles', category: 1 }, { kind: 30079, kindString: 'kind30079', description: 'Event Paths', category: 1 }, //{ kind: 9734, kindString: 'kind9734', description: 'Lightning Zap Request', category: 2 }, - { kind: 9735, kindString: 'kind9735', description: 'Lightning Zap Invoice Receipts', category: 2 }, + { kind: 9735, kindString: 'kind9735', description: 'Zap Receipt', category: 2 }, { kind: 10011, kindString: 'kind10011', description: 'Issue Notes', category: 3 }, { kind: 10022, kindString: 'kind10022', description: 'PR Notes', category: 3 }, { kind: 9803, kindString: 'kind9803', description: 'Commit Notes', category: 3 }, From b0740fa730726201f857afa82a73a7b465830cc8 Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:56:11 -0700 Subject: [PATCH 05/11] various fixes: relay settings --- src/pages/RelaySettingsPage.tsx | 10 +++++----- src/styles/GlobalStyle.ts | 14 +++++++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/pages/RelaySettingsPage.tsx b/src/pages/RelaySettingsPage.tsx index 5ffe4f1..481a062 100644 --- a/src/pages/RelaySettingsPage.tsx +++ b/src/pages/RelaySettingsPage.tsx @@ -85,7 +85,7 @@ const RelaySettingsPage: React.FC = () => { { kind: 8, kindString: 'kind8', description: 'Badge Award', category: 2 }, { kind: 16, kindString: 'kind16', description: 'Generic Repost', category: 1 }, { kind: 10000, kindString: 'kind10000', description: 'Mute List', category: 1 }, - { kind: 10001, kindString: 'kind10001', description: 'Pinned Note', category: 1 }, + { kind: 10001, kindString: 'kind10001', description: 'Pinned Note(s)', category: 1 }, { kind: 10002, kindString: 'kind10002', description: 'Tiny Relay List', category: 1 }, { kind: 1984, kindString: 'kind1984', description: 'Reporting', category: 1 }, { kind: 30000, kindString: 'kind30000', description: 'Custom Follow List', category: 1 }, @@ -581,7 +581,7 @@ const RelaySettingsPage: React.FC = () => {

{group.name}

{group.notes.map((note) => ( -
+
{ style={{ display: 'flex', flexDirection: 'row', gap: '.5rem', alignItems: 'center' }} key={kind} > -
+
{

{group.name}

{group.notes.map((note) => ( -
+
{ style={{ display: 'flex', flexDirection: 'row', gap: '.5rem', alignItems: 'center' }} key={kind} > -
+
Date: Sat, 27 Jul 2024 19:32:23 -0700 Subject: [PATCH 06/11] update translations --- src/locales/en/translation.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index b0e3698..ec2a88d 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -107,13 +107,13 @@ "nuclear": "Nuclear", "oil": "Oil", "kinds": "Kinds", - "pie": "Nostr Relay Contents", + "pie": "Nostr Relay Storage", "scatter": "Scatter", "search": "Search Engine", "union": "Union Ads", "video": "Video Ads", "visitorsFrom": "Contents from", - "monthlyDataUsage": "Notes and Media", + "monthlyDataUsage": "Notes vs Media", "notes": "Notes", "media": "Media" }, From b0212c1d805e53414212c4f44f83a4c8390dd88e Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Sun, 28 Jul 2024 19:16:47 -0700 Subject: [PATCH 07/11] update relay settings --- .../layouts/main/sider/MainSider/MainSider.styles.ts | 1 + src/pages/RelaySettingsPage.tsx | 7 ++++--- src/pages/uiComponentsPages/UIComponentsPage.styles.ts | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/layouts/main/sider/MainSider/MainSider.styles.ts b/src/components/layouts/main/sider/MainSider/MainSider.styles.ts index 8fcc36f..8abe687 100644 --- a/src/components/layouts/main/sider/MainSider/MainSider.styles.ts +++ b/src/components/layouts/main/sider/MainSider/MainSider.styles.ts @@ -83,6 +83,7 @@ export const SiderLogoDiv = styled.div` `; export const BrandSpan = styled.span` + margin: 0 1rem; font-weight: 600; font-size: 0.9rem; diff --git a/src/pages/RelaySettingsPage.tsx b/src/pages/RelaySettingsPage.tsx index 481a062..93b0059 100644 --- a/src/pages/RelaySettingsPage.tsx +++ b/src/pages/RelaySettingsPage.tsx @@ -437,7 +437,8 @@ const RelaySettingsPage: React.FC = () => { @@ -451,7 +452,7 @@ const RelaySettingsPage: React.FC = () => { /> - +
@@ -841,7 +842,7 @@ const RelaySettingsPage: React.FC = () => { /> - +
diff --git a/src/pages/uiComponentsPages/UIComponentsPage.styles.ts b/src/pages/uiComponentsPages/UIComponentsPage.styles.ts index 81f4a62..7ee6e08 100644 --- a/src/pages/uiComponentsPages/UIComponentsPage.styles.ts +++ b/src/pages/uiComponentsPages/UIComponentsPage.styles.ts @@ -115,7 +115,7 @@ export const CheckboxLabel = styled.label` `; // Scaling up the BaseSwitch by increasing its dimensions export const LargeSwitch = styled(BaseSwitch)` - transform: scale(1.2); // Adjust the scale factor as needed + transform: scale(1.05); // Adjust the scale factor as needed transform-origin: center; & .modeSwitch{ background-image: linear-gradient(to right,red,red), linear-gradient(to right,var(--background-color),var(--background-color)); From 573c7effb8f1a6ddc6f2688fa37ba6fd0439b261 Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:50:12 -0700 Subject: [PATCH 08/11] dummy hex generator --- .../ActivityStoryItem/ActivityStoryItem.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx b/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx index 280ac0b..6836986 100644 --- a/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx +++ b/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx @@ -13,13 +13,23 @@ export const ActivityStoryItem: React.FC = ({ witness_tx_id, // Convert value to number const numericValue = parseFloat(value); + //function for dummy data until winness_tx_id is available + function makeHexId(length: number): string { + const characters = 'abcdef0123456789'; + let result = ''; + for (let i = 0; i < length; i++) { + result += characters.charAt(Math.floor(Math.random() * characters.length)); + } + return result; + } + return ( {t('Witness Transaction ID')}: - {witness_tx_id} + {witness_tx_id ? witness_tx_id : makeHexId(64)} {t('Output')}: From c358dd2a85c23693e2ef8ce7c57bed68c96d313c Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:50:49 -0700 Subject: [PATCH 09/11] increased stories visible on large view --- .../activityStory/ActivityStoryItem/ActivityStoryItem.tsx | 2 +- .../nft-dashboard/trending-creators/TrendingCreators.tsx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx b/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx index 6836986..d429647 100644 --- a/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx +++ b/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx @@ -13,7 +13,7 @@ export const ActivityStoryItem: React.FC = ({ witness_tx_id, // Convert value to number const numericValue = parseFloat(value); - //function for dummy data until winness_tx_id is available + //function for dummy data until winness_tx_id is available !!! TODO: remove this function when winness_tx_id is available function makeHexId(length: number): string { const characters = 'abcdef0123456789'; let result = ''; diff --git a/src/components/nft-dashboard/trending-creators/TrendingCreators.tsx b/src/components/nft-dashboard/trending-creators/TrendingCreators.tsx index 9cae126..66ecc5a 100644 --- a/src/components/nft-dashboard/trending-creators/TrendingCreators.tsx +++ b/src/components/nft-dashboard/trending-creators/TrendingCreators.tsx @@ -76,7 +76,10 @@ export const TrendingCreators: React.FC = () => { flickPower="500" breakpoints={{ 8000: { - perPage: 8, // Large desktops and above + perPage: 10, // Large desktops and above + }, + 1920: { + perPage: 10, }, 1600: { perPage: 8, // Smaller desktops From cc575deb8ea5b0e967b3e222e4b15e1388fe8baf Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:48:03 -0700 Subject: [PATCH 10/11] fix rerendering --- .../ActivityStoryItem/ActivityStoryItem.tsx | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx b/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx index d429647..2c09cd1 100644 --- a/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx +++ b/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {useEffect, useState} from 'react'; import { useTranslation } from 'react-i18next'; import { WalletTransaction } from '@app/api/activity.api'; import { Dates } from '@app/constants/Dates'; @@ -7,21 +7,28 @@ import { CurrencyTypeEnum } from '@app/interfaces/interfaces'; import * as S from './ActivityStoryItem.styles'; import { BaseRow } from '@app/components/common/BaseRow/BaseRow'; import { BaseCol } from '@app/components/common/BaseCol/BaseCol'; +function makeHexId(length: number): string { + const characters = 'abcdef0123456789'; + let result = ''; + for (let i = 0; i < length; i++) { + result += characters.charAt(Math.floor(Math.random() * characters.length)); + } + return result; +} export const ActivityStoryItem: React.FC = ({ witness_tx_id, date, output, value }) => { const { t } = useTranslation(); + const [transactionId, setTransactionId] = useState(null); - // Convert value to number - const numericValue = parseFloat(value); - //function for dummy data until winness_tx_id is available !!! TODO: remove this function when winness_tx_id is available - function makeHexId(length: number): string { - const characters = 'abcdef0123456789'; - let result = ''; - for (let i = 0; i < length; i++) { - result += characters.charAt(Math.floor(Math.random() * characters.length)); + // Effect to initialize the transaction ID when the component mounts + useEffect(() => { + if (!witness_tx_id) { + setTransactionId(makeHexId(64)); } - return result; - } + }, [witness_tx_id]); + + const numericValue = parseFloat(value); + return ( @@ -29,7 +36,7 @@ export const ActivityStoryItem: React.FC = ({ witness_tx_id, {t('Witness Transaction ID')}: - {witness_tx_id ? witness_tx_id : makeHexId(64)} + {witness_tx_id ? witness_tx_id : transactionId} {t('Output')}: From 22b304797add054e447834daf2251ab434cb0715 Mon Sep 17 00:00:00 2001 From: TONE-E <90010906+AnthonyMarin@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:52:19 -0700 Subject: [PATCH 11/11] dynamic kinds updates --- src/pages/RelaySettingsPage.tsx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/RelaySettingsPage.tsx b/src/pages/RelaySettingsPage.tsx index 93b0059..3075fc9 100644 --- a/src/pages/RelaySettingsPage.tsx +++ b/src/pages/RelaySettingsPage.tsx @@ -613,11 +613,11 @@ const RelaySettingsPage: React.FC = () => { {settings.mode !== 'smart' && (

{'Add to Blacklist'}

{ /> - {kind} + {`kind`+kind}
removeDynamicKind(kind)} > Remove @@ -827,7 +827,7 @@ const RelaySettingsPage: React.FC = () => { {

{group.name}

{group.notes.map((note) => ( -
+
{
{settings.mode === 'unlimited' && ( -
+

{'Add to Blacklist'}

-
+
setNewKind(e.target.value)} placeholder="Enter new kind" /> { @@ -1026,7 +1026,7 @@ const RelaySettingsPage: React.FC = () => {
{ > {(settings.dynamicKinds || []).map((kind) => (
@@ -1048,7 +1048,7 @@ const RelaySettingsPage: React.FC = () => { isActive={true} style={{ fontSize: '1.2rem', paddingRight: '.8rem', paddingLeft: '.8rem' }} > - {kind} + {`kind`+kind}
removeDynamicKind(kind)}>