diff --git a/backend/src/resolvers/UploadResolver.ts b/backend/src/resolvers/UploadResolver.ts
index d4375c2..2a801e2 100644
--- a/backend/src/resolvers/UploadResolver.ts
+++ b/backend/src/resolvers/UploadResolver.ts
@@ -1,13 +1,11 @@
-import { Upload } from "../entities/upload";
-import { Arg, Authorized, Mutation, Query, Resolver } from "type-graphql";
-import { Visitor } from "../entities/visitor";
-import { User } from "../entities/user";
-import { File } from "../entities/file";
-import {
-	createDownloadToken,
-	generateDownloadLink,
-} from "../helpers/linkGenerator";
+import {Upload} from "../entities/upload";
+import {Arg, Authorized, Ctx, Mutation, Query, Resolver} from "type-graphql";
+import {Visitor} from "../entities/visitor";
+import {User} from "../entities/user";
+import {File} from "../entities/file";
+import {createDownloadToken, generateDownloadLink,} from "../helpers/linkGenerator";
 import jwt from "jsonwebtoken";
+import {Context} from "../index";
 
 @Resolver(Upload)
 class UploadResolver {
@@ -17,20 +15,13 @@ class UploadResolver {
 	}
 
 	@Query(() => [Upload])
-	async getUploadsByUserId(@Arg("userId") userId: number) {
-		const user = await User.findOneByOrFail({ id: userId });
-
-		if (!user) {
-			throw new Error("User not found");
-		}
-
+	async getUploadsByUserId(@Ctx() context: Context) {
 		try {
-			const result = await Upload.find({
-				where: { user: { id: userId } },
+			//@ts-ignore
+			return await Upload.find({
+				where: {user: {id: context.id}},
 				relations: ["files"],
 			});
-
-			return result;
 		} catch (err) {
 			throw new Error("Internal server error");
 		}
@@ -39,7 +30,7 @@ class UploadResolver {
 	@Authorized()
 	@Mutation(() => String)
 	async changeUploadActivatedStatus(@Arg("uploadId") uploadId: number) {
-		const upload = await Upload.findOneByOrFail({ id: uploadId });
+		const upload = await Upload.findOneByOrFail({id: uploadId});
 
 		if (!upload) {
 			throw new Error("Upload not found");
@@ -149,7 +140,7 @@ class UploadResolver {
 			console.log(uploadId);
 
 			const upload = await Upload.findOne({
-				where: { id: uploadId },
+				where: {id: uploadId},
 				relations: ["files"],
 			});
 
@@ -172,12 +163,12 @@ class UploadResolver {
 }
 
 const userOrVisitor = async (email: string): Promise<User | Visitor> => {
-	let user: User | null = await User.findOneBy({ email });
+	let user: User | null = await User.findOneBy({email});
 	if (user) return user;
 
-	let visitor: Visitor | null = await Visitor.findOneBy({ email });
+	let visitor: Visitor | null = await Visitor.findOneBy({email});
 	if (!visitor) {
-		visitor = await Visitor.create({ email }).save();
+		visitor = await Visitor.create({email}).save();
 	}
 
 	return visitor;
diff --git a/files/src/controllers/filesController.ts b/files/src/controllers/filesController.ts
index cebd0b7..f11f32a 100644
--- a/files/src/controllers/filesController.ts
+++ b/files/src/controllers/filesController.ts
@@ -1,11 +1,11 @@
 import fs from "fs";
 import path from "path";
 import multer from "multer";
-import { validateFile } from "../validators/fileValidators";
-import { ADD_ONE_UPLOAD } from "../graphql/mutations";
-import { Request } from "express";
+import {validateFile} from "../validators/fileValidators";
+import {ADD_ONE_UPLOAD} from "../graphql/mutations";
+import {Request} from "express";
 import axios from "axios";
-import { v4 as uuidv4 } from "uuid";
+import {v4 as uuidv4} from "uuid";
 import archiver from "archiver";
 
 const UPLOADS_DIR = path.join(__dirname, "../uploads");
@@ -13,15 +13,15 @@ const TEMP_DIR = path.resolve(UPLOADS_DIR, "temp");
 const FINAL_DIR = path.resolve(UPLOADS_DIR, "final");
 
 if (!fs.existsSync(UPLOADS_DIR)) {
-	fs.mkdirSync(UPLOADS_DIR, { recursive: true });
+	fs.mkdirSync(UPLOADS_DIR, {recursive: true});
 }
 
 if (!fs.existsSync(TEMP_DIR)) {
-	fs.mkdirSync(TEMP_DIR, { recursive: true });
+	fs.mkdirSync(TEMP_DIR, {recursive: true});
 }
 
 if (!fs.existsSync(FINAL_DIR)) {
-	fs.mkdirSync(FINAL_DIR, { recursive: true });
+	fs.mkdirSync(FINAL_DIR, {recursive: true});
 }
 
 export const storage = multer.diskStorage({
@@ -31,7 +31,7 @@ export const storage = multer.diskStorage({
 	filename: (req, file, cb) => {
 		const fileUuid = uuidv4();
 		const fileExtension = path.extname(file.originalname);
-		const newFilename = ${fileUuid}${fileExtension};
+		const newFilename = `${fileUuid}${fileExtension}`;
 
 		(file as any).original_name = file.originalname;
 
@@ -39,7 +39,7 @@ export const storage = multer.diskStorage({
 	},
 });
 
-const upload = multer({ storage }).array("files", 10);
+const upload = multer({storage}).array("files", 10);
 
 // This function works but it's WAY too long, we will need to refactor it someday
 export const addNewUpload = async (req: Request, res: any) => {
@@ -58,7 +58,7 @@ export const addNewUpload = async (req: Request, res: any) => {
 		for (const file of filesArray) {
 			const fileUuid = uuidv4();
 			const fileExtension = path.extname(file.originalname);
-			const fileFinalName = ${fileUuid}${fileExtension};
+			const fileFinalName = `${fileUuid}${fileExtension}`;
 			const tempPath = file.path;
 			const finalPath = path.join(FINAL_DIR, fileFinalName);
 
@@ -124,7 +124,7 @@ export const deleteFile = async (req: Request, res: any) => {
 	const filePath = path.join(FINAL_DIR, filename as string);
 
 	if (!fs.existsSync(filePath)) {
-		return res.status(404).send(File not found.);
+		return res.status(404).send(`File not found.`);
 	}
 
 	// fs.unlinkSync deletes the file
@@ -144,7 +144,7 @@ export const downloadFiles = async (req: Request, res: any) => {
 	res.setHeader("Content-Type", "application/zip");
 	res.attachment("files.zip");
 
-	const archive = archiver("zip", { zlib: { level: 9 } });
+	const archive = archiver("zip", {zlib: {level: 9}});
 
 	archive.on("error", (err) => {
 		res.status(500).send("Error creating ZIP archive.");
@@ -155,9 +155,9 @@ export const downloadFiles = async (req: Request, res: any) => {
 	for (const file of files) {
 		const filePath = path.join(FILES_DIR, file);
 		if (fs.existsSync(filePath)) {
-			archive.file(filePath, { name: file });
+			archive.file(filePath, {name: file});
 		} else {
-			console.warn(File not found: ${file});
+			console.warn(`File not found: ${file}`);
 		}
 	}
 
@@ -170,7 +170,7 @@ export const downloadFiles = async (req: Request, res: any) => {
 
 export const getOneFile = (req: Request, res: any) => {
 	try {
-		const { fileDefaultName } = req.body;
+		const {fileDefaultName} = req.body;
 
 		console.log(fileDefaultName);
 
@@ -189,7 +189,7 @@ export const getOneFile = (req: Request, res: any) => {
 		res.setHeader("Content-Type", "application/octet-stream");
 		res.setHeader(
 			"Content-Disposition",
-			inline; filename="${path.basename(fullPath)}"
+			`inline; filename="${path.basename(fullPath)}"`
 		);
 
 		const fileStream = fs.createReadStream(fullPath);
diff --git a/frontend/src/components/user/dashboard/MyUploads.tsx b/frontend/src/components/user/dashboard/MyUploads.tsx
new file mode 100644
index 0000000..e00a917
--- /dev/null
+++ b/frontend/src/components/user/dashboard/MyUploads.tsx
@@ -0,0 +1,279 @@
+import React, {FC, useState} from "react";
+import {Button, Form, Input, message, Modal, Result, Select, Table} from "antd";
+import {useMutation, useQuery} from "@apollo/client";
+import {GET_UPLOAD_BY_USER} from "../../../graphql/queries.ts";
+import {Upload} from "../../../types/upload";
+import {
+	ADD_FILES_ACCESS_USERS,
+	CHANGE_PRIVACY_STATUS,
+	DELETE_FILE,
+	EDIT_FILE_NAME
+} from "../../../graphql/mutations.ts";
+import {TablesContainer} from "./UserFiles.tsx";
+import {EditOutlined, MailOutlined, SaveOutlined, ShareAltOutlined} from "@ant-design/icons";
+import axios from "axios";
+
+const {Column} = Table
+
+const MyUploads: FC = () => {
+	const {data, loading, error} = useQuery(GET_UPLOAD_BY_USER)
+	const [form] = Form.useForm()
+
+	const [selectedFiles, setSelectedFiles] = useState<OwnTableDatasource[] | []>([])
+	const [openShareModal, setOpenShareModal] = useState<boolean>(false)
+	const [shareSuccess, setShareSuccess] = useState<boolean>(false)
+	const [editableRow, setEditableRow] = useState<number | null>(null)
+	const [filePreview, setFilePreview] = useState<any>(null)
+
+	const [addFilesAccessUsers, {addFilesloading}] = useMutation(ADD_FILES_ACCESS_USERS, {
+		onCompleted(data) {
+			console.log(data)
+			setShareSuccess(true)
+		}, onError(err) {
+			message.error(err.toString(), 3)
+		}
+	})
+
+	const [changeFileStatus] = useMutation(CHANGE_PRIVACY_STATUS, {
+		onError(err) {
+			message.error(err.toString(), 3)
+		}
+	})
+
+	const [deleteFile] = useMutation(DELETE_FILE, {
+		onError(err) {
+			message.error(err.toString(), 3)
+		}
+	})
+
+	const [editFileName] = useMutation(EDIT_FILE_NAME, {
+		onError(err) {
+			message.error(err.toString(), 3)
+		}
+	})
+
+	const handleShareFiles = async (values): Promise<void> => {
+		const filesToArray = selectedFiles.map(file => file.id)
+
+		console.log(values.usersToShareTo)
+
+		await addFilesAccessUsers({
+			variables: {
+				usersToShareTo: values.usersToShareTo,
+				filesId: filesToArray
+			}
+		})
+	}
+
+	const handleChangeStatus = async (fileId, status) => {
+		await changeFileStatus({
+			variables: {
+				id: fileId,
+				status
+			},
+			onCompleted(data) {
+				message.success("File status updated")
+			},
+			refetchQueries: [{query: GET_UPLOAD_BY_USER}]
+		})
+	}
+
+	const handleDeleteFile = async (fileId) => {
+		await deleteFile({
+			variables: {
+				deleteFileId: fileId
+			},
+			onCompleted(data) {
+				message.success("File deleted")
+			},
+			refetchQueries: [{query: GET_UPLOAD_BY_USER}]
+		})
+	}
+
+	const handleSaveFilename = async (fileId, newName) => {
+		await editFileName({
+			variables: {
+				newName,
+				editFileNameId: fileId
+			},
+			onCompleted(data) {
+				message.success("File name updated")
+			},
+			refetchQueries: [{query: GET_UPLOAD_BY_USER}]
+		})
+	}
+
+	const handlePreviewFile = async (fileDefaultName) => {
+		await axios.post(`http://localhost:7002/files/get-one`,
+			{fileDefaultName},
+			{responseType: 'blob'}
+		).then((res) => {
+			console.log(res.data)
+
+			const fileUrl = URL.createObjectURL(res.data)
+			setFilePreview(fileUrl)
+		}).catch(err => console.error(err))
+	}
+
+
+	return (
+		<TablesContainer>
+			<Table
+				title={() => (
+					<Button type='primary'
+					        disabled={selectedFiles.length === 0}
+					        icon={<ShareAltOutlined/>}
+					        onClick={() => setOpenShareModal(true)}
+					>
+						Share selected files
+					</Button>
+				)}
+				loading={loading}
+				style={{width: '100%'}}
+				dataSource={data?.getUploadsByUserId}
+				rowKey={(file) => file.id}
+				pagination={false}
+				expandable={{
+					expandedRowRender: (record: Upload, index, indent, expanded) => (
+						<Table dataSource={record.files}
+						       loading={loading}
+						       style={{width: '100%'}}
+						       rowSelection={{
+							       onSelect: (_record, _selected, selectedRows: OwnTableDatasource[]) => setSelectedFiles(selectedRows),
+							       hideSelectAll: true
+						       }}
+						>
+							<Column key='name' title='Name' dataIndex='name' render={(text, file) => {
+								if (editableRow === file.key) {
+									return (
+										<div style={{
+											display: "flex",
+											justifyContent: "space-between",
+											alignItems: "center"
+										}}>
+											<Input
+												defaultValue={text}
+												onPressEnter={(e) => handleSaveFilename(file.id, (e.target as HTMLInputElement).value)}
+												onBlur={(e) => handleSaveFilename(file.id, (e.target as HTMLInputElement).value)}
+											/>
+											<Button type="text" onClick={() => setEditableRow(null)}>
+												<SaveOutlined/>
+											</Button>
+										</div>
+									);
+								}
+
+								return (
+									<div style={{
+										display: "flex",
+										justifyContent: "space-between",
+										alignItems: "center"
+									}}>
+										{text}
+										<Button type="text" onClick={() => setEditableRow(file.key)}>
+											<EditOutlined/>
+										</Button>
+									</div>
+								);
+							}}/>
+							<Column key='extension' title='Extension' dataIndex='type'/>
+							<Column key='size' title='Size' dataIndex='size'/>
+							<Column key='shared' title='Shared with'/>
+							<Column key='privacy' title='Privacy' dataIndex='privacy_status' render={(text, file) => (
+								<Select
+									style={{width: 100}}
+									defaultValue={text}
+									options={[
+										{
+											label: 'Public',
+											value: 'public'
+										},
+										{
+											label: 'Private',
+											value: 'private'
+										}
+									]}
+									onChange={(value) => handleChangeStatus(file.id, value)}
+								/>
+							)}/>
+
+
+							<Column key='actions' title='Quick Actions' width={170} render={(file) => (
+								<>
+									<Button
+										type='text'
+										onClick={() => handlePreviewFile(file.default_name)}>Preview</Button>
+									<Button
+										type='text'
+										style={{color: 'red'}}
+										onClick={() => handleDeleteFile(file.id)}>Delete</Button>
+								</>
+							)}/>
+						</Table>
+					),
+					rowExpandable: (record) => record.files.length > 0,
+				}}
+			>
+				<Column title='Name' dataIndex='title' key='name'/>
+				<Column title='Creation date' dataIndex='created_at' key='date' render={(text, upload) => (
+					new Date(text).toLocaleString('fr-FR')
+				)}/>
+				<Column title='Receivers' dataIndex='receivers' key='receivers'/>
+			</Table>
+			<Modal open={openShareModal}
+			       onCancel={() => setOpenShareModal(false)}
+			       onOk={() => form.submit()}
+			       title='Share files'
+			       loading={addFilesloading}
+			>
+
+				{shareSuccess ?
+					<Result status='success'/>
+					:
+					<>
+						<Table dataSource={selectedFiles}
+						       pagination={false}
+						       rowHoverable={false}
+						       style={{marginBottom: 50}}
+						>
+							<Column key='name' dataIndex='name' title='Name'/>
+							<Column key='extension' dataIndex='type' title='Extension'/>
+						</Table>
+						<Form form={form} layout='vertical' onFinish={handleShareFiles}>
+							<Form.Item name='usersToShareTo' label='Add users to share with'
+							           rules={[{required: true, message: "Add at least one user"}]}
+							>
+								<Select
+									mode="tags"
+									style={{width: "100%"}}
+									tokenSeparators={[","]}
+									placeholder="Receivers emails"
+									defaultActiveFirstOption={false}
+									suffixIcon={<MailOutlined/>}
+									open={false}
+								/>
+							</Form.Item>
+						</Form>
+					</>
+
+				}
+			</Modal>
+			<Modal
+				open={!!filePreview}
+				closable={true}
+				title='File preview'
+				onCancel={() => setFilePreview(null)}
+				cancelText="Close"
+				okButtonProps={{
+					style: {
+						display: 'none'
+					}
+				}}
+			>
+				<img src={filePreview} alt='Bonjour' width={400}/>
+			</Modal>
+		</TablesContainer>
+	)
+}
+
+export default MyUploads
\ No newline at end of file
diff --git a/frontend/src/components/user/dashboard/UserFiles.tsx b/frontend/src/components/user/dashboard/UserFiles.tsx
index a238fec..43a8f04 100644
--- a/frontend/src/components/user/dashboard/UserFiles.tsx
+++ b/frontend/src/components/user/dashboard/UserFiles.tsx
@@ -1,8 +1,7 @@
 import React from "react";
-import {Tabs} from "antd";
 import styled from "@emotion/styled";
-import UserOwnFilesTable from "./upload files/UserOwnFilesTable.tsx";
 import SharedFilesTable from "./upload files/SharedFilesTable.tsx";
+import MyUploads from "./MyUploads.tsx";
 
 
 const UserFiles: React.FC = () => {
@@ -10,22 +9,7 @@ const UserFiles: React.FC = () => {
 	return (
 		<>
 			<TablesContainer>
-				<Tabs
-					type='card'
-					centered
-					items={[
-						{
-							key: 'myfiles',
-							label: "My Files",
-							children: <UserOwnFilesTable/>
-						},
-						{
-							key: 'shared',
-							label: "My Uploads",
-							// children:
-						}
-					]}
-				/>
+				<MyUploads/>
 			</TablesContainer>
 			<SharedFilesTable/>
 		</>
diff --git a/frontend/src/graphql/queries.ts b/frontend/src/graphql/queries.ts
index 5e6a049..543824d 100644
--- a/frontend/src/graphql/queries.ts
+++ b/frontend/src/graphql/queries.ts
@@ -12,17 +12,42 @@ export const GET_ALL_PLANS = gql`
 `;
 
 export const GET_CONNECTED_USER = gql`
- query GetConnectedUser {
-  getConnectedUser {
-    isLoggedIn
-    email
-    role
-    firstname
-    lastname
-  }
-}
+    query GetConnectedUser {
+        getConnectedUser {
+            isLoggedIn
+            email
+            role
+            firstname
+            lastname
+        }
+    }
 `;
 
+export const GET_UPLOAD_BY_USER = gql`
+    query GetUploadsByUserId {
+        getUploadsByUserId {
+            id
+            title
+            message
+            is_activated
+            receivers
+            created_at
+            updated_at
+            files {
+                id
+                file_uid
+                name
+                default_name
+                path
+                size
+                privacy_status
+                type
+                created_at
+                updated_at
+            }
+        }
+    }`
+
 export const GET_USER_BILLING = gql`
     query GetUserBilling {
         getUserBilling {
@@ -55,13 +80,13 @@ export const GET_USER_FILES = gql`
 
 export const GET_USER_SHARED_FILES = gql`
     query  {
-       getUserAccessSharedFiles {
-			    id
-			    name
-			    path
-			    size
-			    privacy_status
-			    type
-			  }
+        getUserAccessSharedFiles {
+            id
+            name
+            path
+            size
+            privacy_status
+            type
+        }
     }
 `;
\ No newline at end of file
diff --git a/frontend/src/pages/DashboardPage.tsx b/frontend/src/pages/DashboardPage.tsx
index f29afa0..ed70103 100644
--- a/frontend/src/pages/DashboardPage.tsx
+++ b/frontend/src/pages/DashboardPage.tsx
@@ -1,14 +1,16 @@
 import React from "react";
 import styled from "@emotion/styled";
 import UploadFile from "../components/user/dashboard/UploadFile";
-import UserFiles from "../components/user/dashboard/UserFiles";
+import MyUploads from "../components/user/dashboard/MyUploads.tsx";
+import SharedFilesTable from "../components/user/dashboard/upload files/SharedFilesTable.tsx";
 
 const Dashboard: React.FC = () => {
 	return (
 		<DashboardWrapper>
 			<DashboardLayout>
 				<UploadFile/>
-				<UserFiles/>
+				<MyUploads/>
+				<SharedFilesTable/>
 			</DashboardLayout>
 		</DashboardWrapper>
 	);
diff --git a/frontend/src/types/billing.d.ts b/frontend/src/types/billing.d.ts
new file mode 100644
index 0000000..c11e7ef
--- /dev/null
+++ b/frontend/src/types/billing.d.ts
@@ -0,0 +1,14 @@
+import {User} from "./user";
+import {Plan} from "./plan";
+
+export type Billing = {
+	id: number;
+	subscription_date: Date;
+	end_subscription_date: Date;
+	next_payment_date: Date;
+	last_payment_date: Date;
+	created_at: Date;
+	updated_at: Date;
+	plan: Plan;
+	user: User;
+}
\ No newline at end of file
diff --git a/frontend/src/types/plan.d.ts b/frontend/src/types/plan.d.ts
new file mode 100644
index 0000000..6bfa024
--- /dev/null
+++ b/frontend/src/types/plan.d.ts
@@ -0,0 +1,12 @@
+import {Billing} from "./billing";
+
+export type Plan = {
+	id: number;
+	name: string;
+	price: number;
+	billing: string;
+	description: string
+	created_at: Date;
+	updated_at: Date;
+	billings: Billing[];
+}
\ No newline at end of file
diff --git a/frontend/src/types/upload.d.ts b/frontend/src/types/upload.d.ts
new file mode 100644
index 0000000..f93e5fb
--- /dev/null
+++ b/frontend/src/types/upload.d.ts
@@ -0,0 +1,15 @@
+import {User} from "./user";
+import {Visitor} from "./visitor";
+
+export type Upload = {
+	id: number;
+	title: string
+	message: string
+	is_activated: boolean;
+	receivers: string[]
+	created_at: Date
+	updated_at: Date
+	visitor: Visitor
+	user: User
+	files: File[];
+}
diff --git a/frontend/src/types/user.d.ts b/frontend/src/types/user.d.ts
new file mode 100644
index 0000000..e8b1a02
--- /dev/null
+++ b/frontend/src/types/user.d.ts
@@ -0,0 +1,16 @@
+import {Upload} from "./upload";
+
+export type User = {
+	id: number
+	firstname: string;
+	lastname: string;
+	email: string;
+	password: string;
+	profile_picture_name: string;
+	role: string
+	created_at: Date;
+	updated_at: Date;
+	billing: Billing;
+	accessed_files: File[];
+	uploads: Upload[]
+};
diff --git a/frontend/src/types/visitor.d.ts b/frontend/src/types/visitor.d.ts
new file mode 100644
index 0000000..240e6aa
--- /dev/null
+++ b/frontend/src/types/visitor.d.ts
@@ -0,0 +1,11 @@
+import {Upload} from "./upload";
+
+export type Visitor = {
+	id: number;
+	email: string;
+	email_is_verified: boolean;
+	code: number;
+	created_at: Date;
+	updated_at: Date;
+	uploads: Upload[]
+}
\ No newline at end of file