diff --git a/web/src/pages/Company/ProveIdentity.tsx b/web/src/pages/Company/ProveIdentity.tsx
new file mode 100644
index 00000000..1993f2b5
--- /dev/null
+++ b/web/src/pages/Company/ProveIdentity.tsx
@@ -0,0 +1,71 @@
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import randomstring from 'randomstring';
+import { Layout, Loading, QRCode, RandomGraphicElement, WebSocket } from '../../components';
+import useStep from '../../utils/useStep';
+import config from '../../config.json';
+import { useTranslation, Trans } from 'react-i18next';
+import { Router, useNavigate } from 'react-router';
+import { Actions, useCredentialsDispatch, useGlobalState } from '../../context/globalState';
+import { Providers } from '@sharedTypes/Providers';
+import { Issuers } from '@sharedTypes/Issuers';
+import { Scopes } from '@sharedTypes/Scopes';
+import { copyFile } from 'fs';
+
+const ProveIdentity: React.FC = () => {
+ const { t } = useTranslation();
+
+ const { nextStep } = useStep();
+ const navigate = useNavigate();
+ const [loading, setLoading] = useState(true);
+ const [status, setStatus] = useState("pages.general.proveIdentity.waitingForLogin");
+ const dispatch = useCredentialsDispatch();
+ const { state } = useGlobalState();
+
+ const goToNextStep = useCallback(() => {
+ navigate(nextStep);
+ }, [nextStep, navigate]);
+
+ useEffect(() => {
+ dispatch?.({type: Actions.REQUEST_INVITE, provider: Providers.WaltId, scope: Scopes.CompanyHouse});
+ }, [dispatch]);
+
+ useEffect(() => {
+ if(state[Scopes.CompanyHouse]?.connectedDID) {
+ goToNextStep();
+ }
+ }, [state, goToNextStep])
+
+ const messages = {
+ waiting: 'general.messages.waiting',
+ connectionError: 'general.messages.connectionError',
+ missing: 'general.messages.missing',
+ verifying: 'general.messages.verifying'
+ };
+
+ function setStatusMessage(message: string) {
+ setStatus(message);
+ }
+
+ return (
+
+
+
+
{t("pages.general.proveIdentity.provideCredentials")}
+
+
+ Scan this QR code with Selv App to continue
+
+
+
+ {/* TODO: Handle loading state */}
+
+
+
{t(status)}
+ {loading &&
}
+
+ );
+};
+
+export default ProveIdentity;
diff --git a/web/src/pages/Company/ProvideData.tsx b/web/src/pages/Company/ProvideData.tsx
new file mode 100644
index 00000000..1f93912d
--- /dev/null
+++ b/web/src/pages/Company/ProvideData.tsx
@@ -0,0 +1,78 @@
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import randomstring from 'randomstring';
+import { Layout, Loading, QRCode, RandomGraphicElement, WebSocket } from '../../components';
+import useStep from '../../utils/useStep';
+import config from '../../config.json';
+import { useTranslation, Trans } from 'react-i18next';
+import { Router, useNavigate } from 'react-router';
+import { Actions, useCredentialsDispatch, useGlobalState } from '../../context/globalState';
+import { Providers } from '@sharedTypes/Providers';
+import { Issuers } from '@sharedTypes/Issuers';
+import { Scopes } from '@sharedTypes/Scopes';
+
+
+const ProvideData: React.FC = () => {
+ const { t } = useTranslation();
+
+ const { nextStep } = useStep();
+ const navigate = useNavigate();
+ const [loading, setLoading] = useState(true);
+ const [status, setStatus] = useState("pages.general.proveIdentity.waitingForLogin");
+ const dispatch = useCredentialsDispatch();
+ const { state } = useGlobalState();
+
+ const goToNextStep = useCallback(() => {
+ navigate(nextStep);
+ }, [nextStep, navigate]);
+
+ useEffect(() => {
+
+ dispatch?.({
+ type: Actions.REQUEST_PRESENTATION,
+ provider: Providers.WaltId,
+ scope: Scopes.CompanyHouse,
+
+ })
+
+ }, [dispatch]);
+
+ useEffect(() => {
+ if(state[Scopes.CompanyHouse]?.credentials?.length) {
+ goToNextStep();
+ }
+ }, [state, goToNextStep])
+
+ const messages = {
+ waiting: 'general.messages.waiting',
+ connectionError: 'general.messages.connectionError',
+ missing: 'general.messages.missing',
+ verifying: 'general.messages.verifying'
+ };
+
+ function setStatusMessage(message: string) {
+ setStatus(message);
+ }
+
+ return (
+
+
+
+
{t("pages.general.proveIdentity.provideCredentials")}
+
+
+ Scan this QR code with Selv App to continue
+
+
+
+ {/* TODO: Handle loading state */}
+
+
+
{t(status)}
+ {loading &&
}
+
+ );
+};
+
+export default ProvideData;
diff --git a/web/src/pages/Company/ReceiveCredentials.tsx b/web/src/pages/Company/ReceiveCredentials.tsx
new file mode 100644
index 00000000..1db9f299
--- /dev/null
+++ b/web/src/pages/Company/ReceiveCredentials.tsx
@@ -0,0 +1,88 @@
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import randomstring from 'randomstring';
+import { Layout, Loading, QRCode, RandomGraphicElement, WebSocket } from '../../components';
+import useStep from '../../utils/useStep';
+import config from '../../config.json';
+import { useTranslation, Trans } from 'react-i18next';
+import { Router, useNavigate } from 'react-router';
+import { Actions, useCredentialsDispatch, useGlobalState } from '../../context/globalState';
+import { Issuers } from '@sharedTypes/Issuers';
+import { Providers } from '@sharedTypes/Providers';
+import { Scopes } from '@sharedTypes/Scopes';
+
+const ReceiveCredentials: React.FC = () => {
+ const { t } = useTranslation();
+
+ const { nextStep } = useStep();
+ const navigate = useNavigate();
+ const [loading, setLoading] = useState(true);
+ const [status, setStatus] = useState("pages.general.proveIdentity.waitingForLogin");
+ const dispatch = useCredentialsDispatch();
+ const { state } = useGlobalState();
+
+ const goToNextStep = useCallback(() => {
+ navigate(nextStep);
+ }, [nextStep, navigate]);
+
+ useEffect(() => {
+ dispatch?.({type: Actions.REQUEST_ISSUANCE, provider: Providers.WaltId, scope: Scopes.CompanyHouse, credential:JSON.stringify({
+ '@context': [
+ 'https://www.w3.org/2018/credentials/v1',
+ 'https://www.w3.org/2018/credentials/examples/v1',
+ ],
+ type: ['VerifiableCredential', 'UniversityDegreeCredential'],
+ issuanceDate: '2017-10-22T12:23:48Z',
+ // issuer:
+ // 'did:iota:snd:0x1d78531b739a3aef0e90523213f28e869423a6d6253ea0fcbd7db2714e9606bf',
+ credentialSubject: {
+ id: 'did:iota:snd:0xce05da2c7e3fd32e89b4fcaf77bb3101d89be60ba6276cba80bd3ec2bd0603f6',
+ degree: {
+ type: 'BachelorDegree',
+ name: 'Bachelor of Science and Arts',
+ },
+ },
+ }),
+ issuer: Issuers.CompanyHouse
+ })
+ }, [dispatch]);
+
+ useEffect(() => {
+ if(state[Scopes.CompanyHouse]?.issuanceComplete) {
+ goToNextStep();
+ }
+ }, [state, goToNextStep])
+
+ const messages = {
+ waiting: 'general.messages.waiting',
+ connectionError: 'general.messages.connectionError',
+ missing: 'general.messages.missing',
+ verifying: 'general.messages.verifying'
+ };
+
+ function setStatusMessage(message: string) {
+ setStatus(message);
+ }
+
+ return (
+
+
+
+
{t("pages.general.proveIdentity.provideCredentials")}
+
+
+ Scan this QR code with Selv App to continue
+
+
+
+ {/* TODO: Handle loading state */}
+
+
+
{t(status)}
+ {loading &&
}
+
+ );
+};
+
+export default ReceiveCredentials;
diff --git a/web/bank/src/pages/SingInConfirmation.tsx b/web/src/pages/Company/SingInConfirmation.tsx
similarity index 52%
rename from web/bank/src/pages/SingInConfirmation.tsx
rename to web/src/pages/Company/SingInConfirmation.tsx
index a3f276f5..8a663af7 100644
--- a/web/bank/src/pages/SingInConfirmation.tsx
+++ b/web/src/pages/Company/SingInConfirmation.tsx
@@ -1,33 +1,20 @@
import React, { useEffect } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
import { Button } from 'antd';
-import useStep from '../utils/useStep';
-import { Layout, RandomGraphicElement } from '../components';
-import selv from '../assets/selvBordered.svg';
+import useStep from '../../utils/useStep';
+import { Layout, RandomGraphicElement } from '../../components';
+import selv from '../../assets/selvBordered.svg';
import { useTranslation } from 'react-i18next';
/**
* Component which will display a SingInConfirmation.
*/
-const SingInConfirmation: React.FC = ({ history, match }: any) => {
- const { nextStep } = useStep(match);
-
+const SingInConfirmation: React.FC = () => {
+ const { nextStep } = useStep();
const { t } = useTranslation();
- useEffect(() => {
- async function getData() {
- const credentialsString: string | null = await localStorage.getItem('credentials');
- const credentials = credentialsString && await JSON.parse(credentialsString);
- const status = credentials?.status;
- if (!status || Number(status) !== 2) {
- history.goBack();
- }
- }
- getData();
- }, []); // eslint-disable-line react-hooks/exhaustive-deps
-
return (
-
+
diff --git a/web/src/pages/Company/index.tsx b/web/src/pages/Company/index.tsx
new file mode 100644
index 00000000..a5df8ad0
--- /dev/null
+++ b/web/src/pages/Company/index.tsx
@@ -0,0 +1,19 @@
+import CompanyIntro from './CompanyIntro';
+import ProveIdentity from './ProveIdentity';
+import SingInConfirmation from './SingInConfirmation';
+import CompanyData from './CompanyData';
+import CompanyDetails from './CompanyDetails';
+import Confirmation from './Confirmation';
+import ProvideData from './ProvideData';
+import ReceiveCredentials from './ReceiveCredentials';
+
+export {
+ ProveIdentity,
+ SingInConfirmation,
+ CompanyIntro,
+ CompanyData,
+ CompanyDetails,
+ Confirmation,
+ ProvideData,
+ ReceiveCredentials
+};
diff --git a/web/bank/src/pages/GreatSuccess.tsx b/web/src/pages/GreatSuccess.tsx
similarity index 97%
rename from web/bank/src/pages/GreatSuccess.tsx
rename to web/src/pages/GreatSuccess.tsx
index a8759d74..07f19833 100644
--- a/web/bank/src/pages/GreatSuccess.tsx
+++ b/web/src/pages/GreatSuccess.tsx
@@ -14,8 +14,8 @@ import { useTranslation } from 'react-i18next';
/**
* Component which will display a GreatSuccess.
*/
-const GreatSuccess: React.FC = ({ match }: any) => {
- const { nextStep } = useStep(match);
+const GreatSuccess: React.FC = () => {
+ const { nextStep } = useStep();
const [companyId, setCompanyId] = useState('');
const { t } = useTranslation();
diff --git a/web/bank/src/pages/IncorporatedCompaniesList.tsx b/web/src/pages/IncorporatedCompaniesList.tsx
similarity index 84%
rename from web/bank/src/pages/IncorporatedCompaniesList.tsx
rename to web/src/pages/IncorporatedCompaniesList.tsx
index 47b7849e..dbd306fa 100644
--- a/web/bank/src/pages/IncorporatedCompaniesList.tsx
+++ b/web/src/pages/IncorporatedCompaniesList.tsx
@@ -5,25 +5,25 @@ import { Button } from 'antd';
import useStep from '../utils/useStep';
import useFetch from '../utils/useFetch';
import { Layout, Table, NextStepDrawer } from '../components';
-import { serverAPI } from '../config.json';
+import config from '../config.json';
import { useTranslation } from 'react-i18next';
/**
* Component which will display a IncorporatedCompanies.
*/
-const IncorporatedCompanies: React.FC = ({ history, match, ...props }: any) => {
- const { nextStep } = useStep(match);
- const { response, loading } = useFetch(`${serverAPI}/company`);
+const IncorporatedCompanies: React.FC = ({ history, ...props }: any) => {
+ const { nextStep } = useStep();
+ const { response, loading } = useFetch(`${config.serverAPI}/company`);
const { t } = useTranslation();
function onRowClick (data: any) {
- history.push(`/company/details/${match?.params?.step || 0}/${data.CompanyNumber}`);
+ // history.push(`/company/details/${match?.params?.step || 0}/${data.CompanyNumber}`);
}
const drawer = props?.location?.state?.nextStep ? 'drawer' : '';
return (
-
+
diff --git a/web/bank/src/pages/InsuranceData.tsx b/web/src/pages/InsuranceData.tsx
similarity index 99%
rename from web/bank/src/pages/InsuranceData.tsx
rename to web/src/pages/InsuranceData.tsx
index 754dbf9b..857019ab 100644
--- a/web/bank/src/pages/InsuranceData.tsx
+++ b/web/src/pages/InsuranceData.tsx
@@ -130,7 +130,7 @@ const InsuranceData: React.FC = ({ history, match }: any) => {
return (
-
+
{t("pages.insurance.insuranceData.openAnAccount")}
{
{
webSocket && {
- const { nextStep } = useStep(match);
+const IntroShowTodos: React.FC = () => {
+ const { nextStep } = useStep();
const { t } = useTranslation();
diff --git a/web/bank/src/pages/IntroShowTodos.tsx b/web/src/pages/IntroShowTodos.tsx
similarity index 96%
rename from web/bank/src/pages/IntroShowTodos.tsx
rename to web/src/pages/IntroShowTodos.tsx
index 51f34754..94129dc4 100644
--- a/web/bank/src/pages/IntroShowTodos.tsx
+++ b/web/src/pages/IntroShowTodos.tsx
@@ -12,8 +12,8 @@ import { useTranslation, Trans } from 'react-i18next';
/**
* Component which will display a IntroShowTodos.
*/
-const IntroShowTodos: React.FC = ({ match }: any) => {
- const { nextStep } = useStep(match);
+const IntroShowTodos: React.FC = () => {
+ const { nextStep } = useStep();
const { t } = useTranslation();
diff --git a/web/bank/src/pages/Landing.tsx b/web/src/pages/Landing.tsx
similarity index 88%
rename from web/bank/src/pages/Landing.tsx
rename to web/src/pages/Landing.tsx
index c3de5ea1..9fcd32c9 100644
--- a/web/bank/src/pages/Landing.tsx
+++ b/web/src/pages/Landing.tsx
@@ -1,4 +1,5 @@
import React, { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
import {
App,
ControlIdentity,
@@ -14,7 +15,8 @@ import {
/**
* Component which will display a Landing page.
*/
-const Landing: React.FC = ({ location }: any) => {
+const Landing: React.FC = () => {
+ let location = useLocation();
useEffect(() => {
if (location.hash) {
const target: Element | null = document.querySelector(location.hash);
diff --git a/web/bank/src/pages/ThankYou.tsx b/web/src/pages/ThankYou.tsx
similarity index 100%
rename from web/bank/src/pages/ThankYou.tsx
rename to web/src/pages/ThankYou.tsx
diff --git a/web/bank/src/pages/index.tsx b/web/src/pages/index.tsx
similarity index 55%
rename from web/bank/src/pages/index.tsx
rename to web/src/pages/index.tsx
index 7b78cc8a..4c2c9a7e 100644
--- a/web/bank/src/pages/index.tsx
+++ b/web/src/pages/index.tsx
@@ -1,14 +1,7 @@
import Landing from './Landing';
import IntroShowTodos from './IntroShowTodos';
import IntroShowMobile from './IntroShowMobile';
-import IntroDemoSelection from './IntroDemoSelection';
import AppDownloadQR from './AppDownloadQR';
-import CompanyIntro from './CompanyIntro';
-import ProveIdentity from './ProveIdentity';
-import SingInConfirmation from './SingInConfirmation';
-import CompanyData from './CompanyData';
-import CompanyDetails from './CompanyDetails';
-import Confirmation from './Confirmation';
import BankData from './BankData';
import InsuranceData from './InsuranceData';
import IncorporatedCompanies from './IncorporatedCompaniesList';
@@ -19,14 +12,7 @@ export {
Landing,
IntroShowTodos,
IntroShowMobile,
- IntroDemoSelection,
AppDownloadQR,
- ProveIdentity,
- SingInConfirmation,
- CompanyIntro,
- CompanyData,
- CompanyDetails,
- Confirmation,
BankData,
InsuranceData,
IncorporatedCompanies,
diff --git a/web/bank/src/react-app-env.d.ts b/web/src/react-app-env.d.ts
similarity index 100%
rename from web/bank/src/react-app-env.d.ts
rename to web/src/react-app-env.d.ts
diff --git a/testing/src/did/schemas/Address.json b/web/src/schemas/Address.json
similarity index 100%
rename from testing/src/did/schemas/Address.json
rename to web/src/schemas/Address.json
diff --git a/web/bank/src/schemas/BankAccount.json b/web/src/schemas/BankAccount.json
similarity index 100%
rename from web/bank/src/schemas/BankAccount.json
rename to web/src/schemas/BankAccount.json
diff --git a/web/bank/src/schemas/Company.json b/web/src/schemas/Company.json
similarity index 100%
rename from web/bank/src/schemas/Company.json
rename to web/src/schemas/Company.json
diff --git a/testing/src/did/schemas/ContactDetails.json b/web/src/schemas/ContactDetails.json
similarity index 100%
rename from testing/src/did/schemas/ContactDetails.json
rename to web/src/schemas/ContactDetails.json
diff --git a/web/bank/src/schemas/Insurance.json b/web/src/schemas/Insurance.json
similarity index 100%
rename from web/bank/src/schemas/Insurance.json
rename to web/src/schemas/Insurance.json
diff --git a/testing/src/did/schemas/PersonalData.json b/web/src/schemas/PersonalData.json
similarity index 100%
rename from testing/src/did/schemas/PersonalData.json
rename to web/src/schemas/PersonalData.json
diff --git a/web/bank/src/schemas/UserDataCredential.json b/web/src/schemas/UserDataCredential.json
similarity index 100%
rename from web/bank/src/schemas/UserDataCredential.json
rename to web/src/schemas/UserDataCredential.json
diff --git a/web/bank/src/serviceWorker.ts b/web/src/serviceWorker.ts
similarity index 100%
rename from web/bank/src/serviceWorker.ts
rename to web/src/serviceWorker.ts
diff --git a/web/src/steps.tsx b/web/src/steps.tsx
new file mode 100644
index 00000000..f3802e86
--- /dev/null
+++ b/web/src/steps.tsx
@@ -0,0 +1,52 @@
+import * as React from "react";
+
+import * as Company from './pages/Company'
+
+import {
+ Landing,
+ IntroShowTodos,
+ IntroShowMobile,
+ AppDownloadQR,
+ BankData,
+ InsuranceData,
+ IncorporatedCompanies,
+ GreatSuccess,
+ ThankYou,
+} from './pages';
+
+import TangleLabs from "./components/powerdBy/TangleLabs";
+import Impierce from "./components/powerdBy/Impierce";
+import Waltid from "./components/powerdBy/Waltid";
+
+export const routes = [
+ { path: '/:lng?', element: },
+ { path: '/:lng?/demo/todos', element: },
+ { path: '/:lng?/demo/app', element: },
+ { path: '/:lng?/company/list/0', element: },
+ { path: '/:lng?/demo/app/0', element: },
+ { path: '/:lng?/company/prove/0', element: , poweredBy: },
+ { path: '/:lng?/company/signin/0', element: , poweredBy: },
+ { path: '/:lng?/company/provide/0', element: , poweredBy: },
+ { path: '/:lng?/company/data/0', element: , poweredBy: },
+ { path: '/:lng?/company/receive/0', element: , poweredBy: },
+ { path: '/:lng?/company/confirm/1', element: , poweredBy: },
+ { path: '/:lng?/demo/success/1', element: },
+ { path: '/:lng?/company/details/1/:companyId', element: },
+ { path: '/:lng?/bank/prove/1', element: },
+ { path: '/:lng?/bank/data/1', element: },
+ { path: '/:lng?/bank/confirm/2', element: },
+ { path: '/:lng?/company/details/2/:companyId', element: },
+ { path: '/:lng?/insurance/prove/2', element: },
+ { path: '/:lng?/insurance/data/2', element: },
+ { path: '/:lng?/insurance/confirm/3', element: },
+ { path: '/:lng?/company/details/3/:companyId', element: },
+ { path: '/:lng?/demo/thankyou', element: }
+];
+
+//These are now just the keys for the translation that get dynamically loaded
+export const mainSteps = [
+ { title: "actions.setUpCompany" },
+ { title: "actions.getBankAccount" },
+ { title: "actions.liabilityInsurance"},
+ { title: "actions.readyForBusiness"},
+];
\ No newline at end of file
diff --git a/web/bank/src/styles/components/buttons.scss b/web/src/styles/components/buttons.scss
similarity index 100%
rename from web/bank/src/styles/components/buttons.scss
rename to web/src/styles/components/buttons.scss
diff --git a/web/bank/src/styles/components/disclaimer.scss b/web/src/styles/components/disclaimer.scss
similarity index 100%
rename from web/bank/src/styles/components/disclaimer.scss
rename to web/src/styles/components/disclaimer.scss
diff --git a/web/bank/src/styles/components/drawer.scss b/web/src/styles/components/drawer.scss
similarity index 100%
rename from web/bank/src/styles/components/drawer.scss
rename to web/src/styles/components/drawer.scss
diff --git a/web/bank/src/styles/components/dropSelector.scss b/web/src/styles/components/dropSelector.scss
similarity index 100%
rename from web/bank/src/styles/components/dropSelector.scss
rename to web/src/styles/components/dropSelector.scss
diff --git a/web/bank/src/styles/components/footer.scss b/web/src/styles/components/footer.scss
similarity index 100%
rename from web/bank/src/styles/components/footer.scss
rename to web/src/styles/components/footer.scss
diff --git a/web/bank/src/styles/components/header.scss b/web/src/styles/components/header.scss
similarity index 100%
rename from web/bank/src/styles/components/header.scss
rename to web/src/styles/components/header.scss
diff --git a/web/bank/src/styles/components/layout.scss b/web/src/styles/components/layout.scss
similarity index 100%
rename from web/bank/src/styles/components/layout.scss
rename to web/src/styles/components/layout.scss
diff --git a/web/bank/src/styles/components/mobileMenu.scss b/web/src/styles/components/mobileMenu.scss
similarity index 100%
rename from web/bank/src/styles/components/mobileMenu.scss
rename to web/src/styles/components/mobileMenu.scss
diff --git a/web/bank/src/styles/components/sidebar.scss b/web/src/styles/components/sidebar.scss
similarity index 99%
rename from web/bank/src/styles/components/sidebar.scss
rename to web/src/styles/components/sidebar.scss
index 2ded8c0f..60de7271 100644
--- a/web/bank/src/styles/components/sidebar.scss
+++ b/web/src/styles/components/sidebar.scss
@@ -56,7 +56,7 @@
flex-direction: column;
justify-content: space-between;
align-items: flex-start;
- height: 110px;
+ // min-height: 110px;
width: 156px;
z-index: 2;
diff --git a/web/bank/src/styles/components/table.scss b/web/src/styles/components/table.scss
similarity index 100%
rename from web/bank/src/styles/components/table.scss
rename to web/src/styles/components/table.scss
diff --git a/web/bank/src/styles/components/text.scss b/web/src/styles/components/text.scss
similarity index 100%
rename from web/bank/src/styles/components/text.scss
rename to web/src/styles/components/text.scss
diff --git a/web/bank/src/styles/helpers/_globals.scss b/web/src/styles/helpers/_globals.scss
similarity index 100%
rename from web/bank/src/styles/helpers/_globals.scss
rename to web/src/styles/helpers/_globals.scss
diff --git a/web/bank/src/styles/helpers/breakpoints.scss b/web/src/styles/helpers/breakpoints.scss
similarity index 100%
rename from web/bank/src/styles/helpers/breakpoints.scss
rename to web/src/styles/helpers/breakpoints.scss
diff --git a/web/bank/src/styles/helpers/mixins.scss b/web/src/styles/helpers/mixins.scss
similarity index 100%
rename from web/bank/src/styles/helpers/mixins.scss
rename to web/src/styles/helpers/mixins.scss
diff --git a/web/bank/src/styles/helpers/theming.scss b/web/src/styles/helpers/theming.scss
similarity index 100%
rename from web/bank/src/styles/helpers/theming.scss
rename to web/src/styles/helpers/theming.scss
diff --git a/web/bank/src/styles/helpers/variables.scss b/web/src/styles/helpers/variables.scss
similarity index 100%
rename from web/bank/src/styles/helpers/variables.scss
rename to web/src/styles/helpers/variables.scss
diff --git a/web/bank/src/styles/index.scss b/web/src/styles/index.scss
similarity index 100%
rename from web/bank/src/styles/index.scss
rename to web/src/styles/index.scss
diff --git a/web/bank/src/styles/pages/bankData.scss b/web/src/styles/pages/bankData.scss
similarity index 100%
rename from web/bank/src/styles/pages/bankData.scss
rename to web/src/styles/pages/bankData.scss
diff --git a/web/bank/src/styles/pages/companies.scss b/web/src/styles/pages/companies.scss
similarity index 100%
rename from web/bank/src/styles/pages/companies.scss
rename to web/src/styles/pages/companies.scss
diff --git a/web/bank/src/styles/pages/companyData.scss b/web/src/styles/pages/companyData.scss
similarity index 98%
rename from web/bank/src/styles/pages/companyData.scss
rename to web/src/styles/pages/companyData.scss
index 6e94393f..76643028 100644
--- a/web/bank/src/styles/pages/companyData.scss
+++ b/web/src/styles/pages/companyData.scss
@@ -77,6 +77,7 @@
.ant-input {
background: #F5F6FF;
border: 1px solid #9EA0E6;
+ padding-left: 5px;
}
}
diff --git a/web/bank/src/styles/pages/confirmation.scss b/web/src/styles/pages/confirmation.scss
similarity index 100%
rename from web/bank/src/styles/pages/confirmation.scss
rename to web/src/styles/pages/confirmation.scss
diff --git a/web/bank/src/styles/pages/demo.scss b/web/src/styles/pages/demo.scss
similarity index 100%
rename from web/bank/src/styles/pages/demo.scss
rename to web/src/styles/pages/demo.scss
diff --git a/web/bank/src/styles/pages/greatSuccess.scss b/web/src/styles/pages/greatSuccess.scss
similarity index 100%
rename from web/bank/src/styles/pages/greatSuccess.scss
rename to web/src/styles/pages/greatSuccess.scss
diff --git a/web/bank/src/styles/pages/landing.scss b/web/src/styles/pages/landing.scss
similarity index 100%
rename from web/bank/src/styles/pages/landing.scss
rename to web/src/styles/pages/landing.scss
diff --git a/web/bank/src/styles/pages/scanQRcode.scss b/web/src/styles/pages/scanQRcode.scss
similarity index 100%
rename from web/bank/src/styles/pages/scanQRcode.scss
rename to web/src/styles/pages/scanQRcode.scss
diff --git a/web/bank/src/styles/pages/signInPage.scss b/web/src/styles/pages/signInPage.scss
similarity index 100%
rename from web/bank/src/styles/pages/signInPage.scss
rename to web/src/styles/pages/signInPage.scss
diff --git a/web/bank/src/styles/pages/thankYou.scss b/web/src/styles/pages/thankYou.scss
similarity index 100%
rename from web/bank/src/styles/pages/thankYou.scss
rename to web/src/styles/pages/thankYou.scss
diff --git a/web/bank/src/styles/themes.scss b/web/src/styles/themes.scss
similarity index 100%
rename from web/bank/src/styles/themes.scss
rename to web/src/styles/themes.scss
diff --git a/web/bank/src/utils/did.ts b/web/src/utils/did.ts
similarity index 100%
rename from web/bank/src/utils/did.ts
rename to web/src/utils/did.ts
diff --git a/web/bank/src/utils/helper.ts b/web/src/utils/helper.ts
similarity index 100%
rename from web/bank/src/utils/helper.ts
rename to web/src/utils/helper.ts
diff --git a/web/bank/src/utils/matchSteps.ts b/web/src/utils/matchSteps.ts
similarity index 80%
rename from web/bank/src/utils/matchSteps.ts
rename to web/src/utils/matchSteps.ts
index e4a561c1..cd6e694e 100644
--- a/web/bank/src/utils/matchSteps.ts
+++ b/web/src/utils/matchSteps.ts
@@ -12,10 +12,9 @@ interface Match {
}
export default (path: string): MatchResult | null | undefined => {
- const match: Match | null = matchPath(path, {
+ const match: Match | null = matchPath({
path: '/:lng?/:theme/:page/:step?/:companyId?',
- exact: true,
- strict: false
- });
+ end: true
+ }, path);
return match?.params;
};
diff --git a/web/bank/src/utils/useFetch.tsx b/web/src/utils/useFetch.tsx
similarity index 96%
rename from web/bank/src/utils/useFetch.tsx
rename to web/src/utils/useFetch.tsx
index 81a51046..e5a97a34 100644
--- a/web/bank/src/utils/useFetch.tsx
+++ b/web/src/utils/useFetch.tsx
@@ -13,6 +13,7 @@ const useFetch = (url: string, options?: any) => {
const json = await res.json();
setResponse(json);
} catch (e) {
+ //@ts-ignore
setError(e);
} finally {
setLoading(false);
diff --git a/web/bank/src/utils/useInterval.tsx b/web/src/utils/useInterval.tsx
similarity index 100%
rename from web/bank/src/utils/useInterval.tsx
rename to web/src/utils/useInterval.tsx
diff --git a/web/bank/src/utils/useStep.tsx b/web/src/utils/useStep.tsx
similarity index 60%
rename from web/bank/src/utils/useStep.tsx
rename to web/src/utils/useStep.tsx
index 814c3d03..be3a1e0c 100644
--- a/web/bank/src/utils/useStep.tsx
+++ b/web/src/utils/useStep.tsx
@@ -1,7 +1,8 @@
import { useState, useEffect, useContext } from 'react';
-import Context from '../context/app-context';
+import {GlobalStateContext} from '../context/globalState';
import matchStep from './matchSteps';
import { useTranslation } from 'react-i18next';
+import { matchPath, useLocation } from 'react-router-dom';
interface MatchResult {
page: string | undefined;
@@ -10,30 +11,35 @@ interface MatchResult {
theme: string | undefined;
}
-const useStep = (match: any) => {
+const useStep = () => {
const [step, setStep] = useState(0);
- const { mainSteps, routes }: any = useContext(Context);
+ const { mainSteps, routes }: any = useContext(GlobalStateContext);
const [nextStep, setNextStep] = useState('');
+ const [currentRoute, setCurrentRoute] = useState(null);
const [theme, setTheme] = useState('');
+ const location = useLocation();
const { i18n } = useTranslation();
useEffect(() => {
async function setSteps () {
- const matchStepResult: MatchResult | null | undefined = matchStep(match.path);
+ const matchStepResult: MatchResult | null | undefined = matchStep(location.pathname);
if (matchStepResult?.step) {
- if (match?.params?.step) {
- setStep(Number(match?.params?.step));
+ console.log(matchStepResult, location)
+ // TODO: figure out was is going on here
+ if(false) { // if (location?.search?.step) {
+ //setStep(Number(match?.params?.step));
} else {
setStep(Number(matchStepResult?.step));
}
}
-
+
if (matchStepResult?.theme) {
setTheme(matchStepResult?.theme);
}
-
- const idx = routes.findIndex(({ path }: { path: string; }) => path === match.path);
+
+ const idx = routes.findIndex(({ path }: { path: string; }) => matchPath(path, location.pathname));
+ setCurrentRoute(routes[idx]);
if (idx !== -1 && routes.length > idx + 1) {
var next = routes[idx + 1].path;
next = next.replace(":lng?", i18n.language.toString()); //replace route-param
@@ -41,9 +47,9 @@ const useStep = (match: any) => {
}
}
setSteps();
- }, [match, routes, step]);
+ }, [location, routes, step]);
- return { step, nextStep, mainSteps, theme };
+ return { step, currentRoute, nextStep, mainSteps, theme };
};
export default useStep;
diff --git a/web/bank/src/utils/useWindowSize.tsx b/web/src/utils/useWindowSize.tsx
similarity index 100%
rename from web/bank/src/utils/useWindowSize.tsx
rename to web/src/utils/useWindowSize.tsx
diff --git a/web/covid/tsconfig.json b/web/tsconfig.json
similarity index 60%
rename from web/covid/tsconfig.json
rename to web/tsconfig.json
index f2850b71..aed82fa3 100644
--- a/web/covid/tsconfig.json
+++ b/web/tsconfig.json
@@ -1,25 +1,28 @@
{
"compilerOptions": {
- "target": "es5",
+ "target": "ES2021",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
- "allowJs": true,
- "skipLibCheck": true,
- "esModuleInterop": true,
- "allowSyntheticDefaultImports": true,
- "strict": true,
- "forceConsistentCasingInFileNames": true,
+ "jsx": "react",
"module": "esnext",
"moduleResolution": "node",
+ "paths": {
+ "@sharedTypes/*": [
+ "../types/*"
+ ]
+ },
+ "baseUrl": "./",
"resolveJsonModule": true,
- "isolatedModules": true,
- "noEmit": true,
- "jsx": "react"
+ "esModuleInterop": true,
+ "forceConsistentCasingInFileNames": true,
+ "strict": true,
+ "skipLibCheck": true
},
"include": [
- "src"
+ "src",
+ "../types/**/*"
]
-}
+}
\ No newline at end of file
diff --git a/web/bank/vercel.json b/web/vercel.json
similarity index 100%
rename from web/bank/vercel.json
rename to web/vercel.json
+
+
+
+
+
+
+
+ 
+ 
+ 
+