diff --git a/src/app/profile/profile-routing.module.ts b/src/app/profile/profile-routing.module.ts
index 20e114fbdd1874a9bb838351c7fde98fba2da7d6..efa2a89b3aa637f97e9cc0bea9f80e0596411440 100644
--- a/src/app/profile/profile-routing.module.ts
+++ b/src/app/profile/profile-routing.module.ts
@@ -9,7 +9,16 @@ import { StructureEditionSummaryComponent } from './structure-edition-summary/st
const routes: Routes = [
{
path: '',
- component: ProfileComponent,
+ children: [
+ {
+ path: '',
+ component: ProfileComponent,
+ },
+ {
+ path: ':id',
+ component: ProfileComponent,
+ },
+ ],
},
{
path: 'edit-structure/:id',
diff --git a/src/app/profile/profile.component.html b/src/app/profile/profile.component.html
index 1894d69585aae7756afe5cd7a4efad1def52610f..72e3e2140ca25f1ea27a1869590355d046d26e94 100644
--- a/src/app/profile/profile.component.html
+++ b/src/app/profile/profile.component.html
@@ -7,8 +7,17 @@
>
<section>
<div fxLayout="row" fxLayoutAlign="start center" fxFill>
+ <app-svg-icon
+ *ngIf="isPublic"
+ (click)="goBack()"
+ [iconClass]="'backArrow'"
+ [type]="'ico'"
+ [icon]="'arrowBack'"
+ class="backArrow"
+ ></app-svg-icon>
<h1>Profil</h1>
<app-button
+ *ngIf="!isPublic"
class="hide-on-mobile"
[type]="'button'"
[iconBtn]="'edit'"
@@ -18,6 +27,7 @@
[routerLinkActive]="'active'"
></app-button>
<app-button
+ *ngIf="!isPublic"
class="hide-on-desktop"
[type]="'button'"
[iconBtn]="'edit'"
@@ -44,6 +54,7 @@
</div>
<div class="call-to-action" *ngIf="!userProfile.description" fxLayoutAlign="center center" fxFill>
<app-button
+ *ngIf="!isPublic"
[type]="'button'"
[iconBtn]="'edit'"
[text]="'Ajouter une description'"
@@ -59,6 +70,7 @@
<div fxLayout="row" fxLayoutAlign="start center" fxFill>
<h1>Structures</h1>
<app-button
+ *ngIf="!isPublic"
class="hide-on-mobile"
[type]="'button'"
[iconBtn]="'edit'"
@@ -82,10 +94,11 @@
<div class="structureCard" *ngFor="let s of structures; let i = index">
<div class="structureInfo" fxLayout="column" fxLayoutGap="14px">
<div fxLayout="row" fxLayoutAlign="space-between start" fxLayoutGap="20px">
- <a class="structureName" [routerLink]="['/profile']" [queryParams]="{ id: s.structure._id }">{{
+ <a class="structureName" [routerLink]="['./']" [queryParams]="{ id: s.structure._id }">{{
s.structure.structureName
}}</a>
<app-structure-options-modal
+ *ngIf="!isPublic"
[structure]="s"
(closed)="ngOnInit()"
(closedWithRefresh)="ngOnInit()"
@@ -101,12 +114,12 @@
</div>
</section>
- <section>
+ <section *ngIf="!isPublic">
<div fxLayout="row" fxLayoutAlign="start center" fxFill>
<h1>Ressources</h1>
</div>
</section>
- <section>
+ <section *ngIf="!isPublic">
<div fxLayout="row" fxLayoutAlign="start center" fxFill>
<h1>Newsletter</h1>
</div>
diff --git a/src/app/profile/profile.component.scss b/src/app/profile/profile.component.scss
index edb87e36fa787f5ac2814c040eee88523a483313..b27287863c1c0e73c513c59eb804d7cf18aac7be 100644
--- a/src/app/profile/profile.component.scss
+++ b/src/app/profile/profile.component.scss
@@ -33,6 +33,10 @@ section {
.call-to-action {
margin-top: 40px;
}
+
+ .backArrow {
+ cursor: pointer;
+ }
}
.profile {
diff --git a/src/app/profile/profile.component.ts b/src/app/profile/profile.component.ts
index 83396242ae15568b6217de85f7629e49956d92e5..d6534cc2ab5969752ea250db701015a4ea2a33cc 100644
--- a/src/app/profile/profile.component.ts
+++ b/src/app/profile/profile.component.ts
@@ -1,41 +1,78 @@
+import { UserService } from './../services/user.service';
import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
import { ButtonType } from '@gouvfr-anct/mediation-numerique/shared';
import { StructureWithOwners } from '../models/structureWithOwners.model';
import { User } from '../models/user.model';
import { StructureService } from '../services/structure.service';
import { ProfileService } from './services/profile.service';
import { Utils } from '../utils/utils';
+import { catchError, map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { Location } from '@angular/common';
@Component({
selector: 'app-profile',
templateUrl: './profile.component.html',
- styleUrls: ['./profile.component.scss'],
+ styleUrls: ['./profile.component.scss']
})
export class ProfileComponent implements OnInit {
public userProfile: User;
public structures: StructureWithOwners[] = [];
public buttonTypeEnum = ButtonType;
+ public isPublic: boolean;
constructor(
private profileService: ProfileService,
private structureService: StructureService,
+ private userService: UserService,
+ private route: ActivatedRoute,
private router: Router,
+ private location: Location,
public utils: Utils
) {}
ngOnInit(): void {
- this.profileService.getProfile().then((profile: User) => {
- this.userProfile = profile;
- this.structures = [];
- profile.structuresLink.forEach((structureId) => {
- this.structureService.getStructureWithOwners(structureId, null).subscribe((s) => {
- this.structures.push(s);
+ this.route.params.subscribe((urlParams) => {
+ const userId = urlParams.id ? urlParams.id : '';
+ if (userId) {
+ this.isPublic = true;
+ this.userService
+ .getUser(userId)
+ .pipe(
+ map((res) => res),
+ catchError(() => {
+ this.router.navigate(['/home']);
+ return new Observable<User>();
+ })
+ )
+ .subscribe((user) => {
+ this.userProfile = user;
+ this.getStructuresFromProfile();
+ });
+ } else {
+ this.isPublic = false;
+ this.profileService.getProfile().then((profile: User) => {
+ this.userProfile = profile;
+ this.getStructuresFromProfile();
});
+ }
+ });
+ }
+
+ private getStructuresFromProfile() {
+ this.structures = [];
+ this.userProfile.structuresLink.forEach((structureId) => {
+ this.structureService.getStructureWithOwners(structureId, null).subscribe((s) => {
+ this.structures.push(s);
});
});
}
+ public goBack(): void {
+ this.location.back();
+ }
+
public addStructure(): void {
this.router.navigateByUrl('/form/structure');
}
diff --git a/src/app/structure/components/structure-details-wrapper/structure-details-wrapper.component.html b/src/app/structure/components/structure-details-wrapper/structure-details-wrapper.component.html
index 678979d074c79717e474232c0207fd489eb11e4e..642b684ff581a1e48fa74dd7ae2407a235a10f97 100644
--- a/src/app/structure/components/structure-details-wrapper/structure-details-wrapper.component.html
+++ b/src/app/structure/components/structure-details-wrapper/structure-details-wrapper.component.html
@@ -39,11 +39,18 @@
<h2>Membres</h2>
<div fxLayout="column" fxLayoutGap="8px" fxLayoutAlign="baseline baseline">
<div *ngFor="let member of structureAdmins" class="member-card">
- <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'"></app-svg-icon>
- <div class="info-member">
- <p class="member">{{ member.name | uppercase }} {{ member.surname | titlecase }}</p>
- <p class="job" *ngIf="displayJobEmployer(member)">{{ displayJobEmployer(member) }}</p>
- </div>
+ <a [routerLink]="'/profile/' + member._id">
+ <app-svg-icon
+ class="avatar"
+ [type]="'avatar'"
+ [icon]="'defaultAvatar'"
+ [iconClass]="'icon-40'"
+ ></app-svg-icon>
+ <div class="info-member">
+ <p class="member">{{ member.name | uppercase }} {{ member.surname | titlecase }}</p>
+ <p class="job" *ngIf="displayJobEmployer(member)">{{ displayJobEmployer(member) }}</p>
+ </div>
+ </a>
</div>
</div>
</div>
diff --git a/src/app/structure/components/structure-details-wrapper/structure-details-wrapper.component.scss b/src/app/structure/components/structure-details-wrapper/structure-details-wrapper.component.scss
index 0b82adf0b3e7a31c9c305f17405faa2f8faf19ba..8dee4cd6877e3920aaa328ef043cbaa8bc3a39da 100644
--- a/src/app/structure/components/structure-details-wrapper/structure-details-wrapper.component.scss
+++ b/src/app/structure/components/structure-details-wrapper/structure-details-wrapper.component.scss
@@ -33,6 +33,14 @@ h3 {
display: flex;
justify-content: center;
align-items: center;
+ a {
+ text-decoration: none;
+ display: flex;
+ align-items: center;
+ }
+ a:hover {
+ text-decoration: underline;
+ }
.avatar {
background-color: $grey-8;
border-radius: 4px;