Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Big folder upload #780

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export class DocumentsController {
reply.status(200).send();
} catch (error) {
logger.error({ error: `${error}` }, "Failed to restore drive item");
throw new CrudException("Failed to restore drive item", 500);
throw new CrudException(`Failed to restore drive item: ${error}`, 500);
}
};

Expand Down
4 changes: 4 additions & 0 deletions tdrive/frontend/public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
"general.add": "Add",
"general.back": "Back",
"general.cancel": "Cancel",
"general.close": "Close",
"general.connexion_status.connected": "You are online",
"general.connexion_status.connecting": "Reconnecting…",
"general.connexion_status.disconnected": "You are offline",
Expand All @@ -184,6 +185,9 @@
"general.resume": "Resume",
"general.send": "Send message",
"general.update": "Update",
"general.uploading": "Uploading",
"general.uploaded": "Uploaded",
"general.files": "file(s)",
"general.user.anonymous": "Anonymous",
"general.user.deactivated": "User is no longer in this company",
"general.user.deleted": "Deleted Account",
Expand Down
4 changes: 4 additions & 0 deletions tdrive/frontend/public/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
"general.add": "Ajouter",
"general.back": "Retour",
"general.cancel": "Annuler",
"general.close": "Fermer",
"general.connexion_status.connected": "Vous êtes connecté",
"general.connexion_status.connecting": "Reconnexion en cours…",
"general.connexion_status.disconnected": "Vous êtes hors ligne",
Expand All @@ -177,6 +178,9 @@
"general.resume": "Reprendre",
"general.send": "Envoyer un message",
"general.update": "Mettre à jour",
"general.uploading": "Téléchargement en cours",
"general.uploaded": "Téléversé",
"general.files": "fichiers",
"general.user.anonymous": "Compte anonyme",
"general.user.deactivated": "Cet utilisateur n'est plus dans cette l'entreprise",
"general.user.deleted": "Compte supprimé",
Expand Down
4 changes: 4 additions & 0 deletions tdrive/frontend/public/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@
"general.resume": "Продолжить",
"general.send": "Отправить сообщение",
"general.update": "Обновить",
"general.uploading": "Загрузка",
"general.uploaded": "Загружено",
"general.close": "Закрыть",
"general.files": "файлы",
"general.user.anonymous": "Анонимный",
"general.user.deactivated": "Пользователь больше не состоит в этой компании",
"general.user.deleted": "Удаленная учетная запись",
Expand Down
4 changes: 4 additions & 0 deletions tdrive/frontend/public/locales/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
"general.add": "Thêm",
"general.back": "Quay lại",
"general.cancel": "Hủy",
"general.close": "Đóng",
"general.connexion_status.connected": "Bạn đang trực tuyến",
"general.connexion_status.connecting": "Đang kết nối...",
"general.connexion_status.disconnected": "Bạn đang ngoại tuyến",
Expand All @@ -166,6 +167,9 @@
"general.resume": "Tiếp tục",
"general.send": "Gửi",
"general.update": "Cập nhật",
"general.uploading": "Đang tải lên",
"general.uploaded": "Đã tải lên",
"general.files": "tệp",
"general.user.anonymous": "Vô danh",
"general.user.deactivated": "Người dùng không còn thuộc công ty này nữa",
"general.user.deleted": "Tài khoản đã bị xóa",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions tdrive/frontend/src/app/atoms/icons-colored/assets/folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions tdrive/frontend/src/app/atoms/icons-colored/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ import { ReactComponent as FileTypeUnknownSvg } from './assets/file-type-unknown
import { ReactComponent as FileTypeMediaSvg } from './assets/file-type-media.svg';
import { ReactComponent as FileTypeSlidesSvg } from './assets/file-type-slides.svg';
import { ReactComponent as FileTypeLinkSvg } from './assets/file-type-link.svg';
import { ReactComponent as FolderSvg } from './assets/folder.svg';
import { ReactComponent as ArrowDownSvg } from './assets/arrow-down.svg';
import { ReactComponent as ArrowUpSvg } from './assets/arrow-up.svg';
import { ReactComponent as CheckGreenSvg } from './assets/check-green.svg';
import { ReactComponent as ShowFolderSvg } from './assets/icon-show-folder.svg';
import { ReactComponent as ResumeSvg } from './assets/icon-resume.svg';
import { ReactComponent as PauseSvg } from './assets/icon-pause.svg';
import { ReactComponent as CancelSvg } from './assets/icon-cancel.svg';
import { ReactComponent as RemoveSvg } from './assets/remove.svg';
import { ReactComponent as SentSvg } from './assets/sent.svg';

Expand Down Expand Up @@ -37,6 +45,22 @@ export const FileTypeSlidesIcon = (props: ComponentProps<'svg'>) => (

export const FileTypeLinkIcon = (props: ComponentProps<'svg'>) => <FileTypeLinkSvg {...props} />;

export const FolderIcon = (props: ComponentProps<'svg'>) => <FolderSvg {...props} />;

export const ArrowDownIcon = (props: ComponentProps<'svg'>) => <ArrowDownSvg {...props} />;

export const ArrowUpIcon = (props: ComponentProps<'svg'>) => <ArrowUpSvg {...props} />;

export const CheckGreenIcon = (props: ComponentProps<'svg'>) => <CheckGreenSvg {...props} />;

export const ShowFolderIcon = (props: ComponentProps<'svg'>) => <ShowFolderSvg {...props} />;

export const ResumeIcon = (props: ComponentProps<'svg'>) => <ResumeSvg {...props} />;

export const PauseIcon = (props: ComponentProps<'svg'>) => <PauseSvg {...props} />;

export const CancelIcon = (props: ComponentProps<'svg'>) => <CancelSvg {...props} />;

export const RemoveIcon = (props: ComponentProps<'svg'>) => <RemoveSvg {...props} />;

export const SentIcon = (props: ComponentProps<'svg'>) => <SentSvg {...props} />;

This file was deleted.

Loading