Merge branch 'dev' into staging

This commit is contained in:
Vins 2024-06-20 09:52:13 +02:00
commit 030d010186
2 changed files with 42 additions and 54 deletions

View File

@ -8,7 +8,9 @@ import Form from "../Form";
import Mail from "@Assets/Icons/mail.svg"; import Mail from "@Assets/Icons/mail.svg";
import Image from "next/image"; import Image from "next/image";
type IProps = {}; type IProps = {
isOpen?: boolean;
};
interface IState { interface IState {
email: string; email: string;
@ -58,45 +60,46 @@ export default class Newsletter extends React.Component<IProps, IState> {
public override render(): JSX.Element { public override render(): JSX.Element {
return ( return (
<> <>
{this.state.isNewsletterOpen && ( {this.state.isNewsletterOpen ||
<div className={classes["container"]}> (this.props.isOpen && (
<div className={classes["root"]}> <div className={classes["container"]}>
<div className={classes["text"]}> <div className={classes["root"]}>
<Typography typo={ITypo.H3} color={ITypoColor.WHITE}> <div className={classes["text"]}>
Restez Informé(e) avec notre Newsletter <Typography typo={ITypo.H3} color={ITypoColor.WHITE}>
</Typography> Restez Informé(e) avec notre Newsletter
<Typography typo={ITypo.P_18} color={ITypoColor.WHITE}> </Typography>
Ne manquez aucune de nos actualités, promotions exclusives et conseils d'experts ! <Typography typo={ITypo.P_18} color={ITypoColor.WHITE}>
</Typography> Ne manquez aucune de nos actualités, promotions exclusives et conseils d'experts !
{this.state.errorMessage && ( </Typography>
<div> {this.state.errorMessage && (
<Typography typo={ITypo.P_ERR_16} color={ITypoColor.RED_FLASH}> <div>
{this.state.errorMessage} <Typography typo={ITypo.P_ERR_16} color={ITypoColor.RED_FLASH}>
</Typography> {this.state.errorMessage}
</div> </Typography>
)} </div>
{this.state.successMessage && ( )}
<div> {this.state.successMessage && (
<Typography typo={ITypo.P_16} color={ITypoColor.GREEN_FLASH}> <div>
{this.state.successMessage} <Typography typo={ITypo.P_16} color={ITypoColor.GREEN_FLASH}>
</Typography> {this.state.successMessage}
</div> </Typography>
)} </div>
</div> )}
</div>
<div className={classes["buttons"]}> <div className={classes["buttons"]}>
<Form onSubmit={this.handleSubmit} className={classes["form"]}> <Form onSubmit={this.handleSubmit} className={classes["form"]}>
<TextField name="EMAIL" placeholder="Email" onChange={this.handleChange} /> <TextField name="EMAIL" placeholder="Email" onChange={this.handleChange} />
<div className={classes["buttons-container"]}> <div className={classes["buttons-container"]}>
<Button fullwidth type="submit" variant={EButtonVariant.WHITE}> <Button fullwidth type="submit" variant={EButtonVariant.WHITE}>
Envoyer Envoyer
</Button> </Button>
</div> </div>
</Form> </Form>
</div>
</div> </div>
</div> </div>
</div> ))}
)}
<div className={classes["container-icon"]}> <div className={classes["container-icon"]}>
<div className={classes["newsletter"]}> <div className={classes["newsletter"]}>

View File

@ -5,8 +5,6 @@ import { OfficeFolder } from "le-coffre-resources/dist/Notary";
import BasePage from "../Base"; import BasePage from "../Base";
import classes from "./classes.module.scss"; import classes from "./classes.module.scss";
import Newletter from "@Front/Components/DesignSystem/Newsletter"; import Newletter from "@Front/Components/DesignSystem/Newsletter";
// import Image from "next/image";
// import Mail from "@Assets/Icons/mail.svg";
type IProps = {}; type IProps = {};
type IState = { type IState = {
@ -18,7 +16,7 @@ export default class Folder extends BasePage<IProps, IState> {
super(props); super(props);
this.state = { this.state = {
selectedFolder: null, selectedFolder: null,
isArchivedModalOpen: false, isArchivedModalOpen: true,
}; };
this.onSelectedFolder = this.onSelectedFolder.bind(this); this.onSelectedFolder = this.onSelectedFolder.bind(this);
} }
@ -35,16 +33,7 @@ export default class Folder extends BasePage<IProps, IState> {
Sélectionnez un dossier Sélectionnez un dossier
</Typography> </Typography>
</div> </div>
<Newletter /> <Newletter isOpen />
{/* <div className={classes["newsletter"]}>
<Image
src={Mail}
alt="newsletter-icon"
className={classes["newsletter-icon"]}
onClick={() => this.handleNewsletterOpen(this.state.isNewsletterOpen)}
/>
</div> */}
</div> </div>
</div> </div>
</DefaultNotaryDashboard> </DefaultNotaryDashboard>
@ -54,8 +43,4 @@ export default class Folder extends BasePage<IProps, IState> {
private onSelectedFolder(folder: OfficeFolder): void { private onSelectedFolder(folder: OfficeFolder): void {
this.setState({ selectedFolder: folder }); this.setState({ selectedFolder: folder });
} }
// private handleNewsletterOpen(isNewsletterOpen: boolean): void {
// this.setState({ isNewsletterOpen: !isNewsletterOpen });
// }
} }