diff --git a/backend/app/file_transfer/schemas.py b/backend/app/file_transfer/schemas.py index b18f2eb..1b4de91 100644 --- a/backend/app/file_transfer/schemas.py +++ b/backend/app/file_transfer/schemas.py @@ -1,3 +1,5 @@ +from datetime import datetime +import uuid from pydantic import BaseModel @@ -7,10 +9,13 @@ class FileUploaded(BaseModel): class MetadataFileResponse(BaseModel): + id: uuid.UUID name: str path: str size: int encrypted: bool + timestamp: datetime + expiration: datetime class Config: from_attributes = True diff --git a/backend/app/file_transfer/service.py b/backend/app/file_transfer/service.py index 4f0b4e8..49d72ca 100644 --- a/backend/app/file_transfer/service.py +++ b/backend/app/file_transfer/service.py @@ -60,10 +60,13 @@ async def get_all_files_user( return [ MetadataFileResponse( + id=file.id, name=str(file.name), path=str(file.path), size=int(file.size), # type: ignore encrypted=bool(file.encrypted), + timestamp=file.timestamp, + expiration=file.expiration, ) for file in files.scalars() ] diff --git a/frontend/src/lib/components/Header.svelte b/frontend/src/lib/components/Header.svelte index d4e103b..66daaaf 100644 --- a/frontend/src/lib/components/Header.svelte +++ b/frontend/src/lib/components/Header.svelte @@ -4,6 +4,7 @@ export let toggleTheme = () => {}; export let currentTheme = 'light'; + const useStyles = createStyles((theme) => { return { root: { diff --git a/frontend/src/lib/components/user/FileRow.svelte b/frontend/src/lib/components/user/FileRow.svelte index cc6e1a6..75fe2ac 100644 --- a/frontend/src/lib/components/user/FileRow.svelte +++ b/frontend/src/lib/components/user/FileRow.svelte @@ -38,7 +38,7 @@ {file.encrypted} - {file.size} + {Math.round(file.size/1024)} {file.timestamp}