Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f7ddab2510 |
1151
package-lock.json
generated
1151
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -12,15 +12,15 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tanstack/react-query": "^5.71.0",
|
"@tanstack/react-query": "^5.71.0",
|
||||||
"@tanstack/react-table": "^8.21.2",
|
"@tanstack/react-table": "^8.21.2",
|
||||||
"react": "^19.0.0",
|
"react": "^18.0.0",
|
||||||
"react-debounce-input": "^3.3.0",
|
"react-debounce-input": "^3.3.0",
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "^18.0.0",
|
||||||
"react-router": "^7.4.0"
|
"react-router": "^7.4.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.21.0",
|
"@eslint/js": "^9.21.0",
|
||||||
"@types/react": "^19.0.10",
|
"@types/react": "^18.0.10",
|
||||||
"@types/react-dom": "^19.0.4",
|
"@types/react-dom": "^18.0.4",
|
||||||
"@vitejs/plugin-react": "^4.3.4",
|
"@vitejs/plugin-react": "^4.3.4",
|
||||||
"eslint": "^9.21.0",
|
"eslint": "^9.21.0",
|
||||||
"eslint-plugin-react-hooks": "^5.1.0",
|
"eslint-plugin-react-hooks": "^5.1.0",
|
||||||
|
|||||||
@ -4,17 +4,13 @@ import { createRoot } from "react-dom/client";
|
|||||||
import { RouterProvider } from "react-router";
|
import { RouterProvider } from "react-router";
|
||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { router } from "./routes.ts";
|
import { router } from "./routes.ts";
|
||||||
import { loader as categoriesLoader } from "./routes/categories";
|
|
||||||
import { CategoryContext } from "./store/CategoryContext.ts";
|
|
||||||
|
|
||||||
const queryClient = new QueryClient();
|
const queryClient = new QueryClient();
|
||||||
|
|
||||||
createRoot(document.getElementById("root")!).render(
|
createRoot(document.getElementById("root")!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<CategoryContext value={await categoriesLoader()}>
|
<RouterProvider router={router} />
|
||||||
<RouterProvider router={router} />
|
|
||||||
</CategoryContext>
|
|
||||||
</QueryClientProvider>
|
</QueryClientProvider>
|
||||||
</StrictMode>
|
</StrictMode>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -1,18 +1,16 @@
|
|||||||
import { useLoaderData } from "react-router";
|
import { useLoaderData } from "react-router";
|
||||||
|
|
||||||
type Category = {
|
export async function loader() {
|
||||||
name: string;
|
return await fetch(`http://localhost:9000/categories`).then((response) => {
|
||||||
group: { name: string } | undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
export async function loader(): Promise<Category[]> {
|
|
||||||
return fetch(`http://localhost:9000/categories`).then((response) => {
|
|
||||||
return response.json();
|
return response.json();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function Categories() {
|
export default function Categories() {
|
||||||
const data = useLoaderData<typeof loader>();
|
const data: {
|
||||||
|
name: string;
|
||||||
|
group: { name: string } | undefined;
|
||||||
|
}[] = useLoaderData<typeof loader>();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<table>
|
<table>
|
||||||
|
|||||||
@ -7,13 +7,8 @@ import {
|
|||||||
PaginationState,
|
PaginationState,
|
||||||
useReactTable,
|
useReactTable,
|
||||||
} from "@tanstack/react-table";
|
} from "@tanstack/react-table";
|
||||||
<<<<<<< HEAD
|
import { useState } from "react";
|
||||||
import { useContext, useMemo, useState } from "react";
|
|
||||||
=======
|
|
||||||
import { useContext, useState, useMemo } from "react";
|
|
||||||
>>>>>>> 43722c0 (feat: send description before category in loader)
|
|
||||||
import { DebounceInput } from "react-debounce-input";
|
import { DebounceInput } from "react-debounce-input";
|
||||||
import { CategoryContext } from "../store/CategoryContext";
|
|
||||||
|
|
||||||
const PageSize = 30;
|
const PageSize = 30;
|
||||||
|
|
||||||
@ -25,16 +20,11 @@ type Transaction = {
|
|||||||
category: string;
|
category: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
async function loader(
|
async function loader(page = 0, category: string | undefined = "") {
|
||||||
page = 0,
|
|
||||||
description: string | undefined = "",
|
|
||||||
category: string | undefined = ""
|
|
||||||
) {
|
|
||||||
const url = new URL("http://localhost:9000/transactions");
|
const url = new URL("http://localhost:9000/transactions");
|
||||||
url.search = new URLSearchParams({
|
url.search = new URLSearchParams({
|
||||||
limit: String(PageSize),
|
limit: String(PageSize),
|
||||||
offset: String(page * PageSize),
|
offset: String(page * PageSize),
|
||||||
...(description !== "" && { description: description }),
|
|
||||||
...(category !== "" && { category: category }),
|
...(category !== "" && { category: category }),
|
||||||
}).toString();
|
}).toString();
|
||||||
|
|
||||||
@ -48,42 +38,20 @@ async function loader(
|
|||||||
|
|
||||||
const columnHelper = createColumnHelper<Transaction>();
|
const columnHelper = createColumnHelper<Transaction>();
|
||||||
|
|
||||||
|
const columns = [
|
||||||
|
columnHelper.accessor("date", {
|
||||||
|
enableColumnFilter: false,
|
||||||
|
}),
|
||||||
|
columnHelper.accessor("description", {
|
||||||
|
enableColumnFilter: false,
|
||||||
|
}),
|
||||||
|
columnHelper.accessor("value", {
|
||||||
|
enableColumnFilter: false,
|
||||||
|
}),
|
||||||
|
columnHelper.accessor("category", {}),
|
||||||
|
];
|
||||||
|
|
||||||
export default function Transactions() {
|
export default function Transactions() {
|
||||||
const categories = useContext(CategoryContext);
|
|
||||||
|
|
||||||
const columns = useMemo(
|
|
||||||
() => [
|
|
||||||
columnHelper.accessor("date", {
|
|
||||||
header: "Date",
|
|
||||||
enableColumnFilter: false,
|
|
||||||
}),
|
|
||||||
columnHelper.accessor("description", {
|
|
||||||
header: "Description",
|
|
||||||
enableColumnFilter: true,
|
|
||||||
}),
|
|
||||||
columnHelper.accessor("value", {
|
|
||||||
header: "Value",
|
|
||||||
enableColumnFilter: false,
|
|
||||||
}),
|
|
||||||
columnHelper.accessor("category", {
|
|
||||||
header: "Category",
|
|
||||||
cell: (props) => {
|
|
||||||
console.log(props.getValue());
|
|
||||||
return (
|
|
||||||
<select value={props.getValue()}>
|
|
||||||
{categories.map((category) => (
|
|
||||||
<option key={category.name} value={category.name}>
|
|
||||||
{category.name}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
[categories]
|
|
||||||
);
|
|
||||||
|
|
||||||
const [pagination, setPagination] = useState<PaginationState>({
|
const [pagination, setPagination] = useState<PaginationState>({
|
||||||
pageIndex: 0,
|
pageIndex: 0,
|
||||||
pageSize: PageSize,
|
pageSize: PageSize,
|
||||||
@ -95,15 +63,11 @@ export default function Transactions() {
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// track description filter separately (or use table filter for description)
|
|
||||||
const [descriptionFilter, setDescriptionFilter] = useState("");
|
|
||||||
|
|
||||||
const { data, isPending, isError } = useQuery({
|
const { data, isPending, isError } = useQuery({
|
||||||
queryKey: ["transactions", pagination.pageIndex, columnFilters, descriptionFilter],
|
queryKey: ["transactions", pagination.pageIndex, columnFilters],
|
||||||
queryFn: () =>
|
queryFn: () =>
|
||||||
loader(
|
loader(
|
||||||
pagination.pageIndex,
|
pagination.pageIndex,
|
||||||
descriptionFilter,
|
|
||||||
columnFilters.find((filter) => filter.id == "category")!.value as string
|
columnFilters.find((filter) => filter.id == "category")!.value as string
|
||||||
),
|
),
|
||||||
placeholderData: keepPreviousData,
|
placeholderData: keepPreviousData,
|
||||||
@ -122,7 +86,6 @@ export default function Transactions() {
|
|||||||
pagination,
|
pagination,
|
||||||
columnFilters,
|
columnFilters,
|
||||||
},
|
},
|
||||||
debugTable: true,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (isPending) {
|
if (isPending) {
|
||||||
@ -151,13 +114,9 @@ export default function Transactions() {
|
|||||||
<div>
|
<div>
|
||||||
<DebounceInput
|
<DebounceInput
|
||||||
debounceTimeout={275}
|
debounceTimeout={275}
|
||||||
onChange={(e) => {
|
onChange={(e) =>
|
||||||
if (header.column.id === "description") {
|
header.column.setFilterValue(e.target.value)
|
||||||
setDescriptionFilter(e.target.value);
|
}
|
||||||
} else {
|
|
||||||
header.column.setFilterValue(e.target.value);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|||||||
@ -1,8 +0,0 @@
|
|||||||
import { createContext } from "react";
|
|
||||||
|
|
||||||
type Category = {
|
|
||||||
name: string;
|
|
||||||
group: { name: string } | undefined;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const CategoryContext = createContext<Category[]>([]);
|
|
||||||
Loading…
x
Reference in New Issue
Block a user