From 8bb1074aebd3da90839f0982e71190e1bcf8723c Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Fri, 12 May 2023 11:17:22 +0200 Subject: [PATCH 1/2] :bug: Wording archived folders --- .../Layouts/FolderArchived/FolderInformation/index.tsx | 8 ++++---- src/front/Components/Layouts/FolderArchived/index.tsx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx b/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx index 36d8aafc..41c653f3 100644 --- a/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx @@ -1,17 +1,17 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; +import Folders, { IPutFoldersParams } from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import FolderBoxInformation, { EFolderBoxInformationType } from "@Front/Components/DesignSystem/FolderBoxInformation"; import QuantityProgressBar from "@Front/Components/DesignSystem/QuantityProgressBar"; import Typography, { ITypo, ITypoColor } from "@Front/Components/DesignSystem/Typography"; import DefaultNotaryDashboard, { IDashBoardFolder } from "@Front/Components/LayoutTemplates/DefaultNotaryDashboard"; +import Module from "@Front/Config/Module"; +import { OfficeFolder } from "le-coffre-resources/dist/Customer"; import { NextRouter, useRouter } from "next/router"; import BasePage from "../../Base"; import classes from "./classes.module.scss"; import ClientSection from "./ClientSection"; -import { OfficeFolder } from "le-coffre-resources/dist/Customer"; -import Folders, { IPutFoldersParams } from "@Front/Api/LeCoffreApi/SuperAdmin/Folders/Folders"; -import Module from "@Front/Config/Module"; type IProps = {}; @@ -93,7 +93,7 @@ class FolderInformationClass extends BasePage { Informations du dossier
- Vous n'avez aucun dossier archivé + Aucun dossier sélectionné
diff --git a/src/front/Components/Layouts/FolderArchived/index.tsx b/src/front/Components/Layouts/FolderArchived/index.tsx index 68c3b4a1..7b71e800 100644 --- a/src/front/Components/Layouts/FolderArchived/index.tsx +++ b/src/front/Components/Layouts/FolderArchived/index.tsx @@ -8,7 +8,7 @@ type IState = { selectedFolder: IDashBoardFolder | null; isArchivedModalOpen: boolean; }; -export default class Folder extends BasePage { +export default class FolderArchived extends BasePage { public constructor(props: IProps) { super(props); this.state = { @@ -31,7 +31,7 @@ export default class Folder extends BasePage { Informations du dossier
- Vous n'avez aucun dossier archivé + Aucun dossier sélectionné
From 153e98fb322d318d4ee3dd5eb5376050f0d28044 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Fri, 12 May 2023 11:32:58 +0200 Subject: [PATCH 2/2] :bug: Default env vars --- src/pages/_app.tsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 0e6998df..c45d2226 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -41,16 +41,16 @@ const MyApp = (({ const getLayout = Component.getLayout ?? ((page) => ); const instance = FrontendVariables.getInstance(); - instance.BACK_API_PROTOCOL = backApiProtocol; - instance.BACK_API_HOST = backApiHost; - instance.BACK_API_ROOT_URL = backApiRootUrl; - instance.BACK_API_VERSION = backApiVersion; - instance.FRONT_APP_HOST = frontAppHost; - instance.FRONT_APP_PORT = frontAppPort; - instance.IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint; - instance.IDNOT_CLIENT_ID = idNotClientId; - instance.FC_AUTHORIZE_ENDPOINT= fcAuthorizeEndpoint; - instance.FC_CLIENT_ID = fcClientId + instance.BACK_API_PROTOCOL = backApiProtocol ?? "https://"; + instance.BACK_API_HOST = backApiHost ?? "api.stg.lecoffre.smart-chain.fr"; + instance.BACK_API_ROOT_URL = backApiRootUrl ?? "/api"; + instance.BACK_API_VERSION = backApiVersion ?? "/v1"; + instance.FRONT_APP_HOST = frontAppHost ?? "app.stg.lecoffre.smart-chain.fr"; + instance.FRONT_APP_PORT = frontAppPort ?? "3000"; + instance.IDNOT_AUTHORIZE_ENDPOINT = idNotAuthorizeEndpoint ?? "https://qual-connexion.idnot.fr/IdPOAuth2/authorize/idnot_idp_v1"; + instance.IDNOT_CLIENT_ID = idNotClientId ?? "4501646203F3EF67"; + instance.FC_AUTHORIZE_ENDPOINT= fcAuthorizeEndpoint ?? "https://fcp.integ01.dev-franceconnect.fr/api/v1/authorize"; + instance.FC_CLIENT_ID = fcClientId ?? "211286433e39cce01db448d80181bdfd005554b19cd51b3fe7943f6b3b86ab6e"; return getLayout(); }) as AppType;