diff --git a/frontend/app/src/components/AuthModal.tsx b/frontend/app/src/components/AuthModal.tsx index f66b94f..ca64c86 100644 --- a/frontend/app/src/components/AuthModal.tsx +++ b/frontend/app/src/components/AuthModal.tsx @@ -20,12 +20,13 @@ const AuthModal = (props: { const [current, setCurrent] = useState("login"); const messageApi = useContext(MessageContext); - const { data, isFetching, isError } = useGetUserQuery({}); - useEffect(() => { - if (!isFetching && !isError) { - store.dispatch(updateUser(data)); - } - }, [data]); + // const { data, refetch, isFetching, isError } = useGetUserQuery({}); + // useEffect(() => { + // console.log(data); + // if (!isFetching && !isError) { + // store.dispatch(updateUser(data)); + // } + // }, [data, isFetching, useGetUserQuery]); const [loginUser, { isLoading: isLoggingIn }] = useLoginMutation(); const [registerUser, { isLoading: isRegistering }] = useRegisterMutation(); @@ -50,7 +51,6 @@ const AuthModal = (props: { password: string; password2: string; }) => { - console.log(formData); registerUser(formData) .unwrap() .then(() => props.setOpen(false)) diff --git a/frontend/app/src/components/HeaderComponent.tsx b/frontend/app/src/components/HeaderComponent.tsx index 675668a..8e9e229 100644 --- a/frontend/app/src/components/HeaderComponent.tsx +++ b/frontend/app/src/components/HeaderComponent.tsx @@ -4,16 +4,25 @@ import React, { useEffect, useState } from "react"; import AuthModal from "./AuthModal"; import "./styles.css"; import { getLocalToken, store, updateUser } from "../config/store"; -import { useGetUserQuery } from "../slice/AuthApi"; +import { User, useGetUserQuery } from "../slice/AuthApi"; const { Header } = Layout; +type NullableUser = { name: string | null; username: string } | null; + const HeaderComponent = () => { const [authModalOpen, setAuthModalOpen] = useState(false); store.dispatch(getLocalToken()); + const user: NullableUser = store.getState().auth.user; - const user = store.getState().auth.user; - console.log(user); + // useEffect(() => { + // console.log(data); + // if (!isFetching && !isError) { + // store.dispatch(updateUser(data)); + // } + // }, [data, isFetching, useGetUserQuery]); + + console.log(store.getState()); const items: MenuProps["items"] = [ { diff --git a/frontend/app/src/components/authProvider.ts b/frontend/app/src/components/authProvider.ts new file mode 100644 index 0000000..d711505 --- /dev/null +++ b/frontend/app/src/components/authProvider.ts @@ -0,0 +1,15 @@ +import { useEffect } from "react"; +import { useGetUserQuery } from "../slice/AuthApi"; +import { store, updateUser } from "../config/store"; + +const authProvider = () => { + const { data, isFetching, isError } = useGetUserQuery({}); + useEffect(() => { + console.log(data); + if (!isFetching && !isError) { + store.dispatch(updateUser(data)); + } + }, [data, isFetching, useGetUserQuery]); +}; + +export default authProvider;