Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 64 additions & 49 deletions src/routeTree.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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": {
Expand All @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -737,7 +751,8 @@ interface MainRouteRouteChildren {

const MainRouteRouteChildren: MainRouteRouteChildren = {
MainReadRouteRoute: MainReadRouteRouteWithChildren,
MainTranslateRouteRoute: MainTranslateRouteRouteWithChildren,
mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRoute:
mainTranslateDotDotDotDotDotDotUiTranslationRoutesRouteRouteWithChildren,
MainDashboardRoute: MainDashboardRoute,
MainFeaturesRoute: MainFeaturesRoute,
MainProfileRoute: MainProfileRoute,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
]);
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -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 }) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
@@ -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(),
Expand Down
Loading