diff --git a/apps/bear/src/app/(auth)/auth/login/page.tsx b/apps/bear/src/app/(auth)/auth/login/page.tsx index 5899e5e..081cfbf 100644 --- a/apps/bear/src/app/(auth)/auth/login/page.tsx +++ b/apps/bear/src/app/(auth)/auth/login/page.tsx @@ -4,7 +4,7 @@ import { LoginStep } from '@lumina/market/app/screens/(auth)/auth/login/organism import type { Metadata } from 'next'; import { i18n } from '../../../../i18n'; -import { AuthTemplate } from '../../templates/auth-template'; +import { AuthTemplate } from '../../../templates/auth-template'; export function generateMetadata(): Metadata { return { title: i18n.t('auth:login.meta-title'), robots: { index: false } }; diff --git a/apps/bear/src/app/(auth)/auth/login/verify/page.tsx b/apps/bear/src/app/(auth)/auth/login/verify/page.tsx index 51d7e94..89e9db3 100644 --- a/apps/bear/src/app/(auth)/auth/login/verify/page.tsx +++ b/apps/bear/src/app/(auth)/auth/login/verify/page.tsx @@ -4,7 +4,7 @@ import { LoginVerifyStep } from '@lumina/market/app/screens/(auth)/auth/login/ve import type { Metadata } from 'next'; import { i18n } from '../../../../../i18n'; -import { AuthTemplate } from '../../../templates/auth-template'; +import { AuthTemplate } from '../../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bear/src/app/(auth)/auth/register/details/page.tsx b/apps/bear/src/app/(auth)/auth/register/details/page.tsx index 42f7699..5f3a5e1 100644 --- a/apps/bear/src/app/(auth)/auth/register/details/page.tsx +++ b/apps/bear/src/app/(auth)/auth/register/details/page.tsx @@ -4,7 +4,7 @@ import { RegisterDetailsStep } from '@lumina/market/app/screens/(auth)/auth/regi import type { Metadata } from 'next'; import { i18n } from '../../../../../i18n'; -import { AuthTemplate } from '../../../templates/auth-template'; +import { AuthTemplate } from '../../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bear/src/app/(auth)/auth/register/page.tsx b/apps/bear/src/app/(auth)/auth/register/page.tsx index 630dfdf..0c3e794 100644 --- a/apps/bear/src/app/(auth)/auth/register/page.tsx +++ b/apps/bear/src/app/(auth)/auth/register/page.tsx @@ -4,7 +4,7 @@ import { RegisterTypeStep } from '@lumina/market/app/screens/(auth)/auth/registe import type { Metadata } from 'next'; import { i18n } from '../../../../i18n'; -import { AuthTemplate } from '../../templates/auth-template'; +import { AuthTemplate } from '../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bear/src/app/(auth)/auth/register/phone/page.tsx b/apps/bear/src/app/(auth)/auth/register/phone/page.tsx index 56554d4..be29603 100644 --- a/apps/bear/src/app/(auth)/auth/register/phone/page.tsx +++ b/apps/bear/src/app/(auth)/auth/register/phone/page.tsx @@ -4,7 +4,7 @@ import { RegisterPhoneStep } from '@lumina/market/app/screens/(auth)/auth/regist import type { Metadata } from 'next'; import { i18n } from '../../../../../i18n'; -import { AuthTemplate } from '../../../templates/auth-template'; +import { AuthTemplate } from '../../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bear/src/app/(auth)/auth/register/verify/page.tsx b/apps/bear/src/app/(auth)/auth/register/verify/page.tsx index eb1d7e6..d049a09 100644 --- a/apps/bear/src/app/(auth)/auth/register/verify/page.tsx +++ b/apps/bear/src/app/(auth)/auth/register/verify/page.tsx @@ -4,7 +4,7 @@ import { RegisterVerifyStep } from '@lumina/market/app/screens/(auth)/auth/regis import type { Metadata } from 'next'; import { i18n } from '../../../../../i18n'; -import { AuthTemplate } from '../../../templates/auth-template'; +import { AuthTemplate } from '../../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bear/src/app/(auth)/loading.tsx b/apps/bear/src/app/(auth)/loading.tsx index 00f8489..20c4694 100644 --- a/apps/bear/src/app/(auth)/loading.tsx +++ b/apps/bear/src/app/(auth)/loading.tsx @@ -1,7 +1,7 @@ import { SkeletonPreset } from '@lumina/island/organisms/skeleton-preset'; import { i18n } from '../../i18n'; -import { AuthTemplate } from './templates/auth-template'; +import { AuthTemplate } from '../templates/auth-template'; /** Login and registration, before their frame arrives: the header, the card and a form step's shape. */ export default function AuthLoading() { diff --git a/apps/bear/src/app/(auth)/templates/auth-template/AuthTemplate.tsx b/apps/bear/src/app/templates/auth-template/AuthTemplate.tsx similarity index 92% rename from apps/bear/src/app/(auth)/templates/auth-template/AuthTemplate.tsx rename to apps/bear/src/app/templates/auth-template/AuthTemplate.tsx index 26347fe..77af0c2 100644 --- a/apps/bear/src/app/(auth)/templates/auth-template/AuthTemplate.tsx +++ b/apps/bear/src/app/templates/auth-template/AuthTemplate.tsx @@ -3,10 +3,10 @@ import { Typography } from '@lumina/island/atoms/typography'; import { Card } from '@lumina/island/molecules/card'; import { cn } from '@lumina/island/tools/cn'; import { ROUTES } from '@lumina/market/app/navigation'; -import { SupportEntry } from '@lumina/market/app/screens/(auth)/organisms/support-entry'; +import { SupportEntry } from '@lumina/market/app/screens/organisms/support-entry'; import NextLink from 'next/link'; -import { i18n } from '../../../../i18n'; +import { i18n } from '../../../i18n'; import type { AuthTemplateProps } from './types'; /** diff --git a/apps/bear/src/app/(auth)/templates/auth-template/index.ts b/apps/bear/src/app/templates/auth-template/index.ts similarity index 100% rename from apps/bear/src/app/(auth)/templates/auth-template/index.ts rename to apps/bear/src/app/templates/auth-template/index.ts diff --git a/apps/bear/src/app/(auth)/templates/auth-template/types.ts b/apps/bear/src/app/templates/auth-template/types.ts similarity index 100% rename from apps/bear/src/app/(auth)/templates/auth-template/types.ts rename to apps/bear/src/app/templates/auth-template/types.ts diff --git a/apps/bull/src/app/(auth)/auth/login/page.tsx b/apps/bull/src/app/(auth)/auth/login/page.tsx index f4001ca..1ecadb7 100644 --- a/apps/bull/src/app/(auth)/auth/login/page.tsx +++ b/apps/bull/src/app/(auth)/auth/login/page.tsx @@ -4,8 +4,8 @@ import { LoginStep } from '@lumina/market/app/screens/(auth)/auth/login/organism import type { Metadata } from 'next'; import { i18n } from '../../../../i18n'; -import { AuthTopBar } from '../../organisms/auth-top-bar'; -import { AuthTemplate } from '../../templates/auth-template'; +import { AuthTopBar } from '../../../organisms/auth-top-bar'; +import { AuthTemplate } from '../../../templates/auth-template'; export function generateMetadata(): Metadata { return { title: i18n.t('auth:login.meta-title'), robots: { index: false } }; diff --git a/apps/bull/src/app/(auth)/auth/login/verify/page.tsx b/apps/bull/src/app/(auth)/auth/login/verify/page.tsx index d9ceee8..52a380a 100644 --- a/apps/bull/src/app/(auth)/auth/login/verify/page.tsx +++ b/apps/bull/src/app/(auth)/auth/login/verify/page.tsx @@ -5,8 +5,8 @@ import { LoginVerifyStep } from '@lumina/market/app/screens/(auth)/auth/login/ve import type { Metadata } from 'next'; import { i18n } from '../../../../../i18n'; -import { AuthTopBar } from '../../../organisms/auth-top-bar'; -import { AuthTemplate } from '../../../templates/auth-template'; +import { AuthTopBar } from '../../../../organisms/auth-top-bar'; +import { AuthTemplate } from '../../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bull/src/app/(auth)/auth/register/details/page.tsx b/apps/bull/src/app/(auth)/auth/register/details/page.tsx index 10d3963..b094546 100644 --- a/apps/bull/src/app/(auth)/auth/register/details/page.tsx +++ b/apps/bull/src/app/(auth)/auth/register/details/page.tsx @@ -4,8 +4,8 @@ import { RegisterDetailsStep } from '@lumina/market/app/screens/(auth)/auth/regi import type { Metadata } from 'next'; import { i18n } from '../../../../../i18n'; -import { AuthTopBar } from '../../../organisms/auth-top-bar'; -import { AuthTemplate } from '../../../templates/auth-template'; +import { AuthTopBar } from '../../../../organisms/auth-top-bar'; +import { AuthTemplate } from '../../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bull/src/app/(auth)/auth/register/page.tsx b/apps/bull/src/app/(auth)/auth/register/page.tsx index a36693a..060d370 100644 --- a/apps/bull/src/app/(auth)/auth/register/page.tsx +++ b/apps/bull/src/app/(auth)/auth/register/page.tsx @@ -4,8 +4,8 @@ import { RegisterTypeStep } from '@lumina/market/app/screens/(auth)/auth/registe import type { Metadata } from 'next'; import { i18n } from '../../../../i18n'; -import { AuthTopBar } from '../../organisms/auth-top-bar'; -import { AuthTemplate } from '../../templates/auth-template'; +import { AuthTopBar } from '../../../organisms/auth-top-bar'; +import { AuthTemplate } from '../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bull/src/app/(auth)/auth/register/phone/page.tsx b/apps/bull/src/app/(auth)/auth/register/phone/page.tsx index 6631ca9..8f82f09 100644 --- a/apps/bull/src/app/(auth)/auth/register/phone/page.tsx +++ b/apps/bull/src/app/(auth)/auth/register/phone/page.tsx @@ -5,8 +5,8 @@ import { RegisterPhoneStep } from '@lumina/market/app/screens/(auth)/auth/regist import type { Metadata } from 'next'; import { i18n } from '../../../../../i18n'; -import { AuthTopBar } from '../../../organisms/auth-top-bar'; -import { AuthTemplate } from '../../../templates/auth-template'; +import { AuthTopBar } from '../../../../organisms/auth-top-bar'; +import { AuthTemplate } from '../../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bull/src/app/(auth)/auth/register/verify/page.tsx b/apps/bull/src/app/(auth)/auth/register/verify/page.tsx index 47081b5..14709e0 100644 --- a/apps/bull/src/app/(auth)/auth/register/verify/page.tsx +++ b/apps/bull/src/app/(auth)/auth/register/verify/page.tsx @@ -5,8 +5,8 @@ import { RegisterVerifyStep } from '@lumina/market/app/screens/(auth)/auth/regis import type { Metadata } from 'next'; import { i18n } from '../../../../../i18n'; -import { AuthTopBar } from '../../../organisms/auth-top-bar'; -import { AuthTemplate } from '../../../templates/auth-template'; +import { AuthTopBar } from '../../../../organisms/auth-top-bar'; +import { AuthTemplate } from '../../../../templates/auth-template'; export function generateMetadata(): Metadata { return { diff --git a/apps/bull/src/app/(auth)/loading.tsx b/apps/bull/src/app/(auth)/loading.tsx index 732f42f..70071a2 100644 --- a/apps/bull/src/app/(auth)/loading.tsx +++ b/apps/bull/src/app/(auth)/loading.tsx @@ -1,8 +1,8 @@ import { SkeletonPreset } from '@lumina/island/organisms/skeleton-preset'; import { i18n } from '../../i18n'; -import { AuthTopBar } from './organisms/auth-top-bar'; -import { AuthTemplate } from './templates/auth-template'; +import { AuthTopBar } from '../organisms/auth-top-bar'; +import { AuthTemplate } from '../templates/auth-template'; /** Login and registration, before their frame arrives: the top bar and a form step's shape. */ export default function AuthLoading() { diff --git a/apps/bull/src/app/(auth)/organisms/auth-top-bar/AuthTopBar.tsx b/apps/bull/src/app/organisms/auth-top-bar/AuthTopBar.tsx similarity index 92% rename from apps/bull/src/app/(auth)/organisms/auth-top-bar/AuthTopBar.tsx rename to apps/bull/src/app/organisms/auth-top-bar/AuthTopBar.tsx index ca975b6..74a788f 100644 --- a/apps/bull/src/app/(auth)/organisms/auth-top-bar/AuthTopBar.tsx +++ b/apps/bull/src/app/organisms/auth-top-bar/AuthTopBar.tsx @@ -2,10 +2,10 @@ import { Button } from '@lumina/island/atoms/button'; import { FlexBox } from '@lumina/island/atoms/flex-box'; import { Typography } from '@lumina/island/atoms/typography'; import { ROUTES } from '@lumina/market/app/navigation'; -import { SupportEntry } from '@lumina/market/app/screens/(auth)/organisms/support-entry'; +import { SupportEntry } from '@lumina/market/app/screens/organisms/support-entry'; import NextLink from 'next/link'; -import { i18n } from '../../../../i18n'; +import { i18n } from '../../../i18n'; import type { AuthTopBarProps } from './types'; /** diff --git a/apps/bull/src/app/(auth)/organisms/auth-top-bar/index.ts b/apps/bull/src/app/organisms/auth-top-bar/index.ts similarity index 100% rename from apps/bull/src/app/(auth)/organisms/auth-top-bar/index.ts rename to apps/bull/src/app/organisms/auth-top-bar/index.ts diff --git a/apps/bull/src/app/(auth)/organisms/auth-top-bar/types.ts b/apps/bull/src/app/organisms/auth-top-bar/types.ts similarity index 100% rename from apps/bull/src/app/(auth)/organisms/auth-top-bar/types.ts rename to apps/bull/src/app/organisms/auth-top-bar/types.ts diff --git a/apps/bull/src/app/(auth)/templates/auth-template/AuthTemplate.tsx b/apps/bull/src/app/templates/auth-template/AuthTemplate.tsx similarity index 100% rename from apps/bull/src/app/(auth)/templates/auth-template/AuthTemplate.tsx rename to apps/bull/src/app/templates/auth-template/AuthTemplate.tsx diff --git a/apps/bull/src/app/(auth)/templates/auth-template/index.ts b/apps/bull/src/app/templates/auth-template/index.ts similarity index 100% rename from apps/bull/src/app/(auth)/templates/auth-template/index.ts rename to apps/bull/src/app/templates/auth-template/index.ts diff --git a/apps/bull/src/app/(auth)/templates/auth-template/types.ts b/apps/bull/src/app/templates/auth-template/types.ts similarity index 100% rename from apps/bull/src/app/(auth)/templates/auth-template/types.ts rename to apps/bull/src/app/templates/auth-template/types.ts diff --git a/platforms/market/src/app/screens/(auth)/auth/login/organisms/login-step/LoginStep.tsx b/platforms/market/src/app/screens/(auth)/auth/login/organisms/login-step/LoginStep.tsx index 73bb94d..ec7495e 100644 --- a/platforms/market/src/app/screens/(auth)/auth/login/organisms/login-step/LoginStep.tsx +++ b/platforms/market/src/app/screens/(auth)/auth/login/organisms/login-step/LoginStep.tsx @@ -13,7 +13,7 @@ import { useTranslation } from 'react-i18next'; import { useLoginPage } from '../../../../../../../features/auth'; import { translateMessage } from '../../../../../../../shared/utils'; import { useAuthRoutes } from '../../../../../../navigation'; -import { SupportEntry } from '../../../../organisms/support-entry'; +import { SupportEntry } from '../../../../../organisms/support-entry'; import type { LoginStepProps } from './types'; /** diff --git a/platforms/market/src/app/screens/(auth)/auth/login/organisms/login-step/types.ts b/platforms/market/src/app/screens/(auth)/auth/login/organisms/login-step/types.ts index 7ede64f..e94f7ae 100644 --- a/platforms/market/src/app/screens/(auth)/auth/login/organisms/login-step/types.ts +++ b/platforms/market/src/app/screens/(auth)/auth/login/organisms/login-step/types.ts @@ -1,4 +1,4 @@ -import type { SupportEntryProps } from '../../../../organisms/support-entry'; +import type { SupportEntryProps } from '../../../../../organisms/support-entry'; export type LoginStepProps = { /** `lg` on mobile, `md` on desktop. */ diff --git a/platforms/market/src/app/screens/(auth)/auth/login/verify/organisms/login-verify-step/components/SuspendedNotice.tsx b/platforms/market/src/app/screens/(auth)/auth/login/verify/organisms/login-verify-step/components/SuspendedNotice.tsx index 40f9e8b..b0a4f01 100644 --- a/platforms/market/src/app/screens/(auth)/auth/login/verify/organisms/login-verify-step/components/SuspendedNotice.tsx +++ b/platforms/market/src/app/screens/(auth)/auth/login/verify/organisms/login-verify-step/components/SuspendedNotice.tsx @@ -6,7 +6,7 @@ import { Typography } from '@lumina/island/atoms/typography'; import { useEffect, useRef } from 'react'; import { useTranslation } from 'react-i18next'; -import { SupportEntry } from '../../../../../../organisms/support-entry'; +import { SupportEntry } from '../../../../../../../organisms/support-entry'; import type { SuspendedNoticeProps } from '../types'; /** diff --git a/platforms/market/src/app/screens/(auth)/auth/login/verify/organisms/login-verify-step/types.ts b/platforms/market/src/app/screens/(auth)/auth/login/verify/organisms/login-verify-step/types.ts index ab5907d..944168b 100644 --- a/platforms/market/src/app/screens/(auth)/auth/login/verify/organisms/login-verify-step/types.ts +++ b/platforms/market/src/app/screens/(auth)/auth/login/verify/organisms/login-verify-step/types.ts @@ -1,4 +1,4 @@ -import type { SupportEntryProps } from '../../../../../organisms/support-entry'; +import type { SupportEntryProps } from '../../../../../../organisms/support-entry'; export type LoginVerifyStepProps = { /** `lg` on mobile, `md` on desktop. */ diff --git a/platforms/market/src/app/screens/(auth)/auth/organisms/code-step/CodeStep.tsx b/platforms/market/src/app/screens/(auth)/auth/organisms/code-step/CodeStep.tsx index 9374fc9..feff8f4 100644 --- a/platforms/market/src/app/screens/(auth)/auth/organisms/code-step/CodeStep.tsx +++ b/platforms/market/src/app/screens/(auth)/auth/organisms/code-step/CodeStep.tsx @@ -12,7 +12,7 @@ import { Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; import { formatMobile, translateMessage } from '../../../../../../shared/utils'; -import { SupportEntry } from '../../../organisms/support-entry'; +import { SupportEntry } from '../../../../organisms/support-entry'; import type { CodeStepProps } from './types'; /** diff --git a/platforms/market/src/app/screens/(auth)/auth/organisms/code-step/types.ts b/platforms/market/src/app/screens/(auth)/auth/organisms/code-step/types.ts index 09b5d02..3b300a8 100644 --- a/platforms/market/src/app/screens/(auth)/auth/organisms/code-step/types.ts +++ b/platforms/market/src/app/screens/(auth)/auth/organisms/code-step/types.ts @@ -1,7 +1,7 @@ import type { ReactNode } from 'react'; import type { CodeStepModel } from '../../../../../../features/auth'; -import type { SupportEntryProps } from '../../../organisms/support-entry'; +import type { SupportEntryProps } from '../../../../organisms/support-entry'; export type CodeStepProps = { /** The page model's code step (`useCodeStep`). */ diff --git a/platforms/market/src/app/screens/(auth)/auth/register/details/organisms/register-details-step/components/DetailsFrame.tsx b/platforms/market/src/app/screens/(auth)/auth/register/details/organisms/register-details-step/components/DetailsFrame.tsx index cd19f9f..e24d5a3 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/details/organisms/register-details-step/components/DetailsFrame.tsx +++ b/platforms/market/src/app/screens/(auth)/auth/register/details/organisms/register-details-step/components/DetailsFrame.tsx @@ -6,8 +6,8 @@ import { Banner } from '@lumina/island/molecules/banner'; import type { FormEvent } from 'react'; import { useTranslation } from 'react-i18next'; -import { SupportEntry } from '../../../../../../organisms/support-entry'; -import { RegisterProgress } from '../../../../organisms/register-progress'; +import { SupportEntry } from '../../../../../../../organisms/support-entry'; +import { RegisterProgress } from '../../../../../../../organisms/register-progress'; import type { DetailsFrameProps } from '../types'; import { ExpiryHalt } from './ExpiryHalt'; import { ExpiryWarning } from './ExpiryWarning'; diff --git a/platforms/market/src/app/screens/(auth)/auth/register/details/organisms/register-details-step/types.ts b/platforms/market/src/app/screens/(auth)/auth/register/details/organisms/register-details-step/types.ts index a2878a1..c2d6814 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/details/organisms/register-details-step/types.ts +++ b/platforms/market/src/app/screens/(auth)/auth/register/details/organisms/register-details-step/types.ts @@ -5,7 +5,7 @@ import type { RegisterDetailsPageModel, UseDetailsPartOptions, } from '../../../../../../../../features/auth'; -import type { SupportEntryProps } from '../../../../../organisms/support-entry'; +import type { SupportEntryProps } from '../../../../../../organisms/support-entry'; export type RegisterDetailsStepProps = { /** `lg` on mobile, `md` on desktop. */ diff --git a/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-type-step/RegisterTypeStep.tsx b/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-type-step/RegisterTypeStep.tsx index 4f022c1..d0ff4d3 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-type-step/RegisterTypeStep.tsx +++ b/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-type-step/RegisterTypeStep.tsx @@ -14,8 +14,8 @@ import { useRegisterTypePage } from '../../../../../../../features/auth'; import type { UserRole } from '../../../../../../../features/auth'; import { translateMessage } from '../../../../../../../shared/utils'; import { useAuthRoutes } from '../../../../../../navigation'; -import { SupportEntry } from '../../../../organisms/support-entry'; -import { RegisterProgress } from '../register-progress'; +import { SupportEntry } from '../../../../../organisms/support-entry'; +import { RegisterProgress } from '../../../../../organisms/register-progress'; import type { RegisterTypeStepProps } from './types'; const ACCOUNT_TYPES = [ diff --git a/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-type-step/types.ts b/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-type-step/types.ts index d688e2e..531c25c 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-type-step/types.ts +++ b/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-type-step/types.ts @@ -1,4 +1,4 @@ -import type { SupportEntryProps } from '../../../../organisms/support-entry'; +import type { SupportEntryProps } from '../../../../../organisms/support-entry'; export type RegisterTypeStepProps = { /** `lg` on mobile, `md` on desktop. */ diff --git a/platforms/market/src/app/screens/(auth)/auth/register/phone/organisms/register-phone-step/RegisterPhoneStep.tsx b/platforms/market/src/app/screens/(auth)/auth/register/phone/organisms/register-phone-step/RegisterPhoneStep.tsx index 78e6bf6..ed51995 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/phone/organisms/register-phone-step/RegisterPhoneStep.tsx +++ b/platforms/market/src/app/screens/(auth)/auth/register/phone/organisms/register-phone-step/RegisterPhoneStep.tsx @@ -15,8 +15,8 @@ import { useTranslation } from 'react-i18next'; import { useRegisterPhonePage } from '../../../../../../../../features/auth'; import { translateMessage } from '../../../../../../../../shared/utils'; import { useAuthRoutes } from '../../../../../../../navigation'; -import { SupportEntry } from '../../../../../organisms/support-entry'; -import { RegisterProgress } from '../../../organisms/register-progress'; +import { SupportEntry } from '../../../../../../organisms/support-entry'; +import { RegisterProgress } from '../../../../../../organisms/register-progress'; import type { RegisterPhoneStepProps } from './types'; /** diff --git a/platforms/market/src/app/screens/(auth)/auth/register/phone/organisms/register-phone-step/types.ts b/platforms/market/src/app/screens/(auth)/auth/register/phone/organisms/register-phone-step/types.ts index d32c601..72ad998 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/phone/organisms/register-phone-step/types.ts +++ b/platforms/market/src/app/screens/(auth)/auth/register/phone/organisms/register-phone-step/types.ts @@ -1,4 +1,4 @@ -import type { SupportEntryProps } from '../../../../../organisms/support-entry'; +import type { SupportEntryProps } from '../../../../../../organisms/support-entry'; export type RegisterPhoneStepProps = { /** `lg` on mobile, `md` on desktop. */ diff --git a/platforms/market/src/app/screens/(auth)/auth/register/verify/organisms/register-verify-step/RegisterVerifyStep.tsx b/platforms/market/src/app/screens/(auth)/auth/register/verify/organisms/register-verify-step/RegisterVerifyStep.tsx index 3daa25c..f7715ce 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/verify/organisms/register-verify-step/RegisterVerifyStep.tsx +++ b/platforms/market/src/app/screens/(auth)/auth/register/verify/organisms/register-verify-step/RegisterVerifyStep.tsx @@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'; import { useRegisterVerifyPage } from '../../../../../../../../features/auth'; import { useAuthRoutes } from '../../../../../../../navigation'; import { CodeStep } from '../../../../organisms/code-step'; -import { RegisterProgress } from '../../../organisms/register-progress'; +import { RegisterProgress } from '../../../../../../organisms/register-progress'; import type { RegisterVerifyStepProps } from './types'; /** diff --git a/platforms/market/src/app/screens/(auth)/auth/register/verify/organisms/register-verify-step/types.ts b/platforms/market/src/app/screens/(auth)/auth/register/verify/organisms/register-verify-step/types.ts index a23a268..42d63ad 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/verify/organisms/register-verify-step/types.ts +++ b/platforms/market/src/app/screens/(auth)/auth/register/verify/organisms/register-verify-step/types.ts @@ -1,4 +1,4 @@ -import type { SupportEntryProps } from '../../../../../organisms/support-entry'; +import type { SupportEntryProps } from '../../../../../../organisms/support-entry'; export type RegisterVerifyStepProps = { /** `lg` on mobile, `md` on desktop. */ diff --git a/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-progress/RegisterProgress.tsx b/platforms/market/src/app/screens/organisms/register-progress/RegisterProgress.tsx similarity index 100% rename from platforms/market/src/app/screens/(auth)/auth/register/organisms/register-progress/RegisterProgress.tsx rename to platforms/market/src/app/screens/organisms/register-progress/RegisterProgress.tsx diff --git a/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-progress/index.ts b/platforms/market/src/app/screens/organisms/register-progress/index.ts similarity index 100% rename from platforms/market/src/app/screens/(auth)/auth/register/organisms/register-progress/index.ts rename to platforms/market/src/app/screens/organisms/register-progress/index.ts diff --git a/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-progress/types.ts b/platforms/market/src/app/screens/organisms/register-progress/types.ts similarity index 79% rename from platforms/market/src/app/screens/(auth)/auth/register/organisms/register-progress/types.ts rename to platforms/market/src/app/screens/organisms/register-progress/types.ts index 82c0f87..a3e40e8 100644 --- a/platforms/market/src/app/screens/(auth)/auth/register/organisms/register-progress/types.ts +++ b/platforms/market/src/app/screens/organisms/register-progress/types.ts @@ -1,4 +1,4 @@ -import type { UserRole } from '../../../../../../../features/auth'; +import type { UserRole } from '../../../../features/auth'; export type RegisterProgressProps = { /** 0-based: account type, number, code, details or identity, profile. */ diff --git a/platforms/market/src/app/screens/(auth)/organisms/support-entry/SupportEntry.tsx b/platforms/market/src/app/screens/organisms/support-entry/SupportEntry.tsx similarity index 96% rename from platforms/market/src/app/screens/(auth)/organisms/support-entry/SupportEntry.tsx rename to platforms/market/src/app/screens/organisms/support-entry/SupportEntry.tsx index 28404d4..0dfdaed 100644 --- a/platforms/market/src/app/screens/(auth)/organisms/support-entry/SupportEntry.tsx +++ b/platforms/market/src/app/screens/organisms/support-entry/SupportEntry.tsx @@ -7,8 +7,8 @@ import { SupportSheet } from '@lumina/island/organisms/support-sheet'; import { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { getEnv } from '../../../../../env'; -import { ROUTES } from '../../../../navigation'; +import { getEnv } from '../../../../env'; +import { ROUTES } from '../../../navigation'; import { SUPPORT_CHAT_URLS } from './constants'; import type { SupportEntryProps } from './types'; diff --git a/platforms/market/src/app/screens/(auth)/organisms/support-entry/constants.ts b/platforms/market/src/app/screens/organisms/support-entry/constants.ts similarity index 100% rename from platforms/market/src/app/screens/(auth)/organisms/support-entry/constants.ts rename to platforms/market/src/app/screens/organisms/support-entry/constants.ts diff --git a/platforms/market/src/app/screens/(auth)/organisms/support-entry/index.ts b/platforms/market/src/app/screens/organisms/support-entry/index.ts similarity index 100% rename from platforms/market/src/app/screens/(auth)/organisms/support-entry/index.ts rename to platforms/market/src/app/screens/organisms/support-entry/index.ts diff --git a/platforms/market/src/app/screens/(auth)/organisms/support-entry/types.ts b/platforms/market/src/app/screens/organisms/support-entry/types.ts similarity index 100% rename from platforms/market/src/app/screens/(auth)/organisms/support-entry/types.ts rename to platforms/market/src/app/screens/organisms/support-entry/types.ts diff --git a/platforms/market/src/features/channel/entities/public-creator/types.ts b/platforms/market/src/features/channel/entities/public-creator/types.ts index 9512d28..efe82a3 100644 --- a/platforms/market/src/features/channel/entities/public-creator/types.ts +++ b/platforms/market/src/features/channel/entities/public-creator/types.ts @@ -1,4 +1,5 @@ -import type { Market, TradingStyle } from '../../../profile'; +import type { Market } from '../../../../shared/constants'; +import type { TradingStyle } from '../../../profile'; /** * trader-service's public projection of an approved creator (`toPublicProfile`). `id` is the diff --git a/platforms/market/src/features/channel/repositories/channel/types.ts b/platforms/market/src/features/channel/repositories/channel/types.ts index b11bf68..184be67 100644 --- a/platforms/market/src/features/channel/repositories/channel/types.ts +++ b/platforms/market/src/features/channel/repositories/channel/types.ts @@ -1,8 +1,9 @@ import type { BillingPeriod, CompareSource, + Market, } from '../../../../shared/constants'; -import type { Market, SocialLinkPayload, TradingStyle } from '../../../profile'; +import type { SocialLinkPayload, TradingStyle } from '../../../profile'; import type { PublicCreatorEntity } from '../../entities/public-creator'; import type { PublicTierEntity } from '../../entities/public-tier'; diff --git a/platforms/market/src/features/profile/constants.ts b/platforms/market/src/features/profile/constants.ts index bad4282..d05396f 100644 --- a/platforms/market/src/features/profile/constants.ts +++ b/platforms/market/src/features/profile/constants.ts @@ -1,16 +1,4 @@ -import type { Market, TradingStyle } from './entities/creator-profile'; - -/** Every market, in the server's order, for pickers. */ -export const MARKETS: readonly Market[] = [ - 'crypto', - 'gold', - 'equities', - 'forex', - 'funds', - 'real_estate', - 'automotive', - 'USDT', -]; +import type { TradingStyle } from './entities/creator-profile'; /** Every trading style, in the server's order, for pickers. */ export const TRADING_STYLES: readonly TradingStyle[] = [ diff --git a/platforms/market/src/features/profile/entities/creator-profile/index.ts b/platforms/market/src/features/profile/entities/creator-profile/index.ts index c09a3fb..7544689 100644 --- a/platforms/market/src/features/profile/entities/creator-profile/index.ts +++ b/platforms/market/src/features/profile/entities/creator-profile/index.ts @@ -1,7 +1,6 @@ export type { CreatorProfileEntity, KycStatus, - Market, SocialLinkEntity, TradingStyle, } from './types'; diff --git a/platforms/market/src/features/profile/entities/creator-profile/types.ts b/platforms/market/src/features/profile/entities/creator-profile/types.ts index 4f881a5..6f0568e 100644 --- a/platforms/market/src/features/profile/entities/creator-profile/types.ts +++ b/platforms/market/src/features/profile/entities/creator-profile/types.ts @@ -1,15 +1,4 @@ -import type { VerificationStatus } from '../../../../shared/constants'; - -/** The markets a creator analyses (`MARKETS` in creator-profile-setup.dto). `USDT` is the dollar/tether market. */ -export type Market = - | 'crypto' - | 'gold' - | 'equities' - | 'forex' - | 'funds' - | 'real_estate' - | 'automotive' - | 'USDT'; +import type { Market, VerificationStatus } from '../../../../shared/constants'; /** How a creator trades (`TRADING_STYLES` in creator-profile-setup.dto). */ export type TradingStyle = diff --git a/platforms/market/src/features/profile/index.ts b/platforms/market/src/features/profile/index.ts index e505862..bf56498 100644 --- a/platforms/market/src/features/profile/index.ts +++ b/platforms/market/src/features/profile/index.ts @@ -1,9 +1,5 @@ -export { MARKETS, PROFILE_LIMITS, TRADING_STYLES } from './constants'; -export type { - KycStatus, - Market, - TradingStyle, -} from './entities/creator-profile'; +export { PROFILE_LIMITS, TRADING_STYLES } from './constants'; +export type { KycStatus, TradingStyle } from './entities/creator-profile'; export { profileKeys, profileRepository } from './repositories/profile'; export type { CreatorProfilePayload, diff --git a/platforms/market/src/features/profile/repositories/profile/types.ts b/platforms/market/src/features/profile/repositories/profile/types.ts index 041d06c..df7b3d5 100644 --- a/platforms/market/src/features/profile/repositories/profile/types.ts +++ b/platforms/market/src/features/profile/repositories/profile/types.ts @@ -1,8 +1,10 @@ -import type { VerificationStatus } from '../../../../shared/constants'; +import type { + Market, + VerificationStatus, +} from '../../../../shared/constants'; import type { CreatorProfileEntity, KycStatus, - Market, TradingStyle, } from '../../entities/creator-profile'; diff --git a/platforms/market/src/index.ts b/platforms/market/src/index.ts index 2bf952c..7441c67 100644 --- a/platforms/market/src/index.ts +++ b/platforms/market/src/index.ts @@ -71,6 +71,7 @@ export { COMPARE_SOURCES, CONFIRMATION_LANDINGS, CONFIRMATION_PHASES, + MARKETS, PAYMENT_STATUSES, PAYMENT_UI_STATUSES, SUBSCRIPTION_RECORD_STATUSES, @@ -82,13 +83,13 @@ export type { CompareSource, ConfirmationLanding, ConfirmationPhase, + Market, PaymentStatus, PaymentUiStatus, SubscriptionRecordStatus, VerificationStatus, } from './shared/constants'; export { - MARKETS, PROFILE_LIMITS, profileKeys, profileRepository, @@ -97,7 +98,6 @@ export { export type { CreatorProfilePayload, KycStatus, - Market, SocialLinkArgs, SocialLinkPayload, TradingStyle, diff --git a/platforms/market/src/shared/constants/index.ts b/platforms/market/src/shared/constants/index.ts index 3b952d3..1126e5f 100644 --- a/platforms/market/src/shared/constants/index.ts +++ b/platforms/market/src/shared/constants/index.ts @@ -37,6 +37,19 @@ export type ConfirmationPhase = (typeof CONFIRMATION_PHASES)[number]; export const CONFIRMATION_LANDINGS = ['wait', 'channel', 'checkout'] as const; export type ConfirmationLanding = (typeof CONFIRMATION_LANDINGS)[number]; +/** The markets creators analyse and investors follow (`MARKETS` in creator-profile-setup.dto). `USDT` is the dollar/tether market. */ +export const MARKETS = [ + 'crypto', + 'gold', + 'equities', + 'forex', + 'funds', + 'real_estate', + 'automotive', + 'USDT', +] as const; +export type Market = (typeof MARKETS)[number]; + /** * `subscription_payments.status` as stored. A pending payment turns `pending_review` after a while * and `expired` after its 30-minute TTL.