Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
Resin
Client
Commits
7635a489
Commit
7635a489
authored
4 years ago
by
Jérémie BRISON
Browse files
Options
Downloads
Patches
Plain Diff
fix(form) : fix user verification without new structure
parent
c9f791e0
No related branches found
No related tags found
3 merge requests
!68
Recette
,
!67
Dev
,
!66
Fix/form design create structure
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/user-verification/user-verification.component.html
+7
-3
7 additions, 3 deletions
src/app/user-verification/user-verification.component.html
src/app/user-verification/user-verification.component.ts
+21
-17
21 additions, 17 deletions
src/app/user-verification/user-verification.component.ts
with
28 additions
and
20 deletions
src/app/user-verification/user-verification.component.html
+
7
−
3
View file @
7635a489
...
...
@@ -2,13 +2,17 @@
<p
*ngIf=
"!verificationSuccess && !verificationIssue"
>
Votre email est en cours de vérification ...
</p>
<div
*ngIf=
"verificationSuccess"
>
<div
class=
"title"
>
<h3>
<h3
*ngIf=
"structure"
>
Bravo !
<br
/>
Votre compte et votre structure ont bien été référencés.
</h3>
<h3
*ngIf=
"!structure"
>
Bravo !
<br
/>
Votre compte a bien été créé.
</h3>
</div>
<div
class=
"structureInfoBlock"
fxLayout=
"row"
fxLayoutAlign=
" center"
>
<div
*ngIf=
"structure"
class=
"structureInfoBlock"
fxLayout=
"row"
fxLayoutAlign=
" center"
>
<div
class=
"structureInfoContent"
fxLayout=
"column"
>
{{ structure.structureName }}
<span>
{{ structure.structureType }}
</span>
...
...
@@ -20,7 +24,7 @@
</div>
</div>
<div
class=
"btnSection"
>
<button
class=
"btn"
routerLink=
"/home"
[state]=
"{ data: structure }"
>
Voir ma structure
</button>
<button
*ngIf=
"structure"
class=
"btn"
routerLink=
"/home"
[state]=
"{ data: structure }"
>
Voir ma structure
</button>
</div>
</div>
<p
*ngIf=
"verificationIssue"
>
...
...
This diff is collapsed.
Click to expand it.
src/app/user-verification/user-verification.component.ts
+
21
−
17
View file @
7635a489
...
...
@@ -35,23 +35,27 @@ export class UserVerificationComponent implements OnInit {
private
sendVerification
():
void
{
this
.
authService
.
verifyUser
(
this
.
userId
,
this
.
token
).
subscribe
(
(
user
:
User
)
=>
{
this
.
structureService
.
getStructure
(
user
.
structuresLink
[
0
]).
subscribe
(
(
structure
)
=>
{
structure
.
accountVerified
=
true
;
this
.
structure
=
structure
;
this
.
structureService
.
updateStructureAfterOwnerVerify
(
structure
.
_id
,
user
).
subscribe
(
()
=>
{
this
.
verificationSuccess
=
true
;
},
()
=>
{
this
.
verificationIssue
=
true
;
}
);
},
()
=>
{
this
.
verificationIssue
=
true
;
}
);
if
(
user
.
structuresLink
[
0
])
{
this
.
structureService
.
getStructure
(
user
.
structuresLink
[
0
]).
subscribe
(
(
structure
)
=>
{
structure
.
accountVerified
=
true
;
this
.
structure
=
structure
;
this
.
structureService
.
updateStructureAfterOwnerVerify
(
structure
.
_id
,
user
).
subscribe
(
()
=>
{
this
.
verificationSuccess
=
true
;
},
()
=>
{
this
.
verificationIssue
=
true
;
}
);
},
()
=>
{
this
.
verificationIssue
=
true
;
}
);
}
else
{
this
.
verificationSuccess
=
true
;
}
},
()
=>
{
this
.
verificationIssue
=
true
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment