diff --git a/src/routeTree.gen.ts b/src/routeTree.gen.ts index 5ba0d609..b4a724c2 100644 --- a/src/routeTree.gen.ts +++ b/src/routeTree.gen.ts @@ -21,13 +21,13 @@ import { Route as MinimalForgotPasswordRouteImport } from "./routes/_minimal/for import { Route as MainProfileRouteImport } from "./routes/_main/profile"; import { Route as MainFeaturesRouteImport } from "./routes/_main/features"; import { Route as MainDashboardRouteImport } from "./routes/_main/dashboard"; -import { Route as MainTranslateRouteRouteImport } from "./routes/_main/translate/route"; +import { Route as mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteImport } from "./ui/translation/routes/route"; import { Route as MainReadRouteRouteImport } from "./routes/_main/read/route"; -import { Route as MainTranslateCodeRouteImport } from "./routes/_main/translate/$code"; +import { Route as mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteImport } from "./ui/translation/routes/$code"; import { Route as MainReadCodeRouteImport } from "./routes/_main/read/$code"; import { Route as MainPSplatRouteImport } from "./routes/_main/p.$"; import { Route as mainAdminDotDotDotDotDotDotUiAdminRoutesMainRouteImport } from "./ui/admin/routes/_main"; -import { Route as MainTranslateCodeVerseIdRouteImport } from "./routes/_main/translate/$code.$verseId"; +import { Route as mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRouteImport } from "./ui/translation/routes/$code.$verseId"; import { Route as MainReadCodeChapterIdRouteImport } from "./routes/_main/read/$code.$chapterId"; import { Route as mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotjobsRouteImport } from "./ui/admin/routes/_main.jobs"; import { Route as mainAdminDotDotDotDotDotDotUiAdminRoutesLanguagesDotcodeRouteRouteImport } from "./ui/admin/routes/languages.$code/route"; @@ -98,21 +98,24 @@ const MainDashboardRoute = MainDashboardRouteImport.update({ path: "/dashboard", getParentRoute: () => MainRouteRoute, } as any); -const MainTranslateRouteRoute = MainTranslateRouteRouteImport.update({ - id: "/translate", - path: "/translate", - getParentRoute: () => MainRouteRoute, -} as any); +const mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRoute = + mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteImport.update({ + id: "/translate", + path: "/translate", + getParentRoute: () => MainRouteRoute, + } as any); const MainReadRouteRoute = MainReadRouteRouteImport.update({ id: "/read", path: "/read", getParentRoute: () => MainRouteRoute, } as any); -const MainTranslateCodeRoute = MainTranslateCodeRouteImport.update({ - id: "/$code", - path: "/$code", - getParentRoute: () => MainTranslateRouteRoute, -} as any); +const mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRoute = + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteImport.update({ + id: "/$code", + path: "/$code", + getParentRoute: () => + mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRoute, + } as any); const MainReadCodeRoute = MainReadCodeRouteImport.update({ id: "/$code", path: "/$code", @@ -129,12 +132,15 @@ const mainAdminDotDotDotDotDotDotUiAdminRoutesMainRoute = path: "/admin", getParentRoute: () => MainRouteRoute, } as any); -const MainTranslateCodeVerseIdRoute = - MainTranslateCodeVerseIdRouteImport.update({ - id: "/$verseId", - path: "/$verseId", - getParentRoute: () => MainTranslateCodeRoute, - } as any); +const mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRoute = + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRouteImport.update( + { + id: "/$verseId", + path: "/$verseId", + getParentRoute: () => + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRoute, + } as any, + ); const MainReadCodeChapterIdRoute = MainReadCodeChapterIdRouteImport.update({ id: "/$chapterId", path: "/$chapterId", @@ -222,7 +228,7 @@ const mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotlanguagesNewRoute = export interface FileRoutesByFullPath { "/": typeof IndexRoute; "/read": typeof MainReadRouteRouteWithChildren; - "/translate": typeof MainTranslateRouteRouteWithChildren; + "/translate": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteWithChildren; "/dashboard": typeof MainDashboardRoute; "/features": typeof MainFeaturesRoute; "/profile": typeof MainProfileRoute; @@ -235,11 +241,11 @@ export interface FileRoutesByFullPath { "/admin": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainRouteWithChildren; "/p/$": typeof MainPSplatRoute; "/read/$code": typeof MainReadCodeRouteWithChildren; - "/translate/$code": typeof MainTranslateCodeRouteWithChildren; + "/translate/$code": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteWithChildren; "/admin/languages/$code": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesLanguagesDotcodeRouteRouteWithChildren; "/admin/jobs": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotjobsRoute; "/read/$code/$chapterId": typeof MainReadCodeChapterIdRoute; - "/translate/$code/$verseId": typeof MainTranslateCodeVerseIdRoute; + "/translate/$code/$verseId": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRoute; "/admin/languages/new": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotlanguagesNewRoute; "/admin/users/invite": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotusersInviteRoute; "/admin/languages/$code/exports": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesLanguagesDotcodeExportsRoute; @@ -252,7 +258,7 @@ export interface FileRoutesByFullPath { export interface FileRoutesByTo { "/": typeof IndexRoute; "/read": typeof MainReadRouteRouteWithChildren; - "/translate": typeof MainTranslateRouteRouteWithChildren; + "/translate": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteWithChildren; "/dashboard": typeof MainDashboardRoute; "/features": typeof MainFeaturesRoute; "/profile": typeof MainProfileRoute; @@ -265,10 +271,10 @@ export interface FileRoutesByTo { "/admin": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainRouteWithChildren; "/p/$": typeof MainPSplatRoute; "/read/$code": typeof MainReadCodeRouteWithChildren; - "/translate/$code": typeof MainTranslateCodeRouteWithChildren; + "/translate/$code": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteWithChildren; "/admin/jobs": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotjobsRoute; "/read/$code/$chapterId": typeof MainReadCodeChapterIdRoute; - "/translate/$code/$verseId": typeof MainTranslateCodeVerseIdRoute; + "/translate/$code/$verseId": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRoute; "/admin/languages/new": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotlanguagesNewRoute; "/admin/users/invite": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotusersInviteRoute; "/admin/languages/$code/exports": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesLanguagesDotcodeExportsRoute; @@ -284,7 +290,7 @@ export interface FileRoutesById { "/_main": typeof MainRouteRouteWithChildren; "/_minimal": typeof MinimalRouteRouteWithChildren; "/_main/read": typeof MainReadRouteRouteWithChildren; - "/_main/translate": typeof MainTranslateRouteRouteWithChildren; + "/_main/translate": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteWithChildren; "/_main/dashboard": typeof MainDashboardRoute; "/_main/features": typeof MainFeaturesRoute; "/_main/profile": typeof MainProfileRoute; @@ -297,11 +303,11 @@ export interface FileRoutesById { "/_main/admin/_main": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainRouteWithChildren; "/_main/p/$": typeof MainPSplatRoute; "/_main/read/$code": typeof MainReadCodeRouteWithChildren; - "/_main/translate/$code": typeof MainTranslateCodeRouteWithChildren; + "/_main/translate/$code": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteWithChildren; "/_main/admin/languages/$code": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesLanguagesDotcodeRouteRouteWithChildren; "/_main/admin/_main/jobs": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotjobsRoute; "/_main/read/$code/$chapterId": typeof MainReadCodeChapterIdRoute; - "/_main/translate/$code/$verseId": typeof MainTranslateCodeVerseIdRoute; + "/_main/translate/$code/$verseId": typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRoute; "/_main/admin/_main/languages/new": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotlanguagesNewRoute; "/_main/admin/_main/users/invite": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotusersInviteRoute; "/_main/admin/languages/$code/exports": typeof mainAdminDotDotDotDotDotDotUiAdminRoutesLanguagesDotcodeExportsRoute; @@ -502,7 +508,7 @@ declare module "@tanstack/react-router" { id: "/_main/translate"; path: "/translate"; fullPath: "/translate"; - preLoaderRoute: typeof MainTranslateRouteRouteImport; + preLoaderRoute: typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteImport; parentRoute: typeof MainRouteRoute; }; "/_main/read": { @@ -516,8 +522,8 @@ declare module "@tanstack/react-router" { id: "/_main/translate/$code"; path: "/$code"; fullPath: "/translate/$code"; - preLoaderRoute: typeof MainTranslateCodeRouteImport; - parentRoute: typeof MainTranslateRouteRoute; + preLoaderRoute: typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteImport; + parentRoute: typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRoute; }; "/_main/read/$code": { id: "/_main/read/$code"; @@ -544,8 +550,8 @@ declare module "@tanstack/react-router" { id: "/_main/translate/$code/$verseId"; path: "/$verseId"; fullPath: "/translate/$code/$verseId"; - preLoaderRoute: typeof MainTranslateCodeVerseIdRouteImport; - parentRoute: typeof MainTranslateCodeRoute; + preLoaderRoute: typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRouteImport; + parentRoute: typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRoute; }; "/_main/read/$code/$chapterId": { id: "/_main/read/$code/$chapterId"; @@ -651,27 +657,35 @@ const MainReadRouteRouteWithChildren = MainReadRouteRoute._addFileChildren( MainReadRouteRouteChildren, ); -interface MainTranslateCodeRouteChildren { - MainTranslateCodeVerseIdRoute: typeof MainTranslateCodeVerseIdRoute; +interface mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteChildren { + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRoute: typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRoute; } -const MainTranslateCodeRouteChildren: MainTranslateCodeRouteChildren = { - MainTranslateCodeVerseIdRoute: MainTranslateCodeVerseIdRoute, -}; +const mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteChildren: mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteChildren = + { + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRoute: + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeDotverseIdRoute, + }; -const MainTranslateCodeRouteWithChildren = - MainTranslateCodeRoute._addFileChildren(MainTranslateCodeRouteChildren); +const mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteWithChildren = + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRoute._addFileChildren( + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteChildren, + ); -interface MainTranslateRouteRouteChildren { - MainTranslateCodeRoute: typeof MainTranslateCodeRouteWithChildren; +interface mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteChildren { + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRoute: typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteWithChildren; } -const MainTranslateRouteRouteChildren: MainTranslateRouteRouteChildren = { - MainTranslateCodeRoute: MainTranslateCodeRouteWithChildren, -}; +const mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteChildren: mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteChildren = + { + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRoute: + mainTranslateDotDotDotDotDotDotUiTranslationRoutesCodeRouteWithChildren, + }; -const MainTranslateRouteRouteWithChildren = - MainTranslateRouteRoute._addFileChildren(MainTranslateRouteRouteChildren); +const mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteWithChildren = + mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRoute._addFileChildren( + mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteChildren, + ); interface mainAdminDotDotDotDotDotDotUiAdminRoutesMainRouteChildren { mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotjobsRoute: typeof mainAdminDotDotDotDotDotDotUiAdminRoutesMainDotjobsRoute; @@ -726,7 +740,7 @@ const mainAdminDotDotDotDotDotDotUiAdminRoutesLanguagesDotcodeRouteRouteWithChil interface MainRouteRouteChildren { MainReadRouteRoute: typeof MainReadRouteRouteWithChildren; - MainTranslateRouteRoute: typeof MainTranslateRouteRouteWithChildren; + mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRoute: typeof mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteWithChildren; MainDashboardRoute: typeof MainDashboardRoute; MainFeaturesRoute: typeof MainFeaturesRoute; MainProfileRoute: typeof MainProfileRoute; @@ -737,7 +751,8 @@ interface MainRouteRouteChildren { const MainRouteRouteChildren: MainRouteRouteChildren = { MainReadRouteRoute: MainReadRouteRouteWithChildren, - MainTranslateRouteRoute: MainTranslateRouteRouteWithChildren, + mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRoute: + mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteWithChildren, MainDashboardRoute: MainDashboardRoute, MainFeaturesRoute: MainFeaturesRoute, MainProfileRoute: MainProfileRoute, diff --git a/src/routes/_main/admin/__virtual.ts b/src/routes/_main/__virtual.ts similarity index 56% rename from src/routes/_main/admin/__virtual.ts rename to src/routes/_main/__virtual.ts index 512fff83..3b352326 100644 --- a/src/routes/_main/admin/__virtual.ts +++ b/src/routes/_main/__virtual.ts @@ -4,5 +4,6 @@ import { } from "@tanstack/virtual-file-routes"; export default defineVirtualSubtreeConfig([ - physical("../../../ui/admin/routes"), + physical("/admin", "../../../ui/admin/routes"), + physical("/translate", "../../../ui/translation/routes"), ]); diff --git a/src/modules/translation/ui/ClientTranslationView.tsx b/src/ui/translation/components/ClientTranslationView.tsx similarity index 100% rename from src/modules/translation/ui/ClientTranslationView.tsx rename to src/ui/translation/components/ClientTranslationView.tsx diff --git a/src/modules/translation/ui/PhraseNoteEditor.tsx b/src/ui/translation/components/PhraseNoteEditor.tsx similarity index 92% rename from src/modules/translation/ui/PhraseNoteEditor.tsx rename to src/ui/translation/components/PhraseNoteEditor.tsx index f0b6a9a1..ca906c9a 100644 --- a/src/modules/translation/ui/PhraseNoteEditor.tsx +++ b/src/ui/translation/components/PhraseNoteEditor.tsx @@ -12,9 +12,9 @@ import React, { useState, Suspense, } from "react"; -import { getPhraseNote } from "../actions/getPhraseNote"; -import { updateFootnoteAction } from "../actions/updateFootnote"; -import { updateTranslatorNoteAction } from "../actions/updateTranslatorNote"; +import { getPhraseNote } from "@/ui/translation/serverFns/getPhraseNote"; +import { updateFootnoteAction } from "@/modules/translation/actions/updateFootnote"; +import { updateTranslatorNoteAction } from "@/modules/translation/actions/updateTranslatorNote"; import LoadingSpinner from "@/components/LoadingSpinner"; const RichText = React.lazy(() => import("@/components/RichText")); diff --git a/src/modules/translation/ui/TranslateWord.tsx b/src/ui/translation/components/TranslateWord.tsx similarity index 99% rename from src/modules/translation/ui/TranslateWord.tsx rename to src/ui/translation/components/TranslateWord.tsx index 28178535..2e0c8b69 100644 --- a/src/modules/translation/ui/TranslateWord.tsx +++ b/src/ui/translation/components/TranslateWord.tsx @@ -13,10 +13,10 @@ import { useRef, useState, } from "react"; -import { updateGlossAction } from "../actions/updateGloss"; +import { updateGlossAction } from "@/modules/translation/actions/updateGloss"; import { fontMap } from "@/fonts"; import { useParams } from "@tanstack/react-router"; -import { GlossApprovalMethodRaw } from "../types"; +import { GlossApprovalMethodRaw } from "@/modules/translation/types"; import { hasShortcutModifier } from "@/utils/keyboard-shortcuts"; import { MachineGlossStrategy } from "@/modules/languages/model"; import { useServerFn } from "@tanstack/react-start"; diff --git a/src/modules/translation/ui/TranslationClientState.tsx b/src/ui/translation/components/TranslationClientState.tsx similarity index 100% rename from src/modules/translation/ui/TranslationClientState.tsx rename to src/ui/translation/components/TranslationClientState.tsx diff --git a/src/modules/translation/ui/TranslationLexiconPanel.tsx b/src/ui/translation/components/TranslationLexiconPanel.tsx similarity index 97% rename from src/modules/translation/ui/TranslationLexiconPanel.tsx rename to src/ui/translation/components/TranslationLexiconPanel.tsx index faf6df0d..f4bfdeb2 100644 --- a/src/modules/translation/ui/TranslationLexiconPanel.tsx +++ b/src/ui/translation/components/TranslationLexiconPanel.tsx @@ -7,7 +7,7 @@ import { useTranslations } from "use-intl"; import { useQuery } from "@tanstack/react-query"; import { VersesPreview } from "@/components/VersesPreview"; import { parseReferenceRange } from "@/verse-utils"; -import { getWordResource } from "../actions/getWordResource"; +import { getWordResource } from "@/ui/translation/serverFns/getWordResource"; import LoadingSpinner from "@/components/LoadingSpinner"; import { ClientOnly } from "@tanstack/react-router"; diff --git a/src/modules/translation/ui/TranslationProgressBar.tsx b/src/ui/translation/components/TranslationProgressBar.tsx similarity index 97% rename from src/modules/translation/ui/TranslationProgressBar.tsx rename to src/ui/translation/components/TranslationProgressBar.tsx index 2d67c27a..86ea6309 100644 --- a/src/modules/translation/ui/TranslationProgressBar.tsx +++ b/src/ui/translation/components/TranslationProgressBar.tsx @@ -4,7 +4,7 @@ import { useTextWidth } from "@/utils/text-width"; import { useQuery } from "@tanstack/react-query"; import { useParams } from "@tanstack/react-router"; import { useEffect, useRef, useState } from "react"; -import { getBookProgress } from "../actions/getBookProgress"; +import { getBookProgress } from "../serverFns/getBookProgress"; import { useTranslations } from "use-intl"; export default function TranslationProgressBar({ diff --git a/src/modules/translation/ui/TranslationReference.tsx b/src/ui/translation/components/TranslationReference.tsx similarity index 100% rename from src/modules/translation/ui/TranslationReference.tsx rename to src/ui/translation/components/TranslationReference.tsx diff --git a/src/modules/translation/ui/TranslationSidebar.tsx b/src/ui/translation/components/TranslationSidebar.tsx similarity index 100% rename from src/modules/translation/ui/TranslationSidebar.tsx rename to src/ui/translation/components/TranslationSidebar.tsx diff --git a/src/modules/translation/ui/TranslationToolbar.tsx b/src/ui/translation/components/TranslationToolbar.tsx similarity index 97% rename from src/modules/translation/ui/TranslationToolbar.tsx rename to src/ui/translation/components/TranslationToolbar.tsx index 8e8b4563..85d02647 100644 --- a/src/modules/translation/ui/TranslationToolbar.tsx +++ b/src/ui/translation/components/TranslationToolbar.tsx @@ -13,11 +13,11 @@ import { useState, type JSX, } from "react"; -import { approveAll } from "../actions/approveAll"; -import { linkWords } from "../actions/linkWords"; -import { redirectToUnapproved } from "../actions/redirectToUnapproved"; -import { sanityCheck } from "../actions/sanityCheck"; -import { unlinkPhrase } from "../actions/unlinkPhrase"; +import { approveAll } from "@/modules/translation/actions/approveAll"; +import { linkWords } from "@/modules/translation/actions/linkWords"; +import { redirectToUnapproved } from "@/ui/translation/serverFns/redirectToUnapproved"; +import { sanityCheck } from "@/modules/translation/actions/sanityCheck"; +import { unlinkPhrase } from "@/modules/translation/actions/unlinkPhrase"; import { bookFirstVerseId, bookLastVerseId, diff --git a/src/modules/translation/read-models/getVerseWordsReadModel.ts b/src/ui/translation/readModels/getVerseWordsReadModel.ts similarity index 100% rename from src/modules/translation/read-models/getVerseWordsReadModel.ts rename to src/ui/translation/readModels/getVerseWordsReadModel.ts diff --git a/src/routes/_main/translate/$code.$verseId.tsx b/src/ui/translation/routes/$code.$verseId.tsx similarity index 92% rename from src/routes/_main/translate/$code.$verseId.tsx rename to src/ui/translation/routes/$code.$verseId.tsx index 63503f5f..b934e348 100644 --- a/src/routes/_main/translate/$code.$verseId.tsx +++ b/src/ui/translation/routes/$code.$verseId.tsx @@ -1,6 +1,6 @@ import LoadingSpinner from "@/components/LoadingSpinner"; -import { getTranslationVerseData } from "@/modules/translation/actions/getTranslationVerseData"; -import ClientTranslationView from "@/modules/translation/ui/ClientTranslationView"; +import { getTranslationVerseData } from "../serverFns/getTranslationVerseData"; +import ClientTranslationView from "../components/ClientTranslationView"; import { createFileRoute, notFound, useRouter } from "@tanstack/react-router"; import { incrementVerseId, parseVerseId } from "@/verse-utils"; import { withDocumentTitle } from "@/documentTitle"; diff --git a/src/routes/_main/translate/$code.tsx b/src/ui/translation/routes/$code.tsx similarity index 69% rename from src/routes/_main/translate/$code.tsx rename to src/ui/translation/routes/$code.tsx index ddd7aa8e..611ffe70 100644 --- a/src/routes/_main/translate/$code.tsx +++ b/src/ui/translation/routes/$code.tsx @@ -1,7 +1,7 @@ import { Outlet, createFileRoute } from "@tanstack/react-router"; -import { getTranslationLayoutData } from "@/modules/translation/actions/getTranslationLayoutData"; -import TranslationToolbar from "@/modules/translation/ui/TranslationToolbar"; -import { TranslationClientStateProvider } from "@/modules/translation/ui/TranslationClientState"; +import { getTranslationLayoutData } from "../serverFns/getTranslationLayoutData"; +import TranslationToolbar from "../components/TranslationToolbar"; +import { TranslationClientStateProvider } from "../components/TranslationClientState"; export const Route = createFileRoute("/_main/translate/$code")({ loader: ({ params }) => diff --git a/src/routes/_main/translate/route.tsx b/src/ui/translation/routes/route.tsx similarity index 100% rename from src/routes/_main/translate/route.tsx rename to src/ui/translation/routes/route.tsx diff --git a/src/modules/translation/actions/getBookProgress.ts b/src/ui/translation/serverFns/getBookProgress.ts similarity index 100% rename from src/modules/translation/actions/getBookProgress.ts rename to src/ui/translation/serverFns/getBookProgress.ts diff --git a/src/modules/translation/actions/getPhraseNote.ts b/src/ui/translation/serverFns/getPhraseNote.ts similarity index 96% rename from src/modules/translation/actions/getPhraseNote.ts rename to src/ui/translation/serverFns/getPhraseNote.ts index fd0051c8..530675d4 100644 --- a/src/modules/translation/actions/getPhraseNote.ts +++ b/src/ui/translation/serverFns/getPhraseNote.ts @@ -5,7 +5,7 @@ import { serverActionLogger } from "@/server-action"; import { createServerFn } from "@tanstack/react-start"; import { notFound } from "@tanstack/react-router"; import * as z from "zod"; -import { phraseRepository } from "../data-access/phraseRepository"; +import { phraseRepository } from "@/modules/translation/data-access/phraseRepository"; const requestSchema = z.object({ phraseId: z.coerce.number().int(), diff --git a/src/modules/translation/actions/getTranslationLayoutData.ts b/src/ui/translation/serverFns/getTranslationLayoutData.ts similarity index 100% rename from src/modules/translation/actions/getTranslationLayoutData.ts rename to src/ui/translation/serverFns/getTranslationLayoutData.ts diff --git a/src/modules/translation/actions/getTranslationVerseData.ts b/src/ui/translation/serverFns/getTranslationVerseData.ts similarity index 99% rename from src/modules/translation/actions/getTranslationVerseData.ts rename to src/ui/translation/serverFns/getTranslationVerseData.ts index f5930c52..1a8e0d55 100644 --- a/src/modules/translation/actions/getTranslationVerseData.ts +++ b/src/ui/translation/serverFns/getTranslationVerseData.ts @@ -6,7 +6,7 @@ import { MachineGlossStrategy } from "@/modules/languages/model"; import { getCurrentLanguageReadModel } from "@/modules/languages/read-models/getCurrentLanguageReadModel"; import { createServerFn } from "@tanstack/react-start"; import * as z from "zod"; -import { getVerseWordsReadModel } from "../read-models/getVerseWordsReadModel"; +import { getVerseWordsReadModel } from "../readModels/getVerseWordsReadModel"; const requestSchema = z.object({ code: z.string(), diff --git a/src/modules/translation/actions/getWordResource.ts b/src/ui/translation/serverFns/getWordResource.ts similarity index 100% rename from src/modules/translation/actions/getWordResource.ts rename to src/ui/translation/serverFns/getWordResource.ts diff --git a/src/modules/translation/actions/redirectToUnapproved.ts b/src/ui/translation/serverFns/redirectToUnapproved.ts similarity index 89% rename from src/modules/translation/actions/redirectToUnapproved.ts rename to src/ui/translation/serverFns/redirectToUnapproved.ts index 0b7a5fb2..3821f765 100644 --- a/src/modules/translation/actions/redirectToUnapproved.ts +++ b/src/ui/translation/serverFns/redirectToUnapproved.ts @@ -1,7 +1,7 @@ import * as z from "zod"; import { serverActionLogger } from "@/server-action"; import { createServerFn } from "@tanstack/react-start"; -import glossRepository from "../data-access/GlossRepository"; +import glossRepository from "@/modules/translation/data-access/GlossRepository"; const requestSchema = z.object({ code: z.string(),