diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx index 8ae89c32..07fe436a 100755 --- a/src/components/Layout.tsx +++ b/src/components/Layout.tsx @@ -166,7 +166,7 @@ export default function Layout({ children, config }: { children: React.ReactNode if (error) { showNotification({ title: 'Error', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -199,7 +199,7 @@ export default function Layout({ children, config }: { children: React.ReactNode if (error) { showNotification({ title: 'Error', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/file/DashboardFile/EditFileDetailsModal.tsx b/src/components/file/DashboardFile/EditFileDetailsModal.tsx index 3073c793..b4d42cc7 100755 --- a/src/components/file/DashboardFile/EditFileDetailsModal.tsx +++ b/src/components/file/DashboardFile/EditFileDetailsModal.tsx @@ -32,7 +32,7 @@ export default function EditFileDetailsModal({ if (error) { showNotification({ title: 'Failed to remove password...', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -66,7 +66,7 @@ export default function EditFileDetailsModal({ if (error) { showNotification({ title: 'Failed to save changes...', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/file/DashboardFile/FileModal.tsx b/src/components/file/DashboardFile/FileModal.tsx index 9a1cc0eb..d3823fe8 100755 --- a/src/components/file/DashboardFile/FileModal.tsx +++ b/src/components/file/DashboardFile/FileModal.tsx @@ -143,7 +143,7 @@ export default function FileModal({ if (error) { showNotification({ title: 'Failed to save tags', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/file/actions.tsx b/src/components/file/actions.tsx index 332a373c..85caf8c5 100755 --- a/src/components/file/actions.tsx +++ b/src/components/file/actions.tsx @@ -60,7 +60,7 @@ export async function handleDeleteFile(file: File, setOpen: (open: boolean) => v if (error) { notifications.show({ title: 'Error', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -90,7 +90,7 @@ export async function favoriteFile(file: File) { if (error) { notifications.show({ title: 'Error', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -114,7 +114,7 @@ export function createFolderAndAdd(file: File, folderName: string | null) { if (error) { notifications.show({ title: 'Error while creating folder', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -147,7 +147,7 @@ export async function removeFromFolder(file: File) { if (error) { notifications.show({ title: 'Error while removing from folder', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -178,7 +178,7 @@ export async function addToFolder(file: File, folderId: string | null) { if (error) { notifications.show({ title: 'Error while adding to folder', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -210,7 +210,7 @@ export async function addMultipleToFolder(files: File[], folderId: string | null if (error) { notifications.show({ title: 'Error while adding files to folder', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/files/PendingFilesButton.tsx b/src/components/pages/files/PendingFilesButton.tsx index cef72910..60f091b8 100755 --- a/src/components/pages/files/PendingFilesButton.tsx +++ b/src/components/pages/files/PendingFilesButton.tsx @@ -65,7 +65,7 @@ export default function PendingFilesButton() { if (error) { showNotification({ title: 'Error', - message: `Failed to delete pending file: ${error.message}`, + message: `Failed to delete pending file: ${error.error}`, color: 'red', icon: , }); diff --git a/src/components/pages/files/bulk.tsx b/src/components/pages/files/bulk.tsx index 1a03321e..5dc5287f 100755 --- a/src/components/pages/files/bulk.tsx +++ b/src/components/pages/files/bulk.tsx @@ -48,7 +48,7 @@ export async function bulkDelete(ids: string[], setSelectedFiles: (files: File[] if (error) { notifications.update({ title: 'Error while deleting files', - message: error.message, + message: error.error, color: 'red', icon: , id: 'bulk-delete', @@ -111,7 +111,7 @@ export async function bulkFavorite(ids: string[]) { if (error) { notifications.update({ title: 'Error while favoriting files', - message: error.message, + message: error.error, color: 'red', icon: , id: 'bulk-favorite', diff --git a/src/components/pages/files/tags/CreateTagModal.tsx b/src/components/pages/files/tags/CreateTagModal.tsx index f94cdc61..d12eddea 100755 --- a/src/components/pages/files/tags/CreateTagModal.tsx +++ b/src/components/pages/files/tags/CreateTagModal.tsx @@ -41,7 +41,7 @@ export default function CreateTagModal({ open, onClose }: { open: boolean; onClo if (error) { showNotification({ title: 'Failed to create tag', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/files/tags/EditTagModal.tsx b/src/components/pages/files/tags/EditTagModal.tsx index eb10f048..63b2c237 100755 --- a/src/components/pages/files/tags/EditTagModal.tsx +++ b/src/components/pages/files/tags/EditTagModal.tsx @@ -50,7 +50,7 @@ export default function EditTagModal({ if (error) { showNotification({ title: 'Failed to edit tag', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/files/tags/TagsButton.tsx b/src/components/pages/files/tags/TagsButton.tsx index 48f68e1e..cf1233e2 100755 --- a/src/components/pages/files/tags/TagsButton.tsx +++ b/src/components/pages/files/tags/TagsButton.tsx @@ -27,7 +27,7 @@ export default function TagsButton() { if (error) { showNotification({ title: 'Error', - message: `Failed to delete tag: ${error.message}`, + message: `Failed to delete tag: ${error.error}`, color: 'red', icon: , }); diff --git a/src/components/pages/folders/actions.tsx b/src/components/pages/folders/actions.tsx index 150fb2b7..2df592de 100755 --- a/src/components/pages/folders/actions.tsx +++ b/src/components/pages/folders/actions.tsx @@ -51,7 +51,7 @@ export async function editFolderVisibility(folder: Folder, isPublic: boolean) { if (error) { notifications.show({ title: 'Failed to edit folder visibility', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -79,7 +79,7 @@ async function handleDeleteFolder(folder: Folder) { if (error) { notifications.show({ title: 'Failed to delete folder', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/folders/index.tsx b/src/components/pages/folders/index.tsx index 892c7483..b6ee4ffe 100755 --- a/src/components/pages/folders/index.tsx +++ b/src/components/pages/folders/index.tsx @@ -39,7 +39,7 @@ export default function DashboardFolders() { if (error) { notifications.show({ - message: error.message, + message: error.error, color: 'red', }); } else { diff --git a/src/components/pages/invites/actions.tsx b/src/components/pages/invites/actions.tsx index 867b055f..4ff4554f 100755 --- a/src/components/pages/invites/actions.tsx +++ b/src/components/pages/invites/actions.tsx @@ -41,7 +41,7 @@ async function handleDeleteInvite(invite: Invite) { if (error) { notifications.show({ title: 'Failed to delete invite', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/invites/index.tsx b/src/components/pages/invites/index.tsx index 534f412b..836a83ff 100755 --- a/src/components/pages/invites/index.tsx +++ b/src/components/pages/invites/index.tsx @@ -40,7 +40,7 @@ export default function DashboardInvites() { if (error) { notifications.show({ - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/serverSettings/settingsOnSubmit.tsx b/src/components/pages/serverSettings/settingsOnSubmit.tsx index 8e8fbb48..83354e9f 100644 --- a/src/components/pages/serverSettings/settingsOnSubmit.tsx +++ b/src/components/pages/serverSettings/settingsOnSubmit.tsx @@ -21,7 +21,7 @@ export function settingsOnSubmit(router: NextRouter, form: ReturnType x.message).join('\n') - : error.message, + : error.error, color: 'red', }); diff --git a/src/components/pages/settings/parts/SettingsAvatar.tsx b/src/components/pages/settings/parts/SettingsAvatar.tsx index d05d7de8..d9d44677 100755 --- a/src/components/pages/settings/parts/SettingsAvatar.tsx +++ b/src/components/pages/settings/parts/SettingsAvatar.tsx @@ -56,7 +56,7 @@ export default function SettingsAvatar() { if (!data && error) { notifications.show({ title: 'Error while updating avatar', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -83,7 +83,7 @@ export default function SettingsAvatar() { if (!data && error) { notifications.show({ title: 'Error while updating avatar', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/settings/parts/SettingsFileView.tsx b/src/components/pages/settings/parts/SettingsFileView.tsx index 1285c4c9..8577d4f9 100755 --- a/src/components/pages/settings/parts/SettingsFileView.tsx +++ b/src/components/pages/settings/parts/SettingsFileView.tsx @@ -71,7 +71,7 @@ export default function SettingsFileView() { if (!data && error) { notifications.show({ title: 'Error while updating view settings', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/settings/parts/SettingsMfa/PasskeyButton.tsx b/src/components/pages/settings/parts/SettingsMfa/PasskeyButton.tsx index 91bbbab7..630b95f2 100755 --- a/src/components/pages/settings/parts/SettingsMfa/PasskeyButton.tsx +++ b/src/components/pages/settings/parts/SettingsMfa/PasskeyButton.tsx @@ -50,7 +50,7 @@ export default function PasskeyButton() { notifications.show({ title: 'Error while saving passkey', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -90,7 +90,7 @@ export default function PasskeyButton() { if (error) { notifications.show({ title: 'Error while removing passkey', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/settings/parts/SettingsMfa/TwoFAButton.tsx b/src/components/pages/settings/parts/SettingsMfa/TwoFAButton.tsx index e81f4cad..860ce93b 100755 --- a/src/components/pages/settings/parts/SettingsMfa/TwoFAButton.tsx +++ b/src/components/pages/settings/parts/SettingsMfa/TwoFAButton.tsx @@ -55,7 +55,7 @@ export default function TwoFAButton() { ); if (error) { - setPinError(error.message!); + setPinError(error.error!); setPinDisabled(false); } else { setTotpOpen(false); @@ -84,7 +84,7 @@ export default function TwoFAButton() { ); if (error) { - setPinError(error.message!); + setPinError(error.error!); setPinDisabled(false); } else { setTotpOpen(false); diff --git a/src/components/pages/settings/parts/SettingsOAuth/index.tsx b/src/components/pages/settings/parts/SettingsOAuth/index.tsx index 4566a1ea..ca890efb 100755 --- a/src/components/pages/settings/parts/SettingsOAuth/index.tsx +++ b/src/components/pages/settings/parts/SettingsOAuth/index.tsx @@ -45,7 +45,7 @@ function OAuthButton({ provider, linked }: { provider: OAuthProviderType; linked if (error) { notifications.show({ title: 'Failed to unlink account', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/settings/parts/SettingsUser.tsx b/src/components/pages/settings/parts/SettingsUser.tsx index d1c9c444..11911d6f 100755 --- a/src/components/pages/settings/parts/SettingsUser.tsx +++ b/src/components/pages/settings/parts/SettingsUser.tsx @@ -65,12 +65,12 @@ export default function SettingsUser() { const { data, error } = await fetchApi('/api/user', 'PATCH', send); if (!data && error) { - if (error.message === 'Username already exists') { - form.setFieldError('username', error.message); + if (error.error === 'Username already exists') { + form.setFieldError('username', error.error); } else { notifications.show({ title: 'Error while updating user', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/urls/actions.tsx b/src/components/pages/urls/actions.tsx index 3feb3ecd..6b7d54eb 100755 --- a/src/components/pages/urls/actions.tsx +++ b/src/components/pages/urls/actions.tsx @@ -45,7 +45,7 @@ async function handleDeleteUrl(url: Url) { if (error) { notifications.show({ title: 'Failed to delete url', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/urls/index.tsx b/src/components/pages/urls/index.tsx index f7ea9fb8..17157f62 100755 --- a/src/components/pages/urls/index.tsx +++ b/src/components/pages/urls/index.tsx @@ -68,7 +68,7 @@ export default function DashboardURLs() { if (error) { notifications.show({ title: 'Failed to shorten URL', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/users/EditUserModal.tsx b/src/components/pages/users/EditUserModal.tsx index 42ead003..90cb5462 100755 --- a/src/components/pages/users/EditUserModal.tsx +++ b/src/components/pages/users/EditUserModal.tsx @@ -122,7 +122,7 @@ export default function EditUserModal({ if (error) { notifications.show({ title: 'Failed to edit user', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/users/actions.tsx b/src/components/pages/users/actions.tsx index 714f1de8..83029759 100755 --- a/src/components/pages/users/actions.tsx +++ b/src/components/pages/users/actions.tsx @@ -41,7 +41,7 @@ async function handleDeleteUser(user: User, deleteFiles: boolean = false) { if (error) { notifications.show({ title: 'Failed to delete user', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/components/pages/users/index.tsx b/src/components/pages/users/index.tsx index 0d8244f1..079debca 100755 --- a/src/components/pages/users/index.tsx +++ b/src/components/pages/users/index.tsx @@ -75,7 +75,7 @@ export default function DashboardUsers() { if (error) { notifications.show({ title: 'Failed to create user', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/lib/response.ts b/src/lib/response.ts index 1aa36fb7..b7d1a70d 100755 --- a/src/lib/response.ts +++ b/src/lib/response.ts @@ -22,7 +22,6 @@ export interface NextApiReq extends Next } export type ErrorBody = { - message?: string; data?: any; statusCode?: number; error?: string; diff --git a/src/pages/auth/login.tsx b/src/pages/auth/login.tsx index f4b491f4..a6b85abd 100755 --- a/src/pages/auth/login.tsx +++ b/src/pages/auth/login.tsx @@ -92,9 +92,9 @@ export default function Login({ config }: InferGetServerSidePropsType, }); diff --git a/src/pages/setup.tsx b/src/pages/setup.tsx index 8f61906e..ac546afa 100755 --- a/src/pages/setup.tsx +++ b/src/pages/setup.tsx @@ -56,7 +56,7 @@ export default function Setup() { if (error) { notifications.show({ title: 'Error', - message: error.message, + message: error.error, color: 'red', icon: , }); @@ -79,7 +79,7 @@ export default function Setup() { if (error) { notifications.show({ title: 'Error', - message: error.message, + message: error.error, color: 'red', icon: , }); diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx index cff56382..29ae5435 100755 --- a/src/pages/view/[id].tsx +++ b/src/pages/view/[id].tsx @@ -55,6 +55,8 @@ export default function ViewFileId({ const router = useRouter(); + console.log(file); + const [passwordValue, setPassword] = useState(''); const [passwordError, setPasswordError] = useState(''); const [detailsOpen, setDetailsOpen] = useState(false); @@ -74,7 +76,7 @@ export default function ViewFileId({ const meta = ( - {user?.view.embedTitle && user?.view.embed && ( + {/* {user?.view.embedTitle && user?.view.embed && ( - )} + )} */} {file.type.startsWith('image') && ( <> @@ -112,29 +114,24 @@ export default function ViewFileId({ {file.type.startsWith('video') && ( <> - + {/* - - {/* - {file.thumbnail && ( - <> - - - - )} */} + */} + + {file.thumbnail && } - - - - - - - + {/* */} + {/* */} + + {/* */} + {/* */} + + )} @@ -343,6 +340,11 @@ export const getServerSideProps: GetServerSideProps<{ password: true, userId: true, tags: false, + thumbnail: { + select: { + path: true, + }, + }, }, }); if (!file || !file.userId) return { notFound: true };