Need to refresh to file upload

backend/src/resolvers/FileResolver.ts

@@ -16,6 +16,8 @@ class FileResolver {
 	@Query(() => [File])
 	async getUserAccessSharedFiles(@Ctx() context: Context) {
 
+		console.log(context.id)
+
 		return await File.createQueryBuilder("file")
 			.leftJoin("file.users_with_access", "user")
 			.where("user.id = :userId", {userId: context.id})

backend/src/resolvers/UserResolver.ts

@@ -56,7 +56,7 @@ class UserResolver {
 		return "You have successfully signed up!"
 	}
 
-	@Mutation(() => UserInfo)
+	@Mutation(() => String)
 	async login(
 		@Arg("email") emailFromClient: string,
 		@Arg("password") passwordFromClient: string,
@@ -93,13 +93,7 @@ class UserResolver {
 
 			context.res.setHeader("Set-Cookie", serializedCookie);
 
-			return {
-				email: userFromDB.email,
-				role: userFromDB.role,
-				firstname: userFromDB.firstname,
-				lastname: userFromDB.lastname,
-				isLoggedIn: true,
-			};
+			return "User logged in";
 
 		} catch (err) {
 			if (err instanceof EntityNotFoundError || err instanceof AuthenticationError) {
@@ -148,6 +142,8 @@ class UserResolver {
 			throw new Error("User not authenticated");
 		}
 
+		console.log(context.id)
+
 		const user = await User.findOne({
 			where: {id: context.id},
 			relations: ['uploads', 'uploads.files'],

frontend/src/App.tsx

@@ -10,7 +10,6 @@ import PricingPage from "./pages/PricingPage.tsx";
 import BillingPage from "./pages/BillingPage.tsx";
 import VisitorDownloadPage from "./pages/VisitorDownloadPage.tsx";
 import {FC} from "react";
-import {UserProvider, useUserContext} from "./context/UserContext.tsx";
 
 interface ProtectedRouteProps {
 	isLoggedIn: boolean;
@@ -28,14 +27,13 @@ const ProtectedRoute = ({isLoggedIn, children}: ProtectedRouteProps) => {
 
 const App: FC = () => {
 	return (
-		<UserProvider>
-			<MainLayout/>
-		</UserProvider>
+		// <UserProvider>
+		<MainLayout/>
+		// </UserProvider>
 	);
 };
 
 const MainLayout: FC = () => {
-	const {isLoggedIn} = useUserContext()
 
 	const router = createBrowserRouter([
 		{path: "/", element: <LandingPage/>},
@@ -56,7 +54,7 @@ const MainLayout: FC = () => {
 			children: [
 				{
 					index: true,
-					element: <ProtectedRoute isLoggedIn={isLoggedIn}><Dashboard/></ProtectedRoute>
+					element: <ProtectedRoute isLoggedIn={true}><Dashboard/></ProtectedRoute>
 				},
 				{path: "settings", element: <SettingsPage/>},
 				{path: "billing", element: <BillingPage/>},

frontend/src/components/Signin/SignInForm.tsx

@@ -5,19 +5,16 @@ import {LOGIN_MUTATION} from "../../graphql/mutations.ts";
 import {useNavigate} from 'react-router-dom'
 import {ApolloError, useMutation} from "@apollo/client";
 import styled from "@emotion/styled";
-import {useUserContext} from "../../context/UserContext.tsx";
 
 const {Item} = Form
 
 const SignInForm: React.FC = () => {
 	const [notifApi, contextHolder] = notification.useNotification()
 	const navigate = useNavigate()
-	const {setUser} = useUserContext()
 
 
 	const [login, {loading, error}] = useMutation(LOGIN_MUTATION, {
 		onCompleted: (data) => {
-			setUser(data.login)
 			navigate("/dashboard");
 		},
 		onError: (error: ApolloError) => {

frontend/src/components/user/UserLayout.tsx

@@ -6,21 +6,12 @@ import {DashboardOutlined, DollarOutlined, LogoutOutlined, SettingOutlined} from
 import {Link, Outlet, useNavigate} from "react-router-dom";
 import {ApolloError, useMutation} from '@apollo/client';
 import {LOGOUT} from "../../graphql/mutations.ts";
-import {useUserContext} from "../../context/UserContext.tsx";
 
 const UserLayout: FC = () => {
 	const navigate = useNavigate();
-	const {setUser, firstname} = useUserContext()
 
 	const [logout] = useMutation(LOGOUT, {
 		onCompleted: () => {
-			setUser({
-				isLoggedIn: false,
-				role: '',
-				firstname: '',
-				lastname: '',
-				email: '',
-			})
 			navigate('/');
 		},
 		onError: (err: ApolloError) => {
@@ -66,7 +57,7 @@ const UserLayout: FC = () => {
 						backgroundColor: '#fde3cf',
 						color: '#f56a00',
 						cursor: 'pointer'
-					}}>{firstname.charAt(0).toUpperCase()}</Avatar>
+					}}>U</Avatar>
 				</Dropdown>
 			</HeaderContainer>
 			<Outlet/>

frontend/src/context/UserContext.tsx

@@ -1,4 +1,4 @@
-import React, {createContext, FC, ReactNode, useContext, useEffect, useState} from 'react';
+import React, {createContext, FC, ReactNode, useContext, useState} from 'react';
 
 interface UserContextType {
 	isLoggedIn: boolean;
@@ -21,10 +21,6 @@ export const UserProvider: FC<{ children: ReactNode }> = ({children}) => {
 		setUser: (userData) => setUser((prev) => ({...prev, ...userData})),
 	});
 
-	useEffect(() => {
-		console.log(user)
-	}, [user]);
-
 	return <UserContext.Provider value={user}>{children}</UserContext.Provider>;
 };
 

frontend/src/graphql/mutations.ts

@@ -9,13 +9,7 @@ export const SIGN_UP_USER = gql`
 
 export const LOGIN_MUTATION = gql`
     mutation Login($email: String!, $password: String!) {
-        login(email: $email, password: $password) {
-         email
-            role
-            firstname
-            lastname
-            isLoggedIn
-        }
+        login(email: $email, password: $password) 
     }
 `;