diff --git a/src/App.jsx b/src/App.jsx index 65798b2..e353e0d 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -46,21 +46,14 @@ function App() { <> } /> - } /> - } /> - } /> } /> } /> } /> } /> - } /> } /> } /> } /> - } /> } /> - } /> - } /> } /> } /> diff --git a/src/components/DropdownProfile.jsx b/src/components/DropdownProfile.jsx index e0da30e..0952f8a 100644 --- a/src/components/DropdownProfile.jsx +++ b/src/components/DropdownProfile.jsx @@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect } from 'react'; import {observer} from "mobx-react-lite"; import { Link } from 'react-router-dom'; import Transition from '../utils/Transition'; -import {registrationStore} from "../store/store"; +import {store} from "../store/store"; import {generateSvgAvatar} from "../images/GenerateOnboardingSvg/GenerateSvg"; import UserAvatar from '../images/user-avatar-32.png'; @@ -36,6 +36,11 @@ import UserAvatar from '../images/user-avatar-32.png'; return () => document.removeEventListener('keydown', keyHandler); }); + const logOut = () => { + sessionStorage.removeItem('passPhrase') + store.fetchPassPhrase() + } + return (
- {/* Footer */} -
-
- Have an account? Sign In -
-
diff --git a/src/pages/Onboarding3.jsx b/src/pages/Onboarding3.jsx index 1af6786..e43686d 100644 --- a/src/pages/Onboarding3.jsx +++ b/src/pages/Onboarding3.jsx @@ -1,28 +1,32 @@ -import React from 'react'; +import React, {useEffect} from 'react'; import {observer} from "mobx-react-lite"; import { Link } from 'react-router-dom'; import {generateSvgAvatar} from "../images/GenerateOnboardingSvg/GenerateSvg"; import Logo from "../images/logo.png"; -import {registrationStore} from "../store/store"; +import {store} from "../store/store"; const Onboarding3 = observer(()=>{ - function generatePassPhrase() { - registrationStore.generatePassPhrase(); + + useEffect(()=>{ + store.generatePassPhrase(); + }, []) + + const generatePassPhrase = () => { + store.generatePassPhrase(); }; - function savePassPhraseInStore (copiedPhrase) { + const savePassPhraseInStore = copiedPhrase => { if (copiedPhrase.split(' ').length === 12) { - registrationStore.savePastPassPhrase(copiedPhrase.trim()); + store.savePastPassPhrase(copiedPhrase.trim()); } }; - function pastePassPhrase() { + const pastePassPhrase = () => { navigator.clipboard.readText().then(res => savePassPhraseInStore(res)); }; - function convertPassPhraseToArray() { - return registrationStore.passPhrase.split(' ').map((item, index) => ({str:item, id:index})); - }; + const convertPassPhraseToArray = () => store.passPhrase.split(' '). + map((item, index) => ({str: item, id: index})); return (
@@ -118,7 +122,7 @@ const Onboarding3 = observer(()=>{ {/* Image */} diff --git a/src/pages/Onboarding4.jsx b/src/pages/Onboarding4.jsx index 0280407..06c2c8d 100644 --- a/src/pages/Onboarding4.jsx +++ b/src/pages/Onboarding4.jsx @@ -3,7 +3,7 @@ import { Link } from 'react-router-dom'; import {generateSvgAvatar} from "../images/GenerateOnboardingSvg/GenerateSvg"; import Logo from "../images/logo.png"; import {observer} from "mobx-react-lite"; -import { registrationStore } from "../store/store"; +import { store } from "../store/store"; const Onboarding4 = observer(() => { @@ -11,8 +11,9 @@ const Onboarding4 = observer(() => { function createAccount() { if(checkBoxesSelected.length === 2) { - registrationStore.pushAccountData(); - sessionStorage.setItem('passPhrase', registrationStore.passPhrase); + store.pushAccountData(); + sessionStorage.setItem('passPhrase', store.passPhrase); + store.clearDataRegistration(); } }; @@ -24,7 +25,7 @@ const Onboarding4 = observer(() => { } }; - const firstNameAccount = registrationStore.accountData.length && registrationStore.accountData.find(item => item.key === "firstname").value; + const firstNameAccount = store.accountData.length && store.accountData.find(item => item.key === "firstname").value; return (
@@ -83,7 +84,7 @@ const Onboarding4 = observer(() => {

{firstNameAccount ? `Nice to meet you, ${firstNameAccount} 🙌` : 'Please, go back step 2'}

@@ -112,7 +113,7 @@ const Onboarding4 = observer(() => { {/* Image */} diff --git a/src/pages/SignIn.jsx b/src/pages/SignIn.jsx index 40c5e23..80b079d 100644 --- a/src/pages/SignIn.jsx +++ b/src/pages/SignIn.jsx @@ -3,7 +3,7 @@ import {observer} from "mobx-react-lite"; import { Link } from 'react-router-dom'; import {generateSvgAvatar} from "../images/GenerateOnboardingSvg/GenerateSvg"; import Logo from "../images/logo.png"; -import {registrationStore} from "../store/store"; +import {store} from "../store/store"; const SignIn = observer(()=>{ @@ -12,11 +12,11 @@ const SignIn = observer(()=>{ function savePassPhrase (copiedPhrase) { if (copiedPhrase.split(' ').length === 12) { - registrationStore.savePastPassPhrase(copiedPhrase.trim()); - setPassPhrase(registrationStore.passPhrase); + store.savePastPassPhrase(copiedPhrase.trim()); + setPassPhrase(store.passPhrase); setAddedPassPhrase(true); } - }; + } function convertPassPhraseToArray() { return passPhrase.split(' ').map((item, index) => ({str:item, id:index})); @@ -24,7 +24,7 @@ const SignIn = observer(()=>{ function pastePassPhrase() { navigator.clipboard.readText().then(res => savePassPhrase(res)); - }; + } return (
@@ -41,7 +41,7 @@ const SignIn = observer(()=>{ {/* Header */}
{/* Logo */} - + logo
@@ -75,7 +75,7 @@ const SignIn = observer(()=>{
@@ -90,7 +90,7 @@ const SignIn = observer(()=>{ {/* Table */}
- +
{/* Left sidebar */} @@ -407,7 +407,7 @@ const Profile = observer (() => {

Summary

- {registrationStore.decryptedAccountData.filter(({ key }) => selectedItems.includes(key)).map(item => ( + {store.decryptedAccountData.filter(({ key }) => selectedItems.includes(key)).map(item => ( {item.label} ))}
diff --git a/src/pages/digitalId/Validate.jsx b/src/pages/digitalId/Validate.jsx index 78462f4..351b92c 100644 --- a/src/pages/digitalId/Validate.jsx +++ b/src/pages/digitalId/Validate.jsx @@ -6,7 +6,7 @@ import ValidateTable from "../../partials/validate/ValidateTable"; import ValidatePanel from "../../partials/validate/ValidatePanel"; import ValidateRoadMap from "../../partials/validationLog/ValidateRoadMap"; import {Link} from "react-router-dom"; -import {registrationStore} from "../../store/store"; +import {store} from "../../store/store"; const Validate = observer(() => { const [sidebarOpen, setSidebarOpen] = useState(false); @@ -57,7 +57,7 @@ const Validate = observer(() => {

Digital ID validation log ✨

- {registrationStore.transactionsInfo.map(item => { + {store.transactionsInfo.map(item => { return })}
diff --git a/src/pages/digitalId/ValidationLog.jsx b/src/pages/digitalId/ValidationLog.jsx index 6c2a4fc..9644d80 100644 --- a/src/pages/digitalId/ValidationLog.jsx +++ b/src/pages/digitalId/ValidationLog.jsx @@ -3,7 +3,7 @@ import ValidateRoadMap from "../../partials/validationLog/ValidateRoadMap"; import {observer} from "mobx-react-lite"; import Sidebar from '../../partials/Sidebar'; import Header from '../../partials/Header'; -import {registrationStore} from "../../store/store"; +import {store} from "../../store/store"; const ValidationLog = observer(() => { const [sidebarOpen, setSidebarOpen] = useState(false); @@ -27,7 +27,7 @@ const ValidationLog = observer(() => {
{/* PostsID */} - {registrationStore.transactionsInfo.map(item => { + {store.transactionsInfo.map(item => { return })}
diff --git a/src/pages/digitalId/Verify.jsx b/src/pages/digitalId/Verify.jsx index 821cd18..30f7e53 100644 --- a/src/pages/digitalId/Verify.jsx +++ b/src/pages/digitalId/Verify.jsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import Sidebar from '../../partials/Sidebar'; import Header from '../../partials/Header'; -import {registrationStore} from "../../store/store"; +import {store} from "../../store/store"; import { observer } from 'mobx-react-lite'; const Verify = observer(() => { @@ -42,7 +42,7 @@ const Verify = observer(() => {
{/* Block */}
- {registrationStore.sharedData.map((item, index) => ( + {store.sharedData.map((item, index) => (
{/* Header */}
diff --git a/src/partials/Sidebar.jsx b/src/partials/Sidebar.jsx index 1568aec..65bc46f 100644 --- a/src/partials/Sidebar.jsx +++ b/src/partials/Sidebar.jsx @@ -81,7 +81,7 @@ function Sidebar({ {/* Logo */} - + logo
@@ -97,101 +97,6 @@ function Sidebar({ Pages
    - {/* Dashboard */} - - {(handleClick, open) => { - return ( - - { - e.preventDefault(); - sidebarExpanded ? handleClick() : setSidebarExpanded(true); - }} - > -
    -
    - - - - - - - Dashboard - -
    - {/* Icon */} -
    - - - -
    -
    -
    -
    -
      -
    • - - 'block text-slate-400 hover:text-slate-200 transition duration-150 truncate ' + (isActive ? '!text-indigo-500' : '') - } - > - - Main - - -
    • -
    • - - 'block text-slate-400 hover:text-slate-200 transition duration-150 truncate ' + (isActive ? '!text-indigo-500' : '') - } - > - - Analytics - - -
    • -
    • - - 'block text-slate-400 hover:text-slate-200 transition duration-150 truncate ' + (isActive ? '!text-indigo-500' : '') - } - > - - Fintech - - -
    • -
    -
    -
    - ); - }} -
    {/* digitalId */} {(handleClick, open) => { @@ -302,38 +207,6 @@ function Sidebar({ ); }} - {/* Messages */} -
  • - -
    -
    - - - - - - Messages - -
    - {/* Badge */} -
    - 4 -
    -
    -
    -
diff --git a/src/partials/profile/ProfileTable.jsx b/src/partials/profile/ProfileTable.jsx index 7771ce1..a68ff80 100644 --- a/src/partials/profile/ProfileTable.jsx +++ b/src/partials/profile/ProfileTable.jsx @@ -2,7 +2,7 @@ import React, {useState, useEffect} from 'react'; import ProfileTableItem from './ProfileTableItem'; import ProfileIcon from '../../images/profile-icon.svg'; -function ProfileTable({ +function ProfileTable({ userData, handleClick, isCheck, @@ -23,7 +23,7 @@ function ProfileTable({ const generalData = userData.filter(elem => data.general.includes(elem.label)); const nationalityData = userData.filter(elem => data.nationality.includes(elem.label)); - const sosialData = userData.filter(elem => data.social.includes(elem.label)); + const socialData = userData.filter(elem => data.social.includes(elem.label)); const otherData = userData.filter((elem) => !data.general.includes(elem.label) && !data.nationality.includes(elem.label) && !data.social.includes(elem.label)); @@ -82,12 +82,12 @@ function ProfileTable({ {/* Social */} -
0 || 'hidden'}`}> +
0 || 'hidden'}`}>

Social 🖋️

- {sosialData.map(data => { + {socialData.map(data => { return ( this.fetchNodeInfoSuccess(info)) @@ -175,7 +179,7 @@ class Store { return this._accountData.map((elem) => ({ ...elem, key: elem.label, - label: labelMap[elem.label], + label: labelMap[elem.label] || elem.label, value: cryptography.decryptMessageWithPassphrase(elem.value, elem.value_nonce, this.passPhrase, this.pubKey).split(':')[1] })) } @@ -192,6 +196,18 @@ class Store { }) } + get firstName() { + return this.decryptedAccountData.find(item => item.key === 'firstname')?.value + } + + get lastName() { + return this.decryptedAccountData.find(item => item.key === 'secondname')?.value + } + + get accountName() { + return this.firstName || this.lastName || this.pubKey + } + get keysArray() { return this._keysArray; } @@ -228,6 +244,6 @@ class Store { const sign = cryptography.signDataWithPassphrase(Buffer.from(stringToSign, 'hex'), this.passPhrase).toString('hex') return this.pubKey + ':' +sign } -}; +} -export const registrationStore = new Store(); +export const store = new Store();