temp fix
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -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()),
|
||||||
|
|||||||
@@ -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 (
|
||||||
|
|||||||
@@ -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 (
|
||||||
|
|||||||
@@ -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 (
|
||||||
|
|||||||
@@ -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';
|
||||||
|
|||||||
Reference in New Issue
Block a user