diff --git a/packages/demobank-ui/src/components/menu/LangSelector.tsx b/packages/demobank-ui/src/components/LangSelector.tsx similarity index 98% rename from packages/demobank-ui/src/components/menu/LangSelector.tsx rename to packages/demobank-ui/src/components/LangSelector.tsx index 6c0acaf42..574f42814 100644 --- a/packages/demobank-ui/src/components/menu/LangSelector.tsx +++ b/packages/demobank-ui/src/components/LangSelector.tsx @@ -22,7 +22,7 @@ import { Fragment, h, VNode } from "preact"; import { useEffect, useState } from "preact/hooks"; import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; -import { strings as messages } from "../../i18n/strings.js"; +import { strings as messages } from "../i18n/strings.js"; type LangsNames = { [P in keyof typeof messages]: string; diff --git a/packages/demobank-ui/src/pages/home/AccountPage.tsx b/packages/demobank-ui/src/pages/AccountPage.tsx similarity index 96% rename from packages/demobank-ui/src/pages/home/AccountPage.tsx rename to packages/demobank-ui/src/pages/AccountPage.tsx index da22568f9..7ec4d36fb 100644 --- a/packages/demobank-ui/src/pages/home/AccountPage.tsx +++ b/packages/demobank-ui/src/pages/AccountPage.tsx @@ -19,11 +19,11 @@ import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; import { ComponentChildren, Fragment, h, VNode } from "preact"; import { useEffect } from "preact/hooks"; import useSWR, { SWRConfig, useSWRConfig } from "swr"; -import { useBackendContext } from "../../context/backend.js"; -import { PageStateType, usePageContext } from "../../context/pageState.js"; -import { BackendInfo } from "../../hooks/backend.js"; -import { bankUiSettings } from "../../settings.js"; -import { getIbanFromPayto, prepareHeaders } from "../../utils.js"; +import { useBackendContext } from "../context/backend.js"; +import { PageStateType, usePageContext } from "../context/pageState.js"; +import { BackendInfo } from "../hooks/backend.js"; +import { bankUiSettings } from "../settings.js"; +import { getIbanFromPayto, prepareHeaders } from "../utils.js"; import { BankFrame } from "./BankFrame.js"; import { LoginForm } from "./LoginForm.js"; import { PaymentOptions } from "./PaymentOptions.js"; diff --git a/packages/demobank-ui/src/pages/home/BankFrame.tsx b/packages/demobank-ui/src/pages/BankFrame.tsx similarity index 94% rename from packages/demobank-ui/src/pages/home/BankFrame.tsx rename to packages/demobank-ui/src/pages/BankFrame.tsx index cb629effb..e36629e2a 100644 --- a/packages/demobank-ui/src/pages/home/BankFrame.tsx +++ b/packages/demobank-ui/src/pages/BankFrame.tsx @@ -16,12 +16,12 @@ import { Logger } from "@gnu-taler/taler-util"; import { ComponentChildren, Fragment, h, VNode } from "preact"; -import talerLogo from "../../assets/logo-white.svg"; -import { LangSelectorLikePy as LangSelector } from "../../components/menu/LangSelector.js"; -import { useBackendContext } from "../../context/backend.js"; -import { PageStateType, usePageContext } from "../../context/pageState.js"; +import talerLogo from "../assets/logo-white.svg"; +import { LangSelectorLikePy as LangSelector } from "../components/LangSelector.js"; +import { useBackendContext } from "../context/backend.js"; +import { PageStateType, usePageContext } from "../context/pageState.js"; import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; -import { bankUiSettings } from "../../settings.js"; +import { bankUiSettings } from "../settings.js"; const logger = new Logger("BankFrame"); diff --git a/packages/demobank-ui/src/pages/home/LoginForm.tsx b/packages/demobank-ui/src/pages/LoginForm.tsx similarity index 94% rename from packages/demobank-ui/src/pages/home/LoginForm.tsx rename to packages/demobank-ui/src/pages/LoginForm.tsx index 4f38bc91d..61d3c1e49 100644 --- a/packages/demobank-ui/src/pages/home/LoginForm.tsx +++ b/packages/demobank-ui/src/pages/LoginForm.tsx @@ -17,11 +17,11 @@ import { h, VNode } from "preact"; import { route } from "preact-router"; import { useEffect, useRef, useState } from "preact/hooks"; -import { useBackendContext } from "../../context/backend.js"; +import { useBackendContext } from "../context/backend.js"; import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; -import { BackendStateHandler } from "../../hooks/backend.js"; -import { bankUiSettings } from "../../settings.js"; -import { getBankBackendBaseUrl, undefinedIfEmpty } from "../../utils.js"; +import { BackendStateHandler } from "../hooks/backend.js"; +import { bankUiSettings } from "../settings.js"; +import { getBankBackendBaseUrl, undefinedIfEmpty } from "../utils.js"; import { ShowInputErrorLabel } from "./ShowInputErrorLabel.js"; /** diff --git a/packages/demobank-ui/src/pages/home/PaymentOptions.tsx b/packages/demobank-ui/src/pages/PaymentOptions.tsx similarity index 100% rename from packages/demobank-ui/src/pages/home/PaymentOptions.tsx rename to packages/demobank-ui/src/pages/PaymentOptions.tsx diff --git a/packages/demobank-ui/src/pages/home/PaytoWireTransferForm.tsx b/packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx similarity index 98% rename from packages/demobank-ui/src/pages/home/PaytoWireTransferForm.tsx rename to packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx index 36182cd93..1237f5eb1 100644 --- a/packages/demobank-ui/src/pages/home/PaytoWireTransferForm.tsx +++ b/packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx @@ -18,14 +18,14 @@ import { Amounts, Logger, parsePaytoUri } from "@gnu-taler/taler-util"; import { useLocalStorage } from "@gnu-taler/web-util/lib/index.browser"; import { h, VNode } from "preact"; import { StateUpdater, useEffect, useRef, useState } from "preact/hooks"; -import { useBackendContext } from "../../context/backend.js"; -import { PageStateType, usePageContext } from "../../context/pageState.js"; +import { useBackendContext } from "../context/backend.js"; +import { PageStateType, usePageContext } from "../context/pageState.js"; import { InternationalizationAPI, useTranslationContext, } from "@gnu-taler/web-util/lib/index.browser"; -import { BackendState } from "../../hooks/backend.js"; -import { prepareHeaders, undefinedIfEmpty } from "../../utils.js"; +import { BackendState } from "../hooks/backend.js"; +import { prepareHeaders, undefinedIfEmpty } from "../utils.js"; import { ShowInputErrorLabel } from "./ShowInputErrorLabel.js"; const logger = new Logger("PaytoWireTransferForm"); diff --git a/packages/demobank-ui/src/pages/home/PublicHistoriesPage.tsx b/packages/demobank-ui/src/pages/PublicHistoriesPage.tsx similarity index 97% rename from packages/demobank-ui/src/pages/home/PublicHistoriesPage.tsx rename to packages/demobank-ui/src/pages/PublicHistoriesPage.tsx index 1577e0dfc..be9f4aee1 100644 --- a/packages/demobank-ui/src/pages/home/PublicHistoriesPage.tsx +++ b/packages/demobank-ui/src/pages/PublicHistoriesPage.tsx @@ -20,9 +20,9 @@ import { ComponentChildren, Fragment, h, VNode } from "preact"; import { route } from "preact-router"; import { StateUpdater } from "preact/hooks"; import useSWR, { SWRConfig } from "swr"; -import { PageStateType, usePageContext } from "../../context/pageState.js"; +import { PageStateType, usePageContext } from "../context/pageState.js"; import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; -import { getBankBackendBaseUrl } from "../../utils.js"; +import { getBankBackendBaseUrl } from "../utils.js"; import { BankFrame } from "./BankFrame.js"; import { Transactions } from "./Transactions.js"; diff --git a/packages/demobank-ui/src/pages/home/QrCodeSection.stories.tsx b/packages/demobank-ui/src/pages/QrCodeSection.stories.tsx similarity index 100% rename from packages/demobank-ui/src/pages/home/QrCodeSection.stories.tsx rename to packages/demobank-ui/src/pages/QrCodeSection.stories.tsx diff --git a/packages/demobank-ui/src/pages/home/QrCodeSection.tsx b/packages/demobank-ui/src/pages/QrCodeSection.tsx similarity index 97% rename from packages/demobank-ui/src/pages/home/QrCodeSection.tsx rename to packages/demobank-ui/src/pages/QrCodeSection.tsx index 7e89cd516..59a8ccd61 100644 --- a/packages/demobank-ui/src/pages/home/QrCodeSection.tsx +++ b/packages/demobank-ui/src/pages/QrCodeSection.tsx @@ -16,7 +16,7 @@ import { h, VNode } from "preact"; import { useEffect } from "preact/hooks"; -import { QR } from "../../components/QR.js"; +import { QR } from "../components/QR.js"; import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; export function QrCodeSection({ diff --git a/packages/demobank-ui/src/pages/home/RegistrationPage.tsx b/packages/demobank-ui/src/pages/RegistrationPage.tsx similarity index 96% rename from packages/demobank-ui/src/pages/home/RegistrationPage.tsx rename to packages/demobank-ui/src/pages/RegistrationPage.tsx index c21693885..c97cb56f3 100644 --- a/packages/demobank-ui/src/pages/home/RegistrationPage.tsx +++ b/packages/demobank-ui/src/pages/RegistrationPage.tsx @@ -17,15 +17,15 @@ import { Logger } from "@gnu-taler/taler-util"; import { Fragment, h, VNode } from "preact"; import { route } from "preact-router"; import { StateUpdater, useState } from "preact/hooks"; -import { useBackendContext } from "../../context/backend.js"; -import { PageStateType, usePageContext } from "../../context/pageState.js"; +import { useBackendContext } from "../context/backend.js"; +import { PageStateType, usePageContext } from "../context/pageState.js"; import { InternationalizationAPI, useTranslationContext, } from "@gnu-taler/web-util/lib/index.browser"; -import { BackendStateHandler } from "../../hooks/backend.js"; -import { bankUiSettings } from "../../settings.js"; -import { getBankBackendBaseUrl, undefinedIfEmpty } from "../../utils.js"; +import { BackendStateHandler } from "../hooks/backend.js"; +import { bankUiSettings } from "../settings.js"; +import { getBankBackendBaseUrl, undefinedIfEmpty } from "../utils.js"; import { BankFrame } from "./BankFrame.js"; import { ShowInputErrorLabel } from "./ShowInputErrorLabel.js"; diff --git a/packages/demobank-ui/src/pages/Routing.tsx b/packages/demobank-ui/src/pages/Routing.tsx index 6b00df97b..3c3aae0ce 100644 --- a/packages/demobank-ui/src/pages/Routing.tsx +++ b/packages/demobank-ui/src/pages/Routing.tsx @@ -18,9 +18,9 @@ import { createHashHistory } from "history"; import { h, VNode } from "preact"; import Router, { route, Route } from "preact-router"; import { useEffect } from "preact/hooks"; -import { AccountPage } from "./home/AccountPage.js"; -import { PublicHistoriesPage } from "./home/PublicHistoriesPage.js"; -import { RegistrationPage } from "./home/RegistrationPage.js"; +import { AccountPage } from "./AccountPage.js"; +import { PublicHistoriesPage } from "./PublicHistoriesPage.js"; +import { RegistrationPage } from "./RegistrationPage.js"; export function Routing(): VNode { const history = createHashHistory(); diff --git a/packages/demobank-ui/src/pages/home/ShowInputErrorLabel.tsx b/packages/demobank-ui/src/pages/ShowInputErrorLabel.tsx similarity index 100% rename from packages/demobank-ui/src/pages/home/ShowInputErrorLabel.tsx rename to packages/demobank-ui/src/pages/ShowInputErrorLabel.tsx diff --git a/packages/demobank-ui/src/pages/home/Transactions.tsx b/packages/demobank-ui/src/pages/Transactions.tsx similarity index 100% rename from packages/demobank-ui/src/pages/home/Transactions.tsx rename to packages/demobank-ui/src/pages/Transactions.tsx diff --git a/packages/demobank-ui/src/pages/home/WalletWithdrawForm.tsx b/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx similarity index 95% rename from packages/demobank-ui/src/pages/home/WalletWithdrawForm.tsx rename to packages/demobank-ui/src/pages/WalletWithdrawForm.tsx index 440d16c6c..ed2898952 100644 --- a/packages/demobank-ui/src/pages/home/WalletWithdrawForm.tsx +++ b/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx @@ -17,14 +17,14 @@ import { Logger } from "@gnu-taler/taler-util"; import { h, VNode } from "preact"; import { StateUpdater, useEffect, useRef } from "preact/hooks"; -import { useBackendContext } from "../../context/backend.js"; -import { PageStateType, usePageContext } from "../../context/pageState.js"; +import { useBackendContext } from "../context/backend.js"; +import { PageStateType, usePageContext } from "../context/pageState.js"; import { InternationalizationAPI, useTranslationContext, } from "@gnu-taler/web-util/lib/index.browser"; -import { BackendState } from "../../hooks/backend.js"; -import { prepareHeaders, validateAmount } from "../../utils.js"; +import { BackendState } from "../hooks/backend.js"; +import { prepareHeaders, validateAmount } from "../utils.js"; const logger = new Logger("WalletWithdrawForm"); diff --git a/packages/demobank-ui/src/pages/home/WithdrawalConfirmationQuestion.tsx b/packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx similarity index 97% rename from packages/demobank-ui/src/pages/home/WithdrawalConfirmationQuestion.tsx rename to packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx index 693f85bcd..8cfdd4e9f 100644 --- a/packages/demobank-ui/src/pages/home/WithdrawalConfirmationQuestion.tsx +++ b/packages/demobank-ui/src/pages/WithdrawalConfirmationQuestion.tsx @@ -17,14 +17,14 @@ import { Logger } from "@gnu-taler/taler-util"; import { Fragment, h, VNode } from "preact"; import { StateUpdater } from "preact/hooks"; -import { useBackendContext } from "../../context/backend.js"; -import { PageStateType, usePageContext } from "../../context/pageState.js"; +import { useBackendContext } from "../context/backend.js"; +import { PageStateType, usePageContext } from "../context/pageState.js"; import { InternationalizationAPI, useTranslationContext, } from "@gnu-taler/web-util/lib/index.browser"; -import { BackendState } from "../../hooks/backend.js"; -import { prepareHeaders } from "../../utils.js"; +import { BackendState } from "../hooks/backend.js"; +import { prepareHeaders } from "../utils.js"; const logger = new Logger("WithdrawalConfirmationQuestion"); diff --git a/packages/demobank-ui/src/pages/home/WithdrawalQRCode.tsx b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx similarity index 97% rename from packages/demobank-ui/src/pages/home/WithdrawalQRCode.tsx rename to packages/demobank-ui/src/pages/WithdrawalQRCode.tsx index 978d3a840..174c19288 100644 --- a/packages/demobank-ui/src/pages/home/WithdrawalQRCode.tsx +++ b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx @@ -17,7 +17,7 @@ import { Logger } from "@gnu-taler/taler-util"; import { Fragment, h, VNode } from "preact"; import useSWR from "swr"; -import { PageStateType, usePageContext } from "../../context/pageState.js"; +import { PageStateType, usePageContext } from "../context/pageState.js"; import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser"; import { QrCodeSection } from "./QrCodeSection.js"; import { WithdrawalConfirmationQuestion } from "./WithdrawalConfirmationQuestion.js"; diff --git a/packages/demobank-ui/src/pages/home/index.stories.tsx b/packages/demobank-ui/src/pages/index.stories.tsx similarity index 100% rename from packages/demobank-ui/src/pages/home/index.stories.tsx rename to packages/demobank-ui/src/pages/index.stories.tsx diff --git a/packages/demobank-ui/src/stories.tsx b/packages/demobank-ui/src/stories.tsx index aab93a749..611d63879 100644 --- a/packages/demobank-ui/src/stories.tsx +++ b/packages/demobank-ui/src/stories.tsx @@ -20,7 +20,7 @@ */ import { strings } from "./i18n/strings.js"; -import * as pages from "./pages/home/index.stories.js"; +import * as pages from "./pages/index.stories.js"; import { renderStories } from "@gnu-taler/web-util/lib/index.browser";