4nk/lecoffre-front
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
This commit is contained in:
Maxime Lalo 2023-05-12 10:57:50 +02:00
commit b116e52807
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/front/Components/DesignSystem/DepositDocument/index.tsx
View File

@ -69,6 +69,7 @@ export default class DepositDocument extends React.Component<IProps, IState> {
} }
public override render(): JSX.Element { public override render(): JSX.Element {
console.log("Loading :", this.state.loading);
return ( return (
<div className={classes["container"]}> <div className={classes["container"]}>
<div <div
@ -281,12 +282,16 @@ export default class DepositDocument extends React.Component<IProps, IState> {
} }
private async onDragDrop(event: React.DragEvent<HTMLDivElement>) { private async onDragDrop(event: React.DragEvent<HTMLDivElement>) {
this.setState({
loading: true,
});
event.preventDefault(); event.preventDefault();
this.setState({ this.setState({
isDragOver: false, isDragOver: false,
}); });
const file = event.dataTransfer.files[0]; const file = event.dataTransfer.files[0];
if (file) this.addFile(file); if (file) this.addFile(file);
else this.setState({ loading: false });
} }
private async addFile(file: File) { private async addFile(file: File) {
@ -294,9 +299,7 @@ export default class DepositDocument extends React.Component<IProps, IState> {
formData.append("file", file, file.name); formData.append("file", file, file.name);
const query = JSON.stringify({ document: { uid: this.props.document.uid } }); const query = JSON.stringify({ document: { uid: this.props.document.uid } });
formData.append("q", query); formData.append("q", query);
this.setState({
loading: true,
});
const newFile = await Files.getInstance().post(formData); const newFile = await Files.getInstance().post(formData);
const files = this.state.currentFiles ? [...this.state.currentFiles, newFile] : [newFile]; const files = this.state.currentFiles ? [...this.state.currentFiles, newFile] : [newFile];
@ -334,11 +337,18 @@ export default class DepositDocument extends React.Component<IProps, IState> {
private async onFileChange() { private async onFileChange() {
if (!this.inputRef.current) return; if (!this.inputRef.current) return;
this.setState({
loading: true,
});
const files = this.inputRef.current.files; const files = this.inputRef.current.files;
if (!files) return; if (!files) {
this.setState({ loading: false });
return;
}
const file = files[0]; const file = files[0];
if (file) this.addFile(file); if (file) this.addFile(file);
else this.setState({ loading: false });
} }
private addDocument() { private addDocument() {

11
src/front/Components/DesignSystem/FilePreview/index.tsx
View File

@ -3,7 +3,6 @@ import React from "react";
import Typography, { ITypo, ITypoColor } from "../Typography"; import Typography, { ITypo, ITypoColor } from "../Typography";
import classes from "./classes.module.scss"; import classes from "./classes.module.scss";
import Loader from "../Loader"; import Loader from "../Loader";
import Image from "next/image";
type IProps = { type IProps = {
href: string; href: string;
@ -27,11 +26,11 @@ export default class FilePreview extends React.Component<IProps, IState> {
</Typography> </Typography>
)} )}
<div className={classes["file-container"]}> <div className={classes["file-container"]}>
{type?.toLowerCase() === "pdf" && ( {type?.toLowerCase() === "pdf" && (
<embed src={this.props.href} width="100%" height="100%" type="application/pdf" className={classes["pdf"]} /> <embed src={this.props.href} width="100%" height="100%" type="application/pdf" className={classes["pdf"]} />
)} )}
{type?.toLowerCase() !== "pdf" && <Image src={this.props.href} alt="File preview" className={classes["image"]} />} {type?.toLowerCase() !== "pdf" && <img src={this.props.href} alt="File preview" className={classes["image"]} />}
</div> </div>
</div> </div>
); );
} }

2
src/front/Components/Layouts/Folder/CreateFolder/index.tsx
View File

@ -18,7 +18,7 @@ import Users from "@Front/Api/LeCoffreApi/SuperAdmin/Users/Users";
import User from "le-coffre-resources/dist/Notary"; import User from "le-coffre-resources/dist/Notary";
import Folders, { IPostFoldersParams } from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; import Folders, { IPostFoldersParams } from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders";
import { NextRouter, useRouter } from "next/router"; import { NextRouter, useRouter } from "next/router";
import backgroundImage from "@Front/assets/images/404-background-image.jpeg"; import backgroundImage from "@Assets/images/404-background-image.jpeg";
type IFormValues = { type IFormValues = {
folder_number: string; folder_number: string;

2
src/front/Components/Layouts/PageNotFound/index.tsx
View File

@ -6,7 +6,7 @@ import BasePage from "../Base";
import classes from "./classes.module.scss"; import classes from "./classes.module.scss";
import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage"; import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage";
import backgroundImage from "@Front/assets/images/404-background-image.jpeg"; import backgroundImage from "@Assets/images/404-background-image.jpeg";
export default class PageNotFound extends BasePage { export default class PageNotFound extends BasePage {
public override render(): JSX.Element { public override render(): JSX.Element {