diff --git a/.vscode/settings.json b/.vscode/settings.json
index c0691ad76d3a84ec9f8e15a3e8f7ca2e639bd492..62ee709648a27306893cf6ff2dd148abd72f7adf 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -59,6 +59,7 @@
"personaloffer",
"Rés'in",
"saturday",
+ "sizename",
"smedium",
"sunday",
"thursday",
diff --git a/src/app/annuaire/result-list/result-list.component.html b/src/app/annuaire/result-list/result-list.component.html
index 9f5db7053a0cf9104863348ce7b8c28a2e883b97..631ce5989c616ae256a7ca8fa0724bad94c14d75 100644
--- a/src/app/annuaire/result-list/result-list.component.html
+++ b/src/app/annuaire/result-list/result-list.component.html
@@ -22,19 +22,19 @@
(keyup.enter)="goToUser(user._id)"
>
<div class="left">
- <app-svg-icon [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-48'" />
+ <app-svg-icon [folder]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-48'" />
<div class="identity">
<p class="name">{{ user.name | userName }} {{ user.surname | uppercase }}</p>
<p *ngIf="user.job" class="job">{{ user.job.name }}</p>
<div *ngIf="user.withAppointment" class="appointment">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'rdv'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'rdv'" />
<span>Rendez-vous</span>
</div>
</div>
</div>
<div class="right">
<div *ngIf="user.employer" class="employer">{{ user.employer.name }}</div>
- <app-svg-icon [iconClass]="'icon-32'" [type]="'ico'" [icon]="'chevronRight'" />
+ <app-svg-icon [iconClass]="'icon-32'" [folder]="'ico'" [icon]="'chevronRight'" />
</div>
</div>
<div *ngIf="showPagination" class="pagination">
diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html
index 6d53f98096c4076f2538b5f5dcb2002cce3ff875..8a8fb5e0063e0a34832c8355a49aa74211c98037 100644
--- a/src/app/contact/contact.component.html
+++ b/src/app/contact/contact.component.html
@@ -9,13 +9,13 @@
<app-svg-icon
*ngIf="contactForm.get('name').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="contactForm.get('name').value && !contactForm.get('name').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -28,13 +28,13 @@
<app-svg-icon
*ngIf="contactForm.get('email').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="contactForm.get('email').value && !contactForm.get('email').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -54,13 +54,13 @@
<app-svg-icon
*ngIf="contactForm.get('phone').value && contactForm.get('phone').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="contactForm.get('phone').value && !contactForm.get('phone').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -73,13 +73,13 @@
<app-svg-icon
*ngIf="contactForm.get('subject').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="contactForm.get('subject').value && !contactForm.get('subject').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -97,13 +97,13 @@
<app-svg-icon
*ngIf="contactForm.get('message').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="contactForm.get('message').value && !contactForm.get('message').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
diff --git a/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html b/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html
index 772ca38d143a19323d4b56786e2e5f914fbb9fe3..6c6ae7d94ec728adb3a7f7f1549f0eed3eeab8c8 100644
--- a/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html
+++ b/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html
@@ -31,7 +31,7 @@
<li [ngClass]="accountForm.get('password').value.length >= 8 ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="accountForm.get('password').value.length >= 8 ? 'validate' : 'notValidate'"
/>
<p>8 caractères</p>
@@ -39,7 +39,7 @@
<li [ngClass]="checkIfPasswordHasSpecialChar(accountForm.get('password').value) ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="checkIfPasswordHasSpecialChar(accountForm.get('password').value) ? 'validate' : 'notValidate'"
/>
<p>1 caractère spécial</p>
@@ -47,7 +47,7 @@
<li [ngClass]="checkIfPasswordHasLowerCase(accountForm.get('password').value) ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="checkIfPasswordHasLowerCase(accountForm.get('password').value) ? 'validate' : 'notValidate'"
/>
<p>1 caractère en minuscule</p>
@@ -55,7 +55,7 @@
<li [ngClass]="checkIfPasswordHasUpperCase(accountForm.get('password').value) ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="checkIfPasswordHasUpperCase(accountForm.get('password').value) ? 'validate' : 'notValidate'"
/>
<p>1 caractère en majuscule</p>
@@ -63,7 +63,7 @@
<li [ngClass]="checkIfPasswordHasDigit(accountForm.get('password').value) ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="checkIfPasswordHasDigit(accountForm.get('password').value) ? 'validate' : 'notValidate'"
/>
<p>1 chiffre</p>
diff --git a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
index e865c69c04ae3ea4906d9195af90320d8284cdba..00b1dcccd042633bdbe3af40c821e5d021cbea2f 100644
--- a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
+++ b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
@@ -43,7 +43,7 @@
*ngIf="isSelectedStructure(structure)"
class="form-icon"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<div *ngIf="structure.alreadySelected" class="sticker">Déjà <br />sélectionnée</div>
diff --git a/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html b/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html
index 83433bbf59718380445004330140858ef98cb85b..961a52f7ffe353defa66c077c72a46994e6aea6d 100644
--- a/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html
+++ b/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html
@@ -5,7 +5,7 @@
<p>Plusieurs choix possibles</p>
</div>
<p *ngIf="isEditMode && !structureForm.get('categories').get('accessModality').valid" class="missing-information">
- <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" />
+ <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [folder]="'form'" [icon]="'notValidate'" />
<span>Il faut renseigner au moins un champ</span>
</p>
<div *ngIf="accessModality" class="modality">
diff --git a/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html b/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html
index afddcb27a16d193070736b0d800bde676e210748..c0d833c40db2a97bf5314736b5feffc4d86f3a63 100644
--- a/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html
+++ b/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html
@@ -18,7 +18,7 @@
<app-svg-icon
*ngIf="structureForm.get('contactPersonFirstname').valid"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
</div>
@@ -37,7 +37,7 @@
<app-svg-icon
*ngIf="structureForm.get('contactPersonLastname').valid"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
</div>
@@ -56,13 +56,13 @@
<app-svg-icon
*ngIf="structureForm.get('contactPersonEmail').valid"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="structureForm.get('contactPersonEmail').invalid && structureForm.get('contactPersonEmail').value"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
diff --git a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html
index 5dc593c436fa2459c051bf1062f189e2efcdf747..8593e56494eb4d25cfbfb66052d1991446f49667 100644
--- a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html
+++ b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html
@@ -11,7 +11,7 @@
<p>{{ isMandatoryFields ? '' : 'Facultatif - ' }}Plusieurs choix possibles</p>
</div>
<p *ngIf="isEditMode && !structureForm.get('categories').get('age').valid" class="missing-information">
- <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" />
+ <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [folder]="'form'" [icon]="'notValidate'" />
<span>Il faut renseigner au moins un champ</span>
</p>
<ng-container *ngIf="!isMandatoryFields">
diff --git a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
index 28032a7974546cc161c677abbc2b3cf5cf08fa08..7384aac97ff539715ce3fa6bc0f02dccba39755e 100644
--- a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
+++ b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
@@ -10,7 +10,7 @@
<div class="inputSection">
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'website'"
[iconClass]="'icon-36'"
[ngClass]="{
@@ -38,7 +38,7 @@
<div class="inputSection">
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'x'"
[iconClass]="'icon-36'"
[class.icon-centered]="
@@ -61,7 +61,7 @@
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'facebook'"
[iconClass]="'icon-36'"
[class.icon-centered]="
@@ -84,7 +84,7 @@
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'linkedin'"
[iconClass]="'icon-36'"
[class.icon-centered]="
@@ -107,7 +107,7 @@
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'instagram'"
[iconClass]="'icon-36'"
[class.icon-centered]="
diff --git a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html
index 41a5db1a2f0855e72ee0b77461bca624bdaf6a9b..efbea87b6da92c07fe953ee97c4ffa358a73240c 100644
--- a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html
+++ b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html
@@ -18,7 +18,7 @@
*ngIf="structure.structureName === selected?.structureName"
class="form-icon"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
</div>
@@ -39,13 +39,13 @@
<app-svg-icon
*ngIf="form.get('structureName').value && form.get('structureName').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="form.get('structureName').value && !form.get('structureName').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -64,13 +64,13 @@
<app-svg-icon
*ngIf="form.get('structureMail').value && form.get('structureMail').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="form.get('structureMail').value && !form.get('structureMail').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -89,13 +89,13 @@
<app-svg-icon
*ngIf="form.get('structurePhone').value && form.get('structurePhone').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="form.get('structurePhone').value && !form.get('structurePhone').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html
index 50c0e1c427156c38f2fc32dd9061ab6fdaf1d925..f2a014ae2b0d32ad9f9e78a1177c8af81da1973c 100644
--- a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html
@@ -33,7 +33,7 @@
(change)="onSocialWorkerRadioChange(owner)"
/>
<label for="{{ owner._id }}">
- <app-svg-icon class="" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
+ <app-svg-icon class="" [folder]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
<div fxLayout="column" fxLayoutAlign="start">
<div fxLayout="row" class="selectListNameContainer">
<span class="selectListName">{{ owner.name | userName }} {{ owner.surname | uppercase }}</span>
@@ -49,7 +49,7 @@
<div class="header" tabindex="0" fxLayout="column">
<div fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px">
<div fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="8px">
- <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
+ <app-svg-icon class="avatar" [folder]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
<div fxLayout="column" fxLayoutAlign="end">
<div fxLayout="row" class="headerNameContainer">
<span class="headerName"
diff --git a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.html b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.html
index f65c86877987f5df1beca98049a11a7781a168ad..f53825dba19a4b3b9d9135ce1c57ae7368f2b446 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.html
@@ -12,11 +12,11 @@
class="form-input"
(input)="updatedForm('name', $event.target)"
/>
- <app-svg-icon *ngIf="form.get('name').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" />
+ <app-svg-icon *ngIf="form.get('name').valid" [iconClass]="'validation'" [folder]="'form'" [icon]="'validate'" />
<app-svg-icon
*ngIf="form.get('name').value && !form.get('name').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -34,13 +34,13 @@
<app-svg-icon
*ngIf="form.get('surname').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="form.get('surname').value && !form.get('surname').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -59,13 +59,13 @@
<app-svg-icon
*ngIf="form.get('email').value && form.get('email').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="form.get('email').value && !form.get('email').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -81,11 +81,16 @@
class="form-input"
(input)="updatedForm('phone', $event.target)"
/>
- <app-svg-icon *ngIf="form.get('phone').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" />
+ <app-svg-icon
+ *ngIf="form.get('phone').valid"
+ [iconClass]="'validation'"
+ [folder]="'form'"
+ [icon]="'validate'"
+ />
<app-svg-icon
*ngIf="form.get('phone').value && !form.get('phone').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index bbfe129a092e8db18d570d72a4e627b31fed6446..25394e74474c968b775c3630badd2931d7f3c662 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -3,7 +3,7 @@
<app-svg-icon
class="clickable"
tabindex="0"
- [type]="'ico'"
+ [folder]="'ico'"
[icon]="'menu'"
[iconClass]="'icon-32'"
(click)="openMenu()"
@@ -24,7 +24,7 @@
<app-svg-icon
class="clickable"
tabindex="0"
- [type]="'ico'"
+ [folder]="'ico'"
[icon]="'profile'"
[iconClass]="'icon-32'"
(click)="isLoggedIn ? openProfileMenu() : goToLoginPage()"
@@ -94,7 +94,7 @@
<app-svg-icon
class="avatar"
tabindex="0"
- [type]="'avatar'"
+ [folder]="'avatar'"
[icon]="'defaultAvatar'"
[iconClass]="'icon-40'"
(click)="isLoggedIn ? openProfileMenu() : goToLoginPage()"
diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html
index 7267da9225278fbd4529ce41b55d10ea18ec0aa0..5406da31f41bcdb86b614f02455349cac8cfa5aa 100644
--- a/src/app/profile/edit/edit.component.html
+++ b/src/app/profile/edit/edit.component.html
@@ -94,11 +94,11 @@
<div *ngIf="currentTab === tabsEnum.credentials" class="credentialsTab">
<div class="credentials">
<div class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'mail'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'mail'" [iconClass]="'icon-20'" />
<span>{{ userProfile.email }}</span>
</div>
<div class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'password'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'password'" [iconClass]="'icon-20'" />
<span>********</span>
</div>
</div>
@@ -295,7 +295,7 @@
/>
<app-svg-icon
[iconClass]="'icon-32 grey hover'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="isShowPassword.oldPassword ? 'eyePasswordInvisible' : 'eyePasswordVisible'"
(click)="showPassword(ShowPassword.oldPassword)"
/>
diff --git a/src/app/profile/profile-structure/profile-structure.component.html b/src/app/profile/profile-structure/profile-structure.component.html
index f65873f75042f68aa9ab5eed15da13af0d1c59f3..69c00299ae5229a2dea579e47229d703bfe1c097 100644
--- a/src/app/profile/profile-structure/profile-structure.component.html
+++ b/src/app/profile/profile-structure/profile-structure.component.html
@@ -88,15 +88,15 @@
</div>
<div class="sectionContent infoSection">
<div class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'address'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'ico'" [icon]="'address'" />
<p>{{ getAddress() }}</p>
</div>
<div *ngIf="structure.contactPhone" class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'phone'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'ico'" [icon]="'phone'" />
<p>{{ structure.contactPhone | phone }}</p>
</div>
<div *ngIf="structure.contactMail" class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'mail'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'ico'" [icon]="'mail'" />
<a class="email" href="mailto:{{ structure.contactMail }}">
{{ structure.contactMail }}
</a>
diff --git a/src/app/profile/profile.component.html b/src/app/profile/profile.component.html
index 5bf9bbdc85cd59146a021b3778f6fd4f03f1b189..fae79edaef70605dd6c251e757370e3f31dd84b8 100644
--- a/src/app/profile/profile.component.html
+++ b/src/app/profile/profile.component.html
@@ -42,7 +42,7 @@
/>
</div>
<div class="profile">
- <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-112'" />
+ <app-svg-icon class="avatar" [folder]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-112'" />
<div class="information">
<div class="block">
<div class="name">{{ userProfile.name | userName }} {{ userProfile.surname | uppercase }}</div>
@@ -50,15 +50,15 @@
</div>
<div class="block contact">
<div class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'phone'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'phone'" />
<div>{{ userProfile.phone | phone }}</div>
</div>
<div class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'mail'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'mail'" />
<a href="mailto:{{ userProfile.email }}">{{ userProfile.email }}</a>
</div>
<div *ngIf="isPublic && userProfile.withAppointment" class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'rdv'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'rdv'" />
<div>Rendez-vous</div>
</div>
</div>
diff --git a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html
index 67387c0190302af168953897cf43da5225572fd7..471af23d35411522562901efa317a8bb8c096edc 100644
--- a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html
+++ b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html
@@ -10,10 +10,10 @@
<label for="email">Email du membre à ajouter</label>
<div class="modalItem">
<input type="text" formControlName="email" class="form-input" autocomplete="on" />
- <app-svg-icon *ngIf="fAddAccount.email.valid" [type]="'form'" [icon]="'validate'" />
+ <app-svg-icon *ngIf="fAddAccount.email.valid" [folder]="'form'" [icon]="'validate'" />
<app-svg-icon
*ngIf="fAddAccount.email.invalid && fAddAccount.email.value"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
diff --git a/src/app/profile/structure-edition-summary/missing-information/missing-information.component.ts b/src/app/profile/structure-edition-summary/missing-information/missing-information.component.ts
index 28731f72e59c9b3ff175b33240637520d2adbf5b..80e5d1db213468c3d41cbd17f2e66f2434ea2704 100644
--- a/src/app/profile/structure-edition-summary/missing-information/missing-information.component.ts
+++ b/src/app/profile/structure-edition-summary/missing-information/missing-information.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
@Component({
selector: 'app-missing-information',
template: `<p class="warning">
- <app-svg-icon [type]="'tags'" [icon]="'warning'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'warning'" />
<span>{{ plural ? 'Informations manquantes' : 'Information manquante' }}</span>
</p>`,
styleUrls: ['./missing-information.component.scss'],
diff --git a/src/app/profile/structure-edition-summary/structure-edition-summary.component.html b/src/app/profile/structure-edition-summary/structure-edition-summary.component.html
index 026a06c440e7ec62fd8174a86405622cf284e7f4..7ba60273d68929edc413232dd84cca4c3e4058b2 100644
--- a/src/app/profile/structure-edition-summary/structure-edition-summary.component.html
+++ b/src/app/profile/structure-edition-summary/structure-edition-summary.component.html
@@ -34,13 +34,13 @@
</div>
<div class="content">
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'structureType'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'structureType'" />
<p>
{{ structure.structureName }}
</p>
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'address'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'address'" />
<p>
{{ formatAddress() }}
</p>
@@ -71,7 +71,7 @@
</div>
<div class="content">
<div class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'structure'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'structure'" />
<app-no-information *ngIf="!isFieldValid('structureType')" />
<p *ngIf="isFieldValid('structureType')" class="inline">
{{ structure.structureType?.category }} - {{ structure.structureType?.name }}
@@ -127,14 +127,14 @@
</div>
<div class="content">
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'phone'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'phone'" />
<app-no-information *ngIf="utils.isNullOrEmpty(structure.contactPhone)" />
<p *ngIf="!utils.isNullOrEmpty(structure.contactPhone)">
{{ structure.contactPhone }}
</p>
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'mail'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'mail'" />
<app-no-information *ngIf="utils.isNullOrEmpty(structure.contactMail)" />
<a *ngIf="!utils.isNullOrEmpty(structure.contactMail)" [href]="mailHref">
{{ structure.contactMail }}
@@ -163,13 +163,13 @@
</div>
<div class="content">
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'website'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'website'" />
<app-no-information *ngIf="!structure.website" />
<a *ngIf="structure.website" href="{{ structure.website }}">{{ structure.website }}</a>
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'x'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'x'" />
<app-no-information *ngIf="!structure.twitter" />
<a
*ngIf="structure.twitter"
@@ -183,7 +183,7 @@
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'facebook'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'facebook'" />
<app-no-information *ngIf="!structure.facebook" />
<a
*ngIf="structure.facebook"
@@ -197,7 +197,7 @@
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'linkedin'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'linkedin'" />
<app-no-information *ngIf="!structure.linkedin" />
<a
*ngIf="structure.linkedin"
@@ -211,7 +211,7 @@
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'instagram'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'instagram'" />
<app-no-information *ngIf="!structure.instagram" />
<a
*ngIf="structure.instagram"
diff --git a/src/app/profile/structure-members-management/structure-members-management.component.html b/src/app/profile/structure-members-management/structure-members-management.component.html
index 385384e7d40f8751a9f8d0bcbce19ba76dd216f9..9f146a4bf775091626ce046174fbc02b61dd53a0 100644
--- a/src/app/profile/structure-members-management/structure-members-management.component.html
+++ b/src/app/profile/structure-members-management/structure-members-management.component.html
@@ -24,7 +24,7 @@
<div class="user">
<app-svg-icon
class="avatar hide-on-mobile"
- [type]="'avatar'"
+ [folder]="'avatar'"
[icon]="'defaultAvatar'"
[iconClass]="'icon-40'"
/>
@@ -48,7 +48,7 @@
<div class="user">
<app-svg-icon
class="avatar hide-on-mobile"
- [type]="'avatar'"
+ [folder]="'avatar'"
[icon]="'defaultAvatar'"
[iconClass]="'icon-40'"
/>
diff --git a/src/app/profile/structures-management/structures-management.component.html b/src/app/profile/structures-management/structures-management.component.html
index 3bacd7e2b4e60f00f1ae5ed09efebd9943374d40..43abba5782f3c9a435efaf44feed553c5c3b68c7 100644
--- a/src/app/profile/structures-management/structures-management.component.html
+++ b/src/app/profile/structures-management/structures-management.component.html
@@ -32,7 +32,7 @@
[color]="'red'"
/>
<div *ngIf="isBeingDeleted(elt.structure)" class="deleteInProgress">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'warning'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'warning'" />
<span>
Suppression le {{ elt.structure.toBeDeletedAt | date: 'shortDate' }} (5 semaines depuis la demande de
suppression)
diff --git a/src/app/shared/components/button/button.component.html b/src/app/shared/components/button/button.component.html
index 1e315a064a5c5d1b25db2aa3a99605fd084d5d4f..99a54b7efdf8b139681d5cdf2605f2096211307f 100644
--- a/src/app/shared/components/button/button.component.html
+++ b/src/app/shared/components/button/button.component.html
@@ -8,7 +8,7 @@
fxLayoutAlign="space-around center"
[ngClass]="variant"
>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
<span>{{ text }}</span>
</div>
<div
@@ -19,7 +19,7 @@
[ngClass]="variant"
>
<span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
</div>
</button>
</ng-container>
@@ -27,7 +27,7 @@
<ng-container *ngIf="style === buttonTypeEnum.searchIcon">
<button class="searchIcon" aria-label="Rechercher" type="{{ type }}" (click)="doAction()">
<div fxLayout="row center" class="searchIcon withIcon" fxLayoutAlign="space-between center">
- <app-svg-icon [type]="'ico'" [icon]="iconBtn" [iconColor]="'currentColor'" [iconClass]="'icon-30'" />
+ <app-svg-icon [folder]="'ico'" [icon]="iconBtn" [iconColor]="'currentColor'" [iconClass]="'icon-30'" />
</div>
</button>
</ng-container>
@@ -48,7 +48,7 @@
fxLayoutAlign="space-around center"
[ngClass]="variant"
>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
<span [ngClass]="extraClass">{{ text }}</span>
</div>
<div
@@ -59,7 +59,7 @@
[ngClass]="variant"
>
<span [ngClass]="extraClass">{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
</div>
</button>
</ng-container>
@@ -74,7 +74,7 @@
fxLayoutAlign="space-around center"
[ngClass]="variant"
>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
<span>{{ text }}</span>
</div>
<div
@@ -85,7 +85,7 @@
[ngClass]="variant"
>
<span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
</div>
</button>
</ng-container>
@@ -106,7 +106,7 @@
fxLayoutAlign="space-around center"
[ngClass]="variant"
>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
<span>{{ text }}</span>
</div>
<div
@@ -117,7 +117,7 @@
[ngClass]="variant"
>
<span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
</div>
</button>
</ng-container>
@@ -140,7 +140,7 @@
class="text withIcon left"
[ngClass]="variant"
>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
<span>{{ text }}</span>
</div>
<div
@@ -151,7 +151,7 @@
[ngClass]="variant"
>
<span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
</div>
</button>
</ng-container>
@@ -165,7 +165,7 @@
class="text withIcon left"
fxLayoutAlign="center center"
>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
<span>{{ text }}</span>
</div>
<div
@@ -176,7 +176,7 @@
[ngClass]="variant"
>
<span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
</div>
</button>
</ng-container>
@@ -190,7 +190,7 @@
fxLayoutAlign="space-around center"
[ngClass]="variant"
>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
</div>
</button>
</ng-container>
@@ -208,7 +208,7 @@
>
<app-svg-icon
class="iconBtn"
- [type]="'ico'"
+ [folder]="'ico'"
[iconClass]="'icon-32'"
[icon]="iconBtn"
[iconColor]="'currentColor'"
@@ -234,7 +234,7 @@
fxLayoutAlign="space-around center"
fxLayoutGap="13px"
>
- <app-svg-icon [type]="'ico'" [iconClass]="'icon-32'" [icon]="iconBtn" [iconColor]="'currentColor'" />
+ <app-svg-icon [folder]="'ico'" [iconClass]="'icon-32'" [icon]="iconBtn" [iconColor]="'currentColor'" />
{{ text }}
</div>
</button>
@@ -275,7 +275,7 @@
<div fxLayout="row center" fxLayoutAlign="space-around center" fxLayoutGap="13px">
<app-svg-icon
*ngIf="extraClass"
- [type]="'ico'"
+ [folder]="'ico'"
[icon]="'check'"
[iconClass]="'icon-28'"
[iconColor]="'currentColor'"
@@ -296,7 +296,7 @@
<div *ngIf="iconBtn" class="text withIcon" [ngClass]="variant">
<app-svg-icon
*ngIf="iconBtn"
- [type]="iconType"
+ [folder]="iconType"
[icon]="iconBtn"
[iconClass]="'icon-28'"
[iconColor]="active ? 'green' : 'currentColor'"
diff --git a/src/app/shared/components/button/button.component.ts b/src/app/shared/components/button/button.component.ts
index d23441d50b8c178b3dbed039413d4107d97ac356..d504461e31e5897f4ad60bcd33dda1d357313cd9 100644
--- a/src/app/shared/components/button/button.component.ts
+++ b/src/app/shared/components/button/button.component.ts
@@ -1,4 +1,5 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { SpriteFolderType } from '../svg-icon/SpriteFolder.type';
import { ButtonType } from './buttonType.enum';
@Component({
@@ -11,7 +12,7 @@ export class ButtonComponent {
@Input() public text: string;
@Input() public type = 'button';
@Input() public variant: 'small' | 'medium' | 'large' = 'medium';
- @Input() public iconType = 'ico';
+ @Input() public iconType: SpriteFolderType = 'ico';
@Input() public iconBtn: string;
@Input() public iconPos = 'left';
@Input() public extraClass: string;
diff --git a/src/app/shared/components/checkbox-filter/checkbox-filter.component.html b/src/app/shared/components/checkbox-filter/checkbox-filter.component.html
index 35538a1f79a938d100784897c62895f02b9e0252..ab8a474d8e5b30af55121b795c536648e242e7fe 100644
--- a/src/app/shared/components/checkbox-filter/checkbox-filter.component.html
+++ b/src/app/shared/components/checkbox-filter/checkbox-filter.component.html
@@ -1,5 +1,5 @@
<button type="button" [ngClass]="{ checked: checked }" (click)="toggle.emit(module)">
- <app-svg-icon *ngIf="!checked" [iconClass]="'icon-20'" [type]="'form'" [icon]="'radio-unchecked'" />
- <app-svg-icon *ngIf="checked" [iconClass]="'icon-20'" [type]="'form'" [icon]="'radio-checked'" />
+ <app-svg-icon *ngIf="!checked" [iconClass]="'icon-20'" [folder]="'form'" [icon]="'radio-unchecked'" />
+ <app-svg-icon *ngIf="checked" [iconClass]="'icon-20'" [folder]="'form'" [icon]="'radio-checked'" />
<span>{{ module.displayText }}</span>
</button>
diff --git a/src/app/shared/components/collapsable-filter/collapsable-filter.component.html b/src/app/shared/components/collapsable-filter/collapsable-filter.component.html
index 03403632e815dcc26627c484969c755b3687c037..0c75310f9703c5aadbedc30e0976f07336188550 100644
--- a/src/app/shared/components/collapsable-filter/collapsable-filter.component.html
+++ b/src/app/shared/components/collapsable-filter/collapsable-filter.component.html
@@ -7,5 +7,5 @@
(click)="handleToggle()"
>
<span>{{ label }}</span>
- <app-svg-icon [ngClass]="{ expanded: expanded }" [type]="'ico'" [icon]="'chevronDown'" [iconClass]="'icon-20'" />
+ <app-svg-icon [ngClass]="{ expanded: expanded }" [folder]="'ico'" [icon]="'chevronDown'" [iconClass]="'icon-20'" />
</button>
diff --git a/src/app/shared/components/member-card/member-card.component.html b/src/app/shared/components/member-card/member-card.component.html
index efeb1c9360dacaaab85565c0343f54cc3451796a..13c97778e10de744da11dd23754c2d9c0b3a8de4 100644
--- a/src/app/shared/components/member-card/member-card.component.html
+++ b/src/app/shared/components/member-card/member-card.component.html
@@ -1,5 +1,5 @@
<div class="structureMember">
- <app-svg-icon class="avatar hide-on-mobile" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
+ <app-svg-icon class="avatar hide-on-mobile" [folder]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
<div class="infoDetails">
<p class="name underline" tabindex="0" (click)="goToProfile()" (keyup.enter)="goToProfile()">
{{ member.name | userName }} {{ member.surname | uppercase }}
diff --git a/src/app/shared/components/password-form/password-form.component.html b/src/app/shared/components/password-form/password-form.component.html
index d6cdc35fc8d883db5450b563fd0ab7c7512a9bfe..3b6a59b25f31582b8d84fae93a4470a88ccd129b 100644
--- a/src/app/shared/components/password-form/password-form.component.html
+++ b/src/app/shared/components/password-form/password-form.component.html
@@ -13,7 +13,7 @@
/>
<app-svg-icon
tabindex="0"
- [type]="'form'"
+ [folder]="'form'"
[iconClass]="'grey'"
[icon]="'eyePassword'"
(click)="showOldPassword()"
@@ -21,7 +21,7 @@
/>
<app-svg-icon
*ngIf="!checkOldPassword(accountForm.value.oldPassword)"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -40,13 +40,13 @@
<app-svg-icon
*ngIf="accountForm.get('password').value.length >= 8"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="accountForm.get('password').value.length < 8"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>8 caractères</p>
@@ -60,13 +60,13 @@
<app-svg-icon
*ngIf="checkIfPasswordHasSpecialChar(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="!checkIfPasswordHasSpecialChar(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>un caractère spécial</p>
@@ -80,13 +80,13 @@
<app-svg-icon
*ngIf="checkIfPasswordHasLowerCase(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="!checkIfPasswordHasLowerCase(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>un caractère en minuscule</p>
@@ -100,13 +100,13 @@
<app-svg-icon
*ngIf="checkIfPasswordHasUpperCase(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="!checkIfPasswordHasUpperCase(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>un caractère en majuscule</p>
@@ -120,13 +120,13 @@
<app-svg-icon
*ngIf="checkIfPasswordHasDigit(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="!checkIfPasswordHasDigit(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>un chiffre</p>
@@ -142,7 +142,7 @@
<app-svg-icon
tabindex="0"
[iconClass]="'validation grey hover'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'eyePassword'"
(click)="showPassword()"
(keyup.enter)="showPassword()"
@@ -151,13 +151,13 @@
<app-svg-icon
*ngIf="accountForm.get('password').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="accountForm.get('password').invalid && accountForm.get('password').value"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -174,7 +174,7 @@
<app-svg-icon
tabindex="0"
[iconClass]="'validation grey hover'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'eyePassword'"
(click)="showConfirmPassword()"
(keyup.enter)="showConfirmPassword()"
@@ -182,13 +182,13 @@
<app-svg-icon
*ngIf="accountForm.get('confirmPassword').valid && accountForm.get('confirmPassword').value"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="accountForm.get('confirmPassword').invalid && accountForm.get('confirmPassword').value"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
diff --git a/src/app/shared/components/structure-detail-print/structure-detail-print.component.html b/src/app/shared/components/structure-detail-print/structure-detail-print.component.html
index fa5e23b868d4852d7ca22b402fcf270ff9e8e194..2cc2e743c8a3bd541d469859efd2ff68a463c3ad 100644
--- a/src/app/shared/components/structure-detail-print/structure-detail-print.component.html
+++ b/src/app/shared/components/structure-detail-print/structure-detail-print.component.html
@@ -13,15 +13,15 @@
<div class="mobile-column">
<div fxLayout="column" fxFlex="100%">
<div *ngIf="structure.address" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [type]="'ico'" [icon]="'adress'" [iconClass]="'icon-22'" />
+ <app-svg-icon [folder]="'ico'" [icon]="'address'" [iconClass]="'icon-22'" />
<p>{{ structure.address.numero }} {{ structure.address.street }}, {{ structure.address.commune }}</p>
</div>
<div *ngIf="structure.contactPhone" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [type]="'ico'" [icon]="'tel'" [iconClass]="'icon-22'" />
+ <app-svg-icon [folder]="'ico'" [icon]="'tel'" [iconClass]="'icon-22'" />
<p>{{ structure.contactPhone | phone }}</p>
</div>
<div *ngIf="structure.contactMail" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [type]="'ico'" [iconClass]="'grey-1 icon-22'" [icon]="'email'" />
+ <app-svg-icon [folder]="'ico'" [icon]="'email'" [iconClass]="'grey-1 icon-22'" />
<p>{{ structure.contactMail }}</p>
</div>
</div>
diff --git a/src/app/shared/components/structure-pmr/structure-pmr.component.html b/src/app/shared/components/structure-pmr/structure-pmr.component.html
index c7726274427f2c69dba93e7f7c33f44cee00c539..1af3acf298e0126a9989508f67f8a8feb9728590 100644
--- a/src/app/shared/components/structure-pmr/structure-pmr.component.html
+++ b/src/app/shared/components/structure-pmr/structure-pmr.component.html
@@ -5,7 +5,7 @@
<p>Un seul choix possible</p>
</div>
<p *ngIf="isEditMode && !structureForm.get('pmrAccess').valid" class="missing-information">
- <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" />
+ <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [folder]="'form'" [icon]="'notValidate'" />
<span>Il faut renseigner un champ</span>
</p>
<div class="formGroup">
diff --git a/src/app/shared/components/svg-icon/SpriteFolder.type.ts b/src/app/shared/components/svg-icon/SpriteFolder.type.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f7e2066dd01130c875fb432cf61264cc515664b8
--- /dev/null
+++ b/src/app/shared/components/svg-icon/SpriteFolder.type.ts
@@ -0,0 +1 @@
+export type SpriteFolderType = 'avatar' | 'form' | 'ico' | 'tags' | 'tcl';
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.html b/src/app/shared/components/svg-icon/svg-icon.component.html
index a70245f6aff02d84c86f53cca6fecd36314f006e..72f8ed825f1bdd485bca014d8ea19ec6990abc5a 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.html
+++ b/src/app/shared/components/svg-icon/svg-icon.component.html
@@ -2,11 +2,11 @@
<svg
aria-hidden="true"
class="icon"
- role="img"
+ role="presentation"
[ngClass]="iconClass"
[attr.fill]="iconColor"
[attr.stroke]="iconColor"
>
- <use [attr.xlink:href]="'assets/' + type + '/sprite.svg#' + icon" />
+ <use [attr.xlink:href]="'assets/' + folder + '/sprite.svg#' + icon" />
</svg>
</div>
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.scss b/src/app/shared/components/svg-icon/svg-icon.component.scss
index 7f77f0f919e7ae54d9514bd608804033a664d334..742058e5b237b8331a8db3f636c9e79162816131 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.scss
+++ b/src/app/shared/components/svg-icon/svg-icon.component.scss
@@ -59,6 +59,7 @@ $sizes: (
opacity: 0.8;
}
}
+ // V3REMOVE
&.white {
fill: $white;
stroke: $white;
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.ts b/src/app/shared/components/svg-icon/svg-icon.component.ts
index 577f21bdac10ea9527d2397427da679c7a27195b..59bce347689128db6a2fcafa018ff36bffe43f19 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.ts
+++ b/src/app/shared/components/svg-icon/svg-icon.component.ts
@@ -1,4 +1,5 @@
import { Component, Input } from '@angular/core';
+import { SpriteFolderType } from './SpriteFolder.type';
@Component({
selector: 'app-svg-icon',
@@ -9,8 +10,8 @@ export class SvgIconComponent {
/** Id of svg to use */
@Input({ required: true }) icon: string;
- /** Folder of the sprite to use */
- @Input({ required: true }) type: string;
+ /** Folder of the sprite ex: assets/ico/sprite.svg */
+ @Input({ required: true }) folder: SpriteFolderType = 'ico';
@Input() iconClass: string;
@Input() iconColor = 'none';
diff --git a/src/app/shared/components/v3/button/button.component.html b/src/app/shared/components/v3/button/button.component.html
index 57b740107c858d064f5c5b6d0f7d762914620eeb..a73644d7c8d0883e7ffe06363b741cf6eaf6b848 100644
--- a/src/app/shared/components/v3/button/button.component.html
+++ b/src/app/shared/components/v3/button/button.component.html
@@ -1,7 +1,7 @@
<button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
<app-svg-icon
*ngIf="iconName && iconPosition === 'left'"
- [type]="iconFolder"
+ [folder]="iconFolder"
[icon]="iconName"
[iconColor]="iconColor"
[iconClass]="'icon-20'"
@@ -9,7 +9,7 @@
{{ label }}
<app-svg-icon
*ngIf="iconName && iconPosition === 'right'"
- [type]="iconFolder"
+ [folder]="iconFolder"
[icon]="iconName"
[iconColor]="iconColor"
[iconClass]="'icon-20'"
diff --git a/src/app/shared/components/v3/button/button.component.ts b/src/app/shared/components/v3/button/button.component.ts
index ecfb4a4e15f0fb5543b46447d7b07ca5b30ef79c..406f3cc343be68d832dc08e4b0793d776d40f4fd 100644
--- a/src/app/shared/components/v3/button/button.component.ts
+++ b/src/app/shared/components/v3/button/button.component.ts
@@ -1,4 +1,5 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { SpriteFolderType } from '../../svg-icon/SpriteFolder.type';
/** values will be used for css selectors */
export type ButtonTypeV3 =
@@ -38,7 +39,7 @@ export class ButtonV3Component {
@Input() iconPosition: 'left' | 'right' = 'left';
/** Folder of the icon ex: assets/ico */
- @Input() iconFolder = 'ico';
+ @Input() iconFolder: SpriteFolderType = 'ico';
/** Icon name */
@Input() iconName?: string;
diff --git a/src/app/shared/components/v3/button/icon-button/icon-button.component.html b/src/app/shared/components/v3/button/icon-button/icon-button.component.html
index cb2f3f64e8234541679da7cc5ed27be9a1fb0bbe..f87527ac5624a2bb565ee96f93eb5d6ce25b960c 100644
--- a/src/app/shared/components/v3/button/icon-button/icon-button.component.html
+++ b/src/app/shared/components/v3/button/icon-button/icon-button.component.html
@@ -1,3 +1,3 @@
<button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
- <app-svg-icon [type]="iconFolder" [icon]="iconName" [iconColor]="iconColor" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="iconFolder" [icon]="iconName" [iconColor]="iconColor" [iconClass]="'icon-20'" />
</button>
diff --git a/src/app/shared/components/v3/button/icon-button/icon-button.component.ts b/src/app/shared/components/v3/button/icon-button/icon-button.component.ts
index d0a22e751fb2c064ad7514c11e8c05fd560d0543..66e9cb9d26d389f11a9aedca83adbfbfa35e62f9 100644
--- a/src/app/shared/components/v3/button/icon-button/icon-button.component.ts
+++ b/src/app/shared/components/v3/button/icon-button/icon-button.component.ts
@@ -1,4 +1,5 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { SpriteFolderType } from '../../../svg-icon/SpriteFolder.type';
import { ButtonTypeV3 } from '../button.component';
@Component({
@@ -22,8 +23,8 @@ export class IconButtonV3Component {
/** Should the button be disabled ? */
@Input() disabled = false;
- /** Folder of the icon ex: assets/ico */
- @Input() iconFolder = 'ico';
+ /** Folder of the sprite ex: assets/ico/sprite.svg */
+ @Input() iconFolder: SpriteFolderType = 'ico';
/** Icon color, defaults to none as the svg-icon does */
@Input() iconColor = 'none';
diff --git a/src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.ts b/src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.ts
index a0341f444693cc83cd2f20a02dfaa5f85fa516e2..ec62e8b0eca3ac44886547d2e53bba80fbbb25b5 100644
--- a/src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.ts
+++ b/src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.ts
@@ -11,7 +11,7 @@ import { Component, EventEmitter, Output } from '@angular/core';
(keyup.enter)="toggle.emit()"
>
<ng-content />
- <app-svg-icon [ngClass]="expanded && 'expanded'" [type]="'ico'" [icon]="'chevronDown'" [iconClass]="'icon-32'" />
+ <app-svg-icon [ngClass]="expanded && 'expanded'" [folder]="'ico'" [icon]="'chevronDown'" [iconClass]="'icon-32'" />
</div>`,
styleUrls: ['collapse-header.component.scss'],
})
diff --git a/src/app/shared/components/v3/modal/modal.component.html b/src/app/shared/components/v3/modal/modal.component.html
index bb1f952cdfc5fc4a36f5fb5d70ebce05bfe793ac..eeb4e472ba6fe3f8f258e9e2f0352d458e083c3c 100644
--- a/src/app/shared/components/v3/modal/modal.component.html
+++ b/src/app/shared/components/v3/modal/modal.component.html
@@ -5,7 +5,7 @@
<app-svg-icon
tabindex="0"
alt="Fermer la fenêtre"
- [type]="'ico'"
+ [folder]="'ico'"
[icon]="'cross'"
[iconClass]="'icon-24 hover'"
(keyup.enter)="closeModal(false)"
diff --git a/src/app/shared/components/v3/radio/radio.component.html b/src/app/shared/components/v3/radio/radio.component.html
index d4210091016bacd2018f9631c6cb30475d41bd81..2d3f9e8977734f072773e8463c996985d5ea048e 100644
--- a/src/app/shared/components/v3/radio/radio.component.html
+++ b/src/app/shared/components/v3/radio/radio.component.html
@@ -7,7 +7,7 @@
[ngClass]="classes"
(click)="action.emit($event)"
/>
- <app-svg-icon *ngIf="iconName" [iconClass]="'icon-40'" [type]="'form'" [icon]="iconName" />
+ <app-svg-icon *ngIf="iconName" [iconClass]="'icon-40'" [folder]="'form'" [icon]="iconName" />
<div class="details">
<label [for]="id">{{ label }}</label>
<p *ngIf="description" class="description">{{ description }}</p>
diff --git a/src/app/shared/components/v3/tag-item/tag-item.component.html b/src/app/shared/components/v3/tag-item/tag-item.component.html
index b73fd8e47fe1e7cc80f92667e7f321c487a79dfa..47765edc015c8a4f04445f196648a4921a57cc10 100644
--- a/src/app/shared/components/v3/tag-item/tag-item.component.html
+++ b/src/app/shared/components/v3/tag-item/tag-item.component.html
@@ -7,7 +7,7 @@
>
<app-svg-icon
*ngIf="iconName && iconPosition === 'left'"
- [type]="iconFolder"
+ [folder]="iconFolder"
[icon]="iconName"
[iconColor]="'currentColor'"
[iconClass]="iconSize"
@@ -15,7 +15,7 @@
{{ label }}
<app-svg-icon
*ngIf="iconName && iconPosition === 'right'"
- [type]="iconFolder"
+ [folder]="iconFolder"
[icon]="iconName"
[iconColor]="'currentColor'"
[iconClass]="iconSize"
diff --git a/src/app/shared/components/v3/tag-item/tag-item.component.ts b/src/app/shared/components/v3/tag-item/tag-item.component.ts
index 71d3a74af64f701ccf2df36eac43e88aa86de827..81bf378e7e06876ad7216652047113469261ec6e 100644
--- a/src/app/shared/components/v3/tag-item/tag-item.component.ts
+++ b/src/app/shared/components/v3/tag-item/tag-item.component.ts
@@ -1,4 +1,5 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { SpriteFolderType } from '../../svg-icon/SpriteFolder.type';
@Component({
selector: 'app-v3-tag-item',
@@ -25,7 +26,7 @@ export class TagItemV3Component {
@Input() iconPosition?: 'left' | 'right' = 'left';
/** Folder of the icon ex: assets/ico */
- @Input() iconFolder = 'ico';
+ @Input() iconFolder: SpriteFolderType = 'ico';
/** Icon name */
@Input() iconName?: string;
diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html
index fc6caaf081f1ba5af8d18cb18c2b1c4495eeaa91..8b03dfd952c9255d0feab4fd92a06eba9e0c1705 100644
--- a/src/app/structure-list/components/card/card.component.html
+++ b/src/app/structure-list/components/card/card.component.html
@@ -20,7 +20,7 @@
[size]="'small'"
/>
<div class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'address'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'address'" [iconClass]="'icon-20'" />
<ng-container *ngIf="structure.distance">
<span class="distance"> {{ this.formatDistance() }} </span>
<span class="structureLocationDot">•</span>
@@ -31,14 +31,14 @@
</div>
<!-- rdv -->
<div *ngIf="structure.hasUserWithAppointmentDN && !isOrientation" class="rdv">
- <app-svg-icon [type]="'tags'" [icon]="'rdv'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'rdv'" [iconClass]="'icon-20'" />
<span>Rendez-vous</span>
</div>
</div>
</div>
<div class="right">
- <app-svg-icon *ngIf="!isOrientation" [type]="'ico'" [icon]="'chevronRight'" [iconClass]="'icon-24'" />
+ <app-svg-icon *ngIf="!isOrientation" [folder]="'ico'" [icon]="'chevronRight'" [iconClass]="'icon-24'" />
<div *ngIf="isOrientation && !isOrientationRdv">
<div
*ngIf="!isSelected"
@@ -49,7 +49,7 @@
(click)="cardAddToList(); $event.stopPropagation()"
(keyup.enter)="cardAddToList(); $event.stopPropagation()"
>
- <app-svg-icon [type]="'ico'" [icon]="'add'" [iconColor]="'black'" />
+ <app-svg-icon [folder]="'ico'" [icon]="'add'" [iconColor]="'black'" />
<span>Ajouter</span>
</div>
<div
@@ -61,7 +61,7 @@
(click)="cardAddToList(); $event.stopPropagation()"
(keyup.enter)="cardAddToList(); $event.stopPropagation()"
>
- <app-svg-icon [type]="'ico'" [icon]="'check'" [iconClass]="'icon-22'" [iconColor]="'white'" />
+ <app-svg-icon [folder]="'ico'" [icon]="'check'" [iconClass]="'icon-22'" [iconColor]="'white'" />
<span>Ajouté</span>
</div>
</div>
diff --git a/src/app/structure-list/components/more-filters/more-filters.component.html b/src/app/structure-list/components/more-filters/more-filters.component.html
index 4e76898ef72043530905296d38161fb4a902fda5..38860ebda4d157e46c7cd848523cc16198bd99cd 100644
--- a/src/app/structure-list/components/more-filters/more-filters.component.html
+++ b/src/app/structure-list/components/more-filters/more-filters.component.html
@@ -4,7 +4,7 @@
<div *ngIf="getModalType() === 'moreFilters'" class="moreFiltersHeader">
<h3>Plus de filtres</h3>
<div class="closeIcon" tabindex="0" (click)="closeModal()" (keyup.enter)="closeModal()">
- <app-svg-icon [iconClass]="'icon-40'" [iconColor]="'grey-1'" [icon]="'cross'" [type]="'ico'" />
+ <app-svg-icon [iconClass]="'icon-40'" [iconColor]="'grey-1'" [icon]="'cross'" [folder]="'ico'" />
</div>
</div>
<!-- Filter with single category -->
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html
index b7bf9c5a27e1d2ff4ac36c44f6432890d13d0d90..a5629300561202aaa21d46212670479b941e8b6c 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.html
+++ b/src/app/structure-list/components/structure-details/structure-details.component.html
@@ -21,7 +21,7 @@
[clickable]="false"
/>
</div>
- <app-svg-icon [type]="'ico'" [icon]="'cross'" [iconColor]="'grey-1'" (click)="close()" />
+ <app-svg-icon [folder]="'ico'" [icon]="'cross'" [iconColor]="'grey-1'" (click)="close()" />
</section>
<section class="actions hide-on-print">
@@ -33,7 +33,7 @@
[routerLink]="['/orientation']"
[state]="{ rdvStructure: structure }"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'rdvDetail'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'rdvDetail'" [iconClass]="'icon-32'" />
<div class="iconTitle">Demander un RDV</div>
</div>
<!-- Voir le site -->
@@ -45,12 +45,12 @@
(click)="goToWebsite()"
(keyup.enter)="goToWebsite()"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'web'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'web'" [iconClass]="'icon-32'" />
<div class="iconTitle">Site web</div>
</div>
<!-- Imprimer -->
<div role="button" class="printButton clickableDiv" tabindex="0" (click)="print()" (keyup.enter)="print()">
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'printStructure'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'printStructure'" [iconClass]="'icon-32'" />
<div class="iconTitle">Imprimer</div>
</div>
<!-- Signaler une erreur -->
@@ -61,7 +61,7 @@
(click)="displayModalError()"
(keyup.enter)="displayModalError()"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'watch'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'watch'" [iconClass]="'icon-32'" />
<div class="iconTitle">Signaler une erreur</div>
</div>
<!-- Je travaille ici -->
@@ -73,7 +73,7 @@
(click)="handleJoin()"
(keyup.enter)="handleJoin()"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'workHere'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'workHere'" [iconClass]="'icon-32'" />
<div class="iconTitle">Je travaille ici</div>
</div>
<!-- Modifier la structure -->
@@ -85,7 +85,7 @@
(click)="handleModify()"
(keyup.enter)="handleModify()"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'modifyStructure'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'modifyStructure'" [iconClass]="'icon-32'" />
<div class="iconTitle">Modifier la structure</div>
</div>
</section>
@@ -116,43 +116,43 @@
<section class="informations">
<h2>Informations</h2>
<div *ngIf="structure.address" class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'address'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'address'" [iconClass]="'icon-20'" />
<span>{{ structure.address.numero }} {{ structure.address.street }}</span>
<span class="light">•</span>
<span class="light"> {{ structure.address.commune }} </span>
</div>
<div *ngIf="structure.contactPhone" class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'phone'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'phone'" [iconClass]="'icon-20'" />
{{ structure.contactPhone | phone }}
</div>
<div *ngIf="structure.contactMail" class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'mail'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'mail'" [iconClass]="'icon-20'" />
<a href="mailto:{{ structure.contactMail }}">{{ structure.contactMail }}</a>
</div>
<div *ngIf="structure.twitter" class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'x'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'x'" />
<a target="_blank" rel="noopener noreferrer" [href]="'http://' + structure.twitter">
{{ structure.twitter }}
</a>
</div>
<div *ngIf="structure.facebook" class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'facebook'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'facebook'" />
<a target="_blank" rel="noopener noreferrer" [href]="'http://' + structure.facebook">
{{ structure.facebook }}
</a>
</div>
<div *ngIf="structure.linkedin" class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'linkedin'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'linkedin'" />
<a target="_blank" rel="noopener noreferrer" [href]="'http://' + structure.linkedin">
{{ structure.linkedin }}
</a>
</div>
<div *ngIf="structure.instagram" class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'instagram'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'instagram'" />
<a target="_blank" rel="noopener noreferrer" [href]="'http://' + structure.instagram">
{{ structure.instagram }}
</a>
@@ -385,13 +385,13 @@
<span>{{ tclStop.name }}</span>
<div class="inline">
<p *ngFor="let sub of tclStop.subLines">
- <app-svg-icon [type]="'tcl'" [icon]="sub" [iconClass]="'acces-icon'" />
+ <app-svg-icon [folder]="'tcl'" [icon]="sub" [iconClass]="'acces-icon'" />
</p>
<p *ngFor="let tram of tclStop.tramLines">
- <app-svg-icon [type]="'tcl'" [icon]="tram" [iconClass]="'acces-icon'" />
+ <app-svg-icon [folder]="'tcl'" [icon]="tram" [iconClass]="'acces-icon'" />
</p>
<p *ngFor="let bus of tclStop.busLines">
- <app-svg-icon [type]="'tcl'" [icon]="bus" [iconClass]="'acces-icon'" />
+ <app-svg-icon [folder]="'tcl'" [icon]="bus" [iconClass]="'acces-icon'" />
</p>
</div>
</div>
diff --git a/src/assets/ico/adress.svg b/src/assets/ico/address.svg
similarity index 100%
rename from src/assets/ico/adress.svg
rename to src/assets/ico/address.svg
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 26da3dd6b2ba81b12f3724c6134356649e096c8b..4226333f1a3fc721f057c2df6fcd32355377b694 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -116,7 +116,7 @@
fill="#010176" />
</symbol>
- <symbol id="adress" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <symbol id="address" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M11 2C12.6055 2.0145 14.1397 2.68885 15.265 3.87463C16.3902 5.06042 17.0142 6.66048 16.9998 8.32269C16.9998 11.8208 12.1242 19 11 19C9.87584 19 5.00025 11.8208 5.00025 8.32269C4.98578 6.66048 5.60982 5.06042 6.73504 3.87463C7.86026 2.68885 9.39446 2.0145 11 2ZM10.9999 5.55695C12.0865 5.53677 13.0768 6.19906 13.5059 7.23274C13.9349 8.26643 13.7173 9.4661 12.9553 10.2683C12.1933 11.0704 11.0384 11.3157 10.0329 10.8888C9.02744 10.4619 8.37129 9.44779 8.37266 8.32272C8.36215 6.80858 9.53743 5.57133 10.9999 5.55695Z"
fill="#333333" />