Compare revisions

a3647cd0 · a3647cd0 · a3647cd0 · a3647cd0 · a3647cd0 · a3647cd0
--- a/src/app/shared/components/modal-options/modal-options.component.html
+++ b/src/app/shared/components/modal-options/modal-options.component.html
@@ -14,6 +14,10 @@
    </div>
  </div>
  <div *ngIf="!isModalProfileOpts" class="modalContent" fxLayout="column" fxLayoutGap="10px">
+    <div (click)="closeModal(functionType.manageOwners)" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="9px">
+      <app-svg-icon [type]="'ico'" [iconColor]="'inherit'" [icon]="'edit'"></app-svg-icon>
+      <p>Gérer les membres</p>
+    </div>
    <div (click)="closeModal(functionType.addUser)" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="9px">
      <app-svg-icon [type]="'ico'" [iconColor]="'inherit'" [icon]="'add'"></app-svg-icon>
      <p>Ajouter un compte</p>

--- a/src/app/shared/components/structure-options-modal/structure-options-modal.component.ts
+++ b/src/app/shared/components/structure-options-modal/structure-options-modal.component.ts
@@ -84,6 +84,9 @@ export class StructureOptionsModalComponent implements OnInit {
      case FunctionTypeModalOptions.deleteAccount:
        this.toggleDeleteAccountModal();
        break;
+      case FunctionTypeModalOptions.manageOwners:
+        this.router.navigateByUrl(`/profile/structure-members-management/${this.structure.structure._id}`);
+        break;
      case FunctionTypeModalOptions.addUser:
        this.editModal = TypeModalProfile.addAccount;
        this.ownerAlreadyLinked = false;

--- a/src/app/shared/enum/functionTypeModalOptions.enum.ts
+++ b/src/app/shared/enum/functionTypeModalOptions.enum.ts
@@ -2,6 +2,7 @@ export enum FunctionTypeModalOptions {
  changeEmail = 1,
  changePassword,
  deleteAccount,
+  manageOwners,
  addUser,
  removeUser,
  editStructure,

--- a/src/app/structure-list/components/structure-details/structure-details.component.html
+++ b/src/app/structure-list/components/structure-details/structure-details.component.html
@@ -268,7 +268,7 @@
              [iconClass]="'icon-40'"
            ></app-svg-icon>
            <div class="info-member">
-              <p class="member">{{ member.name | uppercase }} {{ member.surname | titlecase }}</p>
+              <p class="member">{{ member.name }} {{ member.surname | uppercase }}</p>
              <p class="job" *ngIf="displayJobEmployer(member)">{{ displayJobEmployer(member) }}</p>
            </div>
          </div>

--- a/src/assets/form/notvalidate.svg
+++ b/src/assets/form/notvalidate.svg
--- a/src/assets/form/notValidateWithBorder.svg
+++ b/src/assets/form/notValidateWithBorder.svg
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="12" cy="12" r="11.5" fill="#DA6C2E" stroke="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0835 7.00067C11.0835 6.49441 11.4939 6.084 12.0001 6.08398C12.5064 6.08397 12.9168 6.49437 12.9168 7.00063L12.917 14.0006C12.917 14.5069 12.5066 14.9173 12.0003 14.9173C11.4941 14.9173 11.0837 14.5069 11.0836 14.0007L11.0835 7.00067ZM11.0837 17.6896C11.0837 17.1833 11.4941 16.7729 12.0004 16.7729C12.5066 16.7729 12.917 17.1833 12.917 17.6896L12.917 18.0318C12.917 18.5381 12.5066 18.9485 12.0004 18.9485C11.4941 18.9485 11.0837 18.5381 11.0837 18.0318L11.0837 17.6896Z" fill="white"/>
+</svg>
--- a/src/assets/form/sprite.svg
+++ b/src/assets/form/sprite.svg
@@ -646,6 +646,12 @@
    <path d="M13.25 20.6066L13.25 20" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
  </symbol>

+    <symbol id="notValidateWithBorder" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <circle cx="12" cy="12" r="11.5" fill="#DA6C2E" stroke="white"/>
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M11.0835 7.00067C11.0835 6.49441 11.4939 6.084 12.0001 6.08398C12.5064 6.08397 12.9168 6.49437 12.9168 7.00063L12.917 14.0006C12.917 14.5069 12.5066 14.9173 12.0003 14.9173C11.4941 14.9173 11.0837 14.5069 11.0836 14.0007L11.0835 7.00067ZM11.0837 17.6896C11.0837 17.1833 11.4941 16.7729 12.0004 16.7729C12.5066 16.7729 12.917 17.1833 12.917 17.6896L12.917 18.0318C12.917 18.5381 12.5066 18.9485 12.0004 18.9485C11.4941 18.9485 11.0837 18.5381 11.0837 18.0318L11.0837 17.6896Z" fill="white"/>
+</symbol>
+
+
  <symbol id="validate" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
    <circle cx="13" cy="13" r="13" fill="#47C562" />
    <path d="M8 13.8182L11.8889 17L18 10" stroke="white" stroke-width="3" stroke-linecap="round"

--- a/src/assets/ico/fold.svg
+++ b/src/assets/ico/fold.svg
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 16L12.5 9L19 16" stroke="black" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -129,9 +129,11 @@
    </defs>
  </symbol>

-  <symbol id="edit" viewBox="0 0 22 22"
+  <symbol id="edit" viewBox="0 0 23 23" fill="none"
    xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M17.3745 2.62547C17.72 2.28003 18.3461 2.34613 18.7731 2.7731L20.3193 4.3193C20.7463 4.74627 20.8124 5.37243 20.4669 5.71787L18.6115 7.57331L15.5191 4.48091L17.3745 2.62547ZM17.993 8.1918L14.9006 5.0994L5.62344 14.3766L8.71584 17.469L17.993 8.1918ZM8.09736 18.0874L5.00496 14.995L4.74469 15.2553C4.60266 15.3973 4.52461 15.5949 4.52337 15.8155L3.77535 18.7134C3.7736 19.0246 4.0678 19.3188 4.37904 19.3171L7.27695 18.569C7.49751 18.5678 7.69506 18.4897 7.83709 18.3477L8.09736 18.0874Z" stroke="none"/>
+      <path d="M4.28317 15.287L3.65575 18.6944C3.65575 18.9504 3.85693 19.1516 4.11297 19.1516L7.52029 18.5242C7.63917 18.5242 7.75804 18.4784 7.84034 18.387L17.4626 8.77388L14.0335 5.34473L4.42034 14.9578C4.32889 15.0493 4.28317 15.159 4.28317 15.287Z" stroke="#333333" stroke-width="1.5" />
+  <path d="M19.1358 7.09997C19.4924 6.74334 19.4924 6.16724 19.1358 5.81061L16.996 3.67082C16.8252 3.49959 16.5932 3.40336 16.3513 3.40336C16.1094 3.40336 15.8775 3.49959 15.7067 3.67082L14.0332 5.34424L17.4624 8.7734L19.1358 7.09997Z" stroke="#333333" stroke-width="1.5" />
+  <path d="M4.78906 14.6543L8.15154 18.0168" stroke="#333333" stroke-width="1.5" />
  </symbol>

  <symbol id="liste" viewBox="0 0 32 32"
@@ -585,20 +587,6 @@
    <path d="M15.875 15.625C18.1877 15.625 20.0625 13.7502 20.0625 11.4375C20.0625 9.1248 18.1877 7.25 15.875 7.25C13.5623 7.25 11.6875 9.1248 11.6875 11.4375C11.6875 13.7502 13.5623 15.625 15.875 15.625Z" stroke="#333333" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
  </symbol>

-  <symbol id="edit" viewBox="0 0 23 23" fill="none"
-    xmlns="http://www.w3.org/2000/svg">
-    <g clip-path="url(#clip0_7929_46214)">
-      <path d="M4.28317 15.287L3.65575 18.6944C3.65575 18.9504 3.85693 19.1516 4.11297 19.1516L7.52029 18.5242C7.63917 18.5242 7.75804 18.4784 7.84034 18.387L17.4626 8.77388L14.0335 5.34473L4.42034 14.9578C4.32889 15.0493 4.28317 15.159 4.28317 15.287Z" stroke="#333333" stroke-width="1.5"/>
-      <path d="M19.1358 7.09997C19.4924 6.74334 19.4924 6.16724 19.1358 5.81061L16.996 3.67082C16.8252 3.49959 16.5932 3.40336 16.3513 3.40336C16.1094 3.40336 15.8775 3.49959 15.7067 3.67082L14.0332 5.34424L17.4624 8.7734L19.1358 7.09997Z" stroke="#333333" stroke-width="1.5"/>
-      <path d="M4.78906 14.6543L8.15154 18.0168" stroke="#333333" stroke-width="1.5"/>
-    </g>
-    <defs>
-      <clipPath id="clip0_7929_46214">
-        <rect width="22" height="22" fill="white" transform="translate(0.5 0.5)"/>
-      </clipPath>
-    </defs>
-  </symbol>
-
  <symbol id="toastError" width="40" height="41" viewBox="0 0 40 41" fill="none"
    xmlns="http://www.w3.org/2000/svg">
    <path d="M26.8169 11.4821C27.3593 10.9397 28.2738 10.9749 28.8596 11.5607C29.4454 12.1464 29.4806 13.061 28.9382 13.6034L13.2247 29.3169C12.6823 29.8593 11.7677 29.8241 11.1819 29.2383C10.5962 28.6525 10.561 27.738 11.1034 27.1956L26.8169 11.4821Z" fill="#FF0000"/>
@@ -872,6 +860,16 @@
 <path d="M180.306 79.7301C181.856 79.5776 182.939 82.5877 181.198 82.8686C181.123 82.8847 181.156 83.0211 181.239 82.9971C183.139 82.7001 182.014 79.4491 180.331 79.6016C180.206 79.6177 180.206 79.7461 180.306 79.7301Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linejoin="round"/>
 </symbol>

+<symbol id="check" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.9977 6.2526C19.4105 6.61952 19.4477 7.25159 19.0808 7.66437L10.9326 16.831C10.5785 17.2294 9.97428 17.28 9.55883 16.9462L4.37364 12.7795C3.94313 12.4336 3.87458 11.8041 4.22053 11.3736C4.56647 10.9431 5.19592 10.8746 5.62643 11.2205L10.0699 14.7912L17.586 6.33565C17.9529 5.92286 18.585 5.88568 18.9977 6.2526Z" fill="#696969" />
+</symbol>
+
+<symbol id="unfold" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 10L12.5 17L19 10" stroke="black" stroke-linecap="round" stroke-linejoin="round" />
+</symbol>

+<symbol id="fold" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 16L12.5 9L19 16" stroke="black" stroke-linecap="round" stroke-linejoin="round" />
+</symbol>

 </svg>
--- a/src/assets/ico/unfold.svg
+++ b/src/assets/ico/unfold.svg
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 10L12.5 17L19 10" stroke="black" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -346,33 +346,6 @@ button {
  }
 }

-.structureCard {
-  border: 1px solid $grey-4;
-  border-radius: 6px;
-  .structureInfo {
-    border-radius: 6px;
-    background: $white;
-    min-height: 100px;
-    padding: 33px 55px;
-    @media #{$large-phone} {
-      padding: 33px 25px;
-    }
-    a {
-      margin: 0;
-      &.structureName {
-        @include lato-bold-26;
-        color: $primary-color;
-        text-decoration: underline;
-      }
-    }
-    .ownerName {
-      @include lato-regular-18;
-      color: $grey-2;
-    }
-  }
-  @include background-hash($grey-2);
-}
-
 .loader {
  width: 100%;
  text-align: center;
No results found