olly/queueful
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

not working shit

Browse Source
This commit is contained in:
Olly Hearn
2024-04-09 14:55:31 +03:00
parent afbb1253ee
commit 90f37bd595
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/app/src/components/AuthModal.tsx
View File

@ -20,12 +20,13 @@ const AuthModal = (props: {
const [current, setCurrent] = useState("login"); const [current, setCurrent] = useState("login");
const messageApi = useContext(MessageContext); const messageApi = useContext(MessageContext);
const { data, isFetching, isError } = useGetUserQuery({}); // const { data, refetch, isFetching, isError } = useGetUserQuery({});
useEffect(() => { // useEffect(() => {
if (!isFetching && !isError) { // console.log(data);
store.dispatch(updateUser(data)); // if (!isFetching && !isError) {
} // store.dispatch(updateUser(data));
}, [data]); // }
// }, [data, isFetching, useGetUserQuery]);
const [loginUser, { isLoading: isLoggingIn }] = useLoginMutation(); const [loginUser, { isLoading: isLoggingIn }] = useLoginMutation();
const [registerUser, { isLoading: isRegistering }] = useRegisterMutation(); const [registerUser, { isLoading: isRegistering }] = useRegisterMutation();
@ -50,7 +51,6 @@ const AuthModal = (props: {
password: string; password: string;
password2: string; password2: string;
}) => { }) => {
console.log(formData);
registerUser(formData) registerUser(formData)
.unwrap() .unwrap()
.then(() => props.setOpen(false)) .then(() => props.setOpen(false))

15
frontend/app/src/components/HeaderComponent.tsx
View File

@ -4,16 +4,25 @@ import React, { useEffect, useState } from "react";
import AuthModal from "./AuthModal"; import AuthModal from "./AuthModal";
import "./styles.css"; import "./styles.css";
import { getLocalToken, store, updateUser } from "../config/store"; import { getLocalToken, store, updateUser } from "../config/store";
import { useGetUserQuery } from "../slice/AuthApi"; import { User, useGetUserQuery } from "../slice/AuthApi";
const { Header } = Layout; const { Header } = Layout;
type NullableUser = { name: string | null; username: string } | null;
const HeaderComponent = () => { const HeaderComponent = () => {
const [authModalOpen, setAuthModalOpen] = useState(false); const [authModalOpen, setAuthModalOpen] = useState(false);
store.dispatch(getLocalToken()); store.dispatch(getLocalToken());
const user: NullableUser = store.getState().auth.user;
const user = store.getState().auth.user; // useEffect(() => {
console.log(user); // console.log(data);
// if (!isFetching && !isError) {
// store.dispatch(updateUser(data));
// }
// }, [data, isFetching, useGetUserQuery]);
console.log(store.getState());
const items: MenuProps["items"] = [ const items: MenuProps["items"] = [
{ {

15
frontend/app/src/components/authProvider.ts Normal file
View File

@ -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;