From bc364d1b855d1acb8834c65781e63c9803c63aee Mon Sep 17 00:00:00 2001 From: DwCay Date: Wed, 13 Jul 2022 14:30:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BD=D0=B5=D0=B9=D0=BC=D0=B8=D0=BD=D0=B3=20?= =?UTF-8?q?=D0=B2=20store=20=D0=B8=20transactionsStore.=20=D0=92=D0=BE?= =?UTF-8?q?=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D0=BA=D0=B8=20=D1=8E=D0=B7=D0=B5=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D1=83=20ValidationLog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/digitalId/Validate.jsx | 4 +- src/pages/digitalId/ValidationLog.jsx | 4 +- .../validationlog/ValidateRoadMap.jsx | 11 +++- .../validationlog/ValidationUsersImg.jsx | 5 +- src/store/store.js | 16 +++--- src/store/transactionsStore.js | 51 +++++++++++++++++++ 6 files changed, 75 insertions(+), 16 deletions(-) create mode 100644 src/store/transactionsStore.js diff --git a/src/pages/digitalId/Validate.jsx b/src/pages/digitalId/Validate.jsx index 5153e85..36ead06 100644 --- a/src/pages/digitalId/Validate.jsx +++ b/src/pages/digitalId/Validate.jsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import {observer} from "mobx-react-lite"; -import {validationLogStore} from "../../store/validationLogStore"; +import {transactionsStore} from "../../store/transactionsStore"; import Sidebar from '../../partials/Sidebar'; import Header from '../../partials/Header'; import ValidateTable from "../../partials/validate/ValidateTable"; @@ -58,7 +58,7 @@ const Validate = observer(()=>{

Digital ID validation log ✨

- {validationLogStore.transactionData.map(item => { + {transactionsStore.transactionsData.map(item => { return })} diff --git a/src/pages/digitalId/ValidationLog.jsx b/src/pages/digitalId/ValidationLog.jsx index 8a17a68..a1190b2 100644 --- a/src/pages/digitalId/ValidationLog.jsx +++ b/src/pages/digitalId/ValidationLog.jsx @@ -1,7 +1,7 @@ import React, {useState} from 'react'; import ValidateRoadMap from "../../partials/validationlog/ValidateRoadMap"; -import {validationLogStore} from "../../store/validationLogStore"; +import {transactionsStore} from "../../store/transactionsStore"; import {observer} from "mobx-react-lite"; import Sidebar from '../../partials/Sidebar'; import Header from '../../partials/Header'; @@ -28,7 +28,7 @@ const ValidationLog = observer(()=>{
{/* PostsID */} - {validationLogStore.transactionData.map(item=>{ + {transactionsStore.transactionsData.map(item=>{ return })}
diff --git a/src/partials/validationlog/ValidateRoadMap.jsx b/src/partials/validationlog/ValidateRoadMap.jsx index fdda6c0..c086b80 100644 --- a/src/partials/validationlog/ValidateRoadMap.jsx +++ b/src/partials/validationlog/ValidateRoadMap.jsx @@ -1,6 +1,7 @@ import React from "react"; import ValidationSeasonItem from "./ValidationSeasonItem"; +import ValidationUsersImg from "./ValidationUsersImg"; function ValidateRoadMap({ season }) { @@ -14,13 +15,19 @@ function ValidateRoadMap({ season }) {
{/* Avatars */} +
+ {season.users_images.map(pic => { + return + })} +
+
·
{/* List */}
    {/* List item(s) */} - {season.assets.map((item, index) => { - return + {season.transaction.map((item, index) => { + return })}
diff --git a/src/partials/validationlog/ValidationUsersImg.jsx b/src/partials/validationlog/ValidationUsersImg.jsx index 7f6b941..4b29d26 100644 --- a/src/partials/validationlog/ValidationUsersImg.jsx +++ b/src/partials/validationlog/ValidationUsersImg.jsx @@ -1,9 +1,10 @@ import React from "react"; function ValidationUsersImg({ image }) { + return ( - - {image.img} + + {image.image} ); } diff --git a/src/store/store.js b/src/store/store.js index c959a32..c9a084e 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -12,7 +12,7 @@ class Store { _userData = {} - _transactionInfo = {} + _transactionsInfo = {} constructor() { makeAutoObservable(this); @@ -20,7 +20,7 @@ class Store { this.fetchNodeInfo() reaction(() => this.tokenKey, () => this.fetchNewAccountData()) - reaction(() => this.tokenKey, () => this.fetchTransactionInfo()) + reaction(() => this.tokenKey, () => this.fetchTransactionsInfo()) }; fetchNewAccountData() { @@ -38,12 +38,12 @@ class Store { .then(()=>this.fetchNewAccountData()) } - fetchTransactionInfo() { + fetchTransactionsInfo() { fetchWrapper.getAuth(`http://3.125.47.101/api/account/transactions/b444b7ff3118cf2a30cbd54cfcdb8fd5d805017a?moduleID=1001&assetID=11`, { networkIdentifier: this.nodeInfo.networkIdentifier, lastBlockID: this.nodeInfo.lastBlockID }) - .then((res)=>this.saveInfoTransaction(res)) + .then((res)=>this.saveInfoTransactions(res)) } userDataFetchChange(res) { @@ -54,8 +54,8 @@ class Store { return this._userData } - get transactionInfo() { - return this._transactionInfo + get transactionsInfo() { + return this._transactionsInfo } savePassPhrase(phrase) { @@ -66,8 +66,8 @@ class Store { this._accountData = data; }; - saveInfoTransaction(transaction) { - this._transactionInfo = transaction + saveInfoTransactions(transaction) { + this._transactionsInfo = transaction } fetchNodeInfo() { diff --git a/src/store/transactionsStore.js b/src/store/transactionsStore.js new file mode 100644 index 0000000..a14ad80 --- /dev/null +++ b/src/store/transactionsStore.js @@ -0,0 +1,51 @@ +import {makeAutoObservable, reaction} from "mobx"; +import {registrationStore} from "./store"; +import User05 from "../../src/images/user-28-05.jpg"; +import User08 from "../../src/images/user-28-08.jpg"; +import User09 from "../../src/images/user-28-09.jpg"; +import User06 from "../../src/images/user-28-06.jpg"; + +const labelMap = { + firstname: 'First name', + secondname: 'Second name', + gender: "Gender", + birthdate: "Birthdate" +}; + +const usersImages = [User08,User06,User05,User09]; + +class TransactionsStore { + _transactionsData = []; + + constructor() { + makeAutoObservable(this) + + reaction(() => ({data: registrationStore.transactionsInfo}), ({data}) => { + this._transactionsData = data.data; + }) + } + + get transactionsData() { + return this._transactionsData.map(item=>{ + return { + id: item.id, + users_images: usersImages.map(image=>{ + return { + image: image, + size: 24 + } + }), + transaction: item.asset.features.map(asset=>{ + return { + transaction_id: item.id, + address: item.asset.recipientAddress, + value: asset.value, + label: labelMap[asset.label], + } + }) + } + }) + } +} + +export const transactionsStore = new TransactionsStore()