WIP vite migration

This commit is contained in:
2023-12-12 19:37:41 +01:00
parent cba850251f
commit 34efa48c3e
15 changed files with 729 additions and 16603 deletions

View File

@ -16,7 +16,7 @@ export class APIClient {
* Get backend URL
*/
static backendURL(): string {
const URL = process.env.REACT_APP_BACKEND ?? "";
const URL = import.meta.env.VITE_APP_BACKEND ?? "";
if (URL.length === 0) throw new Error("Backend URL undefined!");
return URL;
}

View File

@ -1 +0,0 @@
/// <reference types="react-scripts" />

View File

@ -26,7 +26,6 @@ import { useFamily } from "../../widgets/BaseFamilyRoute";
import { BasicFamilyTree } from "../../widgets/BasicFamilyTree";
import { MemberItem } from "../../widgets/MemberItem";
import { RouterLink } from "../../widgets/RouterLink";
import { ComplexFamilyTree } from "../../widgets/complex_family_tree/ComplexFamilyTree";
import { SimpleFamilyTree } from "../../widgets/simple_family_tree/SimpleFamilyTree";
enum CurrTab {
@ -149,7 +148,7 @@ export function FamilyMemberTreeRoute(): React.ReactElement {
>
<Tab tabIndex={CurrTab.BasicTree} label="Basique" />
<Tab tabIndex={CurrTab.SimpleTree} label="Simple" />
<Tab tabIndex={CurrTab.AdvancedTree} label="Avancé" />
{/*<Tab tabIndex={CurrTab.AdvancedTree} label="Avancé" />*/}
</Tabs>
</div>
@ -160,11 +159,11 @@ export function FamilyMemberTreeRoute(): React.ReactElement {
) : currTab === CurrTab.SimpleTree ? (
<SimpleFamilyTree tree={tree!} depth={currDepth} />
) : (
<ComplexFamilyTree
<>unimplemented</> /*<ComplexFamilyTree
tree={tree!}
isUp={currMode === TreeMode.Ascending}
depth={currDepth}
/>
/>*/
)}
</Paper>
</div>

View File

@ -1,3 +1,5 @@
export function isDebug(): boolean {
return !process.env.NODE_ENV || process.env.NODE_ENV === "development";
return (
!import.meta.env.NODE_ENV || import.meta.env.NODE_ENV === "development"
);
}

View File

@ -2,7 +2,7 @@ import { mdiXml } from "@mdi/js";
import Icon from "@mdi/react";
import PictureAsPdfIcon from "@mui/icons-material/PictureAsPdf";
import { IconButton, Tooltip } from "@mui/material";
import f3, { f3Data } from "family-chart";
import "family-chart";
import { jsPDF } from "jspdf";
import React from "react";
import "svg2pdf.js";
@ -24,7 +24,7 @@ export function ComplexFamilyTree(p: {
depth: number;
}): React.ReactElement {
const darkTheme = useDarkTheme();
console.log(f3);
const applyTree = (container: HTMLDivElement) => {
if (!container) return;
@ -207,10 +207,10 @@ function treeToF3Data(
node: FamilyTreeNode,
isUp: boolean,
depth: number
): f3Data[] {
): f3.f3Data[] {
const availableMembers = getAvailableMembers(node, depth);
const list: f3Data[] = [];
const list: f3.f3Data[] = [];
if (isUp) treeToF3DataUpRecurse(node, list, availableMembers);
else treeToF3DataDownRecurse(node, list, availableMembers);
return list;
@ -232,7 +232,7 @@ function memberData(m: Member, c?: Couple): f3.f3DataData {
function treeToF3DataUpRecurse(
node: FamilyTreeNode,
array: f3Data[],
array: f3.f3Data[],
availableMembers: Set<number>,
child?: number,
spouses?: number[]
@ -274,7 +274,7 @@ function treeToF3DataUpRecurse(
function treeToF3DataDownRecurse(
node: FamilyTreeNode,
array: f3Data[],
array: f3.f3Data[],
availableMembers: Set<number>
) {
if (!availableMembers.has(node.member.id)) return;

View File

@ -13,6 +13,7 @@ import { downloadBlob } from "../../utils/files_utils";
import { getTextWidth } from "../../utils/render_utils";
import "./simpletree.css";
import "./Roboto-normal";
import "svg2pdf.js";
const FACE_WIDTH = 60;
const FACE_HEIGHT = 70;
@ -92,7 +93,8 @@ function buildSimpleTreeNode(
): SimpleTreeNode {
if (depth === 0) throw new Error("Too much recursion reached!");
const lastCouple = tree.couples?.[tree.couples?.length - 1 ?? 0];
const lastCoupleId = tree.couples?.length ?? 1;
const lastCouple = tree.couples?.[lastCoupleId - 1];
// Preprocess children
let childrenToProcess = tree.down;