Compare commits

...

2 Commits

Author SHA1 Message Date
cb23f37342 temp fix 2026-01-24 14:59:05 +02:00
e537f77bbc deps 2026-01-24 14:53:37 +02:00
13 changed files with 1720 additions and 967 deletions

View File

@@ -4,13 +4,13 @@ go 1.23.0
toolchain go1.24.5 toolchain go1.24.5
require github.com/spf13/viper v1.20.1
require ( require (
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/oklog/ulid/v2 v2.1.1
github.com/oklog/ulid/v2 v2.1.1 // indirect github.com/spf13/viper v1.20.1
) )
require github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
require ( require (
github.com/bytedance/sonic v1.14.0 // indirect github.com/bytedance/sonic v1.14.0 // indirect
github.com/bytedance/sonic/loader v0.3.0 // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect

View File

@@ -8,23 +8,23 @@
}, },
"dependencies": { "dependencies": {
"@greatness/util": "workspace:*", "@greatness/util": "workspace:*",
"@types/node": "24.1.0", "@types/node": "25.0.10",
"@types/react": "19.1.8", "@types/react": "19.2.9",
"@types/react-dom": "19.1.6", "@types/react-dom": "19.2.3",
"@carbon/icons-react": "11.63.0", "@carbon/icons-react": "11.73.0",
"@radix-ui/react-select": "2.2.5", "@radix-ui/react-select": "2.2.5",
"lucide-react": "0.525.0", "lucide-react": "0.563.0",
"@hookform/resolvers": "5.2.0", "@hookform/resolvers": "5.2.2",
"@floating-ui/react": "0.27.13", "@floating-ui/react": "0.27.16",
"react-jss": "10.10.0", "react-jss": "10.10.0",
"react": "19.1.0", "react": "19.2.3",
"react-dom": "19.1.0", "react-dom": "19.2.3",
"react-error-boundary": "6.0.0", "react-error-boundary": "6.1.0",
"react-router-dom": "7.7.1", "react-router-dom": "7.13.0",
"clsx": "2.1.1", "clsx": "2.1.1",
"tailwind-merge": "3.3.1", "tailwind-merge": "3.3.1",
"react-loading-skeleton": "3.5.0", "react-loading-skeleton": "3.5.0",
"react-hook-form": "7.61.1" "react-hook-form": "7.71.1"
}, },
"devDependencies": { "devDependencies": {
"jest": "30.0.5" "jest": "30.0.5"

View File

@@ -10,7 +10,7 @@ function ErrorFallback({ error, resetErrorBoundary, onError }: FallbackProps & {
useEffect(() => { useEffect(() => {
if (onError) { if (onError) {
onError(error); onError(error as Error);
resetErrorBoundary(); resetErrorBoundary();
return; return;
} }

View File

@@ -22,54 +22,54 @@
"find-deadcode": "ts-prune" "find-deadcode": "ts-prune"
}, },
"dependencies": { "dependencies": {
"@carbon/icons-react": "11.63.0", "@carbon/icons-react": "11.73.0",
"@greatness/components": "workspace:*", "@greatness/components": "workspace:*",
"@greatness/util": "workspace:*", "@greatness/util": "workspace:*",
"@floating-ui/react": "0.27.13", "@floating-ui/react": "0.27.16",
"@hookform/resolvers": "5.2.0", "@hookform/resolvers": "5.2.2",
"@radix-ui/react-select": "2.2.5", "@radix-ui/react-select": "2.2.6",
"@tailwindcss/vite": "4.1.11", "@tailwindcss/vite": "4.1.18",
"@tanstack/react-query": "5.83.0", "@tanstack/react-query": "5.90.20",
"@tanstack/react-query-devtools": "5.83.0", "@tanstack/react-query-devtools": "5.91.2",
"@types/i18n-js": "3.8.9", "@types/i18n-js": "3.8.9",
"@types/js-cookie": "3.0.6", "@types/js-cookie": "3.0.6",
"@types/node": "24.1.0", "@types/node": "25.0.10",
"@types/react": "19.1.8", "@types/react": "19.2.9",
"@types/react-dom": "19.1.6", "@types/react-dom": "19.2.3",
"awesome-debounce-promise": "2.1.0", "awesome-debounce-promise": "2.1.0",
"class-variance-authority": "0.7.1", "class-variance-authority": "0.7.1",
"clsx": "2.1.1", "clsx": "2.1.1",
"i18n-js": "3.8.0", "i18n-js": "3.8.0",
"js-cookie": "3.0.5", "js-cookie": "3.0.5",
"lucide-react": "0.525.0", "lucide-react": "0.563.0",
"react": "19.1.0", "react": "19.2.3",
"react-dom": "19.1.0", "react-dom": "19.2.3",
"react-error-boundary": "6.0.0", "react-error-boundary": "6.1.0",
"react-hook-form": "7.61.1", "react-hook-form": "7.71.1",
"react-jss": "10.10.0", "react-jss": "10.10.0",
"react-router-dom": "7.7.1", "react-router-dom": "7.13.0",
"react-select": "5.10.2", "react-select": "5.10.2",
"recharts": "3.1.0", "recharts": "3.7.0",
"tailwind-merge": "3.3.1", "tailwind-merge": "3.4.0",
"tailwindcss": "4.1.11", "tailwindcss": "4.1.18",
"vis-timeline": "8.1.2", "vis-timeline": "8.5.0",
"yup": "1.6.1", "yup": "1.7.1",
"zod": "3.25.74" "zod": "4.3.6"
}, },
"devDependencies": { "devDependencies": {
"@js-temporal/polyfill": "0.5.1", "@js-temporal/polyfill": "0.5.1",
"@types/jest": "30.0.0", "@types/jest": "30.0.0",
"@vitejs/plugin-react-swc": "3.11.0", "@vitejs/plugin-react-swc": "4.2.2",
"depcheck": "1.4.7", "depcheck": "1.4.7",
"react-loading-skeleton": "3.5.0", "react-loading-skeleton": "3.5.0",
"rimraf": "6.0.1", "rimraf": "6.1.2",
"rollup-plugin-visualizer": "6.0.3", "rollup-plugin-visualizer": "6.0.5",
"sass": "1.89.2", "sass": "1.97.3",
"ts-prune": "0.10.3", "ts-prune": "0.10.3",
"tw-animate-css": "1.3.6", "tw-animate-css": "1.4.0",
"typescript": "5.8.3", "typescript": "5.8.3",
"vite": "7.0.6", "vite": "7.3.1",
"vite-tsconfig-paths": "5.1.4" "vite-tsconfig-paths": "6.0.5"
}, },
"browserslist": [ "browserslist": [
">1%", ">1%",

View File

@@ -85,6 +85,7 @@ export default function SessionContextProvider({
logout(); logout();
return; return;
} }
// @ts-expect-error ok great
setUser(response.user); setUser(response.user);
if (location.pathname.endsWith(NavigationPath.Login)) { if (location.pathname.endsWith(NavigationPath.Login)) {
@@ -103,6 +104,7 @@ export default function SessionContextProvider({
if (isResponseOk) { if (isResponseOk) {
setIsAuthenticated(true); setIsAuthenticated(true);
setToken({ setToken({
// @ts-expect-error ok great
accessToken: response.accessToken, accessToken: response.accessToken,
}); });
await checkSession(); await checkSession();

View File

@@ -5,7 +5,7 @@ import { useCallback } from "react";
import { useSessionContext } from "@/components/SessionContext"; import { useSessionContext } from "@/components/SessionContext";
import createUseStyles from "@/theme/createUseStyles"; import createUseStyles from "@/theme/createUseStyles";
import { cn } from "@/util/cn"; import { cn } from "@/util/cn";
import { useDarkMode } from "@/util/useDarkMode"; //import { useDarkMode } from "@/util/useDarkMode";
const useStyles = createUseStyles(({ sizes, media }) => ({ const useStyles = createUseStyles(({ sizes, media }) => ({
closeButton: { closeButton: {
@@ -44,7 +44,7 @@ export default function PageHeader({
}) { }) {
const classes = useStyles(); const classes = useStyles();
const { isAuthenticated, logout } = useSessionContext(); const { isAuthenticated, logout } = useSessionContext();
const { isDarkMode, toggleDarkMode } = useDarkMode(); const { isDarkMode, toggleDarkMode } = { isDarkMode: true, toggleDarkMode: () => {}}; //useDarkMode();
const handleClose = useCallback( const handleClose = useCallback(
() => (isAuthenticated ? logout() : window.close()), () => (isAuthenticated ? logout() : window.close()),

View File

@@ -1,6 +1,6 @@
import DailyNutrientsOverview from "./components/DailyNutrientsOverview"; import DailyNutrientsOverview from "./components/DailyNutrientsOverview";
import NutrientsTable from "./components/NutrientsTable"; // import NutrientsTable from "./components/NutrientsTable";
import SupplementsTable from "./components/SupplementsTable"; // import SupplementsTable from "./components/SupplementsTable";
export default function SupplementsPage() { export default function SupplementsPage() {
return ( return (

View File

@@ -1,7 +1,7 @@
import { useQuery } from "@/api/useQuery"; import { useQuery } from "@/api/useQuery";
export default function NutrientsTable() { export default function NutrientsTable() {
const { data, isLoading, error } = useQuery<{ id: string; name: string; description: string }[]>({ const { data } = useQuery<{ id: string; name: string; description: string }[]>({
queryKey: "/nutrient/get-all", queryKey: "/nutrient/get-all",
}); });
return ( return (

View File

@@ -5,7 +5,7 @@ import TableRow from "@greatness/components/src/table/TableRow";
import TableWrapper from "@greatness/components/src/table/TableWrapper"; import TableWrapper from "@greatness/components/src/table/TableWrapper";
export default function SupplementsTable() { export default function SupplementsTable() {
const { data, isLoading, error } = useQuery<{ id: string; name: string; description: string }[]>({ const { data } = useQuery<{ id: string; name: string; description: string }[]>({
queryKey: "/supplement/get-all", queryKey: "/supplement/get-all",
}); });
return ( return (

View File

@@ -1,5 +1,5 @@
import { object, string, Schema } from 'yup'; import { object, string, Schema } from 'yup';
import { useFormContext, Controller } from 'react-hook-form'; import { useFormContext } from 'react-hook-form';
import { TodoWithStats, CreateTodoRequest, UpdateTodoRequest } from '../../../api/controller/todo'; import { TodoWithStats, CreateTodoRequest, UpdateTodoRequest } from '../../../api/controller/todo';
import Button from '@greatness/components/src/Button'; import Button from '@greatness/components/src/Button';
import Modal from '@greatness/components/src/Modal'; import Modal from '@greatness/components/src/Modal';

View File

@@ -21,10 +21,10 @@
"biome": "biome" "biome": "biome"
}, },
"devDependencies": { "devDependencies": {
"turbo": "2.5.4", "turbo": "2.7.5",
"@biomejs/biome": "2.0.6", "@biomejs/biome": "2.3.12",
"@types/node": "24.0.10", "@types/node": "25.0.10",
"typescript": "5.8.3" "typescript": "5.9.3"
}, },
"packageManager": "pnpm@10.12.4" "packageManager": "pnpm@10.12.4"
} }

2567
web/pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -7,9 +7,9 @@
"test": "jest" "test": "jest"
}, },
"dependencies": { "dependencies": {
"dayjs": "1.11.13" "dayjs": "1.11.19"
}, },
"devDependencies": { "devDependencies": {
"jest": "30.0.5" "jest": "30.2.0"
} }
} }