diff --git a/package.json b/package.json index 9034061..559c934 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@region-x/components", - "version": "0.1.16", + "version": "0.1.20", "type": "module", "main": "dist/index.js", "module": "dist/index.es.js", diff --git a/src/App.tsx b/src/App.tsx index b91b3f8..a004f4b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -20,6 +20,7 @@ function App() { } const regionData: RegionData = { + rawId: '5432', name: 'Region #2', regionStart: 'Started 10 days ago', regionEnd: 'Ends in 18 days', @@ -199,7 +200,7 @@ function App() {

- +

diff --git a/src/components/RegionCard/RegionCard.module.scss b/src/components/RegionCard/RegionCard.module.scss index f205a5c..f090ae5 100644 --- a/src/components/RegionCard/RegionCard.module.scss +++ b/src/components/RegionCard/RegionCard.module.scss @@ -20,4 +20,15 @@ justify-content: center; color: $dark5; } + + .priceWrapper { + display: flex; + justify-content: space-between; + + h4 { + @include Inter; + margin: 1rem 1rem; + font-weight: 500; + } + } } diff --git a/src/components/RegionCard/RegionCard.tsx b/src/components/RegionCard/RegionCard.tsx index 579d523..db141a9 100644 --- a/src/components/RegionCard/RegionCard.tsx +++ b/src/components/RegionCard/RegionCard.tsx @@ -12,13 +12,16 @@ interface RegionCardProps { selected?: boolean; regionData: RegionData; task: string; + salePrice?: string; + pricePerTimeslice?: string; } -const RegionCard: React.FC = ({task, typeMarketplace, ownedRegion, selected, regionData}) => { +const RegionCard: React.FC = ({task, typeMarketplace, ownedRegion, selected, regionData, salePrice, pricePerTimeslice}) => { return (
= ({task, typeMarketplace, ownedRegi consumed={regionData.consumed} currentUsage={regionData.currentUsage} /> + {typeMarketplace && +
+

Price: {salePrice}

+

Per timeslice: {pricePerTimeslice}

+
+ } { !typeMarketplace && regionData.chainLabel && regionData.chainColor ?
: - + }
); diff --git a/src/components/RegionCard/RegionCardHeader/RegionCardHeader.tsx b/src/components/RegionCard/RegionCardHeader/RegionCardHeader.tsx index efab270..778c745 100644 --- a/src/components/RegionCard/RegionCardHeader/RegionCardHeader.tsx +++ b/src/components/RegionCard/RegionCardHeader/RegionCardHeader.tsx @@ -5,33 +5,47 @@ import Identicon from '@polkadot/react-identicon'; import { encodeAddress, blake2AsU8a } from '@polkadot/util-crypto'; interface RegionCardHeaderProps { - name: string; //Card Name - regionStart: string; //start date - regionEnd: string; //end date - coreIndex: number; - duration: string; + rawId: string; + name: string; //Card Name + regionStart: string; //start date + regionEnd: string; //end date + coreIndex: number; + duration: string; } -const RegionCardHeader: React.FC = ({name, regionStart, regionEnd, coreIndex, duration}) => { - const publicKey = blake2AsU8a(`${regionStart}-${regionEnd}-${coreIndex}`); - const ss58Address = encodeAddress(publicKey, 42); - console.log(publicKey); - +const RegionCardHeader: React.FC = ({rawId, name, regionStart, regionEnd, coreIndex, duration}) => { return ( - <> -
- -
-
{name}
-

{regionStart} | {regionEnd}

+ <> + +
+ +
-
-
- - -
); }; +interface RegionMinimalProps { + rawId: string; + name: string; //Card Name + regionStart: string; //start date + regionEnd: string; //end date +} + +const RegionMinimal = ({rawId, name, regionStart, regionEnd}: RegionMinimalProps) => { + const publicKey = blake2AsU8a(`${rawId}`); + const ss58Address = encodeAddress(publicKey, 42); + + return ( +
+ +
+
{name}
+

{regionStart} | {regionEnd}

+
+
+ ) +} + +export { RegionMinimal }; export default RegionCardHeader; diff --git a/src/index.ts b/src/index.ts index 8473d6e..b8ee539 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,5 +5,7 @@ export { default as Slider } from './components/Slider/Slider'; export { default as Select } from './components/Select/Select'; export { default as Balance } from './components/Balance/Balance'; export { default as RegionCard } from './components/RegionCard/RegionCard'; +export { default as RegionCardHeader } from './components/RegionCard/RegionCardHeader/RegionCardHeader'; +export { RegionMinimal } from './components/RegionCard/RegionCardHeader/RegionCardHeader'; export { default as AmountInput } from './components/AmountInput/AmountInput'; export { default as TableComponent } from './components/TableComponent/TableComponent'; diff --git a/src/types/types.ts b/src/types/types.ts index 9d871a8..a303e43 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -7,6 +7,7 @@ export interface SelectOption { } export interface RegionData { + rawId: string; name: string; regionStart: string; regionEnd: string;