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

Merge branch 'dev' into staging

Browse Source
This commit is contained in:
Vins 2024-06-20 10:16:00 +02:00
commit c4cf9974cb
2 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/front/Components/DesignSystem/Newsletter/index.tsx
View File

@ -26,7 +26,7 @@ export default class Newsletter extends React.Component<IProps, IState> {
email: "", email: "",
errorMessage: "", errorMessage: "",
successMessage: "", successMessage: "",
isNewsletterOpen: false, isNewsletterOpen: this.props.isOpen ?? false,
}; };
} }
@ -60,46 +60,45 @@ 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 && (
(this.props.isOpen && ( <div className={classes["container"]}>
<div className={classes["container"]}> <div className={classes["root"]}>
<div className={classes["root"]}> <div className={classes["text"]}>
<div className={classes["text"]}> <Typography typo={ITypo.H3} color={ITypoColor.WHITE}>
<Typography typo={ITypo.H3} color={ITypoColor.WHITE}> Restez Informé(e) avec notre Newsletter
Restez Informé(e) avec notre Newsletter </Typography>
</Typography> <Typography typo={ITypo.P_18} color={ITypoColor.WHITE}>
<Typography typo={ITypo.P_18} color={ITypoColor.WHITE}> Ne manquez aucune de nos actualités, promotions exclusives et conseils d'experts !
Ne manquez aucune de nos actualités, promotions exclusives et conseils d'experts ! </Typography>
</Typography> {this.state.errorMessage && (
{this.state.errorMessage && ( <div>
<div> <Typography typo={ITypo.P_ERR_16} color={ITypoColor.RED_FLASH}>
<Typography typo={ITypo.P_ERR_16} color={ITypoColor.RED_FLASH}> {this.state.errorMessage}
{this.state.errorMessage} </Typography>
</Typography> </div>
</div> )}
)} {this.state.successMessage && (
{this.state.successMessage && ( <div>
<div> <Typography typo={ITypo.P_16} color={ITypoColor.GREEN_FLASH}>
<Typography typo={ITypo.P_16} color={ITypoColor.GREEN_FLASH}> {this.state.successMessage}
{this.state.successMessage} </Typography>
</Typography> </div>
</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"]}>

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

@ -231,7 +231,7 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
<Typography typo={ITypo.P_16}>Cette action sera irréversible.</Typography> <Typography typo={ITypo.P_16}>Cette action sera irréversible.</Typography>
</div> </div>
</Confirm> </Confirm>
<Newsletter /> <Newsletter isOpen={false} />
</div> </div>
) : ( ) : (
<div className={classes["no-folder-selected"]}> <div className={classes["no-folder-selected"]}>