Skip to content
Snippets Groups Projects
Commit 0780eeea authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

Merge branch 'dev' of... 

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client into dev
parents 33d0af77 d9e84238
No related branches found
No related tags found
2 merge requests!103Recette,!102Dev
Hide whitespace changes
Inline Side-by-side
src/app/form/form.component.html
+ 19
− 17
View file @ 0780eeea
...@@ -1098,25 +1098,27 @@ ...@@ -1098,25 +1098,27 @@
<svg aria-hidden="true"> <svg aria-hidden="true">
<use [attr.xlink:href]="'assets/form/sprite.svg#emailVerification'"></use> <use [attr.xlink:href]="'assets/form/sprite.svg#emailVerification'"></use>
</svg> </svg>
<h3>Un courriel vous a été envoyé afin de finaliser votre inscription</h3> <h3>Un courriel vous a été envoyé afin de valider votre inscription</h3>
</div> </div>
<div *ngIf="currentPage == nbPagesForm && profile" class="page"> <div *ngIf="currentPage == nbPagesForm && profile" class="lastPage">
<div class="title"> <div class="lastPage">
<h3> <div class="title">
Bravo !<br /> <h3>
Votre structure a bien été référencée. Bravo !<br />
</h3> Votre structure a bien été référencée.
</div> </h3>
<div class="structureInfoBlock" fxLayout="row" fxLayoutAlign="center">
<div class="structureInfoContent" fxLayout="column">
{{ getStructureControl('structureName').value }}
<span>{{ getStructureControl('structureType').value }}</span>
</div> </div>
<div class="validateSvg">
<svg class="validate" aria-hidden="true"> <div class="structureInfoBlock" fxLayout="row" fxLayoutAlign="center">
<use [attr.xlink:href]="'assets/form/sprite.svg#checkVector'"></use> <div class="structureInfoContent" fxLayout="column">
</svg> {{ getStructureControl('structureName').value }}
<span>{{ getStructureControl('structureType').value }}</span>
</div>
<div class="validateSvg">
<svg class="validate" aria-hidden="true">
<use [attr.xlink:href]="'assets/form/sprite.svg#checkVector'"></use>
</svg>
</div>
</div> </div>
</div> </div>
</div> </div>
......
src/app/form/form.component.scss
+ 5
− 0
View file @ 0780eeea
...@@ -531,3 +531,8 @@ img { ...@@ -531,3 +531,8 @@ img {
overflow: hidden; overflow: hidden;
} }
} }
.lastPage {
max-width: 530px;
margin: 0 auto;
}
src/app/user-verification/user-verification.component.html
+ 63
− 39
View file @ 0780eeea
<div fxLayout="column" class="content-container full-screen"> <div fxLayout="column" class="content-container full-screen">
<p *ngIf="!verificationSuccess && !verificationIssue">Votre email est en cours de vérification ...</p> <p *ngIf="!verificationSuccess && !verificationIssue">Votre email est en cours de vérification ...</p>
<div *ngIf="verificationSuccess"> <div class="formDiv" *ngIf="verificationSuccess">
<div class="title"> <div *ngIf="structure">
<h3 *ngIf="structure"> <div class="title">
Bravo !<br /> <h1 class="title-form">Bravo, votre compte et votre structure ont bien été référencés !</h1>
Votre compte et votre structure ont bien été référencés. </div>
</h3> <div class="structureInfoBlock" fxLayout="row" fxLayoutAlign="center">
<h3 *ngIf="!structure"> <div class="structureInfoContent" fxLayout="column">
Bravo !<br /> {{ structure.structureName }}
Votre compte a bien été créé. <span>{{ structure.structureType }}</span>
</h3> </div>
</div> <div class="validateSvg">
<div *ngIf="structure" class="structureCard"> <svg class="validate" aria-hidden="true">
<div class="structureInfo" fxLayout="column" fxLayoutGap="14px"> <use [attr.xlink:href]="'assets/form/sprite.svg#checkVector'"></use>
<div fxLayout="row" fxLayoutAlign="space-between start" fxLayoutGap="20px"> </svg>
<a class="structureName" routerLink="/home" [state]="{ data: structure }">{{ structure.structureName }}</a>
</div> </div>
</div> </div>
<div class="btnSection" fxLayout="row" fxLayoutAlign="space-around center">
<button
*ngIf="verificationSuccess"
class="btn"
routerLink="/home"
[queryParams]="{ id: structure._id }"
[state]="{ data: structure }"
>
Voir ma structure
</button>
</div>
</div>
<div *ngIf="!structure">
<div>
<h1 class="title-form">Une dernière validation de Rés'in et votre structure vous sera attribuée !</h1>
<div style="font-style: italic">Cela prendra 3 jours maximum si nous ne sommes pas le weekend ;)</div>
<svg class="formClock" aria-hidden="true">
<use [attr.xlink:href]="'assets/form/sprite.svg#formClock'"></use>
</svg>
</div>
</div> </div>
</div> </div>
<p *ngIf="verificationIssue"> <p *ngIf="verificationIssue">
Une erreur est survenue lors de la validation de votre email... Veuillez envoyer un mail au support. Une erreur est survenue lors de la validation de votre email... Veuillez envoyer un mail au support.
</p> </p>
<!-- TypeForm --> <!-- formulaire -->
<div *ngIf="!verificationIssue"> <div class="formDiv" *ngIf="!verificationIssue">
<iframe <div *ngIf="!structure">
*ngIf="structure" En attendant, vous pouvez participer à l'amélioration de Rés'in en répondant à ces quelques questions
class="typeform-widget custom-form" </div>
title="typeform" <div *ngIf="structure">
src="https://form.typeform.com/to/m7DV3CdW?typeform-medium=embed-snippet" Donnez nous votre avis: vous pouvez participer à l'amélioration de Rés'in en répondant à ces quelques questions
></iframe> </div>
<div <div fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="24px" [style.margin-top]="'50px'">
*ngIf="!structure" <button class="button" routerLink="/home">Je passe mon tour</button>
class="typeform-widget custom-form" <a
data-url="https://form.typeform.com/to/ASJH3B7Z?typeform-medium=embed-snippet" *ngIf="structure"
></div> target="_blank"
</div> class="btn custom-link"
<div class="btnSection" fxLayout="row" fxLayoutAlign="space-around center"> rel="noopener noreferrer"
<button [href]="'https://form.typeform.com/to/m7DV3CdW?typeform-medium=embed-snippet'"
*ngIf="structure && verificationSuccess" >
class="btn" Nous aider
routerLink="/home" </a>
[queryParams]="{ id: structure._id }" <a
[state]="{ data: structure }" *ngIf="!structure"
> target="_blank"
Voir ma structure class="btn custom-link"
</button> rel="noopener noreferrer"
[href]="'https://form.typeform.com/to/ASJH3B7Z?typeform-medium=embed-snippet'"
>
Nous aider
</a>
</div>
</div> </div>
</div> </div>
src/app/user-verification/user-verification.component.scss
+ 55
− 5
View file @ 0780eeea
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
border: 0; border: 0;
color: $white; color: $white;
height: 40px; height: 40px;
width: 192px; width: 244px;
@include btn-bold; text-decoration: none;
font-size: 16px !important;
} }
.btnSection { .btnSection {
@media #{$large-phone} { @media #{$large-phone} {
...@@ -46,9 +47,58 @@ ...@@ -46,9 +47,58 @@
// Override button style to be the same as typeform button // Override button style to be the same as typeform button
button { button {
margin: 0px; margin: 0px;
border: none;
background: none;
max-width: 100%; max-width: 100%;
font-size: 24px !important; cursor: pointer;
text-decoration: underline;
font-size: 16px !important;
line-height: 32px !important; line-height: 32px !important;
min-height: 48px; min-height: 40px;
width: 245px !important; width: 244 !important;
}
.formDiv {
max-width: 530px;
padding-bottom: 30px;
margin: 0 auto;
}
.title-form {
font-size: 26px;
}
.structureInfoBlock {
background: $green-1;
color: $white;
padding: 16px;
border-radius: 6px;
@include cn-bold-18;
.structureInfoContent {
width: 100%;
}
span {
font-style: italic;
@include cn-regular-14;
}
.validateSvg {
stroke: $white;
text-align: right;
svg {
height: 14px;
width: 14px;
}
}
}
.formClock {
width: 100%;
height: 146px;
margin: 24px;
}
.custom-link {
display: flex;
align-items: center;
justify-content: center;
} }
src/assets/form/sprite.svg
+ 6
− 0
View file @ 0780eeea
...@@ -343,4 +343,10 @@ ...@@ -343,4 +343,10 @@
<path d="M8 13.8182L11.8889 17L18 10" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/> <path d="M8 13.8182L11.8889 17L18 10" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
</symbol> </symbol>
<symbol id="formClock" viewBox="0 0 146 146" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="73.2273" cy="73.8401" r="67.2273" fill="#EAF8FB" stroke="#348899" stroke-width="12"/>
<path d="M75.2275 24.3398C75.2275 23.2353 74.3321 22.3398 73.2275 22.3398C72.123 22.3398 71.2275 23.2353 71.2275 24.3398H75.2275ZM73.2275 73.8398H71.2275C71.2275 74.4855 71.5392 75.0914 72.0645 75.4669L73.2275 73.8398ZM94.4205 91.4476C95.3191 92.0899 96.5683 91.8822 97.2106 90.9836C97.853 90.085 97.6452 88.8358 96.7466 88.1935L94.4205 91.4476ZM71.2275 24.3398V73.8398H75.2275V24.3398H71.2275ZM72.0645 75.4669L94.4205 91.4476L96.7466 88.1935L74.3906 72.2128L72.0645 75.4669Z" fill="#DC2A59"/>
</symbol>
</svg> </svg>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment