Merge 'dev' in 'staging' (#49)
This commit is contained in:
commit
ed53861659
@ -22,7 +22,7 @@ lecoffreFront:
|
||||
tls:
|
||||
hosts:
|
||||
- app.ppd.lecoffre.smart-chain.fr
|
||||
secretName: api-tls
|
||||
secretName: front-tls
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: nginx
|
||||
cert-manager.io/cluster-issuer: letsencrypt-prod
|
||||
|
@ -22,7 +22,7 @@ lecoffreFront:
|
||||
tls:
|
||||
hosts:
|
||||
- app.lecoffre.smart-chain.fr
|
||||
secretName: api-tls
|
||||
secretName: front-tls
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: nginx
|
||||
cert-manager.io/cluster-issuer: letsencrypt-prod
|
||||
|
@ -22,7 +22,7 @@ lecoffreFront:
|
||||
tls:
|
||||
hosts:
|
||||
- app.stg.lecoffre.smart-chain.fr
|
||||
secretName: api-tls
|
||||
secretName: front-tls
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: nginx
|
||||
cert-manager.io/cluster-issuer: letsencrypt-prod
|
||||
|
@ -32,7 +32,7 @@ spec:
|
||||
ports:
|
||||
- port: 80
|
||||
name: http
|
||||
targetPort: 3001
|
||||
targetPort: 3000
|
||||
selector:
|
||||
app: lecoffre-front
|
||||
---
|
||||
|
@ -1,16 +1 @@
|
||||
apiVersion: external-secrets.io/v1beta1
|
||||
kind: ExternalSecret
|
||||
metadata:
|
||||
name: {{ .Values.lecoffreFront.envSecrets }}
|
||||
spec:
|
||||
refreshInterval: 20s
|
||||
secretStoreRef:
|
||||
kind: SecretStore
|
||||
name: secret-store
|
||||
data:
|
||||
{{ range $v := .Values.lecoffreFront.env }}
|
||||
- secretKey: {{ $v.key }}
|
||||
remoteRef:
|
||||
key: {{ $v.scwID}}
|
||||
version: latest_enabled
|
||||
{{ end }}
|
||||
## same secret as back
|
@ -24,7 +24,7 @@
|
||||
"eslint-config-next": "13.2.4",
|
||||
"form-data": "^4.0.0",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.66",
|
||||
"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.68",
|
||||
"next": "13.2.4",
|
||||
"prettier": "^2.8.7",
|
||||
"react": "18.2.0",
|
||||
|
BIN
src/front/Api/.BaseApiService.ts.swp
Normal file
BIN
src/front/Api/.BaseApiService.ts.swp
Normal file
Binary file not shown.
38
src/front/Api/Auth/franceConnect/Customer.ts
Normal file
38
src/front/Api/Auth/franceConnect/Customer.ts
Normal file
@ -0,0 +1,38 @@
|
||||
import BaseApiService from "@Front/Api/BaseApiService";
|
||||
|
||||
export default class Customer extends BaseApiService {
|
||||
private static instance: Customer;
|
||||
private readonly baseURl = this.getBaseUrl().concat("/france-connect/customer");
|
||||
|
||||
private constructor() {
|
||||
super();
|
||||
}
|
||||
|
||||
public static getInstance() {
|
||||
if (!this.instance) {
|
||||
return new Customer();
|
||||
} else {
|
||||
return this.instance;
|
||||
}
|
||||
}
|
||||
|
||||
public async login(email: string) {
|
||||
const url = new URL(this.baseURl.concat("/login/").concat(email));
|
||||
try {
|
||||
return await this.postRequest(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
public async refreshToken(refreshToken: string): Promise<{ accessToken: string }> {
|
||||
const url = new URL(this.baseURl.concat("/refresh-token"));
|
||||
try {
|
||||
return await this.postRequest(url, {}, refreshToken);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
import BaseApiService from "@Front/Api/BaseApiService";
|
||||
|
||||
export default abstract class BaseNotary extends BaseApiService {
|
||||
protected readonly namespaceUrl = this.getBaseUrl().concat("/customers");
|
||||
protected readonly namespaceUrl = this.getBaseUrl().concat("/customer");
|
||||
}
|
||||
|
67
src/front/Api/LeCoffreApi/Customer/Customers/Customers.ts
Normal file
67
src/front/Api/LeCoffreApi/Customer/Customers/Customers.ts
Normal file
@ -0,0 +1,67 @@
|
||||
import Customer, { Contact } from "le-coffre-resources/dist/Customer";
|
||||
|
||||
import BaseCustomer from "../BaseCustomer";
|
||||
import { ECivility } from "le-coffre-resources/dist/Customer/Contact";
|
||||
|
||||
// TODO Type get query params -> Where + inclue + orderby
|
||||
export interface IGetCustomersparams {
|
||||
where?: {};
|
||||
include?: {};
|
||||
}
|
||||
|
||||
// TODO Type getbyuid query params
|
||||
|
||||
export type IPutCustomersParams = {
|
||||
uid?: Customer["uid"];
|
||||
contact?: Customer["contact"];
|
||||
};
|
||||
|
||||
export interface IPostCustomersParams {
|
||||
first_name: string;
|
||||
last_name: string;
|
||||
email: string;
|
||||
cell_phone_number: string;
|
||||
civility: ECivility;
|
||||
address?: Contact["address"];
|
||||
}
|
||||
|
||||
export default class Customers extends BaseCustomer {
|
||||
private static instance: Customers;
|
||||
private readonly baseURl = this.namespaceUrl.concat("/customers");
|
||||
|
||||
private constructor() {
|
||||
super();
|
||||
}
|
||||
|
||||
public static getInstance() {
|
||||
if (!this.instance) {
|
||||
return new this();
|
||||
} else {
|
||||
return this.instance;
|
||||
}
|
||||
}
|
||||
|
||||
public async get(q: IGetCustomersparams): Promise<Customer[]> {
|
||||
const url = new URL(this.baseURl);
|
||||
const query = { q };
|
||||
Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
|
||||
try {
|
||||
return await this.getRequest<Customer[]>(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
public async getByUid(uid: string, q?: any): Promise<Customer> {
|
||||
const url = new URL(this.baseURl.concat(`/${uid}`));
|
||||
const query = { q };
|
||||
if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
|
||||
try {
|
||||
return await this.getRequest<Customer>(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
}
|
93
src/front/Api/LeCoffreApi/Customer/Documents/Documents.ts
Normal file
93
src/front/Api/LeCoffreApi/Customer/Documents/Documents.ts
Normal file
@ -0,0 +1,93 @@
|
||||
import { Document } from "le-coffre-resources/dist/Customer";
|
||||
|
||||
import BaseCustomer from "../BaseCustomer";
|
||||
import { EDocumentStatus } from "le-coffre-resources/dist/Customer/Document";
|
||||
|
||||
// TODO Type get query params -> Where + inclue + orderby
|
||||
export interface IGetDocumentsparams {
|
||||
where?: {};
|
||||
include?: {};
|
||||
}
|
||||
|
||||
// TODO Type getbyuid query params
|
||||
|
||||
export type IPutDocumentsParams = {
|
||||
document_status?: EDocumentStatus;
|
||||
refused_reason?: string;
|
||||
};
|
||||
|
||||
export interface IPostDocumentsParams {}
|
||||
|
||||
export default class Documents extends BaseCustomer {
|
||||
private static instance: Documents;
|
||||
private readonly baseURl = this.namespaceUrl.concat("/documents");
|
||||
|
||||
private constructor() {
|
||||
super();
|
||||
}
|
||||
|
||||
public static getInstance() {
|
||||
if (!this.instance) {
|
||||
return new this();
|
||||
} else {
|
||||
return this.instance;
|
||||
}
|
||||
}
|
||||
|
||||
public async get(q: IGetDocumentsparams): Promise<Document[]> {
|
||||
const url = new URL(this.baseURl);
|
||||
const query = { q };
|
||||
if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
|
||||
try {
|
||||
return await this.getRequest<Document[]>(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @description : Create a Document
|
||||
*/
|
||||
public async post(body: any): Promise<Document> {
|
||||
const url = new URL(this.baseURl);
|
||||
try {
|
||||
return await this.postRequest<Document>(url, body);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
public async getByUid(uid: string, q?: any): Promise<Document> {
|
||||
const url = new URL(this.baseURl.concat(`/${uid}`));
|
||||
const query = { q };
|
||||
if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
|
||||
try {
|
||||
return await this.getRequest<Document>(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
public async put(uid: string, body: IPutDocumentsParams): Promise<Document> {
|
||||
const url = new URL(this.baseURl.concat(`/${uid}`));
|
||||
try {
|
||||
return await this.putRequest<Document>(url, body);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
public async delete(uid: string): Promise<Document> {
|
||||
const url = new URL(this.baseURl.concat(`/${uid}`));
|
||||
try {
|
||||
return await this.deleteRequest<Document>(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
}
|
93
src/front/Api/LeCoffreApi/Customer/Files/Files.ts
Normal file
93
src/front/Api/LeCoffreApi/Customer/Files/Files.ts
Normal file
@ -0,0 +1,93 @@
|
||||
import { File } from "le-coffre-resources/dist/Customer";
|
||||
import BaseCustomer from "../BaseCustomer";
|
||||
|
||||
// TODO Type get query params -> Where + inclue + orderby
|
||||
export interface IGetFilesparams {
|
||||
where?: {};
|
||||
include?: {};
|
||||
}
|
||||
|
||||
// TODO Type getbyuid query params
|
||||
|
||||
export type IPutFilesParams = {};
|
||||
|
||||
export interface IPostFilesParams {}
|
||||
|
||||
export default class Files extends BaseCustomer {
|
||||
private static instance: Files;
|
||||
private readonly baseURl = this.namespaceUrl.concat("/files");
|
||||
|
||||
private constructor() {
|
||||
super();
|
||||
}
|
||||
|
||||
public static getInstance() {
|
||||
return (this.instance ??= new this());
|
||||
}
|
||||
|
||||
public async get(q: IGetFilesparams): Promise<File[]> {
|
||||
const url = new URL(this.baseURl);
|
||||
const query = { q };
|
||||
if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
|
||||
try {
|
||||
const files = await this.getRequest<File[]>(url);
|
||||
return files;
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @description : Create a File
|
||||
*/
|
||||
public async post(body: any): Promise<File> {
|
||||
const url = new URL(this.baseURl);
|
||||
try {
|
||||
return await this.postRequestFormData<File>(url, body);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
public getUploadLink(uid: string): string {
|
||||
return this.baseURl.concat(`/download/${uid}`);
|
||||
}
|
||||
|
||||
public async getByUid(uid: string, q?: any): Promise<File> {
|
||||
const url = new URL(this.baseURl.concat(`/${uid}`));
|
||||
const query = { q };
|
||||
if (q) Object.entries(query).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
|
||||
try {
|
||||
const file = await this.getRequest<File>(url);
|
||||
return file;
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
public async put(uid: string, body: IPutFilesParams): Promise<File> {
|
||||
const url = new URL(this.baseURl.concat(`/${uid}`));
|
||||
try {
|
||||
return await this.putRequest<File>(url, body);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @description : Delete a folder only if the folder don't contains customers
|
||||
*/
|
||||
public async delete(uid: string): Promise<File> {
|
||||
const url = new URL(this.baseURl.concat(`/${uid}`));
|
||||
try {
|
||||
return await this.deleteRequest<File>(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
}
|
57
src/front/Api/LeCoffreApi/Customer/Folders/Folders.ts
Normal file
57
src/front/Api/LeCoffreApi/Customer/Folders/Folders.ts
Normal file
@ -0,0 +1,57 @@
|
||||
import { type OfficeFolder } from "le-coffre-resources/dist/Customer";
|
||||
|
||||
import BaseCustomer from "../BaseCustomer";
|
||||
|
||||
// TODO Type get query params -> Where + inclue + orderby
|
||||
export interface IGetFoldersParams {
|
||||
q?: {
|
||||
select?: {};
|
||||
where?: {};
|
||||
include?: {};
|
||||
};
|
||||
}
|
||||
|
||||
export default class Folders extends BaseCustomer {
|
||||
private static instance: Folders;
|
||||
private readonly baseURl = this.namespaceUrl.concat("/folders");
|
||||
|
||||
private constructor() {
|
||||
super();
|
||||
}
|
||||
|
||||
public static getInstance() {
|
||||
if (!this.instance) {
|
||||
return new this();
|
||||
} else {
|
||||
return this.instance;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @description : Get all folders
|
||||
*/
|
||||
public async get(q: IGetFoldersParams): Promise<OfficeFolder[]> {
|
||||
const url = new URL(this.baseURl);
|
||||
Object.entries(q).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
|
||||
try {
|
||||
return await this.getRequest<OfficeFolder[]>(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @description : Get a folder by uid
|
||||
*/
|
||||
public async getByUid(uid: string, q?: any): Promise<OfficeFolder> {
|
||||
const url = new URL(this.baseURl.concat(`/${uid}`));
|
||||
if (q) Object.entries(q).forEach(([key, value]) => url.searchParams.set(key, JSON.stringify(value)));
|
||||
try {
|
||||
return await this.getRequest<OfficeFolder>(url);
|
||||
} catch (err) {
|
||||
this.onError(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
}
|
@ -10,7 +10,7 @@ import Tooltip from "../ToolTip";
|
||||
import Typography, { ITypo, ITypoColor } from "../Typography";
|
||||
import classes from "./classes.module.scss";
|
||||
import { Document, DocumentHistory, File as FileCustomer } from "le-coffre-resources/dist/Customer";
|
||||
import Files from "@Front/Api/LeCoffreApi/SuperAdmin/Files/Files";
|
||||
import Files from "@Front/Api/LeCoffreApi/Customer/Files/Files";
|
||||
import { EDocumentStatus } from "le-coffre-resources/dist/Customer/Document";
|
||||
import classNames from "classnames";
|
||||
import Confirm from "../Modal/Confirm";
|
||||
|
@ -1,46 +1,101 @@
|
||||
import Customers from "@Front/Api/LeCoffreApi/SuperAdmin/Customers/Customers";
|
||||
import Documents, { IGetDocumentsparams } from "@Front/Api/LeCoffreApi/SuperAdmin/Documents/Documents";
|
||||
"use client";
|
||||
import Customers from "@Front/Api/LeCoffreApi/Customer/Customers/Customers";
|
||||
import Documents, { IGetDocumentsparams } from "@Front/Api/LeCoffreApi/Customer/Documents/Documents";
|
||||
import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button";
|
||||
import DepositDocument from "@Front/Components/DesignSystem/DepositDocument";
|
||||
import TextField from "@Front/Components/DesignSystem/Form/TextField";
|
||||
import Confirm from "@Front/Components/DesignSystem/Modal/Confirm";
|
||||
import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography";
|
||||
import Base from "@Front/Components/Layouts/Base";
|
||||
import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate";
|
||||
import Customer, { Document, DocumentType } from "le-coffre-resources/dist/Customer";
|
||||
import React from "react";
|
||||
import React, { useCallback, useEffect, useState } from "react";
|
||||
|
||||
import classes from "./classes.module.scss";
|
||||
import { useRouter } from "next/router";
|
||||
import JwtService from "@Front/Services/JwtService/JwtService";
|
||||
|
||||
type IProps = {
|
||||
targetedCustormer: string; // MOCK
|
||||
};
|
||||
type IState = {
|
||||
isAddDocumentModalVisible: boolean;
|
||||
documents: Document[];
|
||||
mockedCustomer: Customer | null;
|
||||
type IProps = {};
|
||||
|
||||
export default function ClientDashboard(props: IProps) {
|
||||
const router = useRouter();
|
||||
let { folderUid } = router.query;
|
||||
const [documents, setDocuments] = useState<Document[] | null>(null);
|
||||
const [customer, setCustomer] = useState<Customer | null>(null);
|
||||
const [isAddDocumentModalVisible, setIsAddDocumentModalVisible] = useState<boolean>(false);
|
||||
|
||||
const onCloseModalAddDocument = useCallback(() => {
|
||||
setIsAddDocumentModalVisible(false);
|
||||
}, []);
|
||||
|
||||
const onOpenModalAddDocument = useCallback(() => {
|
||||
setIsAddDocumentModalVisible(true);
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
async function getDocuments() {
|
||||
let jwt;
|
||||
if (typeof document !== "undefined") {
|
||||
jwt = JwtService.getInstance().decodeJwt();
|
||||
}
|
||||
if (!jwt || !jwt.email) return;
|
||||
const customers = await Customers.getInstance().get({
|
||||
where: { contact: { email: jwt.email }, office_folders: { some: { uid: folderUid } } },
|
||||
});
|
||||
const actualCustomer: Customer = customers[0]!;
|
||||
|
||||
const query: IGetDocumentsparams = {
|
||||
where: { depositor: { uid: actualCustomer.uid }, folder_uid: folderUid as string },
|
||||
include: {
|
||||
files: true,
|
||||
document_history: true,
|
||||
document_type: true,
|
||||
depositor: true,
|
||||
},
|
||||
};
|
||||
|
||||
export default class ClientDashboard extends Base<IProps, IState> {
|
||||
public constructor(props: IProps) {
|
||||
super(props);
|
||||
this.state = {
|
||||
isAddDocumentModalVisible: false,
|
||||
documents: [],
|
||||
mockedCustomer: null,
|
||||
};
|
||||
this.onCloseModalAddDocument = this.onCloseModalAddDocument.bind(this);
|
||||
this.onOpenModalAddDocument = this.onOpenModalAddDocument.bind(this);
|
||||
const documentList = await Documents.getInstance().get(query);
|
||||
|
||||
setDocuments(documentList);
|
||||
setCustomer(actualCustomer);
|
||||
}
|
||||
|
||||
public override render(): JSX.Element {
|
||||
getDocuments();
|
||||
}, [folderUid]);
|
||||
|
||||
const renderHeader = useCallback(() => {
|
||||
return (
|
||||
<div className={classes["header"]}>
|
||||
<div className={classes["text-container"]}>
|
||||
{/* TODO Get name from userStore */}
|
||||
<Typography typo={ITypo.H1} className={classes["title"]}>
|
||||
Bonjour {customer?.contact?.first_name.concat(" ", customer?.contact?.last_name)}
|
||||
</Typography>
|
||||
|
||||
<Typography typo={ITypo.H2} className={classes["subtitle"]}>
|
||||
Documents à envoyer
|
||||
</Typography>
|
||||
|
||||
<Typography typo={ITypo.P_16} className={classes["text"]}>
|
||||
Votre notaire est dans l'attente de documents pour valider votre dossier. Voici la liste des documents.Veuillez
|
||||
glisser / déposez chaque document dans la zone prévue à cet effet ou cliquez sur la zone puis sélectionnez le
|
||||
document correspondant. Si un des documents demandés ne vous concernent pas, veuillez contacter votre notaire à
|
||||
l’aide du bouton ci-dessus.
|
||||
</Typography>
|
||||
</div>
|
||||
<a href="mailto:g.texier@notaires.fr" target="_blank">
|
||||
<Button className={classes["button"]}>Contacter mon notaire</Button>
|
||||
</a>
|
||||
</div>
|
||||
);
|
||||
}, [customer]);
|
||||
|
||||
return (
|
||||
<DefaultTemplate title={"Mon compte"} isPadding={false} hasHeaderLinks={false}>
|
||||
<div className={classes["root"]}>
|
||||
{this.renderHeader()}
|
||||
{renderHeader()}
|
||||
<div className={classes["sub-container"]}>
|
||||
<div className={classes["content"]}>
|
||||
{this.state.documents?.map((document) => (
|
||||
{documents?.map((document) => (
|
||||
<DepositDocument document={document} key={document.uid} defaultFiles={document.files ?? []} />
|
||||
))}
|
||||
</div>
|
||||
@ -48,14 +103,14 @@ export default class ClientDashboard extends Base<IProps, IState> {
|
||||
<Typography typo={ITypo.P_16} className={classes["text"]}>
|
||||
Vous souhaitez envoyer d'autres documents à votre notaire ?
|
||||
</Typography>
|
||||
<Button variant={EButtonVariant.GHOST} className={classes["button"]} onClick={this.onOpenModalAddDocument}>
|
||||
<Button variant={EButtonVariant.GHOST} className={classes["button"]} onClick={onOpenModalAddDocument}>
|
||||
Ajouter d'autres documents
|
||||
</Button>
|
||||
</div>
|
||||
<Confirm
|
||||
isOpen={this.state.isAddDocumentModalVisible}
|
||||
onClose={this.onCloseModalAddDocument}
|
||||
onAccept={this.onOpenModalAddDocument}
|
||||
isOpen={isAddDocumentModalVisible}
|
||||
onClose={onCloseModalAddDocument}
|
||||
onAccept={onOpenModalAddDocument}
|
||||
closeBtn
|
||||
header={"Ajouter un document"}
|
||||
cancelText={"Annuler"}
|
||||
@ -82,57 +137,3 @@ export default class ClientDashboard extends Base<IProps, IState> {
|
||||
</DefaultTemplate>
|
||||
);
|
||||
}
|
||||
|
||||
private renderHeader(): JSX.Element {
|
||||
return (
|
||||
<div className={classes["header"]}>
|
||||
<div className={classes["text-container"]}>
|
||||
{/* TODO Get name from userStore */}
|
||||
<Typography typo={ITypo.H1} className={classes["title"]}>
|
||||
Bonjour {this.state.mockedCustomer?.contact?.first_name.concat(" ", this.state.mockedCustomer?.contact?.last_name)}
|
||||
</Typography>
|
||||
|
||||
<Typography typo={ITypo.H2} className={classes["subtitle"]}>
|
||||
Documents à envoyer
|
||||
</Typography>
|
||||
|
||||
<Typography typo={ITypo.P_16} className={classes["text"]}>
|
||||
Votre notaire est dans l'attente de documents pour valider votre dossier. Voici la liste des documents.Veuillez
|
||||
glisser / déposez chaque document dans la zone prévue à cet effet ou cliquez sur la zone puis sélectionnez le
|
||||
document correspondant. Si un des documents demandés ne vous concernent pas, veuillez contacter votre notaire à
|
||||
l’aide du bouton ci-dessus.
|
||||
</Typography>
|
||||
</div>
|
||||
<a href="mailto:g.texier@notaires.fr" target="_blank">
|
||||
<Button className={classes["button"]}>Contacter mon notaire</Button>
|
||||
</a>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
public override async componentDidMount() {
|
||||
// TODO Get documents of the current customer according to userStore
|
||||
// REMOVE this mock
|
||||
const mockedCustomers = await Customers.getInstance().get({ where: { contact: { email: this.props.targetedCustormer } } });
|
||||
const mockedCustomer: Customer = mockedCustomers[0]!;
|
||||
|
||||
const query: IGetDocumentsparams = {
|
||||
where: { depositor: { uid: mockedCustomer.uid } },
|
||||
include: {
|
||||
files: true,
|
||||
document_history: true,
|
||||
document_type: true,
|
||||
},
|
||||
};
|
||||
const documents: Document[] = await Documents.getInstance().get(query);
|
||||
this.setState({ documents, mockedCustomer });
|
||||
}
|
||||
|
||||
private onCloseModalAddDocument() {
|
||||
this.setState({ isAddDocumentModalVisible: false });
|
||||
}
|
||||
|
||||
private onOpenModalAddDocument() {
|
||||
this.setState({ isAddDocumentModalVisible: true });
|
||||
}
|
||||
}
|
||||
|
141
src/front/Components/Layouts/ClientDashboard/index2.tsx
Normal file
141
src/front/Components/Layouts/ClientDashboard/index2.tsx
Normal file
@ -0,0 +1,141 @@
|
||||
import Customers from "@Front/Api/LeCoffreApi/Customer/Customers/Customers";
|
||||
import Documents, { IGetDocumentsparams } from "@Front/Api/LeCoffreApi/Customer/Documents/Documents";
|
||||
import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button";
|
||||
import DepositDocument from "@Front/Components/DesignSystem/DepositDocument";
|
||||
import TextField from "@Front/Components/DesignSystem/Form/TextField";
|
||||
import Confirm from "@Front/Components/DesignSystem/Modal/Confirm";
|
||||
import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography";
|
||||
import Base from "@Front/Components/Layouts/Base";
|
||||
import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate";
|
||||
import Customer, { Document, DocumentType } from "le-coffre-resources/dist/Customer";
|
||||
import React from "react";
|
||||
|
||||
import classes from "./classes.module.scss";
|
||||
import JwtService from "@Front/Services/JwtService/JwtService";
|
||||
|
||||
type IProps = {};
|
||||
type IState = {
|
||||
isAddDocumentModalVisible: boolean;
|
||||
documents: Document[];
|
||||
mockedCustomer: Customer | null;
|
||||
};
|
||||
|
||||
export default class ClientDashboard extends Base<IProps, IState> {
|
||||
public constructor(props: IProps) {
|
||||
super(props);
|
||||
this.state = {
|
||||
isAddDocumentModalVisible: false,
|
||||
documents: [],
|
||||
mockedCustomer: null,
|
||||
};
|
||||
this.onCloseModalAddDocument = this.onCloseModalAddDocument.bind(this);
|
||||
this.onOpenModalAddDocument = this.onOpenModalAddDocument.bind(this);
|
||||
}
|
||||
|
||||
public override render(): JSX.Element {
|
||||
return (
|
||||
<DefaultTemplate title={"Mon compte"} isPadding={false} hasHeaderLinks={false}>
|
||||
<div className={classes["root"]}>
|
||||
{this.renderHeader()}
|
||||
<div className={classes["sub-container"]}>
|
||||
<div className={classes["content"]}>
|
||||
{this.state.documents?.map((document) => (
|
||||
<DepositDocument document={document} key={document.uid} defaultFiles={document.files ?? []} />
|
||||
))}
|
||||
</div>
|
||||
<Typography typo={ITypo.H2}>Documents supplémentaires (facultatif)</Typography>
|
||||
<Typography typo={ITypo.P_16} className={classes["text"]}>
|
||||
Vous souhaitez envoyer d'autres documents à votre notaire ?
|
||||
</Typography>
|
||||
<Button variant={EButtonVariant.GHOST} className={classes["button"]} onClick={this.onOpenModalAddDocument}>
|
||||
Ajouter d'autres documents
|
||||
</Button>
|
||||
</div>
|
||||
<Confirm
|
||||
isOpen={this.state.isAddDocumentModalVisible}
|
||||
onClose={this.onCloseModalAddDocument}
|
||||
onAccept={this.onOpenModalAddDocument}
|
||||
closeBtn
|
||||
header={"Ajouter un document"}
|
||||
cancelText={"Annuler"}
|
||||
confirmText={"Déposer le document"}>
|
||||
<div className={classes["modal-content"]}>
|
||||
<Typography typo={ITypo.P_16} className={classes["text"]}>
|
||||
Vous souhaitez envoyer un autre document à votre notaire ?
|
||||
</Typography>
|
||||
<TextField placeholder="Nom du document" />
|
||||
<Typography typo={ITypo.P_16} className={classes["text"]}>
|
||||
Glissez / Déposez votre document dans la zone prévue à cet effet ou cliquez sur la zone puis sélectionnez le
|
||||
document correspondant.
|
||||
</Typography>
|
||||
<DepositDocument
|
||||
document={Document.hydrate<Document>({
|
||||
document_type: DocumentType.hydrate<DocumentType>({
|
||||
name: "Document annexe",
|
||||
}),
|
||||
})}
|
||||
/>
|
||||
</div>
|
||||
</Confirm>
|
||||
</div>
|
||||
</DefaultTemplate>
|
||||
);
|
||||
}
|
||||
|
||||
private renderHeader(): JSX.Element {
|
||||
return (
|
||||
<div className={classes["header"]}>
|
||||
<div className={classes["text-container"]}>
|
||||
{/* TODO Get name from userStore */}
|
||||
<Typography typo={ITypo.H1} className={classes["title"]}>
|
||||
Bonjour {this.state.mockedCustomer?.contact?.first_name.concat(" ", this.state.mockedCustomer?.contact?.last_name)}
|
||||
</Typography>
|
||||
|
||||
<Typography typo={ITypo.H2} className={classes["subtitle"]}>
|
||||
Documents à envoyer
|
||||
</Typography>
|
||||
|
||||
<Typography typo={ITypo.P_16} className={classes["text"]}>
|
||||
Votre notaire est dans l'attente de documents pour valider votre dossier. Voici la liste des documents.Veuillez
|
||||
glisser / déposez chaque document dans la zone prévue à cet effet ou cliquez sur la zone puis sélectionnez le
|
||||
document correspondant. Si un des documents demandés ne vous concernent pas, veuillez contacter votre notaire à
|
||||
l’aide du bouton ci-dessus.
|
||||
</Typography>
|
||||
</div>
|
||||
<a href="mailto:g.texier@notaires.fr" target="_blank">
|
||||
<Button className={classes["button"]}>Contacter mon notaire</Button>
|
||||
</a>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
public override async componentDidMount() {
|
||||
// TODO Get documents of the current customer according to userStore
|
||||
// REMOVE this mock
|
||||
|
||||
const jwt = JwtService.getInstance().decodeJwt();
|
||||
const mockedCustomers = await Customers.getInstance().get({
|
||||
where: { contact: { email: jwt?.email } },
|
||||
});
|
||||
const mockedCustomer: Customer = mockedCustomers[0]!;
|
||||
|
||||
const query: IGetDocumentsparams = {
|
||||
where: { depositor: { uid: mockedCustomer.uid } },
|
||||
include: {
|
||||
files: true,
|
||||
document_history: true,
|
||||
document_type: true,
|
||||
},
|
||||
};
|
||||
const documents: Document[] = await Documents.getInstance().get(query);
|
||||
this.setState({ documents, mockedCustomer });
|
||||
}
|
||||
|
||||
private onCloseModalAddDocument() {
|
||||
this.setState({ isAddDocumentModalVisible: false });
|
||||
}
|
||||
|
||||
private onOpenModalAddDocument() {
|
||||
this.setState({ isAddDocumentModalVisible: true });
|
||||
}
|
||||
}
|
@ -15,6 +15,7 @@ import LandingImage from "./landing-connect.jpeg";
|
||||
|
||||
export default function Login() {
|
||||
const router = useRouter();
|
||||
|
||||
const redirectUserOnConnection = useCallback(() => {
|
||||
async function getUser() {
|
||||
try {
|
||||
@ -28,6 +29,21 @@ export default function Login() {
|
||||
|
||||
getUser();
|
||||
}, [router]);
|
||||
|
||||
const redirectCustomerOnConnection = useCallback(() => {
|
||||
async function getCustomer() {
|
||||
try {
|
||||
await UserStore.instance.connectCustomer("antoine.bernard@outlook.com");
|
||||
await JwtService.getInstance().checkJwt();
|
||||
router.push(Module.getInstance().get().modules.pages.Folder.pages.Select.props.path);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
getCustomer();
|
||||
}, [router]);
|
||||
|
||||
return (
|
||||
<DefaultDoubleSidePage title={"Login"} image={LandingImage}>
|
||||
<div className={classes["root"]}>
|
||||
@ -38,6 +54,9 @@ export default function Login() {
|
||||
<Button onClick={redirectUserOnConnection} icon={idNoteLogo} iconposition={"left"}>
|
||||
S'identifier avec ID.not
|
||||
</Button>
|
||||
<Button onClick={redirectCustomerOnConnection} icon={idNoteLogo} iconposition={"left"}>
|
||||
S'identifier en tant que customer
|
||||
</Button>
|
||||
<Typography typo={ITypo.P_18}>
|
||||
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
||||
</Typography>
|
||||
|
@ -6,7 +6,7 @@ import Form from "@Front/Components/DesignSystem/Form";
|
||||
import Confirm from "@Front/Components/DesignSystem/Modal/Confirm";
|
||||
import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography";
|
||||
import DefaultRoleDashboard from "@Front/Components/LayoutTemplates/DefaultRoleDashboard";
|
||||
import { Role, Rule } from "le-coffre-resources/dist/Admin";
|
||||
import { OfficeRole, Rule } from "le-coffre-resources/dist/Admin";
|
||||
import { useRouter } from "next/router";
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import React from "react";
|
||||
@ -21,7 +21,7 @@ export default function RolesInformations(props: IProps) {
|
||||
const router = useRouter();
|
||||
let { roleUid } = router.query;
|
||||
|
||||
const [roleSelected, setRoleSelected] = useState<Role | null>(null);
|
||||
const [roleSelected, setRoleSelected] = useState<OfficeRole | null>(null);
|
||||
const [rulesCheckboxes, setRulesCheckboxes] = useState<RuleCheckbox[]>([]);
|
||||
const [selectAll, setSelectAll] = useState<boolean>(false);
|
||||
|
||||
@ -56,7 +56,7 @@ export default function RolesInformations(props: IProps) {
|
||||
}
|
||||
return { ...rule, checked: false };
|
||||
})
|
||||
.sort((ruleA, ruleB) => (ruleA.name < ruleB.name ? 1 : -1))
|
||||
.sort((ruleA, ruleB) => (ruleA.label < ruleB.label ? 1 : -1))
|
||||
.sort((rule) => (rule.checked ? -1 : 1));
|
||||
|
||||
const selectAll = rulesCheckboxes.every((rule) => rule.checked);
|
||||
@ -134,7 +134,7 @@ export default function RolesInformations(props: IProps) {
|
||||
{rulesCheckboxes.map((rule) => (
|
||||
<div className={classes["right"]} key={rule.uid}>
|
||||
<CheckBox
|
||||
option={{ label: rule.name, value: rule.uid }}
|
||||
option={{ label: rule.label, value: rule.uid }}
|
||||
checked={rule.checked}
|
||||
onChange={handleRuleChange}
|
||||
/>
|
||||
|
@ -1,4 +1,4 @@
|
||||
import Folders from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders";
|
||||
import Folders from "@Front/Api/LeCoffreApi/Customer/Folders/Folders";
|
||||
import BlockList, { IBlock } from "@Front/Components/DesignSystem/BlockList";
|
||||
import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography";
|
||||
import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage";
|
||||
@ -8,6 +8,7 @@ import { useCallback, useEffect, useState } from "react";
|
||||
|
||||
import LandingImage from "../Login/landing-connect.jpeg";
|
||||
import classes from "./classes.module.scss";
|
||||
import JwtService from "@Front/Services/JwtService/JwtService";
|
||||
|
||||
export default function SelectFolder() {
|
||||
const [folders, setFolders] = useState<OfficeFolder[]>([]);
|
||||
@ -15,8 +16,21 @@ export default function SelectFolder() {
|
||||
|
||||
useEffect(() => {
|
||||
async function getFolders() {
|
||||
const folders = await Folders.getInstance().get({});
|
||||
setFolders(folders.slice(0, 3));
|
||||
const jwt = JwtService.getInstance().decodeJwt();
|
||||
if (!jwt) return;
|
||||
|
||||
const folders = await Folders.getInstance().get({
|
||||
q: {
|
||||
where: {
|
||||
customers: {
|
||||
some: {
|
||||
uid: jwt.userId,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
setFolders(folders);
|
||||
}
|
||||
|
||||
getFolders();
|
||||
@ -24,7 +38,7 @@ export default function SelectFolder() {
|
||||
|
||||
const handleSelectBlock = useCallback(
|
||||
(block: IBlock) => {
|
||||
router.push("/client-dashboard");
|
||||
router.push("/client-dashboard/" + block.id);
|
||||
},
|
||||
[router],
|
||||
);
|
||||
|
@ -182,9 +182,9 @@ export default function UserInformations(props: IProps) {
|
||||
setRoleModalOpened(false);
|
||||
setSelectedOption({
|
||||
value: userSelected?.office_role ? userSelected?.office_role?.uid : userSelected?.role?.uid,
|
||||
label: userSelected?.office_role ? userSelected?.office_role?.name : userSelected?.role?.name!,
|
||||
label: userSelected?.office_role ? userSelected?.office_role?.name : userSelected?.role?.label!,
|
||||
});
|
||||
}, [userSelected?.office_role, userSelected?.role?.name, userSelected?.role?.uid]);
|
||||
}, [userSelected?.office_role, userSelected?.role?.label, userSelected?.role?.uid]);
|
||||
|
||||
const changeRole = useCallback(async () => {
|
||||
await Users.getInstance().put(
|
||||
@ -271,7 +271,7 @@ export default function UserInformations(props: IProps) {
|
||||
onChange={handleRoleChange}
|
||||
selectedOption={{
|
||||
value: userSelected?.office_role ? userSelected?.office_role?.uid : userSelected?.role?.uid,
|
||||
label: userSelected?.office_role ? userSelected?.office_role?.name : userSelected?.role?.name!,
|
||||
label: userSelected?.office_role ? userSelected?.office_role?.name : userSelected?.role?.label!,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
@ -8,6 +8,7 @@ enum PROVIDER_OPENID {
|
||||
|
||||
interface IUserJwtPayload {
|
||||
userId: string;
|
||||
email: string | null;
|
||||
openId: {
|
||||
providerName: PROVIDER_OPENID;
|
||||
userId: string | number;
|
||||
@ -38,6 +39,7 @@ export default class JwtService {
|
||||
*/
|
||||
public async checkJwt() {
|
||||
const decodedToken = this.decodeJwt();
|
||||
|
||||
if (!decodedToken) return;
|
||||
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
|
@ -1,6 +1,7 @@
|
||||
"use client";
|
||||
|
||||
import User from "@Front/Api/Auth/IdNot/User";
|
||||
import Customer from "@Front/Api/Auth/franceConnect/Customer";
|
||||
import CookieService from "@Front/Services/CookieService/CookieService";
|
||||
import EventEmitter from "@Front/Services/EventEmitter";
|
||||
|
||||
@ -33,6 +34,23 @@ export default class UserStore {
|
||||
return true;
|
||||
}
|
||||
|
||||
public async connectCustomer(email: string) {
|
||||
try {
|
||||
//call connection function
|
||||
const customer: any = await Customer.getInstance().login(email);
|
||||
|
||||
//Save tokens in cookies
|
||||
CookieService.getInstance().setCookie("leCoffreAccessToken", customer.accessToken);
|
||||
CookieService.getInstance().setCookie("leCoffreRefreshToken", customer.refreshToken);
|
||||
|
||||
this.event.emit("connection", this.accessToken);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public async disconnect() {
|
||||
try {
|
||||
//Remove tokens from cookies
|
||||
|
@ -1,5 +1,5 @@
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard";
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard/index";
|
||||
|
||||
export default function Route() {
|
||||
return <ClientDashboard targetedCustormer="lucie.chevalier@outlook.com" />;
|
||||
return <ClientDashboard />;
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard";
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard/index2";
|
||||
|
||||
export default function Route() {
|
||||
return <ClientDashboard targetedCustormer="manon.simon@gmail.com" />;
|
||||
|
@ -1,4 +1,4 @@
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard";
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard/index2";
|
||||
|
||||
export default function Route() {
|
||||
return <ClientDashboard targetedCustormer="vincent.brognard@gmail.com" />;
|
||||
|
@ -1,4 +1,4 @@
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard";
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard/index2";
|
||||
|
||||
export default function Route() {
|
||||
return <ClientDashboard targetedCustormer="maxime.lalo@gmail.com" />;
|
||||
|
@ -1,4 +1,4 @@
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard";
|
||||
import ClientDashboard from "@Front/Components/Layouts/ClientDashboard/index2";
|
||||
|
||||
export default function Route() {
|
||||
return <ClientDashboard targetedCustormer="kevin.hautefaye@gmail.com" />;
|
||||
|
Loading…
x
Reference in New Issue
Block a user