Merge branch 'dev' into feat/posts-list

src/app/admin/components/claim-structure/claim-structure.component.ts

@@ -17,14 +17,18 @@ export class ClaimStructureComponent implements OnInit {
   }
 
   public acceptDemand(demand: DemandAttachment): void {
-    this.adminService.acceptStructureClaim(demand.userEmail, demand.structureId).subscribe((data) => {
-      this.demandsAttachment = data;
-    });
+    this.adminService
+      .acceptStructureClaim(demand.userEmail, demand.structureId, demand.structureName)
+      .subscribe((data) => {
+        this.demandsAttachment = data;
+      });
   }
 
   public refuseDemand(demand: DemandAttachment): void {
-    this.adminService.refuseStructureClaim(demand.userEmail, demand.structureId).subscribe((data) => {
-      this.demandsAttachment = data;
-    });
+    this.adminService
+      .refuseStructureClaim(demand.userEmail, demand.structureId, demand.structureName)
+      .subscribe((data) => {
+        this.demandsAttachment = data;
+      });
   }
 }

src/app/admin/services/admin.service.ts

@@ -15,11 +15,27 @@ export class AdminService {
     return this.http.get<DemandAttachment[]>(`${this.baseUrl}/pendingStructures`);
   }
 
-  public acceptStructureClaim(userEmail: string, structureId: number): Observable<DemandAttachment[]> {
-    return this.http.post<DemandAttachment[]>(`${this.baseUrl}/validatePendingStructure`, { userEmail, structureId });
+  public acceptStructureClaim(
+    userEmail: string,
+    structureId: number,
+    structureName: string
+  ): Observable<DemandAttachment[]> {
+    return this.http.post<DemandAttachment[]>(`${this.baseUrl}/validatePendingStructure`, {
+      userEmail,
+      structureId,
+      structureName,
+    });
   }
 
-  public refuseStructureClaim(userEmail: string, structureId: number): Observable<DemandAttachment[]> {
-    return this.http.post<DemandAttachment[]>(`${this.baseUrl}/rejectPendingStructure`, { userEmail, structureId });
+  public refuseStructureClaim(
+    userEmail: string,
+    structureId: number,
+    structureName: string
+  ): Observable<DemandAttachment[]> {
+    return this.http.post<DemandAttachment[]>(`${this.baseUrl}/rejectPendingStructure`, {
+      userEmail,
+      structureId,
+      structureName,
+    });
   }
 }

src/app/app.component.ts

@@ -23,6 +23,15 @@ export class AppComponent {
     if (this.authService.isLoggedIn()) {
       this.profilService.getProfile();
     }
+    this.setHeightApp();
+    window.addEventListener('resize', () => {
+      this.setHeightApp();
+    });
+  }
+
+  private setHeightApp(): void {
+    const vh = window.innerHeight * 0.01;
+    document.documentElement.style.setProperty('--vh', `${vh}px`);
   }
   public onScrollDown(event): void {
     this.windowScrollService.scrollY.next(event);

src/app/form/form.component.html

@@ -62,7 +62,7 @@
       fxLayoutAlign="space-between center"
       fxLayoutAlign.lt-sm="center"
     >
-      <h2 class="no-wrap">
+      <h2>
         {{ isJoinMode ? 'Rejoindre' : 'Revendiquer' }} la structure <span>{{ claimStructure.structureName }}</span>
       </h2>
       <div>

src/app/form/form.component.scss

@@ -16,11 +16,11 @@ h3 {
 .form {
   background: white;
   width: 100vw;
-  height: calc(100vh - #{$header-height} - #{$footer-height});
+  height: calc(var(--vh, 1vh) * 100 - #{$header-height} - #{$footer-height});
   top: #{$header-height};
   z-index: $structure-details-z-index;
   @media #{$tablet} {
-    height: calc(100vh - #{$header-height});
+    height: calc(var(--vh, 1vh) * 100 - #{$header-height});
     position: fixed; //Hide default header app.
   }
 }
@@ -115,9 +115,6 @@ h3 {
     span {
       color: $secondary-color;
     }
-    &.no-wrap {
-      white-space: nowrap;
-    }
   }
   h3 {
     @include cn-bold-26;
@@ -137,7 +134,6 @@ h3 {
     height: auto;
     color: $grey-1;
     &.home {
-      height: 100%;
       .btnStart {
         margin-top: 90px;
         margin-bottom: 10px;

src/app/header/header.component.scss

@@ -101,7 +101,7 @@ a {
   animation: slideMenu 0.5s;
   .menu-content {
     background-color: $white;
-    height: 100vh;
+    height: calc(var(--vh, 1vh) * 100);
     width: 350px;
     padding: 27px 25px;
   }

src/app/structure-list/components/search/search.component.html

@@ -91,7 +91,7 @@
     </div>
   </div>
   <div class="footerSearchSection isntPhoneContent" fxLayout="row" fxLayoutAlign="space-between center">
-    <div class="checkbox">
+    <div class="checkbox no-width">
       <div class="checkboxItem">
         <label>
           <input

src/app/structure-list/components/search/search.component.scss

@@ -118,7 +118,6 @@
 }
 a {
   @include hyperlink;
-  width: 100%;
   text-align: right;
 }
 

src/assets/scss/_buttons.scss

@@ -7,7 +7,7 @@
   height: 40px;
   width: 190px;
   border: 1px solid $grey-4;
-  padding: 3px 16px 3px 16px;
+  padding: 3px 8px 3px 16px;
   outline: none;
   border-radius: 4px;
   cursor: pointer;

src/styles.scss

@@ -73,9 +73,6 @@ a {
   &.full-screen {
     min-height: calc(100vh - #{$header-height} - #{$footer-height});
   }
-  @media #{$phone} {
-    padding-top: 30px;
-  }
 }
 .section-container {
   width: 80%;
@@ -158,6 +155,9 @@ button {
       -ms-transform: rotate(45deg);
     }
   }
+  &.no-width {
+    width: unset;
+  }
 }
 
 // Layout